From 157a8265858e92a987875c628e232a1651fca999 Mon Sep 17 00:00:00 2001
From: jjLv <1981429112@qq.com>
Date: Thu, 22 Aug 2024 16:37:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E6=B5=8B=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/base/bracelet/index.vue             | 19 ++++++++----
 src/views/base/device/index.vue               |  6 ++--
 src/views/base/project/index.vue              |  2 +-
 .../constructionRecord/index.vue              |  8 ++---
 src/views/construction/sideband/index.vue     | 30 +++++++++++--------
 5 files changed, 39 insertions(+), 26 deletions(-)

diff --git a/src/views/base/bracelet/index.vue b/src/views/base/bracelet/index.vue
index 0f0d294..039b23d 100644
--- a/src/views/base/bracelet/index.vue
+++ b/src/views/base/bracelet/index.vue
@@ -331,7 +331,7 @@
             >查看</el-button>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <el-table-column label="操作" align="center" width="140px" class-name="small-padding fixed-width">
           <template slot-scope="scope">
             <el-button
               size="mini"
@@ -665,7 +665,7 @@
         <el-table-column label="手环编码" align="center" prop="shCode" />
       </el-table>
       <div slot="footer" class="dialog-footer">
-        <el-button
+        <el-button 
             type="primary"
             plain
             icon="el-icon-plus"
@@ -692,19 +692,19 @@
           <el-row :gutter="24">
             <el-col :span="12">
                     <el-form-item label="手环箱名称" prop="shboxName">
-                        <el-input v-model="formTwo.shboxName" placeholder="请输入手环箱名称" />
+                        <el-input v-model="formTwo.shboxName" placeholder="请输入手环箱名称" maxlength="20"/>
                       </el-form-item>
                     </el-col>
                     <el-col :span="12">
                       <el-form-item label="手环箱编码" prop="shboxCode">
-                        <el-input v-model="formTwo.shboxCode" placeholder="请输入手环箱编码" />
+                        <el-input v-model="formTwo.shboxCode" placeholder="请输入手环箱编码" maxlength="20"/>
                       </el-form-item>
                     </el-col>
           </el-row>
           <el-row :gutter="24">
                     <el-col :span="14">
                     <el-form-item label="手环箱容量" prop="shboxCapacity">
-                        <el-input v-model.number="formTwo.shboxCapacity" placeholder="请输入手环箱容量" >
+                        <el-input v-model.number="formTwo.shboxCapacity" placeholder="请输入手环箱容量" maxlength="10">
                         <template slot="append">个</template>
                       </el-input>
                     </el-form-item>      
