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

public/static/inspection.html

@@ -143,7 +143,7 @@
             <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">
@@ -226,7 +226,7 @@
           <div>{{tableData.bulkDensity}}</div>
         </div>
         <div class="small-row">
-          <div>不完整粒（%）</div>
+          <div>不完善粒（%）</div>
           <div>{{tableData.imperfectGrain}}</div>
         </div>
         <div class="small-row">

public/static/payprint.html

@@ -156,7 +156,7 @@
             <div>No.</div>
           </div>
           <div class="header-top">
-            <div>开票日期：{{date}}</div>
+            <div>开票日期：{{printData.currentTime}}</div>
             <div class="number">{{100000000000000}}</div>
           </div>
           <table class="table">
@@ -164,7 +164,7 @@
               <td rowspan="4" class="col col-bgc">买方</td>
               <td class="col col-bgc">单位名称</td>
               <td class="col" colspan="3">{{printData.compName}}</td>
-              <td rowspan="4" class="col col-bgc">买方</td>
+              <td rowspan="4" class="col col-bgc">卖方</td>
               <td class="col col-bgc">姓名</td>
               <td class="col" colspan="3">{{printData.customerName}}</td>
             </tr>
@@ -172,19 +172,19 @@
               <td class="col col-bgc">税务登记号</td>
               <td class="col" colspan="3">{{ printData.taxRegistrationNo}}</td>
               <td class="col col-bgc">身份证号</td>
-              <td class="col" colspan="3">{{printData.customerNumberCard}}</td>
+              <td class="col" colspan="3">{{printData.identityAuthenticationInfo.customerNumberCard}}</td>
             </tr>
             <tr class="row">
               <td class="col col-bgc">化验单号</td>
               <td class="col" colspan="3">{{printData.paymentNo}}</td>
               <td class="col col-bgc">卡号</td>
-              <td class="col" colspan="3">{{printData.bankCard}}</td>
+              <td class="col" colspan="3">{{printData.identityAuthenticationInfo.bankDeposit}}{{printData.identityAuthenticationInfo.bankCard}}</td>
             </tr>
             <tr class="row">
               <td class="col col-bgc">收货仓库</td>
               <td class="col" colspan="3">{{printData.warehouseName}}</td>
               <td class="col col-bgc">地址</td>
-              <td class="col" colspan="3">{{printData.compAddress}}</td>
+              <td class="col" colspan="3">{{printData.identityAuthenticationInfo.compAddress}}</td>
             </tr>
             <tr class="row">
               <td class="col col-bgc">货名</td>
@@ -201,17 +201,18 @@
             <tr class="row">
               <td class="col">{{printData.goodsName}}</td>
               <td class="col">{{printData.type}}</td>
-              <td class="col">{{printData.grade}}</td>
-              <td class="col">{{printData.waterContent}}</td>
-              <td class="col">{{printData.impurity}}</td>
+              <td class="col">{{printData.qualityInspectionManagement.grade}}</td>
+              <td class="col">{{printData.qualityInspectionManagement.waterContent}}</td>
+              <td class="col">{{printData.qualityInspectionManagement.impurity}}</td>
               <td class="col">{{printData.grossWeight}}</td>
               <td class="col">{{printData.tare}}</td>
-              <td class="col">{{printData.buckleMiscellaneous}}</td>
+              <td class="col">{{printData.qualityInspectionManagement.buckleWeightRatio}}</td>
               <td class="col">{{printData.netWeight}}</td>
               <td class="col">{{printData.pureWeight}}</td>
             </tr>
             <tr class="row">
-              <td class="col col-bgc">净重单价</td>
+              <td class="col col-bgc" v-if="printData.type == '潮粮'">净重单价</td>
+              <td class="col col-bgc" v-if="printData.type == '干粮'">单价</td>
               <td class="col col-bgc">粮款</td>
               <td class="col col-bgc">称重补助</td>
               <td class="col col-bgc">运费补助</td>
