diff --git a/src/views/Pricesystem/ListOfPriceSystems.vue b/src/views/Pricesystem/ListOfPriceSystems.vue index 71cc4dbf..1c20c9f8 100644 --- a/src/views/Pricesystem/ListOfPriceSystems.vue +++ b/src/views/Pricesystem/ListOfPriceSystems.vue @@ -161,7 +161,7 @@ import { getDictionaryBiz } from '@/api/system/dict'; //字典 import { processRowProperty, setNodeHeight } from '@/utils/util'; import functions from '@/utils/functions.js'; import { ElMessageBox, ElMessage } from 'element-plus'; -import { downloadXls } from '@/utils/util'; +import { downloadXls, deepClone } from '@/utils/util'; import { useStore } from 'vuex'; import dayjs from 'dayjs'; const $router = useRouter(); //跳转 @@ -205,7 +205,7 @@ const details = reactive({ /** 时间选择器数据 */ stockupDate: [], /** 列表 */ - columnList, + columnList: deepClone(columnList), /** 列表数据 */ data: [], diff --git a/src/views/aftersales/WorkorderTimeout.vue b/src/views/aftersales/WorkorderTimeout.vue index 50c9409a..7e1de5be 100644 --- a/src/views/aftersales/WorkorderTimeout.vue +++ b/src/views/aftersales/WorkorderTimeout.vue @@ -88,7 +88,7 @@ import { ref, reactive, toRefs, computed, onMounted, nextTick, watch } from 'vue'; import { columnList } from '@/option/aftersales/WorkorderTimeout.js'; import { getDictionaryBiz } from '@/api/system/dict'; //字典 -import { processRowProperty } from '@/utils/util'; +import { processRowProperty, deepClone } from '@/utils/util'; const details = reactive({ /** 是否开启搜索 */ search: false, @@ -127,7 +127,7 @@ const details = reactive({ /** 时间选择器数据 */ stockupDate: [], /** 列表 */ - columnList, + columnList: deepClone(columnList), /** 列表数据 */ data: [{}], @@ -207,13 +207,10 @@ const showdrawer = _flag => { const inputsc = (index, row) => { details.query[row.prop] = index; processRowProperty(index, row, details); - test(details.query); - + test(details.query); }; // 实例函数 -const test=(val)=>{ - -} +const test = val => {}; /** 表格表头时间选择 */ const timesc = (index, row) => { console.log(index, row); diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue index d1b5e319..7575f456 100644 --- a/src/views/aftersales/aftersalesWorkOrder.vue +++ b/src/views/aftersales/aftersalesWorkOrder.vue @@ -205,7 +205,12 @@ - + @@ -382,7 +387,7 @@
-
勾选数量:{{details.selectionList.length}}
+
勾选数量:{{ details.selectionList.length }}
{ await DataRendering(TabPermissions.value, details.query, true); TabList.value.find(res => res.name == TabPermissions.value).request = false; return; - console.log('没有执行'); - if (TabPermissions.value == '4') { - // 理赔金额未出 - settlementclaim(details.query); - return; - } - - if (AppealStatusT.value && TabPermissions.value == '6') { - // 申诉列表 - appealFn(details.query); - return; - } - if (TabPermissions.value == '8') { - // 待回复 - ProcessingPartyFun(details.query); - return; - } - if (TabPermissions.value == '7') { - TimeoutHandling(details.query); //超时未处理 - return; - } - - IndexTable(details.query); //首页初始化信息 // ======= @@ -2576,20 +2555,6 @@ const inputsc = async (index, row) => { const searchChange = () => { DataRendering(TabPermissions.value, details.query, true); return; - - if (ClaimStatus.value) { - // 表示这是理赔查询 - settlementclaim(); - details.search = false; //关闭搜索 - return; - } - - details.search = false; //关闭搜索 - if (!ProcessingPartyState.value) { - IndexTable(details.query); //首页初始化信息 - } else { - ProcessingPartyFun(details.query); //处理方信息 - } }; const emptyvalues = data => { @@ -2637,15 +2602,6 @@ const timesc = async (index, row) => { await DataRendering(TabPermissions.value, details.query, true); TabList.value.find(res => res.name == TabPermissions.value).request = false; return; - - console.log(index, row); - if (!!index) { - index = dayjs(index).format('YYYY-MM-DD'); - } - details.query[row.prop] = index; - if (!index) { - delete details.query[row.prop]; - } }; /** 表格表头输入框搜索 */ @@ -2664,30 +2620,6 @@ const selectsc = async (index, row) => { TabList.value.find(res => res.name == TabPermissions.value).request = false; return; - - if (TimeoutStatus.value) { - // 超时列表 - TimeoutHandling(details.query); - return; - } - - if (AppealStatus.value) { - // 申诉列表 - appealFn(details.query); - return; - } - - if (ClaimStatus.value) { - // 这是理赔搜索 - settlementclaim(details.query); - return; - } - - if (!ProcessingPartyState.value) { - IndexTable(details.query); //首页初始化信息 - } else { - ProcessingPartyFun(details.query); //处理方信息 - } }; // 反字典公共请求 @@ -2716,30 +2648,6 @@ const currentChange = async val => { await DataRendering(TabPermissions.value, details.query, true); TabList.value.find(res => res.name == TabPermissions.value).request = false; return; - // 超时 - if (TimeoutStatus.value) { - TimeoutHandling(details.query); - return; - } - - if (AppealStatus.value) { - // 申诉列表 - appealFn(details.query); - return; - } - - if (ClaimStatus.value) { - // 这是理赔 - settlementclaim(details.query); - return; - } - - if (!ProcessingPartyState.value) { - //表示当前不是处理方 - IndexTable(details.query); - } else { - ProcessingPartyFun(details.query); - } }; // 每页多少条 const sizeChange = async val => { @@ -2748,29 +2656,6 @@ const sizeChange = async val => { await DataRendering(TabPermissions.value, details.query, true); TabList.value.find(res => res.name == TabPermissions.value).request = false; return; - // 超时 - if (TimeoutStatus.value) { - TimeoutHandling(details.query); - return; - } - if (AppealStatus.value) { - // 申诉列表 - appealFn(details.query); - return; - } - - if (ClaimStatus.value) { - // 这是理赔 - settlementclaim(details.query); - return; - } - - if (!ProcessingPartyState.value) { - //表示当前不是处理方 - IndexTable(details.query); - } else { - ProcessingPartyFun(details.query); - } }; const changeProcessingResults = val => { // 首先删除取消的项目 @@ -2939,13 +2824,12 @@ const appealFn = val => { // 申诉列表 const AppealTab = val => { - console.log(val, '仲裁中当前列表'); - console.log(arbitration.value,'菜单'); - arbitrationTemp.value=val - - if (val == 0) { - arbitrationTemp.value=0 + console.log(arbitration.value, '菜单'); + arbitrationTemp.value = val; + + if (val == 0) { + arbitrationTemp.value = 0; AppealStatusT.value = false; //申诉列表关闭 Tableheaderswitching(columnList); //切换表头 console.log('处理完毕'); @@ -2958,8 +2842,7 @@ const AppealTab = val => { }; IndexTable(data, true); } else { - - arbitrationTemp.value=1 + arbitrationTemp.value = 1; AppealListFn(); //申诉列表函数 } @@ -2970,7 +2853,7 @@ const AppealTab = val => { // 申诉列表公共函数 function AppealListFn(val) { AppealStatusT.value = true; //申诉列表开启 - console.log(AppealStatusT.value,'AppealStatusT.value'); + console.log(AppealStatusT.value, 'AppealStatusT.value'); data.workOrderStatus = ''; console.log(data.workOrderStatus, '当前搜索状态'); Tableheaderswitching(AppealList); //切换表头 @@ -3165,7 +3048,6 @@ const DataRendering = (val, input, Refresh) => { IndexTable(data, Refresh); } else if (val == 6 && AppealStatusT.value) { - // 申诉列表 Tableheaderswitching(AppealList); //切换表头 console.log('申诉列表'); @@ -3173,8 +3055,8 @@ const DataRendering = (val, input, Refresh) => { details.query.workOrderStatus = null; AppealListFn(data, Refresh); //申诉列表函数 } else if (val == 6) { - console.log(arbitrationTemp.value,'arbitrationTemp.value'); - console.log(AppealStatusT.value,'AppealStatusT.value'); + console.log(arbitrationTemp.value, 'arbitrationTemp.value'); + console.log(AppealStatusT.value, 'AppealStatusT.value'); // 完结 ProcessingPartyState.value = false; //关闭处理方 data.workOrderStatus = 80; @@ -3235,107 +3117,6 @@ const tabChenge = async (val, input, Refresh = false) => { DataRendering(TabPermissions.value, input, Refresh); return; - if (val == 0) { - ProcessingPartyState.value = false; //关闭处理方 - ArbitrationStatus.value = true; //可以以申请仲裁 - if (UserPermissions.value == '仓库客服') { - //全部 - data.workOrderStatus = 1000; - details.query.workOrderStatus = 1000; - Tableheaderswitching(columnList); - IndexTable(data); - } else { - details.query.workOrderStatus = null; - Tableheaderswitching(columnList); - IndexTable(); - } - } else if (val == 1) { - // 处理中 - if (UserPermissions.value == '仓库客服') { - data.workOrderStatus = 20; - details.query.workOrderStatus = 20; - } else { - data.workOrderStatus = 40; - details.query.workOrderStatus = 40; - } - ProcessingPartyState.value = false; //关闭处理方 - ArbitrationStatus.value = true; //可以申请仲裁 - Tableheaderswitching(columnList); - IndexTable(data); - } else if (val == 2) { - //处理完毕 - data.workOrderStatus = 30; - details.query.workOrderStatus = 30; - ProcessingPartyState.value = false; //关闭处理方 - ArbitrationStatus.value = false; //不可以申请仲裁 - Tableheaderswitching(columnList); - IndexTable(data); - } else if (val == 3) { - // 待处理 - ProcessingPartyState.value = true; //开启处理方 - if (UserPermissions.value != '仓库客服') { - data.workOrderStatus = 500; - details.query.workOrderStatus = 500; - } else { - data.workOrderStatus = 10; - details.query.workOrderStatus = 10; - } - ArbitrationStatus.value = true; //可以申请仲裁 - Tableheaderswitching(columnList); - IndexTable(data); - } else if (val == 4) { - // 理赔金额未出 - ProcessingPartyState.value = false; //关闭处理方 - details.query.workOrderStatus = null; - ArbitrationStatus.value = false; //不可以申请仲裁 - Tableheaderswitching(Claimsfield); //切换表格 - settlementclaim(data); - } else if (val == 5) { - // 仲裁中 - ProcessingPartyState.value = false; //关闭处理方 - data.workOrderStatus = 70; - details.query.workOrderStatus = 70; - ArbitrationStatus.value = false; //不可以申请仲裁 - Tableheaderswitching(columnList); //表头切换 - IndexTable(data); - } else if (val == 6 && AppealStatusT.value) { - console.log('申诉列表'); - data.workOrderStatus = null; - details.query.workOrderStatus = null; - AppealListFn(data); //申诉列表函数 - } else if (val == 6) { - // 完结 - ProcessingPartyState.value = false; //关闭处理方 - data.workOrderStatus = 80; - details.query.workOrderStatus = 80; - ArbitrationStatus.value = false; //不可以申请仲裁 - Tableheaderswitching(columnList); //表头切换 - IndexTable(data); - var bodyContent = document.querySelectorAll('.maboxhi'); - const _height = getWinHight(); - // 设置列表的高度 - bodyContent.forEach(val => { - val.style.height = _height - val.getBoundingClientRect().top - (65 + 20) + 'px'; - }); - } else if (val == 7) { - // 超时未处理 - ProcessingPartyState.value = false; //关闭处理方 - data.workOrderStatus = null; - details.query.workOrderStatus = null; - ArbitrationStatus.value = false; //不可以申请仲裁 - Tableheaderswitching(timeoutList); //表头切换 - TimeoutHandling(); //调用超时未出理 - } else if (val == 8) { - // 待回复按钮 - if (UserPermissions.value == '仓库客服') { - // 不是仓库客服看不见待回复按钮 - data.workOrderStatus = null; - details.query.workOrderStatus = null; - Tableheaderswitching(columnList); - ProcessingPartyFun(data); - } - } - console.log('执行完毕'); }; /** * 设置列表 -- 固定函数 @@ -3443,11 +3224,6 @@ const reply = val => { }, }); return; - console.log(val, 'ID++++++++'); - console.log(val.row); - dialogcustomerService.value = true; //开启回复弹窗 - ListRow.value = val.row; //存储当前行点击数据 - FKList(); }; // 处理方数据 const ProcessingParty = () => { @@ -4722,7 +4498,6 @@ const AssignSubmission = () => { display: flex; align-items: flex-end; margin-bottom: 10px; - } .el-times { :deep(.el-input__wrapper) { diff --git a/src/views/aftersales/aftersalesWorkOrderend.vue b/src/views/aftersales/aftersalesWorkOrderend.vue index 6eb7df48..411ac27b 100644 --- a/src/views/aftersales/aftersalesWorkOrderend.vue +++ b/src/views/aftersales/aftersalesWorkOrderend.vue @@ -791,10 +791,14 @@ -
- 操作人

Update Github template

-
操作事件

Tom committed 2018/4/12 20:46

- +
+ 操作人 +

Update Github template

+
+
+ 操作事件 +

Tom committed 2018/4/12 20:46

+
@@ -909,7 +913,7 @@ import { columnList, recordList } from '@/option/aftersales/vueTvemp.js'; import { getToken } from '@/utils/auth'; import { useRoute, useRouter } from 'vue-router'; import { getDictionaryBiz } from '@/api/system/dict'; -import { computeNumber, isNumber, AddressClosed } from '@/utils/util'; +import { computeNumber, isNumber, AddressClosed, deepClone } from '@/utils/util'; import { useStore } from 'vuex'; // 获取vuex仓库 const $store = useStore(); @@ -1051,12 +1055,12 @@ const details = reactive({ /** 时间选择器数据 */ stockupDate: [], /** 列表 */ - columnList, + columnList: deepClone(columnList), /** 列表数据 */ data: [], // 处理记录 - recordList, + recordList: deepClone(recordList), // 处理记录数据 recorddata: [], /** 页面loading */ diff --git a/src/views/basicdata/ConfigureBillingAndWarehousing/list.vue b/src/views/basicdata/ConfigureBillingAndWarehousing/list.vue index 8459b2f5..fd27b961 100644 --- a/src/views/basicdata/ConfigureBillingAndWarehousing/list.vue +++ b/src/views/basicdata/ConfigureBillingAndWarehousing/list.vue @@ -204,7 +204,7 @@ import dayjs from 'dayjs'; import { mapGetters } from 'vuex'; /** 获取字典 */ import { getDictionaryBiz } from '@/api/system/dict'; -import { downloadXls, setNodeHeight, debounce } from '@/utils/util'; +import { downloadXls, setNodeHeight, debounce ,deepClone} from '@/utils/util'; import { columnList } from '@/option/basicdata/ConfigureBillingAndWarehousing'; import { postPageList, @@ -268,7 +268,7 @@ const details = reactive({ /** 时间选择器数据 */ stockupDate: [], /** 列表 */ - columnList, + columnList: deepClone(columnList), /** 列表数据 */ data: [], /** 页面loading */ diff --git a/src/views/basicdata/TripartiteMaterial/list.vue b/src/views/basicdata/TripartiteMaterial/list.vue index a9a5ba6c..612f66b9 100644 --- a/src/views/basicdata/TripartiteMaterial/list.vue +++ b/src/views/basicdata/TripartiteMaterial/list.vue @@ -220,7 +220,7 @@ import dayjs from 'dayjs'; import { mapGetters } from 'vuex'; /** 获取字典 */ import { getDictionaryBiz } from '@/api/system/dict'; -import { downloadXls, setNodeHeight, debounce } from '@/utils/util'; +import { downloadXls, setNodeHeight, debounce, deepClone } from '@/utils/util'; import { columnList } from '@/option/basicdata/TripartiteMaterial'; import { postPageList, @@ -284,7 +284,7 @@ const details = reactive({ /** 时间选择器数据 */ stockupDate: [], /** 列表 */ - columnList, + columnList: deepClone(columnList), /** 列表数据 */ data: [], /** 页面loading */ diff --git a/src/views/basicdata/driverArtery/basicdataDriverArtery.vue b/src/views/basicdata/driverArtery/basicdataDriverArtery.vue index 79e79d86..119bcfe1 100644 --- a/src/views/basicdata/driverArtery/basicdataDriverArtery.vue +++ b/src/views/basicdata/driverArtery/basicdataDriverArtery.vue @@ -142,7 +142,7 @@ import { columnList } from '@/option/basicdata/basicdataDriverArtery1'; import { mapGetters } from 'vuex'; import { exportBlob } from '@/api/common'; import { getToken } from '@/utils/auth'; -import { downloadXls, setNodeHeight, debounce } from '@/utils/util'; +import { downloadXls, setNodeHeight, debounce, deepClone } from '@/utils/util'; import { dateNow } from '@/utils/date'; import NProgress from 'nprogress'; import 'nprogress/nprogress.css'; @@ -153,7 +153,7 @@ export default { return { search: false, query: {}, - columnList, + columnList: deepClone(columnList), data: [], drawerShow: false, page: { diff --git a/src/views/basicdata/warehouse/warehouse/basicdataWarehouseTemp.vue b/src/views/basicdata/warehouse/warehouse/basicdataWarehouseTemp.vue index 69c05749..75b675ee 100644 --- a/src/views/basicdata/warehouse/warehouse/basicdataWarehouseTemp.vue +++ b/src/views/basicdata/warehouse/warehouse/basicdataWarehouseTemp.vue @@ -66,7 +66,7 @@
- + { console.log(file); }; -const ruleFormRef = ref() +const ruleFormRef = ref(); const handlePictureCardPreview = file => { dialogImageUrl.value = file.url; dialogVisible.value = true; @@ -621,10 +621,8 @@ const handleDownload = file => { console.log(file); }; const rules = reactive({ - name: [ - { required: true, message: '仓库名称', trigger: 'change' }, - ], -}) + name: [{ required: true, message: '仓库名称', trigger: 'change' }], +}); const Topquery = ref({}); //顶部搜索参数 const newlyaddload = ref(false); //新增弹窗 const AssessmentDepartment = ref([]); //考核部门 @@ -802,7 +800,7 @@ const details = reactive({ /** 时间选择器数据 */ stockupDate: [], /** 列表 */ - columnList, + columnList: deepClone(columnList), query: {}, /** 列表数据 */ data: [], @@ -992,7 +990,9 @@ const onLoad = val => { } if (item.grade) { // 仓库等级 - item.grade = gradeList.value.find(res => res.dictKey === String(item.grade) || res.dictValue === String(item.grade)).dictValue; + item.grade = gradeList.value.find( + res => res.dictKey === String(item.grade) || res.dictValue === String(item.grade) + ).dictValue; } }); } else { @@ -1132,79 +1132,10 @@ const DeleteInformation = val => { }; // 新增数据确定 const newlyaddSubmit = () => { - ruleFormRef.value.validate(valid=>{ - console.log(valid,'当前校验'); - }) - return - console.log(ruleFormRef); - if(ruleFormRef.value.validate){ - console.log('通过校验'); - }else{ - console.log('未通过校验'); - - } - return - console.log(Addform.value); - Addform.value.warehouseAddress = Addform.value.address[2]; //仓库地址 - Addform.value.longitude = Addform.value.address[0]; //精度 - Addform.value.latitude = Addform.value.address[1]; //维度 - console.log(AssessmentDepartment.value, '部门'); - Addform.value.departmentName = department.value.label; //部门名称 - Addform.value.startDate = dayjs(Addform.value.daterange[0]).format('YYYY-MM-DD'); //开始时间 - Addform.value.endDate = dayjs(Addform.value.daterange[1]).format('YYYY-MM-DD'); //结束时间 - if (Addform.value.paymentCodeUrlS) { - if (Addform.value.paymentCodeUrlS.length) { - Addform.value.paymentCodeUrl = Addform.value.paymentCodeUrlS[0].response.data.link; //收款码 - } - } - Addform.value.administrativeAreas = Addform.value.administrativeAreas.join(','); - Addform.value.provinceCode = Addform.value.addressInfo[0]; // 仓库地区一级 - Addform.value.cityCode = Addform.value.addressInfo[0]; // 仓库地区二级 - Addform.value.code = Addform.value.addressInfo[0]; // 仓库地区三级 - console.log(Addform.value); - let data = { - ...Addform.value, - }; - console.log(data, '准备提交的参数'); - if (dialogTitle.value == '新增') { - TCloading.value = true; - $_addsave(data) - .then(res => { - console.log(res, '新增之后返回值'); - if (res.data.code == 200) { - newlyaddload.value = false; //关闭新增弹窗 - Addform.value = {}; - ElMessage({ - message: res.data.msg, - type: 'success', - }); - onLoad(); - } - }) - .catch(() => {}) - .finally(() => { - TCloading.value = false; - }); - } else { - TCloading.value = true; - $_Postupdate(data) - .then(res => { - console.log(res, '编辑之后的值'); - if (res.data.code == 200) { - newlyaddload.value = false; //关闭新增弹窗 - Addform.value = {}; - ElMessage({ - message: res.data.msg, - type: 'success', - }); - onLoad(); - } - }) - .catch(() => {}) - .finally(() => { - TCloading.value = false; - }); - } + ruleFormRef.value.validate(valid => { + console.log(valid, '当前校验'); + }); + return; }; // 编辑信息 diff --git a/src/views/distribution/artery/AddVehicleStowage.vue b/src/views/distribution/artery/AddVehicleStowage.vue index 07f427a3..48857dce 100644 --- a/src/views/distribution/artery/AddVehicleStowage.vue +++ b/src/views/distribution/artery/AddVehicleStowage.vue @@ -671,11 +671,11 @@ const details = reactive({ /** 时间选择器数据 */ stockupDate: [], /** 订单池表头 */ - columnList, + columnList: deepClone(columnList), /** 调度池表头 */ - newColumnList, + newColumnList: deepClone(newColumnList), /** 节点信息列表表头 */ - nodeInfoColumnList, + nodeInfoColumnList: deepClone(nodeInfoColumnList), /** 列表数据 */ data: [], /** 节点信息数据 */ diff --git a/src/views/distribution/artery/TripartiteTransfer.vue b/src/views/distribution/artery/TripartiteTransfer.vue index f0ddc0b5..fd4aa365 100644 --- a/src/views/distribution/artery/TripartiteTransfer.vue +++ b/src/views/distribution/artery/TripartiteTransfer.vue @@ -481,9 +481,9 @@ const details = reactive({ /** 时间选择器数据 */ stockupDate: [], /** 列表 */ - columnList, + columnList: deepClone(columnList), /** 装车明细表头信息 */ - detailsColumnList, + detailsColumnList: deepClone(detailsColumnList), /** 修改的列表信息 */ editColumnList: [], /** 列表数据 */ diff --git a/src/views/distribution/artery/TripartiteTransferDetails.vue b/src/views/distribution/artery/TripartiteTransferDetails.vue index 9bda7045..19bab92e 100644 --- a/src/views/distribution/artery/TripartiteTransferDetails.vue +++ b/src/views/distribution/artery/TripartiteTransferDetails.vue @@ -316,7 +316,7 @@ import dayjs from 'dayjs'; import { mapGetters } from 'vuex'; /** 获取字典 */ import { getDictionaryBiz } from '@/api/system/dict'; -import { downloadXls, computeNumber, setNodeHeight, debounce } from '@/utils/util'; +import { downloadXls, computeNumber, setNodeHeight, debounce, deepClone } from '@/utils/util'; import { columnList, newColumnList } from '@/option/distribution/addVehicleStowage'; import { postloadFindLoadInitData, @@ -388,9 +388,9 @@ const details = reactive({ /** 修改的列表信息 */ editColumnList: [], /** 运单池 */ - columnList, + columnList: deepClone(columnList), /** 调度池 */ - newColumnList, + newColumnList: deepClone(newColumnList), /** 列表数据 */ oldData: [], /** 渲染数据 */ diff --git a/src/views/distribution/artery/VehicleArrivalManagement.vue b/src/views/distribution/artery/VehicleArrivalManagement.vue index fc1df972..fefa4454 100644 --- a/src/views/distribution/artery/VehicleArrivalManagement.vue +++ b/src/views/distribution/artery/VehicleArrivalManagement.vue @@ -520,7 +520,7 @@ const details = reactive({ /** 时间选择器数据 */ stockupDate: [], /** 列表 */ - columnList, + columnList: deepClone(columnList), /** 列表数据 */ data: [], /** 页面loading */ diff --git a/src/views/distribution/artery/VehicleStowage.vue b/src/views/distribution/artery/VehicleStowage.vue index baa74eb2..604d5017 100644 --- a/src/views/distribution/artery/VehicleStowage.vue +++ b/src/views/distribution/artery/VehicleStowage.vue @@ -435,7 +435,7 @@ import dayjs from 'dayjs'; import { mapGetters } from 'vuex'; /** 获取字典 */ import { getDictionaryBiz } from '@/api/system/dict'; -import { downloadXls, setNodeHeight, debounce } from '@/utils/util'; +import { downloadXls, setNodeHeight, debounce, deepClone } from '@/utils/util'; import { columnList, packageColumnList } from '@/option/distribution/VehicleStowage'; import { postloadCarsPageList, @@ -504,7 +504,7 @@ const details = reactive({ /** 时间选择器数据 */ stockupDate: [], /** 列表 */ - columnList, + columnList: deepClone(columnList), /** 列表数据 */ data: [], /** 页面loading */ @@ -548,7 +548,7 @@ const details = reactive({ /** 装载清单 */ listOfLoadedWagonsPopUp: false, }, - packageColumnList, + packageColumnList: deepClone(packageColumnList), /** 配置装车目的地数据 */ packageData: [], /** 配置装车目的地数据 -- 渲染数据 */ diff --git a/src/views/distribution/artery/VehicleStowageDetails.vue b/src/views/distribution/artery/VehicleStowageDetails.vue index e085b247..311982bd 100644 --- a/src/views/distribution/artery/VehicleStowageDetails.vue +++ b/src/views/distribution/artery/VehicleStowageDetails.vue @@ -414,7 +414,7 @@ import { import { postRemoveCarsLoadScan } from '@/api/distribution/truckLoadingDetails'; import { useRouter, useRoute } from 'vue-router'; import { useStore } from 'vuex'; -import { ElMessage, ElMessageBox, ElSpace } from 'element-plus'; +import { ElMessage, ElMessageBox } from 'element-plus'; /** 被合并的列 */ const mergeColumn = []; @@ -485,9 +485,9 @@ const details = reactive({ /** 修改的列表信息 */ editColumnList: [], /** 运单池 */ - detailsColumnList, + detailsColumnList: deepClone(detailsColumnList), /** 节点列表 */ - nodeInfoColumnList, + nodeInfoColumnList: deepClone(nodeInfoColumnList), nodeInfoData: [], /** 列表数据 */ oldData: [], diff --git a/src/views/distribution/artery/abnormalList.vue b/src/views/distribution/artery/abnormalList.vue index 3fb82528..dc6332b0 100644 --- a/src/views/distribution/artery/abnormalList.vue +++ b/src/views/distribution/artery/abnormalList.vue @@ -164,7 +164,7 @@ import dayjs from 'dayjs'; import { mapGetters } from 'vuex'; /** 获取字典 */ import { getDictionaryBiz } from '@/api/system/dict'; -import { downloadXls, setNodeHeight, getHtmls } from '@/utils/util'; +import { downloadXls, setNodeHeight, getHtmls, deepClone } from '@/utils/util'; import { columnList } from '@/option/distribution/abnormalList'; import { useRouter } from 'vue-router'; import { ElMessage, ElMessageBox } from 'element-plus'; @@ -212,7 +212,7 @@ const details = reactive({ /** 时间选择器数据 */ stockupDate: [], /** 列表 */ - columnList, + columnList: deepClone(columnList), /** 列表数据 */ data: [{}], /** 页面loading */ diff --git a/src/views/distribution/artery/addTripartiteTransfer.vue b/src/views/distribution/artery/addTripartiteTransfer.vue index 796a23e0..10ef09a6 100644 --- a/src/views/distribution/artery/addTripartiteTransfer.vue +++ b/src/views/distribution/artery/addTripartiteTransfer.vue @@ -432,7 +432,7 @@ import dayjs from 'dayjs'; import { mapGetters } from 'vuex'; /** 获取字典 */ import { getDictionaryBiz } from '@/api/system/dict'; -import { downloadXls, computeNumber, setNodeHeight, debounce } from '@/utils/util'; +import { downloadXls, computeNumber, setNodeHeight, debounce, deepClone } from '@/utils/util'; import { columnList, newColumnList } from '@/option/distribution/addVehicleStowage'; import { postloadFindLoadInitData, @@ -507,9 +507,9 @@ const details = reactive({ /** 修改的列表信息 */ editColumnList: [], /** 运单池 */ - columnList, + columnList: deepClone(columnList), /** 调度池 */ - newColumnList, + newColumnList: deepClone(newColumnList), /** 列表数据 */ newData: [], newRenderData: [], diff --git a/src/views/distribution/artery/directGoMarketDetails.vue b/src/views/distribution/artery/directGoMarketDetails.vue index 31a5ce2f..5b1a60c4 100644 --- a/src/views/distribution/artery/directGoMarketDetails.vue +++ b/src/views/distribution/artery/directGoMarketDetails.vue @@ -310,8 +310,8 @@ const details = reactive({ /** 时间选择器数据 */ stockupDate: [], /** 装车明细表头信息 */ - columnList, - detailsColumnList, + columnList: deepClone(columnList), + detailsColumnList: deepClone(detailsColumnList), /** 列表数据 */ data: [], /** 页面loading */ diff --git a/src/views/distribution/artery/handleLoadingDestination.vue b/src/views/distribution/artery/handleLoadingDestination.vue index fb70d01c..ffb533fc 100644 --- a/src/views/distribution/artery/handleLoadingDestination.vue +++ b/src/views/distribution/artery/handleLoadingDestination.vue @@ -90,7 +90,7 @@ import dayjs from 'dayjs'; import { mapGetters } from 'vuex'; /** 获取字典 */ import { getDictionaryBiz } from '@/api/system/dict'; -import { downloadXls, setNodeHeight, debounce } from '@/utils/util'; +import { downloadXls, setNodeHeight, debounce, deepClone } from '@/utils/util'; import { packageColumnList } from '@/option/distribution/VehicleStowage'; import { postDetermineHasNoFinalNode, @@ -153,7 +153,7 @@ const details = reactive({ }, }, ], - packageColumnList, + packageColumnList: deepClone(packageColumnList), /** 复选框选中数据 */ selectionList: [], /** 后续节点数据 */ diff --git a/src/views/distribution/artery/truckLoadingDetails.vue b/src/views/distribution/artery/truckLoadingDetails.vue index fa6ffb0b..c9224771 100644 --- a/src/views/distribution/artery/truckLoadingDetails.vue +++ b/src/views/distribution/artery/truckLoadingDetails.vue @@ -216,7 +216,7 @@ import { import { getShowAdvancePackgeCode } from '@/api/waybill/orderPackageListDetails'; /** 获取字典 */ import { getDictionaryBiz } from '@/api/system/dict'; -import { downloadXls, getHtmls, debounce, setNodeHeight } from '@/utils/util'; +import { downloadXls, getHtmls, debounce, setNodeHeight, deepClone } from '@/utils/util'; import { detailsColumnList } from '@/option/distribution/TripartiteTransfer'; import { useRouter, useRoute } from 'vue-router'; import print from '@/utils/print'; @@ -259,7 +259,7 @@ const details = reactive({ /** 时间选择器数据 */ stockupDate: [], /** 装车明细表头信息 */ - detailsColumnList, + detailsColumnList: deepClone(detailsColumnList), /** 列表数据 */ data: [], /** 页面loading */ diff --git a/src/views/distribution/artery/zeroAdditionalRecording.vue b/src/views/distribution/artery/zeroAdditionalRecording.vue index fdc5205e..a7bab771 100644 --- a/src/views/distribution/artery/zeroAdditionalRecording.vue +++ b/src/views/distribution/artery/zeroAdditionalRecording.vue @@ -261,7 +261,7 @@ import { postDeleteZeroSuppleById, postFindNextNodeList, } from '@/api/distribution/zeroAdditionalRecording'; -import { downloadXls, setNodeHeight, debounce } from '@/utils/util'; +import { downloadXls, setNodeHeight, debounce, deepClone } from '@/utils/util'; import { oldColumnList, newColumnList } from '@/option/distribution/zeroAdditionalRecording'; import { ElMessage } from 'element-plus'; import { useRoute, useRouter } from 'vue-router'; @@ -318,8 +318,8 @@ const details = reactive({ stockupDate: [], /** 列表 */ columnList: [], - oldColumnList, - newColumnList, + oldColumnList: deepClone(oldColumnList), + newColumnList: deepClone(newColumnList), /** 订单池数据 */ oldData: [], /** 调度池数据 */ diff --git a/src/views/distribution/inventory/BookingNote.vue b/src/views/distribution/inventory/BookingNote.vue index ea2272c3..481f1ecb 100644 --- a/src/views/distribution/inventory/BookingNote.vue +++ b/src/views/distribution/inventory/BookingNote.vue @@ -16,7 +16,7 @@
车次号: - {{ query.trainNumber }} + {{ query.customerTrain }}
diff --git a/src/views/distribution/inventory/CreateOrder.vue b/src/views/distribution/inventory/CreateOrder.vue index 2d970bb3..1ef6be1d 100644 --- a/src/views/distribution/inventory/CreateOrder.vue +++ b/src/views/distribution/inventory/CreateOrder.vue @@ -7,7 +7,7 @@ :inline="true" :rules="details.rules" :model="query" - class="el-fr-d" + class="table_form" label-width="100px" > @@ -940,6 +940,59 @@
+ + + + + + + + + + + + + + + + + + + +
+ 取 消 + 确 认 +
+ @@ -974,7 +1027,7 @@ import { debounce, getObjType, } from '@/utils/util'; -import { columnList, packageListColumnList } from '@/option/waybill/TemporaryStorageList'; +import { columnList } from '@/option/waybill/TemporaryStorageList'; import { getopenOrderAdvancePageList } from '@/api/waybill/TemporaryStorageList'; import { getLazyTreeAll } from '@/api/base/region'; import { ElMessage, ElMessageBox } from 'element-plus'; @@ -1008,6 +1061,8 @@ const $route = useRoute(); // 获取vuex let $store = useStore(); +const tableNode = ref(); + console.log('$store :>> ', $store); const details = reactive({ @@ -1481,7 +1536,7 @@ const details = reactive({ ], }, /** 列表 */ - columnList, + columnList: deepClone(columnList), /** 列表数据 */ haveDataData: [], notHaveDataData: [], @@ -1516,6 +1571,8 @@ const details = reactive({ columnListVisited: false, /** 是否继续开单 */ titleVisited: false, + /** 改单原因 */ + causeVisited: false, }, /** 列表Dom节点 */ listNode: '', @@ -1540,6 +1597,45 @@ const details = reactive({ /** 装卸费 */ // { name: '仓库存储费', key: 'storageFee' }, ], + /** 提交类型 */ + submitType: 'haveData' as 'haveData' | 'notHaveData', + /** 修改原因 */ + causeForm: {}, + /** 修改列表 */ + changeColumnList: [ + { + prop: 'itemName', + label: '修改项', + type: 1, + values: '', + width: '', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'oldValue', + label: '修改前', + type: 1, + values: '', + width: '', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'newValue', + label: '修改后', + type: 1, + values: '', + width: '', + checkarr: [], + fixed: false, + sortable: false, + }, + ], + /** 修改数据 */ + changeData: [], }); const info = ref({}); @@ -1728,6 +1824,8 @@ const initPageInfo = async (idsArr = []) => { details.query = { ...data, ...data.warehouseWaybill }; delete details.query.warehouseWaybill; + console.log('details.query :>> ', details.query); + details.query.openOrderUserName = details.query.agent; details.query.queryDestinationWarehouseName = details.query.destinationWarehouseName; details.query.openOrderDate = data.warehouseWaybill.createTime; details.query.orderCode = data.warehouseWaybill.orderNo; @@ -1992,6 +2090,7 @@ const handleChoose = () => { const ids = details.selectionList.map(val => val.id); // 请求页面数据 initPageInfo(ids); + details.submitType = details.orderStatus; details.popUpShow.columnListVisited = false; details.popUpShow.titleVisited = false; } catch (error) { @@ -2351,7 +2450,7 @@ const handleSubmit = (formEl: FormInstance | undefined) => { details.submitData = submitData; // 有数据开单 - if (details.orderStatus === 'haveData') res = await postOpenOrderOpenWaybill(submitData); + if (details.submitType === 'haveData') res = await postOpenOrderOpenWaybill(submitData); else { submitData.waybillType = 2; @@ -2401,28 +2500,35 @@ const handleSubmit = (formEl: FormInstance | undefined) => { const response = await postUpdateWaybillVerify(submitData); if (response.data.code !== 200) return; - if (!response.data.data) return ElMessage.warning('没有更改的数据'); - - ElMessageBox.alert(response.data.data.replaceAll(';', '
'), '被更改数据', { - dangerouslyUseHTMLString: true, - confirmButtonText: '确认', - callback: async (action: Action) => { - try { - details.loadingObj.submitLoadingBtn = true; - - const res = await postUpdateWaybill(submitData); - const { code, msg } = res.data; - if (code !== 200) return; - if (msg) ElMessage.success(msg); - - back(); - } catch (error) { - console.log('error :>> ', error); - } finally { - details.loadingObj.submitLoadingBtn = false; - } - }, - }); + if (!response.data.data || response.data.data.length === 0) + return ElMessage.warning('没有更改的数据'); + + details.changeData = response.data.data; + details.popUpShow.causeVisited = true; + await nextTick(); + + setNodeHeight(tableNode.value.$el, '40vh'); + + // ElMessageBox.alert(response.data.data.replaceAll(';', '
'), '被更改数据', { + // dangerouslyUseHTMLString: true, + // confirmButtonText: '确认', + // callback: async (action: Action) => { + // try { + // details.loadingObj.submitLoadingBtn = true; + + // const res = await postUpdateWaybill(submitData); + // const { code, msg } = res.data; + // if (code !== 200) return; + // if (msg) ElMessage.success(msg); + + // back(); + // } catch (error) { + // console.log('error :>> ', error); + // } finally { + // details.loadingObj.submitLoadingBtn = false; + // } + // }, + // }); } const { code, msg } = res.data; if (code !== 200) return; @@ -2602,6 +2708,7 @@ const handleChooseGoods = (item, val) => { details.deepQuery = deepClone(details.query); details.orderStatus = $route.query.orderStatus; +details.submitType = $route.query.orderStatus; initPageInfo(); @@ -2622,14 +2729,20 @@ initPageInfo(); - \ No newline at end of file + diff --git a/src/views/reportforms/DeliveryDetails.vue b/src/views/reportforms/DeliveryDetails.vue index 94997e85..c268ad1c 100644 --- a/src/views/reportforms/DeliveryDetails.vue +++ b/src/views/reportforms/DeliveryDetails.vue @@ -4,8 +4,8 @@
- - + +
@@ -87,7 +87,7 @@ 清 空 - + @@ -165,13 +165,13 @@ import { ref, reactive, toRefs, computed, onMounted, nextTick, watch } from 'vue import { columnList } from '@/option/reportforms/DeliveryDetails.js'; import { getDictionaryBiz } from '@/api/system/dict'; //字典 import { processRowProperty, setNodeHeight } from '@/utils/util'; -import { $_getdetails, $_exportDetails,$_getMyWarehouseList } from '@/api/reportforms/index.js'; +import { $_getdetails, $_exportDetails, $_getMyWarehouseList } from '@/api/reportforms/index.js'; import { ElMessageBox } from 'element-plus'; -import { downloadXls } from '@/utils/util'; +import { downloadXls, deepClone } from '@/utils/util'; import functions from '@/utils/functions.js'; import dayjs from 'dayjs'; -const queryCarn=ref({});//查询顶部 -const TopQuery=ref({});//查询顶部 +const queryCarn = ref({}); //查询顶部 +const TopQuery = ref({}); //查询顶部 const warehouseList = ref([]); //仓库列表 const DeliveryTypeList = ref([ { @@ -197,12 +197,10 @@ const DeliverygenericList = ref([ }, ]); //配送类型 - // 签收状态 -const Signingstatus=ref( - [ -{ +const Signingstatus = ref([ + { label: '已签收', value: '已签收', }, @@ -211,8 +209,7 @@ const Signingstatus=ref( label: '未签收', value: '未签收', }, -] -) +]); const details = reactive({ /** 是否开启搜索 */ search: false, @@ -251,7 +248,7 @@ const details = reactive({ /** 时间选择器数据 */ stockupDate: [], /** 列表 */ - columnList, + columnList: deepClone(columnLists), /** 列表数据 */ data: [], @@ -362,65 +359,65 @@ const selectionChange = list => { details.selectionList = list; }; // 清空 -const searchReset=()=>{ +const searchReset = () => { TopQuery.value = {}; - TopQuery.value.warehouseNameRange=[] + TopQuery.value.warehouseNameRange = []; queryCarn.value = {}; details.query = {}; details.columnList.forEach(item => { - item.values = ''; - }); - details.page.total = 0 - details.data = [] + item.values = ''; + }); + details.page.total = 0; + details.data = []; // getrain(); -} +}; // 网页顶部搜索按钮 const searchChange = () => { // 日期处理 if (TopQuery.value.time) { queryCarn.value.startTaskTime = dayjs(TopQuery.value.time[0]).format('YYYY-MM-DD HH:mm:ss'); //开始日期 queryCarn.value.endTaskTime = dayjs(TopQuery.value.time[1]).format('YYYY-MM-DD HH:mm:ss'); //结束日期 - }else{ - delete queryCarn.value.startTaskTime - delete queryCarn.value.endTaskTime + } else { + delete queryCarn.value.startTaskTime; + delete queryCarn.value.endTaskTime; } // 仓库处理 if (TopQuery.value.warehouseNameRange.length) { queryCarn.value.warehouseNameRange = TopQuery.value.warehouseNameRange.join(','); - }else{ - delete queryCarn.value.warehouseNameRange; + } else { + delete queryCarn.value.warehouseNameRange; } // 车辆处理 - if(TopQuery.value.vehicleNameRange){ - queryCarn.value.vehicleNameRange = TopQuery.value.vehicleNameRange - }else{ + if (TopQuery.value.vehicleNameRange) { + queryCarn.value.vehicleNameRange = TopQuery.value.vehicleNameRange; + } else { delete queryCarn.value.vehicleNameRange; } // 司机处理 - if(TopQuery.value.driverNameRange){ - queryCarn.value.driverNameRange = TopQuery.value.driverNameRange - }else{ + if (TopQuery.value.driverNameRange) { + queryCarn.value.driverNameRange = TopQuery.value.driverNameRange; + } else { delete queryCarn.value.driverNameRange; } // 客户处理 - if(TopQuery.value.consigneeRange){ - queryCarn.value.consigneeRange = TopQuery.value.consigneeRange - }else{ + if (TopQuery.value.consigneeRange) { + queryCarn.value.consigneeRange = TopQuery.value.consigneeRange; + } else { delete queryCarn.value.consigneeRange; } // 运单收货人 - if(TopQuery.value.consigneeNameRange){ - queryCarn.value.consigneeNameRange = TopQuery.value.consigneeNameRange - }else{ + if (TopQuery.value.consigneeNameRange) { + queryCarn.value.consigneeNameRange = TopQuery.value.consigneeNameRange; + } else { delete queryCarn.value.consigneeNameRange; } // 运单收货人 - if(TopQuery.value.consigneeNameRange){ - queryCarn.value.consigneeNameRange = TopQuery.value.consigneeNameRange + if (TopQuery.value.consigneeNameRange) { + queryCarn.value.consigneeNameRange = TopQuery.value.consigneeNameRange; } console.log(queryCarn.value, '顶部搜索触发'); - getrain(queryCarn.value) + getrain(queryCarn.value); // details.search = false; //关闭搜索 }; // 每页多少条 @@ -473,7 +470,7 @@ const onLoad = () => { columnList.find(res => res.label == '仓库').checkarr = warehouseList.value; columnList.find(res => res.label == '司机签收状态').checkarr = []; columnList.find(res => res.label == '司机签收状态').checkarr = Signingstatus.value; - + console.log(columnList, 'columnList'); // 获取仓库 @@ -490,7 +487,7 @@ const onLoad = () => { }; onLoad(); // 获取数据 -const getrain = (val) => { +const getrain = val => { let data = { current: details.page.currentPage, size: details.page.pageSize, diff --git a/src/views/reportforms/DeliveryTrainNumber.vue b/src/views/reportforms/DeliveryTrainNumber.vue index 5efd3b94..09c68093 100644 --- a/src/views/reportforms/DeliveryTrainNumber.vue +++ b/src/views/reportforms/DeliveryTrainNumber.vue @@ -29,7 +29,6 @@ filterable placeholder="多选仓库搜索" style="width: 240px" - > { if (TopQuery.value.time) { queryCarn.value.startTaskTime = dayjs(TopQuery.value.time[0]).format('YYYY-MM-DD HH:mm:ss'); //开始日期 queryCarn.value.endTaskTime = dayjs(TopQuery.value.time[1]).format('YYYY-MM-DD HH:mm:ss'); //结束日期 - }else{ - delete queryCarn.value.startTaskTime - delete queryCarn.value.endTaskTime + } else { + delete queryCarn.value.startTaskTime; + delete queryCarn.value.endTaskTime; } // 仓库处理 if (TopQuery.value.warehouseNameRange.length) { queryCarn.value.warehouseNameRange = TopQuery.value.warehouseNameRange.join(','); - }else{ - delete queryCarn.value.warehouseNameRange; + } else { + delete queryCarn.value.warehouseNameRange; } // 车辆处理 - if(TopQuery.value.vehicleNameRange){ - queryCarn.value.vehicleNameRange = TopQuery.value.vehicleNameRange - }else{ + if (TopQuery.value.vehicleNameRange) { + queryCarn.value.vehicleNameRange = TopQuery.value.vehicleNameRange; + } else { delete queryCarn.value.vehicleNameRange; } // 司机处理 - if(TopQuery.value.driverNameRange){ - queryCarn.value.driverNameRange = TopQuery.value.driverNameRange - }else{ + if (TopQuery.value.driverNameRange) { + queryCarn.value.driverNameRange = TopQuery.value.driverNameRange; + } else { delete queryCarn.value.driverNameRange; } console.log(queryCarn.value, '顶部搜索触发'); - getrain(queryCarn.value) + getrain(queryCarn.value); // details.search = false; //关闭搜索 }; //顶部清空搜索 -const searchReset=()=>{ - TopQuery.value={} - TopQuery.value.warehouseNameRange=[] - queryCarn.value={} +const searchReset = () => { + TopQuery.value = {}; + TopQuery.value.warehouseNameRange = []; + queryCarn.value = {}; details.columnList.forEach(item => { item.values = ''; }); - details.query={}, - details.page.total = 0; + (details.query = {}), (details.page.total = 0); details.data = []; // getrain(queryCarn.value) -} +}; const Toptiem = val => { if (!val) { delete TopQuery.value.startTaskTime; @@ -465,7 +463,7 @@ const onLoad = () => { }; onLoad(); // 获取数据 -const getrain = (val) => { +const getrain = val => { let data = { current: details.page.currentPage, size: details.page.pageSize, diff --git a/src/views/reportforms/Inventory.vue b/src/views/reportforms/Inventory.vue index 9939721d..dff8e22e 100644 --- a/src/views/reportforms/Inventory.vue +++ b/src/views/reportforms/Inventory.vue @@ -1,9 +1,9 @@ - - - - - \ No newline at end of file + .catch(() => {}) + .finally(() => { + details.loadingObj.list = false; + }); +}; +// getrain(); + +// 导出 +const exportReport = () => { + ElMessageBox.confirm('是否导出报表?', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning', + }) + .then(() => { + details.loadingObj.list = true; + let data = { + ...details.query, + }; + $_exportInventory(data) + .then(res => { + downloadXls(res.data, `库存品明细报表数据.xlsx`); + }) + .catch(() => {}) + .finally(() => { + details.loadingObj.list = false; + }); + }) + .catch(() => {}); +}; + + + diff --git a/src/views/reportforms/InventoryOutbound.vue b/src/views/reportforms/InventoryOutbound.vue index ca7e5dff..220bc501 100644 --- a/src/views/reportforms/InventoryOutbound.vue +++ b/src/views/reportforms/InventoryOutbound.vue @@ -1,9 +1,9 @@ - - - - - \ No newline at end of file + .catch(() => {}) + .finally(() => { + details.loadingObj.list = false; + }); +}; +// getrain(); + +// 导出 +const exportReport = () => { + ElMessageBox.confirm('是否导出报表?', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning', + }) + .then(() => { + details.loadingObj.list = true; + let data = { + ...details.query, + }; + $_exportOutStocks(data) + .then(res => { + downloadXls(res.data, `库存出库明细报表数据.xlsx`); + }) + .catch(() => {}) + .finally(() => { + details.loadingObj.list = false; + }); + }) + .catch(() => {}); +}; + + + diff --git a/src/views/reportforms/InventoryReceipt.vue b/src/views/reportforms/InventoryReceipt.vue index 737ad427..dfc4e0f6 100644 --- a/src/views/reportforms/InventoryReceipt.vue +++ b/src/views/reportforms/InventoryReceipt.vue @@ -178,7 +178,7 @@ import { getDictionaryBiz } from '@/api/system/dict'; //字典 import { processRowProperty, setNodeHeight } from '@/utils/util'; import { $_exportInStocks, $_getinStocks, $_getMyWarehouseList } from '@/api/reportforms/index.js'; import { ElMessageBox } from 'element-plus'; -import { downloadXls } from '@/utils/util'; +import { downloadXls, deepClone } from '@/utils/util'; import functions from '@/utils/functions.js'; import dayjs from 'dayjs'; const queryCarn = ref({}); //查询顶部 @@ -239,7 +239,7 @@ const details = reactive({ /** 时间选择器数据 */ stockupDate: [], /** 列表 */ - columnList, + columnList:deepClone(columnList), /** 列表数据 */ data: [], diff --git a/src/views/reportforms/Selfpickupreport.vue b/src/views/reportforms/Selfpickupreport.vue index ba9a6b59..d235612e 100644 --- a/src/views/reportforms/Selfpickupreport.vue +++ b/src/views/reportforms/Selfpickupreport.vue @@ -1,12 +1,12 @@ - - - - - \ No newline at end of file + .catch(() => {}) + .finally(() => { + details.loadingObj.list = false; + }); +}; +// getrain(); + +// 导出 +const exportReport = () => { + ElMessageBox.confirm('是否导出报表?', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning', + }) + .then(() => { + details.loadingObj.list = true; + let data = { + ...details.query, + }; + $_exportSelfpickup(data) + .then(res => { + downloadXls(res.data, `自提明细报表数据.xlsx`); + }) + .catch(() => {}) + .finally(() => { + details.loadingObj.list = false; + }); + }) + .catch(() => {}); +}; + + + diff --git a/src/views/reportforms/Selfpickuptask.vue b/src/views/reportforms/Selfpickuptask.vue index fb8c2861..de87d49c 100644 --- a/src/views/reportforms/Selfpickuptask.vue +++ b/src/views/reportforms/Selfpickuptask.vue @@ -1,570 +1,573 @@ - - - - - \ No newline at end of file +} + diff --git a/src/views/reportforms/Stockordertable.vue b/src/views/reportforms/Stockordertable.vue index 2ffcb60b..eecd048e 100644 --- a/src/views/reportforms/Stockordertable.vue +++ b/src/views/reportforms/Stockordertable.vue @@ -1,540 +1,548 @@ - - - - - \ No newline at end of file +} + diff --git a/src/views/supervise/IndicatorList.vue b/src/views/supervise/IndicatorList.vue index 13391cda..200c4ba4 100644 --- a/src/views/supervise/IndicatorList.vue +++ b/src/views/supervise/IndicatorList.vue @@ -414,7 +414,7 @@ import { ElMessage, ElMessageBox } from 'element-plus'; import { ref, reactive, computed, onMounted } from 'vue'; import { IndicatorColumnList } from '@/option/supervise/supervise.js'; import functions from '@/utils/functions.js'; -import { setNodeHeight } from '@/utils/util'; +import { setNodeHeight, deepClone } from '@/utils/util'; import { downloadXls } from '@/utils/util'; import { $_Getclassify, diff --git a/src/views/supervise/classify.vue b/src/views/supervise/classify.vue index 61a4fb43..5cee624e 100644 --- a/src/views/supervise/classify.vue +++ b/src/views/supervise/classify.vue @@ -24,11 +24,21 @@ 新 增 - - 批量删除 - - 查看 + + 查看
@@ -136,6 +146,7 @@ import { ElMessage, ElMessageBox } from 'element-plus'; import { ref, reactive, computed, onMounted, watch } from 'vue'; import { classificationColumnList } from '@/option/supervise/supervise.js'; import functions from '@/utils/functions.js'; +import { deepClone } from '@/utils/util.js'; import { $_Getclassify, $_newlyadded, @@ -148,33 +159,32 @@ const current = ref(1); //当前页 const total = ref(0); //总页数 const drawerShow = ref(false); //列表配置显示 const pageSize = ref(30); -const currentPage=ref(1) +const currentPage = ref(1); const lassificationform = ref({}); //分类表单 const title = ref(true); //标题 const EditID = ref(true); //编辑需要的ID -const columnList = ref([]); //列表配置 +const columnList = ref([]); //列表配置 const newlyAdded = ref(false); //新增弹窗 const loadingAddPopup = ref(false); //弹窗加载 const selectionList = ref([]); //选中数据 const $useStore = useStore(); const accessControl = $useStore.getters.permission; - const PermissionButton = computed(() => { return { classify_add: accessControl.classify_add, //新增 - classify_delete:accessControl.classify_delete, //删除 - classify_view:accessControl.classify_view, //查看 + classify_delete: accessControl.classify_delete, //删除 + classify_view: accessControl.classify_view, //查看 }; }); -console.log(accessControl,'角色权限'); +console.log(accessControl, '角色权限'); const onLoad = () => { let data = { current: current.value, size: pageSize.value, isPid: 1, }; - columnList.value=classificationColumnList + columnList.value = deepClone(classificationColumnList); loadingclassification.value = true; //开启加载效果 $_Getclassify(data) .then(res => { @@ -231,7 +241,6 @@ const ClassificationDditing = val => { lassificationform.value.name = data.name; //分类名称 lassificationform.value.description = data.description; //分类描述 lassificationform.value.remark = data.remark; //分类备注 - }; // 分类新增按钮 @@ -345,12 +354,12 @@ const selectionChange = list => { console.log(selectionList.value, '已经选中的数据'); }; // 表格禁止勾选 -function ProhibitSelection(val,index){ - if(val.isEdit=='0'){ - return false - }else{ - return true - } +function ProhibitSelection(val, index) { + if (val.isEdit == '0') { + return false; + } else { + return true; + } } @@ -386,7 +395,7 @@ function ProhibitSelection(val,index){ .maboxhi { height: 700px !important; } -.el_view{ +.el_view { display: none; } diff --git a/src/views/system/dict.vue b/src/views/system/dict.vue index 389ad2ab..e4d45b37 100644 --- a/src/views/system/dict.vue +++ b/src/views/system/dict.vue @@ -109,6 +109,7 @@ import { } from '@/api/system/dict'; import { optionParent, optionChild } from '@/option/system/dict'; import { mapGetters } from 'vuex'; +import { deepClone } from '@/utils/util.js'; export default { data() { @@ -136,8 +137,8 @@ export default { }, dataParent: [], dataChild: [], - optionParent: optionParent, - optionChild: optionChild, + optionParent: deepClone(optionParent), + optionChild: deepClone(optionChild), }; }, computed: { @@ -449,19 +450,19 @@ export default { }; - diff --git a/src/views/system/dictbiz.vue b/src/views/system/dictbiz.vue index 8178dfcd..219734e0 100644 --- a/src/views/system/dictbiz.vue +++ b/src/views/system/dictbiz.vue @@ -109,6 +109,7 @@ import { } from '@/api/system/dictbiz'; import { optionParent, optionChild } from '@/option/system/dictbiz'; import { mapGetters } from 'vuex'; +import { deepClone } from '@/utils/util.js'; export default { data() { @@ -136,8 +137,8 @@ export default { }, dataParent: [], dataChild: [], - optionParent: optionParent, - optionChild: optionChild, + optionParent: deepClone(optionParent), + optionChild: deepClone(optionChild), }; }, computed: { @@ -448,26 +449,26 @@ export default { }, }; - \ No newline at end of file + diff --git a/src/views/util/demo/dict.vue b/src/views/util/demo/dict.vue index 43fea0a5..d0390061 100644 --- a/src/views/util/demo/dict.vue +++ b/src/views/util/demo/dict.vue @@ -120,6 +120,7 @@ import { } from '@/api/system/dict'; import { optionParent, optionChild } from '@/option/system/dict'; import { mapGetters } from 'vuex'; +import { deepClone } from '@/utils/util.js'; export default { data() { @@ -146,8 +147,8 @@ export default { }, dataParent: [], dataChild: [], - optionParent: optionParent, - optionChild: optionChild, + optionParent: deepClone(optionParent), + optionChild: deepClone(optionChild), }; }, computed: { diff --git a/src/views/util/demo/dictbiz.vue b/src/views/util/demo/dictbiz.vue index 8616f99c..5a954499 100644 --- a/src/views/util/demo/dictbiz.vue +++ b/src/views/util/demo/dictbiz.vue @@ -120,6 +120,7 @@ import { } from '@/api/system/dictbiz'; import { optionParent, optionChild } from '@/option/system/dictbiz'; import { mapGetters } from 'vuex'; +import { deepClone } from '@/utils/util.js'; export default { data() { @@ -146,8 +147,8 @@ export default { }, dataParent: [], dataChild: [], - optionParent: optionParent, - optionChild: optionChild, + optionParent: deepClone(optionParent), + optionChild: deepClone(optionChild), }; }, computed: { diff --git a/src/views/waybill/ChangeOrder.vue b/src/views/waybill/ChangeOrder.vue index 00288206..8a94ea46 100644 --- a/src/views/waybill/ChangeOrder.vue +++ b/src/views/waybill/ChangeOrder.vue @@ -196,7 +196,7 @@ import { mapGetters } from 'vuex'; import { getDictionaryBiz } from '@/api/system/dict'; import { getopenOrderAdvancePageList } from '@/api/waybill/ChangeOrder'; import { showOrderPackgeCode } from '@/api/distribution/distributionStockArticle'; -import { downloadXls, setNodeHeight, getHtmls } from '@/utils/util'; +import { downloadXls, setNodeHeight, getHtmls, deepClone } from '@/utils/util'; import { columnList, viewColumnList } from '@/option/waybill/ChangeOrder'; import { useRouter } from 'vue-router'; import print from '@/utils/print'; @@ -243,11 +243,11 @@ const details = reactive({ /** 时间选择器数据 */ stockupDate: [], /** 列表 */ - columnList, + columnList: deepClone(columnList), /** 列表数据 */ data: [{}], /** 查看列表表头 */ - viewColumnList, + viewColumnList: deepClone(viewColumnList), /** 页面loading */ loadingObj: { /** 列表加载loading */ diff --git a/src/views/waybill/ComparativeStatement.vue b/src/views/waybill/ComparativeStatement.vue index 6f75e84e..40341923 100644 --- a/src/views/waybill/ComparativeStatement.vue +++ b/src/views/waybill/ComparativeStatement.vue @@ -75,7 +75,7 @@ import dayjs from 'dayjs'; import { mapGetters } from 'vuex'; /** 获取字典 */ import { getDictionaryBiz } from '@/api/system/dict'; -import { downloadXls, setNodeHeight } from '@/utils/util'; +import { downloadXls, setNodeHeight, deepClone } from '@/utils/util'; import { columnList, detailsColumnList, @@ -89,12 +89,11 @@ import { ElMessage, ElMessageBox } from 'element-plus'; const $router = useRouter(); const details = reactive({ - /** 列表 */ - columnList, - detailsColumnList, - warehouseNodeColumnList, - truckLoadingColumnList, + columnList: deepClone(columnList), + detailsColumnList: deepClone(detailsColumnList), + warehouseNodeColumnList: deepClone(warehouseNodeColumnList), + truckLoadingColumnList: deepClone(truckLoadingColumnList), /** 列表数据 */ data: [{}], /** 页面loading */ @@ -110,9 +109,6 @@ const details = reactive({ pageSize: 30, total: 0, }, - - - }); const { data, loadingObj } = toRefs(details); diff --git a/src/views/waybill/CreateZeroOrder.vue b/src/views/waybill/CreateZeroOrder.vue index 1ecf7e94..7ce99597 100644 --- a/src/views/waybill/CreateZeroOrder.vue +++ b/src/views/waybill/CreateZeroOrder.vue @@ -881,8 +881,7 @@ import { postFindCategoryInfo, postFindArrPrice, } from '@/api/distribution/CreateOrder.js'; -import { isNumber, getObjType } from '@/utils/util.js'; -import { deepClone } from 'avue-plugin-ueditor/packages/ueditor/src/upload/util'; +import { isNumber, getObjType, deepClone } from '@/utils/util.js'; // 获取vue实例 const instance = getCurrentInstance(); diff --git a/src/views/waybill/EditCustomerInfo.vue b/src/views/waybill/EditCustomerInfo.vue index c48e1381..17f1efc2 100644 --- a/src/views/waybill/EditCustomerInfo.vue +++ b/src/views/waybill/EditCustomerInfo.vue @@ -71,6 +71,7 @@ import { import { useStore } from 'vuex'; import dayjs from 'dayjs'; import { ElMessage } from 'element-plus'; +import { deepClone } from '@/utils/util'; const $store = useStore(); const $router = useRouter(); @@ -95,7 +96,7 @@ for (let key in form.value) { const details = reactive({ /** 列表 */ - columnList, + columnList: deepClone(columnList), /** 列表数据 */ data: [], /** 页面loading */ diff --git a/src/views/waybill/FreezeOrder.vue b/src/views/waybill/FreezeOrder.vue index 6f8ae429..8224fc9a 100644 --- a/src/views/waybill/FreezeOrder.vue +++ b/src/views/waybill/FreezeOrder.vue @@ -144,6 +144,7 @@ import { downloadXls, setNodeHeight, getHtmls } from '@/utils/util'; import { columnList, packageListColumnList } from '@/option/waybill/FreezeOrder'; import { useRouter } from 'vue-router'; import print from '@/utils/print'; +import { deepClone } from '@/utils/util'; import { ElMessage, ElMessageBox } from 'element-plus'; // 获取路由实例 @@ -187,14 +188,14 @@ const details = reactive({ /** 时间选择器数据 */ stockupDate: [], /** 列表 */ - columnList, + columnList: deepClone(columnList), /** 列表数据 */ haveDataData: [], notHaveDataData: [], /** 包明细表头 */ - packageListColumnList, + packageListColumnList: deepClone(packageListColumnList), /** 包明细数据 */ - packageListData: [{}], + packageListData: [], /** 页面loading */ loadingObj: { /** 列表加载loading */ diff --git a/src/views/waybill/ReceiptManagement.vue b/src/views/waybill/ReceiptManagement.vue index 017eca4f..3b7d8008 100644 --- a/src/views/waybill/ReceiptManagement.vue +++ b/src/views/waybill/ReceiptManagement.vue @@ -120,6 +120,7 @@ import { showOrderPackgeCode } from '@/api/distribution/distributionStockArticle import { downloadXls, setNodeHeight, getHtmls } from '@/utils/util'; import { columnList } from '@/option/waybill/ReceiptManagement'; import { useRouter } from 'vue-router'; +import { deepClone } from '@/utils/util'; import print from '@/utils/print'; import { ElMessage, ElMessageBox } from 'element-plus'; @@ -164,7 +165,7 @@ const details = reactive({ /** 时间选择器数据 */ stockupDate: [], /** 包明细表头 */ - columnList, + columnList: deepClone(columnList), /** 包明细数据 */ data: [{}], /** 页面loading */ diff --git a/src/views/waybill/TemporaryStorageList.vue b/src/views/waybill/TemporaryStorageList.vue index 96ae499a..f912aa77 100644 --- a/src/views/waybill/TemporaryStorageList.vue +++ b/src/views/waybill/TemporaryStorageList.vue @@ -479,7 +479,7 @@ import { } from '@/api/waybill/TemporaryStorageList'; import { getLazyTreeAll } from '@/api/base/region'; import { showOrderPackgeCode } from '@/api/distribution/distributionStockArticle'; -import { downloadXls, setNodeHeight, getHtmls } from '@/utils/util'; +import { downloadXls, setNodeHeight, getHtmls, deepClone } from '@/utils/util'; import { columnList } from '@/option/waybill/TemporaryStorageList'; import { useRouter } from 'vue-router'; import print from '@/utils/print'; @@ -496,7 +496,7 @@ const $store = useStore(); // 表单实例 const ruleFormRef = ref(); - +columnList; /** 表格实例 */ const tableNodeRef = ref(); @@ -538,7 +538,7 @@ const details = reactive({ /** 时间选择器数据 */ stockupDate: [], /** 列表 */ - columnList, + columnList: deepClone(columnList), /** 列表数据 */ haveDataData: [], notHaveDataData: [], diff --git a/src/views/waybill/WarehousingByTrainNumber.vue b/src/views/waybill/WarehousingByTrainNumber.vue index c9fee6a9..00c85a49 100644 --- a/src/views/waybill/WarehousingByTrainNumber.vue +++ b/src/views/waybill/WarehousingByTrainNumber.vue @@ -103,7 +103,7 @@ import { postFindIncomingOrderList, postIncomingBatchOrder, } from '@/api/distribution/WarehousingByTrainNumber'; -import { downloadXls, setNodeHeight, getHtmls } from '@/utils/util'; +import { downloadXls, setNodeHeight, getHtmls, deepClone } from '@/utils/util'; import { columnList } from '@/option/waybill/WarehousingByTrainNumber'; import { useRouter } from 'vue-router'; import print from '@/utils/print'; @@ -156,7 +156,7 @@ const details = reactive({ /** 时间选择器数据 */ stockupDate: [], /** 包明细表头 */ - columnList, + columnList: deepClone(columnList), /** 包明细数据 */ data: [], /** 页面loading */ diff --git a/src/views/waybill/WaybillOrderList.vue b/src/views/waybill/WaybillOrderList.vue index 7dfdfeb4..bd112600 100644 --- a/src/views/waybill/WaybillOrderList.vue +++ b/src/views/waybill/WaybillOrderList.vue @@ -280,14 +280,13 @@ import { postSaveWaybillReturn, } from '@/api/waybill/WaybillOrderList.js'; import { showOrderPackgeCode } from '@/api/distribution/distributionStockArticle'; -import { downloadXls, setNodeHeight, getHtmls } from '@/utils/util'; +import { downloadXls, setNodeHeight, getHtmls, deepClone } from '@/utils/util'; import { columnList } from '@/option/waybill/WaybillOrderList'; import { useRouter } from 'vue-router'; import print from '@/utils/print'; import { ElMessage } from 'element-plus'; import { getToken } from '@/utils/auth'; import type { UploadProps, UploadUserFile } from 'element-plus'; -import { deepClone } from 'avue-plugin-ueditor/packages/ueditor/src/upload/util'; const $store = useStore(); diff --git a/src/views/waybill/ZeroTagList.vue b/src/views/waybill/ZeroTagList.vue index 3e6593fb..6187e6af 100644 --- a/src/views/waybill/ZeroTagList.vue +++ b/src/views/waybill/ZeroTagList.vue @@ -131,7 +131,7 @@ import { mapGetters } from 'vuex'; import { getDictionaryBiz } from '@/api/system/dict'; import { getopenOrderAdvancePageList } from '@/api/waybill/TemporaryStorageList'; import { showOrderPackgeCode } from '@/api/distribution/distributionStockArticle'; -import { downloadXls, setNodeHeight, getHtmls } from '@/utils/util'; +import { downloadXls, setNodeHeight, getHtmls, deepClone } from '@/utils/util'; import { columnList } from '@/option/waybill/ZeroTagList'; import { useRouter } from 'vue-router'; import print from '@/utils/print'; @@ -178,7 +178,7 @@ const details = reactive({ /** 时间选择器数据 */ stockupDate: [], /** 包明细表头 */ - columnList, + columnList: deepClone(columnList), /** 包明细数据 */ data: [{}], /** 页面loading */ diff --git a/src/views/waybill/orderDetails.vue b/src/views/waybill/orderDetails.vue index 5e2db2fc..38f380b3 100644 --- a/src/views/waybill/orderDetails.vue +++ b/src/views/waybill/orderDetails.vue @@ -118,6 +118,7 @@ import { getHtmls, handleClearTableQuery, debounce, + deepClone, } from '@/utils/util'; import { packageListColumnList } from '@/option/waybill/orderDetails'; import { useRouter, useRoute } from 'vue-router'; @@ -173,7 +174,7 @@ const details = reactive({ data: [], renderData: [], /** 包明细表头 */ - packageListColumnList, + packageListColumnList: deepClone(packageListColumnList), /** 页面loading */ loadingObj: { /** 列表加载loading */ diff --git a/src/views/waybill/orderPackageList.vue b/src/views/waybill/orderPackageList.vue index 7a86a302..ad932cdf 100644 --- a/src/views/waybill/orderPackageList.vue +++ b/src/views/waybill/orderPackageList.vue @@ -365,7 +365,7 @@ import { mapGetters } from 'vuex'; import { getDictionaryBiz } from '@/api/system/dict'; import { getopenOrderAdvancePageList } from '@/api/waybill/TemporaryStorageList'; import { showOrderPackgeCode } from '@/api/distribution/distributionStockArticle'; -import { downloadXls, setNodeHeight, getHtmls } from '@/utils/util'; +import { downloadXls, setNodeHeight, getHtmls, deepClone } from '@/utils/util'; import { packageListColumnList, packageDetailColumnList, @@ -416,17 +416,17 @@ const details = reactive({ /** 时间选择器数据 */ stockupDate: [], /** 包明细表头 */ - packageListColumnList, + packageListColumnList: deepClone(packageListColumnList), /** 包明细数据 */ - packageListData: [{}], + packageListData: [], /** 包内产品表头 */ - packageDetailColumnList, + packageDetailColumnList: deepClone(packageDetailColumnList), /** 包内产品数据 */ - packageDetailData: [{}], + packageDetailData: [], /** 流转节点表头 */ - flowNodeColumnList, + flowNodeColumnList: deepClone(flowNodeColumnList), /** 流转节点数据 */ - flowNodeData: [{}], + flowNodeData: [], /** 页面loading */ loadingObj: { /** 列表加载loading */ @@ -619,8 +619,6 @@ const handleShowPackageOrderList = ({ row }) => { }); }; - - /** 修改客户信息 */ const editClientInfo = () => { if (details.selectionList.length !== 0) { diff --git a/src/views/waybill/orderPackageListDetails.vue b/src/views/waybill/orderPackageListDetails.vue index 5733d7a3..b6521f1a 100644 --- a/src/views/waybill/orderPackageListDetails.vue +++ b/src/views/waybill/orderPackageListDetails.vue @@ -280,7 +280,7 @@ import { postDeleteAdvanceDetail, postFinaPackageTrackLogList, } from '@/api/waybill/orderPackageListDetails'; -import { downloadXls, setNodeHeight, getHtmls, debounce } from '@/utils/util'; +import { downloadXls, setNodeHeight, getHtmls, debounce, deepClone } from '@/utils/util'; import { packageListColumnList, packageDetailColumnList, @@ -334,18 +334,18 @@ const details = reactive({ /** 时间选择器数据 */ stockupDate: [], /** 包明细表头 */ - packageListColumnList, + packageListColumnList: deepClone(packageListColumnList), /** 包明细数据 */ packageListData: [], packageListRenderData: [], /** 包内产品表头 */ - packageDetailColumnList, + packageDetailColumnList: deepClone(packageDetailColumnList), /** 包内产品数据 */ packageDetailData: [], /** 流转节点表头 */ - flowNodeColumnList, + flowNodeColumnList: deepClone(flowNodeColumnList), /** 流转节点数据 */ - flowNodeData: [{}], + flowNodeData: [], /** 页面loading */ loadingObj: { /** 列表加载loading */