diff --git a/src/assets/images/base/del.png b/src/assets/images/base/del.png new file mode 100644 index 0000000..1220ca5 Binary files /dev/null and b/src/assets/images/base/del.png differ diff --git a/src/assets/images/base/edit.png b/src/assets/images/base/edit.png new file mode 100644 index 0000000..438b273 Binary files /dev/null and b/src/assets/images/base/edit.png differ diff --git a/src/assets/images/team/09091备份.png b/src/assets/images/team/111.png similarity index 100% rename from src/assets/images/team/09091备份.png rename to src/assets/images/team/111.png diff --git a/src/assets/images/team/indicate.png b/src/assets/images/team/indicate.png new file mode 100644 index 0000000..fc667c9 Binary files /dev/null and b/src/assets/images/team/indicate.png differ diff --git a/src/assets/images/team/urBody.png b/src/assets/images/team/urBody.png new file mode 100644 index 0000000..920182b Binary files /dev/null and b/src/assets/images/team/urBody.png differ diff --git a/src/assets/images/team/urHead.png b/src/assets/images/team/urHead.png new file mode 100644 index 0000000..01d3b03 Binary files /dev/null and b/src/assets/images/team/urHead.png differ diff --git a/src/assets/images/team/编组 7.png b/src/assets/images/team/urjj.png similarity index 100% rename from src/assets/images/team/编组 7.png rename to src/assets/images/team/urjj.png diff --git a/src/assets/images/team/按钮(红).png b/src/assets/images/team/urjjbtn.png similarity index 100% rename from src/assets/images/team/按钮(红).png rename to src/assets/images/team/urjjbtn.png diff --git a/src/assets/images/team/编组 9.png b/src/assets/images/team/urnode.png similarity index 100% rename from src/assets/images/team/编组 9.png rename to src/assets/images/team/urnode.png diff --git a/src/assets/images/team/编组 16.png b/src/assets/images/team/uryb.png similarity index 100% rename from src/assets/images/team/编组 16.png rename to src/assets/images/team/uryb.png diff --git a/src/assets/images/team/urybbtn.png b/src/assets/images/team/urybbtn.png new file mode 100644 index 0000000..82542e6 Binary files /dev/null and b/src/assets/images/team/urybbtn.png differ diff --git a/src/assets/images/team/编组 8 (1).png b/src/assets/images/team/urzd.png similarity index 100% rename from src/assets/images/team/编组 8 (1).png rename to src/assets/images/team/urzd.png diff --git a/src/assets/images/team/按钮(黄).png b/src/assets/images/team/urzdbtn.png similarity index 100% rename from src/assets/images/team/按钮(黄).png rename to src/assets/images/team/urzdbtn.png diff --git a/src/assets/images/team/矩形.png b/src/assets/images/team/矩形.png new file mode 100644 index 0000000..f1e4c29 Binary files /dev/null and b/src/assets/images/team/矩形.png differ diff --git a/src/assets/images/team/编组 10.png b/src/assets/images/team/编组 10.png new file mode 100644 index 0000000..f204cf4 Binary files /dev/null and b/src/assets/images/team/编组 10.png differ diff --git a/src/loveflow/assets/reset.scss b/src/loveflow/assets/reset.scss index 53b5937..ca341dd 100644 --- a/src/loveflow/assets/reset.scss +++ b/src/loveflow/assets/reset.scss @@ -216,6 +216,18 @@ background: url("~@/assets/images/base/plus.png") no-repeat center center; background-size: 100% 100%; } + .delIcon { + height: vw(14); + width: vw(14); + background: url("~@/assets/images/base/del.png") no-repeat center center; + background-size: 100% 100%; + } + .editIcon { + height: vw(14); + width: vw(14); + background: url("~@/assets/images/base/edit.png") no-repeat center center; + background-size: 100% 100%; + } .addBtn { padding: vw(8) vw(18); font-size: vw(14); @@ -249,4 +261,26 @@ cursor: pointer; } } + .commonBtn { + padding: vw(12) vw(22); + font-size: vw(14); + color: #ffffff; + background: url("~@/assets/images/base/delbtn.png") no-repeat center center; + background-size: 100% 100%; + &:hover { + opacity: 0.8; + cursor: pointer; + } + } + + .resetStyle { + .el-select { + .el-input__inner { + border: none; + background: url("~@/assets/images/base/selectb.png") no-repeat center + center; + background-size: 100% 100%; + } + } + } } diff --git a/src/loveflow/components/modal/formDialog.vue b/src/loveflow/components/modal/formDialog.vue index a121f07..4220878 100644 --- a/src/loveflow/components/modal/formDialog.vue +++ b/src/loveflow/components/modal/formDialog.vue @@ -4,6 +4,7 @@ :visible.sync="dialogVisible" :width="width" :before-close="handleClose" + :close-on-click-modal="false" > +
+
+
+
+ 返回 +
+
+
+
+
+
处置方式:
+
{{ info.way }}
+
+
+
+
+
处置流程:
+
{{ info.nr }}
+
+
+
+
+
任务单:
+
+
+
+
{{ info.task }}
+
+
+
+
+
新增模板
+
+
+
+
编辑
+
+ + +
+
+
删除
+
+
+
+
+
+
+
+
+ + +
+ + + diff --git a/src/views/enterpriseTeamWork/tipSet/index.vue b/src/views/enterpriseTeamWork/tipSet/index.vue index 8ea5269..db8a619 100644 --- a/src/views/enterpriseTeamWork/tipSet/index.vue +++ b/src/views/enterpriseTeamWork/tipSet/index.vue @@ -27,6 +27,7 @@ import msgPushModel from "./msgPushModel.vue"; 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"; export default { @@ -35,6 +36,7 @@ export default { msgPush, urgencyWrap, dealWay, + dealWayCreate, dealRequire, msgPushDetail, msgPushModel, @@ -66,6 +68,7 @@ export default { }, methods: { tabChange(val) { + console.log("主页tab:", val); if (val == "1") { this.content = msgPush; } @@ -87,6 +90,9 @@ export default { if (val == "3") { this.content = dealWay; } + if (val == "31") { + this.content = dealWayCreate; + } if (val == "4") { this.content = dealRequire; } diff --git a/src/views/enterpriseTeamWork/tipSet/urNodeWrap.vue b/src/views/enterpriseTeamWork/tipSet/urNodeWrap.vue new file mode 100644 index 0000000..527f3ba --- /dev/null +++ b/src/views/enterpriseTeamWork/tipSet/urNodeWrap.vue @@ -0,0 +1,107 @@ + + + + diff --git a/src/views/enterpriseTeamWork/tipSet/urgency.vue b/src/views/enterpriseTeamWork/tipSet/urgency.vue index e69de29..94838a6 100644 --- a/src/views/enterpriseTeamWork/tipSet/urgency.vue +++ b/src/views/enterpriseTeamWork/tipSet/urgency.vue @@ -0,0 +1,270 @@ + + +