@@ -223,7 +224,8 @@
               <td class="col col-bgc">质量扣款</td>
             </tr>
             <tr class="row">
-              <td class="col ">{{printData.tidalGrainPrice}}</td>
+              <td class="col " v-if="printData.type == '潮粮'">{{printData.tidalGrainPrice}}</td>
+              <td class="col " v-if="printData.type == '干粮'">{{printData.qualityInspectionManagement.dryGrainPrice}}</td>
               <td class="col ">{{printData.grainMoney}}</td>
               <td class="col ">{{printData.weighingSubsidy}}</td>
               <td class="col ">{{printData.freightSubsidy}}</td>
@@ -236,7 +238,7 @@
             </tr>
             <tr class="row">
               <td class="col col-bgc">其他扣款</td>
-              <td class="col col-bgc">纯重单价</td>
+              <td class="col col-bgc" v-if="printData.type == '潮粮'">纯重单价</td>
               <td class="col col-bgc">合计应付</td>
               <td class="col col-bgc">购粮性质</td>
               <td class="col col-bgc">车牌号</td>
@@ -244,9 +246,9 @@
             </tr>
             <tr class="row">
               <td class="col ">{{printData.otherDeduction}}</td>
-              <td class="col ">{{printData.solidGrainPrice}}</td>
+              <td class="col " v-if="printData.type == '潮粮'">{{printData.solidGrainPrice}}</td>
               <td class="col ">{{printData.calculationPayable}}</td>
-              <td class="col ">{{printData.natureOfGrainPurchase}}</td>
+              <td class="col ">{{printData.qualityInspectionManagement.natureOfGrainPurchase}}</td>
               <td class="col ">{{printData.carNo}}</td>
               <td class="col " colspan="5">{{printData.remarks}}</td>
             </tr>
@@ -261,12 +263,12 @@
 
           <div class="bottom">
             <div class="bottom-row1">
-              <div>质检：{{printData.qualityInspector}}</div>
-              <div>毛检：{{printData.secretaryWeigher}}</div>
-              <div>皮检：{{printData.skinInspector}}</div>
+              <div>质检：{{printData.qualityInspectionManagement.qualityInspector}}</div>
+              <div>毛检：{{printData.weighingManagement.secretaryWeigher}}</div>
+              <div>皮检：{{printData.weighingManagement.skinInspector}}</div>
               <div>结算：{{printData.settlementClerk}}</div>
-              <div>付款：{{printData.actualPayment}}</div>
-              <div>复点：{{}}</div>
+              <div>付款：{{printData.cashier}}</div>
+              <div>复点：{{printData.qualityInspector}}</div>
             </div>
             <div class="bottom-row2">
               <div class="left">

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">

src/api/V2/statisticalReport/index.js

@@ -80,4 +80,4 @@ export const API_POST_ADDDISORREMARKS = '/stockPurchaseReceiptReport/api/disAndR
 //现货采购入库修改结算重量
 export const API_POST_EDITSETTLEMENTWEIGHT = '/stockPurchaseReceiptReport/api/edit'
 //现货采购入库合同
-export const API_GET_STOCK_PURCHASE_CONTRACTNO = '/stockPurchaseReceiptReport/selectContractNoList'
+export const API_GET_STOCK_PURCHASE_CONTRACTNO = '/stockPurchaseReceiptReport/selectContractNoList'

src/model/statisticalReport/index.js

@@ -38,7 +38,7 @@ import {
     API_POST_STOCKPURCHASEPAYMONEY,
     API_POST_ADDDISORREMARKS,
     API_POST_EDITSETTLEMENTWEIGHT,
-    API_GET_STOCKPURCHASECONTRACTNOLIST
+    API_GET_STOCK_PURCHASE_CONTRACTNO,
 } from '@/api/V2/statisticalReport'
 //期货采购入库报表
 export const getpurchreceipt = appRx.get(API_GET_PURCHRECEIPT, errorCatcher, errorHandle, filter)
