Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_cp/dv_cp_wechat_app into dev

src/apps/AppGridManagement/AddGird.vue

@@ -14,7 +14,7 @@
       </div>
       <div class="value" @click="toAddUser('manage')">
         
-        <span v-if="form.girdMemberManageList.length">
+        <span v-if="form.girdMemberManageList && form.girdMemberManageList.length">
           <span v-for="(item, index) in form.girdMemberManageList" :key="index"><span v-if="index>0">,</span>{{item.name}}</span>
         </span>
         <span style="color:#999;" v-else>请选择</span>
@@ -25,7 +25,7 @@
         <span class="tips"></span>网格员
       </div>
       <div class="value" @click="toAddUser('Member')">
-        <span v-if="form.girdMemberList.length">
+        <span v-if="form.girdMemberList && form.girdMemberList.length">
           <span v-for="(item, index) in form.girdMemberList" :key="index"><span v-if="index>0">,</span>{{item.name}}</span>
         </span>
         <span style="color:#999;" v-else>请选择</span>
@@ -93,10 +93,20 @@ export default {
       if(!this.form.girdName){
         return this.$u.toast('请输入网格名称')
       }
+      if(this.fromType == 'add') {
+        this.form.parentGirdId = this.detailInfo.id
+        this.form.parentGirdName = this.detailInfo.girdName
+        this.form.girdLevel = Number(this.detailInfo.girdLevel)+1
+        this.form.girdType = Number(this.detailInfo.girdType)+1
+        this.form.isLastLevel = this.form.girdLevel == 2 ? '1' : '0'
+      }
       this.$http.post(`/app/appgirdinfo/addOrUpdate`, this.form).then((res) => {
         if (res.code == 0) {
-          this.
+          this.$u.toast('提交成功')
-          uni.navigateBack()
+          uni.$emit('update')
+          setTimeout(() => {
+            uni.navigateBack()
+          }, 600)
         }
       })
 

src/apps/AppGridManagement/AppGridManagement.vue

@@ -21,7 +21,7 @@ export default {
 
   data() {
     return {
-      component: 'Organization',
+      component: 'Statistics',
       params: {},
       refresh: true,
       tabIndex: 0,

src/apps/AppGridManagement/Organization.vue

@@ -6,7 +6,7 @@
         {{userGird.girdName}}
         <img src="./components/img/down-icon.png" alt="" class="down-icon"> 
       </div>
-      <span @click="linkTo('./SetGird')">网格配置</span>
+      <span @click="linkTo('./SetGird')" v-if="checkType == 2">网格配置</span>
     </div>
     <div class="title">网格人员</div>
     <div class="user-content" v-for="(item, index) in dataInfo.parentGirdMembers" :key="index">

src/apps/AppGridManagement/SetGird.vue

@@ -60,6 +60,7 @@
             </span>
           </div>
         </div>
+        <div style="height:56px;"></div>
         <div class="btn" v-if="form.girdRight == 1">
           <span class="del" @click="del">删除网格</span>
           <span class="edit" @click="edit">编辑网格</span>
@@ -88,6 +89,10 @@ export default {
   onLoad() {
     this.$dict.load('girdType', 'girdLevel')
     this.isGirdUser()
+    uni.$on('update',  () => {
+      this.show = false
+      this.getTree()
+    })
   },
   methods: {
     isGirdUser() {
@@ -408,9 +413,14 @@ export default {
       border-bottom: 0;
     }
     .btn{
-      padding: 32px 0;
+      width: 100%;
+      padding: 32px;
+      box-sizing: border-box;
       background-color: #fff;
       display: flex;
+      position: fixed;
+      bottom: 0;
+      left: 0;
       span{
         display: inline-block;
         height: 92px;

src/apps/AppGridManagement/Statistics.vue

@@ -15,17 +15,20 @@
 
       <div class="card">
         <div class="box">
-          <span class="count">{{ peopleList['网格长'] || 0 }}</span>
+          <span class="count" v-if="peopleList && peopleList['网格长']">{{ peopleList['网格长']}}</span>
+          <span class="count" v-else>0</span>
           <span class="girdCount">网格长</span>
         </div>
 
         <div class="box">
-          <span class="count">{{ peopleList['网格员'] || 0 }}</span>
+          <span class="count" v-if="peopleList && peopleList['网格员'] ">{{ peopleList['网格员']}}</span>
+           <span class="count" v-else>0</span>
           <span class="girdCount">网格员</span>
         </div>
 
         <div class="box">
-          <span class="count">{{ peopleList['责任家庭数'] || 0 }}</span>
+          <span class="count" v-if="peopleList && peopleList['责任家庭数']">{{ peopleList['责任家庭数'] }}</span>
+          <span class="count" v-else>0</span>
           <span class="girdCount">责任家庭数</span>
         </div>
       </div>

src/apps/AppVillageDiscuss/Add.vue

@@ -224,7 +224,7 @@ export default {
         if (!this.form.discussDeadline) {
           return this.$u.toast('请先选择议事截止时间')
         }
-        var beginTimes = new Date(this.form.discussDeadline).getTime() * 1
+        var beginTimes = new Date(this.form.discussDeadline.replaceAll('-', '/')).getTime() * 1
 
         var publicityDeadlineTimes = new Date(e.year + '/' + e.month + '/' + e.day + ' ' + e.hour + ':' + e.minute + ':' + '00').getTime() * 1