轮胎8月1号修改内容

src/views/tirePartsMall/financialManagement/collectionSettlement/detailsPage.vue

@@ -501,12 +501,12 @@ export default {
                 corpName: this.form.$corpId
               }
               saveSubmit(data).then(res => {
+                  loading.close()
                 collectionAndPayment(data).then((res => {
                   this.refresh(res.data.data.id)
                   this.$set(this.optionForm, 'disabled', true)
                   this.$set(this.optionContactsBack, 'disabled', true)
                   this.$message.success('收款成功')
-                  loading.close()
                 }))
               }).catch(() => {
                 loading.close()

src/views/tirePartsMall/financialManagement/collectionSettlement/index.vue

@@ -72,7 +72,7 @@ export default {
         menuWidth: 50,
         searchSpan: 8,
         searchIcon: true,
-        searchIndex: 2,
+        searchIndex: 4,
         highlightCurrentRow: true,
         dialogWidth: "70%",
         column: [{
@@ -105,10 +105,22 @@ export default {
                 column[1].searchValue = value;
             },
           click: () => {
-            console.log('555555');
             this.$refs.crud.dicInit()
           },
         }, {
+            label: "结算日期",
+            prop: "settlementDate",
+            searchProp: "settlementDateList",
+            searchOrder:2,
+            type: "date",
+            search:true,
+            overHidden: true,
+            width: 100,
+            searchRange: true,
+            searchDefaultTime: ["00:00:00", "23:59:59"],
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd HH:mm:ss"
+        }, {
           label: "所属公司",
           prop: "salesCompanyId",
           search: true,
@@ -162,19 +174,6 @@ export default {
             label: "dictValue",
             value: "dictKey"
           }
-        }, {
-          label: "结算日期",
-          prop: "settlementDate",
-          searchProp: "settlementDateList",
-          searchOrder:2,
-          type: "date",
-          search:true,
-          overHidden: true,
-          width: 100,
-          searchRange: true,
-          searchDefaultTime: ["00:00:00", "23:59:59"],
-          format: "yyyy-MM-dd",
-          valueFormat: "yyyy-MM-dd HH:mm:ss"
         },
         {
           label: "制单日期",

src/views/tirePartsMall/financialManagement/paymentSettlement/index.vue

@@ -81,7 +81,7 @@ export default {
         menuWidth: 50,
         searchSpan: 8,
         searchIcon: true,
-        searchIndex: 2,
+        searchIndex: 4,
         highlightCurrentRow: true,
         dialogWidth: "70%",
         column: [{
@@ -105,6 +105,19 @@ export default {
             value: 'id'
           },
           dicUrl: '/api/blade-sales-part/corpsDesc/listAll?cname={{key}}&corpType=GYS&enableOrNot=1',
+        },{
+            label: '结算日期',
+            prop: "settlementDate",
+            searchProp:"settlementDateList",
+            search: true,
+            overHidden: true,
+            type: "date",
+            searchOrder:2,
+            width: 100,
+            searchRange: true,
+            searchDefaultTime: ["00:00:00", "23:59:59"],
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd HH:mm:ss"
         }, {
           label: '账户',
           prop: "accountName",
@@ -136,19 +149,6 @@ export default {
             label: "dictValue",
             value: "dictKey"
           }
-        },{
-          label: '结算日期',
-          prop: "settlementDate",
-          searchProp:"settlementDateList",
-          search: true,
-          overHidden: true,
-          type: "date",
-            searchOrder:2,
-          width: 100,
-          searchRange: true,
-          searchDefaultTime: ["00:00:00", "23:59:59"],
-          format: "yyyy-MM-dd",
-          valueFormat: "yyyy-MM-dd HH:mm:ss"
         },  {
           label: "制单时间",
           prop: "createTime",

src/views/tirePartsMall/inventory/index.vue

@@ -40,7 +40,7 @@ export default {
       treeData: [],
       loading: false,
       corpTypeVisible: false,
-      search: {},
+      search: {whether:'0'},
       form: {},
       dataList: [],
       detailData: {},
@@ -202,14 +202,14 @@ export default {
             hide: true,
             width: 120,
             searchLabelWidth: 120,
-            searchValue:0,
+            searchValue:'0',
             dicData: [{
-              "label": "是",
-              "value": "1"
+                label: '是',
+              value: '1'
             }, {
-              "label": "否",
-              "value": "0"
-            }]
+              label: '否',
+                value: '0'
+            }],
           }]
       }
     }
@@ -286,7 +286,7 @@ export default {
       done();
       this.onLoad(this.page, params)
     },
-    onLoad(page, params = {whether:0}) {
+    onLoad(page, params = {}) {
       console.log(params);
       params = {
         storageId:params.storageName,

src/views/tirePartsMall/salesManagement/inboundTask/index.vue

@@ -58,7 +58,7 @@ export default {
     return {
       detailsOpen: false,
       loading: false,
-      search: {},
+      search: { statusName:'待处理' },
       form: {},
       dataList: [],
       selectionList: [],
@@ -129,6 +129,11 @@ export default {
                 label: '已完成',
                 value: '已完成'
             }],
+            change: ({ value }) => {
+                console.log(value,133)
+                // this.option.column[1].searchValue = value;
+            },
+            searchValue:'待处理',
             value:'待处理'
         }, {
           label: '业务对象',
@@ -391,7 +396,6 @@ export default {
         current: page.currentPage,
         size: page.pageSize,
         bizTypeName: "SHRW",
-          statusName:'待处理',
         ...Object.assign(params, this.search),
         customerName : params.$customerName
       }

src/views/tirePartsMall/salesManagement/purchaseOrder/detailsPage.vue

@@ -1813,6 +1813,7 @@ export default {
                                 if(this.form.orderItemsList[i].dot){}else {
                                     this.$message.warning(`采购明细序号${Number(i)+1}的批次号不能为空`);
                                     picihao = true
+                                    break;
                                 }
                             }else {
                             }

src/views/tirePartsMall/salesManagement/purchaseOrder/index.vue

@@ -261,10 +261,10 @@ export default {
         }, {
           label: '业务对象',
           prop: "customerId",
-          search: true,
+          type: 'select',
           remote:true,
+          search: true,
           overHidden: true,
-          type: 'select',
           props: {
             label: 'cname',
             value: 'id'
@@ -274,7 +274,7 @@ export default {
           label: '仓库',
           prop: "storageId",
           search: true,
-          remote:true,
+          // remote:true,
           overHidden: true,
           type: 'select',
           props: {

src/views/tirePartsMall/salesManagement/saleOrder/detailsPage.vue

@@ -1704,6 +1704,7 @@ export default {
                                 if(this.form.orderItemsList[i].dot){}else {
                                     this.$message.warning(`销售明细序号${Number(i)+1}的批次号不能为空`);
                                     picihao = true
+                                    break;
                                 }
                             }else {
                             }

src/views/tirePartsMall/statisticAnalysis/supplierTransactions/index.vue

@@ -442,7 +442,7 @@ export default {
       // 清空检索条件
       qingkongss(params,done){
           this.search = ''
-          this.onLoad(this.page)
+          // this.onLoad(this.page)
       },
       // 获取列表数据
     onLoad(page, params = {}) {