From 1f44e13f5117bae32c920e826343f5c1dd413d64 Mon Sep 17 00:00:00 2001
From: kylin L <452061493@qq.com>
Date: Fri, 9 Aug 2024 09:28:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=20+=20=E6=8A=95?=
 =?UTF-8?q?=E8=AF=89=20+=20=E6=89=A7=E6=B3=95=E4=BA=BA=E5=91=98=E5=BF=85?=
 =?UTF-8?q?=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/administrative/appointment.vue     | 30 +++++++++++++-------
 src/views/administrative/appointmentEdit.vue | 12 ++++++--
 src/views/enforce/scanQrCode.vue             |  8 +++---
 src/views/enforce/sign.vue                   | 14 +++++++--
 4 files changed, 43 insertions(+), 21 deletions(-)

diff --git a/src/views/administrative/appointment.vue b/src/views/administrative/appointment.vue
index 3963cff..03ff3ed 100644
--- a/src/views/administrative/appointment.vue
+++ b/src/views/administrative/appointment.vue
@@ -92,6 +92,8 @@
                 <van-field
                         v-model="submitData.bureauDeptName"
                         readonly
+                        required
+                        :rules="[{ required: true, message: '必填项' }]"
                         label="执法部门"
                 />
                 <van-field
@@ -100,11 +102,13 @@
                         label="执法人员"
                 />
                   <div v-for="(item, index) in data.lawCer" :key="index">
-                      <div class="item-delete" @click.stop="cancelUser(index)"><label>执法人员 {{index+1}}</label> <a>删除</a></div>
+                      <div class="item-delete" v-if="index>0" @click.stop="cancelUser(index)"><label>执法人员 {{index+1}}</label> <a>删除</a></div>
                     <van-field
                                v-model="item.show"
                                label="执法人员"
                                readonly
+                               required
+                               :rules="[{ required: true, message: '必填项' }]"
                                placeholder="请选择"
                                is-link
                                @click="showPopup(index)"
@@ -262,8 +266,8 @@
         overlayShow: false,
         tempDate: null,
         lawCerFlag: 0,
