工单执行

pages/implement/components/sendCheck.vue

@@ -227,9 +227,10 @@ export default {
     },
     getCurrentUser(e) {
       if (e) {
-        let userInfo = this.$store.admin.user.info;
+        let userInfo = this.$store.state.admin.user.info;
+     
         this.user.cardno = userInfo.login_id
-        this.user.user_name =userInfo.userName
+        this.user.user_name =userInfo.name
         this.user.user_id = userInfo.userId
       } else {
         this.user.cardno = ''

pages/implement/components/usercard.vue

@@ -238,8 +238,8 @@ export default {
     },
     getCurrentUser(e) {
       if (e) {
-        let userInfo = this.$store.state.userInfo;
-       console.log(userInfo);
+        let userInfo = this.$store.state.admin.user.info;
+     
         this.user.cardno = userInfo.login_id
         this.user.user_name = userInfo.name
         this.user.user_id = userInfo.userId

pages/processManage/setProcess/components/orderMaterial.vue

@@ -410,6 +410,7 @@ export default {
         file_template: '',
         remarks: '',
         extend: '',
+        
         order_comb_id: 0,
         orderids: '',
         productingPreparationPeople:'',

pages/processManage/setProcess/index.vue

@@ -526,7 +526,7 @@ export default {
 
 
         {
-          title: '主工艺',
+          title: '工艺规程',
           key: 'mainRoutingID',
           width: 120,
           render: (h, params) => {
@@ -610,7 +610,7 @@ export default {
           key: 'materialbillID',
           width: 120,
           render: (h, params) => {
-            if (this.tabstatus == '1') {
+           if (params.row.mainRoutingID== 0) {
               h('div', '')
             } else {
               let id = params.row.id
@@ -1615,6 +1615,8 @@ export default {
       this.modalliao = true
       let ld = this.$refs.orderMaterial
 
+params.row.mainRoutingID
+
       if (
         params.row.materialbillStatus == 1 ||
         params.row.materialbillStatus == 2 ||