Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-work-pc into dev

src/assets/scss/modules/management/list-main.scss

@@ -106,7 +106,12 @@
     }
   }
 
-
+.div-flex{
+  .m-page{
+    display: flex;
+    justify-content: space-between;
+  }
+}
 
 // 弹性盒子
 .f-flex {

src/views/modules/communityParty/regionalParty/activitys.vue

@@ -385,7 +385,7 @@ export default {
 
     //获取服务事项下拉框
     async loadService () {
-      const url = "/heart/serviceitem/dict-list"
+      const url = "/actual/base/serviceitem/dict-list"
 
 
       let params = {

src/views/modules/communityParty/regionalParty/activitysForm.vue

@@ -315,7 +315,7 @@ export default {
 
     //获取服务事项下拉框
     async loadService () {
-      const url = "/heart/serviceitem/dict-list"
+      const url = "/actual/base/serviceitem/dict-list"
 
       let params = {
         type: 'usable'

src/views/modules/communityParty/regionalParty/finishList.vue

@@ -301,8 +301,8 @@ export default {
     async loadTable () {
 
       this.tableLoading = true
-      const url = '/heart/icpartyunitcompletion/list'
+      const url = '/actual/base/icpartyunitcompletion/list'
-      // const url = 'http://yapi.elinkservice.cn/mock/245/heart/icpartyunitcompletion/list'
+      // const url = 'http://yapi.elinkservice.cn/mock/245/actual/base/icpartyunitcompletion/list'
       let params = {
         unitId: this.unitId
       }
@@ -375,9 +375,9 @@ export default {
     },
     async addReview (row, tableIndex) {
 
-      let url = "/heart/icpartyunitcompletion/save"
+      let url = "/actual/base/icpartyunitcompletion/save"
 
-      // let url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunitcompletion/save"
+      // let url = "http://yapi.elinkservice.cn/mock/245/actual/base/icpartyunitcompletion/save"
 
       let params = JSON.parse(JSON.stringify(row))
 
@@ -462,8 +462,8 @@ export default {
 
     async deleteRecord (row, tableIndex) {
 
-      const url = "/heart/icpartyunitcompletion/delete"
+      const url = "/actual/base/icpartyunitcompletion/delete"
-      // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunitcompletion/delete"
+      // const url = "http://yapi.elinkservice.cn/mock/245/actual/base/icpartyunitcompletion/delete"
 
       let params = {
         id: row.id

src/views/modules/communityParty/regionalParty/units.vue

@@ -217,10 +217,10 @@
                         trigger="click">
               <div v-if="scope.row.syncType==='not_sync'"
                    class="table-more-btn">
-                <el-button type="text"
+                <!-- <el-button type="text"
                            class="div-table-button--detail"
                            size="small"
-                           @click="handleSync(scope.row)">同步</el-button>
+                           @click="handleSync(scope.row)">同步</el-button> -->
               </div>
               <div v-if="scope.row.syncType==='sync'"
                    class="table-more-btn">
@@ -412,7 +412,7 @@ export default {
 
     //获取服务事项下拉框
     async loadService () {
-      const url = "/heart/serviceitem/dict-list"
+      const url = "/actual/base/serviceitem/dict-list"
 
 
       let params = {
@@ -451,7 +451,7 @@ export default {
     async loadTable () {
       this.tableLoading = true
 
-      const url = "/heart/icpartyunit/list"
+      const url = "/actual/base/icpartyunit/list"
       // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/list"
       let params = {
         pageSize: this.pageSize,
@@ -544,23 +544,23 @@ export default {
 
     },
 
-    async handleSync (row) {
+    // async handleSync (row) {
 
-      this.$confirm("确认同步到通讯录？", "提示", {
+    //   this.$confirm("确认同步到通讯录？", "提示", {
-        confirmButtonText: "确定",
+    //     confirmButtonText: "确定",
-        cancelButtonText: "取消",
+    //     cancelButtonText: "取消",
-        type: "warning"
+    //     type: "warning"
-      })
+    //   })
-        .then(() => {
+    //     .then(() => {
-          this.syncUnit(row)
+    //       this.syncUnit(row)
-        })
+    //     })
-        .catch(err => {
+    //     .catch(err => {
-          if (err == "cancel") {
+    //       if (err == "cancel") {
 
-          }
+    //       }
 
-        });
+    //     });
-    },
+    // },
     async handleNoSync (row) {
 
       this.$confirm("确认取消同步?", "提示", {

src/views/modules/communityParty/regionalParty/unitsForm.vue

@@ -224,7 +224,7 @@ export default {
 
     //获取服务事项下拉框
     async loadService () {
-      const url = "/heart/serviceitem/dict-list"
+      const url = "/actual/base/serviceitem/dict-list"
       let params = {
         type: 'usable'
         // parentCategoryCode: '1010'

src/views/modules/communityService/gxxq/addForm.vue

@@ -444,6 +444,7 @@ export default {
         this.formData.content = data.content;
         this.formData.assignFlag = data.assignFlag
         this.formData.resiSearchTagId = data.resiSearchTagId;
+        if( data.assignInfo){
         this.newFormData.serviceTimeStart = data.assignInfo.serviceTimeStart;
         this.newFormData.serviceTimeEnd = data.assignInfo.serviceTimeEnd;
         this.newFormData.serverOrgType = data.assignInfo.serverOrgType;
@@ -455,8 +456,9 @@ export default {
             data.assignInfo.serviceScopeList[i].objectId
           );
         }
-        await this.handleChangeServiceTypeLevel1();
         await this.getServiceuserList(data.assignInfo.serverOrgType);
+        }
+        await this.handleChangeServiceTypeLevel1();
         await // this.formData = { ...data };
 
         await this.getTagName();
@@ -696,33 +698,47 @@ export default {
           objectName: this.newArr[i].objectName,
         });
       }
+      this.newArr = []
       //  如果是编辑的话回填的数据会有数组字符串需要将不是对象属性的过滤掉
       let arr = [];
+      let isOk = false;
       this.newFormData.serviceScopeList.forEach((item) => {
         if (typeof item != "string") {
           arr.push(item);
         }
       });
-      //   选中的数据中有不是网格或者社区或者楼栋的就停止它
+      //   选中的数据中有不是网格或者小区或者楼栋的就停止它
-      let isOk = false;
+   
-      arr.findIndex((item) => {
+      // arr.forEach((item) => {
-        if (
+      //   if (
-          item.objectType == "neighborhood" ||
+      //     item.objectType == "neighborhood" ||
-          item.objectType == "agency" ||
+      //     item.objectType == "agency" ||
-          item.objectType == "grid"
+      //     item.objectType == "grid"
-        ) {
+      //   ) {
-          isOk = true;
+      //     isOk = true;
-        } else {
+      //   } else {
-          return (isOk = false);
+      //     isOk = false
-        }
+      //     this.newArr = [];
-      });
+      //     this.newFormData.serviceScopeList = []
-      console.log(isOk);
+      //     arr = []
-      if (!isOk) {
+      //     this.$message.error("请选择正确的网格,社区,楼栋!");
-        this.newArr = [];
+      //   }
-        this.$message.error("请选择正确的网格,社区,楼栋!");
+      // });
-        return;
+     for(let i in arr){
-      }
+          if(arr[i].objectType == "neighborhood" ||
-      this.newFormData.serviceScopeList = arr;
+            arr[i].objectType == "agency" ||
+            arr[i].objectType == "grid"){
+            isOk = true;
+          }else{
+            isOk = false;
+            console.log( this.newArr,'没有清空?');
+            this.$message.error("请选择正确的网格,社区,楼栋!");
+            return
+          }
+     }
+     console.log( this.newArr);
+     this.newFormData.serviceScopeList = arr;
+      if (!isOk && this.formData.assignFlag) return
       var url = "";
       var params = {};
       if (this.formType == "edit") {
@@ -749,15 +765,15 @@ export default {
       }
       //   const url = 'http://yapi.elinkservice.cn/mock/245/governance/icServiceProject/service/initiate'
       console.log(params);
-      //   const { data, code, msg } = await requestPost(url, params);
+        const { data, code, msg } = await requestPost(url, params);
-
+
-      //   if (code === 0) {
+        if (code === 0) {
-      //     this.$message.success("添加成功");
+          this.$message.success("添加成功");
-      //     this.resetData();
+          this.resetData();
-      //     this.$emit("handleComfirm");
+          this.$emit("handleComfirm");
-      //   } else if(code>=8000){
+        } else if(code>=8000){
-      //     this.$message.error(msg);
+          this.$message.error(msg);
-      //   }
+        }
     },
 
     handleCancle() {

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

@@ -204,7 +204,9 @@
 
       <div class="div-flex">
         <div class="m-page">
-      
+          <el-button @click="deleteBatch" size="small" style="margin-top: 15px;">
+                批量删除
+        </el-button>
           <el-pagination
             @size-change="handleSizeChange"
             @current-change="handleCurrentChange"
@@ -214,9 +216,6 @@
             layout="sizes, prev, pager, next, total"
             :total="total"
           >
-          <el-button @click="deleteBatch">
-                批量删除
-        </el-button>
           </el-pagination>
         </div>
       </div>

src/views/modules/communityService/measure/detail.vue

@@ -86,11 +86,13 @@
 
       </div>
     </div>
-    <div class="div-btn">
-      <el-button size="small"
-                 @click="handleCancle">关 闭</el-button>
   
-    </div>
+    <el-row>
+        <el-col :span="24" align="right">
+          <el-button size="small"
+                 @click="handleCancle" style="margin-right: 16px;">关 闭</el-button>
+        </el-col>
+    </el-row>
   </div>
 </template>
 

src/views/modules/shequzhili/csgltc/csgl.vue

@@ -314,7 +314,7 @@ export default {
 
     //获取服务事项下拉框
     async loadService () {
-      // const url = "/heart/serviceitem/dict-list"
+      // const url = "/heart/actual/base/serviceitem/dict-list"
       const url = "/gov/org/coverage/dict-select-list/city_management"
 
 

src/views/modules/visual/communityParty/community.vue

@@ -837,7 +837,7 @@ export default {
       return y + '-' + m + '-' + d + ' ' + h
     },
     async loadUnit () {
-      const url = "/heart/serviceitem/dict-list"
+      const url = "/actual/base/serviceitem/dict-list"
 
       let params = {