diff --git a/src/option/distribution/addVehicleStowage.js b/src/option/distribution/addVehicleStowage.js index a84b3ee6..a2b3df4a 100644 --- a/src/option/distribution/addVehicleStowage.js +++ b/src/option/distribution/addVehicleStowage.js @@ -227,6 +227,17 @@ export const columnList = [ sortable: true, isshowSummary: false, }, + { + prop: 'shipperName', + label: '发货人', + type: 2, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + isshowSummary: false, + }, { prop: 'consignee', label: '收货单位', diff --git a/src/views/distribution/artery/AddVehicleStowage.vue b/src/views/distribution/artery/AddVehicleStowage.vue index 41e2ba0d..27ec20ef 100644 --- a/src/views/distribution/artery/AddVehicleStowage.vue +++ b/src/views/distribution/artery/AddVehicleStowage.vue @@ -314,24 +314,48 @@
- + + + - + + + + + + + + + + + + + + + + + + ({ /** 当前所在仓库 */ warehouseId: '', warehouseName: '', + warehouseOption: [], }); /** 始发仓数据 */ @@ -1001,6 +1027,18 @@ onMounted(() => { setTabelHeight(); }); +/** 初始化请求仓库数据 */ +getListName({ name: '' }).then(res => { + const { code, data } = res.data; + if (code !== 200 || getObjType(data) !== 'array') return; + details.warehouseOption = data.map(val => { + return { + dictKey: val.id, + dictValue: val.name, + }; + }); +}); + // 清空复选框 const clearSelectionList = () => { details.selectionList = []; @@ -2566,4 +2604,8 @@ const handleSubmit = (formEl: FormInstance | undefined) => { :deep(.el-tabs__item.is-active) { font-weight: bold; } + +:deep(.el-form-item__content) { + width: 250px !important; +} diff --git a/src/views/distribution/reservation/reservation.vue b/src/views/distribution/reservation/reservation.vue index 110caf93..6ee485c0 100644 --- a/src/views/distribution/reservation/reservation.vue +++ b/src/views/distribution/reservation/reservation.vue @@ -111,7 +111,7 @@ >取消预约 确认预约 @@ -241,7 +241,7 @@ { console.log(res.data); @@ -1305,11 +1305,11 @@ export default { }); }, aaa() { - this.queryA.reservationStatus = '1'; + this.queryA.reservationStatus = '10'; this.onLoad(this.page); }, bbb() { - this.queryB.reservationStatus = '2'; + this.queryB.reservationStatus = '20'; this.onLoad(this.page); }, handleView(row) { @@ -1512,7 +1512,7 @@ export default { // this.query.reservationStatus = '1'; // } let query = this.queryB; - query.reservationStatus = '2'; + query.reservationStatus = '20'; console.log('this.activename :>> ', this.activename); if (this.activename === 'nocheck') { console.log('123123 :>> ', 123123); diff --git a/src/views/distribution/reservation/reservationMarket.vue b/src/views/distribution/reservation/reservationMarket.vue index f7cc70a5..f6f46d97 100644 --- a/src/views/distribution/reservation/reservationMarket.vue +++ b/src/views/distribution/reservation/reservationMarket.vue @@ -17,7 +17,7 @@
添加预约 批量确认 批量转备货 { const data = res.data.data; diff --git a/src/views/distribution/reservation/reservationSelf.vue b/src/views/distribution/reservation/reservationSelf.vue index 3346ee1e..640ed394 100644 --- a/src/views/distribution/reservation/reservationSelf.vue +++ b/src/views/distribution/reservation/reservationSelf.vue @@ -17,7 +17,7 @@
添加预约 批量确认 批量转备货 { const data = res.data.data; diff --git a/src/views/mail/reservation/list.vue b/src/views/mail/reservation/list.vue index 2c680e94..97d14ad5 100644 --- a/src/views/mail/reservation/list.vue +++ b/src/views/mail/reservation/list.vue @@ -810,12 +810,12 @@ export default { // 未 nulName = '待确定预约单数据.xlsx'; row = { ...row, ...this.queryA }; - row.reservationStatus = '1'; + row.reservationStatus = '10'; } else { // 已 nulName = '已确定预约单数据.xlsx'; row = { ...row, ...this.queryB }; - row.reservationStatus = '2'; + row.reservationStatus = '20'; } reservationExport(row).then(res => { console.log(res.data);