From 1b26a5d01401091f733d3d0890ae6cd4edfac442 Mon Sep 17 00:00:00 2001 From: shijing Date: Tue, 11 Jun 2024 10:15:02 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=E6=A3=80=E9=AA=8C=E4=BA=BA=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inm/mioitem_check.vue | 2 +- src/views/qm/behavior_form.vue | 740 +++++++++++++++++++------------- src/views/qm/first_check.vue | 2 +- 3 files changed, 440 insertions(+), 304 deletions(-) diff --git a/src/views/inm/mioitem_check.vue b/src/views/inm/mioitem_check.vue index c4ebbfa0..7dec4d6c 100644 --- a/src/views/inm/mioitem_check.vue +++ b/src/views/inm/mioitem_check.vue @@ -863,7 +863,7 @@ export default { getUserList() { let that = this; this.$API.system.user.list - // .req({ page: 0, belong_dept__name: "检验管理部" }) + // .req({ page: 0,posts__name:'检验' }) .req({ page: 0 }) .then((res) => { that.userList = res; diff --git a/src/views/qm/behavior_form.vue b/src/views/qm/behavior_form.vue index 3b886bd2..bc25f4c3 100644 --- a/src/views/qm/behavior_form.vue +++ b/src/views/qm/behavior_form.vue @@ -1,310 +1,446 @@ - + diff --git a/src/views/qm/first_check.vue b/src/views/qm/first_check.vue index 8b8f8892..0f785e9f 100644 --- a/src/views/qm/first_check.vue +++ b/src/views/qm/first_check.vue @@ -280,7 +280,7 @@ export default { getUserList() { let that = this; this.$API.system.user.list - .req({ page: 0, depts__name: "检验管理部" }) + .req({ page: 0, posts__name: "检验" }) .then((res) => { that.userList = res.results; }); From 11ab06f162b94e6b1a0030f67969a0cfdbc445e2 Mon Sep 17 00:00:00 2001 From: shijing Date: Tue, 11 Jun 2024 10:15:17 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:=E6=A3=80=E9=AA=8C=E4=BA=BA=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qm/productCheck.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/qm/productCheck.vue b/src/views/qm/productCheck.vue index ec3d5dc0..7669bf2b 100644 --- a/src/views/qm/productCheck.vue +++ b/src/views/qm/productCheck.vue @@ -390,7 +390,7 @@ export default { getUserList() { let that = this; this.$API.system.user.list - .req({ page: 0, belong_dept__name: "检验管理部" }) + .req({ page: 0, posts__name: "检验" }) .then((res) => { that.userList = res; }); From 69b7d92105b78d27498d04ee03d3fd9914508efa Mon Sep 17 00:00:00 2001 From: caoqianming Date: Tue, 11 Jun 2024 11:16:42 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix:=20base=20=E5=AD=97=E5=85=B8=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=88=B7=E6=96=B0=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/sys/dict.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/sys/dict.vue b/src/views/sys/dict.vue index d0de04a4..d0a8929a 100644 --- a/src/views/sys/dict.vue +++ b/src/views/sys/dict.vue @@ -38,7 +38,7 @@ - + @@ -257,7 +257,7 @@ this.isSaveing = false; if(res.name){ this.visibleDicType = false; - this.getDic(); + this.getDicType(); this.$message.success("操作成功") }else{ this.$alert(res.message, "提示", {type: 'error'}) @@ -364,7 +364,7 @@ }else{ that.$message.success("操作成功"); that.visibleDicItem = false; - that.getDicType(); + that.$refs.table.refresh() } } }) From 90036784db3a878f4509f89e795aba320d66c9ba Mon Sep 17 00:00:00 2001 From: caoqianming Date: Tue, 11 Jun 2024 16:41:48 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix:=20exam=20=E8=BF=9B=E8=A1=8C=E4=B8=AD?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/edu/exam.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/edu/exam.vue b/src/views/edu/exam.vue index b34634f7..9f640bd6 100644 --- a/src/views/edu/exam.vue +++ b/src/views/edu/exam.vue @@ -37,7 +37,6 @@ > diff --git a/src/views/dpm/risk.vue b/src/views/dpm/risk.vue index 525580a3..7f06e526 100644 --- a/src/views/dpm/risk.vue +++ b/src/views/dpm/risk.vue @@ -9,11 +9,61 @@ hideDo style="height: 400px" > + + + + + + + + diff --git a/src/views/dpm/risk_form.vue b/src/views/dpm/risk_form.vue new file mode 100644 index 00000000..d57ea59b --- /dev/null +++ b/src/views/dpm/risk_form.vue @@ -0,0 +1,112 @@ + + \ No newline at end of file diff --git a/src/views/dpm/riskpoint.vue b/src/views/dpm/riskpoint.vue index 103562fb..593173c5 100644 --- a/src/views/dpm/riskpoint.vue +++ b/src/views/dpm/riskpoint.vue @@ -174,11 +174,14 @@ - + + + + - + + + + @@ -357,9 +366,10 @@ import { riskLevelEnum, manageLevelEnum, riskTypeEnum } from "@/utils/enum.js"; import Risk from "./risk.vue"; import CheckTaskSet from "./checktaskset.vue"; import MySchedule from "@/views/sys/myschedule.vue"; +import RiskForm from "./risk_form.vue"; const defaultForm = {}; export default { - components: { Risk, CheckTaskSet, MySchedule}, + components: { Risk, CheckTaskSet, MySchedule, RiskForm}, data() { return { riskTypeEnum, @@ -368,13 +378,14 @@ export default { formSaving: false, saveDialog: false, saveDialog2: false, + riskDialog: false, choseMyScheduleDialog: false, query: { search: "", }, apiObj: this.$API.dpm.riskpoint.list, saveForm: Object.assign({}, defaultForm), - saveForm2: {}, + saveForm2: {"expire": 0}, deptOptions: [], rowData: {}, xoptions: ["风险列表", "排查任务配置"], @@ -386,8 +397,27 @@ export default { this.getAreaOptions(); }, methods: { + updateRisk(row) { + this.riskDialog = true; + this.$nextTick(() => { + this.$refs.riskForm.setData(row); + }); + }, + riskConfirm(){ + this.riskDialog = false; + this.$refs.riskTable.handleQuery(); + }, + risk_add() { + this.riskDialog = true; + }, + scheduleChose(item){ + this.saveForm2.myschedule = item.id; + this.saveForm2.myschedule_name = item.name; + this.choseMyScheduleDialog = false; + }, checktaskset_add() { this.saveDialog2 = true; + this.saveForm2 = {"expire": 0}; }, rowClick(row) { this.rowData = row; @@ -426,7 +456,27 @@ export default { this.handleQuery(); }); }, + formSubmit2() { + this.$refs.saveForm2.validate((valid)=>{ + if(valid){ + this.formSaving = true; + this.$API.dpm.checktaskset.create + .req(this.saveForm2) + .then((res) => { + this.formSaving = false; + this.$message.success("创建成功"); + this.$refs.checktasksetTable.handleQuery(); + }) + .catch((err) => { + this.formSaving = false; + }); + } + }) + + }, formSubmit() { + this.$refs.saveForm.validate((valid) => { + if (valid) { this.formSaving = true; if (this.saveForm.id) { this.$API.dpm.riskpoint.update @@ -452,7 +502,8 @@ export default { .catch((err) => { this.formSaving = false; }); - } + }} + }); }, }, }; diff --git a/src/views/sys/myschedule.vue b/src/views/sys/myschedule.vue index 74e32552..8f29a37d 100644 --- a/src/views/sys/myschedule.vue +++ b/src/views/sys/myschedule.vue @@ -1,9 +1,9 @@