From 647f857a5de2e534890ddb174cf2c5f3f38d0cee Mon Sep 17 00:00:00 2001 From: TengXF <302828528@qq.com> Date: Mon, 19 Aug 2024 10:12:13 +0800 Subject: [PATCH 01/22] =?UTF-8?q?HL-5424=20=E6=9B=B4=E6=96=B0=E4=BA=BA?= =?UTF-8?q?=E5=92=8C=E6=93=8D=E4=BD=9C=E4=BA=BA=E7=AD=9B=E9=80=89=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E4=B8=BA=E4=B8=8B=E6=8B=89=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/SearchHigh/src/SearchHigh.vue | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/components/SearchHigh/src/SearchHigh.vue b/src/components/SearchHigh/src/SearchHigh.vue index 02dc5690c..728fbd500 100644 --- a/src/components/SearchHigh/src/SearchHigh.vue +++ b/src/components/SearchHigh/src/SearchHigh.vue @@ -150,10 +150,10 @@ const moreListOptions = ref({ // 判断输入框类型 const getInputType = (val) => { - + const type = searchOption_high.value.find(item => (item.field == val)) let data = 'input' - if (type?.dictType || type?.field == 'creator') { + if (type?.dictType || type?.field == 'creator'||type?.field == 'updater' ||type?.field == 'worker') { data = 'select' } else if (type?.form?.component == 'InputNumber') { data = 'inputNumber' @@ -170,7 +170,7 @@ const moreListOptions = ref({ const getFilterable = (val) => { const type = searchOption_high.value.find(item => (item.field == val)) // 下拉列表过长，去掉筛选功能 - if (type?.field == 'creator') { + if (type?.field == 'creator' || type?.field == 'updater' || type?.field == 'worker') { return false }else{ return true @@ -182,7 +182,7 @@ const getFilterable = (val) => { let precision = 6 if (type?.form?.component == 'InputNumber') { precision = type?.form?.componentProps?.precision || type?.form?.componentProps?.precision == 0 ? type.form.componentProps.precision : 6 - } + } return precision } // 根据数据内容约束条件选项 ==,!=,>,<,>=,<=,like,in,notIn,betweeen,isNull,isNotNull @@ -204,7 +204,7 @@ const moreListDelete = (val,item,$event) => { } else { message.confirm(t('ts.您确定删除吗, 是否继续?')).then(() => { moreListData.value.filters.splice(val, 1) - }) + }) } } @@ -243,7 +243,7 @@ const actionSelect = (val)=>{ val.value1 =[] val.value = '' }) - + } // 查询 重置按钮事件 @@ -265,11 +265,11 @@ const buttonBaseClick = (val) => { value:item.value, } } - + data.push(obj) }) if (props.masterId){ - data.push({ + data.push({ column: 'masterId', action: "==", value: props.masterId, @@ -298,7 +298,7 @@ const getDictOptions = ()=>{ // allDictOptions.value[item.field] = getStrDictOptions(item.dictType) if (item.dictType) { allDictOptions.value[item.field] = getStrDictOptions(item.dictType) - } else if(item.field == 'creator'){ + } else if(item.field == 'creator'||item.field == 'updater' ||item.field == 'worker'){ allDictOptions.value[item.field] = userListAll.value } }) @@ -387,4 +387,4 @@ defineExpose({ } } // } - \ No newline at end of file + From c28844d96dbf2d5536aac5ee15fa3e68ffc1cb4b Mon Sep 17 00:00:00 2001 From: TengXF <302828528@qq.com> Date: Mon, 19 Aug 2024 10:12:45 +0800 Subject: [PATCH 02/22] =?UTF-8?q?HL-5424=20=E5=BA=93=E5=AD=98=E4=BD=99?= =?UTF-8?q?=E9=A2=9D=E5=B1=95=E7=A4=BA=E6=9B=B4=E6=96=B0=E4=BA=BA=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/inventoryManage/balance/balance.data.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/wms/inventoryManage/balance/balance.data.ts b/src/views/wms/inventoryManage/balance/balance.data.ts index 31e8df4fe..8e295897d 100644 --- a/src/views/wms/inventoryManage/balance/balance.data.ts +++ b/src/views/wms/inventoryManage/balance/balance.data.ts @@ -446,7 +446,7 @@ export const Balance = useCrudSchemas( } }, isForm: false, - isTable: false + isTable: true }, { label: '最后更新者', @@ -456,7 +456,7 @@ export const Balance = useCrudSchemas( width: 150 }, isForm: false, - isTable: false + isTable: true }, // TODO: 临时添加 方便操作 { From 2a3c49bf49cf0ac96f041df998cc2d08f229d38a Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Mon, 19 Aug 2024 10:21:30 +0800 Subject: [PATCH 03/22] =?UTF-8?q?=E8=AE=A1=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/inventoryjobManage/scrap/scrapRequestMain/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue index 1e99700f7..56d170f54 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue @@ -177,6 +177,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) => newRow['itemCode'] = item['itemCode'] newRow['uom'] = item['uom'] newRow['singlePrice'] = itemCode ? itemCode['price'] : '' + newRow['amount'] = newRow['qty'] * newRow['singlePrice'] tableData.value.push(newRow) }) // row['singlePrice'] = res.price From 9dcb20d795ff20cbe322b6e0765b66252a3f41e6 Mon Sep 17 00:00:00 2001 From: gaojs <757918719@qq.com> Date: Mon, 19 Aug 2024 11:59:56 +0800 Subject: [PATCH 04/22] =?UTF-8?q?WMS=20=E9=9C=80=E6=B1=82=EF=BC=9AHL-5264?= =?UTF-8?q?=20=20=E4=BB=BF=E7=85=A7=E5=A4=87=E4=BB=B6=E9=A2=86=E7=94=A8?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=86=8D=E5=81=9A=E4=B8=80=E4=B8=AA=E5=A4=87?= =?UTF-8?q?=E4=BB=B6=E9=80=80=E5=BA=93=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sparepartReturnRequestMain.data.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/sparepartReturnRequestMain.data.ts b/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/sparepartReturnRequestMain.data.ts index 00bfdf790..2ae509935 100644 --- a/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/sparepartReturnRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/sparepartReturnRequestMain.data.ts @@ -65,7 +65,7 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive field: 'status', dictType: DICT_TYPE.REQUEST_STATUS, dictClass: 'string', - isSearch: true, + isSearch: false, isForm: false, isTable: true, sort: 'custom', @@ -397,7 +397,7 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive field: 'toAreaTypes', dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', - isSearch: true, + isSearch: false, isTable: true, sort: 'custom', table: { @@ -412,7 +412,7 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive table: { width: 150 }, - isSearch: true, + isSearch: false, isForm: false, }, { @@ -926,6 +926,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive Date: Mon, 19 Aug 2024 13:16:49 +0800 Subject: [PATCH 05/22] =?UTF-8?q?HL-5430WMS=20=E5=BA=93=E5=AD=98=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96=E9=A1=B5=E9=9D=A2=E6=9C=89=E4=B8=A4=E5=88=97?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventoryinitRequestMain/inventoryinitRequestMain.data.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts index 12f41d622..49c7d0fdb 100644 --- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts @@ -397,6 +397,7 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( table: { width: 180 }, + hiddenInMain:true, isTableForm: false, form: { componentProps: { From 37f5fccbb506585f18a7bd11b493626bc218df31 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Mon, 19 Aug 2024 13:29:41 +0800 Subject: [PATCH 06/22] =?UTF-8?q?=E5=88=B6=E5=93=81=E5=9B=9E=E6=94=B6-?= =?UTF-8?q?=E5=8A=A0=E7=94=9F=E4=BA=A7=E7=BA=BF=E4=BB=A3=E7=A0=81=E5=AD=97?= =?UTF-8?q?=E6=AE=B5-=E8=BE=BE=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productredressJobMain/productredressJobMain.data.ts | 9 +++++++++ .../productredressRecordMain.data.ts | 9 +++++++++ .../productredressRequestMain.data.ts | 2 +- 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts b/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts index 35d0113d7..feb84a75c 100644 --- a/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts +++ b/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts @@ -44,6 +44,15 @@ export const ProductredressJobMain = useCrudSchemas(reactive([ } } }, + { + label: '生产线代码', + field: 'productionLineCode', + sort: 'custom', + table: { + width: 150 + }, + isTable:true, + }, { label: '申请时间', field: 'requestTime', diff --git a/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts b/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts index d0518f979..cf13590fe 100644 --- a/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts +++ b/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts @@ -55,6 +55,15 @@ export const ProductredressRecordMain = useCrudSchemas(reactive([ width: 150 } }, + { + label: '生产线代码', + field: 'productionLineCode', + sort: 'custom', + table: { + width: 150 + }, + isTable:true, + }, // { // label: '生产计划单号', // field: 'productionPlanNumber', diff --git a/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts b/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts index 200e490ac..02030f9a1 100644 --- a/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts +++ b/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts @@ -105,7 +105,7 @@ export const ProductredressRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, - isTable:false, + isTable:true, tableForm: { enterSearch: true, isInpuFocusShow: true, From 2b0f6b770f8505c32af83a0c23f7a7ca0e862a95 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Mon, 19 Aug 2024 13:38:50 +0800 Subject: [PATCH 07/22] =?UTF-8?q?HL-5395=20WMS=EF=BC=8CSCP=EF=BC=8CQMS?= =?UTF-8?q?=E5=9C=A8=E6=89=80=E6=9C=89=E5=88=97=E8=A1=A8=E9=A1=B5=E4=B8=8A?= =?UTF-8?q?=E9=9D=A2=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=A1=86=E4=B8=AD=E8=BE=93?= =?UTF-8?q?=E5=85=A5=E4=BF=A1=E6=81=AF=E5=90=8E=E6=8C=89=E3=80=90=E5=9B=9E?= =?UTF-8?q?=E8=BD=A6=E3=80=91=EF=BC=8C=E5=8F=AF=E4=BB=A5=E7=9B=B4=E6=8E=A5?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=EF=BC=8C=E7=9B=B8=E5=BD=93=E4=BA=8E=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E4=BA=86=E3=80=90=E6=9F=A5=E8=AF=A2=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Form/src/Form.vue | 6 ++++++ src/components/Search/src/Search.vue | 16 +++++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/src/components/Form/src/Form.vue b/src/components/Form/src/Form.vue index d8421d87c..1a9076d65 100644 --- a/src/components/Form/src/Form.vue +++ b/src/components/Form/src/Form.vue @@ -400,6 +400,12 @@ export default defineComponent({ onBlur={(e) => { onBlur(item.field, e) }} onFocus={(e) => { onFocus(item.field) }} onInput={(value)=>{onInput(item.field,value)}} + onKeyup={(event)=>{ + if(event.keyCode === 13){ + //回车 + emit('onEnter',item.field,formModel.value[item.field],event) + } + }} {...(notRenderOptions.includes(item?.component as string) && item?.componentProps?.options ? { options: item?.componentProps?.options || [] } diff --git a/src/components/Search/src/Search.vue b/src/components/Search/src/Search.vue index c233dd92c..f75d6fa2f 100644 --- a/src/components/Search/src/Search.vue +++ b/src/components/Search/src/Search.vue @@ -63,9 +63,15 @@ const props = defineProps({ required: false, default: [] }, + //回车触发搜索。默认true + enterSearch:{ + type: Boolean, + required: false, + default: true + }, }) -const emit = defineEmits(['search', 'reset','onInput','onChange','searchTableSuccess']) +const emit = defineEmits(['search', 'reset','onInput','onChange','onEnter','searchTableSuccess']) const visible = ref(true) @@ -116,6 +122,13 @@ const onInput = (field,value) => { const onChange = (field, value)=>{ emit('onChange', field,value) } +const onEnter = async (field, value, e) => { + if(props.enterSearch){ + search() + }else{ + emit('onEnter', field, value, e) + } +} const searchTableRef = ref() const opensearchTable = ( formField, @@ -291,6 +304,7 @@ defineExpose({setFormValues,search}) // 提供 open 方法，用于打开弹窗 @onInput="onInput" @opensearchTable="opensearchTable" @onChange="onChange" + @onEnter="onEnter" >