合规评估流程-项目维度

This commit is contained in:
yuezhihang
2021-07-27 21:16:09 +08:00
parent 8ff5f85189
commit d1b37660ff
7 changed files with 1132 additions and 1119 deletions
@@ -42,31 +42,37 @@
</process-title> </process-title>
<el-table <el-table
:data="dataList" :data="dataList"
border style="width: 100%; border: 1px solid #cccccc"
ref="selection" row-key="standId"
height="70%" height="70%"
style="width: 100%; border:1px solid #ccc" border
@selection-change="selectStandChange"
: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'}"
>
<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="standNumber" prop="standEnName"
label="标准编号"
width="180"
fixed="left"
align="center" align="center"
width="200" >
label="标准编号">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="standName" prop="standName"
fixed="left"
width="180"
align="center" align="center"
width="200" label="标准名称"
label="标准名称"> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="itemNum" prop="itemsNum"
align="center" align="center"
width="200" width="200"
label="条款号"> label="条款号">
@@ -78,21 +84,21 @@
label="条款名称"> label="条款名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="xCXSSRQ" prop="xcxssrqgj"
width="200" width="200"
align="center" align="center"
label="新车型实施日期"> label="新车型实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="zCCSSRQ" prop="zccssrqgj"
width="200" width="200"
align="center" align="center"
label="在产车实施日期"> label="在产车实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -169,13 +175,6 @@
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column
fixed="right"
align="center"
width="150"
prop="workPeople"
label="落实人">
</el-table-column>
</el-table> </el-table>
</div> </div>
<div> <div>
@@ -297,7 +296,7 @@ export default {
saveLoading: false, saveLoading: false,
//表单的数据 //表单的数据
listForm: { listForm: {
BZFlag: " ", //1审批通过 其他为驳回 bzFlag: " ", //1审批通过 其他为驳回
projectNumber: "", //项目编号 projectNumber: "", //项目编号
projectName: "", //项目名称 projectName: "", //项目名称
dataList: [], //项目下的标准数据 dataList: [], //项目下的标准数据
@@ -359,7 +358,10 @@ export default {
}, },
//驳回事件 //驳回事件
beforeBack() { beforeBack() {
this.listForm.BZFlag = "2"; if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('请填写审批意见')
}else{
this.listForm.bzFlag = "2";
this.listForm.commentText = this.commentText; this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm); const json = JSON.stringify(this.listForm);
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
@@ -375,10 +377,14 @@ export default {
} }
}, e => { }, e => {
}); });
}
}, },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
this.listForm.BZFlag = "1"; if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('请填写审批意见')
}else{
this.listForm.bzFlag = "1";
this.listForm.commentText = this.commentText; this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm); const json = JSON.stringify(this.listForm);
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
@@ -396,6 +402,7 @@ export default {
}); });
} }
}, },
},
computed: { computed: {
listNoDataText() { listNoDataText() {
return this.processType === 1 ? "暂无待办流程" : "暂无已办流程"; return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
@@ -42,31 +42,37 @@
</process-title> </process-title>
<el-table <el-table
:data="dataList" :data="dataList"
border style="width: 100%; border: 1px solid #cccccc"
ref="selection" row-key="standId"
height="70%" height="70%"
style="width: 100%; border:1px solid #ccc" border
@selection-change="selectStandChange"
: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'}"
>
<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="standNumber" prop="standEnName"
label="标准编号"
width="180"
fixed="left"
align="center" align="center"
width="200" >
label="标准编号">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="standName" prop="standName"
fixed="left"
width="180"
align="center" align="center"
width="200" label="标准名称"
label="标准名称"> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="itemNum" prop="itemsNum"
align="center" align="center"
width="200" width="200"
label="条款号"> label="条款号">
@@ -78,21 +84,21 @@
label="条款名称"> label="条款名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="xCXSSRQ" prop="xcxssrqgj"
width="200" width="200"
align="center" align="center"
label="新车型实施日期"> label="新车型实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="zCCSSRQ" prop="zccssrqgj"
width="200" width="200"
align="center" align="center"
label="在产车实施日期"> label="在产车实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -169,13 +175,6 @@
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column
fixed="right"
align="center"
width="150"
prop="workPeople"
label="落实人">
</el-table-column>
</el-table> </el-table>
</div> </div>
<div> <div>
@@ -297,7 +296,7 @@ export default {
saveLoading: false, saveLoading: false,
//表单的数据 //表单的数据
listForm: { listForm: {
BZFlag: " ", //1审批通过 其他为驳回 bzFlag: " ", //1审批通过 其他为驳回
projectNumber: "", //项目编号 projectNumber: "", //项目编号
projectName: "", //项目名称 projectName: "", //项目名称
dataList: [], //项目下的标准数据 dataList: [], //项目下的标准数据
@@ -359,7 +358,10 @@ export default {
}, },
//驳回事件 //驳回事件
beforeBack() { beforeBack() {
this.listForm.BZFlag = "2"; if (this.commentText === null || this.commentText === undefined || this.commentText === '') {
this.$message.warning('请填写审批意见')
} else {
this.listForm.bzFlag = "2";
this.listForm.commentText = this.commentText; this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm); const json = JSON.stringify(this.listForm);
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
@@ -375,10 +377,14 @@ export default {
} }
}, e => { }, e => {
}); });
}
}, },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
this.listForm.BZFlag = "1"; if (this.commentText === null || this.commentText === undefined || this.commentText === '') {
this.$message.warning('请填写审批意见')
} else {
this.listForm.bzFlag = "1";
this.listForm.commentText = this.commentText; this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm); const json = JSON.stringify(this.listForm);
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
@@ -396,6 +402,8 @@ export default {
}); });
} }
}, },
},
computed: { computed: {
listNoDataText() { listNoDataText() {
return this.processType === 1 ? "暂无待办流程" : "暂无已办流程"; return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
@@ -42,31 +42,37 @@
</process-title> </process-title>
<el-table <el-table
:data="dataList" :data="dataList"
border style="width: 100%; border: 1px solid #cccccc"
ref="selection" row-key="standId"
height="70%" height="70%"
style="width: 100%; border:1px solid #ccc" border
@selection-change="selectStandChange"
: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'}"
>
<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="standNumber" prop="standEnName"
label="标准编号"
width="180"
fixed="left"
align="center" align="center"
width="200" >
label="标准编号">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="standName" prop="standName"
fixed="left"
width="180"
align="center" align="center"
width="200" label="标准名称"
label="标准名称"> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="itemNum" prop="itemsNum"
align="center" align="center"
width="200" width="200"
label="条款号"> label="条款号">
@@ -78,21 +84,21 @@
label="条款名称"> label="条款名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="xCXSSRQ" prop="xcxssrqgj"
width="200" width="200"
align="center" align="center"
label="新车型实施日期"> label="新车型实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="zCCSSRQ" prop="zccssrqgj"
width="200" width="200"
align="center" align="center"
label="在产车实施日期"> label="在产车实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -169,13 +175,6 @@
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column
fixed="right"
align="center"
width="150"
prop="workPeople"
label="落实人">
</el-table-column>
</el-table> </el-table>
</div> </div>
<div> <div>
@@ -297,7 +296,7 @@ export default {
saveLoading: false, saveLoading: false,
//表单的数据 //表单的数据
listForm: { listForm: {
BZFlag: " ", //1审批通过 其他为驳回 dlFlag: " ", //1审批通过 其他为驳回
projectNumber: "", //项目编号 projectNumber: "", //项目编号
projectName: "", //项目名称 projectName: "", //项目名称
dataList: [], //项目下的标准数据 dataList: [], //项目下的标准数据
@@ -359,7 +358,10 @@ export default {
}, },
//驳回事件 //驳回事件
beforeBack() { beforeBack() {
this.listForm.BZFlag = "2"; if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('请填写审批意见')
}else{
this.listForm.dlFlag = "2";
this.listForm.commentText = this.commentText; this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm); const json = JSON.stringify(this.listForm);
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
@@ -375,10 +377,14 @@ export default {
} }
}, e => { }, e => {
}); });
}
}, },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
this.listForm.BZFlag = "1"; if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('请填写审批意见')
}else{
this.listForm.dlFlag = "1";
this.listForm.commentText = this.commentText; this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm); const json = JSON.stringify(this.listForm);
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
@@ -396,6 +402,7 @@ export default {
}); });
} }
}, },
},
computed: { computed: {
listNoDataText() { listNoDataText() {
return this.processType === 1 ? "暂无待办流程" : "暂无已办流程"; return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
@@ -404,7 +411,7 @@ export default {
mounted() { mounted() {
this.processTable(); this.processTable();
this.getData(); this.getData();
} },
}; };
</script> </script>
@@ -72,7 +72,7 @@
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="itemNum" prop="itemsNum"
align="center" align="center"
width="200" width="200"
label="条款号"> label="条款号">
@@ -84,21 +84,21 @@
label="条款名称"> label="条款名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="xCXSSRQ" prop="xcxssrqgj"
width="200" width="200"
align="center" align="center"
label="新车型实施日期"> label="新车型实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format("YYYY-MM-DD") : "" }}</span> <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="zCCSSRQ" prop="zccssrqgj"
width="200" width="200"
align="center" align="center"
label="在产车实施日期"> label="在产车实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format("YYYY-MM-DD") : "" }}</span> <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -112,7 +112,7 @@
label="合规"> label="合规">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input <el-input
v-model="dataList[scope.$index].complianceReasons" v-model="scope.row.complianceReasons"
placeholder="请输入合规原因" placeholder="请输入合规原因"
> >
</el-input> </el-input>
@@ -130,7 +130,7 @@
label="不合规项目"> label="不合规项目">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input <el-input
v-model="dataList[scope.$index].noCompliance" v-model="scope.row.noCompliance"
placeholder="请输入不合规项目" placeholder="请输入不合规项目"
> >
</el-input> </el-input>
@@ -143,7 +143,7 @@
label="应对措施"> label="应对措施">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input <el-input
v-model="dataList[scope.$index].countermeasures" v-model="scope.row.countermeasures"
placeholder="请输入应对措施" placeholder="请输入应对措施"
> >
</el-input> </el-input>
@@ -156,7 +156,7 @@
label="完成时间"> label="完成时间">
<template slot-scope="scope"> <template slot-scope="scope">
<el-date-picker <el-date-picker
v-model="dataList[scope.$index].completionTime" v-model="scope.row.completionTime"
type="date" type="date"
placeholder="选择日期"> placeholder="选择日期">
</el-date-picker> </el-date-picker>
@@ -174,7 +174,7 @@
label="合规(具体情况)"> label="合规(具体情况)">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input <el-input
v-model="dataList[scope.$index].zcComplianceReasons" v-model="scope.row.zcComplianceReasons"
placeholder="请输入合规原因" placeholder="请输入合规原因"
> >
</el-input> </el-input>
@@ -191,7 +191,7 @@
label="不合规项目"> label="不合规项目">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input <el-input
v-model="dataList[scope.$index].zcNoCompliance" v-model="scope.row.zcNoCompliance"
placeholder="请输入不合规项目" placeholder="请输入不合规项目"
> >
</el-input> </el-input>
@@ -204,7 +204,7 @@
label="应对措施"> label="应对措施">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input <el-input
v-model="dataList[scope.$index].zcCountermeasures" v-model="scope.row.zcCountermeasures"
placeholder="请输入应对措施" placeholder="请输入应对措施"
> >
</el-input> </el-input>
@@ -217,7 +217,7 @@
label="完成时间"> label="完成时间">
<template slot-scope="scope"> <template slot-scope="scope">
<el-date-picker <el-date-picker
v-model="dataList[scope.$index].zcCompletionTime" v-model="scope.row.zcCompletionTime"
type="date" type="date"
placeholder="选择日期"> placeholder="选择日期">
</el-date-picker> </el-date-picker>
@@ -396,6 +396,7 @@ export default {
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
if (res) { if (res) {
console.log(res.mesg)
const processForm = JSON.parse(res.mesg); const processForm = JSON.parse(res.mesg);
this.getFormFieldList(processForm); this.getFormFieldList(processForm);
} }
@@ -407,37 +408,13 @@ export default {
getFormFieldList(item) { getFormFieldList(item) {
this.$nextTick(() => { this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item)); this.listForm = JSON.parse(JSON.stringify(item));
console.log(this.listForm)
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.listForm.dataList = item.dataList; // this.listForm.dataList = item.dataList;
this.dataList = item.dataList; this.dataList = this.listForm.dataList;
let children = []; console.log(this.dataList)
item.breakdownList.forEach(
item => {
let aa = {
key: item.standId,
id: item.id,
standId: item.itemsNum,
itemsNum: item.itemsNum,
itemsName: item.itemsName,
workPeople: "请选择责任人"
};
children.push(aa);
}
);
this.dataList.forEach(key => {
key["children"] = [];
children.forEach(breakDown => {
if (key.standId === breakDown.key) {
key["children"].push(breakDown);
}
});
if (key["children"].length === 0) {
delete key["children"];
}
});
this.listForm.children = children;
}); });
}, },
//保存事件 //保存事件
@@ -446,8 +423,6 @@ export default {
}, },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
this.listForm.dataList.forEach(item => {
if (item.workPeople !== undefined) {
this.listForm.commentText = this.commentText; this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm); const json = JSON.stringify(this.listForm);
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
@@ -463,10 +438,6 @@ export default {
} }
}, e => { }, e => {
}); });
} else {
this.$message.warning("请选择分发负责人");
}
});
}, },
//标准表格选择框改变 //标准表格选择框改变
selectStandChange(data) { selectStandChange(data) {
@@ -42,31 +42,37 @@
</process-title> </process-title>
<el-table <el-table
:data="dataList" :data="dataList"
border style="width: 100%; border: 1px solid #cccccc"
ref="selection" row-key="standId"
height="70%" height="70%"
style="width: 100%; border:1px solid #ccc" border
@selection-change="selectStandChange"
: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'}"
>
<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="standNumber" prop="standEnName"
label="标准编号"
width="180"
fixed="left"
align="center" align="center"
width="200" >
label="标准编号">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="standName" prop="standName"
fixed="left"
width="180"
align="center" align="center"
width="200" label="标准名称"
label="标准名称"> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="itemNum" prop="itemsNum"
align="center" align="center"
width="200" width="200"
label="条款号"> label="条款号">
@@ -78,21 +84,21 @@
label="条款名称"> label="条款名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="xCXSSRQ" prop="xcxssrqgj"
width="200" width="200"
align="center" align="center"
label="新车型实施日期"> label="新车型实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="zCCSSRQ" prop="zccssrqgj"
width="200" width="200"
align="center" align="center"
label="在产车实施日期"> label="在产车实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -169,13 +175,6 @@
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column
fixed="right"
align="center"
width="150"
prop="workPeople"
label="落实人">
</el-table-column>
</el-table> </el-table>
</div> </div>
<div> <div>
@@ -275,12 +274,12 @@
</template> </template>
<script> <script>
import ProcessHeader from "../../components/ProcessHeader"; import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter"; import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle"; import ProcessTitle from "../../components/ProcessTitle";
import { inboundLiaisonDetail, queryDetail } from "api/process"; import {inboundLiaisonDetail, queryDetail} from "api/process";
export default { export default {
name: "xmpg2Step7", name: "xmpg2Step7",
components: { components: {
ProcessTitle, ProcessTitle,
@@ -297,7 +296,7 @@ export default {
saveLoading: false, saveLoading: false,
//表单的数据 //表单的数据
listForm: { listForm: {
BZFlag: " ", //1审批通过 其他为驳回 ffFlag: " ", //1审批通过 其他为驳回
projectNumber: "", //项目编号 projectNumber: "", //项目编号
projectName: "", //项目名称 projectName: "", //项目名称
dataList: [], //项目下的标准数据 dataList: [], //项目下的标准数据
@@ -359,7 +358,10 @@ export default {
}, },
//驳回事件 //驳回事件
beforeBack() { beforeBack() {
this.listForm.BZFlag = "2"; if (this.commentText === null || this.commentText === undefined || this.commentText === '') {
this.$message.warning('请填写审批意见')
} else {
this.listForm.ffFlag = "2";
this.listForm.commentText = this.commentText; this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm); const json = JSON.stringify(this.listForm);
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
@@ -375,10 +377,14 @@ export default {
} }
}, e => { }, e => {
}); });
}
}, },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
this.listForm.BZFlag = "1"; if (this.commentText === null || this.commentText === undefined || this.commentText === '') {
this.$message.warning('请填写审批意见')
} else {
this.listForm.ffFlag = "1";
this.listForm.commentText = this.commentText; this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm); const json = JSON.stringify(this.listForm);
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
@@ -392,10 +398,10 @@ export default {
this.$message.success(res.message); this.$message.success(res.message);
this.$router.push("/processCenter"); this.$router.push("/processCenter");
} }
}, e => {
}); });
} }
}, },
},
computed: { computed: {
listNoDataText() { listNoDataText() {
return this.processType === 1 ? "暂无待办流程" : "暂无已办流程"; return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
@@ -404,14 +410,14 @@ export default {
mounted() { mounted() {
this.processTable(); this.processTable();
this.getData(); this.getData();
} },
}; };
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
@import '~@/assets/styles/style'; @import '~@/assets/styles/style';
.xmpg2-step7 { .xmpg2-step7 {
/deep/ .el-drawer__container { /deep/ .el-drawer__container {
.prc-content-border { .prc-content-border {
border: none; border: none;
@@ -481,5 +487,5 @@ export default {
.demo-drawer-content { .demo-drawer-content {
margin-top: 10px; margin-top: 10px;
} }
} }
</style> </style>
@@ -42,31 +42,37 @@
</process-title> </process-title>
<el-table <el-table
:data="dataList" :data="dataList"
border style="width: 100%; border: 1px solid #cccccc"
ref="selection" row-key="standId"
height="70%" height="70%"
style="width: 100%; border:1px solid #ccc" border
@selection-change="selectStandChange"
: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'}"
>
<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="standNumber" prop="standEnName"
label="标准编号"
width="180"
fixed="left"
align="center" align="center"
width="200" >
label="标准编号">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="standName" prop="standName"
fixed="left"
width="180"
align="center" align="center"
width="200" label="标准名称"
label="标准名称"> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="itemNum" prop="itemsNum"
align="center" align="center"
width="200" width="200"
label="条款号"> label="条款号">
@@ -78,21 +84,21 @@
label="条款名称"> label="条款名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="xCXSSRQ" prop="xcxssrqgj"
width="200" width="200"
align="center" align="center"
label="新车型实施日期"> label="新车型实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="zCCSSRQ" prop="zccssrqgj"
width="200" width="200"
align="center" align="center"
label="在产车实施日期"> label="在产车实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -169,13 +175,6 @@
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column
fixed="right"
align="center"
width="150"
prop="workPeople"
label="落实人">
</el-table-column>
</el-table> </el-table>
</div> </div>
<div> <div>
@@ -297,7 +296,7 @@ export default {
saveLoading: false, saveLoading: false,
//表单的数据 //表单的数据
listForm: { listForm: {
BZFlag: " ", //1审批通过 其他为驳回 jgFlag: " ", //1审批通过 其他为驳回
projectNumber: "", //项目编号 projectNumber: "", //项目编号
projectName: "", //项目名称 projectName: "", //项目名称
dataList: [], //项目下的标准数据 dataList: [], //项目下的标准数据
@@ -359,7 +358,10 @@ export default {
}, },
//驳回事件 //驳回事件
beforeBack() { beforeBack() {
this.listForm.BZFlag = "2"; if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('请填写审批意见')
}else{
this.listForm.jgFlag = "2";
this.listForm.commentText = this.commentText; this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm); const json = JSON.stringify(this.listForm);
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
@@ -375,10 +377,14 @@ export default {
} }
}, e => { }, e => {
}); });
}
}, },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
this.listForm.BZFlag = "1"; if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('请填写审批意见')
}else{
this.listForm.jgFlag = "1";
this.listForm.commentText = this.commentText; this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm); const json = JSON.stringify(this.listForm);
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
@@ -396,6 +402,7 @@ export default {
}); });
} }
}, },
},
computed: { computed: {
listNoDataText() { listNoDataText() {
return this.processType === 1 ? "暂无待办流程" : "暂无已办流程"; return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
@@ -42,31 +42,37 @@
</process-title> </process-title>
<el-table <el-table
:data="dataList" :data="dataList"
border style="width: 100%; border: 1px solid #cccccc"
ref="selection" row-key="standId"
height="70%" height="70%"
style="width: 100%; border:1px solid #ccc" border
@selection-change="selectStandChange"
: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'}"
>
<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="standNumber" prop="standEnName"
label="标准编号"
width="180"
fixed="left"
align="center" align="center"
width="200" >
label="标准编号">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="standName" prop="standName"
fixed="left"
width="180"
align="center" align="center"
width="200" label="标准名称"
label="标准名称"> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="itemNum" prop="itemsNum"
align="center" align="center"
width="200" width="200"
label="条款号"> label="条款号">
@@ -78,21 +84,21 @@
label="条款名称"> label="条款名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="xCXSSRQ" prop="xcxssrqgj"
width="200" width="200"
align="center" align="center"
label="新车型实施日期"> label="新车型实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="zCCSSRQ" prop="zccssrqgj"
width="200" width="200"
align="center" align="center"
label="在产车实施日期"> label="在产车实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -169,13 +175,6 @@
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column
fixed="right"
align="center"
width="150"
prop="workPeople"
label="落实人">
</el-table-column>
</el-table> </el-table>
</div> </div>
<div> <div>
@@ -359,7 +358,10 @@ export default {
}, },
//驳回事件 //驳回事件
beforeBack() { beforeBack() {
this.listForm.BZFlag = "2"; if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('请填写审批意见')
}else{
this.listForm.gcFlag = "2";
this.listForm.commentText = this.commentText; this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm); const json = JSON.stringify(this.listForm);
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
@@ -375,10 +377,14 @@ export default {
} }
}, e => { }, e => {
}); });
}
}, },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
this.listForm.BZFlag = "1"; if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('请填写审批意见')
}else{
this.listForm.gcFlag = "1";
this.listForm.commentText = this.commentText; this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm); const json = JSON.stringify(this.listForm);
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
@@ -396,6 +402,7 @@ export default {
}); });
} }
}, },
},
computed: { computed: {
listNoDataText() { listNoDataText() {
return this.processType === 1 ? "暂无待办流程" : "暂无已办流程"; return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";