diff --git a/src/api/aftersales/aftersalesWorkOrder.js b/src/api/aftersales/aftersalesWorkOrder.js index 96425e3f..389d5083 100644 --- a/src/api/aftersales/aftersalesWorkOrder.js +++ b/src/api/aftersales/aftersalesWorkOrder.js @@ -203,3 +203,74 @@ export const $_addCompletionEnd = (data) => { data }) } + +// 获取责任人 +export const $_getBusinessDepartmentUser = (params) => { + return request({ + url: '/api/logpm-aftersales/aftersalesWorkOrder/getBusinessDepartmentUser', + method: 'get', + params + }) +} + + +// 回复调查接口 +export const $_savaSurveyRecord = (data) => { + return request({ + url: '/api/logpm-aftersales/aftersalesWorkOrder/savaSurveyRecord ', + method: 'post', + data + }) +} + + +// 提交异常工单处理结果 +export const $_addProcessingResults = (data) => { + return request({ + url: '/api/logpm-aftersales/aftersalesWorkOrder/addProcessingResults', + method: 'post', + data + }) +} + + + +// 获取回复记录 +export const $_getSurveyRecord = (params) => { + return request({ + url: '/api/logpm-aftersales/aftersalesWorkOrder/getSurveyRecord', + method: 'get', + params + }) +} + +// 工单申诉 + + +export const $_appealSubmit = (data) => { + return request({ + url: '/api/logpm-aftersales/aftersalesAppeal/submit', + method: 'post', + data + }) +} + + + +// 查询理赔数据 +export const $_listSettlement = (params) => { + return request({ + url: '/api/logpm-aftersales/aftersalesWorkOrder/listSettlement', + method: 'get', + params + }) +} + +// 查询包件信息 +export const $_getAbnormalPackage = (params) => { + return request({ + url: '/api/logpm-aftersales/aftersalesAbnormalPackage/getAbnormalPackage', + method: 'get', + params + }) +} diff --git a/src/api/basicdata/basicdataGoodsShelfView.ts b/src/api/basicdata/basicdataGoodsShelfView.ts index 20a9080a..d802b2c5 100644 --- a/src/api/basicdata/basicdataGoodsShelfView.ts +++ b/src/api/basicdata/basicdataGoodsShelfView.ts @@ -78,3 +78,12 @@ export function posturl(name,data): Promise { + return request({ + url: '/api/logpm-warehouse/warehouseGoodsAllocation/locationsnub', + method: 'get', + params + }) +} diff --git a/src/option/aftersales/vueTvemp.js b/src/option/aftersales/vueTvemp.js index 956951a2..e7749a9a 100644 --- a/src/option/aftersales/vueTvemp.js +++ b/src/option/aftersales/vueTvemp.js @@ -15,7 +15,7 @@ export const columnList = [ fixed: true, }, { - prop: 'workOrderTypeName',//workOrderType + prop: 'workOrderTypeNameS',//workOrderType label: '异常类型', type: 3, values: '', @@ -26,7 +26,7 @@ export const columnList = [ head: false, }, { - prop: 'discoveryNodeName',//discoveryNode + prop: 'discoveryNodeNameS',//discoveryNode label: '发现节点', type: 3, values: '', @@ -382,4 +382,267 @@ export const recordList = [ sortable: false, head: false, }, -] \ No newline at end of file +] + + +// 理赔 +export const Claimsfield = [ + { + prop: '', + label: '复选框', + type: 0, + width: 55, + fixed: true, + }, + { + prop: '', + label: '序号', + type: 12, + values: '', + width: 55, + fixed: true, + }, + { + prop: 'workOrderNumber', + label: '工单号', + type: 2, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'businessName', + label: '营业部', + type: 3, + values: '', + width: '100', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + // { + // prop: 'businessId', + // label: '营业部ID', + // type: 3, + // values: '', + // width: '100', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, + { + prop: 'brandName', + label: '品牌', + type: 2, + values: '', + width: '100', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'mallName', + label: '商场名称', + type: 2, + values: '', + width: '100', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'waybillNumber', + label: '运单号', + type: 2, + values: '', + width: '100', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + // { + // prop: 'workOrderType', + // label: '异常类型', + // type: 3, + // values: '', + // width: '100', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, + { + prop: 'workOrderTypeName', + label: '异常类型名称', + type: 3, + values: '', + width: '100', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + // { + // prop: 'resultType', + // label: '处理结果', + // type: 3, + // values: '', + // width: '100', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, + { + prop: 'resultTypeName', + label: '处理结果名称', + type: 3, + values: '', + width: '100', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + // { + // prop: 'laprId', + // label: '处理结果ID', + // type: 3, + // values: '', + // width: '100', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, + // { + // prop: 'discoveryNode', + // label: '发现环节', + // type: 3, + // values: '', + // width: '100', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, + { + prop: 'discoveryNodeName', + label: '发现环节名称', + type: 3, + values: '', + width: '100', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'resultDescription', + label: '处理结果说明', + type: 2, + values: '', + width: '100', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'vehicleRoute', + label: '车辆路线', + type: 2, + values: '', + width: '100', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'indemnitor', + label: '赔款方', + type: 3, + values: '', + width: '100', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'reason', + label: '判责原因', + type: 2, + values: '', + width: '100', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'money', + label: '金额', + type: 2, + values: '', + width: '100', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + // { + // prop: 'lawoId', + // label: '异常工单ID', + // type: 3, + // values: '', + // width: '100', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, + { + prop: 'processNumber', + label: '钉钉流程号', + type: 2, + values: '', + width: '100', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + // { + // prop: 'workOrderStatus', + // label: '工单状态', + // type: 3, + // values: '', + // width: '100', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, + { + prop: 'workOrderStatusName', + label: '工单状态名称', + type: 3, + values: '', + width: '100', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, +] + diff --git a/src/router/views/index.js b/src/router/views/index.js index fad8889e..08cd3f34 100644 --- a/src/router/views/index.js +++ b/src/router/views/index.js @@ -1252,6 +1252,20 @@ export default [ }, ], }, + + { + path: '/aftersales/aftersalesWorkOrderSS', + component: Layout, + redirect: '/aftersales/aftersalesWorkOrderSS', + children: [ + { + path: '/aftersales/aftersalesWorkOrderSS', + name: '工单A', + component: () => import('@/views/aftersales/aftersalesWorkOrderSS.vue'), + }, + ], + }, + // { // path: '/distribution/turndelivery/devtmp', // component: Layout, diff --git a/src/utils/util.js b/src/utils/util.js index ccbed0cd..3573b585 100644 --- a/src/utils/util.js +++ b/src/utils/util.js @@ -504,10 +504,10 @@ const updateDetailQuery = (index, propName, obj) => { } }; export const processRowProperty = (index, row, details) => { - const nameRegex = /(\w+)Name$/; // 捕获以'Name'结尾的属性名 + const nameRegex = /(\w+)NameS$/; // 捕获以'NameS'结尾的属性名 const match = row.prop.match(nameRegex); - // 如果属性以'Name'结尾，则更新相应的查询参数 + // 如果属性以'NameS'结尾，则更新相应的查询参数 if (match) { const basePropName = match[1]; // 获取不包含'Name'的属性名 updateDetailQuery(index, basePropName, details.query); diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue index 9f588c12..e0478b35 100644 --- a/src/views/aftersales/aftersalesWorkOrder.vue +++ b/src/views/aftersales/aftersalesWorkOrder.vue @@ -89,6 +89,7 @@ 工单指派 申请仲裁 批量完结 + 申诉 @@ -99,12 +100,20 @@ - + + + + + + + +
+ + + + + + + 取消 + 确定 + +
+ @@ -972,18 +1011,22 @@ import { $_getCustomerServicePersonnel, $_arbitrate, $_addCompletionEnd, + $_appealSubmit, + $_listSettlement, + $_getAbnormalPackage, } from '@/api/aftersales/aftersalesWorkOrder'; import { getToken } from '@/utils/auth'; import { getDictionaryBiz } from '@/api/system/dict'; //字典 import functions from '@/utils/functions.js'; import { getDetailWarehouse, getDeptWarehouse } from '@/api/basicdata/basicdataWarehouse'; //处理方 import { ref, reactive, toRefs, computed, onMounted, nextTick, watch } from 'vue'; -import { columnList, recordList } from '@/option/aftersales/vueTvemp.js'; +import { columnList, recordList, Claimsfield } from '@/option/aftersales/vueTvemp.js'; import { processRowProperty, isNumer, computeNumber } from '@/utils/util'; import { useRouter } from 'vue-router'; import dayjs from 'dayjs'; const $router = useRouter(); const tabValue = ref(0); //侧边栏激活状态 +const publicColumnList = ref([]); //公共列表参数 const scrollContainer = ref(null); //客服实例 const workOrderStatus = ref(null); //侧边栏参数 const BatchFrom = ref({}); //批量打回 @@ -991,13 +1034,16 @@ const currentPage = ref(1); // 默认页码 const pageSize = ref(30); // 默认每一页几条 const total = ref(0); //页码总页数 const KFinput = ref(''); //客服发送消息 +const Appealselection = ref([]); //申诉选择的责任人 const KFfeel = ref(''); //文件附件地址 const pageList = ref([5, 10, 50, 100, 200]); // 选择每页显示多少条 const background = ref(true); // 是否开启背景颜色 const disabled = ref(false); // 是否禁止使用页码功能 const loading = ref(false); //首页表格加载效果 const dialogReturn = ref(false); //批量打回弹窗状态 +const dialogappeal = ref(false); //申诉弹窗状态 const Indexdialog = ref(false); //新增弹窗 +const Reasonforappeal = ref(''); //申诉原因 const Indexform = ref({}); //首页新增表单 const dialogcustomerService = ref(false); //客服信息 const IndexException = ref([]); //异常类型下拉选择 @@ -1006,8 +1052,10 @@ const warehouseData = ref([]); //处理方 const customerService = ref([]); const IndexForm = ref(null); //首页表实例 const FromDisabled = ref(false); //详情禁止输入框 +const loadingappeal = ref(false); //工单申诉状态 const SelectType = ref(null); //类型 const ListRow = ref(); //当前行数据 +const appealList = ref(); //申诉选择的参数 const StateType = ref(true); //类型 const dialogassign = ref(false); //工单指派 const AssignLoad = ref(false); //工单指派加载 @@ -1035,6 +1083,8 @@ const TotalamountCompensation = ref(0); //赔款金额合计 const TotalamountReceived = ref(0); //收款金额合计 const Reasonarbitration = ref(null); //仲裁原因 const BatchcompletionHeight = ref(0); //批量完结弹窗 +const userInfo = ref(); //当前登录人信息 +const ClaimStatus = ref(false); //理赔状态 const TabList = ref([ { name: 0, label: '全部' }, { name: 1, label: '处理中' }, @@ -1218,6 +1268,7 @@ const TransportLossNode = ref([ // 页面初始化数据 const IndexTable = val => { + ClaimStatus.value = false; // ProcessingPartyState.value = false; //关闭处理方 details.loadingObj.list = true; //开启动画加载 let data = { @@ -1243,33 +1294,33 @@ const IndexTable = val => { } // 对状态进行处理 if (item.workOrderType == 1) { - item.workOrderTypeName = columnList[2].checkarr[0].label; //货损 + item.workOrderTypeNameS = columnList[2].checkarr[0].label; //货损 } else if (item.workOrderType == 2) { - item.workOrderTypeName = columnList[2].checkarr[1].label; //少货 + item.workOrderTypeNameS = columnList[2].checkarr[1].label; //少货 } else if (item.workOrderType == 3) { - item.workOrderTypeName = columnList[2].checkarr[2].label; //窜货 + item.workOrderTypeNameS = columnList[2].checkarr[2].label; //窜货 } else if (item.workOrderType == 4) { - item.workOrderTypeName = columnList[2].checkarr[3].label; //加急 + item.workOrderTypeNameS = columnList[2].checkarr[3].label; //加急 } else if (item.workOrderType == 5) { - item.workOrderTypeName = columnList[2].checkarr[4].label; //其他 + item.workOrderTypeNameS = columnList[2].checkarr[4].label; //其他 } // 提货环节下拉赋值 if (item.discoveryNode == 1) { - item.discoveryNodeName = columnList[3].checkarr[0].label; //提货环节 + item.discoveryNodeNameS = columnList[3].checkarr[0].label; //提货环节 } else if (item.discoveryNode == 2) { - item.discoveryNodeName = columnList[3].checkarr[1].label; //发货环节 + item.discoveryNodeNameS = columnList[3].checkarr[1].label; //发货环节 } else if (item.discoveryNode == 3) { - item.discoveryNodeName = columnList[3].checkarr[2].label; //干线卸车环节 + item.discoveryNodeNameS = columnList[3].checkarr[2].label; //干线卸车环节 } else if (item.discoveryNode == 4) { - item.discoveryNodeName = columnList[3].checkarr[3].label; //库内作业环节 + item.discoveryNodeNameS = columnList[3].checkarr[3].label; //库内作业环节 } else if (item.discoveryNode == 5) { - item.discoveryNodeName = columnList[3].checkarr[4].label; //配送装车环节 + item.discoveryNodeNameS = columnList[3].checkarr[4].label; //配送装车环节 } else if (item.discoveryNode == 6) { - item.discoveryNodeName = columnList[3].checkarr[5].label; //其他 + item.discoveryNodeNameS = columnList[3].checkarr[5].label; //其他 } else if (item.discoveryNode == 7) { - item.discoveryNodeName = columnList[3].checkarr[6].label; //配送签收环节 + item.discoveryNodeNameS = columnList[3].checkarr[6].label; //配送签收环节 } else if (item.discoveryNode == 8) { - item.discoveryNodeName = columnList[3].checkarr[7].label; //安装环节 + item.discoveryNodeNameS = columnList[3].checkarr[7].label; //安装环节 } }); details.data = res.data.data.records; @@ -1280,8 +1331,15 @@ const IndexTable = val => { }); }; +// 表格切换 +const Tableheaderswitching = (val = columnList) => { + publicColumnList.value = val; //默认加载表格 +}; // 页面初始化 const OnLoad = () => { + // 表格切换 + Tableheaderswitching(); + userInfo.value = JSON.parse(localStorage.getItem('TWMS-userInfo')); //获取本地登录人参数 Mydata.value = JSON.parse(localStorage.getItem('my_data')); //获取本地仓库信息 currentUser.value = Mydata.value.id; // 在组件挂载后获取屏幕高度 @@ -1298,6 +1356,7 @@ const OnLoad = () => { updateDictionary(columnList[2].checkarr, 'pc_work_order'); //异常类型 updateDictionary(columnList[3].checkarr, 'pc_discovery_node'); //发现环节 + IndexTable(details.query); getDeptWarehouse({}).then(res => { res.data.data.forEach(item => { @@ -1414,10 +1473,10 @@ const view = val => { query: { id: val.row.id, name: val.row.id + '-信息查看', - RouterState: 'view', + routerState: 'view', }, }); - return + return; console.log(val, '当前行数据'); FromDisabled.value = true; //禁用输入框 updateDictionary(IndexException.value, 'pc_work_order'); //异常类型 @@ -1510,11 +1569,86 @@ const addingRecord = val => { path: '/aftersales/aftersalesWorkOrderend', query: { id: val.row.id, - name: val.row.id + '-添加异常记录', + name: val.row.workOrderNumber + '-添加异常记录', RouterState: 'record', + businessId: val.row.businessId, }, }); }; + +// 工单申诉按钮 +const appeal = val => { + console.log(details.selectionList, 'details.selectionList'); + if (!details.selectionList.length) { + ElMessage({ + message: '请选择要申诉的数据', + type: 'warning', + }); + return; + } + dialogappeal.value = true; //展开申诉弹窗 +}; +// 工单申诉确认按钮 +const Appealbutton = () => { + loadingappeal.value = true; //开启加载效果 + console.log(Appealselection.value, '当前选择的责任人'); + console.log(warehouseData.value, '要循环处理的参数'); + let data = { + peopleEntityList: [], //参数一 + }; + details.selectionList.forEach(item => { + console.log(item, '已经选择的列表'); + data['peopleEntityList'].push({ + workOrderId: item.id, //异常工单ID + warehouseId: item.warehouseId == '/' ? '' : item.warehouseId, + reason: Reasonforappeal.value, //申诉理由 + claimant: userInfo.value.content.user_name, //申诉人 + claimantUserId: userInfo.value.content.user_id, //申诉人ID + actualPersonName: warehouseData.value + .filter(item => Appealselection.value.includes(item.value)) + .map(item => item.label) + .join(','), //实际责任人名称 + actualPersonId: warehouseData.value + .filter(item => Appealselection.value.includes(item.value)) + .map(item => item.value) + .join(','), //实际责任人ID + }); + }); + console.log(data, '处理好的值'); + $_appealSubmit(data).then(res => { + dialogappeal.value = false; //关闭申诉弹窗 + loadingappeal.value = false; //关闭加载效果 + console.log(res, '申诉成功返回值'); + ProcessingPartyState.value = false; //关闭处理方 + data.workOrderStatus = 30; + details.query.workOrderStatus = 30; + ArbitrationStatus.value = false; //不可以申请仲裁 + tabValue.value = 2; + empty(); //清空搜索数据 + IndexTable({ workOrderStatus: 30 }); + if (res.data.code == 200) { + ElMessage({ + message: res.data.msg, + type: 'success', + }); + } + }); +}; +// 申诉列表 +const AppealTab = val => { + if (val == 0) { + console.log('处理完毕'); + ProcessingPartyState.value = false; //关闭处理方 + data.workOrderStatus = 30; + details.query.workOrderStatus = 30; + ArbitrationStatus.value = false; //不可以申请仲裁 + empty(); //清空搜索数据 + IndexTable({ workOrderStatus: 30 }); + } else { + console.log('当前是申诉列表'); + } +}; + // 异常类型事件 const abnormalChange = val => { console.log(val); @@ -1587,8 +1721,14 @@ const handlePictureCardPreview = uploadFile => { /** 表格表头输入框搜索 */ const inputsc = (index, row) => { - details.query[row.prop] = index; processRowProperty(index, row, details); + details.query[row.prop] = index; + if (ClaimStatus.value) { + // 这是理赔搜索 + settlementclaim(details.query); + return; + } + if (!ProcessingPartyState.value) { IndexTable(details.query); //首页初始化信息 console.log('首页'); @@ -1599,6 +1739,13 @@ const inputsc = (index, row) => { }; // 网页顶部搜索按钮 const searchChange = () => { + if (ClaimStatus.value) { + // 表示这是理赔查询 + settlementclaim(); + details.search = false; //关闭搜索 + return; + } + details.search = false; //关闭搜索 if (!ProcessingPartyState.value) { IndexTable(details.query); //首页初始化信息 @@ -1647,6 +1794,13 @@ const btnsc = val => { /** 表格表头下拉框选择 */ const selectsc = (index, row) => { processRowProperty(index, row, details); + + if (ClaimStatus.value) { + // 这是理赔搜索 + settlementclaim(details.query); + return; + } + if (!ProcessingPartyState.value) { IndexTable(details.query); //首页初始化信息 } else { @@ -1658,13 +1812,20 @@ function onLoad() {} /** 表格表头复选框选择 */ const selectionChange = list => { - console.log(list); + console.log(list, '当前选择的数据'); details.selectionList = list; }; /** 页码改变执行的回调 */ const currentChange = val => { page.value.currentPage = val; + + if (ClaimStatus.value) { + // 这是理赔 + settlementclaim(details.query); + return; + } + if (!ProcessingPartyState.value) { //表示当前不是处理方 IndexTable(details.query); @@ -1675,6 +1836,13 @@ const currentChange = val => { // 每页多少条 const sizeChange = val => { page.value.pageSize = val; + + if (ClaimStatus.value) { + // 这是理赔 + settlementclaim(details.query); + return; + } + if (!ProcessingPartyState.value) { //表示当前不是处理方 IndexTable(details.query); @@ -1724,6 +1892,57 @@ const changeProcessingResults = val => { } }); }; +// 查询理赔数据 +const settlementclaim = val => { + console.log(Claimsfield, '理赔数据'); + ClaimStatus.value = true; //开启理赔查询状态 + details.columnList = Claimsfield; + Claimsfield[3].checkarr = []; //营业部 + Claimsfield[7].checkarr = []; //异常类型名称 + Claimsfield[9].checkarr = []; //异常类型名称 + getDeptWarehouse({}).then(res => { + res.data.data.forEach(item => { + Claimsfield[3].checkarr.push({ + value: item.name, + label: item.name, + }); + }); + }); + + getDictionaryBiz('pc_work_order').then(res => { + res.data.data.forEach(item => { + Claimsfield[7].checkarr.push({ + value: item.dictValue, + label: item.dictValue, + }); + }); + }); + getDictionaryBiz('pc_discovery_node').then(res => { + res.data.data.forEach(item => { + Claimsfield[9].checkarr.push({ + value: item.dictValue, + label: item.dictValue, + }); + }); + }); + + // details.columnList warehouseData.value + details.loadingObj.list = true; //开启动画加载 + console.log(details, 'details'); + let data = { + current: details.page.currentPage, + size: details.page.pageSize, + ...val, + }; + console.log(data, '要传递的参数'); + $_listSettlement(data).then(res => { + details.loadingObj.list = false; //关闭动画加载 + console.log(res, '查询理赔数据'); + details.data = res.data.data.records; //数据 + page.value.total = res.data.data.total; + }); +}; + // 标签栏触发 const tabChenge = val => { console.log(val, '触发了标签栏'); @@ -1732,6 +1951,7 @@ const tabChenge = val => { ProcessingPartyState.value = false; //关闭处理方 details.query.workOrderStatus = null; ArbitrationStatus.value = false; //不可以申请仲裁 + Tableheaderswitching(columnList); IndexTable(); empty(); console.log('全部'); @@ -1741,6 +1961,7 @@ const tabChenge = val => { data.workOrderStatus = 20; details.query.workOrderStatus = 20; ArbitrationStatus.value = true; //可以申请仲裁 + Tableheaderswitching(columnList); empty(); IndexTable(data); } else if (val == 2) { @@ -1749,30 +1970,32 @@ const tabChenge = val => { data.workOrderStatus = 30; details.query.workOrderStatus = 30; ArbitrationStatus.value = false; //不可以申请仲裁 + Tableheaderswitching(columnList); empty(); IndexTable(data); } else if (val == 3) { console.log('待处理'); - ProcessingPartyState.value = true; //开启处理方 details.query.workOrderStatus = ''; ArbitrationStatus.value = true; //可以申请仲裁 + Tableheaderswitching(columnList); empty(); ProcessingPartyFun(data); } else if (val == 4) { ProcessingPartyState.value = false; //关闭处理方 // 理赔金额未出 - data.workOrderStatus = 40; - details.query.workOrderStatus = 40; + details.query.workOrderStatus = null; ArbitrationStatus.value = false; //不可以申请仲裁 + Tableheaderswitching(Claimsfield); //切换表格 empty(); - IndexTable(data); + settlementclaim(); } else if (val == 5) { // 仲裁中 ProcessingPartyState.value = false; //关闭处理方 data.workOrderStatus = 70; details.query.workOrderStatus = 70; ArbitrationStatus.value = false; //不可以申请仲裁 + Tableheaderswitching(columnList); empty(); IndexTable(data); } else if (val == 6) { @@ -1781,6 +2004,7 @@ const tabChenge = val => { data.workOrderStatus = 80; details.query.workOrderStatus = 80; ArbitrationStatus.value = false; //不可以申请仲裁 + Tableheaderswitching(columnList); empty(); IndexTable(data); } else if (val == 7) { @@ -1789,6 +2013,7 @@ const tabChenge = val => { data.workOrderStatus = 60; details.query.workOrderStatus = 60; ArbitrationStatus.value = false; //不可以申请仲裁 + Tableheaderswitching(columnList); empty(); IndexTable(data); } @@ -1817,6 +2042,7 @@ const showdrawer = _flag => { // 处理方数据公共函数 const ProcessingPartyFun = val => { + ClaimStatus.value = false; //关闭理赔状态 details.query.workOrderStatus = null; details.loadingObj.list = true; //开启动画加载 let data = { @@ -1843,33 +2069,33 @@ const ProcessingPartyFun = val => { } // 对状态进行处理 if (item.workOrderType == 1) { - item.workOrderTypeName = columnList[2].checkarr[0].label; //货损 + item.workOrderTypeNameS = columnList[2].checkarr[0].label; //货损 } else if (item.workOrderType == 2) { - item.workOrderTypeName = columnList[2].checkarr[1].label; //少货 + item.workOrderTypeNameS = columnList[2].checkarr[1].label; //少货 } else if (item.workOrderType == 3) { - item.workOrderTypeName = columnList[2].checkarr[2].label; //窜货 + item.workOrderTypeNameS = columnList[2].checkarr[2].label; //窜货 } else if (item.workOrderType == 4) { - item.workOrderTypeName = columnList[2].checkarr[3].label; //加急 + item.workOrderTypeNameS = columnList[2].checkarr[3].label; //加急 } else if (item.workOrderType == 5) { - item.workOrderTypeName = columnList[2].checkarr[4].label; //其他 + item.workOrderTypeNameS = columnList[2].checkarr[4].label; //其他 } // 提货环节下拉赋值 if (item.discoveryNode == 1) { - item.discoveryNodeName = columnList[3].checkarr[0].label; //提货环节 + item.discoveryNodeNameS = columnList[3].checkarr[0].label; //提货环节 } else if (item.discoveryNode == 2) { - item.discoveryNodeName = columnList[3].checkarr[1].label; //发货环节 + item.discoveryNodeNameS = columnList[3].checkarr[1].label; //发货环节 } else if (item.discoveryNode == 3) { - item.discoveryNodeName = columnList[3].checkarr[2].label; //干线卸车环节 + item.discoveryNodeNameS = columnList[3].checkarr[2].label; //干线卸车环节 } else if (item.discoveryNode == 4) { - item.discoveryNodeName = columnList[3].checkarr[3].label; //库内作业环节 + item.discoveryNodeNameS = columnList[3].checkarr[3].label; //库内作业环节 } else if (item.discoveryNode == 5) { - item.discoveryNodeName = columnList[3].checkarr[4].label; //配送装车环节 + item.discoveryNodeNameS = columnList[3].checkarr[4].label; //配送装车环节 } else if (item.discoveryNode == 6) { - item.discoveryNodeName = columnList[3].checkarr[5].label; //其他 + item.discoveryNodeNameS = columnList[3].checkarr[5].label; //其他 } else if (item.discoveryNode == 7) { - item.discoveryNodeName = columnList[3].checkarr[6].label; //配送签收环节 + item.discoveryNodeNameS = columnList[3].checkarr[6].label; //配送签收环节 } else if (item.discoveryNode == 8) { - item.discoveryNodeName = columnList[3].checkarr[7].label; //安装环节 + item.discoveryNodeNameS = columnList[3].checkarr[7].label; //安装环节 } }); details.data = res.data.data.records; @@ -1900,12 +2126,12 @@ const FKList = () => { // 点击回复按钮 const reply = val => { $router.push({ - path:'/aftersales/customerService', - query:{ - row:JSON.stringify(val.row), - } + path: '/aftersales/customerService', + query: { + row: JSON.stringify(val.row), + }, }); - return + return; console.log(val, 'ID++++++++'); console.log(val.row); dialogcustomerService.value = true; //开启回复弹窗 @@ -2741,7 +2967,7 @@ const CompletedSubmission = () => { display: flex; align-items: center; } - :deep(.el-tab-pane){ + :deep(.el-tab-pane) { padding: 10px; } } @@ -2772,24 +2998,35 @@ const CompletedSubmission = () => { display: flex; justify-content: flex-end; } -:deep(.el_tabs){ +:deep(.el_tabs) { width: 100%; - display: flex; - flex-direction: column; - .el-tabs__content{ - padding: 0; - } + display: flex; + flex-direction: column; + .el-tabs__content { + padding: 0; + } } -:deep(.avue-crud__pagination){ +:deep(.avue-crud__pagination) { padding-top: 2px !important; } -.arbitrate{ +.arbitrate { margin-top: 36px; - .el_btn{ + .el_btn { margin-top: 10px; } - :deep(.el-tabs__content){ + :deep(.el-tabs__content) { padding: 0 !important; } } +.el_appeal { + :deep(.el-select) { + width: 100% !important; + margin-bottom: 10px; + } +} +.el_sdialog-footer { + display: flex; + justify-content: flex-end; + margin-top: 10px; +} diff --git a/src/views/aftersales/aftersalesWorkOrderAdd.vue b/src/views/aftersales/aftersalesWorkOrderAdd.vue index aea21553..ae0326a7 100644 --- a/src/views/aftersales/aftersalesWorkOrderAdd.vue +++ b/src/views/aftersales/aftersalesWorkOrderAdd.vue @@ -1,50 +1,92 @@ - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - {{ - item.txt - }} - - -
- - - - - - - - - - - - -
- - - -
+
+
+ + + + -
-
- 处理方 - - - -
-
-
-
- 责任方 - - - -
-
+ + + -
-
- 处理结果 - - + + + + + + + + + + + + + + + + + + + + + - -
-
+ -
-
处理结果-理赔金额
-
-
- {{ item.name }}: - + -
支付方式
+ +
+
+ + + +
+ +
+
+ 处理方 + + + +
+
+ + + +
+
+ 运损节点 + + + +
+
-
- - 请选择支付方式 - -
- - + + + +
+
+ 添加信息 +
+
+
+
+ 责任方: + + + + + + + + + + +
+ +
+ 责任人： + + + +
+
+ 占比: + +
+
+ 说明: + +
+
+
+ + 移除 + +
+
+
+ 公司占比:{{ companyProportion }} +
+
+ + + +
+ + + + +
+ 添加赔款方 + 添加收款方 +
+ +
+ {{ item.state == 0 ? '赔款方' : '收款方' }}{{ item.cld }} +
+ +
+
+ +
+
+ +
+ +
+ +
+
+ 财务处理 + + 移除 + +
+
+
+ + 赔款金额总和:{{ + TotalamountCompensation + }} + + 收款金额总和:{{ TotalamountReceived }} +
+ + + +
+
+ 处理结果 + + + +
+
+ +
+
处理结果-理赔金额
+
+
+ {{ item.name }}: + +
+ {{ item.payment ? item.text : '支付方式' }} +
+
+
+ +
+ 总金额:{{ TotalClaimAmount }} +
+ - - -
- - 理赔支付时间 - -
- - -
-
- - - - - - -
- - - -
+ +
--> - -
- 图片 - - - + + 理赔支付时间 + +
+ + +
+
+ + + + - - Preview Image - -
+ +
+ + + +
- -
- 视频 - - -
- 点击上传 - 点击预览 -
- -
- - - - - - -
- - - - - - +
+ 图片 + - - - - -
+ + - -
- - - - -
- 添加赔款方 - 添加收款方 + + Preview Image +
-
- {{ item.state == 0 ? '赔款方' : '收款方' }}{{ item.cld }} +
+ 视频 + -
- -
-
- -
-
- -
- 移除 + +
+ 点击上传 + 点击预览 +
+
-
- - 赔款金额总和:{{ TotalamountCompensation }} - - 收款金额总和:{{ TotalamountReceived }} + + + + + + +
+ + + + + + + + + +
- - -
+
- -
- - - - - - - + +
+ + + + + + + +
+
- + +
+ +
+ +
+ + + + +

