fix: 修改收样位置为空时执行逻辑判断

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

@@ -511,209 +511,389 @@ export default {
                             repostCurd('updatesByWhere', JSON.stringify(allParams))
                         }
                         // 插入样品位置list
-                        // console.log('fullLocal:',this.fullLocal)
-                        repostCurd('add', '{"tableName":"t_ypcfwz","paramWhere":' + JSON.stringify(this.fullLocal) + '}').then(res => {
-                            // 再次查询位置表，对比当前样品列表 替换初始值为占用的样品位置id
-                            let findLocationAgain = `select id_,shi_fou_liu_yang_,biao_zhi_uuid_ from t_ypcfwz where find_in_set(biao_zhi_uuid_,'${allUUIDStr}')`
-                            // console.log(findLocationAgain)
-                            repostCurd('sql', findLocationAgain).then(res => {
-                                let data = res.variables.data
-                                let uuidArgs = ['biao_zhi_uuid_1', 'biao_zhi_uuid_2', 'biao_zhi_uuid_3', 'biao_zhi_uuid_4']
-                                let shouYangArgs = ['shou_yang_wei_zhi_yi', 'shou_yang_wei_zhi_er', 'shou_yang_wei_zhi_san', 'shou_yang_wei_zhi_si']
-                                let liuYangArgs = ['liu_yang_wei_zhi_yi', 'liu_yang_wei_zhi_er', 'liu_yang_wei_zhi_san', 'liu_yang_wei_zhi_si']
-                                data.forEach(item => {
-                                    uuidArgs.forEach((uuid, index) => {
-                                        let ypIndex = ypInfoList.findIndex(i => i[uuid] === item.biao_zhi_uuid_)
-                                        if (ypIndex != -1) {
-                                            item.shi_fou_liu_yang_ === '否' ?
-                                                ypInfoList[ypIndex][shouYangArgs[index]] = item.id_ :
-                                                ypInfoList[ypIndex][liuYangArgs[index]] = item.id_
-                                        }
-                                    })
-                                })
+                        console.log('fullLocal:',this.fullLocal)
+                        if(this.fullLocal.length == 0){
+                            /* 2、封装样品登记表对象,插入样品登记表 顺便封装任务分配表  */
+                            let ypdjb = []
+                            let rws = []
+                            console.log(result)
+                            console.log(ypInfoList)
+                            result.forEach((item, index) => {
+                                // 2-1:统计每个样品有多少类型[数量]
+                                let lxList = []
+                                let ypggList = []
+                                let liuYangList = []
+                                lxList.push(ypInfoList[index].yang_pin_lei_xing, ypInfoList[index].yang_pin_lei_er_, ypInfoList[index].yang_pin_lei_san_, ypInfoList[index].yang_pin_lei_si_)
+                                ypggList.push(
+                                    ypInfoList[index].yang_pin_gui_ge_? ypInfoList[index].yang_pin_gui_ge_ +'*'+ ypInfoList[index].shu_liang_+ ypInfoList[index].dan_wei_yi:'',
+                                     ypInfoList[index].yang_pin_gui_ge_e? ypInfoList[index].yang_pin_gui_ge_e+'*'+ ypInfoList[index].shu_liang_er_+ ypInfoList[index].dan_wei_er:'',
+                                     ypInfoList[index].yang_pin_gui_ge_s?ypInfoList[index].yang_pin_gui_ge_s +'*'+ ypInfoList[index].shu_liang_san_+ ypInfoList[index].dan_wei_san:'',
+                                     ypInfoList[index].yang_pin_gui_si_?ypInfoList[index].yang_pin_gui_si_ +'*'+ ypInfoList[index].shu_liang_si_+ ypInfoList[index].dan_wei_si:'')
+                                liuYangList.push(ypInfoList[index].liu_yang_shu_lian_yi, ypInfoList[index].liu_yang_shu_lian_er, ypInfoList[index].liu_yang_shu_lian_san, ypInfoList[index].liu_yang_shu_lian_si)
+                                let yplxz = lxList.filter(i => i).join('；')
+                                let ypggStr = ypggList.filter(i => i).join('；')
+                                let liuyangStr = liuYangList.filter(i => i).join('；')
+                                // let count = lxList.filter(i => i).join(',').match(/,/g).length + 1
+                                let size = lxList.filter(i => i).join(',').match(/,/g)
+                                let count = 1
+                                size == null ? count = 1 : count = size.length + 1
+                                for (let c = 0; c < count; c++) {
+                                    let xmmc = []
+                                    xmmc.push(item.chang_gui_xiang_m, item.tao_can_ming_chen)
+                                    let xiangMuZh = xmmc.filter(i => i).join(',')
+
+                                    let yblx = c == 0 ? ypInfoList[index].yang_pin_lei_xing :
+                                               c == 1 ? ypInfoList[index].yang_pin_lei_er_  : 
+                                               c == 2 ? ypInfoList[index].yang_pin_lei_san_ : 
+                                               c == 3 ? ypInfoList[index].yang_pin_lei_si_  : ''
+                                    let ystj = c == 0 ? ypInfoList[index].yang_ben_yun_shu_ : 
+                                               c == 1 ? ypInfoList[index].yang_pin_yun_shu_ : 
+                                               c == 2 ? ypInfoList[index].yang_pin_yun_san  : 
+                                               c == 3 ? ypInfoList[index].yang_pin_yun_si_  : ''
+                                    let ypsl = c == 0 ? ypInfoList[index].shu_liang_ : 
+                                               c == 1 ? ypInfoList[index].shu_liang_er_ : 
+                                               c == 2 ? ypInfoList[index].shu_liang_san_ : 
+                                               c == 3 ? ypInfoList[index].shu_liang_si_ : ''
+                                    let ybgg = c == 0 ? ypInfoList[index].yang_pin_gui_ge_ : 
+                                               c == 1 ? ypInfoList[index].yang_pin_gui_ge_e : 
+                                               c == 2 ? ypInfoList[index].yang_pin_gui_ge_s : 
+                                               c == 3 ? ypInfoList[index].yang_pin_gui_si_ : ''
+                                    let sywz = c == 0 ? ypInfoList[index].shou_yang_wei_zhi_yi : 
+                                               c == 1 ? ypInfoList[index].shou_yang_wei_zhi_er : 
+                                               c == 2 ? ypInfoList[index].shou_yang_wei_zhi_san : 
+                                               c == 3 ? ypInfoList[index].shou_yang_wei_zhi_si : ''
+                                    let lycf = c == 0 ? ypInfoList[index].liu_yang_wei_zhi_yi : 
+                                               c == 1 ? ypInfoList[index].liu_yang_wei_zhi_er : 
+                                               c == 2 ? ypInfoList[index].liu_yang_wei_zhi_san : 
+                                               c == 3 ? ypInfoList[index].liu_yang_wei_zhi_si : ''
+                                    let lysl = c == 0 ? ypInfoList[index].liu_yang_shu_lian_yi : 
+                                               c == 1 ? ypInfoList[index].liu_yang_shu_lian_er : 
+                                               c == 2 ? ypInfoList[index].liu_yang_shu_lian_san : 
+                                               c == 3 ? ypInfoList[index].liu_yang_shu_lian_si : ''
+                                    let currentUUID = c == 0 ? ypInfoList[index].biao_zhi_uuid_1 : 
+                                                      c == 1 ? ypInfoList[index].biao_zhi_uuid_2 : 
+                                                      c == 2 ? ypInfoList[index].biao_zhi_uuid_3 : 
+                                                      c == 3 ? ypInfoList[index].biao_zhi_uuid_4 : ''
+                                    let ifLy = c == 0 ? ypInfoList[index].shi_fou_liu_yang_yi : 
+                                               c == 1 ? ypInfoList[index].shi_fou_liu_yang_er :
+                                               c == 2 ? ypInfoList[index].shi_fou_liu_yang_san: 
+                                               c == 3 ? ypInfoList[index].shi_fou_liu_yang_si : ''
+                                    let obj = {
+                                            wei_tuo_dan_hao_: item.wei_tuo_bian_hao_,
+                                            wei_tuo_dan_wei_: item.wtdh,
+                                            lian_xi_ren_: item.wei_tuo_fang_lian,
+                                            lian_xi_dian_hua_: item.wei_tuo_lian,
+                                            yang_ben_ming_che: item.yang_pin_ming_che,
+                                            yang_ben_bian_hao: item.yang_pin_bian_hao,
+                                            pi_hao_bian_hao_: item.song_jian_pi_hao_,
+                                            song_jian_dan_wei: item.song_jian_dan_wei,
+                                            xing_ming_: ypInfoList[index].xing_ming_=== undefined?'':ypInfoList[index].xing_ming_,
+                                            xing_bie_: ypInfoList[index].xing_bie_=== undefined?'':ypInfoList[index].xing_bie_,
+                                            nian_ling_: ypInfoList[index].nian_ling_=== undefined?'':ypInfoList[index].nian_ling_,
+                                            yang_ben_zhuang_t: item.yang_pin_zhuang_t,
+                                            shou_yang_ri_qi_: currentTime,
+                                            bei_zhu_: ypInfoList[index].bei_zhu_1_ === undefined?'':ypInfoList[index].bei_zhu_1_,
+                                            yang_ben_lei_xing: yblx,
+                                            yun_shu_tiao_jian: ystj,
+                                            yang_pin_shu_lian: ypsl,
+                                            yang_ben_gui_ge_s: ybgg,
+                                            yan_shou_jie_guo_: ypInfoList[index].yan_shou_jie_guo_,
+                                            cun_fang_wei_zhi_: sywz,
+                                            liu_zhuan_zhuang_: '待任务分配',
+                                            shi_fou_liu_yang_: ifLy,
+                                            liu_yang_ri_qi_: ifLy == '是'? ypInfoList[index].liu_yang_ri_qi_:'',
+                                            liu_yang_cun_fang: ifLy == '是'?lycf:'',
+                                            liu_yang_shu_lian: ifLy == '是'?  (lysl == null ?'':lysl) : '',
+                                            liu_yang_qi_xian: ifLy == '是'? ypInfoList[index].liu_yang_qi_xian:'',
+                                            xiao_hui_ri_qi_: ypInfoList[index].xiao_hui_ri_qi_=== undefined?'':ypInfoList[index].xiao_hui_ri_qi_,
+                                            fan_yang_ri_qi_: ypInfoList[index].fan_yang_ri_qi_=== undefined?'':ypInfoList[index].fan_yang_ri_qi_,
+                                            fan_yang_jyr: ypInfoList[index].fan_yang_jyr=== undefined?'':ypInfoList[index].fan_yang_jyr,
+                                            biao_zhi_uuid_: currentUUID,
+                                            song_yang_yao_qiu: ypInfoList[index].song_yang_yao_qiu=== undefined?'':ypInfoList[index].song_yang_yao_qiu,
+                                            jian_ce_xiang_mu_: xiangMuZh,
+                                            shou_yang_ren_:this.$store.getters.userInfo.user.name
+                                }
+                                    // console.log(obj)
+                                    ypdjb.push(obj)
+                                }
+                                // 2-2:封装任务分配表
+                                let rw = {
+                                    yang_pin_ming_che: item.yang_pin_ming_che,
+                                    yang_pin_bian_hao: item.yang_pin_bian_hao,
+                                    wei_tuo_lei_xing_: item.wei_tuo_lei_xing_,
+                                    yang_pin_lei_xing: yplxz,
+                                    yang_pin_gui_ge_: ypggStr,
+                                    wei_tuo_id_: item.wtID,
+                                    he_tong_id_: item.he_tong_id_,
+                                    zhuang_tai_: '待任务分配',
+                                    wan_cheng_shi_jia: item.song_jian_shi_jia,
+                                    shou_yang_ri_qi_: currentTime,
+                                    bao_gao_lei_xing_: item.bao_gao_lei_xing_,
+                                    xin_xiang_mu_ming: item.xiang_mu_ming_che,
+                                    zhan_shi_biao_id_: item.zhan_shi_biao_id_,
+                                    fen_zhuang_liu_ya: liuyangStr,
+                                    shi_fou_jia_ji_: item.chu_ju_bao_gao_ya,             // 是否加急【2023/2/23王嘎嘎提出】
+                                    yang_pin_shu_lian: ypInfoList[index].jie_yang_shu_lian // 样品确认总数【2023/3/7王嘎嘎提出】
+                                }
+                                rws.push(rw)
 
-                                // repostCurd('updates', '{"tableName":"t_lhypb","paramWhere":[' + lhypIdNewList + '],"paramCond":{"jie_yang_zhuang_t":"已接收"}}')
-
-                                /* 2、封装样品登记表对象,插入样品登记表 顺便封装任务分配表  */
-                                let ypdjb = []
-                                let rws = []
-                                console.log(result)
-                                console.log(ypInfoList)
-                                result.forEach((item, index) => {
-                                    // 2-1:统计每个样品有多少类型[数量]
-                                    let lxList = []
-                                    let ypggList = []
-                                    let liuYangList = []
-                                    lxList.push(ypInfoList[index].yang_pin_lei_xing, ypInfoList[index].yang_pin_lei_er_, ypInfoList[index].yang_pin_lei_san_, ypInfoList[index].yang_pin_lei_si_)
-                                    ypggList.push(
-                                        ypInfoList[index].yang_pin_gui_ge_? ypInfoList[index].yang_pin_gui_ge_ +'*'+ ypInfoList[index].shu_liang_+ ypInfoList[index].dan_wei_yi:'',
-                                         ypInfoList[index].yang_pin_gui_ge_e? ypInfoList[index].yang_pin_gui_ge_e+'*'+ ypInfoList[index].shu_liang_er_+ ypInfoList[index].dan_wei_er:'',
-                                         ypInfoList[index].yang_pin_gui_ge_s?ypInfoList[index].yang_pin_gui_ge_s +'*'+ ypInfoList[index].shu_liang_san_+ ypInfoList[index].dan_wei_san:'',
-                                         ypInfoList[index].yang_pin_gui_si_?ypInfoList[index].yang_pin_gui_si_ +'*'+ ypInfoList[index].shu_liang_si_+ ypInfoList[index].dan_wei_si:'')
-                                    liuYangList.push(ypInfoList[index].liu_yang_shu_lian_yi, ypInfoList[index].liu_yang_shu_lian_er, ypInfoList[index].liu_yang_shu_lian_san, ypInfoList[index].liu_yang_shu_lian_si)
-                                    let yplxz = lxList.filter(i => i).join('；')
-                                    let ypggStr = ypggList.filter(i => i).join('；')
-                                    let liuyangStr = liuYangList.filter(i => i).join('；')
-                                    // let count = lxList.filter(i => i).join(',').match(/,/g).length + 1
-                                    let size = lxList.filter(i => i).join(',').match(/,/g)
-                                    let count = 1
-                                    size == null ? count = 1 : count = size.length + 1
-                                    for (let c = 0; c < count; c++) {
-                                        let xmmc = []
-                                        xmmc.push(item.chang_gui_xiang_m, item.tao_can_ming_chen)
-                                        let xiangMuZh = xmmc.filter(i => i).join(',')
-
-                                        let yblx = c == 0 ? ypInfoList[index].yang_pin_lei_xing :
-                                                   c == 1 ? ypInfoList[index].yang_pin_lei_er_  : 
-                                                   c == 2 ? ypInfoList[index].yang_pin_lei_san_ : 
-                                                   c == 3 ? ypInfoList[index].yang_pin_lei_si_  : ''
-                                        let ystj = c == 0 ? ypInfoList[index].yang_ben_yun_shu_ : 
-                                                   c == 1 ? ypInfoList[index].yang_pin_yun_shu_ : 
-                                                   c == 2 ? ypInfoList[index].yang_pin_yun_san  : 
-                                                   c == 3 ? ypInfoList[index].yang_pin_yun_si_  : ''
-                                        let ypsl = c == 0 ? ypInfoList[index].shu_liang_ : 
-                                                   c == 1 ? ypInfoList[index].shu_liang_er_ : 
-                                                   c == 2 ? ypInfoList[index].shu_liang_san_ : 
-                                                   c == 3 ? ypInfoList[index].shu_liang_si_ : ''
-                                        let ybgg = c == 0 ? ypInfoList[index].yang_pin_gui_ge_ : 
-                                                   c == 1 ? ypInfoList[index].yang_pin_gui_ge_e : 
-                                                   c == 2 ? ypInfoList[index].yang_pin_gui_ge_s : 
-                                                   c == 3 ? ypInfoList[index].yang_pin_gui_si_ : ''
-                                        let sywz = c == 0 ? ypInfoList[index].shou_yang_wei_zhi_yi : 
-                                                   c == 1 ? ypInfoList[index].shou_yang_wei_zhi_er : 
-                                                   c == 2 ? ypInfoList[index].shou_yang_wei_zhi_san : 
-                                                   c == 3 ? ypInfoList[index].shou_yang_wei_zhi_si : ''
-                                        let lycf = c == 0 ? ypInfoList[index].liu_yang_wei_zhi_yi : 
-                                                   c == 1 ? ypInfoList[index].liu_yang_wei_zhi_er : 
-                                                   c == 2 ? ypInfoList[index].liu_yang_wei_zhi_san : 
-                                                   c == 3 ? ypInfoList[index].liu_yang_wei_zhi_si : ''
-                                        let lysl = c == 0 ? ypInfoList[index].liu_yang_shu_lian_yi : 
-                                                   c == 1 ? ypInfoList[index].liu_yang_shu_lian_er : 
-                                                   c == 2 ? ypInfoList[index].liu_yang_shu_lian_san : 
-                                                   c == 3 ? ypInfoList[index].liu_yang_shu_lian_si : ''
-                                        let currentUUID = c == 0 ? ypInfoList[index].biao_zhi_uuid_1 : 
-                                                          c == 1 ? ypInfoList[index].biao_zhi_uuid_2 : 
-                                                          c == 2 ? ypInfoList[index].biao_zhi_uuid_3 : 
-                                                          c == 3 ? ypInfoList[index].biao_zhi_uuid_4 : ''
-                                        let ifLy = c == 0 ? ypInfoList[index].shi_fou_liu_yang_yi : 
-                                                   c == 1 ? ypInfoList[index].shi_fou_liu_yang_er :
-                                                   c == 2 ? ypInfoList[index].shi_fou_liu_yang_san: 
-                                                   c == 3 ? ypInfoList[index].shi_fou_liu_yang_si : ''
-                                        let obj = {
-                                                wei_tuo_dan_hao_: item.wei_tuo_bian_hao_,
-                                                wei_tuo_dan_wei_: item.wtdh,
-                                                lian_xi_ren_: item.wei_tuo_fang_lian,
-                                                lian_xi_dian_hua_: item.wei_tuo_lian,
-                                                yang_ben_ming_che: item.yang_pin_ming_che,
-                                                yang_ben_bian_hao: item.yang_pin_bian_hao,
-                                                pi_hao_bian_hao_: item.song_jian_pi_hao_,
-                                                song_jian_dan_wei: item.song_jian_dan_wei,
-                                                xing_ming_: ypInfoList[index].xing_ming_=== undefined?'':ypInfoList[index].xing_ming_,
-                                                xing_bie_: ypInfoList[index].xing_bie_=== undefined?'':ypInfoList[index].xing_bie_,
-                                                nian_ling_: ypInfoList[index].nian_ling_=== undefined?'':ypInfoList[index].nian_ling_,
-                                                yang_ben_zhuang_t: item.yang_pin_zhuang_t,
-                                                shou_yang_ri_qi_: currentTime,
-                                                bei_zhu_: ypInfoList[index].bei_zhu_1_ === undefined?'':ypInfoList[index].bei_zhu_1_,
-                                                yang_ben_lei_xing: yblx,
-                                                yun_shu_tiao_jian: ystj,
-                                                yang_pin_shu_lian: ypsl,
-                                                yang_ben_gui_ge_s: ybgg,
-                                                yan_shou_jie_guo_: ypInfoList[index].yan_shou_jie_guo_,
-                                                cun_fang_wei_zhi_: sywz,
-                                                liu_zhuan_zhuang_: '待任务分配',
-                                                shi_fou_liu_yang_: ifLy,
-                                                liu_yang_ri_qi_: ifLy == '是'? ypInfoList[index].liu_yang_ri_qi_:'',
-                                                liu_yang_cun_fang: ifLy == '是'?lycf:'',
-                                                liu_yang_shu_lian: ifLy == '是'?  (lysl == null ?'':lysl) : '',
-                                                liu_yang_qi_xian: ifLy == '是'? ypInfoList[index].liu_yang_qi_xian:'',
-                                                xiao_hui_ri_qi_: ypInfoList[index].xiao_hui_ri_qi_=== undefined?'':ypInfoList[index].xiao_hui_ri_qi_,
-                                                fan_yang_ri_qi_: ypInfoList[index].fan_yang_ri_qi_=== undefined?'':ypInfoList[index].fan_yang_ri_qi_,
-                                                fan_yang_jyr: ypInfoList[index].fan_yang_jyr=== undefined?'':ypInfoList[index].fan_yang_jyr,
-                                                biao_zhi_uuid_: currentUUID,
-                                                song_yang_yao_qiu: ypInfoList[index].song_yang_yao_qiu=== undefined?'':ypInfoList[index].song_yang_yao_qiu,
-                                                jian_ce_xiang_mu_: xiangMuZh,
-                                                shou_yang_ren_:this.$store.getters.userInfo.user.name
-                                    }
-                                        // console.log(obj)
-                                        ypdjb.push(obj)
-                                    }
-                                    // 2-2:封装任务分配表
-                                    let rw = {
-                                        yang_pin_ming_che: item.yang_pin_ming_che,
-                                        yang_pin_bian_hao: item.yang_pin_bian_hao,
-                                        wei_tuo_lei_xing_: item.wei_tuo_lei_xing_,
-                                        yang_pin_lei_xing: yplxz,
-                                        yang_pin_gui_ge_: ypggStr,
-                                        wei_tuo_id_: item.wtID,
-                                        he_tong_id_: item.he_tong_id_,
-                                        zhuang_tai_: '待任务分配',
-                                        wan_cheng_shi_jia: item.song_jian_shi_jia,
-                                        shou_yang_ri_qi_: currentTime,
-                                        bao_gao_lei_xing_: item.bao_gao_lei_xing_,
-                                        xin_xiang_mu_ming: item.xiang_mu_ming_che,
-                                        zhan_shi_biao_id_: item.zhan_shi_biao_id_,
-                                        fen_zhuang_liu_ya: liuyangStr,
-                                        shi_fou_jia_ji_: item.chu_ju_bao_gao_ya,             // 是否加急【2023/2/23王嘎嘎提出】
-                                        yang_pin_shu_lian: ypInfoList[index].jie_yang_shu_lian // 样品确认总数【2023/3/7王嘎嘎提出】
-                                    }
-                                    rws.push(rw)
 
+                                lhwtzsbID.push('{"shen_qing_id_":"' + item.zhan_shi_biao_id_ + '"}')
+                                lhwtbID.push('{"id_":"' + item.wtID + '"}')
 
-                                    lhwtzsbID.push('{"shen_qing_id_":"' + item.zhan_shi_biao_id_ + '"}')
-                                    lhwtbID.push('{"id_":"' + item.wtID + '"}')
+                            })
 
-                                })
 
+                            /* 4、任务分配 
+                                4-1、根据 wtdAndYpb 的 wtID 更改委托表的 委托状态 wei_tuo_zhuang_ta 变成 已完成
+                                4-2、根据每个样品一个任务分配流程 遍历样品表开任务分配流程
+                                4-3、委托表找zhan_shi_biao_id_ 修改  t_lhwtzsb "zhuang_tai_"为"任务分配进行中"
 
-                                /* 4、任务分配 
-                                    4-1、根据 wtdAndYpb 的 wtID 更改委托表的 委托状态 wei_tuo_zhuang_ta 变成 已完成
-                                    4-2、根据每个样品一个任务分配流程 遍历样品表开任务分配流程
-                                    4-3、委托表找zhan_shi_biao_id_ 修改  t_lhwtzsb "zhuang_tai_"为"任务分配进行中"
+                                优化：将其他不冲突的更改状态脚本放在任务分配后并行处理
+                            */
 
-                                    优化：将其他不冲突的更改状态脚本放在任务分配后并行处理
+                            // console.log("4、任务分配",rws)
+                            repostCurd('add', '{"tableName":"t_lhrwfpb","paramWhere":' + JSON.stringify(rws) + ',"defKey":"Process_04o0csc","formKey":"lhrwfp"}').then(res=>{
+                                // console.log('4、更改委托表的 委托状态',lhwtbID)
+                                repostCurd('updates', '{"tableName":"t_lhwtsqb","paramWhere":[' + lhwtbID + '],"paramCond":{"wei_tuo_zhuang_ta":"已完成"}}')
+                                /* 5、更新展示表  */
+                                if (lhwtzsbID.length > 0) {
+                                    // console.log('5、更新展示表',lhwtzsbID)
+                                    repostCurd('updates', '{"tableName":"t_lhwtzsb","paramWhere":[' + lhwtzsbID + '],"paramCond":{"zhuang_tai_":"任务分配进行中"}}')
+                                }
+                                console.log('样品登记表:',ypdjb)
+                                if(ypdjb.length > 0){
+                                    repostCurd('add', '{"tableName":"t_lhypdjb","paramWhere":' + JSON.stringify(ypdjb) + '}').then(()=>{
+                                        console.log("样品登记表数据添加成功!")
+                                        this.$emit('callback', true)
+                                    }).catch(error =>{
+                                        console.log(error)
+                                        this.handleAnySituation(true,"样品登记表数据添加失败!请勿关闭此页面，联系开发人员解决",'error')
+                                    })
+                                }else{
+                                    this.handleAnySituation(true,"样品登记表数据添加失败!请勿关闭此页面，联系开发人员解决",'error')
+                                }
+                                /* 3、更新样品表  
+                                // console.log('3、更新样品表',lhypIdNewList)
+                                repostCurd('updates', '{"tableName":"t_lhypb","paramWhere":[' + lhypIdNewList + '],"paramCond":{"jie_yang_zhuang_t":"已接收"}}').then(res=>{
+                                    this.handleAnySituation(true,"样品成功接收,正在开启任务分配!",'success')
+                                })
                                 */
+                                console.log('更新样品表',sampleList)
+                                let allSampleParams ={
+                                    tableName:'t_lhypb',
+                                    updList:sampleList
+                                }
+                                repostCurd('updatesByWhere', JSON.stringify(allSampleParams)).then(res=>{
+                                    this.handleAnySituation(true,"样品成功接收,正在开启任务分配!",'success')
+                                })
 
-                                // console.log("4、任务分配",rws)
-                                repostCurd('add', '{"tableName":"t_lhrwfpb","paramWhere":' + JSON.stringify(rws) + ',"defKey":"Process_04o0csc","formKey":"lhrwfp"}').then(res=>{
-                                    // console.log('4、更改委托表的 委托状态',lhwtbID)
-                                    repostCurd('updates', '{"tableName":"t_lhwtsqb","paramWhere":[' + lhwtbID + '],"paramCond":{"wei_tuo_zhuang_ta":"已完成"}}')
-                                    /* 5、更新展示表  */
-                                    if (lhwtzsbID.length > 0) {
-                                        // console.log('5、更新展示表',lhwtzsbID)
-                                        repostCurd('updates', '{"tableName":"t_lhwtzsb","paramWhere":[' + lhwtzsbID + '],"paramCond":{"zhuang_tai_":"任务分配进行中"}}')
-                                    }
-                                    console.log('样品登记表:',ypdjb)
-                                    if(ypdjb.length > 0){
-                                        repostCurd('add', '{"tableName":"t_lhypdjb","paramWhere":' + JSON.stringify(ypdjb) + '}').then(()=>{
-                                            console.log("样品登记表数据添加成功!")
-                                            this.$emit('callback', true)
-                                        }).catch(error =>{
-                                            console.log(error)
-                                            this.handleAnySituation(true,"样品登记表数据添加失败!请勿关闭此页面，联系开发人员解决",'error')
+                            })
+                        }else{
+                            repostCurd('add', '{"tableName":"t_ypcfwz","paramWhere":' + JSON.stringify(this.fullLocal) + '}').then(res => {
+                                // 再次查询位置表，对比当前样品列表 替换初始值为占用的样品位置id
+                                let findLocationAgain = `select id_,shi_fou_liu_yang_,biao_zhi_uuid_ from t_ypcfwz where find_in_set(biao_zhi_uuid_,'${allUUIDStr}')`
+                                // console.log(findLocationAgain)
+                                repostCurd('sql', findLocationAgain).then(res => {
+                                    let data = res.variables.data
+                                    let uuidArgs = ['biao_zhi_uuid_1', 'biao_zhi_uuid_2', 'biao_zhi_uuid_3', 'biao_zhi_uuid_4']
+                                    let shouYangArgs = ['shou_yang_wei_zhi_yi', 'shou_yang_wei_zhi_er', 'shou_yang_wei_zhi_san', 'shou_yang_wei_zhi_si']
+                                    let liuYangArgs = ['liu_yang_wei_zhi_yi', 'liu_yang_wei_zhi_er', 'liu_yang_wei_zhi_san', 'liu_yang_wei_zhi_si']
+                                    data.forEach(item => {
+                                        uuidArgs.forEach((uuid, index) => {
+                                            let ypIndex = ypInfoList.findIndex(i => i[uuid] === item.biao_zhi_uuid_)
+                                            if (ypIndex != -1) {
+                                                item.shi_fou_liu_yang_ === '否' ?
+                                                    ypInfoList[ypIndex][shouYangArgs[index]] = item.id_ :
+                                                    ypInfoList[ypIndex][liuYangArgs[index]] = item.id_
+                                            }
                                         })
-                                    }else{
-                                        this.handleAnySituation(true,"样品登记表数据添加失败!请勿关闭此页面，联系开发人员解决",'error')
-                                    }
-                                    /* 3、更新样品表  
-                                    // console.log('3、更新样品表',lhypIdNewList)
-                                    repostCurd('updates', '{"tableName":"t_lhypb","paramWhere":[' + lhypIdNewList + '],"paramCond":{"jie_yang_zhuang_t":"已接收"}}').then(res=>{
-                                        this.handleAnySituation(true,"样品成功接收,正在开启任务分配!",'success')
                                     })
+    
+                                    // repostCurd('updates', '{"tableName":"t_lhypb","paramWhere":[' + lhypIdNewList + '],"paramCond":{"jie_yang_zhuang_t":"已接收"}}')
+    
+                                    /* 2、封装样品登记表对象,插入样品登记表 顺便封装任务分配表  */
+                                    let ypdjb = []
+                                    let rws = []
+                                    console.log(result)
+                                    console.log(ypInfoList)
+                                    result.forEach((item, index) => {
+                                        // 2-1:统计每个样品有多少类型[数量]
+                                        let lxList = []
+                                        let ypggList = []
+                                        let liuYangList = []
+                                        lxList.push(ypInfoList[index].yang_pin_lei_xing, ypInfoList[index].yang_pin_lei_er_, ypInfoList[index].yang_pin_lei_san_, ypInfoList[index].yang_pin_lei_si_)
+                                        ypggList.push(
+                                            ypInfoList[index].yang_pin_gui_ge_? ypInfoList[index].yang_pin_gui_ge_ +'*'+ ypInfoList[index].shu_liang_+ ypInfoList[index].dan_wei_yi:'',
+                                             ypInfoList[index].yang_pin_gui_ge_e? ypInfoList[index].yang_pin_gui_ge_e+'*'+ ypInfoList[index].shu_liang_er_+ ypInfoList[index].dan_wei_er:'',
+                                             ypInfoList[index].yang_pin_gui_ge_s?ypInfoList[index].yang_pin_gui_ge_s +'*'+ ypInfoList[index].shu_liang_san_+ ypInfoList[index].dan_wei_san:'',
+                                             ypInfoList[index].yang_pin_gui_si_?ypInfoList[index].yang_pin_gui_si_ +'*'+ ypInfoList[index].shu_liang_si_+ ypInfoList[index].dan_wei_si:'')
+                                        liuYangList.push(ypInfoList[index].liu_yang_shu_lian_yi, ypInfoList[index].liu_yang_shu_lian_er, ypInfoList[index].liu_yang_shu_lian_san, ypInfoList[index].liu_yang_shu_lian_si)
+                                        let yplxz = lxList.filter(i => i).join('；')
+                                        let ypggStr = ypggList.filter(i => i).join('；')
+                                        let liuyangStr = liuYangList.filter(i => i).join('；')
+                                        // let count = lxList.filter(i => i).join(',').match(/,/g).length + 1
+                                        let size = lxList.filter(i => i).join(',').match(/,/g)
+                                        let count = 1
+                                        size == null ? count = 1 : count = size.length + 1
+                                        for (let c = 0; c < count; c++) {
+                                            let xmmc = []
+                                            xmmc.push(item.chang_gui_xiang_m, item.tao_can_ming_chen)
+                                            let xiangMuZh = xmmc.filter(i => i).join(',')
+    
+                                            let yblx = c == 0 ? ypInfoList[index].yang_pin_lei_xing :
+                                                       c == 1 ? ypInfoList[index].yang_pin_lei_er_  : 
+                                                       c == 2 ? ypInfoList[index].yang_pin_lei_san_ : 
+                                                       c == 3 ? ypInfoList[index].yang_pin_lei_si_  : ''
+                                            let ystj = c == 0 ? ypInfoList[index].yang_ben_yun_shu_ : 
+                                                       c == 1 ? ypInfoList[index].yang_pin_yun_shu_ : 
+                                                       c == 2 ? ypInfoList[index].yang_pin_yun_san  : 
+                                                       c == 3 ? ypInfoList[index].yang_pin_yun_si_  : ''
+                                            let ypsl = c == 0 ? ypInfoList[index].shu_liang_ : 
+                                                       c == 1 ? ypInfoList[index].shu_liang_er_ : 
+                                                       c == 2 ? ypInfoList[index].shu_liang_san_ : 
+                                                       c == 3 ? ypInfoList[index].shu_liang_si_ : ''
+                                            let ybgg = c == 0 ? ypInfoList[index].yang_pin_gui_ge_ : 
+                                                       c == 1 ? ypInfoList[index].yang_pin_gui_ge_e : 
+                                                       c == 2 ? ypInfoList[index].yang_pin_gui_ge_s : 
+                                                       c == 3 ? ypInfoList[index].yang_pin_gui_si_ : ''
+                                            let sywz = c == 0 ? ypInfoList[index].shou_yang_wei_zhi_yi : 
+                                                       c == 1 ? ypInfoList[index].shou_yang_wei_zhi_er : 
+                                                       c == 2 ? ypInfoList[index].shou_yang_wei_zhi_san : 
+                                                       c == 3 ? ypInfoList[index].shou_yang_wei_zhi_si : ''
+                                            let lycf = c == 0 ? ypInfoList[index].liu_yang_wei_zhi_yi : 
+                                                       c == 1 ? ypInfoList[index].liu_yang_wei_zhi_er : 
+                                                       c == 2 ? ypInfoList[index].liu_yang_wei_zhi_san : 
+                                                       c == 3 ? ypInfoList[index].liu_yang_wei_zhi_si : ''
+                                            let lysl = c == 0 ? ypInfoList[index].liu_yang_shu_lian_yi : 
+                                                       c == 1 ? ypInfoList[index].liu_yang_shu_lian_er : 
+                                                       c == 2 ? ypInfoList[index].liu_yang_shu_lian_san : 
+                                                       c == 3 ? ypInfoList[index].liu_yang_shu_lian_si : ''
+                                            let currentUUID = c == 0 ? ypInfoList[index].biao_zhi_uuid_1 : 
+                                                              c == 1 ? ypInfoList[index].biao_zhi_uuid_2 : 
+                                                              c == 2 ? ypInfoList[index].biao_zhi_uuid_3 : 
+                                                              c == 3 ? ypInfoList[index].biao_zhi_uuid_4 : ''
+                                            let ifLy = c == 0 ? ypInfoList[index].shi_fou_liu_yang_yi : 
+                                                       c == 1 ? ypInfoList[index].shi_fou_liu_yang_er :
+                                                       c == 2 ? ypInfoList[index].shi_fou_liu_yang_san: 
+                                                       c == 3 ? ypInfoList[index].shi_fou_liu_yang_si : ''
+                                            let obj = {
+                                                    wei_tuo_dan_hao_: item.wei_tuo_bian_hao_,
+                                                    wei_tuo_dan_wei_: item.wtdh,
+                                                    lian_xi_ren_: item.wei_tuo_fang_lian,
+                                                    lian_xi_dian_hua_: item.wei_tuo_lian,
+                                                    yang_ben_ming_che: item.yang_pin_ming_che,
+                                                    yang_ben_bian_hao: item.yang_pin_bian_hao,
+                                                    pi_hao_bian_hao_: item.song_jian_pi_hao_,
+                                                    song_jian_dan_wei: item.song_jian_dan_wei,
+                                                    xing_ming_: ypInfoList[index].xing_ming_=== undefined?'':ypInfoList[index].xing_ming_,
+                                                    xing_bie_: ypInfoList[index].xing_bie_=== undefined?'':ypInfoList[index].xing_bie_,
+                                                    nian_ling_: ypInfoList[index].nian_ling_=== undefined?'':ypInfoList[index].nian_ling_,
+                                                    yang_ben_zhuang_t: item.yang_pin_zhuang_t,
+                                                    shou_yang_ri_qi_: currentTime,
+                                                    bei_zhu_: ypInfoList[index].bei_zhu_1_ === undefined?'':ypInfoList[index].bei_zhu_1_,
+                                                    yang_ben_lei_xing: yblx,
+                                                    yun_shu_tiao_jian: ystj,
+                                                    yang_pin_shu_lian: ypsl,
+                                                    yang_ben_gui_ge_s: ybgg,
+                                                    yan_shou_jie_guo_: ypInfoList[index].yan_shou_jie_guo_,
+                                                    cun_fang_wei_zhi_: sywz,
+                                                    liu_zhuan_zhuang_: '待任务分配',
+                                                    shi_fou_liu_yang_: ifLy,
+                                                    liu_yang_ri_qi_: ifLy == '是'? ypInfoList[index].liu_yang_ri_qi_:'',
+                                                    liu_yang_cun_fang: ifLy == '是'?lycf:'',
+                                                    liu_yang_shu_lian: ifLy == '是'?  (lysl == null ?'':lysl) : '',
+                                                    liu_yang_qi_xian: ifLy == '是'? ypInfoList[index].liu_yang_qi_xian:'',
+                                                    xiao_hui_ri_qi_: ypInfoList[index].xiao_hui_ri_qi_=== undefined?'':ypInfoList[index].xiao_hui_ri_qi_,
+                                                    fan_yang_ri_qi_: ypInfoList[index].fan_yang_ri_qi_=== undefined?'':ypInfoList[index].fan_yang_ri_qi_,
+                                                    fan_yang_jyr: ypInfoList[index].fan_yang_jyr=== undefined?'':ypInfoList[index].fan_yang_jyr,
+                                                    biao_zhi_uuid_: currentUUID,
+                                                    song_yang_yao_qiu: ypInfoList[index].song_yang_yao_qiu=== undefined?'':ypInfoList[index].song_yang_yao_qiu,
+                                                    jian_ce_xiang_mu_: xiangMuZh,
+                                                    shou_yang_ren_:this.$store.getters.userInfo.user.name
+                                        }
+                                            // console.log(obj)
+                                            ypdjb.push(obj)
+                                        }
+                                        // 2-2:封装任务分配表
+                                        let rw = {
+                                            yang_pin_ming_che: item.yang_pin_ming_che,
+                                            yang_pin_bian_hao: item.yang_pin_bian_hao,
+                                            wei_tuo_lei_xing_: item.wei_tuo_lei_xing_,
+                                            yang_pin_lei_xing: yplxz,
+                                            yang_pin_gui_ge_: ypggStr,
+                                            wei_tuo_id_: item.wtID,
+                                            he_tong_id_: item.he_tong_id_,
+                                            zhuang_tai_: '待任务分配',
+                                            wan_cheng_shi_jia: item.song_jian_shi_jia,
+                                            shou_yang_ri_qi_: currentTime,
+                                            bao_gao_lei_xing_: item.bao_gao_lei_xing_,
+                                            xin_xiang_mu_ming: item.xiang_mu_ming_che,
+                                            zhan_shi_biao_id_: item.zhan_shi_biao_id_,
+                                            fen_zhuang_liu_ya: liuyangStr,
+                                            shi_fou_jia_ji_: item.chu_ju_bao_gao_ya,             // 是否加急【2023/2/23王嘎嘎提出】
+                                            yang_pin_shu_lian: ypInfoList[index].jie_yang_shu_lian // 样品确认总数【2023/3/7王嘎嘎提出】
+                                        }
+                                        rws.push(rw)
+    
+    
+                                        lhwtzsbID.push('{"shen_qing_id_":"' + item.zhan_shi_biao_id_ + '"}')
+                                        lhwtbID.push('{"id_":"' + item.wtID + '"}')
+    
+                                    })
+    
+    
+                                    /* 4、任务分配 
+                                        4-1、根据 wtdAndYpb 的 wtID 更改委托表的 委托状态 wei_tuo_zhuang_ta 变成 已完成
+                                        4-2、根据每个样品一个任务分配流程 遍历样品表开任务分配流程
+                                        4-3、委托表找zhan_shi_biao_id_ 修改  t_lhwtzsb "zhuang_tai_"为"任务分配进行中"
+    
+                                        优化：将其他不冲突的更改状态脚本放在任务分配后并行处理
                                     */
-                                    console.log('更新样品表',sampleList)
-                                    let allSampleParams ={
-                                        tableName:'t_lhypb',
-                                        updList:sampleList
-                                    }
-                                    repostCurd('updatesByWhere', JSON.stringify(allSampleParams)).then(res=>{
-                                        this.handleAnySituation(true,"样品成功接收,正在开启任务分配!",'success')
+    
+                                    // console.log("4、任务分配",rws)
+                                    repostCurd('add', '{"tableName":"t_lhrwfpb","paramWhere":' + JSON.stringify(rws) + ',"defKey":"Process_04o0csc","formKey":"lhrwfp"}').then(res=>{
+                                        // console.log('4、更改委托表的 委托状态',lhwtbID)
+                                        repostCurd('updates', '{"tableName":"t_lhwtsqb","paramWhere":[' + lhwtbID + '],"paramCond":{"wei_tuo_zhuang_ta":"已完成"}}')
+                                        /* 5、更新展示表  */
+                                        if (lhwtzsbID.length > 0) {
+                                            // console.log('5、更新展示表',lhwtzsbID)
+                                            repostCurd('updates', '{"tableName":"t_lhwtzsb","paramWhere":[' + lhwtzsbID + '],"paramCond":{"zhuang_tai_":"任务分配进行中"}}')
+                                        }
+                                        console.log('样品登记表:',ypdjb)
+                                        if(ypdjb.length > 0){
+                                            repostCurd('add', '{"tableName":"t_lhypdjb","paramWhere":' + JSON.stringify(ypdjb) + '}').then(()=>{
+                                                console.log("样品登记表数据添加成功!")
+                                                this.$emit('callback', true)
+                                            }).catch(error =>{
+                                                console.log(error)
+                                                this.handleAnySituation(true,"样品登记表数据添加失败!请勿关闭此页面，联系开发人员解决",'error')
+                                            })
+                                        }else{
+                                            this.handleAnySituation(true,"样品登记表数据添加失败!请勿关闭此页面，联系开发人员解决",'error')
+                                        }
+                                        /* 3、更新样品表  
+                                        // console.log('3、更新样品表',lhypIdNewList)
+                                        repostCurd('updates', '{"tableName":"t_lhypb","paramWhere":[' + lhypIdNewList + '],"paramCond":{"jie_yang_zhuang_t":"已接收"}}').then(res=>{
+                                            this.handleAnySituation(true,"样品成功接收,正在开启任务分配!",'success')
+                                        })
+                                        */
+                                        console.log('更新样品表',sampleList)
+                                        let allSampleParams ={
+                                            tableName:'t_lhypb',
+                                            updList:sampleList
+                                        }
+                                        repostCurd('updatesByWhere', JSON.stringify(allSampleParams)).then(res=>{
+                                            this.handleAnySituation(true,"样品成功接收,正在开启任务分配!",'success')
+                                        })
+    
                                     })
-
+    
+                                    
                                 })
-
-                                
                             })
-                        })
+
+                        }
                     })
                 }).catch(_ => { });
             }

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

@@ -36,22 +36,22 @@ export default {
             }
             let sql = `select lei_xing_ from t_yplxb`
             let sql2 = `select yang_pin_gui_ge_ from t_ypbzggb`
-            Promise.all([repostCurd('sql',sql),repostCurd('sql',sql2)]).then(([res1,res2]) =>{
-                let data  = res1.variables.data
+            Promise.all([repostCurd('sql', sql), repostCurd('sql', sql2)]).then(([res1, res2]) => {
+                let data = res1.variables.data
                 let data2 = res2.variables.data
                 let types = []
                 let guiGes = []
-                data.forEach(item=>{
+                data.forEach(item => {
                     let obj = {
-                        value:item.lei_xing_,
-                        label:item.lei_xing_
+                        value: item.lei_xing_,
+                        label: item.lei_xing_
                     }
                     types.push(obj)
                 })
-                data2.forEach(item=>{
+                data2.forEach(item => {
                     let o = {
-                        value:item.yang_pin_gui_ge_,
-                        label:item.yang_pin_gui_ge_
+                        value: item.yang_pin_gui_ge_,
+                        label: item.yang_pin_gui_ge_
                     }
                     guiGes.push(o)
                 })
@@ -64,7 +64,7 @@ export default {
                 let sql = `select ypb.*,sqb.chu_ju_bao_gao_ya from t_lhypb ypb join t_lhwtsqb sqb on ypb.parent_id_ = sqb.id_  and find_in_set(ypb.yang_pin_bian_hao,'${id}') and ypb.jie_yang_zhuang_t = '待接收' and ypb.shi_fou_guo_shen_ = '1'`
                 let liuYangSQL = `select liu_yang_qi_xian_ from t_lyqxpzb limit 1`
                 let cfIDSQL = `select cun_fang_id_,liu_yang_id_ FROM t_ypwzmrxzb`
-                Promise.all([repostCurd('sql', sql), repostCurd('sql', liuYangSQL),repostCurd('sql',cfIDSQL)]).then((res) => {
+                Promise.all([repostCurd('sql', sql), repostCurd('sql', liuYangSQL), repostCurd('sql', cfIDSQL)]).then((res) => {
                     let temp = res[0].variables.data
                     let option = res[1].variables.data[0].liu_yang_qi_xian_
                     let cfID = res[2].variables.data[0].cun_fang_id_
@@ -87,13 +87,13 @@ export default {
                             item.liu_yang_shu_lian_yi = ' ml/支×1支'
                             item.shou_yang_wei_zhi_yi = cfID
                             item.liu_yang_wei_zhi_yi = lyID
-                            item.yang_pin_lei_er_ ? 
-                            (item.liu_yang_shu_lian_er = ' ml/支×1支' ,item.shou_yang_wei_zhi_er = cfID,item.liu_yang_wei_zhi_er = lyID)  : null
+                            item.yang_pin_lei_er_ ?
+                                (item.liu_yang_shu_lian_er = ' ml/支×1支', item.shou_yang_wei_zhi_er = cfID, item.liu_yang_wei_zhi_er = lyID) : null
                             item.yang_pin_lei_san_ ?
-                             (item.liu_yang_shu_lian_san = ' ml/支×1支',item.shou_yang_wei_zhi_san = cfID,item.liu_yang_wei_zhi_san = lyID) : null
+                                (item.liu_yang_shu_lian_san = ' ml/支×1支', item.shou_yang_wei_zhi_san = cfID, item.liu_yang_wei_zhi_san = lyID) : null
                             item.yang_pin_lei_si_ ?
-                             (item.liu_yang_shu_lian_si = ' ml/支×1支',item.shou_yang_wei_zhi_si = cfID,item.liu_yang_wei_zhi_si = lyID) : null
-                            
+                                (item.liu_yang_shu_lian_si = ' ml/支×1支', item.shou_yang_wei_zhi_si = cfID, item.liu_yang_wei_zhi_si = lyID) : null
+
                             // item.yang_pin_lei_er_ ? item.liu_yang_shu_lian_er = ' ml/支×1支' : null
                             // item.yang_pin_lei_san_ ? item.liu_yang_shu_lian_san = ' ml/支×1支' : null
                             // item.yang_pin_lei_si_ ? item.liu_yang_shu_lian_si = ' ml/支×1支' : null
@@ -129,7 +129,7 @@ export default {
                 this.closeDialog();
             }).catch(_ => {});
         },
-        handleAnySituation(callBackBool,msg,type){
+        handleAnySituation(callBackBool, msg, type) {
             this.$emit('callback', callBackBool)
             this.visable = false
             this.$message({
@@ -208,57 +208,57 @@ export default {
                         }
                         /** 如果四个是否留样中有一个为‘是’ 则 留样日期 和对应的留样位置就不能为空 */
                         if (ypInfoList[yp].shi_fou_liu_yang_yi == "是" ||
-                         (ypInfoList[yp].flag2 == true && ypInfoList[yp].shi_fou_liu_yang_er == "是") ||
-                          (ypInfoList[yp].flag3 == true && ypInfoList[yp].shi_fou_liu_yang_san == "是") ||
-                           (ypInfoList[yp].flag4 == true && ypInfoList[yp].shi_fou_liu_yang_si == "是")) {
+                            (ypInfoList[yp].flag2 == true && ypInfoList[yp].shi_fou_liu_yang_er == "是") ||
+                            (ypInfoList[yp].flag3 == true && ypInfoList[yp].shi_fou_liu_yang_san == "是") ||
+                            (ypInfoList[yp].flag4 == true && ypInfoList[yp].shi_fou_liu_yang_si == "是")) {
                             if (ypInfoList[yp].liu_yang_ri_qi_ == null || ypInfoList[yp].liu_yang_ri_qi_ == '') {
                                 this_.$message.error('留样时必须填写留样日期!')
                                 return;
                                 // this_.handleErrorData("") todo 失效
                             }
-                            if(ypInfoList[yp].shi_fou_liu_yang_yi == "是"){
+                            if (ypInfoList[yp].shi_fou_liu_yang_yi == "是") {
                                 // 判断位置是否为空
                                 if (ypInfoList[yp].liu_yang_wei_zhi_yi == null || ypInfoList[yp].liu_yang_wei_zhi_yi == '') {
                                     this_.$message.error('操作失败，[' + ypInfoList[yp].yang_pin_ming_che + '] 类型1的留样位置选择不能为空!')
                                     return;
                                 }
-                                if(ypInfoList[yp].liu_yang_shu_lian_yi == null || ypInfoList[yp].liu_yang_shu_lian_yi == ''){
+                                if (ypInfoList[yp].liu_yang_shu_lian_yi == null || ypInfoList[yp].liu_yang_shu_lian_yi == '') {
                                     this_.$message.error('操作失败，[' + ypInfoList[yp].yang_pin_ming_che + '] 类型1的留样数量不能为空!')
                                     return;
                                 }
                             }
-                            if(ypInfoList[yp].shi_fou_liu_yang_er == "是"){
-                                if(ypInfoList[yp].flag2 == true){
+                            if (ypInfoList[yp].shi_fou_liu_yang_er == "是") {
+                                if (ypInfoList[yp].flag2 == true) {
                                     if (ypInfoList[yp].liu_yang_wei_zhi_er == '' || ypInfoList[yp].liu_yang_wei_zhi_er == null) {
                                         this_.$message.error('操作失败，[' + ypInfoList[yp].yang_pin_ming_che + '] 类型2的留样位置选择不能为空!')
                                         return;
                                     }
-                                    if(ypInfoList[yp].liu_yang_shu_lian_er == null || ypInfoList[yp].liu_yang_shu_lian_er == ''){
+                                    if (ypInfoList[yp].liu_yang_shu_lian_er == null || ypInfoList[yp].liu_yang_shu_lian_er == '') {
                                         this_.$message.error('操作失败，[' + ypInfoList[yp].yang_pin_ming_che + '] 类型2的留样数量不能为空!')
                                         return;
                                     }
                                 }
                             }
-                            if(ypInfoList[yp].shi_fou_liu_yang_san == "是"){
-                                if(ypInfoList[yp].flag3 == true ){
+                            if (ypInfoList[yp].shi_fou_liu_yang_san == "是") {
+                                if (ypInfoList[yp].flag3 == true) {
                                     if (ypInfoList[yp].liu_yang_wei_zhi_san == '' || ypInfoList[yp].liu_yang_wei_zhi_san == null) {
                                         this_.$message.error('操作失败，[' + ypInfoList[yp].yang_pin_ming_che + '] 类型3的留样位置选择不能为空!')
                                         return;
                                     }
-                                    if(ypInfoList[yp].liu_yang_shu_lian_san == null || ypInfoList[yp].liu_yang_shu_lian_san == ''){
+                                    if (ypInfoList[yp].liu_yang_shu_lian_san == null || ypInfoList[yp].liu_yang_shu_lian_san == '') {
                                         this_.$message.error('操作失败，[' + ypInfoList[yp].yang_pin_ming_che + '] 类型3的留样数量不能为空!')
                                         return;
                                     }
                                 }
 
                             }
-                            if(ypInfoList[yp].shi_fou_liu_yang_si == "是"){
-                                if(ypInfoList[yp].flag4 == true ){
+                            if (ypInfoList[yp].shi_fou_liu_yang_si == "是") {
+                                if (ypInfoList[yp].flag4 == true) {
                                     if (ypInfoList[yp].liu_yang_wei_zhi_si == '' || ypInfoList[yp].liu_yang_wei_zhi_si == null) {
                                         this_.$message.error('操作失败，[' + ypInfoList[yp].yang_pin_ming_che + '] 类型4的留样位置选择不能为空!')
                                         return;
                                     }
-                                    if(ypInfoList[yp].liu_yang_shu_lian_si == null || ypInfoList[yp].liu_yang_shu_lian_si == ''){
+                                    if (ypInfoList[yp].liu_yang_shu_lian_si == null || ypInfoList[yp].liu_yang_shu_lian_si == '') {
                                         this_.$message.error('操作失败，[' + ypInfoList[yp].yang_pin_ming_che + '] 类型4的留样数量不能为空!')
                                         return;
                                     }
@@ -283,24 +283,24 @@ export default {
                             this_.$message.error('操作失败，[' + ypInfoList[yp].yang_pin_ming_che + '] 类型4的位置选择不能为空!')
                             return;
                         }
-                         // 判断留样日期不得早于当前日期
-                         if(ypInfoList[yp].liu_yang_ri_qi_ != null && ypInfoList[yp].liu_yang_ri_qi_ != ''){
-                            if(ypInfoList[yp].liu_yang_ri_qi_ < curTime){
-                                console.log(ypInfoList[yp].liu_yang_ri_qi_,curTime)
+                        // 判断留样日期不得早于当前日期
+                        if (ypInfoList[yp].liu_yang_ri_qi_ != null && ypInfoList[yp].liu_yang_ri_qi_ != '') {
+                            if (ypInfoList[yp].liu_yang_ri_qi_ < curTime) {
+                                console.log(ypInfoList[yp].liu_yang_ri_qi_, curTime)
                                 this_.$message.error('操作失败，[' + ypInfoList[yp].yang_pin_ming_che + '] 的留样日期不得早于收样日期!')
                                 return;
                             }
                         }
                         // 判断留样期限日期不得早于当前日期
-                        if(ypInfoList[yp].liu_yang_qi_xian != null && ypInfoList[yp].liu_yang_qi_xian != ''){
-                            if(ypInfoList[yp].liu_yang_qi_xian < curTime){
+                        if (ypInfoList[yp].liu_yang_qi_xian != null && ypInfoList[yp].liu_yang_qi_xian != '') {
+                            if (ypInfoList[yp].liu_yang_qi_xian < curTime) {
                                 this_.$message.error('操作失败，[' + ypInfoList[yp].yang_pin_ming_che + '] 的留样期限日期不得早于收样日期!')
                                 return;
                             }
                         }
                         // 判断返样日期不得早于当前日期
-                        if(ypInfoList[yp].fan_yang_ri_qi_ != null && ypInfoList[yp].fan_yang_ri_qi_ != ''){
-                            if(ypInfoList[yp].fan_yang_ri_qi_ < curTime){
+                        if (ypInfoList[yp].fan_yang_ri_qi_ != null && ypInfoList[yp].fan_yang_ri_qi_ != '') {
+                            if (ypInfoList[yp].fan_yang_ri_qi_ < curTime) {
                                 this_.$message.error('操作失败，[' + ypInfoList[yp].yang_pin_ming_che + '] 的返样日期不得早于收样日期!')
                                 return;
                             }
@@ -324,10 +324,10 @@ export default {
                         )
 
                         let o = {
-                            where:{
-                                id_ : ypInfoList[yp].id_
+                            where: {
+                                id_: ypInfoList[yp].id_
                             },
-                            param:{
+                            param: {
                                 yang_pin_lei_xing: ypInfoList[yp].yang_pin_lei_xing,
                                 yang_ben_yun_shu_: ypInfoList[yp].yang_ben_yun_shu_,
                                 shu_liang_: ypInfoList[yp].shu_liang_,
@@ -348,9 +348,9 @@ export default {
                                 shu_liang_si_: ypInfoList[yp].shu_liang_si_,
                                 yang_pin_gui_si_: ypInfoList[yp].yang_pin_gui_si_,
 
-                                jie_yang_zhuang_t:"已接收",
-                                yang_pin_zong_shu:ypInfoList[yp].yang_pin_zong_shu,
-                                bei_zhu_1_:ypInfoList[yp].bei_zhu_1_
+                                jie_yang_zhuang_t: "已接收",
+                                yang_pin_zong_shu: ypInfoList[yp].yang_pin_zong_shu,
+                                bei_zhu_1_: ypInfoList[yp].bei_zhu_1_
                             }
                         }
                         sampleList.push(o)
@@ -375,11 +375,11 @@ export default {
                     //  console.log('当前选择的位置ids：',locationIds)
                     var allLocal = `select * from t_ypcfwz where find_in_set(id_,'${localStr}')`
                     Promise.all([repostCurd("sql", allSQL), repostCurd("sql", allLocal)]).then((res) => {
-                        let initResult =  res[0].variables.data
+                        let initResult = res[0].variables.data
                         let result = []
                         let localInfo = res[1].variables.data
                         // 排序
-                        ypInfoList.forEach(item=>{
+                        ypInfoList.forEach(item => {
                             result.push(initResult.find(i => i.yang_pin_bian_hao === item.yang_pin_bian_hao))
                         })
 
@@ -392,29 +392,29 @@ export default {
                         ypInfoList.forEach(item => {
                             allUUID.push(item.biao_zhi_uuid_1, item.biao_zhi_uuid_2, item.biao_zhi_uuid_3, item.biao_zhi_uuid_4)
                             let allResult = []
-                            if(item.shou_yang_wei_zhi_yi != undefined && item.shou_yang_wei_zhi_yi){
-                                allResult.push(this.handleLocationInfo(item.shou_yang_wei_zhi_yi, '否', localInfo, locationIds, item, item.biao_zhi_uuid_1, currentTime,item.yang_pin_lei_xing,item.liu_yang_shu_lian_yi))
+                            if (item.shou_yang_wei_zhi_yi != undefined && item.shou_yang_wei_zhi_yi) {
+                                allResult.push(this.handleLocationInfo(item.shou_yang_wei_zhi_yi, '否', localInfo, locationIds, item, item.biao_zhi_uuid_1, currentTime, item.yang_pin_lei_xing, item.liu_yang_shu_lian_yi))
                             }
                             if (item.shou_yang_wei_zhi_er != undefined && item.shou_yang_wei_zhi_er) {
-                                allResult.push(this.handleLocationInfo(item.shou_yang_wei_zhi_er, '否', localInfo, locationIds, item, item.biao_zhi_uuid_2, currentTime,item.yang_pin_lei_er_,item.liu_yang_shu_lian_er))
+                                allResult.push(this.handleLocationInfo(item.shou_yang_wei_zhi_er, '否', localInfo, locationIds, item, item.biao_zhi_uuid_2, currentTime, item.yang_pin_lei_er_, item.liu_yang_shu_lian_er))
                             }
                             if (item.shou_yang_wei_zhi_san != undefined && item.shou_yang_wei_zhi_san) {
-                                allResult.push(this.handleLocationInfo(item.shou_yang_wei_zhi_san, '否', localInfo, locationIds, item, item.biao_zhi_uuid_3, currentTime,item.yang_pin_lei_san_,item.liu_yang_shu_lian_san))
+                                allResult.push(this.handleLocationInfo(item.shou_yang_wei_zhi_san, '否', localInfo, locationIds, item, item.biao_zhi_uuid_3, currentTime, item.yang_pin_lei_san_, item.liu_yang_shu_lian_san))
                             }
                             if (item.shou_yang_wei_zhi_si != undefined && item.shou_yang_wei_zhi_si) {
-                                allResult.push(this.handleLocationInfo(item.shou_yang_wei_zhi_si, '否', localInfo, locationIds, item, item.biao_zhi_uuid_4, currentTime,item.yang_pin_lei_si_,item.liu_yang_shu_lian_si))
+                                allResult.push(this.handleLocationInfo(item.shou_yang_wei_zhi_si, '否', localInfo, locationIds, item, item.biao_zhi_uuid_4, currentTime, item.yang_pin_lei_si_, item.liu_yang_shu_lian_si))
                             }
-                            if(item.liu_yang_wei_zhi_yi != undefined && item.liu_yang_wei_zhi_yi && item.shi_fou_liu_yang_yi === '是'){
-                                allResult.push(this.handleLocationInfo(item.liu_yang_wei_zhi_yi, '是', localInfo, locationIds, item, item.biao_zhi_uuid_1, currentTime,item.yang_pin_lei_xing,item.liu_yang_shu_lian_yi))
+                            if (item.liu_yang_wei_zhi_yi != undefined && item.liu_yang_wei_zhi_yi && item.shi_fou_liu_yang_yi === '是') {
+                                allResult.push(this.handleLocationInfo(item.liu_yang_wei_zhi_yi, '是', localInfo, locationIds, item, item.biao_zhi_uuid_1, currentTime, item.yang_pin_lei_xing, item.liu_yang_shu_lian_yi))
                             }
                             if (item.liu_yang_wei_zhi_er != undefined && item.liu_yang_wei_zhi_er && item.shi_fou_liu_yang_er === '是') {
-                                allResult.push(this.handleLocationInfo(item.liu_yang_wei_zhi_er, '是', localInfo, locationIds, item, item.biao_zhi_uuid_2, currentTime,item.yang_pin_lei_er_,item.liu_yang_shu_lian_er))
+                                allResult.push(this.handleLocationInfo(item.liu_yang_wei_zhi_er, '是', localInfo, locationIds, item, item.biao_zhi_uuid_2, currentTime, item.yang_pin_lei_er_, item.liu_yang_shu_lian_er))
                             }
                             if (item.liu_yang_wei_zhi_san != undefined && item.liu_yang_wei_zhi_san && item.shi_fou_liu_yang_san === '是') {
-                                allResult.push(this.handleLocationInfo(item.liu_yang_wei_zhi_san, '是', localInfo, locationIds, item, item.biao_zhi_uuid_3, currentTime,item.yang_pin_lei_san_,item.liu_yang_shu_lian_san))
+                                allResult.push(this.handleLocationInfo(item.liu_yang_wei_zhi_san, '是', localInfo, locationIds, item, item.biao_zhi_uuid_3, currentTime, item.yang_pin_lei_san_, item.liu_yang_shu_lian_san))
                             }
                             if (item.liu_yang_wei_zhi_si != undefined && item.liu_yang_wei_zhi_si && item.shi_fou_liu_yang_si === '是') {
-                                allResult.push(this.handleLocationInfo(item.liu_yang_wei_zhi_si, '是', localInfo, locationIds, item, item.biao_zhi_uuid_4, currentTime,item.yang_pin_lei_si_,item.liu_yang_shu_lian_si))
+                                allResult.push(this.handleLocationInfo(item.liu_yang_wei_zhi_si, '是', localInfo, locationIds, item, item.biao_zhi_uuid_4, currentTime, item.yang_pin_lei_si_, item.liu_yang_shu_lian_si))
                             }
                             allResult.forEach(item => {
                                 item.name === 'emptyLocation' ? this.emptyLocal.push(item.value) : this.fullLocal.push(item.value)
@@ -423,7 +423,7 @@ export default {
                         let allUUIDStr = allUUID.filter(i => i).join(',')
                         // 更新样品位置list
                         // console.log('emptyLocal:',this.emptyLocal)
-                        if(this.emptyLocal.length > 0){
+                        if (this.emptyLocal.length > 0) {
                             let allParams = {
                                 tableName: 't_ypcfwz',
                                 updList: this.emptyLocal
@@ -432,94 +432,273 @@ export default {
                         }
                         // 插入样品位置list
                         // console.log('fullLocal:',this.fullLocal)
-                        repostCurd('add', '{"tableName":"t_ypcfwz","paramWhere":' + JSON.stringify(this.fullLocal) + '}').then(res => {
-                            // 再次查询位置表，对比当前样品列表 替换初始值为占用的样品位置id
-                            let findLocationAgain = `select id_,shi_fou_liu_yang_,biao_zhi_uuid_ from t_ypcfwz where find_in_set(biao_zhi_uuid_,'${allUUIDStr}')`
-                            // console.log(findLocationAgain)
-                            repostCurd('sql', findLocationAgain).then(res => {
-                                let data = res.variables.data
-                                let uuidArgs = ['biao_zhi_uuid_1', 'biao_zhi_uuid_2', 'biao_zhi_uuid_3', 'biao_zhi_uuid_4']
-                                let shouYangArgs = ['shou_yang_wei_zhi_yi', 'shou_yang_wei_zhi_er', 'shou_yang_wei_zhi_san', 'shou_yang_wei_zhi_si']
-                                let liuYangArgs = ['liu_yang_wei_zhi_yi', 'liu_yang_wei_zhi_er', 'liu_yang_wei_zhi_san', 'liu_yang_wei_zhi_si']
-                                data.forEach(item => {
-                                    uuidArgs.forEach((uuid, index) => {
-                                        let ypIndex = ypInfoList.findIndex(i => i[uuid] === item.biao_zhi_uuid_)
-                                        if (ypIndex != -1) {
-                                            item.shi_fou_liu_yang_ === '否' ?
-                                                ypInfoList[ypIndex][shouYangArgs[index]] = item.id_ :
-                                                ypInfoList[ypIndex][liuYangArgs[index]] = item.id_
-                                        }
+                        console.log('fullLocal:', this.fullLocal)
+                        if (this.fullLocal.length == 0) {
+                            /* 2、封装样品登记表对象,插入样品登记表 顺便封装任务分配表  */
+                            let ypdjb = []
+                            let rws = []
+                            console.log(result)
+                            console.log(ypInfoList)
+                            result.forEach((item, index) => {
+                                // 2-1:统计每个样品有多少类型[数量]
+                                let lxList = []
+                                let ypggList = []
+                                let liuYangList = []
+                                lxList.push(ypInfoList[index].yang_pin_lei_xing, ypInfoList[index].yang_pin_lei_er_, ypInfoList[index].yang_pin_lei_san_, ypInfoList[index].yang_pin_lei_si_)
+                                ypggList.push(
+                                    ypInfoList[index].yang_pin_gui_ge_ ? ypInfoList[index].yang_pin_gui_ge_ + '*' + ypInfoList[index].shu_liang_ + ypInfoList[index].dan_wei_yi : '',
+                                    ypInfoList[index].yang_pin_gui_ge_e ? ypInfoList[index].yang_pin_gui_ge_e + '*' + ypInfoList[index].shu_liang_er_ + ypInfoList[index].dan_wei_er : '',
+                                    ypInfoList[index].yang_pin_gui_ge_s ? ypInfoList[index].yang_pin_gui_ge_s + '*' + ypInfoList[index].shu_liang_san_ + ypInfoList[index].dan_wei_san : '',
+                                    ypInfoList[index].yang_pin_gui_si_ ? ypInfoList[index].yang_pin_gui_si_ + '*' + ypInfoList[index].shu_liang_si_ + ypInfoList[index].dan_wei_si : '')
+                                liuYangList.push(ypInfoList[index].liu_yang_shu_lian_yi, ypInfoList[index].liu_yang_shu_lian_er, ypInfoList[index].liu_yang_shu_lian_san, ypInfoList[index].liu_yang_shu_lian_si)
+                                let yplxz = lxList.filter(i => i).join('；')
+                                let ypggStr = ypggList.filter(i => i).join('；')
+                                let liuyangStr = liuYangList.filter(i => i).join('；')
+                                // let count = lxList.filter(i => i).join(',').match(/,/g).length + 1
+                                let size = lxList.filter(i => i).join(',').match(/,/g)
+                                let count = 1
+                                size == null ? count = 1 : count = size.length + 1
+                                for (let c = 0; c < count; c++) {
+                                    let xmmc = []
+                                    xmmc.push(item.chang_gui_xiang_m, item.tao_can_ming_chen)
+                                    let xiangMuZh = xmmc.filter(i => i).join(',')
+
+                                    let yblx = c == 0 ? ypInfoList[index].yang_pin_lei_xing :
+                                        c == 1 ? ypInfoList[index].yang_pin_lei_er_ :
+                                        c == 2 ? ypInfoList[index].yang_pin_lei_san_ :
+                                        c == 3 ? ypInfoList[index].yang_pin_lei_si_ : ''
+                                    let ystj = c == 0 ? ypInfoList[index].yang_ben_yun_shu_ :
+                                        c == 1 ? ypInfoList[index].yang_pin_yun_shu_ :
+                                        c == 2 ? ypInfoList[index].yang_pin_yun_san :
+                                        c == 3 ? ypInfoList[index].yang_pin_yun_si_ : ''
+                                    let ypsl = c == 0 ? ypInfoList[index].shu_liang_ :
+                                        c == 1 ? ypInfoList[index].shu_liang_er_ :
+                                        c == 2 ? ypInfoList[index].shu_liang_san_ :
+                                        c == 3 ? ypInfoList[index].shu_liang_si_ : ''
+                                    let ybgg = c == 0 ? ypInfoList[index].yang_pin_gui_ge_ :
+                                        c == 1 ? ypInfoList[index].yang_pin_gui_ge_e :
+                                        c == 2 ? ypInfoList[index].yang_pin_gui_ge_s :
+                                        c == 3 ? ypInfoList[index].yang_pin_gui_si_ : ''
+                                    let sywz = c == 0 ? ypInfoList[index].shou_yang_wei_zhi_yi :
+                                        c == 1 ? ypInfoList[index].shou_yang_wei_zhi_er :
+                                        c == 2 ? ypInfoList[index].shou_yang_wei_zhi_san :
+                                        c == 3 ? ypInfoList[index].shou_yang_wei_zhi_si : ''
+                                    let lycf = c == 0 ? ypInfoList[index].liu_yang_wei_zhi_yi :
+                                        c == 1 ? ypInfoList[index].liu_yang_wei_zhi_er :
+                                        c == 2 ? ypInfoList[index].liu_yang_wei_zhi_san :
+                                        c == 3 ? ypInfoList[index].liu_yang_wei_zhi_si : ''
+                                    let lysl = c == 0 ? ypInfoList[index].liu_yang_shu_lian_yi :
+                                        c == 1 ? ypInfoList[index].liu_yang_shu_lian_er :
+                                        c == 2 ? ypInfoList[index].liu_yang_shu_lian_san :
+                                        c == 3 ? ypInfoList[index].liu_yang_shu_lian_si : ''
+                                    let currentUUID = c == 0 ? ypInfoList[index].biao_zhi_uuid_1 :
+                                        c == 1 ? ypInfoList[index].biao_zhi_uuid_2 :
+                                        c == 2 ? ypInfoList[index].biao_zhi_uuid_3 :
+                                        c == 3 ? ypInfoList[index].biao_zhi_uuid_4 : ''
+                                    let ifLy = c == 0 ? ypInfoList[index].shi_fou_liu_yang_yi :
+                                        c == 1 ? ypInfoList[index].shi_fou_liu_yang_er :
+                                        c == 2 ? ypInfoList[index].shi_fou_liu_yang_san :
+                                        c == 3 ? ypInfoList[index].shi_fou_liu_yang_si : ''
+                                    let obj = {
+                                        wei_tuo_dan_hao_: item.wei_tuo_bian_hao_,
+                                        wei_tuo_dan_wei_: item.wtdh,
+                                        lian_xi_ren_: item.wei_tuo_fang_lian,
+                                        lian_xi_dian_hua_: item.wei_tuo_lian,
+                                        yang_ben_ming_che: item.yang_pin_ming_che,
+                                        yang_ben_bian_hao: item.yang_pin_bian_hao,
+                                        pi_hao_bian_hao_: item.song_jian_pi_hao_,
+                                        song_jian_dan_wei: item.song_jian_dan_wei,
+                                        xing_ming_: ypInfoList[index].xing_ming_ === undefined ? '' : ypInfoList[index].xing_ming_,
+                                        xing_bie_: ypInfoList[index].xing_bie_ === undefined ? '' : ypInfoList[index].xing_bie_,
+                                        nian_ling_: ypInfoList[index].nian_ling_ === undefined ? '' : ypInfoList[index].nian_ling_,
+                                        yang_ben_zhuang_t: item.yang_pin_zhuang_t,
+                                        shou_yang_ri_qi_: currentTime,
+                                        bei_zhu_: ypInfoList[index].bei_zhu_1_ === undefined ? '' : ypInfoList[index].bei_zhu_1_,
+                                        yang_ben_lei_xing: yblx,
+                                        yun_shu_tiao_jian: ystj,
+                                        yang_pin_shu_lian: ypsl,
+                                        yang_ben_gui_ge_s: ybgg,
+                                        yan_shou_jie_guo_: ypInfoList[index].yan_shou_jie_guo_,
+                                        cun_fang_wei_zhi_: sywz,
+                                        liu_zhuan_zhuang_: '待任务分配',
+                                        shi_fou_liu_yang_: ifLy,
+                                        liu_yang_ri_qi_: ifLy == '是' ? ypInfoList[index].liu_yang_ri_qi_ : '',
+                                        liu_yang_cun_fang: ifLy == '是' ? lycf : '',
+                                        liu_yang_shu_lian: ifLy == '是' ? (lysl == null ? '' : lysl) : '',
+                                        liu_yang_qi_xian: ifLy == '是' ? ypInfoList[index].liu_yang_qi_xian : '',
+                                        xiao_hui_ri_qi_: ypInfoList[index].xiao_hui_ri_qi_ === undefined ? '' : ypInfoList[index].xiao_hui_ri_qi_,
+                                        fan_yang_ri_qi_: ypInfoList[index].fan_yang_ri_qi_ === undefined ? '' : ypInfoList[index].fan_yang_ri_qi_,
+                                        fan_yang_jyr: ypInfoList[index].fan_yang_jyr === undefined ? '' : ypInfoList[index].fan_yang_jyr,
+                                        biao_zhi_uuid_: currentUUID,
+                                        song_yang_yao_qiu: ypInfoList[index].song_yang_yao_qiu === undefined ? '' : ypInfoList[index].song_yang_yao_qiu,
+                                        jian_ce_xiang_mu_: xiangMuZh,
+                                        shou_yang_ren_: this.$store.getters.userInfo.user.name
+                                    }
+                                    // console.log(obj)
+                                    ypdjb.push(obj)
+                                }
+                                // 2-2:封装任务分配表
+                                let rw = {
+                                    yang_pin_ming_che: item.yang_pin_ming_che,
+                                    yang_pin_bian_hao: item.yang_pin_bian_hao,
+                                    wei_tuo_lei_xing_: item.wei_tuo_lei_xing_,
+                                    yang_pin_lei_xing: yplxz,
+                                    yang_pin_gui_ge_: ypggStr,
+                                    wei_tuo_id_: item.wtID,
+                                    he_tong_id_: item.he_tong_id_,
+                                    zhuang_tai_: '待任务分配',
+                                    wan_cheng_shi_jia: item.song_jian_shi_jia,
+                                    shou_yang_ri_qi_: currentTime,
+                                    bao_gao_lei_xing_: item.bao_gao_lei_xing_,
+                                    xin_xiang_mu_ming: item.xiang_mu_ming_che,
+                                    zhan_shi_biao_id_: item.zhan_shi_biao_id_,
+                                    fen_zhuang_liu_ya: liuyangStr,
+                                    shi_fou_jia_ji_: item.chu_ju_bao_gao_ya, // 是否加急【2023/2/23王嘎嘎提出】
+                                    yang_pin_shu_lian: ypInfoList[index].jie_yang_shu_lian // 样品确认总数【2023/3/7王嘎嘎提出】
+                                }
+                                rws.push(rw)
+
+
+                                lhwtzsbID.push('{"shen_qing_id_":"' + item.zhan_shi_biao_id_ + '"}')
+                                lhwtbID.push('{"id_":"' + item.wtID + '"}')
+
+                            })
+
+
+                            /* 4、任务分配 
+                                4-1、根据 wtdAndYpb 的 wtID 更改委托表的 委托状态 wei_tuo_zhuang_ta 变成 已完成
+                                4-2、根据每个样品一个任务分配流程 遍历样品表开任务分配流程
+                                4-3、委托表找zhan_shi_biao_id_ 修改  t_lhwtzsb "zhuang_tai_"为"任务分配进行中"
+
+                                优化：将其他不冲突的更改状态脚本放在任务分配后并行处理
+                            */
+
+                            // console.log("4、任务分配",rws)
+                            repostCurd('add', '{"tableName":"t_lhrwfpb","paramWhere":' + JSON.stringify(rws) + ',"defKey":"Process_04o0csc","formKey":"lhrwfp"}').then(res => {
+                                // console.log('4、更改委托表的 委托状态',lhwtbID)
+                                repostCurd('updates', '{"tableName":"t_lhwtsqb","paramWhere":[' + lhwtbID + '],"paramCond":{"wei_tuo_zhuang_ta":"已完成"}}')
+                                /* 5、更新展示表  */
+                                if (lhwtzsbID.length > 0) {
+                                    // console.log('5、更新展示表',lhwtzsbID)
+                                    repostCurd('updates', '{"tableName":"t_lhwtzsb","paramWhere":[' + lhwtzsbID + '],"paramCond":{"zhuang_tai_":"任务分配进行中"}}')
+                                }
+                                console.log('样品登记表:', ypdjb)
+                                if (ypdjb.length > 0) {
+                                    repostCurd('add', '{"tableName":"t_lhypdjb","paramWhere":' + JSON.stringify(ypdjb) + '}').then(() => {
+                                        console.log("样品登记表数据添加成功!")
+                                        this.$emit('callback', true)
+                                    }).catch(error => {
+                                        console.log(error)
+                                        this.handleAnySituation(true, "样品登记表数据添加失败!请勿关闭此页面，联系开发人员解决", 'error')
                                     })
+                                } else {
+                                    this.handleAnySituation(true, "样品登记表数据添加失败!请勿关闭此页面，联系开发人员解决", 'error')
+                                }
+                                /* 3、更新样品表  
+                                // console.log('3、更新样品表',lhypIdNewList)
+                                repostCurd('updates', '{"tableName":"t_lhypb","paramWhere":[' + lhypIdNewList + '],"paramCond":{"jie_yang_zhuang_t":"已接收"}}').then(res=>{
+                                    this.handleAnySituation(true,"样品成功接收,正在开启任务分配!",'success')
+                                })
+                                */
+                                console.log('更新样品表', sampleList)
+                                let allSampleParams = {
+                                    tableName: 't_lhypb',
+                                    updList: sampleList
+                                }
+                                repostCurd('updatesByWhere', JSON.stringify(allSampleParams)).then(res => {
+                                    this.handleAnySituation(true, "样品成功接收,正在开启任务分配!", 'success')
                                 })
 
-                                // repostCurd('updates', '{"tableName":"t_lhypb","paramWhere":[' + lhypIdNewList + '],"paramCond":{"jie_yang_zhuang_t":"已接收"}}')
-
-                                /* 2、封装样品登记表对象,插入样品登记表 顺便封装任务分配表  */
-                                let ypdjb = []
-                                let rws = []
-                                console.log(result)
-                                console.log(ypInfoList)
-                                result.forEach((item, index) => {
-                                    // 2-1:统计每个样品有多少类型[数量]
-                                    let lxList = []
-                                    let ypggList = []
-                                    let liuYangList = []
-                                    lxList.push(ypInfoList[index].yang_pin_lei_xing, ypInfoList[index].yang_pin_lei_er_, ypInfoList[index].yang_pin_lei_san_, ypInfoList[index].yang_pin_lei_si_)
-                                    ypggList.push(
-                                        ypInfoList[index].yang_pin_gui_ge_? ypInfoList[index].yang_pin_gui_ge_ +'*'+ ypInfoList[index].shu_liang_+ ypInfoList[index].dan_wei_yi:'',
-                                         ypInfoList[index].yang_pin_gui_ge_e? ypInfoList[index].yang_pin_gui_ge_e+'*'+ ypInfoList[index].shu_liang_er_+ ypInfoList[index].dan_wei_er:'',
-                                         ypInfoList[index].yang_pin_gui_ge_s?ypInfoList[index].yang_pin_gui_ge_s +'*'+ ypInfoList[index].shu_liang_san_+ ypInfoList[index].dan_wei_san:'',
-                                         ypInfoList[index].yang_pin_gui_si_?ypInfoList[index].yang_pin_gui_si_ +'*'+ ypInfoList[index].shu_liang_si_+ ypInfoList[index].dan_wei_si:'')
-                                    liuYangList.push(ypInfoList[index].liu_yang_shu_lian_yi, ypInfoList[index].liu_yang_shu_lian_er, ypInfoList[index].liu_yang_shu_lian_san, ypInfoList[index].liu_yang_shu_lian_si)
-                                    let yplxz = lxList.filter(i => i).join('；')
-                                    let ypggStr = ypggList.filter(i => i).join('；')
-                                    let liuyangStr = liuYangList.filter(i => i).join('；')
-                                    // let count = lxList.filter(i => i).join(',').match(/,/g).length + 1
-                                    let size = lxList.filter(i => i).join(',').match(/,/g)
-                                    let count = 1
-                                    size == null ? count = 1 : count = size.length + 1
-                                    for (let c = 0; c < count; c++) {
-                                        let xmmc = []
-                                        xmmc.push(item.chang_gui_xiang_m, item.tao_can_ming_chen)
-                                        let xiangMuZh = xmmc.filter(i => i).join(',')
-
-                                        let yblx = c == 0 ? ypInfoList[index].yang_pin_lei_xing :
-                                                   c == 1 ? ypInfoList[index].yang_pin_lei_er_  : 
-                                                   c == 2 ? ypInfoList[index].yang_pin_lei_san_ : 
-                                                   c == 3 ? ypInfoList[index].yang_pin_lei_si_  : ''
-                                        let ystj = c == 0 ? ypInfoList[index].yang_ben_yun_shu_ : 
-                                                   c == 1 ? ypInfoList[index].yang_pin_yun_shu_ : 
-                                                   c == 2 ? ypInfoList[index].yang_pin_yun_san  : 
-                                                   c == 3 ? ypInfoList[index].yang_pin_yun_si_  : ''
-                                        let ypsl = c == 0 ? ypInfoList[index].shu_liang_ : 
-                                                   c == 1 ? ypInfoList[index].shu_liang_er_ : 
-                                                   c == 2 ? ypInfoList[index].shu_liang_san_ : 
-                                                   c == 3 ? ypInfoList[index].shu_liang_si_ : ''
-                                        let ybgg = c == 0 ? ypInfoList[index].yang_pin_gui_ge_ : 
-                                                   c == 1 ? ypInfoList[index].yang_pin_gui_ge_e : 
-                                                   c == 2 ? ypInfoList[index].yang_pin_gui_ge_s : 
-                                                   c == 3 ? ypInfoList[index].yang_pin_gui_si_ : ''
-                                        let sywz = c == 0 ? ypInfoList[index].shou_yang_wei_zhi_yi : 
-                                                   c == 1 ? ypInfoList[index].shou_yang_wei_zhi_er : 
-                                                   c == 2 ? ypInfoList[index].shou_yang_wei_zhi_san : 
-                                                   c == 3 ? ypInfoList[index].shou_yang_wei_zhi_si : ''
-                                        let lycf = c == 0 ? ypInfoList[index].liu_yang_wei_zhi_yi : 
-                                                   c == 1 ? ypInfoList[index].liu_yang_wei_zhi_er : 
-                                                   c == 2 ? ypInfoList[index].liu_yang_wei_zhi_san : 
-                                                   c == 3 ? ypInfoList[index].liu_yang_wei_zhi_si : ''
-                                        let lysl = c == 0 ? ypInfoList[index].liu_yang_shu_lian_yi : 
-                                                   c == 1 ? ypInfoList[index].liu_yang_shu_lian_er : 
-                                                   c == 2 ? ypInfoList[index].liu_yang_shu_lian_san : 
-                                                   c == 3 ? ypInfoList[index].liu_yang_shu_lian_si : ''
-                                        let currentUUID = c == 0 ? ypInfoList[index].biao_zhi_uuid_1 : 
-                                                          c == 1 ? ypInfoList[index].biao_zhi_uuid_2 : 
-                                                          c == 2 ? ypInfoList[index].biao_zhi_uuid_3 : 
-                                                          c == 3 ? ypInfoList[index].biao_zhi_uuid_4 : ''
-                                        let ifLy = c == 0 ? ypInfoList[index].shi_fou_liu_yang_yi : 
-                                                   c == 1 ? ypInfoList[index].shi_fou_liu_yang_er :
-                                                   c == 2 ? ypInfoList[index].shi_fou_liu_yang_san: 
-                                                   c == 3 ? ypInfoList[index].shi_fou_liu_yang_si : ''
-                                        let obj = {
+                            })
+                        } else {
+                            repostCurd('add', '{"tableName":"t_ypcfwz","paramWhere":' + JSON.stringify(this.fullLocal) + '}').then(res => {
+                                // 再次查询位置表，对比当前样品列表 替换初始值为占用的样品位置id
+                                let findLocationAgain = `select id_,shi_fou_liu_yang_,biao_zhi_uuid_ from t_ypcfwz where find_in_set(biao_zhi_uuid_,'${allUUIDStr}')`
+                                // console.log(findLocationAgain)
+                                repostCurd('sql', findLocationAgain).then(res => {
+                                    let data = res.variables.data
+                                    let uuidArgs = ['biao_zhi_uuid_1', 'biao_zhi_uuid_2', 'biao_zhi_uuid_3', 'biao_zhi_uuid_4']
+                                    let shouYangArgs = ['shou_yang_wei_zhi_yi', 'shou_yang_wei_zhi_er', 'shou_yang_wei_zhi_san', 'shou_yang_wei_zhi_si']
+                                    let liuYangArgs = ['liu_yang_wei_zhi_yi', 'liu_yang_wei_zhi_er', 'liu_yang_wei_zhi_san', 'liu_yang_wei_zhi_si']
+                                    data.forEach(item => {
+                                        uuidArgs.forEach((uuid, index) => {
+                                            let ypIndex = ypInfoList.findIndex(i => i[uuid] === item.biao_zhi_uuid_)
+                                            if (ypIndex != -1) {
+                                                item.shi_fou_liu_yang_ === '否' ?
+                                                    ypInfoList[ypIndex][shouYangArgs[index]] = item.id_ :
+                                                    ypInfoList[ypIndex][liuYangArgs[index]] = item.id_
+                                            }
+                                        })
+                                    })
+
+                                    // repostCurd('updates', '{"tableName":"t_lhypb","paramWhere":[' + lhypIdNewList + '],"paramCond":{"jie_yang_zhuang_t":"已接收"}}')
+
+                                    /* 2、封装样品登记表对象,插入样品登记表 顺便封装任务分配表  */
+                                    let ypdjb = []
+                                    let rws = []
+                                    console.log(result)
+                                    console.log(ypInfoList)
+                                    result.forEach((item, index) => {
+                                        // 2-1:统计每个样品有多少类型[数量]
+                                        let lxList = []
+                                        let ypggList = []
+                                        let liuYangList = []
+                                        lxList.push(ypInfoList[index].yang_pin_lei_xing, ypInfoList[index].yang_pin_lei_er_, ypInfoList[index].yang_pin_lei_san_, ypInfoList[index].yang_pin_lei_si_)
+                                        ypggList.push(
+                                            ypInfoList[index].yang_pin_gui_ge_ ? ypInfoList[index].yang_pin_gui_ge_ + '*' + ypInfoList[index].shu_liang_ + ypInfoList[index].dan_wei_yi : '',
+                                            ypInfoList[index].yang_pin_gui_ge_e ? ypInfoList[index].yang_pin_gui_ge_e + '*' + ypInfoList[index].shu_liang_er_ + ypInfoList[index].dan_wei_er : '',
+                                            ypInfoList[index].yang_pin_gui_ge_s ? ypInfoList[index].yang_pin_gui_ge_s + '*' + ypInfoList[index].shu_liang_san_ + ypInfoList[index].dan_wei_san : '',
+                                            ypInfoList[index].yang_pin_gui_si_ ? ypInfoList[index].yang_pin_gui_si_ + '*' + ypInfoList[index].shu_liang_si_ + ypInfoList[index].dan_wei_si : '')
+                                        liuYangList.push(ypInfoList[index].liu_yang_shu_lian_yi, ypInfoList[index].liu_yang_shu_lian_er, ypInfoList[index].liu_yang_shu_lian_san, ypInfoList[index].liu_yang_shu_lian_si)
+                                        let yplxz = lxList.filter(i => i).join('；')
+                                        let ypggStr = ypggList.filter(i => i).join('；')
+                                        let liuyangStr = liuYangList.filter(i => i).join('；')
+                                        // let count = lxList.filter(i => i).join(',').match(/,/g).length + 1
+                                        let size = lxList.filter(i => i).join(',').match(/,/g)
+                                        let count = 1
+                                        size == null ? count = 1 : count = size.length + 1
+                                        for (let c = 0; c < count; c++) {
+                                            let xmmc = []
+                                            xmmc.push(item.chang_gui_xiang_m, item.tao_can_ming_chen)
+                                            let xiangMuZh = xmmc.filter(i => i).join(',')
+
+                                            let yblx = c == 0 ? ypInfoList[index].yang_pin_lei_xing :
+                                                c == 1 ? ypInfoList[index].yang_pin_lei_er_ :
+                                                c == 2 ? ypInfoList[index].yang_pin_lei_san_ :
+                                                c == 3 ? ypInfoList[index].yang_pin_lei_si_ : ''
+                                            let ystj = c == 0 ? ypInfoList[index].yang_ben_yun_shu_ :
+                                                c == 1 ? ypInfoList[index].yang_pin_yun_shu_ :
+                                                c == 2 ? ypInfoList[index].yang_pin_yun_san :
+                                                c == 3 ? ypInfoList[index].yang_pin_yun_si_ : ''
+                                            let ypsl = c == 0 ? ypInfoList[index].shu_liang_ :
+                                                c == 1 ? ypInfoList[index].shu_liang_er_ :
+                                                c == 2 ? ypInfoList[index].shu_liang_san_ :
+                                                c == 3 ? ypInfoList[index].shu_liang_si_ : ''
+                                            let ybgg = c == 0 ? ypInfoList[index].yang_pin_gui_ge_ :
+                                                c == 1 ? ypInfoList[index].yang_pin_gui_ge_e :
+                                                c == 2 ? ypInfoList[index].yang_pin_gui_ge_s :
+                                                c == 3 ? ypInfoList[index].yang_pin_gui_si_ : ''
+                                            let sywz = c == 0 ? ypInfoList[index].shou_yang_wei_zhi_yi :
+                                                c == 1 ? ypInfoList[index].shou_yang_wei_zhi_er :
+                                                c == 2 ? ypInfoList[index].shou_yang_wei_zhi_san :
+                                                c == 3 ? ypInfoList[index].shou_yang_wei_zhi_si : ''
+                                            let lycf = c == 0 ? ypInfoList[index].liu_yang_wei_zhi_yi :
+                                                c == 1 ? ypInfoList[index].liu_yang_wei_zhi_er :
+                                                c == 2 ? ypInfoList[index].liu_yang_wei_zhi_san :
+                                                c == 3 ? ypInfoList[index].liu_yang_wei_zhi_si : ''
+                                            let lysl = c == 0 ? ypInfoList[index].liu_yang_shu_lian_yi :
+                                                c == 1 ? ypInfoList[index].liu_yang_shu_lian_er :
+                                                c == 2 ? ypInfoList[index].liu_yang_shu_lian_san :
+                                                c == 3 ? ypInfoList[index].liu_yang_shu_lian_si : ''
+                                            let currentUUID = c == 0 ? ypInfoList[index].biao_zhi_uuid_1 :
+                                                c == 1 ? ypInfoList[index].biao_zhi_uuid_2 :
+                                                c == 2 ? ypInfoList[index].biao_zhi_uuid_3 :
+                                                c == 3 ? ypInfoList[index].biao_zhi_uuid_4 : ''
+                                            let ifLy = c == 0 ? ypInfoList[index].shi_fou_liu_yang_yi :
+                                                c == 1 ? ypInfoList[index].shi_fou_liu_yang_er :
+                                                c == 2 ? ypInfoList[index].shi_fou_liu_yang_san :
+                                                c == 3 ? ypInfoList[index].shi_fou_liu_yang_si : ''
+                                            let obj = {
                                                 wei_tuo_dan_hao_: item.wei_tuo_bian_hao_,
                                                 wei_tuo_dan_wei_: item.wtdh,
                                                 lian_xi_ren_: item.wei_tuo_fang_lian,
@@ -528,12 +707,12 @@ export default {
                                                 yang_ben_bian_hao: item.yang_pin_bian_hao,
                                                 pi_hao_bian_hao_: item.song_jian_pi_hao_,
                                                 song_jian_dan_wei: item.song_jian_dan_wei,
-                                                xing_ming_: ypInfoList[index].xing_ming_=== undefined?'':ypInfoList[index].xing_ming_,
-                                                xing_bie_: ypInfoList[index].xing_bie_=== undefined?'':ypInfoList[index].xing_bie_,
-                                                nian_ling_: ypInfoList[index].nian_ling_=== undefined?'':ypInfoList[index].nian_ling_,
+                                                xing_ming_: ypInfoList[index].xing_ming_ === undefined ? '' : ypInfoList[index].xing_ming_,
+                                                xing_bie_: ypInfoList[index].xing_bie_ === undefined ? '' : ypInfoList[index].xing_bie_,
+                                                nian_ling_: ypInfoList[index].nian_ling_ === undefined ? '' : ypInfoList[index].nian_ling_,
                                                 yang_ben_zhuang_t: item.yang_pin_zhuang_t,
                                                 shou_yang_ri_qi_: currentTime,
-                                                bei_zhu_: ypInfoList[index].bei_zhu_1_ === undefined?'':ypInfoList[index].bei_zhu_1_,
+                                                bei_zhu_: ypInfoList[index].bei_zhu_1_ === undefined ? '' : ypInfoList[index].bei_zhu_1_,
                                                 yang_ben_lei_xing: yblx,
                                                 yun_shu_tiao_jian: ystj,
                                                 yang_pin_shu_lian: ypsl,
@@ -542,100 +721,102 @@ export default {
                                                 cun_fang_wei_zhi_: sywz,
                                                 liu_zhuan_zhuang_: '待任务分配',
                                                 shi_fou_liu_yang_: ifLy,
-                                                liu_yang_ri_qi_: ifLy == '是'? ypInfoList[index].liu_yang_ri_qi_:'',
-                                                liu_yang_cun_fang: ifLy == '是'?lycf:'',
-                                                liu_yang_shu_lian: ifLy == '是'?  (lysl == null ?'':lysl) : '',
-                                                liu_yang_qi_xian: ifLy == '是'? ypInfoList[index].liu_yang_qi_xian:'',
-                                                xiao_hui_ri_qi_: ypInfoList[index].xiao_hui_ri_qi_=== undefined?'':ypInfoList[index].xiao_hui_ri_qi_,
-                                                fan_yang_ri_qi_: ypInfoList[index].fan_yang_ri_qi_=== undefined?'':ypInfoList[index].fan_yang_ri_qi_,
-                                                fan_yang_jyr: ypInfoList[index].fan_yang_jyr=== undefined?'':ypInfoList[index].fan_yang_jyr,
+                                                liu_yang_ri_qi_: ifLy == '是' ? ypInfoList[index].liu_yang_ri_qi_ : '',
+                                                liu_yang_cun_fang: ifLy == '是' ? lycf : '',
+                                                liu_yang_shu_lian: ifLy == '是' ? (lysl == null ? '' : lysl) : '',
+                                                liu_yang_qi_xian: ifLy == '是' ? ypInfoList[index].liu_yang_qi_xian : '',
+                                                xiao_hui_ri_qi_: ypInfoList[index].xiao_hui_ri_qi_ === undefined ? '' : ypInfoList[index].xiao_hui_ri_qi_,
+                                                fan_yang_ri_qi_: ypInfoList[index].fan_yang_ri_qi_ === undefined ? '' : ypInfoList[index].fan_yang_ri_qi_,
+                                                fan_yang_jyr: ypInfoList[index].fan_yang_jyr === undefined ? '' : ypInfoList[index].fan_yang_jyr,
                                                 biao_zhi_uuid_: currentUUID,
-                                                song_yang_yao_qiu: ypInfoList[index].song_yang_yao_qiu=== undefined?'':ypInfoList[index].song_yang_yao_qiu,
+                                                song_yang_yao_qiu: ypInfoList[index].song_yang_yao_qiu === undefined ? '' : ypInfoList[index].song_yang_yao_qiu,
                                                 jian_ce_xiang_mu_: xiangMuZh,
-                                                shou_yang_ren_:this.$store.getters.userInfo.user.name
-                                    }
-                                        // console.log(obj)
-                                        ypdjb.push(obj)
-                                    }
-                                    // 2-2:封装任务分配表
-                                    let rw = {
-                                        yang_pin_ming_che: item.yang_pin_ming_che,
-                                        yang_pin_bian_hao: item.yang_pin_bian_hao,
-                                        wei_tuo_lei_xing_: item.wei_tuo_lei_xing_,
-                                        yang_pin_lei_xing: yplxz,
-                                        yang_pin_gui_ge_: ypggStr,
-                                        wei_tuo_id_: item.wtID,
-                                        he_tong_id_: item.he_tong_id_,
-                                        zhuang_tai_: '待任务分配',
-                                        wan_cheng_shi_jia: item.song_jian_shi_jia,
-                                        shou_yang_ri_qi_: currentTime,
-                                        bao_gao_lei_xing_: item.bao_gao_lei_xing_,
-                                        xin_xiang_mu_ming: item.xiang_mu_ming_che,
-                                        zhan_shi_biao_id_: item.zhan_shi_biao_id_,
-                                        fen_zhuang_liu_ya: liuyangStr,
-                                        shi_fou_jia_ji_: item.chu_ju_bao_gao_ya,             // 是否加急【2023/2/23王嘎嘎提出】
-                                        yang_pin_shu_lian: ypInfoList[index].jie_yang_shu_lian // 样品确认总数【2023/3/7王嘎嘎提出】
-                                    }
-                                    rws.push(rw)
-
+                                                shou_yang_ren_: this.$store.getters.userInfo.user.name
+                                            }
+                                            // console.log(obj)
+                                            ypdjb.push(obj)
+                                        }
+                                        // 2-2:封装任务分配表
+                                        let rw = {
+                                            yang_pin_ming_che: item.yang_pin_ming_che,
+                                            yang_pin_bian_hao: item.yang_pin_bian_hao,
+                                            wei_tuo_lei_xing_: item.wei_tuo_lei_xing_,
+                                            yang_pin_lei_xing: yplxz,
+                                            yang_pin_gui_ge_: ypggStr,
+                                            wei_tuo_id_: item.wtID,
+                                            he_tong_id_: item.he_tong_id_,
+                                            zhuang_tai_: '待任务分配',
+                                            wan_cheng_shi_jia: item.song_jian_shi_jia,
+                                            shou_yang_ri_qi_: currentTime,
+                                            bao_gao_lei_xing_: item.bao_gao_lei_xing_,
+                                            xin_xiang_mu_ming: item.xiang_mu_ming_che,
+                                            zhan_shi_biao_id_: item.zhan_shi_biao_id_,
+                                            fen_zhuang_liu_ya: liuyangStr,
+                                            shi_fou_jia_ji_: item.chu_ju_bao_gao_ya, // 是否加急【2023/2/23王嘎嘎提出】
+                                            yang_pin_shu_lian: ypInfoList[index].jie_yang_shu_lian // 样品确认总数【2023/3/7王嘎嘎提出】
+                                        }
+                                        rws.push(rw)
 
-                                    lhwtzsbID.push('{"shen_qing_id_":"' + item.zhan_shi_biao_id_ + '"}')
-                                    lhwtbID.push('{"id_":"' + item.wtID + '"}')
 
-                                })
+                                        lhwtzsbID.push('{"shen_qing_id_":"' + item.zhan_shi_biao_id_ + '"}')
+                                        lhwtbID.push('{"id_":"' + item.wtID + '"}')
 
+                                    })
 
-                                /* 4、任务分配 
-                                    4-1、根据 wtdAndYpb 的 wtID 更改委托表的 委托状态 wei_tuo_zhuang_ta 变成 已完成
-                                    4-2、根据每个样品一个任务分配流程 遍历样品表开任务分配流程
-                                    4-3、委托表找zhan_shi_biao_id_ 修改  t_lhwtzsb "zhuang_tai_"为"任务分配进行中"
 
-                                    优化：将其他不冲突的更改状态脚本放在任务分配后并行处理
-                                */
+                                    /* 4、任务分配 
+                                        4-1、根据 wtdAndYpb 的 wtID 更改委托表的 委托状态 wei_tuo_zhuang_ta 变成 已完成
+                                        4-2、根据每个样品一个任务分配流程 遍历样品表开任务分配流程
+                                        4-3、委托表找zhan_shi_biao_id_ 修改  t_lhwtzsb "zhuang_tai_"为"任务分配进行中"
+    
+                                        优化：将其他不冲突的更改状态脚本放在任务分配后并行处理
+                                    */
 
-                                // console.log("4、任务分配",rws)
-                                repostCurd('add', '{"tableName":"t_lhrwfpb","paramWhere":' + JSON.stringify(rws) + ',"defKey":"Process_04o0csc","formKey":"lhrwfp"}').then(res=>{
-                                    // console.log('4、更改委托表的 委托状态',lhwtbID)
-                                    repostCurd('updates', '{"tableName":"t_lhwtsqb","paramWhere":[' + lhwtbID + '],"paramCond":{"wei_tuo_zhuang_ta":"已完成"}}')
-                                    /* 5、更新展示表  */
-                                    if (lhwtzsbID.length > 0) {
-                                        // console.log('5、更新展示表',lhwtzsbID)
-                                        repostCurd('updates', '{"tableName":"t_lhwtzsb","paramWhere":[' + lhwtzsbID + '],"paramCond":{"zhuang_tai_":"任务分配进行中"}}')
-                                    }
-                                    console.log('样品登记表:',ypdjb)
-                                    if(ypdjb.length > 0){
-                                        repostCurd('add', '{"tableName":"t_lhypdjb","paramWhere":' + JSON.stringify(ypdjb) + '}').then(()=>{
-                                            console.log("样品登记表数据添加成功!")
-                                            this.$emit('callback', true)
-                                        }).catch(error =>{
-                                            console.log(error)
-                                            this.handleAnySituation(true,"样品登记表数据添加失败!请勿关闭此页面，联系开发人员解决",'error')
+                                    // console.log("4、任务分配",rws)
+                                    repostCurd('add', '{"tableName":"t_lhrwfpb","paramWhere":' + JSON.stringify(rws) + ',"defKey":"Process_04o0csc","formKey":"lhrwfp"}').then(res => {
+                                        // console.log('4、更改委托表的 委托状态',lhwtbID)
+                                        repostCurd('updates', '{"tableName":"t_lhwtsqb","paramWhere":[' + lhwtbID + '],"paramCond":{"wei_tuo_zhuang_ta":"已完成"}}')
+                                        /* 5、更新展示表  */
+                                        if (lhwtzsbID.length > 0) {
+                                            // console.log('5、更新展示表',lhwtzsbID)
+                                            repostCurd('updates', '{"tableName":"t_lhwtzsb","paramWhere":[' + lhwtzsbID + '],"paramCond":{"zhuang_tai_":"任务分配进行中"}}')
+                                        }
+                                        console.log('样品登记表:', ypdjb)
+                                        if (ypdjb.length > 0) {
+                                            repostCurd('add', '{"tableName":"t_lhypdjb","paramWhere":' + JSON.stringify(ypdjb) + '}').then(() => {
+                                                console.log("样品登记表数据添加成功!")
+                                                this.$emit('callback', true)
+                                            }).catch(error => {
+                                                console.log(error)
+                                                this.handleAnySituation(true, "样品登记表数据添加失败!请勿关闭此页面，联系开发人员解决", 'error')
+                                            })
+                                        } else {
+                                            this.handleAnySituation(true, "样品登记表数据添加失败!请勿关闭此页面，联系开发人员解决", 'error')
+                                        }
+                                        /* 3、更新样品表  
+                                        // console.log('3、更新样品表',lhypIdNewList)
+                                        repostCurd('updates', '{"tableName":"t_lhypb","paramWhere":[' + lhypIdNewList + '],"paramCond":{"jie_yang_zhuang_t":"已接收"}}').then(res=>{
+                                            this.handleAnySituation(true,"样品成功接收,正在开启任务分配!",'success')
                                         })
-                                    }else{
-                                        this.handleAnySituation(true,"样品登记表数据添加失败!请勿关闭此页面，联系开发人员解决",'error')
-                                    }
-                                    /* 3、更新样品表  
-                                    // console.log('3、更新样品表',lhypIdNewList)
-                                    repostCurd('updates', '{"tableName":"t_lhypb","paramWhere":[' + lhypIdNewList + '],"paramCond":{"jie_yang_zhuang_t":"已接收"}}').then(res=>{
-                                        this.handleAnySituation(true,"样品成功接收,正在开启任务分配!",'success')
-                                    })
-                                    */
-                                    console.log('更新样品表',sampleList)
-                                    let allSampleParams ={
-                                        tableName:'t_lhypb',
-                                        updList:sampleList
-                                    }
-                                    repostCurd('updatesByWhere', JSON.stringify(allSampleParams)).then(res=>{
-                                        this.handleAnySituation(true,"样品成功接收,正在开启任务分配!",'success')
+                                        */
+                                        console.log('更新样品表', sampleList)
+                                        let allSampleParams = {
+                                            tableName: 't_lhypb',
+                                            updList: sampleList
+                                        }
+                                        repostCurd('updatesByWhere', JSON.stringify(allSampleParams)).then(res => {
+                                            this.handleAnySituation(true, "样品成功接收,正在开启任务分配!", 'success')
+                                        })
+
                                     })
 
-                                })
 
-                                
+                                })
                             })
-                        })
+
+                        }
                     })
-                }).catch(_ => { });
+                }).catch(_ => {});
             }
 
         },
@@ -686,9 +867,9 @@ export default {
             }
             return temp
         },
-        handleLocationInfo(currentLocation, isLiuYang, localInfo, locationIds, item, UUID, currentTime,sampleType,liuYangNum) {
+        handleLocationInfo(currentLocation, isLiuYang, localInfo, locationIds, item, UUID, currentTime, sampleType, liuYangNum) {
             !locationIds.has(currentLocation) ? locationIds.add(currentLocation) : localInfo.find(i => i.id_ === currentLocation).wei_zhi_zhuang_ta = '占用'
-            if (localInfo.find(i => i.id_ === currentLocation)!=undefined  &&localInfo.find(i => i.id_ === currentLocation).wei_zhi_zhuang_ta === '空余') {
+            if (localInfo.find(i => i.id_ === currentLocation) != undefined && localInfo.find(i => i.id_ === currentLocation).wei_zhi_zhuang_ta === '空余') {
                 let obj = {
                     where: {
                         id_: currentLocation
@@ -700,7 +881,7 @@ export default {
                         yang_pin_ming_che: item.yang_pin_ming_che,
                         shi_fou_liu_yang_: isLiuYang,
                         yang_pin_lei_xing: sampleType,
-                        liu_yang_shu_lian: liuYangNum == null? '':liuYangNum
+                        liu_yang_shu_lian: liuYangNum == null ? '' : liuYangNum
                     }
                 }
                 let result = {
@@ -716,7 +897,7 @@ export default {
                     biao_zhi_uuid_: UUID,
                     shi_fou_liu_yang_: isLiuYang,
                     type: sampleType,
-                    num: liuYangNum == null? '':liuYangNum
+                    num: liuYangNum == null ? '' : liuYangNum
                 }
                 let newLocation = this.generateNewLocation(localInfo.find(i => i.id_ === currentLocation), sampleInfo)
                 let result = {