修改样品扫码，样品标签

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

@@ -134,62 +134,74 @@ export default {
         idStr += item + ','
       })
       idStr = idStr.substring(0,idStr.length-1);
-      console.log(idStr)
+      // console.log(idStr)
       this.getLook(idStr)
     },
     getLook(id) {
-      console.log(id)
-      let sql = `select * from t_lhypb where find_in_set(parent_id_,'${id}')`
-      console.log(sql)
+      // 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}')`
+      // console.log(sql)
       repostCurd("sql", sql).then(res => {
         if (res.state === 200) {
           const data = res.variables.data
+          // console.log(data)
           let list = []
           data.forEach(item => {
-            if (item.yang_pin_lei_xing != '' && parseInt(item.shu_liang_) > 0) {
+            if (item.yang_ben_lei_xing != '' && parseInt(item.yang_pin_shu_lian) > 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_
+                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_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
-
+          // console.log(this.list)
         }
       })
     }

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

@@ -242,7 +242,6 @@ export default {
               /* 封装样品登记表对象  */
               let ypdjb = []
               let res = res1.variables.data
-              // console.log('res ! ',res)
               wtdAndYpb = res
 
               for(let i = 0; i<res.length; i++){
@@ -291,14 +290,15 @@ export default {
                     // obj["jiao_yang_ri_qi_"] =        ypInfoList[i].
                     // obj["jiao_yang_jyr"] =           ypInfoList[i].
                     // obj["jiao_yang_shu_lia"] =       ypInfoList[i].
-                    obj["liu_yang_ri_qi_"] =         ypInfoList[i].liu_yang_ri_qi_
+                    obj["liu_yang_ri_qi_"]    =       ypInfoList[i].liu_yang_ri_qi_
                     obj["liu_yang_cun_fang"]  =      ypInfoList[i].liu_yang_cun_fang
                     obj["liu_yang_shu_lian"]  =      ypInfoList[i].liu_yang_shu_lian
                     obj["liu_yang_qi_xian"]   =        ypInfoList[i].liu_yang_qi_xian
                     obj["xiao_hui_ri_qi_"]    =         ypInfoList[i].xiao_hui_ri_qi_
                     obj["fan_yang_ri_qi_"]    =         ypInfoList[i].fan_yang_ri_qi_
                     obj["fan_yang_jyr"]       =       ypInfoList[i].fan_yang_jyr
-                    obj["biao_zhi_uuid_"]       =       ypInfoList[i].biao_zhi_uuid_
+                    obj["biao_zhi_uuid_"]     =       ypInfoList[i].biao_zhi_uuid_
+                    obj["song_yang_yao_qiu"]  =    ypInfoList[i].song_yang_yao_qiu
                     changeWeiZhi = ypInfoList[i].shou_yang_wei_zhi ==''?'':ypInfoList[i].shou_yang_wei_zhi
                     changesyWeiZhi = ypInfoList[i].liu_yang_cun_fang ==''?'':ypInfoList[i].liu_yang_cun_fang
                     ypdjb.push(obj)

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

@@ -274,6 +274,7 @@ export default {
                     obj["fan_yang_ri_qi_"]    =         ypInfoList[i].fan_yang_ri_qi_
                     obj["fan_yang_jyr"]       =       ypInfoList[i].fan_yang_jyr
                     obj["biao_zhi_uuid_"]       =       ypInfoList[i].biao_zhi_uuid_
+                    obj["song_yang_yao_qiu"]  =    ypInfoList[i].song_yang_yao_qiu
                     changeWeiZhi = ypInfoList[i].shou_yang_wei_zhi ==''?'':ypInfoList[i].shou_yang_wei_zhi
                     changesyWeiZhi = ypInfoList[i].liu_yang_cun_fang ==''?'':ypInfoList[i].liu_yang_cun_fang
                     ypdjb.push(obj)