update

common/router/modules/routes.js

@@ -230,6 +230,13 @@ const routes = [{
 		meta: {
 			title: '投诉列表',
 		},
+	},
+	{
+		path: "/pages/fileView/fileView",
+		name: 'fileView',
+		meta: {
+			title: '文件预览',
+		},
 	}
 ]
 export default routes

common/util/meth.js

@@ -0,0 +1,27 @@
+export default {
+	//时间
+	time(index) {
+		var nowDate = new Date((new Date).getTime() + 8 * 60 * 60 * 1000)
+		var time = nowDate.toJSON().split('T').join(' ').substr(0, index)
+		return time
+	},
+	//弹出提示
+	getPrompt(title, icon = 'none', duration = 2000) {
+		uni.showToast({
+			title: title,
+			icon: icon,
+			duration: duration
+		})
+	},
+	getShowToast(val1, val2) {
+		let title = '必填'
+		if (val2 == 1) {
+			title = '必选一项'
+		} else if (val2 == 2) {
+			title = '必添加'
+		} else if (val2 == 3) {
+			title = '大于1'
+		}
+		this.getPrompt(val1 + title)
+	}
+}

main.js

@@ -5,12 +5,6 @@ import store from './store'
 import MinCache from './common/util/MinCache.js'
 import tip from './common/util/tip.js'
 import configService from './common/service/config.service.js'
