工艺管理接口联调

src/page/index/top/index.vue

@@ -50,7 +50,7 @@
         <top-logs></top-logs>
       </div> -->
       <div class="top-user">
-        <img class="top-bar__img" :src="userInfo.avatar" />
+        <!-- <img class="top-bar__img" :src="userInfo.avatar" /> -->
         <el-dropdown :hide-on-click="false">
           <span class="el-dropdown-link" :style="{color:setting.styleRadio == '3' || setting.styleRadio == '6' ? '#fff' : ''}">
             {{ userInfo.real_name }}

src/router/views/index.js

@@ -36,7 +36,7 @@ export default [
         component: () => import(/* webpackChunkName: "views" */ '@/views/wel/dashboard.vue'),
       },
       {
-        path: '/taskCope',
+        path: '/wel/taskCope',
         component: () => import(/* webpackChunkName: "page" */ '@/views/zhgd-work/taskCope/index.vue'),
         name: '工序接收',
         meta: {
@@ -46,26 +46,7 @@ export default [
         },
       },
       // workReport
-      {
-        path: '/workReport',
-        component: () => import(/* webpackChunkName: "page" */ '@/views/zhgd-work/workReport/index.vue'),
-        name: '工序报工',
-        meta: {
-          keepAlive: true,
-          isTab: false,
-          isAuth: false,
-        },
-      },
-      {
-        path: '/workCheck',
-        component: () => import(/* webpackChunkName: "page" */ '@/views/zhgd-work/workCheck/index.vue'),
-        name: '工序检验',
-        meta: {
-          keepAlive: true,
-          isTab: false,
-          isAuth: false,
-        },
-      },
+
       // {
       //   path: 'search',
       //   name: '菜单搜索',
@@ -139,6 +120,53 @@ export default [
       },
     ],
   },
+  {
+    path: '/zhgd-work',
+    component: Layout,
+    redirect: '/zhgd-work/taskCope',
+    children: [
+      {
+        path: 'taskCope',
+        name: '工序接收',
+        meta: {
+          i18n: 'info',
+        },
+        component: () => import(/* webpackChunkName: "views" */ '@/views/zhgd-work/taskCope/index.vue'),
+      },
+
+    ],
+  },
+  {
+    path: '/workReport',
+    component: Layout,
+    redirect: '/workReport/index',
+    children: [
+      {
+        path: 'index',
+        component: () => import(/* webpackChunkName: "page" */ '@/views/zhgd-work/workReport/index.vue'),
+        name: '工序报工',
+        meta: {
+          i18n: 'info',
+        },
+      },
+    ],
+  },
+  {
+    path: '/workCheck',
+    component: Layout,
+    redirect: '/workCheck/index',
+    children: [
+      {
+        path: 'index',
+        component: () => import(/* webpackChunkName: "page" */ '@/views/zhgd-work/workCheck/index.vue'),
+        name: '工序检验',
+        meta: {
+          i18n: 'info',
+        },
+      },
+    ],
+  },
+
   {
     path: '/work/process/leave',
     component: Layout,
@@ -209,5 +237,5 @@ export default [
       }
     ]
   },
-  
+
 ];

src/views/processManagement/components/addinPlantMaintenanceDialog.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog title="新增" append-to-body :modelValue="openShow" width="80%" @close="closeDialog">
+  <el-dialog :title="title" append-to-body :modelValue="openShow" width="80%" @close="closeDialog">
     <div style="margin-bottom: 12px" v-if="moldAddMore">
       <el-button type="primary" @click="addTable">插入一行</el-button>
       <el-button type="danger" @click="delTable">删除选中行</el-button>
@@ -172,7 +172,7 @@
 <script>
 import { getWorkCenterList } from '@/api/processManagement/addQuantity.js';
 // import { submitBatchData } from '@/api/processManagement/periodical.js'; // 实际提交接口
