update

common/router/index.js

@@ -21,9 +21,7 @@ router.beforeEach((to, from, next) => {
 
 	if (token) {
 		next()
-		console.log(true)
 	} else {
-		console.log(false)
 		if (to.name == 'login') {
 			next()
 		} else if (to.name == 'zhuce') {
@@ -42,7 +40,5 @@ router.beforeEach((to, from, next) => {
 	}
 })
 // 全局路由后置守卫
-router.afterEach((to, from) => {
-	console.log("afterEach")
-})
+router.afterEach((to, from) => {})
 export default router;

pages/home/home.vue

@@ -89,7 +89,6 @@
 			cur: {
 				immediate: true,
 				handler: function(val, oldVal) {
-					console.log('cur', val, oldVal)
 					this.initMenu()
 				},
 			},
@@ -135,7 +134,6 @@
 
 		methods: {
 			initMenu() {
-				console.log("-----------home------------")
 				//this.onSocketOpen()
 				// this.onSocketReceive()
 				this.loadCount(0);
@@ -149,7 +147,6 @@
 					this.msgCount = 0
 				}
 				this.dot[page] = false
-				console.log(page)
 				this.$Router.push({
 					name: page
 				})
@@ -161,7 +158,6 @@
 			onSocketReceive() {
 				var _this = this
 				socket.acceptMessage = function(res) {
-					// console.log("页面收到的消息", res);
 					if (res.cmd == "topic") {
 						//系统通知
 						_this.loadCount('1')
@@ -175,17 +171,14 @@
 				}
 			},
 			loadCount(flag) {
-				console.log("loadCount::flag", flag)
 				let url = '/sys/annountCement/listByUser';
 
 				/*
 				this.$http.get(url).then(res=>{
-					console.log("res::",res)
 				  if(res.data.success){
 					let msg1Count = res.data.result.anntMsgTotal;
 					let msg2Count = res.data.result.sysMsgTotal;
 					this.msgCount = msg1Count + msg2Count
-					console.log("this.msgCount",this.msgCount)
 				  }
 				})
 				*/

pages/jiance/list.vue

@@ -114,8 +114,6 @@
 			},
 			change(e) {
 				this.getData(this.current, this.pageSize, this.total);
-				console.log(this.total)
-				console.log(e)
 				this.current = e.current
 			},
 

pages/jiance/list/specimen.vue

@@ -36,16 +36,16 @@
 					<u-input type="select" v-model="form.song_jian_shi_jia" @click="dateClick('inspect')" />
 				</u-form-item>
 
-				<view class="qingshe" @click="form.showBoolean1 = !form.showBoolean1">
+				<view class="qingshe" @click="showBoolean1 = !showBoolean1">
 					<view>
 						②
 					</view>
 					<view>
-						<u-icon name="arrow-up" v-if="form.showBoolean1"></u-icon>
+						<u-icon name="arrow-up" v-if="showBoolean1"></u-icon>
 						<u-icon name="arrow-down" v-else></u-icon>
 					</view>
 				</view>
-				<block v-if="form.showBoolean1">
+				<block v-if="showBoolean1">
 					<u-form-item label="样本类型一">
 						<u-input type="select" v-model="form.yang_pin_lei_xing" @click="sheetClick('yangpinType1')" />
 					</u-form-item>
@@ -63,16 +63,16 @@
 				</block>
 
 
-				<view class="qingshe" @click="form.showBoolean2 = !form.showBoolean2">
+				<view class="qingshe" @click="showBoolean2 = !showBoolean2">
 					<view>
 						②
 					</view>
 					<view>
-						<u-icon name="arrow-up" v-if="form.showBoolean3"></u-icon>
+						<u-icon name="arrow-up" v-if="showBoolean3"></u-icon>
 						<u-icon name="arrow-down" v-else></u-icon>
 					</view>
 				</view>
-				<block v-if="form.showBoolean2">
+				<block v-if="showBoolean2">
 					<u-form-item label="样本类型②">
 						<u-input type="select" v-model="form.yang_pin_lei_er_" @click="sheetClick('yangpinType2')" />
 					</u-form-item>
@@ -90,16 +90,16 @@
 				</block>
 
 
-				<view class="qingshe" @click="form.showBoolean3 = !form.showBoolean3">
+				<view class="qingshe" @click="showBoolean3 = !showBoolean3">
 					<view>
 						③
 					</view>
 					<view>
-						<u-icon name="arrow-up" v-if="form.showBoolean3"></u-icon>
+						<u-icon name="arrow-up" v-if="showBoolean3"></u-icon>
 						<u-icon name="arrow-down" v-else></u-icon>
 					</view>
 				</view>
-				<block v-if="form.showBoolean3">
+				<block v-if="showBoolean3">
 					<u-form-item label="样本类③">
 						<u-input type="select" v-model="form.yang_pin_lei_san_" @click="sheetClick('yangpinType3')" />
 					</u-form-item>
@@ -117,16 +117,16 @@
 				</block>
 
 
-				<view class="qingshe" @click="form.showBoolean4 = !form.showBoolean4">
+				<view class="qingshe" @click="showBoolean4 = !showBoolean4">
 					<view>
 						④
 					</view>
 					<view>
-						<u-icon name="arrow-up" v-if="form.showBoolean4"></u-icon>
+						<u-icon name="arrow-up" v-if="showBoolean4"></u-icon>
 						<u-icon name="arrow-down" v-else></u-icon>
 					</view>
 				</view>
-				<block v-if="form.showBoolean4">
+				<block v-if="showBoolean4">
 					<u-form-item label="样本类型④">
 						<u-input type="select" v-model="form.yang_pin_lei_si_" @click="sheetClick('yangpinType4')" />
 					</u-form-item>
@@ -151,8 +151,11 @@
 					<view style="width: 100%;">
 						<view v-for="(it, x) in jianCeList" :key="x">
 							<view class="jiancexiangm">
-								<view>{{it.lei_bie_}}-{{it.jian_ce_xiang_mu_}}</view>
-								<view>{{it.yi_ju_de_biao_zhu}}</view>
+								<view>
+									{{it.lei_bie_ || ''}}-{{it.jian_ce_xiang_mu_ || ''}}[{{it.xiang_mu_dan_jia_ || '0'}}元]
+								</view>
+								<view>{{it.yi_ju_de_biao_zhu || ''}}</view>
+								<view>报告周期（工作日）:{{it.bao_gao_zhou_qi_g || '0'}}天</view>
 							</view>
 						</view>
 					</view>
@@ -206,12 +209,11 @@
 					yang_pin_yun_si_: '',
 					yang_pin_lei_si_: '',
 					xiang_mu_ming_che: '',
-
-					showBoolean1: true,
-					showBoolean2: false,
-					showBoolean3: false,
-					showBoolean4: false,
 				},
+				showBoolean1: true,
+				showBoolean2: false,
+				showBoolean3: false,
+				showBoolean4: false,
 				jianCeList: [],
 				//日期
 				dateType: 'inspect',
@@ -288,16 +290,16 @@
 						}
 
 						if (result.yang_pin_lei_xing != '') {
-							this.form.showBoolean1 = true
+							this.showBoolean1 = true
 						}
 						if (result.yang_pin_lei_er_ != '') {
-							this.form.showBoolean2 = true
+							this.showBoolean2 = true
 						}
 						if (result.yang_pin_lei_san_ != '') {
-							this.form.showBoolean3 = true
+							this.showBoolean3 = true
 						}
 						if (result.yang_pin_lei_si_ != '') {
-							this.form.showBoolean4 = true
+							this.showBoolean4 = true
 						}
 
 					}

pages/jiance/manyi.vue

@@ -220,7 +220,6 @@
 				});
 			},
 			onChange(e) {
-				console.log(e)
 				let itemData = this.kehuXinXinList.find(item => item.id_ = e)
 				if (itemData) {
 					this.lianxidianhua = itemData.lian_xi_fang_shi_

pages/jiance/order.vue

@@ -8,42 +8,41 @@
 			:disabled="type == 'detail' ? true : false">
 			<uni-group mode="card" title="委托信息">
 				<u-form-item label="委托类型">
-					<u-input v-model="form.weiTuoLeiXing" disabled />
+					<u-input placeholder="请输入委托类型" v-model="form.weiTuoLeiXing" disabled />
 				</u-form-item>
 				<u-form-item label="委托编号">
-					<u-input v-model="form.weiTuoBianHao" disabled />
+					<u-input placeholder="请输入委托编号" v-model="form.weiTuoBianHao" disabled />
 				</u-form-item>
 				<u-form-item label="合同选择" prop="heTongId" required>
-					<uni-data-select 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>
 				<u-form-item label="委托来源">
-					<u-input v-model="form.weiTuoDanLaiYuan" disabled />
+					<u-input placeholder="请输入委托来源" v-model="form.weiTuoDanLaiYuan" disabled />
 				</u-form-item>
 				<u-form-item label="合同类型" prop="weiTuoHeTong" required>
-					<u-input v-model="form.weiTuoHeTong" disabled />
+					<u-input placeholder="请输入合同类型" v-model="form.weiTuoHeTong" disabled />
 				</u-form-item>
 				<u-form-item label="委托单位">
-					<u-input v-model="form.weiTuoDanWei" disabled />
+					<u-input placeholder="请输入委托单位" v-model="form.weiTuoDanWei" disabled />
 				</u-form-item>
 				<u-form-item label="送检单位" prop="songJianDanWei" required>
-					<u-input v-model="form.songJianDanWei" />
+					<u-input placeholder="请输入送检单位" v-model="form.songJianDanWei" />
 				</u-form-item>
-
 			</uni-group>
 
 			<uni-group mode="card" :title="'样品' + (index+1)" v-for="(item,index) in form.lhypb" :key="index">
 				<u-form-item label="样品名称" prop="yangPinMingCheng" required>
-					<u-input v-model="item.yangPinMingCheng" :disabled="type == 'detail'?true :false" />
+					<u-input placeholder="请输入样品名称" v-model="item.yangPinMingCheng"
+						:disabled="type == 'detail'?true :false" />
 				</u-form-item>
 				<u-form-item label="样品编号">
-					<u-input v-model="item.yangPinBianHao" disabled />
+					<u-input placeholder="请输入样品编号" v-model="item.yangPinBianHao" disabled />
 				</u-form-item>
 				<u-form-item label="姓名">
-					<u-input v-model="item.xingMing" :disabled="type == 'detail'?true :false" />
+					<u-input placeholder="请输入姓名" v-model="item.xingMing" :disabled="type == 'detail'?true :false" />
 				</u-form-item>
 				<u-form-item label="性别">
 					<u-radio-group v-model="item.xingBie" v-if="type != 'detail'">
@@ -54,24 +53,26 @@
 					<text v-else>{{item.xingBie}}</text>
 				</u-form-item>
 				<u-form-item label="年龄">
-					<u-input v-model="item.nianLing" />
+					<u-input placeholder="请输入年龄" v-model="item.nianLing" />
 				</u-form-item>
 				<u-form-item label="送检批号/编号" prop="songJianPiHao" required>
-					<u-input v-model="item.songJianPiHao" :disabled="type == 'detail'?true :false" />
+					<u-input placeholder="请输入送检批号/编号" v-model="item.songJianPiHao"
+						:disabled="type == 'detail'?true :false" />
 				</u-form-item>
 				<u-form-item label="样本状态" prop="yangPinZhuangTai" required>
-					<u-input type="select" v-model="item.yangPinZhuangTai" @click="sheetClick('state',index)"
-						v-if="type != 'detail'" />
+					<u-input placeholder="请选择样本状态" type="select" v-model="item.yangPinZhuangTai"
+						@click="sheetClick('state',index)" v-if="type != 'detail'" />
 
 					<text v-else>{{item.yangPinZhuangTai}}</text>
 				</u-form-item>
 				<u-form-item label="送检时间" prop="songJianShiJian" required>
-					<u-input type="select" v-model="item.songJianShiJian" @click="dateClick('inspect',index)"
-						v-if="type != 'detail'" />
+					<u-input placeholder="请选择送检时间" type="select" v-model="item.songJianShiJian"
+						@click="dateClick('inspect',index)" v-if="type != 'detail'" />
 					<text v-else>{{item.songJianShiJian}}</text>
 				</u-form-item>
 				<u-form-item label="送样要求">
-					<u-input v-model="item.songYangYaoQiu" :disabled="type == 'detail'?true :false" />
+					<u-input placeholder="请输入送样要求" v-model="item.songYangYaoQiu"
+						:disabled="type == 'detail'?true :false" />
 				</u-form-item>
 
 				<view class="qingshe" @click="item.showBoolean1 = !item.showBoolean1">
@@ -84,13 +85,13 @@
 					</view>
 				</view>
 				<block v-if="item.showBoolean1">
-					<u-form-item label="样本类型①">
-						<u-input type="select" v-model="item.yangPinLeiXing" @click="sheetClick('yangpinType1',index)"
-							v-if="type != 'detail'" />
+					<u-form-item label="样品类型①">
+						<u-input placeholder="请选择样品类型①" type="select" v-model="item.yangPinLeiXing"
+							@click="sheetClick('yangpinType1',index)" v-if="type != 'detail'" />
 						<text v-else>{{item.yangPinLeiXing}}</text>
 					</u-form-item>
-					<u-form-item label="样本运输条件①">
-						<u-input type="select" v-model="item.yangBenYunShuTiao"
+					<u-form-item label="样品运输条件①">
+						<u-input placeholder="请选择样品运输条件①" type="select" v-model="item.yangBenYunShuTiao"
 							@click="sheetClick('transportType1',index)" v-if="type != 'detail'" />
 						<text v-else>{{item.yangBenYunShuTiao}}</text>
 					</u-form-item>
@@ -100,7 +101,7 @@
 						<text v-else>{{item.shuLiang}}</text>
 					</u-form-item>
 					<u-form-item label="样品规格①">
-						<u-input v-model="item.yangPinGuiGe" v-if="type != 'detail'" />
+						<u-input placeholder="请输入样品规格①" v-model="item.yangPinGuiGe" v-if="type != 'detail'" />
 						<u-button slot="right" type="success" size="mini" @click="sheetClick('specification1',index)"
 							v-if="type != 'detail'">规格
 						</u-button>
@@ -118,13 +119,13 @@
 					</view>
 				</view>
 				<block v-if="item.showBoolean2">
-					<u-form-item label="样本类型②">
-						<u-input type="select" v-model="item.yangPinLeiXingEr" @click="sheetClick('yangpinType2',index)"
-							v-if="type != 'detail'" />
+					<u-form-item label="样品类型②">
+						<u-input placeholder="请选择样品类型②" type="select" v-model="item.yangPinLeiXingEr"
+							@click="sheetClick('yangpinType2',index)" v-if="type != 'detail'" />
 						<text v-else>{{item.yangPinLeiXingEr}}</text>
 					</u-form-item>
-					<u-form-item label="样本运输条件②">
-						<u-input type="select" v-model="item.yangPinYunShuTiao"
+					<u-form-item label="样品运输条件②">
+						<u-input placeholder="请选择样品运输条件②" type="select" v-model="item.yangPinYunShuTiao"
 							@click="sheetClick('transportType2',index)" v-if="type != 'detail'" />
 						<text v-else>{{item.yangPinYunShuTiao}}</text>
 					</u-form-item>
@@ -134,7 +135,7 @@
 						<text v-else>{{item.shuLiangEr}}</text>
 					</u-form-item>
 					<u-form-item label="样品规格②">
-						<u-input v-model="item.yangPinGuiGeEr" v-if="type != 'detail'" />
+						<u-input placeholder="请输入样品规格②" v-model="item.yangPinGuiGeEr" v-if="type != 'detail'" />
 						<u-button slot="right" type="success" size="mini" @click="sheetClick('specification2',index)"
 							v-if="type != 'detail'">规格
 						</u-button>
@@ -152,13 +153,13 @@
 					</view>
 				</view>
 				<block v-if="item.showBoolean3">
-					<u-form-item label="样本类型③">
-						<u-input type="select" v-model="item.yangPinLeiXingSan"
+					<u-form-item label="样品类型③">
+						<u-input placeholder="请选择样品类型③" type="select" v-model="item.yangPinLeiXingSan"
 							@click="sheetClick('yangpinType3',index)" v-if="type != 'detail'" />
 						<text v-else>{{item.yangPinLeiXingSan}}</text>
 					</u-form-item>
-					<u-form-item label="样本运输条件③">
-						<u-input type="select" v-model="item.yangPinYunShuSan"
+					<u-form-item label="样品运输条件③">
+						<u-input placeholder="请选择样品运输条件③" type="select" v-model="item.yangPinYunShuSan"
 							@click="sheetClick('transportType3',index)" v-if="type != 'detail'" />
 						<text v-else>{{item.yangPinLeiXingSan}}</text>
 					</u-form-item>
@@ -168,7 +169,7 @@
 						<text v-else>{{item.shuLiangSan}}</text>
 					</u-form-item>
 					<u-form-item label="样品规格③">
-						<u-input v-model="item.yangPinGuiGeSan" v-if="type != 'detail'" />
+						<u-input placeholder="请输入样品规格③" v-model="item.yangPinGuiGeSan" v-if="type != 'detail'" />
 						<u-button slot="right" type="success" size="mini" @click="sheetClick('specification3',index)"
 							v-if="type != 'detail'">规格
 						</u-button>
@@ -186,13 +187,13 @@
 					</view>
 				</view>
 				<block v-if="item.showBoolean4">
-					<u-form-item label="样本类型④">
-						<u-input type="select" v-model="item.yangPinLeiXingSi" @click="sheetClick('yangpinType4',index)"
-							v-if="type != 'detail'" />
+					<u-form-item label="样品类型④">
+						<u-input placeholder="请选择样品类型④" type="select" v-model="item.yangPinLeiXingSi"
+							@click="sheetClick('yangpinType4',index)" v-if="type != 'detail'" />
 						<text v-else>{{item.yangPinLeiXingSi}}</text>
 					</u-form-item>
-					<u-form-item label="样本运输条件④">
-						<u-input type="select" v-model="item.yangPinYunShuSi"
+					<u-form-item label="样品运输条件④">
+						<u-input placeholder="请选择样品运输条件④" type="select" v-model="item.yangPinYunShuSi"
 							@click="sheetClick('transportType4',index)" v-if="type != 'detail'" />
 						<text v-else>{{item.yangPinYunShuSi}}</text>
 					</u-form-item>
@@ -202,22 +203,24 @@
 						<text v-else>{{item.shuLiangSi}}</text>
 					</u-form-item>
 					<u-form-item label="样品规格④">
-						<u-input v-model="item.yangPinGuiGeSi" v-if="type != 'detail'" />
+						<u-input placeholder="请输入样品规格④" v-model="item.yangPinGuiGeSi" v-if="type != 'detail'" />
 						<u-button slot="right" type="success" size="mini" @click="sheetClick('specification4',index)"
 							v-if="type != 'detail'">规格
 						</u-button>
 						<text v-else>{{item.yangPinGuiGeSi}}</text>
 					</u-form-item>
-					<u-form-item label="项目名称" prop="xiangMuMingCheng" v-if="form.weiTuoHeTong == '技术服务协议'">
-						<u-input v-model="item.xiangMuMingCheng" :disabled="type == 'detail'?true :false" />
-					</u-form-item>
-					<u-form-item label="样品总价" prop="yangPinZongJia">
-						<u-input v-model="item.yangPinZongJia" disabled />
-					</u-form-item>
 				</block>
+				<u-form-item label="项目名称" prop="xiangMuMingCheng" v-if="form.weiTuoHeTong == '技术服务协议'">
+					<u-input placeholder="请输入项目名称" v-model="item.xiangMuMingCheng"
+						:disabled="type == 'detail'?true :false" />
+				</u-form-item>
+				<u-form-item label="样品总价" prop="yangPinZongJia">
+					<u-input v-model="item.yangPinZongJia" disabled />
+				</u-form-item>
 
 				<u-form-item label="检测类型" v-if="type != 'detail'">
-					<u-input type="select" v-model="item.jianCeType" @click="selectClick('jianCeType',index)" />
+					<u-input placeholder="请选择检测类型" type="select" v-model="item.jianCeType"
+						@click="selectClick('jianCeType',index)" />
 				</u-form-item>
 
 				<u-form-item label="检测项目" prop="name" label-position="top">
@@ -228,26 +231,28 @@
 							<view>
 								<checkbox :checked="it.checked" :value="it.id_" />
 							</view>
-							<view style="margin-left: 10rpx;">
+							<view style="margin-left: 10rpx;font-size: 28rpx;">
 								<view>
-									{{it.jian_ce_lei_bie_ || ''}}-{{it.jian_ce_xiang_mu_ || ''}}[{{it.xiang_mu_dan_jia_ || '0'}}]
+									{{it.jian_ce_lei_bie_ || ''}}-{{it.jian_ce_xiang_mu_ || ''}}
+									<text style="color: red;">[{{it.xiang_mu_dan_jia_ || '0'}}元]</text>
 								</view>
 								<view>{{it.yi_ju_de_biao_zhu || ''}}</view>
+								<view>报告周期（工作日）:{{it.bao_gao_zhou_qi_g || '0'}}天</view>
 							</view>
 						</label>
 					</checkbox-group>
 					<view v-for="(it, x) in item.jianCeList" :key="x" v-if="it.checked && type=='detail'">
 						<view class="uni-list-cell uni-list-cell-pd">
 							<view
-								style="margin-left: 10rpx;font-size: 20rpx;line-height: 40rpx;background: #eee;padding: 10rpx;">
+								style="margin-left: 10rpx;font-size: 28rpx;line-height: 40rpx;background: #eee;padding: 10rpx;">
 								<view>
-									{{it.jian_ce_lei_bie_ || ''}}-{{it.jian_ce_xiang_mu_ || ''}}[{{it.xiang_mu_dan_jia_ || ''}}]
+									{{it.jian_ce_lei_bie_ || ''}}-{{it.jian_ce_xiang_mu_ || ''}}[{{it.xiang_mu_dan_jia_ || ''}}元]
 								</view>
 								<view>{{it.yi_ju_de_biao_zhu || ''}}</view>
+								<view>报告周期（工作日）:{{it.bao_gao_zhou_qi_g || '0'}}天</view>
 							</view>
 						</view>
 					</view>
-
 				</u-form-item>
 
 				<u-button type="error" class="btn" @click="deletSing(index)" v-if="type != 'detail'">删除样品{{index+1}}
@@ -258,7 +263,7 @@
 
 			<uni-group mode="card">
 				<u-form-item label="付款方式">
-					<u-input v-model="form.fuKuanFangShi" disabled />
+					<u-input placeholder="请输入付款方式" v-model="form.fuKuanFangShi" disabled />
 				</u-form-item>
 				<u-form-item label="报告类型">
 					<u-radio-group v-model="form.baoGaoLeiXing" v-if="type != 'detail'">
@@ -277,32 +282,35 @@
 					<text v-else>{{getButtChange(form.chuJuBaoGaoYaoQiu,reportRequireList)}}</text>
 				</u-form-item>
 				<u-form-item label="出报告时间" prop="chuBaoGaoShiJian" required>
-					<u-input type="select" v-model="form.chuBaoGaoShiJian" @click="dateClick('report')"
-						v-if="type != 'detail'" />
+					<u-input placeholder="请选择出报告时间" type="select" v-model="form.chuBaoGaoShiJian"
+						@click="dateClick('report')" v-if="type != 'detail'" />
 					<text v-else>{{form.chuBaoGaoShiJian}}</text>
 				</u-form-item>
 				<u-form-item label="样本处理" prop="yangBenChuLi" required>
-					<u-input 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>
 				<u-form-item label="总价">
-					<u-input v-model="form.zongJia" disabled />
+					<u-input placeholder="请输入总价" v-model="form.zongJia" disabled />
 				</u-form-item>
 			</uni-group>
 
 			<uni-group mode="card" title="委托人信息">
 				<u-form-item label="委托方" prop="weiTuoFangMingChe" required>
-					<u-input 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 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 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 type="select" v-model="form.weiTuoRiQi" @click="dateClick('weiTuo')"
+					<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>
@@ -384,7 +392,7 @@
 					weiTuoFangLianXiD: '',
 					weiTuoRiQi: '',
 					weiTuoFangQueRen: '',
-					zongJia: '',
+					zongJia: 0,
 					zhanShiBiaoId: this.generateUUID()
 				},
 				rules: {
@@ -491,18 +499,14 @@
 		onLoad(options) {
 			this.getInit()
 			if (options.saveId) { //是不是暂存信息
-				console.log("1")
 				this.saveId = options.saveId
 				this.getSaveData(options.saveId)
 			} else if (options.type && options.type != '') { //是不是修改信息
-				console.log("2")
 				this.type = options.type
 			} else {
-				console.log("3")
 				this.getLhwtdh()
 			}
 			if (options.id) { //是不是修改信息
-				console.log("4")
 				this.id = options.id
 				this.getDe(options.id)
 
@@ -510,9 +514,6 @@
 					this.getTaskId(options.id)
 				}
 			}
-
-
-
 		},
 		onReady() {
 			this.$refs.form.setRules(this.rules);
@@ -529,7 +530,6 @@
 					if (res.data.state == 200) {
 						let result = res.data.variables.data[0]
 						this.taskId = result.TASK_ID_
-						console.log(this.taskId)
 					}
 				})
 			},
