调整非宗教类信息报送

src/api/secularMessage/secularMessageService.js

@@ -3,10 +3,17 @@ export default class siteInspectionService {
     // 保存
     save(inputForm) {
         return request.post(
-            '/religiousinformation/religiousInformation/save',
+            '/religiousinformationno/religiousInformationNo/save',
             inputForm
         )
     }
+	//原先接口
+	save1(inputForm) {
+	    return request.post(
+	        '/religiousinformation/religiousInformation/save',
+	        inputForm
+	    )
+	}
     keepOnRecord(ids) {
        
         return request.post(
@@ -20,18 +27,37 @@ export default class siteInspectionService {
     }
     queryById(id) {
         return request.get(
-            '/religiousinformation/religiousInformation/queryById', { id: id }
+            '/religiousinformationno/religiousInformationNo/queryById', { id: id }
         )
     };
+	//原先接口
+	queryById1(id) {
+	    return request.get(
+	        '/religiousinformation/religiousInformation/queryById', { id: id }
+	    )
+	};
     list(params) {
         return request.get(
-            `/religiousinformation/religiousInformation/list`,
+            `/religiousinformationno/religiousInformationNo/list`,
             params
         )
     }
+	//原先接口
+	list1(params) {
+	    return request.get(
+	        `/religiousinformation/religiousInformation/list`,
+	        params
+	    )
+	}
     delete(ids) {
         return request.delete(
-            '/religiousinformation/religiousInformation/delete', { ids: ids }
+            '/religiousinformationno/religiousInformationNo/delete', { ids: ids }
         )
     }
+	//原先接口
+	delete1(ids) {
+	    return request.delete(
+	        '/religiousinformation/religiousInformation/delete', { ids: ids }
+	    )
+	}
 }

src/views/activityMan/secularMessage/secularMessageInfo.vue

@@ -16,14 +16,14 @@
     <div class="info">
       <p class="miniTitle">详细信息</p>
       
-      <van-cell-group>
+      <!-- <van-cell-group>
         <van-field
           v-model="info.religiousCategoriesname"
           readonly
           label="宗教类别:"
           input-align="right"
         />
-      </van-cell-group>
+      </van-cell-group> -->
       <van-cell-group>
         <van-field
           v-model="info.siteName.name"
@@ -82,20 +82,8 @@
         </van-field>
       </van-cell-group>
     </div>
-    <!-- <van-button
-      v-if="info.assessment == 1"
-      type="primary"
-      class="btn-sub"
-      @click="update(2)"
-      >排查合格</van-button
-    >
-    <van-button
-      v-if="info.assessment == 1"
-      type="primary"
-      class="btn-sub"
-      @click="update(3)"
-      >排查不合格</van-button
-    > -->
+
+     <van-button v-if="info.assessment == 0" type="primary" class="btn-sub" @click="update">审核</van-button>
   </div>    
 <!-- 富文本编辑器 -->
 <van-popup v-model:show="showReport">
@@ -133,7 +121,7 @@
       onMounted(() => {
         new secularMessageService().queryById(route.query.id).then((data) => {
 
-          data.religiousCategoriesname = getreligiousT(data.religiousCategories);
+          // data.religiousCategoriesname = getreligiousT(data.religiousCategories);
           info.value = data;
 
           
@@ -183,44 +171,30 @@
       });
     };
 
-      // 审核通过
-      const update = (state) => {
-        isLoading.value = true;
-        info.value.assessment = state;
-        // new siteInspectionService().save(info.value).then((res) => {
-
-        //   isLoading.value = false;
-        //   window.xm.showToast({
-        //      message:"排查成功!"+state
-        //   })
-        //   history.back();
-        // });
-
-
-        if(state==2){
-          new secularMessageService().keepOnRecord(info.value.id).then((res) => {
-
-            isLoading.value = false;
-            window.xm.showToast({
-              message:"排查成功!"
-            })
-            history.back();
-          });
-        }else{
-          new secularMessageService().keepOnRecordNO(info.value.id).then((res) => {
-
-            isLoading.value = false;
-            window.xm.showToast({
-              message:"排查成功!"
-            })
-            history.back();
-            });
-        }
-
-        
-
-
-      };
+    
+	  // 审核通过
+	  const update = () => {
+	    xm.showConfirm({
+	      title: "审核",
+	      message: "确定审核所选项吗?",
+	    }).then((result) => {
+	      if (result == "ok") {
+	        info.value.assessment = 1;
+			
+			
+			new secularMessageService().save(info.value).then((res) => {
+				if (res.data == "保存宗教类信息上报成功") {
+					xm.showToast({
+					  message: "已审核",
+					});
+				}
+				onClickLeft();
+			});
+	        
+	      }
+	    });
+	  };
+	  
       return {
         // 导航栏颜色
         selectColor,
@@ -242,12 +216,12 @@
   .van-cell__value .van-field__right-icon .van-icon-location {
     color: #36a7f3 !important;
   }
+  
   .btn-sub {
-    width: 42%;
+    width: 90%;
     border-radius: 20px;
     margin-left: 5%;
     margin-bottom: 40px;
-    margin-top: -100px;
   }
   .van-loading {
     text-align: center;

src/views/activityMan/secularMessage/secularMessageList.vue

@@ -54,7 +54,6 @@
             <div class="list_item" @click="goInfo(item.id)">
               <div class="item-left">
                 <p style="color: #c4c4c4">
-                  {{ item.supervisionTime }}
                 </p>
                 <p style="color: gray">已审核</p>
               </div>
@@ -255,13 +254,13 @@ export default {
         .list({
           current: index + 1,
           size: 10,
-          religiousCategories:"",
           place:"",
           state:"",
           assessment:active.value,
           siteName:{id:searchValId.value}
         })
         .then((res) => {
+
           list.value.push(...res.records) ;
           // 加载状态结束
           loading.value = false;

src/views/activityMan/secularMessage/secularMessageView.vue

@@ -4,8 +4,8 @@
 	<van-loading size="16px" v-show="isLoading">加载中...</van-loading>
 	<div class="main" v-show="!isLoading">
 		<div class="formArea">
-			<!-- <p class="miniTitle">基础信息</p> -->
-			<van-cell-group>
+
+			<!-- <van-cell-group>
 				<van-field v-model="religiousCategories" center readonly label="宗教类别:" placeholder="请选择宗教类别"
 					input-align="right" right-icon="arrow-down" @click="showPlace1 = true" />
 				<van-popup v-model:show="showPlace1" round position="bottom">
@@ -14,7 +14,7 @@
               value: 'value',
             }" @cancel="showPlace1 = false" @confirm="getType" />
 				</van-popup>
-			</van-cell-group>
+			</van-cell-group> -->
 
 			<van-cell-group>
 				<van-field v-model="siteInspection.siteName.name" readonly required center label="场所名称:"
@@ -146,12 +146,19 @@
 			// 根据路由初始化
 			let route = useRoute();
 			onMounted(() => {
+				
+				siteInspection.value.reportingTime = `${currentDate.value.join(
+				  "-"
+				)} ${currentTime.value.join(":")}`;
+				
 				if (route.query.id) {
 					new secularMessageService().queryById(route.query.id).then((data) => {
 						siteInspection.value = data;				
 
 					});
 				}
+				
+				
 			});
 
 			// 场所名称
@@ -338,7 +345,7 @@
 					//保存前附件处理
 					siteInspection.value.enclosure = fileupList.value.map((option) => option.id).join("|");
 					new secularMessageService().save(siteInspection.value).then((res) => {
-						if (res.data == "保存宗教类信息上报成功") {
+						if (res.data == "保存非宗教类信息上报成功") {
 							window.xm.showToast({
 								message: "保存成功!"
 							})

src/views/tab_a/tabAll.vue

@@ -278,19 +278,26 @@ export default {
         window.xm.getToken().then(async function (token) {
           //上线取消注释
           // let token = "test"; //上线注释
+		  
 
           new userSets()
             .TokenLogin({
               token: token,
             })
             .then((res) => {
+
+				
+				that.$store.commit("setPcToken", res.PcToken);
+				that.$store.commit("setUser", res.account);
+				
               new userSets().getMenus().then(( data ) => {
-                that.$store.commit("setPcToken", res.PcToken);
-                that.$store.commit("setUser", res.account);
+			
+                
                 that.$store.commit(
                   "setPermissions",
                   JSON.stringify(data.permissions || "[]")
                 );
+
                 that.getBannerImg(); //获取轮播图
                 that.getSelectColor(); //获取主题颜色
                 that.dataNumber(); //获取待办事项数

vue.config.js

@@ -9,7 +9,7 @@ module.exports = defineConfig({
         proxy: {
             '/api': {
                 target: 'http://2.142.215.98:8010',//生产环境
-                //target: 'http://192.168.139.82:8084',//开发环境
+                //target: 'http://192.168.139.90:8084',//开发环境
                 changeOrigin: true,
                 pathRewrite: {
                     '^/api': '/'