前端散船修改

src/views/warehouse/warehouseManagementDelivery.vue

@@ -344,11 +344,15 @@
                 prop="carNo"
                 v-if="deptBudgetList.outType == '散船'"
               >
-                <ws-input
+                <!-- <ws-input
                   v-model="deptBudgetList.carNo"
                   placeholder="请输入船名"
                   size="small"
-                />
+                /> -->
+                <ws-input v-if='shipInfoList.length<2' v-model="deptBudgetList.shipName" placeholder="请输入船名" maxlength="20" size="small" />
+                <el-select v-else v-model="deptBudgetList.shipName" placeholder="请选择船名" @change='shipNamechange'>
+                  <el-option v-for="item in shipInfoList" :key="item.value" :label="item.shipName" :value="item.shipName" />
+                </el-select>
               </ws-form-item>
               <ws-form-item
                 label="航次"
@@ -356,12 +360,10 @@
                 prop="shipNumber"
                 v-if="deptBudgetList.outType == '散船'"
               >
-                <ws-input
-                  v-model="deptBudgetList.shipNumber"
-                  placeholder="请输入航次"
-                  maxlength="20"
-                  size="small"
-                />
+                <ws-input v-if='shipInfoList.length<2' v-model="deptBudgetList.shipNumber" placeholder="请输入航次" maxlength="20" size="small" />
+                <el-select v-else disabled v-model="deptBudgetList.shipNumber" placeholder="请选择航次">
+                  <el-option v-for="item in shipInfoList" :key="item.value" :label="item.shipNo" :value="item.shipNo" />
+                </el-select>
               </ws-form-item>
               <!--车号  -->
               <ws-form-item
@@ -635,6 +637,7 @@ export default {
       tableDate: [],
       // 是否显示
       showType: true,
+      shipInfoList:[],
       readonly: true,
       // 年
       year: '',
@@ -739,6 +742,13 @@ export default {
             this.carChange1='识别下拉'
         }
       },
+      shipNamechange(e){
+        for (let i = 0; i < this.shipInfoList.length; i++) {
+          if(this.shipInfoList[i].shipName==e){
+            this.deptBudgetList.shipNumber=this.shipInfoList[i].shipNo
+          }
+        }
+      },
     imgBig(item){
       console.log(item)
       this.img=item
@@ -816,6 +826,9 @@ export default {
             this.tranCarInfoList=this.outContractNo[i].tranCarInfoList
             this.carstatus=true
           }
+          if(this.outContractNo[i].shipInfoList){
+               this.shipInfoList = this.outContractNo[i].shipInfoList
+            }
         }
       }
     },

src/views/warehouse/warehouseManagementGross.vue

@@ -269,10 +269,17 @@
               </ws-form-item>
               <!--船名  -->
               <ws-form-item label="船名" span="1" prop="carNo" v-if="deptBudgetList.outType == '散船'">
-                <ws-input v-model="deptBudgetList.carNo" placeholder="请输入船名" size="small" />
+                <!-- <ws-input v-model="deptBudgetList.carNo" placeholder="请输入船名" size="small" /> -->
+                 <ws-input v-if='shipInfoList.length<2' v-model="deptBudgetList.shipName" placeholder="请输入船名" maxlength="20" size="small" />
+                <el-select v-else v-model="deptBudgetList.shipName" placeholder="请选择船名" @change='shipNamechange'>
+                  <el-option v-for="item in shipInfoList" :key="item.value" :label="item.shipName" :value="item.shipName" />
+                </el-select>
               </ws-form-item>
               <ws-form-item label="航次" span="1" prop="shipNumber" v-if="deptBudgetList.outType == '散船'">
-                <ws-input v-model="deptBudgetList.shipNumber" placeholder="请输入航次" maxlength="20" size="small" />
+                 <ws-input v-if='shipInfoList.length<2' v-model="deptBudgetList.shipNumber" placeholder="请输入航次" maxlength="20" size="small" />
+                <el-select v-else disabled v-model="deptBudgetList.shipNumber" placeholder="请选择航次">
+                  <el-option v-for="item in shipInfoList" :key="item.value" :label="item.shipNo" :value="item.shipNo" />
+                </el-select>
               </ws-form-item>
               <!--车号  -->
               <ws-form-item label="车号" span="1" prop="carNo" v-if="deptBudgetList.outType == '火运'">
@@ -475,6 +482,7 @@
         searchKeyWord: '',
         contractType: 2,
         startDate: null,
