From e2cae6f6927c54efad1715ce3b2e7ae8fb76677d Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Mon, 15 Aug 2022 18:56:57 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=AD=A3=E6=95=B0?= =?UTF-8?q?=E6=9C=80=E5=A4=9A=E4=BF=9D=E7=95=99=E4=B8=A4=E4=BD=8D=E5=B0=8F?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/gridScoreManage.vue | 72 +++++++++++++++++-- .../creditScore/scoreSysUser/ssuDetail.vue | 6 +- 2 files changed, 70 insertions(+), 8 deletions(-) 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} ] From c3f7b017f5a89ba9ae95ec290c8c9dc08f94b08c Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Mon, 15 Aug 2022 18:59:40 +0800 Subject: [PATCH 02/16] =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppGridMemberScore/components/gridScoreManage.vue | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreManage.vue b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreManage.vue index f545c67c..969e3754 100644 --- a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreManage.vue +++ b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreManage.vue @@ -52,7 +52,7 @@ @onConfirm="onConfirm" @closed="form={},chooseUserList=[]"> - + @@ -62,17 +62,17 @@ - + - + - + @@ -147,8 +147,6 @@ 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("请输入正数")}, - // {pattern: /^(([0-9]\d*))(\.\d{0})?$/, message: '请输入正数', trigger: 'blur'}], integral: [{required: true, message: '请输入积分', trigger: 'blur' }, {pattern: /^([1-9]\d*|0)(\.\d{1,2})?$/, message: '请输入正数且最多只能保留两位小数'}], } From dc9e2278cc9210c636d2f4e726f9d409ff1e5c17 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Mon, 15 Aug 2022 20:22:02 +0800 Subject: [PATCH 03/16] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/gridScoreRules.vue | 30 ++++++------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreRules.vue b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreRules.vue index 5613e205..4114fe6e 100644 --- a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreRules.vue +++ b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreRules.vue @@ -107,7 +107,7 @@
- 取消 + 取消 确认
@@ -299,9 +299,6 @@ export default { this.getList(); }, onConfirm() { - // if(this.form.ruleType==1 && !this.form.ladderRule.length) { - // return this.$message.error('请添加规则') - // } this.$refs.DialogForm.validate((valid) => { if (valid) { let formData = this.$copy(this.form); @@ -424,14 +421,6 @@ export default { .post(`/app/appgirdinfo/listAll3`, null, null) .then((res) => { if (res.code == 0) { - // res.data.forEach((item)=>{ - // const isChecked = this.girdInfoList.find((checkedId)=>{ - // return item.id === checkedId - // }) - // if(isChecked) item.checkType = true - // }) - // console.log(res.data) - this.treeObj.treeList = this.girdToTree(res.data); this.girdInfoList.map((e) => { this.treeObj.checkedKeys.push(e.id); @@ -439,7 +428,7 @@ export default { this.$nextTick(() => { this.currCheckedKeys = this.girdInfoList; this.$nextTick(() => { - this.$refs.tree?.getCheckedKeys(this.currCheckedKeys); + this.$refs.tree?.setCheckedKeys(this.currCheckedKeys); }); }); } @@ -447,14 +436,13 @@ export default { }, onCheckChange(e) { - // this.$nextTick(() => { - // this.$refs.tree.getCheckedKeys().forEach(v => { - // this.$refs.tree.setChecked(v, false) - // }) - // this.$refs.tree.setChecked(e.id, true) - // }) - // console.log(e); - this.$refs.tree.setChecked(e.id, true); + this.girdInfoList.forEach((v) => { + if(v == e.id) { + this.$refs.tree.setChecked(e.id, false); + } else { + this.$refs.tree.setChecked(e.id, true); + } + }) }, }, computed: { From 0ee41d90469009a917dfd07b688c20c0d565966b Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Tue, 16 Aug 2022 09:40:23 +0800 Subject: [PATCH 04/16] 30828 --- .../components/gridScoreRules.vue | 35 ++++++++++++++----- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreRules.vue b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreRules.vue index 4114fe6e..19cc4c59 100644 --- a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreRules.vue +++ b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreRules.vue @@ -42,7 +42,7 @@ - + @@ -103,11 +103,13 @@
- + +
- 取消 + 取消 确认
@@ -187,14 +189,17 @@ export default { systemRuleId: [ { required: true, message: "请选择事件/类型", trigger: "change" }, ], + ruleName: [ + { required: true, message: "请输入自定义事件", trigger: "change" }, + ], scoringCycle: [ { required: true, message: "请选择周期范围", trigger: "change" }, ], integral: [ { required: true, - pattern: /^\d*[.\d]\d?$/, - message: "请输入积分分值,最多保留一位小数", + pattern: /^([1-9]\d*|0)(\.\d{1,2})?$/, + message: "请输入积分分值,最多保留两位小数", }, ], validRangeType: [ @@ -214,6 +219,8 @@ export default { defaultProps: { label: "girdName", value: "id", + children: 'children', // 节点是否拥有子节点 + isLeaf: 'leaf' }, checkedKeys: [], }, @@ -417,9 +424,7 @@ export default { beforeSelectTree() { this.treeObj.checkedKeys = []; - this.instance - .post(`/app/appgirdinfo/listAll3`, null, null) - .then((res) => { + this.instance.post(`/app/appgirdinfo/listAll3`, null, null).then((res) => { if (res.code == 0) { this.treeObj.treeList = this.girdToTree(res.data); this.girdInfoList.map((e) => { @@ -434,6 +439,20 @@ export default { } }); }, + // el-tree懒加载 + loadNode(node, resolve) { + if (node.level === 0) { + this.instance.post('').then((res) => { + + }) + let arr = node.childNodes; + return resolve(arr); + } + if (node.level >= 1) { + let arr1 = node.data.children + return resolve(arr1); + } + }, onCheckChange(e) { this.girdInfoList.forEach((v) => { From c4214725bee0742fd3b7f3b6cf39eef5835a2f0a Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Tue, 16 Aug 2022 09:43:21 +0800 Subject: [PATCH 05/16] 30826 --- .../AppGridMemberScore/components/gridScoreRules.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreRules.vue b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreRules.vue index 19cc4c59..63b3b781 100644 --- a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreRules.vue +++ b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreRules.vue @@ -43,7 +43,7 @@ - + From 960f5c494066d8436d9647ea08bee8881c7c3959 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Tue, 16 Aug 2022 09:44:32 +0800 Subject: [PATCH 06/16] 30830 --- .../AppGridMemberScore/components/gridScoreRules.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreRules.vue b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreRules.vue index 63b3b781..b7a80d2d 100644 --- a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreRules.vue +++ b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreRules.vue @@ -272,7 +272,7 @@ export default { }); }, remove(id) { - this.$confirm("删除后不可恢复，是否要删除该事项？", { + this.$confirm("删除后不可恢复，是否要删除该规则？", { type: "error", }).then(() => { this.instance From f7964ebe60f3c0753e7bfd7362b0f77ab68252e9 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Tue, 16 Aug 2022 10:49:10 +0800 Subject: [PATCH 07/16] 30832 30821 --- .../components/gridScoreManage.vue | 13 ++++++++----- .../components/gridScoreRules.vue | 18 +++++++++++++++--- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreManage.vue b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreManage.vue index 969e3754..3de1a713 100644 --- a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreManage.vue +++ b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreManage.vue @@ -135,7 +135,7 @@ export default { colConfigs() { return [ { prop: "userName", label: '姓名', align: "left", }, - { prop: "girdName", label: '所属网格', align: "center", }, + { prop: "girdName", label: '所属网格' }, { slot: "integral", label: '积分余额', align: "center", }, { slot: "totalIntegral", label: '累计积分', align: "center", }, { slot: "usedIntegral", label: '已用积分', align: "center", }, @@ -148,7 +148,7 @@ export default { eventDesc: [{required: true, message: '请输入调整说明', trigger: 'blur'}], integralCalcType: [{required: true, message: '请选择类型', trigger: 'change'}], integral: [{required: true, message: '请输入积分', trigger: 'blur' }, - {pattern: /^([1-9]\d*|0)(\.\d{1,2})?$/, message: '请输入正数且最多只能保留两位小数'}], + {pattern: /(^[1-9]{1}[0-9]*$)|(^[0-9]*\.[0-9]{2}$)/, message: '请输入正数且最多只能保留两位小数'}], } }, }, @@ -315,9 +315,7 @@ export default { overflow-y: hidden; } - ::v-deep .selectCont .pagination { - width: 100%; - } + .userlist { display: inline-block; @@ -371,5 +369,10 @@ export default { text-overflow: ellipsis; } } + + ::v-deep .aipersonselect .ai-personselect .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 b7a80d2d..6ca28640 100644 --- a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreRules.vue +++ b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreRules.vue @@ -198,7 +198,7 @@ export default { integral: [ { required: true, - pattern: /^([1-9]\d*|0)(\.\d{1,2})?$/, + pattern: /(^[1-9]{1}[0-9]*$)|(^[0-9]*\.[0-9]{2}$)/, message: "请输入积分分值,最多保留两位小数", }, ], @@ -234,6 +234,7 @@ export default { this.getList(); this.getRulesList(); this.beforeSelectTree(); + this.getList12() }); }, methods: { @@ -442,8 +443,10 @@ export default { // el-tree懒加载 loadNode(node, resolve) { if (node.level === 0) { - this.instance.post('').then((res) => { - + this.instance.post('/app/appgirdinfo/listBy12').then((res) => { + if(res?.data) { + console.log(this.girdToTree(res.data)) + } }) let arr = node.childNodes; return resolve(arr); @@ -454,6 +457,15 @@ export default { } }, + // 加载一二级数据 + getList12() { + this.instance.post('/app/appgirdinfo/listBy12').then((res) => { + if(res?.data) { + console.log(this.girdToTree(res.data)) + } + }) + }, + onCheckChange(e) { this.girdInfoList.forEach((v) => { if(v == e.id) { From baed2d91b7a275c48f8dc5cb477c15dabde420ad Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Tue, 16 Aug 2022 11:00:43 +0800 Subject: [PATCH 08/16] 30839 --- .../AppGridMemberScore/components/gridScoreRules.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreRules.vue b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreRules.vue index 6ca28640..e8800e99 100644 --- a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreRules.vue +++ b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreRules.vue @@ -82,7 +82,7 @@ - + @@ -230,7 +230,8 @@ export default { }; }, created() { - this.$dict.load("integralRuleStatus","integralRuleRuleType","integralRuleScoringCycle","integralRuleEvent","integralRuleEventType").then(() => { + this.$dict.load("integralRuleStatus","integralRuleRuleType","integralRuleScoringCycle", + "integralRuleEvent","integralRuleEventType").then(() => { this.getList(); this.getRulesList(); this.beforeSelectTree(); From 16c4b2dfa730edfa7d1e31194fab0c114cd5253e Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Tue, 16 Aug 2022 11:36:29 +0800 Subject: [PATCH 09/16] table --- .../components/gridScoreManage.vue | 23 ++++--------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreManage.vue b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreManage.vue index 3de1a713..47047a36 100644 --- a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreManage.vue +++ b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreManage.vue @@ -20,21 +20,6 @@ - - - - - - - - -