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

public/static/inspection.html

@@ -130,20 +130,20 @@
           </tr>
           <tr class="row">
             <td class="col col-bgc">收货单位</td>
-            <td class="col" colspan="2">{{tableData.receivingUnit}}</td>
+            <td class="col" colspan="2">{{tableData.compName}}</td>
             <td class="col col-bgc">联系人</td>
-            <td class="col" colspan="2">{{tableData.contacts}}</td>
+            <td class="col" colspan="2">{{tableData.person}}</td>
             <td class="col col-bgc">联系电话</td>
-            <td class="col">{{tableData.contactsPhone}}</td>
+            <td class="col">{{tableData.personPhone}}</td>
           </tr>
           <tr class="row">
             <td class="col col-bgc">货名</td>
             <td class="col">{{tableData.goodsName}}</td>
             <td class="col col-bgc">类型</td>
-            <td class="col">{{tableData.customerName}}</td>
+            <td class="col">{{tableData.type}}</td>
             <td class="col col-bgc">容量（克/升）</td>
             <td class="col">{{tableData.bulkDensity}}</td>
-            <td class="col col-bgc">不完整粒（%）</td>
+            <td class="col col-bgc">不完善粒（%）</td>
             <td class="col">{{tableData.imperfectGrain}}</td>
           </tr>
           <tr class="row">
@@ -162,7 +162,7 @@
             <td class="col col-bgc">霉变粒（%）</td>
             <td class="col">{{tableData.mildewGrain}}</td>
             <td class="col col-bgc" colspan="2">购粮性质</td>
-            <td class="col" colspan="2">{{tableData.customerName}}</td>
+            <td class="col" colspan="2">{{tableData.natureOfGrainPurchase}}</td>
           </tr>
         </table>
         <div class="bottom">
@@ -203,15 +203,15 @@
         </div>
         <div class="small-row">
           <div>收货单位</div>
-          <div>{{tableData.receivingUnit}}</div>
+          <div>{{tableData.compName}}</div>
         </div>
         <div class="small-row">
           <div>联系人</div>
-          <div>{{tableData.contacts}}</div>
+          <div>{{tableData.person}}</div>
         </div>
         <div class="small-row">
           <div>联系电话</div>
-          <div>{{tableData.contactsPhone}}</div>
+          <div>{{tableData.personPhone}}</div>
         </div>
         <div class="small-row">
           <div>货名</div>
@@ -219,14 +219,14 @@
         </div>
         <div class="small-row">
           <div>类型</div>
-          <div>{{tableData.customerName}}</div>
+          <div>{{tableData.type}}</div>
         </div>
         <div class="small-row">
           <div>容量（克/升）</div>
           <div>{{tableData.bulkDensity}}</div>
         </div>
         <div class="small-row">
-          <div>不完整粒（%）</div>
+          <div>不完善粒（%）</div>
           <div>{{tableData.imperfectGrain}}</div>
         </div>
         <div class="small-row">
@@ -255,7 +255,7 @@
         </div>
         <div class="small-row">
           <div>购粮性质</div>
-          <div>{{tableData.customerName}}</div>
+          <div>{{tableData.natureOfGrainPurchase}}</div>
         </div>
         <div class="small-row">
           <div>质检</div>

public/static/weightCheck.html

@@ -146,7 +146,7 @@
             <td class="col">{{tableData.type}}</td>
             <td class="col col-bgc">容量（克/升）</td>
             <td class="col">{{tableData.qualityInspectionManagement.bulkDensity}}</td>
-            <td class="col col-bgc">不完整粒（%）</td>
+            <td class="col col-bgc">不完善粒（%）</td>
             <td class="col">{{tableData.qualityInspectionManagement.imperfectGrain}}</td>
           </tr>
           <tr class="row">
@@ -156,7 +156,7 @@
             <td class="col">{{tableData.qualityInspectionManagement.waterContent}}</td>
             <td class="col col-bgc">热损伤（%）</td>
             <td class="col">{{tableData.qualityInspectionManagement.jiaorenli}}</td>
-            <td class="col col-bgc" colspan="2">质检{{tableData.qualityInspectionManagement.suqualityTestingDate}}</td>
+            <td class="col col-bgc" colspan="2">质检&nbsp;&nbsp;{{tableData.qualityInspectionManagement.qualityDate}}</td>
           </tr>
           <tr class="row">
             <td class="col col-bgc">杂质（%）</td>

src/api/V2/houseSelfCollect/index.js

@@ -76,6 +76,7 @@ export const API_POST_PAYMENT_AUDIT = '/paymentManagement/api/openAuditFlow'
 export const API_POST_PAYMENT_PAYMENTSUBMIT = '/paymentManagement/api/payMoney'
 //付款结算修改
 export const API_POST_PAYMENT_SETTLEMENTEDIT = '/paymentManagement/api/editCollect'
-
+//付款结算修改
+export const API_GET_INSPECT_GETDRYGRAINPRICE = '/purchasePrice/dryGrainPrice'
 
 

src/api/V2/statisticalReport/index.js

@@ -1,64 +1,64 @@
-//采购入库报表
+//期货采购入库报表
 export const API_GET_PURCHRECEIPT = '/purchaseReceiptReport/selectPurchaseOrder'
-// 销售平仓合同
+// 期货销售平仓合同
 export const API_GET_SALE_CONTRACTNO = '/salesClosingReport/selectContractNoList'
-// 销售出库合同
+// 期货销售出库合同
 export const API_GET_SALE_OUT_CONTRACTNO = '/salesDeliveryReport/selectContractNoList'
-// 采购平仓合同
+// 期货采购平仓合同
 export const API_GET_PURCHASE_CONTRACTNO = '/purchaseClosingReport/selectContractNoList'
-// 采购入库合同
+// 期货采购入库合同
 export const API_GET_PURCHASE_IN_CONTRACTNO = '/purchaseReceiptReport/selectContractNoList'
-// 采购入库修改
+// 期货采购入库修改
 export const API_POST_AMEND_PURCHRECEIPT = '/purchaseReceiptReport/api/editProcurementReceiptReport'
-// 采购入库补货结转
+// 期货采购入库补货结转
 export const API_POST_REPLANISHENT = '/purchaseReceiptReport/api/replenishment'
-// 采购入库补货结转其他合同
+// 期货采购入库补货结转其他合同
 export const API_GET_SELECTCONTRACTNO = '/purchaseReceiptReport/selectContractNo'
-// 采购入库审核
+// 期货采购入库审核
 export const API_POST_AUDIT = '/purchaseReceiptReport/api/examinePurchaseOrder'
-// 采购入库付款
+// 期货采购入库付款
 export const API_POST_PAYMONEY = '/purchaseReceiptReport/api/payMoney'
-// 采购订单flag0 补充定金 1解冻定金 2完成 3更改基差
+// 期货采购订单flag0 补充定金 1解冻定金 2完成 3更改基差
 export const API_POST_EDITSTATUS = '/purchaseOrder/api/editStatus'
-//采购状态，基差，单价修改 
+//期货采购状态，基差，单价修改 
 export const API_POST_PROCUREMENT_EDITSTATUS = '/procurementPlanInfo/api/editStatus'
-// 采购订单删除
+// 期货采购订单删除
 export const API_POST_DELETEPURCHASE = '/purchaseOrder/api/deletePurchaseOrder'
-// 采购入库报表头部信息
+// 期货采购入库报表头部信息
 export const API_GET_SELECTORDER= '/purchaseReceiptReport/selectOrder'
-// 销售平仓审核、通过、驳回
+// 期货销售平仓审核、通过、驳回
 export const API_POST_SALE_EXAMINE ='/salesClosingReport/api/examine'
-// 销售平仓列表
+// 期货销售平仓列表
 export const API_GET_SALE_LIST ='/salesClosingReport/selectSalesClosingOrder'
-// 销售平仓付款
+// 期货销售平仓付款
 export const API_POST_PAY_MONEY ='/salesClosingReport/api/payMoney'
-// 销售平仓收款
+// 期货销售平仓收款
 export const API_POST_COLLECT_MONEY ='/salesClosingReport/api/collectMoney'
-//采购平仓报表
+//期货采购平仓报表
 export const API_GET_CLOSE = '/purchaseClosingReport/selectPurchaseOrder'
-//采购平仓审核
+//期货采购平仓审核
 export const API_POST_CLOAEAUDIT = '/purchaseClosingReport/api/examine'
-//采购平仓付款
+//期货采购平仓付款
 export const API_POST_CLOSEPAYMONEY = '/purchaseClosingReport/api/payMoney'
-//采购平仓收款
+//期货采购平仓收款
 export const API_POST_CLOSECOLLMONEY = '/purchaseClosingReport/api/collectMoney'
-//采购入库开发票
+//期货采购入库开发票
 export const API_POST_OPENINVOICE = '/purchaseReceiptReport/api/openInvoice'
-//采购入库批量开发票
+//期货采购入库批量开发票
 export const API_POST_BATCHOPENINVOICE = '/purchaseReceiptReport/api/openInvoiceList'
-//销售出库报表
+//期货销售出库报表
 export const API_GET_SALELIST = '/salesDeliveryReport/selectSalesDeliveryReport'
-// 销售出库出纳收款
+// 期货销售出库出纳收款
 export const API_POST_CASHIER_PAYMENT = '/salesDeliveryReport/api/collectMoney'
-// 销售出库开发票
+// 期货销售出库开发票
 export const API_POST_SALES_INVOICING = '/salesDeliveryReport/api/openInvoice'
-// 销售出库批量开发票
+// 期货销售出库批量开发票
 export const API_POST_SALES_BATCH_INVOICING = '/salesDeliveryReport/api/openInvoiceList'
-// 销售出库最终结算价
+// 期货销售出库最终结算价
 export const API_POST_FINAL_SETTLEMENT_PRICE = '/salesDeliveryReport/api/editSalesDeliveryReport'
-// 销售出库审核
+// 期货销售出库审核
 export const API_POST_ISSUE_APPROVAL = '/salesDeliveryReport/api/examineSalesDeliveryReport'
-// 销售出库报表头部信息
+// 期货销售出库报表头部信息
 export const API_GET_SELECTSALEORDER= '/salesDeliveryReport/selectOrder'
 // 汽运结算报表
 export const API_GET_AUTOSETTLEMENT= '/tranSettlementReport/selectTranSettlementReport'
@@ -69,4 +69,15 @@ export const API_GET_AUTOCONTRACT= '/tranSettlementReport/selectContractNoList'
 // 汽运结算报表付款
 export const API_POST_AUTOPAYMONEY= '/tranSettlementReport/api/payMoney'
 // 汽运结算报表批量开发票
-export const API_POST_OPENINVOICELIST= '/tranSettlementReport/api/openInvoiceList'
+export const API_POST_OPENINVOICELIST= '/tranSettlementReport/api/openInvoiceList'
+
+//现货采购入库报表
+export const API_GET_STOCKPURCHASERECEIPT = '/stockPurchaseReceiptReport/selectPurchaseOrder'
+//现货采购入库付款
+export const API_POST_STOCKPURCHASEPAYMONEY = '/stockPurchaseReceiptReport/api/payMoney'
+//现货采购入库 定金/备注
+export const API_POST_ADDDISORREMARKS = '/stockPurchaseReceiptReport/api/disAndRemark'
+//现货采购入库修改结算重量
+export const API_POST_EDITSETTLEMENTWEIGHT = '/stockPurchaseReceiptReport/api/edit'
+//现货采购入库合同
+export const API_GET_STOCK_PURCHASE_CONTRACTNO = '/stockPurchaseReceiptReport/selectContractNoList'

src/lang/zh.js