+        shipInfoList:[],
         endDate: null,
         goodnameList: {},
         checked: true,
@@ -604,6 +612,13 @@
       // }
     },
     methods: {
+      shipNamechange(e){
+        for (let i = 0; i < this.shipInfoList.length; i++) {
+          if(this.shipInfoList[i].shipName==e){
+            this.deptBudgetList.shipNumber=this.shipInfoList[i].shipNo
+          }
+        }
+      },
       // 千丰自动计算扣款
       automaticCalculation() {
         let _price = 0
@@ -2221,6 +2236,9 @@
               this.tranCarInfoList = this.outContractNo[i].tranCarInfoList
               // this.carstatus = true
             }
+            if(this.outContractNo[i].shipInfoList){
+               this.shipInfoList = this.outContractNo[i].shipInfoList
+            }
           }
         }
       },

src/views/warehouse/warehouseManagementNoWeightIn.vue

@@ -233,7 +233,11 @@
               </ws-form-item>
               <!--船名  -->
               <ws-form-item label="船名" span="1" prop="carNo" v-if="deptBudgetList.outType == '散船'">
-                <ws-input v-model="deptBudgetList.carNo" placeholder="请输入船名" size="small" />
+                <!-- <ws-input v-model="deptBudgetList.carNo" placeholder="请输入船名" size="small" /> -->
+                 <ws-input v-if='shipInfoList.length<2' v-model="dataList.shipName" placeholder="请输入船名" maxlength="20" size="small" />
+                <el-select v-else v-model="dataList.shipName" placeholder="请选择船名">
+                  <el-option v-for="item in shipInfoList" :key="item.value" :label="item.shipName" :value="item.shipName" />
+                </el-select>
               </ws-form-item>
               <!--车号  -->
               <ws-form-item label="车号" span="1" prop="carNo" v-if="deptBudgetList.outType == '火运'">
@@ -449,6 +453,7 @@
         tableDate: [],
         // 是否显示
         showType: true,
+        shipInfoList:[],
         // 年
         year: '',
         deptBudgetTotal: 0,
@@ -622,6 +627,7 @@
       // }
     },
     methods: {
+      
       // 千丰自动计算扣款
       automaticCalculation() {
         let _price = 0
@@ -776,6 +782,9 @@
               this.tranCarInfoList = this.outContractNo[i].tranCarInfoList
               // this.carstatus = true
             }
+            if(this.outContractNo[i].shipInfoList){
+               this.shipInfoList = this.outContractNo[i].shipInfoList
+            }
           }
         }
       },

src/views/warehouse/warehouseManagementNoWeightOut.vue

@@ -243,10 +243,16 @@
                 <ws-input v-model="dataList.wingNumberOther" placeholder="请输入车厢号" maxlength="20" size="small" />
               </ws-form-item>
               <ws-form-item label="船名" span="1" prop="shipName" v-if="dataList.outType == '散船'">
-                <ws-input v-model="dataList.shipName" placeholder="请输入船名" maxlength="20" size="small" />
+                <ws-input v-if='shipInfoList.length<2' v-model="dataList.shipName" placeholder="请输入船名" maxlength="20" size="small" />
+                <el-select v-else v-model="dataList.shipName" placeholder="请选择船名" @change='shipNamechange'>
+                  <el-option v-for="item in shipInfoList" :key="item.value" :label="item.shipName" :value="item.shipName" />
+                </el-select>
               </ws-form-item>
               <ws-form-item label="航次" span="1" prop="shipNumber" v-if="dataList.outType == '散船'">
-                <ws-input v-model="dataList.shipNumber" placeholder="请输入航次" maxlength="20" size="small" />
+                <ws-input v-if='shipInfoList.length<2' v-model="dataList.shipNumber" placeholder="请输入航次" maxlength="20" size="small" />
+                <el-select v-else disabled v-model="dataList.shipNumber" placeholder="请选择航次">
+                  <el-option v-for="item in shipInfoList" :key="item.value" :label="item.shipNo" :value="item.shipNo" />
+                </el-select>
               </ws-form-item>
             </ws-info-table>
           </div>
@@ -432,6 +438,7 @@
         options: [],
         options1: [],
         options2: [],
+        shipInfoList:[],
         carstatus: false,
         storageType: [],
         deliveryType: [],
