public/static/inspection.html

@@ -168,10 +168,10 @@
             <td class="col">{{tableData.goodsName}}</td>
             <td class="col col-bgc">类型</td>
             <td class="col">{{tableData.type}}</td>
-            <td class="col col-bgc">容重（克/升）</td>
-            <td class="col">{{tableData.bulkDensity}}</td>
-            <td class="col col-bgc">不完善粒（%）</td>
-            <td class="col">{{tableData.imperfectGrain}}</td>
+            <td class="col col-bgc">{{tableData.goodsName == '大豆'?'蛋白':'容重（克/升）'}}</td>
+            <td class="col">{{ tableData.goodsName == '大豆'?tableData.protein:tableData.bulkDensity}}</td>
+            <td class="col col-bgc">{{tableData.goodsName == '大豆'?'完整粒率（%）':'不完善粒（%）'}}</td>
+            <td class="col">{{ tableData.goodsName == '大豆'?tableData.completeGrain:printData.imperfectGrain }}</td>
           </tr>
           <tr class="row">
             <td class="col col-bgc">等级</td>
@@ -276,12 +276,12 @@
           <div>{{tableData.type}}</div>
         </div>
         <div class="small-row">
-          <div>容重（克/升）：</div>
-          <div>{{tableData.bulkDensity}}</div>
+          <div>{{tableData.goodsName=='大豆'?"蛋白：":"容重（克/升）："}}</div>
+          <div>{{tableData.goodsName=='大豆'?tableData.protein:tableData.bulkDensity}}</div>
         </div>
         <div class="small-row">
-          <div>不完善粒（%）：</div>
-          <div>{{tableData.imperfectGrain}}</div>
+          <div>{{tableData.goodsName=='大豆'?"完整粒率（%）":"不完善粒（%）："}}</div>
+          <div>{{tableData.goodsName=='大豆'?tableData.completeGrain:tableData.imperfectGrain}}</div>
         </div>
         <div class="small-row">
           <div>等级：</div>

public/static/payprint1.html

@@ -465,13 +465,13 @@
                                 <td class="col">{{printData1[index].weighingManagement.goodsName}}</td>
                                 <td class="col col-bgc">类型</td>
                                 <td class="col">{{printData1[index].weighingManagement.type}}</td>
-                                <td class="col col-bgc">{{printData1[index].weighingManagement.goodsName != '大豆'?'容量（克/升）':'蛋白'}}</td>
+                                <td class="col col-bgc">{{printData1[index].weighingManagement.goodsName == '大豆'?'蛋白':'容量（克/升）'}}</td>
                                 <td class="col">
-                                    {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.bulkDensity:''}}
+                                    {{printData1[index].weighingManagement.goodsName == '大豆'?printData1[index].qualityInspectionManagement.protein:printData1[index].qualityInspectionManagement.bulkDensity}}
                                 </td>
-                                <td class="col col-bgc">不完善粒（%）</td>
+                                <td class="col col-bgc">{{printData1[index].weighingManagement.goodsName == '大豆'?'完整粒率（%）':'不完善粒（%）'}}</td>
                                 <td class="col">
-                                    {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.imperfectGrain:''}}
+                                    {{printData1[index].weighingManagement.goodsName == '大豆'?printData1[index].qualityInspectionManagement.completeGrain:printData1[index].qualityInspectionManagement.imperfectGrain}}
                                 </td>
                             </tr>
                             <tr class="row">
@@ -684,7 +684,7 @@
                         <td class="col">
                             {{ printData.qualityInspectionManagement.impurity}}
                         </td>
-                        <td class="col">{{printData.qualityInspectionManagement?printData.qualityInspectionManagement.bulkDensity:''}}</td>
+                        <td class="col">{{printData.goodsName== '大豆'?printData.qualityInspectionManagement.protein:printData.qualityInspectionManagement.bulkDensity}}</td>
                         <td class="col">{{ printData.grossWeight}}</td>
                         <td class="col">{{ printData.tare}}</td>
                         <td class="col" v-if="compId!='6a713699e08c4cbc97a87f7648a95e3d' 
