update 委托单新功能添加，

pages/jiance/list.vue

@@ -8,8 +8,7 @@
 		<view class="cu-bar bg-white search fixed" :style="[{top:CustomBar + 'px'}]">
 			<view class="search-form round">
 				<text class="cuIcon-search"></text>
-				<input type="text" v-model="keyword" placeholder="输入搜索的关键词" confirm-type="search"
-					@confirm="search"></input>
+				<input type="text" v-model="keyword" placeholder="输入搜索的关键词" confirm-type="search" @confirm="search"></input>
 			</view>
 			<view class="action">
 				<button class="cu-btn bg-gradual-blue shadow-blur round" @tap="search">搜索</button>
@@ -17,10 +16,8 @@
 		</view>
 
 
-		<view v-for="(item,i) in resdata" :key="i" style="margin: 10rpx 20rpx;position: relative;"
-			:style="[{top:'calc('+ CustomBar + 'px + 20rpx)'}]">
-			<uni-section :title="'样品编号:'+item.yang_pin_bian_hao" :subTitle="'检测委托单号:'+item.wei_tuo_bian_hao_"
-				type="line" padding>
+		<view v-for="(item,i) in resdata" :key="i" style="margin: 10rpx 20rpx;position: relative;" :style="[{top:'calc('+ CustomBar + 'px + 20rpx)'}]">
+			<uni-section :title="'样品编号:'+item.yang_pin_bian_hao" :subTitle="'检测委托单号:'+item.wei_tuo_bian_hao_" type="line" padding>
 				<view>
 					<view>
 						<view style="display: flex;line-height: 50rpx;">
@@ -55,9 +52,7 @@
 					</view>
 					<!-- v-if="item.zhuang_tai_ && (item.zhuang_tai_ == '待运营中心审核' || item.zhuang_tai_ == '待检测中心审核' || item.zhuang_tai_ == '待财务审核' || item.zhuang_tai_ == '待样品接收')" -->
 					<view class="btnList">
-						<u-button class="u-m-r-15 btn-back-color" type="success" size="mini"
-							@click="goto(item.id_,item.wei_tuo_bian_hao_)"
-							v-if="item.wei_tuo_zhuang_ta && (item.wei_tuo_zhuang_ta == '待审核' ||item.wei_tuo_zhuang_ta == '已编制')">
+						<u-button class="u-m-r-15 btn-back-color" type="success" size="mini" @click="goto(item.id_,item.wei_tuo_bian_hao_)" v-if="item.wei_tuo_zhuang_ta && (item.wei_tuo_zhuang_ta == '待审核' ||item.wei_tuo_zhuang_ta == '已编制')">
 							样品修改</u-button>
 						<u-button type="success" size="mini" class="m-r-15" @click="getTag(item.id_)">样品标签</u-button>
 						<u-button type="success" size="mini" @click="goBaogao(item.yang_pin_bian_hao)">查看报告</u-button>
@@ -165,7 +160,7 @@
 					`left join t_lhwtsqb c on a.parent_id_ = c.id_ ` +
 					`left join t_bjd d on c.he_tong_id_ = d.id_ ` +
 					`left join t_lhypdjb b on a.yang_pin_bian_hao = b.yang_ben_bian_hao ` +
