Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

public/static/warehousePrint.html

@@ -183,12 +183,12 @@
         <div class='title12'>
           <span>仓库名：</span>
           <span>{{warehouseName}}</span>
-          <span>质检员:</span>
-          <span>{{printData[0].qualityInspector}}</span>
-          <span>复检员：</span>
-          <span>{{printData[0].reInspector}}</span>
+          <span v-if='printData[0].qualityInspector'>质检员:</span>
+          <span v-if='printData[0].qualityInspector'>{{printData[0].qualityInspector}}</span>
+          <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>
             <span style="margin-left:100px">车数：{{printData.length}}辆</span>
           </p>

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/contractManagement/storageContract.vue

@@ -25,7 +25,7 @@
         <el-date-picker v-model="value2" type="daterange" align="right" unlink-panels range-separator="至"
           start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions">
         </el-date-picker>
-        <el-input v-model="searchKeyWord" placeholder="可按照合同编号、买方名称、卖方名称进行查找" clearable maxlength="500" type="input"
+        <el-input v-model="searchKeyWord" placeholder="可按照合同编号、库方名称、承租方名称进行查找" clearable maxlength="500" type="input"
           class="findValue" @keyup.enter.native="find()"></el-input>
         <ws-button class="find" type="primary" @click="find()"><img width="16" height="16" style="
               vertical-align: text-top;
@@ -48,8 +48,8 @@
       <el-table-column prop="creator" label="创建人" width="90">
       </el-table-column>
       <el-table-column prop="goodsName" label="货名"></el-table-column>
-      <el-table-column prop="buyer" label="买方"> </el-table-column>
-      <el-table-column prop="seller" label="卖方"> </el-table-column>
+      <el-table-column prop="buyer" label="库方"> </el-table-column>
+      <el-table-column prop="seller" label="承租方"> </el-table-column>
       <el-table-column prop="weight" label="重量（吨）"> </el-table-column>
       <el-table-column prop="completedQuantity" label="已完成（吨）">
     <!--    <template slot-scope="scope">

src/views/contractManagement/storageContractAdd.vue

@@ -42,9 +42,9 @@
           </ws-select>
           <!-- <ws-input v-model="deptBudgetList.shippingType" placeholder="请输入运输方式" maxlength="100" size="small" /> -->
         </ws-form-item>
-          <!--买方-->
-          <ws-form-item label="买方" span="1" prop="buyer" class="readonly">
-            <el-select v-model="deptBudgetList.buyer" placeholder="请选择买方名称" class="typeselect" filterable clearable
+          <!--库方-->
+          <ws-form-item label="库方" span="1" prop="buyer" class="readonly">
+            <el-select v-model="deptBudgetList.buyer" placeholder="请选择库方名称" class="typeselect" filterable clearable
               @change="buyerSelect">
               <el-option v-for="(item,index) in customerinfo" :key="index" :label="item.customerName"
                 :value="item.customerName" />
@@ -54,14 +54,14 @@
           <ws-form-item label="结算方式" span="1" prop="settlementMethod">
             <ws-input v-model="deptBudgetList.settlementMethod" placeholder="请输入结算方式" maxlength="120" size="small" />
           </ws-form-item>
-           <!--卖方-->
-          <ws-form-item label="卖方" span="1" prop="seller" class="readonly">
+           <!--承租方-->
+          <ws-form-item label="承租方" span="1" prop="seller" class="readonly">
             <el-autocomplete class="inline-input" v-model="deptBudgetList.seller" :fetch-suggestions="querySearch2"
-              placeholder="请输入卖方名称" @select="handleSelect"></el-autocomplete>
+              placeholder="请输入承租方名称" @select="handleSelect"></el-autocomplete>
           </ws-form-item>
-          <ws-form-item label="交货方式" span="1" prop="seller" class="readonly">
-          <el-radio v-model="deptBudgetList.deliverType" label="1">我方送货</el-radio>
-          <el-radio v-model="deptBudgetList.deliverType" label="2">对方自提</el-radio>
+          <ws-form-item label="交货方式" span="1" prop="seller" class="readonly">  
+          <el-radio v-model="deptBudgetList.deliverType" label="2">对方送货</el-radio>
+          <el-radio v-model="deptBudgetList.deliverType" label="1">我方自提</el-radio>
           <!-- <el-radio v-model="deptBudgetList.deliverType" v-if="deptBudgetList.priceType == '随行就市'" disabled label="1">
               我方自提</el-radio>
             <el-radio v-model="deptBudgetList.deliverType" v-else label="1">我方自提</el-radio>
@@ -69,10 +69,16 @@
               对方送货</el-radio>
             <el-radio v-model="deptBudgetList.deliverType" v-else label="2">对方送货</el-radio> -->
         </ws-form-item>
-        <!--买方电话-->
-          <ws-form-item label="买方电话" span="1" prop="contractNo">
+          <!-- 发货反馈负责人（多选） -->
+            <ws-form-item label="发货反馈负责人" span="1" prop="agent" v-if="deptBudgetList.deliverType == '2'">
+              <el-select  v-model="deptBudgetList.agent"  multiple filterable clearable allow-create default-first-option placeholder="请选择经办人"  @change="feedbackLeaderChange" >
+                <el-option v-for="(item,index1) in feedbackLeaders" :key="index1" :label="item.staffName" :value="item.staffName"></el-option>
+                </el-select>
+              </ws-form-item>
+        <!--库方电话-->
+          <ws-form-item label="库方电话" span="1" prop="contractNo">
             <el-autocomplete class="inline-input" v-model="deptBudgetList.buyerPhone" :fetch-suggestions="querySearch3"
