Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/views/contractManagement/futuresPurchaseContractAdd.vue

@@ -384,7 +384,7 @@
         </ws-form-item>
 
         <!--水分（%）<=-->
-        <ws-form-item label="水分（%）" span="1" prop="waterContent">
+        <ws-form-item label="水分（%）<=" span="1" prop="waterContent">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.waterContent"
             placeholder="请输入水分占比"
@@ -411,7 +411,7 @@
         </ws-form-item>
 
         <!--杂质（%）<=-->
-        <ws-form-item label="杂质（%）" span="1" prop="impurity">
+        <ws-form-item label="杂质（%）<=" span="1" prop="impurity">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.impurity"
             placeholder="请输入杂质占比（%）"
@@ -431,7 +431,7 @@
         </ws-form-item>
 
         <!--霉变粒（%）<=-->
-        <ws-form-item label="霉变粒（%）" span="1" prop="mildewGrain">
+        <ws-form-item label="霉变粒（%）<=" span="1" prop="mildewGrain">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.mildewGrain"
             placeholder="请输入霉变粒占比（%）"
@@ -441,7 +441,7 @@
         </ws-form-item>
 
         <!--热损伤（%）<=-->
-        <ws-form-item label="热损伤（%）" span="1" prop="jiaorenli">
+        <ws-form-item label="热损伤（%）<=" span="1" prop="jiaorenli">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.jiaorenli"
             placeholder="请输入输入热损伤占比（%）"

src/views/contractManagement/futuresPurchaseContractEdit.vue

@@ -382,7 +382,7 @@
           {{ deptBudgetList.contractGoodsInfo.goodsName }}
         </ws-form-item>
         <!--水分（%）<=-->
-        <ws-form-item label="水分（%）" span="1" prop="waterContent">
+        <ws-form-item label="水分（%）<=" span="1" prop="waterContent">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.waterContent"
             placeholder="请输入水分占比"
@@ -409,7 +409,7 @@
         </ws-form-item>
 
         <!--杂质（%）<=-->
-        <ws-form-item label="杂质（%）" span="1" prop="impurity">
+        <ws-form-item label="杂质（%）<=" span="1" prop="impurity">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.impurity"
             placeholder="请输入杂质占比（%）"
@@ -429,7 +429,7 @@
         </ws-form-item>
 
         <!--霉变粒（%）<=-->
-        <ws-form-item label="霉变粒（%）" span="1" prop="mildewGrain">
+        <ws-form-item label="霉变粒（%）<=" span="1" prop="mildewGrain">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.mildewGrain"
             placeholder="请输入霉变粒占比（%）"
@@ -439,7 +439,7 @@
         </ws-form-item>
 
         <!--热损伤（%）<=-->
-        <ws-form-item label="热损伤（%）" span="1" prop="jiaorenli">
+        <ws-form-item label="热损伤（%）<=" span="1" prop="jiaorenli">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.jiaorenli"
             placeholder="请输入输入热损伤占比（%）"
