代码提交
This commit is contained in:
parent
15c64a99d7
commit
9cb1194819
|
|
@ -104,6 +104,7 @@ export default {
|
||||||
name: 'DetailData',
|
name: 'DetailData',
|
||||||
query: {
|
query: {
|
||||||
id: encryptWithSM4(row.id ?? '0'),
|
id: encryptWithSM4(row.id ?? '0'),
|
||||||
|
proId: encryptWithSM4(row.proId ?? '0'),
|
||||||
viewStatus: encryptWithSM4('detail'),
|
viewStatus: encryptWithSM4('detail'),
|
||||||
auditStatus: encryptWithSM4(this.getStatusText2(row.auditStatus)),
|
auditStatus: encryptWithSM4(this.getStatusText2(row.auditStatus)),
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -143,7 +143,7 @@ export default {
|
||||||
proId: this.rowData.proId || undefined,
|
proId: this.rowData.proId || undefined,
|
||||||
deptId: this.rowData.deptId || undefined,
|
deptId: this.rowData.deptId || undefined,
|
||||||
};
|
};
|
||||||
const res = await getTransferApplyFilesByApplyIdApi({ id: this.rowData.id });
|
const res = await getTransferApplyFilesByApplyIdApi({ id: this.rowData.id,proId:this.rowData.proId });
|
||||||
if (Array.isArray(res.data) && res.data.length > 0) {
|
if (Array.isArray(res.data) && res.data.length > 0) {
|
||||||
res.data.map(item => {
|
res.data.map(item => {
|
||||||
const newFile = {
|
const newFile = {
|
||||||
|
|
|
||||||
|
|
@ -65,6 +65,7 @@ export default {
|
||||||
name: 'DetailData2',
|
name: 'DetailData2',
|
||||||
query: {
|
query: {
|
||||||
id: encryptWithSM4(row.id ?? '0'),
|
id: encryptWithSM4(row.id ?? '0'),
|
||||||
|
proId: encryptWithSM4(row.proId ?? '0'),
|
||||||
viewStatus: encryptWithSM4('audit'),
|
viewStatus: encryptWithSM4('audit'),
|
||||||
auditStatus: encryptWithSM4(this.getStatusText2(row.auditStatus)),
|
auditStatus: encryptWithSM4(this.getStatusText2(row.auditStatus)),
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -123,6 +123,7 @@ export default {
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
id: decryptWithSM4(this.$route.query.id),
|
id: decryptWithSM4(this.$route.query.id),
|
||||||
|
proId: decryptWithSM4(this.$route.query.proId),
|
||||||
viewStatus: decryptWithSM4(this.$route.query.viewStatus),
|
viewStatus: decryptWithSM4(this.$route.query.viewStatus),
|
||||||
status: decryptWithSM4(this.$route.query.auditStatus), // approving, approved, rejected
|
status: decryptWithSM4(this.$route.query.auditStatus), // approving, approved, rejected
|
||||||
projectName: '',
|
projectName: '',
|
||||||
|
|
@ -202,10 +203,9 @@ export default {
|
||||||
},
|
},
|
||||||
async initData() {
|
async initData() {
|
||||||
this.fileList = [];
|
this.fileList = [];
|
||||||
|
const res = this.viewStatus === 'audit' ? await getTransferAudieFilesByApplyIdApi({ id: this.id,proId: this.proId }) : await getTransferApplyFilesByApplyIdApi({ id: this.id, proId: this.proId });
|
||||||
|
|
||||||
const res = this.viewStatus === 'audit' ? await getTransferAudieFilesByApplyIdApi({ id: this.id }) : await getTransferApplyFilesByApplyIdApi({ id: this.id });
|
const res2 = this.viewStatus === 'audit' ? await getTransferAuditApi({ id: this.id,proId: this.proId }) : await getTransferApplyApi({ id: this.id, proId: this.proId });
|
||||||
|
|
||||||
const res2 = this.viewStatus === 'audit' ? await getTransferAuditApi({ id: this.id }) : await getTransferApplyApi({ id: this.id });
|
|
||||||
this.projectName = res2?.data?.proName || '/';
|
this.projectName = res2?.data?.proName || '/';
|
||||||
this.receivingOrg = res2?.data?.deptName || '/';
|
this.receivingOrg = res2?.data?.deptName || '/';
|
||||||
// 审批信息
|
// 审批信息
|
||||||
|
|
|
||||||
|
|
@ -125,6 +125,7 @@ export default {
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
id: decryptWithSM4(this.$route.query.id),
|
id: decryptWithSM4(this.$route.query.id),
|
||||||
|
proId: decryptWithSM4(this.$route.query.proId),
|
||||||
viewStatus: decryptWithSM4(this.$route.query.viewStatus),
|
viewStatus: decryptWithSM4(this.$route.query.viewStatus),
|
||||||
projectName: '',
|
projectName: '',
|
||||||
receivingOrg: '',
|
receivingOrg: '',
|
||||||
|
|
@ -173,7 +174,7 @@ export default {
|
||||||
async initData() {
|
async initData() {
|
||||||
this.fileList = [];
|
this.fileList = [];
|
||||||
|
|
||||||
const res = this.viewStatus === 'accept' ? await getTransferReceiceDetailApi({ id: this.id }) : await getTransferRecordDetailApi({ id: this.id });
|
const res = this.viewStatus === 'accept' ? await getTransferReceiceDetailApi({ id: this.id, proId: this.proId }) : await getTransferRecordDetailApi({ id: this.id, proId: this.proId });
|
||||||
this.projectName = res?.data?.proName || '/';
|
this.projectName = res?.data?.proName || '/';
|
||||||
this.receivingOrg = res?.data?.deptName || '/';
|
this.receivingOrg = res?.data?.deptName || '/';
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -95,6 +95,7 @@ export default {
|
||||||
name: 'RecordDetail',
|
name: 'RecordDetail',
|
||||||
query: {
|
query: {
|
||||||
id: encryptWithSM4(row.id ?? '0'),
|
id: encryptWithSM4(row.id ?? '0'),
|
||||||
|
proId: encryptWithSM4(row.proId ?? '0'),
|
||||||
viewStatus: encryptWithSM4('record'),
|
viewStatus: encryptWithSM4('record'),
|
||||||
auditStatus: encryptWithSM4(this.getStatusText2(row.auditStatus)),
|
auditStatus: encryptWithSM4(this.getStatusText2(row.auditStatus)),
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue