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

public/static/weightCheckInOut.html

@@ -203,7 +203,7 @@
         printSmall() {},
         printBig() {},
       },
-      mounted() {debugger
+      mounted() {
         // console.log("sssss",this.getQueryVariable("tableData"))
         // let _data = decodeURIComponent(this.getQueryVariable("tableData"))
         // console.log("dfddd",_data)

public/static/weightCheckOut.html

@@ -219,7 +219,6 @@
         printBig() {},
       },
       mounted() {
-        debugger
         // console.log(decodeURIComponent(this.getQueryVariable("tableData")))
         // let _data = decodeURIComponent(this.getQueryVariable("tableData"))
         let _data= JSON.parse(localStorage.getItem('ck_bd_printData1'))            

src/views/contractManagement/collectionContract.vue

@@ -353,7 +353,7 @@
         console.log(`当前页: ${val}`)
         this.getList()
       },
-      getList() {debugger
+      getList() {
         getList({
             compId: localStorage.getItem('ws-pf_compId'),
             contractType: this.contractType,

src/views/contractManagement/collectionContractAdd.vue

@@ -406,7 +406,7 @@
         feedbackLeaders: [], //收货反馈负责人
       }
     },
-    activated() {debugger
+    activated() {
       // this.newSelectedOptions = '请选择货源所在地'
       this.newSelectedOptions1 = '请选择交货所在地'
       this.deptBudgetList.packingMethod = '散装'
@@ -558,7 +558,7 @@
           path: 'salesContract',
         })
       },
-      loaddata() {debugger
+      loaddata() {
         packList({
             constId: 'CON2',
           })

src/views/houseSelfCollect/customerManagementAdd.vue

@@ -584,6 +584,13 @@
           })
           return
         }
+        if (!this.customerList.compAddress) {
+          this.$message({
+            message: '请输入联系地址',
+            type: 'warning',
+          })
+          return
+        }
         // 验证码校验
         GetCustomerCodeJY({
             phone: this.customerList.customerPhone,

src/views/warehouse/warehouseManagementGross.vue

@@ -253,10 +253,9 @@
                 ">
                 <ws-input v-if="options2.length == 0" v-model="deptBudgetList.carNo" placeholder="请输入车牌号" maxlength="7"
                   size="small" />
-                <el-select v-if="carstatus && options2.length > 0" filterable clearable :filter-method="dataFilter2"
-                  v-model="deptBudgetList.carNo" placeholder="请选择车牌号" class="typeselect" @change="carChange">
-                  <el-option v-for="item in options2" :key="item.constKey"
-                    :label="item.carNo + '(' + item.tranCarNo + ')'" :value="item.carNo" />
+                <el-select v-if="carstatus && options2.length > 0" filterable clearable v-model="deptBudgetList.carNoCopy" placeholder="请选择车牌号" class="typeselect" @change="carChange">
+                  <el-option v-for="(item,index) in options2" :key="index"
+                    :label="item.carNo + '(' + item.tranCarNo + ')'" :value="index" />
                 </el-select>
                 <el-select v-if="!carstatus && options2.length > 0" filterable clearable :filter-method="dataFilter2"
                   v-model="deptBudgetList.carNo" placeholder="请选择车牌号" class="typeselect" @change="carChange">
@@ -663,23 +662,23 @@
           this.options1 = this.outContractNo
         }
       },
-      dataFilter2(val) {
-        this.deptBudgetList.carNo = val
-        if (val) {
-          //val存在
-          this.options1 = this.outContractNo1.filter((item) => {
-            if (
-              !!~item.carNo.indexOf(val) ||
-              !!~item.carNo.toUpperCase().indexOf(val.toUpperCase())
-            ) {
-              return true
-            }
-          })
-        } else {
-          //val为空时，还原数组
-          this.options2 = this.tranCarInfoList
-        }
-      },
+      // dataFilter2(val) {
+      //   this.deptBudgetList.carNo = val
+      //   if (val) {
+      //     //val存在
+      //     this.options1 = this.outContractNo1.filter((item) => {
+      //       if (
+      //         !!~item.carNo.indexOf(val) ||
+      //         !!~item.carNo.toUpperCase().indexOf(val.toUpperCase())
+      //       ) {
+      //         return true
+      //       }
+      //     })
+      //   } else {
+      //     //val为空时，还原数组
+      //     this.options2 = this.tranCarInfoList
+      //   }
+      // },
       editClick(status) {
         this.isGetCost = false
         if (status == 1) {
@@ -696,7 +695,9 @@
       },
       carChange(e) {
         for (let i = 0; i < this.tranCarInfoList.length; i++) {
-          if (this.tranCarInfoList[i].carNo == this.deptBudgetList.carNo) {
+          if (i==e) {
+            this.deptBudgetList.carNo =  this.tranCarInfoList[i].carNo
+             this.deptBudgetList.carNoCopy =  this.tranCarInfoList[i].carNo + '(' + this.tranCarInfoList[i].tranCarNo + ')'
             this.deptBudgetList.tranCarNo = this.tranCarInfoList[i].tranCarNo
             this.deptBudgetList.carId = this.tranCarInfoList[i].id
             this.deptBudgetList.freight = Math.round(
@@ -1852,6 +1853,7 @@
                 this.deptBudgetList.pureWeight /= 1000
                 this.deptBudgetList.deductionAmount *= 1000
                 this.deptBudgetList.deductionWeight /= 1000
+                delete this.deptBudgetList.carNoCopy
                 addstorageputList(this.deptBudgetList)
                   .toPromise()
                   .then((response) => {