diff --git a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreManage.vue b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreManage.vue
index dc57d9cf..fd5812c5 100644
--- a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreManage.vue
+++ b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreManage.vue
@@ -5,12 +5,12 @@
批量调整积分
-
-
@@ -20,21 +20,6 @@
-
-
- {{ row.integral }}
-
-
-
-
- {{ row.totalIntegral }}
-
-
-
-
- {{ row.usedIntegral }}
-
-
调整积分
@@ -52,27 +37,27 @@
@onConfirm="onConfirm"
@closed="form={},chooseUserList=[]">
-
-
+
-
+
-
+
-
+
@@ -94,13 +79,14 @@ export default {
data() {
return {
search: {
- name: '',
+ userName: '',
girdId: '',
current: 1,
size: 10,
sortFiled: '',
sortRule: '',
},
+ girdIdList: [],
tableData: [],
page: {size: 10, total: 0},
current: 1,
@@ -135,10 +121,10 @@ export default {
colConfigs() {
return [
{ prop: "userName", label: '姓名', align: "left", },
- { prop: "girdName", label: '所属网格', align: "center", },
- { slot: "integral", label: '积分余额', align: "center", },
- { slot: "totalIntegral", label: '累计积分', align: "center", },
- { slot: "usedIntegral", label: '已用积分', align: "center", },
+ { prop: "girdName", label: '所属网格' },
+ { prop: "integral", label: '积分余额', align: "center", sortable: true },
+ { prop: "totalIntegral", label: '累计积分', align: "center", sortable: true },
+ { prop: "usedIntegral", label: '已用积分', align: "center", sortable: true },
{ slot: "options" },
]
},
@@ -147,7 +133,8 @@ export default {
ids: [{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("请输入正数")}],
+ integral: [{required: true, message: '请输入积分', trigger: 'blur' },
+ {pattern: /^([1-9]\d*|0)(\.\d{1,2})?$/, message: '请输入正数且最多只能保留两位小数'}],
}
},
},
@@ -218,6 +205,7 @@ export default {
},
gridChange(val) {
+ this.girdIdList = val
this.search.girdId = val?.[val.length - 1]
this.$refs.cascader1.dropDownVisible = false;
this.getTableData()
@@ -225,36 +213,30 @@ export default {
changeTableSort(col) {
if(col.prop === 'integral') { // 剩余积分
+ this.search.sortFiled = 0
if(col.order === 'ascending') {
- this.search.sortFiled = 0
this.search.sortRule = true
} else if(col.order === 'descending') {
- this.search.sortFiled = 0
this.search.sortRule = false
} else if(col.order === null) {
- this.search.sortFiled = ''
this.search.sortRule = ''
}
} else if(col.prop === 'totalIntegral') { // 累计积分
+ this.search.sortFiled = 1
if(col.order === 'ascending') {
- this.search.sortFiled = 1
this.search.sortRule = true
} else if(col.order === 'descending') {
- this.search.sortFiled = 1
this.search.sortRule = false
} else if(col.order === null) {
- this.search.sortFiled = ''
this.search.sortRule = ''
}
} else if(col.prop === 'usedIntegral') { // 已用积分
+ this.search.sortFiled = 2
if(col.order === 'ascending') {
- this.search.sortFiled = 2
this.search.sortRule = true
} else if(col.order === 'descending') {
- this.search.sortFiled = 2
this.search.sortRule = false
} else if(col.order === null) {
- this.search.sortFiled = ''
this.search.sortRule = ''
}
}
@@ -277,12 +259,15 @@ export default {
integralCalcType: this.form.integralCalcType,
integral: this.form.integral,
}).then(res => {
- if(res.code == 0) {
+ if(res?.code == 0) {
this.$message.success('调整积分成功')
setTimeout(() =>{
- this.getTableData()
this.dialog = false
- })
+ this.getTableData()
+ this.flag = false
+ }, 600)
+ } else {
+ this.flag = false
}
})
}
@@ -309,5 +294,65 @@ export default {
::v-deep .ai-dialog .ai-dialog__content {
overflow-y: hidden;
}
+
+
+
+ .userlist {
+ display: inline-block;
+ }
+
+ .userlist, .user {
+ display: inline-block;
+ }
+
+ .user {
+ position: relative;
+ width: 70px;
+ text-align: center;
+
+ .remove-icon {
+ position: absolute;
+ right: 7px;
+ top: -4px;
+ line-height: 1;
+ padding: 6px 0;
+ font-size: 16px;
+ cursor: pointer;
+
+ &:hover {
+ color: crimson;
+ }
+ }
+
+ img, h2 {
+ display: block;
+ width: 40px;
+ height: 40px;
+ line-height: 40px;
+ text-align: center;
+ margin: 0 auto 4px;
+ font-size: 14px;
+ color: #fff;
+ border-radius: 50%;
+ }
+
+ h2 {
+ background-color: $primaryColor;
+ }
+
+ span {
+ color: #666;
+ font-size: 14px;
+ white-space: nowrap;
+ overflow: hidden;
+ word-break: break-all;
+ text-overflow: ellipsis;
+ }
+ }
+
+ ::v-deep .selectCont .pagination {
+ width: 100%!important;
+ background: pink;
+ }
}
\ No newline at end of file
diff --git a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreRules.vue b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreRules.vue
index 5613e205..dde7ac51 100644
--- a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreRules.vue
+++ b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreRules.vue
@@ -7,7 +7,7 @@
添加
-
+
@@ -42,8 +42,8 @@
-
-
+
+
@@ -82,7 +82,7 @@
-
+
@@ -97,13 +97,18 @@
- {{ girdInfoList.length ? "已选择" : "请选择" }}
+ {{ girdInfoList.length ? "重新选择" : "请选择" }}
+
+ {{e}}
+
-
+
-
@@ -56,7 +56,7 @@
-
@@ -103,7 +103,7 @@
@@ -140,6 +140,7 @@ export default {
startTime: '',
endTime: '',
},
+ girdIdArr:[],
page: {
size: 10,
total: 0,
@@ -156,10 +157,12 @@ export default {
endTime: '',
data: {},
girdId: '',
+ girdArr: [],
girdOptions: [],
defaultProps: {
label: 'girdName',
value: 'id',
+ children: 'children',
checkStrictly: true,
},
details: {},
@@ -247,6 +250,7 @@ export default {
},
gridChangeOpt(val) {
+ this.girdIdArr = val
this.search.girdId = val?.[val.length - 1]
this.$refs.cascader2.dropDownVisible = false;
this.getTableData()
@@ -387,6 +391,7 @@ export default {
this.myChart2.resize()
},
gridChange(val) {
+ this.girdArr = val
this.girdId = val?.[val.length - 1]
this.$refs.cascader1.dropDownVisible = false;
this.getStatistics()
diff --git a/packages/conv/creditScore/scoreSysUser/ssuDetail.vue b/packages/conv/creditScore/scoreSysUser/ssuDetail.vue
index ac28dd80..edc5b894 100644
--- a/packages/conv/creditScore/scoreSysUser/ssuDetail.vue
+++ b/packages/conv/creditScore/scoreSysUser/ssuDetail.vue
@@ -103,10 +103,8 @@ export default {
return [
{prop: 'doTime', label: '时间', width: 200},
{prop: "type", label: "类型", dict: "integralDetailType", align: 'center'},
- {
- prop: 'changeIntegral', align: 'center', label: '变动积分',
- render: (h, {row}) => h('p', `${row.integralCalcType == 1 ? '+' : '-'}${row.changeIntegral}`)
- },
+ {prop: 'changeIntegral', align: 'center', label: '变动积分',render:
+ (h, {row}) => h('p', `${row.integralCalcType == 1 ? '+' : '-'}${row.changeIntegral}`)},
{prop: 'nowIntegral', align: 'center', label: '剩余积分'},
{prop: 'eventDesc', label: '事件', width: 500}
]