前端

public/static/warehousePrint.html

@@ -188,7 +188,7 @@
           <span v-if='printData[0].reInspector'>复检员：</span>
           <span v-if='printData[0].reInspector'>{{printData[0].reInspector}}</span>
           <span>检斤员：</span>
-          <span>{{printData[0].agent}}</span>
+          <span>{{printData[0].secretaryWeigher}}</span>
           <p>
             <span>值班日期：</span>
             <span>{{startDate}}</span>
@@ -197,7 +197,7 @@
           </p>
           <p>
             <span>货名：</span>
-            <span>玉米</span>
+            <span>{{printData[0].goodsName}}</span>
             <span style="margin-left:100px">质量单位：吨</span>
           </p>
         </div>

src/views/contractManagement/acquisitionContractAdd.vue

@@ -147,9 +147,9 @@
             value-format="yyyy-MM-dd" />
         </ws-form-item>
 
-        <ws-form-item label="最终实际成交量（吨）" span="1" prop="finalTradingVolume">
+        <!-- <ws-form-item label="最终实际成交量（吨）" span="1" prop="finalTradingVolume">
           <ws-input v-model="deptBudgetList.finalTradingVolume" placeholder="请输入最终实际成交量" maxlength="100" size="small" />
-        </ws-form-item>
+        </ws-form-item> -->
       </ws-info-table>
       <div class="wenzi">
         <h3>货物信息</h3>

src/views/contractManagement/acquisitionContractAudit.vue

@@ -96,9 +96,9 @@
         <ws-form-item label="签订日期" span="1" prop="signingDate">
           {{ deptBudgetList.signingDate }}
         </ws-form-item>
-        <ws-form-item label="最终实际交易量(吨)" span="1" prop="finalTradingVolume">
+        <!-- <ws-form-item label="最终实际交易量(吨)" span="1" prop="finalTradingVolume">
           {{ deptBudgetList.finalTradingVolume }}
-        </ws-form-item>
+        </ws-form-item> -->
         <ws-form-item label="结算单价（元/吨）" span="1" prop="settlementPrice" >
           {{ deptBudgetList.settlementPrice?deptBudgetList.settlementPrice:'自动结算，不可编辑'}}
         </ws-form-item>

src/views/contractManagement/acquisitionContractEdit.vue

@@ -87,9 +87,9 @@
         </ws-form-item>
 
         <!-- 最终实际交易量（吨） -->
-        <ws-form-item label="最终实际交易量（吨）" span="1" prop="totalContractPrice">
+        <!-- <ws-form-item label="最终实际交易量（吨）" span="1" prop="totalContractPrice">
           <ws-input v-model="deptBudgetList.finalTradingVolume" maxlength="100" placeholder="请输入最终实际交易量" size="small" />
-        </ws-form-item>
+        </ws-form-item> -->
         <ws-form-item label="结算单价（元/吨）" span="1" prop="settlementPrice" >
           {{ deptBudgetList.settlementPrice?deptBudgetList.settlementPrice:'自动结算，不可编辑'}}
         </ws-form-item>

src/views/contractManagement/acquisitionContractExamine.vue

@@ -96,9 +96,9 @@
         <ws-form-item label="签订日期" span="1" prop="signingDate">
           {{ deptBudgetList.signingDate }}
         </ws-form-item>
-        <ws-form-item label="最终实际交易量(吨)" span="1" prop="finalTradingVolume">
+        <!-- <ws-form-item label="最终实际交易量(吨)" span="1" prop="finalTradingVolume">
           {{ deptBudgetList.finalTradingVolume }}
-        </ws-form-item>
+        </ws-form-item> -->
         <ws-form-item label="结算单价（元/吨）" span="1" prop="settlementPrice" >
           {{ deptBudgetList.settlementPrice?deptBudgetList.settlementPrice:'自动结算，不可编辑'}}
         </ws-form-item>

src/views/contractManagement/collectionContractAdd.vue

@@ -132,10 +132,10 @@
           <ws-form-item label="代收费(元/吨)" span="1" prop="agencyCharge">
             <ws-input v-model="deptBudgetList.agencyCharge" placeholder="请输入仓储费" maxlength="20" size="small" />
           </ws-form-item>
-          <ws-form-item label="最终实际成交量（吨）" span="1" prop="finalTradingVolume">
+          <!-- <ws-form-item label="最终实际成交量（吨）" span="1" prop="finalTradingVolume">
             <ws-input v-model="deptBudgetList.finalTradingVolume" placeholder="请输入最终实际成交量" maxlength="100"
               size="small" />
-          </ws-form-item>
+          </ws-form-item> -->
           <ws-form-item label="代收库负责人" span="1" prop="packingMethod">
             <el-select v-model="deptBudgetList.personPhone" multiple placeholder="请选择代收库负责人" filterable clearable
               @change="selectstaff">

