From bd9a1c24b56b2b8e6d9e6953475484f3a6094a31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com> Date: Wed, 13 Mar 2024 17:01:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/BasicForm/src/BasicForm.vue | 1 + src/components/Detail/src/Detail.vue | 4 +- .../SearchTable/src/SearchTable.vue | 4 +- src/views/eam/item/adjustRecord/index.vue | 10 +- .../eam/item/applicationRecord/index.vue | 10 +- src/views/eam/item/countRecord/index.vue | 10 +- src/views/eam/item/countadjustPlan/index.vue | 8 +- src/views/eam/item/countadjustWork/index.vue | 11 +- src/views/eam/item/itemApplyMain/index.vue | 669 ++++++++++-------- .../item/itemApplyMain/itemApplyMain.data.ts | 111 +-- src/views/eam/item/itemOrderMain/index.vue | 8 +- src/views/eam/item/replaceItemDes/index.vue | 4 +- .../eam/item/transaction/transaction.data.ts | 22 +- 13 files changed, 462 insertions(+), 410 deletions(-) diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue index fa89661..c3aa2fa 100644 --- a/src/components/BasicForm/src/BasicForm.vue +++ b/src/components/BasicForm/src/BasicForm.vue @@ -419,6 +419,7 @@ const submitForm = async () => { if (!elForm) return const valid = await elForm.validate() if (!valid) return + console.log('isBusiness0',props.isBusiness) // 针对主子表 明细校验 if (props.isBusiness) { formLoading.value = true diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue index 7f1d2b6..c0a190c 100644 --- a/src/components/Detail/src/Detail.vue +++ b/src/components/Detail/src/Detail.vue @@ -511,7 +511,7 @@ const submitForm = async (formType, data) => { try { const rs = (await props.detailValidate) ? props.detailValidate(data) : true if (!rs) return - emit('detailSubmitForm', formType, data, getList, formRef.value) + emit('detailSubmitForm', formType, data, getList(), formRef.value) } finally { // formRef.value.formLoading = false } @@ -581,7 +581,7 @@ const openImage = (item) => { emit('openImage', item) } -defineExpose({ openDetail, tableObject }) // 提供 open 方法，用于打开弹窗 +defineExpose({ openDetail, tableObject , getList }) // 提供 open 方法，用于打开弹窗 //监视属性 watch( () => props.apiPage, diff --git a/src/components/SearchTable/src/SearchTable.vue b/src/components/SearchTable/src/SearchTable.vue index 690395a..32fcc17 100644 --- a/src/components/SearchTable/src/SearchTable.vue +++ b/src/components/SearchTable/src/SearchTable.vue @@ -165,9 +165,9 @@ const submitForm = async () => { } const onMountedCallBack = ($event,a,b)=>{ - debugger + } \ No newline at end of file + diff --git a/src/views/eam/item/adjustRecord/index.vue b/src/views/eam/item/adjustRecord/index.vue index 4db6c35..b43fbab 100644 --- a/src/views/eam/item/adjustRecord/index.vue +++ b/src/views/eam/item/adjustRecord/index.vue @@ -38,7 +38,9 @@ :detailAllSchemas="AdjustRecordDetail.allSchemas" :detailAllSchemasRules="AdjustRecordDetailRules" :apiCreate="AdjustRecordDetailApi.createAdjustRecordDetail" :apiUpdate="AdjustRecordDetailApi.updateAdjustRecordDetail" :apiPage="AdjustRecordDetailApi.getAdjustRecordDetailPage" :apiDelete="AdjustRecordDetailApi.deleteAdjustRecordDetail" - @searchTableSuccessDetail="searchTableSuccessDetail" /> + @searchTableSuccessDetail="searchTableSuccessDetail" + :isShowAddBtn="false" + :detailButtonIsShow="true"/> + @searchTableSuccessDetail="searchTableSuccessDetail" + :isShowAddBtn="false" + :detailButtonIsShow="true" /> + @searchTableSuccessDetail="searchTableSuccessDetail" + :isShowAddBtn="false" + :detailButtonIsShow="true"/> { // 列表-操作按钮 const butttondata = [ - defaultButtons.mainListEditBtn({hasPermi:'eam:countadjustPlan:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'eam:countadjustPlan:delete'}), // 删除 + // defaultButtons.mainListEditBtn({hasPermi:'eam:countadjustPlan:update'}), // 编辑 + // defaultButtons.mainListDeleteBtn({hasPermi:'eam:countadjustPlan:delete'}), // 删除 ] // 列表-操作按钮事件 diff --git a/src/views/eam/item/countadjustWork/index.vue b/src/views/eam/item/countadjustWork/index.vue index 34ef906..c0b46c1 100644 --- a/src/views/eam/item/countadjustWork/index.vue +++ b/src/views/eam/item/countadjustWork/index.vue @@ -37,8 +37,9 @@ :detailAllSchemas="CountJobDetail.allSchemas" :detailAllSchemasRules="CountJobDetailRules" :apiCreate="CountJobDetailApi.createCountJobDetail" :apiUpdate="CountJobDetailApi.updateCountJobDetail" :apiPage="CountJobDetailApi.getCountJobDetailPage" :apiDelete="CountJobDetailApi.deleteCountJobDetail" - @searchTableSuccessDetail="searchTableSuccessDetail" /> - + @searchTableSuccessDetail="searchTableSuccessDetail" + :isShowAddBtn="false" + :detailButtonIsShow="true"/> @@ -111,9 +112,9 @@ // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn(null), // 新增 - defaultButtons.defaultImportBtn(null), // 导入 - defaultButtons.defaultExportBtn(null), // 导出 + // defaultButtons.defaultAddBtn(null), // 新增 + // defaultButtons.defaultImportBtn(null), // 导入 + // defaultButtons.defaultExportBtn(null), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 diff --git a/src/views/eam/item/itemApplyMain/index.vue b/src/views/eam/item/itemApplyMain/index.vue index 2d7bd1a..9bad023 100644 --- a/src/views/eam/item/itemApplyMain/index.vue +++ b/src/views/eam/item/itemApplyMain/index.vue @@ -1,316 +1,359 @@ - - - diff --git a/src/views/eam/item/itemApplyMain/itemApplyMain.data.ts b/src/views/eam/item/itemApplyMain/itemApplyMain.data.ts index 848de51..b513c3b 100644 --- a/src/views/eam/item/itemApplyMain/itemApplyMain.data.ts +++ b/src/views/eam/item/itemApplyMain/itemApplyMain.data.ts @@ -42,6 +42,23 @@ export const ItemApplyMain = useCrudSchemas(reactive([ isForm: false, isSearch: false, }, + + { + label: '状态', + field: 'status', + sort: 'custom', + dictType: DICT_TYPE.ITEM_APPLY_STATUS, + dictClass: 'string', + isSearch: true, + isTable: true, + table: { + width: 150 + }, + tableForm: { + type: 'Select', + disabled: false + } + }, { label: '描述', field: 'name', @@ -121,6 +138,22 @@ export const ItemApplyDetail = useCrudSchemas(reactive([ }, ] }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + isSearchList: true, + searchListPlaceholder: '请选择备件编号', + searchField: 'number', + searchTitle: '备件信息', + searchAllSchemas: ItemAccounts.allSchemas, // 查询弹窗所需类 + searchPage: ItemAccountsApi.getItemAccountsPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + },] + } + } }, { label: '类型', @@ -163,6 +196,26 @@ export const ItemApplyDetail = useCrudSchemas(reactive([ } ] }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + isSearchList: true, + searchListPlaceholder: '请选择单号', + searchField: 'number', + searchTitle: '单号信息', + searchAllSchemas: DeviceMOLD.allSchemas, // 查询弹窗所需类 + searchPage: DeviceMoldItemsApi.getNumber, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'available', + value: "TRUE", + isMainValue: false + }, { + key: 'type', + value: "type", + isMainValue: true + }] + } + } }, { label: '申领数量', @@ -194,11 +247,13 @@ export const ItemApplyDetail = useCrudSchemas(reactive([ form: { component: 'InputNumber', componentProps: { + disabled: true, min: 0, precision: 2 } }, tableForm: { + disabled: true, type: 'InputNumber', min: 0, precision: 2 @@ -238,7 +293,12 @@ export const ItemApplyDetail = useCrudSchemas(reactive([ tableForm: { type: 'Select', disabled: true - } + }, + form: { + componentProps: { + disabled: true, + } + }, }, { label: '备注', @@ -263,53 +323,14 @@ export const ItemApplyDetail = useCrudSchemas(reactive([ //表单校验 export const ItemApplyDetailRules = reactive({ - lineNumber: [ - { required: true, message: '请输入行号', trigger: 'blur' }, - { max: 50, message: '不得超过50个字符', trigger: 'blur' } - ], - stdPackQty: [ - { required: true, message: '请输入标包数量', trigger: 'blur' } + itemNumber: [ + { required: true, message: '请选择备件编号', trigger: 'change' } ], - stdPackUnit: [ - { required: true, message: '请选择标包单位', trigger: 'change' } - ], - convertRate: [ - { required: true, message: '请输入转换率', trigger: 'blur' } - ], - taxRate: [ - { required: true, message: '请输入税率', trigger: 'blur' } - ], - shippedQty: [ - { required: true, message: '请输入已发货数量', trigger: 'blur' } - ], - receivedQty: [ - { required: true, message: '请输入已收货数量', trigger: 'blur' } - ], - returnedQty: [ - { required: true, message: '请输入已退货数量', trigger: 'blur' } - ], - putawayQty: [ - { required: true, message: '请输入已上架数量', trigger: 'blur' } - ], - overReceivingPercent: [ - { required: true, message: '请输入超收百分比', trigger: 'blur' } - ], - orderQty: [ - { required: true, message: '请输入订单数量', trigger: 'blur' } - ], - uom: [ - { required: true, message: '请选择计量单位', trigger: 'change' } + qty: [ + { required: true, message: '请输入申领数量', trigger: 'change' } ], available: [ { required: true, message: '请选择是否可用', trigger: 'change' } ], - nuumber: [ - { required: true, message: '请输入单据号', trigger: 'blur' } - ], - itemCode: [ - { required: true, message: '请选择物品代码', trigger: 'change' } - ], - remark: [ - { max: 50, message: '不得超过50个字符', trigger: 'blur' } - ], + }) diff --git a/src/views/eam/item/itemOrderMain/index.vue b/src/views/eam/item/itemOrderMain/index.vue index c17baf8..574dbdc 100644 --- a/src/views/eam/item/itemOrderMain/index.vue +++ b/src/views/eam/item/itemOrderMain/index.vue @@ -112,9 +112,7 @@ // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn(null), // 新增 - defaultButtons.defaultImportBtn(null), // 导入 - defaultButtons.defaultExportBtn(null), // 导出 + // defaultButtons.defaultExportBtn(null), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 @@ -157,8 +155,8 @@ const butttondata = (row) => { return [ defaultButtons.mainListOrderCOMPLETEBtn({ hide: isShowMainButton(row, ['INCOMPLETE']) }), // 完成 - defaultButtons.mainListEditBtn(null), // 编辑 - defaultButtons.mainListDeleteBtn(null), // 删除 + // defaultButtons.mainListEditBtn(null), // 编辑 + // defaultButtons.mainListDeleteBtn(null), // 删除 ] } diff --git a/src/views/eam/item/replaceItemDes/index.vue b/src/views/eam/item/replaceItemDes/index.vue index a949072..aa9f63c 100644 --- a/src/views/eam/item/replaceItemDes/index.vue +++ b/src/views/eam/item/replaceItemDes/index.vue @@ -25,12 +25,10 @@ - - @@ -142,7 +140,7 @@ } if (data.activeTime == 0) data.activeTime = null; if (data.expireTime == 0) data.expireTime = null; - data.filePathList=[]; + data.filePathList = []; for (let i = 0; i < data.filePathList.length; i++) { data.filePathList.push(data.filePathList[i].url); } diff --git a/src/views/eam/item/transaction/transaction.data.ts b/src/views/eam/item/transaction/transaction.data.ts index 1ee3eb2..9ab8c6f 100644 --- a/src/views/eam/item/transaction/transaction.data.ts +++ b/src/views/eam/item/transaction/transaction.data.ts @@ -10,13 +10,6 @@ export const Rules = reactive({ }) export const Transaction = useCrudSchemas(reactive([ - { - label: '事务编号', - field: 'number', - sort: 'custom', - isSearch: true, - }, - { label: '备件编号', field: 'itemNumber', @@ -59,20 +52,11 @@ export const Transaction = useCrudSchemas(reactive([ type: 'Select' } }, - { - label: '业务类型', - field: 'businessType', - sort: 'custom', - isSearch: true, - form: { - component: 'Select' - }, - }, { label: '库存状态', field: 'inventoryStatus', sort: 'custom', - isSearch: true, + isSearch: false, form: { component: 'Radio' }, @@ -81,13 +65,13 @@ export const Transaction = useCrudSchemas(reactive([ label: '计量单位', field: 'uom', sort: 'custom', - isSearch: true, + isSearch: false, }, { label: '数量', field: 'qty', sort: 'custom', - isSearch: true, + isSearch: false, }, { label: '操作', From f3f5211dfe2205fa4f5b0c48e1ab2ea83a5034ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com> Date: Wed, 13 Mar 2024 17:29:02 +0800 Subject: [PATCH 2/2] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/eam/item/itemApplyMain/itemApplyMain.data.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/eam/item/itemApplyMain/itemApplyMain.data.ts b/src/views/eam/item/itemApplyMain/itemApplyMain.data.ts index b513c3b..6e017c0 100644 --- a/src/views/eam/item/itemApplyMain/itemApplyMain.data.ts +++ b/src/views/eam/item/itemApplyMain/itemApplyMain.data.ts @@ -51,6 +51,7 @@ export const ItemApplyMain = useCrudSchemas(reactive([ dictClass: 'string', isSearch: true, isTable: true, + isForm: false, table: { width: 150 },