diff --git a/src/api/wms/customerreturnRequestMain/index.ts b/src/api/wms/customerreturnRequestMain/index.ts index 89c850dca..6f42a5662 100644 --- a/src/api/wms/customerreturnRequestMain/index.ts +++ b/src/api/wms/customerreturnRequestMain/index.ts @@ -80,31 +80,31 @@ export const importTemplate = () => { } // 关闭客户退货申请主 Excel -export const closeProductreceiptRequestMain = async (id) => { +export const close = async (id) => { return await request.put({ url: `/wms/customerreturn-request-main/close?id=` + id }) } // 重新添加客户退货申请主 Excel -export const reAddProductreceiptRequestMain = async (id) => { +export const reAdd = async (id) => { return await request.put({ url: `/wms/customerreturn-request-main/reAdd?id=` + id }) } // 提交客户退货申请主 Excel -export const submitProductreceiptRequestMain = async (id) => { +export const submit = async (id) => { return await request.put({ url: `/wms/customerreturn-request-main/submit?id=` + id }) } // 审批通过客户退货申请主 Excel -export const agreeProductreceiptRequestMain = async (id) => { +export const agree = async (id) => { return await request.put({ url: `/wms/customerreturn-request-main/agree?id=` + id }) } // 审批驳回客户退货申请主 Excel -export const refusedProductreceiptRequestMain = async (id) => { +export const refused = async (id) => { return await request.put({ url: `/wms/customerreturn-request-main/refused?id=` + id }) } // 处理驳回客户退货申请主 Excel -export const handleProductreceiptRequestMain = async (id) => { +export const handle = async (id) => { return await request.put({ url: `/wms/customerreturn-request-main/handle?id=` + id }) } \ No newline at end of file diff --git a/src/api/wms/customersettleRequestMain/index.ts b/src/api/wms/customersettleRequestMain/index.ts index 34cd74875..5b9a042e4 100644 --- a/src/api/wms/customersettleRequestMain/index.ts +++ b/src/api/wms/customersettleRequestMain/index.ts @@ -63,4 +63,34 @@ export const exportCustomersettleRequestMain = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/customersettle-request-main/get-import-template' }) +} + +// 关闭 +export const close = (id) => { + return request.put({ url: '/wms/customersettle-request-main/close?id=' + id }) +} + +// 重新添加 +export const reAdd = (id) => { + return request.put({ url: '/wms/customersettle-request-main/reAdd?id=' + id }) +} + +// 提交审批 +export const submit = (id) => { + return request.put({ url: '/wms/customersettle-request-main/submit?id=' + id }) +} + +// 驳回 +export const refused = (id) => { + return request.put({ url: '/wms/customersettle-request-main/refused?id=' + id }) +} + +// 审批通过 +export const agree = (id) => { + return request.put({ url: '/wms/customersettle-request-main/agree?id=' + id }) +} + +// 处理 +export const handle = (id) => { + return request.put({ url: '/wms/customersettle-request-main/handle?id=' + id }) } \ No newline at end of file diff --git a/src/api/wms/deliverJobMain/index.ts b/src/api/wms/deliverJobMain/index.ts index 04d2f938c..a539279c8 100644 --- a/src/api/wms/deliverJobMain/index.ts +++ b/src/api/wms/deliverJobMain/index.ts @@ -94,22 +94,22 @@ export const importTemplate = () => { return request.download({ url: '/wms/deliver-job-main/get-import-template' }) } -// 承接客户退货任务主 Excel -export const submitDeliverJobMain = async (id) => { +// 承接发货任务 Excel +export const acceptDeliverJobMain = async (id) => { return await request.put({ url: `/wms/deliver-job-main/accept?id=` + id }) } -// 取消承接客户退货任务主 Excel -export const agreeDeliverJobMain = async (id) => { +// 取消承接发货任务 Excel +export const abandonDeliverJobMain = async (id) => { return await request.put({ url: `/wms/deliver-job-main/abandon?id=` + id }) } -// 取消客户退货任务主 Excel -export const refusedDeliverJobMain = async (id) => { +// 关闭发货任务主 Excel +export const closeDeliverJobMain = async (id) => { return await request.put({ url: `/wms/deliver-job-main/close?id=` + id }) } -// 执行客户退货任务主 +// 执行发货任务主 export const executeDeliverJobMain = async (data: DeliverJobMainVO) => { return await request.put({ url: `/wms/deliver-job-main/execute`, data }) } \ No newline at end of file diff --git a/src/api/wms/deliverRequestMain/index.ts b/src/api/wms/deliverRequestMain/index.ts index 5beecf02e..47ae568e6 100644 --- a/src/api/wms/deliverRequestMain/index.ts +++ b/src/api/wms/deliverRequestMain/index.ts @@ -71,4 +71,33 @@ export const exportDeliverRequestMain = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/deliver-request-main/get-import-template' }) +} +// 关闭 +export const close = (id) => { + return request.put({ url: '/wms/deliver-request-main/close?id=' + id }) +} + +// 重新添加 +export const reAdd = (id) => { + return request.put({ url: '/wms/deliver-request-main/reAdd?id=' + id }) +} + +// 提交审批 +export const submit = (id) => { + return request.put({ url: '/wms/deliver-request-main/submit?id=' + id }) +} + +// 驳回 +export const refused = (id) => { + return request.put({ url: '/wms/deliver-request-main/refused?id=' + id }) +} + +// 审批通过 +export const agree = (id) => { + return request.put({ url: '/wms/deliver-request-main/agree?id=' + id }) +} + +// 处理 +export const handle = (id) => { + return request.put({ url: '/wms/deliver-request-main/handle?id=' + id }) } \ No newline at end of file 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/api/wms/purchasereceiptRecordMain/index.ts b/src/api/wms/purchasereceiptRecordMain/index.ts index ea0c4c832..7c61327e9 100644 --- a/src/api/wms/purchasereceiptRecordMain/index.ts +++ b/src/api/wms/purchasereceiptRecordMain/index.ts @@ -66,7 +66,12 @@ export const deletePurchasereceiptRecordMain = async (id: number) => { // 导出采购收货记录主 Excel export const exportPurchasereceiptRecordMain = async (params) => { - return await request.download({ url: `/wms/purchasereceipt-record-main/export-excel`, params }) + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/wms/purchasereceipt-record-main/export-excel-senior`, data }) + } else { + return await request.download({ url: `/wms/purchasereceipt-record-main/export-excel`, params }) + } } // 下载用户导入模板 diff --git a/src/api/wms/supplierdeliverRequestMain/index.ts b/src/api/wms/supplierdeliverRequestMain/index.ts index 625f93f2e..d60e9ddda 100644 --- a/src/api/wms/supplierdeliverRequestMain/index.ts +++ b/src/api/wms/supplierdeliverRequestMain/index.ts @@ -63,6 +63,30 @@ export const deleteSupplierdeliverRequestMain = async (id: number) => { return await request.delete({ url: `/wms/supplierdeliver-request-main/delete?id=` + id }) } +// 打开供应商发货申请主 +export const opeSupplierdeliverRequestMain = async (id: number) => { + return await request.post({ url: `/wms/supplierdeliver-request-main/open?id=` + id }) +} +// 关闭供应商发货申请主 +export const cloSupplierdeliverRequestMain = async (id: number) => { + return await request.post({ url: `/wms/supplierdeliver-request-main/close?id=` + id }) +} +// 提交审批供应商发货申请主 +export const subSupplierdeliverRequestMain = async (id: number) => { + return await request.post({ url: `/wms/supplierdeliver-request-main/sub?id=` + id }) +} +// 审批通过供应商发货申请主 +export const appSupplierdeliverRequestMain = async (id: number) => { + return await request.post({ url: `/wms/supplierdeliver-request-main/app?id=` + id }) +} +// 驳回供应商发货申请主 +export const rejSupplierdeliverRequestMain = async (id: number) => { + return await request.post({ url: `/wms/supplierdeliver-request-main/rej?id=` + id }) +} +// 生成标签 +export const genLabel = async (id) => { + return await request.post({ url: `/wms/supplierdeliver-request-main/genLabel?id=` + id }) +} // 导出供应商发货申请主 Excel export const exportSupplierdeliverRequestMain = async (params) => { return await request.download({ url: `/wms/supplierdeliver-request-main/export-excel`, params }) @@ -71,4 +95,4 @@ export const exportSupplierdeliverRequestMain = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/supplierdeliver-request-main/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue index 4dc22efb4..4d039ba7b 100644 --- a/src/components/BasicForm/src/BasicForm.vue +++ b/src/components/BasicForm/src/BasicForm.vue @@ -1,5 +1,10 @@ -
+
+
+ +
@@ -52,6 +73,7 @@ import { SearchTable } from '@/components/SearchTable' import * as defaultButtons from '@/utils/disposition/defaultButtons' import ButtonBase from '@/components/XButton/src/ButtonBase.vue' import TableForm from '@/components/TableForm/src/TableForm.vue' +import TableFormCountPlan from '@/components/TableFormCountPlan/src/TableFormCountPlan.vue' import { DICT_TYPE, getStrDictOptions } from '@/utils/dict' const props = defineProps({ @@ -142,6 +164,11 @@ const props = defineProps({ type: String, required: false, default: '' + }, + countScopeType: { + type: Array, + required: false, + default: null } }) @@ -155,7 +182,9 @@ const formType = ref('') // 表单的类型：create - 新增；update - 修改 const formRef = ref() // 表单 Ref const formSchema = ref(props.formAllSchemas?.formSchema) -console.log('props.formAllSchemas',props.formAllSchemas) +const tableAllSchemas = ref(props.tableAllSchemas) +const tableFormRules = ref(props.tableFormRules) +console.log('tableAllSchemas', tableAllSchemas.value) /** 弹层操作 */ // formField form表单中的字段 @@ -178,7 +207,7 @@ const opensearchTable = ( // 判断查询条件中，是否存在指向主表的数据 if (searchCondition && searchCondition.length > 0) { // 转换筛选条件所需 - let filters:any[] = [] + let filters: any[] = [] searchCondition.forEach((item) => { // 查询条件为主表某字段，需要赋值主表数据，数据来源是详情的，赋值需要从row中获取 // 20231127 row[item.value]?row[item.value] 修改为 row?row[item.value] 返回'null' 为了查询不到任何数据 @@ -337,6 +366,7 @@ const emit = defineEmits([ 'tableSelectionChange', 'extendedButtonsClick', 'formSelectChange', + 'formSelectvVisibleChange', 'tableSortChange', 'selectCallback', 'handleTableSelect', @@ -346,11 +376,15 @@ const emit = defineEmits([ 'searchTableSuccess', 'opensearchTable', 'submitForm', - 'selectChange' + 'selectChange', + 'tableFormChange' ]) //普通下拉改变事件 -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) => { @@ -380,8 +414,6 @@ const handleAddTable = () => { } // 输入框聚焦 const inpuFocus = (headerItem, row, index) => { - console.log(headerItem.tableForm.multiple) - opensearchTable( headerItem.field, headerItem.tableForm.searchField, @@ -394,16 +426,56 @@ const inpuFocus = (headerItem, row, index) => { row ) } + // 修改盘点类型 -const selectChange=((field,val)=>{ -emit('selectChange',field,val) -}) +const selectChange = (field, val) => { + emit('selectChange', field, val) +} + +const tableFormChange = (field, val, row) => { + emit('tableFormChange', field, val, row) +} diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue index a221dd247..0eddf4f7d 100644 --- a/src/components/Detail/src/Detail.vue +++ b/src/components/Detail/src/Detail.vue @@ -46,7 +46,7 @@ :columns="2" />
+ @@ -180,7 +181,13 @@ const props = defineProps({ type: Function, required: false, default: null - } + }, + // 来源 countPlan盘点计划进入 + fromeWhere: { + type: String, + required: false, + default: '' + }, }) const isShowDrawer = ref(false) const detailLoading = ref(false) diff --git a/src/components/DetailCountPlan/index.ts b/src/components/DetailCountPlan/index.ts new file mode 100644 index 000000000..2acd32a21 --- /dev/null +++ b/src/components/DetailCountPlan/index.ts @@ -0,0 +1,3 @@ +import DetailCountPlan from './src/DetailCountPlan.vue' + +export { DetailCountPlan } diff --git a/src/components/DetailCountPlan/src/DetailCountPlan.vue b/src/components/DetailCountPlan/src/DetailCountPlan.vue new file mode 100644 index 000000000..80a59f6e2 --- /dev/null +++ b/src/components/DetailCountPlan/src/DetailCountPlan.vue @@ -0,0 +1,499 @@ + + + + + diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue index 93e8260b4..2fbdd83eb 100644 --- a/src/components/TableForm/src/TableForm.vue +++ b/src/components/TableForm/src/TableForm.vue @@ -112,7 +112,7 @@ :allow-create="headerItem?.tableForm.allowCreate" style="width: 100%" :placeholder="headerItem?.tableForm?.placeholder || '请选择' + headerItem.label" - @change="formSelectChange(row[headerItem.field], $event)"> + @change="formSelectChange(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) } + // 点击selection框 const tableSelectionChange = (val) => { emit('tableSelectionChange', val) @@ -376,6 +377,7 @@ const TableBaseForm_Ref = ref() */ const validateForm = () => { + console.log(TableBaseForm_Ref.value) let _lists = TableBaseForm_Ref.value?.map(v => v.validate()) return Promise.all(_lists).then(() => { return true diff --git a/src/components/TableFormCountPlan/index.ts b/src/components/TableFormCountPlan/index.ts new file mode 100644 index 000000000..2f51d1abc --- /dev/null +++ b/src/components/TableFormCountPlan/index.ts @@ -0,0 +1,3 @@ +import TableFormCountPlan from './src/TableFormCountPlan.vue' + +export { TableFormCountPlan } diff --git a/src/components/TableFormCountPlan/src/TableFormCountPlan.vue b/src/components/TableFormCountPlan/src/TableFormCountPlan.vue new file mode 100644 index 000000000..12bc0bf5a --- /dev/null +++ b/src/components/TableFormCountPlan/src/TableFormCountPlan.vue @@ -0,0 +1,193 @@ + + + + + diff --git a/src/utils/dict.ts b/src/utils/dict.ts index 166dc3280..7c07a0d85 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -222,6 +222,7 @@ export enum DICT_TYPE { REQEUST_MODE = 'reqeust_mode', // 申请模式 TIME_UNIT = 'time_unit', // 时间单位 COUNT_TYPE = 'count_type', // 盘点类型 + COUNT_SCOPE_TYPE = 'count_scope_type', // 盘点范围类型 BARCODE_PREFIX = 'barcode_prefix', // 条码前缀 SETTLEMENT_TYPE = 'settlement_type', // 结算类型 FROZEN_REASON = 'frozen_reason', // 冻结原因 diff --git a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts index 69a2b2eb5..22be31675 100644 --- a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts +++ b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts @@ -434,179 +434,221 @@ 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 + width: 300 }, 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' + width: '300', } }, { @@ -621,22 +663,11 @@ export const CountPlanDetail = useCrudSchemas(([ isTableForm:false, } ])) - -//表单校验 export const CountPlanDetailRules = reactive({ - available: [ - { required: true, message: '请选择是否可用', trigger: 'change' } - ], - uom: [ - { required: true, message: '请选择计量单位', trigger: 'change' } - ], - planQty: [ - { required: true, message: '请输入计划数量', trigger: 'blur' } - ], - number: [ - { required: true, message: '请输入单据号', trigger: 'blur' } + type: [ + { required: true, message: '请选择盘点范围类型', trigger: 'change' } ], - itemCode: [ - { required: true, message: '请选择物品代码', trigger: 'change' } + value: [ + { required: true, message: '请选择盘点范围值', trigger: 'change' } ], }) \ No newline at end of file diff --git a/src/views/wms/countManage/count/countPlanMain/index.vue b/src/views/wms/countManage/count/countPlanMain/index.vue index 347151989..c5363524f 100644 --- a/src/views/wms/countManage/count/countPlanMain/index.vue +++ b/src/views/wms/countManage/count/countPlanMain/index.vue @@ -37,7 +37,10 @@ @@ -53,14 +56,16 @@ :tableData="tableData" :apiUpdate="CountPlanMainApi.updateCountPlanMain" :apiCreate="CountPlanMainApi.createCountPlanMain" - :isBusiness="false" fromeWhere="countPlan" + :countScopeType="getStrDictOptions(DICT_TYPE.COUNT_SCOPE_TYPE)" @handleAddTable="handleAddTable" @handleDeleteTable="handleDeleteTable" @searchTableSuccess="searchTableSuccess" @submitForm="submitForm" @formSelectChange="formSelectChange" + @formSelectvVisibleChange="formSelectvVisibleChange" @selectChange="selectChange" + @tableFormChange="tableFormChange" /> @@ -76,6 +81,7 @@ :apiPage="CountPlanDetailApi.getCountPlanDetailPage" :apiDelete="CountPlanDetailApi.deleteCountPlanDetail" :Echo="Echo" + fromeWhere="countPlan" /> @@ -89,12 +95,27 @@ \ No newline at end of file +