zjy 3 лет назад
Родитель
Сommit
f7d7518996

+ 8 - 4
src/views/system/jbdScan/goods/caigourukudan.vue

@@ -69,7 +69,7 @@
                         <th style="font-weight: normal">物料名称</th>
                         <th>货号</th>
                         <th>批号</th>
-                        <th>规格/特征量值</th>
+                        <th>规格/特征</th>
                         <th>生产商/品牌</th>
                         <th>数量</th>
                         <th>单位</th>
@@ -130,11 +130,15 @@
                   </table>
                 </div>
                 <div class="bottom">
-                  <div>仓管员/日期 :{{ item1.name2 }} /{{ item1.time2 }}</div>
+                  <div>仓管员:{{ item1.name2 }} 
+                    <!-- /{{ item1.time2 }} -->
+
+                  </div>
                   <div>
-                    审核人(部门负责人)/日期 :{{ item1.name3 }} /{{
+                    审核人:{{ item1.name3 }}
+                     <!-- /{{
                       item1.time3
-                    }}
+                    }} -->
                   </div>
                 </div>
               </div>

+ 7 - 4
src/views/system/jbdScan/goods/chnangguirukudan.vue

@@ -68,7 +68,7 @@
                         <th style="font-weight: normal">物料名称</th>
                         <th>货号</th>
                         <th>批号</th>
-                        <th>规格/特征量值</th>
+                        <th>规格/特征</th>
                         <th>生产商/品牌</th>
                         <th>数量</th>
                         <th>单位</th>
@@ -125,11 +125,14 @@
                   </table>
                 </div>
                 <div class="bottom">
-                  <div>仓管员/日期 :{{ item1.name2 }} /{{ item1.time2 }}</div>
+                  <div>仓管员:{{ item1.name2 }}
+                     <!-- /{{ item1.time2 }} -->
+                     </div>
                   <div>
-                    审核人(部门负责人)/日期 :{{ item1.name3 }} /{{
+                    审核人:{{ item1.name3 }} 
+                    <!-- /{{
                       item1.time3
-                    }}
+                    }} -->
                   </div>
                 </div>
               </div>

+ 21 - 20
src/views/system/jbdScan/goods/lingliaodan.vue

@@ -8,7 +8,7 @@
       :visible.sync="scanVisible"
     >
       <!-- 表单是否显示 -->
-      <div style="height: 500px; width: 95%; margin: 0 auto" >
+      <div style="height: 500px; width: 95%; margin: 0 auto">
         <div ref="qrcode" id="box">
           <vue-easy-print tableShow ref="easyPrint" :onePageRow="onePageRow">
             <div
@@ -57,12 +57,12 @@
                   <table border="1">
                     <thead>
                       <tr>
-                        <th style="width: 40px;line-height:22px;">序号</th>
+                        <th style="width: 40px; line-height: 22px">序号</th>
                         <th style="font-weight: normal">物料编码</th>
                         <th style="font-weight: normal">物料名称</th>
-                        <th>货号</th>
+                        <!-- <th>货号</th> -->
                         <th>批号</th>
-                        <th>规格/特征量值</th>
+                        <th>规格/特征</th>
                         <th>数量</th>
                         <th>单位</th>
                         <th>单价</th>
@@ -80,7 +80,7 @@
                         <td style="width: 120px">
                           {{ item.wu_liao_ming_chen }}
                         </td>
-                        <td style="width: 60px">{{ item.huo_hao_ }}</td>
+                        <!-- <td style="width: 60px">{{ item.huo_hao_ }}</td>  -->
                         <td style="width: 60px">{{ item.pi_hao_ }}</td>
                         <td style="width: 120px">
                           {{ item.gui_ge_xing_hao_ }}
@@ -108,16 +108,17 @@
                 </div>
                 <div class="bottom">
                   <div></div>
-                  <div style="float:left">
-                    领用人/日期:{{ item1.name1 }}/{{ item1.ling_liao_ri_qi_ }}
-                  </div>
-                  <div style="margin: 0 auto;">
-                    审核人(部门负责人)/日期 :{{ item1.name2 }} /{{
-                      item1.time2
-                    }}
+                  <div style="float: left">
+                    领用人/日期:
+                    <!-- {{ item1.name1 }}/{{ item1.ling_liao_ri_qi_ }} -->
                   </div>
+                  <!-- <div style="margin: 0 auto">
+                    审核人/日期 :
+                    {{ item1.name2 }} /{{item1.time2}}
+                  </div> -->
                   <div>
-                    发放人(仓库员)/日期 :{{ item1.name3 }}/{{ item1.time3 }}
+                    发放人/日期 :
+                    <!-- {{ item1.name3 }}/{{ item1.time3 }} -->
                   </div>
                 </div>
               </div>
@@ -137,7 +138,7 @@
 import VueBarcode from "vue-barcode";
 import vueEasyPrint from "vue-easy-print";
 import repostCurd from "@/business/platform/form/utils/custom/joinCURD.js";
-import { Loading } from 'element-ui';
+import { Loading } from "element-ui";
 import { toFixed } from "@/views/platform/form/formPrint/utils";
 
 export default {
@@ -187,7 +188,7 @@ export default {
       });
     },
   },
-    watch: {
+  watch: {
     obj() {
       this.getInit();
     },
@@ -238,7 +239,7 @@ export default {
     },
     getLook(id) {
       let this_ = this;
-      this.list=[];
+      this.list = [];
       let sql = `select * FROM t_crkjlb WHERE FIND_IN_SET(id_,'${id}')`;
       let zhubiao = [];
       let name1, name2, name3;
@@ -257,7 +258,7 @@ 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_;
@@ -270,7 +271,7 @@ export default {
                 data["name3"] = name3;
                 data["time3"] = time3;
                 data["ling_liao_chu_ku_"] = item.ling_liao_chu_ku_;
-                 data["id_"] = item.id_;
+                data["id_"] = item.id_;
                 data["ling_liao_bu_men_"] = item.ling_liao_bu_men_;
                 data["ling_liao_ri_qi_"] = item.ling_liao_ri_qi_;
                 data["gong_ying_shang_"] = item.gong_ying_shang_ || 0;
@@ -278,8 +279,8 @@ export default {
                   data["heji"] = this.addNumber(chushi, it.jin_e_);
                   chushi = data["heji"];
                 });
-                
-                 data["heji"] =this_.toDecimal2(data["heji"]);
+
+                data["heji"] = this_.toDecimal2(data["heji"]);
                 this_.list.push(data);
                 chushi = 0;
               });