diff --git a/src/api/project/project.js b/src/api/project/project.js index fc555cb..42438e1 100644 --- a/src/api/project/project.js +++ b/src/api/project/project.js @@ -30,7 +30,7 @@ export const getContactChooseData2= data => createAPI(`/project/getContactChoose export const saveProjectContactList= data => createAPI(`/project/saveProjectContactList`,'post',data) export const deleteProjectInfo= data => createAPI(`/project/deleteProjectInfo`,'post',data) export const getProjectInfoPartList= data => createAPI(`/project/getProjectInfoPartList`,'post',data) -export const getProjectPartList= data => createAPI(`/project/getProjectPartList`,'get',data) +export const getProjectPartList= data => createAPI(`/project/getProjectPartList`,'post',data) export const getProjectPart= data => createAPI(`/project/getProjectPart`,'get',data) export const saveProjectPart= data => createAPI(`/project/saveProjectPart`,'post',data) export const deleteProjectPartWithId= data => createAPI(`/project/deleteProjectPartWithId`,'post',data) diff --git a/src/views/modules/customer/customerInformationManagement.vue b/src/views/modules/customer/customerInformationManagement.vue index 826edae..0cb02d6 100644 --- a/src/views/modules/customer/customerInformationManagement.vue +++ b/src/views/modules/customer/customerInformationManagement.vue @@ -924,6 +924,23 @@ export default { // ======== 列表表头 ======== columnList: [ { + userId: this.$store.state.user.name, + functionId: 101001, + serialNumber: '101001Table1CustomerNo', + tableId: '101001Table1', + tableName: '客户信息表', + columnProp: 'customerNo', + headerAlign: 'center', + align: 'left', + columnLabel: '客户代码', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 160 + },{ userId: this.$store.state.user.name, functionId: 101001, serialNumber: '101001Table1CustomerDesc', diff --git a/src/views/modules/project/projectInfo/com_project_info_quotation.vue b/src/views/modules/project/projectInfo/com_project_info_quotation.vue index 20ff4ea..76e41bb 100644 --- a/src/views/modules/project/projectInfo/com_project_info_quotation.vue +++ b/src/views/modules/project/projectInfo/com_project_info_quotation.vue @@ -43,42 +43,6 @@ export default { fixed: '', columnWidth: 100 }, - // { - // userId: this.$store.state.user.name, - // functionId: 101002001, - // serialNumber: '101002001Table5CustomerNo', - // tableId: '101002001Table5', - // tableName: '报价信息表', - // columnProp: 'customerNo', - // headerAlign: 'center', - // align: 'center', - // columnLabel: '客户编码', - // columnHidden: false, - // columnImage: false, - // columnSortable: false, - // sortLv: 0, - // status: true, - // fixed: '', - // columnWidth: 120 - // }, - // { - // userId: this.$store.state.user.name, - // functionId: 101002001, - // serialNumber: '101002001Table5CustomerName', - // tableId: '101002001Table5', - // tableName: '报价信息表', - // columnProp: 'customerName', - // headerAlign: 'center', - // align: 'center', - // columnLabel: '客户名称', - // columnHidden: false, - // columnImage: false, - // columnSortable: false, - // sortLv: 0, - // status: true, - // fixed: '', - // columnWidth: 120 - // }, { userId: this.$store.state.user.name, functionId: 101002001, @@ -160,7 +124,7 @@ export default { columnProp: 'customerInquiryNo', headerAlign: 'center', align: 'center', - columnLabel: '客户报价单号', + columnLabel: '客户询价单号', columnHidden: false, columnImage: false, columnSortable: false, @@ -178,7 +142,7 @@ export default { columnProp: 'internalInquiryNo', headerAlign: 'center', align: 'center', - columnLabel: '内部报价单号', + columnLabel: '内部询价单号', columnHidden: false, columnImage: false, columnSortable: false, diff --git a/src/views/modules/project/projectInfo/com_project_sample.vue b/src/views/modules/project/projectInfo/com_project_sample.vue index 2330fa4..02a3f9c 100644 --- a/src/views/modules/project/projectInfo/com_project_sample.vue +++ b/src/views/modules/project/projectInfo/com_project_sample.vue @@ -114,7 +114,7 @@ columnProp: 'trackerName', headerAlign: 'center', align: 'center', - columnLabel: '跟单员', + columnLabel: 'CS', columnHidden: false, columnImage: false, columnSortable: false, @@ -132,7 +132,25 @@ columnProp: 'engineerName', headerAlign: 'center', align: 'center', - columnLabel: '工程师', + columnLabel: 'NPI工程师', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 80 + }, + { + userId: this.$store.state.user.name, + functionId: 103001, + serialNumber: '103001Table1ApproverName', + tableId: '103001Table1', + tableName: '打样信息表', + columnProp: 'approverName', + headerAlign: 'center', + align: 'center', + columnLabel: 'Approver', columnHidden: false, columnImage: false, columnSortable: false, @@ -285,24 +303,6 @@ fixed: '', columnWidth: 80 }, - { - userId: this.$store.state.user.name, - functionId: 103001, - serialNumber: '103001Table1CreateDate', - tableId: '103001Table1', - tableName: '打样信息表', - columnProp: 'createDate', - headerAlign: 'center', - align: 'center', - columnLabel: '创建时间', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 160 - }, ], // 导出 start exportData: [], diff --git a/src/views/modules/project/projectInfo/com_project_test.vue b/src/views/modules/project/projectInfo/com_project_test.vue index fa674ff..d2a4814 100644 --- a/src/views/modules/project/projectInfo/com_project_test.vue +++ b/src/views/modules/project/projectInfo/com_project_test.vue @@ -96,7 +96,7 @@ export default { columnProp: 'trackerName', headerAlign: 'center', align: 'center', - columnLabel: '跟单员', + columnLabel: 'Artwork', columnHidden: false, columnImage: false, columnSortable: false, @@ -114,7 +114,7 @@ export default { columnProp: 'engineerName', headerAlign: 'center', align: 'center', - columnLabel: '工程师', + columnLabel: ' TP工程师', columnHidden: false, columnImage: false, columnSortable: false, diff --git a/src/views/modules/proofing/requestForProofing.vue b/src/views/modules/proofing/requestForProofing.vue index b1de03e..a9e5ecf 100644 --- a/src/views/modules/proofing/requestForProofing.vue +++ b/src/views/modules/proofing/requestForProofing.vue @@ -1134,6 +1134,9 @@ export default { if (newVal === false){ this.rejectOpinion = '' } + }, + "searchData.proofingNo"(newVal,oldVal){ + this.searchData.proofingNo = newVal.toUpperCase() } }, computed: { diff --git a/src/views/modules/quotation/requestForQuote.vue b/src/views/modules/quotation/requestForQuote.vue index 9c03027..324bfe1 100644 --- a/src/views/modules/quotation/requestForQuote.vue +++ b/src/views/modules/quotation/requestForQuote.vue @@ -1013,6 +1013,12 @@ export default { if (newVal === '' || newVal === null || newVal === undefined){ this.modalData.trackerName = '' } + }, + "searchData.quotationNo"(newVal,oldVal){ + this.searchData.quotationNo = newVal.toUpperCase() + }, + "searchData.quotationBatchNo"(newVal,oldVal){ + this.searchData.quotationBatchNo = newVal.toUpperCase() } }, data() { diff --git a/src/views/modules/quotation/sellForQuotation.vue b/src/views/modules/quotation/sellForQuotation.vue index d5f39c4..21cdd8c 100644 --- a/src/views/modules/quotation/sellForQuotation.vue +++ b/src/views/modules/quotation/sellForQuotation.vue @@ -1552,7 +1552,19 @@ export default { this.getApprovalList() this.getPriceCheckProperties(); } - } + }, + "searchData.customerNo"(newVal,oldVal){ + this.searchData.customerNo = newVal.toUpperCase() + }, + "searchData.quotationNo"(newVal,oldVal){ + this.searchData.quotationNo = newVal.toUpperCase() + }, + "searchData.internalInquiryNo"(newVal,oldVal){ + this.searchData.internalInquiryNo = newVal.toUpperCase() + }, + "searchData.projectId"(newVal,oldVal){ + this.searchData.projectId = newVal.toUpperCase() + }, }, mounted() { }, diff --git a/src/views/modules/quotation/sellForQuotation/quoteDetail.vue b/src/views/modules/quotation/sellForQuotation/quoteDetail.vue index a826358..a95cedd 100644 --- a/src/views/modules/quotation/sellForQuotation/quoteDetail.vue +++ b/src/views/modules/quotation/sellForQuotation/quoteDetail.vue @@ -650,24 +650,6 @@ export default { fixed: '', columnWidth: 100 }, - { - userId: this.$store.state.user.name, - functionId: 102003, - serialNumber: '102003Table3CodeNo', - tableId: '102003Table3', - tableName: '项目物料表', - columnProp: 'codeNo', - headerAlign: 'center', - align: 'center', - columnLabel: '模板编码', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 120 - }, ], //报价明细新增对象 quotationDetail: { @@ -688,6 +670,8 @@ export default { site:this.$store.state.user.site, testPartNo:undefined,// 项目编号 partDesc:undefined,// 项目名称 + finalPartNo:undefined,// 正式料号 + customerPartNo:undefined,// 客户料号 }, fullscreen:false, // 报价明细 参数列表 @@ -852,6 +836,8 @@ export default { site:this.$store.state.user.site, testPartNo:undefined,// 项目编号 partDesc:undefined,// 项目名称 + finalPartNo:undefined,// 正式料号 + customerPartNo:undefined,// 客户料号 } this.projectPartTable = []; }, @@ -1284,18 +1270,23 @@ export default { :visible.sync="projectPartDialogFlag"> - + - + + + + + + + 查 询 - +