@@ -630,11 +630,11 @@
 						this.form = form
 
 						if (result.chu_ju_bao_gao_ya == '特急') {
-							this.total = parseInt(result.zong_jia_) / 1.5
+							this.total = parseFloat(result.zong_jia_) / 1.5
 						} else if (result.chu_ju_bao_gao_ya == '加急') {
-							this.total = parseInt(result.zong_jia_) / 1.2
+							this.total = parseFloat(result.zong_jia_) / 1.2
 						} else {
-							this.total = parseInt(result.zong_jia_)
+							this.total = parseFloat(result.zong_jia_)
 						}
 
 						this.getJiance(result.he_tong_id_, this.type, id)
@@ -701,6 +701,7 @@
 					this.form.weiTuoHeTong = data.he_tong_lei_xing_
 					this.form.fuKuanFangShi = data.fu_kuan_fang_shi_
 					this.form.weiTuoDanWei = data.zhuan_huan_ke_hu_
+					this.form.songJianDanWei = data.zhuan_huan_ke_hu_
 					this.getJiance(e)
 				}
 			},
@@ -766,11 +767,11 @@
 					let itemTotal = 0
 					item.jianCeList.forEach((it, x) => {
 						if (it.checked) {
-							total += parseInt(it.zhe_hou_jia_ge_)
-							itemTotal += parseInt(it.zhe_hou_jia_ge_)
+							total += parseFloat(it.zhe_hou_jia_ge_)
+							itemTotal += parseFloat(it.zhe_hou_jia_ge_)
 						}
 					})