src/views/contractManagement/collectionContractAudit.vue

@@ -92,9 +92,9 @@
         <ws-form-item label="代收费(元/吨)" span="1" prop="agencyCharge">
           {{deptBudgetList.agencyCharge}}
         </ws-form-item>
-        <ws-form-item label="最终实际交易量(吨)" span="1" prop="finalTradingVolume">
+        <!-- <ws-form-item label="最终实际交易量(吨)" span="1" prop="finalTradingVolume">
           {{ deptBudgetList.finalTradingVolume }}
-        </ws-form-item>
+        </ws-form-item> -->
         <ws-form-item label="代收库负责人" span="1" prop="personCharge" v-if="deptBudgetList.deliverType == 1">
           {{ deptBudgetList.personCharge }}
         </ws-form-item>

src/views/contractManagement/collectionContractEdit.vue

@@ -154,10 +154,10 @@
           </ws-form-item>
 
           <!-- 最终实际交易量（吨） -->
-          <ws-form-item label="最终实际交易量（吨）" span="1" prop="totalContractPrice">
+          <!-- <ws-form-item label="最终实际交易量（吨）" span="1" prop="totalContractPrice">
             <ws-input v-model="deptBudgetList.finalTradingVolume" maxlength="100" placeholder="请输入最终实际交易量"
               size="small" />
-          </ws-form-item>
+          </ws-form-item> -->
 
           <ws-form-item label="临时仓库负责人" span="1" prop="packingMethod">
             <el-select v-model="deptBudgetList.personPhone" multiple placeholder="请选择临时仓库负责人" filterable clearable

src/views/contractManagement/collectionContractExamine.vue

@@ -92,9 +92,9 @@
         <ws-form-item label="代收费(元/吨)" span="1" prop="agencyCharge">
           {{deptBudgetList.agencyCharge}}
         </ws-form-item>
-        <ws-form-item label="最终实际交易量(吨)" span="1" prop="finalTradingVolume">
+        <!-- <ws-form-item label="最终实际交易量(吨)" span="1" prop="finalTradingVolume">
           {{ deptBudgetList.finalTradingVolume }}
-        </ws-form-item>
+        </ws-form-item> -->
         <ws-form-item label="代收库负责人" span="1" prop="personCharge" v-if="deptBudgetList.deliverType == 1">
           {{ deptBudgetList.personCharge }}
         </ws-form-item>

src/views/contractManagement/purchaseContractAudit.vue

@@ -135,9 +135,9 @@
         <ws-form-item label="签订日期" span="1" prop="signingDate">
           {{ deptBudgetList.signingDate }}
         </ws-form-item>
-        <ws-form-item label="最终实际交易量(吨)" span="1" prop="finalTradingVolume">
+        <!-- <ws-form-item label="最终实际交易量(吨)" span="1" prop="finalTradingVolume">
           {{ deptBudgetList.finalTradingVolume }}
-        </ws-form-item>
+        </ws-form-item> -->
         <ws-form-item label="临时仓库负责人" span="1" prop="personCharge" v-if="deptBudgetList.deliverType != 2">
           {{ deptBudgetList.personCharge }}
         </ws-form-item>

src/views/contractManagement/purchaseContractEdit.vue

@@ -205,9 +205,9 @@
         </ws-form-item>
 
         <!-- 最终实际交易量（吨） -->
-        <ws-form-item label="最终实际交易量（吨）" span="1" prop="totalContractPrice">
+        <!-- <ws-form-item label="最终实际交易量（吨）" span="1" prop="totalContractPrice">
           <ws-input v-model="deptBudgetList.finalTradingVolume" maxlength="100" placeholder="请输入最终实际交易量" size="small" />
-        </ws-form-item>
+        </ws-form-item> -->
 
         <!-- 临时仓库负责人 -->
         <ws-form-item label="临时仓库负责人" span="1" prop="packingMethod" v-if="deptBudgetList.deliverType != 2">

src/views/contractManagement/purchaseContractExamine.vue

@@ -135,9 +135,9 @@
         <ws-form-item label="签订日期" span="1" prop="signingDate">
           {{ deptBudgetList.signingDate }}
         </ws-form-item>
-        <ws-form-item label="最终实际交易量(吨)" span="1" prop="finalTradingVolume">
+        <!-- <ws-form-item label="最终实际交易量(吨)" span="1" prop="finalTradingVolume">
           {{ deptBudgetList.finalTradingVolume }}
-        </ws-form-item>
+        </ws-form-item> -->
         <ws-form-item label="临时仓库负责人" span="1" prop="personCharge" v-if="deptBudgetList.deliverType != 2">
           {{ deptBudgetList.personCharge }}
         </ws-form-item>

src/views/contractManagement/salesContractAdd.vue

