From f4c92ea07e2c59b017a1e18300e0e98f0d9590ad Mon Sep 17 00:00:00 2001
From: Aoi_Tori <2547614904@qq.com>
Date: Tue, 3 Jun 2025 09:08:35 +0800
Subject: [PATCH] 2025/6/3
---
src/views/modules/oss/ossComponents.vue | 11 ++
.../modules/part/partCatalogInformation.vue | 19 +++
src/views/modules/part/partInformation.vue | 146 ++++++++++++------
src/views/modules/part/routingManagement.vue | 7 +-
.../modules/quotation/requestForQuote.vue | 8 +-
.../com_bm_demoSlot.vue | 2 +-
.../com_tsd_basicInformation.vue | 6 +-
7 files changed, 145 insertions(+), 54 deletions(-)
diff --git a/src/views/modules/oss/ossComponents.vue b/src/views/modules/oss/ossComponents.vue
index fc8c974..235be11 100644
--- a/src/views/modules/oss/ossComponents.vue
+++ b/src/views/modules/oss/ossComponents.vue
@@ -109,6 +109,8 @@ export default {
this.fileList = fileList
},
handleUploadFiles(){
+ console.log('单号为:')
+ console.log(this.ossForm.orderRef2)
if (this.fileList.length === 0){
this.$message.error('请选择文件');
return;
@@ -255,7 +257,16 @@ export default {
this.dataList = [];
this.handleQuery();
}
+ },
+ orderRef2(newVal) {
+ this.ossForm.orderRef2 = newVal;
+ },
+ 'ossForm.orderRef2'(newVal) {
+ this.$emit('update:orderRef2', newVal);
}
+ },
+ mounted() {
+ this.ossForm.orderRef2 = this.orderRef2;
}
}
diff --git a/src/views/modules/part/partCatalogInformation.vue b/src/views/modules/part/partCatalogInformation.vue
index 654160b..62e259b 100644
--- a/src/views/modules/part/partCatalogInformation.vue
+++ b/src/views/modules/part/partCatalogInformation.vue
@@ -435,6 +435,13 @@
Chooselist
},
watch: {
+ '$route'(to) {
+ const newPartNo = to.params.ifsPartNo
+ if (newPartNo && newPartNo !== this.searchData.partNo) {
+ this.searchData.partNo = newPartNo
+ this.getDataList()
+ }
+ },
searchData: {
deep: true,
handler: function (newV, oldV) {
@@ -1124,6 +1131,18 @@
},
created () {
+ this.searchData = {
+ site: this.$store.state.user.site,
+ partNo: '',
+ partDesc: '',
+ page: 1,
+ limit: 10
+ }
+ const {ifsPartNo} = this.$route.params;
+ if (ifsPartNo) {
+ this.searchData.partNo = ifsPartNo;
+ console.log('赋值成功')
+ }
this.getDataList()
},
diff --git a/src/views/modules/part/partInformation.vue b/src/views/modules/part/partInformation.vue
index 48a0f96..b45a903 100644
--- a/src/views/modules/part/partInformation.vue
+++ b/src/views/modules/part/partInformation.vue
@@ -104,8 +104,18 @@
:min-width="item.columnWidth"
:label="item.columnLabel">
- {{ scope.row[item.columnProp] }}
- ![]()
+
+
+ {{ scope.row[item.columnProp] }}
+
+
![]()
+
+
{{ scope.row[item.columnProp] }}
+
![]()
+
![]()
+ {{ scope.row[item.columnProp] }}
+ ![]()
@@ -366,7 +413,8 @@
零件成本组 / Part Cost Group
-
+
@@ -565,7 +613,7 @@
- 新增
+ 新增
-
+
编辑
删除
@@ -670,7 +718,7 @@
同步
- 保存
+ 编辑
关闭
diff --git a/src/views/modules/part/routingManagement.vue b/src/views/modules/part/routingManagement.vue
index a086496..263fece 100644
--- a/src/views/modules/part/routingManagement.vue
+++ b/src/views/modules/part/routingManagement.vue
@@ -651,7 +651,7 @@
- 保存
+ 保存
关闭
@@ -1289,6 +1289,7 @@ export default {
data() {
return {
initPage: false,
+ loading: false,
// 导出
exportData: [],
exportName: 'Routing列表' + this.dayjs().format('YYYYMMDDHHmmss'),
@@ -4856,9 +4857,11 @@ export default {
return
}
if (this.routingToolData.flag === '1') {
+ this.loading = true
routingToolSave(this.routingToolData).then(({data}) => {
if (data && data.code === 0) {
this.searchRoutingTools()
+ this.loading = false
this.saveRoutingToolModal = false
this.$message({
message: '操作成功',
@@ -4874,9 +4877,11 @@ export default {
}
})
} else {
+ this.loading = true
routingToolEdit(this.routingToolData).then(({data}) => {
if (data && data.code === 0) {
this.searchRoutingTools()
+ this.loading = false
this.saveRoutingToolModal = false
this.$message({
message: '操作成功',
diff --git a/src/views/modules/quotation/requestForQuote.vue b/src/views/modules/quotation/requestForQuote.vue
index 604b58d..28bf2e2 100644
--- a/src/views/modules/quotation/requestForQuote.vue
+++ b/src/views/modules/quotation/requestForQuote.vue
@@ -600,7 +600,7 @@
确定
- 取消
+ 取消
@@ -3567,7 +3567,11 @@ export default {
handleCurrentChange(val){
this.no = val
this.getProjectPartList();
- }
+ },
+ closeRejectForm(){
+ this.rejectVisible = false
+ this.rejectOpinion = ''
+ },
}
}
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue
index ea3215f..8ba0901 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue
@@ -74,7 +74,7 @@
-
+
-
+
+
+
@@ -471,6 +474,7 @@
cqcOperatorList:[],
faiOperatorList:[],
relevancePartNo:'',
+ ecnUpgradeVersion:''
},
dataRole: {
partTypeDesc: [