Merge branch 'new' of http://116.204.114.73:3000/ccsens_zhengzhichuan/acupuncture into new

acupuncture-前台/src/views/medicalFile/details.vue

@@ -224,6 +224,7 @@
           <div class="div-title2">
             中医体质辨识
             <span
+              v-if="userInfo.tenantId == '1902202356883206144'"
               @click="getEvaQr"
               class="foem-item-pg"
               :class="{
@@ -232,6 +233,7 @@
               >二维码</span
             >
             <span
+              v-if="userInfo.tenantId == '1902202356883206144'"
               @click="getEvaTb"
               class="foem-item-pg"
               :class="{

acupuncture-前台/src/views/screening/h5eva.vue

@@ -666,24 +666,38 @@ export default {
   },
   methods: {
     // 编辑信息
-    handlePopupVerify() {
-      if (this.popupRadio === 1) {
-        this.form = {
-          ...this.form,
-          ...JSON.parse(JSON.stringify(this.detailList)),
-        };
-        setTimeout(() => {
-          this.open = false;
-        }, 500);
-      } else {
-        this.$router.replace({
-          path: "/screening/h5Result",
-          query: {
-            tenantName: this.tenantName,
-            data: JSON.stringify(this.detailList),
-          },
-        });
+    async handlePopupVerify() {
+      try {
+        if (this.popupRadio === 1) {
+          this.form = {
+            ...this.form,
+            ...JSON.parse(JSON.stringify(this.detailList)),
+          };
+          setTimeout(() => {
+            this.open = false;
+          }, 500);
+        } else {
+          // ------ 提交筛查 ------
+          const submitParams = { param: { detailId: this.detailId } };
+          // 判断对象是否为空 this.detailList
+          if (Object.keys(this.detailList).length !== 0) {
+            submitParams.param.phone = this.detailList["SCWJ-PHONE"];
+            submitParams.param.name = this.detailList["SCWJ-NAME"];
+          }
+          await screenSubmit(submitParams).then((response) => {
+            this.$router.replace({
+              path: "/screening/h5Result",
+              query: {
+                tenantName: this.tenantName,
+                data: JSON.stringify(this.detailList),
+              },
+            });
+            this.open = false;
+          });
+        }
+      } catch (e) {
         this.open = false;
+        this.$message.error("操作失败，请稍后重试！");
       }
     },
     // 通过手机号查询