From 69b82bd83fa89a1113856164bab8daa520cb93e9 Mon Sep 17 00:00:00 2001 From: Aoi_Tori <2547614904@qq.com> Date: Tue, 10 Jun 2025 09:09:51 +0800 Subject: [PATCH] 2025/6/10 --- src/api/project/project.js | 4 + .../technicalSpecificationList.js | 3 + .../project/projectInfo/projectInfo.vue | 8 +- .../project/projectPart/searchProjectPart.vue | 28 ++++++ .../modules/quotation/requestForQuote.vue | 23 ++++- .../com_bm_routing.vue | 90 ++++++++++++++++++- .../technicalSpecificationList.vue | 2 - 7 files changed, 152 insertions(+), 6 deletions(-) diff --git a/src/api/project/project.js b/src/api/project/project.js index c401ef6..9dfd363 100644 --- a/src/api/project/project.js +++ b/src/api/project/project.js @@ -58,3 +58,7 @@ export const queryProjectCustomer = (data) => createAPI(`/project/customer`,'pos export const queryProjectFinalCustomer = (data) => createAPI(`/project/final/customer`,'post',data) export const queryUsernameByRoleSuperFlag = (data) => createAPI(`/project/site/user/role/super`,'post',data) + +export const projectInfoSearchByAnyField = data => createAPI(`/project/projectInfoSearch/any`,'Post',data) +export const projectPartSearchByAnyField = data => createAPI(`/project/part/any`,'Post',data) + diff --git a/src/api/sampleManagement/technicalSpecificationList.js b/src/api/sampleManagement/technicalSpecificationList.js index c5c1d2d..2ba1526 100644 --- a/src/api/sampleManagement/technicalSpecificationList.js +++ b/src/api/sampleManagement/technicalSpecificationList.js @@ -144,5 +144,8 @@ export const bmStatusToFinish = data => createAPI("/technicalSpecification/bmSta export const getNodeList = data => createAPI("/technicalSpecification/node/list",'post',data) +export const updateBMProcessInfo= data => createAPI(`/technicalSpecification/updateBMProcessInfo`,'post',data) + + diff --git a/src/views/modules/project/projectInfo/projectInfo.vue b/src/views/modules/project/projectInfo/projectInfo.vue index 44840d9..87d00fa 100644 --- a/src/views/modules/project/projectInfo/projectInfo.vue +++ b/src/views/modules/project/projectInfo/projectInfo.vue @@ -416,6 +416,7 @@ import {isAuth} from "../../../../utils"; import FilterSearch from "../../../common/filterSearch.vue"; import {siteList} from "../../../../api/base/site"; + import {projectInfoSearchByAnyField} from "../../../../api/project/project"; /*組件*/ export default { components: { @@ -1997,9 +1998,12 @@ }, projectInfoSearchByAnyField(params){ - mtdnm(params).then(({data})=>{ + params.no = this.pageIndex + params.size = this.pageSize + projectInfoSearchByAnyField(params).then(({data})=>{ if (data && data.code === 0){ - this.dataList1 = data.data + this.dataList1 = data.page.list + this.totalPage = data.page.totalCount }else { this.$message.warning(data.msg) } diff --git a/src/views/modules/project/projectPart/searchProjectPart.vue b/src/views/modules/project/projectPart/searchProjectPart.vue index 54c7bd1..a911a55 100644 --- a/src/views/modules/project/projectPart/searchProjectPart.vue +++ b/src/views/modules/project/projectPart/searchProjectPart.vue @@ -39,6 +39,7 @@ class="el-button el-button--primary el-button--medium"> {{ '导出' }} + 搜索 @@ -206,6 +207,7 @@ + @@ -231,8 +233,14 @@ import CustomerInfo from "../../quotation/sellForQuotation/customerInfo.vue"; import ChangeRecord from "../projectInfo/com_project_change_record.vue"; import {isAuth} from "../../../../utils"; + import FilterSearch from "../../../common/filterSearch.vue"; + import { + technicalSpecificationListSearchByAnyField + } from "../../../../api/sampleManagement/technicalSpecificationList"; + import {projectPartSearchByAnyField} from "../../../../api/project/project"; export default { components: { + FilterSearch, ChangeRecord, CustomerInfo, toolApply, @@ -256,6 +264,7 @@ totalPage: 0, height: 200, dataListLoading: false, + filterVisible: false, // 导出 start exportData: [], exportName: "项目物料清单" + this.dayjs().format('YYYYMMDDHHmmss'), @@ -1027,6 +1036,25 @@ }, + searchByAnyField(params){ + params.site = this.$store.state.user.site + params.no = this.pageIndex + params.size = this.pageSize + projectPartSearchByAnyField(params).then(({data})=>{ + if (data && data.code === 0){ + this.dataList1 = data.page.list + this.totalPage = data.page.totalCount + }else { + this.$message.warning(data.msg) + } + }).catch((error)=>{ + this.$message.error(error) + }) + this.filterVisible = false + }, + + + } } diff --git a/src/views/modules/quotation/requestForQuote.vue b/src/views/modules/quotation/requestForQuote.vue index 28bf2e2..051aec6 100644 --- a/src/views/modules/quotation/requestForQuote.vue +++ b/src/views/modules/quotation/requestForQuote.vue @@ -764,6 +764,8 @@ + + @@ -805,13 +807,14 @@ import PriceCheckDetail from "./sellForQuotation/priceCheckDetail/priceCheckDeta import {getPriceCheckDetailList} from "../../../api/quotation/priceCheckDetail"; import InquiryQuoteDetail from "./inquiry/inquiryQuoteDetail.vue"; import {queryCustomer} from "../../../api/customer/customerInformation"; -import {queryProjectByCustomer} from "../../../api/project/project"; +import {projectPartSearchByAnyField, queryProjectByCustomer} from "../../../api/project/project"; 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"; import {isAuth} from "../../../utils"; +import FilterSearch from "../../common/filterSearch.vue"; export default { computed: { @@ -832,6 +835,7 @@ export default { }, }, components: { + FilterSearch, CustomerInfo, ApprovalInformation, BuSelect, @@ -983,6 +987,7 @@ export default { pageSize: 50, totalPage: 0, selectedDataNum: 0, + filterVisible: false, // 条件查询 searchData: { site: this.$store.state.user.site, @@ -3572,6 +3577,22 @@ export default { this.rejectVisible = false this.rejectOpinion = '' }, + searchByAnyField(params){ + params.site = this.$store.state.user.site + params.no = this.pageIndex + params.size = this.pageSize + projectPartSearchByAnyField(params).then(({data})=>{ + if (data && data.code === 0){ + this.dataList1 = data.page.list + this.totalPage = data.page.totalCount + }else { + this.$message.warning(data.msg) + } + }).catch((error)=>{ + this.$message.error(error) + }) + this.filterVisible = false + }, } } diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue index 63b4e54..165d007 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue @@ -195,6 +195,61 @@ 跳转至Routing + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 修改 + + + { + if (data && data.code === 0) { + this.$clearHighLight() + tsdBasicInformationSearch(this.searchData).then(({data}) => { + if(data.row){ + this.sheetData=data.row + }else { + + } + + }); + this.$message.success('操作成功') + } else { + this.$message.error(data.msg) + } + }) + }, updateBMRouteRev(){ if(this.currentRoute==null){ diff --git a/src/views/modules/sampleManagement/technicalSpecificationList.vue b/src/views/modules/sampleManagement/technicalSpecificationList.vue index f6d2929..6cd0e79 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationList.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationList.vue @@ -1557,8 +1557,6 @@ }, queryByAnyField(params){ - params.site = this.$store.state.user.site - params.username = this.$store.state.user.name params.no = this.pageIndex params.size = this.pageSize technicalSpecificationListSearchByAnyField(params).then(({data})=>{