From 4823f9731d9203feb406a2a9762df33d59da79f5 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Mon, 4 Dec 2023 17:23:42 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E8=AE=A1=E5=88=92=E5=AD=90?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/itembasic/index.ts | 5 +- src/api/wms/owner/index.ts | 5 +- src/components/BasicForm/src/BasicForm.vue | 9 +- src/components/TableForm/src/TableForm.vue | 38 +- .../count/countPlanMain/countPlanMain.data.ts | 351 +++++++++-------- .../countManage/count/countPlanMain/index.vue | 370 +++++++++++++----- 6 files changed, 514 insertions(+), 264 deletions(-) diff --git a/src/api/wms/itembasic/index.ts b/src/api/wms/itembasic/index.ts index 64b06710f..1575fd5c7 100644 --- a/src/api/wms/itembasic/index.ts +++ b/src/api/wms/itembasic/index.ts @@ -38,7 +38,10 @@ export const getItembasicPage = async (params) => { return await request.get({ url: `/wms/itembasic/page`, params }) } } - +// 查询物品基本信息列表 +export const getItembasicList = async (params) => { + return await request.get({ url: `/wms/itembasic/list`, params }) +} // 查询物品基本信息详情 export const getItembasic = async (id: number) => { return await request.get({ url: `/wms/itembasic/get?id=` + id }) diff --git a/src/api/wms/owner/index.ts b/src/api/wms/owner/index.ts index 9c4260ea0..64ccb4470 100644 --- a/src/api/wms/owner/index.ts +++ b/src/api/wms/owner/index.ts @@ -31,7 +31,10 @@ export const getOwnerPage = async (params) => { return await request.get({ url: `/wms/owner/page`, params }) } } - +// 查询所有货主列表 +export const getOwnerList = async (params) => { + return await request.get({ url: `/wms/owner/list`, params }) +} // 查询货主详情 export const getOwner = async (id: number) => { return await request.get({ url: `/wms/owner/get?id=` + id }) diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue index 4dc22efb4..01f94218b 100644 --- a/src/components/BasicForm/src/BasicForm.vue +++ b/src/components/BasicForm/src/BasicForm.vue @@ -35,6 +35,7 @@ @tableSelectionChange="tableSelectionChange" @extendedButtonsClick="extendedButtonsClick" @formSelectChange="formSelectChange" + @formSelectvVisibleChange = 'formSelectvVisibleChange' @tableSortChange="tableSortChange" @selectCallback="selectCallback" @handleTableSelect="handleTableSelect" @@ -337,6 +338,7 @@ const emit = defineEmits([ 'tableSelectionChange', 'extendedButtonsClick', 'formSelectChange', + 'formSelectvVisibleChange', 'tableSortChange', 'selectCallback', 'handleTableSelect', @@ -349,8 +351,11 @@ const emit = defineEmits([ 'selectChange' ]) //普通下拉改变事件 -const formSelectChange = (field, val) => { - emit('formSelectChange', field, val) +const formSelectChange = (field, val,row) => { + emit('formSelectChange', field, val,row) +} +const formSelectvVisibleChange = (field, val,row) => { + emit('formSelectvVisibleChange', field, val,row) } // 点击selection框 const tableSelectionChange = (val) => { diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue index f194382c8..b729e12c0 100644 --- a/src/components/TableForm/src/TableForm.vue +++ b/src/components/TableForm/src/TableForm.vue @@ -97,7 +97,7 @@ + @change="formSelectChange(headerItem.field, $event,row)" + @visible-change="formSelectvVisibleChange(headerItem.field, $event,row)"> + { return item.dictType ? getStrDictOptions(item.dictType) : item.tableForm.initOptions } //普通下拉改变事件 -const formSelectChange = (field, val) => { - emit('formSelectChange', field, val) +const formSelectChange = (field, val,row) => { + emit('formSelectChange', field, val,row) +} +const formSelectvVisibleChange = (field, val,row) => { + emit('formSelectvVisibleChange', field, val,row) } // 点击selection框 const tableSelectionChange = (val) => { diff --git a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts index 69a2b2eb5..92dd2e5d5 100644 --- a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts +++ b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts @@ -434,179 +434,222 @@ export const CountPlanMainRules = reactive({ /** * @returns {Array} 盘点计划子表 */ +// export const CountPlanDetail = useCrudSchemas(([ +// { +// label: '盘点范围类型', +// field: 'type', +// dictType: DICT_TYPE.COUNT_TYPE, +// dictClass: 'string', +// isTable: true, +// sort: 'custom', +// table: { +// width: 150 +// }, +// tableForm: { +// type: 'Select' +// } +// }, +// { +// label: '盘点范围值', +// field: 'value', +// sort: 'custom', +// table: { +// width: 150 +// }, +// }, +// { +// label: '单据号', +// field: 'number', +// sort: 'custom', +// table: { +// width: 150, +// }, +// isTableForm: false, +// form: { +// componentProps: { +// disabled: true +// } +// } +// }, +// { +// label: '物品代码', +// field: 'itemCode', +// sort: 'custom', +// table: { +// width: 150 +// }, +// }, +// { +// label: '备注', +// field: 'remark', +// sort: 'custom', +// table: { +// width: 150 +// }, +// }, +// { +// label: '创建者', +// field: 'creator', +// sort: 'custom', +// table: { +// width: 150 +// }, +// isTableForm: false, +// isForm: false, +// }, +// { +// label: '创建时间', +// field: 'createTime', +// formatter: dateFormatter, +// detail: { +// dateFormat: 'YYYY-MM-DD HH:mm:ss' +// }, +// sort: 'custom', +// table: { +// width: 180 +// }, +// form: { +// component: 'DatePicker', +// componentProps: { +// style: {width:'100%'}, +// type: 'datetime', +// dateFormat: 'YYYY-MM-DD HH:mm:ss', +// valueFormat: 'x', +// } +// }, +// isTableForm: false, +// isForm: false, +// }, +// { +// label: '最后更新时间', +// field: 'updateTime', +// formatter: dateFormatter, +// detail: { +// dateFormat: 'YYYY-MM-DD HH:mm:ss' +// }, +// sort: 'custom', +// table: { +// width: 180 +// }, +// form: { +// component: 'DatePicker', +// componentProps: { +// style: {width:'100%'}, +// type: 'datetime', +// dateFormat: 'YYYY-MM-DD HH:mm:ss', +// valueFormat: 'x', +// } +// }, +// isTableForm: false, +// isForm: false, +// }, +// { +// label: '最后更新者', +// field: 'updater', +// sort: 'custom', +// table: { +// width: 150 +// }, +// isTableForm: false, +// isForm: false, +// }, +// { +// label: '计划数量', +// field: 'planQty', +// sort: 'custom', +// table: { +// width: 150 +// }, +// form: { +// component: 'InputNumber', +// componentProps: { +// min: 1, +// precision: 6 +// } +// }, +// tableForm: { +// type: 'InputNumber', +// min: 1, +// precision: 6 +// } +// }, +// { +// label: '计量单位', +// field: 'uom', +// dictType: DICT_TYPE.UOM, +// dictClass: 'string', +// isTable: true, +// sort: 'custom', +// table: { +// width: 150 +// }, +// tableForm: { +// type: 'Select' +// } +// }, +// { +// label: '是否可用', +// field: 'available', +// dictType: DICT_TYPE.TRUE_FALSE, +// dictClass: 'string', +// isTable: true, +// form: { +// component: 'Switch', +// value: 'TRUE', +// componentProps: { +// inactiveValue: 'FALSE', +// activeValue: 'TRUE' +// } +// }, +// sort: 'custom', +// table: { +// width: 150 +// }, +// tableForm: { +// type: 'Select' +// } +// }, +// { +// label: '操作', +// field: 'action', +// isDetail: false, +// isForm: false , +// table: { +// width: 150, +// fixed: 'right' +// }, +// isTableForm:false, +// } +// ])) + +//表单校验 export const CountPlanDetail = useCrudSchemas(([ { label: '盘点范围类型', field: 'type', - dictType: DICT_TYPE.COUNT_TYPE, + dictType: DICT_TYPE.COUNT_SCOPE_TYPE, dictClass: 'string', isTable: true, sort: 'custom', table: { - width: 150 + width: 300 }, tableForm: { - type: 'Select' + type: 'Select', + width: '300' } }, { label: '盘点范围值', field: 'value', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '单据号', - field: 'number', - sort: 'custom', - table: { - width: 150, - }, - isTableForm: false, - form: { - componentProps: { - disabled: true - } - } - }, - { - label: '物品代码', - field: 'itemCode', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '备注', - field: 'remark', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '创建者', - field: 'creator', - sort: 'custom', - table: { - width: 150 - }, - isTableForm: false, - isForm: false, - }, - { - label: '创建时间', - field: 'createTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', - table: { - width: 180 - }, - form: { - component: 'DatePicker', - componentProps: { - style: {width:'100%'}, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } - }, - isTableForm: false, - isForm: false, - }, - { - label: '最后更新时间', - field: 'updateTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', - table: { - width: 180 - }, - form: { - component: 'DatePicker', - componentProps: { - style: {width:'100%'}, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } - }, - isTableForm: false, - isForm: false, - }, - { - label: '最后更新者', - field: 'updater', - sort: 'custom', - table: { - width: 150 - }, - isTableForm: false, - isForm: false, - }, - { - label: '计划数量', - field: 'planQty', - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'InputNumber', - componentProps: { - min: 1, - precision: 6 - } - }, - tableForm: { - type: 'InputNumber', - min: 1, - precision: 6 - } - }, - { - label: '计量单位', - field: 'uom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - tableForm: { - type: 'Select' - } - }, - { - label: '是否可用', - field: 'available', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', isTable: true, - form: { - component: 'Switch', - value: 'TRUE', - componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE' - } - }, sort: 'custom', table: { - width: 150 + width: 300 }, tableForm: { - type: 'Select' + type: 'InputString', + width: '300', } }, { @@ -621,8 +664,6 @@ export const CountPlanDetail = useCrudSchemas(([ isTableForm:false, } ])) - -//表单校验 export const CountPlanDetailRules = reactive({ available: [ { required: true, message: '请选择是否可用', trigger: 'change' } diff --git a/src/views/wms/countManage/count/countPlanMain/index.vue b/src/views/wms/countManage/count/countPlanMain/index.vue index 347151989..ab9350ad8 100644 --- a/src/views/wms/countManage/count/countPlanMain/index.vue +++ b/src/views/wms/countManage/count/countPlanMain/index.vue @@ -37,7 +37,10 @@ @@ -53,13 +56,13 @@ :tableData="tableData" :apiUpdate="CountPlanMainApi.updateCountPlanMain" :apiCreate="CountPlanMainApi.createCountPlanMain" - :isBusiness="false" fromeWhere="countPlan" @handleAddTable="handleAddTable" @handleDeleteTable="handleDeleteTable" @searchTableSuccess="searchTableSuccess" @submitForm="submitForm" @formSelectChange="formSelectChange" + @formSelectvVisibleChange="formSelectvVisibleChange" @selectChange="selectChange" /> @@ -89,12 +92,26 @@