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

src/views/home/service.js

@@ -602,8 +602,6 @@ export default {
         isTask: isTask ? 1 : 0
       }
       getRoule().toPromise().then(response => {
-        
-        debugger
         let list = []
         response.forEach(item => {
           if (item.name === 'crewManagement') {

src/views/houseSelfCollect/acquisitionManagement.vue

@@ -101,7 +101,8 @@
         goodsNameList: [],
         warehouseList: [],
         userJurisdiction: false,
-        userJurisdictionAllow: true
+        userJurisdictionAllow: true,
+        warehouseName:'',
       }
     },
     activated() {
@@ -132,6 +133,12 @@
         this.getList()
       },
       warehouseChange(e) {
+           for (let i = 0; i < this.warehouseList.length; i++) {
+        if (this.warehouseList[i].id == this.selectVal) {
+          this.warehouseName = this.warehouseList[i].warehouseName
+          this.WAREHOUSE.payname = this.warehouseList[i].id
+        }
+      }
         let _obj = this.warehouseList.find((item) => {
           return item.id === this.selectVal;
         });
@@ -183,7 +190,14 @@
           // if(this.userJurisdiction){
           //   this.warehouseList.unshift({warehouseName:response[0].flag})
           // }
+                console.log(this.WAREHOUSE.payname)
           this.selectVal = this.warehouseList[0].id
+          if (this.warehouseName) {
+            this.selectVal = this.WAREHOUSE.payname
+          } else {
+            this.WAREHOUSE.payname = this.warehouseList[0].id
+          }
+          this.warehouseName = this.warehouseList[0].warehouseName
           if (this.warehouseList[0].allowEdit == 1) {
 
             this.checked = true

src/views/houseSelfCollect/acquisitionManagementAdd.vue

@@ -137,7 +137,7 @@
         </el-table>
       </div>
       <div class="bottom-btn">
-        <div v-if="baseInfoForm.status=='审核中'||!isShowTip" class="left">当前价格尚未通过审核，建议审核通过后进行打印</div>
+        <div v-if="baseInfoForm.status=='审核中'" class="left">当前价格尚未通过审核，建议审核通过后进行打印</div>
         <div class="right">
           <el-button class="submit" @click="closeCount">关闭</el-button>
           <el-button class="submit" @click="print">打印</el-button>
@@ -836,6 +836,7 @@
           .then((response) => {
             this.isCountShow = false
             this.isShowTip = true
+             this.getData()
           })
           .catch((req) => {
             this.$message.warning(req.message)

src/views/houseSelfCollect/inspectInfo.vue

@@ -610,7 +610,6 @@
                count = response
           })
           //  客户下拉校验
-          debugger
         getamount({
           compId: sessionStorage.getItem('ws-pf_compId'),
           customerName: this.inspect.customerName,
@@ -681,7 +680,6 @@
                count = response
           })
         //  货名下拉校验
-        debugger
         getamount({
           compId: sessionStorage.getItem('ws-pf_compId'),
           customerName: this.inspect.customerName,

src/views/houseSelfCollect/inspectionManagement.vue

@@ -189,6 +189,7 @@ export default {
           this.warehouseCount = this.warehouseList[i].count
           this.warehouseNo = this.warehouseList[i].No
           this.cangid = this.warehouseList[i].id
+          this.WAREHOUSE.payname = this.warehouseList[i].value
           this.purchasePriceList = this.warehouseList[i].purchasePriceList
         }
       }
@@ -249,6 +250,11 @@ export default {
           }
           if(this.warehouseList.length > 0){
             this.warehouseName =  this.warehouseList[0].value
+             if (this.cangid) {
+            this.warehouseName = this.WAREHOUSE.payname
+          } else {
+            this.WAREHOUSE.payname = this.warehouseList[0].value
+          }
             this.warehouseCount =  this.warehouseList[0].count
             this.warehouseNo =  this.warehouseList[0].No
             this.cangid =  this.warehouseList[0].id

src/views/houseSelfCollect/weighingManagement.vue

@@ -198,6 +198,7 @@ export default {
           this.warehouseId = this.warehouseList[i].warehouseId
          this.purchasePriceList = this.warehouseList[i].warehouseList
           this.allowEdit = this.warehouseList[i].allowEdit
+            this.WAREHOUSE.payname = this.warehouseList[i].value
         }
       }
       this.getList()
@@ -251,9 +252,14 @@ export default {
               warehouseList:response[i].purchasePriceList,
               allowEdit:response[i].allowEdit
             })
+          }
+                this.warehouseName =  this.warehouseList[0].value
+             if (this.warehouseId) {
+            this.warehouseName = this.WAREHOUSE.payname
+          } else {
+            this.WAREHOUSE.payname = this.warehouseList[0].value
           }
           this.allowEdit = this.warehouseList[0].allowEdit
-          this.warehouseName = this.warehouseList[0].value
           this.warehouseId = this.warehouseList[0].warehouseId
           this.purchasePriceList = this.warehouseList[0].warehouseList
          this.getList()

src/views/warehouse/warehouseManagementAdd.vue

@@ -50,6 +50,7 @@
             v-model="deptBudgetList.personCharge"
             placeholder="请选择负责人"
             filterable
+            clearable 
             :filter-method="dataFilter"
             @change="selectstaff"
           >