2025/6/3

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>

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()
     },
 

src/views/modules/part/partInformation.vue

@@ -104,8 +104,18 @@
         :min-width="item.columnWidth"
         :label="item.columnLabel">
         <template slot-scope="scope">
-          <span v-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span>
-          <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+          <div v-if="item.columnProp === 'ifsPartNo'">
+            <el-link style="cursor:pointer;" v-if="!item.columnHidden" @click="toPartMenu(scope.row.ifsPartNo)">
+              {{ scope.row[item.columnProp] }}
+            </el-link>
+            <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
+                                               style="width: 100px; height: 80px"/></span>
+          </div>
+          <div v-else>
+            <span v-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span>
+            <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
+                                               style="width: 100px; height: 80px"/></span>
+          </div>
         </template>
       </el-table-column>
       <el-table-column
@@ -120,11 +130,13 @@
           <el-dropdown trigger="click">
             <el-link style="cursor: pointer;font-size: 12px">
               更多
-            </el-link >
+            </el-link>
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item @click.native="toMenu('BOM', scope.row)">BOM</el-dropdown-item>
               <el-dropdown-item @click.native="toMenu('Routing', scope.row)">Routing</el-dropdown-item>
-              <el-dropdown-item v-if="scope.row.temporaryPartFlag === 'Y' && scope.row.status === 'N'" @click.native="toBecomeOfficialPartModal(scope.row)">转正式物料</el-dropdown-item>
+              <el-dropdown-item v-if="scope.row.temporaryPartFlag === 'Y' && scope.row.status === 'N'"
+                                @click.native="toBecomeOfficialPartModal(scope.row)">转正式物料
+              </el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
         </template>
@@ -135,20 +147,22 @@
 
     <!-- 分页插件 -->
     <el-pagination style="margin-top: 0px"
-      @size-change="sizeChangeHandle"
-      @current-change="currentChangeHandle"
-      :current-page="pageIndex"
-      :page-sizes="[20, 50, 100, 200, 500]"
-      :page-size="pageSize"
-      :total="totalPage"
-      layout="total, sizes, prev, pager, next, jumper">
+                   @size-change="sizeChangeHandle"
+                   @current-change="currentChangeHandle"
+                   :current-page="pageIndex"
+                   :page-sizes="[20, 50, 100, 200, 500]"
+                   :page-size="pageSize"
+                   :total="totalPage"
+                   layout="total, sizes, prev, pager, next, jumper">
     </el-pagination>
 
     <!-- 物料新增/编辑模态框 -->
-    <el-dialog :title="modalData.title" top="10vh" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="1000px">
+    <el-dialog :title="modalData.title" top="10vh" :close-on-click-modal="false" v-drag :visible.sync="modalFlag"
+               width="1000px">
       <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-top: -5px;">
         <el-form-item label="物料编码" prop="partNo" :rules="rules.partNo">
-          <el-input v-model="modalData.partNo" :disabled="modalDisableFlag" style="width: 128px" @blur="queryMasterField"></el-input>
+          <el-input v-model="modalData.partNo" :disabled="modalDisableFlag" style="width: 128px"
+                    @blur="queryMasterField"></el-input>
         </el-form-item>
         <el-form-item label="物料名称" prop="partDesc" :rules="rules.partDesc" style="margin-left: -10px">
           <el-input v-model="modalData.partDesc" clearable style="width: 330px"></el-input>
@@ -156,7 +170,8 @@
         <el-form-item v-if="modalData.flag === '2'" :label="' '">
           <el-button type="primary" @click="toCopyPartModal">Copy</el-button>
         </el-form-item>
-        <el-form-item v-if="modalData.flag === '3'" label="IFS物料编码" prop="ifsPartNo" :rules="[{required: true,message: ' ',trigger: ['blur','change']}]" style="margin-left: -10px">
+        <el-form-item v-if="modalData.flag === '3'" label="IFS物料编码" prop="ifsPartNo"
+                      :rules="[{required: true,message: ' ',trigger: ['blur','change']}]" style="margin-left: -10px">
           <el-input v-model="modalData.ifsPartNo" clearable style="width: 130px"></el-input>
         </el-form-item>
         <el-form-item v-if="modalData.flag === '3'" :label="' '">
