update

pages/jiance/order.vue

@@ -7,8 +7,7 @@
 				<text @click="getBack">退回原因</text>
 			</block>
 		</cu-custom>
-		<u-form :model="form" ref="form" label-width="220" :error-type="errorType"
-			:disabled="type == 'detail' ? true : false">
+		<u-form :model="form" ref="form" label-width="220" :error-type="errorType" :disabled="type == 'detail' ? true : false">
 			<top ref="top" @activeNumClick="activeNumClick"></top>
 
 			<view v-show="activeNum == 1">
@@ -20,14 +19,12 @@
 						<u-input placeholder="请输入委托编号" v-model="form.weiTuoBianHao" disabled />
 					</u-form-item>
 					<u-form-item label="用户选择" required v-if="administrator">
-						<uni-data-select placeholder="请选择合同选择" v-model="form.baoGaoBianZhiYuan" :localdata="userList"
-							@change="userListChange" v-if="type != 'detail'">
+						<uni-data-select placeholder="请选择合同选择" v-model="form.baoGaoBianZhiYuan" :localdata="userList" @change="userListChange" v-if="type != 'detail'">
 						</uni-data-select>
 						<text v-else>{{getButtChange(form.baoGaoBianZhiYuan,userList)}}</text>
 					</u-form-item>
 					<u-form-item label="合同选择" prop="heTongId" required>
-						<uni-data-select placeholder="请选择合同选择" v-model="form.heTongId" :localdata="hetong"
-							@change="hetongChange" v-if="type != 'detail'">
+						<uni-data-select placeholder="请选择合同选择" v-model="form.heTongId" :localdata="hetong" @change="hetongChange" v-if="type != 'detail'">
 						</uni-data-select>
 						<text v-else>{{getButtChange(form.heTongId,hetong)}}</text>
 					</u-form-item>
@@ -67,8 +64,7 @@
 						<text v-else>{{getButtChange(form.chuJuBaoGaoYaoQiu,reportRequireList)}}</text>
 					</u-form-item>
 					<u-form-item label="检毕样品处置" prop="yangBenChuLi" required>
-						<u-input placeholder="请选择检毕样品处置" type="select" v-model="form.yangBenChuLi"
-							@click="sheetClick('disposition')" v-if="type != 'detail'" />
+						<u-input placeholder="请选择检毕样品处置" type="select" v-model="form.yangBenChuLi" @click="sheetClick('disposition')" v-if="type != 'detail'" />
 						<text v-else>{{form.yangBenChuLi}}</text>
 					</u-form-item>
 				</uni-group>
@@ -80,8 +76,7 @@
 				</u-button>
 
 				<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" />
+					<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"
@@ -96,8 +91,7 @@
 				</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 :item="item" :index="index" :type="type" @deleteClick="deletSing" @updateClick="updateClick">
 					</lhypb-com>
 				</view>
 			</view>
@@ -110,20 +104,16 @@
 				</uni-group>
 				<uni-group mode="card">
 					<u-form-item label="委托方" prop="weiTuoFangMingChe" required>
-						<u-input placeholder="请输入委托人信息" v-model="form.weiTuoFangMingChe"
-							:disabled="type == 'detail'?true :false" />
+						<u-input placeholder="请输入委托人信息" v-model="form.weiTuoFangMingChe" :disabled="type == 'detail'?true :false" />
 					</u-form-item>
 					<u-form-item label="联系人" prop="weiTuoFangLianXiR" required>
-						<u-input placeholder="请输入联系人" v-model="form.weiTuoFangLianXiR"
-							:disabled="type == 'detail'?true :false" />
+						<u-input placeholder="请输入联系人" v-model="form.weiTuoFangLianXiR" :disabled="type == 'detail'?true :false" />
 					</u-form-item>
 					<u-form-item label="联系电话" prop="weiTuoFangLianXiD" required>
-						<u-input placeholder="请输入联系电话" v-model="form.weiTuoFangLianXiD"
-							:disabled="type == 'detail'?true :false" />
+						<u-input placeholder="请输入联系电话" v-model="form.weiTuoFangLianXiD" :disabled="type == 'detail'?true :false" />
 					</u-form-item>
 					<u-form-item label="委托日期" prop="weiTuoRiQi">
-						<u-input placeholder="请选择委托日期" type="select" v-model="form.weiTuoRiQi"
-							@click="dateClick('weiTuo')" v-if="type != 'detail'" />
+						<u-input placeholder="请选择委托日期" type="select" v-model="form.weiTuoRiQi" @click="dateClick('weiTuo')" v-if="type != 'detail'" />
 						<text v-else>{{form.weiTuoRiQi}}</text>
 					</u-form-item>
 					<u-form-item label="委托签名" label-position="top" required>