@@ -534,11 +534,13 @@ export default {
     salesOrderList: '销售订单',
     //统计报表
     statisticalReport:'统计报表',
-    purchaseReceiptStatisticsList:'采购入库报表',
-    purchaseClosingCashierList:'采购平仓报表',
-    salesDeliveryReportList:'销售出库报表',
-    salesClosingCashierList:'销售平仓报表',
+    purchaseReceiptStatisticsList:'期货采购入库报表',
+    purchaseClosingCashierList:'期货采购平仓报表',
+    salesDeliveryReportList:'期货销售出库报表',
+    salesClosingCashierList:'期货销售平仓报表',
     autoSettlementList:'汽运结算报表',
+    stockSaleOutReportList:'现货销售出库报表',
+    stockPurchaseReceiptReportList:'现货采购入库报表',
     // 财务管理
     financialManagement:'财务管理',
     collectionManagementList:'收款管理',
@@ -4827,11 +4829,12 @@ export default {
   //统计管理
 
   statisticalReport:{
-    purchaseReceiptStatisticsList:'采购入库报表',
-    purchaseClosingCashierList:'采购平仓报表',
-    salesDeliveryReportList:'销售出库报表',
-    salesClosingCashierList:'销售平仓报表',
-
+    purchaseReceiptStatisticsList:'期货采购入库报表',
+    purchaseClosingCashierList:'期货采购平仓报表',
+    salesDeliveryReportList:'期货销售出库报表',
+    salesClosingCashierList:'期货销售平仓报表',
+    stockSaleOutReportList:'现货销售出库报表',
+    stockPurchaseReceiptReportList:'现货采购入库报表'
   },
   financialManagement:{
     collectionManagementList:'收款管理',

src/model/houseSelfCollect/index.js

@@ -40,7 +40,8 @@ import {
   API_POST_PAYMENT_PAYMENTSUBMIT,
   API_POST_PAYMENT_SETTLEMENTEDIT,
   API_GET_CUSTOMER_CODE,
-  API_GET_CUSTOMER_CODEJY
+  API_GET_CUSTOMER_CODEJY,
+  API_GET_INSPECT_GETDRYGRAINPRICE
 } from '@/api/V2/houseSelfCollect'
 //客户管理列表
 export const getCustomerManage = appRx.get(API_GET_CUSTOMER_MANAGE, errorCatcher, errorHandle, filter)
@@ -120,3 +121,5 @@ export const auditpayment  = appRx.post(API_POST_PAYMENT_AUDIT, errorCatcher, er
 export const paymentCommit = appRx.post(API_POST_PAYMENT_PAYMENTSUBMIT, errorCatcher, errorHandle, filter)
 //付款结算修改
 export const settlementEdit = appRx.post(API_POST_PAYMENT_SETTLEMENTEDIT, errorCatcher, errorHandle, filter)
+//质检干粮单价查看
+export const getDryGrainPrice = appRx.get(API_GET_INSPECT_GETDRYGRAINPRICE, errorCatcher, errorHandle, filter)

src/model/statisticalReport/index.js

@@ -33,66 +33,71 @@ import {
     API_POST_EDITAUTOSETTLEMENT,
     API_GET_AUTOCONTRACT,
     API_POST_AUTOPAYMONEY,
-    API_POST_OPENINVOICELIST
+    API_POST_OPENINVOICELIST,
+    API_GET_STOCKPURCHASERECEIPT,
+    API_POST_STOCKPURCHASEPAYMONEY,
+    API_POST_ADDDISORREMARKS,
+    API_POST_EDITSETTLEMENTWEIGHT,
+    API_GET_STOCK_PURCHASE_CONTRACTNO,
 } from '@/api/V2/statisticalReport'
-//采购入库报表
+//期货采购入库报表
 export const getpurchreceipt = appRx.get(API_GET_PURCHRECEIPT, errorCatcher, errorHandle, filter)
-//销售平仓合同
+//期货销售平仓合同
 export const getsaleclosingcontractno = appRx.get(API_GET_SALE_CONTRACTNO, errorCatcher, errorHandle, filter)
-//销售出库合同
+//期货销售出库合同
 export const getsaleoutcontractno = appRx.get(API_GET_SALE_OUT_CONTRACTNO, errorCatcher, errorHandle, filter)
-//采购平仓合同
+//期货采购平仓合同
 export const getpurchasecontractno = appRx.get(API_GET_PURCHASE_CONTRACTNO, errorCatcher, errorHandle, filter)
-//采购入库合同
+//期货采购入库合同
 export const getpurchaseincontractno = appRx.get(API_GET_PURCHASE_IN_CONTRACTNO, errorCatcher, errorHandle, filter)
-//采购入库修改
+//期货采购入库修改
 export const postamend = appRx.post(API_POST_AMEND_PURCHRECEIPT, errorCatcher, errorHandle, filter)
-//采购入库补货结转
+//期货采购入库补货结转
 export const postreplanishent = appRx.post(API_POST_REPLANISHENT, errorCatcher, errorHandle, filter)
-//采购入库补货结转其他合同
+//期货采购入库补货结转其他合同
 export const getselectctcontractno = appRx.get(API_GET_SELECTCONTRACTNO, errorCatcher, errorHandle, filter)
-//采购入库审核
+//期货采购入库审核
 export const postaudit = appRx.post(API_POST_AUDIT, errorCatcher, errorHandle, filter)
-//采购入库付款
+//期货采购入库付款
 export const postpaymoney = appRx.post(API_POST_PAYMONEY, errorCatcher, errorHandle, filter)
-//采购入库报表头部
+//期货采购入库报表头部
 export const getorder = appRx.get(API_GET_SELECTORDER, errorCatcher, errorHandle, filter)
-//销售平仓审核
+//期货销售平仓审核
 export const postsaleaudit = appRx.post(API_POST_SALE_EXAMINE, errorCatcher, errorHandle, filter)
-//销售平仓列表
+//期货销售平仓列表
 export const getsalelist = appRx.get(API_GET_SALE_LIST, errorCatcher, errorHandle, filter)
-//销售平仓付款
+//期货销售平仓付款
 export const postsalepaymoney= appRx.post(API_POST_PAY_MONEY, errorCatcher, errorHandle, filter)
-//销售平仓收款
+//期货销售平仓收款
 export const postsalecollectmoney= appRx.post(API_POST_COLLECT_MONEY, errorCatcher, errorHandle, filter)
-//采购平仓报表
+//期货采购平仓报表
 export const getclose = appRx.get(API_GET_CLOSE, errorCatcher, errorHandle, filter)
-//采购平仓审核
+//期货采购平仓审核
 export const closeaudit = appRx.post(API_POST_CLOAEAUDIT, errorCatcher, errorHandle, filter)
-//采购平仓付款
+//期货采购平仓付款
 export const closepaymoney = appRx.post(API_POST_CLOSEPAYMONEY, errorCatcher, errorHandle, filter)
-//采购平仓收款
+//期货采购平仓收款
 export const closecollmoney = appRx.post(API_POST_CLOSECOLLMONEY, errorCatcher, errorHandle, filter)
-//采购入库开发票
+//期货采购入库开发票
 export const postopeninvoice = appRx.post(API_POST_OPENINVOICE, errorCatcher, errorHandle, filter)
-//采购入库批量开发票
+//期货采购入库批量开发票
 export const postbatchopeninvoice = appRx.post(API_POST_BATCHOPENINVOICE, errorCatcher, errorHandle, filter)
 
 
 
-//销售出库报表
+//期货销售出库报表
 export const salelist = appRx.get(API_GET_SALELIST, errorCatcher, errorHandle, filter)
-//销售出库出纳收款
+//期货销售出库出纳收款
 export const cashierpayment = appRx.post(API_POST_CASHIER_PAYMENT, errorCatcher, errorHandle, filter)
-//销售出库开发票
+//期货销售出库开发票
 export const salesinvoicing = appRx.post(API_POST_SALES_INVOICING, errorCatcher, errorHandle, filter)
-//销售出库批量开发票
+//期货销售出库批量开发票
 export const salesbatchinvoicing = appRx.post(API_POST_SALES_BATCH_INVOICING, errorCatcher, errorHandle, filter)
-//销售出库最终结算价
+//期货销售出库最终结算价
 export const finalsettlementprice = appRx.post(API_POST_FINAL_SETTLEMENT_PRICE, errorCatcher, errorHandle, filter)
-//销售出库审核
+//期货销售出库审核
 export const issueapproval = appRx.post(API_POST_ISSUE_APPROVAL, errorCatcher, errorHandle, filter)
-//销售出库报表头部
+//期货销售出库报表头部
 export const getsaleorder = appRx.get(API_GET_SELECTSALEORDER, errorCatcher, errorHandle, filter)
 
 
@@ -106,4 +111,16 @@ export const autocontract = appRx.get(API_GET_AUTOCONTRACT, errorCatcher, errorH
 // 汽运结算报表付款
 export const autopaymoney = appRx.post(API_POST_AUTOPAYMONEY, errorCatcher, errorHandle, filter)
 // 汽运结算报表批量开发票
-export const openinvoicelist = appRx.post(API_POST_OPENINVOICELIST, errorCatcher, errorHandle, filter)
+export const openinvoicelist = appRx.post(API_POST_OPENINVOICELIST, errorCatcher, errorHandle, filter)
+
+
+//现货采购入库报表
+export const getStockPurchaseReceiptList = appRx.get(API_GET_STOCKPURCHASERECEIPT, errorCatcher, errorHandle, filter)
+//现货采购入库付款
+export const stockPurchasePayMoney = appRx.post(API_POST_STOCKPURCHASEPAYMONEY, errorCatcher, errorHandle, filter)
+//现货采购入库 定金/备注
+export const addDisOrRemarks = appRx.post(API_POST_ADDDISORREMARKS, errorCatcher, errorHandle, filter)
+//现货采购入库修改结算重量
+export const editSettlementWeight = appRx.post(API_POST_EDITSETTLEMENTWEIGHT, errorCatcher, errorHandle, filter)
+//现货采购入库合同编号下拉
+export const getStockPurchaseContractNoList = appRx.get(API_GET_STOCK_PURCHASE_CONTRACTNO, errorCatcher, errorHandle, filter)

src/router/index.js

@@ -4,7 +4,7 @@ import page from '@/config/page'
 import store from '@/vendors/vuex'
 import { renewalHead } from '@/model/indexRx'
 
-
+import { clearStorage } from '../utils/auth'
 Vue.use(Router)
 
 // 组件实验室
@@ -217,6 +217,11 @@ router.beforeEach(async (to, from, next) => {
     renewalHead(data).toPromise().then(() => {
       next()
     })
+    .catch((err) => {
+      clearStorage()
+      resetRouter()
+      next(`/login?redirect=${to.path}`);
+    })
   } else {
     next()
   }

src/store/modules/permission.js

@@ -1,11 +1,12 @@
 import {
   asyncRoutes,
-  constantRoutes
+  constantRoutes,
+  resetRouter
 } from '@/router';
 import {
   getRoule
 } from '@/model/indexRx'
-
+import { clearStorage } from '../../utils/auth'
 /**
  * 递归过滤异步路由表，返回符合用户角色权限的路由表
  * @param routes asyncRoutes
@@ -123,6 +124,12 @@ const actions = {
   }) {
     return new Promise(async resolve => {
       const data = await getRoule().toPromise()
+      .catch((err) => {
+        clearStorage()
+        resetRouter()
+        window.location.href="https://www.eliangeyun.com"
+      })
+        
       const roles = [];
       handleRoles(data, roles, '');
       // console.log(roles)

src/views/contractManagement/futuresPurchaseContractAdd.vue

@@ -420,8 +420,8 @@
           />
         </ws-form-item>
 
-        <!--容量（克/升）>=-->
-        <ws-form-item label="容量（克/升）" span="1" prop="bulkDensity">
+        <!--容重(克/升)>=-->
+        <ws-form-item label="容重(克/升)>=" span="1" prop="bulkDensity">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.bulkDensity"
             placeholder="请输入容重"
@@ -449,17 +449,17 @@
             size="small"
           />
         </ws-form-item>
-        <!--不完整粒（%）<=-->
-        <ws-form-item label="不完整粒（%）" span="1" prop="imperfectGrain">
+        <!--不完善粒（%）<=-->
+        <ws-form-item label="不完善粒（%）<=" span="1" prop="imperfectGrain">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.imperfectGrain"
-            placeholder="请输入不完整粒占比（%）"
+            placeholder="请输入不完善粒占比（%）"
             maxlength="100"
             size="small"
           />
         </ws-form-item>
         <!--蛋白（%）>=-->
-        <ws-form-item label="蛋白（%）" span="1" prop="protein">
+        <ws-form-item label="蛋白（%）>=" span="1" prop="protein">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.protein"
             placeholder="请输入蛋白占比（%）"
@@ -1335,7 +1335,7 @@ export default {
             2||this.deptBudgetList.contractGoodsInfo.imperfectGrain>40||this.deptBudgetList.contractGoodsInfo.imperfectGrain<0)
       ) {
         this.$message({
-          message: '不完整粒输入错误',
+          message: '不完善粒输入错误',
           type: 'warning',
         })
         return

src/views/contractManagement/futuresPurchaseContractEdit.vue

@@ -418,8 +418,8 @@
           />
         </ws-form-item>
 
-        <!--容量（克/升）>=-->
-        <ws-form-item label="容量（克/升）" span="1" prop="bulkDensity">
+        <!--容重(克/升)>=-->
+        <ws-form-item label="容重(克/升)>=" span="1" prop="bulkDensity">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.bulkDensity"
             placeholder="请输入容重"
@@ -447,17 +447,17 @@
             size="small"
           />
         </ws-form-item>
-        <!--不完整粒（%）<=-->
-        <ws-form-item label="不完整粒（%）" span="1" prop="imperfectGrain">
+        <!--不完善粒（%）<=-->
+        <ws-form-item label="不完善粒（%）<=" span="1" prop="imperfectGrain">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.imperfectGrain"
-            placeholder="请输入不完整粒占比（%）"
+            placeholder="请输入不完善粒占比（%）"
             maxlength="100"
             size="small"
           />
         </ws-form-item>
         <!--蛋白（%）>=-->
-        <ws-form-item label="蛋白（%）" span="1" prop="protein">
+        <ws-form-item label="蛋白（%）>=" span="1" prop="protein">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.protein"
             placeholder="请输入蛋白占比（%）"
@@ -1478,7 +1478,7 @@ export default {
             2||this.deptBudgetList.contractGoodsInfo.imperfectGrain>40||this.deptBudgetList.contractGoodsInfo.imperfectGrain<0)
       ) {
         this.$message({
-          message: '不完整粒输入错误',
+          message: '不完善粒输入错误',
           type: 'warning',
         })
         return

src/views/contractManagement/futuresPurchaseContractExamine.vue

@@ -167,7 +167,7 @@
         <ws-form-item label="杂质（%）<=" span="1" prop="impurity">
           {{ deptBudgetList.contractGoodsInfo.impurity }}
         </ws-form-item>
-        <ws-form-item label="容重（克/升）<=" span="1" prop="bulkDensity">
+        <ws-form-item label="容重(克/升)>=" span="1" prop="bulkDensity">
           {{ deptBudgetList.contractGoodsInfo.bulkDensity }}
         </ws-form-item>
         <ws-form-item

src/views/contractManagement/futuresSalesContractAdd.vue

@@ -412,8 +412,8 @@
           />
         </ws-form-item>
 
-        <!--容量（克/升）>=-->
-        <ws-form-item label="容量（克/升）" span="1" prop="bulkDensity">
+        <!--容重(克/升)>=-->
+        <ws-form-item label="容重(克/升)>=" span="1" prop="bulkDensity">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.bulkDensity"
             placeholder="请输入容重"
@@ -441,17 +441,17 @@
             size="small"
           />
         </ws-form-item>
-        <!--不完整粒（%）<=-->
-        <ws-form-item label="不完整粒（%）" span="1" prop="imperfectGrain">
+        <!--不完善粒（%）<=-->
+        <ws-form-item label="不完善粒（%）<=" span="1" prop="imperfectGrain">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.imperfectGrain"
-            placeholder="请输入不完整粒占比（%）"
+            placeholder="请输入不完善粒占比（%）"
             maxlength="100"
             size="small"
           />
         </ws-form-item>
         <!--蛋白（%）>=-->
-        <ws-form-item label="蛋白（%）" span="1" prop="protein">
+        <ws-form-item label="蛋白（%）>=" span="1" prop="protein">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.protein"
             placeholder="请输入蛋白占比（%）"
@@ -1314,7 +1314,7 @@ export default {
             2||this.deptBudgetList.contractGoodsInfo.imperfectGrain>40||this.deptBudgetList.contractGoodsInfo.imperfectGrain<0)
       ) {
         this.$message({
-          message: '不完整粒输入错误',
+          message: '不完善粒输入错误',
           type: 'warning',
         })
         return

src/views/contractManagement/futuresSalesContractEdit.vue

@@ -412,8 +412,8 @@
           />
         </ws-form-item>
 
-        <!--容量（克/升）>=-->
-        <ws-form-item label="容量（克/升）" span="1" prop="bulkDensity">
+        <!--容重(克/升)>=-->
+        <ws-form-item label="容重(克/升)>=" span="1" prop="bulkDensity">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.bulkDensity"
             placeholder="请输入容重"
@@ -441,17 +441,17 @@
             size="small"
           />
         </ws-form-item>
-        <!--不完整粒（%）<=-->
-        <ws-form-item label="不完整粒（%）" span="1" prop="imperfectGrain">
+        <!--不完善粒（%）<=-->
+        <ws-form-item label="不完善粒（%）<=" span="1" prop="imperfectGrain">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.imperfectGrain"
-            placeholder="请输入不完整粒占比（%）"
+            placeholder="请输入不完善粒占比（%）"
             maxlength="100"
             size="small"
           />
         </ws-form-item>
         <!--蛋白（%）>=-->
-        <ws-form-item label="蛋白（%）" span="1" prop="protein">
+        <ws-form-item label="蛋白（%）>=" span="1" prop="protein">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.protein"
             placeholder="请输入蛋白占比（%）"
@@ -1440,7 +1440,7 @@ export default {
             2||this.deptBudgetList.contractGoodsInfo.imperfectGrain>40||this.deptBudgetList.contractGoodsInfo.imperfectGrain<0)
       ) {
         this.$message({
-          message: '不完整粒输入错误',
+          message: '不完善粒输入错误',
           type: 'warning',
         })
         return

src/views/contractManagement/futuresSalesContractExamine.vue

@@ -164,7 +164,7 @@
         <ws-form-item label="杂质（%）<=" span="1" prop="impurity">
           {{ deptBudgetList.contractGoodsInfo.impurity }}
         </ws-form-item>
-        <ws-form-item label="容重（克/升）<=" span="1" prop="bulkDensity">
+        <ws-form-item label="容重(克/升)>=" span="1" prop="bulkDensity">
           {{ deptBudgetList.contractGoodsInfo.bulkDensity }}
         </ws-form-item>
         <ws-form-item

src/views/contractManagement/purchaseContractAdd.vue

@@ -397,8 +397,8 @@
           />
         </ws-form-item>
 
-        <!--容量（克/升）>=-->
-        <ws-form-item label="容量（克/升）" span="1" prop="bulkDensity">
+        <!--容重(克/升)>=-->
+        <ws-form-item label="容重(克/升)>=" span="1" prop="bulkDensity">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.bulkDensity"
             placeholder="请输入容重"
@@ -426,11 +426,11 @@
             size="small"
           />
         </ws-form-item>
-        <!--不完整粒（%）<=-->
-        <ws-form-item label="不完整粒（%）" span="1" prop="imperfectGrain">
+        <!--不完善粒（%）<=-->
+        <ws-form-item label="不完善粒（%）<=" span="1" prop="imperfectGrain">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.imperfectGrain"
-            placeholder="请输入不完整粒占比（%）"
+            placeholder="请输入不完善粒占比（%）"
             maxlength="100"
             size="small"
           />
@@ -1198,7 +1198,7 @@ export default {
             2||this.deptBudgetList.contractGoodsInfo.imperfectGrain>40||this.deptBudgetList.contractGoodsInfo.imperfectGrain<0)
       ) {
         this.$message({
-          message: '不完整粒输入错误',
+          message: '不完善粒输入错误',
           type: 'warning',
         })
         return

src/views/contractManagement/purchaseContractEdit.vue

@@ -360,7 +360,7 @@
               size="small"
             />
           </ws-form-item>
-          <ws-form-item label="容重（克/升）<=" span="1" prop="bulkDensity">
+          <ws-form-item label="容重(克/升)>=" span="1" prop="bulkDensity">
             <ws-input
               v-model="deptBudgetList.contractGoodsInfo.bulkDensity"
               placeholder="请输入容重"
@@ -397,7 +397,7 @@
           >
             <ws-input
               v-model="deptBudgetList.contractGoodsInfo.imperfectGrain"
-              placeholder="请输入不完整粒占比（%）"
+              placeholder="请输入不完善粒占比（%）"
               maxlength="100"
               size="small"
             />
@@ -1280,7 +1280,7 @@ export default {
             2||this.deptBudgetList.contractGoodsInfo.imperfectGrain>40||this.deptBudgetList.contractGoodsInfo.imperfectGrain<0)
       ) {
         this.$message({
-          message: '不完整粒输入错误',
+          message: '不完善粒输入错误',
           type: 'warning',
         })
         return

src/views/contractManagement/purchaseContractExamine.vue

@@ -161,7 +161,7 @@
         <ws-form-item label="杂质（%）<=" span="1" prop="impurity">
           {{ deptBudgetList.contractGoodsInfo.impurity }}
         </ws-form-item>
-        <ws-form-item label="容重（克/升）<=" span="1" prop="bulkDensity">
+        <ws-form-item label="容重(克/升)>=" span="1" prop="bulkDensity">
           {{ deptBudgetList.contractGoodsInfo.bulkDensity }}
         </ws-form-item>
         <ws-form-item

src/views/contractManagement/salesContractAdd.vue

@@ -402,8 +402,8 @@
             />
           </ws-form-item>
 
-          <!--容量（克/升）>=-->
-          <ws-form-item label="容量（克/升）" span="1" prop="bulkDensity">
+          <!--容重(克/升)>=-->
+          <ws-form-item label="容重(克/升)>=" span="1" prop="bulkDensity">
             <ws-input
               v-model="deptBudgetList.contractGoodsInfo.bulkDensity"
               placeholder="请输入容重"
@@ -431,11 +431,11 @@
               size="small"
             />
           </ws-form-item>
-          <!--不完整粒（%）<=-->
-          <ws-form-item label="不完整粒（%）" span="1" prop="imperfectGrain">
+          <!--不完善粒（%）<=-->
+          <ws-form-item label="不完善粒（%）<=" span="1" prop="imperfectGrain">
             <ws-input
               v-model="deptBudgetList.contractGoodsInfo.imperfectGrain"
-              placeholder="请输入不完整粒占比（%）"
+              placeholder="请输入不完善粒占比（%）"
               maxlength="40"
               size="small"
             />
@@ -1180,7 +1180,7 @@ export default {
             2||this.deptBudgetList.contractGoodsInfo.imperfectGrain>40||this.deptBudgetList.contractGoodsInfo.imperfectGrain<0)
       ) {
         this.$message({
-          message: '不完整粒输入错误',
+          message: '不完善粒输入错误',
           type: 'warning',
         })
         return

src/views/contractManagement/salesContractEdit.vue

@@ -371,11 +371,11 @@
             />
           </ws-form-item>
 
-          <!--容量（克/升）>=-->
-          <ws-form-item label="容量（克/升）" span="1" prop="contractNo">
+          <!--容重(克/升)>=-->
+          <ws-form-item label="容重(克/升)>=" span="1" prop="contractNo">
             <ws-input
               v-model="deptBudgetList.contractGoodsInfo.bulkDensity"
-              placeholder="请输入容量（克/升）"
+              placeholder="请输入容重(克/升)"
               maxlength="100"
               size="small"
             />
@@ -400,11 +400,11 @@
               size="small"
             />
           </ws-form-item>
-          <!--不完整粒（%）<=-->
-          <ws-form-item label="不完整粒（%）" span="1" prop="contractNo">
+          <!--不完善粒（%）<=-->
+          <ws-form-item label="不完善粒（%）<=" span="1" prop="contractNo">
             <ws-input
               v-model="deptBudgetList.contractGoodsInfo.imperfectGrain"
-              placeholder="请输入不完整粒（%）"
+              placeholder="请输入不完善粒（%）"
               maxlength="100"
               size="small"
             />
@@ -1247,7 +1247,7 @@ export default {
             2||this.deptBudgetList.contractGoodsInfo.imperfectGrain>40||this.deptBudgetList.contractGoodsInfo.imperfectGrain<0)
       ) {
         this.$message({
-          message: '不完整粒输入错误',
+          message: '不完善粒输入错误',
           type: 'warning',
         })
         return

src/views/contractManagement/salesContractExamine.vue

@@ -233,7 +233,7 @@
               {{ deptBudgetList.contractGoodsInfo.impurity }}
             </div>
           </ws-form-item>
-          <ws-form-item label="容重（克/升）<=" span="1" prop="bulkDensity">
+          <ws-form-item label="容重(克/升)>=" span="1" prop="bulkDensity">
             <div class="unchanged">
               {{ deptBudgetList.contractGoodsInfo.bulkDensity }}
             </div>

src/views/home/service.js

@@ -602,6 +602,8 @@ export default {
         isTask: isTask ? 1 : 0
       }
       getRoule().toPromise().then(response => {
+        
+        debugger
         let list = []
         response.forEach(item => {
           if (item.name === 'crewManagement') {

src/views/houseSelfCollect/acquisitionManagement.vue

@@ -46,7 +46,7 @@
         <el-table-column prop="saleLimit" label="销量上限(年/吨)"></el-table-column>
         <el-table-column prop="dryGrainPrice" label="干粮收购价"></el-table-column>
         <el-table-column prop="status" label="状态"></el-table-column>
-        <el-table-column prop="passDate" label="通过时间"></el-table-column>
+        <el-table-column prop="updateDate" label="通过时间"></el-table-column>
         <el-table-column label="操作" width="300">
           <template slot-scope="scope">
             <el-button size="mini" @click="newAcquisition(scope.$index, scope.row,'查看')">查看</el-button>

src/views/houseSelfCollect/component/inspectInfoPrint.vue

@@ -23,10 +23,10 @@
         <td class="col col-bgc">货名</td>
         <td class="col">{{ printData.goodsName }}</td>
         <td class="col col-bgc">类型</td>
-        <td class="col">{{ printData.customerName }}</td>
+        <td class="col">{{ printData.type }}</td>
         <td class="col col-bgc">容量（克/升）</td>
         <td class="col">{{ printData.bulkDensity }}</td>
-        <td class="col col-bgc">不完整粒（%）</td>
+        <td class="col col-bgc">不完善粒（%）</td>
         <td class="col">{{ printData.imperfectGrain }}</td>
       </tr>
       <tr class="row">
@@ -45,7 +45,7 @@
         <td class="col col-bgc">霉变粒（%）</td>
         <td class="col">{{ printData.mildewGrain }}</td>
         <td class="col col-bgc" colspan="2">购粮性质</td>
-        <td class="col" colspan="2">{{ printData.customerName }}</td>
+        <td class="col" colspan="2">{{ printData.natureOfGrainPurchase }}</td>
       </tr>
     </table>
     <div class="bottom">

src/views/houseSelfCollect/component/weightCheckPrint.vue

@@ -26,7 +26,7 @@
             <td class="col">{{tableData.type}}</td>
             <td class="col col-bgc">容量（克/升）</td>
             <td class="col">{{tableData.qualityInspectionManagement.bulkDensity}}</td>
-            <td class="col col-bgc">不完整粒（%）</td>
+            <td class="col col-bgc">不完善粒（%）</td>
             <td class="col">{{tableData.qualityInspectionManagement.imperfectGrain}}</td>
           </tr>
           <tr class="row">
@@ -36,7 +36,7 @@
             <td class="col">{{tableData.qualityInspectionManagement.waterContent}}</td>
             <td class="col col-bgc">热损伤（%）</td>
             <td class="col">{{tableData.qualityInspectionManagement.jiaorenli}}</td>
-            <td class="col col-bgc" colspan="2">质检{{tableData.qualityInspectionManagement.suqualityTestingDate}}</td>
+            <td class="col col-bgc" colspan="2">质检&nbsp;&nbsp;{{tableData.qualityInspectionManagement.qualityDate}}</td>
           </tr>
           <tr class="row">
             <td class="col col-bgc">杂质（%）</td>

src/views/houseSelfCollect/customerManagement.vue

@@ -39,7 +39,11 @@
       <el-table-column prop="customerName" label="客户"></el-table-column>
       <el-table-column prop="customerPhone" label="手机号"></el-table-column>
       <el-table-column prop="bankCard" label="银行卡号"></el-table-column>
-      <el-table-column prop="bankDeposit" label="开户行"></el-table-column>
+      <el-table-column prop="bankDeposit" label="开户行">
+        <template slot-scope="scope">
+          <div>{{scope.row.bankDeposit}}-{{scope.row.bankDepositBranch}}</div> 
+        </template>
+      </el-table-column>
       <el-table-column prop="payeeName" label="收款人"></el-table-column>
       <el-table-column prop="authenticationStatus" label="状态"></el-table-column>
       <el-table-column prop="address" label="操作" width="300">

src/views/houseSelfCollect/customerManagementAdd.vue

@@ -69,8 +69,14 @@
               :disabled="disabled" />
           </ws-form-item>
           <ws-form-item label="开户支行" span="1" prop="bankDepositBranch">
-            <ws-input v-model="customerList.bankDepositBranch" placeholder="请输入开户支行" maxlength="100" size="small"
-              :disabled="disabled" />
+            <!-- <ws-input v-model="customerList.bankDepositBranch" placeholder="请输入开户支行" maxlength="100" size="small"
+              :disabled="disabled" /> -->
+
+                <ws-select v-model="customerList.bankDepositBranch" placeholder="请输入开户支行"
+                :disabled="disabled">
+                <ws-option v-for="item in bankList" :key="item" :label="item"
+                  :value="item" />
+              </ws-select>
           </ws-form-item>
           <ws-form-item label="收款人姓名" span="1" prop="payeeName">
             <ws-input v-model="customerList.payeeName" placeholder="请输入收款人姓名" maxlength="15" size="small"
@@ -88,12 +94,11 @@
             <ws-input v-model="customerList.compAddress" placeholder="请输入联系地址" maxlength="100" size="small"
               :disabled="disabled" />
           </ws-form-item>
-          <ws-form-item label="验证码" label-width="0px" span="1" prop="compAddress">
-            <el-button type="primary" class="veriCode" @click="toSend()" v-if="!sendDisabled">获取验证码</el-button>
+          <div v-if="this.switchType == 1 || this.switchType == 3" class = "jiaoYan">
+              <el-button type="primary" class="veriCode" @click="toSend()" v-if="!sendDisabled">获取验证码</el-button>
             <el-button type="warning" class="veriCode" v-if="sendDisabled">{{sendText}}</el-button>
-
             <ws-input v-model="verifyCode" placeholder="请输入验证码" maxlength="100" size="small" :disabled="disabled" />
-          </ws-form-item>
+          </div>
         </ws-info-table>
         <div class="but">
           <el-button type="primary" @click="commit" v-if="switchType == 1 || switchType == 3">提交</el-button>
@@ -156,7 +161,8 @@
         bankLows: 'bankLow',
         sendText: '',
         sendDisabled: false,
-        verifyCode: ""
+        verifyCode: "",
+        bankList:[],
       }
     },
     activated() {
@@ -268,13 +274,13 @@
           .toPromise()
           .then((response) => {
             if (response.recPerson ) {
-              this.customerList.customerName = response.recPerson
+               this.$set( this.customerList,'customerName',response.recPerson)
+               this.$set( this.customerList,'payeeName',response.recPerson)
             }
-            console.log(this.customerList.customerName)
             if (response.recPersonNo ) {
-              this.customerList.customerNumberCard = response.recPersonNo
+              this.$set( this.customerList,'customerNumberCard',response.recPersonNo)
+               this.$set( this.customerList,'payeeNumberCard',response.recPersonNo)
             }
-            console.log(this.customerList.customerNumberCard)
           })
       },
       upLoadSuccess2(e) {
@@ -287,11 +293,13 @@
           .toPromise()
           .then((response) => {
             if (response.recPerson ) {
-              this.customerList.customerName = response.recPerson
+                this.$set( this.customerList,'customerName',response.recPerson)
+                this.$set( this.customerList,'payeeName',response.recPerson)
             }
             
             if (response.recPersonNo ) {
-              this.customerList.customerNumberCard = response.recPersonNo
+              this.$set( this.customerList,'customerNumberCard',response.recPersonNo)
+               this.$set( this.customerList,'payeeNumberCard',response.recPersonNo)
             }
             
           })
@@ -305,11 +313,14 @@
           })
           .toPromise()
           .then((response) => {
+            if (response.bankNameZhihang.length > 0) {
+              this.bankList = response.bankNameZhihang
+            }
             if (response.bankNo) {
-              this.customerList.bankCard = response.bankNo
+                  this.$set(this.customerList,'bankCard',response.bankNo)
             }
             if (response.bankName) {
-              this.customerList.bankDeposit = response.bankName
+              this.$set(this.customerList,'bankDeposit',response.bankName)
             }
           })
       },
@@ -322,11 +333,14 @@
           })
           .toPromise()
           .then((response) => {
+             if (response.bankNameZhihang) {
+              this.bankList = response.bankNameZhihang
+            }
             if (response.bankNo) {
-              this.customerList.bankCard = response.bankNo
+              this.$set(this.customerList,'bankCard',response.bankNo)
             }
             if (response.bankName) {
-              this.customerList.bankDeposit = response.bankName
+              this.$set(this.customerList,'bankDeposit',response.bankName)
             }
           })
       },
@@ -660,6 +674,15 @@
   }
 
   .veriCode {
-    margin-right: 20px;
+    margin: 0 9px;
   }
+  .jiaoYan{
+    display: flex;
+    width: 50%;
+    padding: 0 9px;
+  }
+  /deep/.jiaoYan .el-input__inner{
+    width: 100%;
+  }
+
 </style>

src/views/houseSelfCollect/inspectInfo.vue

@@ -38,7 +38,7 @@
                 :disabled="disabled" />
             </ws-form-item>
             <ws-form-item label="车牌号" span="1" prop="carNumber">
-              <ws-input v-model="inspect.carNumber" placeholder="请输入车牌号" maxlength="100" size="small"
+              <ws-input v-model="inspect.carNumber" placeholder="请输入车牌号" maxlength="10" size="small"
                 :disabled="disabled" />
             </ws-form-item>
             <ws-form-item label="货名" span="1" prop="goodsName">
@@ -53,16 +53,19 @@
                 :disabled="disabled" />
             </ws-form-item>
             <ws-form-item label="类型" span="1" prop="type">
-              <ws-select v-model="inspect.type" placeholder="" :disabled="disabled">
+              <ws-select v-model="inspect.type" :disabled="disabled" @change="typeChange">
                 <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="100" size="small"
+              <ws-input v-model="inspect.natureOfGrainPurchase" placeholder="请输入购粮性质" maxlength="10" size="small"
                 :disabled="disabled" />
             </ws-form-item>
-            <ws-form-item label="净重单价（元/公斤）" span="1" prop="buckleWeightRatio">
-              <ws-input v-model="inspect.tidalGrainPrice" placeholder="请输入净重单价" maxlength="100" size="small" disabled />
+            <ws-form-item label="净重单价（元/公斤）" span="1" prop="tidalGrainPrice" v-if="inspect.type == '潮粮'">
+              <ws-input v-model="inspect.tidalGrainPrice" placeholder="请输入净重单价" maxlength="10" size="small" disabled />
+            </ws-form-item>
+            <ws-form-item label="干粮单价（元/公斤）" span="1" prop="dryGrainPrice" v-if="inspect.type == '干粮'">
+              <ws-input v-model="inspect.dryGrainPrice" placeholder="请输入干粮单价" maxlength="10" size="small"  :disabled="disabled" />
             </ws-form-item>
           </ws-info-table>
 
@@ -87,7 +90,7 @@
               <ws-input v-model="inspect.mildewGrain" placeholder="请输入霉变粒占比" maxlength="100" size="small"
                 :disabled="disabled" />
             </ws-form-item>
-            <ws-form-item label="容重（克/升）" span="1" prop="bulkDensity">
+            <ws-form-item label="容重(克/升)>=" span="1" prop="bulkDensity">
               <ws-input v-model="inspect.bulkDensity" placeholder="请输入容重" maxlength="100" size="small"
                 :disabled="disabled" />
             </ws-form-item>
@@ -95,8 +98,8 @@
               <ws-input v-model="inspect.jiaorenli" placeholder="请输入热损伤占比" maxlength="100" size="small"
                 :disabled="disabled" />
             </ws-form-item>
-            <ws-form-item label="不完整粒（%）" span="1" prop="imperfectGrain">
-              <ws-input v-model="inspect.imperfectGrain" placeholder="请输入不完整粒占比" maxlength="100" size="small"
+            <ws-form-item label="不完善粒（%）" span="1" prop="imperfectGrain">
+              <ws-input v-model="inspect.imperfectGrain" placeholder="请输入不完善粒占比" maxlength="100" size="small"
                 :disabled="disabled" />
             </ws-form-item>
           </ws-info-table>
@@ -112,14 +115,12 @@
       </ws-form>
     </div>
     <el-dialog width="70%" class="table-content" center :visible.sync="isShowPrint" title="粮食质检单" @close="closeDialog">
-      <div slot="footer">
         <inspectInfoPrint :printData="inspect" ref="saveImg"></inspectInfoPrint>
-        <div class="bottom-row4">
+        <div style="text-align:center">
           <el-button type="primary" @click="closePrint">关闭</el-button>
           <el-button type="primary" @click="printSmall">打印小票</el-button>
           <el-button type="primary" @click="printBig">打印单据</el-button>
         </div>
-      </div>
     </el-dialog>
   </div>
 </template>
@@ -134,6 +135,7 @@
     getinspectEdit,
     getamount,
     getCount,
+    getDryGrainPrice
   } from '@/model/houseSelfCollect/index'
    import {
     packList
@@ -153,6 +155,8 @@
         inspect: {
           tidalGrainPrice: 0,
           buckleWeightRatio: 0,
+          natureOfGrainPurchase:"贸易粮",
+          type:"潮粮"
         },
         disabled: false,
         disabled1: false,
@@ -172,6 +176,7 @@
         id: '',
         imgUrl:"",
         printData:{},
+        num:0,
       }
     },
     activated() {
@@ -202,12 +207,12 @@
       printSmall() {
         window.location.href =
           '../../../static/inspection.html?type=1&dataList=' +
-          JSON.stringify(this.printData)
+          JSON.stringify(this.inspect)
       },
       printBig() {
         window.location.href =
           '../../../static/inspection.html?type=2&dataList=' +
-          JSON.stringify(this.printData)
+          JSON.stringify(this.inspect)
       },
       getdate() {
         var date = new Date()
@@ -249,11 +254,19 @@
                 .then((response) => {
                 })
             })
-
             this.dialogTableVisible = true;
           }
         });
       },
+      typeChange(){
+        if(this.inspect.type == "干粮" && this.inspect.goodsName){
+           getDryGrainPrice({warehouseId:this.cangid,goodsName:this.inspect.goodsName})
+                .toPromise()
+                .then((response) => { 
+                  this.$set(this.inspect,'dryGrainPrice',response)
+                })
+        }
+      },
       closePrint(){
         this.isShowPrint = false
         this.$router.push({path:'inspectionManagement'})
@@ -302,7 +315,7 @@
           })
           return
         }
-        if (this.inspect.carNumber.length > 7) {
+        if (this.inspect.carNumber.length > 7 || this.inspect.carNumber.length != 7) {
           this.$message({
             message: '车牌号输入错误',
             type: 'warning',
@@ -345,20 +358,38 @@
           })
           return
         }
-        if (!this.inspect.type) {
+        if (!this.inspect.natureOfGrainPurchase) {
           this.$message({
-            message: '类型不能为空',
+            message: '购粮性质不能为空',
             type: 'warning',
           })
           return
         }
-        if (!this.inspect.natureOfGrainPurchase) {
+        if(this.inspect.type == "干粮"){
+          if(!this.inspect.dryGrainPrice){
+            this.$message({
+              message:'干粮价格不能为空',
+              type:'warning'
+            })
+            return
+          }
+           if(this.inspect.dryGrainPrice < 0 || this.inspect.dryGrainPrice > 1000){
+            this.$message({
+              message:'干粮价格输入错误',
+              type:'warning'
+            })
+            return
+          }
+          if (
+          String(this.inspect.dryGrainPrice).indexOf('.') != -1 &&
+          String(this.inspect.dryGrainPrice).length - (String(this.inspect.dryGrainPrice).indexOf('.') + 1) > 4) {
           this.$message({
-            message: '购粮性质不能为空',
+            message: '干粮价格输入错误',
             type: 'warning',
           })
           return
         }
+        }
         if (!this.inspect.grade) {
           this.$message({
             message: '等级不能为空',
@@ -403,7 +434,7 @@
         }
         if (!this.inspect.imperfectGrain) {
           this.$message({
-            message: '不完整粒不能为空',
+            message: '不完善粒不能为空',
             type: 'warning',
           })
           return
@@ -488,7 +519,7 @@
           .then((response) => {
                count = response
           })
-        //  客户下拉校验
+          //  客户下拉校验
         getamount({
           compId: sessionStorage.getItem('ws-pf_compId'),
           customerName: this.inspect.customerName,
@@ -518,10 +549,17 @@
         if (this.inspect.goodsName) {
           for (var i = 0; i < this.purchasePriceList.length; i++) {
             if (this.purchasePriceList[i].goodsName == this.inspect.goodsName) {
-              this.inspect.buckleWeightRatio =
-                this.purchasePriceList[i].deductWeight
+              this.$set(this.inspect,'buckleWeightRatio',this.purchasePriceList[i].deductWeight)
             }
           }
+          if(this.inspect.type == "干粮"){
+             getDryGrainPrice({warehouseId:this.cangid,goodsName:this.inspect.goodsName})
+                .toPromise()
+                .then((response) => { 
+                  console.log(response,'干粮')
+                  this.$set(this.inspect,'dryGrainPrice',response)
+                })
+          }
         }
         //潮粮单价改变事件
         if (
@@ -541,9 +579,9 @@
               this.unitPrice = response
             })
         }
-        if(this.inspect.goodsName && this.inspect.customerName){
+        if(this.inspect.goodsName && this.inspect.customerName ){
              // //查看当前用户对应货名有未结算状态的送货
-        let count = 0
+       let count = 0
         getCount({
           compId: sessionStorage.getItem('ws-pf_compId'),
           customerName: this.inspect.customerName,
@@ -576,7 +614,6 @@
             }
           })
         }
-        
       },
 
       getList(ids) {

src/views/houseSelfCollect/inspectionManagement.vue

@@ -69,7 +69,7 @@
        <el-table-column prop="type" label="类型"></el-table-column>
       <el-table-column
         prop="tidalGrainPrice"
-        label="净重单价（元/公斤）"
+        label="单价（元/公斤）"
       ></el-table-column>
       <el-table-column prop="binNumber" label="仓位号"></el-table-column>
       <el-table-column prop="storageTagNo" label="囤位号"></el-table-column>
@@ -92,7 +92,13 @@
       :visible.sync="isShowPrint"
       title="粮食质检单"
     >
-    <inspectInfoPrint :printData="printData"></inspectInfoPrint>
+    <!-- <inspectInfoPrint :printData="printData"></inspectInfoPrint> -->
+    <inspectInfoPrint :printData="printData" ref="saveImg"></inspectInfoPrint>
+    <div style="text-align:center">
+          <el-button type="primary" @click="closePrint">关闭</el-button>
+          <el-button type="primary" @click="printSmall">打印小票</el-button>
+          <el-button type="primary" @click="printBig">打印单据</el-button>
+        </div>
     </el-dialog>
     <div style="text-align: center">
       <el-pagination
@@ -147,6 +153,20 @@ export default {
     this.selectWarehouse()
   },
   methods: {
+    printSmall() {
+        window.location.href =
+          '../../../static/inspection.html?type=1&dataList=' +
+          JSON.stringify(this.printData)
+      },
+      printBig() {
+        window.location.href =
+          '../../../static/inspection.html?type=2&dataList=' +
+          JSON.stringify(this.printData)
+      },
+     closePrint(){
+        this.isShowPrint = false
+        this.$router.push({path:'inspectionManagement'})
+      },
     find() {
       this.getList()
     },
@@ -249,7 +269,6 @@ export default {
         searchKeyWord: (this.searchKeyWord).toUpperCase(),
         warehouseName: this.warehouseName,
         managementType:1
-        
       })
         .toPromise()
         .then((response) => {

src/views/houseSelfCollect/settlement.vue

@@ -37,7 +37,7 @@
             </ws-form-item>
             <ws-form-item label="仓位号" span="1" prop="waterContent">
               <ws-input
-              v-model="paymentList.binNumber"
+              v-model="paymentList.qualityInspectionManagement.binNumber"
                 placeholder="请输入仓位号"
                 maxlength="100"
                 disabled
@@ -54,10 +54,10 @@
               />
             </ws-form-item>
             <ws-form-item label="囤位号" span="1" prop="waterContent">
-              <ws-input  v-model="paymentList.storageNumber" placeholder="请输入囤位号" maxlength="100" size="small" disabled />
+              <ws-input  v-model="paymentList.qualityInspectionManagement.storageTagNo" placeholder="请输入囤位号" maxlength="100" size="small" disabled />
             </ws-form-item>
             <ws-form-item label="车牌号" span="1" prop="waterContent">
-              <ws-input v-model="paymentList.carNumber" placeholder="请输入车牌号" maxlength="100" size="small" disabled />
+              <ws-input v-model="paymentList.carNo" placeholder="请输入车牌号" maxlength="100" size="small" disabled />
             </ws-form-item>
             <ws-form-item label="货名" span="1" prop="waterContent">
                 <ws-input v-model="paymentList.goodsName" placeholder="请输入货名" maxlength="100" size="small" disabled />
@@ -66,10 +66,16 @@
               <ws-input v-model="paymentList.type" placeholder="请输入类型" maxlength="100" size="small" disabled />
             </ws-form-item>
             <ws-form-item label="购粮性质" span="1" prop="waterContent">
-                <ws-input v-model="paymentList.natureOfGrainPurchase" placeholder="请输入购粮性质" maxlength="100" size="small" disabled />
+                <ws-input v-model="paymentList.qualityInspectionManagement.natureOfGrainPurchase" placeholder="请输入购粮性质" maxlength="100" size="small" disabled />
             </ws-form-item>
-            <ws-form-item v-if='paymentList.type=="干粮"' label="干粮单价" span="1" prop="waterContent">
+            <!-- <ws-form-item v-if='paymentList.type=="干粮"' label="干粮单价" span="1" prop="waterContent">
                 <ws-input v-model="paymentList.solidGrainPrice" placeholder="请输入干粮单价" maxlength="100" size="small" :disabled='disabled' />
+            </ws-form-item> -->
+             <ws-form-item v-if='paymentList.type=="潮粮"' label="纯重单价（元/公斤）" span="1" prop="tidalGrainPrice">
+                <ws-input v-model="paymentList.tidalGrainPrice" placeholder="请输入纯重单价" maxlength="100" size="small" disabled />
+            </ws-form-item>
+             <ws-form-item v-if='paymentList.type=="干粮"' label="干粮单价（元/公斤）" span="1" prop="waterContent">
+                <ws-input v-model="paymentList.qualityInspectionManagement.dryGrainPrice" placeholder="请输入干粮单价" maxlength="100" size="small" disabled />
             </ws-form-item>
           </ws-info-table>
           <div class="titles">质检数据</div>
@@ -104,7 +110,7 @@
                disabled
               />
             </ws-form-item>
-            <ws-form-item label="容重（克/升）" span="1" prop="waterContent">
+            <ws-form-item label="容重(克/升)>=" span="1" prop="waterContent">
               <ws-input v-model="paymentList.qualityInspectionManagement.bulkDensity" placeholder="请输入容重" maxlength="100" size="small" disabled />
             </ws-form-item>
             <ws-form-item label="热损伤（%）" span="1" prop="waterContent">
@@ -116,10 +122,10 @@
                 disabled
               />
             </ws-form-item>
-            <ws-form-item label="不完整粒（%）" span="1" prop="waterContent">
+            <ws-form-item label="不完善粒（%）" span="1" prop="waterContent">
               <ws-input
               v-model="paymentList.qualityInspectionManagement.imperfectGrain"
-                placeholder="请输入不完整粒占比"
+                placeholder="请输入不完善粒占比"
                 maxlength="100"
                 size="small"
                 disabled
@@ -217,15 +223,15 @@
               prop="waterContent"
               class="formItem"
             >
-              <ws-input @input='grainMoney' v-model="paymentList.grainMoney" placeholder="请输入粮款" maxlength="100" size="small" :disabled='disabled'/>
+              <ws-input @input='grainMoney' v-model="paymentList.grainMoney" placeholder="请输入粮款" maxlength="100" size="small" disabled/>
             </ws-form-item>
-            <ws-form-item v-if='paymentList.type=="干粮"'
+            <ws-form-item v-if='paymentList.type=="干粮"' 
               label="粮款 = 净重 x  干粮单价 ="
               span="1"
               prop="waterContent"
               class="formItem"
             >
-              <ws-input @input='grainMoney' v-model="paymentList.grainMoney" placeholder="请输入粮款" maxlength="100" size="small" :disabled='disabled'/>
+              <ws-input @input='grainMoney' v-model="paymentList.grainMoney" placeholder="请输入粮款" maxlength="100" size="small" disabled/>
             </ws-form-item>
             <ws-form-item label="称重补助" span="1" prop="waterContent">
               <ws-input
@@ -333,7 +339,7 @@
             </ws-form-item>
             <ws-form-item label="实际付款" span="1" prop="waterContent">
               <ws-input
-              @input='actualPayment'
+              @change='actualPayment'
               v-model="paymentList.actualPayment"
                 placeholder="请输入实际付款"
                 maxlength="100"
@@ -403,7 +409,8 @@ export default {
        qualityInspectionManagement:{
          waterContent:'',
          buckleWeightRatio:0,
-         grainMoney:0
+         grainMoney:0,
+         waterMin:0,
        }
      },
       disabled:false,
@@ -424,6 +431,7 @@ export default {
          this.information = '结算'   
     }
    this.getList()
+ 
   },
   methods: {
     closeDialog(){
@@ -470,19 +478,29 @@ export default {
           if(!this.paymentList.solidGrainPrice){
             this.paymentList.solidGrainPrice=this.paymentList.qualityInspectionManagement.tidalGrainPrice/this.paymentList.base
           }
-          if(this.paymentList.type='潮粮'){
+          if(this.paymentList.type =='潮粮'){
             this.paymentList.grainMoney=this.paymentList.qualityInspectionManagement.tidalGrainPrice*this.paymentList.weighingManagement.netWeight
+            this.paymentList.calculationPayable =  this.paymentList.grainMoney
+              this.paymentList.actualPayment = this.paymentList.calculationPayable
+              this.actualPayment( this.paymentList.actualPayment)
           }else{
-            this.paymentList.grainMoney=this.paymentList.qualityInspectionManagement.solidGrainPrice*this.paymentList.weighingManagement.netWeight
+            // this.paymentList.grainMoney=this.paymentList.qualityInspectionManagement.solidGrainPrice*this.paymentList.weighingManagement.netWeight
+             this.paymentList.grainMoney = this.paymentList.qualityInspectionManagement.dryGrainPrice * this.paymentList.weighingManagement.netWeight
+              this.paymentList.calculationPayable =  this.paymentList.grainMoney
+                this.paymentList.actualPayment = this.paymentList.calculationPayable
+                this.actualPayment( this.paymentList.actualPayment)
           }
            this.paymentList.grainMoney = this.paymentList.grainMoney.toFixed(2)
         })
+          
     },
     actualPayment(e){
      this.paymentList.capitalize=this.convertCurrency(e)
     },
     grainMoney(){
        this.paymentList.calculationPayable=(Number(this.paymentList.grainMoney)+Number(this.paymentList.weighingSubsidy)+Number(this.paymentList.freightSubsidy)+Number(this.paymentList.unloadSubsidy)+Number(this.paymentList.otherSubsidy))-this.paymentList.weighingDeduction-this.paymentList.freightDeduction-this.paymentList.unloadDeduction-this.paymentList.otherDeduction-this.paymentList.qualityDeduction
+      this.paymentList.actualPayment = this.paymentList.calculationPayable
+      this.actualPayment( this.paymentList.actualPayment)
       // this.paymentList.calculationPayable=num.toFixed(2)
     },
      /**
@@ -763,6 +781,9 @@ export default {
 .formItem {
   width: 70% !important;
 }
+/deep/.ws-info-table .formItem .el-form-item__label{
+  width: 220px;
+}
 /deep/.el-table .el-table__header .cell,
 .el-table .el-table__body .cell {
   text-align: center;

src/views/houseSelfCollect/weighingManagement.vue

@@ -64,6 +64,8 @@
         label="毛重（公斤）"
       ></el-table-column>
       <el-table-column prop="tare" label="皮重（公斤）"></el-table-column>
+       <el-table-column prop="buckleMiscellaneous" label="扣杂（公斤）"></el-table-column>
+        <el-table-column prop="netWeight" label="净重（公斤）"></el-table-column>
       <el-table-column prop="binNumber" label="仓位号"></el-table-column>
       <el-table-column prop="storageNumber" label="囤位号"></el-table-column>
       <el-table-column prop="secretaryWeigher" label="司称员">

src/views/houseSelfCollect/weightCheck.vue

@@ -223,7 +223,6 @@ export default {
     }else if(this.allowEdit == 1){
       this.disabled = false
     }
-    console.log(this.disabled)
     if (this.tpyeNo == 1) {
       this.information = '毛重'
     } else if (this.tpyeNo == 2) {
@@ -241,7 +240,6 @@ export default {
     },
     calculation() {
       if (this.weighingList.grossWeight && this.weighingList.tare) {
-        let count = 0
         this.weighingList.netWeight =
           this.weighingList.grossWeight -
           this.weighingList.tare -
@@ -329,6 +327,13 @@ export default {
             type: 'warning',
           })
           return
+        }
+         if (this.weighingList.tare > this.weighingList.grossWeight) {
+          this.$message({
+            message: '皮重不能大于毛重',
+            type: 'warning',
+          })
+          return
         }
         if (this.weighingList.tare < 1 || this.weighingList.tare > 100000) {
           this.$message({
@@ -349,6 +354,14 @@ export default {
           })
           return
         }
+        
+         if (this.weighingList.netWeight < 0) {
+          this.$message({
+            message: '净重不能小于0',
+            type: 'warning',
+          })
+          return
+        }
       }
       this.$confirm('确定保存检斤信息？', '提示', {
         confirmButtonText: '确定',

src/views/outboundManagement/collectionment.vue

@@ -101,7 +101,7 @@
                 disabled
               />
             </ws-form-item>
-            <ws-form-item label="容重（克/升）" span="1" prop="bulkDensity">
+            <ws-form-item label="容重(克/升)>=" span="1" prop="bulkDensity">
               <ws-input 
               v-model="collectionList.qualityInspectionManagement.bulkDensity" placeholder="请输入容重" maxlength="100" size="small" disabled/>
             </ws-form-item>
@@ -114,10 +114,10 @@
                 disabled
               />
             </ws-form-item>
-            <ws-form-item label="不完整粒（%）" span="1" prop="imperfectGrain">
+            <ws-form-item label="不完善粒（%）" span="1" prop="imperfectGrain">
               <ws-input
               v-model="collectionList.qualityInspectionManagement.imperfectGrain"
-                placeholder="请输入不完整粒占比"
+                placeholder="请输入不完善粒占比"
                 maxlength="100"
                 size="small"
                 disabled

src/views/outboundManagement/qualityInspection.vue

@@ -115,7 +115,7 @@
                 :disabled="disabled"
               />
             </ws-form-item>
-            <ws-form-item label="容重（克/升）" span="1" prop="bulkDensity">
+            <ws-form-item label="容重(克/升)>=" span="1" prop="bulkDensity">
               <ws-input
                 v-model="inspect.bulkDensity"
                 placeholder="请输入容重"
@@ -133,10 +133,10 @@
                 :disabled="disabled"
               />
             </ws-form-item>
-            <ws-form-item label="不完整粒（%）" span="1" prop="imperfectGrain">
+            <ws-form-item label="不完善粒（%）" span="1" prop="imperfectGrain">
               <ws-input
                 v-model="inspect.imperfectGrain"
-                placeholder="请输入不完整粒占比"
+                placeholder="请输入不完善粒占比"
                 maxlength="100"
                 size="small"
                 :disabled="disabled"

src/views/outboundManagement/weighing.vue

@@ -53,8 +53,9 @@
 						<el-button type="primary" v-if="this.types == 1" @click="chongxin">重新获取</el-button>
 
 						<ws-form-item label="皮重（公斤）" span="1" prop="tare">
-							<ws-input v-model="weighingList.tare" placeholder="未获取到皮重" maxlength="100" size="small"
-								disabled />
+							<!-- <ws-input v-model="weighingList.tare" placeholder="未获取到皮重" maxlength="100" size="small"
+								disabled /> -->
+								<ws-input @input="calculation" v-model="weighingList.tare" placeholder="未获取到皮重" maxlength="100" size="small" />
 						</ws-form-item>
 						<el-button type="primary" v-if="this.types == 2 || this.types == null">重新获取</el-button>
 						<!-- <div class="formItem"> -->

src/views/outboundManagement/weighingManagement.vue

@@ -125,6 +125,7 @@
 						this.warehouseId = this.warehouseList[i].warehouseId
 					}
 				}
+				this.getList()
 			},
 			weighing(row, num) {
 				console.log

src/views/purchasingManagement/procurementPlanEdit.vue

@@ -285,7 +285,7 @@
               class="typeselect"
             />
           </el-form-item>
-          <!-- 蛋白（%）<= -->
+          <!-- 蛋白（%）>= -->
           <el-form-item label="蛋白（%）>=" span="1" prop="protein">
             <el-input
               v-model="dataList.protein"

src/views/purchasingManagement/procurementPlanLook.vue

@@ -121,7 +121,7 @@
           <el-form-item label="不完善粒（%）<=" span="1">
             <el-input disabled v-model="dataList.imperfectGrain" maxlength="120" />
           </el-form-item>
-          <!-- 蛋白（%）<= -->
+          <!-- 蛋白（%）>= -->
           <el-form-item label="蛋白（%）>=" span="1">
             <el-input v-model="dataList.protein" placeholder class="typeselect" disabled />
           </el-form-item>

src/views/salesManagement/salesPlanEdit.vue

@@ -232,7 +232,7 @@
           <el-form-item label="不完善粒（%）<=" span="1" prop="imperfectGrain">
             <el-input v-model="dataList.imperfectGrain" class="typeselect" maxlength="120" placeholder="请输入不完善粒占比" />
           </el-form-item>
-          <!-- 蛋白（%）<= -->
+          <!-- 蛋白（%）>= -->
           <el-form-item label="蛋白（%）>=" span="1" prop="protein">
             <el-input v-model="dataList.protein" class="typeselect" placeholder="请输入蛋白占比" />
           </el-form-item>

src/views/statisticalReport/component/routers/route.js

@@ -12,7 +12,7 @@ const statisticalReportRouter = {
     icon: '-tongjibaobiao'
   },
   children: [
-      // 采购入库报表统计
+    // 期货采购入库报表统计
     {
       path: 'purchaseReceiptStatisticsList',
       component: () =>
@@ -27,22 +27,22 @@ const statisticalReportRouter = {
         // module: 'procurement.sparepart.applDetail'
       }
     },
-      //采购平仓报表
-      {
-          path: 'purchaseClosingCashierList',
-          component: () =>
-          import(/* webpackChunkName: "applDetail" */ '@/views/statisticalReport/purchaseClosingCashierList'),
-          name: 'purchaseClosingCashierList',
-          meta: {
-          title: 'purchaseClosingCashierList',
-          shortcutEntrance: 'statisticalReport',
-          module: 'report.procurementCloseReport',
-          permissicon: [],
-          keepAlive: true
-          // module: 'procurement.sparepart.applDetail'
-          }
-      },
-      // 销售出库报表统计
+    //期货采购平仓报表
+    {
+      path: 'purchaseClosingCashierList',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/statisticalReport/purchaseClosingCashierList'),
+      name: 'purchaseClosingCashierList',
+      meta: {
+        title: 'purchaseClosingCashierList',
+        shortcutEntrance: 'statisticalReport',
+        module: 'report.procurementCloseReport',
+        permissicon: [],
+        keepAlive: true
+        // module: 'procurement.sparepart.applDetail'
+      }
+    },
+    // 期货销售出库报表统计
     {
       path: 'salesDeliveryReportList',
       component: () =>
@@ -57,37 +57,67 @@ const statisticalReportRouter = {
         // module: 'procurement.sparepart.applDetail'
       }
     },
-      //销售平仓报表
-      {
-        path: 'salesClosingCashierList',
-        component: () =>
+    //期货销售平仓报表
+    {
+      path: 'salesClosingCashierList',
+      component: () =>
         import(/* webpackChunkName: "applDetail" */ '@/views/statisticalReport/salesClosingCashierList'),
-        name: 'salesClosingCashierList',
-        meta: {
+      name: 'salesClosingCashierList',
+      meta: {
         title: 'salesClosingCashierList',
         shortcutEntrance: 'statisticalReport',
         module: 'report.saleCloseReport',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'
-        }
-      },
-      //汽运结算报表
-      {
-        path: 'autoSettlementList',
-        component: () =>
+      }
+    },
+    //汽运结算报表
+    {
+      path: 'autoSettlementList',
+      component: () =>
         import(/* webpackChunkName: "applDetail" */ '@/views/statisticalReport/autoSettlementList'),
-        name: 'autoSettlementList',
-        meta: {
+      name: 'autoSettlementList',
+      meta: {
         title: 'autoSettlementList',
         shortcutEntrance: 'statisticalReport',
         module: 'report.transportationReport',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'
-        }
-      },
-    
+      }
+    },
+    // 现货采购入库报表统计
+    {
+      path: 'stockPurchaseReceiptReportList',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/statisticalReport/stockPurchaseReceiptReportList'),
+      name: 'stockPurchaseReceiptReportList',
+      meta: {
+        title: 'stockPurchaseReceiptReportList',
+        shortcutEntrance: 'statisticalReport',
+        module: 'report.saleOutReport',
+        permissicon: [],
+        keepAlive: true
+        // module: 'procurement.sparepart.applDetail'
+      }
+    },
+    // 现货销售出库报表统计
+    {
+      path: 'stockSaleOutReportList',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/statisticalReport/stockSaleOutReportList'),
+      name: 'stockSaleOutReportList',
+      meta: {
+        title: 'stockSaleOutReportList',
+        shortcutEntrance: 'statisticalReport',
+        module: 'report.saleOutReport',
+        permissicon: [],
+        keepAlive: true
+        // module: 'procurement.sparepart.applDetail'
+      }
+    },
+
   ],
 
 };

src/views/statisticalReport/stockPurchaseReceiptReportList.vue

@@ -0,0 +1,1309 @@
+//现货采购入库报表
+<template>
+  <div class="container">
+    <el-scrollbar style="height: 100%">
+      <el-row>
+        <el-col style="padding-left: 15px" :span="16">
+          <ws-button
+            :type="searchType == 1 ? 'primary' : ''"
+            @click="handlestatus(1)"
+            >待审核</ws-button
+          >
+          <ws-button
+            :type="searchType == 2 ? 'primary' : ''"
+            @click="handlestatus(2)"
+            >待结算</ws-button
+          >
+          <ws-button
+            :type="searchType == 3 ? 'primary' : ''"
+            @click="handlestatus(3)"
+            >已结算</ws-button
+          >
+          <ws-button
+            :type="searchType == '' ? 'primary' : ''"
+            @click="handlestatus('')"
+            >全部</ws-button
+          >
+          <ws-button
+            type="primary"
+            v-hasPermission="`report.procurementInReport.view`"
+            @click="handlepass()"
+            >通过</ws-button
+          >
+          <ws-button
+            type="primary"
+            v-hasPermission="`report.procurementInReport.view`"
+            @click="handlereject()"
+            >驳回</ws-button
+          >
+          <ws-button
+            type="primary"
+            v-hasPermission="`report.procurementInReport.payment`"
+            @click="handlepayment"
+            >付款</ws-button
+          >
+          <ws-button
+            type="primary"
+            v-hasPermission="`report.procurementInReport.edit`"
+            @click="addRemarks()"
+            >备注</ws-button
+          >
+          <ws-button
+            type="primary"
+            v-hasPermission="`report.procurementInReport.carry`"
+            @click="dis()"
+            >定金</ws-button
+          >
+        </el-col>
+        <el-col
+          style="text-align: right; line-height: 60px; padding-right: 10px"
+          :span="8"
+        >
+          <el-select
+            v-model="contractNo"
+            placeholder="请选择合同"
+            clearable
+            filterable
+            :filter-method="dataFilter"
+            @change="contractchange"
+            maxlength="500"
+            type="input"
+            class="findValue"
+          >
+            <el-option
+              v-if="item.reportStatus"
+              v-for="item in options"
+              :key="item.constKey"
+              :label="item.contractNo + '(' + item.reportStatus + ')'"
+              :value="item.contractNo"
+            />
+            <el-option
+              v-if="!item.reportStatus"
+              v-for="item in options"
+              :key="item.constKey"
+              :label="item.contractNo"
+              :value="item.contractNo"
+            />
+          </el-select>
+        </el-col>
+      </el-row>
+      <div v-if="contractNo != ''">
+        <span v-if="orderList.goodsName">货名: {{ orderList.goodsName }}</span>
+        <span v-else>货名:——</span>
+        <span v-if="orderList.transactionsNumber"
+          >合同重量: {{ orderList.transactionsNumber }} 吨</span
+        >
+        <span v-else>合同重量: 0 吨</span>
+        <span v-if="orderList.stockInQuantity"
+          >入库量: {{ orderList.stockInQuantity }} 吨</span
+        >
+        <span v-else>入库量: 0 吨</span>
+        <span v-if="orderList.contractPrice"
+          >合同单价: {{ orderList.contractPrice }} 元/吨</span
+        >
+        <span v-else>合同单价: 0 元/吨</span>
+        <span v-if="orderList.amountIngPayable"
+          >应付: {{ orderList.amountIngPayable }} 元</span
+        >
+        <span v-else>应付: 0 元</span>
+        <span v-if="orderList.amountEdPayable"
+          >已付: {{ orderList.amountEdPayable }} 元</span
+        >
+        <span v-else>已付: 0 元</span>
+        <span v-if="orderList.deposit"
+          >定金: {{ orderList.deposit }} 元 {{ orderList.depositUrl }}</span
+        >
+        <span v-else>定金: 0 元</span>
+      </div>
+
+      <el-table
+        class="wenzi"
+        :data="warehouseList.records"
+        style="width: 100%; margin-top: 20px"
+        ref="warehouseList"
+        border
+        :summary-method="getSummaries"
+        show-summary
+        @row-click="handleRowClick"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column
+          :selectable="selectInit"
+          type="selection"
+          width="55"
+        ></el-table-column>
+        <el-table-column type="index" label="序号" width="50"></el-table-column>
+        <el-table-column
+          class="table_td"
+          prop="warehouseName"
+          width="120"
+          label="仓库"
+        ></el-table-column>
+        <el-table-column
+          class="table_td"
+          prop="carNo"
+          width="120"
+          label="车牌号"
+        ></el-table-column>
+        <el-table-column
+          class="table_td"
+          prop="warehousingDate"
+          width="100"
+          label="入库日期"
+        ></el-table-column>
+        <el-table-column
+          width="100"
+          class="table_td"
+          prop="grossWeight"
+          label="毛重"
+        ></el-table-column>
+        <el-table-column
+          width="100"
+          class="table_td"
+          prop="tare"
+          label="皮重"
+        ></el-table-column>
+        <el-table-column
+          width="100"
+          class="table_td"
+          prop="deductionWeight"
+          label="扣重"
+        ></el-table-column>
+        <el-table-column
+          width="100"
+          class="table_td"
+          prop="netWeight"
+          label="净重"
+        ></el-table-column>
+        <el-table-column
+          width="300"
+          class="table_td"
+          prop="settlementWeight"
+          label="结算重量(吨)"
+        >
+          <template slot-scope="scope">
+            <div class="inputChenge">
+              <!-- readonly -->
+              <el-input
+                v-model="scope.row.settlementWeight"
+                v-if="scope.row.identification == 'true'"
+              ></el-input>
+              <div v-if="scope.row.identification == 'false'" class="inputs">
+                {{ scope.row.settlementWeight }}
+              </div>
+            </div>
+            <img
+              width="17"
+              height="18"
+              style="vertical-align: text-top; position: relative; top: -1px"
+              src="../../../public/img/edit.png"
+              @click="whether(scope.row)"
+              v-if="scope.row.identification == 'false'"
+              alt=""
+            />
+            <i
+              class="el-icon-check"
+              style="line-height: 29px; margin-left: 10px"
+              v-if="scope.row.identification == 'true'"
+              @click="varietyClick(scope.row)"
+            ></i>
+            <!-- <div>—</div> -->
+          </template>
+        </el-table-column>
+        <el-table-column
+          width="100"
+          class="table_td"
+          label="应付金额(元)"
+          prop="amountIngPayable"
+        ></el-table-column>
+        <el-table-column
+          width="100"
+          class="table_td"
+          label="已付金额(元)"
+          prop="amountEdPayable"
+        ></el-table-column>
+        <el-table-column
+          width="100"
+          class="table_td"
+          label="未付金额(元)"
+          prop="amountNotPayable"
+        ></el-table-column>
+        <el-table-column
+          class="table_td"
+          label="付款日期"
+          prop="paymentDate"
+        ></el-table-column>
+        <el-table-column label="状态" prop="status">
+          <template slot-scope="scope">
+            <span v-if="scope.row.approveStatus != null">{{
+              scope.row.approveStatus
+            }}</span>
+            <span v-else>{{ scope.row.status }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <!-- 页数 -->
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="currentPage"
+        :page-size="pageSize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="deptBudgetTotal"
+      ></el-pagination>
+    </el-scrollbar>
+    <el-dialog
+      width="25%"
+      title="付款"
+      :visible.sync="dialogFormVisible1"
+      :append-to-body="true"
+    >
+      <el-form :model="form">
+        <el-form-item label="未付金额（元）" :label-width="formLabelWidth">
+          <template>
+            <span>{{ amountNotPayable }}</span>
+          </template>
+        </el-form-item>
+        <el-form-item label="本次付款金额" :label-width="formLabelWidth">
+          <el-input
+            v-model="money"
+            autocomplete="off"
+            placeholder="请输入本次付款金额"
+            class="deal"
+          ></el-input>
+        </el-form-item>
+        <el-form-item
+          label="付款日期"
+          prop="paymentDate"
+          :label-width="formLabelWidth"
+          class="deal"
+        >
+          <ws-date-picker
+            v-model="paymentDate"
+            type="date"
+            placeholder="请选择付款日期"
+            value-format="yyyy-MM-dd"
+            class="deal"
+          />
+        </el-form-item>
+        <el-form-item label="上传付款截图" :label-width="formLabelWidth">
+          <el-upload
+            action="https://www.zthymaoyi.com/upload/admin"
+            list-type="picture-card"
+            :on-success="handlePictureCardPreview"
+            :on-remove="handleRemove"
+            class="photo2"
+          >
+            <i class="el-icon-plus"></i>
+          </el-upload>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormVisible1 = false">取 消</el-button>
+        <el-button type="primary" @click="submitMoney()">提 交</el-button>
+      </div>
+    </el-dialog>
+    <!--备注-->
+    <el-dialog
+      width="25%"
+      title="备注"
+      :visible.sync="dialogFormVisible11"
+      :append-to-body="true"
+    >
+      <el-form :model="form">
+        <div class="beizhu">
+          <el-input
+            v-model="remark"
+            autocomplete="off"
+            placeholder="备注信息,不超过1000字"
+            class="deal"
+          ></el-input>
+        </div>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormVisible11 = false">取 消</el-button>
+        <el-button type="primary" @click="remarksSubmit()">保存</el-button>
+      </div>
+    </el-dialog>
+    <!--定金-->
+    <el-dialog
+      width="30%"
+      title="定金"
+      :visible.sync="dialogFormVisible5"
+      :append-to-body="true"
+    >
+      <el-form>
+        <el-form-item label="已付定金" :label-width="formLabelWidth">
+          <el-input
+            v-model="deposit"
+            autocomplete="off"
+            class="deal"
+            placeholder="输入定金金额"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="上传定金截图" :label-width="formLabelWidth">
+          <el-upload
+            action="https://www.zthymaoyi.com/upload/admin"
+            list-type="picture-card"
+            :on-success="handlePictureCardPreviewDis"
+            :on-remove="handleRemoveDis"
+            class="photo2"
+          >
+            <i class="el-icon-plus"></i>
+          </el-upload>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormVisible5 = false">取 消</el-button>
+        <el-button type="primary" @click="amendconfirm">提 交</el-button>
+      </div>
+    </el-dialog>
+  </div>
+  <!-- </div> -->
+</template>
+<script>
+import {
+  getStockPurchaseReceiptList,
+  getStockPurchaseContractNoList,
+  editSettlementWeight,
+  addDisOrRemarks,
+  stockPurchasePayMoney,
+} from '@/model/statisticalReport/index'
+import { posthandle } from '@/model/purchasingManagement/index'
+import { downloadFile } from '@/utils/batchDown'
+import Pagination from '@/components/Pagination'
+import WsUpload from '@/components/WsUpload'
+import { EventBus } from 'base-core-lib'
+export default {
+  name: 'viewSpareMoney',
+  components: {
+    WsUpload,
+    Pagination,
+  },
+  watch: {
+    // vesselId(val) {
+    //   this.getList()
+    // },
+    isShow(val) {
+      this.showType = val
+    },
+  },
+
+  data() {
+    return {
+      checked: true,
+      needReapply: true,
+      dialogFormVisible1: false,
+      dialogFormVisible5: false,
+      dialogFormVisible11: false,
+      dialogVisible: false,
+
+      form: {
+        transactionPrice: '',
+        transactionsNumber: '',
+        basis: '',
+      },
+      currect: true,
+      formLabelWidth: '120px',
+      barWidth: 0,
+      barHeight: 0,
+      retioX: 1,
+      ratioY: 1,
+      isTaped: false,
+      isHover: false,
+      isShow: !this.autohide,
+      //弹出框
+      dialogViewSpareMoney: false,
+      contractNoList: [],
+      // 是否显示
+      showType: true,
+      // 年
+      year: '',
+      options: [],
+      pickerOptions: {},
+      value2: '',
+      deptBudgetTotal: 0,
+      currentPage: 1,
+      pageSize: 10,
+      searchType: '1',
+      searchTypeText: '未完成',
+      searchKeyWord: '',
+      contractType: 2,
+      enter: {
+        closePositionList: [],
+      },
+
+      // 提交类型
+      submitType: true,
+      size: 10,
+      spanArr: [],
+      contractNo: '',
+      inOutTaskNo: '',
+      compId: sessionStorage.getItem('ws-pf_compId'),
+      roleId: sessionStorage.getItem('ws-pf_roleId'),
+      deptCircularPage: {},
+      warehouseList: [],
+      orderList: {},
+      deptBudgetList: {},
+      id: '',
+      //settlementWeightchange: false,
+      pcFlag: 1,
+      deposit: '0',
+      stockPurchaseInfo: {
+        id: '',
+        settlementWeight: '',
+      },
+      settlementWeight: '',
+      // carryoverlist: {},
+      modification: [],
+      contractManagementInfoList: {},
+      contractManagementInfo: {
+        contractManagementInfoList: [],
+        deposit: '0',
+        depositUrl: '',
+        remark: '',
+        id: '',
+      },
+      remark:'',
+      depositUrls: [],
+      roleFlag: 1,
+      money: '',
+      paymentDate: '',
+      stockPurchaseReceiptReportList: [],
+      stockPurchaseReceiptReport: {
+        stockPurchaseReceiptReportList: [],
+        money: '',
+        amountNotPayable: 0,
+        amountEdPayable: 0,
+        paymentDate: '',
+        paymentScreenshot: '',
+        id: '',
+      },
+
+      amountNotPayable: 0,
+      amountEdPayable: 0,
+      paymentScreenshotUrls: [],
+      carryovercontractnolist: [],
+      pickerBeginDateBefore: {
+        disabledDate: (time) => {
+          return time.getTime() > Date.now()
+        },
+      },
+      accessoryTFs: false,
+    }
+  },
+  activated() {
+    this.getList()
+    this.showType = this.isShow
+  },
+  methods: {
+    //修改结算重量
+    varietyClick(row) {
+      if (
+        row.settlementWeight < 0 ||
+        row.settlementWeight > 100000 ||
+        (String(row.settlementWeight).indexOf('.') != -1 &&
+          String(row.settlementWeight).length -
+            (String(row.settlementWeight).indexOf('.') + 1) >
+            2)
+      ) {
+        this.$message({
+          message: '结算重量输入错误',
+          type: 'warning',
+        })
+        return
+      }
+      if (row.settlementWeight) {
+        if (isNaN(row.settlementWeight)) {
+          this.$message({
+            message: '结算重量非数字!',
+            type: 'warning',
+          })
+          return
+        }
+      }
+      if (!row.settlementWeight) {
+        this.$message({
+          message: '结算重量不能为空！',
+          type: 'warning',
+        })
+        return
+      }
+      this.$confirm(`确定要修改结算重量？`, {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          this.stockPurchaseInfo.id = row.id
+          this.stockPurchaseInfo.settlementWeight = row.settlementWeight
+          editSettlementWeight(this.stockPurchaseInfo)
+            .toPromise()
+            .then((response) => {
+              this.$notify.success({
+                title: '成功',
+                message: '修改成功',
+              })
+              this.getList()
+            })
+            .catch((response) => {})
+        })
+        .catch(() => {
+          return false
+        })
+    },
+    whether(row) {
+      row.identification = 'true'
+    },
+    handleRowClick(row) {
+      if (row.approveStatus == null) {
+        this.$refs.warehouseList.toggleRowSelection(row)
+        return true
+      } else if (row.approveStatus != null) {
+        if (row.taskId == null) {
+          return false
+        } else {
+          this.$refs.warehouseList.toggleRowSelection(row)
+          return true
+        }
+      }
+    },
+    selectInit(row) {
+      //在这里一定要记得类型匹配的上。
+      if (row.approveStatus == null) {
+        return true
+      } else if (row.approveStatus != null) {
+        if (row.taskId == null) {
+          return false
+        } else {
+          return true
+        }
+      }
+    },
+    //添加定金信息
+    dis() {
+      this.dialogFormVisible5 = true
+    },
+    //定金
+    amendconfirm() {
+      this.contractManagementInfo.deposit = this.deposit
+      this.contractManagementInfo.depositUrl = this.depositUrl
+      this.$confirm(`确定提交定金信息？`, {
+        cancelButtonText: '取消',
+        confirmButtonText: '确定',
+        type: 'warning',
+      }).then(() => {
+        for (var i = 0; i < this.contractNoList.length; i++) {
+          if (this.contractNoList[i].contractNo == this.contractNo) {
+            this.contractManagementInfoList.id = this.contractNoList[i].id
+          }
+        }
+        this.contractManagementInfoList.deposit = this.deposit
+        this.contractManagementInfoList.depositUrl = this.depositUrl
+        addDisOrRemarks(this.contractManagementInfoList)
+          .toPromise()
+          .then((response) => {
+            this.$message.success('修改成功')
+            this.dialogFormVisible5 = false
+            this.getList()
+            this.contractManagementInfoList = {}
+          })
+      })
+    },
+    //备注
+    addRemarks() {
+      this.dialogFormVisible11 = true
+    },
+    remarksSubmit() {
+      this.contractManagementInfo.remark = this.remark
+      this.$confirm(`确定要保存备注信息？`, {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        for (var i = 0; i < this.contractNoList.length; i++) {
+          if (this.contractNoList[i].contractNo == this.contractNo) {
+            this.contractManagementInfoList.id = this.contractNoList[i].id
+          }
+        }
+        this.contractManagementInfoList.remark = this.remark
+        addDisOrRemarks(this.contractManagementInfoList)
+          .toPromise()
+          .then(() => {
+            this.dialogFormVisible11 = false
+            this.$message.success('添加备注信息成功')
+            this.paymentManagementList = {}
+            this.getList()
+          })
+          .catch(() => {
+            return false
+          })
+      })
+    },
+    //付款
+    handlepayment() {
+      this.amountNotPayable = 0
+      this.money = this.money
+      this.stockPurchaseReceiptReportList =
+        this.warehouseList.records[0].stockPurchaseReceiptReportList
+      this.amountEdPayable = this.warehouseList.records[0].amountEdPayable
+      this.paymentDate = this.paymentDate
+      if (this.modification.length == 0) {
+        this.$message.warning('请选择一条要付款的条目')
+      } else {
+        for (var i = 0; i < this.modification.length; i++) {
+          if (
+            this.modification[i].status != '已通过' &&
+            this.modification[i].status != '部分付款'
+          ) {
+            this.$message.warning('只有已通过或部分付款的条目才可进行付款操作')
+            return
+          }
+          this.amountNotPayable += this.modification[i].amountNotPayable
+        }
+        this.dialogFormVisible1 = true
+      }
+    },
+    submitMoney() {
+      this.stockPurchaseReceiptReport.money = this.money
+      this.stockPurchaseReceiptReport.paymentDate = this.paymentDate
+      if (this.modification.length == 0) {
+        this.$message.warning('请选择一条要付款的条目')
+      } else {
+        if (
+          this.money < 0 ||
+          (String(this.money).indexOf('.') != -1 &&
+            String(this.money).length - (String(this.money).indexOf('.') + 1) >
+              2)
+        ) {
+          this.$message({
+            message: '付款金额输入错误',
+            type: 'warning',
+          })
+          return
+        }
+        if (this.money) {
+          if (isNaN(this.money)) {
+            this.$message({
+              message: '付款金额非数字!',
+              type: 'warning',
+            })
+            return
+          }
+        }
+        if (!this.money) {
+          this.$message({
+            message: '付款金额不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+        if (this.money > this.modification[0].amountNotPayable) {
+          this.$message({
+            message: '付款金额不能大于未付金额！',
+            type: 'warning',
+          })
+          return
+        }
+        this.$confirm(`确定提交付款信息？`, {
+          cancelButtonText: '取消',
+          confirmButtonText: '确定',
+          type: 'warning',
+        }).then(() => {
+          stockPurchasePayMoney({
+            stockPurchaseReceiptReportList: this.modification,
+            amountEdPayable: this.modification[0].amountEdPayable,
+            amountNotPayable: this.modification[0].amountNotPayable,
+            money: this.money,
+            paymentDate: this.paymentDate,
+            paymentScreenshot: this.paymentScreenshot,
+          })
+            .toPromise()
+            .then((response) => {
+              this.$notify.success({
+                title: '成功',
+                message: '付款成功',
+              })
+              this.stockPurchaseReceiptReportList = {}
+              this.money = ''
+              // this.paymentScreenshot = ''
+              this.paymentDate = ''
+              this.dialogFormVisible1 = false
+              this.getList()
+            })
+            .catch((response) => {
+              console.log(response)
+              EventBus.$emit('error', response.message)
+            })
+        })
+      }
+    },
+    //审核
+    handleAudit() {
+      var that = this
+      if (this.modification.length == 0) {
+        this.$message.warning('请选择一条要审核的条目')
+      } else {
+        this.$confirm(`审核通过后，任务将发送给财务，是否确定通过？`, {
+          cancelButtonText: '取消',
+          confirmButtonText: '确定',
+          type: 'warning',
+        }).then(() => {
+          that.audit(this.modification[0], 0, true)
+        })
+      }
+    },
+    audit(item, index, status, status2, reason) {
+      if (index < this.modification.length) {
+        posthandle({
+          taskId: item.taskId,
+          approved: status,
+          auditMind: reason != undefined ? '已驳回' : '34',
+          needReapply: status2 != undefined ? true : false,
+        })
+          .toPromise()
+          .then((response) => {
+            this.audit(
+              this.modification[index + 1],
+              index + 1,
+              status,
+              status2,
+              reason
+            )
+          })
+          .catch((req) => {
+            this.$message.warning(req.message)
+          })
+      } else {
+        if (status == true) {
+          this.$message.success('通过成功')
+          this.getList()
+        } else if (status == false) {
+          this.$message.success('驳回成功')
+          this.getList()
+        }
+      }
+    },
+    handlereject(status) {
+      var that = this
+      if (this.modification.length == 0) {
+        this.$message.warning('请选择要驳回的条目')
+      } else {
+        this.$confirm(`是否确定驳回？`, {
+          cancelButtonText: '取消',
+          confirmButtonText: '确定',
+          type: 'warning',
+        }).then(() => {
+          that.audit(this.modification[0], 0, false, true, '已驳回')
+        })
+      }
+    },
+    dataFilter(val) {
+      // console.log(val,"名")
+      this.contractNo = val
+      if (val) {
+        //val存在
+        this.options = this.contractNoList.filter((item) => {
+          if (
+            !!~item.contractNo.indexOf(val) ||
+            !!~item.contractNo.toUpperCase().indexOf(val.toUpperCase())
+          ) {
+            return true
+          }
+        })
+      } else {
+        //val为空时，还原数组
+        this.options = this.contractNoList
+      }
+    },
+    handlepass() {
+      var that = this
+      if (this.modification.length == 0) {
+        this.$message.warning('请选择要通过的条目')
+      } else {
+        this.$confirm(`是否确定通过？`, {
+          cancelButtonText: '取消',
+          confirmButtonText: '确定',
+          type: 'warning',
+        }).then(() => {
+          that.audit(this.modification[0], 0, true, 2)
+        })
+      }
+    },
+    handleSelectionChange(val) {
+      this.modification = val
+    },
+    handlestatus(status) {
+      this.searchType = status
+      this.getList()
+    },
+    contractchange(e) {
+      this.contractNo = e
+      this.getList()
+    },
+
+    updated() {
+      this.$nextTick(() => {
+        this.$refs.warehouseList.doLayout()
+      })
+    },
+    //合计
+    getSummaries(param) {
+      const { columns, data } = param
+      const sums = []
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '合计'
+        } else if (
+          index === 12 ||
+          index === 11 ||
+          index === 10 ||
+          index === 9
+        ) {
+          const values = data.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)
+          } else {
+            sums[index] = '元'
+          }
+        } else {
+          sums[index] = '--'
+        }
+      })
+      return sums
+    },
+    getList() {
+      // if(this.roleId=='4c2d50d8ff2943c1b7a1e947feefe048'){
+      //   this.roleFlag=1
+      // }else if(this.roleId=='cca3cf0ca2814d1e918f5b0a4380fe69'){
+      //   this.roleFlag=2
+      // }else if(this.roleId=='9ad8abb997714ef29068f23c2ad3b125'){
+      //   this.roleFlag=3
+      // }else if(this.roleId=='3d7b9179552b4c3e9c2d7af43962e2e4'){
+      //   this.roleFlag=4
+      // }else if(this.roleId=="4ef070439cd64784bce8844fd3f0f8e1"){
+      //   this.roleFlag=''
+      // }
+
+      getStockPurchaseReceiptList({
+        compId: sessionStorage.getItem('ws-pf_compId'),
+        currentPage: this.currentPage,
+        pageSize: this.pageSize,
+        searchType: this.searchType,
+        contractNo: this.contractNo,
+        // roleFlag: this.roleFlag,
+      })
+        .toPromise()
+        .then((response) => {
+          // debugger
+          for (var i = 0; i < response.records.length; i++) {
+            response.records[i].identification = 'false'
+          }
+          this.deptBudgetTotal = response.total
+          this.warehouseList = response
+        })
+      getStockPurchaseContractNoList({
+        compId: sessionStorage.getItem('ws-pf_compId'),
+        currentPage: this.currentPage,
+        pageSize: this.pageSize,
+        roleFlag: this.roleFlag,
+        contractNo: this.contractNo,
+      })
+        .toPromise()
+        .then((response) => {
+          this.contractNoList = response
+          this.options = this.contractNoList
+        })
+    },
+    handleRemove(file) {
+      console.log(file)
+    },
+    handlePictureCardPreview(file) {
+      this.paymentScreenshot = file.url
+      this.dialogVisible = true
+    },
+    // handleDownload(file) {
+    //   console.log(file)
+    // },
+
+    handlePictureCardPreviewDis(file) {
+      this.depositUrl = file.url
+      this.dialogVisible = true
+    },
+    handleRemoveDis(file) {
+      console.log(file)
+    },
+    getSpanArr(data) {
+      let that = this
+
+      //页面展示的数据，不一定是全部的数据，所以每次都清空之前存储的 保证遍历的数据是最新的数据。以免造成数据渲染混乱
+
+      that.spanArr = []
+
+      that.pos = 0
+
+      // //遍历数据
+
+      data.forEach((item, index) => {
+        //判断是否是第一项
+
+        if (index === 0) {
+          this.spanArr.push(1)
+          this.pos = 0
+        } else {
+          //不是第一项时，就根据标识去存储
+          if (data[index].warehouseNumViewList.length > 1) {
+            查找到符合条件的数据时每次要把之前存储的数据 + 1
+            this.spanArr[this.pos] = data[index].warehouseNumViewList.length
+            this.spanArr.push(0)
+          } else {
+            // 没有符合的数据时，要记住当前的index
+            this.spanArr.push(1)
+            this.pos = index
+          }
+        }
+      })
+    },
+    dateFormat(fmt, date) {
+      let ret
+      const opt = {
+        'Y+': date.getFullYear().toString(), // 年
+        'm+': (date.getMonth() + 1).toString(), // 月
+        'd+': date.getDate().toString(), // 日
+        'H+': date.getHours().toString(), // 时
+        // "M+": date.getMinutes().toString(),         // 分
+        // "S+": date.getSeconds().toString()          // 秒
+        // 有其他格式化字符需求可以继续添加，必须转化成字符串
+      }
+      for (let k in opt) {
+        ret = new RegExp('(' + k + ')').exec(fmt)
+        if (ret) {
+          fmt = fmt.replace(
+            ret[1],
+            ret[1].length == 1 ? opt[k] : opt[k].padStart(ret[1].length, '0')
+          )
+        }
+      }
+      return fmt
+    },
+    handleClose() {
+      this.accessoryTFs = false
+    },
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.pageSize = val
+      this.getList()
+    },
+    handleCurrentChange(val) {
+      this.currentPage = val
+      console.log(`当前页: ${val}`)
+      this.getList()
+    },
+    // handleExamine(row) {
+    //   this.$router.push({
+    //     name: 'salesContractExamine',
+    //     query: { id: row.id },
+    //   })
+    // },
+    // 关闭 dialog时 处理文件url 初始化upload组件
+    handleCloe() {
+      this.dialogViewSpareMoney = false
+    },
+    //查找
+    find() {
+      this.currentPage = 1
+      this.getList()
+    },
+    async exportlist() {
+      const { data } = await export1(
+        {
+          compId: sessionStorage.getItem('ws-pf_compId'),
+          contractType: this.contractType,
+          currentPage: this.currentPage,
+          pageSize: this.pageSize,
+          searchType: this.searchType,
+          searchKeyWord: this.searchKeyWord,
+          startDate: this.startDate,
+          endDate: this.endDate,
+        },
+        {},
+        { responseType: 'blob' }
+      ).toPromise()
+      downloadFile({
+        res: data,
+        fileName: `${
+          this.date.year + (this.date.month ? `-${this.date.month}` : '')
+        }_采购合同`,
+        type: 'xls',
+      })
+    },
+    total() {},
+  },
+}
+</script>
+<style lang="scss" scoped>
+.connert {
+  width: 90%;
+  margin: 0 auto;
+}
+.vertical-text-left {
+  width: 62px;
+  text-align: right;
+}
+//分页
+.el-pagination {
+  padding: 10px 15px;
+  margin-bottom: 0;
+  text-align: center;
+}
+/deep/.el-pager li.active {
+  color: #5878e8;
+  cursor: default;
+}
+/deep/.el-pager li:hover {
+  color: #5878e8;
+  cursor: default;
+}
+.el-button--default {
+  color: #8890b1;
+  border-color: #e8eaf1;
+}
+/deep/.base_header_layout .grid-content.right .find.el-button--primary {
+  width: 30px;
+  margin-left: 0;
+  border-top-left-radius: 0px;
+  border-bottom-left-radius: 0px;
+}
+/deep/.findValue .el-input__inner {
+  border-top-right-radius: 0px;
+  border-bottom-right-radius: 0px;
+  width: 385px;
+}
+.completed.el-button--default {
+  border-color: #5878e8;
+  background-color: #f6f7fc;
+  color: #5878e8;
+}
+.putstorage.el-button--default,
+.deliverystorage.el-button--default {
+  border-color: #8890b1;
+  background-color: #fff;
+  color: #8890b1;
+}
+/deep/.el-table td,
+/deep/.el-table th.is-leaf {
+  border-right: 1px solid #e9ecf7;
+  text-align: center;
+}
+/deep/.el-table tr td:first-child,
+/deep/.el-table tr th.is-leaf:first-child {
+  border-left: 1px solid #e9ecf7;
+}
+.record,
+.adjustment {
+  display: inline-block;
+  color: #5878e8;
+  padding: 0 4px !important;
+  position: relative;
+}
+.record:after {
+  position: absolute;
+  content: '';
+  display: block;
+  top: 5px;
+  right: -2px;
+  width: 1px;
+  height: 12px;
+  background: #e9ecf7;
+}
+// .el-row{
+//     height: 150px;
+// }
+.base_header_layout .grid-content {
+  margin-top: 80px;
+}
+.el-input--small .el-input__inner {
+  margin-left: 20px;
+}
+.el-range-editor--small.el-input__inner {
+  height: 32px;
+  margin-left: -20%;
+}
+//执行样式
+.executory,
+.inExecution,
+.done {
+  width: 6px;
+  height: 6px;
+  display: inline-block;
+  border-radius: 50%;
+  position: relative;
+  top: -1px;
+  font-size: 14px;
+}
+.executory {
+  background: #ff9f24;
+}
+.inExecution {
+  background: #5878e8;
+}
+.done {
+  background: #50cad4;
+}
+.record,
+.adjustment {
+  display: inline-block;
+  color: #5878e8;
+  padding: 0 4px !important;
+  position: relative;
+  font-size: 14px;
+}
+.container {
+  overflow: scroll;
+  height: 93vh;
+}
+.button-container {
+  display: flex;
+  flex-wrap: nowrap;
+  justify-content: space-between;
+  align-items: center;
+  background-color: #fff;
+  width: 100%;
+  height: 50px;
+  padding: 0 10px;
+  & > div {
+    margin-left: 10px;
+    display: flex;
+    flex-wrap: nowrap;
+    flex-direction: row;
+    & > span {
+      line-height: 50px;
+    }
+  }
+  /deep/.auditFlow-box {
+    position: unset;
+    margin-left: 10px;
+    &/deep/.auditFlow-icon {
+      width: auto;
+      padding-right: 30px;
+    }
+    &/deep/.auditFlow-main {
+      position: absolute;
+    }
+  }
+}
+.bg-left {
+  padding-left: 30px;
+}
+.title {
+  position: relative;
+}
+.title::before {
+  content: '';
+  display: inline-block;
+  width: 5px;
+  height: 30px;
+  background: #5473e8;
+  position: absolute;
+  left: 0;
+}
+.el-button--primary {
+  background-color: #5878e8;
+  border-color: #5878e8;
+  // margin-left: 85%;
+  margin-top: 13px;
+}
+//导航条样式
+.el-col-12 {
+  width: 50%;
+  height: 60px;
+  background: #f6f7fc;
+  border-radius: 4px 4px 1px 1px;
+}
+.el-input--small .el-input__inner {
+  height: 32px;
+  line-height: 32px;
+  width: 385px;
+  margin-top: 10px;
+}
+.bg-bottom {
+  margin-left: 85%;
+}
+.but {
+  margin-left: 30%;
+  /* margin-top: -32px; */
+  overflow: auto;
+  /* float: left; */
+  /* margin-left: 1px; */
+  margin-left: -10px;
+}
+.el-input--small {
+  font-size: 13px;
+  width: 390px;
+  margin-left: 74%;
+}
+/deep/.el-table .el-table__header .cell,
+.el-table .el-table__body .cell {
+  text-align: center;
+}
+.el-scrollbar__wrap {
+  overflow-y: hidden;
+}
+/deep/.deal {
+  margin-left: 0%;
+  width: 64%;
+}
+.photo {
+  padding: 0% 34%;
+}
+.photo1 {
+  padding: 0 10%;
+}
+.photo2 {
+  padding: 0 12%;
+}
+/deep/.el-form-item--small .el-form-item__label,
+.el-form-item--small .el-form-item__content {
+  text-align: center;
+}
+hr {
+  width: 91%;
+}
+/deep/.deaal {
+  width: 66%;
+  margin-left: 9%;
+}
+.el-date-editor.el-input,
+.el-date-editor.el-input__inner,
+.el-input-number--small {
+  width: 123% !important;
+}
+/deep/.el-table td,
+.el-table th.is-leaf {
+  border-right: 1px solid #e9ecf7;
+  text-align: center;
+  height: 40px;
+}
+.inputChenge {
+  width: 100%;
+  display: inline-flex;
+  margin-left: -69%;
+}
+.inputs {
+  margin: 0 auto;
+}
+/deep/.beizhu .el-input--small .el-input__inner {
+  height: 220px;
+  line-height: 28px;
+  width: 430px;
+  margin-left: 15px;
+}
+</style>

