检测委托（能力范围流程）优化

pages/jiance/list.vue

@@ -26,6 +26,10 @@
 							<view class="title">送样批号：</view>
 							<view> {{item.song_jian_pi_hao_}} </view>
 						</view>
+						<view style="display: flex;line-height: 50rpx;">
+							<view class="title">送检单位：</view>
+							<view> {{item.song_jian_dan_wei}} </view>
+						</view>
 						<view style="display: flex;line-height: 50rpx;">
 							<view class="title">收样时间：</view>
 							<view> {{item.shou_yang_ri_qi_}} </view>
@@ -44,6 +48,10 @@
 								<view style="color: #7349ff;"> 未结清 </view>
 							</view>
 						</view>
+						<view style="display: flex;line-height: 50rpx;">
+							<view class="title">检测进度：</view>
+							<view> {{item.zhuangtai}} </view>
+						</view>
 						<view style="display: flex;line-height: 50rpx;">
 							<view>样品接收备注：</view>
 							<view> {{item.bei_zhu_ || '无'}}</view>
@@ -152,7 +160,7 @@
 				}
 
 				let sql =
-					`select a.id_,a.create_time_,a.yang_pin_ming_che,a.song_jian_pi_hao_,a.yang_pin_bian_hao,c.fu_kuan_zhuang_ta,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.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_ ` +
@@ -162,7 +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)
+						// 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
@@ -179,6 +193,37 @@
 					uni.hideLoading()
 				})
 			},
+			/**
+			 * 委托状态
+			 */
+			 getZhuangtai(id, callback) {
+				let sql =
+					`select * from t_lhwtzsb where yang_pin_bian_hao = '${id}'`
+				let requestData = this.$sig(sql)
+
+
+				this.$http.post("/ibps/business/v3/sys/universal/inputSqlSelectData", requestData).then(res => {
+					if (res.data.state == 200) {
+						const data = res.data.variables.data
+						var tt = ''
+						if (data.length >= 1) {
+							let boo1 = data.some(item => item.zhuang_tai_ == '委托进行中')
+							let boo2 = data.some(item => item.zhuang_tai_ == '任务分配进行中')
+							let boo3 = data.some(item => item.zhuang_tai_ == '检测进行中')
+							let boo4 = data.some(item => item.zhuang_tai_ == '报告进行中')
+							let boo5 = data.some(item => item.zhuang_tai_ == '已完成')
+							if (boo1 || boo2 || boo3 || boo4) {
+								tt = '检测进行中'
+							} else if (boo5) {
+								tt = '已完成'
+							}
+						} else if (data.length == 0) {
+							tt = '检测进行中'
+						}
+						callback(tt)
+					}
+				})
+			},
 			/**
 			 * @param {Object} id
 			 * 修改样品跳转

pages/jiance/order/lhypbMessage.vue

@@ -90,6 +90,14 @@
 											检测类别：
 											<text class="l-user-name">{{item.jian_ce_lei_bie_}}</text>
 										</view>
+										<view class="l-userinfo">
+											检测方法：
+											<text class="l-user-name">{{item.jian_ce_fang_fa_ || '-'}}</text>
+										</view>
+										<view class="l-userinfo">
+											检测地点：
+											<text class="l-user-name">{{item.jian_ce_di_dian_ || '-'}}</text>
+										</view>
 										<view class="l-userinfo">
 											报告周期（工作日）:
 											<text class="l-user-name">{{item.bao_gao_zhou_qi_g || '当'}}天</text>
@@ -333,6 +341,14 @@
 											检测类别：
 											<text class="l-user-name">{{item.jian_ce_lei_bie_}}</text>
 										</view>
+										<view class="l-userinfo">
+											检测方法：
+											<text class="l-user-name">{{item.jian_ce_fang_fa_ || '-'}}</text>
+										</view>
+										<view class="l-userinfo">
+											检测地点：
+											<text class="l-user-name">{{item.jian_ce_di_dian_ || '-'}}</text>
+										</view>
 										<view class="l-userinfo">
 											报告周期（工作日）:
 											<text class="l-user-name">{{item.bao_gao_zhou_qi_g || '当'}}天</text>