|
|
@@ -320,18 +320,15 @@
|
|
|
getBottomData() {
|
|
|
// 获取检测委托受理情况数据
|
|
|
const sql1 = `select tm.zhuang_tai_ as state, DATE_FORMAT(tm.create_time_, '%Y-%m-%d %H:%i:%s') as time from t_mjwtsqb tm where tm.create_time_ like '${this.year}%'`
|
|
|
- // 获取已委托样品数量
|
|
|
- const sql3 = `select count(yp.id_) as unReceive from t_mjypb yp, t_mjwtsqb wt where yp.wai_jian_ = wt.id_ and yp.create_time_ like '${this.month}%'`
|
|
|
// 获取样品 收样/留样/不合格数量
|
|
|
- const sql4 = `select count(a.id_) as receive, count(a.shi_fou_liu_yang_ = '是' or null) as keep, count(a.yan_shou_zhuang_t = '残缺' or null) as incomplete from (select id_, shi_fou_liu_yang_, yan_shou_zhuang_t from t_mjypdjb where create_time_ like '${this.month}%' group by yang_pin_bian_hao) as a`
|
|
|
+ const sql4 = `select count(a.id_) as receive, count(a.shi_fou_liu_yang_ = '是' or null) as keep, count(a.yan_shou_zhuang_t = '残缺' or null) as incomplete, count(a.jie_yang_zhuang_t = '待确认' or null) as unReceive from (select id_, shi_fou_liu_yang_, yan_shou_zhuang_t, jie_yang_zhuang_t from t_mjypdjb where create_time_ like '${this.month}%' group by yang_pin_bian_hao) as a`
|
|
|
Promise.all([
|
|
|
curdPost('sql', sql1),
|
|
|
curdPost('sql', sql3),
|
|
|
curdPost('sql', sql4),
|
|
|
- ]).then(([ res1, res3, res4]) => {
|
|
|
+ ]).then(([ res1, res4]) => {
|
|
|
this.bottomCardData.flag = false
|
|
|
const data1 = res1.variables.data
|
|
|
- const data3 = res3.variables.data
|
|
|
const data4 = res4.variables.data
|
|
|
// console.log(data1, data2, data3, data4)
|
|
|
|
|
|
@@ -365,7 +362,7 @@
|
|
|
// value: completeCount
|
|
|
// }
|
|
|
// ]
|
|
|
- let sample = [data3[0].unReceive - data4[0].receive, data4[0].receive, data4[0].incomplete, data4[0].keep]
|
|
|
+ let sample = [data4[0].unReceive, data4[0].receive, data4[0].incomplete, data4[0].keep]
|
|
|
this.bottomCardData.trust = trust
|
|
|
this.bottomCardData.accepted = accepted
|
|
|
// this.bottomCardData.task = task
|
cfort