update

common/util/work.js

@@ -10,26 +10,51 @@ export const us = {
 		icon: icon_prefix + "richang.png",
 		description: "记录每天的工作经验和心得",
 		useCount: 1000,
-		page: 'order'
+		page: '/pages/jiance/order'
 	}, {
 		title: "委托暂存",
 		icon: icon_prefix + "wendang.png",
 		description: "委托暂存",
 		useCount: 10000,
-		page: 'hold'
+		page: '/pages/hold/hold'
 	}, {
 		title: "委托查询",
 		icon: icon_prefix + "kaoqin.png",
 		description: "工作考勤",
 		useCount: 10000,
-		page: 'jindu',
+		page: '/pages/jiance/jindu',
 		text: 0
 	}, {
 		title: "我的样品",
 		icon: icon_prefix + "richeng.png",
 		description: "建立和查看个人工作安排",
 		useCount: 10000,
-		page: 'list'
+		page: '/pages/jiance/list'
+	}]
+}
+
+/**
+ * other server 售后服务
+ */
+export const sh = {
+	data: [{
+		title: "满意度调查",
+		icon: icon_prefix + "toupiao.png",
+		description: "投票中心",
+		useCount: 10000,
+		page: '/pages/jiance/manyi'
+	}, {
+		title: "投诉",
+		icon: icon_prefix + "renwu.png",
+		description: "任务中心",
+		useCount: 10000,
+		page: '/pages/jiance/tousu/tousuList'
+	}, {
+		title: "沟通",
+		icon: icon_prefix + "wendang.png",
+		description: "文档中心",
+		useCount: 10000,
+		page: '/pages/communication/communicationList'
 	}]
 }
 
@@ -43,20 +68,20 @@ export const os = {
 			icon: icon_prefix + "toupiao.png",
 			description: "投票中心",
 			useCount: 10000,
-			page: 'userdetail'
+			page: '/pages/user/userdetail'
 		},
 		{
 			title: "修改密码",
 			icon: icon_prefix + "xinwen.png",
 			description: "新闻中心",
 			useCount: 10000,
-			page: 'editpassword'
+			page: '/pages/user/editpassword'
 		}, {
 			title: "我的钱包",
 			icon: icon_prefix + "tongzhi.png",
 			description: "我的钱包",
 			useCount: 10000,
-			page: 'wallet'
+			page: '/pages/wallet/wallet'
 		},
 		{
 			title: "退出登录",
@@ -66,30 +91,4 @@ export const os = {
 			page: 'userexit'
 		}
 	]
-}
-
-
-/**
- * other server 售后服务
- */
-export const sh = {
-	data: [{
-		title: "满意度调查",
-		icon: icon_prefix + "toupiao.png",
-		description: "投票中心",
-		useCount: 10000,
-		page: 'manyi'
-	}, {
-		title: "投诉",
-		icon: icon_prefix + "renwu.png",
-		description: "任务中心",
-		useCount: 10000,
-		page: 'tousuList'
-	}, {
-		title: "沟通",
-		icon: icon_prefix + "wendang.png",
-		description: "文档中心",
-		useCount: 10000,
-		page: 'communicationList'
-	}]
 }

components/lin-select/lin-select.vue

@@ -3,22 +3,13 @@
 		<view class="yealuo-background" @tap="isShow = false" v-show="isShow"></view>
 		<view class="yealuo-con" :style="inputStyle" @tap='isShow = !isShow'>
 			<slot name='left'></slot>
-			<input class="uni-combox__input" :disabled="theDisabled" :placeholder="placeholder" v-model="theValue"
-				@input="theInput" @focus="theFocus" @blur="theBlur" autocomplete="off" />
+			<input class="uni-combox__input" :disabled="disabled" :placeholder="placeholder" v-model="theValue" @input="theInput" @focus="theFocus" @blur="theBlur" autocomplete="off" />
 			<slot name='right' v-if="selectIco">
