首頁 探索 說明
註冊 登入
wangchao
/
yiliangyiyun-pc-jj
1
0
複刻 0
檔案 問題管理 0 合併請求 0 Wiki
瀏覽代碼

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

# Conflicts:
#	src/api/V2/houseSelfCollect/index.js
#	src/model/houseSelfCollect/index.js
achao 3 年之前
父節點
a64f94e71d 0a62010822
當前提交
00290ed492
共有 43 個文件被更改，包括 727 次插入 和 284 次删除
分割檢視 顯示文件統計
  1. 18 11
      public/static/inspection.html
  2. 18 4
      public/static/payprint.html
  3. 14 7
      public/static/weightCheck.html
  4. 3 3
      public/static/weightCheckInOut.html
  5. 3 1
      src/api/V2/houseSelfCollect/index.js
  6. 5 2
      src/model/houseSelfCollect/index.js
  7. 1 1
      src/views/contractManagement/purchaseContract.vue
  8. 4 4
      src/views/contractManagement/purchaseContractAdd.vue
  9. 6 6
      src/views/contractManagement/purchaseContractEdit.vue
  10. 5 2
      src/views/contractManagement/purchaseContractExamine.vue
  11. 4 4
      src/views/contractManagement/salesContract.vue
  12. 11 2
      src/views/contractManagement/salesContractExamine.vue
  13. 4 4
      src/views/houseSelfCollect/component/inspectInfoPrint.vue
  14. 6 6
      src/views/houseSelfCollect/component/weightCheckPrint.vue
  15. 3 1
      src/views/houseSelfCollect/customerManagement.vue
  16. 70 49
      src/views/houseSelfCollect/inspectInfo.vue
  17. 6 12
      src/views/houseSelfCollect/inspectionManagement.vue
  18. 38 7
      src/views/houseSelfCollect/paymentManagement.vue
  19. 15 3
      src/views/houseSelfCollect/weighingManagement.vue
  20. 155 19
      src/views/houseSelfCollect/weightCheck.vue
  21. 1 0
      src/views/newTask/listPage.vue
  22. 85 10
      src/views/statisticalReport/stockPurchaseReceiptReportList.vue
  23. 25 5
      src/views/statisticalReport/stockSaleOutReportList.vue
  24. 19 14
      src/views/taskManagement/inOutWarehouseTaskEdit.vue
  25. 1 1
      src/views/taskManagement/moveWarehouseTask.vue
  26. 40 35
      src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue
  27. 19 9
      src/views/taskManagement/tranManagementWarehouseInOutTaskAudit.vue
  28. 21 7
      src/views/taskManagement/tranManagementWarehouseInOutTaskEdit.vue
  29. 1 1
      src/views/tradeServicesManagement/approveWarehouseReceipt.vue
  30. 1 1
      src/views/tradeServicesManagement/warehouseReceiptEdit.vue
  31. 4 4
      src/views/tradeServicesManagement/warehouseReceiptRegulation.vue
  32. 3 3
      src/views/tranManagement/tranManagementReceivingFeedback.vue
  33. 1 1
      src/views/tranManagement/tranManagementTransporHairRespond.vue
  34. 12 1
      src/views/warehouse/warehouseManagementDelivery.vue
  35. 6 2
      src/views/warehouse/warehouseManagementEdit.vue
  36. 11 9
      src/views/warehouse/warehouseManagementGross.vue
  37. 9 0
      src/views/warehouse/warehouseManagementNoWeight.vue
  38. 26 13
      src/views/warehouse/warehouseManagementNoWeightIn.vue
  39. 21 12
      src/views/warehouse/warehouseManagementNoWeightOut.vue
  40. 1 4
      src/views/warehouse/warehouseManagementPerfectput.vue
  41. 12 1
      src/views/warehouse/warehouseManagementPut.vue
  42. 7 1
      src/views/warehouse/warehouseManagementTare.vue
  43. 12 2
      src/views/workNotification/utils/index.js

+ 18 - 11
public/static/inspection.html
查看文件 

@@ -49,12 +49,13 @@
 
       .bottom-row2 {
 
         display: flex;
 
         margin: 10px 0;
 
-      }
 
-
 
