From c7b28c9bdc711f1258fcedfc517f12304532021a Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Wed, 15 Jan 2025 16:18:25 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=B7=A5=E5=BA=8F=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/baseProcessInfo/index.vue | 36 ++++++++++++-------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/views/mes/baseProcessInfo/index.vue b/src/views/mes/baseProcessInfo/index.vue
index 98cc3b4..98bc257 100644
--- a/src/views/mes/baseProcessInfo/index.vue
+++ b/src/views/mes/baseProcessInfo/index.vue
@@ -58,7 +58,7 @@
           </template>
         </el-table-column>
         <el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[7].visible">
-          <template #default="scope">1111
+          <template #default="scope">
             <dict-tag :options="active_flag" :value="scope.row.activeFlag"/>
           </template>
         </el-table-column>
@@ -78,27 +78,27 @@
         </el-table-column>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
-<!--            <el-tooltip content="修改" placement="top">
-              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['mes:baseProcessInfo:edit']"></el-button>
-            </el-tooltip>
-            <el-tooltip content="删除" placement="top">
-              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['mes:baseProcessInfo:remove']"></el-button>
-            </el-tooltip>-->
+            <el-row :gutter="10" class="mb8">
+              <el-col :span="12">
             <el-button
               size="small"
               type="text"
-              icon="el-icon-circle-plus"
+              icon="circle-plus"
               @click="handleProdLineUpdate(scope.row)"
             >关联产线
             </el-button>
+              </el-col>
+              <el-col :span="12">
             <el-button
               size="small"
               type="text"
-              icon="el-icon-s-check"
+              icon="check"
               v-if="scope.row.processType !== '3'"
               @click="handleUserUpdate(scope.row)"
             >关联人员
             </el-button>
+              </el-col>
+            </el-row>
           </template>
         </el-table-column>
       </el-table>
@@ -176,11 +176,11 @@
         </el-row>
         <el-divider content-position="center">工序关联产线信息</el-divider>
         <el-row :gutter="10" class="mb8">
-          <el-col :span="12">
-            <el-button type="primary" icon="el-icon-plus" size="small" @click="handleAddProdLine">添加产线</el-button>
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAddProdLine">添加产线</el-button>
           </el-col>
-          <el-col :span="12">
-            <el-button type="danger" icon="el-icon-delete" size="small" @click="handleDeleteProdLine">删除</el-button>
+          <el-col :span="1.5">
+            <el-button type="danger" icon="Delete" @click="handleDeleteProdLine">删除</el-button>
           </el-col>
         </el-row>
         <el-table :data="prodBaseProcessProdlineBoList" :row-class-name="rowProdBaseProcessProdlineIndex"
@@ -227,18 +227,18 @@
         </el-row>
         <el-divider content-position="center">工序关联人员信息</el-divider>
         <el-row :gutter="10" class="mb8">
-          <el-col :span="12">
-            <el-button type="primary" icon="el-icon-plus" size="small" @click="handleAddUser">添加人员</el-button>
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAddUser">添加人员</el-button>
           </el-col>
-          <el-col :span="12">
-            <el-button type="danger" icon="el-icon-delete" size="small" @click="handleDeleteUser">删除</el-button>
+          <el-col :span="1.5">
+            <el-button type="danger" icon="Delete" @click="handleDeleteUser">删除</el-button>
           </el-col>
         </el-row>
         <el-table :data="prodBaseProcessUserBoList" :row-class-name="rowProdBaseProcessUserIndex"
                   @selection-change="handleUserSelectionChange">
           <el-table-column type="selection" width="50" align="center" />
           <el-table-column label="序号" align="center" prop="index" />
-          <el-table-column label="name" align="center" prop="userName" />
+          <el-table-column label="name" align="center" prop="userName" v-if="false"/>
           <el-table-column label="关联人员" align="center" prop="userId">
             <template #default="scope">
               <el-select v-model="scope.row.userId" filterable placeholder="请选择关联人员" clearable @change="handleSelectUser(scope.row)">