前端

src/views/contractManagement/purchaseContractAdd.vue

@@ -73,12 +73,11 @@
           <el-autocomplete class="inline-input" v-model="deptBudgetList.buyer" :fetch-suggestions="querySearch1"
             placeholder="请输入买方名称" @select="handleSelect"></el-autocomplete>
         </ws-form-item>
-        <!--卖方-->
-
         <ws-form-item label="交货方式" span="1" prop="seller" class="readonly">
           <el-radio v-model="deptBudgetList.deliverType" label="1">我方自提</el-radio>
           <el-radio v-model="deptBudgetList.deliverType" label="2">对方送货</el-radio>
         </ws-form-item>
+         <!--卖方-->
         <ws-form-item label="卖方" span="1" prop="seller" class="readonly">
           <!-- <ws-input v-model="deptBudgetList.seller" placeholder="请输入卖方名称" maxlength="100" size="small" /> -->
           <!-- <el-autocomplete class="inline-input" v-model="deptBudgetList.seller" :fetch-suggestions="querySearch2"
@@ -86,6 +85,7 @@
              -->
             <ws-select  v-model="deptBudgetList.seller" placeholder="请选择卖方名称" class="typeselect" 
             @change="sellerSelect">
+
             <ws-option v-for="(item,index) in customerinfo" :key="index"  :label="item.customerName"
               :value="item.customerName" />
           </ws-select>

src/views/contractManagement/purchaseContractExamine.vue

@@ -71,6 +71,8 @@
         <ws-form-item label="交货方式" span="1" prop="deliverType1">{{ deptBudgetList.deliverType1 }}
         </ws-form-item>
         <ws-form-item label="买方电话" span="1" prop="buyerPhone">{{ deptBudgetList.buyerPhone }}
+        </ws-form-item>
+         <ws-form-item label="发货反馈负责人" span="1" prop="feedbackLeader" v-if="deptBudgetList.deliverType1 == '对方送货'">{{ deptBudgetList.feedbackLeader }}
         </ws-form-item>
         <ws-form-item label="包装方式" span="1" prop="packingMethod">
           {{ deptBudgetList.packingMethod }}

src/views/contractManagement/salesContractEdit.vue

@@ -90,7 +90,7 @@
             <ws-input v-model="deptBudgetList.buyerPhone" placeholder="请输入买方电话" maxlength="100" size="small" />
           </ws-form-item>
           <!-- 收货反馈负责人 -->
-          <ws-form-item label="收货反馈负责人" span="1" prop="feedbackLeader" v-if="deptBudgetList.deliverType == '2'">
+          <ws-form-item label="收货反馈负责人" span="1" prop="feedbackLeader" v-if="deptBudgetList.deliverType1 == '对方自提'">
             <ws-select v-model="deptBudgetList.feedbackLeader" placeholder="请输入收货反馈负责人" class="typeselect" @change="feedbackLeaderChange">
               <ws-option v-for="(item,index ) in feedbackLeaders" :key="item.staffId" :label="item.staffName" :value="index" />
             </ws-select>

src/views/contractManagement/salesContractExamine.vue

@@ -107,6 +107,13 @@
               {{ deptBudgetList.sellerPhone }}
             </div>
           </ws-form-item>
+           <!-- 收货反馈负责人 -->
+          <ws-form-item label="收货反馈负责人" span="1" prop="feedbackLeader" v-if="deptBudgetList.deliverType == '对方自提'">
+            <div class="unchanged">
+              {{ deptBudgetList.feedbackLeader }}
+            </div>
+          </ws-form-item>
+
           <ws-form-item label="验收方式" span="1" prop="acceptanceMethod">
             <div class="unchanged">
               {{ deptBudgetList.acceptanceMethod }}

src/views/houseSelfCollect/acquisitionManagement.vue

@@ -240,7 +240,6 @@ export default {
               this.checked = false
             }
           } else {
-            console.log(this.WAREHOUSE[0].payname)
             this.selectVal = this.warehouseList[0].id
             if (this.warehouseName) {
               this.selectVal = this.WAREHOUSE[0].payname

src/views/houseSelfCollect/inspectionManagement.vue

@@ -172,7 +172,7 @@
 			let _WarehouseName = localStorage.getItem('houseSelfCollect_house1')
 			_WarehouseName = JSON.parse(_WarehouseName)
 			if(_WarehouseName){
-				this.warehouseNameChange(_WarehouseName.value)
+					this.warehouseNameChange(_WarehouseName.value)
 			}
 		},
 		methods: {
@@ -223,6 +223,7 @@
 						this.cangid = this.warehouseList[i].warehouseId
 						this.allowEdit = this.warehouseList[i].allowEdit
 						this.WAREHOUSE[1].payname = this.warehouseList[i].value
+						this.warehouseList[i].compId = localStorage.getItem('ws-pf_compId')
 						localStorage.setItem('houseSelfCollect_house1', JSON.stringify(this.warehouseList[i]))
 					}
 				}
@@ -275,25 +276,29 @@
 						this.warehouseList = []
 						let _wareHouse = localStorage.getItem('houseSelfCollect_house1')
 						_wareHouse = JSON.parse(_wareHouse)
