拉取代码

components/appUpdata/appUpdata.vue

@@ -6,12 +6,13 @@
 				<image class="img" src="/static/img/updata.png"></image>
 			</view> -->
 			<view class="versioninfo">
-				<view class="title">发现新版本</view>
+				<view class="title">更新提示</view>
+				<view class="content">有新版本发布，请及时更新！</view>
 				<view class="schedule" v-if="isSchedule">	
 					<progress :percent="upProgress" show-info stroke-width="15" />
 				</view>
 				<view class="btn">
-					<button type="primary" size="mini" :disabled="isSchedule" @click="nowUpdate()">立即升级</button>
+					<button size="mini" :disabled="isSchedule" @click="nowUpdate()">立即更新</button>
 				</view>
 			</view>
 		</view>
@@ -36,9 +37,8 @@
 				// manifest 中应用版本名称
 				appVersion: '',
 				// manifest 中应用版本号
-				appVersionCode: '',
 				apkInfo: {},
-				apkUrl:'http://192.168.3.108/getapk/pdaz-v1.0.0.apk',
+				apkUrl:'',
 				updateContent: []
 			};
 		},
@@ -50,33 +50,37 @@
 				// 获取本地应用资源版本号
 				plus.runtime.getProperty(plus.runtime.appid, (wgtinfo) => {
 					this.appVersion = wgtinfo.version;
-					this.appVersionCode = wgtinfo.versionCode;
-					// this.getVersionNumber();
+					this.getVersionNumber();
 				})
 			},
 			// 获取后台版本号 检查是否有新版本
 			getVersionNumber() {
-				let version = this.appVersionCode;
-				// this.isUpdate = true;
-				post("/configuration/updData/workConfigHistory").then((res) => {
-				    if (res.status == 200) {
-				      if(res.appVersionCode > version) {
-				      	this.apkInfo = res;
-				      	this.isUpdate = true;
-				      } else {
-				      	this.isUpdate = false;
-				      }
-				    } else {
-						uni.showToast({
-							icon: "none",
-							title: res.msg || "接口获取数据失败！",
-						});
-					}
-				})	
-			},
-			// 暂不升级
-			notUpdate() {
-				this.isUpdate = false;
+				let version = this.appVersion;
+				uni.showLoading({
+				  title: "加载中",
+				});
+				let postData = {
+				  "idx": 0,
+				  "sum": 1,
+				  systemConfiguration: {
+				    keyconfig: "supportAppVersion"
+				  }
+				}
+				post("/simple/data/fetchDataList/systemConfiguration", postData).then((res) => {
+				  uni.hideLoading();
+					if (res.status == 200) {
+				    this.supportAppVersion = res.list[0].valueconfig
+						let ip = uni.getStorageSync('ip')
+						this.apkUrl = ip + `/getapk/pdazV${this.supportAppVersion}.apk`
+						console.log(444,this.apkUrl)
+						if(this.supportAppVersion != version){
+							this.isUpdate = true;
+						}else{
+							this.isUpdate = false;
+						}
+				  }
+				})
+				
 			},
 			// 点击立即升级查看手机是安卓还是ios
 			nowUpdate() {
@@ -175,15 +179,17 @@
 		}
 	}
 	.versioninfo {
-		padding: 15rpx 30rpx;
+		// padding: 15rpx 0rpx;
 		border-radius: 25rpx;
 		background-color: #fff;
-	}
-	.title {
-		// position: absolute;
-		// top: 150rpx;
-		font-size: 40rpx;
-		// color: #fff;
+		.title {
+			font-size: 36rpx;
+			// border-bottom: 1px solid #eee;
+			padding: 20rpx 0;
+		}
+		.content{
+			
+		}
 	}
 	.info {
 		position: relative;
@@ -213,6 +219,8 @@
 			display: flex;
 			align-items: center;
 			justify-content: center;
+			background: #49b856;
+			color: #fff;
 		}
 	}
 }

components/numberKeyModel/numberKeyModel.vue

