添加工单完成弹出问卷码

.hbuilderx/launch.json

@@ -1,20 +1,27 @@
-{ // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
-  // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
-    "version": "0.0",
-    "configurations": [{
-     	"app-plus" : 
-     	{
-     		"launchtype" : "remote"
-     	},
-     	"default" : 
-     	{
-     		"launchtype" : "remote"
-     	},
-     	"h5" : 
-     	{
-     		"launchtype" : "remote"
-     	},
-     	"type" : "uniCloud"
-     }
+{
+    // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
+    // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
+    "version" : "0.0",
+    "configurations" : [
+        {
+            "app-plus" : {
+                "launchtype" : "remote"
+            },
+            "default" : {
+                "launchtype" : "remote"
+            },
+            "h5" : {
+                "launchtype" : "remote"
+            },
+            "type" : "uniCloud"
+        },
+        {
+            "openVueDevtools" : true,
+            "type" : "uni-app:app-ios"
+        },
+        {
+            "openVueDevtools" : true,
+            "type" : "uni-app:app-android"
+        }
     ]
 }

components/questionCode/questionCode.vue

@@ -9,16 +9,16 @@
       </view>
       <view class="showModel__article">
         <view class="showModel__content">
-          <image :src="qrCode.outQrcode" mode="widthFix" style="width: 100%;"></image>
+          <image :src="qrCode.outQrcode" mode="widthFix" style="width: 100%;" @longpress="disableLongPress"></image>
         </view>
       </view>
 			<view class="df-fl">
-				有效期：
-				<view v-if="!timeState" class="df-fl">
-					<uni-countdown @timeup="timeupChange" :second="refreshQRCodeTime" :showDay="false" :showHour="false" :showMinute="false"/>
+				<view @click="getQrCode('reload')" class="reload">刷新</view>
+				<view class="df-fl">
+					有效期：
+					<uni-countdown ref="countDown" @timeup="timeupChange" :second="refreshQRCodeTime" :showDay="false" :showHour="false" :showMinute="false"/>
 					秒
 				</view>
-				<view v-else>已过期</view>
 			</view>
       <view class="showModel__footer">
         <view class="showModel__know" @click="know" hover-class="seimin-btn-hover">关闭</view>
@@ -38,8 +38,7 @@
       return {
         qrCode: '',
 				disjunctor:false,
-				refreshQRCodeTime:null,
-				timeState:false
+				refreshQRCodeTime:null
       };
     },
     props: {
@@ -53,10 +52,17 @@
       },
 			// 倒计时结束
 			timeupChange(){
-				this.timeState = true
+				this.getQrCode('reload')
+			},
+			// 禁止长按
+			disableLongPress(e) {
+				// 阻止默认行为
+				e.preventDefault();
+				// 阻止事件冒泡
+				e.stopPropagation();
 			},
       // 获取我的二维码
-      getQrCode(){
+      getQrCode(type){
         uni.showLoading({
           title: "加载中",
           mask: true,
@@ -66,10 +72,15 @@
 				}).then((result) => {
             uni.hideLoading();
             if (result.status == 200) {
-              this.qrCode = result.data;
+							if(type=='reload'){
+								this.$refs.countDown.update()
+							}
+							this.qrCode = result.data;
 							this.refreshQRCodeTime = result.refreshQRCodeTime
 							this.disjunctor = true
-            } else {
+            } else if(result.status == 405){
+							
+						}else{
               uni.showToast({
                 icon: "none",
                 title: result.msg || "接口获取数据失败！",
@@ -111,6 +122,10 @@
         justify-content: center;
         align-items: center;
       }
+			.reload{
+				margin: 0 20rpx;
+				color: #49b856;
+			}
 			.df-fl{
 				display: flex;
 				justify-content: center;
@@ -158,6 +173,11 @@
           font-size: 36rpx;
           word-break: break-all;
           width: 100%;
+					background: rgba(0,0,0,0);
+					z-index: 999;
+					image{
+						pointer-events:none;
+					}
         }
 
         .showModel__info {

http/http.js

@@ -1,4 +1,4 @@
-import { encode } from 'js-base64';
+import { Base64 } from 'js-base64';
 // #ifdef H5
 import wx from 'weixin-jsapi'
 // #endif
@@ -38,7 +38,7 @@ export function get(url, data = {}) {
 export function post(url, data = {}) {
   if(url.includes('/workerOrder/orderSign/')){
     let code = url.replace('/workerOrder/orderSign/', '');
-    url = '/workerOrder/orderSign/' + encode(code);
+    url = '/workerOrder/orderSign/' + Base64.encode(code);
   }
   url = path + url;
   return new Promise((resolve, reject) => {

manifest.json

@@ -83,7 +83,8 @@
             "proxy" : {
                 "/service" : {
                     "target" : "http://192.168.3.108", //请求的目标域名
-										// "target" : "http://192.168.4.163", //宋程玉本地
+
+                    // "target" : "http://192.168.4.163", //宋程玉本地
                     "changeOrigin" : true, //是否跨域
                     "secure" : false
                 }

package-lock.json

@@ -12,7 +12,7 @@
         "big.js": "^6.2.1",
         "crypto-js": "^4.1.1",
         "dayjs": "^1.11.10",
-        "js-base64": "^3.7.5",
+        "js-base64": "^2.6.4",
         "spinkit": "^2.0.1",
         "weixin-jsapi": "^1.1.0"
       },
@@ -222,9 +222,9 @@
       }
     },
     "node_modules/js-base64": {
-      "version": "3.7.5",
-      "resolved": "https://registry.npmmirror.com/js-base64/-/js-base64-3.7.5.tgz",
-      "integrity": "sha512-mm6+q5LzUWw8jABsLkg7J5A0YL/SL3RgkzIKQaXN+LTaH3x3LQ+ALPM0jnINUtdsVNNpJuKubtecczlHIi92uQ=="
+      "version": "2.6.4",
+      "resolved": "https://registry.npmmirror.com/js-base64/-/js-base64-2.6.4.tgz",
+      "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ=="
     },
     "node_modules/minimatch": {
       "version": "3.1.2",

package.json

@@ -17,7 +17,7 @@
     "big.js": "^6.2.1",
     "crypto-js": "^4.1.1",
     "dayjs": "^1.11.10",
-    "js-base64": "^3.7.5",
+    "js-base64": "^2.6.4",
     "spinkit": "^2.0.1",
     "weixin-jsapi": "^1.1.0"
   },

pages/scanning_Result/scanning_Result.vue

@@ -894,7 +894,7 @@
 				  uni.hideLoading();
 				  if (res.status == 200) {
 				    let data = res.list[0];
-						if(data.taskTypeDTOS.length>0){
+						if(data.taskTypeDTOS.length>0 && data.questionnaireDTOS.length>0){
 							let isQuestion = data.taskTypeDTOS.find(i=> i.id == this.taskTypeId)
 							if(isQuestion){
 								this.isQuestionModel = true
@@ -925,6 +925,7 @@
       } else if (options.model) {
         this.infoDATA = JSON.parse(options.model);
       }
+			console.log(this.infoDATA , "infoDATA");
       if (options.accountObj && options.accountObj != "undefined") {
         this.accountObj = JSON.parse(options.accountObj);
       }
@@ -935,7 +936,11 @@
         this.handover = options.handover;
       }
       this.dataId = options.id;
-			this.taskTypeId = options.taskTypeId
+			if(options.taskTypeId){
+				this.taskTypeId = options.taskTypeId
+			}else if(this.infoDATA.workOrderList && this.infoDATA.workOrderList.length>0){
+				this.taskTypeId = this.infoDATA.workOrderList[0].taskType.id
+			}
       this.RESData = options.resData;
       this.res["status"] = options.status;
       this.res["msg"] = options.msg;
@@ -945,9 +950,20 @@
       this.res["deptName"] = options.deptName;
       this.res["bedNum"] = options.bedNum;
       this.infoType = options.type1;
-			if(this.infoType == 'trans-dsd-1' && this.infoDATA.status == 200){
+			if((this.infoType == 'trans-dsd-1' || this.infoType == 'ins-dsd-1' 
+				|| this.infoType == 'ins-half-ok' || this.infoDATA.type == 'ins-half-ok') 
+				&& this.res.status == 200){
 				this.getQuestionnaireSet()
 			}
+			if(
+				this.res.status == 200 &&
+				this.infoType != 'ins-zxz-1' &&
+				this.infoType != 'ins-dsd-1' &&
+				this.infoType != 'ins-ddd-1' &&
+				this.infoType != 'trans-ddd-1' &&
+				this.infoType != 'trans-dsd-1'){
+					this.getQuestionnaireSet()
+				}
       if (options.dept) {
         this.DEPT = options.dept;
       }

pages/scanning_all/scanning_all.vue

@@ -318,7 +318,7 @@
           mask: true,
         });
         if(this.tabType === 'specimen' && this.infoDATA.specimen && this.infoDATA.specimen[0].gdState.value == 5){
-          let result = await this.validateHandoverSpecimen();
+					let result = await this.validateHandoverSpecimen();
           if (result.status == 200) {
             if(result.list.length){
               // 标本-运送过程-终点科室-标本数字交接
@@ -361,7 +361,9 @@
                 this.tabType
               }&type1=${res.type}&infoData=${res.data}&status=${
                 res.status
-              }&msg=${res.msg}&deptCode=${this.code}&dept=${
+              }&workOrderList=${encodeURIComponent(
+								JSON.stringify(res.workOrderList)
+							)}&msg=${res.msg}&deptCode=${this.code}&dept=${
                 res.dept
               }&ids=${encodeURIComponent(
                 JSON.stringify(this.userId.ids)
@@ -443,7 +445,9 @@
             )}&model=${encodeURIComponent(JSON.stringify(res))}&deptId=${res.deptId}`,
             });
           }
-        });
+        }).catch(err=>{
+					console.log(9999,err)
+				})
       },
       //一键操作
       allStart() {
@@ -621,6 +625,8 @@
                         post("/workerOrder/" + type, list).then((res) => {
                           uni.hideLoading();
                           if (res.status == 200) {
+														console.log('工单id',this.typeData)
+														console.log('selectArr', this.selectArr)
                             if (
                               this.tabType == "inspect" ||
                               this.tabType == "patientTransport"
@@ -645,8 +651,10 @@
                                   }&type1=${res.type}&infoData=${res.data}&status=${
                                     res.status
                                   }&msg=${res.msg}&deptCode=${this.code}&dept=${
-                                    res.dept
-                                  }&ids=${encodeURIComponent(
+                                    res.dept 
+                                  }&workOrderList=${encodeURIComponent(
+                                    JSON.stringify(res.workOrderList)
+                                  )}&ids=${encodeURIComponent(
                                     JSON.stringify(this.userId.ids)
                                   )}&model=${encodeURIComponent(
                                     JSON.stringify(res)
@@ -668,7 +676,9 @@
                                   res.status
                                 }&msg=${res.msg}&deptCode=${this.code}&dept=${
                                   res.dept
-                                }&ids=${encodeURIComponent(
+                                }&workOrderList=${encodeURIComponent(
+                                  JSON.stringify(res.workOrderList)
+                                )}&ids=${encodeURIComponent(
                                   JSON.stringify(this.userId.ids)
                                 )}&model=${encodeURIComponent(
                                   JSON.stringify(res)
@@ -876,8 +886,8 @@
           arr.push(key);
         }
       }
-      console.log(this.infoDATA);
       this.workData = this.infoDATA[arr[0]] || [];
+			console.log('病人数据',this.workData);
       this.tabType = arr[0];
       this.all();
       // #ifdef APP-PLUS

pages/scanning_code/scanning_code.vue

@@ -1004,7 +1004,7 @@
                         }&dept=${
                           this.queryObj.dept
                         }&taskTypeId=${
-													his.infoDATA.taskType.id
+													this.infoDATA.taskType.id
 												}&id=${this.dataId}&model=${encodeURIComponent(
                           JSON.stringify(ress)
                         )}`,
@@ -1264,7 +1264,7 @@
 				  uni.hideLoading();
 				  if (res.status == 200) {
 				    let data = res.list[0];
-						if(data.taskTypeDTOS.length>0){
+						if(data.taskTypeDTOS.length>0 && data.questionnaireDTOS.length>0){
 							let isQuestion = data.taskTypeDTOS.find(i=> i.id == this.infoDATA.taskType.id)
 							if(isQuestion){
 								this.isQuestionModel = true

pages/scanning_djEnd/scanning_djEnd.vue

@@ -212,10 +212,13 @@
       :title="changeSpeModels.title" :content="changeSpeModels.content" :disjunctor="changeSpeModels.disjunctor"
       @ok="changeSpeOk" @check="changeSpeCheck" @cancel="changeSpeCancel" :num="speNumChange" :modifyReason="modifyReason" :isFirstShowReason="false">
     </changeSpeNum>
+		<!-- 调查问卷二维码 -->
+		 <questionCode v-if="isQuestionModel" :orderId="questionId" @know="isQuestionModel = false"></questionCode>
   </view>
 </template>
 <script>
   import showModel from "../../components/showModel/showModel.vue";
+	import questionCode from "../../components/questionCode/questionCode.vue";
   import {
     get,
     post,
@@ -223,8 +226,14 @@
     webHandle
   } from "../../http/http.js";
   export default {
+		components:{
+			questionCode
+		},
     data() {
       return {
+				// 调研二维码
+				isQuestionModel:false,
+				questionId:null,
         speNumChange: 0,
         modifyReason:'',
         changeSpeObj: {},
@@ -1052,6 +1061,64 @@
           url: "../receiptpage/receiptpage",
         });
       },
+			// 获取问卷配置
+			getQuestionnaireSet(){
+				uni.showLoading({
+				  title: "加载中",
+				  mask: true,
+				});
+				const userData = uni.getStorageSync("userData");
+				post("/simple/data/fetchDataList/questionnaireConfig",{
+					questionnaireConfig:{
+						hosId:userData.user.scope.hospitalId.id
+					},
+					idx:0,
+					sum:10
+				}).then((res) => {
+				  uni.hideLoading();
+				  if (res.status == 200) {
+				    let data = res.list[0];
+						let isQuestion = null
+						let taskTypeArr = []
+						if(data.taskTypeDTOS.length>0 && data.questionnaireDTOS.length>0){
+							if(this.type == 'other' && this.infoDATA.workOrderList.length>1){
+								for(let i of this.infoDATA.workOrderList){ 
+									taskTypeArr.push({
+										id:i.id, //工单id
+										taskTypeId:i.taskType.id //任务类型id
+									})
+								}
+								for(let t of data.taskTypeDTOS){
+									for(let x of taskTypeArr){
+										if(t.id == x.taskTypeId){
+											isQuestion = x
+										}
+									}
+								}
+								this.$nextTick(_=>{
+									if(isQuestion){
+										this.questionId = isQuestion.id
+									}
+								})
+							}else{
+								let taskTypeId = this.infoDATA.workOrderList[0].taskType.id
+								this.questionId = this.infoDATA.workOrderList[0].id
+								isQuestion = data.taskTypeDTOS.find(i=> i.id == taskTypeId)
+							}
+							this.$nextTick(_=>{
+								if(isQuestion){
+									this.isQuestionModel = true
+								}
+							})
+						}
+				  } else {
+				    uni.showToast({
+				      icon: "none",
+				      title: res.msg || "接口获取数据失败！",
+				    });
+				  }
+				});
+			}
     },
     onShow() {
       this.SMFlag = true;
@@ -1073,6 +1140,7 @@
       this.code = options.code; //二维码code
       this.ids = options.ids && JSON.parse(options.ids); //科室ID数组
       this.infoDATA = list;
+			console.log(this.infoDATA, "this.infoDATA");
       if (options.type) {
         //关联类型
         this.type = options.type;
@@ -1080,6 +1148,20 @@
         this.type = list.type;
       }
       this.type1 = options.type1;
+			if(options.workOrderList){
+				this.infoDATA.workOrderList = JSON.parse(options.workOrderList)
+			}
+			if(
+			  (this.infoDATA.state == 'finish' &&
+			    this.infoDATA.status == 200 &&
+			    this.type == 'specimenPlan' &&
+			    this.infoDATA.type == 'plan-spe-dsd-1') ||
+			  (this.infoDATA.status == 200 &&
+			    this.type == 'other' &&
+			    this.infoDATA.type == 'qt-dsd-1')){
+						this.getQuestionnaireSet()
+					}
+					
       if(this.queryObj.isDigitalHandover==1){
         this.checkNumber();//自动弹出数量核对
       }

pages/scanning_djInfo/scanning_djInfo.vue

@@ -160,10 +160,13 @@
     <handViewSpecimen v-if="speModels.disjunctor" :title="speModels.title" :disjunctor="speModels.disjunctor"
       @ok="speOk" @cancel="speCancel">
     </handViewSpecimen>
+		<!-- 调查问卷二维码 -->
+		 <questionCode v-if="isQuestionModel" :orderId="gdId" @know="isQuestionModel = false"></questionCode>
   </view>
 </template>
 <script>
   import showModel from "../../components/showModel/showModel.vue";
+	import questionCode from "../../components/questionCode/questionCode.vue";
   import {
     get,
     post,
@@ -174,8 +177,14 @@
     DRUGSBAG_TYPE
   } from '../../tools/enum.drugsbagType.js';
   export default {
+		components:{
+			questionCode
+		},
     data() {
       return {
+				// 调研二维码
+				isQuestionModel:false,
+				gdId:null,
         DRUGSBAG_TYPE,
         currentCode: '', //当前小扫描的科室二维码
         // 手动查询标本弹窗model
@@ -662,6 +671,38 @@
           url: "../receiptpage/receiptpage",
         });
       },
+			// 获取问卷配置
+			getQuestionnaireSet(){
+				uni.showLoading({
+				  title: "加载中",
+				  mask: true,
+				});
+				const userData = uni.getStorageSync("userData");
+				post("/simple/data/fetchDataList/questionnaireConfig",{
+					questionnaireConfig:{
+						hosId:userData.user.scope.hospitalId.id
+					},
+					idx:0,
+					sum:10
+				}).then((res) => {
+				  uni.hideLoading();
+				  if (res.status == 200) {
+				    let data = res.list[0];
+						let taskTypeId = this.infoDATA.workOrderList[0].taskType.id
+						if(data.taskTypeDTOS.length>0 && data.questionnaireDTOS.length>0){
+							let isQuestion = data.taskTypeDTOS.find(i=> i.id == taskTypeId)
+							if(isQuestion){
+								this.isQuestionModel = true
+							}
+						}
+				  } else {
+				    uni.showToast({
+				      icon: "none",
+				      title: res.msg || "接口获取数据失败！",
+				    });
+				  }
+				});
+			}
     },
     onShow() {
       this.SMFlag = true;
@@ -688,7 +729,7 @@
       } else {
         this.infoDATA = this.queryObj.infoData;
       }
-
+			console.log(this.infoDATA, "22222");
       this.RESData = this.queryObj.resData;
       this.res["status"] = this.queryObj.status;
       this.res["msg"] = this.queryObj.msg;
@@ -708,6 +749,31 @@
       }
       this.DEPTCode = this.queryObj.deptCode;
       this.type = this.queryObj.type;
+			this.taskTypeId = options.taskTypeId
+			if(options.workOrderList && options.workOrderList!="undefined" && options.workOrderList!=undefined){
+				this.infoDATA.workOrderList = JSON.parse(options.workOrderList)
+			}
+			if(this.queryObj.ids&&this.queryObj.ids.length>0){
+				this.gdId = this.queryObj.ids[0]
+			}else{
+				this.gdId = this.infoDATA.workOrderList[0].id
+			}
+			if((this.res.status == 200 && this.type == 'inspect') || this.type == 'patientTransport'){
+				if(this.infoType == 'ins-dsd-1' ||
+					this.infoType == 'trans-dsd-1' ||
+					this.infoDATA.type == 'trans-dsd-1' || 
+					this.infoDATA.type == 'ins-half-ok'){
+						this.getQuestionnaireSet()
+					}
+			}
+			
+			if(
+			(this.res.status == 200 && this.type == 'drugsBag') ||
+			(this.res.status == 200 && this.type == 'jPBag')){
+				if(this.infoType == 'drug-dsd-2' || this.infoType == 'jp-dsd-2'){
+					this.getQuestionnaireSet()
+				}
+			}
       // #ifdef APP-PLUS
       webHandle("no", "app");
       // #endif

pages/scanning_ins/scanning_ins.vue

@@ -816,6 +816,7 @@
               mask: true,
             });
             post("/workerOrder/" + type, list).then((res) => {
+							console.log(1111,res)
               uni.hideLoading();
               if (res.status == 200) {
                 if(data.gdState.value == 4 && data.taskType.associationType.value === 'patientTransport'){
@@ -845,7 +846,9 @@
                 )}`,
                 });
               }
-            });
+            }).catch(err=>{
+							console.log(9999,err)
+						})
           }
         } else {
           this.models = {