linweizeng 2 tahun lalu
induk
melakukan
02de138c65

+ 12 - 3
components/lin-popup/index.vue

@@ -2,11 +2,14 @@
 <template>
 	<view>
 		<!--START 选择弹窗-->
-		<view class="cu-modal bottom-modal" :class="isShow ? 'show' : ''" @touchmove.stop.prevent @click="clickMast">
+		<view class="cu-modal bottom-modal" :class="isShow ? 'show' : ''" @click="clickMast">
 			<view class="cu-dialog items-popup" @click.stop="">
 				<view class="title bold" v-if="title">{{title}}</view>
 				<view class="items">
-					<view class="border-bottom" v-for="(v,i) in list" :key="i" @click="confirm(i,v)">{{v.name}}</view>
+					<scroll-view :scroll-y="true" style="overflow-y: scroll;">
+						<view class="border-bottom" v-for="(v,i) in list" :key="i" @click="confirm(i,v)">{{v.name}}</view>
+					</scroll-view>
+
 					<view style="height: 100rpx;"></view>
 					<view class="cancel text-red" @click="cancel">取消</view>
 				</view>
@@ -148,7 +151,7 @@
 
 		.items {
 			max-height: 600rpx;
-			overflow: auto;
+			overflow: scroll;
 			line-height: 90rpx;
 			position: relative;
 
@@ -170,11 +173,17 @@
 					bottom: 20rpx;
 					left: 0;
 					border-top: 10rpx solid #F5F6FA;
+					z-index: 90000;
 				}
 			}
 		}
 	}
 
+	.border-bottom {
+		overflow-y: scroll;
+		z-index: 9999;
+	}
+
 	.border-bottom:hover {
 		background-color: #f9f9f9;
 	}

+ 8 - 8
pages/jiance/order.vue

@@ -64,16 +64,12 @@
 						<text v-else>{{getButtChange(form.chuJuBaoGaoYaoQiu,reportRequireList)}}</text>
 					</u-form-item>
 					<u-form-item label="报告发放方式" prop="chuBaoGaoShiJian">
-						<u-radio-group v-model="form.chuBaoGaoShiJian" v-if="type != 'detail'" @change="getMultiple()">
-							<u-radio v-for="(item, index) in chuBaoGaoShiJianList" :key="index" :name="item.name">
-								{{item.name}}
-							</u-radio>
-						</u-radio-group>
+						<uni-data-checkbox multiple v-model="form.chuBaoGaoShiJianValue" :localdata="chuBaoGaoShiJianList" v-if="type != 'detail'" @change="chuBaoGaoChange"></uni-data-checkbox>
 						<text v-else>{{form.chuBaoGaoShiJian}}</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">
+						<u-radio-group v-model="form.biaoQianTuPianJudge" v-if="type != 'detail'">
+							<u-radio v-for=" (item, index) in judgeList" :key="index" :name="item.name">
 								{{item.name}}
 							</u-radio>
 						</u-radio-group>
@@ -238,7 +234,8 @@
 					fuKuanFangShi: '',
 					baoGaoLeiXing: '简易',
 					chuJuBaoGaoYaoQiu: '常规',
-					chuBaoGaoShiJian: "电子报告",
+					chuBaoGaoShiJian: '电子报告',
+					chuBaoGaoShiJianValue: ['电子报告'],
 					yangBenChuLi: '按照检测方样本管理规程处理',
 					weiTuoFangMingChe: '',
 					weiTuoFangLianXiR: '',
@@ -1470,6 +1467,9 @@
 			},
 			userListChange(e) {
 				this.getDataHetong('', e)
+			},
+			chuBaoGaoChange(e) {
+				this.form.chuBaoGaoShiJian = e.detail.value.join(",")
 			}
 
 		}

+ 5 - 0
pages/jiance/order/meth.js

@@ -55,6 +55,7 @@ export default {
 			baoGaoLeiXing: item.bao_gao_lei_xing_,
 			chuJuBaoGaoYaoQiu: item.chu_ju_bao_gao_ya,
 			chuBaoGaoShiJian: item.chu_bao_gao_shi_j,
+			chuBaoGaoShiJianValue: item.chu_bao_gao_shi_j.split(","),
 			yangBenChuLi: item.yang_ben_chu_li_,
 			weiTuoFangMingChe: item.wei_tuo_fang_ming,
 			weiTuoFangLianXiR: item.wei_tuo_fang_lian,
@@ -314,6 +315,10 @@ export default {
 			this.getPrompt('请选择检毕样品处置')
 			return false
 		}
+		if (form.chuBaoGaoShiJian == '') {
+			this.getPrompt('请选择出报告发放方式')
+			return false
+		}
 		return true
 	},
 	//提交判断

+ 6 - 3
pages/jiance/order/test.json

@@ -5,11 +5,14 @@
 		"name": "常规"
 	}],
 	"chuBaoGaoShiJianList": [{
-		"name": "自取"
+		"text": "自取",
+		"value": "自取"
 	}, {
-		"name": "邮寄"
+		"text": "邮寄",
+		"value": "邮寄"
 	}, {
-		"name": "电子报告"
+		"text": "电子报告",
+		"value": "电子报告"
 	}],
 	"reportSource": [{
 		"name": "客户"