Merge branch 'master' of http://119.23.210.103:3000/wy/mj_firm_former

src/views/system/jbdScan/goods/fenzhuangtag.vue

@@ -2,7 +2,7 @@
   <div class="bg">
     <el-dialog
       width="21cm"
-      height="10cm"
+      height="12cm"
       :modal-append-to-body="false"
       title="物料标签"
       :visible.sync="scanVisible"
@@ -15,7 +15,6 @@
               v-for="(item1, index1) in list"
               :key="index1"
               class="box-content"
-              
             >
               <div
                 v-for="(item2, index2) in parseInt(item1.shu_liang_)"
@@ -39,7 +38,7 @@
                       "
                     >
                       <span> 物料名称：</span>
-                      <p style="width: 230px; margin: 0px">
+                      <p style="width: 180px; margin: 0px">
                         {{ item1.fen_zhuang_wu_lia }}
                       </p>
                       <!-- 物料名称：{{ item1.fen_zhuang_wu_lia }}{{ index2 }} -->
@@ -63,11 +62,11 @@
                   <div class="la">
                     <div style="display: flex">
                       <div class="lh">
-                        <div>货号：</div>
+                        <div>货号:</div>
                         <div>{{ item1.huo_hao_ }}</div>
                       </div>
                       <div class="lh" style="margin-left: 2px">
-                        <div>批号：</div>
+                        <div>批号:</div>
                         <div>{{ item1.fen_zhuang_pi_hao }}</div>
                       </div>
                     </div>
@@ -75,11 +74,15 @@
                   <div class="la">
                     <div style="display: flex">
                       <div class="lh">
-                        <div>分装日期：</div>
+                        <div>入库时间:</div>
                         <div>
                           {{ item1.parent_id_ | timesfiltes(listtimes) }}
                         </div>
                       </div>
+                    </div>
+                  </div>
+                  <div class="la">
+                    <div style="display: flex">
                       <div class="lh" style="margin-left: 2px">
                         <div>有效期:</div>
                         <div>{{ item1.you_xiao_qi_zhi_ }}</div>
