From d014cf2e0527486f3a244be0e605189934bc4f6b Mon Sep 17 00:00:00 2001
From: kylin L <452061493@qq.com>
Date: Tue, 4 Jun 2024 18:15:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=85=E5=A1=AB=E9=80=89=E9=A1=B9=E5=85=A8?=
 =?UTF-8?q?=E9=83=A8=E5=81=9A=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/enforce/enforcementPlanAdd.vue | 18 ++----------------
 src/views/enterprise/complaint.vue       | 22 +++++++++++++++++++++-
 src/views/enterprise/complaintNoScan.vue | 16 +++++++++++++++-
 3 files changed, 38 insertions(+), 18 deletions(-)

diff --git a/src/views/enforce/enforcementPlanAdd.vue b/src/views/enforce/enforcementPlanAdd.vue
index 111250c..a7fd82c 100644
--- a/src/views/enforce/enforcementPlanAdd.vue
+++ b/src/views/enforce/enforcementPlanAdd.vue
@@ -11,7 +11,7 @@
         </div>
         <!-- 中间 -->
         <div class="warp_body">
-            <van-form @failed="onFailed">
+            <van-form @failed="onFailed" @submit="submit">
                 <van-cell-group>
                     <van-field
                             v-model="submitData.planYear"
@@ -91,7 +91,7 @@
                     </div>
                 </van-cell-group>
                 <van-action-bar>
-                    <van-button round block type="info" native-type="submit" @click="submit123">提交</van-button>
+                    <van-button round block type="info" native-type="submit">提交</van-button>
                 </van-action-bar>
             </van-form>
         </div>
@@ -158,20 +158,6 @@
         router.go(-1);
     };
 
-    const submit123 = () => {
-        addEnforcementInspectionProgram(submitData, success => {
-            console.log(success)
-            //跳转企业二维码地址
-            if (success.success) {
-                console.log("保存成功");
-                showSuccessToast('保存成功');
-                goBack();
-            }
-        }, error => {
-            console.log("保存失败")
-        })
-    }
-
     const submit = () => {
         showConfirmDialog({
             title: '公布执法计划',
diff --git a/src/views/enterprise/complaint.vue b/src/views/enterprise/complaint.vue
index 983ea54..d25e0a4 100644
--- a/src/views/enterprise/complaint.vue
+++ b/src/views/enterprise/complaint.vue
@@ -12,6 +12,7 @@
         <!-- 中间 -->
         <div class="warp_body">
             <span class="rigbtn" @click="toNoScanView">入企不扫码投诉</span>
+            <van-form @failed="onFailed" @submit="submit">
             <van-cell-group>
                 <view v-if="data.isSelect=='true'">
                     <van-field
@@ -19,6 +20,8 @@
                             label="投诉案件"
                             placeholder="必填 请选择"
                             readonly
+                            required
+                            :rules="[{ required: true, message: '请选择投诉案件' }]"
                             clickable
                             is-link
                             @click="showPopup"
@@ -30,6 +33,8 @@
                             label="投诉案件"
                             placeholder="必填 请选择"
                             readonly
+                            required
+                            :rules="[{ required: true, message: '请选择投诉案件' }]"
                             clickable
                             is-link
                     />
@@ -63,6 +68,8 @@
                         type="textarea"
                         maxlength="300"
                         placeholder="请输入"
+                        required
+                        :rules="[{ required: true, message: '请输入诉求内容' }]"
                         show-word-limit
                 />
                 <van-divider class="divdsty"/>
@@ -92,6 +99,8 @@
                         label="涉事地址"
                         type="textarea"
                         placeholder="请填写详细地址"
+                        required
+                        :rules="[{ required: true, message: '请填写详细地址' }]"
                         show-word-limit
                 />
                 <van-divider class="divdsty"/>
@@ -100,11 +109,15 @@
                         v-model="submitData.linkman"
                         label="联系人"
                         placeholder="必填 联系人"
+                        required
+                        :rules="[{ required: true, message: '请填写联系人' }]"
                 />
                 <van-field
                         v-model="submitData.linkmanTel"
                         label="联系方式"
                         placeholder="必填 联系方式"
+                        required
+                        :rules="[{ validator, message: '请输入正确内容' }]"
                 />
                 <div class="agree-box">
                     <span class="remsty">是否授权</span>
@@ -113,8 +126,10 @@
                 </div>
             </van-cell-group>
             <van-action-bar>
-                <van-action-bar-button color="#1367fe" text="提交" @click="submit"/>
+<!--                <van-action-bar-button color="#1367fe" text="提交" @click="submit"/>-->
+                <van-button round block type="info" native-type="submit">提交</van-button>
             </van-action-bar>
+            </van-form>
         </div>
     </div>
 </template>
@@ -176,6 +191,11 @@
         router.go(-1);
     };
 
+    const validator = (val) => /^1[34578]\d{9}$/.test(val);
+
+    const onFailed = (errorInfo) => {
+        console.log('failed', errorInfo);
+    };
 
     const submit = () => {
         // console.log(submitData);
diff --git a/src/views/enterprise/complaintNoScan.vue b/src/views/enterprise/complaintNoScan.vue
index 8b18ab0..40fadc8 100644
--- a/src/views/enterprise/complaintNoScan.vue
+++ b/src/views/enterprise/complaintNoScan.vue
@@ -11,6 +11,7 @@
 		</div>
 		<!-- 中间 -->
 		<div class="warp_body">
+            <van-form @failed="onFailed" @submit="submit">
 			<van-cell-group>
         <!-- <van-field
           v-model="submitData.lawEnforcementIncident"
@@ -49,6 +50,8 @@
           type="textarea"
           maxlength="300"
           placeholder="请输入描述"
+          required
+          :rules="[{ required: true, message: '请输入描述' }]"
           show-word-limit
         />
         <van-divider class="divdsty" />
@@ -69,11 +72,15 @@
           v-model="submitData.linkman"
           label="联系人"
           placeholder="必填 联系人"
+          required
+          :rules="[{ required: true, message: '请填写联系人' }]"
         />
         <van-field
           v-model="submitData.linkmanTel"
           label="联系方式"
           placeholder="必填 联系方式"
+          required
+          :rules="[{ validator, message: '请输入正确内容' }]"
         />
         <div class="agree-box">
             <span class="remsty">是否授权</span>
@@ -82,8 +89,10 @@
         </div>
       </van-cell-group>
       <van-action-bar>
-        <van-action-bar-button color="#1367fe" text="提交"  @click="submit" />
+<!--        <van-action-bar-button color="#1367fe" text="提交"  @click="submit" />-->
+          <van-button round block type="info" native-type="submit">提交</van-button>
       </van-action-bar>
+            </van-form>
 		</div>
 	</div>
 </template>
@@ -144,6 +153,11 @@ const goBack = () => {
 	router.go(-1);
 };
 
+const validator = (val) => /^1[34578]\d{9}$/.test(val);
+
+const onFailed = (errorInfo) => {
+    console.log('failed', errorInfo);
+};
 
 const submit = () =>{
   // console.log(submitData);