修改扫码

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

@@ -149,10 +149,10 @@ export default {
     },
     getLook(id) {
       let sql = `select * from t_sbdj where find_in_set(id_,'${id}')`
-      console.log(sql)
+      // console.log(sql)
       repostCurd("sql", sql).then(res => {
           const data = res.variables.data
-          console.log(data)
+          // console.log(data)
           let list = []
           data.forEach(item => {
             let num = 1

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

@@ -139,8 +139,8 @@ export default {
     },
     getLook(id) {
       // console.log(id)
-      // let sql = `select * from t_lhypb where find_in_set(parent_id_,'${id}')`
-      let sql = `select * from t_lhypdjb where find_in_set(id_,'${id}')`
+      let sql = `select * from t_lhypb where find_in_set(id_,'${id}')`
+      // let sql = `select * from t_lhypdjb where find_in_set(id_,'${id}')`
       // console.log(sql)
       repostCurd("sql", sql).then(res => {
         if (res.state === 200) {
@@ -148,56 +148,56 @@ export default {
           // console.log(data)
           let list = []
           data.forEach(item => {
-            if (item.yang_ben_lei_xing != '' && parseInt(item.yang_pin_shu_lian) > 0) {
+          //   if (item.yang_ben_lei_xing != '' && parseInt(item.yang_pin_shu_lian) > 0) {
+          //     let o = {
+          //       name: item.yang_ben_ming_che,
+          //       serial: item.yang_ben_bian_hao,
+          //       type: item.yang_ben_lei_xing,
+          //       num: item.yang_pin_shu_lian,
+          //       condition: item.yun_shu_tiao_jian
+          //     }
+          //     list.push(o)
+          //   }
+            if (item.yang_pin_lei_xing != '' && parseInt(item.shu_liang_) > 0) {
               let o = {
-                name: item.yang_ben_ming_che,
-                serial: item.yang_ben_bian_hao,
-                type: item.yang_ben_lei_xing,
-                num: item.yang_pin_shu_lian,
-                condition: item.yun_shu_tiao_jian
+                name: item.yang_pin_ming_che,
+                serial: item.yang_pin_bian_hao,
+                type: item.yang_pin_lei_xing,
+                num: item.shu_liang_,
+                condition: item.yang_ben_yun_shu_
+              }
+              list.push(o)
+            }
+            if (item.yang_pin_lei_er_ != '' && parseInt(item.shu_liang_er_) > 0) {
+              let o = {
+                name: item.yang_pin_ming_che,
+                serial: item.yang_pin_bian_hao,
+                type: item.yang_pin_lei_er_,
+                num: item.shu_liang_er_,
+                condition: item.yang_pin_yun_shu_
+              }
+              list.push(o)
+            }
+            if (item.yang_pin_lei_san_ != '' && parseInt(item.shu_liang_san_) > 0) {
+              let o = {
+                name: item.yang_pin_ming_che,
+                serial: item.yang_pin_bian_hao,
+                type: item.yang_pin_lei_san_,
+                num: item.shu_liang_san_,
+                condition: item.yang_pin_yun_san
+              }
+              list.push(o)
+            }
+            if (item.yang_pin_lei_si_ != '' && parseInt(item.shu_liang_si_) > 0) {
+              let o = {
+                name: item.yang_pin_ming_che,
+                serial: item.yang_pin_bian_hao,
+                type: item.yang_pin_lei_si_,
+                num: item.shu_liang_si_,
+                condition: item.yang_pin_yun_si_
               }
               list.push(o)
             }
-            // if (item.yang_pin_lei_xing != '' && parseInt(item.shu_liang_) > 0) {
-            //   let o = {
-            //     name: item.yang_pin_ming_che,
-            //     serial: item.yang_pin_bian_hao,
-            //     type: item.yang_pin_lei_xing,
-            //     num: item.shu_liang_,
-            //     condition: item.yang_ben_yun_shu_
-            //   }
-            //   list.push(o)
-            // }
-            // if (item.yang_pin_lei_er_ != '' && parseInt(item.shu_liang_er_) > 0) {
-            //   let o = {
-            //     name: item.yang_pin_ming_che,
-            //     serial: item.yang_pin_bian_hao,
-            //     type: item.yang_pin_lei_er_,
-            //     num: item.shu_liang_er_,
-            //     condition: item.yang_pin_yun_shu_
-            //   }
-            //   list.push(o)
-            // }
-            // if (item.yang_pin_lei_san_ != '' && parseInt(item.shu_liang_san_) > 0) {
-            //   let o = {
-            //     name: item.yang_pin_ming_che,
-            //     serial: item.yang_pin_bian_hao,
-            //     type: item.yang_pin_lei_san_,
-            //     num: item.shu_liang_san_,
-            //     condition: item.yang_pin_yun_san
-            //   }
-            //   list.push(o)
-            // }
-            // if (item.yang_pin_lei_si_ != '' && parseInt(item.shu_liang_si_) > 0) {
-            //   let o = {
-            //     name: item.yang_pin_ming_che,
-            //     serial: item.yang_pin_bian_hao,
-            //     type: item.yang_pin_lei_si_,
-            //     num: item.shu_liang_si_,
-            //     condition: item.yang_pin_yun_si_
-            //   }
-            //   list.push(o)
-            // }
 
           })
           this.list = list

src/views/system/jbdScan/js/manualConfirmationJS.js

@@ -236,7 +236,7 @@ export default {
          // console.log('lhypIdStr :',lhypIdStr)
          let wtdAndYpb = []
         // a.bao_gao_bian_zhi_,a.bao_gao_fu_he_yua,
-         let allSQL = `select a.id_ as wtID,a.zhan_shi_biao_id_,a.wei_tuo_lei_xing_,a.he_tong_id_,a.bao_gao_lei_xing_,a.wei_tuo_bian_hao_, a.wei_tuo_dan_wei_, a.wei_tuo_fang_lian, a.wei_tuo_lian,a.bao_gao_bian_zhi_,a.bao_gao_fu_he_yua,b.* from t_lhwtsqb a inner join t_lhypb b on a.id_ = b.parent_id_ where b.parent_id_ in ('${value}')and b.id_ in ('${lhypIdStr}')`
+         let allSQL = `select a.id_ as wtID,a.zhan_shi_biao_id_,a.wei_tuo_lei_xing_,a.he_tong_id_,a.bao_gao_lei_xing_,a.wei_tuo_bian_hao_, a.wei_tuo_dan_wei_ as wtdh, a.wei_tuo_fang_lian, a.wei_tuo_lian,a.bao_gao_bian_zhi_,a.bao_gao_fu_he_yua,b.* from t_lhwtsqb a inner join t_lhypb b on a.id_ = b.parent_id_ where b.parent_id_ in ('${value}')and b.id_ in ('${lhypIdStr}')`
           // console.log(allSQL)
           repostCurd('sql', allSQL).then(res1 => {
               /* 封装样品登记表对象  */
@@ -264,7 +264,7 @@ export default {
                   for(let x = 0; x<count;x++){
                     let obj = {}
                     obj["wei_tuo_dan_hao_"] = res[i].wei_tuo_bian_hao_
-                    obj["wei_tuo_dan_wei_"] = res[i].wei_tuo_dan_wei_
+                    obj["wei_tuo_dan_wei_"] = res[i].wtdh
                     obj["lian_xi_ren_"]     = res[i].wei_tuo_fang_lian
                     obj["lian_xi_dian_hua_"] = res[i].wei_tuo_lian
 
@@ -314,7 +314,7 @@ export default {
               // console.log('进入样品登记表...',ypdjb)
               repostCurd('add', '{"tableName":"t_lhypdjb","paramWhere":' + JSON.stringify(ypdjb) + '}')
               repostCurd('updates', '{"tableName":"t_lhypb","paramWhere":[' + lhypIdNewList + '],"paramCond":{"jie_yang_zhuang_t":"已接收"}}')
-
+              
               /*
                 更新委托单 如果本来没值，就更新 报告编制人和 报告审核员 否则更新
                 委托单数组 和 样品数组 数量相同，遍历两者 判断委托单是否有编制人，审核员？

src/views/system/jbdScan/js/sampleConfirmationJS.js

@@ -33,6 +33,7 @@ export default {
             for (let i in res.variables.data) {
               res.variables.data[i].jie_yang_shu_lian = 1
               res.variables.data[i].jie_yang_zhuang_t = '未确认'
+              res.variables.data[i].biao_zhi_uuid_ = this.uuid()
               this.listData.push(res.variables.data[i])
               //this.OriginalPosition.push(res.variables.data[i].shi_fou_liu_yang_ == "是" ? res.variables.data[i].liu_yang_wei_zhi_ : res.variables.data[i].shou_yang_wei_zhi)
             }
@@ -213,7 +214,7 @@ export default {
 
          let wtdAndYpb = []
         // a.bao_gao_bian_zhi_,a.bao_gao_fu_he_yua,
-         let allSQL = `select a.id_ as wtID,a.zhan_shi_biao_id_,a.wei_tuo_lei_xing_,a.he_tong_id_,a.bao_gao_lei_xing_,a.wei_tuo_bian_hao_, a.wei_tuo_dan_wei_, a.wei_tuo_fang_lian, a.wei_tuo_lian,a.bao_gao_bian_zhi_,a.bao_gao_fu_he_yua,b.* from t_lhwtsqb a inner join t_lhypb b on a.id_ = b.parent_id_ where b.parent_id_ in ('${value}')and b.id_ in ('${lhypIdStr}')`
+         let allSQL = `select a.id_ as wtID,a.zhan_shi_biao_id_,a.wei_tuo_lei_xing_,a.he_tong_id_,a.bao_gao_lei_xing_,a.wei_tuo_bian_hao_, a.wei_tuo_dan_wei_ as wtdh, a.wei_tuo_fang_lian, a.wei_tuo_lian,a.bao_gao_bian_zhi_,a.bao_gao_fu_he_yua,b.* from t_lhwtsqb a inner join t_lhypb b on a.id_ = b.parent_id_ where b.parent_id_ in ('${value}')and b.id_ in ('${lhypIdStr}')`
           repostCurd('sql', allSQL).then(res1 => {
               /* 封装样品登记表对象  */
               let ypdjb = []
@@ -240,7 +241,7 @@ export default {
                   for(let x = 0; x<count;x++){
                     let obj = {}
                     obj["wei_tuo_dan_hao_"] = res[i].wei_tuo_bian_hao_
-                    obj["wei_tuo_dan_wei_"] = res[i].wei_tuo_dan_wei_
+                    obj["wei_tuo_dan_wei_"] = res[i].wtdh
                     obj["lian_xi_ren_"]     = res[i].wei_tuo_fang_lian
                     obj["lian_xi_dian_hua_"] = res[i].wei_tuo_lian
 
@@ -432,7 +433,9 @@ export default {
 
                     repostCurd('add', '{"tableName":"t_ypcfwz","paramWhere":' + JSON.stringify(cfNewList) + '}').then(res => {
                       let selectsql = "select id_ from t_ypcfwz where biao_zhi_uuid_='" + uuid + "'";
+                      // console.log(selectsql)
                       repostCurd('sql', selectsql).then(res => {
+                        // console.log(res)
                         let dataid = res.variables.data[0].id_;
                         let abc = '{"biao_zhi_uuid_":"' + uuid + '"}'
                         // console.log('zzj abc ',abc)
@@ -542,7 +545,18 @@ export default {
             return data.id_!=val
         })
     },
-
+      uuid() {
+        var s = [];
+        var hexDigits = "0123456789abcdef";
+        for (var i = 0; i < 36; i++) {
+            s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1);
+        }
+        s[14] = "4";  // bits 12-15 of the time_hi_and_version field to 0010
+        s[19] = hexDigits.substr((s[19] & 0x3) | 0x8, 1);  // bits 6-7 of the clock_seq_hi_and_reserved to 01
+        s[8] = s[13] = s[18] = s[23] = "-";
+        var uuid = s.join("");
+        return uuid;
+    },
     unique(arr) {
       return arr.filter((item, index) => {
         return arr.indexOf(item, 0) === index;