From 31c3170c2b5bbf2eaecf7ad5a4e1cd955e0528b8 Mon Sep 17 00:00:00 2001 From: chenfang Date: Mon, 29 Jul 2024 15:28:05 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=89=A9=E6=96=99=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../relegate/relegateRequest/relegateRequestMain.data.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts index 9a16dab51..301661cd4 100644 --- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts +++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts @@ -476,6 +476,14 @@ export const RelegateRequestDetail = useCrudSchemas(reactive([ width: 120 }, }, + { + label: '到包装号', + field: 'toPackingNumber', + sort: 'custom', + table: { + width: 120 + }, + }, { label: '从库位代码', field: 'fromLocationCode', From 624a4b8e29fd4dcb7f037cdb7bef85c810bba37b Mon Sep 17 00:00:00 2001 From: chenfang Date: Mon, 29 Jul 2024 15:33:52 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=89=A9=E6=96=99=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../itemManage/itembasic/itembasic.data.ts | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts index fbb97b258..e34ec8ea0 100644 --- a/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts +++ b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts @@ -64,27 +64,27 @@ export const Itembasic = useCrudSchemas(reactive([ width: 150 } , }, - // { - // label: '状态', - // field: 'status', - // sort: 'custom', - // dictType: DICT_TYPE.ITEM_STATUS, - // dictClass: 'string', - // isForm: false, - // isSearch: false, - // isTable: false, - // table: { - // width: 100 - // } , - // form: { - // component: 'Switch', - // value: 'ENABLE', - // componentProps: { - // inactiveValue: 'DISABLE', - // activeValue: 'ENABLE' - // } - // }, - // }, + { + label: '状态', + field: 'status', + sort: 'custom', + dictType: DICT_TYPE.ITEM_STATUS, + dictClass: 'string', + isForm: false, + isSearch: false, + isTable: false, + table: { + width: 100 + } , + form: { + component: 'Switch', + value: 'ENABLE', + componentProps: { + inactiveValue: 'DISABLE', + activeValue: 'ENABLE' + } + }, + }, { label: '计量单位', field: 'uom', From 3d0fc84e97142849b1bd2f3e38fafcef40bad5b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com> Date: Mon, 29 Jul 2024 15:37:38 +0800 Subject: [PATCH 3/4] =?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/qms/inspectionQ1/index.vue | 3 ++- src/views/qms/inspectionQ1/inspectionQ1.data.ts | 9 ++++++--- src/views/qms/inspectionQ2/index.vue | 3 ++- src/views/qms/inspectionQ2/inspectionQ2.data.ts | 12 ++++++++++-- src/views/qms/inspectionQ3/index.vue | 3 ++- src/views/qms/inspectionQ3/inspectionQ3.data.ts | 12 +++++++++++- .../inspectionRequest/inspectionRequestMain.data.ts | 2 ++ 7 files changed, 35 insertions(+), 9 deletions(-) diff --git a/src/views/qms/inspectionQ1/index.vue b/src/views/qms/inspectionQ1/index.vue index edda21ef0..9a217a668 100644 --- a/src/views/qms/inspectionQ1/index.vue +++ b/src/views/qms/inspectionQ1/index.vue @@ -185,7 +185,8 @@ const openForm = (type: string, row?: any) => { nextTick(() => {     basicFormRef.value.formRef.setValues({ handleTime: new Date().getTime(), - claimTime: new Date().getTime() + claimTime: new Date().getTime(), + priority: '3',     })   }) } diff --git a/src/views/qms/inspectionQ1/inspectionQ1.data.ts b/src/views/qms/inspectionQ1/inspectionQ1.data.ts index 9e884dfba..8e8742141 100644 --- a/src/views/qms/inspectionQ1/inspectionQ1.data.ts +++ b/src/views/qms/inspectionQ1/inspectionQ1.data.ts @@ -141,10 +141,13 @@ export const Q1 = useCrudSchemas( width: 150 }, form: { - component: 'InputNumber' + component: 'InputNumber', + componentProps: { + min: 1, + precision: 2 + } } }, - { label: '单位', field: 'uom', @@ -291,7 +294,7 @@ export const Q1 = useCrudSchemas( component: 'DatePicker', componentProps: { type: 'datetime', - valueFormat: 'x', + valueFormat: 'x' } } }, diff --git a/src/views/qms/inspectionQ2/index.vue b/src/views/qms/inspectionQ2/index.vue index 09b8fad17..bd8e6e19e 100644 --- a/src/views/qms/inspectionQ2/index.vue +++ b/src/views/qms/inspectionQ2/index.vue @@ -193,7 +193,8 @@ const openForm = (type: string, row?: any) => { nextTick(() => {     basicFormRef.value.formRef.setValues({ handleTime: new Date().getTime(), - claimTime: new Date().getTime() + claimTime: new Date().getTime(), + priority: '3',     })   }) } diff --git a/src/views/qms/inspectionQ2/inspectionQ2.data.ts b/src/views/qms/inspectionQ2/inspectionQ2.data.ts index 2367309c2..718b6667e 100644 --- a/src/views/qms/inspectionQ2/inspectionQ2.data.ts +++ b/src/views/qms/inspectionQ2/inspectionQ2.data.ts @@ -71,6 +71,11 @@ export const Q2 = useCrudSchemas( key: 'available', value: 'TRUE', isMainValue: false + }, + { + key: 'status', + value: '0', + isMainValue: false } ] } @@ -227,10 +232,13 @@ export const Q2 = useCrudSchemas( width: 150 }, form: { - component: 'InputNumber' + component: 'InputNumber', + componentProps: { + min: 1, + precision: 2 + } } }, - { label: '编码', field: 'code', diff --git a/src/views/qms/inspectionQ3/index.vue b/src/views/qms/inspectionQ3/index.vue index a2252f5df..509f88af2 100644 --- a/src/views/qms/inspectionQ3/index.vue +++ b/src/views/qms/inspectionQ3/index.vue @@ -186,7 +186,8 @@ const openForm = (type: string, row?: any) => { if (type=='create') { nextTick(() => {     basicFormRef.value.formRef.setValues({ - handleTime: new Date().getTime() + handleTime: new Date().getTime(), + priority: '3',     })   }) } diff --git a/src/views/qms/inspectionQ3/inspectionQ3.data.ts b/src/views/qms/inspectionQ3/inspectionQ3.data.ts index ed0b771d3..c5743323a 100644 --- a/src/views/qms/inspectionQ3/inspectionQ3.data.ts +++ b/src/views/qms/inspectionQ3/inspectionQ3.data.ts @@ -65,6 +65,11 @@ export const Q3 = useCrudSchemas( key: 'available', value: 'TRUE', isMainValue: false + }, + { + key: 'status', + value: '0', + isMainValue: false } ] } @@ -93,6 +98,7 @@ export const Q3 = useCrudSchemas( label: '物料代码', field: 'itemCode', sort: 'custom', + isSearch: true, table: { width: 150 }, @@ -140,7 +146,11 @@ export const Q3 = useCrudSchemas( width: 150 }, form: { - component: 'InputNumber' + component: 'InputNumber', + componentProps: { + min: 1, + precision: 2 + } } }, { diff --git a/src/views/qms/inspectionRequest/inspectionRequestMain.data.ts b/src/views/qms/inspectionRequest/inspectionRequestMain.data.ts index 845e4d999..e28739715 100644 --- a/src/views/qms/inspectionRequest/inspectionRequestMain.data.ts +++ b/src/views/qms/inspectionRequest/inspectionRequestMain.data.ts @@ -237,6 +237,7 @@ export const InspectionMain = useCrudSchemas( componentProps: { isSearchList: true, // 开启查询弹窗 searchTitle: '供应商信息', // 查询弹窗标题 + searchListPlaceholder: '请选择供应商', // 输入框占位文本 searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类 searchField: 'code', // 查询弹窗赋值字段 searchPage: SupplierApi.getSupplierPage, // 查询弹窗所需分页方法 @@ -277,6 +278,7 @@ export const InspectionMain = useCrudSchemas( componentProps: { isSearchList: true, // 开启查询弹窗 searchTitle: '物料信息', // 查询弹窗标题 + searchListPlaceholder: '请选择物料', // 输入框占位文本 searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类 searchField: 'code', // 查询弹窗赋值字段 searchPage: ItemApi.getItembasicPage, // 查询弹窗所需分页方法 From da8f50c50374b72b18bc8712aefef3fb46a11304 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Mon, 29 Jul 2024 15:52:23 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=B1=BB=E5=9E=8B=E5=92=8C=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=85=B3=E7=B3=BB=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../printBusinesstypeTemplate/index.vue | 10 +++--- .../printBusinesstypeTemplate.data.ts | 35 +++++++++++++++++++ 2 files changed, 40 insertions(+), 5 deletions(-) diff --git a/src/views/report/printBusinesstypeTemplate/index.vue b/src/views/report/printBusinesstypeTemplate/index.vue index 11b0bec0c..45b3b13ce 100644 --- a/src/views/report/printBusinesstypeTemplate/index.vue +++ b/src/views/report/printBusinesstypeTemplate/index.vue @@ -99,9 +99,9 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn({hasPermi:'wms:printBusinesstypeTemplate:create'}), // 新增 - defaultButtons.defaultImportBtn({hasPermi:'wms:printBusinesstypeTemplate:import'}), // 导入 - defaultButtons.defaultExportBtn({hasPermi:'wms:printBusinesstypeTemplate:export'}), // 导出 + defaultButtons.defaultAddBtn({hasPermi:'wms:print-businesstype-template:create'}), // 新增 + defaultButtons.defaultImportBtn({hasPermi:'wms:print-businesstype-template:import'}), // 导入 + defaultButtons.defaultExportBtn({hasPermi:'wms:print-businesstype-template:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 @@ -133,8 +133,8 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = [ - defaultButtons.mainListEditBtn({hasPermi:'wms:printBusinesstypeTemplate:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:printBusinesstypeTemplate:delete'}), // 删除 + defaultButtons.mainListEditBtn({hasPermi:'wms:print-businesstype-template:update'}), // 编辑 + defaultButtons.mainListDeleteBtn({hasPermi:'wms:print-businesstype-template:delete'}), // 删除 ] // 列表-操作按钮事件 diff --git a/src/views/report/printBusinesstypeTemplate/printBusinesstypeTemplate.data.ts b/src/views/report/printBusinesstypeTemplate/printBusinesstypeTemplate.data.ts index c8e645d77..d237fccff 100644 --- a/src/views/report/printBusinesstypeTemplate/printBusinesstypeTemplate.data.ts +++ b/src/views/report/printBusinesstypeTemplate/printBusinesstypeTemplate.data.ts @@ -1,5 +1,12 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' +import * as BusinesstypeApi from '@/api/wms/businesstype' +import { Businesstype } from '@//views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts' +// const templateCodes = await UserApi.getSimpleUserList() +const templateCodes = [{ + name:1111, + id:111 +}] // 表单校验 export const PrintBusinesstypeTemplateRules = reactive({ businesstypeCode: [required], @@ -18,12 +25,40 @@ export const PrintBusinesstypeTemplate = useCrudSchemas(reactive([ field: 'businesstypeCode', sort: 'custom', isSearch: true, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择业务类型', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '业务类型', // 查询弹窗标题 + searchAllSchemas: Businesstype.allSchemas, // 查询弹窗所需类 + searchPage: BusinesstypeApi.getBusinesstypePage, // 查询弹窗所需分页方法 + // searchCondition: [{ + // key: 'available', + // value: 'TRUE', + // isMainValue: false + // }] + } + } + }, { label: '模板代码', field: 'templateCode', sort: 'custom', isSearch: true, + form: { + component: 'Select', + componentProps: { + options: templateCodes, + optionsAlias: { + labelField: 'name', + valueField: 'id' + }, + filterable: true, + } + } }, { label: '备注',