diff --git a/src/api/sampleManagement/technicalSpecificationList.js b/src/api/sampleManagement/technicalSpecificationList.js index 7ec33d9..3f667af 100644 --- a/src/api/sampleManagement/technicalSpecificationList.js +++ b/src/api/sampleManagement/technicalSpecificationList.js @@ -127,3 +127,6 @@ export const getOADetailForBM= data => createAPI(`/technicalSpecification/getOAD export const searchCopyPart= data => createAPI(`/technicalSpecification/searchCopyPart`,'post',data) export const copyBm= data => createAPI(`/technicalSpecification/copyBm`,'post',data) + +// 2025-05-14 查询变更信息 +export const queryChangeLogList = data => createAPI("/technicalSpecification/change/log",'post',data) diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/changeLog.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/changeLog.vue new file mode 100644 index 0000000..111fa09 --- /dev/null +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/changeLog.vue @@ -0,0 +1,261 @@ + + + + + diff --git a/src/views/modules/sampleManagement/technicalSpecificationList.vue b/src/views/modules/sampleManagement/technicalSpecificationList.vue index d1e6cf9..bf5308a 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationList.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationList.vue @@ -12,6 +12,7 @@ + 客户 @@ -20,9 +21,9 @@ - - - + + + @@ -337,6 +338,9 @@ + + + @@ -465,8 +469,10 @@ } from '@/api/changeManagement/changeManagement.js' import ApprovalInformation from "../changeManagement/approvalInformation.vue"; import CustomerInfo from "../quotation/sellForQuotation/customerInfo.vue"; + import ChangeLog from "./technicalSpecificationDetail/changeLog.vue"; export default { components: { + ChangeLog, CustomerInfo, ApprovalInformation, Chooselist, @@ -1067,6 +1073,11 @@ strVal = this.searchData.testPartNo } } + if (val === 102) { + if(type==1) { + strVal = this.searchData.customerDesc + } + } this.$refs.baseList.init(val, strVal) }) }, @@ -1104,6 +1115,11 @@ this.searchData.testPartNo = val.Test_part_no } } + if (this.tagNo === 102) { + if(this.tagNo1==1) { + this.searchData.customerDesc = val.Customer_desc + } + } }, // 新增 / 修改 addOrUpdateHandle (id) { diff --git a/src/views/modules/tooling/searchToolApply.vue b/src/views/modules/tooling/searchToolApply.vue index 6bc17e3..02e9081 100644 --- a/src/views/modules/tooling/searchToolApply.vue +++ b/src/views/modules/tooling/searchToolApply.vue @@ -32,7 +32,7 @@ 查询 - + @@ -98,9 +106,11 @@ :total="totalPage" layout="total, sizes, prev, pager, next, jumper"> - + - + 跳转BenchMark - - - - - - - - - - - - + + + + + + + + + + + + - + - + - - + + - + - - + + - + - + @@ -188,7 +198,7 @@ - + @@ -196,7 +206,8 @@ - + @@ -209,7 +220,7 @@ :title="'刀模申请修改'" :close-on-click-modal="false" :visible.sync="visibleU"> - + @@ -217,7 +228,8 @@ - + @@ -233,37 +245,42 @@ placeholder="结束日期"> - - + + 报价员 - + TP - + 采购员 - + - + - - - + -
+
@@ -302,44 +321,48 @@
- - + + - - + + - + - + - - + + - - + + - - + + - - + + - - + + @@ -347,8 +370,8 @@ - {{'保存'}} - {{'取消'}} + {{ '保存' }} + {{ '取消' }} @@ -357,7 +380,7 @@ :title="'刀模申请审批'" :close-on-click-modal="false" :visible.sync="visible"> - + @@ -365,7 +388,8 @@ - + @@ -381,37 +405,42 @@ placeholder="结束日期"> - - + + - 报价员 - + 报价员 + - TP - + TP + - 采购员 - + 采购员 + - + - - - + -
+
- +
- - + + - - + + - + - + - - + + - - + + - - + + - - - + + + - - + + @@ -496,8 +533,8 @@ - {{'取消'}} - 保存 + {{ '取消' }} + 保存 同意 驳回 @@ -508,56 +545,58 @@ :title="'处理信息'" :close-on-click-modal="false" :visible.sync="modelFlag"> - - + + - - + + - - + + - + - - + + - - + + - - + + - - + + - {{'保存'}} - {{'取消'}} + {{ '保存' }} + {{ '取消' }} - + - + @@ -567,802 +606,803 @@ - + - +