From cf42ddbcccd2c54eb0b1b301d8356b37f26dbc48 Mon Sep 17 00:00:00 2001 From: "hongrui.an" <297504645@qq.com> Date: Fri, 27 Jun 2025 17:29:22 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90EDI=E5=89=8D=E7=AB=AF=E3=80=91?= =?UTF-8?q?=E7=BC=BA=E9=99=B7=EF=BC=8C=E9=A1=B5=E9=9D=A2=E6=9B=B4=E6=94=B9?= =?UTF-8?q?=E5=8F=8A=E5=B0=81=E8=A3=85=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Web/src/components/importPop/index.vue | 2 +- Web/src/utils/common/apiServeNames.js | 6 ++--- Web/src/utils/common/apiTableColumns.js | 8 +++--- Web/src/utils/common/index.js | 2 +- .../supplierEmployee/index.vue | 2 +- .../productionQuality/supplierInfo/index.vue | 2 +- .../supplierProProcessEquipment/index.vue | 2 +- .../system/menu/components/editDialog.vue | 25 +++++++++++-------- Web/src/views/system/menu/index.vue | 1 + .../message/components/publishDialog.vue | 1 + Web/src/views/system/user/index.vue | 4 +-- 11 files changed, 32 insertions(+), 23 deletions(-) diff --git a/Web/src/components/importPop/index.vue b/Web/src/components/importPop/index.vue index ddcb2bf..c7df514 100644 --- a/Web/src/components/importPop/index.vue +++ b/Web/src/components/importPop/index.vue @@ -132,7 +132,7 @@ const emits = defineEmits(['success']) const submitFormSuccess = (response: any) => { formLoading.value = false if (response) { - if(response.code == '200'){ + if(response.code == '200' || response.code == '1'){ ElMessage.success('导入成功！') }else{ ElMessage.error(response.message) diff --git a/Web/src/utils/common/apiServeNames.js b/Web/src/utils/common/apiServeNames.js index 92f265a..4167f38 100644 --- a/Web/src/utils/common/apiServeNames.js +++ b/Web/src/utils/common/apiServeNames.js @@ -36,13 +36,13 @@ const apiServeNames = { }, // 供应商基础信息 - cherysupplierinfo:{ + supplierinfodt:{ tableName:'SUPPLIER_INFO', taskName:'供应商基础信息' }, // 人员资质信息 - cherysupplieremployee:{ + supplieremployeedt:{ tableName:'SUPPLIER_EMPLOYEE', taskName:'人员资质信息' }, @@ -96,7 +96,7 @@ const apiServeNames = { }, // 工艺装备 - cherysupplierproprocessequipment:{ + supplierproprocessequipmentdt:{ tableName:'SUPPLIER_PRO_PROCESS_EQUIPMENT', taskName:'工艺装备' }, diff --git a/Web/src/utils/common/apiTableColumns.js b/Web/src/utils/common/apiTableColumns.js index 3d6b912..1fcd9dd 100644 --- a/Web/src/utils/common/apiTableColumns.js +++ b/Web/src/utils/common/apiTableColumns.js @@ -594,7 +594,7 @@ const apiTableColumns = { {prop:'creationTime',title:'创建时间',width:180}, ], // 供应商基础信息 - cherysupplierinfo:[ + supplierinfodt:[ {prop:'writeState',title:'是否传出',type:'tagFilter',options:EnumList.whetherBoolean,width:120,noEdit:true}, {prop:'readState',title:'是否已确认',type:'tagFilter',options:EnumList.whetherBoolean,width:120,noEdit:true}, {prop:'supplierCode',title:'供应商代码',required:true}, @@ -616,9 +616,10 @@ const apiTableColumns = { {prop:'cheryProductNo',title:'奇瑞零件号',required:true}, {prop:'cheryProductName',title:'奇瑞零件名称',width:180,required:true}, {prop:'creationTime',title:'创建时间',width:180,noEdit:true}, + {prop:'remark',title:'备注',align:'left',width:200}, ], // 人员资质信息 - cherysupplieremployee:[ + supplieremployeedt:[ {prop:'writeState',title:'是否传出',type:'tagFilter',options:EnumList.whetherBoolean,width:120,noEdit:true}, {prop:'readState',title:'是否已确认',type:'tagFilter',options:EnumList.whetherBoolean,width:120,noEdit:true}, {prop:'supplierCode',title:'供应商代码',required:true}, @@ -910,7 +911,7 @@ const apiTableColumns = { {prop:'creationTime',title:'创建时间',width:180,noEdit:true}, ], // 工艺装备 - cherysupplierproprocessequipment:[ + supplierproprocessequipmentdt:[ {prop:'writeState',title:'是否传出',type:'tagFilter',options:EnumList.whetherBoolean,width:120,noEdit:true}, {prop:'readState',title:'是否已确认',type:'tagFilter',options:EnumList.whetherBoolean,width:120,noEdit:true}, {prop:'supplierCode',title:'供应商代码',required:true}, @@ -968,6 +969,7 @@ const apiTableColumns = { {prop:'deviceCode',title:'设备编码'}, {prop:'rhythm',title:'工序节拍',type:'number'}, {prop:'rhythmUnit',title:'节拍单位'}, + {prop:'creationTime',title:'创建时间',width:180,noEdit:true}, ], diff --git a/Web/src/utils/common/index.js b/Web/src/utils/common/index.js index 1803f2d..79f0aba 100644 --- a/Web/src/utils/common/index.js +++ b/Web/src/utils/common/index.js @@ -52,7 +52,7 @@ export function getApiByServeName(value,prop='tableName'){ 'M+6月物料需求计划1':'cherysuppliermrpmonth', 'M+6月物料需求计划2':'cherysuppliermrpmonth', '供应商共享库存-上午':'cherysuppliersinvdata', - '供应商共享库存-下午':'cherysuppliersinvdata', + '供应商共享库存-晚上':'cherysuppliersinvdata', } for(let i in _special){ if(i == value){ diff --git a/Web/src/views/productionQuality/supplierEmployee/index.vue b/Web/src/views/productionQuality/supplierEmployee/index.vue index 76e5188..d2270bc 100644 --- a/Web/src/views/productionQuality/supplierEmployee/index.vue +++ b/Web/src/views/productionQuality/supplierEmployee/index.vue @@ -16,7 +16,7 @@ import { reactive, ref, onMounted } from 'vue' import tablePage from '@/components/tablePage/index.vue' const state = reactive({ - apiName:'cherysupplieremployee', + apiName:'supplieremployeedt', searchFilter: { supplierCode: null, creationTime:null diff --git a/Web/src/views/productionQuality/supplierInfo/index.vue b/Web/src/views/productionQuality/supplierInfo/index.vue index e32bc24..47d7167 100644 --- a/Web/src/views/productionQuality/supplierInfo/index.vue +++ b/Web/src/views/productionQuality/supplierInfo/index.vue @@ -16,7 +16,7 @@ import { reactive, ref, onMounted } from 'vue' import tablePage from '@/components/tablePage/index.vue' const state = reactive({ - apiName:'cherysupplierinfo', + apiName:'supplierinfodt', searchFilter: { supplierCode: null, creationTime:null diff --git a/Web/src/views/productionQuality/supplierProProcessEquipment/index.vue b/Web/src/views/productionQuality/supplierProProcessEquipment/index.vue index 0931465..70c8487 100644 --- a/Web/src/views/productionQuality/supplierProProcessEquipment/index.vue +++ b/Web/src/views/productionQuality/supplierProProcessEquipment/index.vue @@ -16,7 +16,7 @@ import { reactive, ref, onMounted } from 'vue' import tablePage from '@/components/tablePage/index.vue' const state = reactive({ - apiName:'cherysupplierproprocessequipment', + apiName:'supplierproprocessequipmentdt', searchFilter: { deviceCode: null, creationTime:null diff --git a/Web/src/views/system/menu/components/editDialog.vue b/Web/src/views/system/menu/components/editDialog.vue index 0e39d7d..b19ba21 100644 --- a/Web/src/views/system/menu/components/editDialog.vue +++ b/Web/src/views/system/menu/components/editDialog.vue @@ -24,7 +24,7 @@ - @@ -168,7 +168,7 @@ const state = reactive({ iconTabActiveName: 'ele', menuTreeList: [], form: {}, - parentIds: [], + // parentIds: [], loading:false, }) @@ -233,19 +233,24 @@ function openDialog(id) { if (id) { getMenu(id).then(res => { state.form = res.data - if (res.data.parentId && res.data.parentId !== '0') { - state.parentIds = [res.data.parentId] - } + // if (res.data.parentId && res.data.parentId !== '0') { + // state.parentIds = res.data.parentId + // } setFormRules() }) - .finally(() => (state.loading = false)) + .finally(() => { + state.loading = false; + state.isShowDialog = true + }) } else { getMaxSort().then(res => { state.form.sort = res.data }) - .finally(() => (state.loading = false)) + .finally(() => { + state.loading = false; + state.isShowDialog = true + }) } - state.isShowDialog = true } function iconChange(iconName) { @@ -272,7 +277,7 @@ function resetForm() { status: 1, openNewWindow: false, } - state.parentIds=[] + // state.parentIds=[] setFormRules() setTimeout(() => { elFormRef.value?.resetFields() @@ -296,7 +301,7 @@ function setFormRules(){ function submit() { - state.form.parentId = (state.parentIds && state.parentIds.length > 0) ? state.parentIds[state.parentIds.length - 1] : null + // state.form.parentId = (state.parentIds && state.parentIds.length > 0) ? state.parentIds[state.parentIds.length - 1] : null elFormRef.value.validate((valid) => { if (valid) { state.loading=true diff --git a/Web/src/views/system/menu/index.vue b/Web/src/views/system/menu/index.vue index ce73329..b090295 100644 --- a/Web/src/views/system/menu/index.vue +++ b/Web/src/views/system/menu/index.vue @@ -56,6 +56,7 @@