diff --git a/src/api/eam/eamProject.js b/src/api/eam/eamProject.js
index 5534d46..f2091cc 100644
--- a/src/api/eam/eamProject.js
+++ b/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)
diff --git a/src/api/eam/eamProofing.js b/src/api/eam/eamProofing.js
index fac3980..4cfd775 100644
--- a/src/api/eam/eamProofing.js
+++ b/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)
diff --git a/src/views/modules/common/uploadFileList1.vue b/src/views/modules/common/uploadFileList1.vue
index 457c867..60aa98f 100644
--- a/src/views/modules/common/uploadFileList1.vue
+++ b/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 {
-
-
+
+
diff --git a/src/views/modules/eam/com_project_proof_record.vue b/src/views/modules/eam/com_project_proof_record.vue
index 424ed5e..5e6f4f9 100644
--- a/src/views/modules/eam/com_project_proof_record.vue
+++ b/src/views/modules/eam/com_project_proof_record.vue
@@ -3,55 +3,57 @@
- 打样记录
-
-
-
- 文档清单定义
- 编辑
-
-
-
-
- {{scope.row[item.columnProp]}}
- ![]()
-
-
-
+
+
打样记录
+
+
+
+ 文档清单定义
+ 编辑
+
+
+
+
+ {{scope.row[item.columnProp]}}
+ ![]()
+
+
+
+
![]()
+
+
+
-
-
+
+ 选择生产确认文档
+
+
+
+ 提醒
+
+
+
+
+
+ {{ getCombinedDocumentType(scope.row) }}
+
+
+
+
+ {{scope.row[item.columnProp]}}
+ ![]()
+
+
+
-
-
+
+
+
+
+
+
+
+
推送人员清单
+
+
+
+
+
+
+
+
+
+
+
+
+ 查看附件
+ 确认
+
+
+
+
![]()
+
+
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 确定
+ 关闭
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ getCombinedDocumentType(scope.row) }}
+
+
+
+
+ {{ getColumnValue(scope.row, item) }}
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 将文件拖到此处，或点击上传
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 删除
+
+
+
+
+
+
+
+
@@ -2561,4 +4070,36 @@
.red-text /deep/ .el-input__inner {
color: red;
}
+/deep/ .left-section {
+ flex: 1; /* 左边部分占据剩余空间 */
+ margin-right: 10px; /* 右边与左边之间的间隔 */
+ margin-left: -10px; /* 左边与父元素之间的间隔 */
+}
+
+/deep/ .right-section {
+ width: 66%; /* 右边部分宽度占满剩余空间 */
+ 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;
+}
+
+/deep/ .custom-upload .el-upload-dragger {
+ width: 418px;
+ height: 180px;
+ text-align: center;
+ position: relative;
+ overflow: hidden;
+ /* 添加其他样式 */
+}