扫码开任务补充是否加急

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

@@ -266,7 +266,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_ 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}')`
+         let allSQL = `select a.id_ as wtID,a.chu_ju_bao_gao_ya,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 => {
               /* 封装样品登记表对象  */
@@ -432,6 +432,7 @@ export default {
                          rw["xin_xiang_mu_ming"] = wtdAndYpb[i].xiang_mu_ming_che   // 项目名称
                          rw["zhan_shi_biao_id_"] = wtdAndYpb[i].zhan_shi_biao_id_   // 展示表id
                          rw["fen_zhuang_liu_ya"] = ypInfoList[i].liu_yang_shu_lian  // 留样数量
+                         rw["shi_fou_jia_ji_"] = wtdAndYpb[i].chu_ju_bao_gao_ya // 是否加急【2023/2/23王嘎嘎提出】
                          rws.push(rw)
                         // }
                   }

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

@@ -89,13 +89,10 @@ export default {
   
             // 获取样品列表
             let ypInfoList = this_.listData
-            // console.log(ypInfoList, "样品信息")
-  
             let dWhere = []
             let ypbh = []
             let cfwzIdList = [] // 放置 存放位置的ID
             let ypbhList = [] // 样品编号列表
-  
             // 罗湖样品编号列表
             let lhypbhList = []
             let lhypmcList = []
@@ -144,16 +141,6 @@ export default {
                 this_.$message.error('操作失败，[' + ypInfoList[yp].yang_pin_ming_che + '] 是否留样不能为空!')
                 return;
               }
-  
-            //  if (ypInfoList[yp].bao_gao_bian_zhi_ == undefined || ypInfoList[yp].bao_gao_bian_zhi_ == '') {
-            //     this_.$message.error('操作失败，[' + ypInfoList[yp].yang_pin_ming_che + '] 报告编制员不能为空!')
-            //     return;
-            //   }
-            //   if (ypInfoList[yp].bao_gao_shen_he_y == undefined || ypInfoList[yp].bao_gao_shen_he_y == '') {
-            //     this_.$message.error('操作失败，[' + ypInfoList[yp].yang_pin_ming_che + '] 报告审核员不能为空!')
-            //     return;
-            //   }
-  
               cfwzObj.push(ypInfoList[yp].shou_yang_wei_zhi) //取位置信息
   
               if (ypInfoList[yp].shi_fou_liu_yang_ == "是") {
@@ -161,10 +148,6 @@ export default {
                   this_.$message.error("你要留样的话，存放位置不能为空哦!")
                   return;
                 }
-                // if (ypInfoList[yp].shou_yang_wei_zhi != undefined && ypInfoList[yp].shou_yang_wei_zhi != '') {
-                //   this_.$message.error("你要留样的话，就不要选收样存放位置!")
-                //   return;
-                // }
                 if (ypInfoList[yp].liu_yang_ri_qi_ == null || ypInfoList[yp].liu_yang_ri_qi_ == '') {
                   this_.$message.error("留样时必须填写留样日期!")
                   return;
@@ -185,34 +168,12 @@ export default {
                   this_.$message.error("留样时必须填写销毁日期!")
                   return;
                 }
-                  // cfwz = ypInfoList[yp].liu_yang_wei_zhi_
                   cfwzObj.push(ypInfoList[yp].liu_yang_wei_zhi_)
-  
               } 
-              // else {
-              //   if (ypInfoList[yp].shou_yang_wei_zhi == null || ypInfoList[yp].shou_yang_wei_zhi == '') {
-              //     this_.$message.error("你正常收样的话，样品存放位置不能为空哦!")
-              //     return;
-              //   }
-              //   if (ypInfoList[yp].liu_yang_wei_zhi_ != undefined && ypInfoList[yp].liu_yang_wei_zhi_ != '') {
-              //     this_.$message.error("你正常收样的话，就不要选择留样存放位置!")
-              //     return;
-              //   }
-              //     cfwz = ypInfoList[yp].shou_yang_wei_zhi //取位置信息
-              // }
-  
-              // uuidList.push(ypInfoList[yp].biao_zhi_uuid_)
-              // ypIdList.push('{"id_":"' + ypInfoList[yp].id_ + '"}')
-              // ypWeiZhi.push(ypInfoList[yp].shou_yang_wei_zhi) // 收样存放位置
-              // ypLiuYangWeiZhi.push(ypInfoList[yp].liu_yang_wei_zhi_) // 留样存放位置
-              // saoMaNumList.push(ypInfoList[yp].jie_yang_shu_lian) // 扫码数量
-              // jieYangQueRenZTList.push(ypInfoList[yp].jie_yang_zhuang_t) // 接收确认状态
               ypbhList.push('{"yang_pin_bian_hao":"' + ypInfoList[yp].yang_pin_bian_hao + '"}') // 样品编号列表
   
   
               // 罗湖
-              // lhypbhList.push('{"yang_pin_bian_hao":"' + ypInfoList[yp].yang_pin_bian_hao + '"}')
-              // lhypbWJ.push('{"id_":"' + ypInfoList[yp].parent_id_ + '"}')
               dWhere.push('{"id_":"' + cfwz + '"}')
               cfwzIdList.push(cfwzObj)
               lhypbhList.push( ypInfoList[yp].yang_pin_bian_hao )
@@ -242,8 +203,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_ 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}')`
+           let allSQL = `select a.id_ as wtID,a.chu_ju_bao_gao_ya,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 => {
                 /* 封装样品登记表对象  */
@@ -409,6 +369,7 @@ export default {
                            rw["xin_xiang_mu_ming"] = wtdAndYpb[i].xiang_mu_ming_che   // 项目名称
                            rw["zhan_shi_biao_id_"] = wtdAndYpb[i].zhan_shi_biao_id_   // 展示表id
                            rw["fen_zhuang_liu_ya"] = ypInfoList[i].liu_yang_shu_lian  // 留样数量
+                           rw["shi_fou_jia_ji_"] = wtdAndYpb[i].chu_ju_bao_gao_ya // 是否加急【2023/2/23王嘎嘎提出】
                            rws.push(rw)
                           // }
                     }