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

src/views/contractManagement/futuresPurchaseContractAdd.vue

@@ -715,6 +715,13 @@
       },
 
       submit() {
+        if(this.deptBudgetList.placeDelivery.indexOf('省')>-1){
+              this.$message({
+            message: '请手动删除详细地址中省市区/市，避免重复显示省市区/市！',
+            type: 'warning',
+          })
+          return
+        }
         if (!this.deptBudgetList.contractNo) {
           this.$message({
             message: '请输入合同编号',

src/views/contractManagement/futuresSalesContractAdd.vue

@@ -694,6 +694,13 @@
       },
 
       submit() {
+        if(this.deptBudgetList.placeDelivery.indexOf('省')>-1){
+          this.$message({
+            message: '请手动删除详细地址中省市区/市，避免重复显示省市区/市！',
+            type: 'warning',
+          })
+          return
+        }
         if (!this.deptBudgetList.contractNo) {
           this.$message({
             message: '请输入合同编号',

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>
@@ -808,6 +808,21 @@
       },
 
       submit() {
+        if(this.deptBudgetList.placeDelivery.indexOf('省')>-1){
+              this.$message({
+            message: '请手动删除详细地址中省市区/市，避免重复显示省市区/市！',
+            type: 'warning',
+          })
+          return
+        }
+        if(this.deptBudgetList.sourceGoods.indexOf('省')>-1){
+          this.$message({
+          message: '请手动删除详细地址中省市区/市，避免重复显示省市区/市！',
+          type: 'warning',
+          })
+          return
+        }
+        
         if (!this.deptBudgetList.contractNo) {
           this.$message({
             message: '合同编号不能为空',
@@ -1049,6 +1064,7 @@
           })
           return
         }
+
         if (!this.newSelectedOptions1) {
           this.$message({
             message: '请选择交货所在地区！',

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/salesContractAdd.vue

@@ -731,6 +731,20 @@
       },
 
       submit() {
+          if(this.deptBudgetList.placeDelivery.indexOf('省')>-1){
+              this.$message({
+            message: '请手动删除详细地址中省市区/市，避免重复显示省市区/市！',
+            type: 'warning',
+          })
+          return
+        }
+        if(this.deptBudgetList.sourceGoods.indexOf('省')>-1){
+          this.$message({
+          message: '请手动删除详细地址中省市区/市，避免重复显示省市区/市！',
+          type: 'warning',
+          })
+          return
+        }
         if (!this.deptBudgetList.contractNo) {
           this.$message({
             message: '合同编号不能为空',

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

@@ -24,7 +24,7 @@
           end-placeholder="截止时间">
         </el-date-picker>
         <div></div>
-        <ws-input v-model="searchKeyWord" placeholder="可按编号、客户名、车牌号查找" clearable maxlength="500" type="input">
+        <ws-input v-model="searchKeyWord" placeholder="可按编号、客户名、车牌号、货名查找" clearable maxlength="500" type="input">
         </ws-input>
         <ws-button class="find" type="primary" @click="find()"><img width="16" height="16" style="
               vertical-align: text-top;
@@ -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()
           })
       },

src/views/tranManagement/tranManagementReceivingFeedback.vue

@@ -92,7 +92,11 @@
             <span v-else>{{ scope.$index + 1 }}</span>
           </template>
         </el-table-column>
-        <el-table-column class="table_td" prop="processNo" label="运输任务编号" width="140">
+        <el-table-column class="table_td" prop="processNo" label="运输任务编号/合同编号" width="140">
+          <template scope="scope">
+            <span v-if='processNo'>{{scope.row.processNo}}</span>
+            <span v-else>{{scope.row.contractNo}}</span>
+          </template>
         </el-table-column>
         <el-table-column prop="tranType" label="运输方式"> </el-table-column>
         <el-table-column class="table_td" prop="goodsName" label="货名">
@@ -255,7 +259,8 @@ export default {
         { value: '汽运', type: 1 },
         { value: '火运', type: 2 },
         { value: '船运', type: 3 },
-        { value: '全部', type: 4 },
+        { value: '他运', type: 4 },
+        { value: '全部', type: 5 },
       ],
       // 提交类型
       submitType: true,

src/views/tranManagement/tranManagementthirdpartnarReceiving.vue

@@ -52,10 +52,10 @@
           }}{{ deptBudgetList.receiveArea }}
         </ws-form-item>
       </ws-info-table>
-      <div  class='flex' style="font-size: 16px;justify-content: space-between;align-items:center;margin-top:10px;">
+      <div  v-show='status' class='flex' style="font-size: 16px;justify-content: space-between;align-items:center;margin-top:10px;">
         汽运反馈
       </div>
-      <div class="liaison">
+      <div  v-show='status' class="liaison">
         <div
           style="width: 100% justify-content: space-between;align-items:center;"
           class="flex"
@@ -98,7 +98,7 @@
           </ws-info-table>
         </div>
       </div>
-      <div class='flex' style="font-size: 16px;justify-content: space-between;align-items:center;margin-top:10px;">
+      <div v-show='status1' class='flex' style="font-size: 16px;justify-content: space-between;align-items:center;margin-top:10px;">
         火运反馈
       </div>
       <div v-show='status1' class="liaison">
@@ -459,9 +459,9 @@ export default {
     },
     submit() {
       var tranCarInfoList1=[],tranCarInfoList2=[],tranCarInfoList3=[],tranCarInfoList4=[]
-      if(this.checkList.indexOf('汽运')!=-1){
+      if(this.deptBudgetList.threeTranType.indexOf('汽运')!=-1){
         for(let i = 0 ; i < this.freightspace.length ; i++){
-          if (!this.freightspace[i].unloadNetWeight) {
+          if (!String(this.freightspace[i].unloadNetWeight)) {
             this.$message({
               message: '卸车净重不能为空！',
               type: 'warning',
@@ -481,9 +481,9 @@ export default {
         }
         tranCarInfoList1=this.freightspace
       }
-      if(this.checkList.indexOf('火运')!=-1){
+      if(this.deptBudgetList.threeTranType.indexOf('火运')!=-1){
         for(let i = 0 ; i < this.freightspace1.length ; i++){
-          if (!this.freightspace1[i].unloadNetWeight) {
+          if (!String(this.freightspace1[i].unloadNetWeight)) {
             this.$message({
               message: '卸车净重不能为空！',
               type: 'warning',
@@ -503,9 +503,9 @@ export default {
         }
         tranCarInfoList2=this.freightspace1
       }
-      if(this.checkList.indexOf('散船')!=-1){
+      if(this.deptBudgetList.threeTranType.indexOf('散船')!=-1){
         for(let i = 0 ; i < this.freightspace2.length ; i++){
-          if (!this.freightspace2[i].unloadNetWeight) {
+          if (!String(this.freightspace2[i].unloadNetWeight)) {
             this.$message({
               message: '卸船净重不能为空！',
               type: 'warning',
@@ -525,9 +525,9 @@ export default {
         }
         tranCarInfoList3=this.freightspace2
       }
-      if(this.checkList.indexOf('集装箱船')!=-1){
+      if(this.deptBudgetList.threeTranType.indexOf('集装箱船')!=-1){
         for(let i = 0 ; i < this.freightspace3.length ; i++){
-          if (!this.freightspace3[i].unloadNetWeight) {
+          if (!String(this.freightspace3[i].unloadNetWeight)) {
             this.$message({
               message: '卸船净重不能为空！',
               type: 'warning',
@@ -586,8 +586,7 @@ export default {
         .then((response) => {
           this.deptBudgetList = response
           if(response.threeTranType){
-            this.checkList=response.threeTranType.split(',')
-            if(this.checkList.indexOf('汽运')!=-1){
+            if(response.threeTranType.indexOf('汽运')!=-1){
               this.status=true
               for (let i = 0; i < response.tranCarInfoList1.length; i++) {
                 if(response.tranCarInfoList1[i].unloadNetWeight){
@@ -601,7 +600,7 @@ export default {
             }else{
               this.status=false
             }
-            if(this.checkList.indexOf('火运')!=-1){
+            if(response.threeTranType.indexOf('火运')!=-1){
               this.status1=true
               for (let i = 0; i < response.tranCarInfoList2.length; i++) {
                 if(response.tranCarInfoList2[i].unloadNetWeight){
@@ -620,7 +619,7 @@ export default {
             }else{
               this.status1=false
             }
-            if(this.checkList.indexOf('散船')!=-1){
+            if(response.threeTranType.indexOf('散船')!=-1){
               this.status2=true
               for (let i = 0; i < response.tranCarInfoList3.length; i++) {
                 if(response.tranCarInfoList3[i].unloadNetWeight){
@@ -639,7 +638,7 @@ export default {
             }else{
               this.status2=false
             }
-            if(this.checkList.indexOf('集装箱船')!=-1){
+            if(response.threeTranType.indexOf('集装箱船')!=-1){
               this.status3=true
               for (let i = 0; i < response.tranCarInfoList4.length; i++) {
                 if(response.tranCarInfoList4[i].unloadNetWeight){