|
|
@@ -50,7 +50,7 @@
|
|
|
</view>
|
|
|
<view style="display: flex;line-height: 50rpx;">
|
|
|
<view class="title">检测进度：</view>
|
|
|
- <view> {{item.zhuangtai}} </view>
|
|
|
+ <view> {{item.liu_zhuan_zhuang_ || '委托进行中'}} </view>
|
|
|
</view>
|
|
|
<view style="display: flex;line-height: 50rpx;">
|
|
|
<view>样品接收备注：</view>
|
|
|
@@ -160,7 +160,7 @@
|
|
|
}
|
|
|
|
|
|
let sql =
|
|
|
- `select a.id_,a.create_time_,a.song_jian_dan_wei,a.yang_pin_ming_che,a.song_jian_pi_hao_,a.yang_pin_bian_hao,c.fu_kuan_zhuang_ta,c.wei_tuo_lei_xing_,c.wei_tuo_fang_ming,c.wei_tuo_bian_hao_,c.wei_tuo_zhuang_ta,b.shou_yang_ri_qi_,b.bei_zhu_,b.yan_shou_jie_guo_,d.ke_hu_zhang_hao_ ` +
|
|
|
+ `select a.id_,a.create_time_,a.song_jian_dan_wei,a.yang_pin_ming_che,a.song_jian_pi_hao_,a.yang_pin_bian_hao,c.fu_kuan_zhuang_ta,c.wei_tuo_lei_xing_,c.wei_tuo_fang_ming,c.wei_tuo_bian_hao_,c.wei_tuo_zhuang_ta,b.shou_yang_ri_qi_,b.bei_zhu_,b.liu_zhuan_zhuang_,b.yan_shou_jie_guo_,d.ke_hu_zhang_hao_ ` +
|
|
|
`from t_lhypb a ` +
|
|
|
`left join t_lhwtsqb c on a.parent_id_ = c.id_ ` +
|
|
|
`left join t_bjd d on c.he_tong_id_ = d.id_ ` +
|
|
|
@@ -170,13 +170,13 @@
|
|
|
this.$http.post("/ibps/business/v3/sys/universal/inputSqlSelectData", requestData).then(res => {
|
|
|
if (res.data.state == 200) {
|
|
|
const data = res.data.variables.data
|
|
|
- // this.resdata.push(...data)
|
|
|
- data.forEach((item, index) => {
|
|
|
- this.getZhuangtai(item.yang_pin_bian_hao, (result) => {
|
|
|
- this.$set(item, 'zhuangtai', result)
|
|
|
- })
|
|
|
- this.resdata.push(item)
|
|
|
- })
|
|
|
+ this.resdata.push(...data)
|
|
|
+ // data.forEach((item, index) => {
|
|
|
+ // this.getZhuangtai(item.yang_pin_bian_hao, (result) => {
|
|
|
+ // this.$set(item, 'zhuangtai', result)
|
|
|
+ // })
|
|
|
+ // this.resdata.push(item)
|
|
|
+ // })
|
|
|
uni.stopPullDownRefresh();
|
|
|
if (data.length > 10) {
|
|
|
this.ReachBottomShow = false
|
cyy