禅道bug
This commit is contained in:
@@ -48,6 +48,7 @@
|
|||||||
tooltip-effect="dark"
|
tooltip-effect="dark"
|
||||||
style="width: 100%;"
|
style="width: 100%;"
|
||||||
height="100%"
|
height="100%"
|
||||||
|
@selection-change="handleSelectionChange"
|
||||||
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
|
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
|
||||||
fontWeight: 'bold', height: '48px'}"
|
fontWeight: 'bold', height: '48px'}"
|
||||||
row-key="id"
|
row-key="id"
|
||||||
@@ -115,6 +116,7 @@ export default {
|
|||||||
return {
|
return {
|
||||||
tableDataLoading: false,
|
tableDataLoading: false,
|
||||||
total: 0,
|
total: 0,
|
||||||
|
handleList: [],
|
||||||
selectRoleId: '',
|
selectRoleId: '',
|
||||||
searchForm: {
|
searchForm: {
|
||||||
standardKey: '',
|
standardKey: '',
|
||||||
@@ -170,6 +172,10 @@ export default {
|
|||||||
// this.resetSearchForm()
|
// this.resetSearchForm()
|
||||||
this.queryTablePage()
|
this.queryTablePage()
|
||||||
},
|
},
|
||||||
|
handleSelectionChange(data){
|
||||||
|
this.handleList = data
|
||||||
|
this.$emit('func',this.handleList)
|
||||||
|
},
|
||||||
|
|
||||||
pageChange (page) {
|
pageChange (page) {
|
||||||
this.pageNo = page
|
this.pageNo = page
|
||||||
@@ -183,7 +189,6 @@ export default {
|
|||||||
resetPageNo() {
|
resetPageNo() {
|
||||||
this.pageNo = 1
|
this.pageNo = 1
|
||||||
},
|
},
|
||||||
|
|
||||||
// 查询、加载表格
|
// 查询、加载表格
|
||||||
queryTablePage () {
|
queryTablePage () {
|
||||||
const formData = {
|
const formData = {
|
||||||
|
|||||||
@@ -1734,6 +1734,7 @@
|
|||||||
>
|
>
|
||||||
<div class="demo-drawer-content">
|
<div class="demo-drawer-content">
|
||||||
<related-terms-select
|
<related-terms-select
|
||||||
|
@func="handleChangeList"
|
||||||
ref="relatedTermsSelect"
|
ref="relatedTermsSelect"
|
||||||
:fileType="fileType"
|
:fileType="fileType"
|
||||||
:stand-id="standId"
|
:stand-id="standId"
|
||||||
@@ -1787,6 +1788,7 @@ export default {
|
|||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
|
handleList: [],
|
||||||
CycxOptions: [],
|
CycxOptions: [],
|
||||||
activeNames: ['基础信息', '过程稿件', '实施日期'],
|
activeNames: ['基础信息', '过程稿件', '实施日期'],
|
||||||
activeState: true,
|
activeState: true,
|
||||||
@@ -2112,6 +2114,9 @@ export default {
|
|||||||
props: {},
|
props: {},
|
||||||
watch: {},
|
watch: {},
|
||||||
methods: {
|
methods: {
|
||||||
|
handleChangeList(data){
|
||||||
|
this.handleList = data
|
||||||
|
},
|
||||||
child1Func(child1) {
|
child1Func(child1) {
|
||||||
const list = []
|
const list = []
|
||||||
if (child1 && child1.length > 1) {
|
if (child1 && child1.length > 1) {
|
||||||
@@ -3647,17 +3652,22 @@ export default {
|
|||||||
this.$refs['relatedTermsSelect'].handleCancel()
|
this.$refs['relatedTermsSelect'].handleCancel()
|
||||||
|
|
||||||
},
|
},
|
||||||
|
//关联成功的提示
|
||||||
handleRelatedTermsDrawerSubmit() {
|
handleRelatedTermsDrawerSubmit() {
|
||||||
|
|
||||||
this.btnLoading = true
|
this.btnLoading = true
|
||||||
this.$refs['relatedTermsSelect'].handleSubmit(() => {
|
if(this.handleList.length){
|
||||||
this.selectSarStandItems()
|
this.$refs['relatedTermsSelect'].handleSubmit(() => {
|
||||||
|
this.selectSarStandItems()
|
||||||
|
this.btnLoading = false
|
||||||
|
this.$message({
|
||||||
|
message: '关联成功',
|
||||||
|
type: 'success'
|
||||||
|
});
|
||||||
|
})
|
||||||
|
}else{
|
||||||
|
this.$message.warning('请至少勾选一条条款进行关联')
|
||||||
this.btnLoading = false
|
this.btnLoading = false
|
||||||
this.$message({
|
}
|
||||||
message: '关联成功',
|
|
||||||
type: 'success'
|
|
||||||
});
|
|
||||||
})
|
|
||||||
},
|
},
|
||||||
closeRelatedTermsDrawer() {
|
closeRelatedTermsDrawer() {
|
||||||
this.$refs['relatedTermsDrawer'].closeDrawer()
|
this.$refs['relatedTermsDrawer'].closeDrawer()
|
||||||
|
|||||||
@@ -638,25 +638,36 @@ export default {
|
|||||||
} else if(this.dataList.length > 5) {
|
} else if(this.dataList.length > 5) {
|
||||||
this.$message.warning('您最多只能选择五条数据')
|
this.$message.warning('您最多只能选择五条数据')
|
||||||
}else{
|
}else{
|
||||||
this.listForm.dataList = this.dataList;
|
let subFlag = true
|
||||||
this.listForm.breakdownList = this.breakdownList
|
this.dataList.forEach(item => {
|
||||||
this.listForm.commentText = this.commentText;
|
if(!item.unameId){
|
||||||
const json = JSON.stringify(this.listForm);
|
subFlag = false
|
||||||
this.isSubmit = true;
|
return
|
||||||
this.$http.post("lawss/activiti/completeTask", {
|
|
||||||
taskIds: this.taskIds,
|
|
||||||
userId: this.userId,
|
|
||||||
json: json
|
|
||||||
}, {
|
|
||||||
_this: this
|
|
||||||
}, res => {
|
|
||||||
if (res.success) {
|
|
||||||
this.$message.success(res.message);
|
|
||||||
this.$router.push("/processCenter");
|
|
||||||
}
|
}
|
||||||
this.isSubmit = false;
|
})
|
||||||
}, e => {
|
if(subFlag){
|
||||||
});
|
this.listForm.dataList = this.dataList;
|
||||||
|
this.listForm.breakdownList = this.breakdownList
|
||||||
|
this.listForm.commentText = this.commentText;
|
||||||
|
const json = JSON.stringify(this.listForm);
|
||||||
|
this.isSubmit = true;
|
||||||
|
this.$http.post("lawss/activiti/completeTask", {
|
||||||
|
taskIds: this.taskIds,
|
||||||
|
userId: this.userId,
|
||||||
|
json: json
|
||||||
|
}, {
|
||||||
|
_this: this
|
||||||
|
}, res => {
|
||||||
|
if (res.success) {
|
||||||
|
this.$message.success(res.message);
|
||||||
|
this.$router.push("/processCenter");
|
||||||
|
}
|
||||||
|
this.isSubmit = false;
|
||||||
|
}, e => {
|
||||||
|
});
|
||||||
|
}else{
|
||||||
|
this.$message.warning('请选择项目经理')
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user