commit
This commit is contained in:
@@ -162,7 +162,7 @@
|
|||||||
<el-input v-model="roleForm.ministerUser" style="display: none;"/>
|
<el-input v-model="roleForm.ministerUser" style="display: none;"/>
|
||||||
<el-input
|
<el-input
|
||||||
v-model="roleForm.ministerUserName"
|
v-model="roleForm.ministerUserName"
|
||||||
placeholder="选择标准法规部部长·"
|
placeholder="选择标准法规部部长"
|
||||||
@click.native="choiceZRR('ministerUser', '选择标准法规部部长', roleForm.ministerUser)"
|
@click.native="choiceZRR('ministerUser', '选择标准法规部部长', roleForm.ministerUser)"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -76,6 +76,14 @@
|
|||||||
- -
|
- -
|
||||||
</div>
|
</div>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
<el-form-item label="审批领导" prop="user7" class="add-form-item form-item-disabled">
|
||||||
|
<el-input
|
||||||
|
v-model="form.user7"
|
||||||
|
style="display: none;"
|
||||||
|
clearable
|
||||||
|
></el-input>
|
||||||
|
<el-input v-model="form.user7Name" placeholder="请选择审批领导" @click.native="choiceZRR"></el-input>
|
||||||
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
</div>
|
</div>
|
||||||
@@ -265,6 +273,13 @@
|
|||||||
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
|
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
|
||||||
</div>
|
</div>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
|
<Role-tree
|
||||||
|
check-box
|
||||||
|
is-title="选择审批领导"
|
||||||
|
:is-visible.sync="modalshowflag"
|
||||||
|
@checkedRole="checkedRole2"
|
||||||
|
:nodeList="nodeList"
|
||||||
|
></Role-tree>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@@ -316,6 +331,8 @@ export default {
|
|||||||
textType: '',
|
textType: '',
|
||||||
modelList: [],
|
modelList: [],
|
||||||
modelNameList: '',
|
modelNameList: '',
|
||||||
|
user7: '',
|
||||||
|
user7Name: ''
|
||||||
},
|
},
|
||||||
formRules: {
|
formRules: {
|
||||||
responUserList: [
|
responUserList: [
|
||||||
@@ -331,6 +348,17 @@ export default {
|
|||||||
ProcessTitle
|
ProcessTitle
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
choiceZRR () {
|
||||||
|
this.nodeList = [];
|
||||||
|
if (this.form.user7.length > 0) {
|
||||||
|
this.nodeList = this.form.user7.split(",");
|
||||||
|
}
|
||||||
|
this.modalshowflag = true;
|
||||||
|
},
|
||||||
|
checkedRole2(data) {
|
||||||
|
this.form.user7 = data[0].id
|
||||||
|
this.form.user7Name = data[0].name
|
||||||
|
},
|
||||||
filesUpload (file) { // 下载
|
filesUpload (file) { // 下载
|
||||||
const attId = file.attId
|
const attId = file.attId
|
||||||
if (attId) {
|
if (attId) {
|
||||||
@@ -446,6 +474,8 @@ export default {
|
|||||||
var json = this.json;
|
var json = this.json;
|
||||||
json.hqFlag = '0';
|
json.hqFlag = '0';
|
||||||
json.commentText = this.commentText6;
|
json.commentText = this.commentText6;
|
||||||
|
json.user7 = this.form.user7;
|
||||||
|
json.user7Name = this.form.user7Name;
|
||||||
this.$http.post("lawss/activiti/completeTask", {
|
this.$http.post("lawss/activiti/completeTask", {
|
||||||
json: JSON.stringify(json),
|
json: JSON.stringify(json),
|
||||||
taskId: this.taskIds,
|
taskId: this.taskIds,
|
||||||
@@ -492,6 +522,8 @@ export default {
|
|||||||
this.form.endTime = data.endTime || data.form.endTime;
|
this.form.endTime = data.endTime || data.form.endTime;
|
||||||
this.form.textType = data.textType || data.form.textType
|
this.form.textType = data.textType || data.form.textType
|
||||||
this.form.modelList = data.modelList || data.form.modelList
|
this.form.modelList = data.modelList || data.form.modelList
|
||||||
|
this.form.user7 = data.form ? data.form.user7 : (data.user7 ? data.user7 : '')
|
||||||
|
this.form.user7Name = data.form ? data.form.user7Name : (data.user7Name ? data.user7Name : '')
|
||||||
this.oldData = JSON.parse(JSON.stringify(data.info))
|
this.oldData = JSON.parse(JSON.stringify(data.info))
|
||||||
var arr = []
|
var arr = []
|
||||||
data.info.forEach(item => {
|
data.info.forEach(item => {
|
||||||
|
|||||||
Reference in New Issue
Block a user