Merge remote-tracking branch 'origin/dev' into dev

src/components/AiOpenData.vue

@@ -1,5 +1,5 @@
 <template>
-  <div :type="type" :openid="oid" v-text="oid"/>
+  <div :type="type" :openid="oid"/>
 </template>
 
 <script>

src/components/pages/selectGird.vue

@@ -11,13 +11,24 @@
       <div class="showTypes">
         <div v-if="options.length > 0">
           <div class="cards" v-for="(item, index) in options" :key="index" @click="itemClick(item)">
-            <div class="imges">
+            <div class="imges" v-if="!isDisabledOneGird">
               <img src="./img/xzh.png" alt="" class="imgselect" v-if="item.isChecked"
                    @click.stop="girdClick(item, index)"/>
               <img src="./img/xz.png" alt="" class="imgselect" v-else
                    @click.stop="girdClick(item, index)"/>
               <img src="./img/gird--select-icon.png" alt="" class="avatras"/>
             </div>
+            <div class="imges" v-if="isDisabledOneGird">
+              <div v-if="item.girdLevel != 0">
+                <img src="./img/xzh.png" alt="" class="imgselect" v-if="item.isChecked"
+                   @click.stop="girdClick(item, index)"/>
+                <img src="./img/xz.png" alt="" class="imgselect" v-else
+                    @click.stop="girdClick(item, index)"/>
+              </div>
+              <span v-else class="imgselect"></span>
+              <img src="./img/gird--select-icon.png" alt="" class="avatras"/>
+            </div>
+
             <div class="rightes">
               <div class="applicationNames fill">{{ item.girdName }}</div>
               <u-icon v-if="item.girdLevel != 2" name="arrow-right" color="#ddd"/>
@@ -53,6 +64,7 @@ export default {
       girdLevel: 0,
       parentGirdId: '',
       isMyGird: false, //是否只查询当前户对应的网格员管理的三级网格
+      isDisabledOneGird: false, //是否可以选择一级网格 true不可选
     }
   },
   computed: {
@@ -68,6 +80,10 @@ export default {
     if (params.isMyGird) {
       this.isMyGird = params.isMyGird
     }
+
+    if(params.isDisabledOneGird) {
+      this.isDisabledOneGird = params.isDisabledOneGird
+    }
     this.isGirdUser()
     
   },

src/saas/AppBuilding/map.vue

@@ -71,7 +71,7 @@ export default {
     this.initMap()
   },
   onShow() {
-    document.title = "以房找人"
+    document.title = "楼栋定位"
   },
   methods: {
     initMap() {  //初始化地图

src/saas/AppConflictMediation/Content.vue

@@ -74,6 +74,7 @@ export default {
     this.typeList()
     uni.$on('goback', (res) => {
       this.selectUser = res
+      console.log(res);
       if(res.name) {
         this.forms.name = res.name
       }else{
@@ -124,7 +125,7 @@ export default {
         }
         if(this.selectUser.name) { //选择的网格员
           params.girdId = this.selectUser.girdId
-          params.girdMemberId = this.selectUser.id
+          params.girdMemberId = this.selectUser.wxUserId
           params.girdMemberName = this.selectUser.name
         }
       }

src/saas/AppConflictMediation/detail.vue

@@ -64,7 +64,11 @@
               <div class="cardsss-right-left">
                 <div class="cardssss-right-left-top">
                   <AiOpenData type="userName" :openid="transTxt(item.systemExplain)[1]" style="display: inline-block;"/>
-                  <div v-html="transTxt(item.systemExplain)[2]"/>
+                  <div v-html="transTxt(item.systemExplain)[2]" style="display: inline-block;"/>
+
+                  <AiOpenData v-if="transTxt(item.systemExplain).length==5" type="userName" 
+                  :openid="transTxt(item.systemExplain)[3]" style="display: inline-block;"/>
+                  <span v-else>{{ item.girdName }}</span>
                   <div style="color: #2ea222; font-size: 16px; margin-top: 5px">
                     {{ $dict.getLabel('clapDoStatus', item.doStatus) }}
                   </div>
@@ -135,6 +139,7 @@ export default {
   },
   methods: {
     transTxt(str){
+      console.log(str.split("$"));
       return str.split("$")
     },
 

src/saas/AppGridManagement/AddGird.vue

@@ -48,7 +48,7 @@
         <img src="./components/img/right-icon.png" alt=""/>
       </div>
     </div>
-    <div class="footer" @click="confirm">确认添加</div>
+    <div class="footer" @click="confirm">{{fromType == 'add' ? '确认添加' : '确认修改'}}</div>
   </div>
 </template>
 
@@ -75,7 +75,11 @@ export default {
     })
   },
   onShow() {
-    document.title = '添加网格'
+    if(this.fromType == 'add') {
+      document.title = '添加网格'
+    }else {
+      document.title = '编辑网格'
+    }
   },
   methods: {
     ...mapActions(['selectPrivilegedContact']),

src/saas/AppGridManagement/Map.vue

@@ -1,11 +1,15 @@
 <template>
   <div class="detail">
     <div class="grid-select">
-      <span class="label">网格选择</span>
+      <AiPagePicker type="gird" class="fill" :selected="[form]" @select="handleSelectGird" :isDisabledOneGird="true">
-      <div class="grid-select__right" @click="toChoose">
+        <div class="gird-content">
-        <span>{{ form.girdName || '请选择' }}</span>
+          <div class="label">网格选择</div>
-        <u-icon name="arrow-right" color="#cccccc" size="26" style="margin-left:4px;"></u-icon>
+          <div class="grid-select__right">
-      </div>
+            <span>{{ form.girdName || '请选择' }}</span>
+            <u-icon name="arrow-right" color="#cccccc" size="26" style="margin-left:4px;"></u-icon>
+          </div>
+        </div>
+      </AiPagePicker>
     </div>
     <div class="map-content">
       <AiTMap ref="AiTMap" :map.sync="map" :lib.sync="lib" :libraries="['geometry','service', 'tools']"/>
@@ -92,6 +96,10 @@ export default {
   },
 
   methods: {
+    handleSelectGird(v) {
+      this.form = v?.[0]
+      this.getGridList(v?.[0].id, true)
+    },
     toChoose() {
       uni.navigateTo({
         url: './SelectGird?isFormMap=1'
@@ -308,8 +316,13 @@ ai-tree-picker {
     color: #333;
 
     .grid-select__right {
+      width: calc(100% - 140px);
+      text-align: right;
+    }
+
+    .gird-content{
       display: flex;
-      align-items: center;
+      justify-content: space-between;
     }
 
     .label {

src/saas/AppGridManagement/SetGird.vue

@@ -200,7 +200,7 @@ export default {
     },
 
     del() {
-      this.$confirm(`是否删除该网格？`).then(() => {
+      this.$confirm('删除网格后，会清除网格内网格员和责任家庭信息，如有下级网格，会同步删除下级网格所有数据', `您确认要删除该网格？`).then(() => {
         this.$http.post(`/app/appgirdinfo/delete?ids=${this.form.id}`).then((res) => {
           if (res.code == 0) {
             this.$u.toast('删除成功!')