From 5d567762eab4665273561785e5b5e5eef80b31e0 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Thu, 18 Jul 2024 17:28:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E6=B5=8B=E9=A1=B9=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E7=BB=84=E5=8F=AF=E7=BC=96=E8=BE=91=E7=89=A9=E6=96=99=E7=BB=84?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/plan/order/index.vue                |  4 ++--
 .../checkTypeProject/MaterialGroupAdd.vue     | 24 ++++++++++++-------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/views/plan/order/index.vue b/src/views/plan/order/index.vue
index ba3a3f0e..00c1a803 100644
--- a/src/views/plan/order/index.vue
+++ b/src/views/plan/order/index.vue
@@ -116,14 +116,14 @@
         >导出
         </el-button>
       </el-col>
-      
+      <!--
       <el-col :span="1.5">
         <el-button type="primary" plain icon="el-icon-guide" size="mini"
         @click="handleAutoSplit"
         :disabled="single"
         v-hasPermi="['mes:pro:order:edit']">辅助排产
         </el-button>
-      </el-col>
+      </el-col>-->
 
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
diff --git a/src/views/quality/checkTypeProject/MaterialGroupAdd.vue b/src/views/quality/checkTypeProject/MaterialGroupAdd.vue
index c89a76ab..b88507f0 100644
--- a/src/views/quality/checkTypeProject/MaterialGroupAdd.vue
+++ b/src/views/quality/checkTypeProject/MaterialGroupAdd.vue
@@ -39,6 +39,14 @@
               @click="() => remove(node, data)">
               －
             </el-button>
+            <el-button
+              v-if="node.level == 1"
+              class="btn-tree"
+              icon="el-icon-edit"
+              type="text"
+              size="medium"
+              @click="handleUpdate(data)">
+            </el-button>
             <el-button
               v-if="node.level == 1"
               class="btn-tree"
@@ -64,10 +72,10 @@
         </el-row>
         <el-row >
           <el-col :span="16">
-            <el-form-item label="物料组" prop="groupName">
+            <el-form-item label="标准模板" prop="groupName">
               <el-select v-model="form.groupCode" filterable clearable placeholder="请选择物料组">
                 <el-option
-                  v-for="(item,index) in OriginalGroupList"
+                  v-for="(item,index) in standarList"
                   :key="index"
                   :label="item.groupName"
                   :value="item.groupCode">
@@ -98,6 +106,7 @@ import {
   delMaterialGroup,
   updateMaterialGroup,
   materialTreeSelect,
+  getMaterialGroup
 } from "@/api/quality/materialGroup";
 import {
   addMaterialGroupDetail,
@@ -133,7 +142,7 @@ export default {
       // 物料组表格数据
       materialGroupList: [],
       // 物料组原始数据
-      OriginalGroupList: [],
+      standarList: [],
       //当前点击的节点数据
       nodeData: {},
       // 弹出层标题
@@ -197,7 +206,7 @@ export default {
     /** 获取初始物料组 */
     getOriginalGroup() {
       getOriginalGroupList(this.queryParams).then((response) => {
-        this.OriginalGroupList = response.rows;
+        this.standarList = response.rows;
         //this.loading = false;
       });
     },
@@ -246,10 +255,9 @@ export default {
       this.title = "添加物料组";
     },
     /** 修改按钮操作 */
-    handleUpdate(row) {
+    handleUpdate(data) {
       this.reset();
-      const id = row.id || this.ids;
-      getMaterialGroup(id).then((response) => {
+      getMaterialGroup(data.id).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "修改物料组";
@@ -380,7 +388,7 @@ export default {
   padding-right: 8px;
 }
 .custom-tree-node .btn-tree {
-  margin: 0 8px;
+  margin: 0 0px;/**左边树按钮间距**/
   font-size: 20px;
   font: bolder;
 }