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

src/views/houseSelfCollect/paymentManagement.vue

@@ -32,15 +32,16 @@
         <ws-button
           :type="searchType == 0 ? 'primary' : ''"
           @click="screen(1)"
-          v-if="isShowAdopt"
+          v-if="isShowAdopt == 'true'"
         >待审核</ws-button>
         <ws-button
           :type="searchType == 0 ? 'primary' : ''"
           @click="screen(7)"
           v-hasPermission="`acquisitionManagement.acquisitionPay.pay`"
         >待付款</ws-button>
-        <ws-button :type="searchType == 2 ? 'primary' : ''" @click="screen(2)">待结算</ws-button>
+        <ws-button :type="searchType == 2 ? 'primary' : ''" @click="screen(2)" v-hasPermission="`acquisitionManagement.acquisitionPay.add`">待结算</ws-button>
         <ws-button :type="searchType == -1 ? 'primary' : ''" @click="screen(-1)">全部</ws-button>
+
         <ws-button type="primary" @click="reject" v-if="isShowAdopt">驳回</ws-button>
         <ws-button type="primary" @click="adopt" v-if="isShowAdopt">通过</ws-button>
         <ws-button type="primary" @click="invoicingClick" v-if="isShowAdopt" v-hasPermission="`acquisitionManagement.acquisitionPay.finace`">开票</ws-button>
