111

config/dev.env.js

@@ -4,7 +4,7 @@ const prodEnv = require('./prod.env')
 
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-   BASE_API: '"http://120.224.213.150/thware/"'
-	// BASE_API: '"http://localhost:8080/thware/"'
+  // BASE_API: '"http://120.224.213.150/thware/"'
+	 BASE_API: '"http://localhost:8080/thware/"'
 	// BASE_API: '"http://47.104.245.159:8081/thware/"'
 })

src/components/PopupDistribution.vue

@@ -158,6 +158,7 @@
 								response.data.data.listDetail = []
 							}
 						}
+						console.log(this.trucks)
 						this.trucks = response.data.data
 						//	console.log(JSON.stringify(this.trucks))
 
@@ -271,7 +272,18 @@
 					if (response.data.code == 0) {
 
 					//	this.dialogVisible = false   //modify by liuc 2025/04/16  10:14
-						this.selectRows    = []
+						this.selectRows    = [];
+						this.$message({
+							message: '配车成功',
+							type: 'success'
+							});
+						this.getTrucks();
+						console.log(this.truckNo)
+						const item = this.trucks.find(item1=> item.truckNo === this.truckNo)
+						console.log(item)
+						this.distribution.id = item.id
+
+
 					} else {
 						this.$message({
 							type: 'error',

src/components/PopupOut.vue

@@ -26,7 +26,13 @@
 				</el-form-item>
 				<el-form-item label="理货人员">
 					<el-select v-model="distribution.tallyPeople" size="small" style="margin-left: 10px" clearable placeholder="理货人员">
-						<el-option v-for="item in tallyPeopleOption" :key="item.id" :label="item.dicName" :value="item.dicCode">
+						<el-option v-for="item in tallyPeopleOption" :key="item.dicName" :label="item.dicName" :value="item.dicName">
+						</el-option>
+					</el-select>
+				</el-form-item>
+				<el-form-item label="承运单位">
+					<el-select v-model="distribution.transportName" size="small" style="margin-left: 10px" clearable placeholder="承运单位">
+						<el-option v-for="item in transports" :key="item.name" :label="item.name" :value="item.name">
 						</el-option>
 					</el-select>
 				</el-form-item>
@@ -111,6 +117,7 @@
 		},
 		mounted() {
 			this.getSearchItem();
+			this.gettransportItem();
 		},
 		data() {
 			return {
@@ -134,13 +141,25 @@
 					sumCount: '',
 					suttle: 0,
 					tallyPeople:'',
-					listDetail: []
+					listDetail: [],
+					transportName:''
 				},
 				time: '',
-				tallyPeopleOption:[]
+				tallyPeopleOption:[],
+				transports: []
 			};
 		},
 		methods: {
+			gettransportItem(){
+				var url = 'MaintTransport/query.do'
+				var param = {page: -1,
+					rows: -1,
+					query: ''}
+				axios.get(url, param).then(response => {
+					this.transports = response.data.data
+				});
+			},
+
 			getTrucks() {
 				var url = 'WareDistribution/queryWaitTrucks.do'
 				var param = {}
@@ -165,7 +184,9 @@
 				var param = {
 					type: 'TALLY_PEOPLE',
 				}
+				
 				axios.get(url, param).then(response => {
+					console.log(response);
 					// alert(JSON.stringify(response))
 					this.tallyPeopleOption = response.data.data;
 				});

src/view/record/outrecord.vue

@@ -134,6 +134,8 @@
 				</el-table-column>
 				<el-table-column prop="tallyPeople" label="出库理货人员" width="180px" show-overflow-tooltip align="left">
 				</el-table-column>
+				<el-table-column prop="transportName" label="承运单位" width="180px" show-overflow-tooltip align="left">
+				</el-table-column>
 				<el-table-column prop="addId" label="出库操作人" width="120px" show-overflow-tooltip align="left">
 				</el-table-column>
 				<el-table-column prop="addTime" label="出库时间" width="200px" show-overflow-tooltip align="left">
@@ -718,6 +720,7 @@
 								,"产地"
 								,"出库车号"
 								,"出库理货人员"
+								,"承运单位"
 								,"出库操作人"
 								,"出库时间"
 								,"备注"
@@ -749,6 +752,7 @@
 						,"productionPlace"
 						,"outCarNo"
 						,"tallyPeople"
+						,"transportName"
 						,"addId"
 						,"addTime"
 						,"remark"