-					item.yangPinZongJia = itemTotal
+					item.yangPinZongJia = (itemTotal).toFixed(2)
 				})
 				this.form.zongJia = total
 				this.total = total
@@ -779,11 +780,11 @@
 			//特急 加急 常规
 			getMultiple() {
 				if (this.form.chuJuBaoGaoYaoQiu == '特急') {
-					this.form.zongJia = this.total * 1.5
+					this.form.zongJia = (this.total * 1.5).toFixed(2)
 				} else if (this.form.chuJuBaoGaoYaoQiu == '加急') {
-					this.form.zongJia = this.total * 1.2
+					this.form.zongJia = (this.total * 1.2).toFixed(2)
 				} else {
-					this.form.zongJia = this.total * 1
+					this.form.zongJia = (this.total * 1).toFixed(2)
 				}
 			},
 
@@ -913,7 +914,6 @@
 				}
 			},
 			selectConfirm(e) {
-				console.log(e)
 				let that = this
 				let lists = that.form.lhypb[this.listIndex]
 				if (this.listType == 'jianCeType') {
@@ -923,6 +923,7 @@
 
 			//提交
 			sumbit(valueType) {
+				//委托提交判断
 				if (valueType != 'beingTime') {
 					if (this.form.lhypb.length == 0) {
 						uni.showToast({
@@ -961,10 +962,8 @@
 				this.form.weiTuoZhuangTai = '已编制'
 				this.form.fuKuanZhuangTai = '未结清'
 
-
-
-
 				this.form.lhypb.forEach((item, index) => {
+					item.jianCeXiangMu2 = []
 					item.weiTuoDanHao = this.form.weiTuoBianHao
 					item.weiTuoDanWei = this.form.weiTuoDanWei
 					item.lianXiRen = this.form.weiTuoFangLianXiR
@@ -977,6 +976,33 @@
 					item.jianCeXiangMu = item.jianCeXiangMu2.join(",")
 				})
 
+				//委托提交判断
+				if (valueType != 'beingTime') {
+					for (let index in this.form.lhypb) {
+						let item = this.form.lhypb[index]
+						if (item.yangPinMingCheng == '') {
+							uni.showToast({
+								title: `请输入样品信息${parseInt(index)+1}的样品名称`,
+								icon: 'none',
+								duration: 2000
+							})
+							return
+						}
+					}
+
+
+					let showIndex = this.form.lhypb.findIndex(item => item.jianCeXiangMu == '')
+					if (showIndex >= 0) {
+						uni.showToast({
+							title: `请在样品信息${showIndex+1}选择委托单需要检测项目`,
+							icon: 'none',
+							duration: 2000
+						})
+						return
+					}
+				}
+
+				//委托暂存判断
 				if (valueType == 'beingTime') {
 					this.form.jianCeTypeList = this.jianCeTypeList
 					this.form.originalTotal = this.total
@@ -984,7 +1010,6 @@
 					return
 				}
 
-
 				//驳回同意数据封装
 				var editData = {}
 				if (this.type == 'edit' && valueType != 'beingTime') {
@@ -1127,9 +1152,7 @@
 									}
 								});
 
-						} else if (res.cancel) {
-							console.log('用户点击取消');
-						}
+						} else if (res.cancel) {}
 					}
 				});
 			},
