30392 30392

project/sanjianxi/apps/AppPartyMemberScore/psList.vue

@@ -33,7 +33,7 @@
                   @getList="getTableData" :col-configs="colConfigs" :dict="dict">
           <el-table-column slot="options" label="操作" fixed="right" align="center">
             <template slot-scope="{row}">
-              <el-button type="text" @click="showDetail(row.id)">详情</el-button>
+              <el-button type="text" @click="showDetail(row.partyId)">详情</el-button>
             </template>
           </el-table-column>
         </ai-table>
@@ -55,10 +55,10 @@ export default {
     ...mapState(['user']),
     colConfigs() {
       return [
-        {label: "排行榜", prop: "name", align: "center"},
+        {label: "排行榜", prop: "orderIndex", align: "center"},
         {label: "党员姓名", prop: "name", align: "center"},
-        {label: "党员类型", prop: "name", align: "center"},
-        {label: "获得积分", prop: "name", align: "center"},
+        {label: "党员类型", prop: "partyType", dict: "partyType", align: "center"},
+        {label: "获得积分", prop: "nowIntegral", align: "center"},
         {slot: "options"}
       ]
     },
@@ -80,7 +80,7 @@ export default {
       areaTree: [],
       defaultProps: {
         children: 'children',
-        label: 'name'
+        label: 'name',
       },
       createTime: '',
       partyOrgId: '',
@@ -130,19 +130,14 @@ export default {
       return data.name.indexOf(value) !== -1
     },
 
-    handleSearchTime(v) {
-      // this.page.current = 1
-      // this.search.startTime = v?.[0]
-      // this.search.endTime = v?.[1]
-      // this.getTableData()
-    },
-
     showDetail(id) {
       this.$router.push({query: {id}})
     },
   },
   created() {
-    this.getTableData()
+    this.dict.load('partyType').then(() => {
+      this.getTableData()
+    })
   }
 }
 </script>

project/sanjianxi/apps/AppPartyScoreRules/components/applyForIntegral.vue

@@ -166,6 +166,7 @@ export default {
         {prop: "eventDesc", label: "简介", dict: "integralRuleEventType", align: "center", "show-overflow-tooltip": true},
         {prop: "ruleType", label: "规则", dict: "partyIntegralRuleRuleType", align: "center"},
         {prop: "scoringCycle", label: "周期范围", dict: "integralRuleScoringCycle", align: "center"},
+        {prop: "scoringCycle", label: "积分分值", dict: "integralRuleScoringCycle", align: "center"},
         {prop: "status", label: "状态", align: "center", width: 96, dict: "integralRuleStatus"},
         {slot: "options", label: "操作", align: "center"},
       ],