-              placeholder="请输入买方电话" @select="handleSelect"></el-autocomplete>
+              placeholder="请输入库方电话" @select="handleSelect"></el-autocomplete>
           </ws-form-item>
            <!--包装方式-->
         <ws-form-item label="包装方式" span="1" prop="packingMethod">
@@ -82,11 +88,11 @@
               :value="item.constValue" />
           </ws-select>
         </ws-form-item>
-         <!--卖方电话-->
-          <ws-form-item label="卖方电话" span="1" prop="sellerPhone">
-            <!-- <ws-input v-model="deptBudgetList.sellerPhone" placeholder="请输入卖方电话" maxlength="100" size="small" /> -->
+         <!--承租方电话-->
+          <ws-form-item label="承租方电话" span="1" prop="sellerPhone">
+            <!-- <ws-input v-model="deptBudgetList.sellerPhone" placeholder="请输入承租方电话" maxlength="100" size="small" /> -->
             <el-autocomplete class="inline-input" v-model="deptBudgetList.sellerPhone" :fetch-suggestions="querySearch4"
-              placeholder="请输入卖方电话" @select="handleSelect"></el-autocomplete>
+              placeholder="请输入承租方电话" @select="handleSelect"></el-autocomplete>
           </ws-form-item>
            <!--验收方式-->
           <ws-form-item label="验收方式" span="1" prop="acceptanceMethod">
@@ -175,8 +181,8 @@
             <ws-input v-model="deptBudgetList.storageFee" placeholder="请输入仓储费" maxlength="20" size="small" />
           </ws-form-item>
           <!--合同单价（元/吨）-->
-        <ws-form-item class="readonly" label="合同单价（元/吨）" span="1" prop="unitContractPrice">
-          <ws-input @input="pricechange" v-model="deptBudgetList.unitContractPrice" placeholder="请输入合同单价"
+        <ws-form-item  label="合同单价（元/吨）" span="1" prop="unitContractPrice">
+          <ws-input @input="pricechange" v-model="deptBudgetList.unitContractPrice" placeholder="选填"
             maxlength="100" size="small" />
         </ws-form-item>
         <ws-form-item label="代储费起算重量" span="1" prop="storageFeeWeight">
@@ -199,10 +205,16 @@
             <ws-date-picker v-model="deptBudgetList.storageFeeEnddate" type="date" placeholder="请选择代储费预计终止日期"
               value-format="yyyy-MM-dd" />
           </ws-form-item>
-          <ws-form-item label="最终实际成交量（吨）" span="1" prop="finalTradingVolume">
+          <ws-form-item v-show="deptBudgetList.deliverType != 2" label="临时仓库负责人" span="1" prop="packingMethod">
+          <el-select v-model="deptBudgetList.personPhone" multiple placeholder="请选择临时仓库负责人" filterable clearable
+            @change="selectstaff">
+            <el-option v-for="item in options" :key="item.value" :label="item.staffName" :value="item.staffMobilePhone" />
+          </el-select>
+        </ws-form-item>
+          <!-- <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>
       </ws-form>
     </div>
@@ -424,7 +436,7 @@
         gradeList: [],
         ChapterTwoList: [],
         deptBudgetList: {
-          deliverType: '1',
+          deliverType: '2',
           agreementType: '代储合同',
           finalTradingVolume: 0,
           totalContractPrice: 0,
@@ -516,9 +528,23 @@
         }
         // console.log(this.deptBudgetList)
       },
-      feedbackLeaderChange(e) {
-        this.deptBudgetList.feedbackLeader = this.feedbackLeaders[e].staffName
-        this.deptBudgetList.feedbackLeaderPhone = this.feedbackLeaders[e].staffMobilePhone
+        feedbackLeaderChange(e){
+         this.deptBudgetList.feedbackLeaderPhone = ""
+        for(var num = 0 ; num < e.length ; num++){
+           for(var i = 0 ; i < this.feedbackLeaders.length ; i++){
+          if(e[num] == this.feedbackLeaders[i].staffName){
+            if(!this.deptBudgetList.feedbackLeaderPhone){
+              this.deptBudgetList.feedbackLeaderPhone = this.feedbackLeaders[i].staffMobilePhone
+              break
+            }else{
+              this.deptBudgetList.feedbackLeaderPhone += ","+this.feedbackLeaders[i].staffMobilePhone
+            }  
+          }
+        }
+        }
+        this.deptBudgetList.feedbackLeader = e.toString()
+        // this.deptBudgetList.feedbackLeader = this.feedbackLeaders[e].staffName
+        // this.deptBudgetList.feedbackLeaderPhone = this.feedbackLeaders[e].staffMobilePhone
       },
       buyerSelect(item) {
         // console.log(item)
@@ -605,7 +631,7 @@
       },
       returnsales() {
         this.deptBudgetList = {
-          deliverType: '1',
+          deliverType: '2',
           agreementType: '代储合同',
           finalTradingVolume: 0,
           totalContractPrice: 0,
@@ -656,6 +682,18 @@
           .then((response) => {
             this.ChapterTwoList = response
           })
+          // 发货反馈负责人
+           getstaff({
+            compId: localStorage.getItem('ws-pf_compId')
+          })
+          .toPromise()
+          .then((response) => {
+            this.feedbackLeaders = response
+            let _obj = []   //发货反馈负责人下拉列表第一个添加  "无需发货反馈（默认）"
+            _obj.staffName = "无需发货反馈"
+            _obj.staffMobilePhone = ""
+            this.feedbackLeaders.unshift(_obj)
+          })
         getcustomerinfo({
             compId: localStorage.getItem('ws-pf_compId'),
           }).toPromise()
@@ -777,14 +815,14 @@
         }
         if (!this.deptBudgetList.buyer) {
           this.$message({
-            message: '买方名称不能为空',
+            message: '库方名称不能为空',
             type: 'warning',
           })
           return
         }
         if (this.deptBudgetList.buyer.length > 30) {
           this.$message({
-            message: '买方名称长度不符合要求,请输入30个字符之内！',
+            message: '库方名称长度不符合要求,请输入30个字符之内！',
             type: 'warning',
           })
           return
@@ -808,42 +846,42 @@
         }
         if (!this.deptBudgetList.seller) {
           this.$message({
-            message: '请输入卖方名称！',
+            message: '请输入承租方名称！',
             type: 'warning',
           })
           return
         }
         if (this.deptBudgetList.seller.length > 30) {
           this.$message({
-            message: '卖方名称长度不符合要求,请输入30个字符之内！',
+            message: '承租方名称长度不符合要求,请输入30个字符之内！',
             type: 'warning',
           })
           return
         }
         if (!this.deptBudgetList.buyerPhone) {
           this.$message({
-            message: '请输入买方电话！',
+            message: '请输入库方电话！',
             type: 'warning',
           })
           return
         }
         // if (isNaN(this.deptBudgetList.buyerPhone)) {
         //   this.$message({
-        //     message: '输入买方电话有误!',
+        //     message: '输入库方电话有误!',
         //     type: 'warning',
         //   })
         //   return
         // }
         if (!this.deptBudgetList.sellerPhone) {
           this.$message({
-            message: '请输入卖方电话！',
+            message: '请输入承租方电话！',
             type: 'warning',
           })
           return
         }
         if (isNaN(this.deptBudgetList.sellerPhone)) {
           this.$message({
-            message: '输入卖方电话有误！',
+            message: '输入承租方电话有误！',
             type: 'warning',
           })
           return
@@ -967,51 +1005,51 @@
           })
           return
         }
