From b890ad1de7e687c0d2d15647f7aabb7c8eb15c4e Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Fri, 9 Aug 2024 17:23:35 +0800 Subject: [PATCH 01/34] =?UTF-8?q?=E8=AE=B0=E5=BD=95=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventorymoveRecordMain.data.ts | 124 +++++++++--------- .../inventorymoveRecordRequestMain.data.ts | 100 +++++++------- 2 files changed, 111 insertions(+), 113 deletions(-) diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordMain.data.ts index 9611e7f26..a89421081 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordMain.data.ts @@ -15,24 +15,24 @@ export const InventorymoveRecordMain = useCrudSchemas(reactive([ }, isSearch: true }, - { - label: '申请单号', - field: 'requestNumber', - sort: 'custom', - table: { - width: 180 - }, - isSearch: true - }, - { - label: '任务单号', - field: 'jobNumber', - sort: 'custom', - table: { - width: 180 - }, - isSearch: true - }, + // { + // label: '申请单号', + // field: 'requestNumber', + // sort: 'custom', + // table: { + // width: 180 + // }, + // isSearch: true + // }, + // { + // label: '任务单号', + // field: 'jobNumber', + // sort: 'custom', + // table: { + // width: 180 + // }, + // isSearch: true + // }, // { // label: '使用在途库', // field: 'useOnTheWayLocation', @@ -133,15 +133,15 @@ export const InventorymoveRecordMain = useCrudSchemas(reactive([ // } // }, // }, - { - label: '发货单号', - field: 'asnNumber', - sort: 'custom', - table: { - width: 150 - }, - isForm: false, - }, + // { + // label: '发货单号', + // field: 'asnNumber', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isForm: false, + // }, { label: '从仓库代码', field: 'fromWarehouseCode', @@ -588,41 +588,41 @@ export const InventorymoveRecordDetail = useCrudSchemas(reactive([ width: 150 }, }, - { - label: '项目代码', - field: 'projectCode', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '从货主代码', - field: 'fromOwnerCode', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '到货主代码', - field: 'toOwnerCode', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '接口类型', - field: 'interfaceType', - dictType: DICT_TYPE.INTERFACE_TYPE, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - }, + // { + // label: '项目代码', + // field: 'projectCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + // { + // label: '从货主代码', + // field: 'fromOwnerCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + // { + // label: '到货主代码', + // field: 'toOwnerCode', + // 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/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordRequestMain.data.ts index e9b5422f8..d11803178 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordRequestMain.data.ts @@ -258,8 +258,8 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( }, { - label: '批次', - field: 'fromBatch', + label: '从包装号', + field: 'fromPackingNumber', sort: 'custom', table: { width: 150 @@ -274,14 +274,28 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( } }, { - label: '从包装号', - field: 'fromPackingNumber', + label: '到包装号', + field: 'toPackingNumber', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: true, + isForm: false, + }, + { + label: '从库存状态', + field: 'fromInventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 }, tableForm: { - disabled: true + disabled: true, + type: 'Select' }, form: { componentProps: { @@ -290,14 +304,24 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( } }, { - label: '到包装号', - field: 'toPackingNumber', + label: '到库存状态', + field: 'toInventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 }, - isTableForm: true, - isForm: false, + tableForm: { + disabled: false, + type: 'Select' + }, + form: { + componentProps: { + disabled: true + } + } }, { label: '包装规格', @@ -319,7 +343,22 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( isTableForm: false, isForm: false, }, - + { + label: '批次', + field: 'fromBatch', + sort: 'custom', + table: { + width: 150 + }, + tableForm: { + disabled: true + }, + form: { + componentProps: { + disabled: true + } + } + }, { label: '数量', field: 'qty', @@ -360,47 +399,6 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( disabled: true } } - }, - - { - label: '从库存状态', - field: 'fromInventoryStatus', - dictType: DICT_TYPE.INVENTORY_STATUS, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - tableForm: { - disabled: true, - type: 'Select' - }, - form: { - componentProps: { - disabled: true - } - } - }, - { - label: '到库存状态', - field: 'toInventoryStatus', - dictType: DICT_TYPE.INVENTORY_STATUS, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - tableForm: { - disabled: false, - type: 'Select' - }, - form: { - componentProps: { - disabled: true - } - } } ])) From 8ff64f3e895fca583dab18abdce55af4f93bb085 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Fri, 9 Aug 2024 17:34:55 +0800 Subject: [PATCH 02/34] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionJob/addForm.vue | 3 ++- src/views/qms/inspectionJobProduction/addForm.vue | 3 ++- src/views/qms/inspectionJobPurchase/addForm.vue | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/views/qms/inspectionJob/addForm.vue b/src/views/qms/inspectionJob/addForm.vue index 93b717cd3..6b2e16b28 100644 --- a/src/views/qms/inspectionJob/addForm.vue +++ b/src/views/qms/inspectionJob/addForm.vue @@ -502,7 +502,8 @@ - + - + - + Date: Fri, 9 Aug 2024 17:45:17 +0800 Subject: [PATCH 03/34] =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=A4=96=E5=87=BA?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=A4=87=E6=B3=A8=E5=AD=97=E6=AE=B5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../unplannedissueJobMain.data.ts | 6 +++--- .../unplannedissueRecordMain.data.ts | 6 +++--- .../unplannedissueRequestMain.data.ts | 7 +++---- .../unplannedreceiptJobMain.data.ts | 18 +++++++++--------- .../unplannedreceiptRecordMain.data.ts | 6 +++--- .../unplannedreceiptRequestMain.data.ts | 6 +++--- 6 files changed, 24 insertions(+), 25 deletions(-) diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts index 689b8a90a..6dd1a6df5 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts @@ -367,8 +367,8 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive([ isTable:false, }, { - label: '备注', - field: 'remark', + label: '备注(主)', + field: 'remarkMain', sort: 'custom', isTable:false, table: { @@ -894,7 +894,7 @@ export const UnplannedissueJobDetail = useCrudSchemas(reactive([ }, }, { - label: '备注', + label: '备注(子)', field: 'remark', sort: 'custom', table: { diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts index 160b3ee62..fe94f3e9f 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts @@ -374,8 +374,8 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive([ }, }, { - label: '备注', - field: 'remark', + label: '备注(主)', + field: 'remarkMain', sort: 'custom', table: { width: 150 @@ -730,7 +730,7 @@ export const UnplannedissueRecordDetail = useCrudSchemas(reactive( }, }, { - label: '备注', + label: '备注(子)', field: 'remark', sort: 'custom', table: { diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts index 0a39c2256..efea9aa1e 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts @@ -496,14 +496,13 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive([ } }, { - label: '备注', - field: 'remark', + label: '备注(主)', + field: 'remarkMain', sort: 'custom', table: { width: 150 }, sortTableDefault: 1000, - isTable: true, }, { label: '直接生成记录', @@ -997,7 +996,7 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive isTable:false, }, { - label: '备注', + label: '备注(子)', field: 'remark', sort: 'custom', table: { diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts index 5d1ea6aef..c3133decd 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts @@ -350,14 +350,14 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive([ // width: 150 // }, // }, - // { - // label: '备注', - // field: 'remark', - // sort: 'custom', - // table: { - // width: 150 - // }, - // }, + { + label: '备注(主)', + field: 'remarkMain', + sort: 'custom', + table: { + width: 150 + }, + }, { label: '自动完成', field: 'autoComplete', @@ -1016,7 +1016,7 @@ export const UnplannedreceiptJobDetail = useCrudSchemas(reactive([ }, }, { - label: '备注', + label: '备注(子)', field: 'remark', sort: 'custom', table: { diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts index a9f5d795b..3527d66e8 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts @@ -349,8 +349,8 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive( }, }, { - label: '备注', - field: 'remark', + label: '备注(主)', + field: 'remarkMain', isTable:false, sort: 'custom', table: { @@ -785,7 +785,7 @@ export const UnplannedreceiptRecordDetail = useCrudSchemas(reactive } }, { - label: '备注', - field: 'remark', + label: '备注(主)', + field: 'remarkMain', sort: 'custom', table: { width: 150 @@ -1231,7 +1231,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive Date: Fri, 9 Aug 2024 17:52:41 +0800 Subject: [PATCH 04/34] =?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/inspectionJob/addForm.vue | 21 +++++++++---------- src/views/qms/inspectionJob/index.vue | 1 + .../qms/inspectionQ3/inspectionQ3.data.ts | 4 ++-- src/views/qms/inspectionRecord/index.vue | 4 ++-- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/views/qms/inspectionJob/addForm.vue b/src/views/qms/inspectionJob/addForm.vue index 6b2e16b28..5627ed1a2 100644 --- a/src/views/qms/inspectionJob/addForm.vue +++ b/src/views/qms/inspectionJob/addForm.vue @@ -414,6 +414,16 @@ + + + + + @@ -502,17 +512,6 @@ - - - - - + @@ -80,6 +82,14 @@ import download from '@/utils/download' import { InventorymoveRecordMain,InventorymoveRecordMainRules,InventorymoveRecordDetail,InventorymoveRecordDetailRules } from './inventorymoveRecordMain.data' import { InventorymoveRequestMain,InventorymoveRequestMainRules,InventorymoveRequestDetail,InventorymoveRequestDetailRules } from './inventorymoveRecordRequestMain.data' +import { + SupplierdeliverRequestPackage +} from '@/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data' + +import { getAccessToken } from '@/utils/auth' + +import * as PackageApi from '@/api/wms/package' +import { getJmreportBaseUrl } from '@/utils/systemParam' import * as InventorymoveRequestMainApi from '@/api/wms/inventorymoveRequestMain' import * as InventorymoveRecordMainApi from '@/api/wms/inventorymoveRecordMain' import * as InventorymoveRecordDetailApi from '@/api/wms/inventorymoveRecordDetail' @@ -165,17 +175,77 @@ const openForm =async (type: string, row?: number) => { formRef.value.open(type, row) } +// 列表-操作按钮 // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 if(findIndex>-1&&findIndex<$index){ return [] } - return [] + return [ + defaultButtons.mainListPointBtn(null), // 标签打印 + ] } // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { + if (val == 'point') { // 标签打印 + labelPrint(row) + } +} +const BASE_URL = getJmreportBaseUrl() +// 标签打印 +const searchTableRef = ref() +const labelType = ref('') // 标签类别 采购还是制造等 +const labelPrint = async (row) => { + tableObject.loading = true + //获取类型 + let resType = await PackageApi.getPackagePage({ + requestNumber: row.number + }) + if(resType.list.length > 0){ + if (resType.list[0].productionLineCode != null) { + labelType.value = 'zz' + } else { + labelType.value = 'cg' + } + } + const defaultParams = {'moduleName':'productreceipt_predict','tableName':'record_productreceipt_main','recordNumber':row.number} + const {tableObject:tableObjectPrint ,tableMethods} = useTable({ + defaultParams, + getListApi: PackageApi.getLabelDetailPage // 分页接口 + }) + // 获得表格的各种操作 + const { getList:getListPrint } = tableMethods + getListPrint() + tableObject.loading = false + const tableColumns = SupplierdeliverRequestPackage.allSchemas.tableFormColumns + tableColumns.forEach((item) => { + item.width = item.table?.width || 150 + }) + searchTableRef.value.openData("标签信息",tableObjectPrint,{tableColumns},true) +} +// 批量打印--预生产收货 +const searchTableSuccessLabel = async (formField, searchField, val, formRef, type, row) => { + console.log('批量打印',val) + + if(val.length == 0){ + message.warning("请先选择要打印的数据!") + return + } + await PackageApi.batchPrintingLable(val.map(item1=>item1.number).join(',')).then(res => { + console.log(res) + if (labelType.value == 'cg') { + const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken()) + window.open(src.value+'&asn_number='+res) + } else { + const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()) + window.open(src.value+'&asn_number='+res) + } + }).catch(err => { + console.log(err) + message.error('创建标签失败') + }) } // 获取部门 用于详情 部门回显 const { wsCache } = useCache() diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordMain.data.ts index a89421081..3fb619aec 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordMain.data.ts @@ -338,6 +338,16 @@ export const InventorymoveRecordMain = useCrudSchemas(reactive([ // } // } // }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false , + table: { + width: 120, + fixed: 'right' + }, + } ])) //表单校验 From 03787a3f84c146ea4b4e6006015105ee33750617 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com> Date: Sat, 10 Aug 2024 12:29:00 +0800 Subject: [PATCH 21/34] =?UTF-8?q?Q1=20Q2=20Q3=20=E7=BC=96=E7=A0=81?= =?UTF-8?q?=E5=AD=97=E5=85=B8=E5=80=BC=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/dict.ts | 3 +++ src/views/qms/inspectionQ1/inspectionQ1.data.ts | 2 +- src/views/qms/inspectionQ2/inspectionQ2.data.ts | 2 +- src/views/qms/inspectionQ3/inspectionQ3.data.ts | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/utils/dict.ts b/src/utils/dict.ts index 22c46d617..5c75f708f 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -323,6 +323,9 @@ export enum DICT_TYPE { QUALITY_NOTIFICATION_PRIORITY = 'quality_notification_priority', // 质量通知优先级 CLAIM_REASON = 'claim_Reason', // 质量通知索赔原因 QMS_CODE = 'qms_code', // 质量通知代码 + QMS_Q1_CODE = 'qms_Q1_code', + QMS_Q2_CODE = 'qms_Q2_code', + QMS_Q3_CODE = 'qms_Q3_code', DEFECT_LOCATION = 'defect_location', // 质量通知缺陷位置 DEFECT_TYPE = 'defect_type', // 质量通知缺陷类型 PROBLEM_REASON = 'problem_reason', // 质量通知问题原因 diff --git a/src/views/qms/inspectionQ1/inspectionQ1.data.ts b/src/views/qms/inspectionQ1/inspectionQ1.data.ts index 39fc07837..6850c5e94 100644 --- a/src/views/qms/inspectionQ1/inspectionQ1.data.ts +++ b/src/views/qms/inspectionQ1/inspectionQ1.data.ts @@ -179,7 +179,7 @@ export const Q1 = useCrudSchemas( label: '编码', field: 'code', sort: 'custom', - dictType: DICT_TYPE.QMS_CODE, + dictType: DICT_TYPE.QMS_Q1_CODE, dictClass: 'string', isSearch: false, isTable: true, diff --git a/src/views/qms/inspectionQ2/inspectionQ2.data.ts b/src/views/qms/inspectionQ2/inspectionQ2.data.ts index 55df4ad9f..5c647f76f 100644 --- a/src/views/qms/inspectionQ2/inspectionQ2.data.ts +++ b/src/views/qms/inspectionQ2/inspectionQ2.data.ts @@ -286,7 +286,7 @@ export const Q2 = useCrudSchemas( label: '编码', field: 'code', sort: 'custom', - dictType: DICT_TYPE.QMS_CODE, + dictType: DICT_TYPE.QMS_Q2_CODE, dictClass: 'string', isSearch: false, isTable: true, diff --git a/src/views/qms/inspectionQ3/inspectionQ3.data.ts b/src/views/qms/inspectionQ3/inspectionQ3.data.ts index 66d54dabb..db0f5fe1a 100644 --- a/src/views/qms/inspectionQ3/inspectionQ3.data.ts +++ b/src/views/qms/inspectionQ3/inspectionQ3.data.ts @@ -214,7 +214,7 @@ export const Q3 = useCrudSchemas( label: '编码', field: 'code', sort: 'custom', - dictType: DICT_TYPE.QMS_CODE, + dictType: DICT_TYPE.QMS_Q3_CODE, dictClass: 'string', isSearch: true, isTable: true, From 597317aba90e7bfde39f06164ebb88202307806c Mon Sep 17 00:00:00 2001 From: gaojs <757918719@qq.com> Date: Sat, 10 Aug 2024 13:14:46 +0800 Subject: [PATCH 22/34] =?UTF-8?q?WMS=20=E2=80=94=E2=80=94>=20bug=20?= =?UTF-8?q?=E7=89=A9=E6=96=99=E5=BA=93=E5=8C=BA=E9=85=8D=E7=BD=AE=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/basicDataManage/itemManage/itemarea/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue index eb9f347ae..ce408d873 100644 --- a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue +++ b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue @@ -52,7 +52,7 @@ :tableData="tableData" :apiUpdate="ItemareaApi.updateItemarea" :apiCreate="ItemareaApi.createItemarea" - :isBusiness="true" + :isBusiness="false" @handleAddTable="handleAddTable" @handleDeleteTable="handleDeleteTable" :isShowReduceButtonSelection="true" @@ -68,7 +68,7 @@ Date: Sat, 10 Aug 2024 13:17:44 +0800 Subject: [PATCH 23/34] InventorymoveRecordMainNew --- .../inventorymoveRecordMainNew/index.vue | 20 +++++++++---------- ....ts => inventorymoveRecordMainNew.data.ts} | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) rename src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/{inventorymoveRecordMain.data.ts => inventorymoveRecordMainNew.data.ts} (98%) diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue index 7a08ce4d9..a46ddc264 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue @@ -1,7 +1,7 @@