工单问卷优化

components/smallScreen/smallScreen.vue

@@ -250,7 +250,8 @@
                         res.bedNum
                       }&status=${res.status}&msg=${
                         res.msg
-                      }&model=${encodeURIComponent(JSON.stringify(res))}&accountObj=${encodeURIComponent(JSON.stringify(accountObj))}`,
+                      }&taskTypeId=${data.taskType.id}&model=${
+												encodeURIComponent(JSON.stringify(res))}&accountObj=${encodeURIComponent(JSON.stringify(accountObj))}`,
                       });
                     }
                   }else{
@@ -265,7 +266,8 @@
                       res.bedNum
                     }&status=${res.status}&msg=${
                       res.msg
-                    }&model=${encodeURIComponent(JSON.stringify(res))}&accountObj=${encodeURIComponent(JSON.stringify(accountObj))}`,
+                    }&taskTypeId=${data.taskType.id}&model=${
+											encodeURIComponent(JSON.stringify(res))}&accountObj=${encodeURIComponent(JSON.stringify(accountObj))}`,
                     });
                   }
                 }

pages/scanning_Result/scanning_Result.vue

@@ -259,10 +259,13 @@
     <handViewSpecimen v-if="speModels.disjunctor" :title="speModels.title" :disjunctor="speModels.disjunctor"
       @ok="speOk" @cancel="speCancel">
     </handViewSpecimen>
+		<!-- 调查问卷二维码 -->
+		 <questionCode v-if="isQuestionModel" :orderId="dataId" @know="isQuestionModel = false"></questionCode>
   </view>
 </template>
 <script>
   import showModel from "../../components/showModel/showModel.vue";
+	import questionCode from "../../components/questionCode/questionCode.vue";
   import {
     get,
     post,
@@ -276,8 +279,13 @@
     DRUGSBAG_TYPE
   } from '../../tools/enum.drugsbagType.js';
   export default {
+		components:{
+			questionCode
+		},
     data() {
       return {
+				// 调研二维码
+				isQuestionModel:false,
         DRUGSBAG_TYPE,
         currentCode: '', //当前小扫描的科室二维码
         // 手动查询标本弹窗model
@@ -319,6 +327,7 @@
         selectRadio: [], //单选框选中的数据，第一项是qrcode，第二项是名称
         gotoFlag: true,
         content: "",
+				taskTypeId:"",
       };
     },
     methods: {
@@ -868,6 +877,37 @@
           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];
+						if(data.taskTypeDTOS.length>0){
+							let isQuestion = data.taskTypeDTOS.find(i=> i.id == this.taskTypeId)
+							if(isQuestion){
+								this.isQuestionModel = true
+							}
+						}
+				  } else {
+				    uni.showToast({
+				      icon: "none",
+				      title: res.msg || "接口获取数据失败！",
+				    });
+				  }
+				});
+			}
     },
     onShow() {
       this.SMFlag = true;
@@ -877,7 +917,7 @@
       if (options.status == 200&&options.scanOrHand === 'hand'&&(options.type === "specimen"||options.type === "specimenPlan")) {
         this.hand_again();
       }
-      console.log(options, "result");
+			console.log(options , "options");
       this.queryObj = options;
       this.isKs = this.queryObj.isKs;
       if (options.infoData && options.infoData != "undefined") {
@@ -885,6 +925,7 @@
       } else if (options.model) {
         this.infoDATA = JSON.parse(options.model);
       }
+			console.log(this.infoDATA , "result");
       if (options.accountObj && options.accountObj != "undefined") {
         this.accountObj = JSON.parse(options.accountObj);
       }
@@ -895,6 +936,7 @@
         this.handover = options.handover;
       }
       this.dataId = options.id;
+			this.taskTypeId = options.taskTypeId
       this.RESData = options.resData;
       this.res["status"] = options.status;
       this.res["msg"] = options.msg;
@@ -904,6 +946,9 @@
       this.res["deptName"] = options.deptName;
       this.res["bedNum"] = options.bedNum;
       this.infoType = options.type1;
+			if(this.infoType == 'trans-dsd-1' && this.infoDATA.status == 200){
+				this.getQuestionnaireSet()
+			}
       if (options.dept) {
         this.DEPT = options.dept;
       }

pages/scanning_code/scanning_code.vue

@@ -1179,7 +1179,7 @@
           uni.hideLoading();
           if (res.status == 200) {
             this.infoDATA = res.data;
-						if(this.infoDATA.gdState.value=='7'){//7已完成
+						if(this.infoDATA.gdState.value=='6' || this.infoDATA.gdState.value=='7'){//7已完成
 							this.getQuestionnaireSet()
 						}
             if(this.infoDATA.taskType.isDigitalHandover==1){
@@ -1205,7 +1205,7 @@
           uni.hideLoading();
           if (res.state == 200) {
             this.infoDATA = res.data;
-						if(this.infoDATA.gdState.value=='7'){//7已完成
+						if(this.infoDATA.gdState.value=='6' || this.infoDATA.gdState.value=='7'){//7已完成
 							this.getQuestionnaireSet()
 						}
             if(this.infoDATA.taskType.isDigitalHandover==1){