{{ item.username }}【{{ item.name }}】

+ {{ item.content }} +
+ +
+
+ 视频: 点击预览 + +
+ +
+ + 文件: 点击下载 + + +
+

{{ item.time }}

+
+ {{ msgState == 1 ? ' 待回复' : msgState == 2 ? '已回复' : '已超时' }} + +
+ + + +
+ + +
+
+
+ + + + + + + +
+ +
+
+ 回复 +
+
+
+ + + +
+ +
{ $_getInfo({ id: $route.query.id }).then(res => { console.log(res, '回显返回值参数'); endFrom.value = res.data.data; - endFrom.value.sss = 123123; endFrom.value.result = []; endFrom.value.processor = []; + endFrom.value.packageImage = []; + //图片处理回显 + res.data.data.decreaseImageVOList.forEach(res => { + endFrom.value['packageImage'].push({ + name: res.imageName, + url: res.imagePath, + }); + }); // 处理结果回显 res.data.data.processingResultsVO.processingMoneyEntityList.forEach(item => { ProcessingList.value.push({ @@ -585,6 +878,7 @@ const onLoad = () => { state: item.resultType, payment: item.compensationMethod, name: item.resultTypeName, + text: '', }); endFrom.value.result.push(item.resultType); }); @@ -594,18 +888,6 @@ const onLoad = () => { endFrom.value.processor.push(String(item.id)); } }); - console.log(ProcessingList.value, '价格'); - //图片处理回显 - res.data.data.decreaseImageVOList.forEach(res => { - endFrom.value['packageImage'].push({ - name: res.imageName, - url: res.imagePath, - }); - }); - - // 处理结果回显 - - console.log(endFrom.value, '当前参数'); }); } getDictionaryBiz('result_handling').then(res => { @@ -630,15 +912,91 @@ const onLoad = () => { }); }); }); + Chathistory(); //聊天的历史记录 +}; +// 文件识别 +const Fileidentifier = val => { + const url = val; + const fileName = url.substring(url.lastIndexOf('/') + 1); + const extension = fileName.substring(fileName.lastIndexOf('.') + 1); + if (extension === 'mp4') { + return 'mp4'; + } + if (extension === 'png') { + return 'png'; + } + if (extension === 'docx') { + return 'docx'; + } + return undefined; // 针对其他扩展名的情况返回 undefined }; + +// 聊天记录获取 +const Chathistory = () => { + // 聊天记录获取 + Msgloading.value = true; //开启加载效果 + MessageResponsibility.value = []; //清空选择内容 + Msgtextarea.value = ''; //清空输入框消息 + $_getSurveyRecord({ + id: $route.query.id, + }).then(res => { + let filetype = ''; //文件类型 + MessageContent.value = []; //先清空内容，防止内容重复叠加 + Msgloading.value = false; //关闭加载效果 + console.log(res, '聊天记录'); + if (res.data.data.processorVOList.length) { + msgState.value = res.data.data.processorVOList[0].processingStatus; //获取聊天状态 + } + + res.data.data.surveyRecordEntities.forEach(item => { + if (item.pictureUrl) { + filetype = Fileidentifier(item.pictureUrl); + } + + // MessageContent.value.push() + MessageContent.value.push({ + time: item.createTime, //时间 + content: item.content, //消息内容 + name: item.addDepartment, //营业部名称 + username: item.addPeople, //用户名 + img: filetype == 'png' ? item.pictureUrl : '', + file: filetype == 'docx' ? item.pictureUrl : '', + mp4: filetype == 'mp4' ? item.pictureUrl : '', + imgList: [filetype == 'png' ? item.pictureUrl : ''], + }); + }); + // 滚动到最后 + setTimeout(() => { + const container = scrollContainer.value; + if (container) { + container.scrollTop = container.scrollHeight; + } + }, 0); + }); +}; + onLoad(); +onMounted(() => { + msgHight.value = window.innerHeight * 0.76; + console.log(msgHight.value, '处理好的页面高度'); + + msgTop.value = window.innerHeight * 0.1; + + // 滚动到最后 + setTimeout(() => { + const container = scrollContainer.value; + if (container) { + container.scrollTop = container.scrollHeight; + } + }, 0); +}); const changeProcessingResults = val => { // 首先删除取消的项目 ProcessingList.value = ProcessingList.value.filter(item => val.includes(item.state - 1)); // 然后添加或保持新的项目 val.forEach(num => { - let newItem = { input: 0, min: 0, max: 9999999999999, state: num + 1, payment: '' }; + let newItem = { input: 0, min: 0, max: 9999999999999, state: num + 1, payment: '', text: '' }; // 根据num为newItem的name字段赋值 switch (num) { case '1': @@ -689,10 +1047,20 @@ const doubledCount = computed(() => { const ImgSuccess = (response, uploadFile) => { if (response.success == true) { console.log(response); - console.log(endFrom.value['packageImage'], '图片列表'); } }; + +// 附件上传成功 +const fellSuccess = (response, uploadFile) => { + console.log('上船成功'); + console.log(response, uploadFile); + if (response.data.link) { + KFfeel.value.push(response.data.link); + console.log(KFfeel.value, '已经上传的附件地址'); + } +}; + // 视频上传成功 const ViodSuccess = response => { if (response.success == true) { @@ -719,6 +1087,7 @@ const beforeAvatarUpload = rawFile => { const pictureList = val => { console.log(val, '图片列表'); }; + // 点击图片移除 const ImgListRemove = val => { console.log(val, '移除图片'); @@ -749,6 +1118,14 @@ const AddPayee = () => { }); CompensationParty.value.push({ name: '', state: 1, num: 0, reason: '', cld: som }); }; +// 理赔总金额计算 +const TotalChange = () => { + TotalClaimAmount.value = 0; + ProcessingList.value.forEach(item => { + console.log(item); + TotalClaimAmount.value += item.input; + }); +}; // 移除按钮 const payremove = (state, val) => { // 判断赔付方，至少保留一条数据 @@ -771,6 +1148,18 @@ const payremove = (state, val) => { console.log('CompensationParty :>> ', CompensationParty); amountMoney(); }; +// 公司占比计算 +const ProportionInput = () => { + console.log(FangAddList.value, '公司占比'); + let sum = 0; + FangAddList.value.forEach(item => { + sum = Number(item.responsibilityRatio) + sum; + }); + sum = 100 - sum; + companyProportion.value = sum; + console.log(sum, '公司占比'); +}; + // 金额输入汇总 const amountMoney = () => { // 计算赔款金额总数 @@ -794,6 +1183,39 @@ const amountMoney = () => { console.log('赔款总计金额', TotalamountCompensation.value); console.log('收款总计金额', TotalamountReceived.value); }; + +// 新视频预览 +const AddVideoPreview = val => { + VideoPreviewStatus.value = true; //开启视频查看弹窗 + videoUrl.value = MessageContent.value[val].mp4; +}; +const FileDownload = val => { + console.log(MessageContent.value[val].file, '文件地址'); +}; +// 责任方添加 +const responsibleParty = () => { + FangAddList.value.push({ businessName: '', personResponsibleName: '', responsibilityRatio: '' }); +}; +// 责任移除 +const ResponsibilityRemoval = val => { + FangAddList.value.splice(val, 1); //移除当前点击的按钮 +}; +// 消息责任方选择 +const Msgresponsibility = val => { + MessageResponsibility.value = val; + console.log(MessageResponsibility.value, '已经选择的责任方'); +}; +// 获取当前责任方的责任人 +const ResponsiblePartychange = (val, index) => { + FangAddList.value[index].personResponsibleName = null; //清空当前选择的责任人 + $_getBusinessDepartmentUser({ + warehouseId: val, + }).then(res => { + console.log(res, '获取责任人列表'); + personResponsibleList.value = res.data.data; + }); +}; + // 支付方式选择 const PaymentSelection = val => { console.log(val, '支付'); @@ -810,9 +1232,11 @@ const PaymentSelection = val => { }; // 支付方式选择确定 const PaymentConfirmation = val => { + console.log(val, '支付方式选择确定'); let data = ProcessingList.value.find(item => item.name == ZFname.value); + console.log(data, '处理好的'); + data.text = Paymentmethod.value.find(item => item.dictKey == val).dictValue; data.payment = val; - console.log(data, '支付方式选择'); ZFdialog.value = false; //关闭支付方式选择弹窗 ElMessage({ message: '支付方式选择成功', @@ -820,6 +1244,7 @@ const PaymentConfirmation = val => { }); console.log(ProcessingList.value, '选择好的支付列表'); }; + // 提交信息 const submit = () => { // 完结的逻辑 @@ -896,19 +1321,23 @@ const submit = () => { }); } else { // 新增记录 + console.log($route.query.id, '异常ID'); console.log(ProcessingList.value, 'ProcessingList12312'); let info = JSON.parse(JSON.stringify(endFrom.value)); //拷贝要提交的数据 let data = { + aftersalesProcessingResultsDTO: { + ...info, + }, processingMoneyEntityList: [], //赔付方式 - ...info, }; - data['workOrderId'] = info.id; //异常工单ID + data.id = $route.query.id; + data.aftersalesProcessingResultsDTO['workOrderId'] = $route.query.id; //异常工单ID let sum = 0; //金额总计 for (let i = 0; i < ProcessingList.value.length; i++) { console.log(ProcessingList.value[i].input); sum = computeNumber(sum, '+', ProcessingList.value[i].input).result; } - data['money'] = sum; //金额汇总 + data.aftersalesProcessingResultsDTO.money = sum; //金额汇总 // data['compensationMethod'] = Paymentmethod.value.filter( // item => item.dictKey == endFrom.value.compensationMethod // )[0].dictValue; //目前是单选 @@ -916,8 +1345,9 @@ const submit = () => { // data['compensationMethod'] = endFrom.value.compensationMethod.join(','); //赔付方式多选 // console.log(data['compensationMethod']); console.log(Paymentmethod.value, 'Paymentmethod.value'); - data['compensationMethod'] = ProcessingList.value.map(item => item.name).join(','); - + data.aftersalesProcessingResultsDTO['compensationMethod'] = ProcessingList.value + .map(item => item.text) + .join(','); data['processingMoneyEntityList'] = ProcessingList.value .map(item => { console.log(item); @@ -941,26 +1371,32 @@ const submit = () => { } }) .filter(item => item !== null); - data['resultType'] = ProcessingList.value.map(item => item.name).join(','); //处理结果说明文字拼接 + data.aftersalesProcessingResultsDTO.processingMoneyEntityList = + data['processingMoneyEntityList']; + console.log('走到了这一步'); + data.aftersalesProcessingResultsDTO.workOrderId = $route.query.id; //异常工单ID + data.aftersalesProcessingResultsDTO['resultType'] = ProcessingList.value + .map(item => item.name) + .join(','); //处理结果说明文字拼接 let imgLink = ''; //存储图片地址 - if (endFrom.value['packageImage'].length) { - imgLink = endFrom.value['packageImage'].map(item => item.response.data.link).join(','); //图片处理 - } + // 图片处理存在问题 + // if (endFrom.value['packageImage'].length) { + // imgLink = endFrom.value['packageImage'].map(item => item.response.data.link).join(','); //图片处理 + // } if (videoUrl.value && imgLink) { - data['annex'] = videoUrl.value + ',' + imgLink; + data.aftersalesProcessingResultsDTO['annex'] = videoUrl.value + ',' + imgLink; } else { - data['annex'] = imgLink; + data.aftersalesProcessingResultsDTO['annex'] = imgLink; } - console.log(data['annex'], '附件路径'); - console.log(data['resultType'], '处理结果'); - console.log(data['processingMoneyEntityList']); + console.log(data, '处理好的数据'); - delete data['id']; //删除ID字段 - delete data['packageImage']; //删除默认图片字段 - $_addSubmit(data).then(res => { + delete data.aftersalesProcessingResultsDTO.id; //删除ID字段 + + (data.aftersalesProcessingResultsDTO.warehouseId = info.warehouseId), //仓库ID + console.log(data, '处理好的数据'); + $_addProcessingResults(data).then(res => { console.log(res, '提交后的参数'); $router.push('/aftersales/aftersalesWorkOrder'); - console.log(res, '完结成功返回值'); if (res.code == 200) { ElMessage({ showClose: true, @@ -971,6 +1407,47 @@ const submit = () => { }); } }; + +// 消息回复 +const replyMessage = () => { + console.log(MessageContent.value, '当前的聊天记录'); + + console.log(warehouseData.value, '参数1212312312312312'); + console.log(MessageResponsibility, '责任方'); + let msgData = { + processorEntityList: [], + }; //初始化参数 + msgData.surveyRecordDTO = { + content: Msgtextarea.value, //内容' + workOrderId: $route.query.id, //工单ID + pictureUrl: KFfeel.value.join(','), //附件路径 + remark: '', //备注 + }; + + msgData.id = $route.query.id; //异常工单ID + // 责任方处理 MessageResponsibility 已经选择的处理方 + MessageResponsibility.value.forEach(item => { + msgData['processorEntityList'].push({ + businessName: warehouseData.value.find(obj => obj.value == item).label, //名称 + businessId: warehouseData.value.find(obj => obj.value == item).value, //ID + workOrderId: $route.query.id, //异常工单ID + typesOf: 2, //1 责任方 2 处理方 + warehouseId: $route.query.warehouseId, //仓库ID + }); + }); + + console.log(msgData, '处理好的参数'); + $_savaSurveyRecord(msgData).then(res => { + console.log(res, '消息回复成功'); + if (res.data.code == 200) { + Chathistory(); //回复消息成功，调用消息刷新显示最新消息 + ElMessage({ + message: res.data.msg, + type: 'success', + }); + } + }); +}; diff --git a/src/views/aftersales/customerService.vue b/src/views/aftersales/customerService.vue index a746c1e5..620fc853 100644 --- a/src/views/aftersales/customerService.vue +++ b/src/views/aftersales/customerService.vue @@ -192,7 +192,7 @@ const messagesendFn = () => { content: KFinput.value, createTime: formattedTime, }); - // 滚动到最后 + // 聊天记录滚动到最后 setTimeout(() => { const container = scrollContainer.value; if (container) { diff --git a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue index 6fe33a81..a6c24102 100644 --- a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue +++ b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue @@ -211,7 +211,7 @@ 按自编号 按包件 按托盘 - 按库存品 + 按零担 禁用 @@ -581,6 +581,7 @@ import { posturl, Alloclocationsnub, disable, + $_locationsnub, } from '@/api/basicdata/basicdataGoodsShelfView'; import { reactive, ref, toRefs, onMounted, getCurrentInstance } from 'vue'; import { getToken } from '@/utils/auth'; @@ -640,6 +641,7 @@ let details = reactive({ inputtxts1: '', boxdetails: {}, }); + onMounted(() => { details.contenbxsty['--length'] = details.contenarr[0]?.length || 0; initconfig(); @@ -663,6 +665,12 @@ async function initnumber() { async function initconfig() { let res = await getstoreCargo(); details.arrlist = res.data.data; + console.log(details.arrlist, '仓库列表'); + if (details.arrlist.length > 0) { + $_locationsnub({ warehouseId: details.arrlist[0].id }).then(res => { + console.log('初始化仓库参数成功', res); + }); + } if (details.arrlist[details.checkselect]?.warehouseGoodsAreaVOList.length > 0) { details.checkregionselect = 0; details.checksele = 0; @@ -837,10 +845,16 @@ async function upgood() { } } -const checkcso = () => { +const checkcso = val => { + console.log(details.arrlist[val].id, '选择的ID-====='); + console.log(val, '货位接受参数'); + $_locationsnub({ warehouseId: details.arrlist[val].id }).then(res => { + console.log('切换请求成功', res); + }); if (details.arrlist[details.checkselect]?.warehouseGoodsAreaVOList.length > 0) { details.checkregionselect = 0; details.checksele = 0; + checkshelves(); } else { details.checkregionselect = ''; @@ -1557,6 +1571,7 @@ const showupt = value => { } searchbuts(); }; + const alldown = async () => { console.log(scope.row); let data = { @@ -2546,7 +2561,7 @@ const { // font-size: 14px; } .type2 { - border: 1px solid #3AD8BC; + border: 1px solid #3ad8bc; background: #ffffff; border-radius: 4px 4px 4px 4px; } diff --git a/src/views/warehouse/warehousingentry/warehouseWarehousingEntry.vue b/src/views/warehouse/warehousingentry/warehouseWarehousingEntry.vue index de784233..076eeb11 100644 --- a/src/views/warehouse/warehousingentry/warehouseWarehousingEntry.vue +++ b/src/views/warehouse/warehousingentry/warehouseWarehousingEntry.vue @@ -341,6 +341,17 @@ export default { checkarr: [], fixed: false, sortable: true, + } + , + { + label: '存放位置备注', + prop: 'positions', + type: 3, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, }, { label: '状态', @@ -687,7 +698,7 @@ export default { handleTemplate() { console.log('下载模板！！！'); exportBlob( - `/api/logpm-warehouse/warehouseWarehousingEntry/export-warehouseWarehousingEntry?${ + `/api/logpm-warehouse/warehouseWarehousingEntry/export-warehouseWarehousingTemplate?${ this.website.tokenHeader }=${getToken()}` ).then(res => { diff --git a/vite.config.js b/vite.config.js index db19b84a..eacdd94d 100644 --- a/vite.config.js +++ b/vite.config.js @@ -23,8 +23,8 @@ export default ({ mode, command }) => { // 新zyc // target: 'http://192.168.6.116:8777', - // target: 'http://192.168.6.141:8777', - target: 'http://192.168.6.116:8777', + target: 'http://192.168.6.122:8777', + // target: 'http://192.168.6.116:8777', // tjj // sst // target: 'http://192.168.10.94:8888',