标准合规评估bug
This commit is contained in:
宋伟佳
@@ -443,32 +443,34 @@
|
|||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
</div>
|
</div>
|
||||||
<el-table
|
<div style="height: calc(100% - 65px); overflow: auto;">
|
||||||
:data="productData"
|
<el-table
|
||||||
tooltip-effect="dark"
|
:data="productData"
|
||||||
style="width: 100%"
|
tooltip-effect="dark"
|
||||||
border
|
style="width: 100%"
|
||||||
ref="projectTable"
|
border
|
||||||
height="100%"
|
ref="projectTable"
|
||||||
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
|
height="100%"
|
||||||
|
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
|
||||||
fontWeight: 'bold', height: '48px'}"
|
fontWeight: 'bold', height: '48px'}"
|
||||||
@selection-change="selectThree"
|
@selection-change="selectThree"
|
||||||
>
|
>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
type="selection"
|
type="selection"
|
||||||
width="55"
|
width="55"
|
||||||
align="center">
|
align="center">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="productLine"
|
prop="productLine"
|
||||||
label="产品线">
|
label="产品线">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
show-overflow-tooltip
|
show-overflow-tooltip
|
||||||
prop="uname"
|
prop="uname"
|
||||||
label="产品线责任人">
|
label="产品线责任人">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<pagination
|
<pagination
|
||||||
:page="pageNo"
|
:page="pageNo"
|
||||||
|
|||||||
@@ -446,32 +446,34 @@
|
|||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
</div>
|
</div>
|
||||||
<el-table
|
<div style="height: calc(100% - 65px); overflow: auto">
|
||||||
:data="productData"
|
<el-table
|
||||||
tooltip-effect="dark"
|
:data="productData"
|
||||||
style="width: 100%"
|
tooltip-effect="dark"
|
||||||
border
|
style="width: 100%"
|
||||||
ref="projectTable"
|
border
|
||||||
height="100%"
|
ref="projectTable"
|
||||||
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
|
height="100%"
|
||||||
|
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
|
||||||
fontWeight: 'bold', height: '48px'}"
|
fontWeight: 'bold', height: '48px'}"
|
||||||
@selection-change="selectThree"
|
@selection-change="selectThree"
|
||||||
>
|
>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
type="selection"
|
type="selection"
|
||||||
width="55"
|
width="55"
|
||||||
align="center">
|
align="center">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="productLine"
|
prop="productLine"
|
||||||
label="产品线">
|
label="产品线">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
show-overflow-tooltip
|
show-overflow-tooltip
|
||||||
prop="uname"
|
prop="uname"
|
||||||
label="产品线责任人">
|
label="产品线责任人">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<pagination
|
<pagination
|
||||||
:page="pageNo"
|
:page="pageNo"
|
||||||
|
|||||||
@@ -759,6 +759,7 @@ export default {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
this.$refs.table.clearSelection()
|
||||||
this.projectModel = false;
|
this.projectModel = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -778,7 +779,7 @@ export default {
|
|||||||
this.selectList.map(item => {
|
this.selectList.map(item => {
|
||||||
let index;
|
let index;
|
||||||
index = this.breakdownList.findIndex(items => {
|
index = this.breakdownList.findIndex(items => {
|
||||||
return items.itemsName === item.itemsName;
|
return items.itemsName === item.itemsName && items.projectName === item.projectName;
|
||||||
});
|
});
|
||||||
if (index > -1) {
|
if (index > -1) {
|
||||||
this.breakdownList.splice(index, 1);
|
this.breakdownList.splice(index, 1);
|
||||||
@@ -874,6 +875,7 @@ export default {
|
|||||||
//保存事件
|
//保存事件
|
||||||
handleSave() {
|
handleSave() {
|
||||||
this.saveLoading = true;
|
this.saveLoading = true;
|
||||||
|
this.listForm.breakdownList = this.breakdownList;
|
||||||
let _formData = new FormData();
|
let _formData = new FormData();
|
||||||
_formData.append("id", this.bpnId || "");
|
_formData.append("id", this.bpnId || "");
|
||||||
_formData.append("prcType", "5");
|
_formData.append("prcType", "5");
|
||||||
|
|||||||
@@ -731,6 +731,7 @@ export default {
|
|||||||
item.implementerId = this.$store.getters.userInfo.userId;
|
item.implementerId = this.$store.getters.userInfo.userId;
|
||||||
item.implementer = this.$store.getters.userInfo.userName;
|
item.implementer = this.$store.getters.userInfo.userName;
|
||||||
});
|
});
|
||||||
|
// this.commentText = ''
|
||||||
this.dataList = item.step3DTOS;
|
this.dataList = item.step3DTOS;
|
||||||
this.dataList.forEach(item => {
|
this.dataList.forEach(item => {
|
||||||
this.$set(item,'complianceReasons', '')
|
this.$set(item,'complianceReasons', '')
|
||||||
@@ -740,6 +741,7 @@ export default {
|
|||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
this.dataList = item.dataList;
|
this.dataList = item.dataList;
|
||||||
|
// this.commentText = ''
|
||||||
this.dataList.forEach(item => {
|
this.dataList.forEach(item => {
|
||||||
item.implementerId = this.$store.getters.userInfo.userId;
|
item.implementerId = this.$store.getters.userInfo.userId;
|
||||||
item.implementer = this.$store.getters.userInfo.userName;
|
item.implementer = this.$store.getters.userInfo.userName;
|
||||||
@@ -870,7 +872,7 @@ export default {
|
|||||||
saveBatchEditForm() {
|
saveBatchEditForm() {
|
||||||
this.dataList.forEach(item => {
|
this.dataList.forEach(item => {
|
||||||
this.selectList.forEach(items => {
|
this.selectList.forEach(items => {
|
||||||
if (item.itemNum === items.itemNum) {
|
if (item.itemNum === items.itemNum && item.projectName === items.projectName) {
|
||||||
item.complianceReasons = this.batchEditForm.complianceReasons;
|
item.complianceReasons = this.batchEditForm.complianceReasons;
|
||||||
//不合规
|
//不合规
|
||||||
item.noCompliance = this.batchEditForm.noCompliance;
|
item.noCompliance = this.batchEditForm.noCompliance;
|
||||||
@@ -881,6 +883,7 @@ export default {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
this.$refs.multipleTable.clearSelection()
|
||||||
this.modalShowFlag = false;
|
this.modalShowFlag = false;
|
||||||
},
|
},
|
||||||
cancelBatchEditForm() {
|
cancelBatchEditForm() {
|
||||||
|
|||||||
@@ -568,6 +568,7 @@ export default {
|
|||||||
if(!this.commentText){
|
if(!this.commentText){
|
||||||
this.$message.warning('请填写审批意见')
|
this.$message.warning('请填写审批意见')
|
||||||
}else{
|
}else{
|
||||||
|
this.isSubmit = true
|
||||||
this.listForm.applyUpdUserId = this.dataList[0].distributePersonId
|
this.listForm.applyUpdUserId = this.dataList[0].distributePersonId
|
||||||
this.listForm.commentText = this.commentText;
|
this.listForm.commentText = this.commentText;
|
||||||
this.listForm.dataList = this.dataList
|
this.listForm.dataList = this.dataList
|
||||||
@@ -584,6 +585,7 @@ export default {
|
|||||||
this.$message.success(res.message)
|
this.$message.success(res.message)
|
||||||
this.$router.push('/processCenter')
|
this.$router.push('/processCenter')
|
||||||
}
|
}
|
||||||
|
this.isSubmit = false
|
||||||
}, e => {
|
}, e => {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -553,6 +553,7 @@ export default {
|
|||||||
this.listForm.prcNum = this.prcNum
|
this.listForm.prcNum = this.prcNum
|
||||||
this.listForm.prcName = this.prcName
|
this.listForm.prcName = this.prcName
|
||||||
this.listForm.id = item.id
|
this.listForm.id = item.id
|
||||||
|
// this.commentText = ''
|
||||||
this.dataList = item.dataList
|
this.dataList = item.dataList
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user