@@ -169,9 +172,7 @@ export default {
   filters: {
     timesfiltes: function (value, arr) {
       for (let i = 0; i < arr.length; i++) {
-        console.log(arr[i].id_ == value);
         if (arr[i].id_ == value) {
-          console.log(arr[i].fen_zhuang_ri_qi_);
           return arr[i].fen_zhuang_ri_qi_;
         }
       }
@@ -180,10 +181,11 @@ export default {
   created() {
     this.getInit();
   },
-  // destroyed() {
-  //       window.location.reload()
-  //       document.body.innerHTML = oldContent
-  // },
+  watch: {
+    obj() {
+      this.getInit();
+    },
+  },
   methods: {
     printDemo() {
       this.$refs.easyPrint.print();
@@ -191,7 +193,6 @@ export default {
       // this.$refs.easyPrint.window.print()
     },
     getInit() {
-      // console.log(this.obj)
       var idStr = "";
       this.obj.forEach((item) => {
         idStr += item + ",";
@@ -205,14 +206,11 @@ export default {
       let sql = `select * FROM t_fzwlmx  WHERE FIND_IN_SET(parent_id_,'${id}')`;
 
       repostCurd("sql", sql).then((res) => {
-        console.log(sql, "sql");
         this_.list = res.variables.data;
-        console.log(this_.list);
       });
       let sql1 = `select * FROM t_fzwlrkd WHERE FIND_IN_SET(id_,'${id}')`;
       repostCurd("sql", sql1).then((res) => {
         this_.listtimes = res.variables.data;
-        console.log(this_.listtimes);
       });
     },
   },

src/views/system/jbdScan/goods/jishutag.vue

@@ -2,7 +2,7 @@
   <div class="bg">
     <el-dialog
       width="21cm"
-      height="10cm"
+      height="12cm"
       :modal-append-to-body="false"
       title="物料标签"
       :visible.sync="scanVisible"
@@ -40,7 +40,7 @@
                       "
                     >
                       <span> 物料名称：</span>
-                      <p style="width: 150px; margin: 0px">
+                      <p style="width: 180px; margin: 0px">
                         {{ item1.wu_liao_ming_chen }}
                       </p>
                     </div>
@@ -60,11 +60,11 @@
                   <div class="la">
                     <div style="display: flex">
                       <div class="lh" style="display: flex">
-                        <div>货号：</div>
+                        <div>货号:</div>
                         <div>{{ item1.huo_hao_ }}</div>
                       </div>
-                      <div class="lh" style="display: flex;margin-left:2px;">
-                        <div>批号：</div>
+                      <div class="lh" style="display: flex; margin-left: 2px">
+                        <div>批号:</div>
                         <div>{{ item1.pi_hao_ }}</div>
                       </div>
                     </div>
@@ -73,12 +73,16 @@
                   <div class="la">
                     <div style="display: flex">
                       <div class="lh">
-                        <div>到库日期：</div>
+                        <div>入库时间:</div>
                         <div>
                           {{ item1.dao_ku_ri_qi_ }}
                         </div>
                       </div>
-                      <div class="lh" style="margin-left:2px;">
+                    </div>
+                  </div>
+                  <div class="la">
+                    <div style="display: flex">
+                      <div class="lh" style="margin-left: 2px">
                         <div>有效期:</div>
                         <div>{{ item1.you_xiao_qi_ }}</div>
                       </div>
@@ -169,13 +173,17 @@ export default {
   created() {
     this.getInit();
   },
+  watch: {
+    obj() {
+      this.getInit();
+    },
+  },
   methods: {
     printDemo() {
       this.$refs.easyPrint.print();
       // this.$refs.easyPrint.window.print()
     },
     getInit() {
-      // console.log(this.obj)
       var idStr = "";
       this.obj.forEach((item) => {
         idStr += item + ",";
@@ -188,9 +196,7 @@ export default {
       let this_ = this;
       let sql = `select * FROM t_wljsysjlb  WHERE FIND_IN_SET(id_,'${id}')`;
       repostCurd("sql", sql).then((res) => {
-        console.log(sql, "sql");
         this_.list = res.variables.data;
-        console.log(this_.list);
       });
     },
   },
@@ -208,11 +214,6 @@ export default {
   top: -32px;
   left: 0;
 }
-.box-content {
-  // display: flex;
-  // float: left;
-  // flex-wrap: wrap;
-}
 .content {
   display: flex;
   justify-content: flex-start;

src/views/system/jbdScan/goods/tag.vue

@@ -2,7 +2,7 @@
   <div class="bg">
     <el-dialog
       width="21cm"
-      height="10cm"
+      height="12cm"
       :modal-append-to-body="false"
       title="物料标签"
       :visible.sync="scanVisible"
@@ -43,7 +43,7 @@
                       "
                     >
                       <span> 物料名称：</span>
-                      <p style="width: 150px; margin: 0px">
+                      <p style="width: 180px; margin: 0px">
                         {{ item1.wu_liao_ming_chen }}
                       </p>
                     </div>
@@ -62,11 +62,11 @@
                   </div>
                   <div class="la">
                     <div style="display: flex">
-                      <div class="lh" style="display: flex;">
+                      <div class="lh" style="display: flex">
                         <div>货号:</div>
                         <div>{{ item1.huo_hao_ }}</div>
                       </div>
-                      <div class="lh" style="display: flex;margin-left:1px;">
+                      <div class="lh" style="display: flex; margin-left: 1px">
                         <div>批号:</div>
                         <div>{{ item1.pi_hao_ }}</div>
                       </div>
@@ -80,7 +80,11 @@
                           {{ item1.wai_jian_ | timesfiltes(listtimes) }}
                         </div>
                       </div>
-                      <div class="lh" style="margin-left:1px;">
+                    </div>
+                  </div>
+                  <div class="la">
+                    <div style="display: flex">
+                      <div class="lh" style="margin-left: 1px">
                         <div>有效期:</div>
                         <div>{{ item1.you_xiao_qi_ }}</div>
                       </div>
@@ -100,10 +104,12 @@
                   </div>
 
                   <div
-                    style="page-break-after: always; display: block !important;height: 40px"
-                  >
-                    
-                  </div>
+                    style="
+                      page-break-after: always;
+                      display: block !important;
+                      height: 40px;
+                    "
+                  ></div>
                 </div>
               </div>
             </div>
@@ -166,23 +172,20 @@ export default {
   filters: {
     timesfiltes: function (value, arr) {
       for (let i = 0; i < arr.length; i++) {
-        // console.log(arr[i].id_==value)
         if (arr[i].id_ == value) {
-          console.log(arr[i].yan_shou_ru_ku_ri);
           return arr[i].yan_shou_ru_ku_ri;
         }
       }
     },
-    fenyefiltes: function (fenye, index) {
-      console.log(fenye);
-    },
-  },
-  update() {
-    console.log("数据变动");
   },
   created() {
     this.getInit();
   },
+  watch: {
+    obj() {
+      this.getInit();
+    },
+  },
   // destroyed() {
   //       window.location.reload()
   //       document.body.innerHTML = oldContent
@@ -194,7 +197,6 @@ export default {
       // this.$refs.easyPrint.window.print()
     },
     getInit() {
-      // console.log(this.obj)
       var idStr = "";
       this.obj.forEach((item) => {
         idStr += item + ",";
@@ -208,14 +210,11 @@ export default {
       let sql = `select * FROM t_cgysjlb  WHERE FIND_IN_SET(wai_jian_,'${id}')`;
 
       repostCurd("sql", sql).then((res) => {
-        console.log(sql, "sql");
         this_.list = res.variables.data;
-        console.log(this_.list);
       });
       let sql1 = `select id_,yan_shou_ru_ku_ri FROM t_yszb  WHERE FIND_IN_SET(id_,'${id}')`;
       repostCurd("sql", sql1).then((res) => {
         this_.listtimes = res.variables.data;
-        console.log(this_.listtimes);
       });
     },
   },