前端

public/static/warehousePrint.html

@@ -183,10 +183,10 @@
         <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>
           <p>

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,29 @@
                   <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.wornNum" placeholder="请输入破损件数" maxlength="30"
+                    size="small" />
+                </ws-form-item> -->
               </ws-info-table>
 
               <div class="title"
@@ -697,6 +735,8 @@ export default {
       shipInfoList: [],
       cost: '',
       pageSize: 10,
+      cartext:'选择',
+      carInputStatus:true,
       isShowPrint: false,
       typeList: ['干粮', '潮粮'],
       fireDirectionList: [],
@@ -804,6 +844,7 @@ export default {
       isGetCost: '',
       carstatus: false,
       options2: [],
+      compName:localStorage.getItem('ws-pf_compName'),
       tranCarInfoList: [],
       gradeList: [],
       deptBudgetTotal: 0,
@@ -891,6 +932,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 +3972,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 +4002,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 +4029,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 +4038,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,13 @@
                 <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 +312,9 @@
   </div>
 </template>
 <script>
+ import {
+    packList,
+  } from '@/model/contarct/index'
   import {
     getList,
     getsponsible,
@@ -355,6 +365,7 @@
     data() {
       return {
         value: '0',
+        compName:localStorage.getItem('ws-pf_compName'),
         rules:{},
         options:[],
         StartDate:'',
@@ -399,7 +410,8 @@
         },
         warehousePositioning:{},
         monitorUrl1:'',
-        monitorUrl2:''
+        monitorUrl2:'',
+        goodnameList:[]
       }
     },
     activated() {
@@ -548,6 +560,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 +1204,13 @@
 
             this.list = response
           })
+          packList({
+            constId: 'CON2'
+          })
+          .toPromise()
+          .then((response) => {
+            this.goodnameList = response
+          })
       },
       changeWeight(e) {
       //实际重量
@@ -1546,7 +1566,7 @@
     right: 0;
     margin: auto;
     width: 340px;
-    height: 400px;
+    height: 456px;
     background: white;
     border-radius: 10px;
     z-index: 999;

src/views/warehousenew/warehousingOrder.vue

@@ -2504,12 +2504,12 @@ export default {
           this.deptBudgetTotal = response.total
           this.clearchecked()
         })
-        getenabledinfo({ functionType: 2 }).toPromise()
-        .then((response) => {
-          if(response){
-            this.interestratevalue = response
-          }
-        })
+        // getenabledinfo({ functionType: 2 }).toPromise()
+        // .then((response) => {
+        //   if(response){
+        //     this.interestratevalue = response
+        //   }
+        // })
     },
 
     multiFilter(array, filters) {