From 29672f058d5315a0967da084657defadbafe110d Mon Sep 17 00:00:00 2001 From: qiezi <15576055375@163.com> Date: Mon, 21 Oct 2024 11:38:44 +0800 Subject: [PATCH] 2024-10-21 --- src/api/project/project.js | 5 + .../project/projectInfo/projectInfo.vue | 187 +++---- .../modules/proofing/requestForProofing.vue | 458 ++++++------------ .../modules/quotation/requestForQuote.vue | 303 ++++++------ .../modules/quotation/sellForQuotation.vue | 4 +- .../sellForQuotation/customerInfo.vue | 287 +++++------ .../technicalSpecificationList.vue | 165 +++---- src/views/modules/test/requestForTest.vue | 151 +----- 8 files changed, 643 insertions(+), 917 deletions(-) diff --git a/src/api/project/project.js b/src/api/project/project.js index 42438e1..9709bb8 100644 --- a/src/api/project/project.js +++ b/src/api/project/project.js @@ -50,3 +50,8 @@ export const queryProjectByCustomer = (data) => createAPI(`/project`,'post',data export const queryProjectPart = (data) => createAPI(`/project/part`,'post',data) export const getProjectPartNowBm= data => createAPI(`/project/getProjectPartNowBm`,'post',data) + + +export const queryProjectCustomer = (data) => createAPI(`/project/customer`,'post',data) + +export const queryProjectFinalCustomer = (data) => createAPI(`/project/final/customer`,'post',data) diff --git a/src/views/modules/project/projectInfo/projectInfo.vue b/src/views/modules/project/projectInfo/projectInfo.vue index ca90f7e..e1b8aea 100644 --- a/src/views/modules/project/projectInfo/projectInfo.vue +++ b/src/views/modules/project/projectInfo/projectInfo.vue @@ -162,98 +162,99 @@ - 直接客户 - - -
- - - -
-
- - - -
-
- - - -
-
- - - -
-
- - - -
-
- -
- - - -
-
- - - -
-
- - - -
-
- 终端客户 - -
- - - -
-
- - - -
-
- - - -
-
- - - -
-
- - - -
-
- -
- - - -
-
- - - -
-
- - - -
-
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -476,9 +477,11 @@ import OssComponents from "../../oss/ossComponents.vue"; import toolApply from "./com_project_toolApplyCation.vue"; import { Divider } from 'element-ui'; + import CustomerInfo from "../../quotation/sellForQuotation/customerInfo.vue"; /*組件*/ export default { components: { + CustomerInfo, OssComponents, ChangeRecord, DictDataSelect, diff --git a/src/views/modules/proofing/requestForProofing.vue b/src/views/modules/proofing/requestForProofing.vue index 4c74ebe..86edd5f 100644 --- a/src/views/modules/proofing/requestForProofing.vue +++ b/src/views/modules/proofing/requestForProofing.vue @@ -480,159 +480,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 录入打样结果 - - 录入送样信息 - - 客户回复 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -757,156 +604,157 @@ - - - -
- - - -
-
- -
- - - -
-
- -
- - - -
-
-
- - -
- - - -
-
- -
- - - -
-
- -
- - - -
-
-
- - -
- - - -
-
- -
- - - -
-
- -
- - - -
-
-
- - -
- - - -
-
- -
- - - -
-
- -
- - - -
-
-
- - -
- - - -
-
-
- - -
- - - -
-
- -
- - - -
-
-
- - -
- - - -
-
- -
- - - -
-
- -
- - - -
-
- -
- - - -
-
-
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -1075,9 +923,11 @@ import {queryCustomer} from "../../../api/customer/customerInformation"; import {queryProjectByCustomer} from "../../../api/project/project"; import OssComponents from "../oss/ossComponents.vue"; import BuSelect from "../base/BuSelect.vue"; +import CustomerInfo from "../quotation/sellForQuotation/customerInfo.vue"; export default { components: { + CustomerInfo, BuSelect, OssComponents, ApprovalInformation, @@ -2302,7 +2152,7 @@ export default { }, mounted() { this.$nextTick(() => { - this.height = window.innerHeight / 2 - 80; + this.height = window.innerHeight / 2 - 100; /*第二个表格高度的动态调整*/ this.secondHeight = window.innerHeight / 2 - 206; }) diff --git a/src/views/modules/quotation/requestForQuote.vue b/src/views/modules/quotation/requestForQuote.vue index 9ec4719..68aa466 100644 --- a/src/views/modules/quotation/requestForQuote.vue +++ b/src/views/modules/quotation/requestForQuote.vue @@ -701,156 +701,157 @@ - - - -
- - - -
-
- -
- - - -
-
- -
- - - -
-
-
- - -
- - - -
-
- -
- - - -
-
- -
- - - -
-
-
- - -
- - - -
-
- -
- - - -
-
- -
- - - -
-
-
- - -
- - - -
-
- -
- - - -
-
- -
- - - -
-
-
- - -
- - - -
-
-
- - -
- - - -
-
- -
- - - -
-
-
- - -
- - - -
-
- -
- - - -
-
- -
- - - -
-
- -
- - - -
-
-
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -917,6 +918,7 @@ import OssComponents from "../oss/ossComponents.vue"; import BuSelect from "../base/BuSelect.vue"; import ApprovalInformation from "../changeManagement/approvalInformation.vue"; import {getApprovalList} from "../../../api/changeManagement/changeManagement"; +import CustomerInfo from "./sellForQuotation/customerInfo.vue"; export default { computed: { @@ -937,6 +939,7 @@ export default { }, }, components: { + CustomerInfo, ApprovalInformation, BuSelect, OssComponents, diff --git a/src/views/modules/quotation/sellForQuotation.vue b/src/views/modules/quotation/sellForQuotation.vue index 21cdd8c..f3a34c3 100644 --- a/src/views/modules/quotation/sellForQuotation.vue +++ b/src/views/modules/quotation/sellForQuotation.vue @@ -160,7 +160,7 @@ - + @@ -439,9 +439,11 @@ import ApprovalInformation from "../changeManagement/approvalInformation.vue"; import OssComponents from "../oss/ossComponents.vue"; import PriceCheckProperties from "./priceCheckProperties.vue"; import {getPriceCheckPropertiesList} from "../../../api/quotation/priceCheckProperties"; +import CustomerInfo from "./sellForQuotation/customerInfo.vue"; export default { components: { + CustomerInfo, PriceCheckProperties, ApprovalInformation, OssComponents, diff --git a/src/views/modules/quotation/sellForQuotation/customerInfo.vue b/src/views/modules/quotation/sellForQuotation/customerInfo.vue index 46acfe9..b074233 100644 --- a/src/views/modules/quotation/sellForQuotation/customerInfo.vue +++ b/src/views/modules/quotation/sellForQuotation/customerInfo.vue @@ -1,157 +1,162 @@ diff --git a/src/views/modules/sampleManagement/technicalSpecificationList.vue b/src/views/modules/sampleManagement/technicalSpecificationList.vue index 3d320e5..57f426d 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationList.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationList.vue @@ -187,89 +187,90 @@
- - -
- - - -
-
- - - -
-
- - - -
-
- -
- - - - -
-
- -
- - - -
-
- -
- - - -
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - -
- - - - -
-
+ + + + + + + + + + + + + + + + - -
- - - - -
-
-
+ + + + + + + + + + + + + + + + + @@ -340,8 +341,10 @@ getApprovalList, // 查询审批信息 } from '@/api/changeManagement/changeManagement.js' import ApprovalInformation from "../changeManagement/approvalInformation.vue"; + import CustomerInfo from "../quotation/sellForQuotation/customerInfo.vue"; export default { components: { + CustomerInfo, ApprovalInformation, Chooselist, AddOrUpdate, diff --git a/src/views/modules/test/requestForTest.vue b/src/views/modules/test/requestForTest.vue index 285bdf1..1518b06 100644 --- a/src/views/modules/test/requestForTest.vue +++ b/src/views/modules/test/requestForTest.vue @@ -692,156 +692,9 @@
- - - -
- - - -
-
- -
- - - -
-
- -
- - - -
-
-
- - -
- - - -
-
- -
- - - -
-
- -
- - - -
-
-
- - -
- - - -
-
- -
- - - -
-
- -
- - - -
-
-
- - -
- - - -
-
- -
- - - -
-
- -
- - - -
-
-
- - -
- - - -
-
- -
- - - -
-
- -
- - - -
-
-
- - -
- - - -
-
- -
- - - -
-
- -
- - - -
-
- -
- - - -
-
-
-
+
- @@ -975,6 +828,7 @@ import OssComponents from "../oss/ossComponents.vue"; import BuSelect from "../base/BuSelect.vue"; import {getApprovalList} from "../../../api/changeManagement/changeManagement"; + import CustomerInfo from "../quotation/sellForQuotation/customerInfo.vue"; export default { computed: { testInformationFlag () { @@ -992,6 +846,7 @@ }, name:"test", components: { + CustomerInfo, BuSelect, OssComponents, TestFile,