diff --git a/src/api/aftersales/aftersalesWorkOrder.js b/src/api/aftersales/aftersalesWorkOrder.js index e8fc781e..2812bc3e 100644 --- a/src/api/aftersales/aftersalesWorkOrder.js +++ b/src/api/aftersales/aftersalesWorkOrder.js @@ -389,7 +389,7 @@ export const $_updateWorkOrderStatus = (data) => { data }) } -// 处理结果完结结果确定 +// 完结审核 export const $_updateManagerConfirmed = (data) => { return request({ url: '/api/logpm-aftersales/aftersalesWorkOrder/updateManagerConfirmed', diff --git a/src/api/wel/index.js b/src/api/wel/index.js index d4112e05..7c26ff01 100644 --- a/src/api/wel/index.js +++ b/src/api/wel/index.js @@ -13,6 +13,19 @@ export const postAllocationData = data => { }); }; +/** + * 库位数据 -- 对比数据 + * @param {Object} data + * @returns + */ +export const postOpenOrderDataByWarehouseId = data => { + return request({ + url: '/api/logpm-report/warehouseIndex/openOrderDataByWarehouseId', + method: 'post', + data, + }); +}; + /** * 当前在库数据 * @param {Object} data diff --git a/src/components/MultiConditionSearch/MultiConditionSearch.vue b/src/components/MultiConditionSearch/MultiConditionSearch.vue index 8b60419d..16bbdf83 100644 --- a/src/components/MultiConditionSearch/MultiConditionSearch.vue +++ b/src/components/MultiConditionSearch/MultiConditionSearch.vue @@ -100,6 +100,8 @@ const maximize = () => { const close = () => { emit('update:modelValue', false); + minimizeState.value = false; + emit('update:inputValue', localInputValue.value); }; const expandWindow = () => { @@ -114,7 +116,14 @@ const destroyWindow = () => { }; const dialogSearchSubmit = () => { - emit('dialogSearchSubmit', localInputValue.value); + const lines = localInputValue.value + .split('\n') // 按换行分割 + .map(line => line.trim()) // 移除每一行前后的空格 + .filter(line => line !== ''); // 过滤掉空行 + + const joinedLines = lines.join(','); // 使用逗号连接,无空格 + emit('dialogSearchSubmit', joinedLines); + emit('update:inputValue', localInputValue.value); }; diff --git a/src/components/tablecmt/tablecmt.vue b/src/components/tablecmt/tablecmt.vue index 11487f0a..5c44edf7 100644 --- a/src/components/tablecmt/tablecmt.vue +++ b/src/components/tablecmt/tablecmt.vue @@ -381,6 +381,8 @@ const isHaveSelection = ref(false); let selectarr = ref([]); /** 设置每行颜色 */ const tableRowClassName = ({ row, rowIndex }: { row: TableDataType; rowIndex: number }) => { + if (props.tableData.length === selectarr.value.length) return 'table-SelectedRow-bgcolor'; + for (let i = 0; i < selectarr.value.length; i++) { if (selectarr.value[i] === row) return 'table-SelectedRow-bgcolor'; } @@ -527,10 +529,10 @@ const handleSelectionChange = (param: TableDataType[]) => { selectCount.value[i].value = 0; } - if (selectarr.value.length === 0) return; + if (param.length === 0) return; - for (let index = 0; index < selectarr.value.length; index++) { - const val = selectarr.value[index]; + for (let index = 0; index < param.length; index++) { + const val = param[index]; for (let j = 0; j < selectCount.value.length; j++) { const item = selectCount.value[j]; @@ -714,10 +716,10 @@ const handleWidthChange = (newWidth, oldWidth, column, event) => { if (props.isSave) return; - postSaveTableSeting({ - tableKey: $route.path + props.columnListName, - tableSetCongig: JSON.stringify(props.columnList), - }); + // postSaveTableSeting({ + // tableKey: $route.path + props.columnListName, + // tableSetCongig: JSON.stringify(props.columnList), + // }); }; let watchTimer; @@ -725,7 +727,6 @@ watch( () => props.columnList, () => { if (watchTimer) clearTimeout(watchTimer); - watchTimer = setTimeout(() => { for (let i = 0; i < props.columnList.length; i++) { const val = props.columnList[i]; @@ -830,21 +831,6 @@ defineExpose({ handleCheckSelect, handleClearSelect }); .el-table .el-input__inner { height: 23px !important; } -// .el-checkbox__input.is-checked .el-checkbox__inner{ -// background-color: #D3832A !important; -// border-color: #D3832A !important; -// } -// .is .el-checkbox__input.is-checked .el-checkbox__inner{ -// background-color: #D3832A !important; -// border-color: #D3832A !important; -// } -// .is-checked .el-checkbox__inner:hover{ -// border-color: #D3832A !important; -// } -// .el-checkbox__input.is-indeterminate .el-checkbox__inner{ -// background-color: #D3832A !important; -// border-color: #D3832A !important; -// } .el-table .el-table__cell { padding: 0px !important; } @@ -864,10 +850,8 @@ defineExpose({ handleCheckSelect, handleClearSelect }); border-color: #d3832a !important; font-size: 12px !important; } -.table-SelectedRow-bgcolor { - > td { - background-color: #f7e8d7 !important; - } +.el-table .table-SelectedRow-bgcolor { + background-color: #f7e8d7 !important; } .colors { color: #409eff !important; @@ -902,9 +886,6 @@ defineExpose({ handleCheckSelect, handleClearSelect }); .el-table .el-popper { max-width: 20% !important; } -.el-input { - // width: 200px !important; -} .el-table__footer { tr { diff --git a/src/option/distribution/TripartiteTransfer.js b/src/option/distribution/TripartiteTransfer.js index 6659366a..334238bc 100644 --- a/src/option/distribution/TripartiteTransfer.js +++ b/src/option/distribution/TripartiteTransfer.js @@ -251,7 +251,7 @@ export const columnList = [ label: '操作', type: 6, values: '', - width: '200', + width: '300', checkarr: [], fixed: 'right', sortable: false, diff --git a/src/option/wel/index.js b/src/option/wel/index.js new file mode 100644 index 00000000..cfd23a59 --- /dev/null +++ b/src/option/wel/index.js @@ -0,0 +1,94 @@ +/** 开单数据 */ +export const openOrderColumn = [ + { + prop: '', + label: '复选框', + type: 0, + width: 55, + fixed: false, + }, + { + prop: '', + label: '序号', + type: 12, + values: '', + width: 55, + fixed: false, + }, + { + prop: 'warehouseName', + label: '仓库', + type: 2, + values: '', + width: '150', + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'totalNum', + label: '总单数', + type: 2, + values: '', + width: '150', + fixed: false, + sortable: true, + head: false, + isshowSummary: true, + }, + { + prop: 'totalCount', + label: '总件数', + type: 2, + values: '', + width: '150', + fixed: false, + sortable: true, + head: false, + isshowSummary: true, + }, + { + prop: 'monthNum', + label: '月单数', + type: 2, + values: '', + width: '150', + fixed: false, + sortable: true, + head: false, + isshowSummary: true, + }, + { + prop: 'monthCount', + label: '月件数', + type: 2, + values: '', + width: '150', + fixed: false, + sortable: true, + head: false, + isshowSummary: true, + }, + { + prop: 'dayNum', + label: '日单数', + type: 2, + values: '', + width: '150', + fixed: false, + sortable: true, + head: false, + isshowSummary: true, + }, + { + prop: 'dayCount', + label: '日件数', + type: 2, + values: '', + width: '150', + fixed: false, + sortable: true, + head: false, + isshowSummary: true, + }, +]; diff --git a/src/router/views/index.js b/src/router/views/index.js index ec092d40..8f443f36 100644 --- a/src/router/views/index.js +++ b/src/router/views/index.js @@ -9,7 +9,7 @@ export default [ children: [ { path: 'index', - name: '首页', + name: '数据看板', meta: { i18n: 'dashboard', }, diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue index ef3c46d9..cd0e7143 100644 --- a/src/views/aftersales/aftersalesWorkOrder.vue +++ b/src/views/aftersales/aftersalesWorkOrder.vue @@ -112,19 +112,31 @@ @click="WorkOrderAssignment" >工单指派 - 客服介入 - 钉钉号填写 - 批量完结 + > --> 批量完结审核 - 财务入账 @@ -363,6 +375,44 @@ + + + + + + + + + + +
- 网络导出 + 全部导出 - 本地导出 + 本地导出 + + + +
+ + + + + + + + + + + +
+ +
+ + +
+ + + + + + + + +
+ +
@@ -998,9 +1081,16 @@