diff --git a/src/router/views/index.js b/src/router/views/index.js index aca52120..058e8fda 100644 --- a/src/router/views/index.js +++ b/src/router/views/index.js @@ -1273,19 +1273,31 @@ export default [ }, ], }, - { - path: '/aftersales/aftersalesWorkOrderSS', + path: '/aftersales/aftersalesWorkOrdermodify', component: Layout, - redirect: '/aftersales/aftersalesWorkOrderSS', + redirect: '/aftersales/aftersalesWorkOrdermodify', children: [ { - path: '/aftersales/aftersalesWorkOrderSS', - name: '工单A', - component: () => import('@/views/aftersales/aftersalesWorkOrderSS.vue'), + path: '/aftersales/aftersalesWorkOrdermodify', + name: '信息编辑', + component: () => import('@/views/aftersales/aftersalesWorkOrdermodify.vue'), }, ], }, + + // { + // path: '/aftersales/aftersalesWorkOrderSS', + // component: Layout, + // redirect: '/aftersales/aftersalesWorkOrderSS', + // children: [ + // { + // path: '/aftersales/aftersalesWorkOrderSS', + // name: '工单A', + // component: () => import('@/views/aftersales/aftersalesWorkOrderSS.vue'), + // }, + // ], + // }, // { diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue index e3b5152f..ea513fcf 100644 --- a/src/views/aftersales/aftersalesWorkOrder.vue +++ b/src/views/aftersales/aftersalesWorkOrder.vue @@ -154,11 +154,11 @@ @selection="selectionChange" > @@ -518,6 +602,8 @@ import { nextTick, ref } from 'vue'; export default { data() { return { + dialogImg:false, + Imgurl:undefined, OrdercolumnList: [ { prop: 'serviceNumber', @@ -549,6 +635,8 @@ export default { loading: false, // 是否为查看模式 view: false, + // 是否为上传模式 + viewSC: false, // 查询信息 query: {}, queryOrder: {}, @@ -1736,6 +1824,10 @@ export default { this.onLoad(this.page); } else if (this.$route.query.type == '3') { this.onLoadCj(); + }else if (this.$route.query.type == '4') { + //查询提货编辑数据 + this.view = true; + this.getDetailOen(); } /** * 初始化获取本地缓存的编辑隐藏的列表 @@ -2254,6 +2346,8 @@ export default { }, handlePreview(file) { console.log(file); + this.Imgurl =file.url; + this.dialogImg =true; }, textbox(e, index) { let nu = index + 1; @@ -3023,4 +3117,23 @@ export default { .el-input-number { width: 100%; } +:deep(.maboxhi){ + height: 100% !important; +} +.toscontent{ + :deep(.el-form-item__content){ + height: 400px; + overflow-y: scroll; + align-items: flex-start; + } + :deep(.el-tabs){ + height: 100% !important; + } +} +.LoadIMG{ + img{ + width: 100%; + height: 100%; + } +} diff --git a/src/views/distribution/inventory/distrilbutionBillLadingList.vue b/src/views/distribution/inventory/distrilbutionBillLadingList.vue index 09149623..56dabc05 100644 --- a/src/views/distribution/inventory/distrilbutionBillLadingList.vue +++ b/src/views/distribution/inventory/distrilbutionBillLadingList.vue @@ -31,12 +31,12 @@ - 待提货：{{ treatNum }}单/{{ numBill }}件 + 待提货：{{ treatNum }}单/{{ this.sumTotal - this.signedFor }}件 - 已提货：{{ stopNum }}单/{{ numBill }}件 @@ -116,12 +116,22 @@ type="primary" text icon="el-icon-edit" - @click="handleEdits(slotProps.scope)" + @click="handleEdits(slotProps.scope,'1')" v-if=" permission.distrilbutionBillLadingList_edit && slotProps.scope.row.conditions < 20 " >编辑提货信息 + 上传签收图片 { diff --git a/src/views/distribution/reservation/reservation.vue b/src/views/distribution/reservation/reservation.vue index 884a4285..2b848ba3 100644 --- a/src/views/distribution/reservation/reservation.vue +++ b/src/views/distribution/reservation/reservation.vue @@ -769,16 +769,16 @@ export default { // sortable: true, // }, - // { - // prop: 'notes', - // label: '备注', - // type: 1, - // values: '', - // width: '140', - // checkarr: [], - // fixed: false, - // sortable: false, - // }, + { + prop: 'operator', + label: '操作人', + type: 1, + values: '', + width: '140', + checkarr: [], + fixed: false, + sortable: false, + }, { prop: '', label: '操作', diff --git a/src/views/distribution/stockup/distributionStockupDiscuss.vue b/src/views/distribution/stockup/distributionStockupDiscuss.vue index 39a3aea5..95ea60ec 100644 --- a/src/views/distribution/stockup/distributionStockupDiscuss.vue +++ b/src/views/distribution/stockup/distributionStockupDiscuss.vue @@ -55,13 +55,15 @@
- 导出 - + + 清单导出 + 指派备货信息 -
@@ -104,7 +106,7 @@ - +
勾选数量: {{ selectionList.length }}
@@ -381,16 +383,16 @@ export default { sortable: true, head: false, }, - // { - // prop: 'stockupUser', - // label: '操作人', - // type: 2, - // values: '', - // width: '130', - // checkarr: [], - // fixed: false, - // sortable: true, - // }, + { + prop: 'consignee', + label: '客户名称', + type: 2, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, { prop: 'stockupStatusName', label: '备货状态', @@ -1043,7 +1045,7 @@ export default { }); }, // 导出功能 - handleExportInfo() { + handleExportInfo() { let row = {}; // 查询信息 // query: {}, @@ -1057,10 +1059,35 @@ export default { } else { row.ids = ''; } - row.typeService='1',//固定参数代表当前页面 - $_CommercialMarket(row).then(res => { + (row.typeService = '1'), //固定参数代表当前页面 + $_CommercialMarket(row).then(res => { + console.log(res.data); + downloadXls(res.data, '商配备货列表.xlsx'); + }); + }, + /** 导出清单 */ + handleExportDetails() { + let row = {}; + // 查询信息 + // query: {}, + if (this.query) { + for (let prop in this.query) { + row[prop] = this.query[prop]; + } + } + if (!!this.ids) { + row.ids = this.ids; + } else { + row.ids = ''; + } + if (row.ids === '') { + this.$message.warning('请选择备货任务!'); + return; + } + console.log('row-------->', row); + $_CommercialDetail(row.ids).then(res => { console.log(res.data); - downloadXls(res.data, '商配备货列表.xlsx'); + downloadXls(res.data, '市配备货列表.xlsx'); }); }, handleDelete() { @@ -1187,9 +1214,9 @@ export default { height: 30px !important; } } -:deep(.el-form-item__label){ - width:auto !important; - padding:0; +:deep(.el-form-item__label) { + width: auto !important; + padding: 0; } :deep(.avue-crud) { display: flex; @@ -1207,6 +1234,6 @@ export default { .el-fy { flex: 1; display: flex; - align-items: flex-end; + align-items: flex-end; } diff --git a/src/views/distribution/stockup/distributionStockupMarket.vue b/src/views/distribution/stockup/distributionStockupMarket.vue index 8a0711fb..ff1f7e8e 100644 --- a/src/views/distribution/stockup/distributionStockupMarket.vue +++ b/src/views/distribution/stockup/distributionStockupMarket.vue @@ -13,21 +13,21 @@ --> -
- - - - - - +
+ + + + + +
@@ -45,6 +45,9 @@ 导出 + 清单导出 + 指派备货信息 @@ -934,6 +937,31 @@ export default { downloadXls(res.data, '市配备货列表.xlsx'); }); }, + /** 导出清单 */ + handleExportDetails() { + let row = {}; + // 查询信息 + // query: {}, + if (this.query) { + for (let prop in this.query) { + row[prop] = this.query[prop]; + } + } + if (!!this.ids) { + row.ids = this.ids; + } else { + row.ids = ''; + } + if (row.ids === '') { + this.$message.warning('请选择备货任务!'); + return; + } + console.log('row-------->', row); + $_CommercialDetail(row.ids).then(res => { + console.log(res.data); + downloadXls(res.data, '市配备货列表.xlsx'); + }); + }, searchReset() { this.query = {}; this.stockupDate = []; @@ -1157,9 +1185,8 @@ export default { .el-fy { flex: 1; display: flex; - align-items: flex-end; + align-items: flex-end; } -.el-input-so{ - +.el-input-so { } diff --git a/src/views/distribution/stockup/distributionStockupSelf.vue b/src/views/distribution/stockup/distributionStockupSelf.vue index d2956268..3bf02a31 100644 --- a/src/views/distribution/stockup/distributionStockupSelf.vue +++ b/src/views/distribution/stockup/distributionStockupSelf.vue @@ -370,6 +370,16 @@ export default { // fixed: false, // sortable: true, // }, + { + prop: 'consignee', + label: '客户名称', + type: 2, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, { prop: 'stockupStatusName', label: '备货状态', diff --git a/src/views/distribution/turndelivery/deliveryDiscuss.vue b/src/views/distribution/turndelivery/deliveryDiscuss.vue index 6ec98a97..7cbfe131 100644 --- a/src/views/distribution/turndelivery/deliveryDiscuss.vue +++ b/src/views/distribution/turndelivery/deliveryDiscuss.vue @@ -1715,10 +1715,10 @@ const CheckBox = (scope, type: number) => { const selectAll = val => { console.log(val); }; -// 弹窗全选 +// 弹窗全选 const TCselectAll = val => { console.log(val, '弹窗全选框'); - dataTmp.value=val + dataTmp.value = val; }; // 弹窗表格单个选中触发事件 const selectChange = (selection, row) => { @@ -1744,11 +1744,20 @@ const selectChange = (selection, row) => { }); } } else { - // 新增状态 + // 新增状态 + if(wrapLoading.value){ + wrapTemp.value = selection + // 包件 + }else{ + selection.forEach(item => { item.checked = true; //表示当前已经被选中了 dataTmp.value.push(item); }); + } + + + } }; @@ -1776,9 +1785,17 @@ const submit = () => { } else { // 新增订单 //选中好的订单提交到要展示的表格 - dataTmp.value.forEach(item => { - dataInfo.value.push(item); - }); + if (wrapLoading.value) { + + dataInfo.value[dataId.value].packageListInfo = wrapTemp.value; //把存在的值给当前订单下面 + console.log(wrapTemp.value, '包件订单被缓存'); + // 包件弹窗 + } else { + dataTmp.value.forEach(item => { + dataInfo.value.push(item); + console.log(dataTmp.value, '订单'); + }); + } console.log('提交后的参数', dataInfo.value); console.log('提交后的临时存储', dataTmp.value);