Merge branch 'test' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into test

src/js/dai/request.js

@@ -1,87 +1,90 @@
 /*---------------------------------------------------------------
  |                           请求接口封装                           |
  ---------------------------------------------------------------*/
-import axios from 'axios'
-import log from 'dai-js/modules/log'
-import curry from 'dai-js/tools/curry'
+import axios from "axios";
+import message from "dai-js/modules/message/message";
+import curry from "dai-js/tools/curry";
 
 const request = curry(
   (method, url, data = {}, headers = {}, progress = () => {}) => {
     return new Promise((reslove) => {
       let returnIniData = {
-        httpCode: '',
+        httpCode: "",
         data: {},
-        msg: '',
-        code: ''
-      }
+        msg: "",
+        code: "",
+      };
 
       // 添加服务器端URL
       function processUrl(url) {
-        if (url.indexOf('http://') > -1 || url.indexOf('https://') > -1) {
-          return url
+        if (url.indexOf("http://") > -1 || url.indexOf("https://") > -1) {
+          return url;
         }
-        return process.env.VUE_APP_API_SERVER + url
+        return process.env.VUE_APP_API_SERVER + url;
       }
 
-      url = processUrl(url)
+      url = processUrl(url);
 
       const succFn = (res) => {
         // log(`[request成功] ${url}`, data, res);
         let retData = {
           ...returnIniData,
           ...res.data,
-          httpCode: res.statusCode
-        }
+          httpCode: res.statusCode,
+        };
         // if(typeof Vue.$afterRequestHook == 'function'){
         // 	retData = Vue.$afterRequestHook(retData);
         // }
-
-        reslove(retData)
+        if (res.data.code > 8000 && res.data.code < 10000) {
+          message.error(res.data.msg);
         }
 
+        reslove(retData);
+      };
+
       const failFn = (err) => {
         // log(`[request失败] ${url}`, data, err);
 
         reslove(
           Object.assign({}, returnIniData, {
-            httpCode: '9999', //访问出现意外
-            msg: '网络错误'
+            httpCode: "9999", //访问出现意外
+            msg: "网络错误",
           })
-        )
-      }
+        );
+      };
 
-      if (method.toUpperCase() == 'POST') {
+      if (method.toUpperCase() == "POST") {
         axios
           .post(url, data, {
             headers,
-            responseType: 'json'
+            responseType: "json",
             // progress,
             // credentials: false,
           })
           .then(succFn)
-          .catch(failFn)
+          .catch(failFn);
       } else {
         axios
           .get(url, {
             params: data,
             headers,
-            responseType: 'json'
+            responseType: "json",
             // credentials: true,
           })
           .then(succFn)
-          .catch(failFn)
+          .catch(failFn);
       }
-    })
+    });
   }
-)
+);
 
-export const requestGet = request('get')
+export const requestGet = request("get");
 
-export const requestPost = request('post')
+export const requestPost = request("post");
 
 export default {
   install(Vue) {
-    Vue.prototype.$requestGet = requestGet
-    Vue.prototype.$requestPost = requestPost
-  }
-}
+    Vue.prototype.$requestGet = requestGet;
+    Vue.prototype.$requestPost = requestPost;
+  },
+};

src/views/modules/communityService/dqfwzx/cpts/edit.vue

@@ -408,18 +408,31 @@ export default {
         },
       ];
     },