@@ -141,8 +141,8 @@ export default {
 				justify-content: space-around;
 				margin-bottom: 20rpx;
 				.content-item{
-					width: 100rpx;
-					height: 100rpx;
+					width: 80rpx;
+					height: 80rpx;
 					border-radius: 10rpx;
 					border: 1px solid #CCCCCC;
 					color: #000;

http/http.js

@@ -158,6 +158,7 @@ export function changeIP(ip) {
   console.log(ip)
   path = `${ip}/service`;
   appIp = ip;
+	uni.setStorageSync('ip', ip);
   uni.setStorageSync('path', path);
 }
 // 建立websocket

manifest.json

@@ -2,8 +2,8 @@
     "name" : "病理全流程",
     "appid" : "__UNI__9F2011E",
     "description" : "",
-    "versionName" : "1.0.0",
-    "versionCode" : "100",
+    "versionName" : "1.0",
+    "versionCode" : 10,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages/homePage/homePage.vue

@@ -78,8 +78,6 @@
     <showModel :title="models2.title" :icon="models2.icon" :disjunctor="models2.disjunctor" :content="models2.content"
       @ok="ok2" @cancel="cancel2" :operate="models2.operate">
     </showModel>
-		<!-- apk自动更新 -->
-		<appUpdata v-if="isApp && isUpdate" @getUpdate="isUpdate=false"></appUpdata>
 	</view>
 </template>
 
@@ -121,7 +119,7 @@
         // 密码
         password: "",
         //ip地址或域名
-        ip: "hsms.dashitech.com",
+        ip: "",
         scroll_refresher_enabled: true, //是否开启自定义下拉刷新
         triggered: false, //下拉刷新状态
         freshing: false, //上拉加载开关
@@ -155,7 +153,7 @@
           disjunctor: false,
         },
         objHistory: {},
-				isUpdate:true
+				isUpdate:false
       };
     },
 		components: {
@@ -1122,7 +1120,6 @@
       }
 			// #ifdef APP-PLUS
 			this.isApp = true;
