linweizeng 3 سال پیش
والد
کامیت
cadad68cc9

+ 0 - 7
common/router/modules/routes.js

@@ -19,13 +19,6 @@ const routes = [{
 			title: '修改密码',
 		},
 	},
-	{
-		path: "/pages/jiance/editOrder",
-		name: 'editOrder',
-		meta: {
-			title: '检测委托修改',
-		},
-	},
 	{
 		path: "/pages/jiance/tousu",
 		name: 'tousu',

+ 8 - 18
pages.json

@@ -17,10 +17,6 @@
 			"path": "pages/user/editpassword",
 			"style": {}
 		},
-		{
-			"path": "pages/jiance/editOrder",
-			"style": {}
-		},
 		{
 			"path": "pages/fileView/fileView",
 			"style": {}
@@ -43,10 +39,6 @@
 			"path": "pages/jiance/tousu",
 			"style": {}
 		},
-		{
-			"path": "pages/jiance/reportList",
-			"style": {}
-		},
 		{
 			"path": "pages/index/index",
 			"style": {}
@@ -254,17 +246,15 @@
 				"enablePullDownRefresh": true
 			}
 
+		}, {
+			"path": "pages/wallet/wallet",
+			"style": {
+				"navigationBarTitleText": "我的钱包",
+				"enablePullDownRefresh": false
+			}
+
 		}