-      img {
 
-        width: 41px;
 
-        height: 41px;
 
-        margin-right: 118px;
 
+       
+      } 
+      img,.left {
 
+        width: 120px;
 
+        height: 120px;
 
+        /* margin-right: 118px; */
 
+        position: absolute
 
       }
 
 
       .config {
 
@@ -105,7 +106,7 @@
 
       .small-row {
 
         display: flex;
 
         justify-content: space-between;
 
-        margin: 10px;
 
+        margin: 10px;  
       }
 
 
       .small-img {
 
@@ -119,8 +120,14 @@
 
   <body>
 
     <div id="app">
 
       <div class="content" v-if="bigContent">
 
+        <div>
 
+            <div class="left">
 
+          <img :src="tableData.codeUrl " alt="">
 
+        </div>
 
         <div class="title">{{tableData.compName}}</div>
 
         <div class="title">粮食质检单</div>
 
+        </div>
 
+      
         <div class="number">{{tableData.qualityNo}}</div>
 
         <table class="table">
 
           <tr class="row">
 
@@ -193,13 +200,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="tableData.codeUrl " alt="">
 
+            </div> -->
 
             <div class="config">收货单位签名或盖章</div>
 
             <div class="">客户签名</div>
 
           </div>
 
-          <div class="bottom-row3">扫一扫</div>
 
+          <!-- <div class="bottom-row3">扫一扫</div> -->
 
         </div>
 
       </div>
 
       <div class="small-content" v-if="smallContent">

+ 18 - 4
public/static/payprint.html
查看文件 

@@ -44,10 +44,16 @@
 
       }
 
 
       img {
 
-        width: 41px;
 
-        height: 41px;
 
+        width: 80px;
 
+        height: 80px;
 
         /* margin-right: 118px; */
 
       }
 
+      .leftimg{
 
+        width: 80px;
 
+        height: 80px;
 
+        position: absolute;
 
+
 
+      }
 
 
       .config {
 
         margin-right: 240px;
 
@@ -163,7 +169,7 @@
 
 
       .part2 {
 
         height: 135vh;
 
-        background: red;
 
+        /* background: red; */
 
       }
 
 
       .part5 {
 
@@ -403,6 +409,9 @@
 
               </div>
 
             </div>
 
             <div v-if="isShowPrintType4" class="part2">
 
+              <div class="leftimg">
 
+                    <img :src="printData1[index].weighingManagement.codeUrl" alt="">
 
+                  </div>
 
               <div class="title">入库检斤单</div>
 
               <div class="number">{{printData1[index].weighingManagement.number}}</div>
 
               <table class="table">
 
@@ -496,7 +505,7 @@
 
                   <!-- <div>{{tableData.qualityDate}}</div> -->
 
                 </div>
 
                 <div class="bottom-row2">
 
-                  <!-- <div class="left">
 
+                  <!-- <div class="leftimg">
 
                     <img src="../img/add.png" alt="">
 
                   </div> -->
 
                   <div class="config">收货单位签名或盖章：</div>
 
@@ -727,6 +736,9 @@
 
         </div>
 
 
         <div v-if="isShowPrintType4" class="part2">
 
+          <div class="leftimg">
 
+            <img :src="tableData.codeUrl" alt="">
 
+          </div>
 
           <div class="title">入库检斤单</div>
 
           <div class="number">{{tableData.number}}</div>
 
           <table class="table">
 
@@ -1110,6 +1122,8 @@
 
           this.printData1 = JSON.parse(
 
             localStorage.getItem('selectPrint_selectPrintList')
 
           )
 
+          console.log("对象", this.printData1)
 
+          console.log("对象", this.printData)
 
           for (let i = 0; i < this.printData1.length; i++) {
 
             if(!this.printData1[i].identityAuthenticationInfo.compAddress) this.printData1[i].identityAuthenticationInfo.compAddress=''
 
             if (this.printData1[i].identityAuthenticationInfo.compAddress.length > 24) {

+ 14 - 7
public/static/weightCheck.html
查看文件 

@@ -50,10 +50,11 @@
 
         display: flex;
 
       }
 
 
-      img {
 
-        width: 41px;
 
-        height: 41px;
 
-        margin-right: 118px;
 
+      img,.left{
 
+        width: 120px;
 
+        height: 120px;
 
+        /* margin-right: 118px; */
 
+        position: absolute;
 
       }
 
 
       .config {
 
@@ -98,7 +99,7 @@
 
         margin: auto;
 
         height: 450px;
 
       }
 
-
 
+      
       .small-title {
 
         text-align: center;
 
         font-size: 18px;
 
@@ -130,6 +131,9 @@
 
       <div v-if="selectPrint">
 
         <div v-for="(item,index) in tableData1" :key="index">
 
           <div class="content" :class="pageType=='A5'?'a5-content':''">
 
+            <div class="left">
 
+              <img :src="item.codeUrl" alt="">
 
+            </div>
 
             <div class="title">{{item.compName}}</div>
 
             <div class="title">入库检斤单</div>
 
             <div class="number">{{item.number}}</div>
 
@@ -206,7 +210,7 @@
 
               </div>
 
               <div class="bottom-row2">
 
                 <!-- <div class="left">
 
-                <img src="../img/add.png" alt="">
 
+                <img :src="item.codeUrl" alt="">
 
               </div> -->
 
                 <div class="config">收货单位签名或盖章：</div>
 
                 <div class="autograph">客户签名：</div>
 
@@ -218,6 +222,9 @@
 
       </div>
 
       <div v-else>
 
         <div class="content" v-if="bigContent">
 
+         <div class="left">
 
+              <img :src="tableData.codeUrl" alt="">
 
+            </div>
 
           <div class="title">{{tableData.compName}}</div>
 
           <div class="title">入库检斤单</div>
 
           <div class="number">{{tableData.number}}</div>
 
@@ -294,7 +301,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="autograph">客户签名：</div>

+ 3 - 3
public/static/weightCheckInOut.html
查看文件 

@@ -124,13 +124,13 @@
 
     <div id="app">
 
       <div class="content" v-if="true">
 
         <div v-if="tableData.inOutFlag == '2'"  class="title">{{tableData.companyName}}</div>
 
-        <div v-else  class="title">{{tableData.contractManagementInfo.seller}}</div>
 
+        <div v-else  class="title">{{tableData.contractManagementInfo?tableData.contractManagementInfo.seller:tableData.companyName}}</div>
 
         <div v-if="tableData.inOutFlag == '2'" class="title">入库检斤单</div>
 
         <div v-else class="title">出库检斤单</div>
 
         <table class="table">
 
           <tr class="row">
 
             <td class="col col-bgc">送货单位</td>
 
-            <td class="col" colspan="4">{{tableData.contractManagementInfo.seller}}</td>
 
+            <td class="col" colspan="4">{{tableData.contractManagementInfo?tableData.contractManagementInfo.seller:tableData.warehouseName}}</td>
 
             <td class="col col-bgc">车牌号</td>
 
             <td class="col" colspan="1">{{tableData.carNo}}</td>
 
             <td class="col col-bgc">货名</td>
 
@@ -138,7 +138,7 @@
 
           </tr>
 
           <tr class="row">
 
             <td class="col col-bgc">收货单位</td>
 
-            <td class="col" colspan="4">{{tableData.contractManagementInfo.buyer}}</td>
 
+            <td class="col" colspan="4">{{tableData.contractManagementInfo?tableData.contractManagementInfo.buyer:tableData.receiveWarehouse}}</td>
 
             <td class="col col-bgc">类型</td>
 
             <td class="col"colspan="1">{{tableData.type}}</td>
 
             <td class="col col-bgc">检斤时间</td>

+ 3 - 1
src/api/V2/houseSelfCollect/index.js
查看文件 

@@ -92,4 +92,6 @@ export const API_POST_INSPECTIONCHECK = '/qualityInspectionManagement/api/editQu
 
 //单据二维码
 
 export const API_GAT_QRCODE = '/weighingManagement/generateQRCodeImage'
 
 //二维码获取数据
 
-export const API_GAT_GETQRCODE = '/weighingManagement/getQRcode'
 
+export const API_GAT_GETQRCODE = '/weighingManagement/getQRcode'
 
+//车型
 
+export const API_GAT_INFO = '/commonSysParameter/getInfo'

+ 5 - 2
src/model/houseSelfCollect/index.js
查看文件 

@@ -48,7 +48,8 @@ import {
 
   API_GET_SHIPPINGINFOFORMATION,
 
   API_POST_INSPECTIONCHECK,
 
   API_GAT_QRCODE,
 
-  API_GAT_GETQRCODE
 
+  API_GAT_GETQRCODE,
 
+  API_GAT_INFO
 
 } from '@/api/V2/houseSelfCollect'
 
 //客户管理列表
 
 export const getCustomerManage = appRx.get(API_GET_CUSTOMER_MANAGE, errorCatcher, errorHandle, filter)
 
@@ -145,4 +146,6 @@ export const postCheck  = appRx.post(API_POST_INSPECTIONCHECK, errorCatcher, err
 
 // 单据二维码
 
 export const getQRcode  = appRx.get(API_GAT_QRCODE, errorCatcher, errorHandle, filter)
 
 // 二维码获取数据
 
-export const getQRCodeData  = appRx.get(API_GAT_GETQRCODE, errorCatcher, errorHandle, filter)
 
+export const getQRCodeData  = appRx.get(API_GAT_GETQRCODE, errorCatcher, errorHandle, filter)
 
+// 车型
 
+export const getcartype  = appRx.get(API_GAT_INFO, errorCatcher, errorHandle, filter)

+ 1 - 1
src/views/contractManagement/purchaseContract.vue
查看文件 

@@ -218,7 +218,7 @@
 
           <div
 
             v-if="
 
               (scope.row.approveStatus != '待决策人审核' &&
 
-                scope.row.approveStatus) 
+                !scope.row.approveStatus) 
             "
 
             style="display: inline-block"
 
           >

+ 4 - 4
src/views/contractManagement/purchaseContractAdd.vue
查看文件 

@@ -188,13 +188,13 @@
 
             </ws-select>
 
           </ws-form-item>
 
         <!--合同单价（元/吨）-->
 
-        <ws-form-item class="readonly" label="合同单价（元/吨）" span="1" prop="unitContractPrice" v-if="deptBudgetList.priceType == '定价销售'">
 
+        <ws-form-item class="readonly" label="合同单价（元/吨）" span="1" prop="unitContractPrice" v-if="deptBudgetList.priceType == '定价采购'">
 
           <ws-input @input="pricechange" v-model="deptBudgetList.unitContractPrice" placeholder="请输入合同单价"
 
             maxlength="100" size="small" />
 
         </ws-form-item>
 
 
         <!--合同总价-->
 
-        <ws-form-item label="合同总价" span="1" prop="totalContractPrice" v-if="deptBudgetList.priceType == '定价销售'">
 
+        <ws-form-item label="合同总价" span="1" prop="totalContractPrice" v-if="deptBudgetList.priceType == '定价采购'">
 
           <ws-input v-model="deptBudgetList.totalContractPrice" placeholder="请输入合同总价" maxlength="100" size="small" />
 
         </ws-form-item>
 
 
@@ -477,7 +477,7 @@
 
           },
 
         ],
 
         contractNoList: [],
 
-        priceTypeList: ['定价销售', '随行就市'],
 
+        priceTypeList: ['定价采购', '随行就市'],
 
         goodnameList: [],
 
         value1: '袋装',
 
         value2: '未回收',
 
@@ -1031,7 +1031,7 @@
 
           })
 
           return
 
         }
 
-        if (this.deptBudgetList.priceType == '定价销售') {
 
+        if (this.deptBudgetList.priceType == '定价采购') {
 
           if (!this.deptBudgetList.unitContractPrice) {
 
             this.$message({
 
               message: '请输入合同单价！',

+ 6 - 6
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>
 
@@ -136,13 +136,13 @@
 
               {{ deptBudgetList.priceType }}
 
           </ws-form-item>
 
         <!-- 合同单价（元/吨） -->
 
-        <ws-form-item class="readonly" label="合同单价（元/吨）" span="1" prop="unitContractPrice" v-if="deptBudgetList.priceType == '定价销售'">
 
+        <ws-form-item class="readonly" label="合同单价（元/吨）" span="1" prop="unitContractPrice" v-if="deptBudgetList.priceType == '定价采购'">
 
           <span v-if="deptBudgetList.unitContractPrice != 'null'">{{
 
             deptBudgetList.unitContractPrice
 
           }}</span>
 
         </ws-form-item>
 
         <!-- 合同总价（元） -->
 
-        <ws-form-item label="合同总价（元）" span="1" prop="totalContractPrice" v-if="deptBudgetList.priceType == '定价销售'">
 
+        <ws-form-item label="合同总价（元）" span="1" prop="totalContractPrice" v-if="deptBudgetList.priceType == '定价采购'">
 
           <ws-input v-model="deptBudgetList.totalContractPrice" maxlength="100" placeholder="请输入合同单价" size="small" />
 
         </ws-form-item>
 
         <!-- 货源所在地区 -->
 
@@ -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>

+ 5 - 2
src/views/contractManagement/purchaseContractExamine.vue
查看文件 

@@ -98,10 +98,10 @@
 
         <ws-form-item label="价格类型" span="1" prop="priceType">
 
           {{ deptBudgetList.priceType }}
 
         </ws-form-item>
 
-        <ws-form-item label="合同单价（元/吨）" span="1" prop="unitContractPrice" v-if="deptBudgetList.priceType == '定价销售'">
 
+        <ws-form-item label="合同单价（元/吨）" span="1" prop="unitContractPrice" v-if="deptBudgetList.priceType == '定价采购'">
 
           {{ deptBudgetList.unitContractPrice }}
 
         </ws-form-item>
 
-        <ws-form-item label="合同总价（元）" span="1" prop="totalContractPrice" v-if="deptBudgetList.priceType == '定价销售'">
 
+        <ws-form-item label="合同总价（元）" span="1" prop="totalContractPrice" v-if="deptBudgetList.priceType == '定价采购'">
 
           {{ deptBudgetList.totalContractPrice }}
 
         </ws-form-item>
 
         <ws-form-item label="货源所在地区" span="1">
 
@@ -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">

+ 4 - 4
src/views/contractManagement/salesContract.vue
查看文件 

@@ -219,13 +219,13 @@
 
             "
 
             alt=""
 
           />
 
-          <!-- <div
 
+          <div
 
             v-if="
 
               (scope.row.approveStatus != '待决策人审核' &&
 
-                scope.row.approveStatus)
 
+                !scope.row.approveStatus)
 
             "
 
             style="display: inline-block"
 
-          > -->
 
+          >
 
             <img
 
               width="17"
 
               height="16"
 
@@ -237,7 +237,7 @@
 
               @click="handleEdit(scope.row)"
 
               alt=""
 
             />
 
-          <!-- </div> -->
 
+          </div>
 
 
           <img
 
             width="16"

+ 11 - 2
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 }}

+ 4 - 4
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;
 
       }
 
     }

+ 6 - 6
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;
 
       }
 
     }

+ 3 - 1
src/views/houseSelfCollect/customerManagement.vue
查看文件 

@@ -35,7 +35,8 @@
 
           <span v-else>{{ scope.$index + 1 }}</span>
 
         </template>
 
       </el-table-column>
 
-      <el-table-column prop="customerName" label="供应商"></el-table-column>
 
+       <el-table-column prop="customerName" label="客户"></el-table-column>
 
+      <el-table-column prop="supplier" label="供应商"></el-table-column>
 
       <el-table-column prop="customerPhone" label="手机号"></el-table-column>
 
       <el-table-column prop="payeeName" label="收款人"></el-table-column>
 
       <el-table-column prop="completedQuantity" label="已完成量(吨)"></el-table-column>
 
