diff --git a/src/views/modules/proofing/requestForProofing.vue b/src/views/modules/proofing/requestForProofing.vue index 4823baa..73017b1 100644 --- a/src/views/modules/proofing/requestForProofing.vue +++ b/src/views/modules/proofing/requestForProofing.vue @@ -1565,23 +1565,6 @@ export default { status: true, fixed: '', columnWidth: 80 - },{ - userId: this.$store.state.user.name, - functionId: 103001, - serialNumber: '103001Table1StepId', - tableId: '103001Table1', - tableName: '打样信息表', - columnProp: 'stepId', - headerAlign: 'center', - align: 'center', - columnLabel: 'stepId', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 80 }, { userId: this.$store.state.user.name, diff --git a/src/views/modules/quotation/requestForQuote.vue b/src/views/modules/quotation/requestForQuote.vue index d5f86e1..f661972 100644 --- a/src/views/modules/quotation/requestForQuote.vue +++ b/src/views/modules/quotation/requestForQuote.vue @@ -203,7 +203,7 @@ v-model="modalData.priorityLevel" dict-type="priority_Level"> - + @@ -277,11 +277,17 @@ clearable dict-type="delivery_terms" :use-default-value="modalData.flag === '1'"> - + + + + + + @@ -1194,6 +1200,7 @@ export default { quoteType: '', tracker: '', trackerName: '', + sourcing:'', quoter: '', quoterName: '', customerQuoteNo: '', @@ -2275,6 +2282,7 @@ export default { customerNo: '', customerDesc: '', deliveryTerms: '', + sourcing:'', quoteType: '', projectId: '', projectName: '', @@ -2332,6 +2340,7 @@ export default { tracker: row.tracker, trackerName: row.trackerName, quoter: row.quoter, + sourcing:row.sourcing, quoterName: row.quoterName, customerQuoteNo: row.customerQuoteNo, quotationStatus: row.quotationStatus, @@ -3356,7 +3365,7 @@ export default { } await getNodeAuthority(tempData).then(({data}) => { if (data && data.code === 0) { - this.plmQuotationInformationArr = data.rows.plmQuotationInformation + this.plmQuotationInformationArr = data.rows.plm_quotation_information } }) }, diff --git a/src/views/modules/test/requestForTest.vue b/src/views/modules/test/requestForTest.vue index fee74b3..a6599a7 100644 --- a/src/views/modules/test/requestForTest.vue +++ b/src/views/modules/test/requestForTest.vue @@ -3432,7 +3432,7 @@ } await getNodeAuthority(tempData).then(({data}) => { if (data && data.code === 0) { - this.plmTestInformationArr = data.rows.plmTestInformation + this.plmTestInformationArr = data.rows.plm_test_information } }) },