@@ -1179,7 +1202,7 @@
 						yangPinYunShuSi: '',
 						shuLiangSi: 0,
 						jianCeList: JSON.parse(JSON.stringify(this.jianCeList)),
-						jianCeType: this.jianCeTypeList[0].text,
+						jianCeType: this.jianCeTypeList[0].value,
 
 						xiangMuMingCheng: '',
 						yangPinZongJia: '',

pages/jiance/order/test.json

@@ -64,19 +64,23 @@
 		"name": "女"
 	}],
 	"specification": [{
-		"text": "__ml(规格)*__ml离心管"
+		"text": "__ml*5ml离心管"
 	}, {
-		"text": "__ml(规格)*冻存管"
+		"text": "__ml*15ml离心管"
 	}, {
-		"text": "__ml(规格)*冻存袋"
+		"text": "__ml*50ml离心管"
 	}, {
-		"text": "__ml(规格)*玻璃管"
+		"text": "__ml*冻存管"
 	}, {
-		"text": "__ml(规格)*玻璃瓶"
+		"text": "__ml*冻存袋"
 	}, {
-		"text": "__ml(规格)*EP管"
+		"text": "__ml*玻璃管"
 	}, {
-		"text": "__ml(规格)*采血管"
+		"text": "__ml*玻璃瓶"
+	}, {
+		"text": "__ml*EP管"
+	}, {
+		"text": "__ml*采血管"
 	}, {
 		"text": "其它：容量*包装类型"
 	}],

