zjy 3 jaren geleden
bovenliggende
commit
07e3de0951

+ 65 - 20
src/views/system/jbdScan/goods/caigourukudan.vue

@@ -17,16 +17,16 @@
               style="margin-bottom: 30px"
             >
               <div style="page-break-after: always">
-                <!-- <div class="tagBox">
-                  <div>供应商:{{item1[0].gong_ying_shang_}}</div>
-                  <div style="  margin-left: 20px;">采购订单编号{{item1[0].cai_gou_ding_dan_}}</div>
-                  <div style="  margin-left: 20px;">入库日期{{item1[0].dao_ku_ri_qi_}}</div>
-                </div> -->
                 <div class="word-title">
                   <h4>采购入库单</h4>
                 </div>
                 <div class="tagBox">
                   <div>
+                    <div style="font-size: 10px">
+                      申购部门:<span style="margin-left: 10px">{{
+                        item1[0].shen_gou_bu_men_ | bumenfilters(bumenList)
+                      }}</span>
+                    </div>
                     <div style="font-size: 10px">
                       供应商:<span style="margin-left: 10px">{{
                         item1[0].gong_ying_shang_
@@ -109,6 +109,23 @@
                           {{ item1[0].han_shui_he_ji_ }}
                         </td>
                       </tr>
+                      <tr>
+                        <td style="width: 30px"></td>
+                        <td style="width: 70px"></td>
+                        <td style="width: 120px"></td>
+                        <td style="width: 60px"></td>
+                        <td style="width: 60px"></td>
+                        <td style="width: 80px"></td>
+                        <td style="width: 120px"></td>
+                        <td style="width: 45px"></td>
+                        <td style="width: 45px"></td>
+                        <td style="width: 60px"></td>
+                        <td style="width: 45px"></td>
+                        <td style="width: 45px">合计:</td>
+                        <td style="width: 45px">{{ item1.addshuie }}</td>
+                        <td style="width: 45px">{{ item1.addjine }}</td>
+                        <td style="width: 60px">{{ item1.addhanshuiheji }}</td>
+                      </tr>
                     </tbody>
                     <tfoot
                       align="right"
@@ -183,6 +200,7 @@ export default {
       list: [],
       visible: true,
       gongyingshangList: [],
+      bumenList: [],
     };
   },
   created() {
@@ -191,19 +209,35 @@ export default {
     repostCurd("sql", sql).then((res) => {
       return (this.gongyingshangList = res.variables.data);
     });
+    let sql1 = `select ID_,NAME_ FROM  ibps_party_org `;
+    repostCurd("sql", sql1).then((res) => {
+      return (this.bumenList = res.variables.data);
+    });
   },
   filters: {
     gongyingshang: function (value, list) {
-      if (!isNaN(value)) {
-        for (let i = 0; i < list.length; i++) {
-          if (value == list[i].id_) {
-            return list[i].gong_ying_shang_m;
-          }
+      for (let i = 0; i < list.length; i++) {
+        if (value == list[i].id_) {
+          return list[i].gong_ying_shang_m;
+        } else if (i == list.length - 1) {
+          return value;
         }
-      } else {
-        return value;
       }
     },
+    bumenfilters: function (value, list) {
+      for (let i = 0; i < list.length; i++) {
+        if (value == list[i].ID_) {
+          return list[i].NAME_;
+        } else if (i == list.length - 1) {
+          return value;
+        }
+      }
+    },
+  },
+  watch: {
+    obj() {
+      this.getInit();
+    },
   },
   methods: {
     printDemo() {
@@ -247,20 +281,18 @@ export default {
       return s;
     },
     getInit() {
-      // console.log(this.obj)
       // var idStr = "";
       // this.obj.forEach((item) => {
       //   idStr += item + ",";
       // });
       // idStr = idStr.substring(0, idStr.length - 1);
-
       this.getLook(this.obj);
     },
     getLook(id) {
+      this.list = [];
       let this_ = this;
       let name1, name2, name3;
       let time1, time2, time3;
-      let chushi = 0;
       id.forEach((item) => {
         let sql = `select * FROM t_wljsysjlb WHERE id_='${item}'`;
         repostCurd("sql", sql).then((res) => {
@@ -272,6 +304,9 @@ export default {
             time2 = res.variables.data[0].CREATE_TIME_ || 0;
             data["name2"] = name2;
             data["time2"] = time2;
+            let addhanshuiheji = 0;
+            let addjine = 0;
+            let addshuie = 0;
             // let s3 = `select NAME_,CREATE_TIME_ FROM ibps_party_employee where id_ =(select CREATE_BY_ FROM ibps_bpm_oper_log WHERE PROC_INST_ID_ = (SELECT PROC_INST_ID_ FROM ibps_bpm_bus_rel WHERE BUSINESSKEY_ = '${item}' )AND NODE_ID_ = 'Activity_04ff3k5' ORDER BY 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}') AND b.NODE_ID_ = 'Activity_04ff3k5' ORDER BY b.CREATE_TIME_ DESC LIMIT 1`;
             repostCurd("sql", s3).then((res) => {
@@ -280,13 +315,23 @@ export default {
               data["name3"] = name3;
               data["time3"] = time3;
               data.forEach((it) => {
-                data["heji"] = this.addNumber(chushi, it.jin_e_);
-                chushi = data["heji"];
+                data["addhanshuiheji"] = this.addNumber(
+                  addhanshuiheji,
+                  it.han_shui_he_ji_
+                );
+                data["addjine"] = this.addNumber(addjine, it.jin_e_);
+                data["addshuie"] = this.addNumber(addshuie, it.shui_e_);
+                addhanshuiheji = data["addhanshuiheji"];
+                addjine = data["addjine"];
+                addshuie = data["addshuie"];
               });
-
-              data["heji"] = this_.toDecimal2(data["heji"]);
+              data["addhanshuiheji"] = this_.toDecimal2(data["addhanshuiheji"]);
+              data["addjine"] = this_.toDecimal2(data["addjine"]);
+              data["addshuie"] = this_.toDecimal2(data["addshuie"]);
               this_.list.push(data);
-              chushi = 0;
+              addhanshuiheji = 0;
+              addjine = 0;
+              addshuie = 0;
               console.log(this_.list);
             });
           });

+ 70 - 29
src/views/system/jbdScan/goods/chnangguirukudan.vue

@@ -22,6 +22,11 @@
                 </div>
                 <div class="tagBox">
                   <div>
+                    <div style="font-size: 10px">
+                      申购部门:<span style="margin-left: 10px">{{
+                        item1.shen_gou_bu_men_|bumenfilters(bumenList)
+                      }}</span>
+                    </div>
                     <div style="font-size: 10px">
                       供应商:<span style="margin-left: 10px">{{
                         item1.gong_ying_shang_
@@ -99,18 +104,24 @@
                         <td style="width: 45px">{{ item.jin_e_ }}</td>
                         <td style="width: 60px">{{ item.han_shui_he_ji_ }}</td>
                       </tr>
-                    </tbody>
-                    <tfoot
-                      align="right"
-                      valign="bottom"
-                      style="text-align: right !important; height: 30px"
-                    >
                       <tr>
-                        <td colspan="15" style="text-align: right !important">
-                          合计:{{ item1.heji }}
-                        </td>
+                        <td style="width: 30px"></td>
+                        <td style="width: 70px"></td>
+                        <td style="width: 120px"></td>
+                        <td style="width: 60px"></td>
+                        <td style="width: 60px"></td>
+                        <td style="width: 80px"></td>
+                        <td style="width: 120px"></td>
+                        <td style="width: 45px"></td>
+                        <td style="width: 45px"></td>
+                        <td style="width: 60px"></td>
+                        <td style="width: 45px"></td>
+                        <td style="width: 45px">合计:</td>
+                        <td style="width: 45px">{{ item1.addshuie }}</td>
+                        <td style="width: 45px">{{ item1.addjine }}</td>
+                        <td style="width: 60px">{{ item1.addhanshuiheji }}</td>
                       </tr>
-                    </tfoot>
+                    </tbody>
                   </table>
                 </div>
                 <div class="bottom">
@@ -174,6 +185,7 @@ export default {
       list: [],
       visible: true,
       gongyingshangList: [],
+      bumenList: [],
     };
   },
   created() {
@@ -182,22 +194,38 @@ export default {
     repostCurd("sql", sql).then((res) => {
       this.gongyingshangList = res.variables.data;
     });
+    let sql1 = `select ID_,NAME_ FROM  ibps_party_org `;
+    repostCurd("sql", sql1).then((res) => {
+      return (this.bumenList = res.variables.data);
+    });
   },
   filters: {
     gongyingshang: function (value, list) {
-      console.log(value);
-      if (!isNaN(value)) {
-        for (let i = 0; i < list.length; i++) {
-          console.log(value == list[i].id_);
-          if (value == list[i].id_) {
-            return list[i].gong_ying_shang_m;
-          }
+      for (let i = 0; i < list.length; i++) {
+        if (value == list[i].id_) {
+          return list[i].gong_ying_shang_m;
+        } else if (i == list.length - 1) {
+          return value;
+        }
+      }
+    },
+    bumenfilters: function (value, list) {
+      // debugger
+      for (let i = 0; i < list.length; i++) {
+        if (value == list[i].ID_) {
+          return list[i].NAME_;
+        } else if (i == list.length - 1) {
+          return value;
         }
-      } else {
-        return value;
       }
     },
   },
+
+  watch: {
+    obj() {
+      this.getInit();
+    },
+  },
   methods: {
     printDemo() {
       this.$refs.easyPrint.print();
@@ -234,13 +262,15 @@ export default {
       this.getLook(idStr);
     },
     getLook(id) {
+      this.list = [];
       let this_ = this;
-      console.log(id);
       let sql = `select * FROM t_yszb WHERE FIND_IN_SET(id_,'${id}')`;
       let zhubiao = [];
       let name1, name2, name3;
       let time1, time2, time3;
-      let chushi = 0;
+      let addhanshuiheji = 0;
+      let addjine = 0;
+      let addshuie = 0;
       repostCurd("sql", sql).then((res) => {
         zhubiao = res.variables.data;
         zhubiao.forEach((item) => {
@@ -249,30 +279,41 @@ export default {
             let data = res.variables.data;
             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_04lhxla' ORDER BY b.CREATE_TIME_ DESC LIMIT 1`;
             repostCurd("sql", s2).then((res) => {
-              console.log(res.variables.data);
               name2 = res.variables.data[0].NAME_;
               time2 = res.variables.data[0].CREATE_TIME_;
-              console.log(name2, "name2");
               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_1dk76gy' ORDER BY b.CREATE_TIME_ DESC LIMIT 1`;
-              console.log(s3);
               repostCurd("sql", s3).then((res) => {
                 name3 = res.variables.data[0].NAME_;
                 time3 = res.variables.data[0].CREATE_TIME_;
                 data["name3"] = name3;
                 data["time3"] = time3;
                 data["gong_ying_shang_"] = item.gong_ying_shang_;
+                data["shen_gou_bu_men_"] = item.shen_gou_bu_men_;
                 data["cai_gou_ding_dan_"] = item.cai_gou_ding_dan_;
                 data["dao_huo_ri_qi_"] = item.dao_huo_ri_qi_;
                 data.forEach((it) => {
-                  data["heji"] = this.addNumber(chushi, it.jin_e_);
-                  chushi = data["heji"];
+                  data["addhanshuiheji"] = this.addNumber(
+                    addhanshuiheji,
+                    it.han_shui_he_ji_
+                  );
+                  data["addjine"] = this.addNumber(addjine, it.jin_e_);
+                  data["addshuie"] = this.addNumber(addshuie, it.shui_e_);
+                  addhanshuiheji = data["addhanshuiheji"];
+                  addjine = data["addjine"];
+                  addshuie = data["addshuie"];
                 });
-                data["heji"] =this_.toDecimal2(data["heji"]);
+                data["addhanshuiheji"] = this_.toDecimal2(
+                  data["addhanshuiheji"]
+                );
+                data["addjine"] = this_.toDecimal2(data["addjine"]);
+                data["addshuie"] = this_.toDecimal2(data["addshuie"]);
                 this_.list.push(data);
-                chushi = 0;
-                console.log(this_.list, 1111111111);
+                addhanshuiheji = 0;
+                addjine = 0;
+                addshuie = 0;
+                console.log(this_.list);
               });
             });
           });

+ 1 - 0
src/views/system/jbdScan/goods/fenzhuangtag.vue

@@ -203,6 +203,7 @@ export default {
     },
     getLook(id) {
       let this_ = this;
+      this.list = [];
       let sql = `select * FROM t_fzwlmx  WHERE FIND_IN_SET(parent_id_,'${id}')`;
 
       repostCurd("sql", sql).then((res) => {

+ 1 - 0
src/views/system/jbdScan/goods/jishutag.vue

@@ -194,6 +194,7 @@ export default {
     },
     getLook(id) {
       let this_ = this;
+      this.list=[];
       let sql = `select * FROM t_wljsysjlb  WHERE FIND_IN_SET(id_,'${id}')`;
       repostCurd("sql", sql).then((res) => {
         this_.list = res.variables.data;

+ 6 - 2
src/views/system/jbdScan/goods/lingliaodan.vue

@@ -186,6 +186,11 @@ export default {
         return res.variables.data[0].NAME_;
       });
     },
+  },
+    watch: {
+    obj() {
+      this.getInit();
+    },
   },
   methods: {
     printDemo() {
@@ -198,7 +203,6 @@ export default {
         idStr += item + ",";
       });
       idStr = idStr.substring(0, idStr.length - 1);
-
       this.getLook(idStr);
     },
     addNumber(num1, num2) {
@@ -234,6 +238,7 @@ export default {
     },
     getLook(id) {
       let this_ = this;
+      this.list=[];
       let sql = `select * FROM t_crkjlb WHERE FIND_IN_SET(id_,'${id}')`;
       let zhubiao = [];
       let name1, name2, name3;
@@ -277,7 +282,6 @@ export default {
                  data["heji"] =this_.toDecimal2(data["heji"]);
                 this_.list.push(data);
                 chushi = 0;
-                console.log(this_.list)
               });
             });
           });

+ 1 - 0
src/views/system/jbdScan/goods/tag.vue

@@ -207,6 +207,7 @@ export default {
     },
     getLook(id) {
       let this_ = this;
+      this.list=[];
       let sql = `select * FROM t_cgysjlb  WHERE FIND_IN_SET(wai_jian_,'${id}')`;
 
       repostCurd("sql", sql).then((res) => {