-					` where (a.create_by_= '${useId}' or d.ke_hu_zhang_hao_ = '${useId}') and (a.yang_pin_bian_hao like '%${keyworks}%' or a.wei_tuo_dan_hao_ like '%${keyworks}%') ORDER BY a.create_time_ desc limit ${page},10`
+					` where (a.create_by_= '${useId}' or d.ke_hu_zhang_hao_ = '${useId}') and (a.yang_pin_bian_hao like '%${keyworks}%' or a.wei_tuo_dan_hao_ like '%${keyworks}%') and c.wei_tuo_lei_xing_ = '客户委托' ORDER BY a.create_time_ desc limit ${page},10`
 				let requestData = this.$sig(sql)
 				this.$http.post("/ibps/business/v3/sys/universal/inputSqlSelectData", requestData).then(res => {
 					if (res.data.state == 200) {

pages/jiance/order.vue

@@ -63,6 +63,24 @@
 						</u-radio-group>
 						<text v-else>{{getButtChange(form.chuJuBaoGaoYaoQiu,reportRequireList)}}</text>
 					</u-form-item>
+					<u-form-item label="样品是否带有传染性疾病" prop="name">
+						<u-radio-group v-model="form.biaoQianTuPianJudge" v-if="type != 'detail'" @change="getMultiple()">
+							<u-radio v-for="(item, index) in judgeList" :key="index" :name="item.name">
+								{{item.name}}
+							</u-radio>
+						</u-radio-group>
+						<text v-else>{{form.biaoQianTuPianJudge}}</text>
+					</u-form-item>
+					<view v-if="form.biaoQianTuPianJudge == '是'">
+						<view class="qingshe">
+							<view class="qingTitle">
+								若样品带有传染性疾病请在此备注
+							</view>
+						</view>
+						<u-form-item label="备注">
+							<u-input placeholder="请输入备注" v-model="form.biaoQianTuPian" :disabled="type == 'detail'?true :false" />
+						</u-form-item>
+					</view>
 					<u-form-item label="检毕样品处置" prop="yangBenChuLi" required>
 						<u-input placeholder="请选择检毕样品处置" type="select" v-model="form.yangBenChuLi" @click="sheetClick('disposition')" v-if="type != 'detail'" />
 						<text v-else>{{form.yangBenChuLi}}</text>
@@ -78,18 +96,6 @@
 				<view class="tagBox" v-if="form.lhypb.length > 1">
 					<uni-tag class="tagSin" :text="'样品：'+(index+1)" :type="lhypbIndex == index ? 'primary':'warning'" :circle="true" v-for="(item,index) in form.lhypb" :key="index" @click="lhypbIndex = index" />
 				</view>
-
-				<!-- <uni-group mode="card" :title="'样品' + (index+1)" v-for="(item,index) in form.lhypb" :key="index"
-					v-if="index == lhypbIndex">
-					<lhypb-message :item="item" :itemType="false" :type="type" :jianCeTypeList="jianCeTypeList"
-						:heTongId="form.heTongId" @countTotal="getTotal" @getParentContent="getJianXiangData">>
-					</lhypb-message>
-					<u-button type="error" class="btn green-back-color" @click="deletSing(index)"
-						v-if="type != 'detail'">
-						删除样品编号“{{item.yangPinBianHao}}”的样品
-					</u-button>
-				</uni-group> -->
-
 				<view v-for="(item,index) in form.lhypb" :key="index" v-if="index == lhypbIndex">
 					<lhypb-com :item="item" :index="index" :type="type" @deleteClick="deletSing" @updateClick="updateClick">
 					</lhypb-com>
@@ -246,7 +252,9 @@
 					weiTuoRiQi: '',
 					weiTuoFangQueRen: '',
 					zongJia: 0,
-					zhanShiBiaoId: this.generateUUID()
+					zhanShiBiaoId: this.generateUUID(),
+					biaoQianTuPianJudge: '否',
+					biaoQianTuPian: ''
 				},
 				rules: {
 					heTongId: [{
@@ -313,6 +321,8 @@
 				dispositionList: order.disposition,
 				//性别
 				sexList: order.sex,
+				//是否判断
+				judgeList: order.judgeList,
 				//签名显示
 				qianshow: false,
 				qianIndex: 0,
@@ -971,6 +981,9 @@
 				this.form.bianZhiBuMen = this.orgId
 				this.form.weiTuoZhuangTai = '待审核'
 				this.form.fuKuanZhuangTai = '未结清'
+				if (this.form.biaoQianTuPianJudge == '否') {
+					this.form.biaoQianTuPian = '否'
+				}
 
 				this.form.lhypb.forEach((item, index) => {
 					if (this.buttonFlagNum === '3') {

pages/jiance/order/meth.js

@@ -32,6 +32,14 @@ export default {
 		this.getPrompt(val1 + title)
 	},
 	getForm(item) {
+		let biaoQianTuPianJudge = ''
+		let biaoQianTuPian = ''
+		if (item.biao_qian_tu_pian != '否') {
+			biaoQianTuPianJudge = '是'
+			biaoQianTuPian = item.biao_qian_tu_pian
+		} else {
+			biaoQianTuPianJudge = '否'
+		}
 		let form = {
 			weiTuoLeiXing: item.wei_tuo_lei_xing_,
 			weiTuoDanLaiYuan: item.wei_tuo_lei_xing_,
@@ -54,7 +62,9 @@ export default {
 			weiTuoFangQueRen: item.wei_tuo_fang_que_,
 			zongJia: item.zong_jia_,
 			zhanShiBiaoId: item.zhan_shi_biao_id_,
-			baoGaoBianZhiYuan: item.bao_gao_bian_zhi_ || ''
+			baoGaoBianZhiYuan: item.bao_gao_bian_zhi_ || '',
+			biaoQianTuPianJudge: biaoQianTuPianJudge,
+			biaoQianTuPian: biaoQianTuPian
 		}
 		return form
 	},
@@ -80,8 +90,6 @@ export default {
 				}
 			}
 
-
-
 			//套餐处理
 			let tCList = JSON.parse(JSON.stringify(taoCanList))
 			if (item.xuan_ze_tao_can_) {

pages/jiance/order/test.json

@@ -16,6 +16,11 @@
 	}, {
 		"name": "特急"
 	}],
+	"judgeList": [{
+		"name": "是"
+	}, {
+		"name": "否"
+	}],
 	"sampleType": [{
 		"text": "细胞培养上清",
 		"value": "细胞培养上清"

pages/jiance/tousu.vue

@@ -99,8 +99,6 @@
 			</uni-section>
 		</view>
 
-
-
 		<uni-section title="客户确认" type="line" v-if="id != ''">
 			<view class="u-m-15 u-p-b-15">
 				<uni-data-checkbox selectedColor="red" v-model="form.shiFouTongYi" :localdata="sexList" v-if="type == '1'">
@@ -126,7 +124,6 @@
 			</view>
 		</uni-section>
 
-
 		<view class="padding flex flex-direction">
 			<u-button type="success" class="btn btn-back-color" @click="onSubmit" v-if="id == ''">提交
 			</u-button>
@@ -134,7 +131,6 @@
 			</u-button>
 		</view>
 
-
 		<u-calendar v-model="show" :mode="mode" @change="dateChange"></u-calendar>
 		<!-- <u-select v-model="selectShow" :list="list" title="投诉方式" @confirm="selecConfirm"></u-select> -->
 		<lin-popup ref="picker2" :title="'投诉方式'" :list="list" @onConfirm="selecConfirm"></lin-popup>
@@ -389,7 +385,6 @@
 							}
 							this.fuJianShangChuanArray.push(obj)
 						})
-
 					}
 				})
 			},
@@ -550,12 +545,7 @@
 				let data = this.$sig(pp)
 
 				this.$http.post("ibps/business/v3/sys/universal/updateDatasContextTable", data).then(res => {
-					if (res.data.state == 200) {
-
-
-					} else {
-
-					}
+					if (res.data.state == 200) {} else {}
 				});
 			},
 			dateChange(e) {
@@ -612,23 +602,17 @@
 			},
 			// 拉取样品列表数据
 			getData() {
-
 				let info = uni.getStorageSync(USER_INFO);
 				let useId = info.user.id
 
-				let sql =
-					`select a.id_,a.create_time_,a.yang_pin_ming_che,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_` +
-					` from t_lhypb a` +
-					` inner join t_lhwtsqb c on a.parent_id_ = c.id_ and a.create_by_= '${useId}' ` +
-					` left join t_lhypdjb b on a.yang_pin_bian_hao = b.yang_ben_bian_hao ORDER BY a.create_time_ desc`
-
+				let sql = `select a.id_,a.create_time_,a.yang_pin_ming_che,a.yang_pin_bian_hao,a.song_jian_pi_hao_ from t_lhypb a left join t_lhwtsqb b  on a.parent_id_ = b.id_ left join t_bjd c on b.he_tong_id_ = c.id_  where (a.create_by_= '${useId}' or c.ke_hu_zhang_hao_ = '${useId}') and b.wei_tuo_lei_xing_ = '客户委托' and a.create_time_ > DATE_SUB(NOW(),INTERVAL 3 MONTH) ORDER BY a.create_time_ desc`
 				let requestData = this.$sig(sql)
 				this.$http.post("/ibps/business/v3/sys/universal/inputSqlSelectData", requestData).then(res => {
 					if (res.data.state == 200) {
 						const datas = res.data.variables.data
 						if (datas.length > 0) {
 							datas.forEach((item, index) => {
-								this.$set(item, 'name', item.yang_pin_bian_hao + '-' + item
+								this.$set(item, 'name', item.yang_pin_bian_hao + '-' + item.song_jian_pi_hao_ + '-' + item
 									.yang_pin_ming_che)
 							})
 							this.yangPinList = datas
@@ -648,12 +632,11 @@
 				if (id) {
 					let itemData = this.yangPinList.find(item => item.id_ == id)
 					if (itemData) {
-						return itemData.yang_pin_bian_hao + '-' + itemData
+						return itemData.yang_pin_bian_hao + '-' + itemData.song_jian_pi_hao_ + '-' + itemData
 							.yang_pin_ming_che
 					} else {
 						return ''
 					}
-
 				} else {
 					return ''
 				}