From 360f2fc5cc672d5ce0f893c740fdf1ce97f93343 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Wed, 8 May 2024 17:26:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9D=83=E9=99=90=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../claimAndRefund/return/returnExamine.vue   |  7 ++--
 .../views/claimAndRefund/return/returnIn.vue  | 35 +++++++++----------
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue b/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue
index 5e364680..b0434d61 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue
@@ -120,6 +120,7 @@
                     size="mini"
                     @click="handleExam"
                     :disabled="multiple"
+                    v-hasPermi="['auditing:batch']"
                     >批量审核</el-button
                 >
             </el-col>
@@ -286,12 +287,12 @@
                         type="text"
                         icon="el-icon-edit"
                         v-if="scope.row.applyStatus == '0'"
-                        v-hasPermi="['receive:examine:nbry-jjfgs']"
+                        v-hasPermi="['auditing']"
                         @click="handleUpdate(scope.row, 'update')"
                     >
                         审批
                     </el-button>
-                    <el-button
+                    <!-- <el-button
                         size="mini"
                         type="text"
                         icon="el-icon-edit"
@@ -300,7 +301,7 @@
                         @click="handleUpdate(scope.row, 'update')"
                     >
                         审批
-                    </el-button>
+                    </el-button> -->
                     <el-button
                         size="mini"
                         type="text"
diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnIn.vue b/sgzb-ui/src/views/claimAndRefund/return/returnIn.vue
index 1e416ec9..b1207905 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/returnIn.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnIn.vue
@@ -93,6 +93,7 @@
                     start-placeholder="开始日期"
                     end-placeholder="结束日期"
                     value-format="yyyy-MM-dd"
+                    style="width: 240px"
                 ></el-date-picker>
             </el-form-item>
 
@@ -141,7 +142,7 @@
             ></right-toolbar>
         </el-row>
 
-        <el-table v-loading="loading" :data="typeList">
+        <el-table v-loading="loading" :data="typeList" border>
             <el-table-column
                 label="序号"
                 align="center"
@@ -158,82 +159,78 @@
                 label="退料单号"
                 align="center"
                 prop="code"
-                :show-overflow-tooltip="true"
+                show-overflow-tooltip
             />
             <el-table-column
                 label="退料单位"
                 align="center"
                 prop="unitName"
-                :show-overflow-tooltip="true"
+                show-overflow-tooltip
             />
             <el-table-column
                 label="退料工程"
                 align="center"
                 prop="lotName"
-                :show-overflow-tooltip="true"
+                show-overflow-tooltip
             />
             <el-table-column
                 label="退料机具"
                 align="center"
                 prop="typeName"
-                :show-overflow-tooltip="true"
+                show-overflow-tooltip
             />
             <el-table-column
                 label="退料人员"
                 align="center"
                 prop="backPerson"
-                :show-overflow-tooltip="true"
+                show-overflow-tooltip
             />
             <el-table-column
                 label="联系电话"
                 align="center"
                 prop="phone"
-                :show-overflow-tooltip="true"
+                show-overflow-tooltip
             />
             <el-table-column
                 label="申请时间"
                 align="center"
                 prop="backTime"
-                :show-overflow-tooltip="true"
+                show-overflow-tooltip
             />
             <el-table-column
                 label="协议号"
                 align="center"
                 prop="agreementCode"
-                :show-overflow-tooltip="true"
+                show-overflow-tooltip
             />
             <el-table-column
                 label="退料状态"
                 align="center"
                 prop="taskName"
-                :show-overflow-tooltip="true"
+                show-overflow-tooltip
             ></el-table-column>
 
-            <el-table-column
-                label="操作"
-                align="center"
-                class-name="small-padding fixed-width"
-                width="250"
-            >
+            <el-table-column label="操作" align="center" width="160">
                 <template slot-scope="scope">
                     <el-button
                         size="mini"
-                        plain
+                        type="text"
                         icon="el-icon-zoom-in"
                         @click="handleSee(scope.row, 'see')"
                         >查看</el-button
                     >
                     <el-button
                         size="mini"
-                        type="warning"
+                        type="text"
                         @click="handleReturn(scope.row, 'see')"
+                        v-hasPermi="['return:btn']"
                         v-if="scope.row.taskStatus != '40'"
                     >
                         退料
                     </el-button>
                     <el-button
                         size="mini"
-                        type="primary"
+                        type="text"
                         @click="handlePrint(scope.row)"
                         >退料单</el-button
                     >