changhaoning hai 1 ano
pai
achega
61e7b355bd
Modificáronse 2 ficheiros con 11 adicións e 4 borrados
  1. 4 0
      src/locale/lang/zh-CN.js
  2. 7 4
      src/view/mst/integral/index.vue

+ 4 - 0
src/locale/lang/zh-CN.js

@@ -614,6 +614,10 @@ export const columns = {
   integralItem:'积分明细',
   signRecord:'签到积分',
   share:'分享积分',
+  integralTypeName:'积分类型',
+  integral:'积分',
+  signDays:'连续签到天数',
+  lastDate:'最近签到日期',
 }
 
 /**

+ 7 - 4
src/view/mst/integral/index.vue

@@ -42,9 +42,10 @@
           <DkTable :id="'table-'+$options.name" ref="detail-select" :data="integralItemData"
                    :choose-flag="false"
                    :height="this.tableHeight * (1-split)" primaryKey="itemId" name="table">
-            <DkTableColumn field="integralType"></DkTableColumn>
+            <DkTableColumn field="integralTypeName"></DkTableColumn>
             <DkTableColumn field="integral"></DkTableColumn>
             <DkTableColumn field="accDate" :data-type="$config.dataType.date"></DkTableColumn>
+            <DkTableColumn field="userName"/>
           </DkTable>
         </div>
         <!--  签到  -->
@@ -52,7 +53,7 @@
           <DkTable :id="'table-'+$options.name" ref="detail-select" :data="signRecordData"
                    :choose-flag="false"
                    :height="this.tableHeight * (1-split)" primaryKey="itemId" name="table">
-            <DkTableColumn field="userId"></DkTableColumn>
+            <DkTableColumn field="userName"/>
             <DkTableColumn field="signDays"></DkTableColumn>
             <DkTableColumn field="lastDate" :data-type="$config.dataType.date"></DkTableColumn>
           </DkTable>
@@ -161,8 +162,10 @@ export default {
           this.excute(this.$service.integralService, this.$service.integralService.selectByCond, params).then(res => {
             if (res.code === this.$config.SUCCESS_CODE) {
               this.tableData = res.data.list;
-              this.getSignRecordData(params);
-              this.getShareData(params);
+              if(this.tableData && this.tableData.length >0 ){
+                this.getSignRecordData(params);
+                this.getShareData(params);
+              }
             }else {
               this.$Message.warning(res.message)
             }