@@ -132,14 +122,12 @@
 								<view v-if="type != 'detail'">
 									<u-button type="primary" size="mini" @click="qianming(0)" class="btn-back-color">
 										签名</u-button>
-									<u-button type="error" size="mini" @click="deqianming(0)"
-										style="margin-left: 15rpx;" v-if="form.weiTuoFangQueRen != ''">
+									<u-button type="error" size="mini" @click="deqianming(0)" style="margin-left: 15rpx;" v-if="form.weiTuoFangQueRen != ''">
 										取消</u-button>
 								</view>
 							</view>
 							<view style="width: 100%;" v-if="form.weiTuoFangQueRen != ''">
-								<image :src="form.weiTuoFangQueRen"
-									style="width: 100%;height: 500rpx;border: 1px #eee solid;">
+								<image :src="form.weiTuoFangQueRen" style="width: 100%;height: 500rpx;border: 1px #eee solid;">
 								</image>
 							</view>
 						</view>
@@ -158,8 +146,7 @@
 
 			<u-row v-else>
 				<u-col span="6">
-					<u-button type="success" @click="onSubmit(1)" class="btn green-back-color"
-						style="margin-bottom: 15rpx;" v-if="type != 'detail'">
+					<u-button type="success" @click="onSubmit(1)" class="btn green-back-color" style="margin-bottom: 15rpx;" v-if="type != 'detail'">
 						暂存
 					</u-button>
 				</u-col>
@@ -189,23 +176,18 @@
 
 		<u-popup v-model="lhypbShow" mode="bottom" height="80%" border-radius="20">
 			<view>
-				<lhypb-message ref="lhypbMessage" :type="lhypbIndexData" :jianCeTypeList="jianCeTypeList"
-					:taoCanShow="taoCanShow" :heTongId="form.heTongId" :itemType="itemType"
-					:chuJuBaoGaoYaoQiu="form.chuJuBaoGaoYaoQiu" @deletClick="deletClick"
-					@sumbitSingClick="sumbitSingClick" @getParentContent="getJianXiangData">
+				<lhypb-message ref="lhypbMessage" :type="lhypbIndexData" :jianCeTypeList="jianCeTypeList" :taoCanShow="taoCanShow" :heTongId="form.heTongId" :itemType="itemType" :chuJuBaoGaoYaoQiu="form.chuJuBaoGaoYaoQiu" @deletClick="deletClick" @sumbitSingClick="sumbitSingClick" @getParentContent="getJianXiangData">
 				</lhypb-message>
 			</view>
 		</u-popup>
 
-		<u-modal v-model="meassageShow" :show-cancel-button="true" :show-confirm-button="false" title="检测项目"
-			@cancel="cancel">
+		<u-modal v-model="meassageShow" :show-cancel-button="true" :show-confirm-button="false" title="检测项目" @cancel="cancel">
 			<view class="u-update-content">
 				<rich-text :nodes="content"></rich-text>
 			</view>
 		</u-modal>
 
-		<u-modal v-model="backShow" :show-cancel-button="true" :show-confirm-button="false" title="退回提示"
-			@cancel="cancel">
+		<u-modal v-model="backShow" :show-cancel-button="true" :show-confirm-button="false" title="退回提示" @cancel="cancel">
 			<view class="u-update-content">
 				<rich-text :nodes="content"></rich-text>
 			</view>
@@ -656,7 +638,7 @@
 						let list = service.getListForm(result, this.jianCeList, this.taoCanXiangmMuList, this
 							.taoCanList)
 						this.form.lhypb = list
-						this.getTotal()
+						//this.getTotal()
 						uni.hideLoading()
 					} else {
 						uni.hideLoading()

pages/jiance/order/meth.js

@@ -67,17 +67,12 @@ export default {
 			let changGuijianCe = []
 			if (item.jian_ce_xiang_mu_) {
 				changGuijianCe = item.jian_ce_xiang_mu_.split(",")
-				//changGuijianCe.forEach(itg => {
 				jiancLis.forEach(it => {
-					//if (itg == it.id_) {
-					//	it.checked = true
-					//}
 					let jianSin = changGuijianCe.findIndex(itg => itg == it.id_)
 					if (jianSin >= 0) {
 						it.checked = true
 					}
 				})
-				//})
 
 				let showHen = this.getXiangMuList(changGuijianCe, jiancLis) //已经选择的检测项目是否存在常规项目
 				if (!showHen) {