-        if (!this.deptBudgetList.unitContractPrice) {
-            this.$message({
-              message: '请输入合同单价！',
-              type: 'warning',
-            })
-            return
-          }
-          if (
-            isNaN(this.deptBudgetList.unitContractPrice) ||
-            (String(this.deptBudgetList.unitContractPrice).indexOf('.') != -1 &&
-              String(this.deptBudgetList.unitContractPrice).length -
-              (String(this.deptBudgetList.unitContractPrice).indexOf('.') + 1) >
-              2) ||
-            this.deptBudgetList.unitContractPrice <= 0 ||
-            this.deptBudgetList.unitContractPrice > 10000
-          ) {
-            this.$message({
-              message: '合同单价输入有误！',
-              type: 'warning',
-            })
-            return
-          }
-          if (!this.deptBudgetList.totalContractPrice) {
-            this.$message({
-              message: '请输入合同总价！',
-              type: 'warning',
-            })
-            return
-          }
-          if (
-            isNaN(this.deptBudgetList.totalContractPrice) ||
-            (String(this.deptBudgetList.totalContractPrice).indexOf('.') != -1 &&
-              String(this.deptBudgetList.totalContractPrice).length -
-              (String(this.deptBudgetList.totalContractPrice).indexOf('.') +
-                1) >
-              2) ||
-            this.deptBudgetList.totalContractPrice <= 0 ||
-            this.deptBudgetList.totalContractPrice > 1000000000
-          ) {
-            this.$message({
-              message: '合同总价输入有误！',
-              type: 'warning',
-            })
-            return
-          }
+        // if (!this.deptBudgetList.unitContractPrice) {
+        //     this.$message({
+        //       message: '请输入合同单价！',
+        //       type: 'warning',
+        //     })
+        //     return
+        //   }
+        //   if (
+        //     isNaN(this.deptBudgetList.unitContractPrice) ||
+        //     (String(this.deptBudgetList.unitContractPrice).indexOf('.') != -1 &&
+        //       String(this.deptBudgetList.unitContractPrice).length -
+        //       (String(this.deptBudgetList.unitContractPrice).indexOf('.') + 1) >
+        //       2) ||
+        //     this.deptBudgetList.unitContractPrice <= 0 ||
+        //     this.deptBudgetList.unitContractPrice > 10000
+        //   ) {
+        //     this.$message({
+        //       message: '合同单价输入有误！',
+        //       type: 'warning',
+        //     })
+        //     return
+        //   }
+        //   if (!this.deptBudgetList.totalContractPrice) {
+        //     this.$message({
+        //       message: '请输入合同总价！',
+        //       type: 'warning',
+        //     })
+        //     return
+        //   }
+        //   if (
+        //     isNaN(this.deptBudgetList.totalContractPrice) ||
+        //     (String(this.deptBudgetList.totalContractPrice).indexOf('.') != -1 &&
+        //       String(this.deptBudgetList.totalContractPrice).length -
+        //       (String(this.deptBudgetList.totalContractPrice).indexOf('.') +
+        //         1) >
+        //       2) ||
+        //     this.deptBudgetList.totalContractPrice <= 0 ||
+        //     this.deptBudgetList.totalContractPrice > 1000000000
+        //   ) {
+        //     this.$message({
+        //       message: '合同总价输入有误！',
+        //       type: 'warning',
+        //     })
+        //     return
+        //   }
         //时间
         if (
           new Date(this.deptBudgetList.deliveryDateStart).getTime() >
@@ -1357,7 +1395,7 @@
             addList(this.deptBudgetList)
               .toPromise()
               .then((response) => {
-                // 存储买方、卖方、买方电话、卖方电话
+                // 存储库方、承租方、库方电话、承租方电话
                 let _data = {
                   byer: this.deptBudgetList.buyer,
                   seller: this.deptBudgetList.seller,
@@ -1434,7 +1472,7 @@
                 localStorage.setItem('deptBudgetList_data4', JSON.stringify(this.restaurants4));
                 this.$message.success('添加成功')
                 this.deptBudgetList = {
-                  deliverType: '1',
+                  deliverType: '2',
                   agreementType: '代储合同',
                   finalTradingVolume: 0,
                   totalContractPrice: 0,
@@ -1564,7 +1602,7 @@
       },
       selectpriceType(e) {
         if (e == '随行就市') {
-          this.deptBudgetList.deliverType = '1'
+          this.deptBudgetList.deliverType = '2'
         }
       },
       weightchange(e) {

src/views/contractManagement/storageContractAudit.vue

@@ -50,6 +50,9 @@
         <ws-form-item label="合同编号" span="1" prop="contractNo">
           {{ deptBudgetList.contractNo }}
         </ws-form-item>
+         <ws-form-item  label="合同提示" span="1" prop="pointOut" >
+          {{ deptBudgetList.pointOut }}
+          </ws-form-item>
         <ws-form-item label="运输方式" span="1" prop="shippingType">
           {{ deptBudgetList.shippingType }}
         </ws-form-item>
@@ -122,8 +125,11 @@
         <ws-form-item label="代储费预计终止日期" span="1" prop="storageFeeEnddate">
           {{deptBudgetList.storageFeeEnddate}}
         </ws-form-item>
-        <ws-form-item label="最终实际交易量(吨)" span="1" prop="finalTradingVolume">
-          {{ deptBudgetList.finalTradingVolume }}
+         <ws-form-item label="临时仓库负责人" span="1" prop="personCharge" v-if="deptBudgetList.deliverType == '1'">
+          {{ deptBudgetList.personCharge }}
+        </ws-form-item>
+        <ws-form-item label="发货反馈负责人" span="1" prop="finalTradingVolume" v-else>
+          {{ deptBudgetList.feedbackLeader }}
         </ws-form-item>
         
       </ws-info-table>

src/views/contractManagement/storageContractEdit.vue

@@ -26,14 +26,17 @@
             <ws-input v-model="deptBudgetList.contractNo" placeholder="请输入合同编号" maxlength="50" size="small"
               :rules="ruleDeptBudget" />
           </ws-form-item>
+          <ws-form-item  label="合同提示" span="1" prop="contractNo" >
+            <ws-input v-model="deptBudgetList.pointOut" placeholder="请输入合同提示" maxlength="10" size="small" />
+          </ws-form-item>
           <!--运输方式-->
         <ws-form-item label="运输方式" span="1" prop="shippingType">
           <ws-input v-model="deptBudgetList.shippingType" placeholder="请输入运输方式" maxlength="100" size="small" />
         </ws-form-item>
          
-          <!--买方-->
-          <ws-form-item label="买方" span="1" prop="buyer" class="readonly">
-            <el-select v-model="deptBudgetList.buyer" placeholder="请选择买方名称" class="typeselect" filterable clearable
+          <!--库方-->
+          <ws-form-item label="库方" span="1" prop="buyer" class="readonly">
+            <el-select v-model="deptBudgetList.buyer" placeholder="请选择库方名称" class="typeselect" filterable clearable
               @change="buyerSelect">
               <el-option v-for="(item,index) in customerinfo" :key="index" :label="item.customerName"
                 :value="item.customerName" />
@@ -43,14 +46,14 @@
           <ws-form-item label="结算方式" span="1" prop="settlementMethod">
             <ws-input v-model="deptBudgetList.settlementMethod" placeholder="请输入结算方式" maxlength="120" size="small" />
           </ws-form-item>
-           <!--卖方-->
-          <ws-form-item label="卖方" span="1" prop="seller" class="readonly">
+           <!--承租方-->
+          <ws-form-item label="承租方" span="1" prop="seller" class="readonly">
             <el-autocomplete class="inline-input" v-model="deptBudgetList.seller" :fetch-suggestions="querySearch2"
-              placeholder="请输入卖方名称" @select="handleSelect"></el-autocomplete>
+              placeholder="请输入承租方名称" @select="handleSelect"></el-autocomplete>
           </ws-form-item>
           <ws-form-item label="交货方式" span="1" prop="seller" class="readonly">
-          <el-radio v-model="deptBudgetList.deliverType" label="1">我方送货</el-radio>
-          <el-radio v-model="deptBudgetList.deliverType" label="2">对方自提</el-radio>
+          <el-radio v-model="deptBudgetList.deliverType" label="2">对方送货</el-radio>
+          <el-radio v-model="deptBudgetList.deliverType" label="1">我方自提</el-radio>
           <!-- <el-radio v-model="deptBudgetList.deliverType" v-if="deptBudgetList.priceType == '随行就市'" disabled label="1">
               我方自提</el-radio>
             <el-radio v-model="deptBudgetList.deliverType" v-else label="1">我方自提</el-radio>
@@ -58,10 +61,16 @@
               对方送货</el-radio>
             <el-radio v-model="deptBudgetList.deliverType" v-else label="2">对方送货</el-radio> -->
         </ws-form-item>
-        <!--买方电话-->
-          <ws-form-item label="买方电话" span="1" prop="contractNo">
+                  <!-- 发货反馈负责人（多选） -->
+            <ws-form-item label="发货反馈负责人" span="1" prop="agent" v-if="deptBudgetList.deliverType == '2'">
+              <el-select  v-model="deptBudgetList.agent"  multiple filterable clearable allow-create default-first-option placeholder="请选择经办人"  @change="feedbackLeaderChange" >
+                <el-option v-for="(item,index1) in feedbackLeaders" :key="index1" :label="item.staffName" :value="item.staffName"></el-option>
+                </el-select>
+              </ws-form-item>
+        <!--库方电话-->
+          <ws-form-item label="库方电话" span="1" prop="contractNo">
             <el-autocomplete class="inline-input" v-model="deptBudgetList.buyerPhone" :fetch-suggestions="querySearch3"
-              placeholder="请输入买方电话" @select="handleSelect"></el-autocomplete>
+              placeholder="请输入库方电话" @select="handleSelect"></el-autocomplete>
           </ws-form-item>
            <!--包装方式-->
         <ws-form-item label="包装方式" span="1" prop="packingMethod">
@@ -71,11 +80,11 @@
               :value="item.constValue" />
           </ws-select>
         </ws-form-item>
-         <!--卖方电话-->
-          <ws-form-item label="卖方电话" span="1" prop="sellerPhone">
-            <!-- <ws-input v-model="deptBudgetList.sellerPhone" placeholder="请输入卖方电话" maxlength="100" size="small" /> -->
+         <!--承租方电话-->
+          <ws-form-item label="承租方电话" span="1" prop="sellerPhone">
+            <!-- <ws-input v-model="deptBudgetList.sellerPhone" placeholder="请输入承租方电话" maxlength="100" size="small" /> -->
             <el-autocomplete class="inline-input" v-model="deptBudgetList.sellerPhone" :fetch-suggestions="querySearch4"
-              placeholder="请输入卖方电话" @select="handleSelect"></el-autocomplete>
+              placeholder="请输入承租方电话" @select="handleSelect"></el-autocomplete>
           </ws-form-item>
            <!--验收方式-->
           <ws-form-item label="验收方式" span="1" prop="acceptanceMethod">
@@ -164,8 +173,8 @@
             <ws-input v-model="deptBudgetList.storageFee" placeholder="请输入仓储费" maxlength="20" size="small" />
           </ws-form-item>
           <!--合同单价（元/吨）-->
-        <ws-form-item class="readonly" label="合同单价（元/吨）" span="1" prop="unitContractPrice">
-          <ws-input @input="pricechange" v-model="deptBudgetList.unitContractPrice" placeholder="请输入合同单价"
+        <ws-form-item  label="合同单价（元/吨）" span="1" prop="unitContractPrice">
+          <ws-input @input="pricechange" v-model="deptBudgetList.unitContractPrice" placeholder="选填"
             maxlength="100" size="small" />
         </ws-form-item>
         <ws-form-item label="代储费起算重量" span="1" prop="storageFeeWeight">
@@ -188,10 +197,16 @@
             <ws-date-picker v-model="deptBudgetList.storageFeeEnddate" type="date" placeholder="请选择代储费预计终止日期"
               value-format="yyyy-MM-dd" />
           </ws-form-item>
-          <ws-form-item label="最终实际成交量（吨）" span="1" prop="finalTradingVolume">
+          <ws-form-item v-show="deptBudgetList.deliverType != 2" label="临时仓库负责人" span="1" prop="packingMethod">
+          <el-select v-model="deptBudgetList.personPhone" multiple placeholder="请选择临时仓库负责人" filterable clearable
+            @change="selectstaff">
+            <el-option v-for="item in options" :key="item.value" :label="item.staffName" :value="item.staffMobilePhone" />
+          </el-select>
+        </ws-form-item>
+          <!-- <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>
       </ws-form>
     </div>
@@ -508,9 +523,22 @@
         console.log(item);
       },
        feedbackLeaderChange(e){
-        this.deptBudgetList.feedbackLeader = this.feedbackLeaders[e].staffName
-        this.deptBudgetList.feedbackLeaderPhone = this.feedbackLeaders[e].staffMobilePhone
-        console.log(  this.deptBudgetList.feedbackLeader,this.deptBudgetList.feedbackLeaderPhone)
+         this.deptBudgetList.feedbackLeaderPhone = ""
+        for(var num = 0 ; num < e.length ; num++){
+           for(var i = 0 ; i < this.feedbackLeaders.length ; i++){
+          if(e[num] == this.feedbackLeaders[i].staffName){
+            if(!this.deptBudgetList.feedbackLeaderPhone){
+              this.deptBudgetList.feedbackLeaderPhone = this.feedbackLeaders[i].staffMobilePhone
+              break
+            }else{
+              this.deptBudgetList.feedbackLeaderPhone += ","+this.feedbackLeaders[i].staffMobilePhone
+            }  
+          }
+        }
+        }
+        this.deptBudgetList.feedbackLeader = e.toString()
+        // this.deptBudgetList.feedbackLeader = this.feedbackLeaders[e].staffName
+        // this.deptBudgetList.feedbackLeaderPhone = this.feedbackLeaders[e].staffMobilePhone
       },
       marker(item) {
         this.deptBudgetList.warehousePositioning =
@@ -600,9 +628,9 @@
             // this.
             // console.log(name)
             if (this.deptBudgetList.deliverType == 1) {
-              this.deptBudgetList.deliverType1 = '我方送货'
+              this.deptBudgetList.deliverType1 = '我方自提'
             } else if (this.deptBudgetList.deliverType == 2) {
-              this.deptBudgetList.deliverType1 = '对方自提'
+              this.deptBudgetList.deliverType1 = '对方送货'
             }
             if (this.deptBudgetList.agreementType == 1) {
               this.deptBudgetList.agreementType1 = '销售合同'
@@ -838,14 +866,14 @@
         }
         if (!this.deptBudgetList.buyer) {
           this.$message({
-            message: '买方名称不能为空',
+            message: '库方名称不能为空',
             type: 'warning',
           })
           return
         }
         if (this.deptBudgetList.buyer.length > 30) {
           this.$message({
-            message: '买方名称长度不符合要求,请输入30个字符之内！',
+            message: '库方名称长度不符合要求,请输入30个字符之内！',
             type: 'warning',
           })
           return
@@ -869,42 +897,42 @@
         }
         if (!this.deptBudgetList.seller) {
           this.$message({
-            message: '请输入卖方名称！',
+            message: '请输入承租方名称！',
             type: 'warning',
           })
           return
         }
         if (this.deptBudgetList.seller.length > 30) {
           this.$message({
-            message: '卖方名称长度不符合要求,请输入30个字符之内！',
+            message: '承租方名称长度不符合要求,请输入30个字符之内！',
             type: 'warning',
           })
           return
         }
         if (!this.deptBudgetList.buyerPhone) {
           this.$message({
-            message: '请输入买方电话！',
+            message: '请输入库方电话！',
             type: 'warning',
           })
           return
         }
         // if (isNaN(this.deptBudgetList.buyerPhone)) {
         //   this.$message({
-        //     message: '输入买方电话有误!',
+        //     message: '输入库方电话有误!',
         //     type: 'warning',
         //   })
         //   return
         // }
         if (!this.deptBudgetList.sellerPhone) {
           this.$message({
-            message: '请输入卖方电话！',
+            message: '请输入承租方电话！',
             type: 'warning',
           })
           return
         }
         if (isNaN(this.deptBudgetList.sellerPhone)) {
           this.$message({
-            message: '输入卖方电话有误！',
+            message: '输入承租方电话有误！',
             type: 'warning',
           })
           return
@@ -1028,51 +1056,51 @@
           })
           return
         }
-        if (!this.deptBudgetList.unitContractPrice) {
-            this.$message({
-              message: '请输入合同单价！',
-              type: 'warning',
-            })
-            return
-          }
-          if (
-            isNaN(this.deptBudgetList.unitContractPrice) ||
-            (String(this.deptBudgetList.unitContractPrice).indexOf('.') != -1 &&
-              String(this.deptBudgetList.unitContractPrice).length -
-              (String(this.deptBudgetList.unitContractPrice).indexOf('.') + 1) >
-              2) ||
-            this.deptBudgetList.unitContractPrice <= 0 ||
-            this.deptBudgetList.unitContractPrice > 10000
-          ) {
-            this.$message({
-              message: '合同单价输入有误！',
-              type: 'warning',
-            })
-            return
-          }
-          if (!this.deptBudgetList.totalContractPrice) {
-            this.$message({
-              message: '请输入合同总价！',
-              type: 'warning',
-            })
-            return
-          }
-          if (
-            isNaN(this.deptBudgetList.totalContractPrice) ||
-            (String(this.deptBudgetList.totalContractPrice).indexOf('.') != -1 &&
-              String(this.deptBudgetList.totalContractPrice).length -
-              (String(this.deptBudgetList.totalContractPrice).indexOf('.') +
-                1) >
-              2) ||
-            this.deptBudgetList.totalContractPrice <= 0 ||
-            this.deptBudgetList.totalContractPrice > 1000000000
-          ) {
-            this.$message({
-              message: '合同总价输入有误！',
-              type: 'warning',
-            })
-            return
-          }
+        // if (!this.deptBudgetList.unitContractPrice) {
+        //     this.$message({
+        //       message: '请输入合同单价！',
+        //       type: 'warning',
+        //     })
+        //     return
+        //   }
+        //   if (
+        //     isNaN(this.deptBudgetList.unitContractPrice) ||
+        //     (String(this.deptBudgetList.unitContractPrice).indexOf('.') != -1 &&
+        //       String(this.deptBudgetList.unitContractPrice).length -
+        //       (String(this.deptBudgetList.unitContractPrice).indexOf('.') + 1) >
+        //       2) ||
+        //     this.deptBudgetList.unitContractPrice <= 0 ||
+        //     this.deptBudgetList.unitContractPrice > 10000
+        //   ) {
+        //     this.$message({
+        //       message: '合同单价输入有误！',
+        //       type: 'warning',
+        //     })
+        //     return
+        //   }
+        //   if (!this.deptBudgetList.totalContractPrice) {
+        //     this.$message({
+        //       message: '请输入合同总价！',
+        //       type: 'warning',
+        //     })
+        //     return
+        //   }
+        //   if (
+        //     isNaN(this.deptBudgetList.totalContractPrice) ||
+        //     (String(this.deptBudgetList.totalContractPrice).indexOf('.') != -1 &&
+        //       String(this.deptBudgetList.totalContractPrice).length -
+        //       (String(this.deptBudgetList.totalContractPrice).indexOf('.') +
+        //         1) >
+        //       2) ||
+        //     this.deptBudgetList.totalContractPrice <= 0 ||
+        //     this.deptBudgetList.totalContractPrice > 1000000000
+        //   ) {
+        //     this.$message({
+        //       message: '合同总价输入有误！',
+        //       type: 'warning',
+        //     })
+        //     return
+        //   }
         //时间
         if (
           new Date(this.deptBudgetList.deliveryDateStart).getTime() >

src/views/contractManagement/storageContractExamine.vue

@@ -50,24 +50,27 @@
         <ws-form-item label="合同编号" span="1" prop="contractNo">
           {{ deptBudgetList.contractNo }}
         </ws-form-item>
+        <ws-form-item  label="合同提示" span="1" prop="pointOut" >
+          {{ deptBudgetList.pointOut }}
+          </ws-form-item>
         <ws-form-item label="运输方式" span="1" prop="shippingType">
           {{ deptBudgetList.shippingType }}
         </ws-form-item>
-        <ws-form-item label="买方" span="1" prop="buyer">
+        <ws-form-item label="库方" span="1" prop="buyer">
           {{ deptBudgetList.buyer }}
         </ws-form-item>
         <ws-form-item label="结算方式" span="1" prop="settlementMethod">{{ deptBudgetList.settlementMethod }}
         </ws-form-item>
-         <ws-form-item label="卖方" span="1" prop="seller">{{ deptBudgetList.seller }}
+         <ws-form-item label="承租方" span="1" prop="seller">{{ deptBudgetList.seller }}
         </ws-form-item>
         <ws-form-item label="交货方式" span="1" prop="deliverType1">{{ deptBudgetList.deliverType1 }}
         </ws-form-item>
-        <ws-form-item label="买方电话" span="1" prop="buyerPhone">{{ deptBudgetList.buyerPhone }}
+        <ws-form-item label="库方电话" span="1" prop="buyerPhone">{{ deptBudgetList.buyerPhone }}
         </ws-form-item>
         <ws-form-item label="包装方式" span="1" prop="packingMethod">
           {{ deptBudgetList.packingMethod }}
         </ws-form-item>
-        <ws-form-item label="卖方电话" span="1" prop="sellerPhone">
+        <ws-form-item label="承租方电话" span="1" prop="sellerPhone">
           {{ deptBudgetList.sellerPhone }}
         </ws-form-item>
         <ws-form-item label="验收方式" span="1" prop="acceptanceMethod">
@@ -122,10 +125,12 @@
         <ws-form-item label="代储费预计终止日期" span="1" prop="storageFeeEnddate">
           {{deptBudgetList.storageFeeEnddate}}
         </ws-form-item>
-        <ws-form-item label="最终实际交易量(吨)" span="1" prop="finalTradingVolume">
-          {{ deptBudgetList.finalTradingVolume }}
+        <ws-form-item label="临时仓库负责人" span="1" prop="personCharge" v-if="deptBudgetList.deliverType == '1'">
+          {{ deptBudgetList.personCharge }}
+        </ws-form-item>
+        <ws-form-item label="发货反馈负责人" span="1" prop="finalTradingVolume" v-else>
+          {{ deptBudgetList.feedbackLeader }}
         </ws-form-item>
-        
       </ws-info-table>
       <div class="remark">
         <h3>货物信息</h3>

src/views/contractManagement/storageContractRecord.vue

@@ -20,7 +20,7 @@
     </div>
     <div class="content-top">
       <div class="content-top-item">合同编号：{{routeData.contractNo}}</div>
-      <div class="content-top-item">买方：{{routeData.buyer}}</div>
+      <div class="content-top-item">库方：{{routeData.buyer}}</div>
       <div class="content-top-item">合同量：{{routeData.weight}}</div>
       <div class="content-top-item">已完成量：{{routeData.completedQuantity}}</div>
       <div class="content-top-item">应收代储费：{{routeData.total}}</div>

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -309,6 +309,22 @@
                 </ws-form-item>
                 <ws-form-item v-if="serviceManagementType == 1 && deptBudgetList.outType == '汽运'" label="车牌号" span="1"
                   prop="carNo">
+                  <!-- <ws-input :disabled="disabled2"
+                    v-if="carInputStatus"
+                    v-model="deptBudgetList.carNo" placeholder="请输入车牌号" maxlength="7" size="small" />
+                  <el-select :disabled="disabled2"
+                    v-if="!carInputStatus&&compName!='辽宁佳屹农商贸有限公司'"
+                    filterable clearable v-model="deptBudgetList.carNo1" placeholder="请选择车牌号" class="typeselect"
+                    @change="carChange($event, 0)">
+                    <el-option v-for="(item, index) in options2" :key="index"
+                      :label="item.carNo + '(' + item.tranCarNo + ')'" :value="index" />
+                  </el-select>
+                  <el-select :disabled="disabled2" v-if="!carInputStatus&&compName=='辽宁佳屹农商贸有限公司'"
+                    filterable clearable :allow-create="true" v-model="deptBudgetList.carNo" placeholder="请选择车牌号"
+                    class="typeselect" @change="carChange($event, 1)">
+                    <el-option v-for="item in carNumberList" :key="item.id" :label="item.carNo" :value="item.carNo" />
+                  </el-select>
+                  <el-button @click="editcarStatus" type="text">{{ cartext }}</el-button> -->
                   <ws-input :disabled="disabled2"
                     v-if="options2.length == 0 && serviceManagementType == 1 && deptBudgetList.inOutType != '移库入库'&&deptBudgetList.inOutType != '退库' || statusTypetext != '初检'||deptBudgetList.inOutType == '退库'&&tranTaskFlag!=1"
                     v-model="deptBudgetList.carNo" placeholder="请输入车牌号" maxlength="7" size="small" />
@@ -397,7 +413,34 @@
                   <ws-input :disabled='recheck' v-model="deptBudgetList.titleNoOther" placeholder="请输入封号" maxlength="20"
                     size="small" />
                 </ws-form-item>
-
+                <!-- <ws-form-item label="规格（公斤）" span="1" prop="boxNoOther"
+                  v-if="compName=='辽宁佳屹农商贸有限公司'">
+                  <el-select :disabled='recheck' filterable clearable v-model="deptBudgetList.specifications" placeholder="请选择规格"
+                    class="typeselect" >
+                    <el-option label="830" value="830" />
+                    <el-option label="850" value="850" />
+                  </el-select>
+                </ws-form-item>
+                <ws-form-item label="工厂" span="1" prop="titleNoOther"
+                  v-if="compName=='辽宁佳屹农商贸有限公司'">
+                  <ws-input :disabled='recheck' v-model="deptBudgetList.factory" 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.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"
+                    size="small" />
+                </ws-form-item> -->
               </ws-info-table>
 
               <div class="title"
@@ -697,6 +740,8 @@ export default {
       shipInfoList: [],
       cost: '',
       pageSize: 10,
+      cartext:'选择',
+      carInputStatus:true,
       isShowPrint: false,
       typeList: ['干粮', '潮粮'],
       fireDirectionList: [],
@@ -804,6 +849,7 @@ export default {
       isGetCost: '',
       carstatus: false,
       options2: [],
+      compName:localStorage.getItem('ws-pf_compName'),
       tranCarInfoList: [],
       gradeList: [],
       deptBudgetTotal: 0,
@@ -891,6 +937,17 @@ export default {
     }
   },
   methods: {
+    editcarStatus(){
+      if(this.deptBudgetList.inOutType!='移库入库'&&this.deptBudgetList.inOutType!='退库'){
+        if(this.cartext=='选择'){
+          this.cartext='手输'
+          this.carInputStatus=false
+        }else{
+          this.cartext='选择'
+          this.carInputStatus=true
+        }
+      }
+    },
     priceblur(e, status) {
       if (status == 1) {
         if (this.deptBudgetList.waterPriceIncrease === '') {
@@ -3920,6 +3977,9 @@ export default {
         this.deptBudgetList.goodsNameKey = this.outContractNo.goodsNameKey
       }
       this.goodsNameChange(this.deptBudgetList.goodsName)
+      // 初始化
+      this.cartext='选择'
+      this.carInputStatus=true
       // this.deptBudgetList.grade = this.outContractNo.grade
       if (this.outContractNo.inOutType == '采购入库') {
         if (this.outContractNo.deliverType == 1) {
@@ -3947,7 +4007,10 @@ export default {
             .unitContractPrice + '元/吨）'
         }
         this.deptBudgetList.inOutTypeKey = 1
+        
       } else if (this.outContractNo.inOutType == '移库入库') {
+        this.cartext='手输'
+        this.carInputStatus=false
         this.customerName = localStorage.getItem('ws-pf_compName')
         this.warehouseTradeCount = '000' + (Number(this.warehouseTradeCount) + 1)
         // this.deptBudgetList.qualityNo = 'YKRK' + this.getTime() + this.warehouseNo + this.warehouseTradeCount
@@ -3971,6 +4034,7 @@ export default {
         this.deptBudgetList.inOutTypeKey = 5
       }
       else if (this.outContractNo.inOutType == '退库') {
+
         if (this.outContractNo.contractNo) {
           this.deptBudgetList.tips = '买方' + this.outContractNo.buyer
         } else {
@@ -3979,6 +4043,13 @@ export default {
         this.deptBudgetList.inOutTypeKey = 6
         //退库有无运输任务标识
 				this.tranTaskFlag=this.outContractNo.tranTaskFlag
+        if(this.tranTaskFlag!=1){
+          this.cartext='选择'
+          this.carInputStatus=true
+        }else{
+          this.cartext='手输'
+          this.carInputStatus=false
+        }
       }
       if(this.outContractNo.contractPrice){
           this.cost = this.outContractNo.contractPrice

src/views/warehousenew/warehouseManagementList.vue

@@ -261,6 +261,12 @@
                 <el-option v-for="item in typeList" :key="item.id" :label="item.binNumber" :value="item.binNumber" />
               </el-select>
             </el-form-item>
+            <el-form-item v-if='compName=="辽宁佳屹农商贸有限公司"' label="货名" span="1" prop="warehouseName">
+              <el-select v-model="parameter.goodsName" placeholder="请选择货名" filterable clearable >
+                <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">
               </el-input>
@@ -305,6 +311,9 @@
   </div>
 </template>
 <script>
+ import {
+    packList,
+  } from '@/model/contarct/index'
   import {
     getList,
     getsponsible,
@@ -355,6 +364,7 @@
     data() {
       return {
         value: '0',
+        compName:localStorage.getItem('ws-pf_compName'),
         rules:{},
         options:[],
         StartDate:'',
@@ -399,7 +409,8 @@
         },
         warehousePositioning:{},
         monitorUrl1:'',
-        monitorUrl2:''
+        monitorUrl2:'',
+        goodnameList:[]
       }
     },
     activated() {
@@ -548,6 +559,7 @@
               printEndDate: this.parameter.printEndDate,
               warehouseName: this.parameter.warehouseName,
               binNumber:this.parameter.binNumber,
+              goodsName:this.parameter.goodsName,
               searchType: this.parameter.radio,
               currentPage: 1,
               pageSize: 999,
@@ -1191,6 +1203,13 @@
 
             this.list = response
           })
+          packList({
+            constId: 'CON2'
+          })
+          .toPromise()
+          .then((response) => {
+            this.goodnameList = response
+          })
       },
       changeWeight(e) {
       //实际重量
@@ -1546,7 +1565,7 @@
     right: 0;
     margin: auto;
     width: 340px;
-    height: 400px;
+    height: 456px;
     background: white;
     border-radius: 10px;
     z-index: 999;

src/views/warehousenew/warehousingOrder.vue

@@ -831,7 +831,9 @@ export default {
       // warehouseList: [],
       currectfocusdata: {},
       customershow: false,
-      interestratevalue: {},
+      interestratevalue: {
+        value:''
+      },
       accessoryTFs: false,
       remarkList: false,
       dialogTitle: '',
@@ -2458,10 +2460,7 @@ export default {
     getList() {
       this.startDate = this.value2[0]
       this.endDate = this.value2[1]
-      getenabledinfo({ functionType: 2 }).toPromise()
-        .then((response) => {
-          this.interestratevalue = response
-        })
+      
       getwarehousingorder({
         compId: localStorage.getItem('ws-pf_compId'),
         startDate: this.startDate,
@@ -2505,6 +2504,12 @@ export default {
           this.deptBudgetTotal = response.total
           this.clearchecked()
         })
+        // getenabledinfo({ functionType: 2 }).toPromise()
+        // .then((response) => {
+        //   if(response){
+        //     this.interestratevalue = response
+        //   }
+        // })
     },
 
     multiFilter(array, filters) {