Explorar el Código

增加提示信息

LuChongMei hace 2 años
padre
commit
3cfb1496cd

+ 15 - 6
src/views/activityMan/differentbelievers/ReligiousPeopleReportInfo.vue

@@ -145,12 +145,21 @@ export default {
       });
     // 审核通过
     const update = () => {
-      isLoading.value = true;
-      inputForm.value.assessment = 1;
-      new ReligiousPeopleReportService().save(inputForm.value).then((res) => {
-        console.log(res);
-        onClickLeft();
-        isLoading.value = false;
+      xm.showConfirm({
+        title: "审核",
+        message: "确定审核所选项吗?",
+      }).then((result) => {
+        if (result == "ok") {
+          inputForm.value.assessment = 1;
+          new PrivatePartyPointService().save(inputForm.value).then((res) => {
+            if (res.status == 200 || res.statusText == "OK") {
+              xm.showToast({
+                message: "已审核",
+              });
+            }
+            onClickLeft();
+          });
+        }
       });
     };
     return {

+ 20 - 26
src/views/activityMan/differentbelievers/ReligiousPeopleReportList.vue

@@ -132,14 +132,6 @@
         </div>
       </van-swipe-cell>
     </van-list>
-    <van-dialog
-      v-model:show="showDel"
-      show-cancel-button
-      confirmButtonText="删除"
-      message="请确认删除该记录"
-      @confirm="Itemdel"
-    >
-    </van-dialog>
   </div>
 </template>
     
@@ -234,22 +226,26 @@ export default {
       searchVal.value = "";
       searchShow.value = false;
     };
-    // 删除确认
-    let showDel = ref(false);
-    let ids = ref("");
-    const deleteItem = (val) => {
-      showDel.value = true;
-      ids.value = val;
-    };
-    // 删除
-    const Itemdel = () => {
-      new ReligiousPeopleReportService().delete(ids.value).then((res) => {
-        console.log("删除", res);
-        index = 0;
-        loading.value = true;
-        list.value = [];
-        readList.value = [];
-        onLoad();
+   // 删除
+   const deleteItem = (val) => {
+      xm.showConfirm({
+        title: "删除确认",
+        message: "确认删除该记录",
+      }).then((result) => {
+        if (result == "ok") {
+          new ReligiousPeopleReportService().delete(val).then((res) => {
+            if (res.status == 200 || res.statusText == "OK") {
+              xm.showToast({
+                message: res.data,
+              });
+            }
+            index = 0;
+            loading.value = true;
+            list.value = [];
+            readList.value = [];
+            onLoad();
+          });
+        }
       });
     };
     let router = useRouter();
@@ -286,9 +282,7 @@ export default {
       onClickRight,
       updateItem,
       goInfo,
-      showDel,
       deleteItem,
-      Itemdel,
     };
   },
 };

+ 5 - 2
src/views/activityMan/differentbelievers/ReligiousPeopleReportView.vue

@@ -196,9 +196,12 @@ export default {
     const submit = () => {
       isLoading.value = true;
       new ReligiousPeopleReportService().save(inputForm.value).then((res) => {
-        console.log("提交", res);
+        if (res.status == 200 || res.statusText == "OK") {
+          xm.showToast({
+            message: res.data,
+          });
+        }
         onClickLeft();
-        isLoading.value = false;
       });
     };
     return {

+ 17 - 11
src/views/activityMan/placeactivity/placeActivityInfo.vue

@@ -194,7 +194,7 @@ import { useRoute } from "vue-router";
 import $base from "@/utils/config";
 // 富文本编辑器
 import WangEditor from "@/components/editor/WangEditor";
-import vant from "vant";
+
 export default {
   components: { WangEditor },
   setup() {
@@ -275,16 +275,22 @@ export default {
     };
     // 审核通过
     const update = () => {
-      isLoading.value = true;
-      placeActivity.value.assessment = 1;
-      console.log("数据", showSuccessToast);
-      showSuccessToast("res");
-      // new placeActivityServer().save(placeActivity.value).then((res) => {
-
-      //   Toast.success(res);
-      //   // onClickLeft();
-      //   isLoading.value = false;
-      // });
+      xm.showConfirm({
+        title: "审核",
+        message: "确定审核所选项吗?",
+      }).then((result) => {
+        if (result == "ok") {
+          placeActivity.value.assessment = 1;
+          new placeActivityServer().save(placeActivity.value).then((res) => {
+            if (res.status == 200 || res.statusText == "OK") {
+              xm.showToast({
+                message: "已审核",
+              });
+            }
+            onClickLeft();
+          });
+        }
+      });
     };
     return {
       onClickLeft,

+ 21 - 26
src/views/activityMan/placeactivity/placeActivityList.vue

@@ -139,19 +139,11 @@
         </div>
       </van-swipe-cell>
     </van-list>
-    <van-dialog
-      v-model:show="showDel"
-      show-cancel-button
-      confirmButtonText="删除"
-      message="请确认删除该记录"
-      @confirm="Itemdel"
-    >
-    </van-dialog>
   </div>
 </template>
 
 <script>
-import { reactive, ref } from "vue";
+import { ref } from "vue";
 import placeActivityServer from "@/api/placeActivity/placeActivityServer";
 import { useRouter } from "vue-router";
 export default {
@@ -243,22 +235,26 @@ export default {
       searchVal.value = "";
       searchShow.value = false;
     };
-    // 删除确认
-    let showDel = ref(false);
-    let ids = ref("");
-    const deleteItem = (val) => {
-      showDel.value = true;
-      ids.value = val;
-    };
     // 删除
-    const Itemdel = () => {
-      new placeActivityServer().delete(ids.value).then((res) => {
-        console.log("删除", res);
-        index = 0;
-        loading.value = true;
-        list.value = [];
-        readList.value = [];
-        onLoad();
+    const deleteItem = (val) => {
+      xm.showConfirm({
+        title: "删除确认",
+        message: "确认删除该记录",
+      }).then((result) => {
+        if (result == "ok") {
+          new placeActivityServer().delete(val).then((res) => {
+            if (res.status == 200 || res.statusText == "OK") {
+              xm.showToast({
+                message: res.data,
+              });
+            }
+            index = 0;
+            loading.value = true;
+            list.value = [];
+            readList.value = [];
+            onLoad();
+          });
+        }
       });
     };
     // 修改跳转
@@ -295,8 +291,7 @@ export default {
       deleteItem,
       updateItem,
       goInfo,
-      showDel,
-      Itemdel,
+      deleteItem,
     };
   },
 };

+ 18 - 11
src/views/activityMan/placeactivity/placeActivityView.vue

@@ -386,24 +386,31 @@ export default {
       new tools()
         .uploadFile(file, `reporting/reportingActivities`)
         .then(({ data }) => {
-          placeActivity.value.safetyPlan = data.url;
-          fileList.value.push(data);
-          fileList.value[0].url = `${$base}` + fileList.value[0].url;
-          fileList.value[0].name = decodeURIComponent(
-            fileList.value[0].url.substring(
-              fileList.value[0].url.lastIndexOf("/") + 1
-            )
-          );
+          if (res.status == 200 || res.statusText == "OK") {
+            xm.showToast({
+              message: "上传成功",
+            });
+            placeActivity.value.safetyPlan = data.url;
+            fileList.value.push(data);
+            fileList.value[0].url = `${$base}` + fileList.value[0].url;
+            fileList.value[0].name = decodeURIComponent(
+              fileList.value[0].url.substring(
+                fileList.value[0].url.lastIndexOf("/") + 1
+              )
+            );
+          }
         });
-      console.log("上传文件", placeActivity.value.safetyPlan);
     };
     // 提交数据
     const submit = () => {
       isLoading.value = true;
       new placeActivityServer().save(placeActivity.value).then((res) => {
-        console.log("提交", res);
+        if (res.status == 200 || res.statusText == "OK") {
+          xm.showToast({
+            message: res.data,
+          });
+        }
         onClickLeft();
-        isLoading.value = false;
       });
     };
     return {

+ 16 - 6
src/views/activityMan/selfMeetingReport/selfMeetingInfo.vue

@@ -82,6 +82,7 @@
       >审核</van-button
     >
   </div>
+  <!-- 富文本编辑器 -->
   <van-popup v-model:show="showReport"
     ><wang-editor ref="contentEditor" v-model="inputForm.content" />
   </van-popup>
@@ -149,12 +150,21 @@ export default {
     };
     // 审核通过
     const update = () => {
-      isLoading.value = true;
-      inputForm.value.assessment = 1;
-      new PrivatePartyPointService().save(inputForm.value).then((res) => {
-        console.log(res);
-        onClickLeft();
-        isLoading.value = false;
+      xm.showConfirm({
+        title: "审核",
+        message: "确定审核所选项吗?",
+      }).then((result) => {
+        if (result == "ok") {
+          inputForm.value.assessment = 1;
+          new PrivatePartyPointService().save(inputForm.value).then((res) => {
+            if (res.status == 200 || res.statusText == "OK") {
+              xm.showToast({
+                message: "已审核",
+              });
+            }
+            onClickLeft();
+          });
+        }
       });
     };
     return {

+ 20 - 26
src/views/activityMan/selfMeetingReport/selfMeetingList.vue

@@ -146,14 +146,6 @@
         </div>
       </van-swipe-cell>
     </van-list>
-    <van-dialog
-      v-model:show="showDel"
-      show-cancel-button
-      confirmButtonText="删除"
-      message="请确认删除该记录"
-      @confirm="Itemdel"
-    >
-    </van-dialog>
   </div>
 </template>
 
@@ -162,7 +154,7 @@ import { ref } from "vue";
 import PrivatePartyPointService from "@/api/privateparty/PrivatePartyPointService";
 import { useRouter } from "vue-router";
 export default {
-  name: "placeActivityList",
+  name: "selfMeetingList",
   setup() {
     const onClickLeft = () => {
       history.back();
@@ -248,22 +240,26 @@ export default {
       searchVal.value = "";
       searchShow.value = false;
     };
-    // 删除确认
-    let showDel = ref(false);
-    let ids = ref("");
-    const deleteItem = (val) => {
-      showDel.value = true;
-      ids.value = val;
-    };
     // 删除
-    const Itemdel = () => {
-      new PrivatePartyPointService().delete(ids.value).then((res) => {
-        console.log("删除", res);
-        index = 0;
-        loading.value = true;
-        list.value = [];
-        readList.value = [];
-        onLoad();
+    const deleteItem = (val) => {
+      xm.showConfirm({
+        title: "删除确认",
+        message: "确认删除该记录",
+      }).then((result) => {
+        if (result == "ok") {
+          new PrivatePartyPointService().delete(val).then((res) => {
+            if (res.status == 200 || res.statusText == "OK") {
+              xm.showToast({
+                message: res.data,
+              });
+            }
+            index = 0;
+            loading.value = true;
+            list.value = [];
+            readList.value = [];
+            onLoad();
+          });
+        }
       });
     };
     let router = useRouter();
@@ -300,9 +296,7 @@ export default {
       onClickRight,
       updateItem,
       goInfo,
-      showDel,
       deleteItem,
-      Itemdel,
     };
   },
 };

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

@@ -233,9 +233,12 @@ export default {
     const submit = () => {
       isLoading.value = true;
       new PrivatePartyPointService().save(inputForm.value).then((res) => {
-        console.log(res);
+        if (res.status == 200 || res.statusText == "OK") {
+          xm.showToast({
+            message: res.data,
+          });
+        }
         onClickLeft();
-        isLoading.value = false;
       });
     };
     return {

+ 1 - 1
src/views/tab_a/tabAll.vue

@@ -96,7 +96,7 @@ import toBeDone from '@/api/toBeDone/toBeDone';
 
 		created(){
 			let id=this.$route.query.id;
-			// window.xm.setNavigationBarTitle({ title: '智慧“和顺”'})
+			window.xm.setNavigationBarTitle({ title: '智慧“和顺”'})
 			this.TokenLogin2();
 			//this.dataNumber();
 		},