From 74810344e25136422601f76fe25388d8c0f2fca1 Mon Sep 17 00:00:00 2001 From: loveflow <5269966+loveflow@user.noreply.gitee.com> Date: Thu, 21 Mar 2024 23:55:04 +0800 Subject: [PATCH] update --- src/loveflow/assets/reset.less | 33 ++- src/loveflow/mixins/commonMixins.js | 22 ++ .../enterpriseTeamWork/tipSet/dealWay.vue | 16 +- .../tipSet/dealWayCreate.vue | 250 ++++++++++++++---- src/views/enterpriseTeamWork/tipSet/index.vue | 13 +- 5 files changed, 269 insertions(+), 65 deletions(-) diff --git a/src/loveflow/assets/reset.less b/src/loveflow/assets/reset.less index 18e5cb5..e964780 100644 --- a/src/loveflow/assets/reset.less +++ b/src/loveflow/assets/reset.less @@ -294,7 +294,7 @@ } } } - .formOptWrap{ + .formOptWrap { display: flex; justify-content: flex-end; } @@ -375,6 +375,37 @@ } } } + + .el-form { + height: calc(100% - 36px); + overflow-y: scroll; + &::-webkit-scrollbar { + display: none; + } + .el-form-item { + .el-form-item__label { + color: #fff; + line-height: 40px; + padding: 0 0 4px; + } + .el-form-item__content { + .el-textarea__inner, + .el-input__inner { + border-radius: 0px; + border: 0.5px solid; + background: #3c4b4a; + color: #fff; + border-color: #5b748c; + } + + /* 查询框点击颜色变化 */ + .el-input__inner:focus, + .el-input__inner:hover { + border-color: #5b748c; + } + } + } + } } .canvasDefault { diff --git a/src/loveflow/mixins/commonMixins.js b/src/loveflow/mixins/commonMixins.js index 61467f2..8c32826 100644 --- a/src/loveflow/mixins/commonMixins.js +++ b/src/loveflow/mixins/commonMixins.js @@ -191,6 +191,28 @@ export const commonMixins = { }, ], dealWayList: [ + { + name: "企业提醒", + value: "1", + }, + { + name: "核实消警", + value: "2", + }, + { + name: "现场核实", + value: "3", + }, + { + name: "现场检查", + value: "4", + }, + { + name: "行政处罚", + value: "5", + }, + ], + dealRequire: [ { name: "自动反馈", value: "1", diff --git a/src/views/enterpriseTeamWork/tipSet/dealWay.vue b/src/views/enterpriseTeamWork/tipSet/dealWay.vue index cc06e2b..08cd5b4 100644 --- a/src/views/enterpriseTeamWork/tipSet/dealWay.vue +++ b/src/views/enterpriseTeamWork/tipSet/dealWay.vue @@ -41,7 +41,9 @@
处置方式：
-
{{ item.way }}
+
+ +
@@ -55,7 +57,8 @@
任务单：
@@ -64,7 +67,8 @@
行政处罚：
@@ -191,6 +195,8 @@ export default { }, ], delArr: [], + taskIcon: require("@/assets/images/team/taskb.png"), + punishIcon: require("@/assets/images/team/cfab.png"), }; }, mounted() { @@ -204,7 +210,7 @@ export default { this.dataSource.push({ cmy: "宁波镇海兴达化工有限公司" + i, id: i, - way: "企业提醒", + dealWay: i % 6 || "1", nr: "您好！X年X月X日，贵单位的XXXXXXXX证书将过期，需及时处置。", taskI: require("@/assets/images/team/taskb.png"), cfaI: require("@/assets/images/team/cfab.png"), @@ -217,7 +223,7 @@ export default { //this.$refs.formDialog.openDialog("other", {}, "推送规则设置"); }, edit(obj) { - this.$refs.formDialog.openDialog("other", obj, "编辑推送规则设置"); + this.$emit("tabChange", "31", { info: obj }); }, selectDel(obj) { let id = obj.id; diff --git a/src/views/enterpriseTeamWork/tipSet/dealWayCreate.vue b/src/views/enterpriseTeamWork/tipSet/dealWayCreate.vue index 40d730a..426f749 100644 --- a/src/views/enterpriseTeamWork/tipSet/dealWayCreate.vue +++ b/src/views/enterpriseTeamWork/tipSet/dealWayCreate.vue @@ -7,54 +7,110 @@
-
-
-
处置方式：
-
{{ info.way }}
+ +
+ + + + + + + + + + + +
-
-
-
-
处置流程：
-
{{ info.nr }}
+
+ + + + + + + + +
-
-
-
-
任务单：
-
-
-
-
{{ info.task }}
-
-
-
-
-
新增模板
-
-
-
-
编辑
-
- - + + + -
-
-
删除
-
- -
+ + + + + + + + + +
+
+ + + + + + +
+
+
新增模板
-
+
+ + + + + + +
+
+
新增模板
+
+
+
{ + return {}; + }, + }, + }, data() { return { + taskList: [ + { + name: "任务单1", + value: "1", + }, + { + name: "任务单2", + value: "2", + }, + { + name: "任务单3", + value: "3", + }, + ], + punishList: [ + { + name: "行政处罚单1", + value: "1", + }, + { + name: "行政处罚单2", + value: "2", + }, + { + name: "行政处罚单3", + value: "3", + }, + ], + wayForm: { + risk: "", + ys: "", + dealWay: "", + unit: "", + isTask: "", + isPunish: "", + task: "", + punish: "", + }, formItems: [ { type: "select", @@ -108,16 +210,15 @@ export default { }, }, { - type: "select", + type: "input", itemAttrs: { label: "处置方式", span: 12, rules: this.$rules.requiredItem, }, attrs: { - model: "way", + model: "dealWay", value: "", - option: [], style: { width: "100%", paddingRight: "16px", @@ -169,19 +270,12 @@ export default { }, ], backIcon: require("@/assets/images/topic/left.png"), - info: { - task: "任务单", - way: "企业提醒", - nr: "以任务单形式派发给指定工作人员，工作人员将处置结果以及企业整改结果反馈到系统中以办结业务", - }, - checkIconActive: false, }; }, mounted() { this.setFindItem("formItems", "risk").attrs.option = this.riskList; this.setFindItem("formItems", "ys").attrs.option = this.elementList; - this.setFindItem("formItems", "way").attrs.option = this.dealWayList; this.setFindItem("formItems", "unit").attrs.option = this.unitList; }, methods: { @@ -191,8 +285,48 @@ export default { selectDel() { this.checkIconActive = !this.checkIconActive; }, - add() { - this.$refs.formDialog.openDialog("other", {}, "推送规则设置"); + addTask() { + if (this.judge()) { + this.$refs.formDialog.openDialog("other", this.wayForm, "任务单模板"); + } + }, + judge() { + if (!this.wayForm.risk) { + this.$message({ + message: "请选择风险类型", + }); + + return false; + } + if (!this.wayForm.ys) { + this.$message({ + message: "请选择要素异常", + }); + return false; + } + if (!this.wayForm.dealWay) { + this.$message({ + message: "请输入处置方式", + }); + return false; + } + if (!this.wayForm.unit) { + this.$message({ + message: "请选择监管单位", + }); + return false; + } + + return true; + }, + addPunish() { + if (this.judge()) { + this.$refs.formDialog.openDialog( + "other", + this.wayForm, + "行政处罚单模板" + ); + } }, edit(obj) { this.$refs.formDialog.openDialog("other", obj, "编辑推送规则设置"); @@ -222,7 +356,6 @@ export default { } .dealWayCreateWrap { padding: vw(16); - height: vw(160); background: url("~@/assets/images/team/urHead.png") no-repeat center center; background-size: 100% 100%; display: flex; @@ -231,6 +364,11 @@ export default { .line { display: flex; align-items: center; + .addBtn { + margin-left: 20px; + height: 40px; + margin-bottom: 26px; + } .item { flex: 1; display: flex; diff --git a/src/views/enterpriseTeamWork/tipSet/index.vue b/src/views/enterpriseTeamWork/tipSet/index.vue index db8a619..9e47e1e 100644 --- a/src/views/enterpriseTeamWork/tipSet/index.vue +++ b/src/views/enterpriseTeamWork/tipSet/index.vue @@ -12,7 +12,11 @@ >
- +
@@ -28,7 +32,7 @@ import msgPushModelDd from "./msgPushModelDd.vue"; import urgencyWrap from "./urgency.vue"; import dealWay from "./dealWay.vue"; import dealWayCreate from "./dealWayCreate.vue"; -import dealRequire from "./msgPush.vue"; +import dealRequire from "./dealRequire.vue"; export default { components: { @@ -64,11 +68,14 @@ export default { ], curTab: "1", content: "msgPush", + info: {}, }; }, methods: { - tabChange(val) { + tabChange(val, obj) { console.log("主页tab:", val); + console.log("主页obj:", obj); + this.info = obj || {}; if (val == "1") { this.content = msgPush; }