20240926

src/views/modules/fanuc/currency.vue

@@ -173,7 +173,6 @@
                   width="80"
                   label="操作">
                   <template slot-scope="scope">
-                    <!--                    <a type="text" size="small" @click="updateModal2(scope.row)">修改</a>-->
                     <a type="text" size="small" @click="deleteModal2(scope.row)">删除</a>
                   </template>
                 </el-table-column>
@@ -685,7 +684,7 @@ export default {
           serialNumber: '501004TableActivationDate',
           tableId: '501004Table',
           tableName: '启用日期',
-          columnWidth: 100,
+          columnWidth: 120,
           columnProp: 'activationDate',
           headerAlign: 'center',
           align: 'center',
@@ -703,7 +702,7 @@ export default {
           serialNumber: '501004TableCreateDate',
           tableId: '501004Table',
           tableName: '录入时间',
-          columnWidth: 120,
+          columnWidth: 160,
           columnProp: 'createDate',
           headerAlign: 'center',
           align: 'center',

src/views/modules/quote/detail/primary/quoteDetailRouting.vue

@@ -578,7 +578,6 @@ export default {
         alternativeNo: '',
         routingType: null,
       }
-      console.log(this.treeData.length)
       if (this.treeData.length === 0){
         this.$message.warning("未维护BOM结构")
         return;
@@ -652,6 +651,7 @@ export default {
         quoteId: this.quoteDetail.quoteId,
         quoteDetailId: this.quoteDetail.id,
         quoteDetailItemNo:this.quoteDetail.itemNo,
+        versionNo: this.quoteDetail.versionNo,
         site: row.site,
         partNo: row.partNo,
         buNo: row.buNo,

src/views/modules/quote/detail/quoteDetail.vue

@@ -911,6 +911,11 @@ export default {
       }).catch((error)=>{
         this.$message.error(error);
       })
+    },
+    handleClickTab(tab){
+      if (this.activeName === 'routing'){
+        this.$refs.routing.handleQueryQuoteDetailBomTree()
+      }
     }
   },
   watch:{
@@ -1018,12 +1023,12 @@ export default {
       </el-row>
     </el-form>
 
-    <el-tabs v-model="activeName" v-if="saveQuoteDetail.id">
+    <el-tabs v-model="activeName" v-if="saveQuoteDetail.id" @tab-click="handleClickTab">
       <el-tab-pane label="材料" name="bom">
         <quote-detail-bom v-if="saveVisible" v-model:quoteDetail="saveQuoteDetail"></quote-detail-bom>
       </el-tab-pane>
       <el-tab-pane label="工艺" name="routing">
-        <quote-detail-routing v-if="saveVisible" v-model:quoteDetail="saveQuoteDetail"></quote-detail-routing>
+        <quote-detail-routing ref="routing" v-if="saveVisible" v-model:quoteDetail="saveQuoteDetail"></quote-detail-routing>
       </el-tab-pane>
       <el-tab-pane label="工具" name="tool">
         <quote-detail-tool v-if="saveVisible" v-model:quoteDetail="saveQuoteDetail"></quote-detail-tool>