Merge remote-tracking branch 'origin/dev' into dev

packages/conv/creditScore/AppGridMemberScore/components/gridScoreDetail.vue

@@ -46,6 +46,12 @@
         </ai-search-bar>
         <ai-table :tableData="tableData" :total="total" :current.sync="search.current" :size.sync="search.size"
                   @getList="getIntegralChange" :col-configs="colConfigs" :dict="dict">
+          <el-table-column slot="changeIntegral" label="变动积分" align="center">
+            <template slot-scope="{ row }">
+              <span v-if="row.integralType == 3">{{ row.changeIntegral | formatTime }}</span>
+              <span v-if="row.integralType == 0">{{ row.changeIntegral > 0 ? '+' : '-' }}{{ row.changeIntegral }}</span>
+            </template>
+          </el-table-column>
           <el-table-column slot="integralType" label="类型" align="center">
             <template slot-scope="{ row }">
               <span v-if="row.integralType == 0">积分调整</span>
@@ -100,9 +106,7 @@ export default {
       return [
         { prop: "doTime", label: '时间', align: "left", width: "200px" },
         { slot: "integralType", label: '类型', align: "center", width: "240px", dict:"integralType"},
-        { prop: "changeIntegral", label: '变动积分', align: "center",width: "200px",render: (h, { row }) => {
-          return h('span', {}, `${row.integralCalcType == 1 ? '+' : '-'}${row.changeIntegral}`)
-        }},
+        { slot: "changeIntegral"},
         { prop: "nowIntegral", label: '剩余积分', align: "center",width: "200px" },
         { slot: "eventDesc"},
       ]
@@ -237,6 +241,16 @@ export default {
 
   },
 
+  filters: {
+    formatTime(num) {
+      if(num > 0) {
+        return '+' + num
+      } else {
+        return num
+      }
+    }
+  },
+
   mounted() {
     this.getColEcherts()
   },

packages/conv/creditScore/AppGridMemberScore/components/gridScoreStatistics.vue

@@ -86,7 +86,7 @@
           </el-table-column>
           <el-table-column slot="changeIntegral" label="积分变动" align="center">
             <template slot-scope="{ row }">
-              <span v-if="row.integralType == 3">{{ row.changeIntegral | format }}</span>
+              <span v-if="row.integralType == 3">{{ row.changeIntegral | formatTime }}</span>
               <span v-if="row.integralType == 0">{{ row.changeIntegral > 0 ? '+' : '-' }}{{ row.changeIntegral }}</span>
             </template>
           </el-table-column>
@@ -107,7 +107,12 @@
             <ai-info-item label="所属网格" :value="details.girdName"/>
             <ai-info-item label="事件" isLine :value="details.eventDesc"/>
             <ai-info-item label="时间" isLine :value="details.createTime"/>
-            <ai-info-item label="积分变动">{{ details.integralCalcType==0? '-' : '+' }}{{ details.changeIntegral }}</ai-info-item>
+            <ai-info-item label="积分变动" v-if="details.integralType == 3">
+              {{ details.changeIntegral | formatTime }}
+            </ai-info-item>
+            <ai-info-item label="积分变动" v-if="details.integralType == 0">
+              {{ details.changeIntegral > 0 ? '+' : '-' }}{{ details.changeIntegral }}
+            </ai-info-item>
             <ai-info-item label="积分余额" :value="details.nowIntegral"/>
             <ai-info-item label="凭证" isLine v-if="fileDownLoad.length">
               <ai-file-list :fileList="fileDownLoad" style="width: 200px;" :fileOps="{name: 'name'}"></ai-file-list>