@@ -192,6 +193,7 @@
 
 
     .find {
 
       width: 32px;
 
+      margin-left:10px;
 
     }
 
 
     .search-left {

+ 70 - 49
src/views/houseSelfCollect/inspectInfo.vue
查看文件 

@@ -30,22 +30,32 @@
 
 
             <ws-form-item label="囤位号" span="1" prop="storageTagNo">
 
               <ws-input v-model="inspect.storageTagNo" placeholder="请输入囤位号" maxlength="15" size="small"
 
-                :disabled="disabled" />
 
+                :disabled="disabled3" />
 
             </ws-form-item>
 
-            <ws-form-item label="车牌号" span="1" prop="carNumber">
 
-              <!-- <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 v-model="inspect.carNumber" placeholder="请输入车牌号" maxlength="10" size="small"
 
+            <ws-form-item label="购粮性质" span="1" prop="natureOfGrainPurchase">
 
+              <ws-input v-model="inspect.natureOfGrainPurchase" placeholder="请输入购粮性质" maxlength="10" size="small"
 
                 :disabled="disabled" />
 
             </ws-form-item>
 
+            <ws-form-item label="货名" span="1" prop="goodsName">
 
+              <ws-select v-model="inspect.goodsName" placeholder="" class="typeselect" :disabled="disabledName" @change="waterContentChange">
 
+                <ws-option v-for="item in goodNameList" :key="item.goodsName" :label="item.goodsName"
 
+                  :value="item.goodsName" />
 
+              </ws-select>
 
+            </ws-form-item>
 
             <ws-form-item label="客户" span="1" prop="customerName">
 
               <el-select v-model="inspect.customerName" clearable filterable placeholder="请选择" class="typeselect"
 
                 @change="customerChange" :disabled="disabled1">
 
                 <el-option v-for="item in customerList" :key="item.valueKey" :label="item.value" :value="item.value" />
 
               </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"
 
+                :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" />
 
+            </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" />
 
             </ws-form-item>
 
@@ -61,13 +71,7 @@
 
               <ws-input :disabled="disabled" v-model="inspect.titleNoOther" placeholder="请输入封号" maxlength="20"
 
                 size="small" />
 
             </ws-form-item>
 
-            <ws-form-item label="货名" span="1" prop="goodsName">
 
-              <ws-select v-model="inspect.goodsName" placeholder="" class="typeselect" :disabled="disabledName" @change="waterContentChange">
 
-                <ws-option v-for="item in goodNameList" :key="item.goodsName" :label="item.goodsName"
 
-                  :value="item.goodsName" />
 
-              </ws-select>
 
-            </ws-form-item>
 
-
 
+            
             <ws-form-item v-if="inspect.paramType != '1'" label="扣重比" span="1" prop="buckleWeightRatio">
 
               <ws-input type="number" @mousewheel.native.prevent v-model="inspect.buckleWeightRatio"
 
                 placeholder="请输入扣重比" maxlength="100" size="small" :disabled="disabled" />
 
@@ -86,10 +90,6 @@
 
                 <ws-option v-for="item in typeList" :key="item" :label="item" :value="item" />
 
               </ws-select>
 
             </ws-form-item>
 
-            <ws-form-item label="购粮性质" span="1" prop="natureOfGrainPurchase">
 
-              <ws-input v-model="inspect.natureOfGrainPurchase" placeholder="请输入购粮性质" maxlength="10" size="small"
 
-                :disabled="disabled" />
 
-            </ws-form-item>
 
             <ws-form-item label="净重单价（元/公斤）" span="1" prop="tidalGrainPrice" v-if="inspect.type == '潮粮'">
 
               <ws-input type="number" @mousewheel.native.prevent v-model="inspect.tidalGrainPrice" placeholder="请输入净重单价"
 
                 maxlength="10" size="small" :disabled="disabled2" />
 
@@ -98,12 +98,16 @@
 
               <ws-input type="number" @mousewheel.native.prevent v-model="inspect.dryGrainPrice" placeholder="请输入干粮单价"
 
                 maxlength="10" size="small" :disabled="disabled2" />
 
             </ws-form-item>
 
-            <el-row>
 
               <ws-form-item label="复检备注" span="2" prop="reMemo" v-if="information == '编辑复检' || statusShow == '已复检'">
 
                 <ws-input type="textarea" v-model="inspect.reMemo" placeholder="请输入复检备注" maxlength="300" v-if="statusShow != '已复检'" />
 
                 <ws-input type="textarea" v-model="inspect.reMemo" placeholder="请输入复检备注" maxlength="300" v-else disabled />
 
               </ws-form-item>
 
-            </el-row>
 
+               <ws-form-item label="车型" span="2" prop="dryGrainPrice" v-if="types==4&&warehouseName=='鲅鱼圈金信库'||types==2&&warehouseName=='鲅鱼圈金信库'">
 
+                <el-select v-model="inspect.carModel" clearable filterable placeholder="请选择" class="typeselect"
 
+                 :disabled="disabled3">
 
+                <el-option v-for="item in cartypeList" :key="item.constValue" :label="item.constValue" :value="item.constValue" />
 
+              </el-select>
 
+            </ws-form-item>
 
           </ws-info-table>
 
 
           <div class="title">质检数据</div>
 
@@ -181,7 +185,9 @@
 
     getCount,
 
     getDryGrainPrice,
 
     getshippinginfo,
 
-    postCheck
 
+    postCheck,
 
+    getQRcode,
 
+    getcartype
 
   } from '@/model/houseSelfCollect/index'
 
   import {
 
     packList
 
@@ -211,6 +217,7 @@
 
         disabled: false,
 
         disabled1: false,
 
         disabled2: false,
 
+        disabled3:false,
 
         disabledName: false,
 
         types: '1',
 
         information: '添加初检',
 
@@ -218,6 +225,7 @@
 
         gradeList: [],
 
         customerList: [],
 
         getbinNumberList: [],
 
+        cartypeList:[],
 
         cangid: '', //仓库id
 
         warehouseName: '',
 
         unitPrice: 0,
 
@@ -231,7 +239,7 @@
 
         num: 0,
 
         tipFlag: true,
 
         allowEdit: 0,
 
-        statusShow :""
 
+        statusShow :''
 
       }
 
     },
 
     activated() {
 
@@ -265,6 +273,7 @@
 
         this.disabled1 = true
 
         this.disabled2 = true
 
         this.disabledName = true
 
+        this.disabled3=true
 
         this.information = '查看质检'
 
       } else if (this.types == 3) {
 
         this.disabled = false
 
@@ -304,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{
 
@@ -417,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 = '黑龙江中天昊元贸易有限公司'
 
@@ -712,7 +728,7 @@
 
           })
 
           return
 
         }
 
-        if( this.information != "编辑复检"){
 
+        if( this.information != '编辑复检'){
 
         if (!this.inspect.waterContent) {
 
           this.$message({
 
             message: '水分不能为空',
 
@@ -916,8 +932,9 @@
 
         let customers = e.split('(')
 
         this.inspect.customerName = customers[0]
 
         for (let i = 0; i < this.customerList1.length; i++) {
 
-          console.log(this.customerList1[i].customerName, this.inspect.customerName)
 
+          // console.log(this.customerList1[i].customerName, this.customerList1[i])
 
           if (this.customerList1[i].customerName == this.inspect.customerName) {
 
+            // console.log(this.customerList1[i])
 
             this.inspect.customerNumberCard = this.customerList1[i].customerNumberCard
 
           }
 
         }
 
@@ -972,7 +989,29 @@
 
                 this.$set(this.inspect, 'dryGrainPrice', response)
 
               })
 
           }
 
-
 
+        //客户
 
+        getcustomer({
 
+            warehouseId: this.cangid,
 
+            goodsName:this.inspect.goodsName
 
+          })
 
+          .toPromise()
 
+          .then((response) => {
 
+            this.customerList1 = response
 
+            this.customerList = []
 
+            let customer = response
 
+            for (let i = 0; i < response.length; i++) {
 
+              if (response[i].supplier) {
 
+                customer = response[i].customerName + '(' + response[i].customerPhone + ')' + '-' + response[i]
 
+                  .supplier
 
+              } else {
 
+                customer = response[i].customerName + '(' + response[i].customerPhone + ')'
 
+              }
 
+              this.customerList.push({
 
+                valueKey: i,
 
+                value: customer,
 
+              })
 
+            }
 
+          })
 
           for (var i = 0; i < this.purchasePriceList.length; i++) {
 
             if (this.purchasePriceList[i].goodsName == this.inspect.goodsName) {
 
               this.$set(this.inspect, 'buckleWeightRatio', this.purchasePriceList[i].deductWeight)
 
@@ -1057,6 +1096,11 @@
 
       },
 
 
       getList(ids) {
 
+        // 车型
 
+        getcartype({constId:'QUA1'}).toPromise()
 
+          .then((response) => {
 
+            this.cartypeList=response
 
+          })
 
         // 货名
 
         getinspectLookGoods({
 
             warehouseId: this.cangid
 
@@ -1075,29 +1119,6 @@
 
           .then((response) => {
 
             this.gradeList = response
 
           })
 
-        //客户
 
-        getcustomer({
 
-            compId: localStorage.getItem('ws-pf_compId'),
 
-            authenticationStatusKey: 7
 
-          })
 
-          .toPromise()
 
-          .then((response) => {
 
-            this.customerList1 = response
 
-            this.customerList = []
 
-            let customer = response
 
-            for (let i = 0; i < response.length; i++) {
 
-              if (response[i].supplier) {
 
-                customer = response[i].customerName + '(' + response[i].customerPhone + ')' + '-' + response[i]
 
-                  .supplier
 
-              } else {
 
-                customer = response[i].customerName + '(' + response[i].customerPhone + ')'
 
-              }
 
-              this.customerList.push({
 
-                valueKey: i,
 
-                value: customer,
 
-              })
 
-            }
 
-          })
 
         getshippinginfo({
 
             compId: localStorage.getItem('ws-pf_compId'),
 
             warehouseName: this.warehouseName

+ 6 - 12
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)
 
 					})

+ 38 - 7
src/views/houseSelfCollect/paymentManagement.vue
查看文件 

@@ -95,6 +95,7 @@
 
         </template>
 
       </el-table-column>
 
       <el-table-column class="table_td" prop="carNo" label="车牌号"></el-table-column>
 
+      <el-table-column class="table_td" v-if='warehouseNameKey=="鲅鱼圈金信库"' width='140' prop="actualWeighingFee" label="卸车过磅费（元）"></el-table-column>
 
       <el-table-column class="table_td" prop="goodsName" width="70" label="货名"></el-table-column>
 
       <el-table-column class="table_td" prop="type" width="60" label="类型"></el-table-column>
 
       <el-table-column class="table_td" prop="tidalGrainPrice" width="140" label="净重单价（元/公斤）"></el-table-column>
 
@@ -422,7 +423,6 @@
 
       this.userJurisdiction = getHp('acquisitionManagement.acquisitionPay.print')
 
       this.getPassYearFormatDate()
 
       this.getWarehouse()
 
-
 
       // this.getList()
 
     },
 
     updated() {
 
@@ -624,12 +624,43 @@
 
       },
 
       //合计
 
       getSummaries(param) {
 
+        console.log(param)
 
         const {
 
           columns,
 
           data
 
         } = param
 
         const sums = []
 
-        columns.forEach((column, index) => {
 
+        if(this.modification.length>0){
 
+          columns.forEach((column, index) => {
 
+            console.log(column, index)
 
+          if (index === 0) {
 
+            sums[index] = '合计'
 
+          } else if (
 
+            index === 10 ||
 
+            index === 11 || index === 15 || index === 16
 
+
 
+          ) {
 
+            const values = this.modification.map((item) => Number(item[column.property]))
 
+            if (!values.every((value) => isNaN(value))) {
 
+              sums[index] = values.reduce((prev, curr) => {
 
+                const value = Number(curr)
 
+                if (!isNaN(value)) {
 
+                  return prev + curr
 
+                } else {
 
+                  return prev
 
+                }
 
+              }, 0)
 
+              sums[index] = sums[index].toFixed(3)
 
+            } else {
 
+              sums[index] = '元'
 
+            }
 
+          } else {
 
+            sums[index] = '--'
 
+          }
 
+        })
 
+        }else{
 
+          console.log(22222)
 
+          columns.forEach((column, index) => {
 
           if (index === 0) {
 
             sums[index] = '合计'
 
           } else if (
 
@@ -655,6 +686,8 @@
 
             sums[index] = '--'
 
           }
 
         })
 
+        }
 
+        
         // sums[6]=sums[6].toFixed(2)
 
         // sums[sums.length-2]=sums[sums.length-2].toFixed(2)
 
         return sums
 
@@ -869,13 +902,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) {
 
@@ -885,11 +918,9 @@
 
                     this.warehouseName = this.warehouseList[0].warehouseName
 
                   }
 
                 }
 
-
 
               }
 
-
 
             }
 
-            this.getList()
 
+              this.getList()
 
           })
 
       },
 
       //上传付款截图

+ 15 - 3
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'))
 
@@ -427,6 +432,7 @@
 
         // 质检是否是已确定状态
 
         // let _isGoweightCheck = this.isConfirmQuality(row)
 
         let _isGoweightCheck = true
 