-        // lawCer:[{ text:"", id:"", show:"", num:"" }],
-        lawCer:[],
+        lawCer:[{ text:"", id:"", show:"", num:"" }],
+        // lawCer:[],
     });
     //保存参数
     const submitData = reactive({
@@ -456,10 +460,12 @@
     }
 
     const tmpSave = () => {
-        if (submitData.enterpriseName == ""
-            || submitData.linkMan == ""
-            || submitData.linkTel == ""
-            || submitData.checkTime == "") { return null; }
+        if (submitData.enterpriseName.length<=0
+            || submitData.linkMan.length<=0
+            || submitData.linkTel.length<=0
+            || submitData.checkTime.length<=0
+            || submitData.bureauDeptName.length<=0
+            || data.lawCer[0].id.length<=0) { return null; }
         data.overlayShow = true;    // 遮罩层
         submitData.lawCertificateNum = null;
         submitData.isUnite = 0;
@@ -495,10 +501,12 @@
     }
 
     const submit112 = () => {
-        if (submitData.enterpriseName == ""
-            || submitData.linkMan == ""
-            || submitData.linkTel == ""
-            || submitData.checkTime == "") { return null; }
+        if (submitData.enterpriseName.length<=0
+            || submitData.linkMan.length<=0
+            || submitData.linkTel.length<=0
+            || submitData.checkTime.length<=0
+            || submitData.bureauDeptName.length<=0
+            || data.lawCer[0].id.length<=0) { return null; }
         data.overlayShow = true;    // 遮罩层
         // showSuccessToast('登记成功');
         submitData.lawCertificateNum = null;
diff --git a/src/views/administrative/appointmentEdit.vue b/src/views/administrative/appointmentEdit.vue
index 4908063..8d7abe2 100644
--- a/src/views/administrative/appointmentEdit.vue
+++ b/src/views/administrative/appointmentEdit.vue
@@ -97,11 +97,13 @@
                         label="执法人员"
                 />
                   <div v-for="(item, index) in data.lawCer" :key="index">
-                      <div class="item-delete" @click.stop="cancelUser(index)"><label>执法人员 {{index+1}}</label> <a>删除</a></div>
+                      <div class="item-delete" v-if="index>0" @click.stop="cancelUser(index)"><label>执法人员 {{index+1}}</label> <a>删除</a></div>
                 <van-field
                            v-model="item.show"
                            label="执法人员"
                            readonly
+                           required
+                           :rules="[{ required: true, message: '必填项' }]"
                            placeholder="请选择"
                            is-link
                            @click="showPopup(index)"
@@ -459,7 +461,9 @@
         if (submitData.enterpriseName == ""
             || submitData.linkMan == ""
             || submitData.linkTel == ""
-            || submitData.checkTime == "") { return null; }
+            || submitData.checkTime == ""
+            || submitData.bureauDeptName == ""
+            || data.lawCer[0].id == "") { return null; }
         data.overlayShow = true;    // 遮罩层
         submitData.isUnite = 0;
         if (data.checked) {
@@ -502,7 +506,9 @@
         if (submitData.enterpriseName == ""
             || submitData.linkMan == ""
             || submitData.linkTel == ""
-            || submitData.checkTime == "") { return null; }
+            || submitData.checkTime == ""
+            || submitData.bureauDeptName == ""
+            || data.lawCer[0].id == "") { return null; }
         data.overlayShow = true;    // 遮罩层
         submitData.isUnite = 0;
         if (data.checked) {
diff --git a/src/views/enforce/scanQrCode.vue b/src/views/enforce/scanQrCode.vue
index 66c699c..7cc6563 100644
--- a/src/views/enforce/scanQrCode.vue
+++ b/src/views/enforce/scanQrCode.vue
@@ -52,7 +52,7 @@
 </template>
 
 <script setup name="Home">
-    // import Vconsole from "vconsole";
+    import Vconsole from "vconsole";
     import {showFailToast} from 'vant';
     import {getEnterpriseMerchantAuthorization} from '@/api/Home';
     import {checkIsExists} from '@/api/enterprise';
@@ -136,7 +136,7 @@
                 const scanObj = JSON.parse(res.resultStr);
                 // 判断二维码是否过期, 如果已过期则跳转提示页
                 checkIsState(scanObj.salt, scanObj.codeId, success => {
-                    console.log(success.data)
+                    console.log(success)
                     if (success.data) {
                         router.push({
                             path: "/enterpriseScanPreview",
@@ -146,13 +146,13 @@
                             }
                         })
                     } else {
-                        showFailToast('企业信息不存在，请确认二维码是否正确！');
+                        showFailToast(success.message);
                         router.push({
                             path: "/enforce/scanQrCode",
                         })
                     }
                 }, error => {
-
+                    showFailToast("该二维码不正确");
                 })
                 // router.push({
                 // 	path: "/enterpriseScanPreview",
diff --git a/src/views/enforce/sign.vue b/src/views/enforce/sign.vue
index e2442a0..71dc15a 100644
--- a/src/views/enforce/sign.vue
+++ b/src/views/enforce/sign.vue
@@ -42,11 +42,13 @@
 <!--                      @click="showPopup(index)"-->
 <!--                    />-->
                     <div v-for="(item, index) in data.lawCer" :key="index">
-                        <div class="item-delete" @click.stop="cancelUser(index)"><label>执法人员 {{index+1}}</label> <a>删除</a></div>
+                        <div class="item-delete" v-if="index>0" @click.stop="cancelUser(index)"><label>执法人员 {{index+1}}</label> <a>删除</a></div>
                         <van-field
                                    v-model="item.show"
                                    label="执法人员"
                                    readonly
+                                   required
+                                   :rules="[{ required: true, message: '必填项' }]"
                                    placeholder="请选择"
                                    is-link
                                    @click="showPopup(index)"
@@ -335,8 +337,8 @@ const data = reactive({
     // lawList: [{ text:"", id:"" }],
     lawList: [],
     lawCerFlag: 0,
-    // lawCer:[{ text:"", id:"" }],
-    lawCer:[],
+    lawCer:[{ text:"", id:"" }],
+    // lawCer:[],
     lawFieldShow: false,
     lawField_columns: [],
     lawFieldText:"",
@@ -648,6 +650,9 @@ const dataFillIn = () => {
 }
 
 const tmpSave = () => {
+    if (submitData.lawCertificateNumText.length <=0
+        || submitData.bureauDeptName.length <=0
+        || data.lawCer[0].id.length <=0) { return null; }
     data.overlayShow = true;    // 遮罩层
     submitData.userId = useCommon.userId;
 
@@ -691,6 +696,9 @@ const tmpSave = () => {
 }
 
 const submit = (type) =>{
+    if (submitData.lawCertificateNumText.length <=0
+        || submitData.bureauDeptName.length <=0
+        || data.lawCer[0].id.length <=0) { return null; }
     data.overlayShow = true;    // 遮罩层
     submitData.isSubmit = type;
     submitData.userId = useCommon.userId;