@@ -708,7 +708,7 @@
                         <td class="col col-bgc">粮款</td>
                         <td class="col col-bgc">霉变粒</td>
                         <td class="col col-bgc">热损伤</td>
-                        <td class="col col-bgc">不完善粒</td>
+                        <td class="col col-bgc">{{printData.goodsName== '大豆'?'完整粒率（%）':"不完善粒"}}</td>
                         <td class="col col-bgc">扣重比</td>
                         <td v-if="printData.type == '潮粮'" class="col col-bgc">扣量%</td>
                         <td :colspan="printData.type == '潮粮'?1:2" class="col col-bgc">仓位号</td>
@@ -734,7 +734,7 @@
                         </td>
                         <td class="col "> {{printData.qualityInspectionManagement.mildewGrain}}</td>
                         <td class="col "> {{printData.qualityInspectionManagement.jiaorenli}}</td>
-                        <td class="col "> {{printData.qualityInspectionManagement.imperfectGrain}}</td>
+                        <td class="col "> {{printData.goodsName== '大豆'?printData.qualityInspectionManagement.completeGrain:printData.qualityInspectionManagement.imperfectGrain}}</td>
                         <td class="col ">{{compId=='6a713699e08c4cbc97a87f7648a95e3d'?'1.25':printData.buckleWeightRatio}}</td>
                         <td class="col " v-if="compId=='6a713699e08c4cbc97a87f7648a95e3d'&&printData.type == '潮粮'">{{ (printData.qualityInspectionManagement.waterContent-14.5)*1.25}}</td>
                         <td class="col " v-if="compId!='6a713699e08c4cbc97a87f7648a95e3d'&&printData.type == '潮粮'"></td>
@@ -875,7 +875,7 @@
                         <td class="col col-bgc">等级</td>
                         <td class="col col-bgc">水分%</td>
                         <td class="col col-bgc">杂质%</td>
-                        <td class="col col-bgc">{{printData.goodsName!= '大豆'?'容重':'蛋白'}}</td>
+                        <td class="col col-bgc">{{printData.goodsName== '大豆'?'蛋白':'容重'}}</td>
                         <td class="col col-bgc">毛重</td>
                         <td class="col col-bgc">皮重</td>
                         <td class="col col-bgc">扣重</td>
@@ -895,7 +895,7 @@
                         <td class="col">
                             {{ printData.qualityInspectionManagement.impurity}}
                         </td>
-                        <td class="col">{{printData.qualityInspectionManagement?printData.qualityInspectionManagement.bulkDensity:''}}</td>
+                        <td class="col">{{printData.goodsName== '大豆'?printData.qualityInspectionManagement.protein:printData.qualityInspectionManagement.bulkDensity}}</td>
                         <td class="col">{{ printData.grossWeight}}</td>
                         <td class="col">{{ printData.tare}}</td>
                         <td class="col" v-if="compId!='6a713699e08c4cbc97a87f7648a95e3d' 
@@ -919,7 +919,7 @@
                         <td class="col col-bgc">粮款</td>
                         <td class="col col-bgc">霉变粒</td>
                         <td class="col col-bgc">热损伤</td>
-                        <td class="col col-bgc">不完善粒</td>
+                        <td class="col col-bgc">{{printData.goodsName== '大豆'?'完整粒率（%）':'不完善粒'}}</td>
                         <td class="col col-bgc">扣重比</td>
                         <td v-if="printData.type == '潮粮'" class="col col-bgc">扣量%</td>
                         <td :colspan="printData.type == '潮粮'?1:2" class="col col-bgc">仓位号</td>
@@ -945,7 +945,7 @@
                         </td>
                         <td class="col "> {{printData.qualityInspectionManagement.mildewGrain}}</td>
                         <td class="col "> {{printData.qualityInspectionManagement.jiaorenli}}</td>
