zjy 3 rokov pred
rodič
commit
ffe88a6e56

+ 5 - 5
src/views/system/jbdScan/goods/lingliaodan.vue

@@ -47,7 +47,7 @@
                         font-size: 10px;
                       "
                     >
-                      领料日期:<span style="margin-left: 10px">{{
+                      领 料 日 期:<span style="margin-left: 10px">{{
                         item1.ling_liao_ri_qi_
                       }}</span>
                     </div>
@@ -57,7 +57,7 @@
                   <table border="1">
                     <thead>
                       <tr>
-                        <th style="width: 40px">序号</th>
+                        <th style="width: 40px;line-height:22px;">序号</th>
                         <th style="font-weight: normal">物料编码</th>
                         <th style="font-weight: normal">物料名称</th>
                         <th>货号</th>
@@ -90,7 +90,7 @@
                         <td style="width: 60px">{{ item.dan_jia_ }}</td>
                         <td style="width: 60px">{{ item.jin_e_ }}</td>
                         <td style="width: 80px">{{ item.yong_tu_ }}</td>
-                        <td style="width: 120px">{{ item.beizhu }}</td>
+                        <td style="width: 120px">{{ item.bei_zhu_ }}</td>
                       </tr>
                     </tbody>
                     <tfoot
@@ -236,13 +236,13 @@ export default {
                 data["name1"] = name1;
               });
             }
-            let s2 = `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_}') AND b.NODE_ID_ = 'Activity_0t9dfi3' ORDER BY b.CREATE_TIME_ DESC LIMIT 1`
+            let s2 = `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_}') AND b.NODE_ID_ = 'Activity_0t9dfi3' ORDER BY b.CREATE_TIME_ DESC LIMIT 1`
             repostCurd("sql", s2).then((res) => {
               name2 = res.variables.data[0].NAME_;
               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_}') AND b.NODE_ID_ = 'Activity_0dbdxg7' ORDER BY b.CREATE_TIME_ DESC LIMIT 1`;
+              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_}') AND b.NODE_ID_ = 'Activity_0dbdxg7' ORDER BY b.CREATE_TIME_ DESC LIMIT 1`;
               repostCurd("sql", s3).then((res) => {
                 name3 = res.variables.data[0].NAME_;
                 time3 = res.variables.data[0].CREATE_TIME_;