1

public/static/payprint.html

@@ -282,17 +282,10 @@
                 <tr class="row">
                   <td class="col">{{ printData1[index].goodsName}}</td>
                   <td class="col">{{ printData1[index].type}}</td>
-                  <td class="col">
-                    {{ printData1[index].qualityInspectionManagement.grade}}
-                  </td>
-                  <td class="col">
-                    {{
-                    printData1[index].qualityInspectionManagement.waterContent}}
-                  </td>
-                  <td class="col">
-                    {{ printData1[index].qualityInspectionManagement.impurity}}
-                  </td>
-                  <td class="col">  {{printData1[index].weighingManagement.qualityInspectionManagement?printData1[index].weighingManagement.qualityInspectionManagement.bulkDensity:''}}</td>
+                  <td class="col">{{ printData1[index].qualityInspectionManagement.grade}}</td>
+                  <td class="col">{{printData1[index].qualityInspectionManagement.waterContent}}</td>
+                  <td class="col">{{ printData1[index].qualityInspectionManagement.impurity}}</td>
+                  <td class="col">{{printData1[index].weighingManagement.qualityInspectionManagement?printData1[index].weighingManagement.qualityInspectionManagement.bulkDensity:''}}</td>
                   <td class="col">{{ printData1[index].grossWeight}}</td>
                   <td class="col">{{ printData1[index].tare}}</td>
                   <td class="col">

src/views/houseSelfCollect/settlement.vue

@@ -56,6 +56,10 @@
               <ws-input type="number" @mousewheel.native.prevent v-model="paymentList.unitDeduction" @input="grainMoney"
                 placeholder="请输入扣单价" maxlength="100" size="small" :disabled="disabled" />
             </ws-form-item>
+            <ws-form-item v-if='paymentList.type=="干粮"' label="出库净重（公斤）" span="1" prop="unitDeduction">
+              <ws-input type="number" @mousewheel.native.prevent v-model="paymentList.unitDeduction" @input="grainMoney"
+                placeholder="自动获取，不可编辑" maxlength="100" size="small" disabled/>
+            </ws-form-item>
           </ws-info-table>
           <div class="titles">质检数据</div>
           <ws-info-table>
@@ -183,6 +187,12 @@
               <ws-input type="number" @mousewheel.native.prevent @input='grainMoney' v-model="paymentList.grainMoney"
                 placeholder="请输入粮款" maxlength="100" size="small" disabled />
             </ws-form-item>
+            <!-- 采购合同 自运 按合同的出库净重计算 -->
+            <!-- <ws-form-item v-if='paymentList.type=="干粮"' label="粮款 = 出库净重 x  (干粮单价 - 扣单价)  =" span="1" prop="waterContent"
+              class="formItem">
+              <ws-input type="number" @mousewheel.native.prevent @input='grainMoney' v-model="paymentList.grainMoney"
+                placeholder="请输入粮款" maxlength="100" size="small" disabled />
+            </ws-form-item> -->
             <ws-form-item label="称重扣款" span="1" prop="waterContent">
               <ws-input type="number" @mousewheel.native.prevent @input='grainMoney' @focus="inputFocus($event)"
                 v-model="paymentList.weighingDeduction" placeholder="请输入称重扣款" maxlength="100" size="small"