-                        <td class="col "> {{printData.qualityInspectionManagement.imperfectGrain}}</td>
+                        <td class="col "> {{printData.goodsName== '大豆'?printData.qualityInspectionManagement.completeGrain:printData.qualityInspectionManagement.imperfectGrain}}</td>
                         <td class="col ">{{compId=='6a713699e08c4cbc97a87f7648a95e3d'?'1.25':printData.buckleWeightRatio}}</td>
                         <td class="col " v-if="compId=='6a713699e08c4cbc97a87f7648a95e3d'&&printData.type != '潮粮'">{{ (printData.qualityInspectionManagement.waterContent-14.5)*1.25}}</td>
                         <td class="col " v-if="compId!='6a713699e08c4cbc97a87f7648a95e3d'&&printData.type != '潮粮'"></td>
@@ -1060,13 +1060,13 @@
                         <td class="col">{{tableData.goodsName}}</td>
                         <td class="col col-bgc">类型</td>
                         <td class="col">{{tableData.type}}</td>
-                        <td class="col col-bgc">{{tableData.goodsName != '大豆'?'容量（克/升）':'蛋白'}}</td>
+                        <td class="col col-bgc">{{tableData.goodsName == '大豆'?'蛋白':'容量（克/升）'}}</td>
                         <td class="col">
-                            {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.bulkDensity:''}}
+                            {{tableData.goodsName == '大豆'?tableData.qualityInspectionManagement.protein:tableData.qualityInspectionManagement.bulkDensity}}
                         </td>
-                        <td class="col col-bgc">不完善粒（%）</td>
+                        <td class="col col-bgc">{{tableData.goodsName == '大豆'?'完整粒率（%）':'不完善粒（%）'}}</td>
                         <td class="col">
-                            {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.imperfectGrain:''}}
+                            {{tableData.goodsName == '大豆'?tableData.qualityInspectionManagement.completeGrain:tableData.qualityInspectionManagement.imperfectGrain}}
                         </td>
                     </tr>
                     <tr class="row">
