Merge branch 'hotfix/yujt_heart'

src/views/modules/heart/actuserclock-detail.vue

@@ -19,6 +19,7 @@
               v-model="dataForm.failureReason"
               type="textarea"
               placeholder="请写明理由，100字以内"
+              style="width: 460px !important;"
             ></el-input>
           </el-form-item>
           <el-form-item style="float: right;">
@@ -368,6 +369,9 @@ export default {
 .project-handle .el-input {
   width: 100px !important;
 }
+.project-handle .el-pagination .el-input .project-handle .el-textarea {
+  width: 100px !important;
+}
 .project-handle .handle-operation {
   background: #fff;
 }

src/views/modules/heart/map-select.vue

@@ -80,6 +80,7 @@ export default {
       this.dataForm.latitude = position.lat
       this.dataForm.longitude = position.lng
       this.dataForm.city = position.city
+      this.getAddress(position.lat,position.lng)
       this.setMap()
     },
     showErr () {
@@ -122,6 +123,9 @@ export default {
         position: myLatlng,
         map: map
       })
+      qq.maps.event.addListener(marker,'click',function (event) {
+        that.addressCheckHandle()
+      })
       markerList.push(marker)
       // 添加监听事件   获取鼠标单击事件
       qq.maps.event.addListener(map, 'click', function (event) {

src/views/modules/points/volunteer-points-log.vue

@@ -7,12 +7,12 @@
   >
     <el-form :model="dataForm" ref="dataForm" :label-width="$i18n.locale === 'en-US' ? '100px' : '80px'">
       <el-form-item label="积分行为">
-        <el-select v-model="dataForm.behaviorCode" placeholder="全部" clearable @change="queryByBehaviorCode">
+        <el-select v-model="dataForm.behaviorCode" placeholder="全部" filterable clearable @change="queryByBehaviorCode">
             <el-option
               v-for="item in behaviorTypeList"
-              :key="item.dictValue"
-              :label="item.dictName"
-              :value="item.dictValue">
+              :key="item.behaviorCode"
+              :label="item.behaviorDesc"
+              :value="item.behaviorCode">
             </el-option>
         </el-select>
       </el-form-item>
@@ -20,8 +20,8 @@
     <el-table  v-loading="dataListLoading" :data="dataList" border style="width: 100%;">
       <el-table-column type="index" width="50" label="序号"></el-table-column>
       <el-table-column prop="operationDesc" label="操作描述" header-align="center" align="center"></el-table-column>
-      <el-table-column prop="behaviorCode" label="积分行为" header-align="center" align="center" :formatter="showBehaviorCodeFormatter"></el-table-column>
-      <el-table-column prop="operationTime" label="操作时间" header-align="center" align="center"></el-table-column>
+      <el-table-column prop="behaviorCode" label="积分行为" header-align="center" align="center"></el-table-column>
+      <el-table-column prop="operationTime" label="操作时间" width="160" header-align="center" align="center"></el-table-column>
       <el-table-column prop="points" label="积分变化" header-align="center" align="center"></el-table-column>
       <el-table-column prop="operationType" label="操作类型" header-align="center" align="center" :formatter="showOperationTypeFormatter"></el-table-column>
       <el-table-column prop="lavePoints" label="剩余积分" header-align="center" align="center"></el-table-column>
@@ -51,7 +51,7 @@ export default {
       },
       visible: false,
       dataForm: {
-        volunteerId: '',
+        userId: '',
         behaviorCode: ''
       },
       behaviorTypeList: [],
@@ -67,7 +67,7 @@ export default {
       this.visible = true
       this.$nextTick(() => {
         this.$refs['dataForm'].resetFields()
-        if (this.dataForm.volunteerId) {
+        if (this.dataForm.userId) {
           this.getDataList()
         }
       })
@@ -86,17 +86,16 @@ export default {
         .catch(() => {})
     },
     showOperationTypeFormatter: function (row, column) {
-      if (row.operationType) {
-        let dict = this.operationTypeList.filter(item => item.dictValue === row.operationType)[0]
-        if (dict) {
-          return dict.dictName
+      if (row.operationType === '0') {
+        return '减积分';
       }
+      if (row.operationType === '1') {
+        return '加积分';
       }
-      return ''
     },
     getBehaviorTypeList () {
       this.$http
-        .get(`/sys/dict/listSimple/pointsrule_behavior`)
+        .get(`/points/pointsbehavior/getBehaviorDesc`)
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
@@ -105,15 +104,6 @@ export default {
         })
         .catch(() => {})
     },
-    showBehaviorCodeFormatter: function (row, column) {
-      if (row.behaviorCode) {
-        let dict = this.behaviorTypeList.filter(item => item.dictValue === row.behaviorCode)[0]
-        if (dict) {
-          return dict.dictName
-        }
-      }
-      return ''
-    },
     queryByBehaviorCode () {
       this.getDataList()
     }

src/views/modules/property/propertyproject.vue

@@ -5,7 +5,7 @@
                 <el-form-item label="物业项目名称">
                     <el-input v-model="dataForm.projectName" clearable></el-input>
                 </el-form-item>
-                <el-form-item label="所属社区">
+                <el-form-item label="所属机构">
                     <el-cascader
                             :options="options"
                             :props="{ checkStrictly: true }"
@@ -39,7 +39,7 @@
                                  align="center"></el-table-column>
                 <el-table-column prop="propertyAddress" label="物业地址" header-align="center"
                                  align="center"></el-table-column>
-                <el-table-column prop="allDeptNames" label="所属社区" header-align="center"
+                <el-table-column prop="allDeptNames" label="所属机构" header-align="center"
                                  align="center"></el-table-column>
                 <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
                     <template slot-scope="scope">

src/views/modules/user/volunteerinfo-check.vue

@@ -8,7 +8,7 @@
              ref="dataForm"
              v-if="clickStatus === 1"
              @keyup.enter.native="dataFormSubmitHandle()"
-             :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+             :label-width="$i18n.locale === 'en-US' ? '140px' : '120px'">
       <el-form-item label="审核 :"
                     prop="auditStatus">
         <template>

src/views/modules/user/volunteerinfo.vue

@@ -92,7 +92,7 @@
                        @click="pointsAdjustHandle(scope.row.id)">积分调整</el-button>
             <el-button type="text"
                        size="small"
-                       @click="pointsLogs(scope.row.id)">积分记录</el-button>
+                       @click="pointsLogs(scope.row.userId)">积分记录</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -236,10 +236,10 @@ export default {
       })
     },
     // 积分记录
-    pointsLogs (id) {
+    pointsLogs (userId) {
       this.volunteerPointsLogVisible = true
       this.$nextTick(() => {
-        this.$refs.volunteerPointsLog.dataForm.volunteerId = id
+        this.$refs.volunteerPointsLog.dataForm.userId = userId
         this.$refs.volunteerPointsLog.init()
       })
     },