工单执行

i18n/locale/zh-CN.js

@@ -1051,7 +1051,53 @@ export default {
         routing_header_id: '',
         comb_param: '',
         rule_qty: '',
+        taskSeq: '工序号',
+        efficiencyValue: '效率系数',
+        calId: '连班策略',
+        overTime: '六日加班',
+        isDiscrete: '是否离散',
+        multipleEquip: "是否多台安排设备",// 否  是
+        multipleEquipIds: "设备id", //用英文逗号分隔
+        discrete: '离散值',
     },
+    routing_header:{
+        id:'',
+        creationTime:'',
+        creatorUserId:'',
+        lastModificationTime:'',
+        lastModifierUserId:'',
+        deleterUserId:'',
+        deletionTime:'',
+        classId:'类id',
+        unicode:'unicode',
+        name:'工艺名称',
+        code:'工艺编号',
+        productId:'产品id',
+        productName:'产品名称',
+        productCode:'产品图号',
+        version:'工艺文件版本',
+        author:'编制人',
+        departmentId:'',
+        isMain:'',
+        upId:'',
+        upDetailId:'',
+        routingType:'工艺类型',
+        status:'',
+        approvalStatus:'状态',
+        remark:'工艺说明',
+        roufile:'多媒体附件',
+        approvalStatusRemark:'',
+        auditUserId1:'审核人',
+        auditUserId2:'审批人',
+        isDeleted:'',
+        platesnum:'',
+        isEffect:'',
+        developmentMode:'研制方式',
+        changeOrderCode:'更改单编号',
+        changeOrderDate:'更改单日期',
+        changeMethod:'更改办法',
+        taskType:'任务类型',
+             },
     routing_detail: {
         id: '',
         creationTime: '创建时间',

pages/implement/components/productReport.vue

@@ -482,10 +482,11 @@ export default {
                 
 
       let datalist = []
+        let userInfo =this.$store.state.admin.user.info;
       for (let i = 0; i < this.data1.length; i++) {
         let obj = this.data1[i]
         if (obj.productstatus1 == 0 && obj.productstatus != 0) {
-          obj.report_user_name = localStorage.getItem('userName')
+          obj.report_user_name =userInfo.name
           datalist.push(obj)
         }
       }

pages/implement/components/sendCheck.vue

@@ -227,9 +227,9 @@ 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