pages/jiance/tousu.vue

@@ -289,7 +289,6 @@
 				}
 				let that = this
 				for (let e in file.tempFilePaths) {
-					console.log("000", file.tempFiles[e].file)
 					var extName = file.tempFiles[e].file.name.substring(file.tempFiles[e].file.name.lastIndexOf(
 						'.'));
 					const path = file.tempFilePaths[e];
@@ -315,7 +314,6 @@
 					});
 				}
 				return true;
-				console.log('选择文件：')
 			},
 			// 删除
 			deleteMe(file) {
@@ -326,18 +324,11 @@
 				}
 			},
 			// 获取上传进度
-			progress(e) {
-				console.log('上传进度：', e)
-			},
+			progress(e) {},
 			// 上传成功
-			success(file) {
-
-				console.log('上传成功', file)
-			},
+			success(file) {},
 			// 上传失败
-			fail(e) {
-				console.log('上传失败：', e)
-			},
+			fail(e) {},
 			onSubmit() {
 				let tmpArray = []
 				for (let e in this.fuJianShangChuanArray) {
@@ -371,7 +362,6 @@
 				this.form.zhuangTai = "已登记"
 				this.form.bianZhiBuMen = "1041786072788369408"
 				para.parameters[2].value = JSON.stringify(this.form);
-				console.log()
 				let that = this;
 				this.$http.post("ibps/business/v3/bpm/instance/start", para).then(res => {
 					if (res.data.state == 200) {

pages/user/people.vue

@@ -14,12 +14,12 @@
 			<view class="padding flex text-center text-grey bg-white shadow-warp">
 				<view class="flex flex-sub flex-direction solid-right animation-slide-top"
 					:style="[{animationDelay: '0.2s'}]">
-					<view class="text-xl text-orange title-message">{{personalList.username}}</view>
+					<view class="text-xl text-orange">{{personalList.username}}</view>
 					<view class="margin-top-sm"><text class="cuIcon-people"></text> 用户</view>
 				</view>
 
 				<view class="flex flex-sub flex-direction animation-slide-top" :style="[{animationDelay: '0.2s'}]">
-					<view class="text-xl text-green title-message">{{personalList.post?personalList.post:'客户'}}</view>
+					<view class="text-xl text-green">{{personalList.post?personalList.post:'客户'}}</view>
 					<view class="margin-top-sm"><text class="cuIcon-news"></text> 职务</view>
 				</view>
 			</view>
@@ -124,27 +124,20 @@
 			cur: {
 				immediate: true,
 				handler() {
-					console.log('watch', this.cur)
 					this.userId = this.$store.getters.userid;
-					console.log(this.userId)
 					this.load()
 				},
 			},
 		},
 		onLoad() {
 			this.user = uni.getStorageSync(USER_INFO).employee;
-			console.log(this.user)
 		},
 		methods: {
 			scan() {
 				console.log("进来了")
 				// #ifndef H5
 				uni.scanCode({
-					success: function(res) {
-						console.log('条码res：' + res);
-						console.log('条码类型：' + res.scanType);
-						console.log('条码内容：' + res.result);
-					}
+					success: function(res) {}
 				});
 				// #endif
 				// #ifdef H5
@@ -179,7 +172,6 @@
 				this.personalList.avatar = user.post
 				this.personalList.post = user.orgName
 				this.personalList.username = user.name
-				console.log(user)
 			},
 			getpost(code) {
 				if (!code || code.length == 0) {
@@ -191,13 +183,10 @@
 						code: code
 					}
 				}).then(res => {
-					console.log("postUrl", res)
 					if (res.data.success) {
 						this.personalList.post = res.data.result.name
 					}
-				}).catch(err => {
-					console.log(err);
-				});
+				}).catch(err => {});
 
 			}
 		}