Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
zhutianqi
2021-12-24 17:34:53 +08:00
3 changed files with 13 additions and 9 deletions
@@ -184,7 +184,7 @@
</el-table> </el-table>
</div> </div>
<el-collapse accordion> <el-collapse accordion>
<el-collapse-item title="审批意见"> <el-collapse-item title="回执说明">
<div style="margin: 10px 0;"> <div style="margin: 10px 0;">
<el-input <el-input
type="textarea" type="textarea"
@@ -179,7 +179,7 @@
</el-table> </el-table>
</div> </div>
<el-collapse accordion> <el-collapse accordion>
<el-collapse-item title="审批意见"> <el-collapse-item title="回执说明">
<div style="margin: 10px 0;"> <div style="margin: 10px 0;">
<el-input <el-input
type="textarea" type="textarea"
@@ -892,13 +892,16 @@ export default {
}, },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
let standList = [] if(this.breakdownList < 1){
this.breakdownList.forEach(item => { this.$message.warning('请添加产品线数据')
if (item.implementer) { }else{
standList.push(item); let standList = [];
} this.breakdownList.forEach(item => {
}); if (item.implementer) {
this.listForm.breakdownList = standList standList.push(item);
}
});
this.listForm.breakdownList = standList;
this.listForm.prcCreateUser = this.$store.getters.userInfo.userId; this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId; this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
this.listForm.prcCreateUserName = this.$store.getters.userInfo.account; this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
@@ -922,6 +925,7 @@ export default {
this.isSubmit = false; this.isSubmit = false;
}, e => { }, e => {
}); });
}
}, },
drawerCheck(data) { drawerCheck(data) {
var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes()); var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());