From 0cfa26d66b9d3b5916a09a92fc110e235ea928ad Mon Sep 17 00:00:00 2001
From: cxw <1056036578@qq.com>
Date: Fri, 6 Jan 2023 10:52:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/reagent/applymanagement/index.vue | 25 +++++++++--------
 src/views/reagent/createapply/index.vue     | 30 ++++++++++++++-------
 src/views/reagent/warehousing/index.vue     |  2 +-
 3 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/src/views/reagent/applymanagement/index.vue b/src/views/reagent/applymanagement/index.vue
index 08a8843..1686042 100644
--- a/src/views/reagent/applymanagement/index.vue
+++ b/src/views/reagent/applymanagement/index.vue
@@ -10,7 +10,7 @@
           :value="item.client_id"
         />
       </el-select> -->
-      <el-button type="primary" plain @click="handleCheck"><i class="el-icon-edit" />详情查看</el-button>
+      <!-- <el-button type="primary" plain @click="handleCheck"><i class="el-icon-edit" />详情查看</el-button> -->
       <div class="header-right">
         <el-button icon="el-icon-refresh" circle @click="handleRefresh" />
       </div>
@@ -27,7 +27,6 @@
       <el-table-column align="center" type="index" width="50" label="序号" />
       <el-table-column prop="user_name" show-overflow-tooltip label="用户名称" align="center" />
       <el-table-column prop="user_name_pt" show-overflow-tooltip label="陪同用户名称" align="center" />
-      <el-table-column prop="use_content" show-overflow-tooltip label="试剂详情" align="center" />
       <el-table-column prop="create_date" show-overflow-tooltip label="申请时间" align="center" />
 
 
@@ -44,8 +43,10 @@
       <el-table-column
         fixed="right"
         label="操作"
+        align="center"
         width="100">
         <template slot-scope="scope">
+          <el-button @click="handleCheck(scope.row)" type="text" size="small">查看</el-button>
           <el-button @click="handleClick(scope.row)" type="text" size="small">审批</el-button>
         </template>
       </el-table-column>
@@ -110,7 +111,6 @@
             <el-table-column align="center" property="name" label="试剂名称" />
             <el-table-column align="center" property="purity" label="纯度" />
             <el-table-column align="center" property="speci" label="规格" />
-            <el-table-column align="center" property="num" label="数量" />
           </el-table>
         </el-scrollbar>
       </div>
@@ -217,14 +217,16 @@ export default {
       this.get_apply()
     },
     // 查看 录入信息
-    handleCheck() {
-      if (this.handleSelectionSelection.length === 1) {
-        this.dialogHistoryVisible = true
-        this.historyData = JSON.parse(this.handleSelectionSelection[0].use_content) 
-        console.log(this.handleSelectionSelection[0].use_content,'111')
-      } else {
-        this.$message.warning("选择一条记录操作！")
-      }
+    handleCheck(row) {
+      this.dialogHistoryVisible = true
+      this.historyData = JSON.parse(row.use_content) 
+      // if (this.handleSelectionSelection.length === 1) {
+      //   this.dialogHistoryVisible = true
+      //   this.historyData = JSON.parse(this.handleSelectionSelection[0].use_content) 
+      //   console.log(this.handleSelectionSelection[0].use_content,'111')
+      // } else {
+      //   this.$message.warning("选择一条记录操作！")
+      // }
     },
     dialogHistoryClose() {
       this.dialogHistoryVisible = false
@@ -261,6 +263,7 @@ export default {
 
     .header-right {
       float: right;
+      margin-bottom: 1rem;
     }
   }
 }
diff --git a/src/views/reagent/createapply/index.vue b/src/views/reagent/createapply/index.vue
index def64a7..2ccdbd9 100644
--- a/src/views/reagent/createapply/index.vue
+++ b/src/views/reagent/createapply/index.vue
@@ -3,7 +3,7 @@
     <div class="title">创建申请</div>
     <div class="header">
       <el-button type="primary" plain @click="openDialogTableVisible"><i class="el-icon-edit" />申请</el-button>
-      <el-button type="primary" plain @click="handleCheck"><i class="el-icon-edit" />详情查看</el-button>
+      <!-- <el-button type="primary" plain @click="handleCheck"><i class="el-icon-edit" />详情查看</el-button> -->
 
       <el-dialog :close-on-click-modal="false" :visible.sync="dialogHistoryVisible" width="60%" title="申请详情">
         <div class="box">
@@ -20,7 +20,6 @@
               <el-table-column align="center" property="name" label="试剂名称" />
               <el-table-column align="center" property="purity" label="纯度" />
               <el-table-column align="center" property="speci" label="规格" />
-              <el-table-column align="center" property="num" label="数量" />
             </el-table>
           </el-scrollbar>
         </div>
@@ -108,7 +107,7 @@
       <el-table-column align="center" type="index" width="50" label="序号" />
       <el-table-column prop="user_name" show-overflow-tooltip label="用户名称" align="center" />
       <el-table-column prop="user_name_pt" show-overflow-tooltip label="陪同用户名称" align="center" />
-      <el-table-column prop="use_content" show-overflow-tooltip label="试剂详情" align="center" />
+      <!-- <el-table-column prop="use_content" show-overflow-tooltip label="试剂详情" align="center" /> -->
       <el-table-column prop="create_date" show-overflow-tooltip label="申请时间" align="center" />
       <el-table-column prop="is_solve" show-overflow-tooltip label="状态" align="center">
         <template slot-scope="scope">
@@ -119,6 +118,15 @@
       <el-table-column prop="solve_user_pt_name" show-overflow-tooltip label="审批人2" align="center" />
       <el-table-column prop="solve_date" show-overflow-tooltip label="审批时间" align="center" />
       <el-table-column prop="information" show-overflow-tooltip label="备注" align="center" />
+      <el-table-column
+        fixed="right"
+        label="操作"
+        align="center"
+        width="100">
+        <template slot-scope="scope">
+          <el-button @click="handleCheck(scope.row)" type="text" size="small">查看</el-button>
+        </template>
+      </el-table-column>
     </el-table>
     <div class="my-pagination" style="text-align: center">
       <el-pagination
@@ -197,13 +205,15 @@ export default {
       that.handleSelectionSelection =selection
     },
     // 查看详情
-    handleCheck() {
-      if (this.handleSelectionSelection.length === 1) {
-        this.dialogHistoryVisible = true
-        this.historyData = JSON.parse(this.handleSelectionSelection[0].use_content) 
-      } else {
-        this.$message.warning("选择一条记录操作！")
-      }
+    handleCheck(row) {
+      this.dialogHistoryVisible = true
+      this.historyData = JSON.parse(row.use_content) 
+      // if (this.handleSelectionSelection.length === 1) {
+      //   this.dialogHistoryVisible = true
+      //   this.historyData = JSON.parse(this.handleSelectionSelection[0].use_content) 
+      // } else {
+      //   this.$message.warning("选择一条记录操作！")
+      // }
     },
     //查看详情关闭
     dialogHistoryClose() {
diff --git a/src/views/reagent/warehousing/index.vue b/src/views/reagent/warehousing/index.vue
index 76ee549..35254f2 100644
--- a/src/views/reagent/warehousing/index.vue
+++ b/src/views/reagent/warehousing/index.vue
@@ -120,7 +120,7 @@
           label="操作"
         >
           <template slot-scope="scope">
-            <el-button type="primary" @click="handleReagentClick(scope.row)">操作</el-button>
+            <el-button type="primary" @click="handleReagentClick(scope.row)">编辑</el-button>
           </template>
         </el-table-column>
       </el-table>