-import { getEquipmentList, add } from '@/api/processManagement/specialProcess';
+import { getEquipmentList, add,update } from '@/api/processManagement/specialProcess';
 import { getRoleUserList } from '@/api/processManagement/taskDispatch';
 export default {
   props: {
@@ -180,13 +180,14 @@ export default {
     moldAddMore: { type: Boolean, default: false },
     tabPosition: { type: String, default: '' },
     itemData: { type: Array, default: () => [] },
+    title: { type: String, default: '' },
   },
   data() {
     return {
       loading: false,
       openShow: false,
       wcData: [],
-      userData:[],
+      userData: [],
       equipmentData: [],
       formError: '', // 全局错误提示
 
@@ -236,12 +237,12 @@ export default {
       console.log('this.itemData', this.itemData);
       this.form.tableData =
         this.itemData.length > 0 ? JSON.parse(JSON.stringify(this.itemData)) : [];
-      if(this.form.tableData.length > 0){
+      if (this.form.tableData.length > 0) {
         this.form.tableData.forEach(item => {
-          item.lastDueTime = item.lastDueTime+' 00:00:00'
-        })
+          item.lastDueTime = item.lastDueTime + ' 00:00:00';
+        });
       }
-      this.workCenterChange()
+      this.workCenterChange();
     }
   },
   methods: {
@@ -324,11 +325,19 @@ export default {
         // 调用接口提交（实际项目替换）
         try {
           console.log('提交数据：', submitData);
-          add(submitData).then(res => {
-            this.$message.success('操作成功');
-            this.loading = false;
-            this.closeDialog();
-          });
+          if (this.title == '新增') {
+            add(submitData).then(res => {
+              this.$message.success('操作成功');
+              this.loading = false;
+              this.closeDialog();
+            });
+          }else{
+            update(submitData[0]).then(res => {
+              this.$message.success('操作成功');
+              this.loading = false;
+              this.closeDialog();
+            });
+          }
         } catch (err) {
           this.loading = false;
           this.$message.error(err.message);

src/views/processManagement/components/inPlantMaintenance.vue

@@ -41,7 +41,7 @@
     ></basic-import>
 
     <!-- 新增 -->
-    <addinPlantMaintenanceDialog v-if="showAddDialog" :showDialog="showAddDialog"  :moldAddMore="moldAddMore" @closeDialog="closeAddDialog" :itemData="itemData"></addinPlantMaintenanceDialog>
+    <addinPlantMaintenanceDialog v-if="showAddDialog" :showDialog="showAddDialog"  :moldAddMore="moldAddMore" @closeDialog="closeAddDialog" :itemData="itemData" :title="title"></addinPlantMaintenanceDialog>
 
   </div>
 </template>
@@ -299,10 +299,12 @@ export default {
       query: {},
       loading: false,
       itemData:[],
+      title:'新增'
     };
   },
   methods: {
     handleEdit(row){
+      this.title = '修改'
       this.showAddDialog = true
       this.moldAddMore = false
       row.proMan=row.proMan.toString()
@@ -310,6 +312,7 @@ export default {
       this.itemData = [row]
     },
     handleAdd(){
+      this.title = '新增'
       this.showAddDialog = true
       this.moldAddMore = true
     },  

src/views/wel/components/quickAccess.vue

@@ -32,9 +32,9 @@ export default {
   data() {
     return {
       accessData: [
-        { name: '工序接收', url: 'plan', page: '/taskCope' },
-        { name: '工序报工', url: 'rule', page: '/workReport' },
-        { name: '工序检验', url: 'product',page:'/workCheck' },
+        { name: '工序接收', url: 'plan', page: '/zhgd-work/taskCope' },
+        { name: '工序报工', url: 'rule', page: '/workReport/index' },
+        { name: '工序检验', url: 'product',page:'/workCheck/index' },
         // { name: '工艺模板', url: 'craft' },
         // { name: '质量检验', url: 'quality' },
       ],