|
|
|
@ -737,9 +737,9 @@ |
|
|
|
fixed="left" |
|
|
|
label="操作"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<a type="primary" @click="uploadFile(scope.row)">上传文件</a> |
|
|
|
<a type="text" size="small" @click="addOrUpdateHandle(scope.row.projectId)">提醒</a> |
|
|
|
<a type="text" size="small" @click="massProductionDocumentDelete(scope.row)">删除</a> |
|
|
|
<a type="primary" v-if="scope.row.documentDefinitionListId !== '-1'" @click="uploadFile(scope.row)">上传文件</a> |
|
|
|
<a type="text" size="small" v-if="scope.row.documentDefinitionListId !== '-1'" @click="addOrUpdateHandle(scope.row.projectId)">提醒</a> |
|
|
|
<a type="text" size="small" v-if="shouldShowDelete(scope.row)" @click="massProductionDocumentDelete(scope.row)">删除</a> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column label="序号" type="index" align="center" :index="indexMethod"></el-table-column> |
|
|
|
@ -780,7 +780,7 @@ |
|
|
|
<el-table-column |
|
|
|
header-align="center" |
|
|
|
align="center" |
|
|
|
width="100" |
|
|
|
width="70" |
|
|
|
fixed="left" |
|
|
|
label="操作"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
@ -839,7 +839,7 @@ |
|
|
|
<el-table-column header-align="center" align="center" prop="confirmFlag" label="是否确认"></el-table-column> |
|
|
|
<el-table-column header-align="center" align="center" prop="confirmedBy" label="实际确认人"></el-table-column> |
|
|
|
<el-table-column header-align="center" align="center" prop="remark" label="备注"></el-table-column> |
|
|
|
<el-table-column header-align="center" align="center" prop="confirmedDate" label="实际确认日期"></el-table-column> |
|
|
|
<el-table-column header-align="center" align="center" prop="confirmedDate" label="实际确认时间"></el-table-column> |
|
|
|
<el-table-column header-align="center" align="center" prop="createDate" label="推送时间"></el-table-column> |
|
|
|
<el-table-column header-align="center" align="center" prop="createBy" label="推送人"></el-table-column> |
|
|
|
<el-table-column |
|
|
|
@ -897,7 +897,7 @@ |
|
|
|
<el-button type="primary" icon="el-icon-upload" style="margin-top: -5px" @click="addProjectDocumentTypeFlag = true">新增</el-button> |
|
|
|
<el-table |
|
|
|
height="200" |
|
|
|
:data="projectOtherDocumentList" |
|
|
|
:data="proofDocumentListDefinition" |
|
|
|
border |
|
|
|
style="width: 100%;"> |
|
|
|
<el-table-column |
|
|
|
@ -1207,10 +1207,10 @@ |
|
|
|
|
|
|
|
<upload-file-list-1 folder="projectOtherDocument" title="上传文档" :file-list.sync="fileList" :label="'文档类型ID:'" :no="otherDocumentCurrentRow.documentTypeId" :no-type="otherDocumentCurrentRow.documentType" |
|
|
|
:proofing-id='proofingCurrentRow.proofingId' :bu="proofingCurrentRow.buNo" :site="proofingCurrentRow.site" :upload-dialog.sync="uploadDialog" :no-desc="otherDocumentCurrentRow.documentDesc" :id="otherDocumentCurrentRow.id" |
|
|
|
:project-id="proofingCurrentRow.projectId" :project-desc="proofingCurrentRow.projectDesc" :document-type="proofingCurrentRow.documentType" |
|
|
|
:project-id="proofingCurrentRow.projectId" :project-desc="proofingCurrentRow.projectDesc" :document-type="proofingCurrentRow.documentType" :conclusion="'N/A'" |
|
|
|
:customer-no="proofingCurrentRow.customerNo" :customer-desc="proofingCurrentRow.customerDesc" :test-part-no="proofingCurrentRow.testPartNo" |
|
|
|
:part-desc="proofingCurrentRow.partDesc" :column-file-content-array="columnFileContentArray" :proof-document-list="projectOtherDocumentList" |
|
|
|
path="/upload/test" :is-editable="isEditable"></upload-file-list-1> |
|
|
|
path="/upload/test" :is-editable="isEditable" :is-mass-production-stage="isMassProductionStage"></upload-file-list-1> |
|
|
|
|
|
|
|
<Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist> |
|
|
|
|
|
|
|
@ -1264,6 +1264,8 @@ import { |
|
|
|
uploadProjectFile |
|
|
|
} from "../../../api/eam/eamProject"; |
|
|
|
import row from "element-ui/packages/row"; |
|
|
|
import moment from 'moment'; |
|
|
|
import 'moment/locale/zh-cn'; |
|
|
|
import {downLoadObjectFile} from "../../../api/eam/eam_object_list"; |
|
|
|
/*打样记录組件*/ |
|
|
|
|
|
|
|
@ -1358,6 +1360,7 @@ import {downLoadObjectFile} from "../../../api/eam/eam_object_list"; |
|
|
|
projectAllDocumentList: [], |
|
|
|
projectAllDocumentList1: [], |
|
|
|
projectAllDocumentConfirmatorList: [], |
|
|
|
proofDocumentListDefinition: [], |
|
|
|
confirmProgressPusherList: [], |
|
|
|
confirmProgressDocumentList: [], |
|
|
|
projectConfirmatorFileList: [], |
|
|
|
@ -1387,6 +1390,7 @@ import {downLoadObjectFile} from "../../../api/eam/eam_object_list"; |
|
|
|
MFGlag:false, |
|
|
|
uploadDialog:false, |
|
|
|
isEditable: true, |
|
|
|
isMassProductionStage: true, |
|
|
|
projectDocumentListVisible: false, |
|
|
|
addProjectDocumentTypeFlag: false, |
|
|
|
projectProductionValidationDocumentVisible: false, |
|
|
|
@ -2014,7 +2018,7 @@ import {downLoadObjectFile} from "../../../api/eam/eam_object_list"; |
|
|
|
sortLv: 0, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 120, |
|
|
|
columnWidth: 180, |
|
|
|
}, |
|
|
|
//是否上传 |
|
|
|
{ |
|
|
|
@ -2054,6 +2058,24 @@ import {downLoadObjectFile} from "../../../api/eam/eam_object_list"; |
|
|
|
fixed: '', |
|
|
|
columnWidth: 70, |
|
|
|
}, |
|
|
|
{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 101001014, |
|
|
|
serialNumber: '101001014Table1DocumentGroupDesc', |
|
|
|
tableId: "101001014Table1", |
|
|
|
tableName: "打样文档表", |
|
|
|
columnProp: 'documentGroupDesc', |
|
|
|
headerAlign: "center", |
|
|
|
align: "center", |
|
|
|
columnLabel: '文档种类', |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
columnSortable: false, |
|
|
|
sortLv: 0, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 70, |
|
|
|
}, |
|
|
|
{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 103001, |
|
|
|
@ -2070,7 +2092,7 @@ import {downLoadObjectFile} from "../../../api/eam/eam_object_list"; |
|
|
|
sortLv: 0, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 160 |
|
|
|
columnWidth: 120 |
|
|
|
}, |
|
|
|
{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
@ -2182,7 +2204,7 @@ import {downLoadObjectFile} from "../../../api/eam/eam_object_list"; |
|
|
|
sortLv: 0, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 120, |
|
|
|
columnWidth: 80, |
|
|
|
}, |
|
|
|
{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
@ -2218,7 +2240,7 @@ import {downLoadObjectFile} from "../../../api/eam/eam_object_list"; |
|
|
|
sortLv: 0, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 120, |
|
|
|
columnWidth: 180, |
|
|
|
}, |
|
|
|
//是否上传 |
|
|
|
{ |
|
|
|
@ -2258,6 +2280,24 @@ import {downLoadObjectFile} from "../../../api/eam/eam_object_list"; |
|
|
|
fixed: '', |
|
|
|
columnWidth: 70, |
|
|
|
}, |
|
|
|
{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 101001014, |
|
|
|
serialNumber: '101001014Table1DocumentGroupDesc', |
|
|
|
tableId: "101001014Table1", |
|
|
|
tableName: "打样文档表", |
|
|
|
columnProp: 'documentGroupDesc', |
|
|
|
headerAlign: "center", |
|
|
|
align: "center", |
|
|
|
columnLabel: '文档种类', |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
columnSortable: false, |
|
|
|
sortLv: 0, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 70, |
|
|
|
}, |
|
|
|
{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 103001, |
|
|
|
@ -2274,7 +2314,7 @@ import {downLoadObjectFile} from "../../../api/eam/eam_object_list"; |
|
|
|
sortLv: 0, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 160 |
|
|
|
columnWidth: 130 |
|
|
|
}, |
|
|
|
{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
@ -3444,7 +3484,6 @@ import {downLoadObjectFile} from "../../../api/eam/eam_object_list"; |
|
|
|
this.otherDocumentCurrentRow = { |
|
|
|
proofingId: '*', |
|
|
|
documentTypeId: '', // 清空文档类型ID |
|
|
|
documentType: '' , // 清空文件类型 |
|
|
|
id: '-1' |
|
|
|
}; |
|
|
|
this.uploadDialog = true |
|
|
|
@ -3458,7 +3497,7 @@ import {downLoadObjectFile} from "../../../api/eam/eam_object_list"; |
|
|
|
site: row.site, |
|
|
|
username: this.$store.state.user.name, |
|
|
|
buNo: row.buNo, |
|
|
|
proofingId: row.proofingNo, |
|
|
|
proofingNo: row.proofingNo, |
|
|
|
projectId: row.projectId, |
|
|
|
projectDesc: row.projectDesc, |
|
|
|
customerId: row.customerNo, |
|
|
|
@ -3480,7 +3519,7 @@ import {downLoadObjectFile} from "../../../api/eam/eam_object_list"; |
|
|
|
type: 'warning' |
|
|
|
}) |
|
|
|
}else { |
|
|
|
this.$confirm('是否删除该转量产阶段文档?', '提示', { |
|
|
|
this.$confirm('是否删除该转量产阶段文档的文件?', '提示', { |
|
|
|
confirmButtonText: '确定', |
|
|
|
cancelButtonText: '取消', |
|
|
|
type: 'warning' |
|
|
|
@ -3606,11 +3645,17 @@ import {downLoadObjectFile} from "../../../api/eam/eam_object_list"; |
|
|
|
page: 1 |
|
|
|
} |
|
|
|
this.getProjectOtherDocument() |
|
|
|
|
|
|
|
// 遍历proofDocumentList |
|
|
|
for (let i = 0; i < this.projectOtherDocumentList.length; i++) { |
|
|
|
if (this.projectOtherDocumentList[i].documentTypeId !== 'N/A') { |
|
|
|
this.proofDocumentListDefinition.push(this.projectOtherDocumentList[i]) |
|
|
|
} |
|
|
|
} |
|
|
|
this.projectDocumentListVisible = true |
|
|
|
}, |
|
|
|
projectDocumentListVisibleFalse() { |
|
|
|
this.projectDocumentListVisible = false |
|
|
|
this.proofDocumentListDefinition = [] |
|
|
|
}, |
|
|
|
deleteProjectDocumentType(row) { |
|
|
|
this.$confirm('是否删除该文档清单?', '提示', { |
|
|
|
@ -3799,19 +3844,13 @@ import {downLoadObjectFile} from "../../../api/eam/eam_object_list"; |
|
|
|
.then(confirmatorResults => { |
|
|
|
let allConfirmatorSuccess = confirmatorResults.every(result => result.data && result.data.code === 0); |
|
|
|
if (allConfirmatorSuccess) { |
|
|
|
let saveDocumentPromises = this.selectedDocumentItems.map(item => { |
|
|
|
let inData = { |
|
|
|
site: this.proofingCurrentRow.site, |
|
|
|
orderRef1: this.proofingCurrentRow.projectId, |
|
|
|
itemNo: '', |
|
|
|
documentType: item.documentType, |
|
|
|
documentId: item.documentId, |
|
|
|
createBy: this.$store.state.user.name |
|
|
|
}; |
|
|
|
return this.handleDocumentSave(inData); |
|
|
|
}); |
|
|
|
|
|
|
|
Promise.all(saveDocumentPromises) |
|
|
|
let inData = { |
|
|
|
site: this.proofingCurrentRow.site, |
|
|
|
orderRef1: this.proofingCurrentRow.projectId, |
|
|
|
selectedDocumentItems: this.selectedDocumentItems, |
|
|
|
} |
|
|
|
let saveDocumentPromises = this.handleDocumentSave(inData); |
|
|
|
saveDocumentPromises |
|
|
|
.then(() => { |
|
|
|
this.$message({ |
|
|
|
message: '新增成功', |
|
|
|
@ -4026,7 +4065,7 @@ import {downLoadObjectFile} from "../../../api/eam/eam_object_list"; |
|
|
|
confirmedDate: new Date(), |
|
|
|
createBy: row.createBy, |
|
|
|
createDate: row.createDate, |
|
|
|
confirmedBy: this.$store.state.user.name, |
|
|
|
confirmedBy: this.$store.state.user.userDisplay, |
|
|
|
documentId: row.documentId, |
|
|
|
remark: row.remark |
|
|
|
} |
|
|
|
@ -4099,6 +4138,8 @@ import {downLoadObjectFile} from "../../../api/eam/eam_object_list"; |
|
|
|
this.$refs.uploadFile.$el.querySelector('input').click() |
|
|
|
}, |
|
|
|
saveUploadFile(){ |
|
|
|
this.confirmData.confirmedDate = moment(this.confirmData.confirmedDate).utcOffset('+8').format('YYYY-MM-DD HH:mm:ss'); |
|
|
|
this.confirmData.confirmedBy = this.$store.state.user.userDisplay; |
|
|
|
console.log('this.confirmData',this.confirmData) |
|
|
|
updateProjectDocumentConfirm(this.confirmData) .then(({data}) => { |
|
|
|
if (data.code === 0) { |
|
|
|
@ -4179,7 +4220,7 @@ import {downLoadObjectFile} from "../../../api/eam/eam_object_list"; |
|
|
|
confirmedDate: new Date(), |
|
|
|
createBy: row.createBy, |
|
|
|
createDate: row.createDate, |
|
|
|
confirmedBy: this.$store.state.user.name, |
|
|
|
confirmedBy: this.$store.state.user.userDisplay, |
|
|
|
documentId: row.documentId, |
|
|
|
remark: row.remark |
|
|
|
} |
|
|
|
@ -4199,7 +4240,7 @@ import {downLoadObjectFile} from "../../../api/eam/eam_object_list"; |
|
|
|
this.viewDocumentFileVisible = true |
|
|
|
}, |
|
|
|
deleteFile(row) { |
|
|
|
if (this.confirmData.confirmedBy === this.$store.state.user.name) { |
|
|
|
if (this.confirmData.confirmedBy === this.$store.state.user.userDisplay) { |
|
|
|
this.$confirm('是否删除该文件?', '提示', { |
|
|
|
confirmButtonText: '确定', |
|
|
|
cancelButtonText: '取消', |
|
|
|
@ -4240,6 +4281,15 @@ import {downLoadObjectFile} from "../../../api/eam/eam_object_list"; |
|
|
|
}) |
|
|
|
} |
|
|
|
}, |
|
|
|
shouldShowDelete(row) { |
|
|
|
console.log('row.documentId',row.documentId) |
|
|
|
console.log('row.projectPhase',row.projectPhase) |
|
|
|
console.log('Y/N',row.documentId !== null || row.projectPhase !== 'SOP文档') |
|
|
|
// 根据条件判断是否显示删除操作 |
|
|
|
if (row.projectPhase === 'SOP文档') { |
|
|
|
return false |
|
|
|
}else return row.documentId !== null; |
|
|
|
}, |
|
|
|
// 查看文件 |
|
|
|
viewFile(row) { |
|
|
|
// 预览文件 |
|
|
|
|
yuejiayang
2 years ago