Merge branch 'master' of http://123.57.226.179:8080/yin_yu820/HS_MZAP

src/views/activityMan/nonReligiousInformation/nonReligiousInformationView.vue

@@ -208,6 +208,7 @@ import UserManage from "@/api/user/UserManage";
 import { useRoute } from "vue-router";
 // 富文本编辑器
 import WangEditor from "@/components/editor/WangEditor";
+import { formatDate, formatTime } from "@/utils/datatime";
 // 图片路径
 import $base from "@/utils/config";
 export default {
@@ -347,8 +348,8 @@ export default {
 
     // 获取活动时间
     let showAct = ref(false);
-    let currentDate = ref(["" + new Date().getFullYear(), "01", "01"]);
-    let currentTime = ref(["00", "00", "00"]);
+    let currentDate = ref(formatDate(new Date()));
+    let currentTime = ref(formatTime(new Date()));
     const columnsType = ["hour", "minute", "second"];
     const getTime = () => {
       showAct.value = false;

src/views/activityMan/religiousConference/religiousConferenceView.vue

@@ -156,6 +156,7 @@ import tools from "@/api/sys/tools";
 import religiousConferenceService from "@/api/religiousConference/religiousConferenceService";
 import UserManage from "@/api/user/UserManage";
 import { useRoute } from "vue-router";
+import { formatDate, formatTime } from "@/utils/datatime";
 // 富文本编辑器
 import WangEditor from "@/components/editor/WangEditor";
 export default {
@@ -219,8 +220,8 @@ export default {
     });
     // 获取活动时间
     let showAct = ref(false);
-    let currentDate = ref(["" + new Date().getFullYear(), "01", "01"]);
-    let currentTime = ref(["00", "00", "00"]);
+    let currentDate = ref(formatDate(new Date()));
+    let currentTime = ref(formatTime(new Date()));
     const columnsType = ["hour", "minute", "second"];
     const getTime = () => {
       showAct.value = false;

src/views/activityMan/securityFacilitiesErr/securityFacilitiesErrView.vue

@@ -24,13 +24,12 @@
           @click="showPlace = true"
         />
         <van-popup v-model:show="showPlace" round position="bottom">
-          <van-picker
-            title="场所选择"
-            :columns="places"
-            :columns-field-names="customFieldName"
-            @cancel="showPlace = false"
-            @confirm="getPlace"
-          />
+			
+			<van-search placeholder="请输入场所名称" shape="round" input-align="center" v-model="interSearch" @search="onSearch"
+			  @cancel="onCancel" />
+			<van-picker title="场所选择" :columns="places" :columns-field-names="customFieldName" @cancel="showPlace = false"
+			  @confirm="getPlace" />
+
         </van-popup>
       </van-cell-group>
 
@@ -233,18 +232,40 @@ export default {
 
     // 场所名称
     let places = ref([]);
+    // 场所搜索
+    let interSearch = ref("");
+    const onCancel = () => {
+      interSearch.value = "";
+      places.value = [];
+      placelist();
+    };
+    const onSearch = () => {
+      places.value = [];
+      new tools()
+        .placeList({
+          current: 1,
+          size: 10000,
+          name: interSearch.value
+        })
+        .then(({ records }) => {
+          places.value.push(...records);
+        });
+    };
     const customFieldName = {
       text: "name",
       value: "id",
     };
-    new tools()
-      .placeList({
-        current: 1,
-        size: 10000,
-      })
-      .then(({ records }) => {
-        places.value.push(...records);
-      });
+    const placelist = () => {
+      new tools()
+        .placeList({
+          current: 1,
+          size: 10000,
+        })
+        .then(({ records }) => {
+          places.value.push(...records);
+        });
+    }
+    placelist();
     let showPlace = ref(false);
     const getPlace = ({ selectedOptions }) => {
       if(selectedOptions[0]!=undefined&&selectedOptions[0]!=null){ 
@@ -422,6 +443,9 @@ export default {
       customFieldName,
       showPlace,
       places,
+      interSearch,
+      onSearch,
+      onCancel,
       getPlace,
       //设施类型选择
       showLx,

src/views/activityMan/siteInspection/siteInspectionView.vue

@@ -24,13 +24,12 @@
           @click="showPlace = true"
         />
         <van-popup v-model:show="showPlace" round position="bottom">
-          <van-picker
-            title="场所选择"
-            :columns="places"
-            :columns-field-names="customFieldName"
-            @cancel="showPlace = false"
-            @confirm="getPlace"
-          />
+			
+			<van-search placeholder="请输入场所名称" shape="round" input-align="center" v-model="interSearch" @search="onSearch"
+			  @cancel="onCancel" />
+			<van-picker title="场所选择" :columns="places" :columns-field-names="customFieldName" @cancel="showPlace = false"
+			  @confirm="getPlace" />
+			          
         </van-popup>
       </van-cell-group>
 
@@ -66,7 +65,7 @@
           right-icon="location"
         />
       </van-cell-group> -->
-	  
+
 	  <van-cell-group>
 	    <van-field v-model="siteInspection.placeDel" center label="详细地址:" placeholder="请填写具体地址" input-align="right">
 	      <template #right-icon>
@@ -74,7 +73,7 @@
 	      </template>
 	    </van-field>
 	  </van-cell-group>
-	  
+
       <van-cell-group>
         <van-field
           v-model="siteInspection.supervisionTime"
@@ -99,9 +98,9 @@
           </van-picker-group>
         </van-popup>
       </van-cell-group>
-	  
+
 	  <van-cell-group>
-	    
+
 	    <van-field
 	      v-model="siteInspection.assessmentName"
 	      center
@@ -174,6 +173,7 @@ import personList from "../personList.vue";
 import siteInspectionService from "@/api/siteInspection/siteInspectionService";
 import { useRoute } from "vue-router";
 import tools from "@/api/sys/tools";
+import { formatDate, formatTime } from "@/utils/datatime";
 // 图片路径
 import $base from "@/utils/config";
 export default {
@@ -205,8 +205,8 @@ export default {
     onMounted(() => {
       if (route.query.id) {
         new siteInspectionService().queryById(route.query.id).then((data) => {
-          siteInspection.value = data;    
-          //附件处理      
+          siteInspection.value = data;
+          //附件处理
           siteInspection.value.enclosure.split("|").forEach((item) => {
             if (item.trim().length > 0) {
               fileList.value.push({
@@ -228,32 +228,55 @@ export default {
       }
     });
 
-    // 场所名称
+	// 场所名称
     let places = ref([]);
+    // 场所搜索
+    let interSearch = ref("");
+    const onCancel = () => {
+      interSearch.value = "";
+      places.value = [];
+      placelist();
+    };
+    const onSearch = () => {
+      places.value = [];
+      new tools()
+        .placeList({
+          current: 1,
+          size: 10000,
+          name: interSearch.value
+        })
+        .then(({ records }) => {
+          places.value.push(...records);
+        });
+    };
     const customFieldName = {
       text: "name",
       value: "id",
     };
-    new tools()
-      .placeList({
-        current: 1,
-        size: 10000,
-      })
-      .then(({ records }) => {
-        places.value.push(...records);
-      });
+    const placelist = () => {
+      new tools()
+        .placeList({
+          current: 1,
+          size: 10000,
+        })
+        .then(({ records }) => {
+          places.value.push(...records);
+        });
+    }
+    placelist();
     let showPlace = ref(false);
     const getPlace = ({ selectedOptions }) => {
-      if(selectedOptions[0]!=undefined&&selectedOptions[0]!=null){ 
+      if(selectedOptions[0]!=undefined&&selectedOptions[0]!=null){
         showPlace.value = false;
         siteInspection.value.siteName = selectedOptions[0];
-        siteInspection.value.place = selectedOptions[0].placeSelectName
+        siteInspection.value.place = selectedOptions[0].placeSelectName;
+		siteInspection.value.placeDel = selectedOptions[0].place;
       }
     };
     // 获取督查时间
     let showAct = ref(false);
-    let currentDate = ref(["" + new Date().getFullYear(), "01", "01"]);
-    let currentTime = ref(["00", "00"]);
+    let currentDate = ref(formatDate(new Date()));
+    let currentTime = ref(formatTime(new Date()));
     const columnsType = ['hour', 'minute', 'second'];
     const getTime = () => {
       showAct.value = false;
@@ -281,19 +304,19 @@ export default {
     });
     // 全部选项选择完毕后，会触发 finish 事件
     const onFinish = ({ selectedOptions }) => {
-      if(selectedOptions[0]!=undefined&&selectedOptions[0]!=null){ 
+      if(selectedOptions[0]!=undefined&&selectedOptions[0]!=null){
         showArea.value = false;
         siteInspection.value.place = selectedOptions
           .map((option) => option.name)
           .join("/");
       }
     };
-	
+
 	//选择排查结果
 	let showLx = ref(false);
 	const facilityTypes = [{text:"正常",value:"1"},{text:"异常",value:"2"}];
-	const getfacilityType= ({ selectedOptions }) => {     
-	  if(selectedOptions[0]!=undefined&&selectedOptions[0]!=null){  
+	const getfacilityType= ({ selectedOptions }) => {
+	  if(selectedOptions[0]!=undefined&&selectedOptions[0]!=null){
 	    siteInspection.value.assessment = selectedOptions[0].value;
 	    siteInspection.value.assessmentName = selectedOptions[0].text;
 	    // getVideoAudioList();
@@ -301,7 +324,7 @@ export default {
 	    showLx.value = false;
 	  }
 	};
-	
+
     // 文件上传
     let fileList = ref([]);
     let fileupList = ref([]);
@@ -334,7 +357,7 @@ export default {
     //         )
     //       );
 
-    //       //data.url = `${$base}` + data.url;    
+    //       //data.url = `${$base}` + data.url;
     //       fileupList.value.push(data);
 
     //     });
@@ -359,23 +382,23 @@ export default {
     //   //删除文件操作
     //   for (let index = 0; index < fileList.value.length; index++) {
     //     if(file.file==fileList.value[index].file){
-    //       let delurl=fileupList.value[index].url;                   
+    //       let delurl=fileupList.value[index].url;
     //       new tools()
     //         .uploadFiledelete("", delurl)
     //         .then(({ data }) => {
     //       });
     //       fileupList.value.splice(index,1);
-    //       fileList.value.splice(index,1); 
-    //     }        
-    //   }      
+    //       fileList.value.splice(index,1);
+    //     }
+    //   }
     // };
-    
+
 	const getLocation = () => {
 	  xm.getLocation().then(data => {
 	    siteInspection.value.placeDel = data.POIName;
 	  })
 	}
-	
+
     // 提交数据
     const submit = () => {
       //添加保存前判断
@@ -397,7 +420,7 @@ export default {
         });
 
       }
-      
+
     };
     return {
       // 导航栏颜色
@@ -407,6 +430,9 @@ export default {
       customFieldName,
       showPlace,
       places,
+	  interSearch,
+	  onSearch,
+	  onCancel,
       getPlace,
       // 时间
       showAct,
@@ -422,12 +448,12 @@ export default {
       options,
       onFinish,
       cascaderValue,
-	  
+
 	  //排查结果选择
 	  showLx,
 	  facilityTypes,
 	  getfacilityType,
-	  
+
 	  getLocation,
       // 文件上传
       chooseImg,