Merge branch 'master' of http://git.zthymaoyi.com:3000/gdc/yiliangyiyun-pc

public/static/inspection.html

@@ -49,11 +49,11 @@
       .bottom-row2 {
         display: flex;
         margin: 10px 0;
-      }
-
+       
+      } 
       img {
-        width: 41px;
-        height: 41px;
+        width: 120px;
+        height: 120px;
         margin-right: 118px;
       }
 
@@ -194,7 +194,7 @@
           </div>
           <div class="bottom-row2">
             <div class="left">
-              <img src="../img/add.png" alt="">
+              <img :src="tableData.codeUrl " alt="">
             </div>
             <div class="config">收货单位签名或盖章</div>
             <div class="">客户签名</div>

public/static/weightCheck.html

@@ -51,8 +51,8 @@
       }
 
       img {
-        width: 41px;
-        height: 41px;
+        width: 120px;
+        height: 120px;
         margin-right: 118px;
       }
 
@@ -98,7 +98,7 @@
         margin: auto;
         height: 450px;
       }
-
+      
       .small-title {
         text-align: center;
         font-size: 18px;
@@ -205,13 +205,13 @@
                 <!-- <div>{{tableData.qualityDate}}</div> -->
               </div>
               <div class="bottom-row2">
-                <!-- <div class="left">
-                <img src="../img/add.png" alt="">
-              </div> -->
+                <div class="left">
+                <img :src="item.codeUrl" alt="">
+              </div>
                 <div class="config">收货单位签名或盖章：</div>
                 <div class="autograph">客户签名：</div>
               </div>
-              <!-- <div class="bottom-row3">扫一扫</div> -->
+              <div class="bottom-row3">扫一扫</div>
             </div>
           </div>
         </div>
@@ -293,9 +293,9 @@
               <!-- <div>{{tableData.qualityDate}}</div> -->
             </div>
             <div class="bottom-row2">
-              <!-- <div class="left">
-                <img src="../img/add.png" alt="">
-              </div> -->
+              <div class="left">
+                <img :src="tableData.codeUrl" alt="">
+              </div>
               <div class="config">收货单位签名或盖章：</div>
               <div class="autograph">客户签名：</div>
             </div>

src/views/contractManagement/purchaseContractEdit.vue

@@ -42,14 +42,14 @@
         <ws-form-item class="readonly" label="买方" span="1" prop="buyer">
           {{ deptBudgetList.buyer }}
         </ws-form-item>
-        <!-- 交货方式 -->
+        <!-- 结算方式 -->
         <ws-form-item label="结算方式" span="1" prop="settlementMethod">
           <ws-input v-model="deptBudgetList.settlementMethod" maxlength="100" placeholder="请输入结算方式" size="small" />
         </ws-form-item>
         <!-- 卖方 -->
         <ws-form-item class="readonly" label="卖方" span="1" prop="seller">{{ deptBudgetList.seller }}
         </ws-form-item>
-
+        <!-- 交货方式 -->
         <ws-form-item class="readonly" label="交货方式" span="1" prop="sourceGoods">
           {{ deptBudgetList.deliverType1 }}
         </ws-form-item>
@@ -58,7 +58,7 @@
           <ws-input v-model="deptBudgetList.buyerPhone" maxlength="100" size="small" />
         </ws-form-item>
         <!-- 发货反馈负责人 -->
-          <ws-form-item label="发货反馈负责人" span="1" prop="feedbackLeader" v-if="deptBudgetList.settlementMethod == '对方送货'">
+          <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,index1) in feedbackLeaders" :key="item.staffId" :label="item.staffName" :value="index1" />
             </ws-select>
@@ -201,7 +201,7 @@
             <el-option v-for="item in options" :key="item.value" :label="item.staffName" :value="item.staffName" />
           </el-select>
         </ws-form-item>
-        <ws-form-item class="readonly" label="交货方式" span="1" prop="settlementWeightMethod">
+        <ws-form-item class="readonly" label="结算重量方式" span="1" prop="settlementWeightMethod">
           {{ deptBudgetList.settlementWeightMethod==1?'按出库重量结算':'按入库重量结算' }}
         </ws-form-item>
       </ws-info-table>

src/views/contractManagement/purchaseContractExamine.vue

@@ -129,6 +129,9 @@
         <ws-form-item label="临时仓库负责人" span="1" prop="personCharge" v-if="deptBudgetList.deliverType == 1">
           {{ deptBudgetList.personCharge }}
         </ws-form-item>