@@ -1463,7 +1463,6 @@
                     }
                 }
             } else {
-                debugger
                 this.printData = JSON.parse(_data)
                     //地址过长截取
                 if (this.printData.identityAuthenticationInfo && this.printData.identityAuthenticationInfo.compAddress.length > 24) {
@@ -1489,7 +1488,6 @@
                     localStorage.getItem('selectPrint_selectCustomerList')
                 )
             } else {
-                debugger
                 if (cwprint == 'true') {
                     this.customerList = JSON.parse(localStorage.getItem('printData1'))
                 }

public/static/weightCheck.html

@@ -179,13 +179,13 @@
                             <td class="col">{{item.goodsName}}</td>
                             <td class="col col-bgc">类型</td>
                             <td class="col">{{item.type}}</td>
-                            <td class="col col-bgc">{{item.goodsName != '大豆' ? '容重（克/升）' : '蛋白'}}</td>
+                            <td class="col col-bgc">{{item.goodsName == '大豆' ? '蛋白' : '容重（克/升）'}}</td>
                             <td class="col">
-                                {{item.qualityInspectionManagement?item.qualityInspectionManagement.bulkDensity:''}}
+                                {{item.goodsName=='大豆'?item.qualityInspectionManagement.protein:item.qualityInspectionManagement.bulkDensity}}
                             </td>
-                            <td class="col col-bgc">不完善粒（%）</td>
+                            <td class="col col-bgc">{{item.goodsName == '大豆' ? '完善粒率（%）' : '不完善粒（%）'}}</td>
                             <td class="col">
-                                {{item.qualityInspectionManagement?item.qualityInspectionManagement.imperfectGrain:''}}
+                                {{item.goodsName == '大豆'?item.qualityInspectionManagement.completeGrain:item.qualityInspectionManagement.imperfectGrain}}
                             </td>
                         </tr>
                         <tr class="row">
@@ -294,13 +294,13 @@
                             <td class="col">{{item.goodsName}}</td>
                             <td class="col col-bgc">类型</td>
                             <td class="col">{{item.type}}</td>
-                            <td class="col col-bgc">{{item.goodsName != '大豆' ? '容重（克/升）' : '蛋白'}}</td>
+                            <td class="col col-bgc">{{item.goodsName == '大豆' ? '蛋白' : '容重（克/升）'}}</td>
                             <td class="col">
-                                {{item.qualityInspectionManagement?item.qualityInspectionManagement.bulkDensity:''}}
+                                {{item.goodsName=='大豆'?item.qualityInspectionManagement.protein:item.qualityInspectionManagement.bulkDensity}}
                             </td>
-                            <td class="col col-bgc">不完善粒（%）</td>
+                            <td class="col col-bgc">{{item.goodsName == '大豆' ? '完善粒率（%）' : '不完善粒（%）'}}</td>
                             <td class="col">
-                                {{item.qualityInspectionManagement?item.qualityInspectionManagement.imperfectGrain:''}}
+                                {{item.goodsName == '大豆'?item.qualityInspectionManagement.completeGrain:item.qualityInspectionManagement.imperfectGrain}}
                             </td>
                         </tr>
                         <tr class="row">
@@ -413,14 +413,14 @@
                         <td class="col">{{_item.goodsName}}</td>
                         <td class="col col-bgc">类型</td>
                         <td class="col">{{_item.type}}</td>
-                        <td class="col col-bgc">{{_item.goodsName != '大豆' ? '容重（克/升）' :'蛋白'}}</td>
-                        <td class="col">
-                            {{_item.qualityInspectionManagement?_item.qualityInspectionManagement.bulkDensity:''}}
-                        </td>
-                        <td class="col col-bgc">不完善粒（%）</td>
-                        <td class="col">
-                            {{_item.qualityInspectionManagement?_item.qualityInspectionManagement.imperfectGrain:''}}
-                        </td>
+                        <td class="col col-bgc">{{_item.goodsName == '大豆' ? '蛋白' : '容重（克/升）'}}</td>
+                            <td class="col">
+                                {{_item.goodsName=='大豆'?_item.qualityInspectionManagement.protein:_item.qualityInspectionManagement.bulkDensity}}
+                            </td>
+                            <td class="col col-bgc">{{_item.goodsName == '大豆' ? '完善粒率（%）' : '不完善粒（%）'}}</td>
+                            <td class="col">
+                                {{_item.goodsName == '大豆'?_item.qualityInspectionManagement.completeGrain:_item.qualityInspectionManagement.imperfectGrain}}
+                            </td>
                     </tr>
                     <tr class="row">
                         <td class="col col-bgc">等级</td>

src/layout/index/top/index.vue

@@ -608,7 +608,7 @@
       async getQRCodeData(tmp) {
         await getQRCodeData(tmp)
           .toPromise()
-          .then((response) => { debugger
+          .then((response) => {
             this.toPageData = response
             // 处理按钮显示状态
             // this.btnStatus 

src/views/contractManagement/component/paymentPrint.vue

@@ -47,7 +47,7 @@
         <td class="col col-bgc">等级</td>
         <td class="col col-bgc">水分%</td>
         <td class="col col-bgc">杂质%</td>
-        <td class="col col-bgc">容重（克/升）</td>
+        <td class="col col-bgc">{{printData.goodsName == '大豆'?'蛋白':'容重（克/升）'}}</td>
         <td class="col col-bgc">毛重</td>
         <td class="col col-bgc">皮重</td>
         <td class="col col-bgc">扣杂重</td>
@@ -60,7 +60,7 @@
         <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.qualityInspectionManagement.bulkDensity}}</td>
+        <td class="col">{{ printData.goodsName == '大豆'?printData.qualityInspectionManagement.protein:printData.qualityInspectionManagement.bulkDensity}}</td>
         <td class="col">{{ printData.grossWeight}}</td>
         <td class="col">{{ printData.tare}}</td>
         <td class="col">{{ printData.weighingManagement.buckleMiscellaneous}}</td>

src/views/houseSelfCollect/component/inspectInfoPrint.vue

@@ -40,10 +40,10 @@
         <td class="col">{{ printData.goodsName }}</td>
         <td class="col col-bgc">类型</td>
         <td class="col">{{ printData.type }}</td>
-        <td class="col col-bgc">容重（克/升）</td>
-        <td class="col">{{ printData.bulkDensity }}</td>
-        <td class="col col-bgc">不完善粒（%）</td>
-        <td class="col">{{ printData.imperfectGrain }}</td>
+        <td class="col col-bgc">{{printData.goodsName == '大豆'?'蛋白':'容重（克/升）'}}</td>
+        <td class="col">{{ printData.goodsName == '大豆'?printData.protein:printData.bulkDensity}}</td>
+        <td class="col col-bgc">{{printData.goodsName == '大豆'?'完整粒率（%）':'不完善粒（%）'}}</td>
+        <td class="col">{{ printData.goodsName == '大豆'?printData.completeGrain:printData.imperfectGrain }}</td>
       </tr>
       <tr class="row">
         <td class="col col-bgc">等级</td>

src/views/houseSelfCollect/component/paymentPrint.vue

@@ -47,7 +47,8 @@
         <td class="col col-bgc">等级</td>
         <td class="col col-bgc">水分%</td>
         <td class="col col-bgc">杂质%</td>
-        <td class="col col-bgc">容重（克/升）</td>
+        <td class="col col-bgc" v-if="printData.goodsName == '大豆'">蛋白</td>
+        <td class="col col-bgc" v-else>容重（克/升）</td>
         <td class="col col-bgc">毛重</td>
         <td class="col col-bgc">皮重</td>
         <td class="col col-bgc">扣杂重</td>
@@ -59,7 +60,8 @@
         <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.qualityInspectionManagement.bulkDensity}}</td>
+        <td class="col" v-if="printData.goodsName == '大豆'">{{ printData.qualityInspectionManagement.protein}}</td>
+        <td class="col" v-else>{{ printData.qualityInspectionManagement.bulkDensity}}</td>
         <td class="col">{{ printData.grossWeight}}</td>
         <td class="col">{{ printData.tare}}</td>
         <td class="col">{{ printData.weighingManagement.buckleMiscellaneous}}</td>

src/views/houseSelfCollect/inspectInfoLook.vue

@@ -179,24 +179,48 @@
                 <ws-input type="number" @mousewheel.native.prevent v-model="inspect.reMildewGrain" 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" v-if="inspect.goodsName != '大豆'">
               <ws-input type="number" @mousewheel.native.prevent v-model="inspect.bulkDensity" placeholder="请输入容重"
                 maxlength="100" size="small" :disabled="disabled" />
                 <ws-input type="number" @mousewheel.native.prevent v-model="inspect.reBulkDensity" placeholder="请输入复检容重"
                 maxlength="100" size="small" :disabled="disabled" />
             </ws-form-item>
+            <ws-form-item label="蛋白" span="1" prop="bulkDensity" v-else>
+              <ws-input type="number" @mousewheel.native.prevent v-model="inspect.protein" placeholder="请输入蛋白"
+                maxlength="100" size="small" :disabled="disabled" />
+                <ws-input type="number" @mousewheel.native.prevent v-model="inspect.reProtein" placeholder="请输入复检蛋白"
+                maxlength="100" size="small" :disabled="disabled" />
+            </ws-form-item>
             <ws-form-item label="热损伤（%）" span="1" prop="jiaorenli">
               <ws-input type="number" @mousewheel.native.prevent v-model="inspect.jiaorenli" placeholder="请输入热损伤占比"
                 maxlength="100" size="small" :disabled="disabled" />
                 <ws-input type="number" @mousewheel.native.prevent v-model="inspect.reJiaorenli" placeholder="请输入复检热损伤占比"
                 maxlength="100" size="small" :disabled="disabled" />
             </ws-form-item>
-            <ws-form-item label="不完善粒（%）" span="1" prop="imperfectGrain">
+            <ws-form-item label="不完善粒（%）" span="1" prop="imperfectGrain" v-if="inspect.goodsName !='大豆'">
               <ws-input type="number" @mousewheel.native.prevent v-model="inspect.imperfectGrain"
                 placeholder="请输入不完善粒占比" maxlength="100" size="small" :disabled="disabled" />
               <ws-input type="number" @mousewheel.native.prevent v-model="inspect.reImperfectGrain"
                 placeholder="请输入复检不完善粒占比" maxlength="100" size="small" :disabled="disabled" />
             </ws-form-item>
+            <ws-form-item label="完整粒率（%）" span="1" prop="completeGrain" v-else>
+              <ws-input type="number" @mousewheel.native.prevent v-model="inspect.completeGrain"
+                placeholder="请输入完整粒率占比" maxlength="100" size="small" :disabled="disabled" />
+              <ws-input type="number" @mousewheel.native.prevent v-model="inspect.reCompleteGrain"
+                placeholder="请输入复检完整粒率占比" maxlength="100" size="small" :disabled="disabled" />
+            </ws-form-item>
+            <ws-form-item label="转基因" span="1" prop="transgene" v-if="inspect.goodsName =='大豆'">
+              <ws-input @mousewheel.native.prevent v-model="inspect.transgene"
+                placeholder="请输入是否转基因" maxlength="100" size="small" :disabled="disabled" />
+              <ws-input @mousewheel.native.prevent v-model="inspect.reTransgene"
+                placeholder="请输入复检是否转基因" maxlength="100" size="small" :disabled="disabled" />
+            </ws-form-item>
+            <ws-form-item label="色泽/气味" span="1" prop="colorLustre" v-if="inspect.goodsName =='大豆'">
+              <ws-input @mousewheel.native.prevent v-model="inspect.colorLustre"
+                placeholder="请输入色泽/气味是否正常" maxlength="100" size="small" :disabled="disabled" />
+              <ws-input @mousewheel.native.prevent v-model="inspect.reColorLustre"
+                placeholder="请输入复检色泽/气味是否正常" maxlength="100" size="small" :disabled="disabled" />
+            </ws-form-item>
             <ws-form-item label="复检备注" span="2" prop="reMemo" v-if="information == '编辑复检' || statusShow == '已复检'">
               <ws-input type="textarea" v-model="inspect.reMemo" placeholder="请输入复检备注" maxlength="300" v-if="statusShow != '已复检'" />
               <ws-input type="textarea" v-model="inspect.reMemo" placeholder="请输入复检备注" maxlength="300" v-else disabled />

src/views/houseSelfCollect/settlement.vue

@@ -82,21 +82,37 @@
                 v-model="paymentList.qualityInspectionManagement.mildewGrain" placeholder="请输入霉变粒占比" maxlength="100"
                 size="small" disabled />
             </ws-form-item>
-            <ws-form-item label="容重(克/升)" span="1" prop="waterContent">
+            <ws-form-item label="容重(克/升)" span="1" prop="waterContent" v-if="paymentList.goodsName != '大豆'">
               <ws-input type="number" @mousewheel.native.prevent
                 v-model="paymentList.qualityInspectionManagement.bulkDensity" placeholder="请输入容重" maxlength="100"
                 size="small" disabled />
             </ws-form-item>
+            <ws-form-item label="蛋白" span="1" prop="waterContent" v-else>
+              <ws-input type="number" @mousewheel.native.prevent
+                v-model="paymentList.qualityInspectionManagement.protein" placeholder="请输入蛋白" maxlength="100"
+                size="small" disabled />
+            </ws-form-item>
             <ws-form-item label="热损伤（%）" span="1" prop="waterContent">
               <ws-input type="number" @mousewheel.native.prevent
                 v-model="paymentList.qualityInspectionManagement.jiaorenli" placeholder="请输入热损伤占比" maxlength="100"
                 size="small" disabled />
             </ws-form-item>
-            <ws-form-item label="不完善粒（%）" span="1" prop="waterContent">
+            <ws-form-item label="不完善粒（%）" span="1" prop="waterContent" v-if="paymentList.goodsName != '大豆'">
               <ws-input type="number" @mousewheel.native.prevent
                 v-model="paymentList.qualityInspectionManagement.imperfectGrain" placeholder="请输入不完善粒占比" maxlength="100"
                 size="small" disabled />
             </ws-form-item>
+            <ws-form-item label="完整粒率（%）" span="1" prop="waterContent" v-else>
+              <ws-input type="number" @mousewheel.native.prevent
+                v-model="paymentList.qualityInspectionManagement.completeGrain" placeholder="请输入不完善粒占比" maxlength="100"
+                size="small" disabled />
+            </ws-form-item>
+            <ws-form-item label="转基因" span="1" prop="transgene" v-if="paymentList.goodsName == '大豆' && paymentList.qualityInspectionManagement.transgene">
+              <ws-input v-model="paymentList.qualityInspectionManagement.transgene" placeholder="暂无" maxlength="100" size="small" disabled />
+            </ws-form-item>
+            <ws-form-item label="色泽/气味" span="1" prop="colorLustre" v-show="paymentList.goodsName == '大豆' && paymentList.qualityInspectionManagement.colorLustre">
+              <ws-input v-model="paymentList.qualityInspectionManagement.colorLustre" placeholder="暂无" maxlength="100" size="small" disabled />
+            </ws-form-item>
           </ws-info-table>
 
           <div v-if='paymentList.type=="潮粮"' class="titles">单价核算</div>

src/views/warehousenew/warehouseManagementList.vue

@@ -438,7 +438,6 @@
           if(strDate<10){ 
              strDate = "0"+strDate
           }
-          debugger
           var pastdate = new Date(date.getTime() - 24 * 60 * 60 * 1000)
           this.StartDate =pastdate.getFullYear() + '-' + (pastdate.getMonth() + 1) + '-' + (pastdate.getDate()>10?pastdate.getDate():'0'+pastdate.getDate())+' 00:00:00'
           // this.StartDate = new Date(pastdate.getFullYear() + '-' + (pastdate.getMonth() + 1) + '-' + (pastdate.getDate()>10?pastdate.getDate():'0'+pastdate.getDate())+' 00:00:00')
@@ -462,7 +461,6 @@
           this.$message.error('请选择打印的类型')
           return
         }
-        debugger
         if (!this.parameter.printStartDate) {
           this.$message.error('请选择打印的起始日期')
           return

src/views/warehousenew/warehousingOrder.vue

@@ -1783,16 +1783,24 @@ export default {
       this.fieldrationsList.baseId = this.currectdata[0].baseId
       this.fieldrationsList.beforeWeight = weight.toFixed(3)
       var response=await getbyname({ warehouseId: this.currectdata[0].baseId, goodsName: this.currectdata[0].goodsName }).toPromise()
-      var response1=await getdryweight({ warehousingOrderList: arr1 }).toPromise()
+      let count = 0
+      for(let i = 0;i<arr1.length;i++){
+        let array =[]
+        array.push(arr1[i])
+        var response1=await getdryweight({ warehousingOrderList: array }).toPromise()
         if (response) {
             let weight2 = 0
             for (let i = 0; i < this.currectdata.length; i++) {
               var weightedMoisture = (this.currectdata[i].weightedMoisture - 14)
               var deductWeight = 100 - (weightedMoisture * response.deductWeight)
             }
-            this.fieldrationsList.afterWeight = response1
+            count =Number(count)+ Number(response1)
+            this.fieldrationsList.warehousingOrderList[i].afterWeight = response1
+
             this.fieldrationsshow = true
           }
+      }
+      this.fieldrationsList.afterWeight = count.toFixed(3)
       // this.fieldrationsList.beforeCost=this.currectdata[0].avgCost
     },
     distribution() {
@@ -2582,6 +2590,7 @@ export default {
       this.marginshow = false
     },
     handleClose4() {
+      this.fieldrationsList.afterWeight = 0
       this.fieldrationsshow = false
     },
     handleSizeChange(val) {