Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
zhutianqi
@@ -17,6 +17,7 @@
|
||||
<el-form
|
||||
:model="listForm"
|
||||
:rules="formRules"
|
||||
ref="xmpgForm"
|
||||
class="label-input-form prc-content-border"
|
||||
label-width="150px"
|
||||
>
|
||||
@@ -39,18 +40,17 @@
|
||||
clearable
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="认证工程师" prop="certifiedEngineer" class="add-form-item form-item-disabled">
|
||||
<el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
|
||||
<el-input
|
||||
v-model="listForm.certifiedEngineer"
|
||||
v-model="listForm.certifiedEngineerName"
|
||||
placeholder="请选择认证工程师"
|
||||
clearable
|
||||
@click.native="choiceZRR(null,'certifiedEngineer', '选择认证工程师', roleForm.certifiedEngineer)"
|
||||
></el-input>
|
||||
<el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="质量工程师" prop="qualityEngineer" class="add-form-item form-item-disabled">
|
||||
<el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
|
||||
<el-input
|
||||
v-model="listForm.qualityEngineer"
|
||||
v-model="listForm.qualityEngineerName"
|
||||
placeholder="请选择质量工程师"
|
||||
clearable
|
||||
@click.native="choiceZRR(null,'qualityEngineer', '选择质量工程师', roleForm.qualityEngineer)"
|
||||
@@ -139,12 +139,12 @@
|
||||
</el-timeline-item>
|
||||
<el-timeline-item timestamp="标准法规部领导审批" placement="top" :color="roleForm.directorUser ? '#66b1ff' : ''">
|
||||
<el-card>
|
||||
<el-form-item prop="directorUserName" style="margin-bottom: 0">
|
||||
<el-form-item prop="ministerUserName" style="margin-bottom: 0">
|
||||
<h4>标准法规部领导</h4>
|
||||
<div style="margin-top: 10px;width: 300px;">
|
||||
<el-input v-model="roleForm.directorUser" style="display: none;"></el-input>
|
||||
<el-input v-model="roleForm.directorUserName" placeholder="请选择标准法规部领导"
|
||||
@click.native="choiceZRR(null,'directorUser', '选择标准法规部领导', roleForm.directorUser)"></el-input>
|
||||
<el-input v-model="roleForm.ministerUser" style="display: none;"></el-input>
|
||||
<el-input v-model="roleForm.ministerUserName" placeholder="请选择标准法规部领导"
|
||||
@click.native="choiceZRR(null,'ministerUser', '选择标准法规部领导', roleForm.ministerUser)"></el-input>
|
||||
</div>
|
||||
</el-form-item>
|
||||
</el-card>
|
||||
@@ -354,26 +354,35 @@ export default {
|
||||
startUser: this.$store.getters.userInfo.id,
|
||||
qualityEngineer: "",
|
||||
certifiedEngineer:"",
|
||||
qualityEngineerName: "",
|
||||
certifiedEngineerName:"",
|
||||
distributePerson: "",
|
||||
dockUser:'',
|
||||
ministerUser:"",
|
||||
dockUserName:'',
|
||||
ministerUserName:"",
|
||||
},
|
||||
formRules: {
|
||||
listType: [
|
||||
{ required: true, message: "请选择清单类型", trigger: "blur" }
|
||||
standName: [
|
||||
{ required: true, message: "请填写标准名称", trigger: "change" }
|
||||
],
|
||||
standNumber: [
|
||||
{ required: true, message: "请填写标准编号", trigger: "change" }
|
||||
],
|
||||
qualityEngineer: [
|
||||
{ required: true, message: "请选择质量工程师", trigger: "change" }
|
||||
],
|
||||
certifiedEngineer: [
|
||||
{ required: true, message: "请选择认证工程师", trigger: "change" }
|
||||
],
|
||||
listName: [
|
||||
{ required: true, message: "请填写清单名称", trigger: "change" }
|
||||
]
|
||||
},
|
||||
roleFormRules: {
|
||||
// dockUserName: [
|
||||
// { required: true, message: "请选择会签责任人", trigger: "blur" }
|
||||
// ],
|
||||
dockUserName: [
|
||||
{ required: true, message: "请选择业务经理", trigger: "change" }
|
||||
],
|
||||
ministerUserName: [
|
||||
{ required: true, message: "请选择修订责任人", trigger: "blur" }
|
||||
{ required: true, message: "请选择标准法规部领导", trigger: "change" }
|
||||
],
|
||||
directorUserName: [
|
||||
{ required: true, message: "请选择审批责任人", trigger: "blur" }
|
||||
]
|
||||
},
|
||||
ListModel: false, //选择拆分标准抽屉状态
|
||||
treeData: [], // 人员数据
|
||||
@@ -440,16 +449,16 @@ export default {
|
||||
} else if (this.type === "ministerUser") {
|
||||
this.roleForm.ministerUser = this.roleRow.id;
|
||||
this.roleForm.ministerUserName = this.roleRow.name;
|
||||
} else if (this.type === "directorUser") {
|
||||
this.roleForm.directorUser = this.roleRow.id;
|
||||
this.roleForm.directorUserName = this.roleRow.name;
|
||||
} else if (this.type === "presidentUser") {
|
||||
this.roleForm.presidentUser = this.roleRow.id;
|
||||
this.roleForm.presidentUserName = this.roleRow.name;
|
||||
} else if (this.type === "qualityEngineer") {
|
||||
this.listForm.qualityEngineer = this.roleRow.name;
|
||||
this.roleForm.qualityEngineer = this.roleRow.id;
|
||||
this.roleForm.qualityEngineerName = this.roleRow.name;
|
||||
this.listForm.qualityEngineer = this.roleForm.qualityEngineer;
|
||||
this.listForm.qualityEngineerName = this.roleForm.qualityEngineerName;
|
||||
} else if (this.type === "certifiedEngineer") {
|
||||
this.listForm.certifiedEngineer = this.roleRow.name;
|
||||
this.roleForm.certifiedEngineer = this.roleRow.id;
|
||||
this.roleForm.certifiedEngineerName = this.roleRow.name;
|
||||
this.listForm.certifiedEngineer = this.roleForm.certifiedEngineer;
|
||||
this.listForm.certifiedEngineerName = this.roleForm.certifiedEngineerName;
|
||||
} else if (this.type === "distributePerson") {
|
||||
this.listForm.distributePerson = this.roleRow.name;
|
||||
this.listForm.dataList[this.dsadadadsada].distributePersonId=this.roleRow.id
|
||||
@@ -527,32 +536,41 @@ export default {
|
||||
},
|
||||
//提交事件
|
||||
handleSubmit() {
|
||||
let json = this.listForm;
|
||||
json.zrUserId = this.$store.getters.userInfo.userId;
|
||||
json.jlUserId = this.$store.getters.userInfo.userId;
|
||||
json.applyUpdUserId = this.$store.getters.userInfo.userId;
|
||||
json.approvalOpinion = "";
|
||||
json.prcCreateUser = this.$store.getters.userInfo.userId;
|
||||
json.prcCreateUserName = this.$store.getters.userInfo.account;
|
||||
console.log(this.roleForm)
|
||||
console.log(this.listForm);
|
||||
// var json = this.listForm
|
||||
var json = Object.assign(this.listForm, this.roleForm)
|
||||
json.prcCreateUser = this.$store.getters.userInfo.userId;
|
||||
json.prcCreateUserName = this.$store.getters.userInfo.account;
|
||||
json.standId = this.listForm.standId;
|
||||
this.$http.get("lawss/activiti/startProcess", { type: "5" }, {
|
||||
_this: this
|
||||
}, res => {
|
||||
if (res.ok) {
|
||||
this.$http.post("lawss/activiti/completeTask", {
|
||||
taskIds: res.data,
|
||||
userId: this.$store.getters.userInfo.userId,
|
||||
json: JSON.stringify(json)
|
||||
}, {
|
||||
_this: this
|
||||
}, res => {
|
||||
if (res.success) {
|
||||
this.$message.success(res.message);
|
||||
this.$router.push("/processCenter");
|
||||
this.$refs["xmpgForm"].validate((valid) => {
|
||||
if (valid) {
|
||||
this.$refs["Form"].validate((valid) => {
|
||||
if (valid) {
|
||||
this.$http.get("lawss/activiti/startProcess", { type: "5" }, {
|
||||
_this: this
|
||||
}, res => {
|
||||
if (res.ok) {
|
||||
this.$http.post("lawss/activiti/completeTask", {
|
||||
taskIds: res.data,
|
||||
userId: this.$store.getters.userInfo.userId,
|
||||
json: JSON.stringify(json)
|
||||
}, {
|
||||
_this: this
|
||||
}, res => {
|
||||
if (res.success) {
|
||||
this.$message.success(res.message);
|
||||
this.$router.push("/processCenter");
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
} else {
|
||||
return this.$message.warning("请完善人员信息");
|
||||
}
|
||||
});
|
||||
} else {
|
||||
return this.$message.warning("请完善基础信息");
|
||||
}
|
||||
});
|
||||
},
|
||||
@@ -600,7 +618,9 @@ export default {
|
||||
this.standList = data;
|
||||
},
|
||||
choiceZRR(scope,type, title, id) {
|
||||
if(scope!=null)this.dsadadadsada=scope.$index;
|
||||
if(scope!=null){
|
||||
this.dsadadadsada = scope.$index;
|
||||
}
|
||||
this.nodeList = [];
|
||||
this.nodeList.push(id);
|
||||
this.type = type;
|
||||
@@ -632,8 +652,8 @@ export default {
|
||||
}, {
|
||||
_this: this
|
||||
}, res => {
|
||||
console.log(res.data.records);
|
||||
this.productData = res.data.records;
|
||||
console.log(res.data);
|
||||
this.productData = res.data;
|
||||
this.totalNo = res.data.total;
|
||||
}, e => {
|
||||
|
||||
|
||||
@@ -35,16 +35,16 @@
|
||||
clearable
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="认证工程师" prop="certifiedEngineer" class="add-form-item form-item-disabled">
|
||||
<el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
|
||||
<el-input
|
||||
v-model="listForm.certifiedEngineer"
|
||||
v-model="listForm.certifiedEngineerName"
|
||||
placeholder="请选择认证工程师"
|
||||
clearable
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="质量工程师" prop="qualityEngineer" class="add-form-item form-item-disabled">
|
||||
<el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
|
||||
<el-input
|
||||
v-model="listForm.qualityEngineer"
|
||||
v-model="listForm.qualityEngineerName"
|
||||
placeholder="请选择质量工程师"
|
||||
clearable
|
||||
></el-input>
|
||||
@@ -234,6 +234,8 @@ export default {
|
||||
standName: "",//标准名称
|
||||
certifiedEngineer: "", //认证工程师
|
||||
qualityEngineer: "", //质量工程师
|
||||
certifiedEngineerName: "", //认证工程师
|
||||
qualityEngineerName: "", //质量工程师
|
||||
breakdownList: [{
|
||||
applyArctic: "",
|
||||
busStandCover: "",
|
||||
@@ -302,6 +304,7 @@ export default {
|
||||
taskIds: this.taskIds,
|
||||
pId: this.pId
|
||||
}).then(res => {
|
||||
console.log(res.mesg);
|
||||
if (res) {
|
||||
const processForm = JSON.parse(res.mesg)
|
||||
this.getFormFieldList(processForm)
|
||||
|
||||
@@ -35,16 +35,16 @@
|
||||
clearable
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="认证工程师" prop="certifiedEngineer" class="add-form-item form-item-disabled">
|
||||
<el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
|
||||
<el-input
|
||||
v-model="listForm.certifiedEngineer"
|
||||
v-model="listForm.certifiedEngineerName"
|
||||
placeholder="请选择认证工程师"
|
||||
clearable
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="质量工程师" prop="qualityEngineer" class="add-form-item form-item-disabled">
|
||||
<el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
|
||||
<el-input
|
||||
v-model="listForm.qualityEngineer"
|
||||
v-model="listForm.qualityEngineerName"
|
||||
placeholder="请选择质量工程师"
|
||||
clearable
|
||||
></el-input>
|
||||
@@ -97,6 +97,16 @@
|
||||
align="center"
|
||||
label="条款名称">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="newTime"
|
||||
align="center"
|
||||
label="新车型实施日期">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="oldTime"
|
||||
align="center"
|
||||
label="在产车实施日期">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
fixed="right"
|
||||
prop="implementer"
|
||||
@@ -382,7 +392,11 @@ export default {
|
||||
distributePerson: item.pepdtos[i].distributePerson,
|
||||
distributePersonId: item.pepdtos[i].distributePersonId,
|
||||
uname: item.pepdtos[i].uname,
|
||||
projectManager: item.pepdtos[i].projectManager
|
||||
projectManager: item.pepdtos[i].projectManager,
|
||||
certifiedEngineer: item.pepdtos[i].certifiedEngineer,
|
||||
qualityEngineer: item.pepdtos[i].qualityEngineer,
|
||||
standNumber: item.pepdtos[i].standNumber,
|
||||
standName: item.pepdtos[i].standName,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<div class="xmpg-step4">
|
||||
<ProcessHeader toggle>
|
||||
<template slot="proName">项目合规评估流程</template>
|
||||
<template slot="proNode">分发责任人分发任务</template>
|
||||
<template slot="proNode">落实人填写评估反馈</template>
|
||||
</ProcessHeader>
|
||||
<div class="headerTabs">
|
||||
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
|
||||
@@ -75,90 +75,166 @@
|
||||
<el-table-column
|
||||
prop="productLine"
|
||||
align="center"
|
||||
width="200"
|
||||
label="产品线">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="projectNumber"
|
||||
align="center"
|
||||
width="200"
|
||||
label="项目编号">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="projectName"
|
||||
align="center"
|
||||
width="200"
|
||||
label="项目名称">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="itemNum"
|
||||
align="center"
|
||||
width="200"
|
||||
label="条款号">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="itemsName"
|
||||
width="200"
|
||||
align="center"
|
||||
label="条款名称">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="newTime"
|
||||
width="200"
|
||||
align="center"
|
||||
label="新车型实施日期">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="oldTime"
|
||||
width="200"
|
||||
align="center"
|
||||
label="在产车实施日期">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="productType"
|
||||
width="450"
|
||||
align="center"
|
||||
label="在研产品">
|
||||
<el-table-column
|
||||
prop="researchImplementationTime"
|
||||
align="center"
|
||||
label="实施时间">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="researchCompliance"
|
||||
align="center"
|
||||
width="160"
|
||||
label="合规">
|
||||
<template slot-scope="scope">
|
||||
<el-input
|
||||
v-model="dataList[scope.$index].complianceReasons"
|
||||
placeholder="请输入合规原因"
|
||||
>
|
||||
</el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
align="center"
|
||||
width="160"
|
||||
prop="researchNonCompliance"
|
||||
label="不合规">
|
||||
<el-table-column
|
||||
prop="researchNonCompliance"
|
||||
align="center"
|
||||
width="160"
|
||||
label="不合规项目">
|
||||
<template slot-scope="scope">
|
||||
<el-input
|
||||
v-model="dataList[scope.$index].noCompliance"
|
||||
placeholder="请输入不合规项目"
|
||||
>
|
||||
</el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="researchCountermeasures"
|
||||
align="center"
|
||||
width="160"
|
||||
label="应对措施">
|
||||
<template slot-scope="scope">
|
||||
<el-input
|
||||
v-model="dataList[scope.$index].countermeasures"
|
||||
placeholder="请输入应对措施"
|
||||
>
|
||||
</el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="researchCompletionTime"
|
||||
align="center"
|
||||
width="160"
|
||||
label="完成时间">
|
||||
<template slot-scope="scope">
|
||||
<el-date-picker
|
||||
v-model="dataList[scope.$index].completionTime"
|
||||
type="date"
|
||||
placeholder="选择日期">
|
||||
</el-date-picker>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table-column>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
align="center"
|
||||
width="450"
|
||||
label="在产产品">
|
||||
<el-table-column
|
||||
prop="productionImplementationTime"
|
||||
align="center"
|
||||
label="实施时间">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="productionCompliance"
|
||||
align="center"
|
||||
width="160"
|
||||
label="合规(具体情况)">
|
||||
<template slot-scope="scope">
|
||||
<el-input
|
||||
v-model="dataList[scope.$index].zcComplianceReasons"
|
||||
placeholder="请输入合规原因"
|
||||
>
|
||||
</el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
align="center"
|
||||
width="160"
|
||||
label="不合规">
|
||||
<el-table-column
|
||||
prop="productionNonCompliance"
|
||||
align="center"
|
||||
width="160"
|
||||
label="不合规项目">
|
||||
<template slot-scope="scope">
|
||||
<el-input
|
||||
v-model="dataList[scope.$index].zcNoCompliance"
|
||||
placeholder="请输入不合规项目"
|
||||
>
|
||||
</el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="productionCountermeasures"
|
||||
align="center"
|
||||
width="160"
|
||||
label="应对措施">
|
||||
<template slot-scope="scope">
|
||||
<el-input
|
||||
v-model="dataList[scope.$index].zcCountermeasures"
|
||||
placeholder="请输入应对措施"
|
||||
>
|
||||
</el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="productionCompletionTime"
|
||||
align="center"
|
||||
width="160"
|
||||
label="完成时间">
|
||||
<template slot-scope="scope">
|
||||
<el-date-picker
|
||||
v-model="dataList[scope.$index].zcCompletionTime"
|
||||
type="date"
|
||||
placeholder="选择日期">
|
||||
</el-date-picker>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table-column>
|
||||
</el-table-column>
|
||||
@@ -285,6 +361,7 @@ export default {
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
|
||||
detailData: [],
|
||||
sarProStateTableHeight: null, // 项目列表高度
|
||||
// 当前流程类型(1待办/2已办)
|
||||
@@ -307,24 +384,62 @@ export default {
|
||||
total: 0,
|
||||
pageSize: this.$store.getters.userInfo.configContent,
|
||||
listForm: {
|
||||
listType: "", //区分是哪个清单
|
||||
listName: "", //清单名称
|
||||
applyRegion: "", //适用区域
|
||||
descriptionList: "", //清单说明
|
||||
enclosure: "", //附件
|
||||
inforlist: "",//用来存放标准的id
|
||||
standNumber: "", //标准编号
|
||||
standName: "",//标准名称
|
||||
certifiedEngineer: "", //认证工程师
|
||||
qualityEngineer: "", //质量工程师
|
||||
dataList: [{
|
||||
standNumber: "", //标准号
|
||||
cnName: "", //中文名称
|
||||
enName: "", //英文名称
|
||||
isSubTime: "", //发布日期
|
||||
newCarTime: "", //新车型实施日期
|
||||
oldCarTime: "", //在产车实施日期
|
||||
applyCar: "", //适用车型
|
||||
textState: "", //文本状态
|
||||
id: ""
|
||||
projectManager: '',
|
||||
itemsName: '',
|
||||
uname: '',
|
||||
projectNumber: '',
|
||||
implementer: '',
|
||||
implementerId: '',
|
||||
productLine: '',
|
||||
itemNum:'',
|
||||
distributePerson:'',
|
||||
projectName:'',
|
||||
distributePersonId:'',
|
||||
complianceReasons:'', //在研合规原因
|
||||
noCompliance:'', //在研不合规项目
|
||||
countermeasures:'', //在研应对措施
|
||||
completionTime:'', //在研完成时间
|
||||
zcComplianceReasons: '', //在产的合规原因
|
||||
zcNoCompliance:'', //在产不合规项目
|
||||
zcCountermeasures:'', //在产的应对措施
|
||||
zcCompletionTime:'', //在产的完成时间
|
||||
}]
|
||||
},
|
||||
// listForm: {
|
||||
// standNumber: "", //标准编号
|
||||
// standName: "",//标准名称
|
||||
// certifiedEngineer: "", //认证工程师
|
||||
// qualityEngineer: "", //质量工程师
|
||||
// dataList: [{
|
||||
// certifiedEngineer: '',
|
||||
// projectManager: '',
|
||||
// standNumber: '',
|
||||
// itemsName: '',
|
||||
// uname: '',
|
||||
// projectNumber: '',
|
||||
// implementer: '',
|
||||
// implementerId: '',
|
||||
// productLine: '',
|
||||
// itemNum:'',
|
||||
// qualityEngineer: '',
|
||||
// distributePerson:'',
|
||||
// projectName:'',
|
||||
// standName:'',
|
||||
// distributePersonId:'',
|
||||
// complianceReasons:'', //在研合规原因
|
||||
// noCompliance:'', //在研不合规项目
|
||||
// countermeasures:'', //在研应对措施
|
||||
// completionTime:'', //在研完成时间
|
||||
// zcComplianceReasons: '', //在产的合规原因
|
||||
// zcCountermeasures:'', //在产的应对措施
|
||||
// zcCompletionTime:'', //在产的完成时间
|
||||
// }]
|
||||
// },
|
||||
choiceForm: {}, //选择标准清单列表
|
||||
countryOptions: [], //适用区域下拉框数据
|
||||
user1: "",
|
||||
@@ -358,6 +473,7 @@ export default {
|
||||
taskIds: this.taskIds,
|
||||
pId: this.pId
|
||||
}).then(res => {
|
||||
console.log(res.mesg);
|
||||
if (res) {
|
||||
const processForm = JSON.parse(res.mesg)
|
||||
this.getFormFieldList(processForm)
|
||||
@@ -375,8 +491,11 @@ export default {
|
||||
this.listForm.prcNum = this.prcNum
|
||||
this.listForm.prcName = this.prcName
|
||||
this.listForm['id'] = item.id
|
||||
this.listForm.dataList = item.dataList
|
||||
this.dataList = item.dataList
|
||||
this.dataList = item.step3DTOS
|
||||
this.listForm.standName = item.step3DTOS[0].standName
|
||||
this.listForm.standNumber = item.step3DTOS[0].standNumber
|
||||
this.listForm.qualityEngineer = item.step3DTOS[0].qualityEngineer
|
||||
this.listForm.certifiedEngineer = item.step3DTOS[0].certifiedEngineer
|
||||
})
|
||||
},
|
||||
|
||||
@@ -394,6 +513,7 @@ export default {
|
||||
this.listForm.approvalOpinion = "";
|
||||
this.listForm.standId = this.listForm.standId;
|
||||
this.listForm.signFlag = "";
|
||||
this.listForm.dataList = this.dataList
|
||||
const json = JSON.stringify(this.listForm);
|
||||
this.$http.post('lawss/activiti/completeTask', {
|
||||
taskIds: this.taskIds,
|
||||
|
||||
@@ -1,13 +1,563 @@
|
||||
<!--评估流程 - 分析审批 -->
|
||||
<template>
|
||||
<div class="xmpg-step5">
|
||||
<ProcessHeader toggle>
|
||||
<template slot="proName">项目合规评估流程</template>
|
||||
<template slot="proNode">审批评估反馈</template>
|
||||
</ProcessHeader>
|
||||
<div class="headerTabs">
|
||||
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
|
||||
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
|
||||
</div>
|
||||
<div class="content" v-if="active == '1'">
|
||||
<div style="flex: auto; overflow: auto">
|
||||
<process-title>
|
||||
<template slot="title">基础信息</template>
|
||||
</process-title>
|
||||
<el-form
|
||||
:model="listForm"
|
||||
class="label-input-form prc-content-border"
|
||||
label-width="150px"
|
||||
>
|
||||
<el-row :gutter="24">
|
||||
<el-col :span="24">
|
||||
<el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
|
||||
<el-input
|
||||
v-model="listForm.standNumber"
|
||||
placeholder="请输入标准编号"
|
||||
clearable
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
|
||||
<el-input
|
||||
v-model="listForm.standName"
|
||||
placeholder="请输入标准名称"
|
||||
clearable
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="认证工程师" prop="certifiedEngineer" class="add-form-item form-item-disabled">
|
||||
<el-input
|
||||
v-model="listForm.certifiedEngineer"
|
||||
placeholder="请选择认证工程师"
|
||||
clearable
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="质量工程师" prop="qualityEngineer" class="add-form-item form-item-disabled">
|
||||
<el-input
|
||||
v-model="listForm.qualityEngineer"
|
||||
placeholder="请选择质量工程师"
|
||||
clearable
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
<process-title>
|
||||
<template slot="title">填写信息</template>
|
||||
</process-title>
|
||||
<div class="tableTitle">
|
||||
</div>
|
||||
<el-table
|
||||
ref="multipleTable"
|
||||
:data="dataList"
|
||||
tooltip-effect="dark"
|
||||
style="width: 100%"
|
||||
border
|
||||
@selection-change="selectStandChange"
|
||||
:height="sarProStateTableHeight"
|
||||
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
|
||||
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
|
||||
<el-table-column
|
||||
type="selection"
|
||||
width="55"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="productLine"
|
||||
align="center"
|
||||
width="200"
|
||||
label="产品线">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="projectNumber"
|
||||
align="center"
|
||||
width="200"
|
||||
label="项目编号">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="projectName"
|
||||
align="center"
|
||||
width="200"
|
||||
label="项目名称">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="itemNum"
|
||||
align="center"
|
||||
width="200"
|
||||
label="条款号">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="itemsName"
|
||||
width="200"
|
||||
align="center"
|
||||
label="条款名称">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="productType"
|
||||
align="center"
|
||||
label="在研产品">
|
||||
<el-table-column
|
||||
prop="complianceReasons"
|
||||
align="center"
|
||||
width="160"
|
||||
label="合规">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
align="center"
|
||||
width="160"
|
||||
prop="researchNonCompliance"
|
||||
label="不合规">
|
||||
<el-table-column
|
||||
prop="noCompliance"
|
||||
align="center"
|
||||
width="160"
|
||||
label="不合规项目">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="countermeasures"
|
||||
align="center"
|
||||
width="160"
|
||||
label="应对措施">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="completionTime"
|
||||
align="center"
|
||||
width="160"
|
||||
label="完成时间">
|
||||
</el-table-column>
|
||||
</el-table-column>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
align="center"
|
||||
label="在产产品">
|
||||
<el-table-column
|
||||
prop="zcComplianceReasons"
|
||||
align="center"
|
||||
width="160"
|
||||
label="合规(具体情况)">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
align="center"
|
||||
width="160"
|
||||
label="不合规">
|
||||
<el-table-column
|
||||
prop="zcNoCompliance"
|
||||
align="center"
|
||||
width="160"
|
||||
label="不合规项目">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="zcCountermeasures"
|
||||
align="center"
|
||||
width="160"
|
||||
label="应对措施">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="zcCompletionTime"
|
||||
align="center"
|
||||
width="160"
|
||||
label="完成时间">
|
||||
</el-table-column>
|
||||
</el-table-column>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
fixed="right"
|
||||
align="center"
|
||||
width="150"
|
||||
prop="implementer"
|
||||
label="落实人">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
fixed="right"
|
||||
align="center"
|
||||
width="150"
|
||||
prop="distributePerson"
|
||||
label="责任人">
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
<div>
|
||||
<el-collapse accordion>
|
||||
<el-collapse-item title="意见填写">
|
||||
<div style="margin: 10px 0;">
|
||||
<el-input
|
||||
type="textarea"
|
||||
:rows="3"
|
||||
resize="none"
|
||||
placeholder="请输入意见"
|
||||
v-model="commentText">
|
||||
</el-input>
|
||||
</div>
|
||||
</el-collapse-item>
|
||||
</el-collapse>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="content" v-if="active === '3'">
|
||||
<div class="flow-list">
|
||||
<el-table
|
||||
height="100%"
|
||||
ref="selection"
|
||||
:data="detailData"
|
||||
tooltip-effect="dark"
|
||||
style="width: 100%"
|
||||
border
|
||||
row-key="id"
|
||||
:no-data-text="listNoDataText"
|
||||
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
|
||||
>
|
||||
<el-table-column
|
||||
type="selection"
|
||||
width="55"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="name"
|
||||
label="任务步骤"
|
||||
align="center"
|
||||
sortable="custom"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="assignee"
|
||||
label="任务受理人"
|
||||
align="center"
|
||||
sortable="custom"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="createTime"
|
||||
label="创建时间"
|
||||
sortable="custom"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="endTime"
|
||||
label="完成时间"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="comment"
|
||||
label="审批意见"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{scope.row.commentText}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="completeFlag"
|
||||
label="状态"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.endTime ? '已完成' : '未完成'}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<loading :loading="loading">流程列表加载中</loading>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<ProcessFooter
|
||||
show-back
|
||||
show-submit
|
||||
:submitLoading="isSubmit"
|
||||
:saveLoading="saveLoading"
|
||||
:approval="true"
|
||||
@back="beforeBack"
|
||||
@submit="handleSubmit"
|
||||
>
|
||||
</ProcessFooter>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import ProcessHeader from "../../components/ProcessHeader";
|
||||
import ProcessFooter from "../../components/ProcessFooter";
|
||||
import ProcessTitle from "../../components/ProcessTitle";
|
||||
import { inboundLiaisonDetail, queryDetail } from "api/process";
|
||||
|
||||
export default {
|
||||
name: "xmpgStep5"
|
||||
name: "xmpgStep5",
|
||||
components: {
|
||||
ProcessHeader,
|
||||
ProcessFooter,
|
||||
ProcessTitle
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
detailData: [],
|
||||
sarProStateTableHeight: null, // 项目列表高度
|
||||
// 当前流程类型(1待办/2已办)
|
||||
processType: 1,
|
||||
loading: false,
|
||||
dataList: [],
|
||||
active: "1",
|
||||
userId:this.$store.getters.userInfo.userId,
|
||||
taskIds: this.$route.query.taskIds,
|
||||
pId: this.$route.query.prcId,
|
||||
listType: "country", //选择的清单类型
|
||||
isSubmit: false,
|
||||
saveLoading: false,
|
||||
tabValue: "listOfCountries",
|
||||
selectedList: [], //选择清单的选择框
|
||||
selectList: [], //选择标准的选择框
|
||||
bringData: [],
|
||||
commentText: "", //填写会签意见
|
||||
page: 1,
|
||||
total: 0,
|
||||
pageSize: this.$store.getters.userInfo.configContent,
|
||||
listForm: {
|
||||
fenFlag: '1', //1为通过 其他为驳回
|
||||
standNumber: "", //标准编号
|
||||
standName: "",//标准名称
|
||||
certifiedEngineer: "", //认证工程师
|
||||
qualityEngineer: "", //质量工程师
|
||||
breakdownList: [{ //分解单数据
|
||||
implementer: "",
|
||||
applyArctic: "",
|
||||
busStandCover: "",
|
||||
claimType: "",
|
||||
id: "",
|
||||
itemsName: "",
|
||||
itemsNum: "",
|
||||
responsibleUnit: "",
|
||||
standId: "",
|
||||
svpps: ""
|
||||
}],
|
||||
dataList: [{
|
||||
implementer: "",
|
||||
projectLine: "", //产品线
|
||||
uname: "",//产品线责任人
|
||||
distributePerson: "", //分发责任人
|
||||
distributePersonId: "", //分发责任人id
|
||||
id: "",
|
||||
sarStandProjectLibraries: [{
|
||||
projectManager: "",
|
||||
projectLevel: "",
|
||||
projectNumber: "",
|
||||
projectEndDate: "",
|
||||
currentNode: "",
|
||||
projectGroup: "",
|
||||
productLine: "",
|
||||
projectClassification: "",
|
||||
projectStatus: "",
|
||||
projectStartDate: "",
|
||||
id: "",
|
||||
projectName: "",
|
||||
projectPlatfor: ""
|
||||
}]
|
||||
}]
|
||||
},
|
||||
choiceForm: {}, //选择标准清单列表
|
||||
countryOptions: [], //适用区域下拉框数据
|
||||
user1: "",
|
||||
user2: "",
|
||||
user3: "",
|
||||
user4: "",
|
||||
user5: "",
|
||||
standMap: new Map()
|
||||
};
|
||||
},
|
||||
methods: {
|
||||
processTable () {
|
||||
this.$http.get('lawss/activiti/get_list_by_instance', {
|
||||
prcNum: this.$route.query.prcNum,
|
||||
sortWord: this.shunxu ? this.paixu : '',
|
||||
shunxu: this.shunxu
|
||||
}, {
|
||||
loading: 'loading',
|
||||
_this: this
|
||||
}, res => {
|
||||
this.detailData = res
|
||||
}, e => {})
|
||||
},
|
||||
//tab发生变化
|
||||
handleTabs(name) {
|
||||
this.active = name;
|
||||
},
|
||||
getData() {
|
||||
return new Promise((resolve, reject) => {
|
||||
inboundLiaisonDetail({
|
||||
taskIds: this.taskIds,
|
||||
pId: this.pId
|
||||
}).then(res => {
|
||||
console.log(res.mesg);
|
||||
if (res) {
|
||||
const processForm = JSON.parse(res.mesg)
|
||||
this.getFormFieldList(processForm)
|
||||
}
|
||||
}).catch(e => {
|
||||
})
|
||||
})
|
||||
},
|
||||
/**
|
||||
* @description: 动态表单读取
|
||||
*/
|
||||
getFormFieldList (item) {
|
||||
console.log(item.dataList);
|
||||
this.$nextTick(() => {
|
||||
this.listForm = JSON.parse(JSON.stringify(item))
|
||||
this.listForm.prcNum = this.prcNum
|
||||
this.listForm.prcName = this.prcName
|
||||
this.listForm['id'] = item.id
|
||||
this.dataList = item.dataList
|
||||
})
|
||||
},
|
||||
|
||||
|
||||
//驳回事件
|
||||
beforeBack () {
|
||||
this.listForm.fenFlag = '2'
|
||||
this.handleSubmit()
|
||||
},
|
||||
//提交事件
|
||||
handleSubmit() {
|
||||
this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
|
||||
this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
|
||||
this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
|
||||
this.listForm.zrUserId = this.$store.getters.userInfo.userId ;
|
||||
this.listForm.commentText = this.commentText;
|
||||
this.listForm.standId = this.listForm.standId;
|
||||
this.listForm.fenFlag = "1";
|
||||
this.listForm.dataList = this.dataList
|
||||
const json = JSON.stringify(this.listForm);
|
||||
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')
|
||||
}
|
||||
}, e => {
|
||||
|
||||
});
|
||||
},
|
||||
//标准表格选择框改变
|
||||
selectStandChange(data) {
|
||||
this.selectList = [];
|
||||
for (let i = 0; i < data.length; i++) {
|
||||
this.selectList.push(data[i].id);
|
||||
}
|
||||
},
|
||||
selectThree() {
|
||||
|
||||
},
|
||||
pageChange(page) {
|
||||
this.page = page;
|
||||
this.searchData();
|
||||
},
|
||||
pageSizeChange(pageSize) {
|
||||
this.pageSize = this.$store.getters.userInfo.configContent;
|
||||
this.searchData();
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
listNoDataText () {
|
||||
return this.processType === 1 ? '暂无待办流程' : '暂无已办流程'
|
||||
},
|
||||
},
|
||||
mounted() {
|
||||
this.processTable()
|
||||
this.getData()
|
||||
// console.log(this.$store.getters.getHandleInfo);
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
<style lang="less" scoped>
|
||||
@import '~@/assets/styles/style';
|
||||
|
||||
.xmpg-step5 {
|
||||
/deep/ .el-drawer__container {
|
||||
.prc-content-border {
|
||||
border: none;
|
||||
padding: 0 20px 0;
|
||||
}
|
||||
}
|
||||
|
||||
.choiceBtn {
|
||||
.el-button--primary {
|
||||
width: 150px;
|
||||
}
|
||||
}
|
||||
|
||||
position: relative;
|
||||
height: 100%;
|
||||
|
||||
.headerTabs {
|
||||
height: 52px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
position: absolute;
|
||||
top: 0;
|
||||
right: 10px;
|
||||
|
||||
.headerTabsItem {
|
||||
border: 1px solid #c1c1c1;
|
||||
padding: 0 5px;
|
||||
height: 30px;
|
||||
line-height: 30px;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.active {
|
||||
border: 1px solid #E6A23C;
|
||||
color: #fff;
|
||||
background: #E6A23C;
|
||||
}
|
||||
}
|
||||
|
||||
.content {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-between;
|
||||
height: calc(~'100% - 103px');
|
||||
overflow: auto;
|
||||
|
||||
.tableTitle {
|
||||
margin-bottom: 10px;
|
||||
height: 30px;
|
||||
line-height: 30px;
|
||||
position: relative;
|
||||
font-size: 13px;
|
||||
font-weight: bold;
|
||||
|
||||
.tableButton {
|
||||
position: absolute;
|
||||
right: 0;
|
||||
top: 0;
|
||||
}
|
||||
|
||||
.accessStandardsAndRegulations {
|
||||
height: 100%;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.demo-drawer-content {
|
||||
margin-top: 10px;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
|
||||
|
||||
@@ -496,6 +496,28 @@ export default {
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
}else if(row.taskInfo === '合规性评估'){
|
||||
this.$router.push({
|
||||
name: 'xmpgStep4',
|
||||
query: {
|
||||
taskIds: row.taskIds,
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
}else if(row.taskInfo === '分发责任人审核'){
|
||||
this.$router.push({
|
||||
name: 'xmpgStep5',
|
||||
query: {
|
||||
taskIds: row.taskIds,
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
}
|
||||
break
|
||||
//未符合项整改流程
|
||||
|
||||
Reference in New Issue
Block a user