@@ -555,6 +562,13 @@
       this.getList()
     },
     methods: {
+      shipNamechange(e){
+        for (let i = 0; i < this.shipInfoList.length; i++) {
+          if(this.shipInfoList[i].shipName==e){
+            this.dataList.shipNumber=this.shipInfoList[i].shipNo
+          }
+        }
+      },
       dataFilter2(){},
       //切换车牌号输入状态
       carNoTypeChange() {
@@ -724,6 +738,9 @@
               this.tranCarInfoList = this.outContractNo[i].tranCarInfoList
               // this.carstatus = true
             }
+            if(this.outContractNo[i].shipInfoList){
+               this.shipInfoList = this.outContractNo[i].shipInfoList
+            }
           }
         }
       },

src/views/warehouse/warehouseManagementPerfectDelivery.vue

@@ -312,11 +312,15 @@
                 prop="carNo"
                 v-if="dataList.outType == '散船'"
               >
-                <ws-input
+                <!-- <ws-input
                   v-model="dataList.carNo"
                   placeholder="请输入船名"
                   size="small"
-                />
+                /> -->
+                <ws-input v-if='shipInfoList.length<2' v-model="dataList.shipName" placeholder="请输入船名" maxlength="20" size="small" />
+                <el-select v-else v-model="dataList.shipName" placeholder="请选择船名" @change='shipNamechange'>
+                  <el-option v-for="item in shipInfoList" :key="item.value" :label="item.shipName" :value="item.shipName" />
+                </el-select>
               </ws-form-item>
               <ws-form-item
                 label="航次"
@@ -324,12 +328,10 @@
                 prop="shipNumber"
                 v-if="dataList.outType == '散船'"
               >
-                <ws-input
-                  v-model="dataList.shipNumber"
-                  placeholder="请输入航次"
-                  maxlength="20"
-                  size="small"
-                />
+                <ws-input v-if='shipInfoList.length<2' v-model="dataList.shipNumber" placeholder="请输入航次" maxlength="20" size="small" />
+                <el-select v-else disabled v-model="dataList.shipNumber" placeholder="请选择航次">
+                  <el-option v-for="item in shipInfoList" :key="item.value" :label="item.shipNo" :value="item.shipNo" />
+                </el-select>
               </ws-form-item>
               <!--车号  -->
               <ws-form-item
@@ -671,6 +673,7 @@ export default {
         freight:0,
         type:'',
         addressUrl:'',
+        shipInfoList:[],
         buckleWeightRatio:'',
         tidalGrainWater:'',
         solidGrainWater:'',
@@ -739,6 +742,13 @@ export default {
             this.carChange1='识别下拉'
         }
       },
+      shipNamechange(e){
+        for (let i = 0; i < this.shipInfoList.length; i++) {
+          if(this.shipInfoList[i].shipName==e){
+            this.dataList.shipNumber=this.shipInfoList[i].shipNo
+          }
+        }
+      },
     imgBig(item){
       console.log(item)
       this.img=item
@@ -833,6 +843,9 @@ export default {
             this.tranCarInfoList=this.outContractNo[i].tranCarInfoList
             this.carstatus=true
           }
+          if(this.outContractNo[i].shipInfoList){
+               this.shipInfoList = this.outContractNo[i].shipInfoList
+            }
         }
       }
     },

src/views/warehouse/warehouseManagementPut.vue

@@ -264,10 +264,16 @@
               </ws-form-item>
               <!--船名  -->
               <ws-form-item label="船名" span="1" prop="carNo" v-if="deptBudgetList.outType == '散船'">
-                <ws-input v-model="deptBudgetList.carNo" placeholder="请输入船名" size="small" />
+                <ws-input v-if='shipInfoList.length<2' v-model="deptBudgetList.shipName" placeholder="请输入船名" maxlength="20" size="small" />
+                <el-select v-else v-model="deptBudgetList.shipName" placeholder="请选择船名" @change='shipNamechange'>
+                  <el-option v-for="item in shipInfoList" :key="item.value" :label="item.shipName" :value="item.shipName" />
+                </el-select>
               </ws-form-item>
               <ws-form-item label="航次" span="1" prop="shipNumber" v-if="deptBudgetList.outType == '散船'">
