添加场所外景字段以及人员新增规则约束

src/views/placeManage/placePerson/placePersonAdd.vue

@@ -51,7 +51,7 @@
         />
       </van-cell-group>
       <van-cell-group>
-        <van-field name="uploader" label="工作照片:" >
+        <van-field name="uploader" label="个人照片:" >
           <template #input>
             <van-uploader readonly v-model="fileList" :max-count="1" accept="" :preview-full-image="false"
               :before-delete="deleteRead" @click-upload="chooseImg">

src/views/placeManage/placePerson/placePersoninfo.vue

@@ -68,7 +68,7 @@
         </van-col>
         <van-col span="8">
           <van-cell-group>
-            <van-field name="uploader" label-align="top" label="工作照片:">
+            <van-field name="uploader" label-align="top" label="个人照片:">
               <template #input>
                 <van-uploader
                   readonly
@@ -985,30 +985,6 @@ export default {
     //人员类型
     const personnalType = ref("");
     const checked2 = ref([]);
-    // const persontype = [
-    //   { text: "宗教从业人员", value: "1" },
-    //   { text: "民族场所从业人员", value: "2" },
-    //   { text: "教职人员", value: "3" },
-    //   { text: "固定信徒", value: "4" },
-    //   { text: "场所居住人员", value: "5" },
-    //   { text: "境外人员", value: "6" },
-    //   { text: "非本市人员", value: "7" },
-    //   { text: "非本教人员", value: "8" },
-    //   { text: "临时人员", value: "9" },
-    //   { text: "异常人员", value: "10" },
-    //   { text: "邪教人员", value: "12" },
-    //   { text: "管理人员", value: "13" },
-    //   { text: "全能神离家人员", value: "14" },
-    //   { text: "全能神骨干人员", value: "15" },
-    //   { text: "网络运营人员", value: "16" },
-    //   { text: "涉政有害活动人员", value: "17" },
-    //   { text: "境内外记者", value: "18" },
-    //   { text: "境外法轮功骨干人员", value: "19" },
-    //   { text: "其他邪教骨干人员", value: "20" },
-    //   { text: "心灵法门骨干人员", value: "21" },
-    //   { text: "“精神控制”有害培训骨干人员", value: "22" },
-    //   { text: "重点人员", value: "23" },
-    // ];
     const showZW = ref("");
     const checkboxRefs = ref([]);
     let hs_persontype = ref(false);

src/views/placeManage/placeRegister/placeRegisterInfo.vue

@@ -11,7 +11,8 @@
       <img src="../../../../public/loginbg/banner.jpg" alt="" />
     </div>
     <div class="info" style="height: 500px">
-      <van-tabs v-model:active="active" swipeable>
+      <van-form @submit="onSubmit" show-error :show-error-message="false">
+        <van-tabs v-model:active="active" swipeable>
         <!-- 基础信息 -->
         <van-tab>
           <template #title> <van-icon name="orders-o" />基础信息</template>
@@ -37,12 +38,34 @@
                 </template>
               </van-field>
             </van-cell-group>
+            <van-cell-group>
+            <van-field
+              name="uploader"
+              label-align="top"
+              label-width="8em"
+              label="场所外景照片:"
+            >
+              <template #input>
+                <van-uploader
+                  readonly
+                  v-model="fileList4"
+                  :max-count="5"
+                  accept=""
+                  :preview-full-image="false"
+                  :before-delete="deleteRead4"
+                  @click-upload="chooseImg4"
+                >
+                </van-uploader>
+              </template>
+            </van-field>
+          </van-cell-group>
             <van-cell-group>
               <van-field
                 v-model="dataitem.name"
                 center
                 required
                 clearable
+                :rules="[{ required: true }]"
                 label="场所名称:"
                 input-align="right"
                 placeholder="请输入场所名称"
@@ -53,6 +76,7 @@
                 v-model="religiousType"
                 readonly
                 required
+                :rules="[{ required: true }]"
                 label="宗教类型:"
                 name="validator"
                 placeholder="请选择教别"
@@ -150,6 +174,7 @@
                 center
                 clearable
                 required
+                :rules="[{ required: true }]"
                 label="额定人数:"
                 input-align="right"
                 placeholder="请输入场所额定人数"
@@ -162,6 +187,7 @@
                 readonly
                 clearable
                 required
+                :rules="[{ required: true }]"
                 label="场所类型:"
                 input-align="right"
                 placeholder="请选择场所类型"
@@ -175,6 +201,7 @@
                 v-model="propertyName"
                 readonly
                 required
+                :rules="[{ required: true }]"
                 label="场所性质"
                 placeholder="请选择场所性质"
                 input-align="right"
@@ -315,6 +342,7 @@
                 required
                 clearable
                 readonly
+                :rules="[{ required: true }]"
                 label-width="8em"
                 label="批准设立时间:"
                 input-align="right"
@@ -329,6 +357,7 @@
                 center
                 required
                 clearable
+                :rules="[{ required: true }]"
                 label="登记机关:"
                 input-align="right"
                 placeholder="请输入登记机关"
@@ -341,6 +370,7 @@
                 required
                 readonly
                 clearable
+                :rules="[{ required: true }]"
                 label="登记日期:"
                 right-icon="arrow-down"
                 input-align="right"
@@ -354,6 +384,7 @@
                 center
                 required
                 clearable
+                :rules="[{ required: true }]"
                 label-width="7em"
                 label="主要教职人员:"
                 input-align="right"
@@ -616,8 +647,10 @@
         </van-tab>
       </van-tabs>
       <div class="btn">
-        <van-button type="primary" @click="submit">确认</van-button>
+        <van-button type="primary" native-type="submit">确认</van-button>
       </div>
+      </van-form>
+      
     </div>
     <!-- 宗教类型 -->
     <van-popup v-model:show="hs_religious" round position="bottom">
@@ -1074,6 +1107,43 @@ export default {
         }
       }
     };
