修改任务分配

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

@@ -25,7 +25,7 @@ export default {
       // 扫码扫到新数据,查询 并分页 回填展示
       let countSQL = `select count(*) as count from t_mjypb where jie_yang_zhuang_t = '待确认'`
       let str = (page-1)*10
-      let fysql = `select ypb.*,sqb.fu_kuan_fang_shi_ from t_mjypb ypb  JOIN t_mjwtsqb sqb on ypb.wai_jian_ = sqb.id_ and ypb.jie_yang_zhuang_t = '待确认' limit ${str},10`
+      let fysql = `select ypb.*,sqb.fu_kuan_fang_shi_,sqb.fu_he_yuan_ from t_mjypb ypb  JOIN t_mjwtsqb sqb on ypb.wai_jian_ = sqb.id_ and ypb.jie_yang_zhuang_t = '待确认' limit ${str},10`
       Promise.all([repostCurd('sql', countSQL), repostCurd('sql', fysql)]).then(([res1, res]) => {
         this.listData = []
         this.pageCount = res1.variables.data[0].count
@@ -307,6 +307,7 @@ export default {
                 rwzb["yang_pin_bei_zhu_"] = mjypbList[i].bei_zhu_			// 样品备注
                 // rwzb["yang_pin_lei_xing"] =  yplxAll //23/1/10号 吴懿说不要了
                 rwzb["shi_fou_jia_ji_"] = mjwtsqbAllResult[i].fu_kuan_fang_shi_ // 2023-2-24吴懿要加的
+                rwzb["wu_jun_shi_fou_ch"] = mjwtsqbAllResult[i].fu_he_yuan_ // 2023-3-6 王嘎嘎加
                 rwb.push(rwzb)
                 // let str = mjypbList[i].jian_ce_xiang_mu2.split(",")
                 // for (var p in str) {

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

@@ -29,7 +29,7 @@ export default {
       // 扫码扫到新数据,查询 回填展示
       if(flag){
          // repostCurd('select','{"tableName": "t_mjypdjb","paramWhere":{"yang_pin_bian_hao":"S220909-1053"}}').then(response => {
-          let sql = `select ypb.*,sqb.fu_kuan_fang_shi_ from t_mjypb ypb  JOIN t_mjwtsqb sqb on ypb.wai_jian_ = sqb.id_ and ypb.jie_yang_zhuang_t = '待确认' and ypb.yang_pin_bian_hao = '${id}'`
+          let sql = `select ypb.*,sqb.fu_kuan_fang_shi_,sqb.fu_he_yuan_ from t_mjypb ypb  JOIN t_mjwtsqb sqb on ypb.wai_jian_ = sqb.id_ and ypb.jie_yang_zhuang_t = '待确认' and ypb.yang_pin_bian_hao = '${id}'`
          repostCurd('sql',sql).then(response => {
           if (response.variables.data && response.variables.data.length > 0) {
               response.variables.data[0].jie_yang_shu_lian = 1
@@ -294,6 +294,7 @@ export default {
                 // rwzb["gong_xian_zhi_"] = mjypbList[i].yang_pin_lei_xin			// 供限值
                 rwzb["yang_pin_bei_zhu_"] = mjypbList[i].bei_zhu_			// 样品备注
                 rwzb["shi_fou_jia_ji_"] = mjwtsqbAllResult[i].fu_kuan_fang_shi_ // 2023-2-24吴懿要加的
+                rwzb["wu_jun_shi_fou_ch"] = mjwtsqbAllResult[i].fu_he_yuan_ // 2023-3-6 王嘎嘎加
                 rwb.push(rwzb)
                 // let str = mjypbList[i].jian_ce_xiang_mu2.split(",")
                 // for (var p in str) {