@@ -283,10 +283,10 @@
           <el-radio v-model="deptBudgetList.settlementWeightMethod" label="1">按出库重量结算</el-radio>
           <el-radio v-model="deptBudgetList.settlementWeightMethod" label="2">按收货重量结算</el-radio>
         </ws-form-item>
-          <ws-form-item label="最终实际成交量（吨）" span="1" prop="finalTradingVolume">
+          <!-- <ws-form-item label="最终实际成交量（吨）" span="1" prop="finalTradingVolume">
             <ws-input v-model="deptBudgetList.finalTradingVolume" placeholder="请输入最终实际成交量" maxlength="100"
               size="small" />
-          </ws-form-item>
+          </ws-form-item> -->
           <ws-form-item label="收款截止日期" span="1" prop="collectionDeadline">
             <ws-date-picker v-model="deptBudgetList.collectionDeadline" type="date" placeholder="请选择收款截止日期"
               value-format="yyyy-MM-dd" />

src/views/contractManagement/salesContractAudit.vue

@@ -222,11 +222,11 @@
               {{ deptBudgetList.settlementWeightMethod==1?'按出库重量结算':'按收货重量结算' }}
             </div>
           </ws-form-item>
-          <ws-form-item label="最终实际交易量 (吨)" span="1" prop="finalTradingVolume">
+          <!-- <ws-form-item label="最终实际交易量 (吨)" span="1" prop="finalTradingVolume">
             <div class="unchanged">
               {{ deptBudgetList.finalTradingVolume }}
             </div>
-          </ws-form-item>
+          </ws-form-item> -->
            <ws-form-item label="结算单价（元/吨）" span="1" prop="settlementPrice" >
            <div class="unchanged">
               {{ deptBudgetList.settlementPrice?deptBudgetList.settlementPrice:'自动结算，不可编辑'}}

src/views/contractManagement/salesContractEdit.vue

@@ -250,10 +250,10 @@
             <span class="unchangeable">*</span>
           </ws-form-item>
           <!-- 最终实际交易量（吨） -->
-          <ws-form-item label="最终实际交易量（吨）" span="1" prop="finalTradingVolume">
+          <!-- <ws-form-item label="最终实际交易量（吨）" span="1" prop="finalTradingVolume">
             <ws-input v-model="deptBudgetList.finalTradingVolume" maxlength="100" placeholder="请输入最终实际交易量"
               size="small" />
-          </ws-form-item>
+          </ws-form-item> -->
           <ws-form-item label="收款截止日期" span="1" prop="collectionDeadline">
             <ws-date-picker v-model="deptBudgetList.collectionDeadline" type="date" placeholder="请选择收款截止日期"
               value-format="yyyy-MM-dd" />

src/views/contractManagement/salesContractExamine.vue

@@ -222,11 +222,11 @@
               {{ deptBudgetList.settlementWeightMethod==1?'按出库重量结算':'按收货重量结算' }}
             </div>
           </ws-form-item>
-          <ws-form-item label="最终实际交易量 (吨)" span="1" prop="finalTradingVolume">
+          <!-- <ws-form-item label="最终实际交易量 (吨)" span="1" prop="finalTradingVolume">
             <div class="unchanged">
               {{ deptBudgetList.finalTradingVolume }}
             </div>
-          </ws-form-item>
+          </ws-form-item> -->
            <ws-form-item label="结算单价（元/吨）" span="1" prop="settlementPrice" >
            <div class="unchanged">
               {{ deptBudgetList.settlementPrice?deptBudgetList.settlementPrice:'自动结算，不可编辑'}}

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -431,6 +431,11 @@
                   <ws-input :disabled='recheck' v-model="deptBudgetList.polluteNum" placeholder="请输入污染件数" maxlength="30"
                     size="small" />
                 </ws-form-item>
+                <ws-form-item label="污染件数" span="1" prop="titleNoOther"
+                  v-if="compName=='辽宁佳屹农商贸有限公司'">
+                  <ws-input :disabled='recheck' v-model="deptBudgetList.polluteNum" placeholder="请输入污染件数" maxlength="30"
+                    size="small" />
+                </ws-form-item>
                 <ws-form-item label="破损件数" span="1" prop="titleNoOther"
                   v-if="compName=='辽宁佳屹农商贸有限公司'">
                   <ws-input :disabled='recheck' v-model="deptBudgetList.wornNum" placeholder="请输入破损件数" maxlength="30"

src/views/warehousenew/warehouseManagementList.vue

@@ -266,7 +266,6 @@
                 <el-option v-for="item in goodnameList" :key="item.constKey" :label="item.constValue"
               :value="item.constValue" />
               </el-select>
-              
             </el-form-item>
             <!-- <el-form-item label="增量比例（%）" v-if="headerText == '打印记录'">
               <el-input placeholder="请输入增量比例" v-model="parameter.proportion" clearable class="proportion_css">