From 25b4572ec8930ecb4c9b10097ea61fcfe8f793c2 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Mon, 20 Jun 2022 16:59:20 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=A7=AF=E5=88=86?= =?UTF-8?q?=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apps/AppScoreRules/AppScoreRules.vue | 183 ++++++++++++++---- 1 file changed, 147 insertions(+), 36 deletions(-) diff --git a/project/sanjianxi/apps/AppScoreRules/AppScoreRules.vue b/project/sanjianxi/apps/AppScoreRules/AppScoreRules.vue index 6f3088f7..aab80f9a 100644 --- a/project/sanjianxi/apps/AppScoreRules/AppScoreRules.vue +++ b/project/sanjianxi/apps/AppScoreRules/AppScoreRules.vue @@ -6,6 +6,7 @@ + 暂无应用权限 - + +
- + + + - - -
- 添加 - - - - - - - - - - - - - + + + + + + + 常规 + 区间 + 阶梯 + - + + + + + + + + + + +
+
+ +
+
+ 至 +
+
+ +
+
+ + + + 添加 + + + + + 删除 + + + + + + + + + + + + + + + + +
+ 取 消 + 提交 +
+
+ + + @@ -152,6 +207,11 @@ export default { {prop: "status", label: "状态", align: "center", width: 96, dict: "integralRuleStatus"}, {slot: "options", label: "操作", align: "center"}, ], + integralConfigs: [ + {prop: "event", label: "加分项", dict: "integralRuleEvent"}, + {prop: "event", label: "获得积分", dict: "integralRuleEvent"}, + {slot: "options", label: "操作", align: "center"}, + ], tableData: [], dialog: false, form: {ladderRule: []}, @@ -161,7 +221,12 @@ export default { integral: [{required: true, pattern: /^\d*[.\d]\d?$/, message: "请输入积分分值,最多保留一位小数"}], numberLimit: [{pattern: /^\d*$/, message: "请输入正整数"}] }, - cacheOps: [] + cacheOps: [], + integralFrom: '', + integralTo: '', + integralData: [], + innerVisible: false, + forms: {}, }; }, created() { @@ -198,6 +263,19 @@ export default { }) }) }, + + typeChange() { + this.form.integral = '' + }, + + handleInputFrom(event) { + this.$emit('focusfrom', event) + }, + + handleInputTo(event) { + this.$emit('blurto', event) + }, + remove(id) { this.$confirm("删除后不可恢复，是否要删除该事项？", { type: 'error' @@ -299,5 +377,38 @@ export default { } } } + + + ::v-deep .el-input--mini .el-input__inner { + border: 0px; + margin: 0; + padding: 0 15px; + background-color: transparent; + } + .input-number-range { + background-color: #fff; + border: 1px solid #dcdfe6; + border-radius: 4px; + } + + .flex { + display: flex; + flex-direction: row; + width: 100%; + // justify-content: space-between; + align-items: center; + + .center { + margin: 0 20px; + margin-top: 1px; + } + } + .is-disabled { + background-color: #eef0f6; + border-color: #e4e7ed; + color: #c0c4cc; + cursor: not-allowed; + } + } From 7db8828e0b272679fc326e6526c82ce359fdad41 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Mon, 20 Jun 2022 17:44:13 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=A7=AF=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- project/sanjianxi/apps/AppPartyScoreFlow/AppPartyScoreFlow.vue | 2 +- project/sanjianxi/apps/AppScoreRules/AppScoreRules.vue | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/project/sanjianxi/apps/AppPartyScoreFlow/AppPartyScoreFlow.vue b/project/sanjianxi/apps/AppPartyScoreFlow/AppPartyScoreFlow.vue index 8c2a5991..59e99e85 100644 --- a/project/sanjianxi/apps/AppPartyScoreFlow/AppPartyScoreFlow.vue +++ b/project/sanjianxi/apps/AppPartyScoreFlow/AppPartyScoreFlow.vue @@ -10,7 +10,7 @@ import PsfList from "./psfList"; export default { name: "AppPartyScoreFlow", components: {PsfList}, - label: "党员积分明细(三涧溪)", + label: "积分明细(三涧溪)", props: { instance: Function, dict: Object, diff --git a/project/sanjianxi/apps/AppScoreRules/AppScoreRules.vue b/project/sanjianxi/apps/AppScoreRules/AppScoreRules.vue index aab80f9a..84ce589a 100644 --- a/project/sanjianxi/apps/AppScoreRules/AppScoreRules.vue +++ b/project/sanjianxi/apps/AppScoreRules/AppScoreRules.vue @@ -126,7 +126,6 @@ 添加 -