From ef18fbbfc8fceeb9a043f1c9d7f91cdbf1557be3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BD=90=E5=A4=A9=E5=A4=A7=E5=9C=A3?= <17615834396@163.com>
Date: Sat, 30 Mar 2024 15:09:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fuintAdmin/src/views/staff/list.vue | 86 ++++++++++++++++++++---------
 1 file changed, 60 insertions(+), 26 deletions(-)

diff --git a/fuintAdmin/src/views/staff/list.vue b/fuintAdmin/src/views/staff/list.vue
index fb5240ef4..afb9d21cb 100644
--- a/fuintAdmin/src/views/staff/list.vue
+++ b/fuintAdmin/src/views/staff/list.vue
@@ -117,13 +117,16 @@
               @click="binding(scope.row)"
 
             >一键绑定</el-button>
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-edit"
-              @click="nobinding(scope.row)"
 
-            >解绑</el-button>
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="nobinding(scope.row)"
+                v-if="scope.row.tagStatus == 1"
+              >解绑</el-button>
+
+
             <el-button
               size="mini"
               type="text"
@@ -316,29 +319,55 @@
     <el-dialog title="码牌列表" :visible.sync="openShow" width="800px" append-to-body>
 
       <div class="wrap-box">
+        <div  class="gang-box">
+          <div class="rw">
+            序号
+          </div>
+          <div class="rw">
+            厂商名称
+          </div>
+          <div class="rw">
+            二维码SN号
+          </div>
+          <div class="rw">
+            码牌SN号
+          </div>
+          <div class="rw">
+            操作
+          </div>
+        </div>
         <div class="gang-box" :class="{'oilid' :oilid == item.id }" v-for="(item,index) in arrList" :key="index">
-          <el-table-column label="厂商名称" align="center" width="110">
-            <template slot-scope="item">
-              <span>{{item.companyName}}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="二维码SN号" align="center" width="110">
-            <template slot-scope="item">
-              <span>{{item.tagCodeSn}}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="码牌SN号" align="center" width="110">
-            <template slot-scope="item">
-              <span>{{item.snCode}}</span>
-            </template>
-          </el-table-column>
-<!--          <div>
+<!--          <el-table-column label="厂商名称" align="center" width="110">-->
+<!--            <template slot-scope="item">-->
+<!--              <span>{{item.companyName || ''}}</span>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+<!--          <el-table-column label="二维码SN号" align="center" width="110">-->
+<!--            <template slot-scope="item">-->
+<!--              <span>{{item.tagCodeSn|| ''}}</span>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+<!--          <el-table-column label="码牌SN号" align="center" width="110">-->
+<!--            <template slot-scope="item">-->
+<!--              <span>{{item.snCode|| ''}}</span>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+          <div class="rw">
+            {{index+1}}
+          </div>
+          <div class="rw">
             {{item.companyName}}
-          </div>-->
-          <div style="color: #00afff;cursor: pointer;margin-right: 15px" v-if="oilid != item.id" @click="getoil(item.id)">
+          </div>
+          <div class="rw">
+            {{item.tagCodeSn}}
+          </div>
+          <div class="rw">
+            {{item.snCode}}
+          </div>
+          <div style="width: 25%; text-align: center; color: #00afff;cursor: pointer;" v-if="oilid != item.id" @click="getoil(item.id)">
             选择
           </div>
-          <div style="color: #adadad;cursor: pointer;margin-right: 15px" v-if="oilid == item.id">
+          <div style="width: 25%; text-align: center; color: #adadad;cursor: pointer;" v-if="oilid == item.id">
             已选择
           </div>
         </div>
@@ -529,7 +558,7 @@ export default {
   },
   created() {
     this.getList();
-    this.gettagCodeRecord()
+    //
     // this.getDuty();
     // this.getStoreList();
   },
@@ -537,6 +566,7 @@ export default {
     binding(row){
       this.staffId = row.id
       this.openShow = true
+      this.gettagCodeRecord()
     },
     nobinding(row){
       let data = {
@@ -907,5 +937,9 @@ export default {
   .oilid{
     background: #f6f8f9 !important;
   }
+  .rw{
+    width: 25%;
+    text-align: center;
+  }
 </style>