-				<svg class="icon" v-if="!isShow"
-					style="width: 1.5em; height: 1.5em;vertical-align: middle;fill: currentColor;overflow: hidden;"
-					viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="530">
-					<path
-						d="M512 714.666667c-8.533333 0-17.066667-2.133333-23.466667-8.533334l-341.333333-341.333333c-12.8-12.8-12.8-32 0-44.8 12.8-12.8 32-12.8 44.8 0l320 317.866667 317.866667-320c12.8-12.8 32-12.8 44.8 0 12.8 12.8 12.8 32 0 44.8L533.333333 704c-4.266667 8.533333-12.8 10.666667-21.333333 10.666667z"
-						p-id="531"></path>
+				<svg class="icon" v-if="!isShow" style="width: 1.5em; height: 1.5em;vertical-align: middle;fill: currentColor;overflow: hidden;" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="530">
+					<path d="M512 714.666667c-8.533333 0-17.066667-2.133333-23.466667-8.533334l-341.333333-341.333333c-12.8-12.8-12.8-32 0-44.8 12.8-12.8 32-12.8 44.8 0l320 317.866667 317.866667-320c12.8-12.8 32-12.8 44.8 0 12.8 12.8 12.8 32 0 44.8L533.333333 704c-4.266667 8.533333-12.8 10.666667-21.333333 10.666667z" p-id="531"></path>
 				</svg>
-				<svg class="icon" v-else
-					style="width: 1.5em; height: 1.5em;vertical-align: middle;fill: currentColor;overflow: hidden;"
-					viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1927">
-					<path
-						d="M904.533333 674.133333l-362.666666-362.666666c-17.066667-17.066667-42.666667-17.066667-59.733334 0l-362.666666 362.666666c-17.066667 17.066667-17.066667 42.666667 0 59.733334 17.066667 17.066667 42.666667 17.066667 59.733333 0L512 401.066667l332.8 332.8c8.533333 8.533333 19.2 12.8 29.866667 12.8s21.333333-4.266667 29.866666-12.8c17.066667-17.066667 17.066667-42.666667 0-59.733334z"
-						p-id="1928"></path>
+				<svg class="icon" v-else style="width: 1.5em; height: 1.5em;vertical-align: middle;fill: currentColor;overflow: hidden;" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1927">
+					<path d="M904.533333 674.133333l-362.666666-362.666666c-17.066667-17.066667-42.666667-17.066667-59.733334 0l-362.666666 362.666666c-17.066667 17.066667-17.066667 42.666667 0 59.733334 17.066667 17.066667 42.666667 17.066667 59.733333 0L512 401.066667l332.8 332.8c8.533333 8.533333 19.2 12.8 29.866667 12.8s21.333333-4.266667 29.866666-12.8c17.066667-17.066667 17.066667-42.666667 0-59.733334z" p-id="1928"></path>
 				</svg>
 			</slot>
 		</view>
@@ -30,8 +21,7 @@
 				</view>
 				<view class="data">
 					<radio-group v-if="checkType=='radio'" @change="selectCheckbox">
-						<view class="select-item" :class="'item-'+overflow" v-for="(item, index) in nowData"
-							:key="index">
+						<view class="select-item" :class="'item-'+overflow" v-for="(item, index) in nowData" :key="index">
 							<label class="item-text" :class="{active: theValue==item.value}">
 								<radio name="name1" checked v-if="theValue==item.value" :value="item.id">
 								</radio>
@@ -41,22 +31,18 @@
 						</view>
 					</radio-group>
 					<checkbox-group v-else-if="checkType=='checkbox'" @change="selectCheckbox">
-						<view class="select-item" :class="'item-'+overflow" v-for="(item, index) in nowData"
-							:key="index">
+						<view class="select-item" :class="'item-'+overflow" v-for="(item, index) in nowData" :key="index">
 							<label class="item-text" :class="{active: theValue.indexOf(item.value)!=-1 }">