-	    ,{
-            "path" : "pages/wallet/wallet",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "我的钱包",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-    ],
+	],
 	"globalStyle": {
 		"mp-alipay": {
 			/* 支付宝小程序特有相关 */

+ 6 - 5
pages/communication/communication.vue

@@ -11,9 +11,9 @@
 			</view>
 			<view class="cu-form-group">
 				<view class="title">客户单位名称:</view>
-				<input placeholder="请输入客户单位名称" v-model="form.keHuDanWeiMingChe" name="input"></input>
-				<u-icon class="uni-icon" name="close-circle-fill" color="rgb(192, 196, 204)" size="42"
-					v-if="form.keHuDanWeiMingChe != ''" @click="form.keHuDanWeiMingChe = ''"></u-icon>
+				<input placeholder="请输入客户单位名称" v-model="form.xuanZeKeHu" name="input" disabled></input>
+				<!-- 				<u-icon class="uni-icon" name="close-circle-fill" color="rgb(192, 196, 204)" size="42"
+					v-if="form.keHuDanWeiMingChe != ''" @click="form.keHuDanWeiMingChe = ''"></u-icon> -->
 			</view>
 			<view class="cu-form-group">
 				<view class="title">客户联系人:</view>
@@ -287,10 +287,11 @@
 			getKehu() {
 				let info = uni.getStorageSync(USER_INFO);
 				if (info) {
-					this.form.xuanZeKeHu = info.user.id
+					this.form.xuanZeKeHu = info.user.wcAccount
 					this.form.lianXiDianHua = info.user.mobile
-					this.form.keHuDanWeiMingChe = info.user.fullname
+					this.form.keHuDanWeiMingChe = info.user.id
 					this.form.keHuLianXiRen = info.user.fullname
+					this.form.keHuDanWeiMingChe = info.user.id
 				}
 				this.getWeiTuoList()
 			},

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 1304
pages/jiance/chaxun.vue


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 1023
pages/jiance/editOrder - 副本.vue


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 1339
pages/jiance/editOrder.vue


+ 6 - 6
pages/jiance/manyi.vue

@@ -6,9 +6,9 @@
 		</cu-custom>
 		<view class="cu-form-group">
 			<view class="title">客户单位:</view>
-			<input placeholder="请输入客户单位" v-model="buMenName" name="input"></input>
-			<u-icon class="uni-icon" name="close-circle-fill" color="rgb(192, 196, 204)" size="42"
-				v-if="buMenName != ''" @click="buMenName = ''"></u-icon>
+			<input placeholder="请输入客户单位" v-model="buMenName" name="input" disabled></input>
+			<!-- 			<u-icon class="uni-icon" name="close-circle-fill" color="rgb(192, 196, 204)" size="42"
+				v-if="buMenName != ''" @click="buMenName = ''"></u-icon> -->
 		</view>
 		<view class="cu-form-group">
 			<view class="title">客户联系方式:</view>
@@ -119,7 +119,7 @@
 				let info = uni.getStorageSync(USER_INFO);
 				if (info) {
 					this.keHuBianHao = info.user.id || ''
-					this.buMenName = info.user.name || ''
+					this.buMenName = info.user.wcAccount || ''
 					this.lianxidianhua = info.user.mobile || ''
 					this.keHuLianXiRen = info.user.name || ''
 					this.keHuLianXiYouXian = info.user.email || ''
@@ -158,8 +158,8 @@
 				}
 				let paraValue = {
 					nianFen: time.substring(0, 4),
-					guanLianKeHu: this.keHuBianHao,
-					keHu: this.buMenName,
+					// guanLianKeHu: this.keHuBianHao,
+					keHu: this.keHuBianHao,
 					lianXiDianHua: this.lianxidianhua,
 					keHuLianXiRen: this.keHuLianXiRen,
 					keHuLianXiYouXian: this.keHuLianXiYouXian,

+ 40 - 24
pages/jiance/order.vue

@@ -42,7 +42,9 @@
 
 			<uni-group mode="card" :title="'样品' + (index+1)" v-for="(item,index) in form.lhypb" :key="index"
 				v-if="index == lhypbIndex">
-				<u-form-item label="样品名称" prop="yangPinMingCheng" required>
+				<lhypb-message :item="item" :itemType="false" :type="type" :jianCeTypeList="jianCeTypeList"
+					@countTotal="getTotal" @getParentContent="getJianXiangData">></lhypb-message>
+				<!-- <u-form-item label="样品名称" prop="yangPinMingCheng" required>
 					<text>{{item.yangPinMingCheng}}</text>
 				</u-form-item>
 				<u-form-item label="样品编号">
@@ -85,8 +87,6 @@
 									<text style="color: red;">[{{it.zhe_hou_jia_ge_ || '当'}}元]</text>
 								</view>
 								<view>{{it.yi_ju_de_biao_zhu || ''}}</view>
-								<!-- 								<view>报告周期(工作日):{{it.bao_gao_zhou_qi_g || '当'}}天</view>
-								<view v-if="it.yang_pin_tiao_jia">送样要求:{{it.yang_pin_tiao_jia || ''}}</view> -->
 							</view>
 						</view>
 					</u-form-item>
@@ -218,13 +218,13 @@
 				<u-form-item label="样品总价" prop="yangPinZongJia">
 					<text>{{item.yangPinZongJia}}</text>
 				</u-form-item>
-
+ -->
 				<u-button type="error" class="btn" @click="deletSing(index)" v-if="type != 'detail'">
 					删除样品编号“{{item.yangPinBianHao}}”的样品
 				</u-button>
-				<u-button type="error" class="btn" @click="updateSing(item,index)" v-if="type != 'detail'">
+				<!-- 				<u-button type="error" class="btn" @click="updateSing(item,index)" v-if="type != 'detail'">
 					修改样品编号“{{item.yangPinBianHao}}”的样品
-				</u-button>
+				</u-button> -->
 			</uni-group>
 
 			<u-button type="success" class="btn" @click="getSing()" v-if="type != 'detail' && form.lhypb.length > 0">
@@ -309,12 +309,21 @@
 
 				</u-form-item>
 			</uni-group>
-			<u-button type="error" @click="sumbit('beingTime')" class="btn" style="margin-bottom: 15rpx;"
-				v-if="type != 'detail'">
-				暂存
-			</u-button>
-			<u-button type="primary" class="btn" @click="sumbit" v-if="type != 'detail'">提交</u-button>
+			<view style="height: 100rpx;" v-if="buttonFlagNum !== '0'"></view>
 		</u-form>
+		<view class="bottomBtn" v-if="buttonFlagNum !== '0'">
+			<u-row>
+				<u-col span="6">
+					<u-button type="error" @click="sumbit('beingTime')" class="btn" style="margin-bottom: 15rpx;"
+						v-if="type != 'detail'">
+						暂存
+					</u-button>
+				</u-col>
+				<u-col span="6">
+					<u-button type="success" class="btn" @click="sumbit" v-if="type != 'detail'">提交</u-button>
+				</u-col>
+			</u-row>
+		</view>
 
 		<u-back-top :scroll-top="scrollTop" :icon-style="iconStyle" bottom="400"></u-back-top>
 
@@ -334,19 +343,12 @@
 		<u-popup v-model="lhypbShow" mode="bottom" height="80%" border-radius="20">
 			<view>
 				<lhypb-message ref="lhypbMessage" :jianCeTypeList="jianCeTypeList" :taoCanShow="taoCanShow"
-					:heTongId="form.heTongId" @deletClick="deletClick" @sumbitSingClick="sumbitSingClick"
-					@getParentContent="getJianXiangData">
+					:heTongId="form.heTongId" :itemType="true" @deletClick="deletClick"
+					@sumbitSingClick="sumbitSingClick" @getParentContent="getJianXiangData">
 				</lhypb-message>
 			</view>
 		</u-popup>
 
-		<!-- <u-popup v-model="meassageShow" mode="bottom" height="50%" border-radius="20">
-			<view>
-				<message ref="message"></message>
-			</view>
-		</u-popup> -->
-
-
 		<u-modal v-model="meassageShow" :show-cancel-button="true" :show-confirm-button="false" title="检测项目"
 			@cancel="cancel">
 			<view class="u-update-content">
@@ -516,6 +518,8 @@
 
 				meassageShow: false,
 				content: ``,
+
+				itemType: false
 			}
 		},
 		onLoad(options) {
@@ -585,6 +589,8 @@
 
 				this.form.weiTuoLeiXing = '客户委托'
 				this.form.weiTuoRiQi = this.time
+
+
 			},
 			//根据暂存id获取暂存详情信息
 			getSaveData(id) {
@@ -779,7 +785,7 @@
 			//根据合同id选择检测项目
 			getJiance(id, type, weiTouId) {
 				let sql =
-					`select tw.*,tb.zhe_hou_jia_ge_,tb.xiang_mu_dan_jia_ from t_htjcxmjmb tb left join t_mjjcnlfw tw on tb.jian_ce_xiang_mu_ = tw.id_  where parent_id_ = '${id}' order by tw.nodekey1_ asc`
+					`select tw.*,tb.zhe_hou_jia_ge_,tb.xiang_mu_dan_jia_ from t_htjcxmjmb tb left join t_mjjcnlfw tw on tb.jian_ce_xiang_mu_ = tw.id_  where parent_id_ = '${id}' and xiang_mu_bian_hao not like '%/%' order by tw.nodekey1_ asc`
 				let requestData = this.$sig(sql)
 				this.$http.post("/ibps/business/v3/sys/universal/inputSqlSelectData", requestData).then(res => {
 					if (res.data.state == 200) {
@@ -792,7 +798,7 @@
 									let obj = {
 										// text: item.jian_ce_lei_bie_
 										value: item.jian_ce_lei_bie_,
-										label: item.jian_ce_lei_bie_
+										text: item.jian_ce_lei_bie_
 									}
 									this.jianCeTypeList.push(obj)
 								} else {
@@ -802,7 +808,7 @@
 										let obj = {
 											// text: item.jian_ce_lei_bie_
 											value: item.jian_ce_lei_bie_,
-											label: item.jian_ce_lei_bie_
+											text: item.jian_ce_lei_bie_
 										}
 										this.jianCeTypeList.push(obj)
 									}
@@ -1337,7 +1343,8 @@
 						yangPinYunShuSi: '',
 						shuLiangSi: 0,
 						jianCeList: JSON.parse(JSON.stringify(this.jianCeList)),
-						jianCeType: this.jianCeTypeList.length > 0 ? this.jianCeTypeList[0].value : '',
+						jianCeType: [],
+						jianCeTypeString: '',
 
 						xiangMuMingCheng: '',
 						yangPinZongJia: '',
@@ -1557,6 +1564,15 @@
 		padding: 30rpx;
 	}
 
+	.bottomBtn {
+		position: fixed;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		background-color: #FFFFFF;
+		z-index: 1000;
+	}
+
 
 	/deep/ .uni-group__content {
 		padding: 15rpx 25rpx;

+ 265 - 147
pages/jiance/order/lhypbMessage.vue

@@ -3,37 +3,45 @@
 		<view class="u-m-20">
 			<u-form :model="form" ref="uForm" label-width="220" :error-type="errorType">
 				<u-form-item label="样品名称" prop="yangPinMingCheng" required>
-					<u-input placeholder="请输入样品名称" v-model="form.yangPinMingCheng" />
+					<u-input placeholder="请输入样品名称" v-model="form.yangPinMingCheng"
+						:disabled="type == 'detail'?true :false" />
 				</u-form-item>
 				<u-form-item label="样品编号">
 					<u-input placeholder="请输入样品编号" v-model="form.yangPinBianHao" disabled />
 				</u-form-item>
 				<u-form-item label="姓名">
-					<u-input placeholder="请输入姓名" v-model="form.xingMing" />
+					<u-input placeholder="请输入姓名" v-model="form.xingMing" :disabled="type == 'detail'?true :false" />
 				</u-form-item>
 				<u-form-item label="性别">
-					<u-radio-group v-model="form.xingBie">
+					<u-radio-group v-model="form.xingBie" v-if="type != 'detail'">
 						<u-radio v-for="(it, index) in sexList" :key="index" :name="it.name">
 							{{it.name}}
 						</u-radio>
 					</u-radio-group>
+					<text v-else>{{form.xingBie}}</text>
 				</u-form-item>
 				<u-form-item label="年龄">
-					<u-input placeholder="请输入年龄" v-model="form.nianLing" />
+					<u-input placeholder="请输入年龄" v-model="form.nianLing" :disabled="type == 'detail'?true :false" />
 				</u-form-item>
 				<u-form-item label="送检批号/编号" prop="songJianPiHao" required>
-					<u-input placeholder="请输入送检批号/编号" v-model="form.songJianPiHao" />
+					<u-input placeholder="请输入送检批号/编号" v-model="form.songJianPiHao"
+						:disabled="type == 'detail'?true :false" />
 				</u-form-item>
 				<u-form-item label="样本状态" prop="yangPinZhuangTai" required>
-					<u-input placeholder="请选择样本状态" type="select" v-model="form.yangPinZhuangTai"
-						@click="sheetClick('state')" />
+					<u-input placeholder="请选择样本状态" v-model="form.yangPinZhuangTai"
+						:disabled="type == 'detail'?true :false" />
+					<u-button type="success" slot="right" size="mini" @click="sheetClick('state')"
+						v-if="type != 'detail'">选择
+					</u-button>
 				</u-form-item>
 				<u-form-item label="送检时间" prop="songJianShiJian" required>
-					<u-input placeholder="请选择送检时间" type="select" v-model="form.songJianShiJian"
-						@click="dateClick('inspect')" />
+					<u-input placeholder="请选择送检时间" v-model="form.songJianShiJian" disabled />
+					<u-button type="success" slot="right" size="mini" @click="dateClick('inspect')"
+						v-if="type != 'detail'">选择
+					</u-button>
 				</u-form-item>
 				<u-form-item label="备注">
-					<u-input placeholder="请输入备注" v-model="form.beiZhu1" />
+					<u-input placeholder="请输入备注" v-model="form.beiZhu1" :disabled="type == 'detail'?true :false" />
 				</u-form-item>
 
 				<view class="qingshe" style="background-color: #99cc66;">
@@ -43,47 +51,66 @@
 				</view>
 
 				<u-form-item label="检测类型">
-					<u-input placeholder="请选择检测类型" type="select" v-model="form.jianCeType"
-						@click="selectClick('jianCeType')" />
+					<!-- <u-input placeholder="请选择检测类型" type="select" v-model="form.jianCeType"
+						@click="selectClick('jianCeType')" /> -->
+					<uni-data-checkbox v-model="form.jianCeType" multiple :localdata="jianCeTypeList"
+						@change="checkBoxChange">
+					</uni-data-checkbox>
 				</u-form-item>
 
 				<u-form-item label="检测项目" prop="name" label-position="top">
-					<view>
-						<checkbox-group v-for="(it, x) in form.jianCeList" :key="x">
-							<label class=" uni-list-cell uni-list-cell-pd" v-show="it.checked"
-								style="display: flex;margin: 15rpx 10rpx;font-size: 20rpx;line-height: 40rpx;">
-								<view>
-									<checkbox :checked="it.checked" :value="it.id_" @click="changeIndex(it,x)" />
-								</view>
-								<view style="margin-left: 10rpx;font-size: 26rpx;" @click.stop="getSty(it)">
+					<view v-if="type != 'detail'">
+						<view>
+							<checkbox-group v-for="(it, x) in form.jianCeList" :key="x">
+								<label class=" uni-list-cell uni-list-cell-pd" v-show="it.checked"
+									style="display: flex;margin: 15rpx 10rpx;font-size: 20rpx;line-height: 40rpx;">
 									<view>
-										{{it.xiang_mu_bian_hao || ''}}-{{it.jian_ce_xiang_mu_ || ''}}
-										<text style="color: red;">[{{it.zhe_hou_jia_ge_ || '0'}}元]</text>
+										<checkbox :checked="it.checked" :value="it.id_" @click="changeIndex(it,x)" />
 									</view>
-									<view>{{it.yi_ju_de_biao_zhu || ''}}</view>
-									<view>报告周期(工作日):{{it.bao_gao_zhou_qi_g || '当'}}天</view>
-								</view>
-							</label>
-						</checkbox-group>
-					</view>
-					<view>
-						<checkbox-group v-for="(it, x) in form.jianCeList" :key="x">
-							<label class=" uni-list-cell uni-list-cell-pd"
-								v-show="(it.jian_ce_lei_bie_==form.jianCeType) && !it.checked"
-								style="display: flex;margin: 15rpx 10rpx;font-size: 20rpx;line-height: 40rpx;">
-								<view>
-									<checkbox :checked="it.checked" :value="it.id_" @click="changeIndex(it,x)" />
-								</view>
-								<view style="margin-left: 10rpx;font-size: 26rpx;" @click.stop="getSty(it)">
+									<view style="margin-left: 10rpx;font-size: 26rpx;" @click.stop="getSty(it)">
+										<view>
+											{{it.xiang_mu_bian_hao || ''}}-{{it.jian_ce_xiang_mu_ || ''}}
+											<text style="color: red;">[{{it.zhe_hou_jia_ge_ || '0'}}元]</text>
+										</view>
+										<!-- <view>{{it.yi_ju_de_biao_zhu || ''}}</view> -->
+										<view>报告周期(工作日):{{it.bao_gao_zhou_qi_g || '当'}}天</view>
+									</view>
+								</label>
+							</checkbox-group>
+						</view>
+						<view>
+							<checkbox-group v-for="(it, x) in form.jianCeList" :key="x">
+								<label class=" uni-list-cell uni-list-cell-pd"
+									v-show="(form.jianCeTypeString.indexOf(it.jian_ce_lei_bie_) !== -1) && !it.checked"
+									style="display: flex;margin: 15rpx 10rpx;font-size: 20rpx;line-height: 40rpx;">
 									<view>
-										{{it.xiang_mu_bian_hao || ''}}-{{it.jian_ce_xiang_mu_ || ''}}
-										<text style="color: red;">[{{it.zhe_hou_jia_ge_ || '0'}}元]</text>
+										<checkbox :checked="it.checked" :value="it.id_" @click="changeIndex(it,x)" />
+									</view>
+									<view style="margin-left: 10rpx;font-size: 26rpx;" @click.stop="getSty(it)">
+										<view>
+											{{it.xiang_mu_bian_hao || ''}}-{{it.jian_ce_xiang_mu_ || ''}}
+											<text style="color: red;">[{{it.zhe_hou_jia_ge_ || '0'}}元]</text>
+										</view>
+										<!-- <view>{{it.yi_ju_de_biao_zhu || ''}}</view> -->
+										<view>报告周期(工作日):{{it.bao_gao_zhou_qi_g || '当'}}天</view>
 									</view>
-									<view>{{it.yi_ju_de_biao_zhu || ''}}</view>
-									<view>报告周期(工作日):{{it.bao_gao_zhou_qi_g || '当'}}天</view>
+								</label>
+							</checkbox-group>
+						</view>
+					</view>
+
+					<view v-else>
+						<view v-for="(it, x) in form.jianCeList" :key="x" v-if="it.checked"
+							@click="getJianXiangData(it)">
+							<view class="jiancexiangm">
+								<view>
+									{{it.xiang_mu_bian_hao || ''}}-{{it.jian_ce_xiang_mu_ || ''}}
+									<text style="color: red;">[{{it.zhe_hou_jia_ge_ || '当'}}元]</text>
 								</view>
-							</label>
-						</checkbox-group>
+								<!-- <view>{{it.yi_ju_de_biao_zhu || ''}}</view> -->
+								<view>报告周期(工作日):{{it.bao_gao_zhou_qi_g || '当'}}天</view>
+							</view>
+						</view>
 					</view>
 				</u-form-item>
 
@@ -94,14 +121,18 @@
 				</view>
 
 				<u-form-item label="选择套餐" prop="name" label-position="top" v-if="taoCanShow">
-					<view class="btnBox">
+					<view class="btnBox" v-if="type != 'detail'">
 						<u-button class="btnSin" size="mini" :type="it.checked ? 'success':''"
 							v-for="(it, x) in form.taoCanList" :key="x" @click="changeTaoCanIndex(it,x,it.checked)">
 							{{it.tao_can_ming_chen}}
 						</u-button>
 					</view>
+					<view class="btnBox" v-else>
+						<u-tag class="btnSin" size="default" v-for="(it, x) in item.taoCanList" v-if="it.checked"
+							:text="it.tao_can_ming_chen" :key="x" />
+					</view>
 				</u-form-item>
-				<view v-if="form.taoCanXiangMuList.length > 0">
+				<view v-if="form.taoCanXiangMuList && form.taoCanXiangMuList.length > 0">
 					<view style="padding: 0 20rpx;">
 						<view v-for="(it, x) in form.taoCanXiangMuList" :key="x" @click.stop="getSty(it)">
 							<view class="jiancexiangm">
@@ -126,120 +157,174 @@
 				</view>
 				<block v-if="form.showBoolean1">
 					<u-form-item label="样品类型①">
-						<u-input placeholder="请选择样品类型①" type="select" v-model="form.yangPinLeiXing"
-							@click="sheetClick('yangpinType1')" />
+						<u-input placeholder="请选择样品类型①" v-model="form.yangPinLeiXing"
+							:disabled="type == 'detail'?true :false" />
+						<u-button type="success" slot="right" size="mini" @click="sheetClick('yangpinType1')"
+							v-if="type != 'detail'">选择
+						</u-button>
 					</u-form-item>
 					<u-form-item label="样品运输条件①">
-						<u-input placeholder="请选择样品运输条件①" type="select" v-model="form.yangBenYunShuTiao"
-							@click="sheetClick('transportType1')" />
+						<u-input placeholder="请选择样品运输条件①" v-model="form.yangBenYunShuTiao"
+							:disabled="type == 'detail'?true :false" />
+						<u-button type="success" slot="right" size="mini" @click="sheetClick('transportType1')"
+							v-if="type != 'detail'">选择
+						</u-button>
 					</u-form-item>
 					<u-form-item label="数量①">
-						<uni-number-box v-model="form.shuLiang"></uni-number-box>
+						<uni-number-box v-model="form.shuLiang" v-if="type != 'detail'"></uni-number-box>
+						<text v-else>{{form.shuLiang}}</text>
 					</u-form-item>
 					<u-form-item label="样品规格①">
-						<u-input placeholder="请输入样品规格①" v-model="form.yangPinGuiGe" />
-						<u-button slot="right" type="success" size="mini" @click="sheetClick('specification1')">规格
+						<u-input placeholder="请输入样品规格①" v-model="form.yangPinGuiGe"
+							:disabled="type == 'detail'?true :false" />
+						<u-button slot="right" type="success" size="mini" @click="sheetClick('specification1')"
+							v-if="type != 'detail'">规格
 						</u-button>
 					</u-form-item>
 				</block>
 
-				<view class="qingshe" @click="form.showBoolean2 = !form.showBoolean2">
-					<view>
-						②
-					</view>
-					<view>
-						<u-icon name="arrow-up" v-if="form.showBoolean2"></u-icon>
-						<u-icon name="arrow-down" v-else></u-icon>
+				<view
+					v-if="(type == 'detail' && (form.yangPinLeiXingEr || form.yangPinYunShuTiao || form.shuLiangEr > 0 || form.yangPinGuiGeEr)) || type != 'detail'">
+					<view class="qingshe" @click="form.showBoolean2 = !form.showBoolean2">
+						<view>
+							②
+						</view>
+						<view>
+							<u-icon name="arrow-up" v-if="form.showBoolean2"></u-icon>
+							<u-icon name="arrow-down" v-else></u-icon>
+						</view>
 					</view>
+					<block v-if="form.showBoolean2">
+						<u-form-item label="样品类型②">
+							<u-input placeholder="请选择样品类型②" v-model="form.yangPinLeiXingEr"
+								:disabled="type == 'detail'?true :false" />
+							<u-button type="success" slot="right" size="mini" @click="sheetClick('yangpinType2')"
+								v-if="type != 'detail'">选择
+							</u-button>
+						</u-form-item>
+						<u-form-item label="样品运输条件②">
+							<u-input placeholder="请选择样品运输条件②" v-model="form.yangPinYunShuTiao"
+								:disabled="type == 'detail'?true :false" />
+							<u-button type="success" slot="right" size="mini" @click="sheetClick('transportType2')"
+								v-if="type != 'detail'">选择
+							</u-button>
+						</u-form-item>
+						<u-form-item label="数量②">
+							<uni-number-box v-model="form.shuLiangEr" v-if="type != 'detail'"></uni-number-box>
+							<text v-else>{{form.shuLiangEr}}</text>
+						</u-form-item>
+						<u-form-item label="样品规格②">
+							<u-input placeholder="请输入样品规格②" v-model="form.yangPinGuiGeEr"
+								:disabled="type == 'detail'?true :false" />
+							<u-button slot="right" type="success" size="mini" @click="sheetClick('specification2')"
+								v-if="type != 'detail'">规格
+							</u-button>
+						</u-form-item>
+					</block>
 				</view>
-				<block v-if="form.showBoolean2">
-					<u-form-item label="样品类型②">
-						<u-input placeholder="请选择样品类型②" type="select" v-model="form.yangPinLeiXingEr"
-							@click="sheetClick('yangpinType2')" />
-					</u-form-item>
-					<u-form-item label="样品运输条件②">
-						<u-input placeholder="请选择样品运输条件②" type="select" v-model="form.yangPinYunShuTiao"
-							@click="sheetClick('transportType2')" />
-					</u-form-item>
-					<u-form-item label="数量②">
-						<uni-number-box v-model="form.shuLiangEr"></uni-number-box>
-					</u-form-item>
-					<u-form-item label="样品规格②">
-						<u-input placeholder="请输入样品规格②" v-model="form.yangPinGuiGeEr" />
-						<u-button slot="right" type="success" size="mini" @click="sheetClick('specification2')">规格
-						</u-button>
-					</u-form-item>
-				</block>
 
-				<view class="qingshe" @click="form.showBoolean3 = !form.showBoolean3">
-					<view>
-						③
-					</view>
-					<view>
-						<u-icon name="arrow-up" v-if="form.showBoolean3"></u-icon>
-						<u-icon name="arrow-down" v-else></u-icon>
+				<view
+					v-if="(type == 'detail' && (form.yangPinLeiXingSan || form.yangPinYunShuSan || form.shuLiangSan > 0 || form.yangPinGuiGeSan)) || type != 'detail'">
+					<view class="qingshe" @click="form.showBoolean3 = !form.showBoolean3">
+						<view>
+							③
+						</view>
+						<view>
+							<u-icon name="arrow-up" v-if="form.showBoolean3"></u-icon>
+							<u-icon name="arrow-down" v-else></u-icon>
+						</view>
 					</view>
+					<block v-if="form.showBoolean3">
+						<u-form-item label="样品类型③">
+							<u-input placeholder="请选择样品类型③" v-model="form.yangPinLeiXingSan"
+								:disabled="type == 'detail'?true :false" />
+							<u-button type="success" slot="right" size="mini" @click="sheetClick('yangpinType3')"
+								v-if="type != 'detail'">选择
+							</u-button>
+						</u-form-item>
+						<u-form-item label="样品运输条件③">
+							<u-input placeholder="请选择样品运输条件③" v-model="form.yangPinYunShuSan"
+								:disabled="type == 'detail'?true :false" />
+							<u-button type="success" slot="right" size="mini" @click="sheetClick('transportType3')"
+								v-if="type != 'detail'">选择
+							</u-button>
+						</u-form-item>
+						<u-form-item label="数量③">
+							<uni-number-box v-model="form.shuLiangSan" v-if="type != 'detail'"></uni-number-box>
+							<text v-else>{{form.shuLiangSan}}</text>
+						</u-form-item>
+						<u-form-item label="样品规格③">
+							<u-input placeholder="请输入样品规格③" v-model="form.yangPinGuiGeSan"
+								:disabled="type == 'detail'?true :false" />
+							<u-button slot="right" type="success" size="mini" @click="sheetClick('specification3')"
+								v-if="type != 'detail'">规格
+							</u-button>
+						</u-form-item>
+					</block>
 				</view>
-				<block v-if="form.showBoolean3">
-					<u-form-item label="样品类型③">
-						<u-input placeholder="请选择样品类型③" type="select" v-model="form.yangPinLeiXingSan"
-							@click="sheetClick('yangpinType3')" />
-					</u-form-item>
-					<u-form-item label="样品运输条件③">
-						<u-input placeholder="请选择样品运输条件③" type="select" v-model="form.yangPinYunShuSan"
-							@click="sheetClick('transportType3')" />
-					</u-form-item>
-					<u-form-item label="数量③">
-						<uni-number-box v-model="form.shuLiangSan"></uni-number-box>
-					</u-form-item>
-					<u-form-item label="样品规格③">
-						<u-input placeholder="请输入样品规格③" v-model="form.yangPinGuiGeSan" />
-						<u-button slot="right" type="success" size="mini" @click="sheetClick('specification3')">规格
-						</u-button>
-					</u-form-item>
-				</block>
 
-				<view class="qingshe" @click="form.showBoolean4 = !form.showBoolean4">
-					<view>
-						④
-					</view>
-					<view>
-						<u-icon name="arrow-up" v-if="form.showBoolean4"></u-icon>
-						<u-icon name="arrow-down" v-else></u-icon>
+				<view
+					v-if="(type == 'detail' && (form.yangPinLeiXingSi || form.yangPinYunShuSi || form.shuLiangSi > 0 || form.yangPinGuiGeSi)) || type != 'detail'">
+					<view class="qingshe" @click="form.showBoolean4 = !form.showBoolean4">
+						<view>
+							④
+						</view>
+						<view>
+							<u-icon name="arrow-up" v-if="form.showBoolean4"></u-icon>
+							<u-icon name="arrow-down" v-else></u-icon>
+						</view>
 					</view>
+					<block v-if="form.showBoolean4">
+						<u-form-item label="样品类型④">
+							<u-input placeholder="请选择样品类型④" v-model="form.yangPinLeiXingSi"
+								:disabled="type == 'detail'?true :false" />
+							<u-button type="success" slot="right" size="mini" @click="sheetClick('yangpinType4')"
+								v-if="type != 'detail'">选择
+							</u-button>
+						</u-form-item>
+						<u-form-item label="样品运输条件④">
+							<u-input placeholder="请选择样品运输条件④" v-model="form.yangPinYunShuSi"
+								:disabled="type == 'detail'?true :false" />
+							<u-button type="success" slot="right" size="mini" @click="sheetClick('transportType4')"
+								v-if="type != 'detail'">ѡ��
+							</u-button>
+						</u-form-item>
+						<u-form-item label="数量④">
+							<uni-number-box v-model="form.shuLiangSi" v-if="type != 'detail'"></uni-number-box>
+							<text v-else>{{form.shuLiangSi}}</text>
+						</u-form-item>
+						<u-form-item label="样品规格④">
+							<u-input placeholder="请输入样品规格④" v-model="form.yangPinGuiGeSi"
+								:disabled="type == 'detail'?true :false" />
+							<u-button slot="right" type="success" size="mini" @click="sheetClick('specification4')"
+								v-if="type != 'detail'">规格
+							</u-button>
+						</u-form-item>
+					</block>
 				</view>
-				<block v-if="form.showBoolean4">
-					<u-form-item label="样品类型④">
-						<u-input placeholder="请选择样品类型④" type="select" v-model="form.yangPinLeiXingSi"
-							@click="sheetClick('yangpinType4')" />
-					</u-form-item>
-					<u-form-item label="样品运输条件④">
-						<u-input placeholder="请选择样品运输条件④" type="select" v-model="form.yangPinYunShuSi"
-							@click="sheetClick('transportType4')" />
-					</u-form-item>
-					<u-form-item label="数量④">
-						<uni-number-box v-model="form.shuLiangSi"></uni-number-box>
-					</u-form-item>
-					<u-form-item label="样品规格④">
-						<u-input placeholder="请输入样品规格④" v-model="form.yangPinGuiGeSi" />
-						<u-button slot="right" type="success" size="mini" @click="sheetClick('specification4')">规格
-						</u-button>
-					</u-form-item>
-				</block>
+
+
 				<u-form-item label="项目名称" prop="xiangMuMingCheng" v-if="form.mingChengShow">
-					<u-input placeholder="请输入项目名称" v-model="form.xiangMuMingCheng" />
+					<u-input placeholder="请输入项目名称" v-model="form.xiangMuMingCheng"
+						:disabled="type == 'detail'?true :false" />
 				</u-form-item>
 				<u-form-item label="样品总价" prop="yangPinZongJia">
 					<u-input v-model="form.yangPinZongJia" disabled />
 				</u-form-item>
 			</u-form>
-			<view style="height: 220rpx;"></view>
+			<view style="height: 110rpx;" v-if="itemType"></view>
 
-			<view class="btnBottom">
-				<u-button type="error" class="btn" @click="deletSing">取消
-				</u-button>
-				<u-button type="error" class="btn" @click="sumbitSing">保存
-				</u-button>
+			<view class="btnBottom" v-if="itemType">
+				<u-row>
+					<u-col span="6">
+						<u-button type="error" class="btn" @click="deletSing">取消
+						</u-button>
+					</u-col>
+					<u-col span="6">
+						<u-button type="success" class="btn" @click="sumbitSing">保存
+						</u-button>
+					</u-col>
+				</u-row>
 			</view>
 		</view>
 
@@ -268,14 +353,26 @@
 			heTongId: {
 				type: String,
 				default: ''
-			}
+			},
+			item: {
+				type: Object,
+				default: function() {
+					return {};
+				}
+			},
+			itemType: {
+				type: Boolean,
+				default: true
+			},
+			type: {
+				type: String,
+				default: 'add'
+			},
 		},
 		data() {
 			return {
 				errorType: ['toast'],
-				form: {
-					taoCanXiangMuList: []
-				},
+				form: this.item,
 				//样本状态
 				sampleStateList: order.sampleState,
 				sexList: order.sex,
@@ -291,7 +388,6 @@
 				selectShow: false,
 				dateShow: false,
 				mode: 'date',
-				type: "",
 				rules: {
 					yangPinMingCheng: [{
 						required: true,
@@ -316,13 +412,16 @@
 				}
 			}
 		},
-		onReady() {
-			this.$refs.uForm.setRules(this.rules);
+		created() {
+			// console.log(this.itemType)
 		},
+
 		methods: {
+			//获取初始化数据,在添加使用
 			getInit(data) {
 				this.form = JSON.parse(JSON.stringify(data))
 			},
+			//委托项目 点击事件
 			changeIndex(it, x) {
 				let itemData = this.form
 				this.form.jianCeList[x].checked = !this.form.jianCeList[x].checked
@@ -339,6 +438,7 @@
 				}
 				this.getTotal()
 			},
+			//套餐添加事件
 			changeTaoCanIndex(it, x, checked) {
 				let itemData = this.form
 
@@ -367,9 +467,8 @@
 				} else {
 					this.getTotal()
 				}
-
-
 			},
+			//计算检测项目和套餐价格
 			getTotal() {
 				var itemTotal = 0
 				this.form.jianCeList.forEach((it, x) => {
@@ -381,7 +480,12 @@
 					itemTotal += parseFloat(it.zhe_hou_jia_ge_ || 0)
 				})
 				this.form.yangPinZongJia = (itemTotal).toFixed(2)
+
+				if (!this.itemType) {
+					this.$emit("countTotal")
+				}
 			},
+			//弹出框初始化
 			selectClick(type) {
 				this.listType = type
 				this.selectShow = true
@@ -389,6 +493,7 @@
 					this.list = this.jianCeTypeList
 				}
 			},
+			//弹出框初始化
 			sheetClick(type) {
 				this.listType = type
 				this.sheetShow = true
@@ -410,6 +515,7 @@
 					this.list = this.dispositionList
 				}
 			},
+			//弹出框初始化
 			selectConfirm(e) {
 				let that = this
 				let lists = that.form
@@ -479,14 +585,14 @@
 			//调用日期组件
 			dateClick(type) {
 				if (type == 'inspect') {
-					this.type = type
+					this.listType = type
 					this.mode = 'date'
 					this.dateShow = true
 				}
 			},
 			//日期回调
 			dateChange(e) {
-				if (this.type == 'inspect') {
+				if (this.listType == 'inspect') {
 					this.form.songJianShiJian = e.result
 				}
 			},
@@ -505,10 +611,12 @@
 					}
 				})
 			},
-
+			//取消事件
 			deletSing() {
 				this.$emit("deletClick")
 			},
+
+			//保存事件
 			sumbitSing() {
 				if (this.form.yangPinZongJia == '') {
 					this.form.yangPinZongJia = 0
@@ -535,9 +643,19 @@
 				});
 
 			},
