Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev

packages/3.0.0/AppReportAiWill/components/Detail.vue

@@ -312,7 +312,7 @@
       },
 
       onConfirm () {
-        if (this.gridInfo.userId || this.gridInfo.isLastLevel === '1') {
+        if (this.gridInfo.userId || this.gridInfo.girdLevel === '2') {
           if (this.gridInfo.userId) {
             this.forwardForm.girdId = this.gridInfo.girdId
             this.forwardForm.girdName = this.gridInfo.girdName

project/shandong10086/apps.import.json

@@ -19,7 +19,6 @@
   "AppScoreFamily": "家庭积分",
   "AppScorePersonal": "个人积分",
   "AppScoreRules": "积分规则",
-  "AppScoreManage": "积分维护",
   "AppScoreSupermarket": "积分超市",
   "AppVillageActivity": "乡村活动",
   "AppAddressBook": "内部通讯录",

project/shandong10086/apps/shandong/AppVillagersCircle/components/List.vue

@@ -17,22 +17,22 @@
             @change="search.current = 1, getList()"
             :selectList="dict.getDict('villagerCircleTopic')">
           </ai-select>
-            <el-date-picker
+          <el-date-picker
-              value-format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
-              v-model="search.startDate"
+            v-model="search.createTimeStart"
-              type="date"
+            type="date"
-              size="small"
+            size="small"
-              unlink-panels
+            unlink-panels
-              placeholder="选择开始日期"
+            placeholder="选择开始日期"
-              @change="search.current = 1, getList()" />
+            @change="search.current = 1, getList()" />
-            <el-date-picker
+          <el-date-picker
-              value-format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
-              v-model="search.endDate"
+            v-model="search.createTimeEnd"
-              type="date"
+            type="date"
-              size="small"
+            size="small"
-              unlink-panels
+            unlink-panels
-              placeholder="选择结束日期"
+            placeholder="选择结束日期"
-              @change="search.current = 1, getList()" />
+            @change="search.current = 1, getList()" />
         </template>
         <template #right>
           <el-input
@@ -87,8 +87,8 @@
           topic: '',
           title: '',
           areaId: '',
-          startDate: '',
+          createTimeStart: '',
-          endDate: ''
+          createTimeEnd: ''
         },
         total: 0,
         colConfigs: [

project/shandong10086/apps/shandong/scoreManage/AppScoreManage.vue

@@ -24,7 +24,7 @@ import scoreChange from "./scoreChange";
 
 export default {
     name: 'AppScoreManage',
-    label: "积分管理",
+    label: "积分审核",
     components: {pointsDeclaration, pointsDetails, pointsAppeal, scoreChange},
     props: {
       instance: Function,