-								<checkbox name="name1" checked v-if="theValue.indexOf(item.value)!=-1 "
-									:value="item.id"></checkbox>
+								<checkbox name="name1" checked v-if="theValue.indexOf(item.value)!=-1 " :value="item.id"></checkbox>
 								<checkbox name="name1" v-else :value="item.id"></checkbox>
 								<text class="select-text">{{item.value}}</text>
 							</label>
 						</view>
 					</checkbox-group>
 					<radio-group v-else @change="selectCheckbox">
-						<view class="select-item" :class="'item-'+overflow" v-for="(item, index) in nowData"
-							:key="index">
+						<view class="select-item" :class="'item-'+overflow" v-for="(item, index) in nowData" :key="index">
 							<label class="item-text" :class="{active: theValue==item.value}">
-								<radio name="name1" style="display: none;" checked v-if="theValue==item.value"
-									:value="item.id"></radio>
+								<radio name="name1" style="display: none;" checked v-if="theValue==item.value" :value="item.id"></radio>
 								<radio name="name1" style="display: none;" v-else :value="item.id">
 								</radio>
 								<text class="select-text">{{item.value}}</text>
@@ -380,4 +366,4 @@
 		// border-bottom: solid 1px #DDDDDD;
 		padding: 0px 10px;
 	}
-</style>
+</style>

pages.json

