From bdec0bfeb7a5da7987b966fa369d8eec0266900f 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    | 13 ++++++-------
 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, 54 insertions(+), 12 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;
   }
 }
 </script>
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..b546427 100644
--- a/src/views/modules/part/partInformation.vue
+++ b/src/views/modules/part/partInformation.vue
@@ -112,7 +112,7 @@
         fixed="right"
         header-align="center"
         align="center"
-        width="120"
+        width="100"
         label="操作">
         <template slot-scope="scope">
           <el-link v-if="isAuth('104001001:details')" style="cursor: pointer" @click="detailsModal(scope.row)">详情</el-link>
@@ -511,12 +511,11 @@
           <el-tab-pane label="Characteristics" style="margin-top: -15px" name="Characteristics">
             <el-form label-position="top" style="margin-left: 2px;">
               <el-form-item>
-                <span v-if="modalData.flag === '4'" slot="label">属性模板</span>
-                <span v-else style="cursor: pointer" slot="label" @click="getBaseList(20)"><a herf="#">属性模板</a></span>
-                <el-input v-model="modalData.codeNo" :disabled="modalData.flag === '4'" @change="codeNoBlur(20)" style="width: 128px"></el-input>
+                <span style="cursor: pointer" slot="label" @click="getBaseList(20)"><a herf="#">属性模板</a></span>
+                <el-input v-model="modalData.codeNo" @change="codeNoBlur(20)" style="width: 128px"></el-input>
                 <el-input v-model="modalData.codeDesc" disabled style="width: 330px"></el-input>
               </el-form-item>
-              <el-form-item v-if="modalData.flag !== '4'" label=" ">
+              <el-form-item label=" ">
                 <el-button type="primary" @click="savePartItemModal">新增</el-button>
                 <el-button type="primary" @click="deletePartItemModal">删除</el-button>
               </el-form-item>
@@ -565,7 +564,7 @@
           </el-tab-pane>
 
           <el-tab-pane v-if="modalDisableFlag" style="margin-top: -10px" label="Revisions" name="Revisions">
-            <el-button v-if="modalData.flag !== '4'" type="primary" @click="savePartRevisionModal">新增</el-button>
+            <el-button type="primary" @click="savePartRevisionModal">新增</el-button>
             <el-table
               :data="revisionList"
               height="355px"
@@ -593,7 +592,7 @@
                 align="center"
                 width="100"
                 label="操作">
-                <template v-if="modalData.flag !== '4'" slot-scope="scope">
+                <template slot-scope="scope">
                   <el-link style="cursor: pointer" @click="updateRevisionModal(scope.row)">编辑</el-link>
                   <el-link style="cursor: pointer" @click="deleteRevisionModal(scope.row)">删除</el-link>
                 </template>
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 @@
         </el-form-item>
       </el-form>
       <el-footer style="height:35px;margin-top:25px;text-align:center">
-        <el-button type="primary" @click="routingToolSave()">保存</el-button>
+        <el-button type="primary" :loading="loading" @click="routingToolSave()">保存</el-button>
         <el-button type="primary" @click="saveRoutingToolModal = false">关闭</el-button>
       </el-footer>
     </el-dialog>
@@ -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 @@
       </el-form>
       <el-footer style="text-align:center;height: 30px;line-height: 30px;">
         <el-button type="primary" @click="rejectSubmit">确定</el-button>
-        <el-button type="primary" @click="rejectVisible = false">取消</el-button>
+        <el-button type="primary" @click="closeRejectForm">取消</el-button>
       </el-footer>
     </el-dialog>
 
@@ -3567,7 +3567,11 @@ export default {
     handleCurrentChange(val){
       this.no = val
       this.getProjectPartList();
-    }
+    },
+    closeRejectForm(){
+      this.rejectVisible = false
+      this.rejectOpinion = ''
+    },
   }
 }
 </script>
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 @@
               <div  v-highlight-container>
               <el-input v-if="scope.row.valueTypeDb === 'T'&&scope.row.valueChooseFlag === 'N'" v-model="scope.row.textValue" style="height: 11px;padding: 0px ;width:98%" allow-create :disabled="ifDisableFlag" ></el-input>
               <div v-if="scope.row.valueTypeDb === 'S'&&scope.row.valueChooseFlag === 'N'"><el-input  v-model="scope.row.textValue" style="height: 11px;padding: 0px ;width:98%" allow-create :disabled="ifDisableFlag"></el-input></div>
-              <el-input v-if="scope.row.valueTypeDb === 'N'&&scope.row.valueChooseFlag === 'N'" v-model="scope.row.numValue" type="number" style="height: 11px;padding: 0px;width:98%"  allow-create :disabled="ifDisableFlag"></el-input>
+              <el-input v-if="scope.row.valueTypeDb === 'N'&&scope.row.valueChooseFlag === 'N'" v-model="scope.row.numValue" type="number" @input="(value) => scope.row.numValue = value.replace(/[^0-9.]/g, '')" style="height: 11px;padding: 0px;width:98%"  allow-create :disabled="ifDisableFlag"></el-input>
               <el-select v-if="scope.row.valueTypeDb === 'T'&&scope.row.valueChooseFlag === 'Y'" v-model="scope.row.textValue" placeholder="请选择" style="height: 11px;padding: 0px " allow-create :disabled="ifDisableFlag">
                 <el-option
                   v-for="item in scope.row.availableValueList"
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue
index 6185822..5174a2a 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue
@@ -104,8 +104,11 @@
 
       <el-row :gutter="10">
         <el-col :span="3">
-          <el-form-item label="ECN Number">
+<!--          <el-form-item label="ECN Number">
             <el-input @focus="jumpPage('A')" ref="jumpA" class="blue-input yzz2" v-model="dataForm.ecnUpgradeVersion" readonly></el-input>
+          </el-form-item>-->
+          <el-form-item label="ECN Number">
+            <el-input @focus="jumpPage('A')" ref="jumpA" class="blue-input yzz2" v-model="dataForm.ecnNo" readonly></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="6">
@@ -471,6 +474,7 @@
           cqcOperatorList:[],
           faiOperatorList:[],
           relevancePartNo:'',
+          ecnUpgradeVersion:''
         },
         dataRole: {
           partTypeDesc: [