فهرست منبع

1、修改销售退货销售出库作废的刷新

zhoux 1 سال پیش
والد
کامیت
7ad5bc77f6
2فایلهای تغییر یافته به همراه172 افزوده شده و 162 حذف شده
  1. 5 0
      package-sales/pages/order-return/order-return.js
  2. 167 162
      package-sales/pages/sales-outbound/sales-outbound.js

+ 5 - 0
package-sales/pages/order-return/order-return.js

@@ -154,7 +154,12 @@ onChangeTabs(e) {
           image: '/static/image/success.png',
           duration: 1000
         })
+         // 查询
+         this.searchData();
       }
+      this.setData({
+        loading: false
+      })
     })
   },
   /**

+ 167 - 162
package-sales/pages/sales-outbound/sales-outbound.js

@@ -39,6 +39,73 @@ Page({
     }],
     // 列表区(内容)
     contentList: [{
+      name: 'outNo',
+      title: mixins.$t("outOrderNo")
+    },
+    {
+      name: 'cusPhone',
+      title: mixins.$t("cusPhone")
+    },
+    {
+      name: 'addressFull',
+      title: mixins.$t("adddressFull")
+    },
+    {
+      name: [{
+        name: 'orgName',
+        title: ''
+      }, {
+        name: 'staffName',
+        title: mixins.$t("staffId")
+      }],
+      title: mixins.$t("storeInformation")
+    }
+    ],
+    // 查询条件
+    searchContent: [{
+      code: 'createtime',
+      title: mixins.$t("pastThirthtyDays"),
+      defaultValue: 5,
+      searchType: Constants.searchType.date
+    },
+    {
+      code: 'staff',
+      title: mixins.$t("staffId"),
+      dropType: 'staff'
+    },
+    {
+      code: 'org',
+      title: mixins.$t("orgId"),
+      dropType: 'org'
+    },
+    {
+      code: 'choose',
+      title: mixins.$t("choose"),
+      searchType: Constants.searchType.pick
+    }
+    ],
+    // 查询条件-筛选
+    pullMenuList: [{
+      code: 'outStatus',
+      pullType: 'mSelect',
+      typeName: 'outStatus'
+    },
+    {
+      code: 'receiveStatus',
+      pullType: 'mSelect',
+      typeName: 'receiveStatus'
+    },
+    {
+      code: 'delivery_Time',
+      dataType: 'date'
+    },
+    {
+      code: 'viewVoidedDocuments',
+      dataType: 'checkbox'
+    },
+    ],
+    contentObj: {
+      '待出库': [{
         name: 'outNo',
         title: mixins.$t("outOrderNo")
       },
@@ -60,119 +127,52 @@ Page({
         }],
         title: mixins.$t("storeInformation")
       }
-    ],
-    // 查询条件
-    searchContent: [{
-        code: 'createtime',
-        title: mixins.$t("pastThirthtyDays"),
-        defaultValue: 5,
-        searchType: Constants.searchType.date
+      ],
+      '出库中': [{
+        name: 'outNo',
+        title: mixins.$t("outOrderNo")
       },
       {
-        code: 'staff',
-        title: mixins.$t("staffId"),
-        dropType: 'staff'
+        name: 'cusPhone',
+        title: mixins.$t("cusPhone")
       },
       {
-        code: 'org',
-        title: mixins.$t("orgId"),
-        dropType: 'org'
+        name: 'addressFull',
+        title: mixins.$t("adddressFull")
       },
       {
-        code: 'choose',
-        title: mixins.$t("choose"),
-        searchType: Constants.searchType.pick
+        name: [{
+          name: 'orgName',
+          title: ''
+        }, {
+          name: 'staffName',
+          title: mixins.$t("staffId")
+        }],
+        title: mixins.$t("storeInformation")
       }
-    ],
-    // 查询条件-筛选
-    pullMenuList: [{
-        code: 'outStatus',
-        pullType: 'mSelect',
-        typeName: 'outStatus'
+      ],
+      '已出库': [{
+        name: 'outNo',
+        title: mixins.$t("outOrderNo")
       },
       {
-        code: 'receiveStatus',
-        pullType: 'mSelect',
-        typeName: 'receiveStatus'
+        name: 'cusPhone',
+        title: mixins.$t("cusPhone")
       },
       {
-        code: 'delivery_Time',
-        dataType: 'date'
+        name: 'addressFull',
+        title: mixins.$t("adddressFull")
       },
       {
-        code: 'viewVoidedDocuments',
-        dataType: 'checkbox'
-      },
-    ],
-    contentObj: {
-      '待出库': [{
-          name: 'outNo',
-          title: mixins.$t("outOrderNo")
-        },
-        {
-          name: 'cusPhone',
-          title: mixins.$t("cusPhone")
-        },
-        {
-          name: 'addressFull',
-          title: mixins.$t("adddressFull")
-        },
-        {
-          name: [{
-            name: 'orgName',
-            title: ''
-          }, {
-            name: 'staffName',
-            title: mixins.$t("staffId")
-          }],
-          title: mixins.$t("storeInformation")
-        }
-      ],
-      '出库中': [{
-          name: 'outNo',
-          title: mixins.$t("outOrderNo")
-        },
-        {
-          name: 'cusPhone',
-          title: mixins.$t("cusPhone")
-        },
-        {
-          name: 'addressFull',
-          title: mixins.$t("adddressFull")
-        },
-        {
-          name: [{
-            name: 'orgName',
-            title: ''
-          }, {
-            name: 'staffName',
-            title: mixins.$t("staffId")
-          }],
-          title: mixins.$t("storeInformation")
-        }
-      ],
-      '已出库': [{
-          name: 'outNo',
-          title: mixins.$t("outOrderNo")
-        },
-        {
-          name: 'cusPhone',
-          title: mixins.$t("cusPhone")
-        },
-        {
-          name: 'addressFull',
-          title: mixins.$t("adddressFull")
-        },
-        {
-          name: [{
-            name: 'orgName',
-            title: ''
-          }, {
-            name: 'staffName',
-            title: mixins.$t("staffId")
-          }],
-          title: mixins.$t("storeInformation")
-        }
+        name: [{
+          name: 'orgName',
+          title: ''
+        }, {
+          name: 'staffName',
+          title: mixins.$t("staffId")
+        }],
+        title: mixins.$t("storeInformation")
+      }
       ],
     },
     buttonSaveList: [{
@@ -209,76 +209,76 @@ Page({
     //除了已入库 不显示销售退货
     if (item.outStatus == Constants.outStatus.outBounded) { //"出库状态-已出库"
       buttonList = [{
-          name: 'editInto',
-          title: mixins.$t('edit')
-        },
-        {
-          name: 'salesOutbound',
-          title: mixins.$t("outProcessing")
-        },
-        {
-          name: 'saleOrderReturn',
-          title: mixins.$t("saleReturn"),
-          formMode: Constants.formMode.other,
-          other: {
-            idKey: 'outId'
-          },
-          formType: 'toSaleOut'
-        }, //退货 
-        {
-          name: 'cusCollection',
-          formType: Constants.formMode.add,
-          title: mixins.$t("cusCollection")
-        },{
-          name: 'cusReturnCollection',
-          formType: Constants.formMode.add,
-          title: mixins.$t("cusReturnCollection")
-        },
-        {
-          name: 'invalid',
-          title: mixins.$t("invaidOrder")
-        }, //作废
-        {
-          name: 'printedBill',
-          title: mixins.$t('printedBill') //打印票据
+        name: 'editInto',
+        title: mixins.$t('edit')
+      },
+      {
+        name: 'salesOutbound',
+        title: mixins.$t("outProcessing")
+      },
+      {
+        name: 'saleOrderReturn',
+        title: mixins.$t("saleReturn"),
+        formMode: Constants.formMode.other,
+        other: {
+          idKey: 'outId'
         },
+        formType: 'toSaleOut'
+      }, //退货 
+      {
+        name: 'cusCollection',
+        formType: Constants.formMode.add,
+        title: mixins.$t("cusCollection")
+      }, {
+        name: 'cusReturnCollection',
+        formType: Constants.formMode.add,
+        title: mixins.$t("cusReturnCollection")
+      },
+      {
+        name: 'invalid',
+        title: mixins.$t("invaidOrder")
+      }, //作废
+      {
+        name: 'printedBill',
+        title: mixins.$t('printedBill') //打印票据
+      },
       ]
     } else {
       // 弹出按钮
       buttonList = [{
-          name: 'editInto',
-          title: mixins.$t('edit')
-        }, {
-          name: 'salesOutbound',
-          title: mixins.$t("outProcessing")
-        },
-        {
-          name: 'cusCollection',
-          formType: Constants.formMode.add,
-          title: mixins.$t("cusCollection")
-        },
-        {
-          name: 'cusReturnCollection',
-          formType: Constants.formMode.add,
-          title: mixins.$t("cusReturnCollection")
-        },
-        {
-          name: 'invalid',
-          title: mixins.$t("invaidOrder")
-        }, //作废 
-        {
-          name: 'printedBill',
-          title: mixins.$t('printedBill') //打印票据
-        },
+        name: 'editInto',
+        title: mixins.$t('edit')
+      }, {
+        name: 'salesOutbound',
+        title: mixins.$t("outProcessing")
+      },
+      {
+        name: 'cusCollection',
+        formType: Constants.formMode.add,
+        title: mixins.$t("cusCollection")
+      },
+      {
+        name: 'cusReturnCollection',
+        formType: Constants.formMode.add,
+        title: mixins.$t("cusReturnCollection")
+      },
+      {
+        name: 'invalid',
+        title: mixins.$t("invaidOrder")
+      }, //作废 
+      {
+        name: 'printedBill',
+        title: mixins.$t('printedBill') //打印票据
+      },
       ]
     }
     //6460 标-免费版-销售出库-一览-三个点再加一个客户收款  除了标准版 其他的删除客户收款
-    if(this.data.gradeCode !== Constants.gradeCode.STD){
-      buttonList.forEach((element,index) => {
-            if(element.name == 'cusCollection'){
-              buttonList.splice(index, 1)
-            }
-          });
+    if (this.data.gradeCode !== Constants.gradeCode.STD) {
+      buttonList.forEach((element, index) => {
+        if (element.name == 'cusCollection') {
+          buttonList.splice(index, 1)
+        }
+      });
     }
     this.setData({
       // 弹出按钮
@@ -335,7 +335,12 @@ Page({
           image: '/static/image/success.png',
           duration: 1000
         })
+        // 查询
+        this.searchData();
       }
+      this.setData({
+        loading: false
+      })
     })
   },