src/views/statisticalReport/stockSaleOutReportList.vue

@@ -0,0 +1,1448 @@
+//销售出库报表
+<template>
+  <div class="container">
+    <el-scrollbar style="height: 100%">
+      <el-row>
+        <el-col style="padding-left: 15px" :span="16">
+          <ws-button
+            :type="searchType == 1 ? 'primary' : ''"
+            @click="handlestatus(1)"
+            >待审核</ws-button
+          >
+          <ws-button
+            :type="searchType == 2 ? 'primary' : ''"
+            @click="handlestatus(2)"
+            >待结算</ws-button
+          >
+          <ws-button
+            :type="searchType == 3 ? 'primary' : ''"
+            @click="handlestatus(3)"
+            >已结算</ws-button
+          >
+          <ws-button
+            :type="searchType == '' ? 'primary' : ''"
+            @click="handlestatus('')"
+            >全部</ws-button
+          >
+          <ws-button
+            type="primary"
+            v-hasPermission="`report.saleOutReport.view`"
+            @click="handlepass()"
+            >通过</ws-button
+          >
+          <ws-button
+            type="primary"
+            v-hasPermission="`report.saleOutReport.view`"
+            @click="handlereject()"
+            >驳回</ws-button
+          >
+          <ws-button
+            type="primary"
+            v-hasPermission="`report.saleOutReport.payment`"
+            @click="handlecollect()"
+            >收款</ws-button
+          >
+          <ws-button
+            type="primary"
+            v-hasPermission="`report.saleOutReport.draw`"
+            @click="handleninvoice()"
+            >开发票</ws-button
+          >
+          <ws-button
+            type="primary"
+            v-hasPermission="`report.saleOutReport.carry`"
+            @click="amend()"
+            >最终结算价</ws-button
+          >
+        </el-col>
+        <el-col
+          style="text-align: right; line-height: 60px; padding-right: 10px"
+          :span="8"
+        >
+          <el-select
+            v-model="contractNo"
+            placeholder="请选择合同"
+            clearable
+            filterable
+            :filter-method="dataFilter"
+            @change="contractchange"
+            maxlength="500"
+            type="input"
+            class="findValue"
+          >
+            <el-option
+              v-if="item.reportStatus"
+              v-for="item in options"
+              :key="item.constKey"
+              :label="item.contractNo + '(' + item.reportStatus + ')'"
+              :value="item.contractNo"
+            />
+            <el-option
+              v-if="!item.reportStatus"
+              v-for="item in options"
+              :key="item.constKey"
+              :label="item.contractNo"
+              :value="item.contractNo"
+            />
+          </el-select>
+        </el-col>
+      </el-row>
+      <div v-if="contractNo != ''">
+        <span v-if="orderList.transactionsNumber"
+          >合同重量: {{ orderList.transactionsNumber }} 吨</span
+        >
+        <span v-else>合同重量: 0 吨</span>
+        <span v-if="orderList.cumulativeTurnover"
+          >成交量: {{ orderList.cumulativeTurnover }} 吨</span
+        >
+        <span v-else>成交量: 0 吨</span>
+        <span v-if="orderList.closedPosition"
+          >已平仓: {{ orderList.closedPosition }} 吨</span
+        >
+        <span v-else>已平仓: 0 吨</span>
+        <span v-if="orderList.stockOutQuantity"
+          >出库量: {{ orderList.stockOutQuantity }} 吨</span
+        >
+        <span v-else>出库量: 0 吨</span>
+      </div>
+
+      <el-table
+        class="wenzi"
+        :data="warehouseList.records"
+        style="width: 100%; margin-top: 20px"
+        ref="warehouseList"
+        border
+        :summary-method="getSummaries"
+        show-summary
+        @row-click="handleRowClick"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column
+          :selectable="selectInit"
+          type="selection"
+          width="55"
+        ></el-table-column>
+        <el-table-column type="index" label="序号" width="50"></el-table-column>
+        <el-table-column
+          class="table_td"
+          prop="contractNo"
+          width="120"
+          label="合同编号"
+        ></el-table-column>
+        <el-table-column
+          class="table_td"
+          prop="goodsName"
+          label="货名"
+        ></el-table-column>
+        <el-table-column
+          class="table_td"
+          prop="positionNumber"
+          label="仓位号"
+        ></el-table-column>
+        <el-table-column class="table_td" prop="carNo" label="车牌号" width="140">
+          <template slot-scope="scope">
+            {{ scope.row.carNo }}({{ scope.row.tranCarNo }})
+          </template>
+        </el-table-column>
+        <el-table-column
+          class="table_td"
+          prop="retrievalDate"
+          width="100"
+          label="出库日期"
+        ></el-table-column>
+        <el-table-column
+          width="100"
+          class="table_td"
+          prop="protein"
+          label="蛋白(%)>="
+        ></el-table-column>
+        <el-table-column
+          width="100"
+          class="table_td"
+          prop="waterContent"
+          label="水分(%)<="
+        ></el-table-column>
+        <el-table-column
+          width="100"
+          class="table_td"
+          prop="unitPrice"
+          label="单价(元/吨)"
+        ></el-table-column>
+        <el-table-column
+          width="100"
+          class="table_td"
+          prop="basisPrice"
+          label="基差(元/吨)"
+        ></el-table-column>
+        <el-table-column
+          width="100"
+          class="table_td"
+          prop="invoiceFee"
+          label="发票费(元/吨)"
+        ></el-table-column>
+        <el-table-column
+          width="120"
+          class="table_td"
+          prop="settlementPrice"
+          label="结算单价(元/吨)"
+        ></el-table-column>
+        <el-table-column
+          class="table_td"
+          prop="netWeight"
+          label="净重(吨)"
+        ></el-table-column>
+        <el-table-column
+          width="100"
+          class="table_td"
+          label="应收金额(元)"
+          prop="collectionIngPayable"
+        ></el-table-column>
+        <el-table-column
+          width="100"
+          class="table_td"
+          label="已收金额(元)"
+          prop="collectionEdPayable"
+        ></el-table-column>
+        <el-table-column
+          width="100"
+          class="table_td"
+          label="未收金额(元)"
+          prop="collectionNotPayable"
+        ></el-table-column>
+        <el-table-column
+          class="table_td"
+          label="收款日期"
+          prop="collectionDate"
+        ></el-table-column>
+        <el-table-column
+          class="table_td"
+          label="客户确认"
+          prop="customerConfirmationStatus"
+        ></el-table-column>
+        <el-table-column
+          class="table_td"
+          label="客户"
+          prop="customerName"
+        ></el-table-column>
+        <el-table-column
+          class="table_td"
+          label="库点"
+          prop="warehouseName"
+        ></el-table-column>
+        <el-table-column
+          width="100"
+          class="table_td"
+          label="已开发票(元)"
+          prop="alreadyInvoice"
+        >
+          <template slot-scope="scope">
+            {{ scope.row.alreadyInvoice }}
+            <img
+            v-if="
+                scope.row.collectionEdPayable > 0
+              "
+              width="17"
+              height="18"
+              style="vertical-align: text-top; position: relative; top: -1px"
+              src="../../../public/img/edit.png"
+              @click="editClickInvoice(scope.row)"
+              alt=""
+            /> </template
+        ></el-table-column>
+        <el-table-column label="状态" prop="status">
+          <template slot-scope="scope">
+            <span v-if="scope.row.approveStatus != null">{{
+              scope.row.approveStatus
+            }}</span>
+            <span v-else>{{ scope.row.status }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <!-- 页数 -->
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="currentPage"
+        :page-size="pageSize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="deptBudgetTotal"
+      ></el-pagination>
+    </el-scrollbar>
+    <!-- 收款 -->
+    <el-dialog
+      width="25%"
+      title="收款"
+      :visible.sync="dialogFormVisible1"
+      :append-to-body="true"
+    >
+      <el-form :model="form">
+        <el-form-item label="未收金额（元）" :label-width="formLabelWidth">
+          <span>{{ collectionNotPayable }}</span>
+          <!-- <el-input v-model="form.region" autocomplete="off" class="deal"></el-input> -->
+        </el-form-item>
+        <el-form-item label="本次收款金额" :label-width="formLabelWidth">
+          <el-input
+            v-model="money"
+            autocomplete="off"
+            placeholder="请输入本次收款金额"
+            class="deal"
+          ></el-input>
+        </el-form-item>
+        <el-form-item
+          label="收款日期"
+          prop="collectionDate"
+          :label-width="formLabelWidth"
+          class="deal"
+        >
+          <ws-date-picker
+            v-model="deptBudgetList.collectionDate"
+            type="date"
+            placeholder="请选择收款日期"
+            value-format="yyyy-MM-dd"
+            class="deal"
+          />
+        </el-form-item>
+        <el-form-item label="上传收款截图" :label-width="formLabelWidth">
+          <el-upload
+            action="https://www.zthymaoyi.com/upload/admin"
+            list-type="picture-card"
+            :on-success="handlePictureCardPreview"
+            :on-remove="handleRemove"
+            class="photo2"
+          >
+            <i class="el-icon-plus"></i>
+          </el-upload>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormVisible1 = false">取 消</el-button>
+        <el-button type="primary" @click="collectment">提 交</el-button>
+      </div>
+    </el-dialog>
+    <!-- 批量开发票 -->
+    <el-dialog
+      width="30%"
+      title="批量开发票"
+      :visible.sync="dialogFormVisible2"
+      :append-to-body="true"
+    >
+      <el-form :model="form">
+        <el-form-item label="发票金额（元）" :label-width="formLabelWidth">
+          <span>{{ collectionEdPayable }}</span>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormVisible2 = false">取 消</el-button>
+        <el-button type="primary" @click="submitBatchInvoice()"
+          >提 交</el-button
+        >
+      </div>
+    </el-dialog>
+    <!-- 开发票 -->
+    <el-dialog
+      width="30%"
+      title="开发票"
+      :visible.sync="dialogFormVisible3"
+      :append-to-body="true"
+    >
+      <el-form :model="form">
+        <el-form-item label="可开发票金额（元）" :label-width="formLabelWidth">
+          <span>{{ collectionEdPayable }}</span>
+        </el-form-item>
+        <el-form-item label="实际发票金额（元）" :label-width="formLabelWidth">
+          <el-input
+            v-model="alreadyInvoice"
+            autocomplete="off"
+            class="deal"
+            placeholder="请输入本次收款金额"
+          ></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormVisible3 = false">取 消</el-button>
+        <el-button type="primary" @click="submitInvoice()">提 交</el-button>
+      </div>
+    </el-dialog>
+    <!-- 最终结算价 -->
+    <el-dialog
+      width="30%"
+      title="最终结算价"
+      :visible.sync="dialogFormVisible5"
+      :append-to-body="true"
+    >
+      <el-form :rules="rules">
+        <el-form-item label="单价" :label-width="formLabelWidth">
+          <el-input
+            @input="getprice"
+            v-model="amendlist.unitPrice"
+            autocomplete="off"
+            class="deal"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="基差" :label-width="formLabelWidth">
+          <el-input
+            @input="getbasis"
+            v-model="amendlist.basisPrice"
+            autocomplete="off"
+            class="deal"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="发票费" :label-width="formLabelWidth">
+          <el-input
+            @input="getinvoice"
+            v-model="amendlist.invoiceFee"
+            autocomplete="off"
+            class="deal"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="最终结算价" :label-width="formLabelWidth">
+          <el-input
+            readonly="readonly"
+            v-model="amendlist.settlementPrice"
+            autocomplete="off"
+            class="deal"
+            placeholder="不可编辑，自动计算"
+          ></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormVisible5 = false">取 消</el-button>
+        <el-button type="primary" @click="amendconfirm">提 交</el-button>
+      </div>
+    </el-dialog>
+  </div>
+  <!-- </div> -->
+</template>
+<script>
+import {
+  salelist,
+  getsaleoutcontractno,
+  finalsettlementprice,
+  issueapproval,
+  getsaleorder,
+  cashierpayment,
+  salesinvoicing,
+  salesbatchinvoicing,
+} from '@/model/statisticalReport/index'
+import { posthandle } from '@/model/purchasingManagement/index'
+import { downloadFile } from '@/utils/batchDown'
+import Pagination from '@/components/Pagination'
+import WsUpload from '@/components/WsUpload'
+import { dayjs, fmoney, EventBus } from 'base-core-lib'
+export default {
+  name: 'viewSpareMoney',
+  components: {
+    WsUpload,
+    Pagination,
+  },
+  watch: {
+    vesselId(val) {
+      this.getList()
+    },
+    isShow(val) {
+      this.showType = val
+    },
+  },
+
+  data() {
+    return {
+      checked: true,
+      dialogFormVisible1: false,
+      dialogFormVisible2: false,
+      dialogFormVisible3: false,
+      dialogFormVisible4: false,
+      dialogFormVisible5: false,
+      dialogFormVisible6: false,
+      dialogFormVisible7: false,
+      dialogFormVisible8: false,
+      dialogVisible: false,
+      collectionEdPayable: 0,
+      collectionNotPayable: 0,
+      alreadyInvoice: 0,
+
+      form: {
+        transactionPrice: '',
+        transactionsNumber: '',
+        basis: '',
+        submissionDate: '',
+        // delivery: false,
+        // type: [],
+        // resource: '',
+        // desc: ''
+      },
+      currect: true,
+      formLabelWidth: '120px',
+      barWidth: 0,
+      barHeight: 0,
+      retioX: 1,
+      ratioY: 1,
+      orderList: {},
+      isTaped: false,
+      isHover: false,
+      isShow: !this.autohide,
+      //弹出框
+      dialogViewSpareMoney: false,
+      contractNoList: [],
+      // 是否显示
+      showType: true,
+      // 年
+      year: '',
+      pickerOptions: {},
+      value2: '',
+      deptBudgetTotal: 0,
+      currentPage: 1,
+      tranTypeKey: 1,
+      collectmoney: 0,
+      pageSize: 10,
+      searchType: '1',
+      searchTypeText: '未完成',
+      searchKeyWord: '',
+      contractType: 2,
+      enter: {
+        closePositionList: [],
+      },
+      // 提交类型
+      submitType: true,
+      size: 10,
+      spanArr: [],
+      contractNo: '全部合同',
+      inOutTaskNo: '',
+      options:[],
+      compId: sessionStorage.getItem('ws-pf_compId'),
+      deptCircularPage: {},
+      warehouseList: [],
+      deptBudgetList: {},
+      rules: {
+        settlementPrice: [
+          {
+            required: true,
+            type: 'number',
+            trigger: 'blur',
+          },
+        ],
+      },
+      pcFlag: 1,
+      modification: [],
+      amendlist: {},
+      money: '',
+      roleFlag: 1,
+      roleId: sessionStorage.getItem('ws-pf_roleId'),
+      collectionScreenshot: '',
+      salesDeliveryReportList: [],
+      salesDeliveryReport: {
+        salesDeliveryReportList: [],
+        money: '',
+        collectionEdPayable: 0,
+        collectionNotPayable: 0,
+        collectionDate: '',
+        id: '',
+        invoiceType: '',
+      },
+      historyList: [],
+      collectionScreenshotUrls: [],
+      pickerBeginDateBefore: {
+        disabledDate: (time) => {
+          return time.getTime() > Date.now()
+        },
+      },
+      accessoryTFs: false,
+    }
+  },
+  activated() {
+    // this.loaddata()
+    console.log(1111)
+    this.getList()
+    this.showType = this.isShow
+  },
+  // computed:{
+  //   sum:function(){
+  //       this.amendlist.settlementPrice = Number(
+  //         this.amendlist.unitPrice )+ Number(this.amendlist.basisPrice )+ Number(this.amendlist.invoiceFee)
+  //    }
+  // },
+  methods: {
+    dataFilter(val) {
+      // console.log(val,"名")
+      this.contractNo = val 
+      if (val) {
+        //val存在
+        this.options = this.contractNoList.filter(item => {
+          if (
+            !!~item.contractNo.indexOf(val) ||
+            !!~item.contractNo.toUpperCase().indexOf(val.toUpperCase())
+          ) {
+            return true
+          }
+        })
+      } else {
+        //val为空时，还原数组
+        this.options = this.contractNoList
+      }
+    },
+    handleRowClick(row) {
+      if (row.approveStatus == null) {
+        this.$refs.warehouseList.toggleRowSelection(row)
+        return true
+      } else if (row.approveStatus != null) {
+        if (row.taskId == null) {
+          return false
+        } else {
+          this.$refs.warehouseList.toggleRowSelection(row)
+          return true
+        }
+      }
+    },
+    selectInit(row) {
+      //在这里一定要记得类型匹配的上。
+      if (row.approveStatus == null) {
+        return true
+      } else if (row.approveStatus != null) {
+        if (row.taskId == null) {
+          return false
+        } else {
+          return true
+        }
+      }
+    },
+    audit(item, index, status, status2, reason) {
+      if (index < this.modification.length) {
+        posthandle({
+          taskId: item.taskId,
+          approved: status,
+          auditMind: reason != undefined ? '已驳回' : '34',
+          needReapply: status2 != undefined ? true : false,
+        })
+          .toPromise()
+          .then((response) => {
+            this.audit(this.modification[index + 1], index + 1, status)
+          })
+          .catch((req) => {
+            this.$message.warning(req.message)
+          })
+      } else {
+       if (status==true) {
+          this.$message.success('通过成功')
+          this.getList()
+        } else if (status==false) {
+          this.$message.success('驳回成功')
+          this.getList()
+          }
+      }
+    },
+    handlereject(status) {
+      var that = this
+      if (this.modification.length == 0) {
+        this.$message.warning('请选择要驳回的条目')
+      } else {
+        this.$confirm(`是否确定驳回？`, {
+          cancelButtonText: '取消',
+          confirmButtonText: '确定',
+          type: 'warning',
+        }).then(() => {
+          that.audit(this.modification[0], 0, false, true, '已驳回')
+        })
+      }
+    },
+    handlepass() {
+      var that = this
+      if (this.modification.length == 0) {
+        this.$message.warning('请选择要通过的条目')
+      } else {
+        this.$confirm(`是否确定通过？`, {
+          cancelButtonText: '取消',
+          confirmButtonText: '确定',
+          type: 'warning',
+        }).then(() => {
+          that.audit(this.modification[0], 0, true)
+        })
+      }
+    },
+    //最终结算价
+    amendconfirm() {
+      this.amendlist.id = this.modification[0].id
+      finalsettlementprice(this.amendlist)
+        .toPromise()
+        .then((response) => {
+          this.$message.success('修改成功')
+          this.dialogFormVisible5 = false
+          this.getList()
+        })
+    },
+    handleSelectionChange(val) {
+      this.modification = val
+    },
+    handlestatus(status) {
+      this.searchType = status
+      this.getList()
+    },
+    contractchange(e) {
+      this.contractNo = e
+      getsaleorder({
+        contractNo: this.contractNo,
+      })
+        .toPromise()
+        .then((response) => {
+          if (response != null) {
+            this.orderList = response
+          }
+        })
+      this.getList()
+    },
+    updated() {
+      this.$nextTick(() => {
+        this.$refs.warehouseList.doLayout()
+      })
+    },
+    //合计
+    getSummaries(param) {
+      const { columns, data } = param
+      const sums = []
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '合计'
+        } else if (
+          index === 13 ||
+          index === 14 ||
+          index === 15 ||
+          index === 16 ||
+          index === 21
+        ) {
+          const values = data.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)
+          } else {
+            sums[index] = '元'
+          }
+        } else {
+          sums[index] = '--'
+        }
+      })
+      return sums
+    },
+    handlecollect() {
+      this.collectionNotPayable = 0
+      if (this.modification.length == 0) {
+        this.$message.warning('请选择一条要收款的条目')
+      } else {
+        for (var i = 0; i < this.modification.length; i++) {
+          if (
+            this.modification[i].status != '已通过' &&
+            this.modification[i].status != '部分收款'
+          ) {
+            this.$message.warning('只有已通过或部分收款的条目才可进行收款操作')
+            return
+          }
+          this.collectionNotPayable += this.modification[i].collectionNotPayable
+        }
+        this.dialogFormVisible1 = true
+      }
+    },
+    //收款
+    collectment() {
+      this.salesDeliveryReport.money = this.money
+      this.salesDeliveryReport.collectionDate = this.collectionDate
+      if (this.modification.length == 0) {
+        this.$message.warning('请选择一条要收款的条目')
+      } else {
+        if (
+          this.money < 0 ||
+          (String(this.money).indexOf('.') != -1 &&
+            String(this.money).length - (String(this.money).indexOf('.') + 1) >
+              2)
+        ) {
+          this.$message({
+            message: '收款金额输入错误',
+            type: 'warning',
+          })
+          return
+        }
+        if (this.money) {
+          if (isNaN(this.money)) {
+            this.$message({
+              message: '收款金额非数字!',
+              type: 'warning',
+            })
+            return
+          }
+        }
+        if (!this.money) {
+          this.$message({
+            message: '收款金额不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+        if (this.money > this.modification[0].collectionNotPayable) {
+          this.$message({
+            message: '收款金额不能大于未收金额！',
+            type: 'warning',
+          })
+          return
+        }
+        this.$confirm(`确定提交收款信息？`, {
+          cancelButtonText: '取消',
+          confirmButtonText: '确定',
+          type: 'warning',
+        }).then(() => {
+          cashierpayment({
+            salesDeliveryReportList: this.modification,
+            collectionEdPayable: this.modification[0].collectionEdPayable,
+            collectionNotPayable: this.modification[0].collectionNotPayable,
+            money: this.money,
+            collectionDate: this.collectionDate,
+            collectionScreenshot: this.collectionScreenshot,
+          })
+            .toPromise()
+            .then((response) => {
+              this.$notify.success({
+                title: '成功',
+                message: '收款成功',
+              })
+              this.salesDeliveryReportList = {}
+              this.money = ''
+              this.collectionDate = ''
+              this.collectionScreenshot=''
+              this.dialogFormVisible1 = false
+              this.getList()
+            })
+            .catch((response) => {
+              console.log(response)
+              EventBus.$emit('error', response.message)
+            })
+        })
+      }
+    },
+    //批量开发票
+    handleninvoice() {
+      this.collectionEdPayable = 0
+      for (var i = 0; i < this.modification.length; i++) {
+        this.collectionEdPayable += this.modification[i].collectionEdPayable
+      }
+      this.dialogFormVisible2 = true
+    },
+    submitBatchInvoice() {
+      if (this.modification.length == 0) {
+        this.$message.warning('请选择一条要开发票的条目')
+      } else if (this.modification[0].collectionEdPayable < 0) {
+        this.$message.warning('请选择一条已收款的条目')
+      } else {
+        this.$confirm(`确定提交发票信息？`, {
+          cancelButtonText: '取消',
+          confirmButtonText: '确定',
+          type: 'warning',
+        }).then(() => {
+          salesbatchinvoicing({
+            salesDeliveryReportList: this.modification,
+          })
+            .toPromise()
+            .then((response) => {
+              this.$notify.success({
+                title: '成功',
+                message: '提交成功',
+              })
+              this.dialogFormVisible2 = false
+              this.getList()
+            })
+            .catch((response) => {
+              console.log(response)
+              EventBus.$emit('error', response.message)
+            })
+        })
+      }
+    },
+    //开发票
+    editClickInvoice(row) {
+      this.id = row.id
+      this.alreadyInvoice1 = row.alreadyInvoice
+      this.amountEdPayable = row.amountEdPayable
+      this.amountNotPayable = row.amountNotPayable
+      this.dialogFormVisible3 = 'true'
+    },
+    submitInvoice() {
+      if (this.collectionEdPayable < 0) {
+        this.$message.warning('请选择一条已付款的条目')
+      } else {
+        if (
+          this.alreadyInvoice < 0 ||
+          this.alreadyInvoice >
+            this.collectionEdPayable - this.alreadyInvoice1 ||
+          (String(this.alreadyInvoice).indexOf('.') != -1 &&
+            String(this.alreadyInvoice).length -
+              (String(this.alreadyInvoice).indexOf('.') + 1) >
+              2)
+        ) {
+          this.$message({
+            message: '金额输入错误',
+            type: 'warning',
+          })
+          return
+        }
+        if (this.alreadyInvoice) {
+          if (isNaN(this.alreadyInvoice)) {
+            this.$message({
+              message: '金额非数字!',
+              type: 'warning',
+            })
+            return
+          }
+        }
+        if (!this.alreadyInvoice) {
+          this.$message({
+            message: '金额不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+        this.$confirm(`确定提交发票信息？`, {
+          cancelButtonText: '取消',
+          confirmButtonText: '确定',
+          type: 'warning',
+        }).then(() => {
+          salesinvoicing({
+            id: this.id,
+            invoiceType: this.invoiceType,
+            alreadyInvoice: this.alreadyInvoice,
+            collectionEdPayable: this.collectionEdPayable,
+            collectionNotPayable: this.collectionNotPayable,
+          })
+            .toPromise()
+            .then((response) => {
+              this.$notify.success({
+                title: '成功',
+                message: '提交成功',
+              })
+              this.dialogFormVisible3 = false
+              this.getList()
+            })
+            .catch((response) => {
+              console.log(response)
+              EventBus.$emit('error', response.message)
+            })
+        })
+      }
+    },
+    //列表
+    getList() {
+      // if(this.roleId=='4c2d50d8ff2943c1b7a1e947feefe048'){
+      //   this.roleFlag=1
+      // }else if(this.roleId=='cca3cf0ca2814d1e918f5b0a4380fe69'){
+      //   this.roleFlag=2
+      // }else if(this.roleId=='9ad8abb997714ef29068f23c2ad3b125'){
+      //   this.roleFlag=3
+      // }else if(this.roleId=='3d7b9179552b4c3e9c2d7af43962e2e4'){
+      //   this.roleFlag=4
+      // }else if(this.roleId=="4ef070439cd64784bce8844fd3f0f8e1"){
+      //   this.roleFlag=''
+      // }
+      salelist({
+        compId: sessionStorage.getItem('ws-pf_compId'),
+        currentPage: this.currentPage,
+        pageSize: this.pageSize,
+        searchType: this.searchType,
+        contractNo: this.contractNo,
+        // roleFlag:this.roleFlag
+      })
+        .toPromise()
+        .then((response) => {
+          for (var i = 0; i < response.records.length; i++) {
+            response.records[i].settlementPrice =
+              response.records[i].unitPrice +
+              response.records[i].basisPrice +
+              response.records[i].invoiceFee
+          }
+          this.deptBudgetTotal = response.total
+          this.warehouseList = response
+        })
+      getsaleoutcontractno({
+        compId: sessionStorage.getItem('ws-pf_compId'),
+        currentPage: this.currentPage,
+        pageSize: this.pageSize,
+        roleFlag: this.roleFlag,
+      })
+        .toPromise()
+        .then((response) => {
+          this.contractNoList = response
+          this.contractNoList.unshift({contractNo:'全部合同'})
+          this.options=this.contractNoList
+        })
+    },
+    //最终结算价
+    amend() {
+      if (this.modification.length == 0) {
+        this.$message.warning('请选择一条要修改最终结算价的条目')
+      } else {
+        this.dialogFormVisible5 = true
+      }
+    },
+    getprice(e) {
+      if (
+        this.amendlist.unitPrice &&
+        this.amendlist.basisPrice &&
+        this.amendlist.invoiceFee
+      ) {
+        this.amendlist.settlementPrice =
+          Number(this.amendlist.unitPrice) +
+          Number(this.amendlist.basisPrice) +
+          Number(this.amendlist.invoiceFee)
+      }
+    },
+    getbasis(e) {
+      console.log(e)
+      if (
+        this.amendlist.unitPrice &&
+        this.amendlist.basisPrice &&
+        this.amendlist.invoiceFee
+      ) {
+        this.amendlist.settlementPrice =
+          Number(this.amendlist.unitPrice) +
+          Number(this.amendlist.basisPrice) +
+          Number(this.amendlist.invoiceFee)
+      }
+    },
+    getinvoice(e) {
+      if (
+        this.amendlist.unitPrice &&
+        this.amendlist.basisPrice &&
+        this.amendlist.invoiceFee
+      ) {
+        this.amendlist.settlementPrice =
+          Number(this.amendlist.unitPrice) +
+          Number(this.amendlist.basisPrice) +
+          Number(this.amendlist.invoiceFee)
+      }
+    },
+
+    handleRemove(file) {
+      console.log(file)
+    },
+    handlePictureCardPreview(file) {
+      this.collectionScreenshot = file.url
+    },
+    handleDownload(file) {
+      console.log(file)
+    },
+
+    getSpanArr(data) {
+      let that = this
+
+      //页面展示的数据，不一定是全部的数据，所以每次都清空之前存储的 保证遍历的数据是最新的数据。以免造成数据渲染混乱
+
+      that.spanArr = []
+
+      that.pos = 0
+
+      // //遍历数据
+
+      data.forEach((item, index) => {
+        //判断是否是第一项
+
+        if (index === 0) {
+          this.spanArr.push(1)
+          this.pos = 0
+        } else {
+          //不是第一项时，就根据标识去存储
+          if (data[index].warehouseNumViewList.length > 1) {
+            查找到符合条件的数据时每次要把之前存储的数据 + 1
+            this.spanArr[this.pos] = data[index].warehouseNumViewList.length
+            this.spanArr.push(0)
+          } else {
+            // 没有符合的数据时，要记住当前的index
+            this.spanArr.push(1)
+            this.pos = index
+          }
+        }
+      })
+    },
+    //查看
+    handleLook(row) {
+      this.$router.push({
+        path: 'warehouseManagementPutOutLook',
+        query: {
+          relevanceId: row.relevanceId,
+        },
+      })
+    },
+    //返回
+    revert() {
+      this.$router.push({ path: 'warehouseManagementList' })
+    },
+    dateFormat(fmt, date) {
+      let ret
+      const opt = {
+        'Y+': date.getFullYear().toString(), // 年
+        'm+': (date.getMonth() + 1).toString(), // 月
+        'd+': date.getDate().toString(), // 日
+        'H+': date.getHours().toString(), // 时
+        // "M+": date.getMinutes().toString(),         // 分
+        // "S+": date.getSeconds().toString()          // 秒
+        // 有其他格式化字符需求可以继续添加，必须转化成字符串
+      }
+      for (let k in opt) {
+        ret = new RegExp('(' + k + ')').exec(fmt)
+        if (ret) {
+          fmt = fmt.replace(
+            ret[1],
+            ret[1].length == 1 ? opt[k] : opt[k].padStart(ret[1].length, '0')
+          )
+        }
+      }
+      return fmt
+    },
+    handleClose() {
+      this.accessoryTFs = false
+    },
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.pageSize = val
+      this.getList()
+    },
+    handleCurrentChange(val) {
+      this.currentPage = val
+      console.log(`当前页: ${val}`)
+      this.getList()
+    },
+    editClick(row) {
+      var status = ''
+      if (row.status == '待审核' || row.status == '已完成') {
+        status = '执行中'
+      } else if (row.status == '执行中') {
+        status = '已完成'
+      }
+      //cancelButtonClass: "btn-custom-cancel"
+      this.$confirm(`是否将状态改为${status}`, {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          alsostate({ id: row.id })
+            .toPromise()
+            .then((response) => {
+              this.$notify.success({
+                title: '成功',
+                message: '状态修改成功',
+              })
+              this.getList()
+            })
+            .catch((response) => {
+              // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+            })
+        })
+        .catch(() => {
+          return false
+        })
+    },
+    selecttaskType(e) {
+      for (var i = 0; i < this.taskTypeList.length; i++) {
+        if (this.taskTypeList[i].value == e) {
+          this.searchType = this.taskTypeList[i].type
+        }
+      }
+    },
+    handleExamine(row) {
+      this.$router.push({
+        name: 'salesContractExamine',
+        query: { id: row.id },
+      })
+    },
+    // 关闭 dialog时 处理文件url 初始化upload组件
+    handleCloe() {
+      this.dialogViewSpareMoney = false
+    },
+    history(row) {
+      billoperatehis({ id: row.id })
+        .toPromise()
+        .then((response) => {
+          this.historyList = response
+        })
+    },
+    //查找
+    find() {
+      this.currentPage = 1
+      this.getList()
+    },
+    async exportlist() {
+      const { data } = await export1(
+        {
+          compId: sessionStorage.getItem('ws-pf_compId'),
+          contractType: this.contractType,
+          currentPage: this.currentPage,
+          pageSize: this.pageSize,
+          searchType: this.searchType,
+          searchKeyWord: this.searchKeyWord,
+          startDate: this.startDate,
+          endDate: this.endDate,
+        },
+        {},
+        { responseType: 'blob' }
+      ).toPromise()
+      downloadFile({
+        res: data,
+        fileName: `${
+          this.date.year + (this.date.month ? `-${this.date.month}` : '')
+        }_采购合同`,
+        type: 'xls',
+      })
+    },
+    total() {},
+  },
+}
+</script>
+<style lang="scss" scoped>
+.connert {
+  width: 90%;
+  margin: 0 auto;
+}
+.vertical-text-left {
+  width: 62px;
+  text-align: right;
+}
+//分页
+.el-pagination {
+  padding: 10px 15px;
+  margin-bottom: 0;
+  text-align: center;
+}
+/deep/.el-pager li.active {
+  color: #5878e8;
+  cursor: default;
+}
+/deep/.el-pager li:hover {
+  color: #5878e8;
+  cursor: default;
+}
+.el-button--default {
+  color: #8890b1;
+  border-color: #e8eaf1;
+}
+/deep/.base_header_layout .grid-content.right .find.el-button--primary {
+  width: 30px;
+  margin-left: 0;
+  border-top-left-radius: 0px;
+  border-bottom-left-radius: 0px;
+}
+/deep/.findValue .el-input__inner {
+  border-top-right-radius: 0px;
+  border-bottom-right-radius: 0px;
+  width: 385px;
+}
+.completed.el-button--default {
+  border-color: #5878e8;
+  background-color: #f6f7fc;
+  color: #5878e8;
+}
+.putstorage.el-button--default,
+.deliverystorage.el-button--default {
+  border-color: #8890b1;
+  background-color: #fff;
+  color: #8890b1;
+}
+/deep/.el-table td,
+/deep/.el-table th.is-leaf {
+  border-right: 1px solid #e9ecf7;
+  text-align: center;
+}
+/deep/.el-table tr td:first-child,
+/deep/.el-table tr th.is-leaf:first-child {
+  border-left: 1px solid #e9ecf7;
+}
+.record,
+.adjustment {
+  display: inline-block;
+  color: #5878e8;
+  padding: 0 4px !important;
+  position: relative;
+}
+.record:after {
+  position: absolute;
+  content: '';
+  display: block;
+  top: 5px;
+  right: -2px;
+  width: 1px;
+  height: 12px;
+  background: #e9ecf7;
+}
+// .el-row{
+//     height: 150px;
+// }
+.base_header_layout .grid-content {
+  margin-top: 80px;
+}
+.el-input--small .el-input__inner {
+  margin-left: 20px;
+}
+.el-range-editor--small.el-input__inner {
+  height: 32px;
+  margin-left: -20%;
+}
+//执行样式
+.executory,
+.inExecution,
+.done {
+  width: 6px;
+  height: 6px;
+  display: inline-block;
+  border-radius: 50%;
+  position: relative;
+  top: -1px;
+  font-size: 14px;
+}
+.executory {
+  background: #ff9f24;
+}
+.inExecution {
+  background: #5878e8;
+}
+.done {
+  background: #50cad4;
+}
+.record,
+.adjustment {
+  display: inline-block;
+  color: #5878e8;
+  padding: 0 4px !important;
+  position: relative;
+  font-size: 14px;
+}
+.container {
+  overflow: scroll;
+  height: 93vh;
+}
+.button-container {
+  display: flex;
+  flex-wrap: nowrap;
+  justify-content: space-between;
+  align-items: center;
+  background-color: #fff;
+  width: 100%;
+  height: 50px;
+  padding: 0 10px;
+  & > div {
+    margin-left: 10px;
+    display: flex;
+    flex-wrap: nowrap;
+    flex-direction: row;
+    & > span {
+      line-height: 50px;
+    }
+  }
+
+  /deep/.auditFlow-box {
+    position: unset;
+    margin-left: 10px;
+    &/deep/.auditFlow-icon {
+      width: auto;
+      padding-right: 30px;
+    }
+    &/deep/.auditFlow-main {
+      position: absolute;
+    }
+  }
+}
+.bg-left {
+  padding-left: 30px;
+}
+.title {
+  position: relative;
+}
+.title::before {
+  content: '';
+  display: inline-block;
+  width: 5px;
+  height: 30px;
+  background: #5473e8;
+  position: absolute;
+  left: 0;
+}
+.el-button--primary {
+  background-color: #5878e8;
+  border-color: #5878e8;
+  // margin-left: 85%;
+  margin-top: 13px;
+}
+//导航条样式
+.el-col-12 {
+  width: 50%;
+  height: 60px;
+  background: #f6f7fc;
+  border-radius: 4px 4px 1px 1px;
+}
+.el-input--small .el-input__inner {
+  height: 32px;
+  line-height: 32px;
+  width: 385px;
+  margin-top: 10px;
+}
+.bg-bottom {
+  margin-left: 85%;
+}
+.but {
+  margin-left: 30%;
+  /* margin-top: -32px; */
+  overflow: auto;
+  /* float: left; */
+  /* margin-left: 1px; */
+  margin-left: -10px;
+}
+.el-input--small {
+  font-size: 13px;
+  width: 390px;
+  margin-left: 74%;
+}
+/deep/.el-table .el-table__header .cell,
+.el-table .el-table__body .cell {
+  text-align: center;
+}
+.el-scrollbar__wrap {
+  overflow-y: hidden;
+}
+/deep/.deal {
+  margin-left: 0%;
+  width: 64%;
+}
+.photo {
+  padding: 0% 34%;
+}
+.photo1 {
+  padding: 0 10%;
+}
+.photo2 {
+  padding: 0 12%;
+}
+/deep/.el-form-item--small .el-form-item__label,
+.el-form-item--small .el-form-item__content {
+  text-align: center;
+}
+hr {
+  width: 91%;
+}
+/deep/.deaal {
+  width: 66%;
+  margin-left: 9%;
+}
+.el-date-editor.el-input,
+.el-date-editor.el-input__inner,
+.el-input-number--small {
+  width: 123% !important;
+}
+/deep/.el-table td,
+.el-table th.is-leaf {
+  border-right: 1px solid #e9ecf7;
+  text-align: center;
+  height: 40px;
+}
+// .danjia{
+//   width: 9px;
+//   height: 9px;
+//   margin-left: 40px;
+// }
+</style>

src/views/taskManagement/inOutWarehouseTaskEdit.vue

@@ -104,8 +104,8 @@
             {{dataList.grade}}
             <!-- </el-select> -->
           </el-form-item>
-          <!--容重（克/升）>=-->
-          <el-form-item label="容重（克/升）>=">
+          <!--容重(克/升)>=-->
+          <el-form-item label="容重(克/升)>=">
             {{dataList.bulkDensity}}
           </el-form-item>
           <!--水分（%）<=-->
@@ -208,8 +208,8 @@
             />
             {{dataList1.grade}}
           </el-form-item>
-          <!--容重（克/升）>=-->
-          <el-form-item label="容重（克/升）>=">
+          <!--容重(克/升)>=-->
+          <el-form-item label="容重(克/升)>=">
             {{dataList1.bulkDensity}}
           </el-form-item>
           <!--水分（%）<=-->
@@ -318,8 +318,8 @@
             {{dataList.grade}}
             <!-- </el-select> -->
           </el-form-item>
-          <!--容重（克/升）>=-->
-          <el-form-item label="容重（克/升）>=">
+          <!--容重(克/升)>=-->
+          <el-form-item label="容重(克/升)>=">
             {{dataList.bulkDensity}}
           </el-form-item>
           <!--水分（%）<=-->

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -171,8 +171,8 @@
               />
             </el-select>
           </el-form-item>
-          <!--容重（克/升）>=-->
-          <el-form-item label="容重（克/升）>=">
+          <!--容重(克/升)>=-->
+          <el-form-item label="容重(克/升)>=">
             <el-input
               @input="bulkDensitychange"
               v-model="dataList.bulkDensity"
@@ -394,8 +394,8 @@
               />
             </el-select>
           </el-form-item>
-          <!--容重（克/升）>=-->
-          <el-form-item label="容重（克/升）>=">
+          <!--容重(克/升)>=-->
+          <el-form-item label="容重(克/升)>=">
             <el-input
               @input="bulkDensitychange"
               :disabled="dataList.taskTypeKey == 3"
@@ -613,8 +613,8 @@
               />
             </el-select>
           </el-form-item>
-          <!--容重（克/升）>=-->
-          <el-form-item label="容重（克/升）>=">
+          <!--容重(克/升)>=-->
+          <el-form-item label="容重(克/升)>=">
             <el-input
               :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4"
               v-model="dataList.bulkDensity"
@@ -1054,21 +1054,21 @@ export default {
         }
         if (!this.dataList.bulkDensity) {
           this.$message({
-            message: '容重（克/升）>=不能为空！',
+            message: '容重不能为空！',
             type: 'warning',
           })
           return
         }
         if (!this.dataList.waterContent) {
           this.$message({
-            message: '水份（%）<=不能为空！',
+            message: '水分不能为空！',
             type: 'warning',
           })
           return
         }
         if (!this.dataList.unitPrice) {
           this.$message({
-            message: '单价（元/吨）不能为空！',
+            message: '单价不能为空！',
             type: 'warning',
           })
           return
@@ -1136,21 +1136,21 @@ export default {
         }
         if (!this.dataList1.bulkDensity) {
           this.$message({
-            message: '容重（克/升）>=不能为空！',
+            message: '容重不能为空！',
             type: 'warning',
           })
           return
         }
         if (!this.dataList1.waterContent) {
           this.$message({
-            message: '水份（%）<=不能为空！',
+            message: '水分不能为空！',
             type: 'warning',
           })
           return
         }
         if (!this.dataList1.unitPrice) {
           this.$message({
-            message: '单价（元/吨）不能为空！',
+            message: '单价不能为空！',
             type: 'warning',
           })
           return
@@ -1223,21 +1223,21 @@ export default {
         }
         if (!this.dataList1.bulkDensity) {
           this.$message({
-            message: '容重（克/升）>=不能为空！',
+            message: '容重不能为空！',
             type: 'warning',
           })
           return
         }
         if (!this.dataList1.waterContent) {
           this.$message({
-            message: '水份（%）<=不能为空！',
+            message: '水分不能为空！',
             type: 'warning',
           })
           return
         }
         if (!this.dataList1.unitPrice) {
           this.$message({
-            message: '单价（元/吨）不能为空！',
+            message: '单价不能为空！',
             type: 'warning',
           })
           return
@@ -1335,21 +1335,21 @@ export default {
         }
         if (!this.dataList1.bulkDensity) {
           this.$message({
-            message: '容重（克/升）>=不能为空！',
+            message: '容重不能为空！',
             type: 'warning',
           })
           return
         }
         if (!this.dataList1.waterContent) {
           this.$message({
-            message: '水份（%）<=不能为空！',
+            message: '水分不能为空！',
             type: 'warning',
           })
           return
         }
         if (!this.dataList1.unitPrice) {
           this.$message({
-            message: '单价（元/吨）不能为空！',
+            message: '单价不能为空！',
             type: 'warning',
           })
           return

src/views/taskManagement/tranManagementWarehouseInOutTaskAudit.vue

@@ -173,8 +173,8 @@
               />
             </el-select>
           </el-form-item>
-          <!--容重（克/升）>=-->
-          <el-form-item label="容重（克/升）>=">
+          <!--容重(克/升)>=-->
+          <el-form-item label="容重(克/升)>=">
             <el-input
               @input="bulkDensitychange"
               v-model="dataList.bulkDensity"
@@ -416,8 +416,8 @@
               />
             </el-select>
           </el-form-item>
-          <!--容重（克/升）>=-->
-          <el-form-item label="容重（克/升）>=">
+          <!--容重(克/升)>=-->
+          <el-form-item label="容重(克/升)>=">
             <el-input
               @input="bulkDensitychange"
               :disabled="dataList.taskTypeKey == 3"
@@ -646,8 +646,8 @@
               />
             </el-select>
           </el-form-item>
-          <!--容重（克/升）>=-->
-          <el-form-item label="容重（克/升）>=">
+          <!--容重(克/升)>=-->
+          <el-form-item label="容重(克/升)>=">
             <el-input
               disabled
               v-model="dataList.bulkDensity"

src/views/taskManagement/tranManagementWarehouseInOutTaskEdit.vue

@@ -162,8 +162,8 @@
               />
             </el-select>
           </el-form-item>
-          <!--容重（克/升）>=-->
-          <el-form-item label="容重（克/升）>=">
+          <!--容重(克/升)>=-->
+          <el-form-item label="容重(克/升)>=">
             <el-input
             @input='bulkDensitychange'
               v-model="dataList.bulkDensity"
@@ -367,8 +367,8 @@
               />
             </el-select>
           </el-form-item>
-          <!--容重（克/升）>=-->
-          <el-form-item label="容重（克/升）>=">
+          <!--容重(克/升)>=-->
+          <el-form-item label="容重(克/升)>=">
             <el-input
             @input='bulkDensitychange'
             :disabled='dataList.taskTypeKey == 3'
@@ -575,8 +575,8 @@
               />
             </el-select>
           </el-form-item>
-          <!--容重（克/升）>=-->
-          <el-form-item label="容重（克/升）>=">
+          <!--容重(克/升)>=-->
+          <el-form-item label="容重(克/升)>=">
             <el-input
             :disabled='dataList.taskTypeKey == 3||dataList.taskTypeKey == 4'
               v-model="dataList.bulkDensity"

src/views/warehouse/warehouseManagementDelivery.vue

@@ -221,8 +221,8 @@
               size="small"
             />
           </ws-form-item>
-          <!--容重（克/升）>=-->
-          <ws-form-item label="容重（克/升）>=" span="1" prop="bulkDensity">
+          <!--容重(克/升)>=-->
+          <ws-form-item label="容重(克/升)>=" span="1" prop="bulkDensity">
             <ws-input
               v-model="deptBudgetList.warehouseInOutDetail.bulkDensity"
               placeholder="请输入容重"
@@ -248,11 +248,11 @@
               size="small"
             />
           </ws-form-item>
-          <!--不完整粒（%）<=-->
-          <ws-form-item label="不完整粒（%）<=" span="1" prop="imperfectGrain">
+          <!--不完善粒（%）<=-->
+          <ws-form-item label="不完善粒（%）<=" span="1" prop="imperfectGrain">
             <ws-input
               v-model="deptBudgetList.warehouseInOutDetail.imperfectGrain"
-              placeholder="请输入不完整粒占比"
+              placeholder="请输入不完善粒占比"
               maxlength="120"
               size="small"
             />
@@ -636,11 +636,11 @@ export default {
         }
       }
 
-      //不完整粒（%）
+      //不完善粒（%）
       if (this.deptBudgetList.warehouseInOutDetail.imperfectGrain) {
         if (isNaN(this.deptBudgetList.warehouseInOutDetail.imperfectGrain)) {
           this.$message({
-            message: '不完整粒（%）非数字!',
+            message: '不完善粒（%）非数字!',
             type: 'warning',
           })
           return
@@ -660,7 +660,7 @@ export default {
               2)
         ) {
           this.$message({
-            message: '不完整粒（%）输入错误! 取值范围1-40之间且可以保留2小数',
+            message: '不完善粒（%）输入错误! 取值范围1-40之间且可以保留2小数',
             type: 'warning',
           })
           return
@@ -670,7 +670,7 @@ export default {
       if (this.deptBudgetList.warehouseInOutDetail.bulkDensity) {
         if (isNaN(this.deptBudgetList.warehouseInOutDetail.bulkDensity)) {
           this.$message({
-            message: '容重（克/升）非数字!',
+            message: '容重(克/升)非数字!',
             type: 'warning',
           })
           return
@@ -690,7 +690,7 @@ export default {
               0)
         ) {
           this.$message({
-            message: '容重（克/升）输入错误! 取值范围1-40之间且是整数',
+            message: '容重(克/升)输入错误! 取值范围1-40之间且是整数',
             type: 'warning',
           })
           return
@@ -998,11 +998,11 @@ export default {
         }
       }
 
-      //不完整粒（%）
+      //不完善粒（%）
       if (this.deptBudgetList.warehouseInOutDetail.imperfectGrain) {
         if (isNaN(this.deptBudgetList.warehouseInOutDetail.imperfectGrain)) {
           this.$message({
-            message: '不完整粒（%）非数字!',
+            message: '不完善粒（%）非数字!',
             type: 'warning',
           })
           return
@@ -1022,7 +1022,7 @@ export default {
               2)
         ) {
           this.$message({
-            message: '不完整粒（%）输入错误! 取值范围1-40之间且可以保留2小数',
+            message: '不完善粒（%）输入错误! 取值范围1-40之间且可以保留2小数',
             type: 'warning',
           })
           return
@@ -1032,7 +1032,7 @@ export default {
       if (this.deptBudgetList.warehouseInOutDetail.bulkDensity) {
         if (isNaN(this.deptBudgetList.warehouseInOutDetail.bulkDensity)) {
           this.$message({
-            message: '容重（克/升）非数字!',
+            message: '容重(克/升)非数字!',
             type: 'warning',
           })
           return
@@ -1052,7 +1052,7 @@ export default {
               0)
         ) {
           this.$message({
-            message: '容重（克/升）输入错误! 取值范围1-40之间且是整数',
+            message: '容重(克/升)输入错误! 取值范围1-40之间且是整数',
             type: 'warning',
           })
           return

src/views/warehouse/warehouseManagementPerfectDelivery.vue

@@ -223,8 +223,8 @@
               size="small"
             />
           </ws-form-item>
-          <!--容重（克/升）>=-->
-          <ws-form-item label="容重（克/升）>=" span="1" prop="bulkDensity">
+          <!--容重(克/升)>=-->
+          <ws-form-item label="容重(克/升)>=" span="1" prop="bulkDensity">
             <ws-input
               v-model="dataList.warehouseInOutDetail.bulkDensity"
               placeholder="请输入容重"
@@ -250,11 +250,11 @@
               size="small"
             />
           </ws-form-item>
-          <!--不完整粒（%）<=-->
-          <ws-form-item label="不完整粒（%）<=" span="1" prop="imperfectGrain">
+          <!--不完善粒（%）<=-->
+          <ws-form-item label="不完善粒（%）<=" span="1" prop="imperfectGrain">
             <ws-input
               v-model="dataList.warehouseInOutDetail.imperfectGrain"
-              placeholder="请输入不完整粒占比"
+              placeholder="请输入不完善粒占比"
               maxlength="120"
               size="small"
             />
@@ -721,11 +721,11 @@ export default {
         }
       }
 
-      //不完整粒（%）
+      //不完善粒（%）
       if (this.dataList.warehouseInOutDetail.imperfectGrain) {
         if (isNaN(this.dataList.warehouseInOutDetail.imperfectGrain)) {
           this.$message({
-            message: '不完整粒（%）非数字!',
+            message: '不完善粒（%）非数字!',
             type: 'warning',
           })
           return
@@ -744,7 +744,7 @@ export default {
               2)
         ) {
           this.$message({
-            message: '不完整粒（%）输入错误! 取值范围1-40之间且可以保留2小数',
+            message: '不完善粒（%）输入错误! 取值范围1-40之间且可以保留2小数',
             type: 'warning',
           })
           return
@@ -754,7 +754,7 @@ export default {
       if (this.dataList.warehouseInOutDetail.bulkDensity) {
         if (isNaN(this.dataList.warehouseInOutDetail.bulkDensity)) {
           this.$message({
-            message: '容重（克/升）非数字!',
+            message: '容重(克/升)非数字!',
             type: 'warning',
           })
           return
@@ -773,7 +773,7 @@ export default {
               0)
         ) {
           this.$message({
-            message: '容重（克/升）输入错误! 取值范围1-40之间且是整数',
+            message: '容重(克/升)输入错误! 取值范围1-40之间且是整数',
             type: 'warning',
           })
           return

src/views/warehouse/warehouseManagementPerfectput.vue

@@ -267,8 +267,8 @@
               size="small"
             />
           </ws-form-item>
-          <!--容重（克/升）>=-->
-          <ws-form-item label="容重（克/升）>=" span="1" prop="bulkDensity">
+          <!--容重(克/升)>=-->
+          <ws-form-item label="容重(克/升)>=" span="1" prop="bulkDensity">
             <ws-input
               v-model="dataList.warehouseInOutDetail.bulkDensity"
               placeholder="请输入容重"
@@ -294,11 +294,11 @@
               size="small"
             />
           </ws-form-item>
-          <!--不完整粒（%）<=-->
-          <ws-form-item label="不完整粒（%）<=" span="1" prop="imperfectGrain">
+          <!--不完善粒（%）<=-->
+          <ws-form-item label="不完善粒（%）<=" span="1" prop="imperfectGrain">
             <ws-input
               v-model="dataList.warehouseInOutDetail.imperfectGrain"
-              placeholder="请输入不完整粒占比"
+              placeholder="请输入不完善粒占比"
               maxlength="120"
               size="small"
             />
@@ -772,11 +772,11 @@ export default {
         }
       }
 
-      //不完整粒（%）
+      //不完善粒（%）
       if (this.dataList.warehouseInOutDetail.imperfectGrain) {
         if (isNaN(this.dataList.warehouseInOutDetail.imperfectGrain)) {
           this.$message({
-            message: '不完整粒（%）非数字!',
+            message: '不完善粒（%）非数字!',
             type: 'warning',
           })
           return
@@ -795,7 +795,7 @@ export default {
               2)
         ) {
           this.$message({
-            message: '不完整粒（%）输入错误! 取值范围1-40之间且可以保留2小数',
+            message: '不完善粒（%）输入错误! 取值范围1-40之间且可以保留2小数',
             type: 'warning',
           })
           return
@@ -805,7 +805,7 @@ export default {
       if (this.dataList.warehouseInOutDetail.bulkDensity) {
         if (isNaN(this.dataList.warehouseInOutDetail.bulkDensity)) {
           this.$message({
-            message: '容重（克/升）非数字!',
+            message: '容重(克/升)非数字!',
             type: 'warning',
           })
           return
@@ -824,7 +824,7 @@ export default {
               0)
         ) {
           this.$message({
-            message: '容重（克/升）输入错误! 取值范围1-40之间且是整数',
+            message: '容重(克/升)输入错误! 取值范围1-40之间且是整数',
             type: 'warning',
           })
           return

src/views/warehouse/warehouseManagementPut.vue

@@ -248,8 +248,8 @@
               size="small"
             />
           </ws-form-item>
-          <!--容重（克/升）>=-->
-          <ws-form-item label="容重（克/升）>=" span="1" prop="bulkDensity">
+          <!--容重(克/升)>=-->
+          <ws-form-item label="容重(克/升)>=" span="1" prop="bulkDensity">
             <ws-input
               v-model="deptBudgetList.warehouseInOutDetail.bulkDensity"
               placeholder="请输入容重"
@@ -275,11 +275,11 @@
               size="small"
             />
           </ws-form-item>
-          <!--不完整粒（%）<=-->
-          <ws-form-item label="不完整粒（%）<=" span="1" prop="imperfectGrain">
+          <!--不完善粒（%）<=-->
+          <ws-form-item label="不完善粒（%）<=" span="1" prop="imperfectGrain">
             <ws-input
               v-model="deptBudgetList.warehouseInOutDetail.imperfectGrain"
-              placeholder="请输入不完整粒占比"
+              placeholder="请输入不完善粒占比"
               maxlength="40"
               size="small"
             />
@@ -693,11 +693,11 @@ export default {
         }
       }
 
-      //不完整粒（%）
+      //不完善粒（%）
       if (this.deptBudgetList.warehouseInOutDetail.imperfectGrain) {
         if (isNaN(this.deptBudgetList.warehouseInOutDetail.imperfectGrain)) {
           this.$message({
-            message: '不完整粒（%）非数字!',
+            message: '不完善粒（%）非数字!',
             type: 'warning'
           })
           return
@@ -717,7 +717,7 @@ export default {
               2)
         ) {
           this.$message({
-            message: '不完整粒（%）输入错误! 取值范围1-40之间且可以保留2小数',
+            message: '不完善粒（%）输入错误! 取值范围1-40之间且可以保留2小数',
             type: 'warning'
           })
           return
@@ -727,7 +727,7 @@ export default {
       if (this.deptBudgetList.warehouseInOutDetail.bulkDensity) {
         if (isNaN(this.deptBudgetList.warehouseInOutDetail.bulkDensity)) {
           this.$message({
-            message: '容重（克/升）非数字!',
+            message: '容重(克/升)非数字!',
             type: 'warning'
           })
           return
@@ -747,7 +747,7 @@ export default {
               0)
         ) {
           this.$message({
-            message: '容重（克/升）输入错误! 取值范围1-40之间且是整数',
+            message: '容重(克/升)输入错误! 取值范围1-40之间且是整数',
             type: 'warning'
           })
           return
@@ -1022,11 +1022,11 @@ export default {
         }
       }
 
-      //不完整粒（%）
+      //不完善粒（%）
       if (this.deptBudgetList.warehouseInOutDetail.imperfectGrain) {
         if (isNaN(this.deptBudgetList.warehouseInOutDetail.imperfectGrain)) {
           this.$message({
-            message: '不完整粒（%）非数字!',
+            message: '不完善粒（%）非数字!',
             type: 'warning'
           })
           return
@@ -1046,7 +1046,7 @@ export default {
               2)
         ) {
           this.$message({
-            message: '不完整粒（%）输入错误! 取值范围1-40之间且可以保留2小数',
+            message: '不完善粒（%）输入错误! 取值范围1-40之间且可以保留2小数',
             type: 'warning'
           })
           return
@@ -1056,7 +1056,7 @@ export default {
       if (this.deptBudgetList.warehouseInOutDetail.bulkDensity) {
         if (isNaN(this.deptBudgetList.warehouseInOutDetail.bulkDensity)) {
           this.$message({
-            message: '容重（克/升）非数字!',
+            message: '容重(克/升)非数字!',
             type: 'warning'
           })
           return
@@ -1076,7 +1076,7 @@ export default {
               0)
         ) {
           this.$message({
-            message: '容重（克/升）输入错误! 取值范围1-40之间且是整数',
+            message: '容重(克/升)输入错误! 取值范围1-40之间且是整数',
             type: 'warning'
           })
           return

src/views/warehouse/warehouseManagementPutOutLook.vue

@@ -155,8 +155,8 @@
               />
             </el-input>
           </el-form-item>
-          <!--容重（克/升）>=-->
-          <el-form-item label="容重（克/升）>=">
+          <!--容重(克/升)>=-->
+          <el-form-item label="容重(克/升)>=">
             <el-input
               disabled
               v-model="dataList.bulkDensity"

src/views/warehouse/warehouseManagementRecord.vue

@@ -115,7 +115,7 @@
                   <ws-form-item label="水分(%)<=" span="1" prop="waterContent">
                     {{ props.row.waterContent }}
                   </ws-form-item>
-                  <ws-form-item label="容重(%)<=" span="1" prop="bulkDensity">
+                  <ws-form-item label="容重(g/l)>=" span="1" prop="bulkDensity">
                     {{ props.row.bulkDensity }}
                   </ws-form-item>
                   <ws-form-item label="热损伤(%)<=" span="1" prop="jiaorenli">
@@ -224,7 +224,7 @@
                   <ws-form-item label="水分(%)<=" span="1" prop="waterContent">
                     {{ props.row.waterContent }}
                   </ws-form-item>
-                  <ws-form-item label="容重(%)<=" span="1" prop="bulkDensity">
+                  <ws-form-item label="容重(g/l)>=" span="1" prop="bulkDensity">
                     {{ props.row.bulkDensity }}
                   </ws-form-item>
                   <ws-form-item label="热损伤(%)<=" span="1" prop="jiaorenli">

vue.config.js

@@ -141,7 +141,7 @@ module.exports = {
         // target: 'https://product-server.winsea.com/', //目标地址
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
-        target: 'http://192.168.1.120:8090/',
+        target: 'http://192.168.1.112:8090/',
         // target: 'http://192.168.1.112:8090/',
         // target: 'http://192.168.1.121:8090/',
         // target: 'http://192.168.1.119:8090/',