-			this.isUpdate = true;
 			uni.closeSocket();
 			// #endif
       if (!this.workSchemeType) {
@@ -1173,7 +1170,6 @@
       //#endif
       // #ifdef APP-PLUS
       this.isApp = true;
-			this.isUpdate = true;
       // 通知权限 start
       // var main = plus.android.runtimeMainActivity();
       // var pkName = main.getPackageName();

pages/receiptpage/receiptpage.vue

@@ -333,7 +333,9 @@
 		</view>
 
 		<!-- 悬浮按钮 -->
-    <uni-fab :pattern="pattern" :content="content" :direction="direction" @fabClick="fabClick" @trigger="trigger"></uni-fab>
+		<view>
+			<uni-fab :pattern="pattern" :content="content" :direction="direction" @fabClick="fabClick" @trigger="trigger"></uni-fab>
+		</view>
 		<!-- 弹窗 -->
     <showModel :title="models.title" :icon="models.icon" :disjunctor="models.disjunctor" :content="models.content"
       @ok="ok" @cancel="cancel" @know="know" :operate="models.operate"></showModel>
@@ -422,6 +424,8 @@
 		<scanner></scanner>
 		<!-- 动态密钥 -->
 		<numberKeyModel v-if="showKey" :keyArr="keyArr" @cancel="showKey = false" @confirm="confirmKey($event)"></numberKeyModel>
+		<!-- apk自动更新 -->
+		<appUpdata v-if="isApp && isUpdate" @getUpdate="isUpdate=false"></appUpdata>
 	</view>
 </template>
 <script>
@@ -436,6 +440,7 @@
 	import uniDrawer from "@/components/uni-drawer/uni-drawer.vue";
 	import ldSelect from "@/components/ld-select/ld-select.vue";
 	import MxDatePicker from "@/components/mx-datepicker/mx-datepicker.vue";
+	import appUpdata from "../../components/appUpdata/appUpdata.vue";
 	
   import {
     get,
@@ -598,7 +603,9 @@
 				showKey:false,
 				keyNum:4, //密钥位数
 				isNumberKey:false, //是否开启动态密钥
-				keyArr: []
+				keyArr: [],
+				isApp:false,
+				isUpdate:false,
       };
     },
 		components: {
@@ -641,6 +648,7 @@
 			numberKeyModel,
 			scanner,
       selectAccount,
+			appUpdata
     },
     methods: {
 			confirmKey(data){
@@ -2940,6 +2948,8 @@
       }
       // #ifdef APP-PLUS
       webHandle("no", "app");
+			this.isUpdate = true
+			this.isApp = true
       // #endif
       // #ifdef H5
       webHandle("no", "wx");
@@ -2949,6 +2959,8 @@
 			this.getConfig();
 			let that = this
 			// #ifdef APP-PLUS
+			this.isUpdate = true
+			this.isApp = true
 			uni.$off('scan') // 每次进来先 移除全局自定义事件监听器
 			uni.$on('scan', function(data) {
 				that.padChange(data)
@@ -2971,6 +2983,14 @@
 		}
   };
 </script>
+<style scoped>
+	>>>.uni-fab--leftBottom{
+		bottom: calc(65px + var(--window-bottom)) !important;
+	}
+	>>>.uni-fab__circle--leftBottom{
+		bottom: calc(75px + var(--window-bottom)) !important;
+	}
+</style>
 <style lang="less">
 	.hideInput{
 		height: 40px;

pages/specimenPort/detail.vue

@@ -175,14 +175,30 @@
 					barcode:scannerCode,
 					platform:"app"
 				}).then((res) => {
+					let data = res.data[0]
 					this.SMFlag = true
 					uni.hideLoading();
 					if(res.status==200){
-						if(res.data[0].status.name=='标本离体'){
-							uni.navigateTo({
-							  url: `/pages/specimenPort/scan?data=${JSON.stringify(res.data[0])}&type=${res.type}`
-							});
-						}else{
+						let item = data.pathologySpecimenDTOList.find(i=>i.specimenCode == scannerCode)
+						if(!item.fixationTime && data.pathologyFormType==0){
+							if(data.status.value==2 || data.status.value==3 ||
+							data.status.value==4){
+								uni.navigateTo({
+								  url: `/pages/specimenPort/scan?data=${JSON.stringify(data)}&type=${res.type}`
+								});
+							}else{
+								uni.showToast({
+									title: '查询到标本申请单信息',
+									duration: 1000,
+									icon:'none'
+								});
+								setTimeout(_=>{
+									uni.navigateTo({
+									  url: `/pages/specimenPort/detail?detailId=${data.id}`
+									});
+								},800)
+							}
+						}else if(item.fixationTime && data.pathologyFormType==0){
 							uni.showToast({
 								title: '查询到标本申请单信息',
 								duration: 1000,
@@ -190,9 +206,15 @@
 							});
 							setTimeout(_=>{
 								uni.navigateTo({
-								  url: `/pages/specimenPort/detail?detailId=${res.data[0].id}`
+									url: `/pages/specimenPort/detail?detailId=${data.id}`
 								});
 							},800)
+						}else{
+							uni.showToast({
+								title: '该申请单类型不是病理检查申请单',
+								duration: 1000,
+								icon:'none'
+							});
 						}
 					}else{
 						uni.showModal({

pages/specimenPort/scan.vue

@@ -2,8 +2,11 @@
 	<view class="content">
 		<view class="info">
 			<view class="header">
-				<view class="title" :class="list.length < infoData.specimenNum?'par-top1':'par-top2'">{{list.length}}/{{infoData.specimenNum}}</view>
+				<view class="center" :class="list.length < infoData.specimenNum?'par-top1':'par-top2'">
+					<view class="sign red">{{list.length}}/{{specimenNum}}</view>
+				</view>
 				<view class="tip" v-if="list.length < infoData.specimenNum">请继续扫描标本！</view>
+				<view class="title">申请单共有<span class="red">{{totalNum}}</span>份，已固定<span class="red">{{fixationNum}}</span>份还需固定<span class="red">{{specimenNum}}</span>份</view>
 			</view>
 			<view>
 				<view class="list" v-for="(item, index) in list" :key="index">
@@ -24,7 +27,7 @@
 				</view>
 				<view class="df-list">
 					<view class="list-title">住院号：</view>
-					<view class="no-center">{{infoData.patientDTO.barCode}}</view>
+					<view class="no-center">{{infoData.patientDTO.patientCode}}</view>
 				</view>
 				<view class="df-list">
 					<view class="list-title">科室名称：</view>
@@ -36,10 +39,10 @@
 				</view>
 			</view>
 		</view>
-		<view class="btn-view" v-if="list.length < infoData.specimenNum">
+<!-- 		<view class="btn-view" v-if="list.length < infoData.specimenNum">
 			<button class="back-btn" @click="back">返回</button>
-		</view>
-		<view class="btn-view df-sb" v-if="list.length == infoData.specimenNum">
+		</view> -->
+		<view class="btn-view df-sb">
 			<button class="back-btn2" @click="back">返回</button>
 			<button class="back-btn3" @click="fixation">标本固定存放</button>
 		</view>
@@ -101,7 +104,10 @@
 					fixative:'',
 					handoverUserId:''
 				},
-				pathologyFormId:null
+				pathologyFormId:null,
+				fixationNum:null,
+				specimenNum:null, 
+				totalNum:null, 
 			}
 		},
 		components: {
@@ -147,11 +153,26 @@
 			},
 			back(){
 				// this.padChange('86386627710976\n')
+				this.cancelSpecimenModal()
 				uni.setStorageSync('pathologyFormId', null)
 				uni.navigateTo({
 				  url: `/pages/specimenPort/specimenPort?backType=detail`
 				});
 			},
+			// 标本重置
+			cancelSpecimenModal(){
+				let ids = []
+				for(let i of this.list){
+					ids.push(i.id)
+				}
+				let data = {
+					pathologySpecimenIds:ids.join(',')
+				}
+				post('/pathology/cancel', data).then((res) => {
+					
+				});
+
+			},
 			// 标本固定
 			fixation(){
 				this.form={
@@ -216,6 +237,9 @@
 				}else{
 					time = this.form.fixationTime
 				}
+				let str = this.list.map(i=>{
+					return i.specimenCode
+				})
 				uni.showLoading({
 					title: "加载中",
 					mask: true,
@@ -226,6 +250,7 @@
 					specimenFixingLiquid:{
 						id:this.form.fixative
 					},
+					specimenCodes:str.join(','),
 					handoverUserId:this.form.handoverUserId,
 					fixationTime:time,
 					specimenDeptId:this.userInfo.dept.id
@@ -263,15 +288,31 @@
 					delete query.pathologyFormId
 				}
 				post("/pathology/scanCode", query).then((res) => {
+					let data = res.data[0]
 					this.SMFlag = true
 					uni.hideLoading();
 					if(res.status==200){
-						uni.setStorageSync('pathologyFormId', res.data[0].id);
-						if(res.data[0].status.name=='标本离体'){
-							uni.navigateTo({
-							  url: `/pages/specimenPort/scan?data=${JSON.stringify(res.data[0])}&type=${res.type}`
-							});
-						}else{
+						let item = data.pathologySpecimenDTOList.find(i=>i.specimenCode == scannerCode)
+						uni.setStorageSync('pathologyFormId', data.id);
+						if(!item.fixationTime && data.pathologyFormType==0){
+							if(data.status.value==2 || data.status.value==3 ||
+							data.status.value==4){
+								uni.navigateTo({
+								  url: `/pages/specimenPort/scan?data=${JSON.stringify(data)}&type=${res.type}`
+								});
+							}else{
+								uni.showToast({
+									title: '查询到标本申请单信息',
+									duration: 1000,
+									icon:'none'
+								});
+								setTimeout(_=>{
+									uni.navigateTo({
+									  url: `/pages/specimenPort/detail?detailId=${data.id}`
+									});
+								},800)
+							}
+						}else if(item.fixationTime && data.pathologyFormType==0){
 							uni.showToast({
 								title: '查询到标本申请单信息',
 								duration: 1000,
@@ -279,9 +320,15 @@
 							});
 							setTimeout(_=>{
 								uni.navigateTo({
-								  url: `/pages/specimenPort/detail?detailId=${res.data[0].id}`
+									url: `/pages/specimenPort/detail?detailId=${data.id}`
 								});
 							},800)
+						}else{
+							uni.showToast({
+								title: '该申请单类型不是病理检查申请单',
+								duration: 1000,
+								icon:'none'
+							});
 						}
 					}else{
 						uni.showModal({
@@ -298,6 +345,15 @@
 						});
 					}
 				})
+			},
+			getSpecimenNum(){
+				post(`/pathology/check/pathologyForm/${this.infoData.id}`, {
+					operationType:'fixation'
+				}).then(res=>{
+					this.fixationNum = res.fixationNum
+					this.specimenNum = res.specimenNum
+					this.totalNum = res.totalNum
+				})
 			}
 		},
 		onBackPress(e) {
@@ -319,15 +375,16 @@
 		onLoad(option){
 			let data = JSON.parse(option.data)
 			this.infoData = data
+			this.getSpecimenNum()
 			this.type = option.type
 			this.list = data.pathologySpecimenDTOList?data.pathologySpecimenDTOList:[]
-			if(this.list.length == this.infoData.specimenNum){
-				uni.showToast({
-					title: '您标本已扫描完成，请填写固定信息',
-					duration: 2000,
-					icon:'none'
-				});
-			}
+			// if(this.list.length == this.infoData.specimenNum){
+			// 	uni.showToast({
+			// 		title: '您标本已扫描完成，请填写固定信息',
+			// 		duration: 2000,
+			// 		icon:'none'
+			// 	});
+			// }
 			this.getFixation()
 		}
 	}
@@ -364,15 +421,24 @@
 	page {
 		background: #F8F8F8;
 	}
+	.red{
+		color: red;
+	}
 	.content {
 		.header {
 			width: 100%;
 			height: 450rpx;
 			text-align: center;
+			.center{
+				.sign{
+					font-size: 70rpx;
+					font-weight: bold;
+				}
+			}
 			.title{
-				color: red;
-				font-size: 70rpx;
-				font-weight: bold;
+				font-weight: 500;
+				font-size: 34rpx;
+				padding: 0 20rpx;
 			}
 			.par-top1{
 				padding-top: 100rpx;

pages/specimenPort/specimenPort.vue

@@ -1,7 +1,11 @@
 <template>
 	<view class="conte">
 		<view class="header">
-			<text class="title">{{userInfo.dept.dept}}</text>
+			<text class="title">{{userInfo.dept.dept}}
+				<text class="red" v-if="otherData">
+					(单 {{otherData.pathologyFormNum}}, 标 {{otherData.specimenNum}})
+				</text>
+			</text>
 			<view class="filter" @click="filterClick">
 				<text class="newicon newicon-shaixuan icon"></text>
 			</view>
@@ -18,7 +22,7 @@
 			</view>
 			<view class="df-list">
 				<view class="df-list-over-left">患者：{{item.patientName}}({{item.patientDTO.bedNum}}床)</view>
-				<view class="df-list-over">住院号：{{item.patientDTO.barCode}}</view>
+				<view class="df-list-over">住院号：{{item.patientDTO.patientCode}}</view>
 			</view>
 			<view class="df-list">
 				<view class="df-list-over-left">离：{{yyTimeFilter(item.inVitroTime)}}</view>
@@ -46,6 +50,8 @@
 		</uni-drawer>
 		<!-- PDA扫描 -->
 		<scanner></scanner>
+		<!-- apk自动更新 -->
+		<appUpdata v-if="isApp && isUpdate" @getUpdate="isUpdate=false"></appUpdata>
 	</view>
 </template>
 
@@ -55,6 +61,7 @@
 		post
 	} from "../../http/http.js";
 	import scanner from "../../components/scanner/scanner.vue";
+	import appUpdata from "../../components/appUpdata/appUpdata.vue";
 	export default {
 		data() {
 			return {
@@ -70,10 +77,14 @@
 				totalNum:0,
 				hasMore:true,
 				SMFlag:true,
+				otherData:null,
+				isApp:false,
+				isUpdate:false,
 			}
 		},
 		components: {
-			scanner
+			scanner,
+			appUpdata
 		},
 		methods: {
 			// 时间格式化
@@ -186,7 +197,7 @@
 			},
 			// 查看详情
 			detail(item){
-				// this.padChange('BL2410251554361\n')
+				// this.padChange('118274209746944\n')
 				uni.navigateTo({
 				  url: `/pages/specimenPort/detail?detailId=${item.id}`
 				});
@@ -254,6 +265,7 @@
 					if(res.list.length){
 						this.hasMore = true;
 						this.list = this.idx === 0 ? res.list : this.list.concat(res.list);
+						this.otherData = res.otherData
 					}else{
 						if(this.idx == 0){
 							this.list = []
@@ -278,14 +290,30 @@
 					barcode:scannerCode,
 					platform:"app"
 				}).then((res) => {
+					let data = res.data[0]
 					this.SMFlag = true
 					uni.hideLoading();
 					if(res.status==200){
-						if(res.data[0].status.name=='标本离体'){
-							uni.navigateTo({
-							  url: `/pages/specimenPort/scan?data=${JSON.stringify(res.data[0])}&type=${res.type}`
-							});
-						}else{
+						let item = data.pathologySpecimenDTOList.find(i=>i.specimenCode == scannerCode)
+						if(!item.fixationTime && data.pathologyFormType==0){
+							if(data.status.value==2 || data.status.value==3 ||
+							data.status.value==4){
+								uni.navigateTo({
+								  url: `/pages/specimenPort/scan?data=${JSON.stringify(data)}&type=${res.type}`
+								});
+							}else{
+								uni.showToast({
+									title: '查询到标本申请单信息',
+									duration: 1000,
+									icon:'none'
+								});
+								setTimeout(_=>{
+									uni.navigateTo({
+									  url: `/pages/specimenPort/detail?detailId=${data.id}`
+									});
+								},800)
+							}
+						}else if(item.fixationTime && data.pathologyFormType==0){
 							uni.showToast({
 								title: '查询到标本申请单信息',
 								duration: 1000,
@@ -293,9 +321,15 @@
 							});
 							setTimeout(_=>{
 								uni.navigateTo({
-								  url: `/pages/specimenPort/detail?detailId=${res.data[0].id}`
+									url: `/pages/specimenPort/detail?detailId=${data.id}`
 								});
 							},800)
+						}else{
+							uni.showToast({
+								title: '该申请单类型不是病理检查申请单',
+								duration: 1000,
+								icon:'none'
+							});
 						}
 					}else{
 						uni.showModal({
@@ -332,6 +366,8 @@
 		onShow() {
 			let that = this
 			// #ifdef APP-PLUS
+			this.isUpdate = true
+			this.isApp = true
 			uni.$off('scan') // 每次进来先 移除全局自定义事件监听器
 			uni.$on('scan', function(data) {
 				that.padChange(data)
@@ -341,6 +377,11 @@
 		onLoad(option) {
 			let backType = option.backType ? option.backType : null
 			this.getDept(backType)
+			// #ifdef APP-PLUS
+			this.isUpdate = true
+			this.isApp = true
+			// #endif
+
 		}
 	}
 </script>
@@ -365,6 +406,10 @@
 				color: #57BC63;
 				font-size: 32rpx;
 				font-weight: 500;
+				.red{
+					color: red;
+					margin-left: 10px;
+				}
 			}
 
 			.filter {