+        console.log(row.qualityInspectionManagement)
 
         if (_isGoweightCheck) {
 
           this.$router.push({
 
             path: 'weightCheck',
 
@@ -442,6 +448,7 @@
 
               boxNoOther: row.qualityInspectionManagement.boxNoOther,
 
               titleNo: row.qualityInspectionManagement.titleNo,
 
               titleNoOther: row.qualityInspectionManagement.titleNoOther,
 
+              carModel:row.qualityInspectionManagement.carModel,
 
               goodsName: row.goodsName,
 
               grossWeight: row.grossWeight,
 
               tare: row.tare,
 
@@ -470,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} 条`)

+ 155 - 19
src/views/houseSelfCollect/weightCheck.vue
查看文件 

@@ -47,7 +47,6 @@
 
               <div class="tab-item" :class="index==0?'active':''" @click="tabClick(0)"> 待称毛重（{{mListTop.length}}）</div>
 
               <div class="tab-item" :class="index==1?'active':''" @click="tabClick(1)">待称皮重（{{pListTop.length}}）</div>
 
             </div>
 
-            <div class="title">基本信息</div>
 
             <ws-info-table>
 
               <ws-form-item label="编号" span="1" prop="number">
 
                 <ws-input v-model="weighingList.number" placeholder="请输入编号" maxlength="100" disabled size="small" />
 
@@ -82,7 +81,7 @@
 
               </ws-form-item>
 
               <ws-form-item label="毛重（公斤）" span="1" prop="grossWeight">
 
                 <ws-input type="number" @mousewheel.native.prevent v-if="this.index == 0"
 
-                  v-model="weighingList.grossWeight" @input="calculation" placeholder="未获取到毛重" maxlength="100"
 
+                  v-model="weighingList.grossWeight" @input="calculation(status)" placeholder="未获取到毛重" maxlength="100"
 
                   size="small" :disabled="disabled" />
 
                 <ws-input type="number" @mousewheel.native.prevent v-else v-model="weighingList.grossWeight"
 
                   @input="calculation" placeholder="未获取到毛重" maxlength="100" size="small" disabled />
 
@@ -104,6 +103,14 @@
 
                   <ws-input type="number" @mousewheel.native.prevent v-model="weighingList.netWeight"
 
                     placeholder="请输入净重" maxlength="100" size="small" disabled />
 
                 </ws-form-item>
 
+                <ws-form-item label="应收卸车过磅费（元）" span="1" prop="receivableWeighingFee" v-if="index==1">
 
+                  <ws-input type="number"  v-model="weighingList.receivableWeighingFee"
 
+                    placeholder="未获取到卸车过磅费金额" maxlength="100" size="small" disabled />
 
+                </ws-form-item>
 
+                <ws-form-item label="实收卸车过磅费（元）" span="1" prop="actualWeighingFee" v-if="index==1">
 
+                  <ws-input type="number"  v-model="weighingList.actualWeighingFee"
 
+                    placeholder="输入卸车过磅费" maxlength="100" size="small"/>
 
+                </ws-form-item>
 
               </div>
 
             </ws-info-table>
 
             <div class="but">
 
@@ -113,10 +120,12 @@
 
             </div>
 
           </div>
 
           <div class="car-right">
 
-            <el-button @click="cutstatus(1)"  :type="status==1?'primary':''">已称重</el-button>
 
-              <el-button @click="cutstatus(2)" :type="status==2?'primary':''">未称重</el-button>
 
+             <div class="tab-item" :class="status==1?'active':''" @click="cutstatus(1)"> 已称重</div>
 
+              <div class="tab-item" :class="status==2?'active':''" @click="cutstatus(2)">未称重</div>
 
+            <!-- <el-button   :type="status==1?'primary':''">已称重</el-button>
 
+              <el-button @click="cutstatus(2)" :type="status==2?'primary':''">未称重</el-button> -->
 
             <el-table ref="singleTable" :data="carList" highlight-current-row @current-change="handleCurrentChange"
 
-              style="width: 100%;overflow:auto;height:680px">
 
+              style="width: 100%;overflow:auto;height:640px">
 
               <el-table-column property="number" label="编号">
 
               </el-table-column>
 
               <el-table-column property="carNumber" label="车牌号">
 
@@ -221,7 +230,8 @@
 
           grossWeight: 0,
 
           tare: 0,
 
           buckleMiscellaneous: 0,
 
-          netWeight: 0
 
+          netWeight: 0,
 
+          receivableWeighingFee:'',
 
         },
 
         tpyeNo: 1,
 
         disabled: true,
 
@@ -264,6 +274,7 @@
 
       this.weighingList.carNumber = this.$route.query.carNumber
 
       this.weighingList.goodsName = this.$route.query.goodsName
 
       this.weighingList.id = this.$route.query.id
 
+      this.weighingList.carModel=this.$route.query.carModel
 
       // this.relationId = this.$route.query.relationId
 
       this.monitorUrl1 = this.$route.query.monitorUrl1
 
       this.monitorUrl2 = this.$route.query.monitorUrl2
 
@@ -273,6 +284,7 @@
 
       } else {
 
         this.weighingList.grossWeight = this.$route.query.grossWeight
 
       }
 
+     
       // this.purchasePriceList = this.$route.query.purchasePriceList
 
       // console.log(this.purchasePriceList, '上限')
 
       this.allowEdit = this.$route.query.allowEdit
 
@@ -290,7 +302,7 @@
 
       if(this.$route.query.automaticWeightAcquisition == '1'){
 
         this.openPort()
 
       }
 
-
 
+      console.log(this.weighingList)
 
     },
 
     deactivated() {
 
       // this.closePort()
 
@@ -453,6 +465,124 @@
 
 
             this.deptBudgetTotal = this.pList.length
 
           }
 
+          this.weighingList.carModel=this.weighingList.qualityInspectionManagement.carModel
 
+           if(this.weighingList.carModel=='单拖小柜'){
 
+        this.weighingList.receivableWeighingFee=80
 
+        this.weighingList.actualWeighingFee=80
 
+      }else if(this.weighingList.carModel=='双拖小柜'){
 
+        this.weighingList.receivableWeighingFee=160
 
+        this.weighingList.actualWeighingFee=160
 
+      }else if(this.weighingList.carModel=='大柜'){
 
+        if((this.weighingList.grossWeight/1000)<50){
 
+  this.$set(this.weighingList,'receivableWeighingFee',120)
 
+          this.weighingList.actualWeighingFee=120
 
+          this.$forceUpdate()
 
+        }else if((this.weighingList.grossWeight/1000)>50||(this.weighingList.grossWeight/1000)<65){
 
+          this.weighingList.receivableWeighingFee=150
 
+          this.weighingList.actualWeighingFee=150
 
+        }else if((this.weighingList.grossWeight/1000)>65||(this.weighingList.grossWeight/1000)<75){
 
+          this.weighingList.receivableWeighingFee=170
 
+          this.weighingList.actualWeighingFee=170
 
+        }else if((this.weighingList.grossWeight/1000)>75||(this.weighingList.grossWeight/1000)<80){
 
+          this.weighingList.receivableWeighingFee=190
 
+          this.weighingList.actualWeighingFee=190
 
+        }else if((this.weighingList.grossWeight/1000)>80||(this.weighingList.grossWeight/1000)<85){
 
+          this.weighingList.receivableWeighingFee=210
 
+          this.weighingList.actualWeighingFee=210
 
+        }else if((this.weighingList.grossWeight/1000)>85||(this.weighingList.grossWeight/1000)<95){
 
+          this.weighingList.receivableWeighingFee=240
 
+          this.weighingList.actualWeighingFee=240
 
+        }else if((this.weighingList.grossWeight/1000)>95||(this.weighingList.grossWeight/1000)<105){
 
+          this.weighingList.receivableWeighingFee=260
 
+          this.weighingList.actualWeighingFee=260
 
+        }else if((this.weighingList.grossWeight/1000)>105||(this.weighingList.grossWeight/1000)<150){
 
+          this.weighingList.receivableWeighingFee=300
 
+          this.weighingList.actualWeighingFee=300
 
+        }
 
+      }else if(this.weighingList.carModel=='挂车'){
 
+        if((this.weighingList.grossWeight/1000)<50){
 
+          this.weighingList.receivableWeighingFee=180
 
+          this.weighingList.actualWeighingFee=180
 
+        }else if((this.weighingList.grossWeight/1000)>50||(this.weighingList.grossWeight/1000)<65){
 
+          this.weighingList.receivableWeighingFee=200
 
+          this.weighingList.actualWeighingFee=200
 
+        }else if((this.weighingList.grossWeight/1000)>65||(this.weighingList.grossWeight/1000)<75){
 
+          this.weighingList.receivableWeighingFee=250
 
+          this.weighingList.actualWeighingFee=250
 
+        }else if((this.weighingList.grossWeight/1000)>75||(this.weighingList.grossWeight/1000)<85){
 
+          this.weighingList.receivableWeighingFee=350
 
+          this.weighingList.actualWeighingFee=350
 
+        }else if((this.weighingList.grossWeight/1000)>85||(this.weighingList.grossWeight/1000)<95){
 
+          this.weighingList.receivableWeighingFee=400
 
+          this.weighingList.actualWeighingFee=400
 
+        }else if((this.weighingList.grossWeight/1000)>95||(this.weighingList.grossWeight/1000)<105){
 
+          this.weighingList.receivableWeighingFee=450
 
+          this.weighingList.actualWeighingFee=450
 
+        }else if((this.weighingList.grossWeight/1000)>105||(this.weighingList.grossWeight/1000)<120){
 
+          this.weighingList.receivableWeighingFee=500
 
+          this.weighingList.actualWeighingFee=500
 
+        }else if((this.weighingList.grossWeight/1000)>120||(this.weighingList.grossWeight/1000)<130){
 
+          this.weighingList.receivableWeighingFee=550
 
+          this.weighingList.actualWeighingFee=550
 
+        }else if((this.weighingList.grossWeight/1000)>130||(this.weighingList.grossWeight/1000)<150){
 
+          this.weighingList.receivableWeighingFee=700
 
+          this.weighingList.actualWeighingFee=700
 
+        }
 
+      }else if(this.weighingList.carModel=='冷藏箱（不抠箱）'){
 
+        if((this.weighingList.grossWeight/1000)<50){
 
+          this.weighingList.receivableWeighingFee=120
 
+          this.weighingList.actualWeighingFee=120
 
+        }else if((this.weighingList.grossWeight/1000)>50||(this.weighingList.grossWeight/1000)<65){
 
+          this.weighingList.receivableWeighingFee=150
 
+          this.weighingList.actualWeighingFee=150
 
+        }else if((this.weighingList.grossWeight/1000)>65||(this.weighingList.grossWeight/1000)<75){
 
+          this.weighingList.receivableWeighingFee=170
 
+          this.weighingList.actualWeighingFee=170
 
+        }else if((this.weighingList.grossWeight/1000)>75||(this.weighingList.grossWeight/1000)<80){
 
+          this.weighingList.receivableWeighingFee=190
 
+          this.weighingList.actualWeighingFee=190
 
+        }else if((this.weighingList.grossWeight/1000)>80||(this.weighingList.grossWeight/1000)<85){
 
+          this.weighingList.receivableWeighingFee=210
 
+          this.weighingList.actualWeighingFee=210
 
+        }else if((this.weighingList.grossWeight/1000)>85||(this.weighingList.grossWeight/1000)<95){
 
+          this.weighingList.receivableWeighingFee=240
 
+          this.weighingList.actualWeighingFee=240
 
+        }else if((this.weighingList.grossWeight/1000)>95||(this.weighingList.grossWeight/1000)<105){
 
+          this.weighingList.receivableWeighingFee=260
 
+          this.weighingList.actualWeighingFee=260
 
+        }else if((this.weighingList.grossWeight/1000)>105||(this.weighingList.grossWeight/1000)<120){
 
+          this.weighingList.receivableWeighingFee=300
 
+          this.weighingList.actualWeighingFee=300
 
+        }
 
+      }else if(this.weighingList.carModel=='冷藏箱（抠箱）'){
 
+        if((this.weighingList.grossWeight/1000)<50){
 
+          this.weighingList.receivableWeighingFee=360
 
+          this.weighingList.actualWeighingFee=360
 
+        }else if((this.weighingList.grossWeight/1000)>50||(this.weighingList.grossWeight/1000)<65){
 
+          this.weighingList.receivableWeighingFee=390
 
+          this.weighingList.actualWeighingFee=390
 
+        }else if((this.weighingList.grossWeight/1000)>65||(this.weighingList.grossWeight/1000)<75){
 
+          this.weighingList.receivableWeighingFee=410
 
+          this.weighingList.actualWeighingFee=410
 
+        }else if((this.weighingList.grossWeight/1000)>75||(this.weighingList.grossWeight/1000)<80){
 
+          this.weighingList.receivableWeighingFee=430
 
+          this.weighingList.actualWeighingFee=430
 
+        }else if((this.weighingList.grossWeight/1000)>80||(this.weighingList.grossWeight/1000)<85){
 
+          this.weighingList.receivableWeighingFee=450
 
+          this.weighingList.actualWeighingFee=450
 
+        }else if((this.weighingList.grossWeight/1000)>85||(this.weighingList.grossWeight/1000)<95){
 
+          this.weighingList.receivableWeighingFee=480
 
+          this.weighingList.actualWeighingFee=480
 
+        }else if((this.weighingList.grossWeight/1000)>95||(this.weighingList.grossWeight/1000)<105){
 
+          this.weighingList.receivableWeighingFee=500
 
+          this.weighingList.actualWeighingFee=500
 
+        }else if((this.weighingList.grossWeight/1000)>105||(this.weighingList.grossWeight/1000)<120){
 
+          this.weighingList.receivableWeighingFee=540
 
+          this.weighingList.actualWeighingFee=540
 
+        }
 
+      }else {
 
+        this.weighingList.receivableWeighingFee=''
 
+      }
 
         }
 
       },
 
       tabClick(val) {
 
@@ -632,7 +762,7 @@
 
           path: 'weighingManagement'
 
         })
 
       },
 
-      calculation() {
 
+      calculation(status) {
 
         // if (this.weighingList.grossWeight && this.weighingList.tare) {
 
         //   this.weighingList.netWeight = this.weighingList.grossWeight - this.weighingList.tare - parseInt(this.weighingList.buckleMiscellaneous)
 
         //   this.weighingList.netWeight = this.weighingList.netWeight.toFixed(2)
 
@@ -849,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'))
 
@@ -884,7 +1018,7 @@
 
 
   .ws-info-table {
 
     border: none;
 
-    height: 610px;
 
+    // height: 610px;
 
   }
 
 
   .ws-info-table .el-form-item {
 
@@ -1112,13 +1246,15 @@
 
       }
 
     }
 
 
-    .left,
 
+    .left{
 
+      width: 40%;
 
+    }
 
     .right {
 
-      width: 50%;
 
+      width: 60%;
 
     }
 
   }
 
 
   .car-right {
 
-    width: 50%;
 
+    width: 60%;
 
   }
 
 </style>

+ 1 - 0
src/views/newTask/listPage.vue
查看文件 

@@ -59,6 +59,7 @@
 
           infinite-scroll-distance="30">
 
         <li v-for="(i, index) in listShow"
 
             :key="index"
 
+            v-if='i.businessType!="BUY"&&i.businessType!="SALE"'
 
             class="list-item"
 
             @click="goPath(i)">
 
           <!-- 图标 -->

+ 85 - 10
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"
 
@@ -221,7 +226,7 @@
 
               height="18"
 
               style="vertical-align: text-top; position: relative; top: -1px"
 
               src="../../../public/img/edit.png"
 
-              @click="whether(scope.row)"
 
+              @click="whether(scope.row,1)"
 
               v-if="scope.row.identification == 'false'"
 
               alt=""
 
             />
 
@@ -234,6 +239,25 @@
 
             <!-- <div>—</div> -->
 
           </template>
 
         </el-table-column>
 
+        <el-table-column class="table_td" prop="settlementPrice" width='150' label="结算单价（元/吨）">
 
+        <template slot-scope="scope">
 
+            <div class="inputChenge">
 
+              <el-input v-model="scope.row.settlementPrice" v-if="scope.row.identification1 == 'true'">
 
+              </el-input>
 
+              <div v-if="scope.row.identification1 == 'false'" class="inputs">
 
+                <span>{{scope.row.settlementPrice}}</span>
 
+              </div>
 
+            </div>
 
+            <div style='display:inline-block;' v-if="scope.row.identification1 == 'false'">
 
+              <img v-hasPermission="`report.goodsSaleOutReport.edit`" width="17" height="18"
 
+                style="vertical-align: text-top; position: relative; top: -1px" src="../../../public/img/edit.png"
 
+                @click="whether(scope.row,2)" alt="" />
 
+            </div>
 
+
 
+            <i class="el-icon-check" style="line-height: 29px; margin-left: 10px"
 
+              v-if="scope.row.identification1 == 'true'" @click="weightClick(scope.row,2)"></i>
 
+          </template>
 
+          </el-table-column>
 
         <el-table-column
 
           width="100"
 
           class="table_td"
 
@@ -466,7 +490,9 @@ export default {
 
       year: '',
 
       option: [],
 
       pickerOptions: {},
 
-      value2: '',
 
+      value2: [],
 
+      startDate: '',
 
+      endDate: '',
 
       deptBudgetTotal: 0,
 
       currentPage: 1,
 
       pageSize: 10,
 
@@ -589,6 +615,7 @@ export default {
 
         .then(() => {
 
           this.stockPurchaseInfo.id = row.id
 
           this.stockPurchaseInfo.settlementWeight = row.settlementWeight
 
+          this.stockPurchaseInfo.flag=1
 
           editSettlementWeight(this.stockPurchaseInfo)
 
             .toPromise()
 
             .then((response) => {
 
@@ -604,8 +631,42 @@ export default {
 
           return false
 
         })
 
     },
 
-    whether(row) {
 
-      row.identification = 'true'
 
+    //修改结算单价
 
+     weightClick(row,flag) {
 
+        var title=''
 
+        var data={}
 
+          title='确定要修改结算单价？'
 
+        data={
 
+              settlementPrice: row.settlementPrice,
 
+              id: row.id,
 
+              flag:flag
 
+            }
 
+        this.$confirm(title, {
 
+            confirmButtonText: '确定',
 
+            cancelButtonText: '取消',
 
+            type: 'warning',
 
+          })
 
+          .then(() => {
 
+            editSettlementWeight(data)
 
+              .toPromise()
 
+              .then((response) => {
 
+                  this.$notify.success({
 
+                  title: '成功',
 
+                  message: '结算单价修改成功',
 
+                })
 
+                this.getList()
 
+              })
 
+              .catch(() => {
 
+                return false
 
+              })
 
+          })
 
+      },
 
+    whether(row,flag) {
 
+      if(flag==1){
 
+          row.identification = 'true'
 
+        }else{
 
+          row.identification1 = 'true'
 
+        }
 
     },
 
     handleRowClick(row) {
 
       if (row.approveStatus == null) {
 
@@ -813,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
 
@@ -928,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]))
 
@@ -948,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() {
 
@@ -971,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,
 
@@ -983,6 +1057,7 @@ export default {
 
           this.settlementWeight1 = 0
 
           for (var i = 0; i < response.records.length; i++) {
 
             response.records[i].identification = 'false'
 
+            response.records[i].identification1 = 'false'
 
             this.payingMoney += response.records[i].amountIngPayable
 
             this.payedMoney += response.records[i].amountEdPayable
 
             this.payNotMoney += response.records[i].amountNotPayable

+ 25 - 5
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) {

+ 19 - 14
src/views/taskManagement/inOutWarehouseTaskEdit.vue
查看文件 

@@ -115,7 +115,7 @@
 
             {{dataList.waterContent}}
 
           </el-form-item>
 
           <!--单价(元/吨)-->
 
-          <el-form-item label="单价(元/吨)" span="1" style=" margin-left: 650px; margin-top: -40px" v-show="dataList.priceType != '随行就市'" v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3'>
 
+          <el-form-item label="单价(元/吨)" span="1" style=" margin-left: 650px; margin-top: -40px" v-show="Pricetype" v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3'>
 
             {{dataList.unitPrice}}
 
           </el-form-item>
 
           <!--预计出库日期-->
 
@@ -123,9 +123,9 @@
 
             {{dataList.predictDate}}
 
           </el-form-item>
 
           	<!--预估运费（元/吨）-->
 
-					<el-form-item label="预估运费（元/吨）" span="1">
 
+					<!-- <el-form-item label="预估运费（元/吨）" span="1">
 
               {{dataList.estimatedFreight}}
 
-					</el-form-item>
 
+					</el-form-item> -->
 
           <!--发货人-->
 
           <el-form-item label="发货人">
 
             {{dataList.agent}}
 
@@ -223,7 +223,7 @@
 
             {{dataList1.waterContent}}
 
           </el-form-item>
 
           <!--单价(元/吨)-->
 
-          <el-form-item label="单价(元/吨)" span="1" style=" margin-left: 650px; margin-top: -40px" v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3'>
 
+          <el-form-item label="单价(元/吨)" span="1" style=" margin-left: 650px; margin-top: -40px" v-show="Pricetype" v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3'>
 
             {{dataList1.unitPrice}}
 
           </el-form-item>
 
           <!--预计出库日期-->
 
@@ -231,9 +231,9 @@
 
             {{dataList1.predictDate}}
 
           </el-form-item>
 
           		<!--预估运费（元/吨）-->
 
-					<el-form-item label="预估运费（元/吨）" span="1" >
 
+					<!-- <el-form-item label="预估运费（元/吨）" span="1" >
 
               {{dataList1.estimatedFreight}}
 
-          </el-form-item>
 
+          </el-form-item> -->
 
           <!--收货人-->
 
           <el-form-item label="收货人">
 
             <el-option
 
@@ -337,7 +337,7 @@
 
             {{dataList.waterContent}}
 
           </el-form-item>
 
           <!--单价(元/吨)-->
 
-          <el-form-item label="单价(元/吨)" span="1" style=" margin-left: 650px; margin-top: -40px">
 
+          <el-form-item label="单价(元/吨)" span="1" style=" margin-left: 650px; margin-top: -40px" v-show="Pricetype">
 
             {{dataList.unitPrice}}
 
           </el-form-item>
 
           <!--预计出库日期-->
 
@@ -345,9 +345,9 @@
 
             {{dataList.predictDate}}
 
           </el-form-item>
 
           		<!--预估运费（元/吨）-->
 
-					<el-form-item label="预估运费（元/吨）" span="1" >
 
+					<!-- <el-form-item label="预估运费（元/吨）" span="1" >
 
           {{dataList.estimatedFreight}}
 
-					</el-form-item>
 
+					</el-form-item> -->
 
           <!--发货人-->
 
           <el-form-item label="发货人">
 
             {{dataList.agent}}
 
@@ -484,6 +484,7 @@ export default {
 
         month: dayjs().format('MM')
 
       },
 
       contractList: [],
 
+      Pricetype:true,
 
       inOutTaskNo: '',
 
       inOutTaskNo1: '',
 
       dataList: { taskTypeKey: '1' },
 
@@ -673,11 +674,15 @@ export default {
 
 					})
 
 					.toPromise()
 
 					.then(response1 => {
 
-            for(let i = 0 ; i < response1.length ; i++){
 
-               if(response1[i].contractNo == this.dataList.contractNo){
 
-                 this.dataList.priceType = response1[i].priceType
 
-               }
 
-            }
 
+             for (let i = 0; i < response1.length; i++) {
 
+                if (response1[i].contractNo == this.dataList.contractNo) {
 
+                    if(response1[i].priceType == "随行就市"){
 
+                      this.Pricetype = false
 
+                    }else{
 
+                      this.Pricetype = true
 
+                    }
 
+                }
 
+             }
 
 					})
 
         })

+ 1 - 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,

+ 40 - 35
src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue
查看文件 

@@ -109,10 +109,10 @@
 
 							value-format="yyyy-MM-dd" />
 
 					</el-form-item>
 
 						<!--预估运费（元/吨）-->
 
-					<el-form-item label="预估运费（元/吨）" span="1">
 
+					<!-- <el-form-item label="预估运费（元/吨）" span="1">
 
 						<el-input v-model="dataList.estimatedFreight" placeholder="请输入预估运费"
 
 							maxlength="20" size="small" type="number"/>
 
-					</el-form-item>
 
+					</el-form-item> -->
 
 					<!--经办人-->
 
 					<el-form-item label="发货人">
 
             <el-select v-model="dataList.agent" placeholder="请选择发货人" filterable
 
@@ -204,7 +204,7 @@
 
 							class="huom" />
 
 					</el-form-item>
 
 					<!--单价(元/吨)-->
 
-					<el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="单价(元/吨)" >
 
+					<el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="单价(元/吨)" v-show="Pricetype">
 
 						<el-input @input="unitPricechange" :disabled="dataList.taskTypeKey == 3"
 
 							v-model="dataList1.unitPrice" placeholder="请输入单价" maxlength="120" size="small"
 
 							class="huom" />
 
@@ -215,10 +215,10 @@
 
 							value-format="yyyy-MM-dd" />
 
 					</el-form-item>
 
 							<!--预估运费（元/吨）-->
 
-					<el-form-item label="预估运费（元/吨）" span="1" >
 
+					<!-- <el-form-item label="预估运费（元/吨）" span="1" >
 
 						<el-input v-model="dataList1.estimatedFreight" placeholder="请输入预估运费"
 
 							maxlength="20" size="small" type="number" />
 
-					</el-form-item>
 
+					</el-form-item> -->
 
 					<!-- 经办人-->
 
 					<el-form-item label="收货人">
 
             <el-select v-model="dataList1.agent" placeholder="请选择收货人" filterable :filter-method="dataFilter1"
 
@@ -323,10 +323,10 @@
 
 							value-format="yyyy-MM-dd" />
 
 					</el-form-item>
 
 							<!--预估运费（元/吨）-->
 
-					<el-form-item label="预估运费（元/吨）" span="1" >
 
+					<!-- <el-form-item label="预估运费（元/吨）" span="1" >
 
 						<el-input v-model="dataList.estimatedFreight" placeholder="请输入预估运费"
 
 							maxlength="20" size="small" type="number" />
 
-					</el-form-item>
 
+					</el-form-item> -->
 
 					<!--发货人-->
 
 					<el-form-item label="发货人">
 
             <el-select v-model="dataList.agent" placeholder="请选择发货人" filterable
 
@@ -709,6 +709,11 @@
 
 				if (this.dataList1.taskTypeKey != 3) {
 
 					for (let i = 0; i < this.contractNoList.length; i++) {
 
 						if (this.contractNoList[i].contractNo == e) {
 
+							if(this.contractNoList[i].priceType == "随行就市"){
 
+								this.Pricetype = false
 
+							}else{
 
+								this.Pricetype = true
 
+							}
 
 							getGoodsName({
 
 									contractId: this.contractNoList[i].id,
 
 									contractNo: this.contractNoList[i].contractNo
 
@@ -894,13 +899,13 @@
 
 						})
 
 						return
 
 					}
 
-				    if (isNaN(this.dataList.estimatedFreight)) {
 
-						this.$message({
 
-							message: '预估运费输入错误！',
 
-							type: 'warning'
 
-						})
 
-						return
 
-					}
 
+				    // if (isNaN(this.dataList.estimatedFreight)) {
 
+					// 	this.$message({
 
+					// 		message: '预估运费输入错误！',
 
+					// 		type: 'warning'
 
+					// 	})
 
+					// 	return
 
+					// }
 
 					// if (!this.dataList.agent) {
 
 					//   this.$message({
 
 					//     message: '出库经办人不能为空！',
 
@@ -1044,13 +1049,13 @@
 
 						})
 
 						return
 
 					}
 
-					 if (isNaN(this.dataList1.estimatedFreight)) {
 
-						this.$message({
 
-							message: '预估运费输入错误！',
 
-							type: 'warning'
 
-						})
 
-						return
 
-					}
 
+					//  if (isNaN(this.dataList1.estimatedFreight)) {
 
+					// 	this.$message({
 
+					// 		message: '预估运费输入错误！',
 
+					// 		type: 'warning'
 
+					// 	})
 
+					// 	return
 
+					// }
 
 					// if (!this.dataList1.agent) {
 
 					//   this.$message({
 
 					//     message: '入库经办人不能为空！',
 
@@ -1117,13 +1122,13 @@
 
 						})
 
 						return
 
 					}
 
-					 if (isNaN(this.dataList1.estimatedFreight)) {
 
-						this.$message({
 
-							message: '预估运费输入错误！',
 
-							type: 'warning'
 
-						})
 
-						return
 
-					}
 
+					//  if (isNaN(this.dataList1.estimatedFreight)) {
 
+					// 	this.$message({
 
+					// 		message: '预估运费输入错误！',
 
+					// 		type: 'warning'
 
+					// 	})
 
+					// 	return
 
+					// }
 
 					if (!this.dataList1.predictDate) {
 
 						this.$message({
 
 							message: '预计入库日期不能为空！',
 
@@ -1303,13 +1308,13 @@
 
 						})
 
 						return
 
 					}
 
-					 if (isNaN(this.dataList1.estimatedFreight)) {
 
-						this.$message({
 
-							message: '预估运费输入错误！',
 
-							type: 'warning'
 
-						})
 
-						return
 
-					}
 
+					//  if (isNaN(this.dataList1.estimatedFreight)) {
 
+					// 	this.$message({
 
+					// 		message: '预估运费输入错误！',
 
+					// 		type: 'warning'
 
+					// 	})
 
+					// 	return
 
+					// }
 
 					// if (!this.dataList.agent) {
 
 					//   this.$message({
 
 					//     message: '出库经办人不能为空！',

+ 19 - 9
src/views/taskManagement/tranManagementWarehouseInOutTaskAudit.vue
查看文件 

@@ -223,7 +223,7 @@
 
             />
 
           </el-form-item>
 
           <!--单价(元/吨)-->
 
-          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="单价(元/吨)">
 
+          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="单价(元/吨)" v-show="Pricetype">
 
             <el-input
 
               @input="unitPricechange"
 
               v-model="dataList.unitPrice"
 
@@ -249,14 +249,14 @@
 
             />
 
           </el-form-item>
 
           <!--预估运费（元/吨）-->
 
-          <el-form-item label="预估运费（元/吨）" span="1">
 
+          <!-- <el-form-item label="预估运费（元/吨）" span="1">
 
             <el-input
 
               v-model="dataList.estimatedFreight"
 
               placeholder="请输入预估运费"
 
               maxlength="20"
 
               size="small"
 
             />
 
-          </el-form-item>
 
+          </el-form-item> -->
 
           <!--收货人-->
 
           <el-form-item label="发货人">
 
             <el-select
 
@@ -478,7 +478,7 @@
 
             />
 
           </el-form-item>
 
           <!--单价(元/吨)-->
 
-          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="单价(元/吨)">
 
+          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="单价(元/吨)" v-show="Pricetype">
 
             <el-input
 
               @input="unitPricechange"
 
               :disabled="dataList.taskTypeKey == 3"
 
@@ -505,14 +505,14 @@
 
             />
 
           </el-form-item>
 
           <!--预估运费（元/吨）-->
 
-          <el-form-item label="预估运费（元/吨）" span="1">
 
+          <!-- <el-form-item label="预估运费（元/吨）" span="1">
 
             <el-input
 
               v-model="dataList1.estimatedFreight"
 
               placeholder="请输入预估运费"
 
               maxlength="20"
 
               size="small"
 
             />
 
-          </el-form-item>
 
+          </el-form-item> -->
 
           <!--收货人-->
 
           <el-form-item label="收货人">
 
             <el-select
 
@@ -716,7 +716,7 @@
 
             />
 
           </el-form-item>
 
           <!--单价(元/吨)-->
 
-          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="单价(元/吨)">
 
+          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="单价(元/吨)" v-show="Pricetype">
 
             <el-input
 
               disabled
 
               v-model="dataList.unitPrice"
 
@@ -741,14 +741,14 @@
 
             />
 
           </el-form-item>
 
           <!--预估运费（元/吨）-->
 
-          <el-form-item label="预估运费（元/吨）" span="1">
 
+          <!-- <el-form-item label="预估运费（元/吨）" span="1">
 
             <el-input
 
               v-model="dataList.estimatedFreight"
 
               placeholder="请输入预估运费"
 
               maxlength="20"
 
               size="small"
 
             />
 
-          </el-form-item>
 
+          </el-form-item> -->
 
           <!--发货人-->
 
           <el-form-item label="发货人">
 
             <el-select
 
@@ -907,6 +907,7 @@ export default {
 
       onChange: {},
 
       deptBudgetList1: [],
 
       gradeList: [],
 
+      Pricetype:true,
 
       rules: {
 
         netWeight: [
 
           {
 
@@ -1407,6 +1408,15 @@ export default {
 
         .toPromise()
 
         .then((response) => {
 
           this.contractNoList = response
 
+          for (let i = 0; i <  this.contractNoList.length; i++) {
 
+              if ( this.contractNoList[i].contractNo == this.dataList.contractNo) {
 
+                  if( this.contractNoList[i].priceType == "随行就市"){
 
+                    this.Pricetype = false
 
+                  }else{
 
+                    this.Pricetype = true
 
+                  }
 
+              }
 
+            }
 
         })
 
       //仓库名
 
       getwarehousename({

+ 21 - 7
src/views/taskManagement/tranManagementWarehouseInOutTaskEdit.vue
查看文件 

@@ -206,10 +206,10 @@
 
             />
 
           </el-form-item>
 
           		<!--预估运费（元/吨）-->
 
-					<el-form-item label="预估运费（元/吨）" span="1" >
 
+					<!-- <el-form-item label="预估运费（元/吨）" span="1" >
 
 						<el-input  v-model="dataList.estimatedFreight" placeholder="请输入预估运费"
 
 							maxlength="20" size="small"  />
 
-					</el-form-item>
 
+					</el-form-item> -->
 
           <!--发货人-->
 
           <el-form-item label="发货人">
 
             <el-select
 
@@ -386,7 +386,7 @@
 
             />
 
           </el-form-item>
 
           <!--单价(元/吨)-->
 
-          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="单价(元/吨)" span="1" style=" margin-left: 650px; margin-top: -40px">
 
+          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="单价(元/吨)" span="1" style=" margin-left: 650px; margin-top: -40px" v-show="Pricetype">
 
             <el-input
 
               @input="unitPricechange"
 
               :disabled="dataList.taskTypeKey == 3"
 
@@ -407,10 +407,10 @@
 
             />
 
           </el-form-item>
 
           		<!--预估运费（元/吨）-->
 
-					<el-form-item label="预估运费（元/吨）" span="1" >
 
+					<!-- <el-form-item label="预估运费（元/吨）" span="1" >
 
 						<el-input v-model="dataList1.estimatedFreight" placeholder="请输入预估运费"
 
 							maxlength="20" size="small"  />
 
-					</el-form-item>
 
+					</el-form-item> -->
 
           <!-- 经办人-->
 
           <el-form-item label="收货人">
 
             <el-select
 
@@ -605,10 +605,10 @@
 
             />
 
           </el-form-item>
 
           		<!--预估运费（元/吨）-->
 
-					<el-form-item label="预估运费（元/吨）" span="1" >
 
+					<!-- <el-form-item label="预估运费（元/吨）" span="1" >
 
 						<el-input v-model="dataList.estimatedFreight" placeholder="请输入预估运费"
 
 							maxlength="20" size="small"  />
 
-					</el-form-item>
 
+					</el-form-item> -->
 
           <!--发货人-->
 
           <el-form-item label="出库发货人">
 
             <el-select
 
@@ -883,6 +883,11 @@ export default {
 
       if (this.dataList1.taskTypeKey != 3) {
 
         for (let i = 0; i < this.contractNoList.length; i++) {
 
           if (this.contractNoList[i].contractNo == e) {
 
+            	if(this.contractNoList[i].priceType == "随行就市"){
 
+								this.Pricetype = false
 
+							}else{
 
+								this.Pricetype = true
 
+							}
 
             getGoodsName({
 
               contractId: this.contractNoList[i].id,
 
               contractNo: this.contractNoList[i].contractNo
 
@@ -1599,6 +1604,15 @@ export default {
 
         .toPromise()
 
         .then(response => {
 
           this.contractNoList = response
 
+          for (let i = 0; i < this.contractNoList.length; i++) {
 
+            if (this.contractNoList[i].contractNo == this.dataList.contractNo) {
 
+                if(this.contractNoList[i].priceType == "随行就市"){
 
+                  this.Pricetype = false
 
+                }else{
 
+                  this.Pricetype = true
 
+                }
 
+            }
 
+          }
 
         })
 
       // //临时仓库入库类型
 
       // pullDown({ constId: 'WARE1' })

+ 1 - 1
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="自动计算，不可编辑"

+ 1 - 1
src/views/tradeServicesManagement/warehouseReceiptEdit.vue
查看文件 

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

+ 4 - 4
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>

+ 3 - 3
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,

+ 1 - 1
src/views/tranManagement/tranManagementTransporHairRespond.vue
查看文件 

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

+ 12 - 1
src/views/warehouse/warehouseManagementDelivery.vue
查看文件 

@@ -539,7 +539,18 @@ export default {
 
       for (var i = 0; i < this.outContractNo.length; i++) {
 
         if (this.outContractNo[i].contractNo == e) {
 
              if (this.outContractNo[i].inOutType == '销售出库') {
 
-              this.deptBudgetList.tips='买方'+this.outContractNo[i].buyer+ '（ '+this.outContractNo[i].unitContractPrice+'元/吨）'
 
+              if(!this.outContractNo[i].unitContractPrice){
 
+              this.deptBudgetList.tips =
 
+              '买方' +
 
+              this.outContractNo[i].buyer
 
+            }else{
 
+              this.deptBudgetList.tips =
 
+              '买方' +
 
+              this.outContractNo[i].buyer +
 
+              '（ ' +
 
+              this.outContractNo[i].unitContractPrice +
 
+              '元/吨）'
 
+            }
 
               this.deptBudgetList.inOutTypeKey = 1
 
             } else if (this.outContractNo[i].inOutType == '移库出库') {
 
                if(this.outContractNo[i].unitContractPrice){

+ 6 - 2
src/views/warehouse/warehouseManagementEdit.vue
查看文件 

@@ -68,7 +68,7 @@
 
           <ws-info-table>
 
             <!--仓位编号-->
 
             <ws-form-item label="仓位编号" span="1" prop="binNumber">
 
-              <ws-input v-model.number="item.binNumber" placeholder="请输入仓位编号" maxlength="100" size="small" />
 
+              <ws-input v-model="item.binNumber" placeholder="请输入仓位编号" maxlength="100" size="small" />
 
             </ws-form-item>
 
             <!--仓位储量（吨）-->
 
             <ws-form-item label="仓位储量（吨）" span="1" prop="maxStorage">
 
@@ -495,7 +495,11 @@
 
             }else{
 
                 this.addressUrls = []
 
             }
 
-            this.deptBudgetList.otherPersonPhone = this.deptBudgetList.otherPersonPhone.split(',')
 
+            if(this.deptBudgetList.otherPersonPhone!=''){
 
+              this.deptBudgetList.otherPersonPhone = this.deptBudgetList.otherPersonPhone.split(',')
 
+            }else{
 
+               this.deptBudgetList.otherPersonPhone = []
 
+            }
 
             this.addressUrls.pop()
 
           })
 
       },

+ 11 - 9
src/views/warehouse/warehouseManagementGross.vue
查看文件 

@@ -2351,6 +2351,7 @@ export default {
 
       }
 
     },
 
     contractNoChange(e) {
 
+      this.disabled1=true
 
       for (let i = 0; i < this.deptBudgetList1.length; i++) {
 
         console.log(this.deptBudgetList1[i])
 
         if (this.deptBudgetList1[i].inOutTaskNo == e) {
 
@@ -2370,12 +2371,18 @@ export default {
 
           this.deptBudgetList.goodsNameKey = this.outContractNo[i].goodsNameKey
 
           this.deptBudgetList.grade = this.outContractNo[i].grade
 
           if (this.outContractNo[i].inOutType == '采购入库') {
 
-            this.deptBudgetList.tips =
 
+            if(!this.outContractNo[i].unitContractPrice){
 
+              this.deptBudgetList.tips =
 
+              '卖方' +
 
+              this.outContractNo[i].seller
 
+            }else{
 
+              this.deptBudgetList.tips =
 
               '卖方' +
 
               this.outContractNo[i].seller +
 
               '（ ' +
 
               this.outContractNo[i].unitContractPrice +
 
               '元/吨）'
 
+            }
 
             this.deptBudgetList.inOutTypeKey = 1
 
           } else if (this.outContractNo[i].inOutType == '移库入库') {
 
             this.deptBudgetList.goodsName = data.goodsName
 
@@ -2407,7 +2414,6 @@ export default {
 
             }
 
             this.deptBudgetList.inOutTypeKey = 6
 
           }
 
-          console.log(this.outContractNo[i])
 
           // this.deptBudgetList.cost = this.outContractNo[i].contractPrice
 
           this.cost = this.outContractNo[i].contractPrice
 
           if (this.cost) {
 
@@ -2424,6 +2430,9 @@ export default {
 
           } else {
 
             this.isSelectType = true
 
           }
 
+          if(this.outContractNo[i].priceType=='随行就市'){
 
+             this.disabled1 = !this.disabled1
 
+          }
 
           if (this.outContractNo[i].deliverType == '1') {
 
             this.carstatus = true
 
           } else {
 
@@ -2440,7 +2449,6 @@ export default {
 
     contractNoChange1(e) {
 
       for (var i = 0; i < this.outContractNo.length; i++) {
 
         if (this.outContractNo[i].contractNo == e) {
 
-          console.log(this.outContractNo[i])
 
           if (this.outContractNo[i].inOutType == '采购入库') {
 
             this.deptBudgetList.inOutTypeKey = 1
 
           } else if (this.outContractNo[i].inOutType == '移库入库') {
 
@@ -2471,12 +2479,6 @@ export default {
 
           } else {
 
             this.isSelectType = true
 
           }
 
-          if(this.outContractNo[i].priceType=='随行就市'){
 
-            this.isGetCost = false
 
-             this.deptBudgetList.cost = this.deptBudgetList.cost
 
-          }else{
 
-            this.isGetCost = true
 
-          }
 
           if (this.outContractNo[i].deliverType == '1') {
 
             this.carstatus = true
 
           } else {

+ 9 - 0
src/views/warehouse/warehouseManagementNoWeight.vue
查看文件 

@@ -288,6 +288,10 @@ export default {
 
             binNumber: row.binNumber,
 
             carNo: row.carNo,
 
             compId: row.compId,
 
+            boxNo:row.boxNo,
 
+            boxNoOther: row.boxNoOther,
 
+            titleNo: row.titleNo,
 
+            titleNoOther: row.titleNoOther,
 
             contractNo: row.contractNo,
 
             goodsName: row.goodsName,
 
             goodsNameKey: row.goodsNameKey,
 
@@ -333,10 +337,15 @@ export default {
 
             carNo: row.carNo,
 
             compId: row.compId,
 
             contractNo: row.contractNo,
 
+            boxNo:row.boxNo,
 
+            boxNoOther: row.boxNoOther,
 
+            titleNo: row.titleNo,
 
+            titleNoOther: row.titleNoOther,
 
             goodsName: row.goodsName,
 
             goodsNameKey: row.goodsNameKey,
 
             grade: row.grade,
 
             status:'',
 
+            inOutTaskNo:row.inOutTaskNo,
 
             grossWeight: row.grossWeight,
 
             inOutDate: row.inOutDate,
 
             inOutFlag: row.inOutFlag,

+ 26 - 13
src/views/warehouse/warehouseManagementNoWeightIn.vue
查看文件 

@@ -779,7 +779,10 @@ export default {
 
         agent: '',
 
         carNo: '',
 
         inOutDate: '',
 
-
 
+        boxNo:'',
 
+        boxNoOther:'',
 
+        titleNo:'',
 
+        titleNoOther:'',
 
         inOutType: '',
 
         goodsName: '',
 
         warehouseInOutDetail: {},
 
@@ -833,7 +836,6 @@ export default {
 
     }
 
     this.deptBudgetList1.warehouseName = this.$route.query.warehouseName
 
     this.deptBudgetList1.binNumber = this.$route.query.binNumber
 
-    this.getList()
 
     this.dataList.id = this.$route.query.id
 
     this.dataList.grossWeight = Math.round(this.$route.query.grossWeight * 1000)
 
     this.dataList.contractNo = this.$route.query.contractNo
 
@@ -845,6 +847,10 @@ export default {
 
     this.dataList.netWeight = Math.round(this.$route.query.netWeight * 1000)
 
     this.dataList.grade = this.$route.query.grade
 
     this.dataList.agent = this.$route.query.agent
 
+    this.dataList.boxNo = this.$route.query.boxNo
 
+    this.dataList.boxNoOther = this.$route.query.boxNoOther
 
+    this.dataList.titleNo = this.$route.query.titleNo
 
+    this.dataList.titleNoOther = this.$route.query.titleNoOther
 
     this.dataList.carNo = this.$route.query.carNo
 
     this.dataList.inOutDate = this.$route.query.inOutDate
 
     this.dataList.contractNo = this.$route.query.contractNo
 
@@ -876,19 +882,11 @@ export default {
 
       this.isGetCost = true
 
       this.cost = this.dataList.cost
 
     }
 
-    getReceiptTaskNo({
 
-      flag: 2,
 
-      warehouseName: this.deptBudgetList1.warehouseName,
 
-      agentKey: localStorage.getItem('ws-pf_userId'),
 
-    })
 
-      .toPromise()
 
-      .then((response) => {
 
-        this.deptBudgetList2 = response
 
-      })
 
-      
+  this.getList()
 
     if(this.$route.query.automaticWeightAcquisition == '1'){
 
       this.openPort()
 
     }
 
+   
   },
 
   methods: {
 
     async closePort() {
 
@@ -1076,7 +1074,11 @@ export default {
 
       for (let i = 0; i < this.deptBudgetList2.length; i++) {
 
         if (this.deptBudgetList2[i].inOutTaskNo == e) {
 
           var data = this.deptBudgetList2[i]
 
-          this.dataList.contractNo = this.deptBudgetList2[i].contractNo
 
+          if (this.deptBudgetList2[i].contractNo) {
 
+            this.dataList.contractNo = this.deptBudgetList2[i].contractNo
 
+          } else {
 
+            this.dataList.contractNo = this.deptBudgetList2[i].moveTaskNo
 
+          }
 
         }
 
       }
 
       for (var i = 0; i < this.outContractNo.length; i++) {
 
@@ -1913,6 +1915,15 @@ export default {
 
         .then((response) => {
 
           this.goodnameList = response
 
         })
 
+          getReceiptTaskNo({
 
+      flag: 2,
 
+      warehouseName: this.deptBudgetList1.warehouseName,
 
+      agentKey: localStorage.getItem('ws-pf_userId'),
 
+    })
 
+      .toPromise()
 
+      .then((response) => {
 
+        this.deptBudgetList2 = response
 
+      })
 
       // 品级
 
       pullDown({
 
         constId: 'CON3',
 
@@ -1966,6 +1977,7 @@ export default {
 
         .then((response) => {
 
           this.options1 = response
 
           this.outContractNo = response
 
+        this.contractNoChange(this.dataList.inOutTaskNo)
 
         })
 
       //合同编号2
 
       xialaNo({
 
@@ -1997,6 +2009,7 @@ export default {
 
           this.staffList = response
 
           //  this.agent = response
 
         })
 
+
 
     },
 
     selecttaskType(e) {
 
       for (var i = 0; i < this.taskTypeList.length; i++) {

+ 21 - 12
src/views/warehouse/warehouseManagementNoWeightOut.vue
查看文件 

@@ -622,7 +622,6 @@ export default {
 
     }
 
     this.deptBudgetList1.warehouseName = this.$route.query.warehouseName
 
     this.deptBudgetList1.binNumber = this.$route.query.binNumber
 
-    this.getList()
 
     this.dataList.id = this.$route.query.id
 
     this.dataList.grossWeight = Math.round(this.$route.query.grossWeight * 1000)
 
     this.dataList.contractNo = this.$route.query.contractNo
 
@@ -632,12 +631,17 @@ export default {
 
     this.dataList.binNumber = this.$route.query.binNumber
 
     this.dataList.tare = Math.round(this.$route.query.tare * 1000)
 
     this.dataList.netWeight = Math.round(this.$route.query.netWeight * 1000)
 
+    this.dataList.boxNo = this.$route.query.boxNo
 
+    this.dataList.boxNoOther = this.$route.query.boxNoOther
 
+    this.dataList.titleNo = this.$route.query.titleNo
 
+    this.dataList.titleNoOther = this.$route.query.titleNoOther
 
     this.dataList.grade = this.$route.query.grade
 
     this.dataList.agent = this.$route.query.agent
 
     this.dataList.carNo = this.$route.query.carNo
 
     this.dataList.inOutDate = this.$route.query.inOutDate
 
     this.dataList.contractNo = this.$route.query.contractNo
 
     this.dataList.inOutType = this.$route.query.inOutType
 
+    this.dataList.inOutTaskNo = this.$route.query.inOutTaskNo
 
     this.dataList.compId = this.$route.query.compId
 
     this.dataList.goodsName = this.$route.query.goodsName
 
     this.dataList.goodsNameKey = Number(this.$route.query.goodsNameKey)
 
@@ -646,19 +650,10 @@ export default {
 
     this.dataList.statusFlag = this.$route.statusFlag
 
     this.dataList.warehouseInOutDetail = this.$route.query.warehouseInOutDetail
 
     console.log(this.dataList)
 
-    getReceiptTaskNo({
 
-      flag: 1,
 
-      warehouseName: this.deptBudgetList.warehouseName,
 
-      agentKey: localStorage.getItem('ws-pf_userId'),
 
-    })
 
-      .toPromise()
 
-      .then((response) => {
 
-        this.deptBudgetList2 = response
 
-      })
 
-      
     if(this.$route.query.automaticWeightAcquisition == '1'){
 
       this.openPort()
 
     }
 
+    this.getList()
 
   },
 
   methods: {
 
     async closePort() {
 
@@ -892,7 +887,11 @@ export default {
 
       for (let i = 0; i < this.deptBudgetList2.length; i++) {
 
         if (this.deptBudgetList2[i].inOutTaskNo == e) {
 
           var data = this.deptBudgetList2[i]
 
-          this.dataList.contractNo = this.deptBudgetList2[i].contractNo
 
+          if (this.deptBudgetList2[i].contractNo) {
 
+            this.dataList.contractNo = this.deptBudgetList2[i].contractNo
 
+          } else {
 
+            this.dataList.contractNo = this.deptBudgetList2[i].moveTaskNo
 
+          }
 
         }
 
       }
 
 
@@ -1517,6 +1516,15 @@ export default {
 
         .then((response) => {
 
           this.goodnameList = response
 
         })
 
+    getReceiptTaskNo({
 
+      flag: 1,
 
+      warehouseName: this.deptBudgetList.warehouseName,
 
+      agentKey: localStorage.getItem('ws-pf_userId'),
 
+    })
 
+      .toPromise()
 
+      .then((response) => {
 
+        this.deptBudgetList2 = response
 
+      })
 
       // 品级
 
       pullDown({
 
         constId: 'CON3',
 
@@ -1552,6 +1560,7 @@ export default {
 
         .toPromise()
 
         .then((response) => {
 
           this.outContractNo = response
 
+          this.contractNoChange(this.dataList.inOutTaskNo)
 
           for (let i = 0; i < response.length; i++) {
 
             if (this.dataList.contractNo == response[i].contractNo) {
 
               if (response[i].deliverType == '1') {

+ 1 - 4
src/views/warehouse/warehouseManagementPerfectput.vue
查看文件 

@@ -711,10 +711,7 @@ export default {
 
             this.isSelectType = true
 
           }
 
           if(this.outContractNo[i].priceType=='随行就市'){
 
-            this.isGetCost = false
 
-             this.dataList.cost = this.dataList.cost
 
-          }else{
 
-            this.isGetCost = true
 
+             this.disabled1 = !this.disabled1
 
           }
 
           if(this.outContractNo[i].tranCarInfoList){
 
             this.options2=this.outContractNo[i].tranCarInfoList

+ 12 - 1
src/views/warehouse/warehouseManagementPut.vue
查看文件 

@@ -1875,7 +1875,18 @@ export default {
 
       for (var i = 0; i < this.outContractNo.length; i++) {
 
         if (this.outContractNo[i].contractNo == e) {
 
           if (this.outContractNo[i].inOutType == '采购入库') {
 
-              this.deptBudgetList.tips='卖方'+this.outContractNo[i].seller+ '（ '+this.outContractNo[i].unitContractPrice+'元/吨）'
 
+           if(!this.outContractNo[i].unitContractPrice){
 
+              this.deptBudgetList.tips =
 
+              '卖方' +
 
+              this.outContractNo[i].seller
 
+            }else{
 
+              this.deptBudgetList.tips =
 
+              '卖方' +
 
+              this.outContractNo[i].seller +
 
+              '（ ' +
 
+              this.outContractNo[i].unitContractPrice +
 
+              '元/吨）'
 
+            }
 
               this.deptBudgetList.inOutTypeKey = 1
 
             } else if (this.outContractNo[i].inOutType == '移库入库') {
 
               if(this.outContractNo[i].unitContractPrice){

+ 7 - 1
src/views/warehouse/warehouseManagementTare.vue
查看文件 

@@ -998,12 +998,18 @@ export default {
 
           this.deptBudgetList.grade = this.outContractNo[i].grade
 
           this.deptBudgetList.inOutType = this.outContractNo[i].inOutType
 
           if (this.outContractNo[i].inOutType == '销售出库') {
 
-            this.deptBudgetList.tips =
 
+            if(!this.outContractNo[i].unitContractPrice){
 
+              this.deptBudgetList.tips =
 
+              '买方' +
 
+              this.outContractNo[i].buyer
 
+            }else{
 
+              this.deptBudgetList.tips =
 
               '买方' +
 
               this.outContractNo[i].buyer +
 
               '（ ' +
 
               this.outContractNo[i].unitContractPrice +
 
               '元/吨）'
 
+            }
 
             this.deptBudgetList.inOutTypeKey = 1
 
           } else if (this.outContractNo[i].inOutType == '移库出库') {
 
             this.deptBudgetList.goodsName = data.goodsName

+ 12 - 2
src/views/workNotification/utils/index.js
查看文件 

@@ -23,6 +23,8 @@ export function code2Url (type, code, state) {
 
       return payment(code, state)
 
     case 'TRADE':
 
       return warehouseReceiptRegulation(code, state)
 
+      case 'ROLE':
 
+      return stock(code, state)
 
     default:
 
       return ''
 
   }
 
@@ -150,7 +152,13 @@ export function checkMateriel (code, state) {
 
   }
 
   return url
 
 }
 
-
 
+export function stock (code, state) {
 
+  if (code === 'TRADE-WAREHOUSE-REPORT') {
 
+    // 现货入库统计
 
+    return 'stockPurchaseReceiptReportList'
 
+  }
 
+  return undefined
 
+}
 
 export function checkSparepart (code, state) {
 
   // 备件
 
   let url = ''
 
@@ -818,12 +826,14 @@ export function payment (code, state) {
 
   return undefined
 
 }
 
 export function warehouseReceiptRegulation (code, state) {
 
-  if (code === 'TRADE-WAREHOUSE-REPORT') {
 
+  if (code === 'STOCK-PROCUREMENT-RECEIPT-REPORT') {
 
     // 付款管理
 
     return 'stockWarehouseReceiptRegulation'
 
   }
 
   return undefined
 
 }
 
+
 
+
 
 // 调度
 
 export function checkDispatch (code, state) {
 
   let url = ''