@@ -123,4 +123,4 @@ export const addDisOrRemarks = appRx.post(API_POST_ADDDISORREMARKS, errorCatcher
 //现货采购入库修改结算重量
 export const editSettlementWeight = appRx.post(API_POST_EDITSETTLEMENTWEIGHT, errorCatcher, errorHandle, filter)
 //现货采购入库合同编号下拉
-export const getStockPurchaseContractNoList = appRx.get(API_GET_STOCKPURCHASECONTRACTNOLIST, errorCatcher, errorHandle, filter)
+export const getStockPurchaseContractNoList = appRx.get(API_GET_STOCK_PURCHASE_CONTRACTNO, errorCatcher, errorHandle, filter)

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/houseSelfCollect/acquisitionManagement.vue

@@ -191,6 +191,7 @@
       },
       //获取列表数据
       getList() {
+        this.goodsNameList=[]
         getPurchasePrice({
           currentPage: this.currentPage,
           pageSize: this.pageSize,

src/views/houseSelfCollect/acquisitionManagementAdd.vue

@@ -68,7 +68,6 @@
             </div>
             <el-button @click="delSetPrice(item,index)" :disabled="!isEdit">删除</el-button>
           </div>
-          {{item}}
           <div class="level">
             <el-checkbox-group v-model="item.checkList" @change="changeLevel($event,index)">
               <el-checkbox label="一等" :disabled="!isEdit"></el-checkbox>
@@ -268,7 +267,10 @@
             this.selectVal = response[0].constValue
           }else{
             this.goodnameList = _list
+            this.goodnameList = _list
+            if(_list.length!=0){
             this.selectVal = _list[0].constValue
+            }
           }
         })
       switch (this.$route.query.type) {
@@ -371,10 +373,8 @@
         })
       },
       goodsChange(e) {
-        console.log(e)
       },
       changeBaseWater(val) {
-        console.log('val', val)
         for (let i = 0; i < this.priceList.length; i++) {
           for (let k = 0; k < this.priceList[i].detailList.length; k++) {
             if (this.priceList[i].detailList[k].type == 2) {
@@ -384,7 +384,6 @@
         }
       },
       changeMinWater(val) {
-        console.log('val', val)
         for (let i = 0; i < this.priceList.length; i++) {
           for (let k = 0; k < this.priceList[i].detailList.length; k++) {
             if (this.priceList[i].detailList[k].type == 1) {
@@ -394,7 +393,6 @@
         }
       },
       changeMaxWater(val) {
-        console.log('val', val)
         for (let i = 0; i < this.priceList.length; i++) {
           for (let k = 0; k < this.priceList[i].detailList.length; k++) {
             if (this.priceList[i].detailList[k].type == 3) {
@@ -452,7 +450,6 @@
       reduce(item, item1, index) {
         item.index--
         item.detailList.splice(index, 2);
-        console.log(item, index)
       },
       // 设置分界索引排序
       makeSpliceIndex(item, item1) {
@@ -466,7 +463,6 @@
       },
       // 复选框变化监听
       changeLevel(val, index) {
-        console.log("val", val)
         let _data = this.priceList
         for (let i = 0; i < _data.length; i++) {
           let _childData = _data[i].checkList
@@ -482,10 +478,7 @@
           if (i == 2) this.checkList3 = _data[i].checkList
           if (i == 3) this.checkList4 = _data[i].checkList
         }
-        console.log("-------------------------")
-        // console.log([...new Set(this.checkList)])
         this.checkList = [...new Set([...this.checkList1, ...this.checkList2, ...this.checkList3, ...this.checkList4])]
-        console.log(this.checkList)
       },
       // 算价格纠正精度不准
       accMul(arg1, arg2) {
@@ -504,7 +497,6 @@
       keepTwoDecimal(num) {
         var result = parseFloat(num);
         if (isNaN(result)) {
-          console.log('传递参数错误，请检查！');
           return false;
         }
         result = Math.round(result * 100) / 100;
@@ -712,7 +704,6 @@
           }
           return false
         }
-        console.log(this.priceList.length)
         if (this.checkList.length != 4) {
           this.$message.error('粮价设置为4个等级！');
           return false
@@ -772,7 +763,6 @@
             isValidate = this.validate()
             if (isValidate) {
               purchasePriceAdd(this.baseInfoForm).toPromise().then((response) => {
-                console.log(response)
                 // this.tableData = response.records
                 this.isCountShow = false
               })
@@ -782,8 +772,6 @@
             isValidate = this.validate()
             if (isValidate) {
               purchasePriceEdit(this.baseInfoForm).toPromise().then((response) => {
-                console.log(response)
-                // this.tableData = response.records
                 this.isCountShow = false
               })
             }
@@ -791,8 +779,6 @@
             isValidate = this.validate()
             if (isValidate) {
               purchasePriceEdit(this.baseInfoForm).toPromise().then((response) => {
-                console.log(response)
-                // this.tableData = response.records
                 let that = this
                   this.$confirm(`是否确定通过？`, {
                     cancelButtonText: '取消',
@@ -894,9 +880,7 @@
                 })
               }
             }
-            console.log(_obj)
             this.splitPriceList.push(_obj)
-            console.log(this.splitPriceList)
           }
         }
       },
@@ -949,8 +933,6 @@
       },
       // 计算价格
       calculatePrice(_waterMin) {
-        console.log(_waterMin)
-        console.log("this.splitPriceList", this.splitPriceList)
         let prcieList = []
         let totalPrice = []
         let _price = 0
@@ -964,13 +946,8 @@
               // 未设置分界
               if (_waterMin >= _list[k].priceStart && _waterMin < _list[k].priceEnd && !this.splitPriceList[i]
                 .haveSplit) {
-                console.log(basePrice)
-                console.log(this.keepTwoDecimal(basePrice))
-                console.log(this.keepTwoDecimal(((parseFloat(this.baseInfoForm.waterBase) - _waterMin) / 0.5) * _list[k]
-                  .betweenPrice))
                 _price = basePrice + (parseFloat(this.baseInfoForm.waterBase) - _waterMin) / 0.5 * _list[k]
                   .betweenPrice;
-                console.log(_price)
                 prcieList.push(this.keepTwoDecimal(_price))
               } else if (_waterMin >= _list[k].priceStart && _waterMin < _list[k].priceEnd) {
                 // 当前区间段价格+其他区间段价格
@@ -990,7 +967,6 @@
                 .haveSplit) {
                 _price = basePrice - (_waterMin - parseFloat(this.baseInfoForm.waterBase)) / 0.5 * _list[k]
                   .betweenPrice;
-                console.log(_price)
                 prcieList.push(this.keepTwoDecimal(_price))
               } else if (_waterMin > _list[k].priceStart && _waterMin <= _list[k].priceEnd) {
                 // 当前段价格+其他段价格

src/views/houseSelfCollect/component/inspectInfoPrint.vue

@@ -26,7 +26,7 @@
         <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">

src/views/houseSelfCollect/component/paymentPrint.vue

@@ -9,7 +9,8 @@
       <div>No.</div>
     </div>
     <div class="header-top">
-      <div>开票日期：{{printData.compName}}</div>
+      <div>开票日期：{{printData.currentTime}}</div>
+      <!-- <div>开票日期：{{new Date(yyyy,mm,dd)}}</div> -->
       <div class="number">{{100000000000000}}</div>
     </div>
     <table class="table">
@@ -17,7 +18,7 @@
         <td rowspan="4" class="col col-bgc">买方</td>
         <td class="col col-bgc">单位名称</td>
         <td class="col" colspan="3">{{ printData.compName}}</td>
-        <td rowspan="4" class="col col-bgc">买方</td>
+        <td rowspan="4" class="col col-bgc">卖方</td>
         <td class="col col-bgc">姓名</td>
         <td class="col" colspan="3">{{ printData.customerName}}</td>
       </tr>
@@ -25,19 +26,19 @@
         <td class="col col-bgc">税务登记号</td>
         <td class="col" colspan="3">{{ printData.taxRegistrationNo}}</td>
         <td class="col col-bgc">身份证号</td>
-        <td class="col" colspan="3">{{ printData.customerNumberCard}}</td>
+        <td class="col" colspan="3">{{ printData.identityAuthenticationInfo.customerNumberCard}}</td>
       </tr>
       <tr class="row">
         <td class="col col-bgc">化验单号</td>
         <td class="col" colspan="3">{{ printData.paymentNo}}</td>
         <td class="col col-bgc">卡号</td>
-        <td class="col" colspan="3">{{ printData. bankCard}}</td>
+        <td class="col" colspan="3">{{printData.identityAuthenticationInfo.bankDeposit}}{{printData.identityAuthenticationInfo.bankCard}}</td>
       </tr>
       <tr class="row">
         <td class="col col-bgc">收货仓库</td>
         <td class="col" colspan="3">{{printData.warehouseName}}</td>
         <td class="col col-bgc">地址</td>
-        <td class="col" colspan="3">{{printData.compAddress}}</td>
+        <td class="col" colspan="3">{{printData.identityAuthenticationInfo.compAddress}}</td>
       </tr>
       <tr class="row">
         <td class="col col-bgc">货名</td>
@@ -54,17 +55,18 @@
       <tr class="row">
         <td class="col">{{ printData.goodsName}}</td>
         <td class="col">{{ printData.type}}</td>
-        <td class="col">{{ printData.grade}}</td>
-        <td class="col">{{ printData.waterContent}}</td>
-        <td class="col">{{ printData.impurity}}</td>
+        <td class="col">{{ printData.qualityInspectionManagement.grade}}</td>
+        <td class="col">{{ printData.qualityInspectionManagement.waterContent}}</td>
+        <td class="col">{{ printData.qualityInspectionManagement.impurity}}</td>
         <td class="col">{{ printData.grossWeight}}</td>
         <td class="col">{{ printData.tare}}</td>
-        <td class="col">{{ printData.buckleMiscellaneous}}</td>
+        <td class="col">{{ printData.qualityInspectionManagement.buckleWeightRatio}}</td>
         <td class="col">{{ printData.netWeight}}</td>
         <td class="col">{{ printData.pureWeight}}</td>
       </tr>
       <tr class="row">
-        <td class="col col-bgc">净重单价</td>
+        <td class="col col-bgc"  v-if="printData.type == '潮粮'">净重单价</td>
+         <td class="col col-bgc" v-if="printData.type == '干粮'">单价</td>
         <td class="col col-bgc">粮款</td>
         <td class="col col-bgc">称重补助</td>
         <td class="col col-bgc">运费补助</td>
@@ -76,7 +78,8 @@
         <td class="col col-bgc">质量扣款</td>
       </tr>
       <tr class="row">
-        <td class="col ">{{ printData.tidalGrainPrice}}</td>
+        <td class="col " v-if="printData.type == '潮粮'">{{printData.tidalGrainPrice}}</td>
+        <td class="col " v-if="printData.type == '干粮'">{{printData.qualityInspectionManagement.dryGrainPrice}}</td>
         <td class="col ">{{ printData.grainMoney}}</td>
         <td class="col ">{{ printData.weighingSubsidy}}</td>
         <td class="col ">{{ printData.freightSubsidy}}</td>
@@ -89,19 +92,19 @@
       </tr>
       <tr class="row">
         <td class="col col-bgc">其他扣款</td>
-        <td class="col col-bgc">纯重单价</td>
+        <td class="col col-bgc" v-if="printData.type == '潮粮'">纯重单价</td>
         <td class="col col-bgc">合计应付</td>
         <td class="col col-bgc">购粮性质</td>
         <td class="col col-bgc">车牌号</td>
-        <td class="col col-bgc" colspan="5">记事</td>
+        <td class="col col-bgc" colspan="6">记事</td>
       </tr>
       <tr class="row">
         <td class="col ">{{ printData.otherDeduction}}</td>
-        <td class="col ">{{ printData.solidGrainPrice}}</td>
+        <td class="col " v-if="printData.type == '潮粮'">{{ printData.solidGrainPrice}}</td>
         <td class="col ">{{ printData.calculationPayable}}</td>
-        <td class="col ">{{ printData.natureOfGrainPurchase}}</td>
+        <td class="col ">{{ printData.qualityInspectionManagement.natureOfGrainPurchase}}</td>
         <td class="col ">{{ printData.carNo}}</td>
-        <td class="col " colspan="5">{{ printData.remarks}}</td>
+        <td class="col " colspan="6">{{ printData.remarks}}</td>
       </tr>
       <tr class="row">
         <td class="col col-bgc">实付金额</td>
@@ -114,11 +117,11 @@
 
     <div class="bottom">
       <div class="bottom-row1">
-        <div>质检：{{ printData.qualityInspector}}</div>
-        <div>毛检：{{ printData.skinInspector}}</div>
-        <div>皮检：{{ printData.qualityInspector}}</div>
+        <div>质检：{{ printData.qualityInspectionManagement.qualityInspector}}</div>
+        <div>毛检：{{ printData.weighingManagement.secretaryWeigher}}</div>
+        <div>皮检：{{ printData.weighingManagement.skinInspector}}</div>
         <div>结算：{{ printData.settlementClerk}}</div>
-        <div>付款：{{ printData.qualityInspector}}</div>
+        <div>付款：{{ printData.cashier}}</div>
         <div>复点：{{ printData.qualityInspector}}</div>
       </div>
       <div class="bottom-row2">
@@ -143,7 +146,8 @@
     props: {
       printData: {
         type: Object
-      }
+      },
+      billingDate:"",
     },
     data() {
       return {
@@ -151,9 +155,17 @@
       }
     },
     activated() {
-
+      let date = new Date()
+     
+      console.log( date.getFullYear())
     },
     methods: {
+      date(){
+        let date = new Date()
+       let datas = date.getDate
+        console.log(new Data())
+        return datas
+      },
       printSmall() {
         window.location.href =
           '../../../../../static/payprint.html?type=1&dataList=' +

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">

src/views/houseSelfCollect/customerManagementAdd.vue

@@ -249,7 +249,6 @@
               phone: this.customerList.customerPhone
             })
             .toPromise().then((response) => {
-              console.log(response)
               if (response == 'ok') {
                 that.sendDisabled = true
                 let sec = 60
@@ -459,7 +458,6 @@
           })
           .toPromise()
           .then((response) => {
-            debugger
             this.customerList.compId = sessionStorage.getItem('ws-pf_compId')
             this.customerList.cardAddressUrl = this.identity.toString()
             this.customerList.payeeAddressUrl = this.bank.toString()

src/views/houseSelfCollect/inspectInfo.vue

@@ -90,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>
@@ -98,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>
@@ -239,7 +239,6 @@
           this.imgUrl = dataURL;
           if (this.imgUrl !== "") {
             let b = this.dataURLtoFile(this.imgUrl, "printImg")
-            console.log(b)
             let formdata = new FormData();
             formdata.append("file", b);
             axios({
@@ -434,7 +433,7 @@
         }
         if (!this.inspect.imperfectGrain) {
           this.$message({
-            message: '不完整粒不能为空',
+            message: '不完善粒不能为空',
             type: 'warning',
           })
           return
@@ -556,7 +555,6 @@
              getDryGrainPrice({warehouseId:this.cangid,goodsName:this.inspect.goodsName})
                 .toPromise()
                 .then((response) => { 
-                  console.log(response,'干粮')
                   this.$set(this.inspect,'dryGrainPrice',response)
                 })
           }

src/views/houseSelfCollect/inspectionManagement.vue

@@ -272,16 +272,6 @@ export default {
       })
         .toPromise()
         .then((response) => {
-          // for (let i = 0; i < response.length; i++) {
-          //   this.warehouseList.push({
-          //     valueKey: i,
-          //     value: response[i].warehouseName,
-          //     id:response[i].id
-          //   })
-          // }
-          // this.searchTypeText = response[0].warehouseName
-          // this.id = response[0].id
-          // console.log(response)
           this.inspect = response.records
           this.deptBudgetTotal = response.total
         })

src/views/houseSelfCollect/paymentManagement.vue

@@ -318,7 +318,6 @@ export default {
     //上传付款截图
     handleAvatarSuccess(e) {
       this.imageUrl = e.url
-      console.log(e, 'dkltgoidrhfglkhs')
     },
     printSmall() {
       window.location.href =
@@ -447,9 +446,6 @@ export default {
       this.payments.paymentScreenshot = this.imageUrl
       this.payments.cashier = sessionStorage.getItem('ws-pf_staffName')
       this.payments.paymentManagementList = this.modification
-      console.log(this.payments,"付款")
-      
-
       this.$confirm('确定提交付款信息？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -563,8 +559,10 @@ export default {
         .then((response) => {
           this.isShowPrint = true
           this.printData = response
-          console.log('printData', response)
+          let date = new Date()
+           this.printData.currentTime = date.getFullYear() +"年"+ date.getMonth() +"月"+ date.getDay()+"日"
         })
+     
     },
     examine() {
       if (this.modification.length == 0) {
@@ -607,19 +605,6 @@ export default {
     handleSelectionChange(val) {
       this.modification = val
     },
-    // 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
-    //     }
-    //   }
-    // },
     warehouseChange(e) {
       for (let i = 0; i < this.warehouseList.length; i++) {
         if (this.warehouseList[i].id == this.warehouseNameKey) {

src/views/houseSelfCollect/settlement.vue

@@ -110,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">
@@ -122,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
@@ -596,7 +596,8 @@ export default {
           return chineseStr;
         },
     print() {
-       if (!this.paymentList.buckleWeightRatio) {
+      if(this.paymentList.type == "潮粮"){
+        if (!this.paymentList.buckleWeightRatio) {
           this.$message({
             message: '扣重比不能为空',
             type: 'warning',
@@ -610,7 +611,7 @@ export default {
           })
           return
         }
-
+      }
         if (this.paymentList.weighingSubsidy < 0 || this.paymentList.weighingSubsidy > 100000) {
           this.$message({
             message: '称重补助范围应在0-100000内',
@@ -703,6 +704,7 @@ export default {
       postpaymentedit(this.paymentList).toPromise().then((response) => {
          getpaymentexamine({id:this.$route.query.id}).toPromise().then((response) => {
              this.printData= response
+             console.log(this.printData,"打印")
          })
          this.isShowPrint = true
            

src/views/houseSelfCollect/weighingManagement.vue

@@ -275,7 +275,6 @@ export default {
           this.warehouseId = this.warehouseList[0].warehouseId
           this.purchasePriceList = this.warehouseList[0].warehouseList
          this.getList()
-          
         })
     },
     getList() {
@@ -302,7 +301,6 @@ export default {
           }
           this.weighingList = response.records
           this.deptBudgetTotal = response.total
-
         })
         .catch((response) => {
           // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))

src/views/houseSelfCollect/weightCheck.vue

@@ -168,7 +168,6 @@
       <el-button type="primary" @click="printSmall">打印小票</el-button>
       <el-button type="primary" @click="printBig">打印单据</el-button>
       </div>
-      
     </el-dialog>
   </div>
 </template>

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/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/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">