-						if (_wareHouse) {
-								this.cangid = _wareHouse.warehouseId
-								this.warehouseName = _wareHouse.value
-								this.warehouseNo = _wareHouse.No
-								this.warehouseCount = _wareHouse.count
-								this.allowEdit = _wareHouse.allowEdit
-							} 
 						for (let i = 0; i < response.length; i++) {
 							if(_wareHouse && response[i].warehouseName==_wareHouse.value){
 								this.warehouseCount = response[i].count
 								this.allowEdit = response[i].allowEdit
+								this.cangid = _wareHouse.warehouseId
+								this.warehouseName = response[i].warehouseName
+								this.warehouseNo = response[i].commonWarehouseNo
 							}
 							this.warehouseList.push({
 								value: response[i].warehouseName,
 								warehouseId: response[i].id,
 								count: response[i].count,
 								No: response[i].commonWarehouseNo,
-								allowEdit:response[i].allowEdit
+								allowEdit:response[i].allowEdit,
+								compId:localStorage.getItem('ws-pf_compId')
 							})
+							// if (_wareHouse && response[i].warehouseName == _wareHouse.value) {
+							// 		this.cangid = _wareHouse.warehouseId
+							// 		this.warehouseName = response[i].warehouseName
+							// 		this.warehouseNo = response[i].commonWarehouseNo
+							// 		this.warehouseCount =  response[i].count
+							// 		this.allowEdit = response[i].allowEdit
+							// } 
 							if (!_wareHouse) {
 								if (this.cangid && this.cangid == response[i].id) {
 									this.warehouseName = response[i].warehouseName

src/views/houseSelfCollect/paymentManagement.vue

@@ -879,18 +879,24 @@
               this.warehouseName = this.$route.query.warehouseName
               this.warehouseNameKey = this.$route.query.warehouseName
             } else {
-              if (_wareHouse) {
-                this.warehouseNameKey = _wareHouse.value
-                this.warehouseName = _wareHouse.value
-              } else {
-                this.warehouseNameKey = this.warehouseList[0].id
-                if (this.warehouseName) {
-                  this.warehouseNameKey = this.WAREHOUSE[3].payname
-                } else {
-                  this.WAREHOUSE[3].payname = this.warehouseList[0].id
-                  this.warehouseName = this.warehouseList[0].warehouseName
-                }
+                for(let index = 0 ; index < this.warehouseList.length ; index++){
+                  
+                    if (_wareHouse && _wareHouse.value == this.warehouseList[index].warehouseName) {
+                          this.warehouseName = this.warehouseList[index].warehouseName
+                          this.warehouseNameKey = this.warehouseList[index].warehouseName
+                          return
+                  } else {
+                    this.warehouseNameKey = this.warehouseList[0].id
+                    if (this.warehouseName) {
+                      this.warehouseNameKey = this.WAREHOUSE[3].payname
+                    } else {
+                      this.WAREHOUSE[3].payname = this.warehouseList[0].id
+                      this.warehouseName = this.warehouseList[0].warehouseName
+                    }
+                  }
+
               }
+              
             }
             this.getList()
           })
@@ -1300,6 +1306,7 @@ settlementEdit({id:this.id,paymentScreenshot:this.payImg[0].url}).toPromise()
                 monitorUrl1: this.warehouseList[i].monitorUrl1,
                 monitorUrl2: this.warehouseList[i].monitorUrl2,
                 warehouseNo: this.warehouseList[i].commonWarehouseNo,
+                compId:localStorage.getItem('ws-pf_compId')
               })
             )
             this.WAREHOUSE[3].payname = this.warehouseList[i].id

src/views/houseSelfCollect/weighingManagement.vue

@@ -405,6 +405,7 @@
             this.common.name = this.warehouseList[i].value
             this.monitorUrl1 = this.warehouseList[i].monitorUrl1
             this.monitorUrl2 = this.warehouseList[i].monitorUrl2
+            this.warehouseList[i].compId = localStorage.getItem('ws-pf_compId')
             localStorage.setItem('ck', e)
             localStorage.setItem('houseSelfCollect_house1', JSON.stringify(this.warehouseList[i]))
           }
@@ -495,16 +496,17 @@
                 monitorUrl1: response[i].monitorUrl1,
                 monitorUrl2: response[i].monitorUrl2,
                 id: response[i].id,
-                warehouseNo: response[i].commonWarehouseNo
+                warehouseNo: response[i].commonWarehouseNo,
+                compId:response[i].compId
               })
-              if (_wareHouse) {
+              if (_wareHouse && response[i].warehouseName == _wareHouse.value) {
                 this.cangid = _wareHouse.warehouseId
-                this.warehouseName = _wareHouse.value
+                this.warehouseName = response[i].warehouseName
                 this.common.name = _wareHouse.value
                 this.warehouseId = _wareHouse.warehouseId
                 this.warehouseNo = _wareHouse.warehouseNo
                 this.monitorUrl1 = _wareHouse.monitorUrl1
-                this.allowEdit = _wareHouse.allowEdit
+                this.allowEdit = response[i].allowEdit
                 this.monitorUrl2 = _wareHouse.monitorUrl2
               } else {
                 if (this.cangid && this.cangid == response[i].id) {
@@ -530,7 +532,6 @@
               }
             }
             localStorage.setItem('ck', this.common.name)
-            console.log(this.warehouseList)
             this.getList()
           })
       },