@@ -165,7 +180,8 @@
         <el-form-item v-if="modalData.flag === '3'" :label="' '">
           <el-button type="primary" @click="nextPartNo">Next Part No</el-button>
         </el-form-item>
-        <el-tabs v-model="inventoryPartTable" style="width: 100%;height: 430px;" type="border-card" @tab-click="inventoryPartClick">
+        <el-tabs v-model="inventoryPartTable" style="width: 100%;height: 430px;" type="border-card"
+                 @tab-click="inventoryPartClick">
           <el-tab-pane label="General" name="General">
             <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-top: -5px;">
               <el-form-item label="零件类型 / Part Type" prop="partType" :rules="rules.partType">
@@ -177,40 +193,49 @@
                 </el-select>
               </el-form-item>
               <el-form-item>
-                <span style="cursor: pointer" slot="label" @click="getBaseList(123)"><a herf="#">安全代码 / Safety Code</a></span>
+                <span style="cursor: pointer" slot="label" @click="getBaseList(123)"><a
+                  herf="#">安全代码 / Safety Code</a></span>
                 <el-input v-model="modalData.hazardCode" @change="hazardCodeBlur(123)" style="width: 128px"></el-input>
                 <el-input v-model="modalData.hazardDesc" disabled style="width: 327px"></el-input>
               </el-form-item>
             </el-form>
             <el-form :inline="true" label-position="top" :model="modalData" :rules="rules">
               <el-form-item prop="productGroupId4" :rules="rules.productGroupId4">
-                <span style="cursor: pointer" slot="label" @click="getBaseList(113)"><a herf="#">计划人 / Planner</a></span>
-                <el-input v-model="modalData.productGroupId4" @change="productGroupId4Blur(113)" style="width: 128px"></el-input>
+                <span style="cursor: pointer" slot="label" @click="getBaseList(113)"><a
+                  herf="#">计划人 / Planner</a></span>
+                <el-input v-model="modalData.productGroupId4" @change="productGroupId4Blur(113)"
+                          style="width: 128px"></el-input>
                 <el-input v-model="modalData.productGroupName4" disabled style="width: 327px"></el-input>
               </el-form-item>
               <el-form-item>
                 <span style="cursor: pointer" slot="label" @click="getBaseList(112)"><a herf="#">会计组 / Accounting Group</a></span>
-                <el-input v-model="modalData.productGroupId3" @change="productGroupId3Blur(112)" style="width: 128px"></el-input>
+                <el-input v-model="modalData.productGroupId3" @change="productGroupId3Blur(112)"
+                          style="width: 128px"></el-input>
                 <el-input v-model="modalData.productGroupName3" disabled style="width: 327px"></el-input>
               </el-form-item>
             </el-form>
             <el-form :inline="true" label-position="top" :model="modalData" :rules="rules">
               <el-form-item prop="umId" :rules="rules.umId">
-                <span v-if="modalData.flag === '2' && modalData.status === 'Y'" slot="label">计量单位 / Inventory UoM</span>
+                <span v-if="modalData.flag === '2' && modalData.status === 'Y'"
+                      slot="label">计量单位 / Inventory UoM</span>
                 <span v-else style="cursor: pointer" slot="label" @click="getBaseList(1007)"><a herf="#">计量单位 / Inventory UoM</a></span>
-                <el-input v-model="modalData.umId" :disabled="modalData.flag === '2' && modalData.status === 'Y'" @change="umIdBlur(1007)" style="width: 128px"></el-input>
+                <el-input v-model="modalData.umId" :disabled="modalData.flag === '2' && modalData.status === 'Y'"
+                          @change="umIdBlur(1007)" style="width: 128px"></el-input>
                 <el-input v-model="modalData.umName" disabled style="width: 327px"></el-input>
               </el-form-item>
               <el-form-item>
-                <span style="cursor: pointer" slot="label" @click="getBaseList(109)"><a herf="#">产品代码 / Product Code</a></span>
+                <span style="cursor: pointer" slot="label" @click="getBaseList(109)"><a
+                  herf="#">产品代码 / Product Code</a></span>
                 <el-input v-model="modalData.groupId" @change="groupIdBlur(109)" style="width: 128px"></el-input>
                 <el-input v-model="modalData.groupName" disabled style="width: 327px"></el-input>
               </el-form-item>
             </el-form>
             <el-form :inline="true" label-position="top" :model="modalData" :rules="rules">
               <el-form-item>
