|
|
@@ -585,44 +585,109 @@ export default {
|
|
|
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_ || '',
|
|
|
- xing_bie_: ypInfoList[index].xing_bie_ || '',
|
|
|
- nian_ling_: 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_ || '',
|
|
|
- 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 ? 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_ || '',
|
|
|
- fan_yang_ri_qi_: ypInfoList[index].fan_yang_ri_qi_ || '',
|
|
|
- fan_yang_jyr: ypInfoList[index].fan_yang_jyr || '',
|
|
|
- biao_zhi_uuid_: currentUUID,
|
|
|
- song_yang_yao_qiu: ypInfoList[index].song_yang_yao_qiu || '',
|
|
|
- jian_ce_xiang_mu_: xiangMuZh,
|
|
|
- shou_yang_ren_:this.$store.getters.userInfo.user.name,
|
|
|
- wei_tuo_lei_xing_:item.wei_tuo_lei_xing_
|
|
|
- }
|
|
|
+ // 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_ || '',
|
|
|
+ // xing_bie_: ypInfoList[index].xing_bie_ || '',
|
|
|
+ // nian_ling_: 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_ || '',
|
|
|
+ // 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 ? 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_ || '',
|
|
|
+ // fan_yang_ri_qi_: ypInfoList[index].fan_yang_ri_qi_ || '',
|
|
|
+ // fan_yang_jyr: ypInfoList[index].fan_yang_jyr || '',
|
|
|
+ // biao_zhi_uuid_: currentUUID,
|
|
|
+ // song_yang_yao_qiu: ypInfoList[index].song_yang_yao_qiu || '',
|
|
|
+ // jian_ce_xiang_mu_: xiangMuZh,
|
|
|
+ // shou_yang_ren_:this.$store.getters.userInfo.user.name,
|
|
|
+ // wei_tuo_lei_xing_:item.wei_tuo_lei_xing_
|
|
|
+ // }
|
|
|
+ // // console.log(obj)
|
|
|
+ // ypdjb.push(obj)
|
|
|
+ const sql = `select bao_gao_zhou_qi_g from t_mjjcnlfw where FIND_IN_SET(id_,'${item.jian_ce_xiang_mu_}')`
|
|
|
+ var maxAge
|
|
|
+ repostCurd('sql', sql).then((res) => {
|
|
|
+ const { data = [] } = res.variables || {}
|
|
|
+ maxAge = data.reduce((max, person) => person.bao_gao_zhou_qi_g > max ? person.bao_gao_zhou_qi_g : max, data[0].bao_gao_zhou_qi_g)
|
|
|
+
|
|
|
+ const currentDate = new Date()
|
|
|
+
|
|
|
+ // 创建一个新的日期对象，表示当前日期加上3天
|
|
|
+ const futureDate = new Date(currentDate)
|
|
|
+
|
|
|
+ futureDate.setDate(currentDate.getDate() + Number(maxAge))
|
|
|
+
|
|
|
+ // 获取年、月、日
|
|
|
+ const year = futureDate.getFullYear()
|
|
|
+
|
|
|
+ const month = String(futureDate.getMonth() + 1).padStart(2, '0')
|
|
|
+
|
|
|
+ // 月份从0开始，所以需要加1
|
|
|
+ const day = String(futureDate.getDate()).padStart(2, '0')
|
|
|
+
|
|
|
+ // 格式化为YYYY-MM-DD
|
|
|
+ const formattedDate = `${year}-${month}-${day}`
|
|
|
+ // console.log('maxAge', formattedDate)
|
|
|
+ const 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_ || '',
|
|
|
+ xing_bie_: ypInfoList[index].xing_bie_ || '',
|
|
|
+ nian_ling_: 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_ || '',
|
|
|
+ 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_ || '',
|
|
|
+ fan_yang_ri_qi_: ypInfoList[index].fan_yang_ri_qi_ || '',
|
|
|
+ fan_yang_jyr: ypInfoList[index].fan_yang_jyr || '',
|
|
|
+ biao_zhi_uuid_: currentUUID,
|
|
|
+ song_yang_yao_qiu: ypInfoList[index].song_yang_yao_qiu || '',
|
|
|
+ jian_ce_xiang_mu_: xiangMuZh,
|
|
|
+ shou_yang_ren_: this.$store.getters.userInfo.user.name,
|
|
|
+ wei_tuo_lei_xing_: item.wei_tuo_lei_xing_,
|
|
|
+ bao_gao_zhou_qi_g: formattedDate
|
|
|
+
|
|
|
+ }
|
|
|
// console.log(obj)
|
|
|
ypdjb.push(obj)
|
|
|
+ })
|
|
|
}
|
|
|
// 2-2:封装任务分配表
|
|
|
let rw = {
|
|
|
@@ -787,44 +852,109 @@ export default {
|
|
|
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_ || '',
|
|
|
- xing_bie_: ypInfoList[index].xing_bie_ || '',
|
|
|
- nian_ling_: 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_ || '',
|
|
|
- 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 ? 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_ || '',
|
|
|
- fan_yang_ri_qi_: ypInfoList[index].fan_yang_ri_qi_ || '',
|
|
|
- fan_yang_jyr: ypInfoList[index].fan_yang_jyr || '',
|
|
|
- biao_zhi_uuid_: currentUUID,
|
|
|
- song_yang_yao_qiu: ypInfoList[index].song_yang_yao_qiu || '',
|
|
|
- jian_ce_xiang_mu_: xiangMuZh,
|
|
|
- shou_yang_ren_:this.$store.getters.userInfo.user.name,
|
|
|
- wei_tuo_lei_xing_:item.wei_tuo_lei_xing_
|
|
|
- }
|
|
|
- // console.log(obj)
|
|
|
+ // 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_ || '',
|
|
|
+ // xing_bie_: ypInfoList[index].xing_bie_ || '',
|
|
|
+ // nian_ling_: 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_ || '',
|
|
|
+ // 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 ? 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_ || '',
|
|
|
+ // fan_yang_ri_qi_: ypInfoList[index].fan_yang_ri_qi_ || '',
|
|
|
+ // fan_yang_jyr: ypInfoList[index].fan_yang_jyr || '',
|
|
|
+ // biao_zhi_uuid_: currentUUID,
|
|
|
+ // song_yang_yao_qiu: ypInfoList[index].song_yang_yao_qiu || '',
|
|
|
+ // jian_ce_xiang_mu_: xiangMuZh,
|
|
|
+ // shou_yang_ren_:this.$store.getters.userInfo.user.name,
|
|
|
+ // wei_tuo_lei_xing_:item.wei_tuo_lei_xing_
|
|
|
+ // }
|
|
|
+ // // console.log(obj)
|
|
|
+ // ypdjb.push(obj)
|
|
|
+ const sql = `select bao_gao_zhou_qi_g from t_mjjcnlfw where FIND_IN_SET(id_,'${item.jian_ce_xiang_mu_}')`
|
|
|
+ var maxAge
|
|
|
+ repostCurd('sql', sql).then((res) => {
|
|
|
+ const { data = [] } = res.variables || {}
|
|
|
+ maxAge = data.reduce((max, person) => person.bao_gao_zhou_qi_g > max ? person.bao_gao_zhou_qi_g : max, data[0].bao_gao_zhou_qi_g)
|
|
|
+
|
|
|
+ const currentDate = new Date()
|
|
|
+
|
|
|
+ // 创建一个新的日期对象，表示当前日期加上3天
|
|
|
+ const futureDate = new Date(currentDate)
|
|
|
+
|
|
|
+ futureDate.setDate(currentDate.getDate() + Number(maxAge))
|
|
|
+
|
|
|
+ // 获取年、月、日
|
|
|
+ const year = futureDate.getFullYear()
|
|
|
+
|
|
|
+ const month = String(futureDate.getMonth() + 1).padStart(2, '0')
|
|
|
+
|
|
|
+ // 月份从0开始，所以需要加1
|
|
|
+ const day = String(futureDate.getDate()).padStart(2, '0')
|
|
|
+
|
|
|
+ // 格式化为YYYY-MM-DD
|
|
|
+ const formattedDate = `${year}-${month}-${day}`
|
|
|
+ // console.log('maxAge', formattedDate)
|
|
|
+ const 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_ || '',
|
|
|
+ xing_bie_: ypInfoList[index].xing_bie_ || '',
|
|
|
+ nian_ling_: 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_ || '',
|
|
|
+ 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_ || '',
|
|
|
+ fan_yang_ri_qi_: ypInfoList[index].fan_yang_ri_qi_ || '',
|
|
|
+ fan_yang_jyr: ypInfoList[index].fan_yang_jyr || '',
|
|
|
+ biao_zhi_uuid_: currentUUID,
|
|
|
+ song_yang_yao_qiu: ypInfoList[index].song_yang_yao_qiu || '',
|
|
|
+ jian_ce_xiang_mu_: xiangMuZh,
|
|
|
+ shou_yang_ren_: this.$store.getters.userInfo.user.name,
|
|
|
+ wei_tuo_lei_xing_: item.wei_tuo_lei_xing_,
|
|
|
+ bao_gao_zhou_qi_g: formattedDate
|
|
|
+
|
|
|
+ }
|
|
|
+ console.log(obj)
|
|
|
ypdjb.push(obj)
|
|
|
+ })
|
|
|
}
|
|
|
// 2-2:封装任务分配表
|
|
|
let rw = {
|
CHINAMI-P698360\Administrator