diff --git a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreManage.vue b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreManage.vue index dc57d9cf..f545c67c 100644 --- a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreManage.vue +++ b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreManage.vue @@ -53,14 +53,14 @@ @closed="form={},chooseUserList=[]"> - + v > 0 ? cb() : cb("请输入正数")}], + // integral: [{required: true, validator: (r, v, cb) => v > 0 ? cb() : cb("请输入正数")}, + // {pattern: /^(([0-9]\d*))(\.\d{0})?$/, message: '请输入正数', trigger: 'blur'}], + integral: [{required: true, message: '请输入积分', trigger: 'blur' }, + {pattern: /^([1-9]\d*|0)(\.\d{1,2})?$/, message: '请输入正数且最多只能保留两位小数'}], } }, }, @@ -283,7 +286,11 @@ export default { this.getTableData() this.dialog = false }) + } else { + this.flag = false } + }).catch(() => { + this.flag = false }) } }) @@ -309,5 +316,62 @@ export default { ::v-deep .ai-dialog .ai-dialog__content { overflow-y: hidden; } + + ::v-deep .selectCont .pagination { + width: 100%; + } + + .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; + } + } } \ No newline at end of file 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} ]