@@ -1773,7 +1773,7 @@ export default {
   margin: 15px 0px;
 }
 .wenzi {
-  width: 900px;
+  width: 1200px;
   margin: 0 auto;
 }
 .wenzi h3 {

src/views/contractManagement/futuresSalesContractAdd.vue

@@ -376,7 +376,7 @@
         </ws-form-item>
 
         <!--水分（%）<=-->
-        <ws-form-item label="水分（%）" span="1" prop="waterContent">
+        <ws-form-item label="水分（%）<=" span="1" prop="waterContent">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.waterContent"
             placeholder="请输入水分占比"
@@ -403,7 +403,7 @@
         </ws-form-item>
 
         <!--杂质（%）<=-->
-        <ws-form-item label="杂质（%）" span="1" prop="impurity">
+        <ws-form-item label="杂质（%）<=" span="1" prop="impurity">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.impurity"
             placeholder="请输入杂质占比（%）"
@@ -423,7 +423,7 @@
         </ws-form-item>
 
         <!--霉变粒（%）<=-->
-        <ws-form-item label="霉变粒（%）" span="1" prop="mildewGrain">
+        <ws-form-item label="霉变粒（%）<=" span="1" prop="mildewGrain">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.mildewGrain"
             placeholder="请输入霉变粒占比（%）"
@@ -433,7 +433,7 @@
         </ws-form-item>
 
         <!--热损伤（%）<=-->
-        <ws-form-item label="热损伤（%）" span="1" prop="jiaorenli">
+        <ws-form-item label="热损伤（%）<=" span="1" prop="jiaorenli">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.jiaorenli"
             placeholder="请输入输入热损伤占比（%）"

src/views/contractManagement/futuresSalesContractEdit.vue

@@ -376,7 +376,7 @@
             {{ deptBudgetList.contractGoodsInfo.goodsName }}
           </ws-form-item>
         <!--水分（%）<=-->
-        <ws-form-item label="水分（%）" span="1" prop="waterContent">
+        <ws-form-item label="水分（%）<=" span="1" prop="waterContent">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.waterContent"
             placeholder="请输入水分占比"
@@ -403,7 +403,7 @@
         </ws-form-item>
 
         <!--杂质（%）<=-->
-        <ws-form-item label="杂质（%）" span="1" prop="impurity">
+        <ws-form-item label="杂质（%）<=" span="1" prop="impurity">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.impurity"
             placeholder="请输入杂质占比（%）"
@@ -423,7 +423,7 @@
         </ws-form-item>
 
         <!--霉变粒（%）<=-->
-        <ws-form-item label="霉变粒（%）" span="1" prop="mildewGrain">
+        <ws-form-item label="霉变粒（%）<=" span="1" prop="mildewGrain">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.mildewGrain"
             placeholder="请输入霉变粒占比（%）"
@@ -433,7 +433,7 @@
         </ws-form-item>
 
         <!--热损伤（%）<=-->
-        <ws-form-item label="热损伤（%）" span="1" prop="jiaorenli">
+        <ws-form-item label="热损伤（%）<=" span="1" prop="jiaorenli">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.jiaorenli"
             placeholder="请输入输入热损伤占比（%）"

src/views/contractManagement/purchaseContractAdd.vue

@@ -361,7 +361,7 @@
         </ws-form-item>
 
         <!--水分（%）<=-->
-        <ws-form-item label="水分（%）" span="1" prop="waterContent">
+        <ws-form-item label="水分（%）<=" span="1" prop="waterContent">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.waterContent"
             placeholder="请输入水分占比"
@@ -388,7 +388,7 @@
         </ws-form-item>
 
         <!--杂质（%）<=-->
-        <ws-form-item label="杂质（%）" span="1" prop="impurity">
+        <ws-form-item label="杂质（%）<=" span="1" prop="impurity">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.impurity"
             placeholder="请输入杂质占比（%）"
@@ -408,7 +408,7 @@
         </ws-form-item>
 
         <!--霉变粒（%）<=-->
-        <ws-form-item label="霉变粒（%）" span="1" prop="mildewGrain">
+        <ws-form-item label="霉变粒（%）<=" span="1" prop="mildewGrain">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.mildewGrain"
             placeholder="请输入霉变粒占比（%）"
@@ -418,7 +418,7 @@
         </ws-form-item>
 
         <!--热损伤（%）<=-->
-        <ws-form-item label="热损伤（%）" span="1" prop="jiaorenli">
+        <ws-form-item label="热损伤（%）<=" span="1" prop="jiaorenli">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.jiaorenli"
             placeholder="请输入输入热损伤占比（%）"

src/views/contractManagement/salesContractAdd.vue

@@ -366,7 +366,7 @@
           </ws-form-item>
 
           <!--水分（%）<=-->
-          <ws-form-item label="水分（%）" span="1" prop="waterContent">
+          <ws-form-item label="水分（%）<=" span="1" prop="waterContent">
             <ws-input
               v-model="deptBudgetList.contractGoodsInfo.waterContent"
               placeholder="请输入水分占比"
@@ -393,7 +393,7 @@
           </ws-form-item>
 
           <!--杂质（%）<=-->
-          <ws-form-item label="杂质（%）" span="1" prop="impurity">
+          <ws-form-item label="杂质（%）<=" span="1" prop="impurity">
             <ws-input
               v-model="deptBudgetList.contractGoodsInfo.impurity"
               placeholder="请输入杂质占比（%）"
@@ -413,7 +413,7 @@
           </ws-form-item>
 
           <!--霉变粒（%）<=-->
-          <ws-form-item label="霉变粒（%）" span="1" prop="mildewGrain">
+          <ws-form-item label="霉变粒（%）<=" span="1" prop="mildewGrain">
             <ws-input
               v-model="deptBudgetList.contractGoodsInfo.mildewGrain"
               placeholder="请输入霉变粒占比（%）"
@@ -423,7 +423,7 @@
           </ws-form-item>
 
           <!--热损伤（%）<=-->
-          <ws-form-item label="热损伤（%）" span="1" prop="jiaorenli">
+          <ws-form-item label="热损伤（%）<=" span="1" prop="jiaorenli">
             <ws-input
               v-model="deptBudgetList.contractGoodsInfo.jiaorenli"
               placeholder="请输入输入热损伤占比（%）"

src/views/contractManagement/salesContractEdit.vue

@@ -344,7 +344,7 @@
           </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.waterContent"
               placeholder="请输入水分（%）"
@@ -362,7 +362,7 @@
           </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.impurity"
               placeholder="请输入杂质（%）"
@@ -382,7 +382,7 @@
           </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.mildewGrain"
               placeholder="请输入霉变粒（%）"
@@ -392,7 +392,7 @@
           </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.jiaorenli"
               placeholder="请输入热损伤（%）"