-                <span style="cursor: pointer" slot="label" @click="getBaseList(110)"><a herf="#">商品组1 / Comm Group 1</a></span>
-                <el-input v-model="modalData.productGroupId1" @change="productGroupId1Blur(110)" style="width: 128px"></el-input>
+                <span style="cursor: pointer" slot="label" @click="getBaseList(110)"><a
+                  herf="#">商品组1 / Comm Group 1</a></span>
+                <el-input v-model="modalData.productGroupId1" @change="productGroupId1Blur(110)"
+                          style="width: 128px"></el-input>
                 <el-input v-model="modalData.productGroupName1" disabled style="width: 327px"></el-input>
               </el-form-item>
               <el-form-item>
@@ -221,8 +246,10 @@
             </el-form>
             <el-form :inline="true" label-position="top" :model="modalData" :rules="rules">
               <el-form-item>
-                <span style="cursor: pointer" slot="label" @click="getBaseList(111)"><a herf="#">商品组2 / Comm Group 2</a></span>
-                <el-input v-model="modalData.productGroupId2" @change="productGroupId2Blur(111)" style="width: 128px"></el-input>
+                <span style="cursor: pointer" slot="label" @click="getBaseList(111)"><a
+                  herf="#">商品组2 / Comm Group 2</a></span>
+                <el-input v-model="modalData.productGroupId2" @change="productGroupId2Blur(111)"
+                          style="width: 128px"></el-input>
                 <el-input v-model="modalData.productGroupName2" disabled style="width: 327px"></el-input>
               </el-form-item>
               <el-form-item label="类型指定 / Type Designation">
@@ -231,7 +258,8 @@
             </el-form>
             <el-form :inline="true" label-position="top" :model="modalData" :rules="rules">
               <el-form-item>
-                <span style="cursor: pointer" slot="label" @click="getBaseList(124)"><a herf="#">资产等级 / Asset Class</a></span>
+                <span style="cursor: pointer" slot="label" @click="getBaseList(124)"><a
+                  herf="#">资产等级 / Asset Class</a></span>
                 <el-input v-model="modalData.assetClass" @change="assetClassBlur(124)" style="width: 128px"></el-input>
                 <el-input v-model="modalData.assetClassDesc" disabled style="width: 327px"></el-input>
               </el-form-item>
@@ -241,12 +269,14 @@
             </el-form>
             <el-form :inline="true" label-position="top" :model="modalData" :rules="rules">
               <el-form-item>
-                <span style="cursor: pointer" slot="label" @click="getBaseList(125)"><a herf="#">零件状态 / Part Status</a></span>
+                <span style="cursor: pointer" slot="label" @click="getBaseList(125)"><a
+                  herf="#">零件状态 / Part Status</a></span>
                 <el-input v-model="modalData.partStatus" @change="partStatusBlur(125)" style="width: 128px"></el-input>
                 <el-input v-model="modalData.partStatusDesc" disabled style="width: 327px"></el-input>
               </el-form-item>
               <el-form-item label="净重">
-                <el-input class="inlineNumber numInput" v-model="modalData.weightNet" readonly type="number" style="width: 110px"></el-input>
+                <el-input class="inlineNumber numInput" v-model="modalData.weightNet" readonly type="number"
+                          style="width: 110px"></el-input>
               </el-form-item>
               <el-form-item label="净重单位" style="margin-left: -10px">
                 <el-input v-model="modalData.uomForWeightNet" readonly style="width: 110px"></el-input>
@@ -257,13 +287,16 @@
             </el-form>
             <el-form :inline="true" label-position="top" :model="modalData" :rules="rules">
               <el-form-item>
-                <span style="cursor: pointer" slot="label" v-if="!modalDisableFlag"><a herf="#">ABC类 / ABC Class</a></span>
+                <span style="cursor: pointer" slot="label" v-if="!modalDisableFlag"><a
+                  herf="#">ABC类 / ABC Class</a></span>
                 <span style="cursor: pointer" slot="label" v-else @click="getBaseList(126)"><a herf="#">ABC类 / ABC Class</a></span>
