From e6a76f6620bda068e734fa0fec4bfdb6de75a12e Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期三, 22 一月 2020 17:37:45 +0800
Subject: [PATCH] Merge branch 'master' of http://highdatas.com:9000/r/~kimi/srs
---
src/components/popup/portion/substep.vue | 84 ++++++++++++++++++++++--------------------
1 files changed, 44 insertions(+), 40 deletions(-)
diff --git a/src/components/popup/portion/substep.vue b/src/components/popup/portion/substep.vue
index 4a3766d..2d90b4a 100644
--- a/src/components/popup/portion/substep.vue
+++ b/src/components/popup/portion/substep.vue
@@ -56,14 +56,14 @@
</el-col>
<el-col :span="11" class="z_grid-content3">
- <el-form-item label="璐熻矗浜�" prop="userId"
+ <el-form-item label="璐熻矗浜�" prop="userIds"
:rules="{type: 'array', required: true, message: '璇烽�夋嫨璐熻矗浜�', trigger: ['change', 'blur']}"
>
<el-cascader
style="width: 100%;"
size="mini"
- v-model="form_['title'].userId"
+ v-model="form_['title'].userIds"
:options="options_users"
:props="{ expandTrigger: 'hover' }"
placeholder="璇烽�夋嫨璐熻矗浜�"
@@ -114,13 +114,13 @@
</el-form-item>
</el-col>
<el-col :span="11" class="z_grid-content3">
- <el-form-item label="璐熻矗浜�" prop="userId"
+ <el-form-item label="璐熻矗浜�" prop="userIds"
:rules="{type: 'array',required: true, message: '璇烽�夋嫨璐熻矗浜�', trigger: ['change', 'blur']}"
>
<el-cascader
size="mini"
style="width: 100%;"
- v-model="form_['scheme'].userId"
+ v-model="form_['scheme'].userIds"
:options="options_users"
:props="{ expandTrigger: 'hover' }"
placeholder="璇烽�夋嫨璐熻矗浜�"
@@ -171,7 +171,7 @@
</el-form-item>
</el-col>
<el-col :span="11" class="z_grid-content3">
- <el-form-item label="璐熻矗浜�" prop="userId"
+ <el-form-item label="璐熻矗浜�" prop="userIds"
:rules="{required: true, message: '璇烽�夋嫨璐熻矗浜�', trigger: ['change', 'blur']}"
>
<el-cascader
@@ -179,7 +179,7 @@
:options="options_users"
:props="{ expandTrigger: 'hover' }"
size="mini"
- v-model="form_['search'].userId"
+ v-model="form_['search'].userIds"
placeholder="璇烽�夋嫨璐熻矗浜�"
>
</el-cascader>
@@ -228,7 +228,7 @@
</el-form-item>
</el-col>
<el-col :span="11" class="z_grid-content3">
- <el-form-item label="璐熻矗浜�" prop="userId"
+ <el-form-item label="璐熻矗浜�" prop="userIds"
:rules="{required: true, message: '璇烽�夋嫨璐熻矗浜�', trigger: ['change', 'blur']}"
>
<el-cascader
@@ -236,7 +236,7 @@
:options="options_users"
:props="{ expandTrigger: 'hover' }"
size="mini"
- v-model="form_['select'].userId"
+ v-model="form_['select'].userIds"
placeholder="璇烽�夋嫨璐熻矗浜�"
>
</el-cascader>
@@ -285,7 +285,7 @@
</el-form-item>
</el-col>
<el-col :span="11" class="z_grid-content3">
- <el-form-item label="璐熻矗浜�" prop="userId"
+ <el-form-item label="璐熻矗浜�" prop="userIds"
:rules="{required: true, message: '璇烽�夋嫨璐熻矗浜�', trigger: ['change', 'blur']}"
>
<el-cascader
@@ -293,7 +293,7 @@
:options="options_users"
:props="{ expandTrigger: 'hover' }"
size="mini"
- v-model="form_['get'].userId"
+ v-model="form_['get'].userIds"
placeholder="璇烽�夋嫨璐熻矗浜�"
>
</el-cascader>
@@ -342,7 +342,7 @@
</el-form-item>
</el-col>
<el-col :span="11" class="z_grid-content3">
- <el-form-item label="璐熻矗浜�" prop="userId"
+ <el-form-item label="璐熻矗浜�" prop="userIds"
:rules="{required: true, message: '璇烽�夋嫨璐熻矗浜�', trigger: ['change', 'blur']}"
>
<el-cascader
@@ -350,7 +350,7 @@
:options="options_users"
:props="{ expandTrigger: 'hover' }"
size="mini"
- v-model="form_['find'].userId"
+ v-model="form_['find'].userIds"
placeholder="璇烽�夋嫨璐熻矗浜�"
>
</el-cascader>
@@ -399,7 +399,7 @@
</el-form-item>
</el-col>
<el-col :span="11" class="z_grid-content3">
- <el-form-item label="璐熻矗浜�" prop="userId"
+ <el-form-item label="璐熻矗浜�" prop="userIds"
:rules="{required: true, message: '璇烽�夋嫨璐熻矗浜�', trigger: ['change', 'blur']}"
>
<el-cascader
@@ -407,7 +407,7 @@
:options="options_users"
:props="{ expandTrigger: 'hover' }"
size="mini"
- v-model="form_['properties'].userId"
+ v-model="form_['properties'].userIds"
placeholder="璇烽�夋嫨璐熻矗浜�"
>
</el-cascader>
@@ -456,7 +456,7 @@
</el-form-item>
</el-col>
<el-col :span="11" class="z_grid-content3">
- <el-form-item label="璐熻矗浜�" prop="userId"
+ <el-form-item label="璐熻矗浜�" prop="userIds"
:rules="{required: true, message: '璇烽�夋嫨璐熻矗浜�', trigger: ['change', 'blur']}"
>
<el-cascader
@@ -464,7 +464,7 @@
:options="options_users"
:props="{ expandTrigger: 'hover' }"
size="mini"
- v-model="form_['risk'].userId"
+ v-model="form_['risk'].userIds"
placeholder="璇烽�夋嫨璐熻矗浜�"
>
</el-cascader>
@@ -513,7 +513,7 @@
</el-form-item>
</el-col>
<el-col :span="11" class="z_grid-content3">
- <el-form-item label="璐熻矗浜�" prop="userId"
+ <el-form-item label="璐熻矗浜�" prop="userIds"
:rules="{required: true, message: '璇烽�夋嫨璐熻矗浜�', trigger: ['change', 'blur']}"
>
<el-cascader
@@ -521,7 +521,7 @@
:options="options_users"
:props="{ expandTrigger: 'hover' }"
size="mini"
- v-model="form_['target'].userId"
+ v-model="form_['target'].userIds"
placeholder="璇烽�夋嫨璐熻矗浜�"
>
</el-cascader>
@@ -570,7 +570,7 @@
</el-form-item>
</el-col>
<el-col :span="11" class="z_grid-content3">
- <el-form-item label="璐熻矗浜�" prop="userId"
+ <el-form-item label="璐熻矗浜�" prop="userIds"
:rules="{required: true, message: '璇烽�夋嫨璐熻矗浜�', trigger: ['change', 'blur']}"
>
<el-cascader
@@ -578,7 +578,7 @@
:options="options_users"
:props="{ expandTrigger: 'hover' }"
size="mini"
- v-model="form_['propertiesArrangement'].userId"
+ v-model="form_['propertiesArrangement'].userIds"
placeholder="璇烽�夋嫨璐熻矗浜�"
>
</el-cascader>
@@ -627,7 +627,7 @@
</el-form-item>
</el-col>
<el-col :span="11" class="z_grid-content3">
- <el-form-item label="璐熻矗浜�" prop="userId"
+ <el-form-item label="璐熻矗浜�" prop="userIds"
:rules="{required: true, message: '璇烽�夋嫨璐熻矗浜�', trigger: ['change', 'blur']}"
>
<el-cascader
@@ -635,7 +635,7 @@
:options="options_users"
:props="{ expandTrigger: 'hover' }"
size="mini"
- v-model="form_['riskChart'].userId"
+ v-model="form_['riskChart'].userIds"
placeholder="璇烽�夋嫨璐熻矗浜�"
>
</el-cascader>
@@ -684,7 +684,7 @@
</el-form-item>
</el-col>
<el-col :span="11" class="z_grid-content3">
- <el-form-item label="璐熻矗浜�" prop="userId"
+ <el-form-item label="璐熻矗浜�" prop="userIds"
:rules="{required: true, message: '璇烽�夋嫨璐熻矗浜�', trigger: ['change', 'blur']}"
>
<el-cascader
@@ -692,7 +692,7 @@
:options="options_users"
:props="{ expandTrigger: 'hover' }"
size="mini"
- v-model="form_['meta'].userId"
+ v-model="form_['meta'].userIds"
placeholder="璇烽�夋嫨璐熻矗浜�"
>
</el-cascader>
@@ -741,7 +741,7 @@
</el-form-item>
</el-col>
<el-col :span="11" class="z_grid-content3">
- <el-form-item label="璐熻矗浜�" prop="userId"
+ <el-form-item label="璐熻矗浜�" prop="userIds"
:rules="{required: true, message: '璇烽�夋嫨璐熻矗浜�', trigger: ['change', 'blur']}"
>
<el-cascader
@@ -749,7 +749,7 @@
:options="options_users"
:props="{ expandTrigger: 'hover' }"
size="mini"
- v-model="form_['grade'].userId"
+ v-model="form_['grade'].userIds"
placeholder="璇烽�夋嫨璐熻矗浜�"
>
</el-cascader>
@@ -798,7 +798,7 @@
</el-form-item>
</el-col>
<el-col :span="11" class="z_grid-content3">
- <el-form-item label="璐熻矗浜�" prop="userId"
+ <el-form-item label="璐熻矗浜�" prop="userIds"
:rules="{required: true, message: '璇烽�夋嫨璐熻矗浜�', trigger: ['change', 'blur']}"
>
<el-cascader
@@ -806,7 +806,7 @@
:options="options_users"
:props="{ expandTrigger: 'hover' }"
size="mini"
- v-model="form_['tsa'].userId"
+ v-model="form_['tsa'].userIds"
placeholder="璇烽�夋嫨璐熻矗浜�"
>
</el-cascader>
@@ -855,7 +855,7 @@
</el-form-item>
</el-col>
<el-col :span="11" class="z_grid-content3">
- <el-form-item label="璐熻矗浜�" prop="userId"
+ <el-form-item label="璐熻矗浜�" prop="userIds"
:rules="{required: true, message: '璇烽�夋嫨璐熻矗浜�', trigger: ['change', 'blur']}"
>
<el-cascader
@@ -863,7 +863,7 @@
:options="options_users"
:props="{ expandTrigger: 'hover' }"
size="mini"
- v-model="form_['compose'].userId"
+ v-model="form_['compose'].userIds"
placeholder="璇烽�夋嫨璐熻矗浜�"
>
</el-cascader>
@@ -912,7 +912,7 @@
</el-form-item>
</el-col>
<el-col :span="11" class="z_grid-content3">
- <el-form-item label="璐熻矗浜�" prop="userId"
+ <el-form-item label="璐熻矗浜�" prop="userIds"
:rules="{required: true, message: '璇烽�夋嫨璐熻矗浜�', trigger: ['change', 'blur']}"
>
<el-cascader
@@ -920,7 +920,7 @@
:options="options_users"
:props="{ expandTrigger: 'hover' }"
size="mini"
- v-model="form_['translate'].userId"
+ v-model="form_['translate'].userIds"
placeholder="璇烽�夋嫨璐熻矗浜�"
>
</el-cascader>
@@ -969,7 +969,7 @@
</el-form-item>
</el-col>
<el-col :span="11" class="z_grid-content3">
- <el-form-item label="璐熻矗浜�" prop="userId"
+ <el-form-item label="璐熻矗浜�" prop="userIds"
:rules="{required: true, message: '璇烽�夋嫨璐熻矗浜�', trigger: ['change', 'blur']}"
>
<el-cascader
@@ -977,7 +977,7 @@
:options="options_users"
:props="{ expandTrigger: 'hover' }"
size="mini"
- v-model="form_['evaluation'].userId"
+ v-model="form_['evaluation'].userIds"
placeholder="璇烽�夋嫨璐熻矗浜�"
>
</el-cascader>
@@ -1026,7 +1026,7 @@
</el-form-item>
</el-col>
<el-col :span="11" class="z_grid-content3">
- <el-form-item label="璐熻矗浜�" prop="userId"
+ <el-form-item label="璐熻矗浜�" prop="userIds"
:rules="{required: true, message: '璇烽�夋嫨璐熻矗浜�', trigger: ['change', 'blur']}"
>
<el-cascader
@@ -1034,7 +1034,7 @@
:options="options_users"
:props="{ expandTrigger: 'hover' }"
size="mini"
- v-model="form_['recommend'].userId"
+ v-model="form_['recommend'].userIds"
placeholder="璇烽�夋嫨璐熻矗浜�"
>
</el-cascader>
@@ -1083,7 +1083,7 @@
</el-form-item>
</el-col>
<el-col :span="11" class="z_grid-content3">
- <el-form-item label="璐熻矗浜�" prop="userId"
+ <el-form-item label="璐熻矗浜�" prop="userIds"
:rules="{required: true, message: '璇烽�夋嫨璐熻矗浜�', trigger: ['change', 'blur']}"
>
<el-cascader
@@ -1091,7 +1091,7 @@
:options="options_users"
:props="{ expandTrigger: 'hover' }"
size="mini"
- v-model="form_['format'].userId"
+ v-model="form_['format'].userIds"
placeholder="璇烽�夋嫨璐熻矗浜�"
>
</el-cascader>
@@ -1140,7 +1140,7 @@
</el-form-item>
</el-col>
<el-col :span="11" class="z_grid-content3">
- <el-form-item label="璐熻矗浜�" prop="userId"
+ <el-form-item label="璐熻矗浜�" prop="userIds"
:rules="{required: true, message: '璇烽�夋嫨璐熻矗浜�', trigger: ['change', 'blur']}"
>
<el-cascader
@@ -1148,7 +1148,7 @@
:options="options_users"
:props="{ expandTrigger: 'hover' }"
size="mini"
- v-model="form_['Contribute'].userId"
+ v-model="form_['Contribute'].userIds"
placeholder="璇烽�夋嫨璐熻矗浜�"
>
</el-cascader>
@@ -1501,7 +1501,11 @@
this.showData[detail_.type] = true;
//缁欐墍鏈夌殑from鐨勬暟鎹祴鍊�
+
this.form_[detail_.type] = detail_;
+ this.form_[detail_.type].userIds = [];
+ this.form_[detail_.type].userIds.push(detail_.roleName);
+ this.form_[detail_.type].userIds.push(detail_.userId);
}
}
--
Gitblit v1.8.0