From 8ef82898c7f113d9279781eaf762afe3f60c1e49 Mon Sep 17 00:00:00 2001 From: Qin Dong Ming <2720806930@qq.com> Date: Sun, 25 Aug 2024 11:00:06 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/engine/engine/index.vue | 200 +++++++++--------------------- 1 file changed, 56 insertions(+), 144 deletions(-) diff --git a/src/views/engine/engine/index.vue b/src/views/engine/engine/index.vue index 3608abb..95d80bb 100644 --- a/src/views/engine/engine/index.vue +++ b/src/views/engine/engine/index.vue @@ -32,106 +32,59 @@ - - - - - - - - + 新增 + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {{ dict.label }} - - - - - - - - {{ dict.label }} - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- 确 定 - 取 消 + 取 消 + 确 定
+ + @@ -188,7 +141,7 @@ icon="el-icon-service" size="mini" type="text" - @click="handUpdate(scope.row)">规则维护 + @click="handUpdate(scope.row.id)">规则维护 @@ -262,37 +215,9 @@ export default { engine:{ }, - // 弹出层标题 - title: "", arr:[], dialogFormVisible:false, - total:0, - rules: { - name: [ - {required: true, message: "规则名称不能为空", trigger: "blur"} - ], - type: [ - {required: true, message: "规则类型不能为空", trigger: "change"} - ], - engineCode: [ - {required: true, message: "规则编码不能为空", trigger: "blur"} - ], - scope: [ - {required: true, message: "规则级别不能为空", trigger: "change"} - ], - isActivate: [ - {required: true, message: "是否激活不能为空", trigger: "change"} - ], - status: [ - {required: true, message: "规则状态不能为空", trigger: "change"} - ], - createBy: [ - {required: true, message: "创建者不能为空", trigger: "blur"} - ], - createTime: [ - {required: true, message: "创建时间不能为空", trigger: "blur"} - ], - } + total:0 }; }, //计算属性 类似于data概念", @@ -301,41 +226,23 @@ export default { watch: {}, //方法集合", methods: { - /** 提交按钮 */ - submitForm() { - this.$refs["form"].validate(valid => { - if (valid) { - if (this.form.id != null) { - update(this.form).then(response => { - this.$modal.msgSuccess("修改成功"); - this.getList(); - this.open = false; - }) - } else { - insert(this.form).then(response => { - this.$modal.msgSuccess("新增成功"); - this.getList(); - this.open = false; - }) - } - } - }); - }, handleSizeChange(val) { console.log(`每页 ${val} 条`); this.engineReq.pageSize = val; this.findSelectSourceList(); }, - // 取消按钮 - cancel() { - this.open = false; - this.reset(); - }, handleCurrentChange(val) { console.log(`当前页: ${val}`); this.engineReq.pageNum = val; this.findSelectSourceList(); }, + insert(){ + this.dialogFormVisible = true + insert(this.engine).then(res =>{ + this.$message.success(res.msg || "添加成功") + }) + this.engine = {} + }, findSelectSourceList(){ selectEngineList(this.engineReq).then(res=>{ this.arr=res.data.list; @@ -347,6 +254,11 @@ export default { this.$message.success(res.msg || "删除成功") }) }, + handUpdate(){ + update(this.engine).then(res =>{ + this.$message.success(res.msg || "修改成功") + }) + }, findSelectSourceExport(){ this.download('engine/engine/export', { ...this.engineReq From 81689fc7768b86cc3a3a88abce1cf6a7830bb624 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E8=B1=AA?= <1437200870@qq.com> Date: Sun, 25 Aug 2024 11:17:18 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=B5=8B=E8=AF=95=EF=BC=9A=E5=89=8D?= =?UTF-8?q?=E5=8F=B0=E4=BB=BB=E5=8A=A1=E8=AE=BE=E8=AE=A1=E9=9B=8F=E5=BD=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/task/task/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/task/task/index.vue b/src/views/task/task/index.vue index 8806ad1..1fc3495 100644 --- a/src/views/task/task/index.vue +++ b/src/views/task/task/index.vue @@ -370,6 +370,7 @@ export default { this.taskInputList(); }, + addTaskInput(){ this.taskInputAdd = false; this.findByInputId(); From 2cbe0231083133aefd92f74bd5b9836c58ccc01a Mon Sep 17 00:00:00 2001 From: wxy <14293288+zysysys@user.noreply.gitee.com> Date: Sun, 25 Aug 2024 11:31:03 +0800 Subject: [PATCH 3/7] =?UTF-8?q?```feat(payment):=20=E5=AE=9E=E7=8E=B0?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E6=94=AF=E4=BB=98=E9=A1=B5=E9=9D=A2=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 新增支付页面，包含支付金额和支付方式的选择。支持自定义金额及支付宝、微信支付方式。点击“确认支付”按钮后，根据支付方式执行相应的操作，目前仅模拟支付宝支付成功的结果。 ``` --- src/views/money/pay/index.vue | 135 ++++++++++++++++++++++++++++++++++ 1 file changed, 135 insertions(+) create mode 100644 src/views/money/pay/index.vue diff --git a/src/views/money/pay/index.vue b/src/views/money/pay/index.vue new file mode 100644 index 0000000..71b367c --- /dev/null +++ b/src/views/money/pay/index.vue @@ -0,0 +1,135 @@ + + + + + From bd9e302e52036a06ce9c1707c9d28938ea985577 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E8=B1=AA?= <1437200870@qq.com> Date: Sun, 25 Aug 2024 11:41:39 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E6=B5=8B=E8=AF=95=EF=BC=9A=E5=89=8D?= =?UTF-8?q?=E5=8F=B0=E4=BB=BB=E5=8A=A1=E8=AE=BE=E8=AE=A1=E9=9B=8F=E5=BD=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/task/task/index.vue | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/src/views/task/task/index.vue b/src/views/task/task/index.vue index 1fc3495..4e8d9b0 100644 --- a/src/views/task/task/index.vue +++ b/src/views/task/task/index.vue @@ -189,28 +189,28 @@ - + - + - + - + - +
取 消 - 下一步 + 下一步
@@ -340,6 +340,7 @@ export default { taskInputReq:{}, taskList:[], taskInfoList:[], + taskInfo:{}, tableList:[], structureList:[], }; @@ -350,9 +351,14 @@ export default { watch: {}, //方法集合", methods: { + //选择数据表改变数据 + changeTableName(row){ + this.taskInfo = row; + }, + //查询字段 - findByInputId(row){ - findByInputId(row.id).then(res=>{ + findByInputId(taskInfo){ + findByInputId(taskInfo.id).then(res=>{ this.structureList = res.data; }) @@ -371,9 +377,9 @@ export default { }, - addTaskInput(){ + addTaskInput(taskInfo){ this.taskInputAdd = false; - this.findByInputId(); + this.findByInputId(taskInfo); this.taskInputFieldAdd = true; }, From badc198cdedf7f7f2c89c3d6e04f66de1168f682 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E8=B1=AA?= <1437200870@qq.com> Date: Sun, 25 Aug 2024 11:45:16 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=B5=8B=E8=AF=95=EF=BC=9A=E5=89=8D?= =?UTF-8?q?=E5=8F=B0=E4=BB=BB=E5=8A=A1=E8=AE=BE=E8=AE=A1=E9=9B=8F=E5=BD=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/task/task/index.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/task/task/index.vue b/src/views/task/task/index.vue index 4e8d9b0..9b9cea7 100644 --- a/src/views/task/task/index.vue +++ b/src/views/task/task/index.vue @@ -187,7 +187,7 @@ - + @@ -353,6 +353,7 @@ export default { methods: { //选择数据表改变数据 changeTableName(row){ + console.log(row); this.taskInfo = row; }, From d3659e5468609390c82df65afa27adabb336ef90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E8=B1=AA?= <1437200870@qq.com> Date: Sun, 25 Aug 2024 11:47:30 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E6=B5=8B=E8=AF=95=EF=BC=9A=E5=89=8D?= =?UTF-8?q?=E5=8F=B0=E4=BB=BB=E5=8A=A1=E8=AE=BE=E8=AE=A1=E9=9B=8F=E5=BD=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/task/task/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/task/task/index.vue b/src/views/task/task/index.vue index 9b9cea7..b8fcd94 100644 --- a/src/views/task/task/index.vue +++ b/src/views/task/task/index.vue @@ -199,7 +199,7 @@ - + From f4d9897c2dfeaaa395998bb0e372563cbdffec9d Mon Sep 17 00:00:00 2001 From: lwj <3529558005@qq.com> Date: Sun, 25 Aug 2024 11:48:51 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=BA=90=E5=88=97=E8=A1=A8=E7=9A=84=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/etl/switch/index.vue | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/src/views/etl/switch/index.vue b/src/views/etl/switch/index.vue index 6d7ff59..a737215 100644 --- a/src/views/etl/switch/index.vue +++ b/src/views/etl/switch/index.vue @@ -136,16 +136,16 @@ 其他信息 - - - - - - - - - - + + + {{ dict.label }} + + + @@ -210,7 +210,10 @@ + prop="status"> +