FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

评估流程

Browse Source
This commit is contained in:
宋伟佳
2021-07-20 17:47:43 +08:00
parent 317294fdc0
commit 7da4bb7893
10 changed files with 112 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+9 -2
View File
@@ -833,6 +833,7 @@ export default {
sarAccessListDatas: [], //国家地区清单表格 sarAccessListDatas: [], //国家地区清单表格
uploadFileListPath: "api/att/attFile/upload", // 上传的地址 uploadFileListPath: "api/att/attFile/upload", // 上传的地址
fileInfoList: [], // 上传的附件 fileInfoList: [], // 上传的附件
fileListName: [], //上传的附件名称
standardData: [], //添加标准数据 standardData: [], //添加标准数据
standardData1: [], //添加标准数据 standardData1: [], //添加标准数据
ListModel: false, //选择清单抽屉状态 ListModel: false, //选择清单抽屉状态
@@ -1063,6 +1064,8 @@ export default {
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
let json = this.listForm; let json = this.listForm;
this.listForm.fileId = this.fileInfoList.join(',')
this.listForm.fileName = this.fileListName.join(',')
// let json = Object.assign(this.listForm, this.roleForm) // let json = Object.assign(this.listForm, this.roleForm)
json.zrUserId = this.roleForm.dockUser; //会签人 json.zrUserId = this.roleForm.dockUser; //会签人
json.jlUserId = this.roleForm.directorUser; //业务经理 json.jlUserId = this.roleForm.directorUser; //业务经理
@@ -1107,15 +1110,19 @@ export default {
// 删除上传的文件 // 删除上传的文件
delFileInfo(file, fileList) { delFileInfo(file, fileList) {
this.fileInfoList = fileList this.fileInfoList = fileList
fileList.forEach(item => {
this.fileListName = item.name
})
}, },
fileUpload () { fileUpload () {
this.fileMadel = true this.fileMadel = true
}, },
// 上传文件成功回调 // 上传文件成功回调
uploadBackSuccess (res, file, fileList) { uploadBackSuccess (res, file, fileList) {
console.log(file);
console.log(fileList)
if (res.ok) { if (res.ok) {
fileList.forEach(item => {
this.fileListName = item.name
})
this.fileInfoList = fileList this.fileInfoList = fileList
this.fileInfoList[this.fileInfoList.length - 1].id = res.data.id this.fileInfoList[this.fileInfoList.length - 1].id = res.data.id
this.$message.success('上传成功') this.$message.success('上传成功')
src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
+23
View File
@@ -373,6 +373,28 @@ export default {
}, },
selectThree() { selectThree() {
},
// 请求上传的文件信息
getFileInfo() {
// this.$http.get("att/attFile/getMultiFileInfos", {
// fileIds: this.sarAccessEO.fileIds
// }, {
// _this: this
// }, res => {
// console.log(res);
// this.$nextTick(() => {
// res.data.map(item => {
// // 赋值要回显的上传文件内容
// this.fileInfoList.push({
// name: item.oldFileName,
// uid: item.uid,
// status: item.status,
// id: item.id
// });
// });
// });
// }, e => {
// });
}, },
pageChange(page) { pageChange(page) {
this.page = page; this.page = page;
@@ -391,6 +413,7 @@ export default {
mounted() { mounted() {
this.processTable() this.processTable()
this.getData() this.getData()
this.getFileInfo()
// console.log(this.$store.getters.getHandleInfo); // console.log(this.$store.getters.getHandleInfo);
} }
}; };
src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
+2 -4
View File
@@ -227,7 +227,7 @@ export default {
total: 0, total: 0,
pageSize: this.$store.getters.userInfo.configContent, pageSize: this.$store.getters.userInfo.configContent,
listForm: { listForm: {
passFlag: "1", //1为审批通过 2 为驳回 passFlag: " ", //空为审批通过 1 为驳回
standNumber: "", //标准编号 standNumber: "", //标准编号
standName: "",//标准名称 standName: "",//标准名称
certifiedEngineer: "", //认证工程师 certifiedEngineer: "", //认证工程师
@@ -330,7 +330,7 @@ export default {
//驳回事件 //驳回事件
beforeBack () { beforeBack () {
this.listForm.passFlag = '2' this.listForm.passFlag = '1'
this.handleSubmit() this.handleSubmit()
}, },
//提交事件 //提交事件
@@ -341,8 +341,6 @@ export default {
this.listForm.zrUserId = this.$store.getters.userInfo.userId ; this.listForm.zrUserId = this.$store.getters.userInfo.userId ;
this.listForm.commentText = this.commentText; this.listForm.commentText = this.commentText;
this.listForm.standId = this.listForm.standId; this.listForm.standId = this.listForm.standId;
this.listForm.passFlag = '1';
this.listForm.signFlag = "";
this.listForm.breakdownList = this.listForm.breakdownList this.listForm.breakdownList = this.listForm.breakdownList
const json = JSON.stringify(this.listForm); const json = JSON.stringify(this.listForm);
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
+2 -2
View File
@@ -398,8 +398,8 @@ export default {
distributePersonId: item.pepdtos[i].distributePersonId, distributePersonId: item.pepdtos[i].distributePersonId,
uname: item.pepdtos[i].uname, uname: item.pepdtos[i].uname,
projectManager: item.pepdtos[i].projectManager, projectManager: item.pepdtos[i].projectManager,
certifiedEngineer: item.pepdtos[i].certifiedEngineer, certifiedEngineerName: item.pepdtos[i].certifiedEngineerName,
qualityEngineer: item.pepdtos[i].qualityEngineer, qualityEngineerName: item.pepdtos[i].qualityEngineerName,
standNumber: item.pepdtos[i].standNumber, standNumber: item.pepdtos[i].standNumber,
standName: item.pepdtos[i].standName, standName: item.pepdtos[i].standName,
xCXSSRQ: item.pepdtos[i].xCXSSRQ, xCXSSRQ: item.pepdtos[i].xCXSSRQ,
src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
+9 -8
View File
@@ -35,16 +35,16 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </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 <el-input
v-model="listForm.certifiedEngineer" v-model="listForm.certifiedEngineerName"
placeholder="请选择认证工程师" placeholder="请选择认证工程师"
clearable clearable
></el-input> ></el-input>
</el-form-item> </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 <el-input
v-model="listForm.qualityEngineer" v-model="listForm.qualityEngineerName"
placeholder="请选择质量工程师" placeholder="请选择质量工程师"
clearable clearable
></el-input> ></el-input>
@@ -390,8 +390,8 @@ export default {
listForm: { listForm: {
standNumber: "", //标准编号 standNumber: "", //标准编号
standName: "",//标准名称 standName: "",//标准名称
certifiedEngineer: "", //认证工程师 certifiedEngineerName: "", //认证工程师
qualityEngineer: "", //质量工程师 qualityEngineerName: "", //质量工程师
dataList: [{ dataList: [{
projectManager: '', projectManager: '',
itemsName: '', itemsName: '',
@@ -477,6 +477,7 @@ export default {
taskIds: this.taskIds, taskIds: this.taskIds,
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
console.log(res.mesg);
if (res) { if (res) {
const processForm = JSON.parse(res.mesg) const processForm = JSON.parse(res.mesg)
this.getFormFieldList(processForm) this.getFormFieldList(processForm)
@@ -497,8 +498,8 @@ export default {
this.dataList = item.step3DTOS this.dataList = item.step3DTOS
this.listForm.standName = item.step3DTOS[0].standName this.listForm.standName = item.step3DTOS[0].standName
this.listForm.standNumber = item.step3DTOS[0].standNumber this.listForm.standNumber = item.step3DTOS[0].standNumber
this.listForm.qualityEngineer = item.step3DTOS[0].qualityEngineer this.listForm.qualityEngineerName = item.step3DTOS[0].qualityEngineerName
this.listForm.certifiedEngineer = item.step3DTOS[0].certifiedEngineer this.listForm.certifiedEngineerName = item.step3DTOS[0].certifiedEngineerName
this.listForm.itemsName = item.step3DTOS[0].itemsName this.listForm.itemsName = item.step3DTOS[0].itemsName
this.listForm.itemNum = item.step3DTOS[0].itemNum this.listForm.itemNum = item.step3DTOS[0].itemNum
this.listForm.responsibleUnit = item.step3DTOS[0].responsibleUnit this.listForm.responsibleUnit = item.step3DTOS[0].responsibleUnit
src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
+8 -11
View File
@@ -35,16 +35,16 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </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 <el-input
v-model="listForm.certifiedEngineer" v-model="listForm.certifiedEngineerName"
placeholder="请选择认证工程师" placeholder="请选择认证工程师"
clearable clearable
></el-input> ></el-input>
</el-form-item> </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 <el-input
v-model="listForm.qualityEngineer" v-model="listForm.qualityEngineerName"
placeholder="请选择质量工程师" placeholder="请选择质量工程师"
clearable clearable
></el-input> ></el-input>
@@ -348,8 +348,8 @@ export default {
fenFlag: '1', //1为通过 其他为驳回 fenFlag: '1', //1为通过 其他为驳回
standNumber: "", //标准编号 standNumber: "", //标准编号
standName: "",//标准名称 standName: "",//标准名称
certifiedEngineer: "", //认证工程师 certifiedEngineerName: "", //认证工程师
qualityEngineer: "", //质量工程师 qualityEngineerName: "", //质量工程师
breakdownList: [{ //分解单数据 breakdownList: [{ //分解单数据
implementer: "", implementer: "",
applyArctic: "", applyArctic: "",
@@ -439,14 +439,12 @@ export default {
this.dataList = item.dataList this.dataList = item.dataList
this.listForm.standName = item.standName this.listForm.standName = item.standName
this.listForm.standNumber = item.standNumber this.listForm.standNumber = item.standNumber
this.listForm.qualityEngineer = item.qualityEngineer this.listForm.qualityEngineerName = item.qualityEngineerName
this.listForm.certifiedEngineer = item.certifiedEngineer this.listForm.certifiedEngineerName = item.certifiedEngineerName
this.listForm.responsibleUnit = item.responsibleUnit this.listForm.responsibleUnit = item.responsibleUnit
this.listForm.responsibleEngineer = item.responsibleEngineer this.listForm.responsibleEngineer = item.responsibleEngineer
}) })
}, },
//驳回事件 //驳回事件
beforeBack () { beforeBack () {
this.listForm.fenFlag = '2' this.listForm.fenFlag = '2'
@@ -456,7 +454,6 @@ export default {
handleSubmit() { handleSubmit() {
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.fenFlag = "1";
this.listForm.dataList = this.dataList this.listForm.dataList = this.dataList
const json = JSON.stringify(this.listForm); const json = JSON.stringify(this.listForm);
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
+8 -9
View File
@@ -35,16 +35,16 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </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 <el-input
v-model="listForm.certifiedEngineer" v-model="listForm.certifiedEngineerName"
placeholder="请选择认证工程师" placeholder="请选择认证工程师"
clearable clearable
></el-input> ></el-input>
</el-form-item> </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 <el-input
v-model="listForm.qualityEngineer" v-model="listForm.qualityEngineerName"
placeholder="请选择质量工程师" placeholder="请选择质量工程师"
clearable clearable
></el-input> ></el-input>
@@ -296,7 +296,6 @@
</div> </div>
<ProcessFooter <ProcessFooter
show-back
show-submit show-submit
:submitLoading="isSubmit" :submitLoading="isSubmit"
:saveLoading="saveLoading" :saveLoading="saveLoading"
@@ -348,8 +347,8 @@ export default {
fenFlag: '1', //1为通过 其他为驳回 fenFlag: '1', //1为通过 其他为驳回
standNumber: "", //标准编号 standNumber: "", //标准编号
standName: "",//标准名称 standName: "",//标准名称
certifiedEngineer: "", //认证工程师 certifiedEngineerName: "", //认证工程师
qualityEngineer: "", //质量工程师 qualityEngineerName: "", //质量工程师
breakdownList: [{ //分解单数据 breakdownList: [{ //分解单数据
implementer: "", implementer: "",
applyArctic: "", applyArctic: "",
@@ -439,8 +438,8 @@ export default {
this.dataList = item.dataList this.dataList = item.dataList
this.listForm.standName = item.step3DTOS[0].standName this.listForm.standName = item.step3DTOS[0].standName
this.listForm.standNumber = item.step3DTOS[0].standNumber this.listForm.standNumber = item.step3DTOS[0].standNumber
this.listForm.qualityEngineer = item.step3DTOS[0].qualityEngineer this.listForm.qualityEngineerName = item.step3DTOS[0].qualityEngineerName
this.listForm.certifiedEngineer = item.step3DTOS[0].certifiedEngineer this.listForm.certifiedEngineerName = item.step3DTOS[0].certifiedEngineerName
}) })
}, },
//驳回事件 //驳回事件
src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
+6 -7
View File
@@ -35,16 +35,16 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </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 <el-input
v-model="listForm.certifiedEngineer" v-model="listForm.certifiedEngineerName"
placeholder="请选择认证工程师" placeholder="请选择认证工程师"
clearable clearable
></el-input> ></el-input>
</el-form-item> </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 <el-input
v-model="listForm.qualityEngineer" v-model="listForm.qualityEngineerName"
placeholder="请选择质量工程师" placeholder="请选择质量工程师"
clearable clearable
></el-input> ></el-input>
@@ -296,7 +296,6 @@
</div> </div>
<ProcessFooter <ProcessFooter
show-back
show-submit show-submit
:submitLoading="isSubmit" :submitLoading="isSubmit"
:saveLoading="saveLoading" :saveLoading="saveLoading"
@@ -348,8 +347,8 @@ export default {
fenFlag: '1', //1为通过 其他为驳回 fenFlag: '1', //1为通过 其他为驳回
standNumber: "", //标准编号 standNumber: "", //标准编号
standName: "",//标准名称 standName: "",//标准名称
certifiedEngineer: "", //认证工程师 certifiedEngineerName: "", //认证工程师
qualityEngineer: "", //质量工程师 qualityEngineerName: "", //质量工程师
breakdownList: [{ //分解单数据 breakdownList: [{ //分解单数据
implementer: "", implementer: "",
applyArctic: "", applyArctic: "",
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue
+42 -6
View File
@@ -142,80 +142,116 @@
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
width="150px"
align="center"
prop="productLineId" prop="productLineId"
label="产品线"> label="产品线">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
width="150px"
align="center"
prop="standNumber" prop="standNumber"
label="项目编号"> label="项目编号">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
width="150px"
align="center"
prop="productName" prop="productName"
label="项目名称"> label="项目名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
width="150px"
align="center"
prop="standNumber" prop="standNumber"
label="标准编号"> label="标准编号">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
width="150px"
align="center"
prop="standName" prop="standName"
label="标准名称"> label="标准名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
width="150px"
align="center"
prop="standardItem" prop="standardItem"
label="标准章条"> label="条款号">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
width="150px"
align="center"
prop="standardInfo" prop="standardInfo"
label="标准主要内容"> label="条款名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
align="productType" align="center"
prop="productType"
label="在研产品"> label="在研产品">
<el-table-column <el-table-column
width="150px"
align="center"
prop="researchImplementationTime" prop="researchImplementationTime"
label="实施时间"> label="实施时间">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
width="150px"
align="center"
prop="researchCompliance" prop="researchCompliance"
label="合规"> label="合规">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
align="researchNonCompliance" width="150px"
align="center"
label="不合规"> label="不合规">
<el-table-column <el-table-column
width="150px"
align="center"
prop="researchNonCompliance" prop="researchNonCompliance"
label="不合规项目"> label="不合规项目">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
width="150px"
align="center"
prop="researchCountermeasures" prop="researchCountermeasures"
label="应对措施"> label="应对措施">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
width="150px"
align="center"
prop="researchCompletionTime" prop="researchCompletionTime"
label="完成时间"> label="完成时间">
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
align="center" align="center"
prop="center"
label="在产产品"> label="在产产品">
<el-table-column <el-table-column
width="150px"
align="center"
prop="productionImplementationTime" prop="productionImplementationTime"
label="实施时间"> label="实施时间">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
width="150px"
align="center"
prop="productionCompliance" prop="productionCompliance"
label="合规(具体情况)"> label="合规(具体情况)">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
align="center" width="150px"
align="center"
label="不合规"> label="不合规">
<el-table-column <el-table-column
width="150px"
align="center"
prop="productionCountermeasures" prop="productionCountermeasures"
label="应对措施"> label="应对措施">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
width="150px"
align="center"
prop="productionCompletionTime" prop="productionCompletionTime"
label="完成时间"> label="完成时间">
</el-table-column> </el-table-column>
src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+3 -3
View File
@@ -167,17 +167,17 @@
label="责任部门"> label="责任部门">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="dutyEngineer" prop="dutyEngineerName"
width="150" width="150"
label="责任工程师"> label="责任工程师">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="authEngineer" prop="authEngineerName"
width="150" width="150"
label="认证工程师"> label="认证工程师">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="qaEngineer" prop="qaEngineerName"
width="150" width="150"
label="质量工程师"> label="质量工程师">
</el-table-column> </el-table-column>