Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

public/static/weightCheck.html

@@ -235,7 +235,7 @@
               </div> -->
                 <div class="config">收货单位签名或盖章：</div>
                 <div class="autograph">客户签名：</div>
-                <div class="autograph">司机签名：</div>
+                <div class="autograph" v-if="item.warehouseName!='白城补数据'">司机签名：</div>
               </div>
               <!-- <div class="bottom-row3">扫一扫</div> -->
             </div>
@@ -337,7 +337,7 @@
               </div> -->
                 <div class="config">收货单位签名或盖章：</div>
                 <div class="autograph">客户签名：</div>
-                <div class="autograph">司机签名：</div>
+                <div class="autograph" v-if="item.warehouseName!='白城补数据'">司机签名：</div>
               </div>
               <!-- <div class="bottom-row3">扫一扫</div> -->
             </div>
@@ -442,7 +442,7 @@
               </div> -->
               <div class="config">收货单位签名或盖章：</div>
               <div class="autograph">客户签名：</div>
-              <div class="autograph">司机签名：</div>
+              <div class="autograph" v-if="_item.warehouseName!='白城补数据'">司机签名：</div>
             </div>
             <!-- <div class="bottom-row3">扫一扫</div> -->
           </div>

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -508,7 +508,7 @@
         //分页
         currentPage: 1,
         cost: '',
-        pageSize: 10,
+        pageSize: 50,
         isShowPrint: false,
         typeList: ['干粮', '潮粮'],
         disablednotarize: false,
@@ -680,7 +680,7 @@
               managementType: 1,
               statusType: that.statusType,
               serviceManagementType: that.serviceManagementType,
-              loadingstatus: 1,
+              // loadingstatus: 1,
             })
             .toPromise()
             .then((response) => {
@@ -730,7 +730,7 @@
       },
       goodsNameChange(e) {
         for (let q = 0; q < this.goodnameList.length; q++) {
-          if (this.goodnameList[q].goodsName = e) {
+          if (this.goodnameList[q].goodsName == e) {
             this.deptBudgetList.goodsName = this.goodnameList[q].goodsName
             this.deptBudgetList.goodsNameKey = this.goodnameList[q].goodsNameKey
           }
@@ -745,7 +745,7 @@
 
           }
           for (let q = 0; q < this.outContractNo.length; q++) {
-            if (this.outContractNo[q].contractNo = this.deptBudgetList.contractNo) {
+            if (this.outContractNo[q].contractNo == this.deptBudgetList.contractNo) {
               this.deptBudgetList.goodsName = this.outContractNo[q].goodsName
               this.deptBudgetList.goodsNameKey = this.outContractNo[q].goodsNameKey
             }
@@ -2648,6 +2648,17 @@
         }
       },
       getList() {
+        //合同编号
+        xialaNo({
+            compId: localStorage.getItem('ws-pf_compId'),
+            flag: 7,
+          })
+          .toPromise()
+          .then((response) => {
+            this.options1 = response
+            this.outContractNo = response
+            // this.refreshClick(1)
+          })
         // 类型
         this.storageType = []
         console.log(this.storageType)
@@ -2690,16 +2701,7 @@
           .then((response) => {
             this.gradeList = response
           })
-        //合同编号
-        xialaNo({
-            compId: localStorage.getItem('ws-pf_compId'),
-            flag: 7,
-          })
-          .toPromise()
-          .then((response) => {
-            this.options1 = response
-            this.outContractNo = response
-          })
+        
         this.multiSelector1 = []
         getinspectcontractno({
             compId: localStorage.getItem('ws-pf_compId'),
@@ -2715,22 +2717,22 @@
             // this.options1 = response
             // this.outContractNo = response
           })
-        this.refreshClick(1)
-        // getinspectList({
-        //     compId: localStorage.getItem('ws-pf_compId'),
-        //     currentPage: this.currentPage,
-        //     pageSize: this.pageSize,
-        //     warehouseName: this.warehouseName,
-        //     managementType: 1,
-        //     statusType:this.statusType,
-        //     serviceManagementType:this.serviceManagementType
-        //   })
-        //   .toPromise()
-        //   .then((response) => {
-        //     this.inspect = response.records
-        //     this.deptBudgetTotal = response.total
-        //     // this.$forceUpdate();
-        //   })
+        
+        getinspectList({
+            compId: localStorage.getItem('ws-pf_compId'),
+            currentPage: this.currentPage,
+            pageSize: this.pageSize,
+            warehouseName: this.warehouseName,
+            managementType: 1,
+            statusType:this.statusType,
+            serviceManagementType:this.serviceManagementType
+          })
+          .toPromise()
+          .then((response) => {
+            this.inspect = response.records
+            this.deptBudgetTotal = response.total
+            // this.$forceUpdate();
+          })
       },
     },
   }

src/views/houseSelfCollect/newWeighingManagement.vue

@@ -388,7 +388,7 @@
         refresh: 60,
         isShowBalance: false,
         currentPage: 1,
-        pageSize: 10,
+        pageSize: 50,
         deptCircularPage: {},
         deptBudgetTotal: 0,
         pList: [],

src/views/houseSelfCollect/weightCheckRecord.vue

@@ -176,6 +176,9 @@
         title: '',
         modification: [],
         ewCustomerOptions: [{
+          value: '黑龙江中天昊元贸易有限公司',
+          label: '黑龙江中天昊元贸易有限公司'
+        }, {
           value: '黑龙江利润元粮食贸易有限公司',
           label: '黑龙江利润元粮食贸易有限公司'
         }, {
@@ -184,11 +187,11 @@
         }, {
           value: '黑龙江鑫满仓粮食贸易有限公司',
           label: '黑龙江鑫满仓粮食贸易有限公司'
-        }, {
-          value: '黑龙江中天昊元贸易有限公司',
-          label: '黑龙江中天昊元贸易有限公司'
         }],
         companyNameOptions: [{
+          value: '黑龙江中天昊元贸易有限公司',
+          label: '黑龙江中天昊元贸易有限公司'
+        }, {
           value: '黑龙江利润元粮食贸易有限公司',
           label: '黑龙江利润元粮食贸易有限公司'
         }, {
@@ -197,15 +200,12 @@
         }, {
           value: '黑龙江鑫满仓粮食贸易有限公司',
           label: '黑龙江鑫满仓粮食贸易有限公司'
-        }, {
-          value: '黑龙江中天昊元贸易有限公司',
-          label: '黑龙江中天昊元贸易有限公司'
-        }, ],
+        }],
         companyNameEWOptions: [{
           value: '厦门建发物产有限公司',
           label: '厦门建发物产有限公司'
         }],
