|
|
|
@ -393,6 +393,8 @@ |
|
|
|
<el-footer style="height:30px;text-align:center;margin-top: 8px"> |
|
|
|
<el-button type="primary" @click="saveData()" v-if="modalData.flag !== '1'">保存</el-button> |
|
|
|
<el-button type="primary" @click="modalFlag = false">关闭</el-button> |
|
|
|
<el-button v-if="modalData.testStatus === '审批中'" type="primary" @click="agreeSubmit">同意</el-button> |
|
|
|
<el-button v-if="modalData.testStatus === '审批中' && modalData.isReject === 'Y'" type="primary" @click="rejectSubmit">驳回</el-button> |
|
|
|
</el-footer> |
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
@ -1077,8 +1079,13 @@ |
|
|
|
saveCustomerResponse, // 保存客户回复 |
|
|
|
getProjectPartList, // 获取产品列表 |
|
|
|
getProjectInformation, // 获取项目信息 |
|
|
|
getCustomerInformation // 获取客户信息 |
|
|
|
getCustomerInformation, // 获取客户信息 |
|
|
|
submitChange, // 提交 |
|
|
|
testInformationEditStatus, // 下达 |
|
|
|
} from '@/api/test/testInformation.js' |
|
|
|
import { |
|
|
|
getNodeAuthority, // 获取节点权限 |
|
|
|
} from '@/api/changeManagement/changeManagement.js' |
|
|
|
import { |
|
|
|
downLoadQuotationFile, // 文件下载 |
|
|
|
searchProjectInfoList |
|
|
|
@ -1102,6 +1109,17 @@ |
|
|
|
import {getTestPropertiesList,searchTestPropertiesItem} from "../../../api/test/testProperties"; |
|
|
|
import TestFile from "./file/testFile.vue"; |
|
|
|
export default { |
|
|
|
computed: { |
|
|
|
testInformationFlag () { |
|
|
|
return (value) => { |
|
|
|
let arr = this.plmTestInformationArr.filter(a => a.fieldId === value) |
|
|
|
if (arr.length > 0) { |
|
|
|
return arr[0].updateFlag |
|
|
|
} |
|
|
|
return 'N' |
|
|
|
} |
|
|
|
}, |
|
|
|
}, |
|
|
|
name:"test", |
|
|
|
components: { |
|
|
|
TestFile, |
|
|
|
@ -1199,7 +1217,8 @@ |
|
|
|
engineerName: '', |
|
|
|
priorityLevel: '', |
|
|
|
page: 1, |
|
|
|
limit: 10 |
|
|
|
limit: 10, |
|
|
|
menuId: this.$route.meta.menuId, |
|
|
|
}, |
|
|
|
// 其它 |
|
|
|
dataListLoading: false, |
|
|
|
@ -1255,6 +1274,11 @@ |
|
|
|
updateBy: '', |
|
|
|
printType:'', |
|
|
|
productName:'', |
|
|
|
nodeConclusion: '', |
|
|
|
stepId: '', |
|
|
|
rejectFlag: '', |
|
|
|
rejectStepId: '', |
|
|
|
isReject: '' |
|
|
|
}, |
|
|
|
testDetailData: { |
|
|
|
technicalConsiderations: '', |
|
|
|
@ -1352,6 +1376,7 @@ |
|
|
|
projectPartList: [], |
|
|
|
addressList: [], |
|
|
|
contactList: [], |
|
|
|
plmTestInformationArr: [], |
|
|
|
// ======== 列表表头 ======== |
|
|
|
columnList: [ |
|
|
|
{ |
|
|
|
@ -2381,7 +2406,8 @@ |
|
|
|
* 报价信息编辑模态框 |
|
|
|
* @param row |
|
|
|
*/ |
|
|
|
updateModal (row) { |
|
|
|
async updateModal (row) { |
|
|
|
await this.getNodeAuthority(row) |
|
|
|
this.modalData = { |
|
|
|
flag: '2', |
|
|
|
title: '测试申请-'+row.testNo, |
|
|
|
@ -2427,7 +2453,12 @@ |
|
|
|
testStatus: row.testStatus, |
|
|
|
testResultStatus: row.testResultStatus, |
|
|
|
nextToDo: row.nextToDo, |
|
|
|
updateBy: this.$store.state.user.name |
|
|
|
updateBy: this.$store.state.user.name, |
|
|
|
nodeConclusion: '', |
|
|
|
stepId: row.stepId, |
|
|
|
rejectFlag: row.rejectFlag, |
|
|
|
rejectStepId: row.rejectStepId, |
|
|
|
isReject: row.isReject |
|
|
|
} |
|
|
|
this.activeTabList = ['product','process','attribute','partAttribute','file'] |
|
|
|
this.$nextTick(()=>{ |
|
|
|
@ -3254,18 +3285,26 @@ |
|
|
|
}) |
|
|
|
}, |
|
|
|
updateModalStatus(row,status){ |
|
|
|
let params = JSON.parse(JSON.stringify(row)) |
|
|
|
params.testResultStatus = status; |
|
|
|
params.testStatus = '下达'; |
|
|
|
testInformationEdit(params).then(({data}) => { |
|
|
|
if (data && data.code === 0) { |
|
|
|
this.getDataList() |
|
|
|
this.$message.success('测试单已下达') |
|
|
|
} else { |
|
|
|
this.$alert(data.msg, '错误', { |
|
|
|
confirmButtonText: '确定' |
|
|
|
}) |
|
|
|
} |
|
|
|
this.$confirm(`是否确认下达?`, '提示', { |
|
|
|
confirmButtonText: '确定', |
|
|
|
cancelButtonText: '取消', |
|
|
|
type: 'warning' |
|
|
|
}).then(() => { |
|
|
|
let params = JSON.parse(JSON.stringify(row)) |
|
|
|
params.testResultStatus = status |
|
|
|
params.testStatus = '下达' |
|
|
|
params.userName = this.$store.state.user.name |
|
|
|
params.menuId = this.$route.meta.menuId |
|
|
|
testInformationEditStatus(params).then(({data}) => { |
|
|
|
if (data && data.code === 0) { |
|
|
|
this.getDataList() |
|
|
|
this.$message.success('测试单已下达') |
|
|
|
} else { |
|
|
|
this.$alert(data.msg, '错误', { |
|
|
|
confirmButtonText: '确定' |
|
|
|
}) |
|
|
|
} |
|
|
|
}) |
|
|
|
}) |
|
|
|
}, |
|
|
|
partClickRow(row){ |
|
|
|
@ -3286,7 +3325,70 @@ |
|
|
|
this.$message.error(error) |
|
|
|
}) |
|
|
|
this.projectPartModelFlag = false |
|
|
|
} |
|
|
|
}, |
|
|
|
|
|
|
|
// 同意提交 |
|
|
|
agreeSubmit () { |
|
|
|
this.$confirm(`是否确认提交?`, '提示', { |
|
|
|
confirmButtonText: '确定', |
|
|
|
cancelButtonText: '取消', |
|
|
|
type: 'warning' |
|
|
|
}).then(() => { |
|
|
|
this.modalData.nodeConclusion = 'Y' |
|
|
|
this.submitData() |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
// 驳回提交 |
|
|
|
rejectSubmit () { |
|
|
|
this.$confirm(`是否确认驳回?`, '提示', { |
|
|
|
confirmButtonText: '确定', |
|
|
|
cancelButtonText: '取消', |
|
|
|
type: 'warning' |
|
|
|
}).then(() => { |
|
|
|
this.modalData.nodeConclusion = 'N' |
|
|
|
this.submitData() |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
// 提交 |
|
|
|
submitData () { |
|
|
|
let tempData = { |
|
|
|
site: this.modalData.site, |
|
|
|
userName: this.$store.state.user.name, |
|
|
|
testNo: this.modalData.testNo, |
|
|
|
menuId: this.$route.meta.menuId, |
|
|
|
nodeConclusion: this.modalData.nodeConclusion |
|
|
|
} |
|
|
|
submitChange(tempData).then(({data}) => { |
|
|
|
if (data && data.code === 0) { |
|
|
|
this.getDataList() |
|
|
|
this.$message({message: '操作成功', type: 'success'}) |
|
|
|
this.submitModalFlag = false |
|
|
|
this.modalFlag = false |
|
|
|
} else { |
|
|
|
this.$alert(data.msg, '错误', { |
|
|
|
confirmButtonText: '确定' |
|
|
|
}) |
|
|
|
} |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
// 获取流程的配置权限 |
|
|
|
async getNodeAuthority (row) { |
|
|
|
let tempData = { |
|
|
|
site: row.site, |
|
|
|
stepId: row.stepId, |
|
|
|
menuId: this.$route.meta.menuId |
|
|
|
} |
|
|
|
await getNodeAuthority(tempData).then(({data}) => { |
|
|
|
if (data && data.code === 0) { |
|
|
|
this.plmTestInformationArr = data.rows.plmTestInformation |
|
|
|
} |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
</script> |
|
|
|
|
fengyuan_yang
2 years ago