Ver Fonte

fix:流程节点打印出库单

zhangjingyuan há 3 anos atrás
pai
commit
696e8472b5

+ 12 - 2
src/views/system/jbdScan/wuliao/bwlingliaodan.vue

@@ -239,6 +239,16 @@ export default {
       }
       return s;
     },
+    timestampToTime(times) {
+      let time = times[1]
+      let mdy = times[0]
+      mdy = mdy.split('/')
+      let month = parseInt(mdy[0]);
+      let day = parseInt(mdy[1]);
+      let year = parseInt(mdy[2])
+      return year + '-' + month + '-' + day 
+    },
+
     getLook(id) {
       let this_ = this;
       this.list = [];
@@ -266,11 +276,11 @@ export default {
               time2 = res.variables.data[0].CREATE_TIME_;
               data["name2"] = name2;
               data["time2"] = time2;
-              let s3 = `select a.NAME_,DATE_FORMAT(b.CREATE_TIME_,'%Y-%m-%d') AS CREATE_TIME_ FROM ibps_party_employee  as a join ibps_bpm_oper_log as b on a.ID_ = b.CREATE_BY_ where b.PROC_INST_ID_ = ( SELECT  PROC_INST_ID_  FROM ibps_bpm_bus_rel WHERE BUSINESSKEY_ = '${item.id_}' LIMIT 1) AND b.NODE_ID_ = 'Activity_1ydalp9' ORDER BY b.CREATE_TIME_ DESC LIMIT 1`;
+              let s3 = `select NAME_ FROM  	ibps_party_employee WHERE ID_ =(SELECT USER_ID_ FROM  ibps_party_user_role WHERE ROLE_ID_ =(SELECT id_ FROM 	ibps_party_role WHERE NAME_ ='仓库管理员' LIMIT 1))`;
               repostCurd("sql", s3).then((res) => {
                 if(res.variables.data.length > 0){
                   name3 = res.variables.data[0].NAME_;
-                  time3 = res.variables.data[0].CREATE_TIME_;                  
+                  time3 = this_.timestampToTime(new Date().toLocaleString('en-US',{hour12: false}).split(" "))                   
                 }
                 data["name3"] = name3;
                 data["time3"] = time3;

+ 11 - 2
src/views/system/jbdScan/wuliao/lingliaodan.vue

@@ -247,6 +247,15 @@ export default {
       }
       return s;
     },
+    timestampToTime(times) {
+      let time = times[1]
+      let mdy = times[0]
+      mdy = mdy.split('/')
+      let month = parseInt(mdy[0]);
+      let day = parseInt(mdy[1]);
+      let year = parseInt(mdy[2])
+      return year + '-' + month + '-' + day 
+    },
     getLook(id) {
       let this_ = this;
       this.list = [];
@@ -275,12 +284,12 @@ export default {
               time2 = res.variables.data[0].CREATE_TIME_;
               data["name2"] = name2;
               data["time2"] = time2;
-              let s3 = `select a.NAME_,DATE_FORMAT(b.CREATE_TIME_,'%Y-%m-%d') AS CREATE_TIME_ FROM ibps_party_employee  as a join ibps_bpm_oper_log as b on a.ID_ = b.CREATE_BY_ where b.PROC_INST_ID_ = ( SELECT  PROC_INST_ID_  FROM ibps_bpm_bus_rel WHERE BUSINESSKEY_ = '${item.id_}' LIMIT 1) AND b.NODE_ID_ = 'Activity_0dbdxg7' ORDER BY b.CREATE_TIME_ DESC LIMIT 1`;
+              let s3 = `select NAME_ FROM  	ibps_party_employee WHERE ID_ =(SELECT USER_ID_ FROM  ibps_party_user_role WHERE ROLE_ID_ =(SELECT id_ FROM 	ibps_party_role WHERE NAME_ ='仓库管理员' LIMIT 1))`;
               repostCurd("sql", s3).then((res) => {
 
                 if(res.variables.data.length >0){
                   name3 = res.variables.data[0].NAME_;
-                  time3 = res.variables.data[0].CREATE_TIME_;                  
+                  time3 = this_.timestampToTime(new Date().toLocaleString('en-US',{hour12: false}).split(" "))                   
                 }
 
                 data["name3"] = name3;