@@ -11,7 +11,10 @@
 		},
 		{
 			"path": "pages/jiance/order",
-			"style": {}
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
 		},
 		{
 			"path": "pages/user/editpassword",
@@ -29,7 +32,9 @@
 		},
 		{
 			"path": "pages/jiance/list",
-			"style": {}
+			"style": {
+				"enablePullDownRefresh": true
+			}
 		},
 		{
 			"path": "pages/jiance/manyi",
@@ -248,7 +253,8 @@
 		"navigationBarBackgroundColor": "#0081ff",
 		"navigationBarTitleText": "深圳市罗湖医院集团细胞质量检测服务平台",
 		"navigationStyle": "custom",
-		"navigationBarTextStyle": "white"
+		"navigationBarTextStyle": "white",
+		"enablePullDownRefresh": false
 	},
 	"usingComponts": true,
 	"condition": { //模式配置，仅开发期间生效

pages/communication/communicationList.vue

@@ -48,6 +48,10 @@
 				</uni-section>
 			</view>
 		</block>
+
+		<view v-if="list.length==0" style="margin-top: 350rpx">
+			<u-empty text="暂无沟通数据" mode="list"></u-empty>
+		</view>
 	</view>
 </template>
 

pages/fileView/reportList.vue

@@ -8,10 +8,11 @@
 			<view class="sinList" v-for="(item,index) in reportList" :key="index">
 				<view class="title">报告编号：{{item.bao_gao_bian_hao_}}</view>
 				<view class="title">样品编号：{{item.yang_pin_bian_hao}}</view>
+				<view class="title">样品名称：{{item.yang_pin_ming_che}}</view>
 				<view class="title">报告名称：<text style="color: #7349ff;">{{item.FILE_NAME_ || ''}}</text></view>
+				<view class="title">版本号：<text style="color: #7349ff;">{{item.run_qian_lu_jing_ || ''}}</text></view>
 				<view class="title">报告类别：{{item.bao_gao_lei_bie_}}</view>
 				<view class="title">报告类型：{{item.bao_gao_lei_xing_}}</view>
-				<view class="title">样品名称：{{item.yang_pin_ming_che}}</view>
 				<!-- <view class="title">联系人：{{item.wei_tuo_lian_xi_r}}</view> -->
 				<view class="title">报告状态：<text style="color: #7349ff;">{{item.zhuang_tai_}}</text></view>
 				<view class="title" style="color: #ff9900;" v-if="item.zhuang_tai_ == '待审核' && item.EXT_ == 'docx'">
@@ -19,7 +20,7 @@
 				</view>
 				<view class="btn">
 					<view>
-						<u-button type="warning" size="mini" @click="goDe(item.id_)" v-if="item.zhuang_tai_ == '待编制' || item.zhuang_tai_ == '待审核'">修改信息</u-button>
+						<!-- <u-button type="warning" size="mini" @click="goDe(item.id_)" v-if="item.zhuang_tai_ == '待编制' || item.zhuang_tai_ == '待审核'">修改信息</u-button> -->
 						<u-button type="warning" size="mini" @click="goto(item.id_,'1')" style="margin-left: 10rpx;" v-if="(item.zhuang_tai_ == '待审核' || item.zhuang_tai_ == '待审批') && item.EXT_ != 'docx'">预览报告</u-button>
 						<u-button type="warning" size="mini" @click="goto(item.id_,'2')" style="margin-left: 10rpx;" v-if="item.zhuang_tai_ == '已完成'">查看报告</u-button>
 						<u-button type="primary" size="mini" @click="geDownload(item.bao_gao_pdf_,item.FILE_NAME_, item.EXT_)" style="margin-left: 10rpx;" v-if="(item.zhuang_tai_ == '已完成') || (item.shi_fou_guo_shen_ == '已编制') || (item.zhuang_tai_ == '待审批') || (item.zhuang_tai_ == '待审核')">

pages/home/home.vue

@@ -9,8 +9,7 @@
 			</view>
 
 			<view class="cu-list grid col-4 text-sm">
-				<view class="cu-item animation-slide-bottom" :style="[{animationDelay: (index + 1)*0.05 + 's'}]"
-					v-for="(item,index) in usList" :key="index" @tap="goPage(item.page)">
+				<view class="cu-item animation-slide-bottom" :style="[{animationDelay: (index + 1)*0.05 + 's'}]" v-for="(item,index) in usList" :key="index" @tap="goPage(item.page)">
 					<icon-item :item="item"></icon-item>
 				</view>
 			</view>
@@ -21,8 +20,7 @@
 				</view>
 			</view>
 			<view class="cu-list grid col-4 text-sm">
-				<view class="cu-item animation-slide-bottom" :style="[{animationDelay: (index + 1)*0.05 + 's'}]"
-					v-for="(item,index) in shList" :key="index" @tap="goPage(item.page)">
+				<view class="cu-item animation-slide-bottom" :style="[{animationDelay: (index + 1)*0.05 + 's'}]" v-for="(item,index) in shList" :key="index" @tap="goPage(item.page)">
 					<icon-item :item="item"></icon-item>
 				</view>
 			</view>
@@ -34,8 +32,7 @@
 				</view>
 			</view>
 			<view class="cu-list grid col-4 text-sm">
-				<view class="cu-item animation-slide-bottom" :style="[{animationDelay: (index + 1)*0.1 + 's'}]"
-					v-for="(item,index) in osList" :key="index" @tap="goPage(item.page)">
+				<view class="cu-item animation-slide-bottom" :style="[{animationDelay: (index + 1)*0.1 + 's'}]" v-for="(item,index) in osList" :key="index" @tap="goPage(item.page)">
 					<icon-item :item="item"></icon-item>
 				</view>
 			</view>
@@ -126,12 +123,15 @@
 				if (!page) {
 					return false;
 				}
-				if (page === 'annotationList') {
-					this.msgCount = 0
-				}
-				this.dot[page] = false
-				this.$Router.push({
-					name: page
+				// if (page === 'annotationList') {
+				// 	this.msgCount = 0
+				// }
+				// this.dot[page] = false
+				// this.$Router.push({
+				// 	name: page
+				// })
+				uni.navigateTo({
+					url: page
 				})
 			},
 			// 启动webSocket

pages/jiance/jindu.vue

@@ -7,7 +7,7 @@
 		<view class="cu-bar bg-white search fixed" :style="[{top:CustomBar + 'px'}]">
 			<view class="search-form round">
 				<text class="cuIcon-search"></text>
-				<input type="text" v-model="keyword" placeholder="输入搜索的关键词" confirm-type="search" @confirm="search"></input>
+				<input type="text" v-model="keyword" placeholder="请输入检测委托单号" confirm-type="search" @confirm="search"></input>
 			</view>
 			<view class="action">
 				<button class="cu-btn bg-gradual-blue shadow-blur round" @tap="search">搜索</button>
@@ -23,11 +23,8 @@
 			<jinduChild :item="item" :type="2" @editOrder="editOrder" @repulse="repulse"></jinduChild>
 		</view>
 
-
-		<view v-if="withdrawList.length == 0 && resdata.length == 0">
-			<uni-card is-full :is-shadow="false">
-				<text class="">暂无数据</text>
-			</uni-card>
+		<view v-if="withdrawList.length == 0 && resdata.length == 0" style="margin-top: 350rpx">
+			<u-empty text="暂无委托单数据" mode="list"></u-empty>
 		</view>
 
 
@@ -121,13 +118,9 @@
 			getWithdrawList(keyworks) {
 				let info = uni.getStorageSync(USER_INFO);
 				let useId = info.user.id
-
-
 				let sql =
 					`select tl.*,td.he_tong_bian_hao_ as he_tong_ming_cheng_ from t_lhwtsqb tl left join t_bjd td on tl.he_tong_id_ = td.id_ where (tl.create_by_ = '${useId}' or td.ke_hu_zhang_hao_ = '${useId}') and tl.wei_tuo_lei_xing_ = '客户委托' and  tl.shi_fou_guo_shen_ = '已退回' and tl.wei_tuo_bian_hao_ like '%${keyworks}%' ORDER BY tl.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) {
 						const data = res.data.variables.data
@@ -163,8 +156,6 @@
 				let sql =
 					`select tl.*,td.he_tong_bian_hao_ as he_tong_ming_cheng_ from t_lhwtsqb tl left join t_bjd td on tl.he_tong_id_ = td.id_ where (tl.create_by_ = '${useId}' or td.ke_hu_zhang_hao_ = '${useId}') and tl.wei_tuo_lei_xing_ = '客户委托' and tl.shi_fou_guo_shen_ != '已退回' and tl.wei_tuo_bian_hao_ like '%${keyworks}%' ORDER BY tl.create_time_ desc LIMIT ${page},10`
 				let requestData = this.$sig(sql)
-
-
 				this.$http.post("/ibps/business/v3/sys/universal/inputSqlSelectData", requestData).then(res => {
 					if (res.data.state == 200) {
 						const data = res.data.variables.data

pages/jiance/list.vue

@@ -8,14 +8,12 @@
 		<view class="cu-bar bg-white search fixed" :style="[{top:CustomBar + 'px'}]">
 			<view class="search-form round">
 				<text class="cuIcon-search"></text>
-				<input type="text" v-model="keyword" placeholder="输入搜索的关键词" confirm-type="search" @confirm="search"></input>
+				<input type="text" v-model="keyword" placeholder="请输入检测委托单号或者样品编号" confirm-type="search" @confirm="search"></input>
 			</view>
 			<view class="action">
 				<button class="cu-btn bg-gradual-blue shadow-blur round" @tap="search">搜索</button>
 			</view>
 		</view>
-
-
 		<view v-for="(item,i) in resdata" :key="i" style="margin: 10rpx 20rpx;position: relative;" :style="[{top:'calc('+ CustomBar + 'px + 20rpx)'}]">
 			<uni-section :title="'样品编号:'+item.yang_pin_bian_hao" :subTitle="'检测委托单号:'+item.wei_tuo_bian_hao_" type="line" padding subTitleColor="rgb(51, 51, 51)" subTitleFontSize="14px">
 				<view>
@@ -33,9 +31,6 @@
 							<view style="color: #5E00FF;" v-if="item.yan_shou_jie_guo_"> {{item.yan_shou_jie_guo_}}
 							</view>
 						</view>
-						<!-- 						<view>
-							付款单号: <view style="color: #5E00FF;">{{item.id_}}</view>
-						</view><br> -->
 						<view style="display: flex;line-height: 50rpx;">
 							<view>付款状态：</view>
 							<view v-if="item.fu_kuan_zhuang_ta=='已结清'">
@@ -62,10 +57,8 @@
 		</view>
 
 
-		<view v-if="resdata.length==0">
-			<uni-card is-full :is-shadow="false">
-				<text class="">暂无数据</text>
-			</uni-card>
+		<view v-if="resdata.length==0" style="margin-top: 350rpx">
+			<u-empty text="暂无样品数据" mode="list"></u-empty>
 		</view>
 	</view>
 </template>
@@ -141,7 +134,7 @@
 			getData(keyworks) {
 				uni.showLoading({
 					mask: true,
-					title: 'loading'
+					title: '加载中'
 				});
 
 				let info = uni.getStorageSync(USER_INFO);

pages/jiance/list/specimen.vue

@@ -25,7 +25,7 @@
 					</uni-data-select>
 				</u-form-item>
 				<u-form-item label="年龄">
-					<u-input v-model="form.nian_ling_" />
+					<u-input type="number" v-model="form.nian_ling_" />
 				</u-form-item>
 				<u-form-item label="送检批号/编号" prop="song_jian_pi_hao_" required>
 					<u-input v-model="form.song_jian_pi_hao_" />

pages/jiance/order.vue

@@ -254,7 +254,8 @@
 					zongJia: 0,
 					zhanShiBiaoId: this.generateUUID(),
 					biaoQianTuPianJudge: '否',
-					biaoQianTuPian: ''
+					biaoQianTuPian: '',
+					kaiPiaoZhuangTai: '未开票'
 				},
 				rules: {
 					heTongId: [{
@@ -1346,7 +1347,6 @@
 				} else {
 					this.itemType = true
 				}
-				console.log(type)
 				this.lhypbIndexData = type
 				this.lhypbShow = true
 

pages/jiance/order/lhypbMessage.vue

@@ -22,7 +22,7 @@
 					<text v-else>{{form.xingBie}}</text>
 				</u-form-item>
 				<u-form-item label="年龄">
-					<u-input placeholder="请输入年龄" v-model="form.nianLing" :disabled="type == 'detail'?true :false" />
+					<u-input placeholder="请输入年龄" v-model="form.nianLing" type="number" :disabled="type == 'detail'?true :false" />
 				</u-form-item>
 				<u-form-item label="送检批号/编号" prop="songJianPiHao" required>
 					<u-input placeholder="请输入送检批号/编号" v-model="form.songJianPiHao" :disabled="type == 'detail'?true :false" />
@@ -58,7 +58,7 @@
 				<u-form-item label="检测类型" v-if="type != 'detail'">
 					<!-- <u-input placeholder="请选择检测类型" type="select" v-model="form.jianCeType"
 						@click="selectClick('jianCeType')" /> -->
-					<lin-select item-key="id" placeholder='请输入内容' :binData="jianCeTypeList" checkType="checkbox" tags="name" inputStyle="" selectStyle="" overflow="hide" @getBackVal="checkBoxChange">
+					<lin-select item-key="id" placeholder='请输入内容' :binData="jianCeTypeList" checkType="checkbox" tags="name" :disabled="true" inputStyle="" selectStyle="" overflow="hide" @getBackVal="checkBoxChange">
 					</lin-select>
 
 				</u-form-item>

pages/jiance/order/meth.js

@@ -65,7 +65,8 @@ export default {
 			zhanShiBiaoId: item.zhan_shi_biao_id_,
 			baoGaoBianZhiYuan: item.bao_gao_bian_zhi_ || '',
 			biaoQianTuPianJudge: biaoQianTuPianJudge,
-			biaoQianTuPian: biaoQianTuPian
+			biaoQianTuPian: biaoQianTuPian,
+			kaiPiaoZhuangTai: item.kai_piao_zhuang_t
 		}
 		return form
 	},

pages/jiance/tousu/tousuList.vue

@@ -50,6 +50,10 @@
 				</uni-section>
 			</view>
 		</view>
+
+		<view v-if="list.length==0" style="margin-top: 350rpx">
+			<u-empty text="暂无投诉数据" mode="list"></u-empty>
+		</view>
 	</view>
 </template>