@@ -1382,6 +1382,7 @@
               return delSh(param);
             }).then(() => {
               this.getboxList();
+              this.getBoxInfo();
               this.getListBoxall();
               this.$modal.msgSuccess("解除绑定成功");
               this.BindNum = this.BindNum - 1;
@@ -1538,6 +1539,14 @@
               shboxId:this.shboxbindId,
               shIds:shIds,
             }
+            if(this.addNums==0){
+              this.$modal.msgError("手环箱容量为0，不可绑定");
+              return;
+            }
+            if(this.numers==this.addNums){
+              this.$modal.msgError("请至少选择一个要绑定的手环");
+              return;
+            }
             this.$modal.confirm('确定与该手环箱绑定吗？').then(function() {
               return bindSh(param);
             }).then(() => {
diff --git a/src/views/base/device/index.vue b/src/views/base/device/index.vue
index 25747bf..452272f 100644
--- a/src/views/base/device/index.vue
+++ b/src/views/base/device/index.vue
@@ -107,7 +107,7 @@
               <div v-if="scope.row.deviceStatus==1" style="color: red;">{{ dict.type.sys_device_status[Number(scope.row.deviceStatus)].label }}</div>
           </template>
         </el-table-column>
-        <el-table-column label="领用人" align="center" prop="lyName" />
+        <el-table-column label="设备使用人" align="center" prop="lyName" />
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template slot-scope="scope">
             <el-button
@@ -235,7 +235,7 @@
             >查看</el-button>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <el-table-column label="操作" align="center" width="140px" class-name="small-padding fixed-width">
           <template slot-scope="scope">
             <el-button
               size="mini"
@@ -891,7 +891,7 @@
               deviceId:row.deviceId
             }
             if (row.lyName!=null && row.lyName!='') {
-              this.$alert('存在领用人，无法删除', '提示', {
+              this.$alert('存在使用人，无法删除', '提示', {
                 type: 'warning',
                 confirmButtonText: '确定',
               });
diff --git a/src/views/base/project/index.vue b/src/views/base/project/index.vue
index bf5497d..1011781 100644
--- a/src/views/base/project/index.vue
+++ b/src/views/base/project/index.vue
@@ -49,7 +49,7 @@
     </el-row>
 
     <el-table v-loading="loading" :data="projectList" ref="multipleTable" row-key="projectId" @selection-change="handleSelectionChange" @select="handlerSelect" @select-all="handlerSelectAll">
-      <el-table-column type="selection" width="55" align="center" />
+      <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <el-table-column label="序号" align="center" width="80" type="index" sortable>
         <template slot-scope="scope">
           <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
diff --git a/src/views/comprehensive/constructionRecord/index.vue b/src/views/comprehensive/constructionRecord/index.vue
index 9490a04..d5cad68 100644
--- a/src/views/comprehensive/constructionRecord/index.vue
+++ b/src/views/comprehensive/constructionRecord/index.vue
@@ -108,7 +108,7 @@
 
     <!-- 查看班组弹窗 -->
       <el-dialog :title="title" :visible.sync="showTeam" width="1000px" height="1000px" append-to-body>
-          <el-form :model="queryTeam" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+          <el-form :model="queryTeam" ref="queryFormTeam" size="small" :inline="true" v-show="showSearch" label-width="68px">
         <el-form-item label="姓名" prop="name">
           <el-input
             v-model="queryTeam.name"
@@ -175,7 +175,7 @@
 
           <!-- 查看临时弹窗 -->
           <el-dialog :title="title" :visible.sync="showTeamTemp" width="1000px" height="1000px" append-to-body>
-          <el-form :model="queryTeamTemp" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+          <el-form :model="queryTeamTemp" ref="queryFormTeamTemp" size="small" :inline="true" v-show="showSearch" label-width="68px">
         <el-form-item label="姓名" prop="name">
           <el-input
             v-model="queryTeamTemp.name"
@@ -535,13 +535,13 @@ export default {
 
     /** 查看班组人员重置按钮操作 */
     resetQueryTeam() {
-      this.resetForm("queryForm");
+      this.resetForm("queryFormTeam");
       this.handleQueryTeam();
     },
 
     /** 查看临时人员重置按钮操作 */
     resetQueryTeamTemp() {
-      this.resetForm("queryForm");
+      this.resetForm("queryFormTeamTemp");
       this.handleQueryTeamTemp();
     },
  
diff --git a/src/views/construction/sideband/index.vue b/src/views/construction/sideband/index.vue
index 66e220f..2d5858c 100644
--- a/src/views/construction/sideband/index.vue
+++ b/src/views/construction/sideband/index.vue
@@ -118,7 +118,7 @@
       
       <!-- 杆塔弹窗 -->
       <el-dialog :title="title" :visible.sync="showGt" width="1000px" height="1000px" append-to-body>
-          <el-form :model="queryKeyword" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+          <el-form :model="queryKeyword" ref="queryFormOne" size="small" :inline="true" v-show="showSearch" label-width="68px">
         <el-form-item  prop="keyword">
           <el-input
             v-model="queryKeyword.keyword"
@@ -149,17 +149,17 @@
 
       <el-table v-loading="loadingTwo" :data="bindList" width="600px" height = "600px" >
         <el-table-column label="设备id" align="center" prop="deviceId" v-if="false" />
-        <el-table-column label="设备类型" align="center" prop="deviceTypeName" >
+        <el-table-column label="设备类型" align="center" prop="deviceTypeName" sortable>
         </el-table-column>
-        <el-table-column label="设备名称" align="center" prop="deviceName" />
-        <el-table-column label="设备编号" align="center" prop="deviceCode" />
-        <el-table-column label="设备状态" align="center" prop="deviceStatus" >
+        <el-table-column label="设备名称" align="center" prop="deviceName" sortable/>
+        <el-table-column label="设备编号" align="center" prop="deviceCode" sortable/>
+        <el-table-column label="设备状态" align="center" prop="deviceStatus" sortable>
         <template slot-scope="scope">
                 <div v-if="scope.row.deviceStatus==0" style="color: green;">{{ stateList[Number(scope.row.deviceStatus)] }}</div>
                 <div v-if="scope.row.deviceStatus==1" style="color: red;">{{ stateList[Number(scope.row.deviceStatus)] }}</div>
             </template>
           </el-table-column>
-        <el-table-column label="领用人" align="center" prop="lyName" />
+        <el-table-column label="领用人" align="center" prop="lyName" sortable/>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template slot-scope="scope">
             <el-button
@@ -185,7 +185,7 @@
 
       <!-- 选择设备弹窗 -->
       <el-dialog :title="title" :visible.sync="showDevice" width="1000px" height="1000px" append-to-body>
-          <el-form :model="queryKeywordTemp" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+          <el-form :model="queryKeywordTemp" ref="queryFormTwo" size="small" :inline="true" v-show="showSearch" label-width="68px">
         <el-form-item  prop="keyword">
           <el-input
             v-model="queryKeywordTemp.keyword"
@@ -211,7 +211,7 @@
         <right-toolbar :showSearch.sync="showSearch" @queryTable="getListDevice"></right-toolbar>
       </el-row> -->
 
-      <el-table v-loading="loadingThree" :data="bindNoList" width="600px" height = "600px" @selection-change="handleSelectionChange">
+      <el-table v-loading="loadingThree" :data="bindNoList" width="600px" height = "600px" class="order" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="设备id" align="center" prop="deviceId" v-if="false" />
         <el-table-column label="设备类型" align="center" prop="deviceTypeName" >
@@ -236,13 +236,13 @@
           <el-row :gutter="24">
                 <el-col :span="12">
                     <el-form-item label="边带名称" prop="sidebandName">
-                        <el-input v-model="form.sidebandName" placeholder="请输入边带名称" />
+                        <el-input v-model="form.sidebandName" placeholder="请输入边带名称" maxlength="20"/>
                     </el-form-item>
                 </el-col>
 
                 <el-col :span="12">
                     <el-form-item label="边带编码" prop="sidebandCode">
-                        <el-input v-model="form.sidebandCode" placeholder="请选择边带编码" />
+                        <el-input v-model="form.sidebandCode" placeholder="请选择边带编码" maxlength="20"/>
                     </el-form-item>
                 </el-col>
           </el-row>
@@ -274,7 +274,7 @@
         </el-row>
         <el-col :span="24">
                     <el-form-item label="备注" prop="remarks">
-                        <el-input v-model="form.remarks" type="textarea" placeholder="请输入备注" />
+                        <el-input v-model="form.remarks" type="textarea" placeholder="请输入备注" maxlength="100"/>
                     </el-form-item>
                 </el-col>
         </el-form>
@@ -528,6 +528,7 @@
         handleAddDevice() {
             this.showDevice = true;
             this.title = "选择";
+            this.idLists = [];
             this.getListDevice();
         },
 
@@ -586,8 +587,7 @@
         },
 
         /** 绑定操作 */
-         handleBindDevice(row) {
-            console.log(row)
+         handleBindDevice() {
             console.log(this.idLists)
             const deviceIds =  this.idLists;
             console.log(deviceIds)
@@ -607,6 +607,7 @@
               this.getListTemp();
               this.getListDevice();
               this.$modal.msgSuccess("绑定成功");
+              this.idLists = [];
             }).catch(() => {});
         },
 
@@ -708,6 +709,9 @@
   </script>
 
   <style lang="scss" scoped>
+  ::v-deep.order .el-table__header-wrapper .el-checkbox {
+    display: none;
+  }
   ::v-deep.el-table .fixed-width .el-button--mini {
       width: 60px !important;
       margin-bottom: 10px;