+        <ws-form-item class="readonly" label="结算重量方式" span="1" prop="settlementWeightMethod">
+          {{ deptBudgetList.settlementWeightMethod==1?'按出库重量结算':'按入库重量结算' }}
+        </ws-form-item>
       </ws-info-table>
       <!--面试信息-->
       <div class="remark">

src/views/contractManagement/salesContractExamine.vue

@@ -88,8 +88,11 @@
             </div>
           </ws-form-item>
           <ws-form-item label="交货方式" span="1" prop="deliverType">
-            <div class="unchanged">
-              {{ deptBudgetList.deliverType }}
+            <div v-if="deptBudgetList.deliverType==1" class="unchanged">
+              我方送货
+            </div>
+            <div v-else class="unchanged">
+              对方自提
             </div>
           </ws-form-item>
           <ws-form-item label="买方电话" span="1" prop="buyerPhone">
@@ -97,6 +100,12 @@
               {{ deptBudgetList.buyerPhone }}
             </div>
           </ws-form-item>
+          <!-- 收货反馈负责人 -->
+          <ws-form-item label="收货反馈负责人" span="1" prop="feedbackLeader" v-if="deptBudgetList.deliverType ==2">
+            <div class="unchanged">
+              {{ deptBudgetList.feedbackLeader }}
+            </div>
+          </ws-form-item>
           <ws-form-item label="包装方式" span="1" prop="packingMethod">
             <div class="unchanged">
               {{ deptBudgetList.packingMethod }}

src/views/houseSelfCollect/component/inspectInfoPrint.vue

@@ -79,12 +79,12 @@
       </div>
       <div class="bottom-row2">
         <div class="left">
-          <img :src="printData.qrCodeUrl" alt="" />
+          <img :src="printData.codeUrl" alt="" />
         </div>
         <div class="config">收货单位签名或盖章：</div>
         <div class="">客户签名：</div>
       </div>
-      <!-- <div class="bottom-row3">扫一扫</div> -->
+      <div class="bottom-row3">扫一扫</div>
     </div>
   </div>
 </template>
@@ -147,8 +147,8 @@
 
     .left {
       img {
-        width: 80px;
-        height: 80px;
+        width: 120px;
+        height: 120px;
         margin-right: 118px;
       }
     }

src/views/houseSelfCollect/component/weightCheckPrint.vue

@@ -69,13 +69,13 @@
             <!-- <div>{{tableData.qualityDate}}</div> -->
           </div>
           <div class="bottom-row2">
-            <!-- <div class="left">
-              <img src="../../../../public/img/add.png" alt="" />
-            </div> -->
+            <div class="left">
+              <img :src="tableData.codeUrl" alt="" />
+            </div>
             <div class="config">收货单位签名或盖章：</div>
             <div class="autograph">客户签名：</div>
           </div>
-          <!-- <div class="bottom-row3">扫一扫</div> -->
+          <div class="bottom-row3">扫一扫</div>
            <!-- <div class="bottom-row4">
          <el-button type="primary">关闭</el-button>
         <el-button type="primary" @click="printSmall">打印小票</el-button>
