Ver código fonte

完成了负责模块的接口测试

LuChongMei 2 anos atrás
pai
commit
c3857b1cff

+ 3 - 0
src/api/placeActivity/placeActivityServer.js

@@ -19,4 +19,7 @@ export default class placeActivityServer {
             params
         )
     };
+    queryListLonginId() {
+        return request.get('/reporting/reportingActivities/queryListLonginId')
+    }
 }

+ 6 - 0
src/api/sys/tools.js

@@ -15,5 +15,11 @@ export default class Tools {
             `/sys/file/webupload/upload?uploadPath=${uploadPath}`,
             formData
         )
+    };
+    // 用户查询
+    queryById(id) {
+        return request.get(
+            `/sys/user/queryById`, { id: id }
+        )
     }
 }

+ 0 - 1
src/main.js

@@ -13,7 +13,6 @@ import 'vant/lib/index.css';
 import store from './store';
 
 const app = createApp(App)
-
 app.use(router)
     .use(NavBar)
     .use(Button)

+ 12 - 1
src/views/activityMan/differentbelievers/ReligiousPeopleReportInfo.vue

@@ -23,7 +23,7 @@
       <p>现居地详情:{{ inputForm.currentResidenceDetail }}</p>
       <p>异常行为:{{ inputForm.abnormalBehavior }}</p>
     </div>
-    <van-button type="primary" class="btn-sub">审核</van-button>
+    <van-button type="primary" class="btn-sub" @click="update">审核</van-button>
   </div>
 </template>
       
@@ -67,10 +67,21 @@ export default {
         inputForm.value = data;
         isLoading.value = false;
       });
+    // 审核通过
+    const update = () => {
+      isLoading.value = true;
+      inputForm.value.assessment = 1;
+      new ReligiousPeopleReportService().save(inputForm.value).then((res) => {
+        console.log(res);
+        onClickLeft();
+        isLoading.value = false;
+      });
+    };
     return {
       onClickLeft,
       inputForm,
       isLoading,
+      update,
     };
   },
 };

+ 11 - 3
src/views/activityMan/differentbelievers/ReligiousPeopleReportView.vue

@@ -117,7 +117,7 @@
       </van-cell-group>
     </div>
     <div class="subbtn">
-      <van-button type="primary">提交</van-button>
+      <van-button type="primary" @click="submit">提交</van-button>
       <van-button type="default" hairline>取消</van-button>
     </div>
   </div>
@@ -183,8 +183,15 @@ export default {
         .map((option) => option.text)
         .join("/");
     };
-    // 性别
-    let checked = ref("1");
+    // 提交数据
+    const submit = () => {
+      isLoading.value = true;
+      new ReligiousPeopleReportService().save(inputForm.value).then((res) => {
+        console.log("提交", res);
+        onClickLeft();
+        isLoading.value = false;
+      });
+    };
     return {
       inputForm,
       // 返回
@@ -195,6 +202,7 @@ export default {
       onFinish,
       cascaderValue,
       isLoading,
+      submit,
     };
   },
 };

+ 12 - 1
src/views/activityMan/placeactivity/placeActivityInfo.vue

@@ -25,7 +25,7 @@
       <p>安全预案:<span style="color: #6892ff">活动申请书</span></p>
       <p>主题内容:{{ placeActivity.subjectContent }}</p>
     </div>
-    <van-button type="primary" class="btn-sub">审核</van-button>
+    <van-button type="primary" class="btn-sub" @click="update">审核</van-button>
   </div>
 </template>
   
@@ -85,10 +85,21 @@ export default {
       });
       isLoading.value = false;
     });
+    // 审核通过
+    const update = () => {
+      isLoading.value = true;
+      placeActivity.value.assessment = 1;
+      new placeActivityServer().save(placeActivity.value).then((res) => {
+        console.log(res);
+        onClickLeft();
+        isLoading.value = false;
+      });
+    };
     return {
       onClickLeft,
       placeActivity,
       isLoading,
+      update,
     };
   },
 };

+ 12 - 5
src/views/activityMan/placeactivity/placeActivityView.vue

@@ -102,6 +102,7 @@
         <van-field
           v-model="placeActivity.reporter.name"
           center
+          readonly
           label="报告人:"
           placeholder="请选择报告人"
           input-align="right"
@@ -220,7 +221,7 @@
 </template>
 
 <script>
-import { ref, onMounted, computed } from "vue";
+import { ref, onMounted } from "vue";
 import personList from "../personList.vue";
 import placeActivityServer from "@/api/placeActivity/placeActivityServer";
 import tools from "@/api/sys/tools";
@@ -228,7 +229,7 @@ import UserManage from "@/api/user/UserManage";
 import { useRoute } from "vue-router";
 // 富文本编辑器
 import WangEditor from "@/components/editor/WangEditor";
-import { useStore } from "vuex";
+
 export default {
   components: { personList, WangEditor },
   setup() {
@@ -273,8 +274,12 @@ export default {
     // 富文本编辑器
     const subjectContentEditor = ref(null);
     // 获取当前登录用户
-    const store = useStore();
-    const user = computed(() => store.state.user);
+    const user = new placeActivityServer().queryListLonginId().then((data) => {
+      let id = data + "";
+      new tools().queryById(id).then((res) => {
+        placeActivity.value.reporter = res;
+      });
+    });
     // 根据路由初始化
     let route = useRoute();
     onMounted(() => {
@@ -379,7 +384,6 @@ export default {
     let fileList = ref([]);
     const afterRead = (file) => {
       // 此时可以自行将文件上传至服务器
-      console.log(file);
       new tools()
         .uploadFile(file, `reporting/reportingActivities`)
         .then(({ data }) => {
@@ -390,8 +394,11 @@ export default {
     };
     // 提交数据
     const submit = () => {
+      isLoading.value = true;
       new placeActivityServer().save(placeActivity.value).then((res) => {
         console.log("提交", res);
+        onClickLeft();
+        isLoading.value = false;
       });
     };
     return {

+ 12 - 1
src/views/activityMan/selfMeetingReport/selfMeetingInfo.vue

@@ -21,7 +21,7 @@
       <p>相关人:{{ inputForm.relatedPersons.name }}</p>
       <p>内容:{{ inputForm.content }}</p>
     </div>
-    <van-button type="primary" class="btn-sub">审核</van-button>
+    <van-button type="primary" class="btn-sub" @click="update">审核</van-button>
   </div>
 </template>
     
@@ -70,10 +70,21 @@ export default {
       });
       isLoading.value = false;
     });
+    // 审核通过
+    const update = () => {
+      isLoading.value = true;
+      inputForm.value.assessment = 1;
+      new PrivatePartyPointService().save(inputForm.value).then((res) => {
+        console.log(res);
+        onClickLeft();
+        isLoading.value = false;
+      });
+    };
     return {
       onClickLeft,
       inputForm,
       isLoading,
+      update,
     };
   },
 };

+ 6 - 5
src/views/activityMan/selfMeetingReport/selfMeetingView.vue

@@ -230,12 +230,13 @@ export default {
         .map((option) => option.name)
         .join("/");
     };
-    // // 富文本传值
-    // const change = (val)=>{
-    //   console.log("富文本数据",val);
-    // };
     const submit = () => {
-      console.log("富文本数据", inputForm.value.content);
+      isLoading.value = true;
+      new PrivatePartyPointService().save(inputForm.value).then((res) => {
+        console.log(res);
+        onClickLeft();
+        isLoading.value = false;
+      });
     };
     return {
       isLoading,