-        companyName: '黑龙江利润元粮食贸易有限公司',
+        companyName: '黑龙江中天昊元贸易有限公司',
         companyNameEW: '厦门建发物产有限公司',
         ewCustomer: '黑龙江利润元粮食贸易有限公司',
         ewradio: '',
@@ -375,8 +375,7 @@
             return
           }
           for (let _num = 0; _num < this.modification.length; _num++) {
-            if (this.modification[_num].serviceManagementType == 1 && (this.warehouseName == '鲅鱼圈金信库' || this
-                .warehouseName == '白城内陆港'|| this.warehouseName == '哈尔滨依兰库')) {
+            if (this.modification[_num].serviceManagementType == 1 && (this.warehouseName == '鲅鱼圈金信库' || this.warehouseName == '白城内陆港' || this.warehouseName == '哈尔滨依兰库')) {
               if (this.modification[_num].seller && this.modification[_num].buyer) {
                 let cang = {}
                 cang.value = this.modification[_num].seller
@@ -395,7 +394,7 @@
           }
           this.isShowPrintType = true
         } else {
-          if (row.serviceManagementType == 1 && (this.warehouseName == '鲅鱼圈金信库' || this.warehouseName == '白城内陆港'|| this.warehouseName == '哈尔滨依兰库')) {
+          if (row.serviceManagementType == 1 && (this.warehouseName == '鲅鱼圈金信库' || this.warehouseName == '白城内陆港' || this.warehouseName == '哈尔滨依兰库')) {
             if (row.seller && row.buyer) {
               let cang = {}
               cang.value = row.seller

src/views/outboundManagement/newQualityInspectionManagement.vue

@@ -224,11 +224,10 @@
         timestamp: '',
         //分页
         currentPage: 1,
-        pageSize: 10,
+        pageSize: 50,
         deptCircularPage: {},
         deptBudgetTotal: 0,
         deptBudgetTotal1: 0,
-        deptBudgetTotal1: 0,
         managementType: 3,
         isShowPrint: false,
         printData: {},
@@ -314,7 +313,7 @@
               warehouseName: that.warehouseName,
               managementType: that.managementType,
               qualityType: 1,
-              loadingstatus: 1,
+              // loadingstatus: 1,
             })
             .toPromise()
             .then((response) => {
@@ -342,7 +341,7 @@
               warehouseName: that.warehouseName,
               managementType: that.managementType,
               qualityType: 2,
-              loadingstatus: 1,
+              // loadingstatus: 1,
             })
             .toPromise()
             .then((response) => {
@@ -762,60 +761,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
+           })
       },
     },
   }

src/views/outboundManagement/weighingManagementNew.vue

@@ -337,7 +337,7 @@
         warehouseList: [],
         warehouseList1: [],
         currentPage: 1,
-        pageSize: 10,
+        pageSize: 50,
         submitAllow: false,
         deliveryList: [],
         positionInfos: [],
@@ -456,7 +456,7 @@
               warehouseName: that.warehouseName,
               managementType: 3,
               statusType: that.statusType,
-               loadingstatus: 1,
+               // loadingstatus: 1,
             })
             .toPromise()
             .then((response) => {
@@ -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) => {})
       },
     },
   }

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -1504,7 +1504,7 @@
 				if (this.dataList1.taskTypeKey == 2) {
 					this.dataList1.inOutType = '采购入库'
 					this.dataList1.inOutTypeKey = '1'
-					this.flag = 0
+					this.flag = 8
 				} else if (this.dataList1.taskTypeKey == 3) {
 					this.disabled = true
 					this.gradestatus=false