+    let fileList4 = ref([]);
+    let fileImg4 = ref([]);
+    const chooseImg4 = () => {
+      xm.chooseFile({
+        count: 1,
+        name: "file",
+        url:
+          $base +
+          `/sys/file/webupload/upload?uploadPath=religioussites/siteinfo/religiousSitesInfo`,
+        headers: {
+          "Content-Type": "multipart/form-data",
+          token: window.localStorage.getItem("MZ_TOKEN"),
+        },
+      }).then((res) => {
+        let data = res[0].data;
+        data.name = decodeURIComponent(
+          data.id.substring(data.url.lastIndexOf("/") + 1)
+        );
+        data.url = $base + data.url;
+        fileImg4.value.push(data);
+        fileList4.value.push(data);
+      });
+    };
+    // 删除文件
+    const deleteRead4 = (file) => {
+      //删除文件操作
+      for (let index = 0; index < fileList4.value.length; index++) {
+        if (file.id == fileList4.value[index].id) {
+          fileList4.value.splice(index, 1);
+          if (fileImg4.value[index]) {
+            let delurl = fileImg4.value[index].url;
+            new tools().uploadFiledelete("", delurl).then(({ data }) => {});
+            fileImg4.value.splice(index, 1);
+          }
+        }
+      }
+    };
     //宗教公安人员选择
     const religiousDeptManaUserName = ref("");
     const securityDeptManaUserName = ref("");
@@ -1322,6 +1392,9 @@ export default {
       dataitem.value.approvalProcedures = fileImg3.value
         .map((option) => option.id)
         .join("|");
+        dataitem.value.plan = fileImg4.value
+        .map((option) => option.id)
+        .join("|");
       new placeRegister().sava(dataitem.value).then((res) => {
         if (res.status == 200) {
           xm.showToast({
@@ -1352,6 +1425,9 @@ export default {
       fileList3,
       chooseImg3,
       deleteRead3,
+      fileList4,
+      chooseImg4,
+      deleteRead4,
       //宗教类型
       religiousType,
       hs_religious,