Merge branch 'rukuguanli' of http://git.zthymaoyi.com:3000/gdc/yiliangyiyun-pc into rukuguanli

src/views/houseSelfCollect/settlement.vue

@@ -56,10 +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"
+            <!-- <ws-form-item v-if='paymentList.contractManagement' label="出库净重（公斤）" span="1" prop="weight">
+              <ws-input type="number" v-model="paymentList.contractManagement.weight" @input="grainMoney"
                 placeholder="自动获取，不可编辑" maxlength="100" size="small" disabled/>
-            </ws-form-item>
+            </ws-form-item> -->
           </ws-info-table>
           <div class="titles">质检数据</div>
           <ws-info-table>
@@ -188,7 +188,7 @@
                 placeholder="请输入粮款" maxlength="100" size="small" disabled />
             </ws-form-item>
             <!-- 采购合同 自运 按合同的出库净重计算 -->
-            <!-- <ws-form-item v-if='paymentList.type=="干粮"' label="粮款 = 出库净重 x  (干粮单价 - 扣单价)  =" span="1" prop="waterContent"
+            <!-- <ws-form-item v-if='paymentList.contractManagement.contractType == 2 && paymentList.contractManagement.deliverType == 1' 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 />