@@ -152,8 +152,8 @@ export default{
 
     .left {
       img {
-        width: 41px;
-        height: 41px;
+        width: 120px;
+        height: 120px;
         margin-right: 118px;
       }
     }

src/views/houseSelfCollect/inspectInfo.vue

@@ -49,12 +49,12 @@
               </el-select>
             </ws-form-item>
             <ws-form-item label="车牌号" span="1" prop="carNumber">
-              <el-select v-model="inspect.carNumber" clearable filterable  placeholder="请选择" class="typeselect" @change="shipperNameChange"
+              <!-- <el-select v-model="inspect.carNumber" clearable filterable  placeholder="请选择" class="typeselect" @change="shipperNameChange"
                 :disabled="disabled1">
                 <el-option v-for="(item,index) in carNumberList" :key="index" :label="item.carNo" :value="index" />
-              </el-select>
-              <!-- <ws-input @change='carnochange' v-model="inspect.carNumber" placeholder="请输入车牌号" maxlength="10" size="small"
-                :disabled="disabled" /> -->
+              </el-select> -->
+              <ws-input @change='carnochange' v-model="inspect.carNumber" placeholder="请输入车牌号" maxlength="10" size="small"
+                :disabled="disabled" />
             </ws-form-item>
             <ws-form-item label="箱号-1" span="1" prop="boxNo">
               <ws-input :disabled="disabled" v-model="inspect.boxNo" placeholder="请输入箱号" maxlength="20" size="small" />
@@ -186,6 +186,7 @@
     getDryGrainPrice,
     getshippinginfo,
     postCheck,
+    getQRcode,
     getcartype
   } from '@/model/houseSelfCollect/index'
   import {
@@ -238,7 +239,7 @@
         num: 0,
         tipFlag: true,
         allowEdit: 0,
-        statusShow :""
+        statusShow :''
       }
     },
     activated() {
@@ -312,7 +313,7 @@
                    postCheck({id:this.id,flag:2})
                     .toPromise()
                     .then((response) => {
-                      if(response == "OK"){
+                      if(response == 'OK'){
                       this.$message.success('提交成功')
                         this.$router.push({path: 'inspectionManagement' })
                         }else{
@@ -425,6 +426,13 @@
                     })
                     .toPromise()
                     .then((response) => {
+                    //  let printString = localStorage.getItem('ws-pf_compId') + "," + row.qualityNo + "," + this.cangid 
+                    //       getQRcode({printString}).toPromise()
+                    //             .then((res) => {
+                            this.isShowPrint = true
+                            this.printData = response
+                            // this.printData.qrCodeUrl = res
+                            // })
                       this.inspect = response
                       if (response.compName == '黑龙江秋收有限公司') {
                				 this.inspect.compName = '黑龙江中天昊元贸易有限公司'
@@ -720,7 +728,7 @@
           })
           return
         }
-        if( this.information != "编辑复检"){
+        if( this.information != '编辑复检'){
         if (!this.inspect.waterContent) {
           this.$message({
             message: '水分不能为空',

src/views/houseSelfCollect/inspectionManagement.vue

@@ -216,7 +216,6 @@
 				})
 			},
 			warehouseNameChange(e) {
-				console.log(this.warehouseList)
 				for (let i = 0; i < this.warehouseList.length; i++) {
 					if (this.warehouseList[i].value == e) {
 						this.warehouseName = this.warehouseList[i].value
@@ -332,7 +331,6 @@
 					})
 					.toPromise()
 					.then((response) => {
-						console.log(response)
 						this.inspect = response.records
 						
 						this.deptBudgetTotal = response.total
@@ -340,24 +338,20 @@
 					})
 			},
 			print(row) {
-				console.log(row)
-
 				getinspectLook({
 						id: row.id,
 					})
 					.toPromise()
 					.then((response) => {
-						let printString = row.id+","+1
-							getQRcode({printString}).toPromise()
-					          .then((res) => {
-								this.isShowPrint = true
-								this.printData = response
-								this.printData.qrCodeUrl = res
-							  })
+						// let printString = localStorage.getItem('ws-pf_compId') + "," + row.qualityNo + "," + this.cangid 
+						// 	getQRcode({printString}).toPromise()
+					    //       .then((res) => {
 								this.isShowPrint = true
 								this.printData = response
+								// this.printData.qrCodeUrl = res
+							//   })
 						    if (response.compName == '黑龙江秋收有限公司') {
-               				 this.printData.compName = '黑龙江中天昊元贸易有限公司'
+               			    	 this.printData.compName = '黑龙江中天昊元贸易有限公司'
               					}
 						// window.location.href="../../../static/inspection.html?dataList="+JSON.stringify(response)
 					})

src/views/houseSelfCollect/paymentManagement.vue

@@ -419,12 +419,13 @@
         },
       }
     },
-    mounted() {
-      this.userJurisdiction = getHp('acquisitionManagement.acquisitionPay.print')
+    // mounted() {
+    //   // this.getList()
+    // },
+    activated(){
+        this.userJurisdiction = getHp('acquisitionManagement.acquisitionPay.print')
       this.getPassYearFormatDate()
       this.getWarehouse()
-
-      this.getList()
     },
     updated() {
       this.$nextTick(() => {
@@ -903,13 +904,13 @@
               //判断是否在任务页面进来
               this.warehouseName = this.$route.query.warehouseName
               this.warehouseNameKey = this.$route.query.warehouseName
+              this.getList()
             } else {
               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
+                 break
                 } else {
                   this.warehouseNameKey = this.warehouseList[0].id
                   if (this.warehouseName) {
@@ -919,11 +920,9 @@
                     this.warehouseName = this.warehouseList[0].warehouseName
                   }
                 }
-
               }
-
             }
-            this.getList()
+              this.getList()
           })
       },
       //上传付款截图

src/views/houseSelfCollect/weighingManagement.vue

@@ -388,11 +388,16 @@
             })
             .toPromise()
             .then((response) => {
-              this.dialogData = response
+              // let printString = localStorage.getItem('ws-pf_compId') + "," + row.qualityNo + "," + this.cangid 
+              // getQRcode({printString}).toPromise()
+					    //       .then((res) => {//二维码
+								this.isShowPrint = true
+								this.dialogData = response
+								// this.printData.qrCodeUrl = res
+							  // })
               if (response.compName == '黑龙江秋收有限公司') {
               this.dialogData.compName = '黑龙江中天昊元贸易有限公司'
               }
-              this.isShowPrint = true
             })
             .catch((response) => {
               // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
@@ -472,10 +477,15 @@
         this.getList()
       },
       datechange() {
+        if(this.value2){
         this.startDate = this.value2[0]
         this.endDate = this.value2[1]
+        }
+        else{
+          this.startDate = ''
+          this.endDate = ''
+        }
         this.getList()
-
       },
       handleSizeChange(val) {
         console.log(`每页 ${val} 条`)

src/views/houseSelfCollect/weightCheck.vue

@@ -979,13 +979,17 @@
                     })
                     .toPromise()
                     .then((response) => {
-                      this.inspect = response
-                      if (response.compName == '黑龙江秋收有限公司') {
-               				 this.inspect.compName = '黑龙江中天昊元贸易有限公司'
-              					}
-                      this.inspect.a = '中天'
-                      // this.tableData = response
-                      this.isShowPrint = true
+                      // let printString = localStorage.getItem('ws-pf_compId') + "," + row.qualityNo + "," + this.cangid 
+                      //   getQRcode({printString}).toPromise().then((res) => {
+                          this.isShowPrint = true
+                          this.inspect = response
+                          // this.inspect.qrCodeUrl = res
+                           if (response.compName == '黑龙江秋收有限公司') {
+                          this.inspect.compName = '黑龙江中天昊元贸易有限公司'
+                            }
+                          this.inspect.a = '中天'
+                          // })
+                     
                     })
                     .catch((response) => {
                       // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))

src/views/statisticalReport/stockPurchaseReceiptReportList.vue

@@ -3,7 +3,7 @@
   <div class="container">
     <el-scrollbar style="height: 100%">
       <el-row>
-        <el-col style="padding-left: 15px" :span="16">
+        <el-col style="padding-left: 15px; width:48%" :span="16">
           <ws-button
             :type="searchType == 1 ? 'primary' : ''"
             @click="handlestatus(1)"
@@ -55,6 +55,11 @@
             >定金</ws-button
           >
         </el-col>
+        <el-col style="text-align: right; line-height: 60px;  width:300px" :span="8">
+        <el-date-picker style="margin: 0 10px 0 0" value-format='yyyy-MM-dd' v-model="value2" @change='datechange'
+          type="daterange" align="right" unlink-panels range-separator="至" start-placeholder="起始时间"
+          end-placeholder="截止时间">
+        </el-date-picker></el-col>
         <el-col
           style="text-align: right; line-height: 60px; padding-right: 10px"
           :span="8"
@@ -485,7 +490,9 @@ export default {
       year: '',
       option: [],
       pickerOptions: {},
-      value2: '',
+      value2: [],
+      startDate: '',
+      endDate: '',
       deptBudgetTotal: 0,
       currentPage: 1,
       pageSize: 10,
@@ -867,6 +874,17 @@ export default {
         })
       }
     },
