achao преди 3 години
родител
ревизия
ff3900e602

+ 38 - 38
src/views/houseSelfCollect/newWeighingManagement.vue

@@ -832,44 +832,44 @@
           .then((response) => {
             this.purchasePriceList = response
           })
-        this.refreshClick(1)
-        // getweighingList({
-        //     compId: localStorage.getItem('ws-pf_compId'),
-        //     currentPage: this.currentPage,
-        //     pageSize: this.pageSize,
-        //     searchKeyWord: '',
-        //     warehouseName: this.warehouseName,
-        //     managementType: 1,
-        //     serviceManagementType: this.inWarehouseType,
-        //     // statusType:1
-        //   })
-        //   .toPromise()
-        //   .then((response) => {
-        //     this.common.commonWeighingList = response.records
-        //     this.makeData()
-        //   })
-        //   .catch((response) => {
-        //     // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
-        //   })
-        // getweighingList({
-        //     compId: localStorage.getItem('ws-pf_compId'),
-        //     currentPage: this.currentPage,
-        //     pageSize: this.pageSize,
-        //     searchKeyWord: '',
-        //     statusType: this.statusType,
-        //     warehouseName: this.warehouseName,
-        //     managementType: 1,
-        //     serviceManagementType: this.inWarehouseType,
-        //     // statusType:1
-        //   })
-        //   .toPromise()
-        //   .then((response) => {
-        //     this.deptBudgetTotal = response.total
-        //     this.weighingList = response.records
-        //   })
-        //   .catch((response) => {
-        //     // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
-        //   })
+        // this.refreshClick(1)
+        getweighingList({
+            compId: localStorage.getItem('ws-pf_compId'),
+            currentPage: this.currentPage,
+            pageSize: this.pageSize,
+            searchKeyWord: '',
+            warehouseName: this.warehouseName,
+            managementType: 1,
+            serviceManagementType: this.inWarehouseType,
+            // statusType:1
+          })
+          .toPromise()
+          .then((response) => {
+            this.common.commonWeighingList = response.records
+            this.makeData()
+          })
+          .catch((response) => {
+            // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+          })
+        getweighingList({
+            compId: localStorage.getItem('ws-pf_compId'),
+            currentPage: this.currentPage,
+            pageSize: this.pageSize,
+            searchKeyWord: '',
+            statusType: this.statusType,
+            warehouseName: this.warehouseName,
+            managementType: 1,
+            serviceManagementType: this.inWarehouseType,
+            // statusType:1
+          })
+          .toPromise()
+          .then((response) => {
+            this.deptBudgetTotal = response.total
+            this.weighingList = response.records
+          })
+          .catch((response) => {
+            // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+          })
       },
       makeData() {
         this.mList = []

+ 54 - 54
src/views/outboundManagement/newQualityInspectionManagement.vue

@@ -762,60 +762,60 @@
       },
       getList() {
         this.timestamp = new Date().valueOf()
-        this.refreshClick(1)
-        // getinspectList({
-        //      compId: localStorage.getItem('ws-pf_compId'),
-        //      currentPage: this.currentPage,
-        //      pageSize: this.pageSize,
-        //      warehouseName: this.warehouseName,
-        //      managementType: this.managementType,
-        //       qualityType:1
-        //    })
-        //    .toPromise()
-        //    .then((response) => {
-        //      this.noinspectList = response.records
-        //      console.log(this.inspectbtn,this.noinspectList.length )
-        //       if(this.inspectbtn == 1 && this.noinspectList.length > 0){
-        //         this.switchList = this.noinspectList
-        //          this.inspect = this.noinspectList[0]
-        //          if(!this.inspect.weighingManagement){
-        //             this.inspect.weighingManagement = {}
-        //          }
-        //      }else if(this.inspectbtn == 1){
-        //         this.switchList = []
-        //          this.inspect = {}
-        //          this.inspect.weighingManagement = {}
-        //      }
-        //      console.log(this.switchList )
-        //      this.deptBudgetTotal1 = response.total
-        //      this.nosuccess = response.total
-        //    })
-        //    getinspectList({
-        //      compId: localStorage.getItem('ws-pf_compId'),
-        //      currentPage: this.currentPage,
-        //      pageSize: this.pageSize,
-        //      warehouseName: this.warehouseName,
-        //      managementType: this.managementType,
-        //      qualityType:2
-        //    })
-        //    .toPromise()
-        //    .then((response) => {
-        //      this.inspectList = response.records
-        //      console.log(this.inspectbtn,this.inspectList.length )
-        //      if(this.inspectbtn == 2 && this.inspectList.length > 0){
-        //          this.switchList = this.inspectList
-        //          this.inspect = this.inspectList[0]
-        //            if(!this.inspect.weighingManagement){
-        //             this.inspect.weighingManagement = {}
-        //          }
-        //      }else if(this.inspectbtn == 2){
-        //        this.switchList = []
-        //        this.inspect = {}
-        //          this.inspect.weighingManagement = {}
-        //      }
-        //      this.deptBudgetTotal2 = response.total
-        //       this.success = response.total
-        //    })
+        // this.refreshClick(1)
+        getinspectList({
+             compId: localStorage.getItem('ws-pf_compId'),
+             currentPage: this.currentPage,
+             pageSize: this.pageSize,
+             warehouseName: this.warehouseName,
+             managementType: this.managementType,
+              qualityType:1
+           })
+           .toPromise()
+           .then((response) => {
+             this.noinspectList = response.records
+             console.log(this.inspectbtn,this.noinspectList.length )
+              if(this.inspectbtn == 1 && this.noinspectList.length > 0){
+                this.switchList = this.noinspectList
+                 this.inspect = this.noinspectList[0]
+                 if(!this.inspect.weighingManagement){
+                    this.inspect.weighingManagement = {}
+                 }
+             }else if(this.inspectbtn == 1){
+                this.switchList = []
+                 this.inspect = {}
+                 this.inspect.weighingManagement = {}
+             }
+             console.log(this.switchList )
+             this.deptBudgetTotal1 = response.total
+             this.nosuccess = response.total
+           })
+           getinspectList({
+             compId: localStorage.getItem('ws-pf_compId'),
+             currentPage: this.currentPage,
+             pageSize: this.pageSize,
+             warehouseName: this.warehouseName,
+             managementType: this.managementType,
+             qualityType:2
+           })
+           .toPromise()
+           .then((response) => {
+             this.inspectList = response.records
+             console.log(this.inspectbtn,this.inspectList.length )
+             if(this.inspectbtn == 2 && this.inspectList.length > 0){
+                 this.switchList = this.inspectList
+                 this.inspect = this.inspectList[0]
+                   if(!this.inspect.weighingManagement){
+                    this.inspect.weighingManagement = {}
+                 }
+             }else if(this.inspectbtn == 2){
+               this.switchList = []
+               this.inspect = {}
+                 this.inspect.weighingManagement = {}
+             }
+             this.deptBudgetTotal2 = response.total
+              this.success = response.total
+           })
       },
     },
   }

+ 34 - 34
src/views/outboundManagement/weighingManagementNew.vue

@@ -1743,40 +1743,40 @@
           .then((response) => {
             this.outContractNo = response
           })
-          this.refreshClick(1)
-        // getweighingList({
-        //     compId: localStorage.getItem('ws-pf_compId'),
-        //     currentPage: this.currentPage,
-        //     pageSize: this.pageSize,
-        //     searchKeyWord: this.searchKeyWord,
-        //     warehouseName: this.warehouseName,
-        //     managementType: 3,
-        //     statusType: this.statusType,
-        //   })
-        //   .toPromise()
-        //   .then((response) => {
-        //     this.deliveryList = response.records
-        //     this.deptBudgetTotal = response.total
-        //     for (var i = 0; i < response.records.length; i++) {
-        //       if (response.records[i].addressUrl != null) {
-        //         if (response.records[i].addressUrl) {
-        //           response.records[i].addressUrlArray =
-        //             response.records[i].addressUrl.split(',')
-        //         }
-        //       } else {
-        //         response.records[i].addressUrlArray = []
-        //       }
-        //     }
-        //     for (var i = 0; i < response.records.length; i++) {
-        //       var arr = new Array()
-        //       this.addressUrls[i] = new Array()
-        //       if (this.weighingList.records[i].addressUrl != null) {
-        //         arr = this.weighingList.records[i].addressUrl.split(',')
-        //         this.addressUrls[i] = arr
-        //       }
-        //     }
-        //   })
-        //   .catch((response) => {})
+          // this.refreshClick(1)
+        getweighingList({
+            compId: localStorage.getItem('ws-pf_compId'),
+            currentPage: this.currentPage,
+            pageSize: this.pageSize,
+            searchKeyWord: this.searchKeyWord,
+            warehouseName: this.warehouseName,
+            managementType: 3,
+            statusType: this.statusType,
+          })
+          .toPromise()
+          .then((response) => {
+            this.deliveryList = response.records
+            this.deptBudgetTotal = response.total
+            for (var i = 0; i < response.records.length; i++) {
+              if (response.records[i].addressUrl != null) {
+                if (response.records[i].addressUrl) {
+                  response.records[i].addressUrlArray =
+                    response.records[i].addressUrl.split(',')
+                }
+              } else {
+                response.records[i].addressUrlArray = []
+              }
+            }
+            for (var i = 0; i < response.records.length; i++) {
+              var arr = new Array()
+              this.addressUrls[i] = new Array()
+              if (this.weighingList.records[i].addressUrl != null) {
+                arr = this.weighingList.records[i].addressUrl.split(',')
+                this.addressUrls[i] = arr
+              }
+            }
+          })
+          .catch((response) => {})
       },
     },
   }