Browse Source

2024.7.7 产品文档收集-转量产、所有、生产文档确认进度

java8
yuejiayang 2 years ago
parent
commit
b9492427aa
  1. 9
      src/api/eam/eamProject.js
  2. 8
      src/api/eam/eamProofing.js
  3. 31
      src/views/modules/common/uploadFileList1.vue
  4. 108
      src/views/modules/eam/com_project_proof_record.vue
  5. 1615
      src/views/modules/eam/eamProjectInfo.vue

9
src/api/eam/eamProject.js

@ -6,3 +6,12 @@ export const eamProjectInfoEdit= data => createAPI(`/pms/eamProject/eamProjectIn
export const eamProjectInfoDelete= data => createAPI(`/pms/eamProject/eamProjectInfoDelete`,'post',data)
export const saveFormalPartNo= data => createAPI(`/pms/eamProject/saveFormalPartNo`,'post',data)
export const getTestPartNo= data => createAPI(`/pms/eamProject/getTestPartNo`,'post',data)
export const searchConfirmatorList= data => createAPI(`/pms/eamProject/searchConfirmatorList`,'post',data)
export const saveProductionValidationDocumentConfirmator= data => createAPI(`/pms/eamProject/saveProductionValidationDocumentConfirmator`,'post',data)
export const saveProductionValidationDocument= data => createAPI(`/pms/eamProject/saveProductionValidationDocument`,'post',data)
export const searchConfirmProgressDocumentList= data => createAPI(`/pms/eamProject/searchConfirmProgressDocumentList`,'post',data)
export const searchConfirmProgressPusherList= data => createAPI(`/pms/eamProject/searchConfirmProgressPusherList`,'post',data)
export const uploadProjectFile= data => createAPI(`/base/uploadProjectFile`,'post',data)
export const updateProjectDocumentConfirm= data => createAPI(`/pms/eamProject/updateProjectDocumentConfirm`,'post',data)
export const searchProjectConfirmatorFileList= data => createAPI(`/pms/eamProject/searchProjectConfirmatorFileList`,'post',data)
export const deleteProjectFile= data => createAPI(`/base/deleteProjectFile`,'post',data)

8
src/api/eam/eamProofing.js

@ -21,3 +21,11 @@ export const editProofingRecord= data => createAPI(`/plm/proofingInformation/edi
export const getExtraDocumentList= data => createAPI(`/plm/proofingInformation/getExtraDocumentList`,'post',data)
//proofingDocumentNEW
export const proofingDocumentNEW= data => createAPI(`/plm/proofingInformation/proofingDocumentNEW`,'post',data)
export const getProjectOtherDocument= data => createAPI(`/plm/proofingInformation/getProofDocument`,'post',data)
export const projectDocumentSave= data => createAPI(`/plm/proofingInformation/projectDocumentSave`,'post',data)
export const editProjectDocument= data => createAPI(`/plm/proofingInformation/editProjectDocument`,'post',data)
export const searchProjectAllDocument= data => createAPI(`/plm/proofingInformation/searchProjectAllDocument`,'post',data)

31
src/views/modules/common/uploadFileList1.vue

@ -24,6 +24,10 @@ export default {
type: [String,Number],
default: ''
},
noDesc:{
type: [String,Number],
default: ''
},
path: {
type: String,
request: true,
@ -84,8 +88,21 @@ export default {
type: [String,Number],
default: ''
},
id:{
type: [String,Number],
default: ''
},
isEditable: Boolean,
},
computed: {
displayValue() {
if (this.noType === null || this.noType === undefined) {
return this.noDesc
}else {
return this.noType
}
}
},
data () {
return {
//fileRemark: '',
@ -130,9 +147,10 @@ export default {
data.append("file", this.fileList[0].raw);
data.append("orderRef1", this.$store.state.user.site);
data.append("orderRef2", this.proofingId);
data.append("orderRef3", this.no);
data.append("orderRef3", this.id);
data.append("orderRef4", this.projectId);
data.append("documentDesc", this.noType);
data.append("documentDesc", this.no);
data.append("cAdditionalInfo", this.noType);
data.append("createBy", this.$store.state.user.name);
data.append("folder", this.folder);
uploadFileList(this.path, data).then(({data}) => {
@ -226,10 +244,7 @@ export default {
if (row.documentType === null || row.documentType === undefined) {
return row.documentDesc
}
if (row.documentDesc === null || row.documentDesc === undefined) {
return row.documentType
}
return `${row.documentType}${row.documentDesc}`;
return row.documentType
},
// getDocumentList() {
// getDocumentList(this.modalData).then(({data}) => {
@ -285,8 +300,8 @@ export default {
<el-form-item :label="label" v-if="!isEditable">
<el-input v-model="no" :readonly="!isEditable" style="width: 113px" class="red-text"></el-input>
</el-form-item>
<el-form-item label="文类型" v-if="!isEditable">
<el-input v-model="noType" :readonly="!isEditable" style="width: 173px" class="red-text"></el-input>
<el-form-item label="文类型" v-if="!isEditable">
<el-input :value="displayValue" :readonly="!isEditable" style="width: 173px" class="red-text"></el-input>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" label-width="80px" style="margin-left: 7px;margin-top: -5px;">

108
src/views/modules/eam/com_project_proof_record.vue

@ -3,55 +3,57 @@
<div class="container">
<el-row>
<el-col class="left-section" :span="12">
<p style="margin-top: 2px">打样记录</p>
<el-table
:data="dataList"
border
style="width: 100%;"
:height="this.height - 30"
highlight-current-row
ref="proofingTable"
@row-click="proofDocumentClickRow"
@current-change="changeCurrentRow"
v-loading="dataListLoading">
<el-table-column
header-align="center"
align="center"
width="150"
fixed="right"
label="操作">
<template slot-scope="scope">
<a type="text" size="small" @click="addDocumentList(scope.row)">文档清单定义</a>
<a type="text" size="small" @click="updateProofingRecord(scope.row)">编辑</a>
</template>
</el-table-column>
<el-table-column
v-for="(item,index) in columnList" :key="index"
:sortable="item.columnSortable"
:prop="item.columnProp"
:header-align="item.headerAlign"
:show-overflow-tooltip="item.showOverflowTooltip"
:align="item.align"
:fixed="item.fixed==''?false:item.fixed"
:min-width="item.columnWidth"
:label="item.columnLabel">
<template slot-scope="scope">
<span v-if="!item.columnHidden"> {{scope.row[item.columnProp]}}</span>
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
style="width: 100px; height: 80px"/></span>
</template>
</el-table-column>
</el-table>
<div class="table-container" style="height: 214px;margin-top: -10px">
<p style="margin-top: -5px">打样记录</p>
<el-table
:data="dataList"
border
style="width: 100%;margin-top: -10px;"
:height="this.height - 14"
highlight-current-row
ref="proofingTable"
@row-click="proofDocumentClickRow"
@current-change="changeCurrentRow"
v-loading="dataListLoading">
<el-table-column
header-align="center"
align="center"
width="150"
fixed="right"
label="操作">
<template slot-scope="scope">
<a type="text" size="small" @click="addDocumentList(scope.row)">文档清单定义</a>
<a type="text" size="small" @click="updateProofingRecord(scope.row)">编辑</a>
</template>
</el-table-column>
<el-table-column
v-for="(item,index) in columnList" :key="index"
:sortable="item.columnSortable"
:prop="item.columnProp"
:header-align="item.headerAlign"
:show-overflow-tooltip="item.showOverflowTooltip"
:align="item.align"
:fixed="item.fixed==''?false:item.fixed"
:min-width="item.columnWidth"
:label="item.columnLabel">
<template slot-scope="scope">
<span v-if="!item.columnHidden"> {{scope.row[item.columnProp]}}</span>
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
style="width: 100px; height: 80px"/></span>
</template>
</el-table-column>
</el-table>
</div>
</el-col>
<el-col :span="12" class="right-section" >
<el-tabs style="font-size: 12px;" class="customer-tab" v-model="activeName" type="border-card" @tab-click="tabClick">
<el-tabs style="font-size: 12px;margin-top: -10px" class="customer-tab" v-model="activeName" type="border-card" @tab-click="tabClick">
<el-tab-pane label="打样文档" name="proofDocument">
<el-button type="primary" icon="el-icon-upload" style="margin-top: -5px" @click="uploadOtherDocument()">上传其他文档</el-button>
<el-button type="primary" icon="el-icon-upload" style="margin-top: -3px;" @click="uploadOtherDocument()">上传其他文档</el-button>
<el-table
:data="proofDocumentList"
border
style="width: 100%;margin-top: 5px;"
:height="height - 80"
:height="height - 75"
ref="proofDocumentTable"
@row-click="uploadDocumentClickRow"
@current-change="changeCurrentRow1"
@ -404,8 +406,8 @@
</el-dialog>
<upload-file-list-1 folder="proofDocument" title="打样文档附件上传" :file-list.sync="fileList" :label="'文档类型ID:'" :no="documentClickRow.documentTypeId" :no-type="documentClickRow.documentType"
:proofing-id="proofDocumenCurrentRow.proofingNo" :bu="proofDocumenCurrentRow.buNo" :site="proofDocumenCurrentRow.site" :upload-dialog.sync="uploadDialog"
:project-id="proofDocumenCurrentRow.projectId" :project-desc="proofDocumenCurrentRow.projectDesc" :document-type="proofDocumenCurrentRow.documentType"
:proofing-id="proofDocumenCurrentRow.proofingNo" :bu="proofDocumenCurrentRow.buNo" :site="proofDocumenCurrentRow.site" :upload-dialog.sync="uploadDialog" :no-desc="documentClickRow.documentDesc"
:project-id="proofDocumenCurrentRow.projectId" :project-desc="proofDocumenCurrentRow.projectDesc" :document-type="proofDocumenCurrentRow.documentType" :id="documentClickRow.id"
:customer-no="proofDocumenCurrentRow.customerNo" :customer-desc="proofDocumenCurrentRow.customerDesc" :test-part-no="proofDocumenCurrentRow.testPartNo"
:part-desc="proofDocumenCurrentRow.partDesc" :column-file-content-array="columnFileContentArray" :proof-document-list="proofDocumentList"
path="/upload/test" :is-editable="isEditable"></upload-file-list-1>
@ -1433,6 +1435,7 @@
}
},
changeCurrentRow1 (row, oldRow) {
row.id = row.documentDefinitionListId
//
if (row) {
this.documentClickRow.bu = this.documentClickRow.site + "-" + this.documentClickRow.buNo
@ -1440,6 +1443,7 @@
}
},
uploadDocumentClickRow(row) {
row.id = row.documentDefinitionListId
this.documentClickRow = JSON.parse(JSON.stringify(row))
},
// ======== ========
@ -1470,7 +1474,8 @@
this.isEditable = true;
this.documentClickRow = {
documentTypeId: '', // ID
documentType: '' //
documentType: '' , //
id: '-1'
};
this.uploadDialog = true
}
@ -1496,4 +1501,17 @@
width: 48%; /* 右边部分宽度占满剩余空间 */
margin-right: 5px;
}
/deep/ .table-container {
border: 1px solid #e0e0e0;
border-radius: 4px;
padding: 10px;
margin-bottom: 10px;
}
/deep/ .el-table {
border: 1px solid #e0e0e0;
border-radius: 4px;
margin-bottom: 10px;
}
</style>

1615
src/views/modules/eam/eamProjectInfo.vue
File diff suppressed because it is too large
View File

Loading…
Cancel
Save