+     datechange() {
+        if(this.value2){
+        this.startDate = this.value2[0]
+        this.endDate = this.value2[1]
+        }
+        else{
+          this.startDate = ''
+          this.endDate = ''
+        }
+        this.getList()
+      },
     //审核
     handleAudit() {
       var that = this
@@ -982,7 +1000,7 @@ export default {
         } else if (
           index === 12 ||
           index === 11 ||
-          index === 10 ||
+          index === 13 ||
           index === 9
         ) {
           const values = data.map((item) => Number(item[column.property]))
@@ -1002,10 +1020,10 @@ export default {
           sums[index] = '--'
         }
       })
-      sums[sums.length-3]=sums[sums.length-3].toFixed(2)
-      sums[sums.length-4]=sums[sums.length-4].toFixed(2)
-			sums[sums.length-5]=sums[sums.length-5].toFixed(2)
-      sums[sums.length-6]=sums[sums.length-6].toFixed(2)
+      // sums[sums.length-3]=sums[sums.length-3].toFixed(2)
+      // sums[sums.length-4]=sums[sums.length-4].toFixed(2)
+			// sums[sums.length-5]=sums[sums.length-5].toFixed(2)
+      // sums[sums.length-6]=sums[sums.length-6].toFixed(2)
       return sums
     },
     getList() {
@@ -1025,6 +1043,8 @@ export default {
         compId: localStorage.getItem('ws-pf_compId'),
         currentPage: this.currentPage,
         pageSize: this.pageSize,
+        startDate: this.startDate,
+        endDate: this.endDate,
         searchType: this.searchType,
         contractNo: this.contractNo,
         // roleFlag: this.roleFlag,

src/views/statisticalReport/stockSaleOutReportList.vue

@@ -3,7 +3,7 @@
   <div class="">
     <div style="height: 100%" class="content">
       <el-row class="content1">
-        <el-col style="padding-left: 15px" :span="16">
+        <el-col style="padding-left: 15px; width:40%" :span="16">
           <ws-button type="primary" v-hasPermission="`report.goodsSaleOutReport.carry`" @click="adopt()">备注
           </ws-button>
           <ws-button type="primary" v-hasPermission="`report.goodsSaleOutReport.draw`" @click="depositbutton()">定金
@@ -13,6 +13,11 @@
           <ws-button type="primary" @click="handleinvoice()">开发票
           </ws-button>
         </el-col>
+        <el-col style="text-align: right; line-height: 60px;  width:400px" :span="8">
+        <el-date-picker style="margin: 0 10px 0 0" value-format='yyyy-MM-dd' v-model="value2" @change='datechange'
+          type="daterange" align="right" unlink-panels range-separator="至" start-placeholder="起始时间"
+          end-placeholder="截止时间">
+        </el-date-picker></el-col>
         <el-col style="text-align: right; line-height: 60px; padding-right: 10px" :span="8">
           <el-select v-model="contractNo" placeholder="请选择合同" clearable filterable @change="contractchange"
             maxlength="500" type="input" class="findValue">
@@ -451,6 +456,9 @@
           id: '',
           invoiceType: '',
         },
+        value2: [],
+        startDate: '',
+        endDate: '',
         orderList: {},
         options: [],
         contractNoList: [],
@@ -534,6 +542,18 @@
                 })
               })
       },
