|
|
@@ -2,302 +2,592 @@ import repostCurd from '@/business/platform/form/utils/custom/joinCURD.js'
|
|
|
|
|
|
export default {
|
|
|
methods: {
|
|
|
-
|
|
|
- facilityData() {
|
|
|
- this.loadData()
|
|
|
+ facilityData(page) {
|
|
|
+ // this.loadData()
|
|
|
+ this.loadDataBySQL(page)
|
|
|
},
|
|
|
/* 获取数据 ，开始查阅记录 */
|
|
|
loadData() {
|
|
|
- // 扫码扫到新数据,查询 回填展示
|
|
|
- repostCurd('select','{"tableName": "t_mjypdjb","paramWhere":{"jie_yang_zhuang_t":"待确认"}}').then(response => {
|
|
|
- if (response.variables.data && response.variables.data.length > 0) {
|
|
|
- for(let i in response.variables.data){
|
|
|
- response.variables.data[i].jie_yang_shu_lian = 1
|
|
|
- this.listData.push(response.variables.data[i])
|
|
|
- this.OriginalPosition.push(response.variables.data[i].shi_fou_liu_yang_ == "是" ? response.variables.data[i].liu_yang_wei_zhi_ : response.variables.data[i].shou_yang_wei_zhi)
|
|
|
- }
|
|
|
+ repostCurd('select', '{"tableName": "t_lhypb","paramWhere":{"jie_yang_zhuang_t":"待接收"}}').then(response => {
|
|
|
+ if (response.variables.data && response.variables.data.length > 0) {
|
|
|
+ for (let i in response.variables.data) {
|
|
|
+ response.variables.data[i].jie_yang_shu_lian = 1
|
|
|
+ this.listData.push(response.variables.data[i])
|
|
|
+ // this.OriginalPosition.push(response.variables.data[i].shi_fou_liu_yang_ == "是" ? response.variables.data[i].liu_yang_wei_zhi_ : response.variables.data[i].shou_yang_wei_zhi)
|
|
|
}
|
|
|
- })
|
|
|
+ }
|
|
|
+ })
|
|
|
+ },
|
|
|
+ loadDataBySQL(page) {
|
|
|
+ // 扫码扫到新数据,查询 并分页 回填展示
|
|
|
+ let countSQL = `select count(*) as count from t_lhypb where jie_yang_zhuang_t = '待接收'`
|
|
|
+ let str = (page-1)*10
|
|
|
+ let fysql = `select * from t_lhypb where jie_yang_zhuang_t = '待接收' limit ${str},10`
|
|
|
+ Promise.all([repostCurd('sql', countSQL), repostCurd('sql', fysql)]).then(([res1, res]) => {
|
|
|
+ this.listData = []
|
|
|
+ this.pageCount = res1.variables.data[0].count
|
|
|
+ if (res.variables.data && res.variables.data.length > 0) {
|
|
|
+ for (let i in res.variables.data) {
|
|
|
+ res.variables.data[i].jie_yang_shu_lian = 1
|
|
|
+ res.variables.data[i].jie_yang_zhuang_t = '未确认'
|
|
|
+ this.listData.push(res.variables.data[i])
|
|
|
+ }
|
|
|
+ }
|
|
|
+ })
|
|
|
},
|
|
|
/* 列表失去焦点*/
|
|
|
- handleChange(){
|
|
|
- this.$refs.redarInput.focus(); //聚焦input
|
|
|
+ handleChange() {
|
|
|
+ this.$refs.redarInput.focus(); //聚焦input
|
|
|
},
|
|
|
/* 关闭弹出列表框*/
|
|
|
closeDialog() {
|
|
|
this.remRedar()
|
|
|
//回传关闭事件。隐藏当前组件。
|
|
|
},
|
|
|
- handleClose(){
|
|
|
+ handleClose() {
|
|
|
this.handleChange()
|
|
|
this.$confirm('确认关闭样品列表页面？').then(_ => {
|
|
|
- this.closeDialog();
|
|
|
- }).catch(_ => {
|
|
|
- });
|
|
|
- },
|
|
|
+ this.closeDialog();
|
|
|
+ }).catch(_ => {});
|
|
|
+ },
|
|
|
|
|
|
submitData(type) {
|
|
|
// this指针
|
|
|
let this_ = this;
|
|
|
+ let changeWeiZhi; // 此处俩字段作用在下面 选择货位时出现重复位置 而重新更新样品登记表 收样位置|留样位置
|
|
|
+ let changesyWeiZhi;
|
|
|
// 回传关闭事件。隐藏当前组件。
|
|
|
let judge = true;
|
|
|
|
|
|
- if(this_.listData.length == 0){
|
|
|
- this.$emit('callback',true)
|
|
|
- this.visable = false
|
|
|
- this.$message({
|
|
|
- message:'暂无样品待接收确认！',
|
|
|
- type:'error'
|
|
|
- })
|
|
|
- this.closeDialog();
|
|
|
- }else{
|
|
|
+ if (this_.listData.length == 0) {
|
|
|
+ this.$emit('callback', true)
|
|
|
+ this.visable = false
|
|
|
+ this.$message({
|
|
|
+ message: '暂无样品待接收确认！',
|
|
|
+ type: 'error'
|
|
|
+ })
|
|
|
+ this.closeDialog();
|
|
|
+ } else {
|
|
|
this.$confirm('请再次确认 [样品接收信息]').then(_ => {
|
|
|
- // 获取样品列表
|
|
|
- let ypInfoList = this_.listData
|
|
|
-
|
|
|
- let dWhere = []
|
|
|
- let ypbh = []
|
|
|
- let cfwzIdList = [] // 放置 存放位置的ID
|
|
|
- let uuidList = [] // 列表的UUID
|
|
|
-
|
|
|
- let ypIdList = [] // 样品id列表,格式转好的
|
|
|
- let ypWeiZhi = [] // 样品收样位置
|
|
|
- let ypLiuYangWeiZhi = [] // 样品留样位置
|
|
|
- let saoMaNumList = [] // 扫码确认数量列表
|
|
|
- let jieYangQueRenZTList = [] // 接样状态列表
|
|
|
-
|
|
|
- let ypbhList = [] // 样品编号列表
|
|
|
- let mjypbList = [] // 明鉴样品表
|
|
|
- let mjypbWJ = [] // 明鉴样品表外键
|
|
|
-
|
|
|
- for(let yp in ypInfoList){
|
|
|
- let cfwz = ''
|
|
|
- if(ypInfoList[yp].jie_yang_shu_lian > ypInfoList[yp].shou_yang_shu_lia){
|
|
|
- this_.$message.error('操作失败，['+ypInfoList[yp].yang_pin_ming_che+'] 接收确认数量不得大于收样数量。')
|
|
|
- return;
|
|
|
- }
|
|
|
- if(ypInfoList[yp].jie_yang_zhuang_t == '待确认'){
|
|
|
- this_.$message.error('操作失败，['+ypInfoList[yp].yang_pin_ming_che+'] 接收确认状态必须为已确认。')
|
|
|
- return;
|
|
|
- }
|
|
|
- if(ypInfoList[yp].shi_fou_liu_yang_ == "是"){
|
|
|
- if(ypInfoList[yp].liu_yang_wei_zhi_ == null || ypInfoList[yp].liu_yang_wei_zhi_ == ''){
|
|
|
- this_.$message.error("你要留样的话，存放位置不能为空哦!")
|
|
|
- return;
|
|
|
- }
|
|
|
- if(ypInfoList[yp].shou_yang_wei_zhi != undefined && ypInfoList[yp].shou_yang_wei_zhi != ''){
|
|
|
- this_.$message.error("你要留样的话，就不要选收样存放位置!")
|
|
|
- return;
|
|
|
- }
|
|
|
- let isLy = ypInfoList[yp].liu_yang_wei_zhi_
|
|
|
- if(isLy.substr(-2,isLy.length -1) == "占用" || isLy.substr(-2,isLy.length -1) == "空余"){
|
|
|
- let sql = "select `id` from MJ_yp_position_status where positionAndStatus = '" + isLy + "' limit 1"
|
|
|
- repostCurd('sql',sql).then(response=>{
|
|
|
- cfwz = response.variables.data[0].id
|
|
|
- ypInfoList[yp].liu_yang_wei_zhi_ = cfwz
|
|
|
- console.log('?question time')
|
|
|
- })
|
|
|
- }else{
|
|
|
- cfwz = ypInfoList[yp].liu_yang_wei_zhi_
|
|
|
- }
|
|
|
|
|
|
- }else{
|
|
|
- if(ypInfoList[yp].shou_yang_wei_zhi == null || ypInfoList[yp].shou_yang_wei_zhi == ''){
|
|
|
- this_.$message.error("你正常收样的话，样品存放位置不能为空哦!")
|
|
|
- return;
|
|
|
- }
|
|
|
- if(ypInfoList[yp].liu_yang_wei_zhi_ != undefined && ypInfoList[yp].liu_yang_wei_zhi_ != ''){
|
|
|
- this_.$message.error("你正常收样的话，就不要选择留样存放位置!")
|
|
|
- return;
|
|
|
- }
|
|
|
- let isZC = ypInfoList[yp].shou_yang_wei_zhi
|
|
|
- if(isZC.substr(-2,isZC.length -1) == "占用" || isZC.substr(-2,isZC.length -1) == "空余"){
|
|
|
- let sql = "select `id` from MJ_yp_position_status where positionAndStatus = '" + isZC + "' limit 1"
|
|
|
- repostCurd('sql',sql).then(response=>{
|
|
|
- cfwz = response.variables.data[0].id
|
|
|
- ypInfoList[yp].shou_yang_wei_zhi = cfwz
|
|
|
- console.log('?question time')
|
|
|
- })
|
|
|
- }else{
|
|
|
- cfwz = ypInfoList[yp].shou_yang_wei_zhi
|
|
|
- }
|
|
|
+ // 获取样品列表
|
|
|
+ let ypInfoList = this_.listData
|
|
|
+ // console.log(ypInfoList, "样品信息")
|
|
|
+
|
|
|
+ let dWhere = []
|
|
|
+ let ypbh = []
|
|
|
+ let cfwzIdList = [] // 放置 存放位置的ID
|
|
|
+ let uuidList = [] // 列表的UUID
|
|
|
+
|
|
|
+ // let ypIdList = [] // 样品id列表,格式转好的
|
|
|
+ // let ypWeiZhi = [] // 样品收样位置
|
|
|
+ // let ypLiuYangWeiZhi = [] // 样品留样位置
|
|
|
+ // let saoMaNumList = [] // 扫码确认数量列表
|
|
|
+ // let jieYangQueRenZTList = [] // 接样状态列表
|
|
|
+
|
|
|
+ let ypbhList = [] // 样品编号列表
|
|
|
+ // let mjypbList = [] // 明鉴样品表
|
|
|
+ // let mjypbWJ = [] // 明鉴样品表外键
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ // 罗湖样品编号列表
|
|
|
+ let lhypbhList = []
|
|
|
+ // 罗湖委托单列表
|
|
|
+ let lhwtsqbList = []
|
|
|
+ // 罗湖样品表列表
|
|
|
+ let lhypbList = []
|
|
|
+ // 罗湖样品表外键
|
|
|
+ let lhypbWJ = []
|
|
|
+ // 罗湖委托表主键
|
|
|
+ let lhwtbID = []
|
|
|
+ // 罗湖委托表展示表ID
|
|
|
+ let lhwtzsbID = []
|
|
|
+ // 罗湖样品id列表
|
|
|
+ let lhypIdList = []
|
|
|
+ // 罗湖样品id格式列表
|
|
|
+ let lhypIdNewList = []
|
|
|
+
|
|
|
+ for (let yp in ypInfoList) { //样品数据
|
|
|
+ let cfwz = ''
|
|
|
+ /*
|
|
|
+ 校验：
|
|
|
+ 1、样品数量 <= 确认数量
|
|
|
+ 2、是否留样 => 填收样位置|留样位置
|
|
|
+ 3、验收结果必填
|
|
|
+ 4、如果留样 => 必填项：留样日期、留样数量、留样期限至、销毁日期
|
|
|
+ */
|
|
|
+ if (ypInfoList[yp].jie_yang_shu_lian > ypInfoList[yp].yang_pin_zong_shu) {
|
|
|
+ this_.$message.error('操作失败，[' + ypInfoList[yp].yang_pin_ming_che + '] 接收确认数量不得大于收样数量。')
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ if (ypInfoList[yp].jie_yang_zhuang_t == '未确认') {
|
|
|
+ this_.$message.error('操作失败，[' + ypInfoList[yp].yang_pin_ming_che + '] 接收确认状态必须为已确认。')
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ if (ypInfoList[yp].yan_shou_jie_guo_ == null || ypInfoList[yp].yan_shou_jie_guo_ == '') {
|
|
|
+ this_.$message.error('操作失败，[' + ypInfoList[yp].yang_pin_ming_che + '] 验收结果不能为空!')
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ if (ypInfoList[yp].shi_fou_liu_yang_ == null || ypInfoList[yp].shi_fou_liu_yang_ == '') {
|
|
|
+ this_.$message.error('操作失败，[' + ypInfoList[yp].yang_pin_ming_che + '] 是否留样不能为空!')
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
+ if (ypInfoList[yp].bao_gao_bian_zhi_ == undefined || ypInfoList[yp].bao_gao_bian_zhi_ == '') {
|
|
|
+ this_.$message.error('操作失败，[' + ypInfoList[yp].yang_pin_ming_che + '] 报告编制员不能为空!')
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ if (ypInfoList[yp].bao_gao_shen_he_y == undefined || ypInfoList[yp].bao_gao_shen_he_y == '') {
|
|
|
+ this_.$message.error('操作失败，[' + ypInfoList[yp].yang_pin_ming_che + '] 报告审核员不能为空!')
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
+ if (ypInfoList[yp].shi_fou_liu_yang_ == "是") {
|
|
|
+ if (ypInfoList[yp].liu_yang_wei_zhi_ == null || ypInfoList[yp].liu_yang_wei_zhi_ == '') {
|
|
|
+ this_.$message.error("你要留样的话，存放位置不能为空哦!")
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ if (ypInfoList[yp].shou_yang_wei_zhi != undefined && ypInfoList[yp].shou_yang_wei_zhi != '') {
|
|
|
+ this_.$message.error("你要留样的话，就不要选收样存放位置!")
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ if (ypInfoList[yp].liu_yang_ri_qi_ == null || ypInfoList[yp].liu_yang_ri_qi_ == '') {
|
|
|
+ this_.$message.error("留样时必须填写留样日期!")
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ if (ypInfoList[yp].liu_yang_shu_lian == null || ypInfoList[yp].liu_yang_shu_lian == '') {
|
|
|
+ this_.$message.error("留样时必须填写留样数量!")
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ if (ypInfoList[yp].liu_yang_shu_lian > ypInfoList[yp].yang_pin_zong_shu) {
|
|
|
+ this_.$message.error('操作失败，[' + ypInfoList[yp].yang_pin_ming_che + '] 留样数量不得大于收样数量。')
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ if (ypInfoList[yp].liu_yang_qi_xian == null || ypInfoList[yp].liu_yang_qi_xian == '') {
|
|
|
+ this_.$message.error("留样时必须填写留样期限!")
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ if (ypInfoList[yp].xiao_hui_ri_qi_ == null || ypInfoList[yp].xiao_hui_ri_qi_ == '') {
|
|
|
+ this_.$message.error("留样时必须填写销毁日期!")
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ // let isLy = ypInfoList[yp].liu_yang_wei_zhi_
|
|
|
+ // // console.log(isLy, "留样");
|
|
|
+ // if (isLy.substr(-2, isLy.length - 1) == "占用" || isLy.substr(-2, isLy.length - 1) == "空余") { //？
|
|
|
+ // let sql = "select 'id' from MJ_yp_position_status where positionAndStatus = '" + isLy + "' limit 1"
|
|
|
+ // repostCurd('sql', sql).then(response => {
|
|
|
+ // cfwz = response.variables.data[0].id
|
|
|
+ // ypInfoList[yp].liu_yang_wei_zhi_ = cfwz
|
|
|
+ // // console.log(ypInfoList)
|
|
|
+ // console.log('?question time留样')
|
|
|
+ // })
|
|
|
+ // } else {
|
|
|
+ cfwz = ypInfoList[yp].liu_yang_wei_zhi_
|
|
|
+ // }
|
|
|
+
|
|
|
+ } else {
|
|
|
+ if (ypInfoList[yp].shou_yang_wei_zhi == null || ypInfoList[yp].shou_yang_wei_zhi == '') {
|
|
|
+ this_.$message.error("你正常收样的话，样品存放位置不能为空哦!")
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ if (ypInfoList[yp].liu_yang_wei_zhi_ != undefined && ypInfoList[yp].liu_yang_wei_zhi_ != '') {
|
|
|
+ this_.$message.error("你正常收样的话，就不要选择留样存放位置!")
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ // let isZC = ypInfoList[yp].shou_yang_wei_zhi
|
|
|
+ // if (isZC.substr(-2, isZC.length - 1) == "占用" || isZC.substr(-2, isZC.length - 1) == "空余") { //?
|
|
|
+ // let sql1 = "select `id` from MJ_yp_position_status where positionAndStatus = '" + isZC + "' limit 1"
|
|
|
+ // // console.log(sql1)
|
|
|
+ // repostCurd('sql', sql1).then(response => {
|
|
|
+ // // console.log(response.variables)
|
|
|
+ // cfwz = response.variables.data[0].id
|
|
|
+ // ypInfoList[yp].shou_yang_wei_zhi = cfwz //查询位置状态表 取值位置的id
|
|
|
+ // console.log('?question time')
|
|
|
+ // })
|
|
|
+ // } else {
|
|
|
+ cfwz = ypInfoList[yp].shou_yang_wei_zhi //取位置信息
|
|
|
+ // }
|
|
|
+ }
|
|
|
+ uuidList.push(ypInfoList[yp].biao_zhi_uuid_)
|
|
|
+ // ypIdList.push('{"id_":"' + ypInfoList[yp].id_ + '"}')
|
|
|
+ // ypWeiZhi.push(ypInfoList[yp].shou_yang_wei_zhi) // 收样存放位置
|
|
|
+ // ypLiuYangWeiZhi.push(ypInfoList[yp].liu_yang_wei_zhi_) // 留样存放位置
|
|
|
+ // saoMaNumList.push(ypInfoList[yp].jie_yang_shu_lian) // 扫码数量
|
|
|
+ // jieYangQueRenZTList.push(ypInfoList[yp].jie_yang_zhuang_t) // 接收确认状态
|
|
|
+ ypbhList.push('{"yang_pin_bian_hao":"' + ypInfoList[yp].yang_pin_bian_hao + '"}') // 样品编号列表
|
|
|
+
|
|
|
+
|
|
|
+ // 罗湖
|
|
|
+ // lhypbhList.push('{"yang_pin_bian_hao":"' + ypInfoList[yp].yang_pin_bian_hao + '"}')
|
|
|
+ // lhypbWJ.push('{"id_":"' + ypInfoList[yp].parent_id_ + '"}')
|
|
|
+ dWhere.push('{"id_":"' + cfwz + '"}')
|
|
|
+ cfwzIdList.push(cfwz)
|
|
|
+ lhypbhList.push( ypInfoList[yp].yang_pin_bian_hao )
|
|
|
+ lhypbWJ.push( ypInfoList[yp].parent_id_ )
|
|
|
+ lhypIdList.push( ypInfoList[yp].id_ )
|
|
|
+ lhypIdNewList.push('{"id_":"' + ypInfoList[yp].id_ + '"}')
|
|
|
+
|
|
|
+ ypbh.push(ypInfoList[yp].yang_pin_bian_hao)
|
|
|
+ }
|
|
|
+
|
|
|
+ /*
|
|
|
+ 封装好样品登记表对象，add 样品登记表
|
|
|
+ */
|
|
|
+ let value = ''
|
|
|
+ let lhypIdStr = ''
|
|
|
+ console.log('lhypbWJ :',lhypbWJ)
|
|
|
+ console.log('lhypIdList :',lhypIdList)
|
|
|
+ for(let i =0;i<lhypbWJ.length; i++){
|
|
|
+ value += lhypbWJ[i] + ','
|
|
|
+ }
|
|
|
+ value = value.substring(0,value.length-1)
|
|
|
+ value = value.replace(/,/g,"','")
|
|
|
+ console.log('value :',value)
|
|
|
+ for(let i = 0; i<lhypIdList.length;i++){
|
|
|
+ lhypIdStr += lhypIdList[i] + ','
|
|
|
+ }
|
|
|
+ lhypIdStr = lhypIdStr.substring(0,lhypIdStr.length-1)
|
|
|
+ lhypIdStr = lhypIdStr.replace(/,/g,"','")
|
|
|
+
|
|
|
+ console.log('lhypIdStr :',lhypIdStr)
|
|
|
+ let wtdAndYpb = []
|
|
|
+ // a.bao_gao_bian_zhi_,a.bao_gao_fu_he_yua,
|
|
|
+ let allSQL = `select a.id_ as wtID,a.zhan_shi_biao_id_,a.wei_tuo_lei_xing_,a.he_tong_id_,a.bao_gao_lei_xing_,a.wei_tuo_bian_hao_, a.wei_tuo_dan_wei_, a.wei_tuo_fang_lian, a.wei_tuo_lian,a.bao_gao_bian_zhi_,a.bao_gao_fu_he_yua,b.* from t_lhwtsqb a inner join t_lhypb b on a.id_ = b.parent_id_ where b.parent_id_ in ('${value}')and b.id_ in ('${lhypIdStr}')`
|
|
|
+ // console.log(allSQL)
|
|
|
+ repostCurd('sql', allSQL).then(res1 => {
|
|
|
+ /* 封装样品登记表对象 */
|
|
|
+ let ypdjb = []
|
|
|
+ let res = res1.variables.data
|
|
|
+ console.log('res ! ',res)
|
|
|
+ // wtdAndYpb.push(res)
|
|
|
+ wtdAndYpb = res
|
|
|
+
|
|
|
+ for(let i = 0; i<res.length; i++){
|
|
|
+ lhwtbID.push('{"id_":"' + res[i].wtID + '"}')
|
|
|
+ lhwtzsbID.push('{"shen_qing_id_":"' + res[i].zhan_shi_biao_id_ + '"}')
|
|
|
+ let count = 0;
|
|
|
+ if(res[i].yang_pin_lei_xing != '' && res[i].yang_pin_lei_xing != undefined){
|
|
|
+ count = 1;
|
|
|
+ if(res[i].yang_pin_lei_er_ != '' && res[i].yang_pin_lei_er_ != undefined){
|
|
|
+ count = 2;
|
|
|
+ if(res[i].yang_pin_lei_san_ != '' && res[i].yang_pin_lei_san_ != undefined){
|
|
|
+ count = 3;
|
|
|
+ if(res[i].yang_pin_lei_si_ != '' && res[i].yang_pin_lei_si_ != undefined){
|
|
|
+ count = 4;
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
- dWhere.push('{"id_":"' + cfwz + '"}')
|
|
|
- ypbh.push(ypInfoList[yp].yang_pin_bian_hao)
|
|
|
- uuidList.push(ypInfoList[yp].biao_zhi_uuid_)
|
|
|
- cfwzIdList.push(cfwz)
|
|
|
-
|
|
|
- ypIdList.push('{"id_":"' + ypInfoList[yp].id_ + '"}')
|
|
|
- ypWeiZhi.push(ypInfoList[yp].shou_yang_wei_zhi) // 收样存放位置
|
|
|
- ypLiuYangWeiZhi.push(ypInfoList[yp].liu_yang_wei_zhi_) // 留样存放位置
|
|
|
- saoMaNumList.push(ypInfoList[yp].jie_yang_shu_lian) // 扫码数量
|
|
|
- jieYangQueRenZTList.push(ypInfoList[yp].jie_yang_zhuang_t) // 接收确认状态
|
|
|
-
|
|
|
- ypbhList.push('{"yang_pin_bian_hao":"' + ypInfoList[yp].yang_pin_bian_hao + '"}') // 样品编号列表
|
|
|
- }
|
|
|
- for(let index in ypIdList){
|
|
|
- let WZtem = ypWeiZhi[index]==null?'':ypWeiZhi[index]
|
|
|
- let LYWZtem = ypLiuYangWeiZhi[index]==null?'':ypLiuYangWeiZhi[index]
|
|
|
- repostCurd('update','{"tableName":"t_mjypdjb","paramWhere":'+ypIdList[index]+',"paramCond":'+'{"shou_yang_wei_zhi":"'+WZtem+'","jie_yang_shu_lian":"'+saoMaNumList[index]+'","jie_yang_zhuang_t":"'+jieYangQueRenZTList[index]+'","liu_yang_wei_zhi_":"'+ LYWZtem + '"}}')
|
|
|
}
|
|
|
- for(let num in dWhere){
|
|
|
- if(this.OriginalPosition[num] != cfwzIdList[num]){
|
|
|
- let sql = "select * from t_mjypcfwz where id_ = '" + cfwzIdList[num] + "'"
|
|
|
- repostCurd('sql',sql).then(response=>{
|
|
|
- let resArr = response.variables.data
|
|
|
- if(resArr.length == 1){
|
|
|
- if(resArr[0].wei_zhi_zhuang_ta == "空余"){
|
|
|
- repostCurd('update','{"tableName":"t_mjypcfwz","paramWhere":'+dWhere[num]+',"paramCond":'+'{"wei_zhi_zhuang_ta":"占用","yang_pin_bian_hao":"'+ ypbh[num] + '","ru_ku_shi_jian_":"'+ this_.dateFormat() + '","shou_yang_ri_qi_":"'+ uuidList[num] + '"}}')
|
|
|
- }else if(resArr[0].wei_zhi_zhuang_ta == "占用"){
|
|
|
- // 新增一条新的位置记录,使用旧的位置记录 修改它的样品编号，入库时间，标识UUID
|
|
|
- let cfNewList = []
|
|
|
- let cfNew = {}
|
|
|
- cfNew["fang_jian_lei_xin"] = resArr[0].fang_jian_lei_xin
|
|
|
- cfNew["huo_jia_lei_xing_"] = resArr[0].huo_jia_lei_xing_
|
|
|
- cfNew["huo_jia_hao_"] = resArr[0].huo_jia_hao_
|
|
|
- cfNew["qu_yu_"] = resArr[0].qu_yu_
|
|
|
- cfNew["gua_jia_hao_"] = resArr[0].gua_jia_hao_
|
|
|
- cfNew["ceng_hao_"] = resArr[0].ceng_hao_
|
|
|
- cfNew["wei_zhi_bian_hao_"] = resArr[0].wei_zhi_bian_hao_
|
|
|
- cfNew["wei_zhi_zhuang_ta"] = resArr[0].wei_zhi_zhuang_ta
|
|
|
- cfNew["cun_fang_lei_xing"] = resArr[0].cun_fang_lei_xing
|
|
|
- cfNew["cun_chu_tiao_jian"] = resArr[0].cun_chu_tiao_jian
|
|
|
- cfNew["yang_pin_bian_hao"] = ypbh[num]
|
|
|
- cfNew["ru_ku_shi_jian_"] = this_.dateFormat()
|
|
|
- cfNew["shou_yang_ri_qi_"] = uuidList[num]
|
|
|
- cfNewList.push(cfNew)
|
|
|
- repostCurd('add','{"tableName":"t_mjypcfwz","paramWhere":'+JSON.stringify(cfNewList)+'}')
|
|
|
- }
|
|
|
- }
|
|
|
- })
|
|
|
- }
|
|
|
+ for(let x = 0; x<count;x++){
|
|
|
+ let obj = {}
|
|
|
+ obj["wei_tuo_dan_hao_"] = res[i].wei_tuo_bian_hao_
|
|
|
+ obj["wei_tuo_dan_wei_"] = res[i].wei_tuo_dan_wei_
|
|
|
+ obj["lian_xi_ren_"] = res[i].wei_tuo_fang_lian
|
|
|
+ obj["lian_xi_dian_hua_"] = res[i].wei_tuo_lian
|
|
|
+
|
|
|
+ obj["yang_ben_ming_che"] = res[i].yang_pin_ming_che
|
|
|
+ obj["yang_ben_bian_hao"] = res[i].yang_pin_bian_hao
|
|
|
+ obj["pi_hao_bian_hao_"] = res[i].song_jian_pi_hao_
|
|
|
+ obj["xing_ming_"] = res[i].xing_ming_
|
|
|
+ obj["xing_bie_"] = res[i].xing_bie_
|
|
|
+ obj["nian_ling_"] = res[i].nian_ling_
|
|
|
+ obj["yang_ben_zhuang_t"] = res[i].yang_pin_zhuang_t
|
|
|
+ obj["shou_yang_ri_qi_"] = this_.dateFormat()
|
|
|
+ obj["bei_zhu_"] = res[i].bei_zhu_
|
|
|
|
|
|
+ obj["yang_ben_lei_xing"] = x==0? res[i].yang_pin_lei_xing : x==1? res[i].yang_pin_lei_er_ : x==2? res[i].yang_pin_lei_san_ : x==3? res[i].yang_pin_lei_si_ :''
|
|
|
+ obj["yun_shu_tiao_jian"] = x==0? res[i].yang_ben_yun_shu_ : x==1? res[i].yang_pin_yun_shu_ : x==2? res[i].yang_pin_yun_san : x==3? res[i].yang_pin_yun_si_ :''
|
|
|
+ obj["yang_pin_shu_lian"] = x==0? res[i].shu_liang_ : x==1? res[i].shu_liang_er_ : x==2? res[i].shu_liang_san_ : x==3? res[i].shu_liang_si_ :''
|
|
|
+ obj["yang_ben_gui_ge_s"] = x==0? res[i].yang_pin_gui_ge_ : x==1? res[i].yang_pin_gui_ge_e : x==2? res[i].yang_pin_gui_ge_s : x==3? res[i].yang_pin_gui_si_ :''
|
|
|
+ // console.log('nnd ',ypInfoList[i])
|
|
|
+ obj["yan_shou_jie_guo_"] = ypInfoList[i].yan_shou_jie_guo_
|
|
|
+ obj["cun_fang_wei_zhi_"] = ypInfoList[i].shou_yang_wei_zhi
|
|
|
+ obj["liu_zhuan_zhuang_"] = '待检'
|
|
|
+ obj["shi_fou_liu_yang_"] = ypInfoList[i].shi_fou_liu_yang_
|
|
|
+ // obj["shou_yang_ren_"] = ypInfoList[i].
|
|
|
+ // obj["jiao_yang_ri_qi_"] = ypInfoList[i].
|
|
|
+ // obj["jiao_yang_jyr"] = ypInfoList[i].
|
|
|
+ // obj["jiao_yang_shu_lia"] = ypInfoList[i].
|
|
|
+ obj["liu_yang_ri_qi_"] = ypInfoList[i].liu_yang_ri_qi_
|
|
|
+ obj["liu_yang_cun_fang"] = ypInfoList[i].liu_yang_cun_fang
|
|
|
+ obj["liu_yang_shu_lian"] = ypInfoList[i].liu_yang_shu_lian
|
|
|
+ obj["liu_yang_qi_xian"] = ypInfoList[i].liu_yang_qi_xian
|
|
|
+ obj["xiao_hui_ri_qi_"] = ypInfoList[i].xiao_hui_ri_qi_
|
|
|
+ obj["fan_yang_ri_qi_"] = ypInfoList[i].fan_yang_ri_qi_
|
|
|
+ obj["fan_yang_jyr"] = ypInfoList[i].fan_yang_jyr
|
|
|
+ changeWeiZhi = ypInfoList[i].shou_yang_wei_zhi ==''?'':ypInfoList[i].shou_yang_wei_zhi
|
|
|
+ changesyWeiZhi = ypInfoList[i].liu_yang_cun_fang ==''?'':ypInfoList[i].liu_yang_cun_fang
|
|
|
+ ypdjb.push(obj)
|
|
|
}
|
|
|
- repostCurd('selects','{"tableName":"t_mjypb","paramWhere":['+ypbhList+']}').then(response=>{
|
|
|
- mjypbList = response.variables.data
|
|
|
- let wjList = []
|
|
|
- let wjAll = []
|
|
|
- let wjAllList = []
|
|
|
- for(let i in mjypbList){
|
|
|
- wjList.push(mjypbList[i].wai_jian_)
|
|
|
- wjAll.push(mjypbList[i].wai_jian_)
|
|
|
- }
|
|
|
- wjList = this_.unique(wjList)
|
|
|
- for(let i in wjList){
|
|
|
- mjypbWJ.push('{"id_":"' + wjList[i]+ '"}')
|
|
|
- }
|
|
|
- for(let i in wjAll){
|
|
|
- wjAllList.push('{"id_":"' + wjAll[i]+ '"}')
|
|
|
- }
|
|
|
- repostCurd('updates','{"tableName":"t_mjwtsqb","paramWhere":['+mjypbWJ+'],"paramCond":{"zhuang_tai_":"委托结束"}}')
|
|
|
- let mjwtsqbAllResult = []
|
|
|
- let mjwtsqbIdList = []
|
|
|
- let mjfbbList = []
|
|
|
- let mjfbbWJList = []
|
|
|
- // console.log('wjAllList',wjAllList)
|
|
|
- for(let i in wjAllList){
|
|
|
- repostCurd('select','{"tableName":"t_mjwtsqb","paramWhere":'+wjAllList[i]+'}').then(response=>{
|
|
|
- mjfbbWJList.push('{"wei_tuo_wai_jian_":"' + response.variables.data[0].id_ + '"}')
|
|
|
- mjwtsqbAllResult.push(response.variables.data[0])
|
|
|
- mjwtsqbIdList.push('{"id_":"' + response.variables.data[0].id_ + '"}')
|
|
|
- // console.log('fbb=>',i,mjfbbWJList[i])
|
|
|
- // repostCurd('select','{"tableName":"t_mjfbb","paramWhere":'+mjfbbWJList[i]+'}').then(response=>{
|
|
|
- // console.log(response.variables)
|
|
|
- // mjfbbList.push(response.variables.data)
|
|
|
- // })
|
|
|
- })
|
|
|
+ }
|
|
|
+ // console.log('进入样品登记表...',ypdjb)
|
|
|
+ repostCurd('add', '{"tableName":"t_lhypdjb","paramWhere":' + JSON.stringify(ypdjb) + '}')
|
|
|
+ repostCurd('updates', '{"tableName":"t_lhypb","paramWhere":[' + lhypIdNewList + '],"paramCond":{"jie_yang_zhuang_t":"已接收"}}')
|
|
|
+
|
|
|
+ console.log('接下来样品列表：',ypInfoList)
|
|
|
+ console.log('委托单：',res)
|
|
|
+ /*
|
|
|
+ 更新委托单 如果本来没值，就更新 报告编制人和 报告审核员 否则更新
|
|
|
+ 委托单数组 和 样品数组 数量相同，遍历两者 判断委托单是否有编制人，审核员？
|
|
|
+ 如果没有，则记录下委托单ID，以及同索引下的样品表的编制人和审核员
|
|
|
+ */
|
|
|
+ // let finalWtdIdList = []
|
|
|
+ for(var index = 0; index < ypInfoList.length; index++){
|
|
|
+ if(res[index].bao_gao_bian_zhi_ == '' || res[index].bao_gao_fu_he_yua == ''){
|
|
|
+ // console.log('{"id_":"' + res[index].id_ + '"}')
|
|
|
+ // console.log(ypInfoList[index].bao_gao_bian_zhi_)
|
|
|
+ // console.log(ypInfoList[index].bao_gao_shen_he_y)
|
|
|
+ repostCurd('update','{"tableName":"t_lhwtsqb","paramWhere":' + '{"id_":"' + res[index].wtID + '"}' + ',"paramCond":' + '{"bao_gao_bian_zhi_":"'+ypInfoList[index].bao_gao_bian_zhi_+'","bao_gao_fu_he_yua":"' + ypInfoList[index].bao_gao_shen_he_y + '"}}')
|
|
|
+ }
|
|
|
+ }
|
|
|
+ /*
|
|
|
+ let wtdSQL = "select id_,bao_gao_bian_zhi_,bao_gao_fu_he_yua from t_lhwtsqb where id_ in('" + value + "')"
|
|
|
+
|
|
|
+ repostCurd('sql', wtdSQL).then(response => {
|
|
|
+ let result = response.variables.data
|
|
|
+ console.log(result)
|
|
|
+ for(var i in result){
|
|
|
+ if(result[i].bao_gao_bian_zhi_ == '' || result[i].bao_gao_bian_zhi_ == undefined){
|
|
|
+ finalWtdIdList.push(result[i])
|
|
|
}
|
|
|
- setTimeout(()=>{
|
|
|
- let narr = []
|
|
|
- for(let a of mjfbbWJList){
|
|
|
- narr.push(a)
|
|
|
- }
|
|
|
- repostCurd('selects','{"tableName":"t_mjfbb","paramWhere":['+narr+']}').then(response=>{
|
|
|
- console.log(response.variables)
|
|
|
- mjfbbList.push(response.variables.data)
|
|
|
- })
|
|
|
- }, 1000)
|
|
|
-
|
|
|
- setTimeout(()=>{
|
|
|
-
|
|
|
- // let mjfbbArray = []
|
|
|
- // for(let a in mjfbbList){
|
|
|
- // for(let b in mjfbbList[a]){
|
|
|
- // mjfbbArray.push(mjfbbList[a][b])
|
|
|
- // }
|
|
|
- // }
|
|
|
- // console.log('mjfbbArray',mjfbbArray)
|
|
|
-
|
|
|
- // console.log('mjfbbList',mjfbbList)
|
|
|
- // console.log('mjypbList',mjypbList)
|
|
|
- let rwb = []
|
|
|
- let index = 0
|
|
|
- if(mjypbList != null && mjypbList.length >= 1){
|
|
|
- index = mjypbList[0].jian_ce_xiang_mu2.split(",").length - 1
|
|
|
- }
|
|
|
- for(var i in mjypbList){
|
|
|
- let str = mjypbList[i].jian_ce_xiang_mu2.split(",")
|
|
|
- // index += str.length-1
|
|
|
- for(var p in str){
|
|
|
- // console.log('坐标',i,p)
|
|
|
- let temp = index - p
|
|
|
- let rwzb = {}
|
|
|
- let wz_ = ypInfoList[i].shi_fou_liu_yang_ == "是" ? ypInfoList[i].liu_yang_wei_zhi_ : ypInfoList[i].shou_yang_wei_zhi // 对应的样品存放位置
|
|
|
- rwzb["jian_ce_xiang_mu_"] = str[p] // 取当前检测项目
|
|
|
- rwzb["yang_pin_bian_hao"] = mjypbList[i].yang_pin_bian_hao // 取对应的样品编号
|
|
|
- rwzb["yang_pin_ming_che"] = mjypbList[i].yang_pin_ming_che // 对应的样品名称
|
|
|
- rwzb["yang_pin_dai_ci_"] = mjypbList[i].dai_ci_ // 对应的样品代次
|
|
|
- rwzb["yang_pin_pi_hao_"] = mjypbList[i].pi_hao_ // 对应的样品批号
|
|
|
- rwzb["yang_pin_shu_lian"] = mjypbList[i].shu_liang_ // 对应的样品数量
|
|
|
- rwzb["bug_ri_qi_"] = mjypbList[i].song_yang_ri_qi_ // 对应的送样日期
|
|
|
- rwzb["cun_fang_wei_zhi_"] = wz_
|
|
|
- rwzb["wei_tuo_wai_jian_"] = mjypbList[i].wai_jian_ // 检测申请单id
|
|
|
- rwzb["he_tong_wai_jian_"] = mjwtsqbAllResult[i].he_tong_bian_hao_ //合同id
|
|
|
- rwzb["song_yang_ri_qi_"] = mjypbList[i].biao_zhi_uuid_ // 收样日期
|
|
|
- rwzb["wei_tuo_ren_"] = mjwtsqbAllResult[i].lian_xi_ren_ // 委托人
|
|
|
- rwzb["bao_gao_jian_ce_s"] = this_.dateFormat() // 检测时间
|
|
|
- rwzb["zhan_shi_biao_wai"] = mjwtsqbAllResult[i].ye_mian_zong_zhua
|
|
|
- rwzb["zhuang_tai_"] = "任务待分配" // 状态
|
|
|
- rwzb["shi_fou_fen_bao_"] = mjfbbList[0][temp].shi_fou_fen_bao_ // 是否分包
|
|
|
- rwzb["qi_wang_wan_cheng"] = mjfbbList[0][temp].wan_cheng_shi_jia // 期望完成时间
|
|
|
- rwb.push(rwzb)
|
|
|
+ }
|
|
|
+ console.log('finalWtdIdList',finalWtdIdList)
|
|
|
+ }) */
|
|
|
+
|
|
|
+
|
|
|
+ /*
|
|
|
+ 3、任务分配 【2022/11/23 取消 直接 批量开检测子流程】
|
|
|
+ 3-1、根据 wtdAndYpb 的 wtID 更改委托表的 委托状态 wei_tuo_zhuang_ta 变成 已完成
|
|
|
+ 3-2、根据每个样品对应的检测项目，开启一个或多个任务 / 遍历样品表开任务分配流程，一个样品可能对应多个检测
|
|
|
+ 3-3、委托表找zhan_shi_biao_id_ 修改 t_lhwtzsb "zhuang_tai_"为"任务分配进行中"
|
|
|
+
|
|
|
+ // console.log('委托单及样品信息',wtdAndYpb)
|
|
|
+ // console.log('委托单id列表 ',lhwtbID)
|
|
|
+ // console.log('展示表id列表 ',lhwtzsbID)
|
|
|
+
|
|
|
+ repostCurd('updates', '{"tableName":"t_lhwtsqb","paramWhere":[' + lhwtbID + '],"paramCond":{"wei_tuo_zhuang_ta":"已完成"}}')
|
|
|
+
|
|
|
+ let rws = []
|
|
|
+ if(wtdAndYpb.length>0){
|
|
|
+ for(var i in wtdAndYpb){
|
|
|
+ let strs = wtdAndYpb[i].jian_ce_xiang_mu_.split(',')
|
|
|
+ for(var l in strs){
|
|
|
+ let rw = {}
|
|
|
+ rw["ren_wu_ming_cheng"] = strs[l] //检测项目
|
|
|
+ rw["yang_pin_ming_che"] = wtdAndYpb[i].yang_pin_ming_che//样品名称
|
|
|
+ rw["yang_pin_bian_hao"] = wtdAndYpb[i].yang_pin_bian_hao//样品编号
|
|
|
+ rw["wei_tuo_lei_xing_"] = wtdAndYpb[i].wei_tuo_lei_xing_ //委托类型
|
|
|
+ let yplxz = ''
|
|
|
+ if(wtdAndYpb[i].yang_pin_lei_xing != null && wtdAndYpb[i].yang_pin_lei_xing!=''){ //样品类型1
|
|
|
+ yplxz = wtdAndYpb[i].yang_pin_lei_xing //样品类型
|
|
|
+ }
|
|
|
+ if(wtdAndYpb[i].yang_pin_lei_er_ != null && wtdAndYpb[i].yang_pin_lei_er_!=''){ //样品类型2
|
|
|
+ if(yplxz==null || yplxz == ''){
|
|
|
+ yplxz = wtdAndYpb[i].yang_pin_lei_er_ //样品类型
|
|
|
+ }else{
|
|
|
+ yplxz =yplxz+','+ wtdAndYpb[i].yang_pin_lei_er_ //样品类型
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if(wtdAndYpb[i].yang_pin_lei_san_ != null && wtdAndYpb[i].yang_pin_lei_san_!=''){ //样品类型3
|
|
|
+ if(yplxz==null || yplxz == ''){
|
|
|
+ yplxz = wtdAndYpb[i].yang_pin_lei_san_ //样品类型
|
|
|
+ }else{
|
|
|
+ yplxz =yplxz+','+ wtdAndYpb[i].yang_pin_lei_san_ //样品类型
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if(wtdAndYpb[i].yang_pin_lei_si_ != null && wtdAndYpb[i].yang_pin_lei_si_!=''){ //样品类型4
|
|
|
+ if(yplxz==null || yplxz == ''){
|
|
|
+ yplxz = wtdAndYpb[i].yang_pin_lei_si_ //样品类型
|
|
|
+ }else{
|
|
|
+ yplxz = yplxz+','+ wtdAndYpb[i].yang_pin_lei_si_ //样品类型
|
|
|
+ }
|
|
|
+ }
|
|
|
+ rw["yang_pin_lei_xing"] = yplxz //样品类型
|
|
|
+ rw["wei_tuo_id_"] = wtdAndYpb[i].wtID //委托id
|
|
|
+ rw["he_tong_id_"] = wtdAndYpb[i].he_tong_id_ //合同id
|
|
|
+ rw["zhuang_tai_"] = '待任务分配'//状态
|
|
|
+ rw["wan_cheng_shi_jia"] = wtdAndYpb[i].song_jian_shi_jia //送检日期
|
|
|
+ rw["bao_gao_bian_zhi_"] = ypInfoList[i].bao_gao_bian_zhi_ //报告编制人
|
|
|
+ rw["bao_gao_shen_he_y"] = ypInfoList[i].bao_gao_shen_he_y //报告审核人
|
|
|
+ rw["bao_gao_lei_xing_"] = wtdAndYpb[i].bao_gao_lei_xing_ //报告类型
|
|
|
+ rw["xin_xiang_mu_ming"] = wtdAndYpb[i].xiang_mu_ming_che //项目名称
|
|
|
+ rw["zhan_shi_biao_id_"] = wtdAndYpb[i].zhan_shi_biao_id_ //展示表id
|
|
|
+ rws.push(rw)
|
|
|
}
|
|
|
- index += str.length
|
|
|
- }
|
|
|
- // console.log('任务表：',rwb)
|
|
|
-
|
|
|
- repostCurd('updates', '{"tableName":"t_mjwtsqb","paramWhere":['+mjwtsqbIdList+'],"paramCond":{"jian_ce_kai_shi_s":"' + this_.dateFormat() + '"}}')
|
|
|
- let uidList = []
|
|
|
- for(let item of mjwtsqbAllResult){
|
|
|
- uidList.push(item.ye_mian_zong_zhua)
|
|
|
- }
|
|
|
- uidList = this_.unique(uidList)
|
|
|
- repostCurd('add', '{"tableName":"t_rwfpb","paramWhere":'+JSON.stringify(rwb)+',"defKey":"Process_04tgh24","formKey":"mjrwfp"}' )
|
|
|
- if(uidList.length > 0 ){
|
|
|
- let ups = []
|
|
|
- for(let t of uidList){
|
|
|
- ups.push('{"shen_qing_id_":"'+t+'"}')
|
|
|
+ }
|
|
|
+ // console.log("任务分配",rws)
|
|
|
+ repostCurd('add', '{"tableName":"t_lhrwfpb","paramWhere":'+JSON.stringify(rws)+',"defKey":"Process_04o0csc","formKey":"lhrwfp"}')
|
|
|
+ }
|
|
|
+ // 更新委托单 检测开始时间 问吴懿是否需要
|
|
|
+ //repostCurd('updates', '{"tableName":"t_lhwtsqb","paramWhere":[' + lhwtbID + '],"paramCond":{"jian_ce_kai_shi_s":"' + this_.dateFormat() + '"}}')
|
|
|
+
|
|
|
+ //更新展示表
|
|
|
+ if(lhwtzsbID.length > 0){
|
|
|
+ repostCurd('updates', '{"tableName":"t_lhwtzsb","paramWhere":['+lhwtzsbID+'],"paramCond":{"zhuang_tai_":"任务分配进行中"}}')
|
|
|
+ }
|
|
|
+ */
|
|
|
+
|
|
|
+ /*
|
|
|
+ 3、【任务分配2022/11/23 取消 直接 批量开检测子流程】
|
|
|
+ 3-1、根据 wtdAndYpb 的 wtID 更改委托表的 委托状态 wei_tuo_zhuang_ta 变成 已完成
|
|
|
+ 3-2、根据每个样品对应的检测项目，开启一个或多个任务 / 遍历样品表开检测子流程，一个样品可能对应多个检测
|
|
|
+ 3-3、委托表找zhan_shi_biao_id_ 修改 t_lhwtzsb "zhuang_tai_"为"待环境监控"
|
|
|
+ */
|
|
|
+
|
|
|
+ let fbbIndex = 0;
|
|
|
+ repostCurd('updates', '{"tableName":"t_lhwtsqb","paramWhere":[' + lhwtbID + '],"paramCond":{"wei_tuo_zhuang_ta":"已完成"}}')
|
|
|
+ if(wtdAndYpb.length>0){
|
|
|
+ for(var i in wtdAndYpb){
|
|
|
+ let strs = wtdAndYpb[i].jian_ce_xiang_mu_.split(',')
|
|
|
+ for(var l in strs){
|
|
|
+ // 循坏一次 分包表索引+1
|
|
|
+ let jcxm = strs[l]
|
|
|
+ if(jcxm != null && jcxm != ''){
|
|
|
+ let sqljc = "select * from t_mjjcnlfw where id_ = '"+ jcxm +"'"
|
|
|
+ repostCurd('sql',sqljc).then(response => {
|
|
|
+ let contjc = response.variables.data
|
|
|
+ if(contjc.length>0){
|
|
|
+ let zhu = []
|
|
|
+ let zhus = {}
|
|
|
+ // 罗湖
|
|
|
+ let yplxz = ''
|
|
|
+ if(wtdAndYpb[i].yang_pin_lei_xing != null && wtdAndYpb[i].yang_pin_lei_xing!=''){ //样品类型1
|
|
|
+ yplxz = wtdAndYpb[i].yang_pin_lei_xing //样品类型
|
|
|
+ }
|
|
|
+ if(wtdAndYpb[i].yang_pin_lei_er_ != null && wtdAndYpb[i].yang_pin_lei_er_!=''){ //样品类型2
|
|
|
+ if(yplxz==null || yplxz == ''){
|
|
|
+ yplxz = wtdAndYpb[i].yang_pin_lei_er_ // 样品类型
|
|
|
+ }else{
|
|
|
+ yplxz =yplxz+','+ wtdAndYpb[i].yang_pin_lei_er_ //样品类型
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if(wtdAndYpb[i].yang_pin_lei_san_ != null && wtdAndYpb[i].yang_pin_lei_san_!=''){ //样品类型3
|
|
|
+ if(yplxz==null || yplxz == ''){
|
|
|
+ yplxz = wtdAndYpb[i].yang_pin_lei_san_ //样品类型
|
|
|
+ }else{
|
|
|
+ yplxz =yplxz+','+ wtdAndYpb[i].yang_pin_lei_san_ //样品类型
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if(wtdAndYpb[i].yang_pin_lei_si_ != null && wtdAndYpb[i].yang_pin_lei_si_!=''){ //样品类型4
|
|
|
+ if(yplxz==null || yplxz == ''){
|
|
|
+ yplxz = wtdAndYpb[i].yang_pin_lei_si_ //样品类型
|
|
|
+ }else{
|
|
|
+ yplxz = yplxz+','+ wtdAndYpb[i].yang_pin_lei_si_ //样品类型
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ zhus["jian_ce_yuan_"] = //检测员
|
|
|
+ zhus["fu_he_yuan_"] = //校验员
|
|
|
+ zhus["yang_pin_ming_che"] = wtdAndYpb[i].yang_pin_ming_che // 样品名称
|
|
|
+ zhus["yang_pin_bian_hao"] = wtdAndYpb[i].yang_pin_bian_hao // 样品编号
|
|
|
+ zhus["jian_ce_xiang_mu_"] = jcxm // 任务名称
|
|
|
+ zhus["wei_tuo_id_"] = wtdAndYpb[i].wtID // 委托id
|
|
|
+ zhus["he_tong_id_"] = wtdAndYpb[i].he_tong_id_ // 合同id
|
|
|
+ zhus["bao_gao_bian_zhi_"] = ypInfoList[i].bao_gao_bian_zhi_ // 报告编制员
|
|
|
+ zhus["bao_gao_fu_he_yua"] = ypInfoList[i].bao_gao_shen_he_y // 报告审核员
|
|
|
+ zhus["wei_tuo_lei_xing_"] = wtdAndYpb[i].wei_tuo_lei_xing_ // 委托类型
|
|
|
+ zhus["yang_pin_lei_xing"] = yplxz // 样品类型
|
|
|
+ zhus["xin_xiang_mu_ming"] = wtdAndYpb[i].xiang_mu_ming_che // 新项目名称
|
|
|
+ zhus["wan_cheng_shi_jia"] = wtdAndYpb[i].song_jian_shi_jia // 送检日期
|
|
|
+ zhus["zhuang_tai_"] = '待环境监控'
|
|
|
+ zhus["zhan_shi_biao_id_"] = wtdAndYpb[i].zhan_shi_biao_id_ // 展示表id
|
|
|
+ zhu.push(zhus)
|
|
|
+ //根据检测项目查出对应检测项目的actitve的key 以及formKey 拼接参数开启流程
|
|
|
+ repostCurd('add', '{"tableName":"t_lhjczb","paramWhere":'+JSON.stringify(zhu)+',"defKey":"'+contjc[0].defkey_+'","formKey":"'+contjc[0].formkey_+'"}')
|
|
|
+ }
|
|
|
+ })
|
|
|
+ }
|
|
|
+
|
|
|
+ fbbIndex ++;
|
|
|
}
|
|
|
- repostCurd('updates', '{"tableName":"t_mjwtzsb","paramWhere":['+ups+'],"paramCond":{"zhuang_tai_":"任务分配进行中"}}')
|
|
|
- }/**/
|
|
|
- },5000)
|
|
|
- })
|
|
|
- this.$emit('callback',true)
|
|
|
- this.visable = false
|
|
|
- this.$message({
|
|
|
- message:'样品接收确认操作成功！',
|
|
|
- type:'success'
|
|
|
- })
|
|
|
- this.closeDialog();
|
|
|
- }).catch(_ => {});
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ //更新展示表
|
|
|
+ if(lhwtzsbID.length > 0){
|
|
|
+ repostCurd('updates', '{"tableName":"t_lhwtzsb","paramWhere":['+lhwtzsbID+'],"paramCond":{"zhuang_tai_":"检测进行中"}}')
|
|
|
+ }
|
|
|
+
|
|
|
+ })
|
|
|
+
|
|
|
+ // console.log('dWhere : ',dWhere)
|
|
|
+
|
|
|
+ /* 2、更新货架位置信息（位置状态、样品编号、入库时间）如果是重复位置，则新增一条位置记录，并增加对应UUID */
|
|
|
+ for (let num in dWhere) {
|
|
|
+ let sql = "select * from t_ypcfwz where id_ = '" + cfwzIdList[num] + "'"
|
|
|
+ repostCurd('sql', sql).then(response => {
|
|
|
+ let resArr = response.variables.data
|
|
|
+ if (resArr.length == 1) {
|
|
|
+ if (resArr[0].wei_zhi_zhuang_ta == "空余") {
|
|
|
+ repostCurd('update', '{"tableName":"t_ypcfwz","paramWhere":' + dWhere[num] + ',"paramCond":' + '{"wei_zhi_zhuang_ta":"占用","yang_pin_bian_hao":"' + ypbh[num] +'","ru_ku_shi_jian_":"' + this_.dateFormat() + '"}}').then(res => {
|
|
|
+ console.log("原本位置为空余 ，新位置更新成功")
|
|
|
+ })
|
|
|
+ } else if (resArr[0].wei_zhi_zhuang_ta == "占用") {
|
|
|
+ // 新增一条新的位置记录,使用旧的位置记录 修改它的样品编号，入库时间，标识UUID
|
|
|
+ let cfNewList = []
|
|
|
+ let cfNew = {}
|
|
|
+ cfNew["fang_jian_lei_xin"] = resArr[0].fang_jian_lei_xin
|
|
|
+ cfNew["wei_zhi_"] = resArr[0].wei_zhi_
|
|
|
+ cfNew["qu_yu_"] = resArr[0].qu_yu_
|
|
|
+ cfNew["huo_jia_lei_xing_"] = resArr[0].huo_jia_lei_xing_
|
|
|
+ cfNew["huo_jia_hao_"] = resArr[0].huo_jia_hao_
|
|
|
+ cfNew["ceng_hao_"] = resArr[0].ceng_hao_
|
|
|
+ cfNew["shui_ping_fen_qu_"] = resArr[0].shui_ping_fen_qu_
|
|
|
+ cfNew["wei_zhi_bian_hao_"] = resArr[0].wei_zhi_bian_hao_
|
|
|
+ cfNew["wei_zhi_zhuang_ta"] = resArr[0].wei_zhi_zhuang_ta
|
|
|
+ cfNew["cun_chu_tiao_jian"] = resArr[0].cun_chu_tiao_jian
|
|
|
+ cfNew["yang_pin_bian_hao"] = ypbh[num]
|
|
|
+ // cfNew["yang_pin_bian_hao"] = lhypIdList[num]
|
|
|
+ cfNew["ru_ku_shi_jian_"] = this_.dateFormat()
|
|
|
+ cfNew["biao_zhi_uuid_"] = this_.uuid()
|
|
|
+ cfNewList.push(cfNew)
|
|
|
+ let uuid = cfNew["biao_zhi_uuid_"];
|
|
|
+ console.log('原本位置为占用 ，新位置插入成功')
|
|
|
+
|
|
|
+ repostCurd('add', '{"tableName":"t_ypcfwz","paramWhere":' + JSON.stringify(cfNewList) + '}').then(res => {
|
|
|
+ let selectsql = "select id_ from t_ypcfwz where biao_zhi_uuid_='" + uuid + "'";
|
|
|
+ repostCurd('sql', selectsql).then(res => {
|
|
|
+ let dataid = res.variables.data[0].id_;
|
|
|
+ let abc = '{"biao_zhi_uuid_":"' + uuid + '"}'
|
|
|
+ // console.log('zzj abc ',abc)
|
|
|
+ if (changeWeiZhi && !changesyWeiZhi) {
|
|
|
+ // alert(1)
|
|
|
+ repostCurd('update', '{"tableName":"t_lhypdjb","paramWhere":' + abc + ',"paramCond":' + '{"shou_yang_wei_zhi":"' + dataid + '"}}').then(res => {
|
|
|
+ console.log('回填样品收样位置')
|
|
|
+ })
|
|
|
+ } else {
|
|
|
+ // alert(2)
|
|
|
+ repostCurd('update', '{"tableName":"t_lhypdjb","paramWhere":' + abc + ',"paramCond":' + '{"liu_yang_wei_zhi_":"' + dataid + '"}}').then(res => {
|
|
|
+ console.log('回填样品留样位置')
|
|
|
+ })
|
|
|
+ }
|
|
|
+ })
|
|
|
+
|
|
|
+ })
|
|
|
+ }
|
|
|
+ }
|
|
|
+ })
|
|
|
+ }
|
|
|
+ this.$emit('callback', true)
|
|
|
+ this.visable = false
|
|
|
+ this.$message({
|
|
|
+ message: '样品接收确认操作成功！',
|
|
|
+ type: 'success'
|
|
|
+ })
|
|
|
+ this.closeDialog();
|
|
|
+ }).catch(_ => {});
|
|
|
}
|
|
|
|
|
|
},
|
|
|
+
|
|
|
/* 去除指定行数据 使用过滤器filter过滤指定行号数据 */
|
|
|
- deleteData(val){
|
|
|
- this.listData = this.listData.filter((data) =>{
|
|
|
- return data.id_!=val
|
|
|
- })
|
|
|
+ deleteData(val) {
|
|
|
+ this.listData = this.listData.filter((data) => {
|
|
|
+ return data.id_ != val
|
|
|
+ })
|
|
|
},
|
|
|
|
|
|
unique(arr) {
|
|
|
@@ -305,51 +595,70 @@ export default {
|
|
|
return arr.indexOf(item, 0) === index;
|
|
|
});
|
|
|
},
|
|
|
- /* 提交数据
|
|
|
- commitData(val){
|
|
|
- for(let item of val) {
|
|
|
- let dataWhere = [] //ajax的修改字段
|
|
|
- dataWhere.push('{"tableName":"t_gdyrqcyp" + "," + "paramWhere":"id_:'+item.id_ +'" +","+ "shu_liang_":"'+ item.shu_liang_ +'" +","+ "lingYongRen":"' + item.ling_yong_ren_ + '" +","+ "cunFangWeiZhi":"' + item.cun_fang_wei_zhi_ + '" +","+ "sign":"out"}')
|
|
|
- // dataWhere.push('{"yangPinBianHao":"'+ item.yang_pin_bian_hao +'" +","+ "lingYongRen":"' + item.ling_yong_ren_ + '" +","+ "cunFangWeiZhi":"' + item.cun_fang_wei_zhi_ + '" +","+ "shuLiang":"' + item.shu_liang_ + '"}')
|
|
|
-
|
|
|
- // repostCurd('updateSample',"{data:'"+JSON.stringify(dataWhere)+"'}").then(response =>{
|
|
|
- // console.log(response)
|
|
|
- // })
|
|
|
-
|
|
|
- // this.Update('t_gdyrqcyp',{"id_":item.id_},"{data:'"+JSON.stringify(dataWhere)+"'}").then(response => {
|
|
|
- // this.$emit('callback', true)
|
|
|
- // this.visible = false
|
|
|
- // this.$message({
|
|
|
- // message: '样品出库操作成功!',
|
|
|
- // type: 'success'
|
|
|
- // });
|
|
|
- // })
|
|
|
- }
|
|
|
- },*/
|
|
|
- Update (name,where,cond) {
|
|
|
- let cont = {}
|
|
|
- cont['tableName'] = name
|
|
|
- cont['paramWhere'] = where
|
|
|
- cont['paramCond'] = cond
|
|
|
- return repostCurd('update',JSON.stringify(cont))
|
|
|
- },
|
|
|
+ uuid() {
|
|
|
+ var s = [];
|
|
|
+ var hexDigits = "0123456789abcdef";
|
|
|
+ for (var i = 0; i < 36; i++) {
|
|
|
+ s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1);
|
|
|
+ }
|
|
|
+ s[14] = "4"; // bits 12-15 of the time_hi_and_version field to 0010
|
|
|
+ s[19] = hexDigits.substr((s[19] & 0x3) | 0x8, 1); // bits 6-7 of the clock_seq_hi_and_reserved to 01
|
|
|
+ s[8] = s[13] = s[18] = s[23] = "-";
|
|
|
+ var uuid = s.join("");
|
|
|
+ return uuid;
|
|
|
+ },
|
|
|
+ /* 根据样品编号 查询所有样品表
|
|
|
+ SearchAllypbEvent(lhypbhList){
|
|
|
+ repostCurd('selects','{"tableName":"t_lhypb","paramWhere":[' + lhypbhList + ']}').then(res =>{
|
|
|
+ return res.variables.data
|
|
|
+ })
|
|
|
+ },
|
|
|
+ */
|
|
|
+ /* 提交数据
|
|
|
+ commitData(val){
|
|
|
+ for(let item of val) {
|
|
|
+ let dataWhere = [] //ajax的修改字段
|
|
|
+ dataWhere.push('{"tableName":"t_gdyrqcyp" + "," + "paramWhere":"id_:'+item.id_ +'" +","+ "shu_liang_":"'+ item.shu_liang_ +'" +","+ "lingYongRen":"' + item.ling_yong_ren_ + '" +","+ "cunFangWeiZhi":"' + item.cun_fang_wei_zhi_ + '" +","+ "sign":"out"}')
|
|
|
+ // dataWhere.push('{"yangPinBianHao":"'+ item.yang_pin_bian_hao +'" +","+ "lingYongRen":"' + item.ling_yong_ren_ + '" +","+ "cunFangWeiZhi":"' + item.cun_fang_wei_zhi_ + '" +","+ "shuLiang":"' + item.shu_liang_ + '"}')
|
|
|
+
|
|
|
+ // repostCurd('updateSample',"{data:'"+JSON.stringify(dataWhere)+"'}").then(response =>{
|
|
|
+ // console.log(response)
|
|
|
+ // })
|
|
|
+
|
|
|
+ // this.Update('t_gdyrqcyp',{"id_":item.id_},"{data:'"+JSON.stringify(dataWhere)+"'}").then(response => {
|
|
|
+ // this.$emit('callback', true)
|
|
|
+ // this.visible = false
|
|
|
+ // this.$message({
|
|
|
+ // message: '样品出库操作成功!',
|
|
|
+ // type: 'success'
|
|
|
+ // });
|
|
|
+ // })
|
|
|
+ }
|
|
|
+ },*/
|
|
|
+ Update(name, where, cond) {
|
|
|
+ let cont = {}
|
|
|
+ cont['tableName'] = name
|
|
|
+ cont['paramWhere'] = where
|
|
|
+ cont['paramCond'] = cond
|
|
|
+ return repostCurd('update', JSON.stringify(cont))
|
|
|
+ },
|
|
|
|
|
|
/* zzj add */
|
|
|
- dateFormat() { // 获取当前时间
|
|
|
- var date=new Date();
|
|
|
- var year=date.getFullYear();
|
|
|
- var month= date.getMonth()+1<10 ? "0"+(date.getMonth()+1) : date.getMonth()+1;
|
|
|
- var day=date.getDate()<10 ? "0"+date.getDate() : date.getDate();
|
|
|
- return year+"-"+month+"-"+day;
|
|
|
+ dateFormat() { // 获取当前时间
|
|
|
+ var date = new Date();
|
|
|
+ var year = date.getFullYear();
|
|
|
+ var month = date.getMonth() + 1 < 10 ? "0" + (date.getMonth() + 1) : date.getMonth() + 1;
|
|
|
+ var day = date.getDate() < 10 ? "0" + date.getDate() : date.getDate();
|
|
|
+ return year + "-" + month + "-" + day;
|
|
|
},
|
|
|
|
|
|
|
|
|
/* 关闭*/
|
|
|
remRedar() {
|
|
|
- this.visible = false // 列表隐藏
|
|
|
- this.listData = [] // 清空列表数据
|
|
|
- this.redar = false // 扫码图标隐藏
|
|
|
- this.$emit('scanOff',false)
|
|
|
+ this.visible = false // 列表隐藏
|
|
|
+ this.listData = [] // 清空列表数据
|
|
|
+ this.redar = false // 扫码图标隐藏
|
|
|
+ this.$emit('scanOff', false)
|
|
|
},
|
|
|
|
|
|
}
|
ZZJ