From 3ddf35ba98443266e19f20a0cf788ce6e8128ae3 Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Wed, 22 May 2024 09:19:39 +0800 Subject: [PATCH 01/81] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=BA=E9=99=B7?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../containerRecordMain/containerRecordMain.data.ts | 1 + .../unplannedreceiptRequestMain/index.vue | 12 ++++++++---- .../purchasereturnRequestMain.data.ts | 3 +++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/containerRecordMain.data.ts b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/containerRecordMain.data.ts index f29e5788f..eee4eb48f 100644 --- a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/containerRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/containerRecordMain.data.ts @@ -274,6 +274,7 @@ export const ContainerRecordDetail = useCrudSchemas(reactive([ isForm: false, hiddenInMain:true, isTableForm: false, + isTable: false, table: { width: 150, fixed: 'right' diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue index f51f37065..7986b0870 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue @@ -464,10 +464,14 @@ const handleAgree = async (id: number) => { const handleHandle = async (id: number) => { await message.confirm(t('common.confirmHandle')) tableObject.loading = true - await UnplannedreceiptRequestMainApi.handleUnplannedreceiptRequestMain(id) - message.success(t('common.handleSuccess')) - tableObject.loading = false - await getList() + try { + await UnplannedreceiptRequestMainApi.handleUnplannedreceiptRequestMain(id) + message.success(t('common.handleSuccess')) + await getList() + + } finally { + tableObject.loading = false + } } /** 添加/修改操作 */ diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts index daf309ff7..39441468d 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts @@ -608,6 +608,9 @@ export const PurchasereturnRequestMainRules = reactive({ supplierCode: [ { required: true, message: '请输入供应商代码', trigger: 'blur' } ], + dueTime: [ + { required: true, message: '请选择截止时间', trigger: 'blur' } + ], purchaseReceiptRecordNumber: [ { required: true, message: '请输入采购收货记录单号', trigger: 'blur' } ], From 2eef72a6692e02d76e5b9d563c325f3244191d20 Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Wed, 22 May 2024 09:33:04 +0800 Subject: [PATCH 02/81] =?UTF-8?q?WMS=20=E8=BF=87=E6=BB=A4=E6=8E=89?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionRecord/index.vue | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/views/qms/inspectionRecord/index.vue b/src/views/qms/inspectionRecord/index.vue index 6c5d8dd2a..daf0f6ec9 100644 --- a/src/views/qms/inspectionRecord/index.vue +++ b/src/views/qms/inspectionRecord/index.vue @@ -73,10 +73,20 @@ import { DICT_TYPE, getStrDictOptions } from '@/utils/dict' const routeName = ref() routeName.value = route.name const tableColumns = ref(InspectionRecordMain.allSchemas.tableColumns) - + if(routeName.value=='InspectRecordMain'){ + tableColumns.value = tableColumns.value.filter(item=>{ + return item.label!='操作' + }) + } // 字段设置 更新主列表字段 const updataTableColumns = (val) => { - tableColumns.value = val + if(routeName.value=='InspectRecordMain'){ + tableColumns.value = val.filter(item=>{ + return item.label!='操作' + }) + }else{ + tableColumns.value = val + } } From ce1ef2308ec64022c671ae58fade128d09eab676 Mon Sep 17 00:00:00 2001 From: chenfang Date: Wed, 22 May 2024 09:58:51 +0800 Subject: [PATCH 03/81] =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerreturnRequestMain.data.ts | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts index 353495c60..caacdf50e 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts @@ -886,22 +886,22 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive } } }, - // { - // label: '到库位代码', - // field: 'toLocationCode', - // sort: 'custom', - // table: { - // width: 150 - // }, - // tableForm: { - // disabled: true - // }, - // form: { - // componentProps: { - // disabled: true - // } - // } - // }, + { + label: '到库位代码', + field: 'toLocationCode', + sort: 'custom', + table: { + width: 150 + }, + tableForm: { + disabled: true + }, + form: { + componentProps: { + disabled: true + } + } + }, { label: '库存状态', field: 'inventoryStatus', From 37108d625f19b4a9475cb3fb0bd89cff8a12a1a8 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Wed, 22 May 2024 10:03:52 +0800 Subject: [PATCH 04/81] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/purchasereceiptRecordDetail/index.ts | 13 +- .../purchasereturnRequestMain/index.vue | 7 +- .../purchasereturnRequestMain.data.ts | 133 +++++------------- 3 files changed, 55 insertions(+), 98 deletions(-) diff --git a/src/api/wms/purchasereceiptRecordDetail/index.ts b/src/api/wms/purchasereceiptRecordDetail/index.ts index 352eeb112..41b7aa7b7 100644 --- a/src/api/wms/purchasereceiptRecordDetail/index.ts +++ b/src/api/wms/purchasereceiptRecordDetail/index.ts @@ -73,6 +73,17 @@ export const getPurchasereceiptRecordDetailPageSpare = async (params) => { } +// 查询采购收货记录--退货筛选列表 +export const getPurchasereceiptRecordDetailPageReturn = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/purchasereceipt-record-detail/seniorReturn', data }) + } else { + return await request.get({ url: `/wms/purchasereceipt-record-detail/pageReturn`, params }) + } +} + export const getPurchasereceiptRecordDetailPageSCP = async (params) => { if (params.isSearch) { delete params.isSearch @@ -152,4 +163,4 @@ export const queryPurchaseceiptChildPackingNumber = async (params) => { // 查询采购收货缺货记录子包装数据 export const queryPurchaseshortageChildPackingNumber = async (params) => { return await request.get({ url: `/wms/purchaseshortage-detail/pageChildPackingNumber`, params }) -} \ No newline at end of file +} diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue index e2920d06c..346df66f0 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue @@ -269,8 +269,11 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) => item.packingNumber = item.fromPackingNumber item.containerNumber = item.toContainerNumber item.receiptQty = item.qty + item.packUnit = item.packUnit + item.packQty = item.packQty item.toLocationGroupCode = null item.toWarehouseCode = null + item.fromLocationCode = null item.toAreaTypes = null item.toLocationCode = null // item.fromLocationCode = item.fromLocationCode @@ -337,7 +340,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef) => { setV['supplierUom'] = val[0]['supplierUom'] setV['inventoryStatus'] = val[0]['inventoryStatus'] // setV['fromLocationCode'] = val[0]['toLocationCode'] - setV['toLocationCode'] = val[0]['toLocationCode'] + // setV['toLocationCode'] = val[0]['toLocationCode'] setV['fromLocationGroupCode'] = val[0]['locationGroupCode'] setV['toLocationGroupCode'] = null setV['toWarehouseCode'] = null @@ -363,7 +366,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef) => { setV['containerNumber'] = val[0]['containerNumber'] setV['containerNumber'] = val[0]['containerNumber'] // setV['fromLocationCode'] = val[0]['fromLocationCode'] - setV['toLocationCode'] = val[0]['toLocationCode'] + // setV['toLocationCode'] = val[0]['toLocationCode'] } }else { setV[formField] = val[0][searchField] diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts index 39441468d..222fae2d7 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts @@ -96,14 +96,6 @@ const PurchasereceiptRecordMain1 = useCrudSchemas(reactive([ width: 150 }, }, - { - label: '数量', - field: 'qty', - sort: 'custom', - table: { - width: 150 - }, - }, { label: '计量单位', field: 'uom', @@ -115,14 +107,6 @@ const PurchasereceiptRecordMain1 = useCrudSchemas(reactive([ width: 150 }, }, - { - label: '包装号', // 实际是子表的从包装号，为了不影响页面，单独放上面 - field: 'fromPackingNumber', - sort: 'custom', - table: { - width: 150 - }, - }, { label: '包装规格', field: 'packUnit', @@ -133,21 +117,6 @@ const PurchasereceiptRecordMain1 = useCrudSchemas(reactive([ width: 150 }, }, - { - label: '包装数量', - field: 'packQty', - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'InputNumber', - }, - tableForm: { - disabled: true, - }, - isForm:false, - }, { label: '从库位代码', field: 'fromLocationCode', @@ -241,7 +210,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive([ searchField: 'number', // 查询弹窗赋值字段 searchTitle: '采购收货记录', // 查询弹窗标题 searchAllSchemas: PurchasereceiptRecordMain1.allSchemas, // 查询弹窗所需类 - searchPage: PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPage, // 查询弹窗所需分页方法 + searchPage: PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPageReturn, // 查询弹窗所需分页方法 searchCondition: [ { key: 'supplierCode', @@ -677,7 +646,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive width: 150 }, tableForm:{ - isInpuFocusShow: true, // 开启查询弹窗 + isInpuFocusShow: false, // 开启查询弹窗 searchListPlaceholder: '请选择订单行', searchField: 'poLine', searchTitle: '采购收货记录信息', @@ -693,7 +662,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive form: { // labelMessage: '信息提示说明！！！', componentProps: { - isSearchList: true, + isSearchList: false, searchListPlaceholder: '请选择订单行', searchField: 'poLine', searchTitle: '采购收货记录信息', @@ -799,33 +768,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive } } }, - // { - // label: '从批次', - // field: 'fromBatch', - // sort: 'custom', - // table: { - // width: 150 - // }, - // tableForm:{ - // disabled:true - // } - // }, - { - label: '批次', - field: 'batch', - sort: 'custom', - table: { - width: 150 - }, - tableForm:{ - disabled:true - }, - form: { - componentProps:{ - disabled:true - } - } - }, + { label: '替代批次', field: 'altBatch', @@ -883,6 +826,27 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive } } }, + { + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isSearch: true, + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + disabled:true, + type: 'Select', + }, + form: { + componentProps:{ + disabled:true + } + } + }, { label: '收货数量', field: 'receiptQty', @@ -898,6 +862,8 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive disabled:true } }, + isTable:false, + isTableForm:false, tableForm:{ disabled:true, type:'InputNumber', @@ -951,27 +917,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive precision: 6 } }, - { - label: '计量单位', - field: 'uom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', - isSearch: true, - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - tableForm:{ - disabled:true, - type: 'Select', - }, - form: { - componentProps:{ - disabled:true - } - } - }, + { label: '库存状态', field: 'inventoryStatus', @@ -1171,7 +1117,6 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive } }, }, - { label: '项目代码', field: 'projectCode', @@ -1397,7 +1342,7 @@ export const PurchasereReturnRequestDetailLabel = useCrudSchemas(reactive Date: Wed, 22 May 2024 10:08:50 +0800 Subject: [PATCH 05/81] =?UTF-8?q?=E4=B8=BB=E5=AD=90=E8=A1=A8=E5=90=88?= =?UTF-8?q?=E5=B9=B6=EF=BC=8C=E5=AF=BC=E8=87=B4table=E4=B8=AD=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E7=9A=84=E6=98=BE=E7=A4=BA=E4=B8=8E=E9=9A=90=E8=97=8F?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/rowDrop/index.vue | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/components/rowDrop/index.vue b/src/components/rowDrop/index.vue index 15d0707a5..73363f566 100644 --- a/src/components/rowDrop/index.vue +++ b/src/components/rowDrop/index.vue @@ -82,9 +82,13 @@ const closeRowDrop = () => { const save = () => { let saveDate:any[] = [] // 默认列表第一列（弹出详情用） - saveDate.push(props.allSchemas.tableColumns[0]) + let myTableColumns = props.allSchemas.tableColumns + if(props.detailAllSchemas){ + myTableColumns = [...props.allSchemas?.tableColumns,...props.detailAllSchemas?.tableMainColumns] + } + saveDate.push(myTableColumns[0]) allData.value.forEach((item) => { - const _item:any = props.allSchemas.tableColumns.find(itemColumns => (itemColumns.label == item )) + const _item:any = myTableColumns.find(itemColumns => (itemColumns.label == item )) if(_item){ _item.isTable = false if (checkedDataList.value.indexOf(_item.label) > -1) { @@ -94,7 +98,7 @@ const save = () => { } }) // 默认操作列 - saveDate.push(props.allSchemas.tableColumns[props.allSchemas.tableColumns.length-1]) + saveDate.push(myTableColumns[myTableColumns.length-1]) updataTableColumns(saveDate) console.log(99, saveDate) RedisApi.addRedis({key: routeName.value,value: JSON.stringify(saveDate)}).then(() => { From 85c984248c3437c8b19c7147723479b14e655b4e Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Wed, 22 May 2024 10:30:54 +0800 Subject: [PATCH 06/81] =?UTF-8?q?tableForm=E8=A1=A8=E6=A0=BC=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E5=B1=85=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/TableForm/src/TableForm.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue index 2ac2fb922..61242caf5 100644 --- a/src/components/TableForm/src/TableForm.vue +++ b/src/components/TableForm/src/TableForm.vue @@ -534,7 +534,10 @@ defineExpose({ padding: 2px 0px; border: none; } - +::v-deep(.el-form-item--default) { + margin-bottom: 5px; + margin-top: 5px; +} ::v-deep(.el-table td.el-table__cell .el-form-item__content) { display: flex !important; align-items: center !important; From 0dc1988198e508ed5eeb7b573c72bb69b65cb2eb Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Wed, 22 May 2024 10:59:59 +0800 Subject: [PATCH 07/81] =?UTF-8?q?=E5=8F=91=E8=B4=A7=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/deliverPlanDetail/index.ts | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/api/wms/deliverPlanDetail/index.ts b/src/api/wms/deliverPlanDetail/index.ts index 33aeffdb9..ea6887451 100644 --- a/src/api/wms/deliverPlanDetail/index.ts +++ b/src/api/wms/deliverPlanDetail/index.ts @@ -24,6 +24,17 @@ export const selectDetailByMasterID = async (id: number) => { // 查询发货计划子列表 export const getDeliverPlanDetailPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/deliver-plan-detail/senior', data }) + } else { + return await request.get({ url: `/wms/deliver-plan-detail/page`, params }) + } +} + +// 查询发货计划子列表 +export const getDeliverPlanDetailPage1 = async (params) => { return await request.get({ url: `/wms/deliver-plan-detail/page`, params }) } From 510b86039cf37f898a46a506fa32b7dd75cff390 Mon Sep 17 00:00:00 2001 From: zhousq Date: Wed, 22 May 2024 11:12:28 +0800 Subject: [PATCH 08/81] =?UTF-8?q?2024-05-22=E6=8A=A5=E5=BA=9F=E6=8B=86?= =?UTF-8?q?=E8=A7=A3=20=E9=A1=B5=E9=9D=A2=E4=B8=BB=E4=BB=8E=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E6=98=BE=E7=A4=BA=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mes/dismantlingMain/dismantlingMain.data.ts | 1 - src/views/mes/dismantlingMain/index.vue | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/views/mes/dismantlingMain/dismantlingMain.data.ts b/src/views/mes/dismantlingMain/dismantlingMain.data.ts index 7f3bfb25f..9d43d8a76 100644 --- a/src/views/mes/dismantlingMain/dismantlingMain.data.ts +++ b/src/views/mes/dismantlingMain/dismantlingMain.data.ts @@ -74,7 +74,6 @@ export const DismantlingMain = useCrudSchemas(reactive([ defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } }, - isForm: false, }, { label: '删除用户名', diff --git a/src/views/mes/dismantlingMain/index.vue b/src/views/mes/dismantlingMain/index.vue index c4c87bdf8..5e7a4a94b 100644 --- a/src/views/mes/dismantlingMain/index.vue +++ b/src/views/mes/dismantlingMain/index.vue @@ -53,7 +53,7 @@ Date: Wed, 22 May 2024 11:17:48 +0800 Subject: [PATCH 09/81] =?UTF-8?q?=E6=89=93=E5=8C=85=E8=BE=93=E5=87=BA?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.hella13 | 2 +- .env.hella14 | 2 +- .env.hella15 | 2 +- .env.hella16 | 2 +- .env.hella8 | 2 +- .env.hella9 | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.env.hella13 b/.env.hella13 index b60b2be7c..427ab7c88 100644 --- a/.env.hella13 +++ b/.env.hella13 @@ -28,7 +28,7 @@ VITE_SOURCEMAP=false VITE_BASE_PATH=/ # 输出路径 -VITE_OUT_DIR=sfms3.0 +VITE_OUT_DIR=sfms3.0-ui # 自定义接口路径 VITE_INTERFACE_URL='http://172.21.32.13:90/magic/web/index.html' diff --git a/.env.hella14 b/.env.hella14 index 4d29e7b41..da353530c 100644 --- a/.env.hella14 +++ b/.env.hella14 @@ -28,7 +28,7 @@ VITE_SOURCEMAP=false VITE_BASE_PATH=/ # 输出路径 -VITE_OUT_DIR=sfms3.0 +VITE_OUT_DIR=sfms3.0-ui # 自定义接口路径 VITE_INTERFACE_URL='http://172.21.32.14:90/magic/web/index.html' diff --git a/.env.hella15 b/.env.hella15 index 5c668fcb1..122b9022e 100644 --- a/.env.hella15 +++ b/.env.hella15 @@ -28,7 +28,7 @@ VITE_SOURCEMAP=false VITE_BASE_PATH=/ # 输出路径 -VITE_OUT_DIR=sfms3.0 +VITE_OUT_DIR=sfms3.0-ui # 自定义接口路径 VITE_INTERFACE_URL='https://scp.faway-hella.com/magic/web/index.html' diff --git a/.env.hella16 b/.env.hella16 index 8e4ffd6b2..e5f3cf2a6 100644 --- a/.env.hella16 +++ b/.env.hella16 @@ -28,7 +28,7 @@ VITE_SOURCEMAP=false VITE_BASE_PATH=/ # 输出路径 -VITE_OUT_DIR=sfms3.0 +VITE_OUT_DIR=sfms3.0-ui # 自定义接口路径 VITE_INTERFACE_URL='https://scptest.faway-hella.com/magic/web/index.html' diff --git a/.env.hella8 b/.env.hella8 index d1d914dac..488560e5c 100644 --- a/.env.hella8 +++ b/.env.hella8 @@ -28,7 +28,7 @@ VITE_SOURCEMAP=false VITE_BASE_PATH=/ # 输出路径 -VITE_OUT_DIR=sfms3.0 +VITE_OUT_DIR=sfms3.0-ui # 自定义接口路径 VITE_INTERFACE_URL='http://172.22.32.8:90/magic/web/index.html' diff --git a/.env.hella9 b/.env.hella9 index 86853d4ef..7ce574d7f 100644 --- a/.env.hella9 +++ b/.env.hella9 @@ -28,7 +28,7 @@ VITE_SOURCEMAP=false VITE_BASE_PATH=/ # 输出路径 -VITE_OUT_DIR=sfms3.0 +VITE_OUT_DIR=sfms3.0-ui # 自定义接口路径 VITE_INTERFACE_URL='http://172.22.32.9:90/magic/web/index.html' From 2c6d07e47e06598bffb0b63c539530758cc94afc Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Wed, 22 May 2024 11:26:37 +0800 Subject: [PATCH 10/81] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereturnRequestMain/index.vue | 2 +- .../purchasereturnRequestMain.data.ts | 35 ++++++++----------- 2 files changed, 16 insertions(+), 21 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue index 346df66f0..54a7ab207 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue @@ -918,7 +918,7 @@ const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAcces const showLabelRef = ref() const labelPrint = async (row) => { tableObject.loading = true - const defaultParams = {'moduleName':'supplier','recordNumber':row.number} + const defaultParams = {'moduleName':'purchasereturn','recordNumber':row.number} const {tableObject:tableObjectPrint ,tableMethods} = useTable({ defaultParams, getListApi: PackageApi.getLabelDetailPage // 分页接口 diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts index 222fae2d7..b2f6d91ea 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts @@ -788,25 +788,6 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive } } }, - { - label: '包装号', - field: 'packingNumber', - sort: 'custom', - table: { - width: 150 - }, - hiddenInMain: true, - tableForm:{ - disabled:true - }, - isTableForm: false, - isTable: false, - form: { - componentProps:{ - disabled:true - } - } - }, { label: '器具号', field: 'containerNumber', @@ -917,7 +898,21 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive precision: 6 } }, - + { + label: '包装号', + field: 'packingNumber', + sort: 'custom', + table: { + width: 150 + }, + hiddenInMain: true, + isTable: false, + form: { + componentProps:{ + disabled:true + } + } + }, { label: '库存状态', field: 'inventoryStatus', From 9e67120bede4c319a0fe6cfd489c83d435c208c4 Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Wed, 22 May 2024 11:39:27 +0800 Subject: [PATCH 11/81] =?UTF-8?q?=E8=A6=81=E8=B4=A7=E8=AE=A1=E5=88=92--?= =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E4=BB=A3=E7=A0=81=E8=BE=93=E5=85=A5?= =?UTF-8?q?=E5=9B=9E=E8=BD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasePlanMain/index.vue | 26 +++++++++++++++++-- .../purchasePlanMain/purchasePlanMain.data.ts | 1 + 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue index d97a73dfa..858220136 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue @@ -43,7 +43,8 @@ :isShowReduceButtonSelection="true" @tableSelectionDelete="tableSelectionDelete" @searchTableSuccess="searchTableSuccess" - @submitForm="submitForm" /> + @submitForm="submitForm" + @onEnter="onEnter"/> @@ -81,7 +82,8 @@ import { PurchaseDetail } from '../purchaseMain/purchaseMain.data' import dayjs from 'dayjs' import supplierdeliverBasicForm from '../supplierdeliverRequestMain/supplierdeliverBasicForm.vue' - + import * as PurchaseMainApi from '@/api/wms/purchaseMain' + import { PurchaseMain } from '../purchaseMain/purchaseMain.data' // 要货计划 defineOptions({ name: 'PurchasePlanMain' }) @@ -536,6 +538,26 @@ const { wsCache } = useCache() const tableSelectionDelete = (selection) => { tableData.value = tableData.value.filter(item => !selection.includes(item)) } + const onEnter = async (field,value)=>{ + console.log(field,value) + if('supplierCode'==field){ + //供应商代码 + formRef.value.opensearchTable('poNumber', 'number', '采购订单信息', PurchaseMain.allSchemas, PurchaseMainApi.getPurchaseMainPage,[{ + key: 'available', + value: 'TRUE', + isMainValue: false + },{ + key: 'supplierCode', + value: 'supplierCode', + message: '请填写供应商代码！', + isMainValue: true + },{ + key: 'status', + value: 2, + isMainValue: false + }]) + } + } // 主子数据 提交 const submitForm = async (formType, data) => { diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts index 584a70016..c73ed0ee3 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts @@ -34,6 +34,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive([ form: { labelMessage: '影响明细中物料代码，需在供应商物料中维护', componentProps: { + enterSearch: true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择供应商代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 From 01eec0b83f8d37b17de55f10f499edb21ef48ee2 Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Wed, 22 May 2024 11:54:07 +0800 Subject: [PATCH 12/81] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7?= =?UTF-8?q?=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereturn/purchasereturnRequestMain/index.vue | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue index 54a7ab207..bb0f8c342 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue @@ -783,12 +783,7 @@ const handleDeleteTable = (item, index, formRef) => { item.componentProps.disabled = false } }) - nextTick(() => { - const setV = {} - setV['purchaseReceiptRecordNumber'] = '' - setV['supplierCode'] = '' - formRef.setValues(setV) - }) + } } const tableSelectionDelete = (selection) => { From d3c7006b9973243505fc4df4add5a7774266eff4 Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Wed, 22 May 2024 11:58:08 +0800 Subject: [PATCH 13/81] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereturn/purchasereturnRequestMain/index.vue | 8 +++++++- .../purchasereturnRequestMain.data.ts | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue index bb0f8c342..25e49ecbf 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue @@ -122,7 +122,8 @@ import { PurchasereturnRequestMainRules, PurchasereturnRequestDetail, PurchasereturnRequestDetailRules, - PurchasereReturnRequestDetailLabel + PurchasereReturnRequestDetailLabel, + PurchasereceiptRecordMain1 } from './purchasereturnRequestMain.data' import * as PurchasereturnRequestMainApi from '@/api/wms/purchasereturnRequestMain' import * as PurchasereturnRequestDetailApi from '@/api/wms/purchasereturnRequestDetail' @@ -155,6 +156,11 @@ const onEnter = async (field,value)=>{ console.log(field,value) if('supplierCode'==field){ //供应商代码 + formRef.value.opensearchTable('purchaseReceiptRecordNumber', 'number', '采购收货记录', PurchasereceiptRecordMain1.allSchemas, PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPageReturn,[{ + key: 'supplierCode', + value: 'supplierCode', + isMainValue: true + }]) }else if('purchaseReceiptRecordNumber' == field){ //采购收货记录 } diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts index b2f6d91ea..1f7a017d5 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts @@ -30,7 +30,7 @@ const queryParams = { // 采购收货记录展示列 -const PurchasereceiptRecordMain1 = useCrudSchemas(reactive([ +export const PurchasereceiptRecordMain1 = useCrudSchemas(reactive([ { label: '物料代码', field: 'itemCode', From 0fbad131d3e4b8970755b31aa7dad9a2373f224a Mon Sep 17 00:00:00 2001 From: TengXF <302828528@qq.com> Date: Wed, 22 May 2024 13:03:47 +0800 Subject: [PATCH 14/81] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=BC=80=E5=85=B3?= =?UTF-8?q?=E5=85=B3=E9=97=AD=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mes/item/index.vue | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/src/views/mes/item/index.vue b/src/views/mes/item/index.vue index 148c77cae..81515d30d 100644 --- a/src/views/mes/item/index.vue +++ b/src/views/mes/item/index.vue @@ -152,7 +152,7 @@ const basicFormRef = ref() const openForm = (type: string, row?: any) => { if(type == "update"){ Item.allSchemas.formSchema.forEach((item) => { - + if (item.field == 'itemCode') { item.componentProps.disabled = true } @@ -168,7 +168,7 @@ const openForm = (type: string, row?: any) => { item.componentProps.disabled = false } - } + } if(row.dataType == 'SWITCH'){ if (item.field == 'dataVerify') { item.componentProps.disabled = true @@ -177,7 +177,7 @@ const openForm = (type: string, row?: any) => { item.componentProps.disabled = true } - } + } if(row.dataType == 'TEXT'){ if (item.field == 'dataVerify') { item.componentProps.disabled = true @@ -186,8 +186,8 @@ const openForm = (type: string, row?: any) => { item.componentProps.disabled = true } - } - }) + } + }) }else{ Item.allSchemas.formSchema.forEach((item) => { if (item.field == 'itemCode') { @@ -202,9 +202,12 @@ const openForm = (type: string, row?: any) => { if (item.field == 'dataStandvalue') { item.componentProps.disabled = false } + if (item.field == 'status') { + item.componentProps.disabled = true + } }) - } + } basicFormRef.value.open(type, row) } @@ -293,9 +296,9 @@ const searchFormClick = (searchData) => { //数据类型切换 const onChangeQG = (field, cur, item) => { - + console.log('cur'+cur) - + Item.allSchemas.formSchema.forEach((item) => { if(cur == 'SWITCH'){ if (item.field == 'dataVerify') { @@ -306,8 +309,8 @@ const onChangeQG = (field, cur, item) => { } if (item.field == 'status') { item.componentProps.disabled = false - } - } + } + } if(cur == 'TEXT'){ if (item.field == 'dataVerify') { item.componentProps.disabled = true @@ -317,7 +320,7 @@ const onChangeQG = (field, cur, item) => { } if (item.field == 'status') { item.componentProps.disabled = true - } + } } if(cur == 'NUMBER'){ if (item.field == 'dataVerify') { @@ -328,13 +331,13 @@ const onChangeQG = (field, cur, item) => { } if (item.field == 'status') { item.componentProps.disabled = true - } + } } - }) - - + }) + + } - + /** 初始化 **/ onMounted(async () => { From 68afbb4aa68a487610b27d73371ce25210922fb5 Mon Sep 17 00:00:00 2001 From: gaojs <757918719@qq.com> Date: Wed, 22 May 2024 13:13:10 +0800 Subject: [PATCH 15/81] =?UTF-8?q?EAM=20=E2=80=94=E2=80=94>=20=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E6=95=B0=E6=8D=AE=20=20=E5=A4=87=E4=BB=B6=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/eam/sparePart/index.ts | 36 ++-- src/views/eam/sparePart/index.vue | 4 +- src/views/eam/sparePart/sparePart.data.ts | 224 ++++++++++++---------- 3 files changed, 140 insertions(+), 124 deletions(-) diff --git a/src/api/eam/sparePart/index.ts b/src/api/eam/sparePart/index.ts index 8ae1f345a..58ef9f2bc 100644 --- a/src/api/eam/sparePart/index.ts +++ b/src/api/eam/sparePart/index.ts @@ -7,23 +7,19 @@ export interface SparePartVO { brand: string specifications: string isOverall: string - isConstant: string subject: string subjectCode: string - category: string + type: string + images: string region: string classification: string uom: string singlePrice: number - stockAge: number - reprocurement: number - safetyStock: number - cost: string - purchaser: string - financer: string - purchaseTime: Date - isFramework: string - isRadeIn: string + manufacturer: string + minInventory: number + maxInventory: number + replacementCycle: number + storageLocation: string departmentCode: string remark: string siteId: string @@ -38,38 +34,38 @@ export const getSparePartPage = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return await request.post({ url: '/eam/sparepart/spare-part/senior', data }) + return await request.post({ url: '/eam/basic/spare-part/senior', data }) } else { - return await request.get({ url: `/eam/sparepart/spare-part/page`, params }) + return await request.get({ url: `/eam/basic/spare-part/page`, params }) } } // 查询备件基础详情 export const getSparePart = async (id: number) => { - return await request.get({ url: `/eam/sparepart/spare-part/get?id=` + id }) + return await request.get({ url: `/eam/basic/spare-part/get?id=` + id }) } // 新增备件基础 export const createSparePart = async (data: SparePartVO) => { - return await request.post({ url: `/eam/sparepart/spare-part/create`, data }) + return await request.post({ url: `/eam/basic/spare-part/create`, data }) } // 修改备件基础 export const updateSparePart = async (data: SparePartVO) => { - return await request.put({ url: `/eam/sparepart/spare-part/update`, data }) + return await request.put({ url: `/eam/basic/spare-part/update`, data }) } // 删除备件基础 export const deleteSparePart = async (id: number) => { - return await request.delete({ url: `/eam/sparepart/spare-part/delete?id=` + id }) + return await request.delete({ url: `/eam/basic/spare-part/delete?id=` + id }) } // 导出备件基础 Excel export const exportSparePart = async (params) => { - return await request.download({ url: `/eam/sparepart/spare-part/export-excel`, params }) + return await request.download({ url: `/eam/basic/spare-part/export-excel`, params }) } // 下载用户导入模板 export const importTemplate = () => { - return request.download({ url: '/eam/sparepart/spare-part/get-import-template' }) -} \ No newline at end of file + return request.download({ url: '/eam/basic/spare-part/get-import-template' }) +} diff --git a/src/views/eam/sparePart/index.vue b/src/views/eam/sparePart/index.vue index 3471dd480..0c59357eb 100644 --- a/src/views/eam/sparePart/index.vue +++ b/src/views/eam/sparePart/index.vue @@ -54,7 +54,7 @@ - + -@/api/wms/itempackage \ No newline at end of file +@/api/wms/itempackage From 89b3712acc0c548c396c91f5fd7374be6020f1b9 Mon Sep 17 00:00:00 2001 From: zhousq Date: Wed, 22 May 2024 14:30:22 +0800 Subject: [PATCH 22/81] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E8=B7=AF=E7=BA=BF?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=20=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?= =?UTF-8?q?=EF=BC=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/mes/processroute/index.ts | 5 +++++ src/views/mes/processroute/components/configDialog.vue | 6 ++++-- src/views/mes/processroute/processroute.data.ts | 7 +++++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/api/mes/processroute/index.ts b/src/api/mes/processroute/index.ts index c889e2dff..f6f5f1726 100644 --- a/src/api/mes/processroute/index.ts +++ b/src/api/mes/processroute/index.ts @@ -87,6 +87,11 @@ export const getProcessBomList = async (params) => { return await request.get({ url: `/mes/common/getBomListByProductAndProcess`,params}) } +// 查询产品bom的工序物料列表 +export const getBomListByProductBomAndProcess = async (params) => { + return await request.get({ url: `/mes/common/getBomListByProductBomAndProcess`,params}) +} + export const getWorkstationPage = async (code:String) => { return await request.get({ url: `/mes/workstation/page?pageSize=25&processCode=`+code}) } diff --git a/src/views/mes/processroute/components/configDialog.vue b/src/views/mes/processroute/components/configDialog.vue index 08cdcd6bb..1b6d72818 100644 --- a/src/views/mes/processroute/components/configDialog.vue +++ b/src/views/mes/processroute/components/configDialog.vue @@ -189,6 +189,7 @@ const tableProcess = ref() const productData = ref({ name: '', code: '', desc1: '--' }) //产品数据 const materialData=ref() const mouldData = ref() +//const bomVersion=ref() const page=ref({ total:0, current:1, @@ -327,6 +328,7 @@ const getProcessBomList = async (pcode,processCode) => { processCode:processCode } return await ProcessrouteApi.getProcessBomList(params); + //return await ProcessrouteApi.getBomListByProductBomAndProcess(params); } /** 查询模具基本信息列表 */ const getPatternPage = async (code) => { @@ -363,10 +365,10 @@ const nodeClick = (e, x, y, node, view) => { currentNode.value.name=node.attrs.title.text Promise.all([ getProcessInfo(node.id), - getProcessBomList(productCode.value,node.id), + getProcessBomList(productCode.value,node.id),// rowData.value getPatternPage(node.id), getWorkstationPage(node.id) - ]).then(([processInfoList,basicBom, patternPage,workstationInfoList]) => { + ]).then(([processInfo,basicBom, patternPage,workstationInfoList]) => { // 在这里处理所有异步操作的结果 //message.info(JSON.stringify(processIndoList)) //console.log('basicBom',basicBom) diff --git a/src/views/mes/processroute/processroute.data.ts b/src/views/mes/processroute/processroute.data.ts index e2f1f9ee8..7f02e7bed 100644 --- a/src/views/mes/processroute/processroute.data.ts +++ b/src/views/mes/processroute/processroute.data.ts @@ -97,6 +97,13 @@ export const Processroute = useCrudSchemas(reactive([ } } }, + // { + // label: 'BOM版本号', + // field: 'BOMVersion', + // sort: 'custom', + // value: '1', + // isSearch: false, + // }, // { // label: '版本号', // field: 'routeVersion', From a2c533ee00e5c80519fdcb05caa05c47d39bf9f6 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Wed, 22 May 2024 15:09:17 +0800 Subject: [PATCH 23/81] =?UTF-8?q?=E7=9B=98=E7=82=B9=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/countJobMain/index.ts | 10 +++++- .../count/countJobMain/countJobMain.data.ts | 2 +- .../countManage/count/countJobMain/index.vue | 35 ++++++++++++++++++- 3 files changed, 44 insertions(+), 3 deletions(-) diff --git a/src/api/wms/countJobMain/index.ts b/src/api/wms/countJobMain/index.ts index 3d9c2a5e8..2f685a8cf 100644 --- a/src/api/wms/countJobMain/index.ts +++ b/src/api/wms/countJobMain/index.ts @@ -89,5 +89,13 @@ export const importTemplate = () => { // 关闭盘点任务主 export const closeCountJobMain = (id: number) => { - return request.download({ url: '/wms/count-job-main/close?id=' + id }) + return request.put({ url: '/wms/count-job-main/close?id=' + id }) } + +// 关闭盘点任务主 +export const handleExportCountJob = async (id: number) => { + let params = { + masterId:id + } + return await request.download({ url: `/wms/count-job-main/export-excel-single`, params }) +} \ No newline at end of file diff --git a/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts b/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts index 8fb474d8a..d8a07ccd3 100644 --- a/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts +++ b/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts @@ -501,7 +501,7 @@ export const CountJobMain = useCrudSchemas(reactive([ isDetail: false, isForm: false, table: { - width: 120, + width: 180, fixed: 'right' }, } diff --git a/src/views/wms/countManage/count/countJobMain/index.vue b/src/views/wms/countManage/count/countJobMain/index.vue index 8cf17ac71..ba882335d 100644 --- a/src/views/wms/countManage/count/countJobMain/index.vue +++ b/src/views/wms/countManage/count/countJobMain/index.vue @@ -186,7 +186,25 @@ const butttondata = (row,$index) => { } return [ // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接 - defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:count-job-main:close'}), // 关闭 + defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1','2']),hasPermi:'wms:count-job-main:close'}), // 关闭 + { + label: '导出', + name: 'exportCountJob', + hide: isShowMainButton(row,['1','2']), + type: 'success', + color: '', + link: true, //文本展现按钮 + hasPermi: '' // wms:count-job-main:exportCountJob + }, + { + label: '导入', + name: 'importCountJob', + hide: isShowMainButton(row,['1','2']), + type: 'success', + color: '', + link: true, //文本展现按钮 + hasPermi: '' // wms:count-job-main:importCountJob + } // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃 // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行 ] @@ -202,6 +220,8 @@ const buttonTableClick = async (val, row) => { handleClose(row.masterId) } else if (val == 'mainJobAcc') { // 承接 console.log('列表-操作按钮事件-承接') + } else if (val == 'exportCountJob'){// 当前任务导出 + handleExportCountJob(row.masterId,row.number) } } @@ -240,6 +260,19 @@ const handleExport = async () => { } } +/** 单条任务导出 */ +const handleExportCountJob = async (id: number,number: string) => { + try { + await message.exportConfirm() + exportLoading.value = true + const data = await CountJobMainApi.handleExportCountJob(id) + download.excel(data, '盘点任务主'+number+'.xlsx') + } catch { + }finally { + exportLoading.value = false + } +} + // 筛选提交 const searchFormClick = (searchData) => { tableObject.params = { From 55f47bd9aab08d9d3affa22fce6210c2680ea42f Mon Sep 17 00:00:00 2001 From: bjang03 Date: Wed, 22 May 2024 15:11:29 +0800 Subject: [PATCH 24/81] =?UTF-8?q?1=E3=80=81=E7=89=A9=E5=93=81=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=96=87=E5=AD=97=E7=BB=9F=E4=B8=80=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E7=89=A9=E6=96=99=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/basicDataManage/itemManage/itemarea/itemarea.data.ts | 4 ++-- .../itemManage/itemwarehouse/itemwarehouse.data.ts | 2 +- .../saleShipmentMainRecord/saleShipmentMainRecord.data.ts | 2 +- .../packageoverJobMain/packageoverJobMain.data.ts | 4 ++-- .../packageoverRetrospect/packageoverRetrospect.data.ts | 2 +- .../productreceiptAssembleRecordMain.data.ts | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts b/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts index d20f50532..6aa8e1d5e 100644 --- a/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts +++ b/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts @@ -16,7 +16,7 @@ import { t } from '@/hooks/web/useI18n' export const Itemarea = useCrudSchemas(reactive([ { - label: '物品代码', + label: '物料代码', field: 'itemCode', sort: 'custom', isSearch: true, @@ -752,4 +752,4 @@ export const ItemareaDetail = useCrudSchemas(reactive([ // 表单校验 export const ItemareaDetailRules = reactive({ -}) \ No newline at end of file +}) diff --git a/src/views/wms/basicDataManage/itemManage/itemwarehouse/itemwarehouse.data.ts b/src/views/wms/basicDataManage/itemManage/itemwarehouse/itemwarehouse.data.ts index 99f6c1c5a..1d3aa7d08 100644 --- a/src/views/wms/basicDataManage/itemManage/itemwarehouse/itemwarehouse.data.ts +++ b/src/views/wms/basicDataManage/itemManage/itemwarehouse/itemwarehouse.data.ts @@ -9,7 +9,7 @@ import { Itempackaging } from '../itempackage/itempackage.data' export const Itemwarehouse = useCrudSchemas(reactive([ { - label: '物品代码', + label: '物料代码', field: 'itemCode', sort: 'custom', isSearch: true, diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts index 1d97d749b..7f958772f 100644 --- a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts +++ b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts @@ -201,7 +201,7 @@ export const SaleShipmentDetailRecord = useCrudSchemas(reactive([ isTable:false }, { - label: '物品代码', + label: '物料代码', field: 'itemCode', sort: 'custom', table: { diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/packageoverJobMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/packageoverJobMain.data.ts index d9afde219..c8a795eeb 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/packageoverJobMain.data.ts +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/packageoverJobMain.data.ts @@ -545,7 +545,7 @@ export const PackageoverJobDetail = useCrudSchemas(reactive([ }, }, { - label: '物品代码', + label: '物料代码', field: 'itemCode', sort: 'custom', table: { @@ -818,4 +818,4 @@ export const PackageoverJobDetail = useCrudSchemas(reactive([ // 表单校验 export const PackageoverJobDetailRules = reactive({ -}) \ No newline at end of file +}) diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/packageoverRetrospect.data.ts b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/packageoverRetrospect.data.ts index f43c1f563..4f1f27fb9 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/packageoverRetrospect.data.ts +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/packageoverRetrospect.data.ts @@ -56,7 +56,7 @@ export const PackageoverRetrospect = useCrudSchemas(reactive([ }, }, { - label: '物品代码', + label: '物料代码', field: 'itemCode', sort: 'custom', isSearch: true, diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts index cda78051b..a6a4be2e7 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts @@ -1028,7 +1028,7 @@ export const ProductreceiptDetailb = useCrudSchemas(reactive([ isSearch: true, }, { - label: '物品代码', + label: '物料代码', field: 'itemCode', sort: 'custom', isSearch: true, From 1cee041840f1058b506d5520adea55a42aa99bbd Mon Sep 17 00:00:00 2001 From: gaojs <757918719@qq.com> Date: Wed, 22 May 2024 15:50:44 +0800 Subject: [PATCH 25/81] =?UTF-8?q?EAM=20=E2=80=94=E2=80=94>=20=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E6=95=B0=E6=8D=AE=20=E5=A4=87=E4=BB=B6=E7=AE=A1?= =?UTF-8?q?=E7=90=86=20=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/eam/sparePart/index.vue | 2 +- src/views/eam/sparePart/sparePart.data.ts | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/views/eam/sparePart/index.vue b/src/views/eam/sparePart/index.vue index 0c59357eb..5c16bad14 100644 --- a/src/views/eam/sparePart/index.vue +++ b/src/views/eam/sparePart/index.vue @@ -54,7 +54,7 @@ - + + + diff --git a/src/views/wms/countManage/count/countJobMain/index.vue b/src/views/wms/countManage/count/countJobMain/index.vue index ba882335d..91cd63903 100644 --- a/src/views/wms/countManage/count/countJobMain/index.vue +++ b/src/views/wms/countManage/count/countJobMain/index.vue @@ -64,6 +64,19 @@ :searchTableParams="searchTableParams" :apiPage="CountJobDetailApi.getCountJobDetailPage" /> + + + +