From d14be1201051f2874ff7ecbb828574b8aec0e08d Mon Sep 17 00:00:00 2001
From: zxy <353513737@qq.com>
Date: Sat, 17 Feb 2024 17:31:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E6=B7=BB=E5=8A=A0=E4=BC=81?=
=?UTF-8?q?=E4=B8=9A=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/tenant/works/Dialog/CopyMission.vue | 48 ++--
src/views/tenant/works/Table/missionView.vue | 6 +-
src/views/util/mission-view.vue | 35 ++-
src/views/util/work-view.vue | 259 ++++++++++++++++++
4 files changed, 319 insertions(+), 29 deletions(-)
create mode 100644 src/views/util/work-view.vue
diff --git a/src/views/tenant/works/Dialog/CopyMission.vue b/src/views/tenant/works/Dialog/CopyMission.vue
index 95b602f..8d2f140 100644
--- a/src/views/tenant/works/Dialog/CopyMission.vue
+++ b/src/views/tenant/works/Dialog/CopyMission.vue
@@ -356,25 +356,25 @@ export default {
}
};
- const workType = (rule, value, callback) => {
- if(this.workTypeState == null || this.workTypeState == undefined || this.workTypeState == ""){
- callback(
- new Error(
- "请选择工种"
- )
- )
- }else{
- if(!this.workTypeBtnState){
- callback(
- new Error(
- "新增工种要添加后才能使用"
- )
- )
- }else{
- callback();
- }
- }
- }
+ // const workType = (rule, value, callback) => {
+ // if(this.workTypeState == null || this.workTypeState == undefined || this.workTypeState == ""){
+ // callback(
+ // new Error(
+ // "请选择工种"
+ // )
+ // )
+ // }else{
+ // if(!this.workTypeBtnState){
+ // callback(
+ // new Error(
+ // "新增工种要添加后才能使用"
+ // )
+ // )
+ // }else{
+ // callback();
+ // }
+ // }
+ // }
const validatePass = (rule, value, callback)=>{
let specialKey = "[`~#$^&*()=|{}\\[\\]<>/~#¥……&*()——|{}【】《》%@‘”“']‘'";
let flagValue = true;
@@ -590,13 +590,15 @@ export default {
label: "工种",
// type: "tree",
prop: "worktypeIds",
- formslot: true,
- labelslot: false,
+ // formslot: true,
+ // labelslot: false,
rules: [
{
required: true,
- validator: workType,
- trigger: ["change", "blur"],
+ // validator: workType,
+ message: "请输入工种",
+ // trigger: ["change", "blur"],
+ trigger: "blur",
},
],
// dicData: self.workData,
diff --git a/src/views/tenant/works/Table/missionView.vue b/src/views/tenant/works/Table/missionView.vue
index a806e7e..a8e450a 100644
--- a/src/views/tenant/works/Table/missionView.vue
+++ b/src/views/tenant/works/Table/missionView.vue
@@ -1,14 +1,14 @@
-
+
+
+
+
\ No newline at end of file