余额变动

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

@@ -46,11 +46,18 @@
         </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="integralType" label="类型" align="center">
+            <template slot-scope="{ row }">
+              <el-popover placement="left" width="240" trigger="hover">
+                <span v-if="row.integralType == 0">{{ 积分调整 }}</span>
+                <span v-else>{{ row.eventType }}</span>
+              </el-popover>
+            </template>
+          </el-table-column>
           <el-table-column slot="eventDesc" label="事件" align="center" style="overflow:hidden;text-overflow:ellipsis;white-space: nowrap;">
             <template slot-scope="{ row }">
               <el-popover placement="left" width="240" trigger="hover">
-                <span>{{ row.integralType == 3 ? row.integralRuleNamesearch : row.integralType == 0? row.eventDesc : '' }}</span>
+                <span>{{ row.integralType == 0 ? row.eventDesc : eventName }}</span>
               </el-popover>
             </template>
           </el-table-column>
@@ -96,7 +103,7 @@ export default {
     colConfigs() {
       return [
         { prop: "doTime", label: '时间', align: "left", width: "200px" },
-        { prop: "integralType", label: '类型', align: "center", width: "240px", dict:"integralType"},
+        { 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}`)
         }},

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

@@ -52,7 +52,7 @@
         @onConfirm="onConfirm"
         @closed="form={},chooseUserList=[]">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="选择人员" prop="residentId">
+        <el-form-item label="选择人员" prop="residentId" required>
           <ai-person-select :instance="instance" :customClicker="true" :chooseUserList="chooseUserList"
                             :url="'/app/appgirdmemberinfo/list?size=10'"
                             :isMultiple="true" dialogTitle="选择" @selectPerson="selectPerson">
@@ -62,7 +62,7 @@
             </template>
           </ai-person-select>
         </el-form-item>
-        <el-form-item label="调整说明" prop="eventDesc">
+        <el-form-item label="调整说明" prop="eventDesc" required>
           <el-input v-model.trim="form.eventDesc" placeholder="请输入..." type="textarea" :rows="4" show-word-limit
                     maxlength="100"></el-input>
         </el-form-item>
@@ -121,7 +121,13 @@ export default {
       },
       chooseUserList: [],
       sortFiled: '',
-      sortRule: ''
+      sortRule: '',
+      rules: {
+        residentId: [{required: true, message: '请选择人员', trigger: 'blur'}],
+        eventDesc: [{required: true, message: '请输入调整说明', trigger: 'blur'}],
+        integralCalcType: [{required: true, message: '请选择类型', trigger: 'change'}],
+        integral: [{required: true, validator: (r, v, cb) => v > 0 ? cb() : cb("请输入正数")}],
+      }
     }
   },
   created() {
@@ -141,14 +147,14 @@ export default {
         { slot: "options" },
       ]
     },
-    rules() {
+    // rules() {
-      return {
+    //   return {
-        residentId: [{required: true, message: '请选择人员', trigger: 'blur'},],
+    //     residentId: [{required: true, message: '请选择人员', trigger: 'blur'}],
-        eventDesc: [{required: true, message: '请输入调整说明', trigger: 'blur'},],
+    //     eventDesc: [{required: true, message: '请输入调整说明', trigger: 'blur'}],
-        integralCalcType: [{required: true, message: '请选择类型', trigger: 'change'},],
+    //     integralCalcType: [{required: true, message: '请选择类型', trigger: 'change'}],
-        integral: [{required: true, validator: (r, v, cb) => v > 0 ? cb() : cb("请输入正数")}],
+    //     integral: [{required: true, validator: (r, v, cb) => v > 0 ? cb() : cb("请输入正数")}],
-      }
+    //   }
-    },
+    // },
   },
   methods: {
     getTableData() {