【EDI前端】缺陷，页面更改及封装暂存

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)

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:'工艺装备'
     },

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},
     ],
 
 

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){

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

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

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

Web/src/views/system/menu/components/editDialog.vue

@@ -24,7 +24,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="父级" prop="parentId">
-              <el-cascader v-model="state.parentIds"
+              <el-cascader v-model="state.form.parentId"
                 :options=" state.menuTreeList"
                 
                 :props="{ label: 'menuName', value: 'id' ,checkStrictly:true}" :clearable="state.form.menuType === 1" />
@@ -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') {
+      // if (res.data.parentId && res.data.parentId !== '0') {
-        state.parentIds = [res.data.parentId]
+      //   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

Web/src/views/system/menu/index.vue

@@ -56,6 +56,7 @@
 </template>
 
 <script setup>
+// menuManage
 defineOptions({ name: 'menuIndex' })
 import { reactive, onMounted, ref } from 'vue'
 import { getTreeList, deleteMenu } from '@/api/system/menuApi'

Web/src/views/system/message/components/publishDialog.vue

@@ -188,6 +188,7 @@ function handleQuery() {
 
 function handleDelete(id) {
   state.tableData = state.tableData.filter((item) => item.id !== id)
+  state.tableDataBak = state.tableDataBak.filter((item) => item.id !== id)
 }
 
 defineExpose({

Web/src/views/system/user/index.vue

@@ -21,8 +21,8 @@
     <div class="app-container-main">
       <el-card class="search-container">
         <el-form :inline="true">
-          <el-form-item label="姓名/账号">
+          <el-form-item label="账号">
-            <el-input v-model="state.queryParams.userName" placeholder="姓名/账号" clearable />
+            <el-input v-model="state.queryParams.userName" placeholder="账号" clearable />
           </el-form-item>
           <el-form-item>
             <el-button @click="handleQuery" icon="Search" v-auth="'userIndex:page'">查询</el-button>