From 46761fae2982c8773ad05df40e1f440e7b026bfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=90=8D=E5=96=9C?= <liumingxiy@outlook.com>
Date: Thu, 5 Dec 2024 09:29:35 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=96=87=E5=AD=97=EF=BC=8C=E6=98=AF=E5=90=A6=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E6=98=AF=E5=90=A6=E6=9C=89=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/md/ROUTE/index.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/md/ROUTE/index.vue b/src/views/md/ROUTE/index.vue
index 91968e5..7ab6d6b 100644
--- a/src/views/md/ROUTE/index.vue
+++ b/src/views/md/ROUTE/index.vue
@@ -33,8 +33,8 @@
 <!--            @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
-      <el-form-item label="是否默认" prop="isDefault">
-        <el-select v-model="queryParams.isDefault" placeholder="请选择是否默认" clearable>
+      <el-form-item label="是否有效" prop="isDefault">
+        <el-select v-model="queryParams.isDefault" placeholder="请选择是否有效" clearable>
           <el-option
               v-for="dict in dict.type.yes_or_no"
               :key="dict.value"
@@ -106,7 +106,7 @@
       <el-table-column label="BOM名称" align="center" prop="bomName"/>
       <el-table-column label="BOM版本" align="center" prop="bomVersion"/>
 <!--      <el-table-column label="所属物料" align="center" prop="mdItemId"/>-->
-      <el-table-column label="是否默认" align="center" prop="isDefault">
+      <el-table-column label="是否有效" align="center" prop="isDefault">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.yes_or_no" :value="scope.row.isDefault"/>
         </template>
@@ -181,8 +181,8 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-form-item label="是否默认" prop="isDefault">
-          <el-select v-model="form.isDefault" placeholder="请选择是否默认">
+        <el-form-item label="是否有效" prop="isDefault">
+          <el-select v-model="form.isDefault" placeholder="请选择是否有效">
             <el-option
                 v-for="dict in dict.type.yes_or_no"
                 :key="dict.value"
@@ -320,7 +320,7 @@ export default {
           {required: true, message: "物料编码不能为空", trigger: "blur"}
         ],
         isDefault: [
-          {required: true, message: "是否默认不能为空", trigger: "change"}
+          {required: true, message: "是否有效不能为空", trigger: "change"}
         ],
       },
       nowChildItemIndex: null

From b381f39fc6c0366c8847543f293f272b548a8b13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=90=8D=E5=96=9C?= <liumingxiy@outlook.com>
Date: Thu, 5 Dec 2024 09:36:22 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E6=89=8B=E5=8A=A8=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/md/PLAN/index.vue | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/views/md/PLAN/index.vue b/src/views/md/PLAN/index.vue
index e73413f..e4c2e2e 100644
--- a/src/views/md/PLAN/index.vue
+++ b/src/views/md/PLAN/index.vue
@@ -73,16 +73,16 @@
         >一键清退无寿命物品
         </el-button>
       </el-col>
-<!--      <el-col :span="1.5">  调试-->
-<!--        <el-button-->
-<!--          type="primary"-->
-<!--          plain-->
-<!--          size="mini"-->
-<!--          @click="handleSynchronizationClick"-->
-<!--          v-hasPermi="['md:PLAN:add']"-->
-<!--        >同步小型刀具库数据-->
-<!--        </el-button>-->
-<!--      </el-col>-->
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          size="mini"
+          @click="handleSynchronizationClick"
+          v-hasPermi="['md:PLAN:add']"
+        >同步小型刀具库数据
+        </el-button>
+      </el-col>
       <!--      <el-col :span="1.5">-->
       <!--        <el-button-->
       <!--            type="success"-->