-    handleDelStaff(index) {
+    async handleDelStaff(index) {
       const { matterList } = this.dataForm;
-      let delItem = matterList.splice(index, 1);
+      let list = [...matterList];
+      let delItem = list.splice(index, 1);
       console.log(delItem);
       if (delItem[0].matterId) {
+        if (!confirm("删除后无法恢复，确认删除？"))
+          return console.log("不删了");
+        if (!(await this.delStaff(delItem[0].matterId))) return;
         this.dataForm.delMatterList = [
           ...this.dataForm.delMatterList,
           delItem[0].matterId,
         ];
       }
 
-      this.dataForm.matterList = matterList;
+      this.dataForm.matterList = list;
+    },
+    async delStaff(matterId) {
+      const { data, code, msg } = await requestPost(
+        "/gov/org/icpartyservicecenter/delmatter",
+        {
+          matterId,
+        }
+      );
+      return code === 0;
     },
     // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
     initMap() {

src/views/modules/communityService/dqfwzx/cpts/order.vue

@@ -139,6 +139,7 @@ import { mapGetters } from "vuex";
 import { Loading } from "element-ui"; // 引入Loading服务
 import { requestPost } from "@/js/dai/request";
 import dateFormat from "dai-js/tools/dateFormat";
+import formVltHelper from "dai-js/tools/formVltHelper";
 
 const deepClone = function (arg) {
   if (typeof arg == "object" || typeof arg == "array") {
@@ -295,6 +296,9 @@ export default {
       }
       console.log(list);
       this.timeList = list;
+      this.dataForm.timeId = list
+        .filter((item) => item.selected && item.isAppointment)
+        .map((item) => item.timeId);
       return false;
     },
 
@@ -350,6 +354,12 @@ export default {
           app.util.validateRule(messageObj);
           this.btnDisable = false;
         } else {
+          if (!formVltHelper.userOrMobile(this.dataForm.appointmentPhone)) {
+            return this.$message({
+              type: "error",
+              message: "手机号格式有误",
+            });
+          }
           this.submit();
         }
       });

src/views/modules/communityService/dqfwzx/index.vue

@@ -17,6 +17,13 @@
               :key="'ct' + index"
               v-for="(item, index) in tableData"
             >
+              <div
+                class="item-btn"
+                v-if="currentIndex == index"
+                @click="handleEdit"
+              >
+                修改
+              </div>
               <div class="item-name">{{ item.centerName }}</div>
               <div class="item-prop">
                 <div class="prop-field">社区地址：</div>
@@ -38,11 +45,11 @@
         </div>
 
         <div class="center-right">
-          <div class="operate">
+          <!-- <div class="operate">
             <el-button type="warning" size="small" @click="handleEdit"
               >修改</el-button
             >
-          </div>
+          </div> -->
 
           <div id="centerIndexApp" class="div_map"></div>
 
@@ -192,8 +199,6 @@ export default {
   async mounted() {
     await this.loadAgency();
     await this.getTableData();
-    this.initMap();
-    this.setMap();
   },
   methods: {
     // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
@@ -324,6 +329,7 @@ export default {
     },
 
     async getTableData() {
+      const oldLen = this.tableData.length;
       const url = "/gov/org/icpartyservicecenter/partyservicecenterlist";
       const { data, code, msg } = await requestPost(url, {
         orgId: this.agencyId,
@@ -333,7 +339,12 @@ export default {
         console.log("列表请求成功！！！！！！！！！！！！！！");
 
         this.tableData = data;
-      } else {
+
+        if (data.length > 0 && oldLen == 0) {
+          await nextTick(100);
+          this.initMap();
+          this.setMap();
+        }
       }
     },
 
@@ -367,6 +378,7 @@ export default {
     width: 25%;
     .list {
       .item {
+        position: relative;
         box-sizing: border-box;
         margin-bottom: 10px;
         border: 2px solid #6aa;
@@ -379,6 +391,21 @@ export default {
           background-color: #ffffff;
           box-shadow: 0 0 10px #6aa;
         }
+        .item-btn {
+          position: absolute;
+          top: 5px;
+          right: 5px;
+          font-size: 14px;
+          color: rgb(235, 192, 4);
+          width: 50px;
+          line-height: 30px;
+          text-align: center;
+          cursor: pointer;
+          &:hover {
+            // text-decoration: underline;
+            color: rgb(250, 208, 23);
+          }
+        }
         .item-name {
           font-size: 16px;
           font-weight: bold;

src/views/modules/communityService/shzz/cpts/edit.vue

@@ -345,8 +345,10 @@ export default {
       if (row) {
         this.dataForm = { ...this.dataForm, ...row };
         this.societyId = this.dataForm.societyId;
+        if (row.latitude && row.longitude) {
           map.setCenter(new TMap.LatLng(row.latitude, row.longitude));
         }
+      }
     },
 
     //加载组织

src/views/modules/communityService/shzz/index.vue

@@ -284,31 +284,24 @@ export default {
         url: window.SITE_CONFIG["apiURL"] + "/heart/societyorg/import",
         method: "post",
         data: formData,
-        responseType: "blob",
+        // responseType: "blob",
       })
         .then((res) => {
           this.importLoading = false;
           this.importBtnTitle = "excel导入";
-          let fileName = window.decodeURI(
-            res.headers["content-disposition"].split(";")[1].split("=")[1]
-          );
-          console.log("filename", fileName);
-          let blob = new Blob([res.data], { type: "application/vnd.ms-excel" });
-          var url = window.URL.createObjectURL(blob);
-          var aLink = document.createElement("a");
-          aLink.style.display = "none";
-          aLink.href = url;
-          aLink.setAttribute("download", fileName);
-          document.body.appendChild(aLink);
-          aLink.click();
-          document.body.removeChild(aLink); //下载完成移除元素
-          window.URL.revokeObjectURL(url); //释放掉blob对象
+          console.log("resresresresresresres", res);
+
           this.getTableData();
+          if (res.data.code == 0) {
+            return this.$message.success(res.data.data || '导入成功');
+          } else {
+            return this.$message.error(res.data.msg);
+          }
         })
         .catch((err) => {
           console.log("失败", err);
-          param.onError(); //上传失败的文件会从文件列表中删除
         });
+      this.$refs.upload.clearFiles();
     },
 
     handleSizeChange(val) {

src/views/modules/communityService/sqzzz/cpts/edit.vue

@@ -209,6 +209,7 @@
 import { mapGetters } from "vuex";
 import { Loading } from "element-ui"; // 引入Loading服务
 import { requestPost } from "@/js/dai/request";
+import formVltHelper from "dai-js/tools/formVltHelper";
 
 var map;
 var search;
@@ -389,6 +390,12 @@ export default {
           app.util.validateRule(messageObj);
           this.btnDisable = false;
         } else {
+          if (!formVltHelper.userOrMobile(this.dataForm.principalPhone)) {
+            return this.$message({
+              type: "error",
+              message: "手机号格式有误",
+            });
+          }
           this.submit();
         }
       });

src/views/modules/communityService/sqzzz/index.vue

@@ -252,31 +252,24 @@ export default {
           "/heart/iccommunityselforganization/importcommunityselforganization",
         method: "post",
         data: formData,
-        responseType: "blob",
+        // responseType: "blob",
       })
         .then((res) => {
           this.importLoading = false;
           this.importBtnTitle = "excel导入";
-          let fileName = window.decodeURI(
-            res.headers["content-disposition"].split(";")[1].split("=")[1]
-          );
-          console.log("filename", fileName);
-          let blob = new Blob([res.data], { type: "application/vnd.ms-excel" });
-          var url = window.URL.createObjectURL(blob);
-          var aLink = document.createElement("a");
-          aLink.style.display = "none";
-          aLink.href = url;
-          aLink.setAttribute("download", fileName);
-          document.body.appendChild(aLink);
-          aLink.click();
-          document.body.removeChild(aLink); //下载完成移除元素
-          window.URL.revokeObjectURL(url); //释放掉blob对象
+          console.log("resresresresresresres", res);
+
           this.getTableData();
+          if (res.data.code == 0) {
+            return this.$message.success(res.data.data || '导入成功');
+          } else {
+            return this.$message.error(res.data.msg);
+          }
         })
         .catch((err) => {
           console.log("失败", err);
-          param.onError(); //上传失败的文件会从文件列表中删除
         });
+      this.$refs.upload.clearFiles();
     },
 
     handleSizeChange(val) {

src/views/modules/visual/warning/components/screen-table/index.vue

@@ -23,7 +23,7 @@
             :key="indexs"
             :style="tableContentStyle[indexs]"
           >
-            {{ item }}
+            <span @click="toUserInfo(item)">{{ item }}</span>
             <span
               v-if="indexs + 1 == value.length && item.length > 8"
               class="more"
@@ -31,7 +31,11 @@
               ref="morePop"
             >
               更多>
-              <span class="more-pop" v-if="visiblePopList[index]">
+              <span
+                class="more-pop"
+                @click="toUserInfo(item)"
+                v-if="visiblePopList[index]"
+              >
                 <!-- 李佳琪、刘阳、赵欣、丁一、嘉敏、李岩、何嘉慧
                   李易峰、赵敏、何军、曲树惠 -->
                 {{ item }}
@@ -180,6 +184,10 @@ export default {
   created() {},
 
   methods: {
+    toUserInfo(uid) {
+      // this.$router.push({ path: `/main-shuju/visual-basicinfo-people/${uid}` });
+    },
+
     onClickMorePop(index) {
       this.visiblePopList.forEach((item, indexs) => {
         if (index == indexs) {