-                <el-input v-model="modalData.abcClass" @change="abcClassBlur(126)" :readonly="!modalDisableFlag" style="width: 128px"></el-input>
+                <el-input v-model="modalData.abcClass" @change="abcClassBlur(126)" :readonly="!modalDisableFlag"
+                          style="width: 128px"></el-input>
                 <el-input v-model="modalData.abcClassDesc" disabled style="width: 327px"></el-input>
               </el-form-item>
               <el-form-item label="净数量">
-                <el-input class="inlineNumber numInput" v-model="modalData.volumeNet" readonly type="number" style="width: 110px"></el-input>
+                <el-input class="inlineNumber numInput" v-model="modalData.volumeNet" readonly type="number"
+                          style="width: 110px"></el-input>
               </el-form-item>
               <el-form-item label="数量单位" style="margin-left: -10px">
                 <el-input v-model="modalData.uomForVolumeNet" readonly style="width: 110px"></el-input>
@@ -277,44 +310,56 @@
           <el-tab-pane label="Acquisition" name="Acquisition">
             <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-top: -5px;">
               <el-form-item label="制造备货期 / Manufacturing Lead Time">
-                <el-input-number :controls="false" :step="0" v-model="modalData.manufacturingLeadTime" @change="changeExpectedLeadTime" :disabled="!(modalData.partType === 'Manufactured' || modalData.partType === 'Manufactured Recipe')" style="width: 222px"></el-input-number>
+                <el-input-number :controls="false" :step="0" v-model="modalData.manufacturingLeadTime"
+                                 @change="changeExpectedLeadTime"
+                                 :disabled="!(modalData.partType === 'Manufactured' || modalData.partType === 'Manufactured Recipe')"
+                                 style="width: 222px"></el-input-number>
               </el-form-item>
               <el-form-item label="周数 / Weeks">
-                <el-input class="inlineNumber numInput" v-model="modalData.durabilityWeek" readonly type="number" style="width: 221px"></el-input>
+                <el-input class="inlineNumber numInput" v-model="modalData.durabilityWeek" readonly type="number"
+                          style="width: 221px"></el-input>
               </el-form-item>
               <el-form-item>
                 <span style="cursor: pointer" slot="label" @click="getBaseList(127)"><a herf="#">来源国家 / Country of Origin</a></span>
-                <el-input v-model="modalData.countryOfOrigin" @change="countryOfOriginBlur(127)" style="width: 128px"></el-input>
+                <el-input v-model="modalData.countryOfOrigin" @change="countryOfOriginBlur(127)"
+                          style="width: 128px"></el-input>
                 <el-input v-model="modalData.countryOfOriginDesc" disabled style="width: 327px"></el-input>
               </el-form-item>
             </el-form>
             <el-form :inline="true" label-position="top" :model="modalData" :rules="rules">
               <el-form-item label="预期提前期 / Expected Lead Time">
-                <el-input-number :controls="false" :step="0" v-model="modalData.expectedLeadTime" style="width: 222px"></el-input-number>
+                <el-input-number :controls="false" :step="0" v-model="modalData.expectedLeadTime"
+                                 style="width: 222px"></el-input-number>
               </el-form-item>
               <el-form-item label="天数 / Days">
-                <el-input-number :controls="false" :step="0" v-model="modalData.durabilityDay" @change="changeDurabilityWeek" style="width: 221px"></el-input-number>
+                <el-input-number :controls="false" :step="0" v-model="modalData.durabilityDay"
+                                 @change="changeDurabilityWeek" style="width: 221px"></el-input-number>
               </el-form-item>
               <el-form-item>
-                <span style="cursor: pointer" slot="label" @click="getBaseList(128)"><a herf="#">区域代码 / Region Code</a></span>
-                <el-input v-model="modalData.regionOfOrigin" @change="regionOfOriginBlur(128)" style="width: 128px"></el-input>
+                <span style="cursor: pointer" slot="label" @click="getBaseList(128)"><a
+                  herf="#">区域代码 / Region Code</a></span>
+                <el-input v-model="modalData.regionOfOrigin" @change="regionOfOriginBlur(128)"
+                          style="width: 128px"></el-input>
                 <el-input v-model="modalData.regionOfOriginDesc" disabled style="width: 327px"></el-input>
               </el-form-item>
             </el-form>
             <el-form :inline="true" label-position="top" :model="modalData" :rules="rules">
               <el-form-item label="州内转换因子 / Intrastat Conv Factor">
