From e1b428e171811324577d3461a1a05f8952395da0 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Thu, 22 Aug 2024 10:55:55 +0800 Subject: [PATCH 1/3] =?UTF-8?q?HL-5589=E7=89=A9=E6=96=99=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=EF=BC=8C=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E4=B8=8D=E5=A5=BD=E4=BD=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../itemManage/relegate/relegateRequest/index.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue index 09bdbd0ae..896eaf436 100644 --- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue +++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue @@ -43,6 +43,7 @@ @handleAddTable="handleAddTable" @handleDeleteTable="handleDeleteTable" :isShowReduceButtonSelection="true" + @tableSelectionDelete="tableSelectionDelete" @searchTableSuccess="searchTableSuccess" @submitForm="submitForm" :isShowButton=isShowButton /> @@ -102,6 +103,7 @@ import * as ProductionlineitemApi from '@/api/wms/productionlineitem' import { formatDate } from '@/utils/formatTime' import { usePageLoading } from '@/hooks/web/usePageLoading' const { loadStart, loadDone } = usePageLoading() +// 物料变更申请 defineOptions({ name: 'RelegateRequestMain' }) const message = useMessage() // 消息弹窗 @@ -171,7 +173,9 @@ const handlePoint = async (row) => { message.warning('请先创建标签') } } - +const tableSelectionDelete = (selection) => { + tableData.value = tableData.value.filter(item => !selection.includes(item)) +} // 查询页面返回 const searchTableSuccess = (formField, searchField, val, formRef, type, row) => { nextTick(() => { From 1fc227eff0f9e48e7b26352242db5423c78a02b0 Mon Sep 17 00:00:00 2001 From: TengXF <302828528@qq.com> Date: Thu, 22 Aug 2024 11:28:55 +0800 Subject: [PATCH 2/3] =?UTF-8?q?HL-5424=20=E7=89=A9=E6=96=99=E5=8F=98?= =?UTF-8?q?=E6=9B=B4=E7=94=B3=E8=AF=B7=20=E5=88=9B=E5=BB=BA=E4=BA=BA?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../relegateRequestMain.data.ts | 45 ++++++++++++++----- 1 file changed, 35 insertions(+), 10 deletions(-) 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 5241b48fd..e2ec64bb6 100644 --- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts +++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts @@ -106,7 +106,10 @@ export const RelegateRequestMain = useCrudSchemas(reactive([ field: 'createTime', sort: 'custom', formatter: dateFormatter, - isSearch: true, + isSearch: false, + table: { + width: 180 + }, search: { component: 'DatePicker', componentProps: { @@ -119,7 +122,7 @@ export const RelegateRequestMain = useCrudSchemas(reactive([ dateFormat: 'YYYY-MM-DD HH:mm:ss' }, isForm: false, - isTable: true + isTable: false }, { label: '扩展属性', @@ -374,7 +377,7 @@ export const RelegateRequestDetail = useCrudSchemas(reactive([ },{ key: 'changeBeforeCode', value: 'itemCode', - isTableRowValue: true, + isTableRowValue: true, isMainValue:false }], verificationParams: [{ @@ -402,7 +405,7 @@ export const RelegateRequestDetail = useCrudSchemas(reactive([ },{ key: 'changeBeforeCode', value: 'itemCode', - isTableRowValue: true, + isTableRowValue: true, isMainValue:false }] }, @@ -603,25 +606,47 @@ export const RelegateRequestDetail = useCrudSchemas(reactive([ isTableForm: false, isTable:false, }, + { + label: '创建人', + field: 'creator', + sort: 'custom', + table: { + width: 150 + }, + isForm: false, + isTable: true + }, { label: '创建时间', field: 'createTime', sort: 'custom', formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + isSearch: true, + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, search: { component: 'DatePicker', componentProps: { - valueFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'YYYY-MM-DD', type: 'daterange', defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } }, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, isForm:false, isTableForm: false, - isTable:false, + isTable:true, }, { label: '状态', @@ -814,4 +839,4 @@ export const RelegateRequestDetailLabel = useCrudSchemas(reactive( //表单校验 export const RelegateRequestDetailLabelRules = reactive({ -}) \ No newline at end of file +}) From 807863470f06e134d3cf4b5ede73222af84a698a Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Thu, 22 Aug 2024 13:15:12 +0800 Subject: [PATCH 3/3] =?UTF-8?q?HL-5594=E5=88=B6=E5=93=81=E5=9B=9E=E6=94=B6?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E3=80=81=E4=BB=BB=E5=8A=A1=E3=80=81=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=EF=BC=8C=E8=BD=A6=E9=97=B4=E6=9F=A5=E8=AF=A2=E4=B8=8D?= =?UTF-8?q?=E5=A5=BD=E4=BD=BF=EF=BC=9B=E8=AE=B0=E5=BD=95=E7=9A=84=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E5=AD=97=E6=AE=B5=E5=8E=BB=E6=8E=89=EF=BC=9B=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E6=B2=A1=E6=9C=89=E7=94=9F=E4=BA=A7=E7=BA=BF=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productredressRecordMain.data.ts | 24 +++++++++---------- .../productredressRequestMain.data.ts | 1 + 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts b/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts index 157243991..8afc4124d 100644 --- a/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts +++ b/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts @@ -43,18 +43,18 @@ export const ProductredressRecordMain = useCrudSchemas(reactive([ width: 180, }, }, - { - label: '状态', - field: 'status', - dictType: DICT_TYPE.REQUEST_STATUS, - dictClass: 'string', - isForm:false, - isTable: true, - sort: 'custom', - table: { - width: 150 - } - }, + // { + // label: '状态', + // field: 'status', + // dictType: DICT_TYPE.REQUEST_STATUS, + // dictClass: 'string', + // isForm:false, + // isTable: true, + // sort: 'custom', + // table: { + // width: 150 + // } + // }, { label: '生产线代码', field: 'productionlineCode', diff --git a/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts b/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts index 02030f9a1..ad94646d0 100644 --- a/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts +++ b/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts @@ -106,6 +106,7 @@ export const ProductredressRequestMain = useCrudSchemas(reactive([ width: 150 }, isTable:true, + isSearch:true, tableForm: { enterSearch: true, isInpuFocusShow: true,