-                <ws-input v-model="deptBudgetList.shipNumber" placeholder="请输入航次" maxlength="20" size="small" />
+               <ws-input v-if='shipInfoList.length<2' v-model="deptBudgetList.shipNumber" placeholder="请输入航次" maxlength="20" size="small" />
+                <el-select v-else disabled v-model="deptBudgetList.shipNumber" placeholder="请选择航次">
+                  <el-option v-for="item in shipInfoList" :key="item.value" :label="item.shipNo" :value="item.shipNo" />
+                </el-select>
               </ws-form-item>
               <!--车号  -->
               <ws-form-item label="车号" span="1" prop="carNo" v-if="deptBudgetList.outType == '火运'">
@@ -460,6 +466,7 @@
         deptBudgetTotal: 0,
         currentPage: 1,
         pageSize: 10,
+        shipInfoList:[],
         searchType: 1,
         searchKeyWord: '',
         contractType: 2,
@@ -569,6 +576,13 @@
       // }
     },
     methods: {
+      shipNamechange(e){
+        for (let i = 0; i < this.shipInfoList.length; i++) {
+          if(this.shipInfoList[i].shipName==e){
+            this.deptBudgetList.shipNumber=this.shipInfoList[i].shipNo
+          }
+        }
+      },
       imgBig(item) {
         console.log(item)
         this.img = item
@@ -1813,6 +1827,9 @@
               this.tranCarInfoList = this.outContractNo[i].tranCarInfoList
               this.carstatus = true
             }
+            if(this.outContractNo[i].shipInfoList){
+               this.shipInfoList = this.outContractNo[i].shipInfoList
+            }
           }
         }
       },

src/views/warehouse/warehouseManagementTare.vue

@@ -227,10 +227,16 @@
                 <ws-input v-model="deptBudgetList.wingNumberOther" placeholder="请输入车厢号" maxlength="20" size="small" />
               </ws-form-item>
               <ws-form-item label="船名" span="1" prop="shipName" v-if="deptBudgetList.outType == '散船'">
-                <ws-input v-model="deptBudgetList.shipName" placeholder="请输入船名" maxlength="20" size="small" />
+                <ws-input v-if='shipInfoList.length<2' v-model="deptBudgetList.shipName" placeholder="请输入船名" maxlength="20" size="small" />
+                <el-select v-else v-model="deptBudgetList.shipName" placeholder="请选择船名" @change='shipNamechange'>
+                  <el-option v-for="item in shipInfoList" :key="item.value" :label="item.shipName" :value="item.shipName" />
+                </el-select>
               </ws-form-item>
               <ws-form-item label="航次" span="1" prop="shipNumber" v-if="deptBudgetList.outType == '散船'">
-                <ws-input v-model="deptBudgetList.shipNumber" placeholder="请输入航次" maxlength="20" size="small" />
+                <ws-input v-if='shipInfoList.length<2' v-model="deptBudgetList.shipNumber" placeholder="请输入航次" maxlength="20" size="small" />
+                <el-select v-else disabled v-model="deptBudgetList.shipNumber" placeholder="请选择航次">
+                  <el-option v-for="item in shipInfoList" :key="item.value" :label="item.shipNo" :value="item.shipNo" />
+                </el-select>
               </ws-form-item>
             </ws-info-table>
           </div>
@@ -376,6 +382,7 @@
         // 提交类型
         submitType: true,
         deliveryType: [],
+        shipInfoList:[],
         typeList: ['干粮', '潮粮'],
         outContractNo: [],
         appendixIdsAdd: '',
@@ -481,6 +488,13 @@
       // }
     },
     methods: {
+      shipNamechange(e){
+        for (let i = 0; i < this.shipInfoList.length; i++) {
+          if(this.shipInfoList[i].shipName==e){
+            this.deptBudgetList.shipNumber=this.shipInfoList[i].shipNo
+          }
+        }
+      },
       //切换车牌号输入状态
       carNoTypeChange() {
         this.carjudge = !this.carjudge
@@ -570,7 +584,6 @@
               }
               this.deptBudgetList.inOutTypeKey = 1
             } else if (this.outContractNo[i].inOutType == '移库出库') {
-
               this.weightbills.buyer = this.outContractNo[i].receiveWarehouse
               this.weightbills.seller = this.outContractNo[i].sendWarehouse
               this.deptBudgetList.goodsName = data.goodsName
@@ -604,6 +617,9 @@
               this.tranCarInfoList = this.outContractNo[i].tranCarInfoList
               this.carstatus = true
             }
+            if(this.outContractNo[i].shipInfoList){
+               this.shipInfoList = this.outContractNo[i].shipInfoList
+            }
           }
         }
       },