+			//检测项目详情
 			getSty(item) {
 				this.$emit('getParentContent', item)
+			},
+			checkBoxChange(e) {
+				// console.log(e)
+				let dataList = e.detail.value
+				this.form.jianCeTypeString = dataList.join(",")
+				// console.log(this.form.jianCeTypeString)
 			}
+		},
+		onReady() {
+			this.$refs.uForm.setRules(this.rules);
 		}
 	}
 </script>
@@ -557,7 +675,7 @@
 
 	.btnBottom {
 		z-index: 1500;
-		height: 220rpx;
+		// height: 220rpx;
 		background-color: #FFFFFF;
 		position: fixed;
 		bottom: 0;

+ 0 - 21
pages/jiance/reportList.vue

@@ -1,21 +0,0 @@
-<template>
-	<view>
-		555
-	</view>
-</template>
-
-<script>
-	export default {
-		// 初始化
-		data() {
-			return {
-
-			}
-		},
-		methods: {}
-	}
-</script>
-
-<style>
-
-</style>

+ 7 - 6
pages/jiance/tousu.vue

@@ -5,6 +5,10 @@
 			<block slot="content">客户投诉</block>
 		</cu-custom>
 
+		<view class="cu-form-group" style="z-index: 999;">
+			<view class="title">投诉单位</view>
+			<input v-model="form.guanLianKeHu" name="input" placeholder="请输入投诉单位" disabled>
+		</view>
 		<view class="cu-form-group" style="z-index: 999;">
 			<view class="title">投诉人</view>
 			<input v-model="form.Complainants" name="input" placeholder="请输入投诉人" :disabled="id != '' ? true : false">
@@ -13,10 +17,7 @@
 			<view class="title">电话</view>
 			<input v-model="form.telephone" name="input" placeholder="请输入电话" :disabled="id != '' ? true : false">
 		</view>
-		<view class="cu-form-group" style="z-index: 999;">
-			<view class="title">投诉单位</view>
-			<input v-model="form.company" name="input" placeholder="请输入投诉单位" :disabled="id != '' ? true : false">
-		</view>
+
 		<view class="cu-form-group" style="z-index: 999;">
 			<view class="title">投诉日期</view>
 			<input v-model="form.touSuRiQi" name="input" placeholder="请输入投诉日期" disabled @click="showClick">
@@ -201,9 +202,9 @@
 			let useId = info.user.id
 			let name = info.user.name
 			this.form.Complainants = name
-			this.form.guanLianKeHu = useId
+			this.form.guanLianKeHu = info.user.wcAccount
 			this.form.telephone = info.user.mobile
-			this.form.company = name
+			this.form.company = useId
 			this.form.postcode = info.user.email
 			this.form.touSuRiQi = time
 			this.getData()

+ 2 - 2
pages/jiance/tousu/tousuList.vue

@@ -14,7 +14,7 @@
 					</view>
 					<view style="display: flex;align-items: center;">
 						<view>投诉单位:</view>
-						<view>{{item.company_}} </view>
+						<view>{{item.guan_lian_ke_hu_}} </view>
 					</view>
 					<view style="display: flex;align-items: center;">
 						<view>投诉日期:</view>
@@ -85,7 +85,7 @@
 				}
 
 				let sql =
-					`select * from t_complaint where guan_lian_ke_hu_ = '${useId}' ORDER BY id_ desc LIMIT ${page},10`
+					`select * from t_complaint where company_ = '${useId}' ORDER BY id_ desc LIMIT ${page},10`
 
 				let requestData = this.$sig(sql)
 				this.$http.post("/ibps/business/v3/sys/universal/inputSqlSelectData", requestData).then(res => {

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 649
pages/jiance/weituo.vue


+ 10 - 0
pages/user/userdetail.vue

@@ -14,6 +14,9 @@
 				<view class="cu-list menu">
 					<u-form :model="user" ref="uForm" label-width="160">
 						<u-form-item label="单位名称">
+							<u-input v-model="user.wcAccount" input-align="right" disabled />
+						</u-form-item>
+						<u-form-item label="客户姓名">
 							<u-input v-model="user.name" input-align="right" />
 						</u-form-item>
 
@@ -99,6 +102,13 @@
 							icon: 'none',
 							duration: 2000
 						})
+
+						let info = uni.getStorageSync(USER_INFO);
+						info.user = this.user
+						uni.setStorage({
+							key: 'login_user_info',
+							data: info
+						})
 					} else {
 						let datas = res.data
 						uni.showToast({

برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است