+      datechange() {
+        if(this.value2){
+        this.startDate = this.value2[0]
+        this.endDate = this.value2[1]
+        }
+        else{
+          this.startDate = ''
+          this.endDate = ''
+        }
+        this.getList()
+      },
+
       handleinvoice(){
         if(this.modification.length==0){
           this.$message({
@@ -607,7 +627,6 @@
       },
       handleRowClick() {},
       handleClick(tab, event) {
-        console.log(tab);
         this.activeName = tab.name
         if (this.activeName == '退库') {
           this.tranType = '退库'
@@ -642,9 +661,8 @@
                 })
               }
             }
-            console.log(this.orderList.tranTaskInfoList)
-            this.activeName = this.tranProcessInfo[0].name
-            this.tranType = this.tranProcessInfo[0].tranType
+            this.activeName = this.tranProcessInfo.name
+            this.tranType = this.tranProcessInfo.tranType
             if (this.contractNoList[i].depositUrl) {
               this.addressUrlArray = this.contractNoList[i].depositUrl.split(',')
             } else {
@@ -1094,6 +1112,8 @@
           currentPage: this.currentPage,
           pageSize: this.pageSize,
           searchType: this.searchType,
+          startDate: this.startDate,
+          endDate: this.endDate,
           contractNo: this.contractNo,
         }
         if (type == 1) {

src/views/taskManagement/moveWarehouseTask.vue

@@ -216,7 +216,7 @@ export default {
       gainList: [],
       currentPage: 1,
       pageSize: 10,
-      searchType: 1,
+      searchType: 3,
       searchTypeText: '执行中',
       searchKeyWord: '',
       contractType: 2,

src/views/tradeServicesManagement/approveWarehouseReceipt.vue

@@ -296,7 +296,7 @@
           size="small"
         ></el-input>
       </el-form-item> -->
-	   <el-form-item label="合计应还（元）" span="1" prop="taskNo">
+	   <el-form-item label="合计应还（元）" span="1" prop="amountDue">
         <el-input
           v-model="deptBudgetList.amountDue"
           placeholder="自动计算，不可编辑"

src/views/tradeServicesManagement/warehouseReceiptEdit.vue

@@ -408,7 +408,7 @@ export default {
         })
         .catch((req) => {
           // this.tableData = response.records
-          this.$message.success('提交失败')
+          this.$message.error('提交失败')
         })
         }
     },

