From 00dbff30810d6317dcc5bf056c5cf70cae9aecff Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Wed, 21 Aug 2024 16:35:19 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/distribution/SeparateTheList.js | 22 ++-- src/option/distribution/SeparateTheList.js | 47 ++++++-- src/views/basicdata/brand/basicClient.vue | 10 +- .../inventory/delivery/SeparateTheList.vue | 101 +++++++++++++++--- .../inventory/distrilbutionBillLadingList.vue | 21 +++- 5 files changed, 164 insertions(+), 37 deletions(-) diff --git a/src/api/distribution/SeparateTheList.js b/src/api/distribution/SeparateTheList.js index 2c1bdc2e..bdb7e2d5 100644 --- a/src/api/distribution/SeparateTheList.js +++ b/src/api/distribution/SeparateTheList.js @@ -35,10 +35,18 @@ export const $_canceltask = params => { }; // 子任务详情 -export const $_gettaskdetail= params => { - return request({ - url: '/api/logpm-distribution/split-order-task/get-task-detail', - method: 'get', - params, - }); - }; \ No newline at end of file +export const $_gettaskdetail = params => { + return request({ + url: '/api/logpm-distribution/split-order-task/get-task-detail', + method: 'get', + params, + }); +}; +// 撤销总任务 +export const $_cancelalltask = params => { + return request({ + url: '/api/logpm-distribution/split-order-task/cancel-all-task', + method: 'post', + params, + }); +}; diff --git a/src/option/distribution/SeparateTheList.js b/src/option/distribution/SeparateTheList.js index 13aa7632..08e3ec53 100644 --- a/src/option/distribution/SeparateTheList.js +++ b/src/option/distribution/SeparateTheList.js @@ -12,14 +12,14 @@ export const columnList = [ label: '序号', type: 12, values: '', - width: 40, + width: 50, fixed: true, }, { prop: 'no', label: '拆单任务编号', - type: 1, + type: 2, values: '', width: '150', fixed: true, @@ -29,7 +29,7 @@ export const columnList = [ { prop: 'orderCode', label: '原订单编号', - type: 1, + type: 2, values: '', width: '150', fixed: true, @@ -58,7 +58,7 @@ export const columnList = [ }, { - prop: 'stateNameS', + prop: 'stateName', label: '拆单任务状态', type: 3, values: '', @@ -66,14 +66,45 @@ export const columnList = [ fixed: true, sortable: true, head: false, - + checkarr: [ + { + label: '未完成', + value: 0, + }, + { + label: '已完成', + value: 1, + }, + { + label: '已撤销', + value: 2, + }, + ], }, - // 1.2.3 - // 未完成 已完成 已撤销 { prop: 'createTime', label: '创建时间', - type: 1, + type: 4, + values: '', + width: '150', + fixed: true, + sortable: true, + head: false, + }, + { + prop: 'finishUsername', + label: '创建人', + type: 2, + values: '', + width: '150', + fixed: true, + sortable: true, + head: false, + }, + { + prop: 'finishTime', + label: '完成时间', + type: 2, values: '', width: '150', fixed: true, diff --git a/src/views/basicdata/brand/basicClient.vue b/src/views/basicdata/brand/basicClient.vue index ae845f7b..e35bc071 100644 --- a/src/views/basicdata/brand/basicClient.vue +++ b/src/views/basicdata/brand/basicClient.vue @@ -1395,6 +1395,9 @@ export default { this.onLoad(this.page); }, handleSubmit(from) { + if(!this.form.typeServiceList.includes('3')){ + delete this.form.businessType + } console.log('上传的集合。。', JSON.parse(JSON.stringify(this.fileList))); if (this.title == '编辑' && this.bianji == false) { console.log('编辑1111'); @@ -1467,10 +1470,11 @@ export default { this.$refs[from].validate(async valid => { if (valid) { try { - this.loadingObj.submitLoading = true; - - console.log('修改提交的数据：', this.form); + this.loadingObj.submitLoading = true; + console.log('修改提交的数据：', this.form); // this.form.typeService = !!this.form.typeService ? parseInt(this.form.typeService) : undefined; + + this.form.bladeRegionCityId = this.form.bladeRegionProvinceId[1]; this.form.bladeRegionAreaId = this.form.bladeRegionProvinceId[2]; this.form.bladeRegionProvinceId = this.form.bladeRegionProvinceId[0]; diff --git a/src/views/distribution/inventory/delivery/SeparateTheList.vue b/src/views/distribution/inventory/delivery/SeparateTheList.vue index ceb76298..3ca41de6 100644 --- a/src/views/distribution/inventory/delivery/SeparateTheList.vue +++ b/src/views/distribution/inventory/delivery/SeparateTheList.vue @@ -5,15 +5,37 @@
- - + + - - - - - + + + + + + + + @@ -52,7 +74,7 @@ @@ -108,7 +130,11 @@ import { columnList } from '@/option/distribution/SeparateTheList.js'; import { useStore } from 'vuex'; import { useRouter } from 'vue-router'; import { ElMessage, ElMessageBox } from 'element-plus'; -import { $_alltasklist, $_finishalltask } from '@/api/distribution/SeparateTheList'; +import { + $_alltasklist, + $_finishalltask, + $_cancelalltask, +} from '@/api/distribution/SeparateTheList'; // 获取路由实例 const $router = useRouter(); @@ -276,7 +302,6 @@ const timesc = (index, row) => { /** 表格表头下拉框选择 */ const selectsc = (index, row) => { handleSelectQuery(index, row, details.query); - onLoad(); }; @@ -300,7 +325,6 @@ const currentChange = current => { /** 查看 */ const handleView = row => { console.log(row); - $router.push({ path: '/distribution/inventory/delivery/SeparateTheListInfo', query: { @@ -327,9 +351,58 @@ const determine = row => { let data = { allTaskId: row.id, }; - $_finishalltask(data).then(res => { - console.log(res, '完成'); - }); + details.loadingObj.list = true; + $_finishalltask(data) + .then(res => { + console.log(res, '完成'); + if (res.data.code == 200) { + ElMessage({ + message: res.data.msg, + type: 'success', + }); + onLoad(); + } + }) + .catch(error => { + console.log(error); + }) + .finally(() => { + details.loadingObj.list = false; + }); + }) + .catch(() => {}); +}; + +// 取消 +const handleDelete = row => { + console.log(row, 'row'); + ElMessageBox.confirm('是否确认取消任务?', '提示', { + confirmButtonText: '确认', + cancelButtonText: '取消', + type: 'warning', + }) + .then(() => { + let data = { + taskId: row.id, + }; + details.loadingObj.list = true; + $_cancelalltask(data) + .then(res => { + console.log(res, '取消'); + if (res.data.code == 200) { + ElMessage({ + message: res.data.msg, + type: 'success', + }); + onLoad(); + } + }) + .catch(error => { + console.log(error, '取消失败'); + }) + .finally(() => { + details.loadingObj.list = false; + }); }) .catch(() => {}); }; diff --git a/src/views/distribution/inventory/distrilbutionBillLadingList.vue b/src/views/distribution/inventory/distrilbutionBillLadingList.vue index 55285d6e..9e903505 100644 --- a/src/views/distribution/inventory/distrilbutionBillLadingList.vue +++ b/src/views/distribution/inventory/distrilbutionBillLadingList.vue @@ -13,26 +13,28 @@ @@ -801,6 +803,7 @@ export default { searchReset() { this.query = {}; this.stockupDate = []; + this.Deliverytime = []; handleClearTableQuery(this.columnList); this.page.currentPage = 1; this.onLoad(this.page); @@ -1128,12 +1131,19 @@ export default { async onLoad(page, params = {}) { try { this.loading = true; - if (this.stockupDate.length > 0) { + if (this.stockupDate?.length) { let startDate = this.stockupDate[0]; let entDate = this.stockupDate[1]; - params.startDate = this.getTime(startDate.toString()); - params.entDate = this.getTime(entDate.toString()); + params.startDate = startDate; + params.entDate = entDate; } + if(this.Deliverytime?.length){ + let startDate = this.Deliverytime[0]; + let entDate = this.Deliverytime[1]; + params.pickUpTimeStart = startDate; + params.pickUpTimeEnd = entDate + } + getListOwnNUm(params).then(res => { console.log('查询数量!!!', res.data.data); if (!!res.data.data) { @@ -1144,6 +1154,7 @@ export default { console.log(',.,.已签收', this.signedFor, '全部', this.sumTotal); } }); + this.data=[] const res = await getListOwn( page.currentPage, page.pageSize, From 7ab2a39fa7f638c2cd633f44a0b97338b2ea7942 Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Wed, 21 Aug 2024 18:20:38 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Tableexportcomponent.vue | 76 ++++++++++--------- .../financialsector/CustomerBaseprice.vue | 29 ++++++- 2 files changed, 66 insertions(+), 39 deletions(-) diff --git a/src/components/Tableexportcomponent/Tableexportcomponent.vue b/src/components/Tableexportcomponent/Tableexportcomponent.vue index 92f52c7a..6fbee0b1 100644 --- a/src/components/Tableexportcomponent/Tableexportcomponent.vue +++ b/src/components/Tableexportcomponent/Tableexportcomponent.vue @@ -1,6 +1,6 @@ @@ -30,6 +25,8 @@ import { ref, computed } from 'vue'; import { ElMessage } from 'element-plus'; import * as XLSX from 'xlsx'; +import { Download } from '@element-plus/icons-vue'; + // 传入的参数 const props = defineProps({ data: { @@ -42,26 +39,44 @@ const props = defineProps({ }, }); -const index = props.menuData.findIndex(item => item.label === '序号'); -if (index !== -1) { - props.menuData.splice(index, 1); -} +// 将 menuData 复制到一个局部变量中，以便在 setup 中操作 +const menuData = ref([...props.menuData]); +// 移除指定列的函数 +const removeColumn = (columnLabel) => { + const index = menuData.value.findIndex(item => item.label === columnLabel); + if (index !== -1) { + menuData.value.splice(index, 1); + } +}; +// 移除 '序号' 列 +removeColumn('序号'); +removeColumn('操作'); +removeColumn('复选框'); + const exportFileName = ref(''); // 已选择的列 const checkedColumns = ref([]); // 构建 el-transfer 所需的数据格式，并添加类型检查 const transferData = computed(() => { - if (Array.isArray(props.menuData)) { - return props.menuData.map(item => ({ + if (Array.isArray(menuData.value)) { + return menuData.value.map(item => ({ ...item, key: item.prop, })); } else { - console.error('menuData 不是一个数组:', props.menuData); + console.error('menuData 不是一个数组:', menuData.value); return []; } }); + +// 设置 el-transfer 的 props +const transferProps = { + key: 'key', + label: 'label', +}; + +// 导出到 Excel 的函数 const exportToExcel = () => { if (checkedColumns.value.length === 0) { ElMessage.warning('请选择要导出的字段'); @@ -74,8 +89,9 @@ const exportToExcel = () => { }); return; } + const selectedColumns = transferData.value.filter(item => - checkedColumns.value.includes(item.prop) + checkedColumns.value.includes(item.key) ); const headers = selectedColumns.map(col => col.label); const fields = selectedColumns.map(col => col.prop); @@ -114,32 +130,20 @@ const fillEmptyCells = (data) => { const rowCount = data.length; const colCount = data[0].length; - // 处理每一列 for (let col = 0; col < colCount; col++) { let lastNonEmptyValue = ''; - let inFillSection = false; - for (let row = 0; row < rowCount; row++) { - if (data[row][0] !== '') { // A列有值 - inFillSection = true; - if (data[row][col] !== '') { // 当前单元格非空 - lastNonEmptyValue = data[row][col]; - } else if (lastNonEmptyValue !== '') { // 当前单元格为空，但有上一个非空值 - data[row][col] = lastNonEmptyValue; // 填充 - } - } else if (inFillSection) { // A列没有值，但在填充区域内 - if (lastNonEmptyValue !== '') { - data[row][col] = lastNonEmptyValue; // 继续填充 - } - } else { // A列没有值，且不在填充区域内 - lastNonEmptyValue = ''; - inFillSection = false; + if (data[row][col] !== '') { + lastNonEmptyValue = data[row][col]; + } else { + data[row][col] = lastNonEmptyValue; } } } return data; }; + // 设置样式的函数 const applyStyles = (worksheet, data) => { const rowCount = data.length; @@ -195,4 +199,4 @@ const applyStyles = (worksheet, data) => { text-align: right; margin-top: 10px; } - + \ No newline at end of file diff --git a/src/views/financialsector/CustomerBaseprice.vue b/src/views/financialsector/CustomerBaseprice.vue index d61ddd5b..888b9874 100644 --- a/src/views/financialsector/CustomerBaseprice.vue +++ b/src/views/financialsector/CustomerBaseprice.vue @@ -23,6 +23,9 @@ 删 除 + + 导 出
@@ -79,6 +82,9 @@
+ + + + + diff --git a/src/option/distribution/SeparateTheListInfo.js b/src/option/distribution/SeparateTheListInfo.js index 934841f9..9a6bccdf 100644 --- a/src/option/distribution/SeparateTheListInfo.js +++ b/src/option/distribution/SeparateTheListInfo.js @@ -19,7 +19,7 @@ export const columnList = [ { prop: 'newOrderCode', label: '拆单订单号', - type: 1, + type: 2, values: '', width: '150', fixed: false, @@ -29,7 +29,7 @@ export const columnList = [ { prop: 'orderCode', label: '原订单编号', - type: 1, + type: 2, values: '', width: '150', fixed: false, @@ -66,13 +66,27 @@ export const columnList = [ fixed: false, sortable: true, head: false, + checkarr: [ + { + label: '未完成', + value: 1, + }, + { + label: '已完成', + value: 2, + }, + { + label: '已撤回', + value: 3, + }, + ], }, // 1.2.3 // 未完成 已完成 已撤销 { prop: 'customerName', label: '客户姓名', - type: 1, + type: 2, values: '', width: '150', fixed: false, @@ -82,7 +96,7 @@ export const columnList = [ { prop: 'customerTelephone', label: '客户电话', - type: 1, + type: 2, values: '', width: '150', fixed: false, @@ -92,7 +106,7 @@ export const columnList = [ { prop: 'customerAddress', label: '客户地址', - type: 1, + type: 2, values: '', width: '150', fixed: false, @@ -132,124 +146,55 @@ export const columnList = [ }, ]; - - - /** 详情 */ export const TccolumnList = [ + { + prop: '', + label: '序号', + type: 12, + values: '', + width: '50', + fixed: true, + }, - { - prop: '', - label: '序号', - type: 12, - values: '', - width: '50', - fixed: true, - }, - - { - prop: 'orderCode', - label: '包条码', - type: 1, - values: '', - width: '150', - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'orderCode', - label: '物料编码', - type: 1, - values: '', - width: '150', - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'taskNumber', - label: '拆单件数', - type: 1, - values: '', - width: '150', - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'number', - label: '已拆件数', - type: 1, - values: '', - width: '150', - fixed: false, - sortable: true, - head: false, - }, - - { - prop: 'stateNameS', - label: '拆单状态', - type: 3, - values: '', - width: '150', - fixed: false, - sortable: true, - head: false, - }, - // 1.2.3 - // 未完成 已完成 已撤销 - { - prop: 'customerName', - label: '客户姓名', - type: 1, - values: '', - width: '150', - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'customerTelephone', - label: '客户电话', - type: 1, - values: '', - width: '150', - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'customerAddress', - label: '客户地址', - type: 1, - values: '', - width: '150', - fixed: false, - sortable: true, - head: false, - }, - - { - prop: 'finishTime', - label: '完成时间', - type: 1, - values: '', - width: '150', - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'createUser', - label: '操作人', - type: 1, - values: '', - width: '150', - fixed: false, - sortable: true, - head: false, - }, - ]; - \ No newline at end of file + { + prop: 'packageCode', + label: '包条码', + type: 1, + values: '', + width: '150', + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'materielNo', + label: '物料编码', + type: 1, + values: '', + width: '150', + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'materiel', + label: '物料名称', + type: 1, + values: '', + width: '150', + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'category', + label: '品类', + type: 1, + values: '', + width: '150', + fixed: false, + sortable: true, + head: false, + }, +]; diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue index dcf0f4ba..659a161c 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue @@ -964,6 +964,29 @@ + + + + + + + + + @@ -994,6 +1017,7 @@ import { import{compressImageBlob } from '@/components/IMGcompressor/imgcompressor.js' import { showOrderPackgeCode } from '@/api/distribution/distributionStockArticle'; import { exportBlob } from '@/api/common'; +import DeleteWarningDialog from '@/components/popupnotification/popupnotification.vue' import { downloadXls } from '@/utils/util'; import { dateNow } from '@/utils/date'; import NProgress from 'nprogress'; @@ -1023,10 +1047,16 @@ import { setNodeHeight } from '@/utils/util.js'; import { AbnormalReview } from '@/option/distribution/DeliveryExceptionReview.js'; import print from '@/utils/print'; import { useStore } from 'vuex'; - +import { Delete, Edit, Search, Share, Upload } from '@element-plus/icons-vue' export default { + components: { + DeleteWarningDialog + }, data() { return { + DataRwo:{}, + popupnotification:false,// + Deleteloading:false, ViRejectselect: [ { value: true, @@ -4573,7 +4603,58 @@ export default { }, }); }, + + // 取消备货接口 + Cancelstocking(data){ + this.loading = true; + cancelReservationPackage(data) + .then(res => { + if (res.data.code === 200) { + this.$message.success(res.data.msg); + this.getReservationInventoryPackageListInfo(this.page); + } + }) + .catch(error => { + console.log(error); + + }).finally(()=>{ + this.loading = false; + }); + }, + // 确认删除备货 + confirmdelete(){ + + }, + // 关闭 + handleDialogClose(){ + this.popupnotification=false + }, + // 确定事件 + handleDialogConfirm(){ + this.loading = true; //开启加载 + let data = { + deliveryId: this.deliveryId, + reservationId: this.wid, + type: 2, + packageIds:'', + }; + if(this.selectionList.length){ + data.packageIds= this.selectionList.map(item => item.id).join(',');//批量取消 + }else{ + data.packageIds= this.DataRwo.id;//单个取消 + } + this.Cancelstocking(data) + this.popupnotification=false; + + }, + // 计划取消 cancelReservationInventoryPackage(row) { + this.DataRwo=row + console.log(row) + if(row.stockStatus ==20 || row.stockStatusName =="已备货"){ + this.popupnotification=true + return + } this.$confirm('是否计划取消？') .then(() => { this.loading = true; //开启加载 @@ -4583,17 +4664,7 @@ export default { type: 2, packageIds: row.id, }; - this.loading = true; - cancelReservationPackage(data) - .then(res => { - if (res.data.code === 200) { - this.$message.success(res.data.msg); - this.getReservationInventoryPackageListInfo(this.page); - } - }) - .catch(res => { - this.loading = false; - }); + this.Cancelstocking(data) }) .catch(() => {}); }, @@ -5013,6 +5084,13 @@ export default { }); return; } + // 查询是否有已经备货的 + let StockupState= this.selectionList.find(item=>item.stockStatus == 20 || item.stockStatusName =="已备货") + if(StockupState){ + this.popupnotification=true + return + } + this.$confirm('是否进行批量计划取消？') .then(() => { this.loading = true; //开启加载 @@ -5614,6 +5692,8 @@ export default { this.loading = false; }); }, + + //一键签收 handleSignone(row) { if (row.isHaveAbnormalPackage == 2) { @@ -5936,4 +6016,45 @@ export default { align-items: center; justify-content: center; } +// :deep(.popupnotification){ +// .el_dialog_title{ +// display: flex; +// align-items: center; +// border-bottom: 1px solid #FF5722; +// padding-bottom: 5px; +// border-radius: 21px; +// padding: 0 4px; +// i{ +// color: #ff0000; +// margin-right: 8px; +// } + +// } +// .el_delte_button{ +// color: white; +// background-color: #F44336; +// border: 1px solid #E91E63; +// span{ +// align-items: flex-end; +// } +// } +// .el-dialog__body{ +// padding-top: 8px; +// } +// .el_content{ +// margin-top: 10px; +// border: 1px dashed #F44336; +// padding: 31px; +// border-radius: 4px; +// position: relative; +// .el_content_icon{ +// position: absolute; +// top: -13px; +// right: -8px; +// font-size: 26px; +// color: #F44336; +// } +// } +// } + diff --git a/src/views/distribution/inventory/delivery/SeparateTheList.vue b/src/views/distribution/inventory/delivery/SeparateTheList.vue index 3ca41de6..077e15d7 100644 --- a/src/views/distribution/inventory/delivery/SeparateTheList.vue +++ b/src/views/distribution/inventory/delivery/SeparateTheList.vue @@ -262,7 +262,6 @@ const searchChange = () => { /** 清空表单 */ const searchReset = () => { details.query = {}; - details.stockupDate = []; details.page.currentPage = 1; handleClearTableQuery(details.columnList); onLoad(); diff --git a/src/views/distribution/inventory/delivery/SeparateTheListInfo.vue b/src/views/distribution/inventory/delivery/SeparateTheListInfo.vue index 2864b2fc..fd8e03c9 100644 --- a/src/views/distribution/inventory/delivery/SeparateTheListInfo.vue +++ b/src/views/distribution/inventory/delivery/SeparateTheListInfo.vue @@ -96,8 +96,8 @@ { const inputsc = (index, row) => { details.query[row.prop] = index; processRowProperty(index, row, details); - test(details.query); + onLoad(); }; // 实例函数 const test = val => {}; @@ -276,6 +278,7 @@ const timesc = (index, row) => { if (!index) { delete details.query[row.prop]; } + onLoad(); }; /** 表格表头输入框搜索 */ @@ -285,6 +288,7 @@ const btnsc = val => { /** 表格表头下拉框选择 */ const selectsc = (index, row) => { processRowProperty(index, row, details); + onLoad(); }; /** 表格表头复选框选择 */ const selectionChange = list => { @@ -365,22 +369,33 @@ const onLoad = () => { } }); }; -const view = (row) => { +const view = row => { dialogVisible.value = true; - gieInfo(row) + gieInfo(row); setTimeout(() => { const _node = document.querySelector('.TCtableNode'); setNodeHeight(_node, '', true); }, 500); }; -const gieInfo=(row)=>{ - let data={ - taskId:row.id - } - $_gettaskdetail(data).then(res=>{ - console.log(res,'详情'); +const gieInfo = row => { + let data = { + taskId: row.id, + }; + details.loadingObj.packageListLoading = true; + $_gettaskdetail(data) + .then(res => { + console.log(res, '详情'); + if (res.data.code == 200) { + details.Tcdata = res.data.data.packageList || []; + } }) -} + .catch(error => { + console.log(error); + }) + .finally(() => { + details.loadingObj.packageListLoading = false; + }); +}; // 页面初始化方法 const pageOnlaod = () => { onLoad();