-
-//ui框架
-import uView from "uview-ui";
-Vue.use(uView);
-
-
 import router from './common/router'
 import {
 	RouterMount
@@ -18,86 +12,57 @@ import {
 import {
 	mdSig
 } from '@/common/util/md.js'
-
 import VueSignaturePad from "vue-signature-pad";
-
-Vue.use(VueSignaturePad);
-
-// 注册缓存器
-Vue.use(MinCache, {
-	timeout: 6
-})
-
-// store
-Vue.prototype.$store = store;
-// tip
-Vue.prototype.$tip = tip;
-// config
-Vue.prototype.$config = configService;
-
-Vue.prototype.$sig = mdSig;
-
 // request请求
 import {
 	http
 } from '@/common/service/service.js'
-Vue.prototype.$http = http
-
 import home from './pages/home/home.vue'
-Vue.component('home', home)
-
-
 import people from './pages/user/people.vue'
-Vue.component('people', people)
-
-// 自定义组件
 import mySelect from './components/my-componets/my-select.vue'
-Vue.component('mySelect', mySelect)
-
 import myImageUpload from './components/my-componets/my-image-upload.vue'
-Vue.component('myImageUpload', myImageUpload)
-
-
 import myPage from './components/my-componets/my-page.vue'
-Vue.component('myPage', myPage)
-
-
-
 import basics from './pages/basics/home.vue'
-Vue.component('basics', basics)
-
 import components from './pages/component/home.vue'
-Vue.component('components', components)
-
 import plugin from './pages/plugin/home.vue'
-Vue.component('plugin', plugin)
-
 import cuCustom from './plugin/colorui/components/cu-custom.vue'
-Vue.component('cu-custom', cuCustom)
-
-//签名组件
 import autograph from '@/components/autograph/autograph.vue'
-Vue.component('autograph', autograph)
-
 import search from '@/components/search/nx-search.vue'
-Vue.component('search', search)
-
 import linPopup from '@/components/lin-popup/index.vue'
-Vue.component('linPopup', linPopup)
-// import VConsole from './js_sdk/vconsole.min'
-
 import dayjs from "dayjs" //封装dayjs
-Vue.prototype.$dayjs = dayjs;
-
 import showToast from "@/common/util/showToast.js"
-Vue.prototype.$showToast = showToast;
-
-//   var vConsole = new VConsole();
+import methCommon from "@/common/util/meth.js"
 
+//ui框架
+import uView from "uview-ui";
+Vue.use(uView);
+Vue.use(VueSignaturePad);
+// 注册缓存器
+Vue.use(MinCache, {
+	timeout: 6
+})
+Vue.prototype.$store = store
+Vue.prototype.$tip = tip
+Vue.prototype.$config = configService
+Vue.prototype.$sig = mdSig
+Vue.prototype.$http = http
+Vue.prototype.$dayjs = dayjs
+Vue.prototype.$showToast = showToast
+Vue.prototype.$methCommon = methCommon
+Vue.component('home', home)
+Vue.component('people', people)
+Vue.component('mySelect', mySelect)
+Vue.component('myImageUpload', myImageUpload)
+Vue.component('myPage', myPage)
+Vue.component('basics', basics)
+Vue.component('components', components)
+Vue.component('plugin', plugin)
+Vue.component('cu-custom', cuCustom)
+Vue.component('autograph', autograph)
+Vue.component('search', search)
+Vue.component('linPopup', linPopup)
 Vue.config.productionTip = false
-
 App.mpType = 'app'
-
 const app = new Vue({
 	store,
 	MinCache,

pages.json

@@ -243,7 +243,7 @@
 			"path": "pages/communication/communicationList",
 			"style": {
 				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": true
 			}
 
 		}, {

pages/communication/communication.vue

@@ -85,7 +85,7 @@
 			</uni-section> -->
 			<uni-section title="签名" type="line" padding>
 				<view style="width: 100%;">
-					<view style="text-align: right;width: 100%;" v-if="id == ''">
+					<view style="text-align: right;width: 100%;" v-if="typeValue != '1'">
 						<view>
 							<u-button type="primary" size="mini" @click="qianming(0)" class="btn-back-color">
 								签名</u-button>
@@ -100,10 +100,20 @@
 					</view>
 				</view>
 			</uni-section>
-			<view class="padding flex flex-direction" v-if="id == ''">
+
+			<uni-section title="沟通内容确定" type="line" padding v-if="id != '' && form.leiXing != '2'">
+				<textarea maxlength="-1" v-model="form.gouTongQueDingNei" placeholder="意见和建议"
+					:disabled="true"></textarea>
+			</uni-section>
+
+			<view class="padding flex flex-direction" v-if="typeValue == '3'">
 				<u-button type="success" class="btn btn-back-color" @click="onSubmit">提交
 				</u-button>
 			</view>
+			<view class="padding flex flex-direction" v-if="typeValue == '2'">
+				<u-button type="success" class="btn btn-back-color" @click="onAgree">同意
+				</u-button>
+			</view>
 		</view>
 
 		<u-action-sheet :list="list" v-model="sheetShow" @click="actionSheetCallback"></u-action-sheet>
@@ -134,8 +144,10 @@
 		},
 		data() {
 			return {
+				typeValue: '3',
 				id: '',
 				sheetShow: false,
+				taskId: '',
 				form: {
 					xuanZeKeHu: '',
 					biaoDanBianHao: '',
@@ -150,7 +162,9 @@
 					baoGaoBianHao: '',
 					gouTongLeiXing: '',
 					gouTongNeiRong: '',
-					keHu: ''
+					keHu: '',
+					gouTongQueDingNei: '',
+					leiXing: '1'
 				},
 				fuJianShangChuanArray: [],
 				popupShow: false,
@@ -182,6 +196,9 @@
 			} else {
 				this.getGtbh()
 			}
+			if (options.id) {
+				this.typeValue = options.typeValue
+			}
 		},
 		methods: {
 			actionSheetCallback(e) {
@@ -321,10 +338,11 @@
 					if (res.data.state == 200) {
 						const data = res.data.variables.data[0]
 						this.form = {
+							id: data.id_,
 							xuanZeKeHu: data.xuan_ze_ke_hu_,
 							biaoDanBianHao: data.biao_dan_bian_hao,
 							buMenName: data.xuan_ze_ke_hu_,
-							keHuDanWeiMingChe: data.ke_hu_lian_xi_ren,
+							keHuDanWeiMingChe: data.ke_hu_dan_wei_min,
 							keHuLianXiRen: data.ke_hu_lian_xi_ren,
 							weiTuoDanHao: data.wei_tuo_dan_hao_,
 							lianXiDianHua: data.lian_xi_dian_hua_,
@@ -334,13 +352,22 @@
 							baoGaoBianHao: data.bao_gao_bian_hao_,
 							gouTongLeiXing: data.gou_tong_lei_xing,
 							gouTongNeiRong: data.gou_tong_nei_rong,
-							keHu: data.ke_hu_
+							keHu: data.ke_hu_,
+							gouTongQueDingNei: data.gou_tong_que_ding,
+							leiXing: data.lei_xing_
+						}
+						if (data.lei_xing_ == '2' && data.shi_fou_guo_shen_ == '已编制') {
+							this.getTaskId(data.id_)
 						}
 						uni.hideLoading()
 					}
 				})
 			},
 			onSubmit() {
+				uni.showLoading({
+					title: '加载中',
+					mask: true
+				})
 				let info = uni.getStorageSync(USER_INFO);
 				let useId = info.user.id
 				let detpId = info.org.id
@@ -369,15 +396,56 @@
 				let that = this;
 				this.$http.post("ibps/business/v3/bpm/instance/start", para).then(res => {
 					if (res.data.state == 200) {
-						this.$tip.success("提交成功!")
-						this.$Router.replace({
-							name: 'index'
-						})
+						this.$methCommon.getPrompt('提交成功!')
+						uni.hideLoading();
+						this.getPageA()
 					}
 				}).catch((err) => {
-					let msg = ((err.response || {}).data || {}).message || err.data.message || "请求出现错误，请稍后再试"
-					this.$tip.error(msg);
+
+				});
+			},
+			onAgree() {
+				uni.showLoading({
+					title: '加载中',
+					mask: true
+				})
+				let info = uni.getStorageSync(USER_INFO);
+				let useId = info.user.id
+				let detpId = info.org.id
+				this.form.gouTongRenYuan = useId
+				this.form.gouTongRiQi = this.$methCommon.time(10)
+				this.form.gouTongBuMen = detpId
+				this.form.shiFouGuoShen = "1"
+				let editData = {
+					data: JSON.stringify(this.form),
+					opinion: '同意',
+					taskId: this.taskId
+				}
+				this.$http.post("/ibps/business/v3/bpm/task/agree", editData).then(res => {
+					if (res.data.state == 200) {
+						this.$methCommon.getPrompt('同意成功!')
+						uni.hideLoading();
+						this.getPageA()
+					} else {
+						this.$methCommon.getPrompt('同意异常!', 'fail')
+						uni.hideLoading()
+					}
 				});
+
+			},
+			//根据委托单id查询 taskId
+			getTaskId(id) {
+				let sql =
+					`select TASK_ID_ from ibps_bpm_tasks where NAME_ = '确认' and NODE_ID_ = 'Activity_1vrp3i4' and PROC_DEF_KEY_ = 'Process_183pepd' and EXEC_ID_ = (select PROC_INST_ID_ from act_ru_execution where ACT_ID_ = 'Activity_1vrp3i4' and BUSINESS_KEY_ = '${id}') ORDER BY 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) {
+						let result = res.data.variables.data[0]
+						this.taskId = result.TASK_ID_
+					}
+				})
 			},
 			//委托信息
 			getWeiTuoList() {
@@ -479,10 +547,23 @@
 			getWeiTuo(id) {
 				if (id) {
 					let itemData = this.weiTuoList.find(item => item.id_ == id)
-					return itemData.wei_tuo_bian_hao_
+					if (itemData) {
+						return itemData.wei_tuo_bian_hao_
+					} else {
+						return ''
+					}
+
 				} else {
 					return ''
 				}
+			},
+			getPageA() {
+				let pages = getCurrentPages()
+				let prevPage = pages[pages.length - 2]
+				prevPage.$vm.getValue()
+				uni.navigateBack({
+					dalta: 1
+				})
 			}
 		}
 	}

pages/communication/communicationList.vue

@@ -4,7 +4,7 @@
 			<block slot="backText">返回</block>
 			<block slot="content">沟通列表</block>
 			<block slot="right">
-				<view @click="getGo('')">添加</view>
+				<view @click="getGo('','3')">添加</view>
 			</block>
 		</cu-custom>
 		<view class="cu-bar bg-white search fixed" :style="[{top:CustomBar + 'px'}]">
@@ -34,16 +34,18 @@
 						<view class="left">编制日期：</view>
 						<view>{{item.bian_zhi_shi_jian}} </view>
 					</view>
+					<view class="sectionBox">
+						<view class="left">类型：</view>
+						<view>{{item.lei_xing_ == '2' ? '医院提出沟通' : '客户提出沟通'}} </view>
+					</view>
 					<view class="sectionBox">
 						<view class="left">状态：</view>
 						<view>{{item.shi_fou_guo_shen_ == '1' ? '已完成' : item.shi_fou_guo_shen_}} </view>
 					</view>
-					<view style=" width: 100%; text-align: right; padding-top: 5rpx;padding-bottom: 0rpx;"
-						v-if="item.chu_li_jie_guo_sh == '已通知' && item.shi_fou_guo_shen_ == '已反馈'">
-						<u-button type="warning" size="mini" @click="getGo(item.id_)">签名</u-button>
-					</view>
 					<view style=" width: 100%; text-align: right; padding-top: 5rpx;padding-bottom: 0rpx;">
-						<u-button type="warning" size="mini" class="btn-back-color" @click="getGo(item.id_)">查阅
+						<u-button type="warning" size="mini" @click="getGo(item.id_,'2')" class="u-m-r-15"
+							v-if="item.lei_xing_ == '2' && item.shi_fou_guo_shen_ == '已编制'">签名</u-button>
+						<u-button type="warning" size="mini" class="btn-back-color" @click="getGo(item.id_,'1')">查阅
 						</u-button>
 					</view>
 				</uni-section>
@@ -58,6 +60,7 @@
 		USER_NAME,
 		USER_INFO
 	} from "@/common/util/constants" // 拉取登录token,userName,userInfo
+
 	export default {
 		data() {
 			return {
@@ -88,12 +91,15 @@
 				this.list = []
 				this.getData(this.keyword)
 			},
+			getValue() {
+				this.getInit()
+			},
 			/**
 			 * 模糊查询
 			 */
 			search() {
 				this.current = 0
-				this.resdata = []
+				this.list = []
 				this.getData(this.keyword)
 			},
 			//获取列表数据
@@ -130,9 +136,9 @@
 					}
 				})
 			},
-			getGo(id) {
+			getGo(id, typeValue) {
 				uni.navigateTo({
-					url: './communication?id=' + id
+					url: `./communication?id=${id}&typeValue=${typeValue}`
 				})
 			}
 		}

pages/fileView/fileView.vue

@@ -21,6 +21,7 @@
 				type: '1'
 			}
 		},
+
 		onLoad(option) {
 
 			if (option.type) {

pages/jiance/jindu.vue

@@ -51,22 +51,14 @@
 						v-if="(item.wei_tuo_zhuang_ta == '待审核' || item.wei_tuo_zhuang_ta == '待审批') && item.shi_fou_guo_shen_ != '已退回'">
 						撤回申请
 					</u-button>
-					<u-button class="m-r-15 btn-back-color" type="primary" size="mini" style=""
-						@click="editOrder(item.id_,item.he_tong_bian_hao_,'0', 'detail')">明细
-					</u-button>
 					<u-button class="m-r-15" type="success" size="mini"
 						@click="editOrder(item.id_,item.he_tong_bian_hao_,'1', 'edit')"
 						v-if="item.wei_tuo_zhuang_ta == '待编制' || item.shi_fou_guo_shen_ == '已退回'">修改</u-button>
+					<u-button class="m-r-15 btn-back-color" type="primary" size="mini" style=""
+						@click="editOrder(item.id_,item.he_tong_bian_hao_,'0', 'detail')">明细
+					</u-button>
 					<!-- <u-button type="warning" size="mini" class="m-r-15" @click="getTag(item.id_)">样品标签</u-button>
 					<u-button type="warning" size="mini" @click="goto(item.id_)">查看报告</u-button> -->
-
-					<!-- 					<button style="margin-right: 15rpx; height: 50rpx;" size="mini"
-						@click="editOrder(item.id_,item.he_tong_bian_hao_,'0')">明细</button>
-					<button style="margin-right: 15rpx; height: 50rpx;" size="mini"
-						@click="editOrder(item.id_,item.he_tong_bian_hao_,'1')"
-						v-if="item.zhuang_tai_ == '待编制' || item.shi_fou_guo_shen_ == '已退回'">修改</button>
-					<button style="margin-right: 15rpx; height: 50rpx;background-color: #7349ff;color: #fff;"
-						@click="goto(item.id_)" size="mini">查看报告</button> -->
 				</view>
 			</uni-section>
 		</view>
@@ -169,7 +161,7 @@
 			getData(keyworks) {
 				uni.showLoading({
 					mask: true,
-					title: 'loading'
+					title: '加载中'
 				});
 
 				let info = uni.getStorageSync(USER_INFO);
@@ -187,7 +179,7 @@
 				// 	`{"sql":"select tb.*,td.he_tong_bian_hao_ as he_tong_ming_cheng_,ty.ke_hu_ming_cheng_ as ke_hu_dang_wei from t_mjwtsqb tb, t_bjd td,t_yxkh ty where tb.he_tong_bian_hao_ = td.id_ and td.ke_hu_ming_cheng_ = ty.id_ and tb.create_by_= '${useId}' and tb.wei_tuo_bian_hao_ like '%${keyworks}%' ORDER BY tb.id_ desc LIMIT ${page},10"}`
 
 				let sql =
-					`select tl.*,td.he_tong_bian_hao_ as he_tong_ming_cheng_ from t_lhwtsqb tl,t_bjd td where tl.he_tong_id_ = td.id_ and tl.create_by_= '${useId}' and tl.wei_tuo_bian_hao_ like '%${keyworks}%' ORDER BY tl.create_time_ desc LIMIT ${page},10`
+					`select tl.*,td.he_tong_bian_hao_ as he_tong_ming_cheng_ from t_lhwtsqb tl,t_bjd td where tl.he_tong_id_ = td.id_ and td.ke_hu_zhang_hao_ = '${useId}' and tl.wei_tuo_bian_hao_ like '%${keyworks}%' ORDER BY tl.create_time_ desc LIMIT ${page},10`
 				let requestData = this.$sig(sql)
 
 

pages/jiance/list/specimen.vue

@@ -510,11 +510,11 @@
 				if (this.form.shu_liang_si_ == 0) {
 					this.form.shu_liang_si_ = ''
 				}
-				let lHData = null
-				if (this.weiTuoBianHao && this.content) {
-					lHData = specimenBox.getLHBata(this.content, this.form, this.showBoolean1, this.showBoolean2, this
-						.showBoolean3, this.showBoolean4)
-				}
+				// let lHData = null
+				// if (this.weiTuoBianHao && this.content) {
+				// 	lHData = specimenBox.getLHBata(this.content, this.form, this.showBoolean1, this.showBoolean2, this
+				// 		.showBoolean3, this.showBoolean4)
+				// }
 				let pp = {
 					paramWhere: [{
 						id_: this.id
@@ -526,9 +526,9 @@
 
 				this.$http.post("ibps/business/v3/sys/universal/updateDatasContextTable", data).then(res => {
 					if (res.data.state == 200) {
-						if (this.weiTuoBianHao && lHData) {
-							this.getLiuHen(lHData)
-						}
+						// if (this.weiTuoBianHao && lHData) {
+						// 	this.getLiuHen(lHData)
+						// }
 						uni.navigateBack({
 							delta: 1
 						})

pages/jiance/order.vue

@@ -19,6 +19,12 @@
 					<u-form-item label="委托编号">
 						<u-input placeholder="请输入委托编号" v-model="form.weiTuoBianHao" disabled />
 					</u-form-item>
+					<!-- <u-form-item label="用户选择" prop="userNameId" required v-if="administrator">
+						<uni-data-select placeholder="请选择合同选择" v-model="form.userNameId" :localdata="userList"
+							v-if="type != 'detail'">
+						</uni-data-select>
+						<text v-else>{{getButtChange(form.heTongId,hetong)}}</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'">
@@ -236,10 +242,12 @@
 			return {
 				activeNum: 1,
 				form: {
+					userNameId: '',
 					weiTuoLeiXing: '',
 					weiTuoDanLaiYuan: '',
 					weiTuoBianHao: '',
 					heTongId: '',
+					heTongBianHao: '',
 					weiTuoHeTong: '',
 					weiTuoDanWei: '',
 					songJianDanWei: '',
@@ -369,18 +377,30 @@
 				itemType: true,
 				deleteString: '',
 				backShow: false,
-				option: ''
+				option: '',
+
+				userList: [],
+				administrator: false
 			}
 		},
 		onLoad(options) {
+			let administrator = uni.getStorageSync('administrator')
+			this.administrator = administrator
+			this.getInit()
+
+			// if (administrator) {
+			// 	this.getAdministrator()
+			// }
+
 			//一开始查合同  如果修改或者明细 传option.id
-			if (options && options.type != 'detail') {
-				this.getDataHetong(options.id)
-			} else {
-				this.getLiuHenWeiTuoDan(options.id)
-			}
+			// if (options && options.type != 'detail') {
+			// 	this.getDataHetong(options.id)
+			// } else {
+			// 	this.getLiuHenWeiTuoDan(options.id)
+			// }
+			this.getDataHetong(options.id)
+
 
-			this.getInit()
 			if (options.saveId) { //是不是暂存信息
 				this.buttonFlagNum = '3'
 				this.saveId = options.saveId
@@ -411,6 +431,22 @@
 			this.scrollTop = e.scrollTop;
 		},
 		methods: {
+			//超级用户 获取全部客户信息
+			getAdministrator() {
+				let sql =
+					`select * from ibps_party_employee where GROUP_ID_ = '1041786072788369408' and STATUS_ = 'actived'`
+				let requestData = this.$sig(sql)
+				this.$http.post("/ibps/business/v3/sys/universal/inputSqlSelectData", requestData).then(res => {
+					if (res.data.state == 200) {
+						let result = res.data.variables.data
+						result.forEach((item, index) => {
+							this.$set(item, 'text', item.NAME_)
+							this.$set(item, 'value', item.ID_)
+						})
+						this.userList = result
+					}
+				})
+			},
 			//根据委托单id查询 taskId
 			getTaskId(id) {
 				let sql =
@@ -459,6 +495,8 @@
 
 				this.form.weiTuoLeiXing = '客户委托'
 				this.form.weiTuoRiQi = this.time
+
+
 			},
 			//根据暂存id获取暂存详情信息
 			getSaveData(id) {
@@ -633,7 +671,7 @@
 				// 	`select tb.*,ty.ke_hu_ming_cheng_ as ke_hu_dang_wei from t_bjd tb,t_yxkh ty where tb.ke_hu_ming_cheng_ = ty.id_  and tb.zhuang_tai_='生效中' and tb.shi_fou_guo_shen_ = '已完成'`
 
 				let sql =
-					`select tb.*,ty.ke_hu_ming_cheng_ as ke_hu_dang_wei from t_bjd tb,t_yxkh ty where tb.ke_hu_ming_cheng_ = ty.id_ and tb.ke_hu_zhang_hao_ ='${info.employee.account}' and tb.zhuang_tai_='生效中' and tb.shi_fou_guo_shen_ = '已完成'`
+					`select tb.*,ty.ke_hu_ming_cheng_ as ke_hu_dang_wei from t_bjd tb,t_yxkh ty where tb.ke_hu_ming_cheng_ = ty.id_ and tb.ke_hu_zhang_hao_ ='${info.employee.id}' and tb.zhuang_tai_='生效中' and tb.shi_fou_guo_shen_ = '已完成'`
 				let requestData = this.$sig(sql)
 				this.$http.post("/ibps/business/v3/sys/universal/inputSqlSelectData", requestData).then(res => {
 					if (res.data.state == 200) {
@@ -678,6 +716,7 @@
 						this.form.weiTuoFangLianXiD = data.dian_hua_ || ''
 						this.form.weiTuoFangLianXiR = data.lian_xi_ren_ || ''
 						this.form.weiTuoFangMingChe = data.ke_hu_dang_wei || ''
+						this.form.heTongBianHao = data.he_tong_bian_hao_ || ''
 					}
 
 					this.getJiance(e, type, weiTouId)
@@ -882,7 +921,7 @@
 					let that = this
 					uni.showModal({
 						title: '提示',
-						content: '委托单编号：' + this.form.weiTuoDanWei + '一共金额为' + this.form.zongJia + '元，是否确定下单？',
+						content: '委托单编号：' + this.form.weiTuoBianHao + '金额为' + this.form.zongJia + '元，是否确定下单？',
 						success: function(res) {
 							if (res.confirm) {
 								that.sumbit(valueType)
@@ -1099,6 +1138,7 @@
 				if (valueType == 2 || valueType == 3) {
 					this.form.lhypb.forEach((item, index) => {
 						let bit = {
+							he_tong_id_: this.form.heTongBianHao,
 							he_tong_bian_hao_: this.form.heTongId,
 							jiao_fei_fang_shi: this.form.fuKuanFangShi,
 							shen_qing_id_: this.form.zhanShiBiaoId,
@@ -1153,7 +1193,7 @@
 				this.$http.post("ibps/business/v3/bpm/instance/start", data).then(res => {
 					if (res.data.state == 200) {
 						this.$tip.success('提交成功!')
-						this.getLiuHen()
+						// this.getLiuHen()
 						uni.hideLoading();
 						this.$Router.replaceAll({
 							name: 'index'
@@ -1183,7 +1223,7 @@
 				this.$http.post("/ibps/business/v3/bpm/task/agree", data).then(res => {
 					if (res.data.state == 200) {
 						this.$tip.success('提交成功!')
-						this.getLiuHen()
+						// this.getLiuHen()
 						uni.hideLoading();
 						this.$Router.replaceAll({
 							name: 'index'
@@ -1197,7 +1237,8 @@
 			//数据留痕
 			getLiuHen() {
 				this.form.taoCanShow = this.taoCanShow
-				this.form.hetongList = this.hetong
+				this.form.hetongList = this.hetongList
+				this.form.hetong = this.hetong
 				this.form.taoCanList = this.taoCanList
 				this.form.jianCeTypeList = this.jianCeTypeList
 				this.form.jianCeList = this.jianCeList

pages/jiance/order/lhypbMessage.vue

@@ -153,7 +153,7 @@
 						</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"
+						<u-tag class="btnSin" size="default" v-for="(it, x) in form.taoCanList" v-if="it.checked"
 							:text="it.tao_can_ming_chen" :key="x" />
 					</view>
 				</u-form-item>

pages/jiance/order/meth.js

@@ -55,50 +55,58 @@ export default {
 		let noList = []
 		list.forEach((item, index) => {
 			//常规项目处理
-			let jian_ce_xiang_mu2_ = item.jian_ce_xiang_mu_.split(",")
 			let jiancLis = JSON.parse(JSON.stringify(jianCeList))
-			jiancLis.forEach(it => {
-				let jianSin = jian_ce_xiang_mu2_.findIndex(itg => itg == it.id_)
-				if (jianSin >= 0) {
-					it.checked = true
+			let changGuijianCe = []
+			if (item.jian_ce_xiang_mu2_) {
+				changGuijianCe = item.jian_ce_xiang_mu_.split(",")
+				jiancLis.forEach(it => {
+					let jianSin = changGuijianCe.findIndex(itg => itg == it.id_)
+					if (jianSin >= 0) {
+						it.checked = true
+					}
+				})
+				let showHen = this.getXiangMuList(changGuijianCe, jiancLis) //已经选择的检测项目是否存在常规项目
+				if (!showHen) {
+					noList.push(index)
 				}
-			})
-			let showHen = this.getXiangMuList(jian_ce_xiang_mu2_, jiancLis) //已经选择的检测项目是否存在常规项目
-			if (!showHen) {
-				noList.push(index)
 			}
 
+
+
 			//套餐处理
 			let tCList = JSON.parse(JSON.stringify(taoCanList))
-			let xuanZeTaoCan = item.xuan_ze_tao_can_.split(',')
-			if (tCList.length > 0 && xuanZeTaoCan.length > 0) {
-				tCList.forEach(ite => {
-					let showData = xuanZeTaoCan.findIndex(itg => itg == ite.id_)
-					if (showData >= 0) {
-						ite.checked = true
-					}
-				})
+			if (item.xuan_ze_tao_can_) {
+				let xuanZeTaoCan = item.xuan_ze_tao_can_.split(',')
+				if (tCList.length > 0 && xuanZeTaoCan.length > 0) {
+					xuanZeTaoCan.forEach(ite => {
+						let showData = tCList.findIndex(itg => itg.id_ == ite)
+						if (showData >= 0) {
+							tCList[showData].checked = true
+						}
+					})
+				}
 			}
 
-
 			//套餐项目处理
 			let tCXmList = JSON.parse(JSON.stringify(taoCanXiangmMuList))
-			let taoCanXiangMu = item.tao_can_xiang_mu_.split(",")
 			let tcXmlist = []
-			if (tCXmList.length > 0 && taoCanXiangMu.length > 0) {
-				taoCanXiangMu.forEach(ite => {
-					tCXmList.forEach(it => {
-						if (it.id_ == ite) {
-							tcXmlist.push(it)
+			if (item.tao_can_xiang_mu_) {
+				let taoCanXiangMu = item.tao_can_xiang_mu_.split(",")
+				if (tCXmList.length > 0 && taoCanXiangMu.length > 0) {
+					taoCanXiangMu.forEach(ite => {
+						let showData = tCXmList.find(itg => itg.id_ == ite)
+						if (showData) {
+							tcXmlist.push(showData)
 						}
 					})
-				})
+				}
 			}
 
+
 			let obj = {
 				id: item.id_,
 				jianCeXiangMu: item.jian_ce_xiang_mu_,
-				jianCeXiangMu2: jian_ce_xiang_mu2_, //不传到后台
+				jianCeXiangMu2: changGuijianCe, //不传到后台
 				yangPinMingCheng: item.yang_pin_ming_che,
 				yangPinBianHao: item.yang_pin_bian_hao,
 				xingMing: item.xing_ming_,
@@ -180,7 +188,7 @@ export default {
 				obj.showBoolean4 = true
 			}
 
-			let show = jian_ce_xiang_mu2_.some(item => item == '1039826037036285952' || item ==
+			let show = changGuijianCe.some(item => item == '1039826037036285952' || item ==
 				'1040205909151711232')
 			if (show) {
 				obj.mingChengShow = true
@@ -191,7 +199,7 @@ export default {
 
 		if (noList.length > 0) {
 			let setList = [...new Set(noList)]
-			this.getPrompt('样品' + setList.join(",") + '因为特殊原因有些检测项目暂时无法检测，请联系医院确定')
+			this.getPrompt('样品' + (parseInt(setList.join(",")) + 1) + '因为特殊原因有些检测项目暂时无法检测，请联系医院确定')
 		}
 
 		return TList
@@ -385,12 +393,22 @@ export default {
 	},
 	//遍历list1 在 list的是否存在
 	getXiangMuList(list1, list2) {
+		console.log(list1)
 		for (let item of list1) {
 			let show = list2.findIndex(it => it.id_ == item)
+			console.log(show)
 			if (show < 0) {
 				return false
 			}
 		}
 		return true
+	},
+	getHeTongBianHao(list, id) {
+		let data = list.find(item => item.value == id)
+		if (data) {
+			return data.text
+		} else {
+			return ''
+		}
 	}
 }

pages/jiance/tousu.vue

@@ -28,7 +28,9 @@
 		</view>
 		<view class="cu-form-group" style="z-index: 999;">
 			<view class="title">关联样品</view>
-			<text style="width: 100%;" @click="getShow">{{getYangPin(form.guanLianYangPin)}}</text>
+			<input v-model="form.guanLianYangPin" name="input" placeholder="请选择关联样品" disabled
+				v-if="form.guanLianYangPin == '' && id == ''">
+			<text style="width: 100%;" @click="getShow" v-else>{{getYangPin(form.guanLianYangPin)}}</text>
 			<u-button type="success" size="mini" @click="getShow" v-if="form.guanLianYangPin == '' && id == ''">选择
 			</u-button>
 			<u-icon class="uni-icon" name="close-circle-fill" color="rgb(192, 196, 204)" size="42"
@@ -36,7 +38,12 @@
 		</view>
 		<view class="cu-form-group" style="z-index: 999;">
 			<view class="title">投诉方式</view>
-			<input v-model="form.complaintsWay" name="input" placeholder="请输入投诉方式" disabled @click="selectShowClick">
+			<input v-model="form.complaintsWay" name="input" placeholder="请选择投诉方式">
+			<u-button type="success" size="mini" @click="selectShowClick" v-if="form.complaintsWay == '' && id == ''">选择
+			</u-button>
+			<u-icon class="uni-icon" name="close-circle-fill" color="rgb(192, 196, 204)" size="42"
+				v-if="form.complaintsWay != '' && id == ''" @click="form.complaintsWay = ''"></u-icon>
+			<!-- <input v-model="form.complaintsWay" name="input" placeholder="请输入投诉方式" disabled @click="selectShowClick"> -->
 		</view>
 
 		<uni-section title="投诉内容" type="line" padding>
@@ -56,7 +63,7 @@
 			</view>
 		</uni-section>
 
-		<uni-section title="受理意见" type="line">
+		<uni-section title="受理意见" type="line" v-if="id != ''">
 			<view class="u-m-15 u-p-b-15">
 				{{option}}
 			</view>
@@ -240,9 +247,10 @@
 							if (result.TASK_ID_) {
 								this.taskId = result.TASK_ID_
 
-								if (this.type == '1') {
-									this.getProcInstId(result.PROC_INST_ID_)
-								}
+								// if (this.type == '1') {
+								// 	this.getProcInstId(result.PROC_INST_ID_)
+								// }
+								this.getProcInstId(result.PROC_INST_ID_)
 							}
 						}
 					}

pages/login/login.vue

@@ -182,11 +182,16 @@
 					return;
 				}
 
-				// let nameLength = this.userName.split("")
-				// if (nameLength != 13 && this.userName.indexOf("MJ") == -1) {
-				// 	this.$tip.toast("该账户不是客户账号");
-				// 	return
-				// }
+				if (this.userName == 'luohu') {
+					uni.setStorageSync('administrator', true)
+				} else {
+					let nameLength = this.userName.split("")
+					if (nameLength != 13 && this.userName.indexOf("LH") == -1) {
+						this.$tip.toast("该账户不是客户账号");
+						return
+					}
+					uni.setStorageSync('administrator', false)
+				}
 				let loginParams = {
 					username: this.userName,
 					password: this.password,

pages/tag/sampleTag.vue

@@ -177,7 +177,7 @@
 				});
 			},
 			getAction() {
-				let data = ['下载', '保存']
+				let data = ['下载']
 				uni.showActionSheet({
 					itemList: data,
 					success: (res) => {
@@ -185,9 +185,9 @@
 							case 0:
 								this.downloadImage()
 								break;
-							case 1:
-								this.getSave()
-								break;
+								// case 1:
+								// 	this.getSave()
+								// 	break;
 						}
 					},
 					fail: function(res) {}
@@ -269,4 +269,8 @@
 		align-items: center;
 
 	}
+
+	/deep/ uni-mask .uni-actionsheet__mask {
+		z-index: 900
+	}
 </style>

pages/user/editpassword.vue

@@ -15,21 +15,17 @@
 					<view class="cu-form-group">
 						<view class="title">密码</view>
 						<input placeholder="请输入六位以上密码" name="input" type="password" v-model="password"></input>
-						<!-- <text class="uni-icon" :class="[!showPassword ? 'uni-eye-active' : '']"
-							@click="changePassword"></text> -->
 					</view>
 					<view class="cu-form-group">
 						<view class="title">确认</view>
 						<input placeholder="请再输入一遍密码" name="input" type="password" v-model="again"></input>
-						<!-- <text class="uni-icon" :class="[!showPassword2 ? 'uni-eye-active' : '']"
-							@click="changePassword"></text> -->
 					</view>
 				</view>
 			</uni-card>
 			<view class="padding flex flex-direction" style="margin-bottom: 100rpx;">
-				<u-button type="success" class="btn btn-back-color" @click="submit">确认修改
-				</u-button>
+				<button class="cu-btn bg-blue lg btn-back-color" @click="submit">确认修改</button>
 			</view>
+
 		</scroll-view>
 	</view>
 </template>
@@ -48,13 +44,11 @@
 				password: "",
 				again: "",
 				id: '',
-				photo: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/b7c7f970-517d-11eb-97b7-0dc4655d6e68.jpg',
-				showPassword: true,
-				showPassword2: true
+				photo: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/b7c7f970-517d-11eb-97b7-0dc4655d6e68.jpg'
 			};
 		},
 		onLoad() {
-			let user = uni.getStorageSync(USER_INFO).employee;
+			let user = uni.getStorageSync(USER_INFO).user;
 			this.id = user.id
 			this.loadinfo()
 		},
@@ -79,17 +73,35 @@
 			},
 			submit() {
 				if (!this.password || this.password.length < 6) {
-					this.$tip.alert('正确输入密码');
+					uni.showToast({
+						title: '密码长度不小于6位',
+						icon: 'none',
+						duration: 2000
+					})
 					return false
 				}
 				if (this.password != this.again) {
-					this.$tip.alert('两次输入不一致');
+					uni.showToast({
+						title: '两次输入不一致 ',
+						icon: 'none',
+						duration: 2000
+					})
+					return false
+				}
+
+				let reg = new RegExp(/^(?![^a-zA-Z]+$)(?!\D+$)/)
+				if (!reg.test(this.password)) {
+					uni.showToast({
+						title: '密码必须包含数字和字母',
+						icon: 'none',
+						duration: 2000
+					})
 					return false
 				}
 
 				let data = {
 					"userIds": [
-						this.user.employee.id,
+						this.id,
 					],
 					"newPassword": this.password,
 					"repeatPassword": this.again,
@@ -103,15 +115,10 @@
 						uni.navigateTo({
 							url: "/pages/index/index"
 						})
-
 					} else {
-
 						this.$tip.toast("发送异常");
 					}
-				});
-
-
-
+				})
 			}
 		}
 	}
@@ -162,8 +169,3 @@
 		color: #333;
 	}
 </style>
-<style scoped>
-	.btn {
-		margin: 15rpx
-	}
-</style>

pages/wallet/wallet.vue

@@ -40,7 +40,7 @@
 						<view class="content">
 							<view class="left">
 								<view v-if="showIndex == 0">
-									<view>委托单：{{item.wei_tuo_dan_hao_}}</view>
+									<view>支付方式：{{item.chong_zhi_fang_sh || '其他'}}</view>
 									<view class="time">充值时间：{{setTime(item.create_time_)}}</view>
 								</view>
 								<view v-if="showIndex == 1">

uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue

@@ -1,11 +1,13 @@
 <template>
 	<view class="uni-stat__select">
-		<span v-if="label" class="uni-label-text hide-on-phone">{{label + '：'}}</span>
+		<span v-if="label" class="uni-label-text hide-on-phone">{{label}}</span>
 		<view class="uni-stat-box" :class="{'uni-stat__actived': current}">
 			<view class="uni-select">
 				<view class="uni-select__input-box" @click="toggleSelector">
-					<view v-if="current" class="uni-select__input-text">{{current}}</view>
-					<view v-else class="uni-select__input-text uni-select__input-placeholder">{{typePlaceholder}}</view>
+					<!-- <view v-if="current" class="uni-select__input-text">{{current}}</view> -->
+					<input v-if="current" v-model="current" disabled class="input-text" />
+					<input v-else v-model="typePlaceholder" disabled class="input-placeholder" />
+					<!-- <view v-else class="uni-select__input-text uni-select__input-placeholder">{{typePlaceholder}}</view> -->
 					<uni-icons v-if="current && clear" type="clear" color="#c0c4cc" size="24" @click="clearVal" />
 					<uni-icons v-else :type="showSelector? 'top' : 'bottom'" size="14" color="#999" />
 				</view>
@@ -235,7 +237,7 @@
 	/* #ifndef APP-NVUE */
 	@media screen and (max-width: 500px) {
 		.hide-on-phone {
-			display: none;
+			//display: none;
 		}
 	}
 
@@ -263,7 +265,7 @@
 
 	.uni-label-text {
 		font-size: 14px;
-		font-weight: bold;
+		// font-weight: bold;
 		color: $uni-base-color;
 		margin: auto 0;
 		margin-right: 5px;
@@ -304,6 +306,7 @@
 		display: flex;
 		/* #endif */
 		flex: 1;
+		justify-content: space-between;
 		flex-direction: row;
 		align-items: center;
 	}
@@ -332,7 +335,7 @@
 		border: 1px solid #EBEEF5;
 		border-radius: 6px;
 		box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
-		z-index: 100;
+		z-index: 990;
 		padding: 4px 0;
 	}
 
@@ -411,9 +414,23 @@
 		overflow: hidden;
 	}
 
+	.input-text {
+		/deep/ .uni-input-input {
+			color: $uni-main-color !important;
+			font-size: 13px;
+		}
+	}
+
 	.uni-select__input-placeholder {
 		color: $uni-base-color;
-		font-size: 12px;
+		font-size: 13px;
+	}
+
+	.input-placeholder {
+		/deep/ .uni-input-input {
+			color: $uni-base-color !important;
+			font-size: 12px;
+		}
 	}
 
 	.uni-select--mask {
@@ -423,4 +440,11 @@
 		right: 0;
 		left: 0;
 	}
+
+	.uni-display-black {
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		-o-text-overflow: ellipsis;
+		overflow: hidden;
+	}
 </style>