-                <el-input-number :controls="false" :step="0" v-model="modalData.intrastatConvFactor" style="width: 128px"></el-input-number>
+                <el-input-number :controls="false" :step="0" v-model="modalData.intrastatConvFactor"
+                                 style="width: 128px"></el-input-number>
                 <el-input v-model="modalData.umDesc" disabled style="width: 327px"></el-input>
               </el-form-item>
               <el-form-item>
                 <span style="cursor: pointer" slot="label" @click="getBaseList(129)"><a herf="#">海关统计序号 / Customs Stat No</a></span>
-                <el-input v-model="modalData.customsStatNo" @change="customsStatNoBlur(129)" style="width: 128px"></el-input>
+                <el-input v-model="modalData.customsStatNo" @change="customsStatNoBlur(129)"
+                          style="width: 128px"></el-input>
                 <el-input v-model="modalData.customsStatDesc" disabled style="width: 327px"></el-input>
               </el-form-item>
             </el-form>
             <el-form :inline="true" label-position="top" :model="modalData" :rules="rules">
               <el-form-item label="备注" style="height: 80px">
-                <el-input type="textarea" v-model="modalData.remark" :rows="3" resize='none' show-word-limit style="width: 931px"></el-input>
+                <el-input type="textarea" v-model="modalData.remark" :rows="3" resize='none' show-word-limit
+                          style="width: 931px"></el-input>
               </el-form-item>
             </el-form>
           </el-tab-pane>
@@ -327,7 +372,8 @@
                 </el-select>
               </el-form-item>
               <el-form-item label="估计物料成本 / Estimated Material Cost">
-                <el-input-number :controls="false" :step="0" v-model="modalData.estimatedMaterialCost" style="width: 220px"></el-input-number>
+                <el-input-number :controls="false" :step="0" v-model="modalData.estimatedMaterialCost"
+                                 style="width: 220px"></el-input-number>
               </el-form-item>
             </el-form>
             <el-table
@@ -347,8 +393,9 @@
                 :min-width="item.columnWidth"
                 :label="item.columnLabel">
                 <template slot-scope="scope">
-                  <span v-if="!item.columnHidden">{{scope.row[item.columnProp]}}</span>
-                  <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+                  <span v-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span>
+                  <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
+                                                     style="width: 100px; height: 80px"/></span>
                 </template>
               </el-table-column>
             </el-table>
@@ -366,7 +413,8 @@
               </el-form-item>
               <el-form-item>
                 <span style="cursor: pointer" slot="label" @click="getBaseList(131)"><a herf="#">零件成本组 / Part Cost Group</a></span>
-                <el-input v-model="modalData.partCostGroupId" @change="partCostGroupIdBlur(131)" style="width: 128px"></el-input>
+                <el-input v-model="modalData.partCostGroupId" @change="partCostGroupIdBlur(131)"
+                          style="width: 128px"></el-input>
                 <el-input v-model="modalData.partCostGroupDesc" disabled style="width: 327px"></el-input>
               </el-form-item>
             </el-form>
@@ -565,7 +613,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 +641,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>
@@ -670,7 +718,7 @@
       </el-form>
       <el-footer style="height:35px;margin-top: 20px;text-align:center">
         <el-button v-if="modalData.flag === '3'" type="primary" :loading="saveLoading" @click="saveData">同步</el-button>
-        <el-button v-if="modalData.flag === '1' || modalData.flag === '2'" type="primary" :loading="saveLoading" @click="saveData">保存</el-button>
+        <el-link v-if="isAuth('104001001:update')" style="cursor: pointer" @click="updateModal(scope.row)">编辑</el-link>
         <el-button type="primary" @click="modalFlag = false" :loading="saveLoading">关闭</el-button>
       </el-footer>
     </el-dialog>

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: '操作成功',

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>

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"

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: [