From c63cd2cf908f850e1005b8bccb7df6d4c1eefc0b Mon Sep 17 00:00:00 2001 From: 13451728018 Date: Mon, 13 Nov 2023 15:27:55 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=8A=A5=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/quotation/quotationHeader.js | 43 ++ src/api/quotation/quotationInformation.js | 7 + .../quotationCustomerContact.vue | 13 + .../quotationCustomerInformation.vue | 14 + .../sellForQuotation/quotationDetail.vue | 707 ++++++++++++++++++ .../quotationExamineAndApprove.vue | 14 + .../quotationProjectInformation.vue | 14 + .../modules/quotation/sellForQuotation.vue | 686 +++++++++++++++++ 8 files changed, 1498 insertions(+) create mode 100644 src/api/quotation/quotationHeader.js create mode 100644 src/components/quotation/sellForQuotation/quotationCustomerContact.vue create mode 100644 src/components/quotation/sellForQuotation/quotationCustomerInformation.vue create mode 100644 src/components/quotation/sellForQuotation/quotationDetail.vue create mode 100644 src/components/quotation/sellForQuotation/quotationExamineAndApprove.vue create mode 100644 src/components/quotation/sellForQuotation/quotationProjectInformation.vue create mode 100644 src/views/modules/quotation/sellForQuotation.vue diff --git a/src/api/quotation/quotationHeader.js b/src/api/quotation/quotationHeader.js new file mode 100644 index 0000000..bd43388 --- /dev/null +++ b/src/api/quotation/quotationHeader.js @@ -0,0 +1,43 @@ +import { createAPI } from "@/utils/httpRequest.js"; +import {data} from "autoprefixer"; + +/** + * 报价信息列表查询 QuotationHeader + * @param data + * @returns {*} + */ +export const getQuotationHeaderByPage = (data) => createAPI(`/plm/quotationHeader/getQuotationHeaderByPage`,'get',data); + +/** + * 新增报价信息 QuotationHeader + * @param data + * @returns {*} + */ +export const insertQuotationHeader = (data) => createAPI('/plm/quotationHeader/insertQuotationHeader','post',data); + +/** + * 查询 报价工具列表 page + * @param data 请求参数 + * @returns {*} + */ +export const searchQuotationTool = (data) => createAPI('/plm/quotationTool/page','get',data); + +/** + * 新增报价工具 记录 + * @param data 请求携带参数 + * @returns {*} + */ +export const insertQuotationTool = (data) => createAPI('/plm/quotation','post',data); + +/** + * 分页查询QuotationDetail + * @param data + * @returns {*} + */ +export const searchQuotationDetailPageByHeaderId = (data) => createAPI('/plm/quotationDetail/searchQuotationDetailPageByHeaderId','get',data); +/** + * 新增QuotationDetail + * @param data + * @returns {*} + */ +export const insertQuotationDetail = (data) => createAPI('/plm/quotationDetail/insertQuotationDetail','post',data); diff --git a/src/api/quotation/quotationInformation.js b/src/api/quotation/quotationInformation.js index d8aba2a..2d021aa 100644 --- a/src/api/quotation/quotationInformation.js +++ b/src/api/quotation/quotationInformation.js @@ -1,4 +1,5 @@ import { createAPI } from "@/utils/httpRequest.js"; +import {data} from "autoprefixer"; /** * 报价信息列表查询 @@ -108,3 +109,9 @@ export const batchDeleteQuotationFile = data => createAPI(`/plm/quotationInforma * @returns {*} */ export const closeModalDeleteFile = data => createAPI(`/plm/quotationInformation/closeModalDeleteFile`,'post',data) +/** + * 通过询价单编号查询询价单信息 + * @param data + * @returns {*} + */ +export const searchQuotationByQuotationNo = data => createAPI(`/plm/quotationInformation/searchQuotationByQuotationNo`,'get',data) diff --git a/src/components/quotation/sellForQuotation/quotationCustomerContact.vue b/src/components/quotation/sellForQuotation/quotationCustomerContact.vue new file mode 100644 index 0000000..536cff9 --- /dev/null +++ b/src/components/quotation/sellForQuotation/quotationCustomerContact.vue @@ -0,0 +1,13 @@ + + + diff --git a/src/components/quotation/sellForQuotation/quotationCustomerInformation.vue b/src/components/quotation/sellForQuotation/quotationCustomerInformation.vue new file mode 100644 index 0000000..d616231 --- /dev/null +++ b/src/components/quotation/sellForQuotation/quotationCustomerInformation.vue @@ -0,0 +1,14 @@ + + + + diff --git a/src/components/quotation/sellForQuotation/quotationDetail.vue b/src/components/quotation/sellForQuotation/quotationDetail.vue new file mode 100644 index 0000000..8928604 --- /dev/null +++ b/src/components/quotation/sellForQuotation/quotationDetail.vue @@ -0,0 +1,707 @@ + + + + diff --git a/src/components/quotation/sellForQuotation/quotationExamineAndApprove.vue b/src/components/quotation/sellForQuotation/quotationExamineAndApprove.vue new file mode 100644 index 0000000..5b2fcef --- /dev/null +++ b/src/components/quotation/sellForQuotation/quotationExamineAndApprove.vue @@ -0,0 +1,14 @@ + + + + diff --git a/src/components/quotation/sellForQuotation/quotationProjectInformation.vue b/src/components/quotation/sellForQuotation/quotationProjectInformation.vue new file mode 100644 index 0000000..3494907 --- /dev/null +++ b/src/components/quotation/sellForQuotation/quotationProjectInformation.vue @@ -0,0 +1,14 @@ + + + + diff --git a/src/views/modules/quotation/sellForQuotation.vue b/src/views/modules/quotation/sellForQuotation.vue new file mode 100644 index 0000000..e6475bd --- /dev/null +++ b/src/views/modules/quotation/sellForQuotation.vue @@ -0,0 +1,686 @@ + + + + + + From 9ed7c1db67a397652a63deb19c2b0827c691abbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=A5=89=E6=BA=90?= <1976974459@qq.com> Date: Mon, 13 Nov 2023 17:53:29 +0800 Subject: [PATCH 2/2] =?UTF-8?q?2023-11-13=20plm=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/part/umInformation.js | 29 ++ src/views/modules/common/Chooselist.vue | 5 +- src/views/modules/part/partInformation.vue | 55 +-- src/views/modules/part/umInformation.vue | 514 +++++++++++++++++++++ 4 files changed, 549 insertions(+), 54 deletions(-) create mode 100644 src/api/part/umInformation.js create mode 100644 src/views/modules/part/umInformation.vue diff --git a/src/api/part/umInformation.js b/src/api/part/umInformation.js new file mode 100644 index 0000000..083b508 --- /dev/null +++ b/src/api/part/umInformation.js @@ -0,0 +1,29 @@ +import { createAPI } from "@/utils/httpRequest.js"; + +/** + * 单位信息列表查询 + * @param data + * @returns {*} + */ +export const umInformationSearch = data => createAPI(`/plm/umInformation/umInformationSearch`,'post',data) +/** + * 单位信息新增 + * @param data + * @returns {*} + */ +export const umInformationSave = data => createAPI(`/plm/umInformation/umInformationSave`,'post',data) +/** + * 单位信息编辑 + * @param data + * @returns {*} + */ +export const umInformationEdit = data => createAPI(`/plm/umInformation/umInformationEdit`,'post',data) +/** + * 单位信息删除 + * @param data + * @returns {*} + */ +export const umInformationDelete = data => createAPI(`/plm/umInformation/umInformationDelete`,'post',data) + + + diff --git a/src/views/modules/common/Chooselist.vue b/src/views/modules/common/Chooselist.vue index b4a80e6..558e302 100644 --- a/src/views/modules/common/Chooselist.vue +++ b/src/views/modules/common/Chooselist.vue @@ -111,13 +111,14 @@ export default { getChooselist({"tagNo": tagNo}).then(({data}) => { this.columnList = [] this.baseListData = data.data - let start = data.data.sqlcode.indexOf("Select") - let end = data.data.sqlcode.indexOf("from") + let start = data.data.sqlcode.toUpperCase().indexOf("Select".toUpperCase()) + let end = data.data.sqlcode.toUpperCase().indexOf("from".toUpperCase()) let length = end - start let columns = data.data.sqlcode.trim().substring(start + 6, length).trim() let props = columns.split(",") props.forEach((item, index) => { let name = '信息列' + //debugger switch (index) { case 0: name = this.baseListData.caption1 diff --git a/src/views/modules/part/partInformation.vue b/src/views/modules/part/partInformation.vue index ae86c89..29419c8 100644 --- a/src/views/modules/part/partInformation.vue +++ b/src/views/modules/part/partInformation.vue @@ -130,7 +130,7 @@ - + 计量单位 @@ -166,7 +166,7 @@ - + 属性模板 @@ -736,55 +736,7 @@ ], // ======== 必填规则 ======== rules: { - customerDesc: [ - { - required: true, - message: ' ', - trigger: 'change' - } - ], - trackerName: [ - { - required: true, - message: ' ', - trigger: 'change' - } - ], - projectName: [ - { - required: true, - message: ' ', - trigger: 'change' - } - ], - quoterName: [ - { - required: true, - message: ' ', - trigger: 'change' - } - ], - partName: [ - { - required: true, - message: ' ', - trigger: 'change' - } - ], - priorityLevel: [ - { - required: true, - message: ' ', - trigger: 'change' - } - ], - requiredCompletionDate: [ - { - required: true, - message: ' ', - trigger: 'change' - } - ] + }, // ======== 复选数据集 ======== partSelections: [], @@ -1209,7 +1161,6 @@ * @param val */ getBaseData (val) { - console.log(222) if (this.tagNo === 107) { if(this.tagNo1 === 1) { this.modalData.umId = val.um_id diff --git a/src/views/modules/part/umInformation.vue b/src/views/modules/part/umInformation.vue new file mode 100644 index 0000000..58b4a3e --- /dev/null +++ b/src/views/modules/part/umInformation.vue @@ -0,0 +1,514 @@ + + + + + +