容重不完善粒水分蛋白修改

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/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/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/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/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/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>
@@ -434,7 +434,7 @@
         }
         if (!this.inspect.imperfectGrain) {
           this.$message({
-            message: '不完整粒不能为空',
+            message: '不完善粒不能为空',
             type: 'warning',
           })
           return

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

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/qualityInspectionManagement.vue

@@ -56,7 +56,7 @@
       <el-table-column prop="contractNo" label="合同编号"></el-table-column>
       <el-table-column prop="carNumber" label="车牌号"></el-table-column>
       <el-table-column prop="goodsName" label="货名"></el-table-column>
-       <el-table-column prop="bulkDensity" label="容重(克/升)"></el-table-column>
+       <el-table-column prop="bulkDensity" label="容重(克/升)>=(克/升)"></el-table-column>
       <el-table-column prop="waterContent" label="水分（%）"></el-table-column>
       <el-table-column prop="binNumber" label="仓位号"></el-table-column>
       <el-table-column prop="storageTagNo" label="囤位号"></el-table-column>
@@ -177,7 +177,7 @@ export default {
           // this.id = response[0].id
           // console.log(response)
           this.inspect = response.records
-          console.log(this.inspect,'容重')
+          console.log(this.inspect,'容重(克/升)>=')
           this.deptBudgetTotal = response.total
         })
     },

src/views/purchasingManagement/procurementPlanAdd.vue

@@ -204,8 +204,8 @@
             <el-input v-model="dataList.waterContent" class="typeselect" placeholder="请输入水分占比" />
             <span class="unchangeable">*</span>
           </el-form-item>
-          <el-form-item label="容重(g/l)>=" span="1" prop="bulkDensity" >
-            <el-input v-model="dataList.bulkDensity" class="typeselect" placeholder="请输入容重" />
+          <el-form-item label="容重(克/升)>=(g/l)>=" span="1" prop="bulkDensity" >
+            <el-input v-model="dataList.bulkDensity" class="typeselect" placeholder="请输入容重(克/升)>=" />
             <span class="unchangeable">*</span>
           </el-form-item>
           <el-form-item label="热损伤(%)<=" span="1" prop="jiaorenli">
@@ -786,7 +786,7 @@ export default {
       }
       if (!this.dataList.bulkDensity) {
         this.$message({
-          message: '容重不能为空！',
+          message: '容重(克/升)>=不能为空！',
           type: 'warning'
         })
         return
@@ -797,7 +797,7 @@ export default {
             (String(this.dataList.bulkDensity).indexOf('.') + 1) >
             2||this.dataList.bulkDensity>1000||this.dataList.bulkDensity<0){
         this.$message({
-          message: '容重输入错误',
+          message: '容重(克/升)>=输入错误',
           type: 'warning'
         })
         return

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/salesPlanAdd.vue

@@ -251,11 +251,11 @@
             />
             <span class="unchangeable">*</span>
           </el-form-item>
-          <el-form-item label="容重(g/l)>=" span="1" prop="bulkDensity" >
+          <el-form-item label="容重(克/升)>=(g/l)>=" span="1" prop="bulkDensity" >
             <el-input
               v-model="dataList.bulkDensity"
               class="typeselect"
-              placeholder="请输入容重"
+              placeholder="请输入容重(克/升)>="
             />
             <span class="unchangeable">*</span>
           </el-form-item>
@@ -893,7 +893,7 @@ export default {
       }
       if (!this.dataList.bulkDensity) {
         this.$message({
-          message: '容重不能为空！',
+          message: '容重(克/升)>=不能为空！',
           type: 'warning'
         })
         return
@@ -908,7 +908,7 @@ export default {
         this.dataList.bulkDensity < 0
       ) {
         this.$message({
-          message: '容重输入错误',
+          message: '容重(克/升)>=输入错误',
           type: 'warning',
         })
         return

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/salesManagement/salesPlanLook.vue

@@ -101,8 +101,8 @@
           <el-form-item label="水分(%)<=">
             <el-input disabled v-model="dataList.waterContent" class="typeselect" />
           </el-form-item>
-          <!-- 容重 -->
-          <el-form-item label="容重(g/l)>=">
+          <!-- 容重(克/升)>= -->
+          <el-form-item label="容重(克/升)>=(g/l)>=">
             <el-input disabled v-model="dataList.bulkDensity" class="typeselect" />
           </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">