@@ -399,16 +400,16 @@ export default {
         })
     },
     handleRowClick(row) {
-      if (row.approveStatus == null) {
-        this.$refs.paymentList.toggleRowSelection(row)
-        return true
-      } else if (row.approveStatus != null) {
-        if (row.taskId == null) {
+     if (row.status != '已驳回') {
+        if (row.taskId == null && row.status != '已通过'&& row.status != '部分付款') {
           return false
         } else {
           this.$refs.paymentList.toggleRowSelection(row)
           return true
         }
+      }else{
+        this.$refs.paymentList.toggleRowSelection(row)
+         return true
       }
     },
     handlepass() {
@@ -506,7 +507,6 @@ export default {
           this.paymentList = response
           this.deptBudgetTotal = response.total
         })
-
       getJurisdiction({
         managementType: 1,
         warehouseName: this.warehouseName,

src/views/houseSelfCollect/weighingManagement.vue

@@ -33,7 +33,7 @@
 			<el-table-column prop="type" label="类型"></el-table-column>
 			<el-table-column prop="grossWeight" label="毛重（公斤）"></el-table-column>
 			<el-table-column prop="tare" label="皮重（公斤）"></el-table-column>
-			<el-table-column prop="buckleMiscellaneous" label="扣杂（公斤）"></el-table-column>
+			<el-table-column prop="buckleMiscellaneous" label="扣杂"></el-table-column>
 			<el-table-column prop="netWeight" label="净重（公斤）"></el-table-column>
 			<el-table-column prop="binNumber" label="仓位号"></el-table-column>
 			<el-table-column prop="storageNumber" label="囤位号"></el-table-column>

src/views/houseSelfCollect/weightCheck.vue

@@ -639,7 +639,7 @@
                       //累计售粮超上限不能完成毛检保存
                       let count = (this.purchasePriceList[i].saleLimit - response / 1000).toFixed(2)
                       // console.log(this.weighingList.grossWeight / 1000, '毛重转吨')
-                      this.weighingList.grossWeight/=1000
+                      // this.weighingList.grossWeight/=1000
                       if (count - this.weighingList.grossWeight / 1000 < 0) {
                         this.$alert(
                           '该客户累计销售' +
@@ -679,12 +679,12 @@
                   }
                 })
             } else if (this.tpyeNo == 2) {
-              this.weighingList.grossWeight/=1000
-              this.weighingList.tare/=1000
-              if(this.weighingList.buckleMiscellaneous){
-                this.weighingList.buckleMiscellaneous/=1000
-              }
-              this.weighingList.netWeight/=1000
+              // this.weighingList.grossWeight/=1000
+              // this.weighingList.tare/=1000
+              // if(this.weighingList.buckleMiscellaneous){
+              //   this.weighingList.buckleMiscellaneous/=1000
+              // }
+              // this.weighingList.netWeight/=1000
               this.weighingList.warehouseId = this.warehouseId;
               (this.weighingList.skinInspector =
                 sessionStorage.getItem('ws-pf_staffName')),

src/views/statisticalReport/autoSettlementList.vue

@@ -88,7 +88,6 @@
           </el-select>
         </el-col>
       </el-row>
-
       <el-table
         class="wenzi"
         :data="warehouseList.records"
@@ -96,7 +95,6 @@
         ref="warehouseList"
         border
         :summary-method="getSummaries"
-        show-summary
         @row-click="handleRowClick"
         @selection-change="handleSelectionChange"
       >

src/views/statisticalReport/huoyunList.vue

@@ -108,7 +108,8 @@
           </el-select>
         </el-col>
       </el-row>
-      <div class="freightSet" v-if="actualFreight && tranPriceIng">
+      <!-- v-if="actualFreight && tranPriceIng" -->
+      <div class="freightSet" >
         <div style="display: flex;width:200px;line-height: 30px;"> 预计运费（元）：{{tranPriceIng}}元</div>
         <span style="display: flex;line-height: 30px;">实际运费（元）：<el-input type="text" maxlength="70" size="small"  v-model="actualFreight" v-show="textShow"/><span v-show="!textShow">{{actualFreight}}</span>元</span>
         <i @click="actualFreightchange" class="iconfont icon-dui" v-show="textShow" style="margin-top:10px"></i>

src/views/statisticalReport/shippingList.vue

@@ -109,7 +109,8 @@
           </el-select>
         </el-col>
       </el-row>
-       <div class="freightSet" v-if="actualFreight && tranPriceIng">
+      <!-- v-if="actualFreight && tranPriceIng" -->
+       <div class="freightSet">
         <div style="display: flex;width:200px;line-height: 30px;"> 预计运费（元）：{{tranPriceIng}}元</div>
         <span style="display: flex;line-height: 30px;">实际运费（元）：<el-input type="text" maxlength="70" size="small"  v-model="actualFreight" v-show="textShow"/><span v-show="!textShow">{{actualFreight}}</span>元</span>
         <i @click="actualFreightchange" class="iconfont icon-dui" v-show="textShow" style="margin-top:10px"></i>

src/views/taskManagement/inOutWarehouseTaskEdit.vue

@@ -122,8 +122,12 @@
           <el-form-item label="预计出库日期" span="1" prop="predictDate" class="deliverydate">
             {{dataList.predictDate}}
           </el-form-item>
-          <!--经办人-->
-          <el-form-item label="出库经办人">
+          	<!--预估运费（元/吨）-->
+					<el-form-item label="预估运费（元/吨）" span="1">
+              {{dataList.estimatedFreight}}
+					</el-form-item>
+          <!--发货人-->
+          <el-form-item label="发货人">
             {{dataList.agent}}
             <el-option
               v-for="item in options"
@@ -226,8 +230,12 @@
           <el-form-item label="预计入库日期" span="1" prop="predictDate" class="deliverydate">
             {{dataList1.predictDate}}
           </el-form-item>
-          <!--经办人-->
-          <el-form-item label="入库经办人">
+          		<!--预估运费（元/吨）-->
+					<el-form-item label="预估运费（元/吨）" span="1" >
+              {{dataList1.estimatedFreight}}
+          </el-form-item>
+          <!--收货人-->
+          <el-form-item label="收货人">
             <el-option
               v-for="item in options"
               :key="item.value"
@@ -336,8 +344,12 @@
           <el-form-item label="预计出库日期" span="1" prop="predictDate" class="deliverydate">
             {{dataList.predictDate}}
           </el-form-item>
-          <!--经办人-->
-          <el-form-item label="出库经办人">
+          		<!--预估运费（元/吨）-->
+					<el-form-item label="预估运费（元/吨）" span="1" >
+          {{dataList.estimatedFreight}}
+					</el-form-item>
+          <!--发货人-->
+          <el-form-item label="发货人">
             {{dataList.agent}}
             <el-option
               v-for="item in options"

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -107,6 +107,11 @@
 					<el-form-item label="预计出库日期" span="1" prop="predictDate" class="deliverydate">
 						<el-date-picker v-model="dataList.predictDate" type="date" placeholder="请选择预计出库日期"
 							value-format="yyyy-MM-dd" />
+					</el-form-item>
+						<!--预估运费（元/吨）-->
+					<el-form-item label="预估运费（元/吨）" span="1">
+						<el-input v-model="dataList.estimatedFreight" placeholder="请输入预估运费"
+							maxlength="20" size="small" />
 					</el-form-item>
 					<!--经办人-->
 					<el-form-item label="发货人">
@@ -208,6 +213,11 @@
 					<el-form-item label="预计入库日期" span="1" prop="predictDate" class="deliverydate">
 						<el-date-picker v-model="dataList1.predictDate" type="date" placeholder="请选择预计入库日期"
 							value-format="yyyy-MM-dd" />
+					</el-form-item>
+							<!--预估运费（元/吨）-->
+					<el-form-item label="预估运费（元/吨）" span="1" >
+						<el-input v-model="dataList1.estimatedFreight" placeholder="请输入预估运费"
+							maxlength="20" size="small"  />
 					</el-form-item>
 					<!-- 经办人-->
 					<el-form-item label="收货人">
@@ -311,6 +321,11 @@
 					<el-form-item label="预计出库日期" span="1" prop="predictDate" class="deliverydate">
 						<el-date-picker v-model="dataList.predictDate" type="date" placeholder="请选择预计出库日期"
 							value-format="yyyy-MM-dd" />
+					</el-form-item>
+							<!--预估运费（元/吨）-->
+					<el-form-item label="预估运费（元/吨）" span="1" >
+						<el-input v-model="dataList1.estimatedFreight" placeholder="请输入预估运费"
+							maxlength="20" size="small"  />
 					</el-form-item>
 					<!--发货人-->
 					<el-form-item label="发货人">

src/views/taskManagement/tranManagementWarehouseInOutTaskAudit.vue

@@ -78,6 +78,7 @@
               class="typeselect"
               @change="selectstorageType"
             >
+
               <el-option
                 v-for="item in storageType"
                 :key="item.constKey"
@@ -213,12 +214,17 @@
               value-format="yyyy-MM-dd"
             />
           </el-form-item>
-          <!--经办人-->
-          <!-- <el-form-item label="出库经办人">
+       			<!--预估运费（元/吨）-->
+					<el-form-item label="预估运费（元/吨）" span="1" >
+						<el-input  v-model="dataList.estimatedFreight" placeholder="请输入预估运费"
+							maxlength="20" size="small"  />
+					</el-form-item>
+          <!--收货人-->
+          <el-form-item label="发货人">
             <el-select
               disabled
               v-model="dataList.agent"
-              placeholder="请选择经办人"
+              placeholder="请选择发货人"
               filterable
               @change="selectstaff"
             >
@@ -229,7 +235,7 @@
                 :value="item.staffName"
               />
             </el-select>
-          </el-form-item> -->
+          </el-form-item>
           <!--业务描述=-->
           <el-form-item v-if="dataList.taskTypeKey != 3" label="业务描述" span="1">
             <el-input
@@ -429,12 +435,17 @@
               value-format="yyyy-MM-dd"
             />
           </el-form-item>
-          <!--经办人-->
-          <!-- <el-form-item label="入库经办人">
+          			<!--预估运费（元/吨）-->
+					<el-form-item label="预估运费（元/吨）" span="1" >
+						<el-input v-model="dataList1.estimatedFreight" placeholder="请输入预估运费"
+							maxlength="20" size="small"  />
+					</el-form-item>
+          <!--收货人-->
+          <el-form-item label="收货人">
             <el-select
               disabled
               v-model="dataList1.agent"
-              placeholder="请选择经办人"
+              placeholder="请选择收货人"
               filterable
              
               @change="selectstaff1"
@@ -446,7 +457,7 @@
                 :value="item.staffName"
               />
             </el-select>
-          </el-form-item> -->
+          </el-form-item>
           <!--业务描述=-->
           <el-form-item v-if="dataList.taskTypeKey != 4" label="业务描述">
             <el-input
@@ -638,11 +649,16 @@
               value-format="yyyy-MM-dd"
             />
           </el-form-item>
-          <!--经办人-->
-          <!-- <el-form-item label="出库经办人">
+          			<!--预估运费（元/吨）-->
+					<el-form-item label="预估运费（元/吨）" span="1" >
+						<el-input  v-model="dataList.estimatedFreight" placeholder="请输入预估运费"
+							maxlength="20" size="small"  />
+					</el-form-item>
+          <!--发货人-->
+          <el-form-item label="发货人">
             <el-select
               v-model="dataList.agent"
-              placeholder="请选择经办人"
+              placeholder="请选择发货人"
               filterable
              
               @change="selectstaff"
@@ -654,7 +670,7 @@
                 :value="item.staffName"
               />
             </el-select>
-          </el-form-item> -->
+          </el-form-item>
           <!--业务描述=-->
           <el-form-item label="业务描述">
             <el-input

src/views/taskManagement/tranManagementWarehouseInOutTaskEdit.vue

@@ -211,11 +211,16 @@
               value-format="yyyy-MM-dd"
             />
           </el-form-item>
-          <!--经办人-->
-          <!-- <el-form-item label="出库经办人">
+          		<!--预估运费（元/吨）-->
+					<el-form-item label="预估运费（元/吨）" span="1" >
+						<el-input  v-model="dataList.estimatedFreight" placeholder="请输入预估运费"
+							maxlength="20" size="small"  />
+					</el-form-item>
+          <!--发货人-->
+          <el-form-item label="发货人">
             <el-select
               v-model="dataList.agent"
-              placeholder="请选择经办人"
+              placeholder="请选择发货人"
               filterable
              
               @change="selectstaff"
@@ -227,7 +232,7 @@
                 :value="item.staffName"
               />
             </el-select>
-          </el-form-item> -->
+          </el-form-item>
           <!--业务描述=-->
           <el-form-item v-if="dataList.taskTypeKey != 3" label="业务描述" span="1">
             <el-input
@@ -414,11 +419,16 @@
               value-format="yyyy-MM-dd"
             />
           </el-form-item>
-          <!--经办人-->
-          <!-- <el-form-item label="入库经办人">
+          		<!--预估运费（元/吨）-->
+					<el-form-item label="预估运费（元/吨）" span="1" >
+						<el-input v-model="dataList1.estimatedFreight" placeholder="请输入预估运费"
+							maxlength="20" size="small"  />
+					</el-form-item>
+          <!-- 经办人-->
+          <el-form-item label="收货人">
             <el-select
               v-model="dataList1.agent"
-              placeholder="请选择经办人"
+              placeholder="请选择收货人"
               filterable
              
               @change="selectstaff1"
@@ -430,7 +440,7 @@
                 :value="item.staffName"
               />
             </el-select>
-          </el-form-item> -->
+          </el-form-item>
           <!--业务描述=-->
           <el-form-item v-if="dataList.taskTypeKey != 4" label="业务描述">
             <el-input
@@ -613,11 +623,16 @@
               value-format="yyyy-MM-dd"
             />
           </el-form-item>
-          <!--经办人-->
-          <!-- <el-form-item label="出库经办人">
+          		<!--预估运费（元/吨）-->
+					<el-form-item label="预估运费（元/吨）" span="1" >
+						<el-input v-model="dataList.estimatedFreight" placeholder="请输入预估运费"
+							maxlength="20" size="small"  />
+					</el-form-item>
+          <!--发货人-->
+          <el-form-item label="出库发货人">
             <el-select
               v-model="dataList.agent"
-              placeholder="请选择经办人"
+              placeholder="请选择发货人"
               filterable
              
               @change="selectstaff"
@@ -629,7 +644,7 @@
                 :value="item.staffName"
               />
             </el-select>
-          </el-form-item> -->
+          </el-form-item>
           <!--业务描述=-->
           <el-form-item label="业务描述">
             <el-input

src/views/tranManagement/tranManagementTransporTrainNo.vue

@@ -114,7 +114,7 @@
               >审核中</el-button
             >
              <el-button
-             
+             v-else
               type="primary"
               size="small"
               @click="priceSubmit()"

src/views/warehouse/warehouseManagementGross.vue

@@ -1965,6 +1965,12 @@ export default {
       }
     },
     contractNoChange(e) {
+      for(let i = 0 ; i < this.deptBudgetList1.length ; i++){
+        if(this.deptBudgetList1[i].inOutTaskNo == e){
+         this.deptBudgetList.contractNo =  this.deptBudgetList1[i].contractNo
+         return
+        }
+      }
       for (var i = 0; i < this.outContractNo.length; i++) {
         if (this.outContractNo[i].contractNo == e) {
           if (this.outContractNo[i].inOutType == '采购入库') {

src/views/warehouse/warehouseManagementNoWeight.vue

@@ -236,6 +236,7 @@ export default {
             inOutFlag: row.inOutFlag,
             inOutType: row.inOutType,
             inOutTypeKey: row.inOutTypeKey,
+            inOutTaskNo:row.inOutTaskNo,
             netWeight: row.netWeight,
             positionId: row.positionId,
             statusFlag: row.statusFlag,

src/views/warehouse/warehouseManagementNoWeightIn.vue

@@ -643,6 +643,7 @@ export default {
     this.dataList.deductionAmount=this.$route.query.deductionAmount/1000
     this.dataList.deductionWeight=this.$route.query.deductionWeight*1000
     this.dataList.inOutTypeFlag=1
+    this.dataList.inOutTaskNo = this.$route.query.inOutTaskNo
     if(this.dataList.cost){
       this.isGetCost = true
       this.cost = this.dataList.cost 
@@ -781,6 +782,12 @@ export default {
 
     },
     contractNoChange(e){
+      for(let i = 0 ; i < this.deptBudgetList2.length ; i++){
+        if(this.deptBudgetList2[i].inOutTaskNo == e){
+         this.dataList.contractNo = this.deptBudgetList2[i].contractNo
+         return
+        }
+      }
       for (var i = 0; i < this.outContractNo.length; i++) {
         if (this.outContractNo[i].contractNo == e) {
             if (this.outContractNo[i].inOutType == '采购入库') {

src/views/warehouse/warehouseManagementRecord.vue

@@ -92,7 +92,7 @@
 					<el-table-column prop="deductionWeight" label="扣重（吨）"> </el-table-column>
 					<el-table-column prop="netWeight" label="净重（吨）"></el-table-column>
 					<el-table-column prop="pureWeight" label="纯重（吨）"> </el-table-column>
-					<el-table-column width='120' prop="deductionAmount" label="扣款（元/吨）"> </el-table-column>
+					<el-table-column prop="deductionAmount" label="扣款（元/吨）" width="150"> </el-table-column>
 					<el-table-column prop="grade" label="品级" width="80px">
 						<template slot-scope="scope">
 							<span v-if="scope.row.grade == '一等品'" class="top-grade">{{
@@ -963,4 +963,7 @@
 	/deep/.ws-info-table .el-form-item .el-form-item__content {
 		border: 0px;
 	}
+	/deep/.el-table td , /deep/.el-table .el-table__header .cell{
+		text-align: center;
+	}
 </style>

src/views/warehouse/warehouseManagementTare.vue

@@ -635,6 +635,12 @@ export default {
 
     },
     contractNoChange(e){
+      for(let i = 0 ; i < this.deptBudgetList1.length ; i ++){
+        if(this.deptBudgetList1[i].inOutTaskNo == e){
+          this.deptBudgetList.contractNo = this.deptBudgetList1[i].contractNo
+          return
+        }
+      }
       for (var i = 0; i < this.outContractNo.length; i++) {
         if (this.outContractNo[i].contractNo == e) {
              if (this.outContractNo[i].inOutType == '销售出库') {