refactor(components): 移除未使用的Element Plus组件并优化销售出库页面布局
This commit is contained in:
parent
57a06c7fee
commit
e193dacc4f
@ -331,6 +331,7 @@ public class SaleDeliveryServiceImpl implements SaleDeliveryService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
saleDelivery.setDeliveryStatus("2");
|
saleDelivery.setDeliveryStatus("2");
|
||||||
|
saleDelivery.setTwmStorageId(proStorage.getId());
|
||||||
saleDeliveryMapper.updateById(saleDelivery);
|
saleDeliveryMapper.updateById(saleDelivery);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -31,28 +31,13 @@ declare module 'vue' {
|
|||||||
DocAlert: typeof import('./../components/DocAlert/index.vue')['default']
|
DocAlert: typeof import('./../components/DocAlert/index.vue')['default']
|
||||||
Echart: typeof import('./../components/Echart/src/Echart.vue')['default']
|
Echart: typeof import('./../components/Echart/src/Echart.vue')['default']
|
||||||
Editor: typeof import('./../components/Editor/src/Editor.vue')['default']
|
Editor: typeof import('./../components/Editor/src/Editor.vue')['default']
|
||||||
ElAlert: typeof import('element-plus/es')['ElAlert']
|
|
||||||
ElAside: typeof import('element-plus/es')['ElAside']
|
|
||||||
ElAutoResizer: typeof import('element-plus/es')['ElAutoResizer']
|
|
||||||
ElAvatar: typeof import('element-plus/es')['ElAvatar']
|
ElAvatar: typeof import('element-plus/es')['ElAvatar']
|
||||||
ElBadge: typeof import('element-plus/es')['ElBadge']
|
|
||||||
ElButton: typeof import('element-plus/es')['ElButton']
|
ElButton: typeof import('element-plus/es')['ElButton']
|
||||||
ElButtonGroup: typeof import('element-plus/es')['ElButtonGroup']
|
|
||||||
ElCard: typeof import('element-plus/es')['ElCard']
|
ElCard: typeof import('element-plus/es')['ElCard']
|
||||||
ElCarousel: typeof import('element-plus/es')['ElCarousel']
|
|
||||||
ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem']
|
|
||||||
ElCascader: typeof import('element-plus/es')['ElCascader']
|
|
||||||
ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
|
ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
|
||||||
ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup']
|
ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup']
|
||||||
ElCol: typeof import('element-plus/es')['ElCol']
|
ElCol: typeof import('element-plus/es')['ElCol']
|
||||||
ElCollapse: typeof import('element-plus/es')['ElCollapse']
|
|
||||||
ElCollapseItem: typeof import('element-plus/es')['ElCollapseItem']
|
|
||||||
ElCollapseTransition: typeof import('element-plus/es')['ElCollapseTransition']
|
|
||||||
ElColorPicker: typeof import('element-plus/es')['ElColorPicker']
|
|
||||||
ElContainer: typeof import('element-plus/es')['ElContainer']
|
|
||||||
ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
|
ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
|
||||||
ElDescriptions: typeof import('element-plus/es')['ElDescriptions']
|
|
||||||
ElDescriptionsItem: typeof import('element-plus/es')['ElDescriptionsItem']
|
|
||||||
ElDialog: typeof import('element-plus/es')['ElDialog']
|
ElDialog: typeof import('element-plus/es')['ElDialog']
|
||||||
ElDivider: typeof import('element-plus/es')['ElDivider']
|
ElDivider: typeof import('element-plus/es')['ElDivider']
|
||||||
ElDrawer: typeof import('element-plus/es')['ElDrawer']
|
ElDrawer: typeof import('element-plus/es')['ElDrawer']
|
||||||
@ -68,42 +53,25 @@ declare module 'vue' {
|
|||||||
ElementTask: typeof import('./../components/bpmnProcessDesigner/package/penal/task/ElementTask.vue')['default']
|
ElementTask: typeof import('./../components/bpmnProcessDesigner/package/penal/task/ElementTask.vue')['default']
|
||||||
ElForm: typeof import('element-plus/es')['ElForm']
|
ElForm: typeof import('element-plus/es')['ElForm']
|
||||||
ElFormItem: typeof import('element-plus/es')['ElFormItem']
|
ElFormItem: typeof import('element-plus/es')['ElFormItem']
|
||||||
ElHeader: typeof import('element-plus/es')['ElHeader']
|
|
||||||
ElIcon: typeof import('element-plus/es')['ElIcon']
|
ElIcon: typeof import('element-plus/es')['ElIcon']
|
||||||
ElImage: typeof import('element-plus/es')['ElImage']
|
|
||||||
ElImageViewer: typeof import('element-plus/es')['ElImageViewer']
|
ElImageViewer: typeof import('element-plus/es')['ElImageViewer']
|
||||||
ElInput: typeof import('element-plus/es')['ElInput']
|
ElInput: typeof import('element-plus/es')['ElInput']
|
||||||
ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
|
|
||||||
ElLink: typeof import('element-plus/es')['ElLink']
|
|
||||||
ElMain: typeof import('element-plus/es')['ElMain']
|
|
||||||
ElOption: typeof import('element-plus/es')['ElOption']
|
ElOption: typeof import('element-plus/es')['ElOption']
|
||||||
ElPagination: typeof import('element-plus/es')['ElPagination']
|
ElPagination: typeof import('element-plus/es')['ElPagination']
|
||||||
ElPopover: typeof import('element-plus/es')['ElPopover']
|
ElPopover: typeof import('element-plus/es')['ElPopover']
|
||||||
ElRadio: typeof import('element-plus/es')['ElRadio']
|
ElRadio: typeof import('element-plus/es')['ElRadio']
|
||||||
ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
|
|
||||||
ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
|
ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
|
||||||
ElRate: typeof import('element-plus/es')['ElRate']
|
|
||||||
ElRow: typeof import('element-plus/es')['ElRow']
|
ElRow: typeof import('element-plus/es')['ElRow']
|
||||||
ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
|
ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
|
||||||
ElSelect: typeof import('element-plus/es')['ElSelect']
|
ElSelect: typeof import('element-plus/es')['ElSelect']
|
||||||
ElSkeleton: typeof import('element-plus/es')['ElSkeleton']
|
ElSkeleton: typeof import('element-plus/es')['ElSkeleton']
|
||||||
ElSlider: typeof import('element-plus/es')['ElSlider']
|
|
||||||
ElSpace: typeof import('element-plus/es')['ElSpace']
|
|
||||||
ElSwitch: typeof import('element-plus/es')['ElSwitch']
|
ElSwitch: typeof import('element-plus/es')['ElSwitch']
|
||||||
ElTable: typeof import('element-plus/es')['ElTable']
|
ElTable: typeof import('element-plus/es')['ElTable']
|
||||||
ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
|
ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
|
||||||
ElTableV2: typeof import('element-plus/es')['ElTableV2']
|
|
||||||
ElTabPane: typeof import('element-plus/es')['ElTabPane']
|
ElTabPane: typeof import('element-plus/es')['ElTabPane']
|
||||||
ElTabs: typeof import('element-plus/es')['ElTabs']
|
ElTabs: typeof import('element-plus/es')['ElTabs']
|
||||||
ElTag: typeof import('element-plus/es')['ElTag']
|
ElTag: typeof import('element-plus/es')['ElTag']
|
||||||
ElText: typeof import('element-plus/es')['ElText']
|
|
||||||
ElTimeline: typeof import('element-plus/es')['ElTimeline']
|
|
||||||
ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
|
|
||||||
ElTimePicker: typeof import('element-plus/es')['ElTimePicker']
|
|
||||||
ElTimeSelect: typeof import('element-plus/es')['ElTimeSelect']
|
|
||||||
ElTooltip: typeof import('element-plus/es')['ElTooltip']
|
ElTooltip: typeof import('element-plus/es')['ElTooltip']
|
||||||
ElTransfer: typeof import('element-plus/es')['ElTransfer']
|
|
||||||
ElTree: typeof import('element-plus/es')['ElTree']
|
|
||||||
ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect']
|
ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect']
|
||||||
ElUpload: typeof import('element-plus/es')['ElUpload']
|
ElUpload: typeof import('element-plus/es')['ElUpload']
|
||||||
Error: typeof import('./../components/Error/src/Error.vue')['default']
|
Error: typeof import('./../components/Error/src/Error.vue')['default']
|
||||||
@ -117,11 +85,20 @@ declare module 'vue' {
|
|||||||
Infotip: typeof import('./../components/Infotip/src/Infotip.vue')['default']
|
Infotip: typeof import('./../components/Infotip/src/Infotip.vue')['default']
|
||||||
InputPassword: typeof import('./../components/InputPassword/src/InputPassword.vue')['default']
|
InputPassword: typeof import('./../components/InputPassword/src/InputPassword.vue')['default']
|
||||||
InputWithColor: typeof import('./../components/InputWithColor/index.vue')['default']
|
InputWithColor: typeof import('./../components/InputWithColor/index.vue')['default']
|
||||||
|
LotNoDialog: typeof import('./../views/biz/productioninsp/LotNoDialog.vue')['default']
|
||||||
MagicCubeEditor: typeof import('./../components/MagicCubeEditor/index.vue')['default']
|
MagicCubeEditor: typeof import('./../components/MagicCubeEditor/index.vue')['default']
|
||||||
|
Matout: typeof import('./../api/biz/matout/index.ts')['default']
|
||||||
|
Matoutdetail: typeof import('./../api/biz/matoutdetail/index.ts')['default']
|
||||||
|
MatOutForm: typeof import('./../views/biz/matout/MatOutForm.vue')['default']
|
||||||
|
Millparamact: typeof import('./../api/biz/millparamact/index.ts')['default']
|
||||||
Pagination: typeof import('./../components/Pagination/index.vue')['default']
|
Pagination: typeof import('./../components/Pagination/index.vue')['default']
|
||||||
ProcessDesigner: typeof import('./../components/bpmnProcessDesigner/package/designer/ProcessDesigner.vue')['default']
|
ProcessDesigner: typeof import('./../components/bpmnProcessDesigner/package/designer/ProcessDesigner.vue')['default']
|
||||||
ProcessPalette: typeof import('./../components/bpmnProcessDesigner/package/palette/ProcessPalette.vue')['default']
|
ProcessPalette: typeof import('./../components/bpmnProcessDesigner/package/palette/ProcessPalette.vue')['default']
|
||||||
ProcessViewer: typeof import('./../components/bpmnProcessDesigner/package/designer/ProcessViewer.vue')['default']
|
ProcessViewer: typeof import('./../components/bpmnProcessDesigner/package/designer/ProcessViewer.vue')['default']
|
||||||
|
Proctioninspdetail: typeof import('./../api/biz/proctioninspdetail/index.ts')['default']
|
||||||
|
Proctioninsptotal: typeof import('./../api/biz/proctioninsptotal/index.ts')['default']
|
||||||
|
Productioninsp: typeof import('./../api/biz/productioninsp/index.ts')['default']
|
||||||
|
ProductionInspForm: typeof import('./../views/biz/productioninsp/ProductionInspForm.vue')['default']
|
||||||
PropertiesPanel: typeof import('./../components/bpmnProcessDesigner/package/penal/PropertiesPanel.vue')['default']
|
PropertiesPanel: typeof import('./../components/bpmnProcessDesigner/package/penal/PropertiesPanel.vue')['default']
|
||||||
Qrcode: typeof import('./../components/Qrcode/src/Qrcode.vue')['default']
|
Qrcode: typeof import('./../components/Qrcode/src/Qrcode.vue')['default']
|
||||||
ReceiveTask: typeof import('./../components/bpmnProcessDesigner/package/penal/task/task-components/ReceiveTask.vue')['default']
|
ReceiveTask: typeof import('./../components/bpmnProcessDesigner/package/penal/task/task-components/ReceiveTask.vue')['default']
|
||||||
|
|||||||
@ -129,7 +129,7 @@ const open = (defaultIds?: number[]) => {
|
|||||||
dialogVisible.value = true
|
dialogVisible.value = true
|
||||||
// 设置默认选中的ID列表
|
// 设置默认选中的ID列表
|
||||||
selectedIds.value = defaultIds || []
|
selectedIds.value = defaultIds || []
|
||||||
searchMaterial()
|
// searchMaterial()
|
||||||
}
|
}
|
||||||
|
|
||||||
const searchMaterial = async () => {
|
const searchMaterial = async () => {
|
||||||
|
|||||||
@ -81,7 +81,7 @@
|
|||||||
<dict-tag v-if="scope.row.unit" :type="DICT_TYPE.UNIT" :value="scope.row.unit" />
|
<dict-tag v-if="scope.row.unit" :type="DICT_TYPE.UNIT" :value="scope.row.unit" />
|
||||||
<span v-else>-</span>
|
<span v-else>-</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
|
|
||||||
<!-- 分页 -->
|
<!-- 分页 -->
|
||||||
@ -169,7 +169,7 @@ const getList = async () => {
|
|||||||
saleOrdId: order.id,
|
saleOrdId: order.id,
|
||||||
custId: order.custId, // 添加客户ID
|
custId: order.custId, // 添加客户ID
|
||||||
deliveriedQty: item.deliveriedQty || 0,
|
deliveriedQty: item.deliveriedQty || 0,
|
||||||
itemId: item.id
|
itemId: item.id
|
||||||
})),
|
})),
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|||||||
@ -72,12 +72,12 @@
|
|||||||
</ContentWrap>
|
</ContentWrap>
|
||||||
|
|
||||||
<!-- 表格区域:主列表 -->
|
<!-- 表格区域:主列表 -->
|
||||||
<ContentWrap class="!p-15px" style="height: calc(50vh - 150px);">
|
<ContentWrap class="!p-10px">
|
||||||
<div style="display: flex; flex-direction: column; ">
|
<div style="display: flex; flex-direction: column; height: calc(50vh - 180px);">
|
||||||
<!-- 主列表 -->
|
<!-- 主列表 -->
|
||||||
<div style="flex: 1; min-height: 0;">
|
<div style="flex: 1; min-height: 0; display: flex; flex-direction: column; overflow: hidden;">
|
||||||
<div style="font-weight: bold; margin-bottom: 8px;">出库单列表</div>
|
<div style="font-weight: bold; margin-bottom: 8px;">出库单列表</div>
|
||||||
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" border @row-click="handleRowClick" style="height: calc(50vh - 220px);">
|
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" border @row-click="handleRowClick" style="flex: 1;" max-height="100%">
|
||||||
<el-table-column type="selection" width="55px" align="right" fixed="left" />
|
<el-table-column type="selection" width="55px" align="right" fixed="left" />
|
||||||
<el-table-column label="序号" align="center" type="index" width="60px" fixed="left" />
|
<el-table-column label="序号" align="center" type="index" width="60px" fixed="left" />
|
||||||
<el-table-column label="出库单号" align="center" prop="saleDeliveryNo" width="130px" fixed="left" />
|
<el-table-column label="出库单号" align="center" prop="saleDeliveryNo" width="130px" fixed="left" />
|
||||||
@ -98,7 +98,7 @@
|
|||||||
<el-table-column label="出库人" align="center" prop="deliveryEmpName" width="100px" />
|
<el-table-column label="出库人" align="center" prop="deliveryEmpName" width="100px" />
|
||||||
<el-table-column label="交货方式" align="center" prop="deliveryType" width="100px">
|
<el-table-column label="交货方式" align="center" prop="deliveryType" width="100px">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<span>{{ scope.row.deliveryType === '1' ? '发货' : (scope.row.deliveryType === '2' ? '自提' : '-') }}</span>
|
<span>{{ scope.row.deliveryType === '1' ? '发货' : (scope.row.deliveryType === '2' ? '自提' : '-') }}</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="联系人" align="center" prop="contact" width="100px" />
|
<el-table-column label="联系人" align="center" prop="contact" width="100px" />
|
||||||
@ -142,17 +142,18 @@
|
|||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
<Pagination
|
<div style="display: flex; justify-content: flex-end; margin-top: 1px; flex-shrink: 0;">
|
||||||
:total="total"
|
<Pagination
|
||||||
v-model:page="queryParams.pageNo"
|
:total="total"
|
||||||
v-model:limit="queryParams.pageSize"
|
v-model:page="queryParams.pageNo"
|
||||||
@pagination="getList"
|
v-model:limit="queryParams.pageSize"
|
||||||
style="margin-top: 8px;"
|
@pagination="getList"
|
||||||
/>
|
/>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</ContentWrap>
|
</ContentWrap>
|
||||||
<ContentWrap class="!p-15px" style="height: calc(50vh - 100px);">
|
<ContentWrap class="!p-15px" style="height: calc(43vh - 100px);">
|
||||||
<!-- 明细表格 -->
|
<!-- 明细表格 -->
|
||||||
<div style="flex: 1; min-height: 0;" >
|
<div style="flex: 1; min-height: 0;" >
|
||||||
<div style="font-weight: bold; margin-bottom: 8px;">出库单明细</div>
|
<div style="font-weight: bold; margin-bottom: 8px;">出库单明细</div>
|
||||||
@ -177,7 +178,7 @@
|
|||||||
|
|
||||||
<!-- 表单弹窗:添加/修改 -->
|
<!-- 表单弹窗:添加/修改 -->
|
||||||
<SaleDeliveryForm ref="formRef" @success="getList" @close="handleQuery"/>
|
<SaleDeliveryForm ref="formRef" @success="getList" @close="handleQuery"/>
|
||||||
|
|
||||||
<!-- 详情弹窗 -->
|
<!-- 详情弹窗 -->
|
||||||
<SaleDeliveryDetail ref="detailRef" @success="getList" @close="handleQuery"/>
|
<SaleDeliveryDetail ref="detailRef" @success="getList" @close="handleQuery"/>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user