src/views/tradeServicesManagement/warehouseReceiptRegulation.vue

@@ -57,14 +57,14 @@
           <template slot-scope="scope">
             <el-button size="mini" v-hasPermission=" `tradeServicesManagement.tradeService.view`" @click="lookBtnClick(scope.row, 2)">
               查看</el-button>
-            <el-button v-if="scope.row.taskId&&scope.row.approveStatus=='待审核'" size="mini" @click="toExamineBtnClick(scope.row, 2)">
+            <el-button v-if="scope.row.taskId && scope.row.approveStatus=='待决策人审核'" size="mini" @click="toExamineBtnClick(scope.row, 2)">
               审核</el-button>
-            <el-button v-if="scope.row.taskId&&scope.row.approveStatus=='待审批'" size="mini" @click="approveBtnClick(scope.row, 2)">
+            <el-button v-if="scope.row.taskId && scope.row.approveStatus=='待银行审批'" size="mini" @click="approveBtnClick(scope.row, 2)">
               审批</el-button>
             <el-button v-hasPermission=" `tradeServicesManagement.tradeService.return`" size="mini" @click="repaymentBtnClick(scope.row, 2)" v-if="scope.row.status == '待还款'">
               还款</el-button>
-            <el-button v-hasPermission=" `tradeServicesManagement.tradeService.edit`" size="mini" @click="rowEditBtnClick(scope.row)">修改</el-button>
-            <el-button v-hasPermission=" `tradeServicesManagement.tradeService.delete`" size="mini" type="danger" @click="rowDeleteBtnClick(scope.row)">删除</el-button>
+            <el-button v-hasPermission=" `tradeServicesManagement.tradeService.edit`" size="mini" @click="rowEditBtnClick(scope.row)" v-if="scope.row.status=='已驳回'">修改</el-button>
+            <el-button v-hasPermission=" `tradeServicesManagement.tradeService.delete`" size="mini" type="danger" @click="rowDeleteBtnClick(scope.row)" v-if="scope.row.status=='已驳回'">删除</el-button>
           </template>
         </el-table-column>
       </el-table>

src/views/tranManagement/tranManagementReceivingFeedback.vue

@@ -92,9 +92,9 @@
             <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="150">
           <template scope="scope">
-            <span v-if='processNo'>{{scope.row.processNo}}</span>
+            <span v-if='scope.row.processNo'>{{scope.row.processNo}}</span>
             <span v-else>{{scope.row.contractNo}}</span>
           </template>
         </el-table-column>
@@ -246,7 +246,7 @@ export default {
       feedbackFlag: 4,
       searchType: 1,
       searchTypeText: '执行中',
-      tranTypeKey:4,
+      tranTypeKey:5,
       tranTypeKeyText: '全部',
       searchKeyWord: '',
       contractType: 2,

src/views/tranManagement/tranManagementTransporHairRespond.vue

@@ -239,7 +239,7 @@ export default {
       pageSize: 10,
       deptBudgetTotal: 0,
       searchType: 1,
-      tranTypeKey:4,
+      tranTypeKey:5,
       tranTypeKeyText: '全部',
       searchTypeText: '执行中',
       searchKeyWord: '',

src/views/warehouse/warehouseManagementTare.vue

@@ -1001,11 +1001,11 @@ export default {
             if(!this.outContractNo[i].unitContractPrice){
               this.deptBudgetList.tips =
               '买方' +
-              this.outContractNo[i].seller
+              this.outContractNo[i].buyer
             }else{
               this.deptBudgetList.tips =
               '买方' +
-              this.outContractNo[i].seller +
+              this.outContractNo[i].buyer +
               '（ ' +
               this.outContractNo[i].unitContractPrice +
               '元/吨）'