From 05781ed0eb97acc71fe10b41f9fe17f5ec1c4da7 Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Wed, 4 Dec 2024 13:00:36 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E5=A4=84=E7=90=86YT-1486=E7=BC=BA=E9=99=B7?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../countRequestMain/countRequestMain.data.ts | 24 ----------- .../countadjustRecordMain.data.ts | 43 ------------------- .../countadjustRequestMain.data.ts | 42 ------------------ 3 files changed, 109 deletions(-) diff --git a/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts b/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts index 867b95491..22219509a 100644 --- a/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts +++ b/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts @@ -183,30 +183,6 @@ export const CountRequestMain = useCrudSchemas(([ width: 150 }, }, - { - label: '部门', - field: 'departmentCode', - sort: 'custom', - isForm: false, - table: { - width: 150 - }, - formatter: (_: Recordable, __: TableColumn, cellValue: number) => { - return userDeptArray.find((account) => account.id == cellValue)?.name - }, - form: { - value: userDept.id, - component: 'Select', - api: () => userDeptArray, - componentProps: { - disabled: true, - optionsAlias: { - labelField: 'name', - valueField: 'id' - } - } - } - }, { label: '备注', field: 'remark', diff --git a/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts b/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts index d1f6cd14c..4d79d87fb 100644 --- a/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts +++ b/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts @@ -456,49 +456,6 @@ export const CountadjustRecordDetail = useCrudSchemas(reactive([ width: 150 }, }, - { - label: '项目代码', - field: 'projectCode', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '货主代码', - field: 'ownerCode', - sort: 'custom', - table: { - width: 150 - }, - }, - // { - // label: '任务明细ID', - // field: 'jobDetailId', - // sort: 'custom', - // table: { - // width: 150 - // }, - // }, - // { - // label: '代码', - // field: 'code', - // sort: 'custom', - // table: { - // width: 150 - // }, - // }, - // { - // label: '接口类型', - // field: 'interfaceType', - // dictType: DICT_TYPE.INTERFACE_TYPE, - // dictClass: 'string', - // isTable: true, - // sort: 'custom', - // table: { - // width: 150 - // }, - // }, { label: '备注', field: 'remark', diff --git a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts index bcc8c248a..d3918e677 100644 --- a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts +++ b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts @@ -171,30 +171,6 @@ export const CountadjustRequestMain = useCrudSchemas(([ }, isForm: false, }, - { - label: '部门', - field: 'departmentCode', - sort: 'custom', - isForm: false, - table: { - width: 150 - }, - formatter: (_: Recordable, __: TableColumn, cellValue: number) => { - return userDeptArray.find((account) => account.id == cellValue)?.name - }, - form: { - value: userDept.id, - component: 'Select', - api: () => userDeptArray, - componentProps: { - disabled: true, - optionsAlias: { - labelField: 'name', - valueField: 'id' - } - } - } - }, { label: '备注', field: 'remark', @@ -573,24 +549,6 @@ export const CountadjustRequestDetail = useCrudSchemas(reactive([ type: 'Select' } }, - { - label: '项目代码', - field: 'projectCode', - sort: 'custom', - table: { - width: 150 - }, - isTableForm: false, - isForm: false, - }, - { - label: '货主代码', - field: 'ownerCode', - sort: 'custom', - table: { - width: 150 - }, - }, { label: '备注', field: 'remark', From 86c2199265a8c79fe5a274d78e06260cda59f726 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 4 Dec 2024 13:12:36 +0800 Subject: [PATCH 2/9] =?UTF-8?q?YT-1496=E7=BB=B4=E4=BF=AE=E5=A4=87=E4=BB=B6?= =?UTF-8?q?=E9=A2=86=E7=94=A8=E7=94=B3=E8=AF=B7=E6=96=B0=E5=A2=9E=E6=97=B6?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E7=9A=84=E7=89=A9=E6=96=99=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E6=89=B9=E6=AC=A1=E6=97=B6=EF=BC=8C=E6=97=A0=E6=B3=95=E4=BF=9D?= =?UTF-8?q?=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sparepartsrequisitionRequestMain.data.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts index d2b897430..7ce36142e 100644 --- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts @@ -932,7 +932,7 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive //表单校验 export const UnplannedissueRequestDetailRules = reactive({ batch: [ - { required: true, message: '请输入批次', trigger: 'blur' }, + // { required: true, message: '请输入批次', trigger: 'blur' }, { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], containerNumber: [ From b4abe273a99b3c086e520c09a72bc40cf2e40851 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 4 Dec 2024 13:40:47 +0800 Subject: [PATCH 3/9] =?UTF-8?q?YT-1501=E7=BB=B4=E4=BF=AE=E5=A4=87=E4=BB=B6?= =?UTF-8?q?=E9=A2=86=E7=94=A8=E8=AE=B0=E5=BD=95=E5=AF=BC=E5=87=BA=E7=9A=84?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E4=B8=8D=E6=AD=A3=E7=A1=AE=EF=BC=8C=E4=B8=8E?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E4=B8=8D=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sparepartsrequisitionRecordMain.data.ts | 51 +++++++++++-------- 1 file changed, 31 insertions(+), 20 deletions(-) diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/sparepartsrequisitionRecordMain.data.ts b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/sparepartsrequisitionRecordMain.data.ts index c4b8f6f2d..fbe9c7036 100644 --- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/sparepartsrequisitionRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/sparepartsrequisitionRecordMain.data.ts @@ -11,6 +11,14 @@ import * as QadProjectApi from '@/api/wms/qadProject' import * as SubjectAccountApi from '@/api/wms/subjectAccount' import { SubjectAccount } from '@/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data' +// 获取当前操作人的部门 +import { useUserStore } from '@/store/modules/user' +const userStore = useUserStore() +const userDept = userStore.userSelfInfo.dept +// id 转str 否则form回显匹配不到 +userDept.id = userDept.id.toString() +const userDeptArray: any = [userDept] + /** * @returns {Array} 计划外出库记录主表 */ @@ -345,6 +353,9 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + formatter: (_: Recordable, __: TableColumn, cellValue: number) => { + return userDeptArray.find((account) => account.id == cellValue)?.name + }, }, { label: '接口类型', @@ -450,26 +461,26 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive([ // width: 150 // }, // }, - { - label: '是否可用', - field: 'available', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isSearch: false, - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'Switch', - value: 'TRUE', - componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE' - } - } - }, + // { + // label: '是否可用', + // field: 'available', + // dictType: DICT_TYPE.TRUE_FALSE, + // dictClass: 'string', + // isSearch: false, + // isTable: true, + // sort: 'custom', + // table: { + // width: 150 + // }, + // form: { + // component: 'Switch', + // value: 'TRUE', + // componentProps: { + // inactiveValue: 'FALSE', + // activeValue: 'TRUE' + // } + // } + // }, ])) //表单校验 From 7696dd7a4e865369dba8ec3f176f57baa72193f2 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 4 Dec 2024 14:00:14 +0800 Subject: [PATCH 4/9] =?UTF-8?q?YT-1507=E4=BF=AE=E6=94=B9=E4=BE=9B=E5=BA=94?= =?UTF-8?q?=E5=95=86=E5=8F=91=E8=B4=A7=E7=94=B3=E8=AF=B7=E3=80=90=E6=9B=B4?= =?UTF-8?q?=E5=A4=9A=E3=80=91=E6=8C=89=E9=92=AE=E7=9A=84=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=EF=BC=8C=E6=94=B9=E4=B8=BA=E4=B8=8E=E3=80=90=E7=94=9F=E6=88=90?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E3=80=91=E6=8C=89=E9=92=AE=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/XButton/src/ButtonBaseMore.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/XButton/src/ButtonBaseMore.vue b/src/components/XButton/src/ButtonBaseMore.vue index f1b7574d1..a2f853471 100644 --- a/src/components/XButton/src/ButtonBaseMore.vue +++ b/src/components/XButton/src/ButtonBaseMore.vue @@ -15,7 +15,7 @@ - 更多 + 更多