From db86f585c05f2c1ec4976dd4963468c599e76837 Mon Sep 17 00:00:00 2001
From: zhouzy062 <zhouzy062@tydic.com>
Date: Fri, 12 Jan 2024 10:07:35 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=EF=BC=8C=E9=80=80=E6=96=99?=
 =?UTF-8?q?=EF=BC=8C=E7=BB=B4=E4=BF=AE1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../claimAndRefund/receive/agreement.vue      | 16 +++--
 .../claimAndRefund/receive/receiveApply.vue   | 22 +++---
 .../receive/receiveApplyAdd.vue               | 20 ++++--
 .../claimAndRefund/receive/receiveExamine.vue |  4 ++
 .../claimAndRefund/receive/receiveManage.vue  | 70 +++++++++++++------
 .../receive/receiveManageAdd.vue              |  2 -
 .../claimAndRefund/return/returnApply.vue     | 45 ++++--------
 .../claimAndRefund/return/returnApplyAdd.vue  |  5 +-
 .../claimAndRefund/return/returnExamine.vue   | 49 +++++--------
 .../claimAndRefund/return/returnFinshed.vue   | 32 ++++-----
 sgzb-ui/src/views/login.vue                   |  2 +-
 .../views/repairTest/repair/dialogOneForm.vue |  2 +-
 .../repairTest/repair/dialogThreeForm.vue     | 33 ++++-----
 .../views/repairTest/repair/dialogTwoForm.vue | 61 ++++++++++------
 .../src/views/store/label/labelBinding.vue    | 11 +--
 .../views/store/label/labelBindingHistory.vue |  6 ++
 sgzb-ui/src/views/store/label/labelType.vue   | 10 ++-
 .../newBuy/newDevices/newDevicesAccept.vue    | 12 +++-
 .../newBuy/newDevices/newDevicesArrival.vue   |  8 ++-
 .../newBuy/newDevices/newDevicesCode.vue      |  8 ++-
 .../newBuy/newDevices/newDevicesList.vue      | 16 +++--
 .../newDevices/newDevicesWarehousing.vue      | 26 ++++---
 sgzb-ui/src/views/store/newBuy/plan.vue       | 12 +++-
 sgzb-ui/src/views/store/newBuy/planSecond.vue | 12 +++-
 .../src/views/store/shelves/shelvesList.vue   | 10 ++-
 sgzb-ui/src/views/store/tools/accessory.vue   | 10 ++-
 sgzb-ui/src/views/store/tools/devices.vue     | 14 ++--
 sgzb-ui/src/views/store/tools/keeper.vue      |  8 ++-
 sgzb-ui/src/views/store/tools/repair.vue      |  8 ++-
 sgzb-ui/src/views/store/tools/safeTools.vue   | 10 ++-
 .../src/views/store/tools/toolsSupplier.vue   | 10 ++-
 sgzb-ui/src/views/store/tools/toolsType.vue   | 27 ++++---
 .../warehousing/accessoryWarehousing.vue      |  8 ++-
 .../store/warehousing/devicesWarehousing.vue  |  8 ++-
 .../store/warehousing/repairWarehousing.vue   | 11 ++-
 sgzb-ui/vue.config.js                         |  8 +--
 36 files changed, 382 insertions(+), 234 deletions(-)

diff --git a/sgzb-ui/src/views/claimAndRefund/receive/agreement.vue b/sgzb-ui/src/views/claimAndRefund/receive/agreement.vue
index daf00e9e..9214d74f 100644
--- a/sgzb-ui/src/views/claimAndRefund/receive/agreement.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receive/agreement.vue
@@ -53,7 +53,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['store:labelType:add']"
+     
         >新建</el-button>
       </el-col>
 
@@ -105,21 +105,19 @@
       <el-table-column label="授权人" align="center" prop="authPerson" :show-overflow-tooltip="true" />
       <el-table-column label="联系电话 " align="center" prop="phone" :show-overflow-tooltip="true" />
       <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button 
               size="mini"
-              type="text"
+              type="primary" 
               icon="el-icon-edit"
               @click="handleUpdate(scope.row)"
-              v-hasPermi="['store:labelType:edit']"
           >编辑</el-button>
           <el-button
             size="mini"
-            type="text"
+            type="danger" 
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['store:labelType:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
@@ -485,3 +483,9 @@ export default {
   }
 };
 </script>
+<style lang="scss" scoped>
+::v-deep.el-table .fixed-width .el-button--mini {
+  width: 60px !important;
+  margin-bottom: 10px;
+}
+</style>
\ No newline at end of file
diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveApply.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveApply.vue
index 262b392f..14d14d13 100644
--- a/sgzb-ui/src/views/claimAndRefund/receive/receiveApply.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveApply.vue
@@ -57,7 +57,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['store:labelType:add']"
+          
         >新建</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -83,7 +83,7 @@
     </el-row>
 
     <el-table v-loading="loading" :data="leaseAuditList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+      <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <el-table-column label="序号" align="center" type="index" />
       <el-table-column label="领料单号" align="center" prop="code" :show-overflow-tooltip="true" />
       <el-table-column label="领料单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
@@ -96,31 +96,29 @@
       <el-table-column label="任务状态" align="center" prop="taskName" :show-overflow-tooltip="true" />
       <el-table-column label="审批结果 " align="center" prop="examineStatus" :show-overflow-tooltip="true" />
       <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120px" fixed="right">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="250" fixed="right">
         <template slot-scope="scope">
           <el-button
             size="mini"
-            type="text"
-            icon="el-icon-edit"
+            icon="el-icon-zoom-in"
             @click="handleView(scope.row)"
           >查看</el-button>
           <el-button
             size="mini"
-            type="text"
+            type="primary" 
             icon="el-icon-edit"
             v-if="scope.row.taskStatus==30"
             @click="handleUpdate(scope.row)"
           >编辑</el-button>
           <el-button
             size="mini"
-            type="text"
-            icon="el-icon-edit"
+            type="info"
             v-if="scope.row.taskStatus==98 || scope.row.taskStatus==99 || scope.row.taskStatus==100"
             @click="handleUpdate(scope.row)"
           >驳回提交</el-button>
           <el-button
             size="mini"
-            type="text"
+            type="danger"
             icon="el-icon-delete"
             v-if="scope.row.taskStatus==30"
             @click="handleDelete(scope.row)"
@@ -425,3 +423,9 @@ export default {
   }
 };
 </script>
+<style lang="scss" scoped>
+::v-deep.el-table .fixed-width .el-button--mini {
+  width: 60px !important;
+  margin-bottom: 10px;
+}
+</style>
\ No newline at end of file
diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue
index a0740886..b5939ee2 100644
--- a/sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue
@@ -97,7 +97,6 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['system:role:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -403,7 +402,10 @@ export default {
         // proId:null,
         // agreementId:null, //协议id
         // agreementCode: null,
-
+      if(data.taskStatus==100){
+        this.queryParams.taskStatus = 32
+        this.queryParams.examineStatusId = '32'
+      }
       this.queryParams.unitId = data.unitId
       this.queryParams.proId = data.projectId
       this.queryParams.leaseApplyInfo.phone = data.leaseApplyInfoList[0].phone
@@ -553,27 +555,31 @@ export default {
               this.$message.error('请添加数据');
               return
             }
+            this.queryParams.leaseApplyDetails.forEach(item=>{
+              if(item.preNum==''){
+                this.$message.error('请填写预领数量');
+                return
+              }
+            })
             this.queryParams.createBy = this.user.userName
             this.queryParams.companyId = this.user.companyId
-
-
             let res;
             if(this.taskId){
               this.leaseApplyInfoList.forEach(v => {
                 v = Object.assign(v,this.queryParams.leaseApplyInfo)
                 this.$set(v,'leaseApplyDetails',this.queryParams.leaseApplyDetails)
               })
-
+              
               const params = {
                 ...this.queryParams,taskId:this.taskId,
                 leaseApplyInfoList:this.leaseApplyInfoList
               }
-
+             
               res = await editLeaseApply(params)
             }else {
+              // console.log(this.queryParams)
               res = await submitLeaseApply(this.queryParams)
             }
-
             if(res.code == 200){
               this.$message({
                 type:'success',
diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveExamine.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveExamine.vue
index baa60079..833a24dd 100644
--- a/sgzb-ui/src/views/claimAndRefund/receive/receiveExamine.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveExamine.vue
@@ -270,6 +270,10 @@ export default {
       this.refuseVisible = true
     },
     handelRefuse(type){
+      if (this.queryParams.companyAuditRemarks=='') {
+        this.$message.error('驳回时审核意见不能为空！');
+        return;
+      }
       if(type){
         this.refuseAuditLeaseByCompany()
       }else {
diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue
index e779828c..f2a64b66 100644
--- a/sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue
@@ -81,7 +81,7 @@
     </el-row>
 
     <el-table v-loading="loading" :data="leaseAuditList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+      <!-- <el-table-column type="selection" width="55" align="center" />wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww -->
       <el-table-column label="序号" align="center" type="index" />
       <el-table-column label="领料单号" align="center" prop="code" :show-overflow-tooltip="true" />
       <el-table-column label="领料单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
@@ -94,26 +94,40 @@
       <el-table-column label="任务状态" align="center" prop="taskName" :show-overflow-tooltip="true" />
 <!--      <el-table-column label="审批结果 " align="center" prop="dictName" :show-overflow-tooltip="true" />-->
       <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
-      <el-table-column label="操作" align="center" width="250" class-name="small-padding fixed-width" fixed="right">
+      <el-table-column label="操作" align="left" width="250" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="scope">
-
           <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-document-checked"
-            @click="handleExamine(scope.row)"
-            v-if="Number(scope.row.examineStatusId)<33&&Number(scope.row.examineStatusId)>29"
-          >审批</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-document-checked"
+            size="mini" 
+            icon="el-icon-zoom-in"
             @click="handleExamine(scope.row)"
           >查看</el-button>
           <el-button
             size="mini"
-            type="text"
-            icon="el-icon-document"
+            type="primary" 
+            icon="el-icon-edit"
+            @click="handleExamine(scope.row)"
+            v-hasPermi="['receive:examine:fgs']"
+            v-if="Number(scope.row.examineStatusId)==30"
+          >审批</el-button>
+          <el-button
+            size="mini"
+            type="primary" 
+            icon="el-icon-edit"
+            @click="handleExamine(scope.row)"
+            v-hasPermi="['receive:examine:fgy']"
+            v-if="Number(scope.row.examineStatusId)==31"
+          >审批</el-button>
+          <el-button
+            size="mini"
+            type="primary" 
+            icon="el-icon-edit"
+            @click="handleExamine(scope.row)"
+            v-hasPermi="['receive:examine:nbry']"
+            v-if="Number(scope.row.examineStatusId)==32"
+          >审批</el-button>
+          <el-button
+            size="mini"
+            type="info" 
             @click="openLld(scope.row)"
           >领料单</el-button>
         </template>
@@ -193,6 +207,7 @@
 <script>
 import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
 import { getLeaseAuditListAll, getUnitData, getProData, getTaskDetail } from '@/api/claimAndRefund/receive'
+import { getInfo } from '@/api/login'
 import vueEasyPrint from 'vue-easy-print';
 export default {
   name: "Dict",
@@ -232,7 +247,7 @@ export default {
         dictType: undefined,
         status: undefined
       },
-
+      user:{},
       unitList:[],
       proList: [],
       leaseAuditList:[],
@@ -267,18 +282,25 @@ export default {
     };
   },
   created() {
-    this.getList();
+    this.GetUserInfo()
+    // this.getList();
 
     this.GetUnitData()
     this.GetProData()
   },
   components:{vueEasyPrint},
   methods: {
-    /** 查询字典类型列表 */
+    // 获取用户信息
+    async GetUserInfo(){
+      const res = await getInfo()
+      this.user = res.user
+      this.user.roles.for
+      console.log(this.user)
+      this.getList();
+    },
+    /** 查询列表 */
     async getList() {
       this.loading = true;
-
-
       const params = {
         unitId:this.queryParams.unitId,
         projectId:this.queryParams.proId,
@@ -294,6 +316,10 @@ export default {
       this.loading = false;
       console.log('getList ============',res)
       this.leaseAuditList = res.data.rows;
+      this.leaseAuditList.forEach((item,index)=>{
+
+
+      })
       this.total = res.data.total;
     },
 
@@ -467,4 +493,8 @@ export default {
       justify-content: space-between;
     }
   }
+  ::v-deep.el-table .fixed-width .el-button--mini {
+    width: 60px !important;
+    margin-bottom: 10px;
+  }
 </style>
diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveManageAdd.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveManageAdd.vue
index 534874b1..af21a50b 100644
--- a/sgzb-ui/src/views/claimAndRefund/receive/receiveManageAdd.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveManageAdd.vue
@@ -90,7 +90,6 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['system:role:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -134,7 +133,6 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['system:role:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnApply.vue b/sgzb-ui/src/views/claimAndRefund/return/returnApply.vue
index 333b7e8c..7757a3a7 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/returnApply.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnApply.vue
@@ -121,7 +121,6 @@
           plain
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['store:labelType:add']"
           >退料申请</el-button
         >
       </el-col>
@@ -157,25 +156,22 @@
       :data="typeList"
       @selection-change="handleSelectionChange"
     >
-      <el-table-column type="selection" width="55" align="center" />
+      <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <el-table-column label="序号" sortable align="center" type="index" />
       <el-table-column
         label="退料单号"
         align="center"
-        prop="code"
-        sortable
+        prop="code" 
         :show-overflow-tooltip="true"
       />
       <el-table-column
         label="退料单位名称"
-        align="center"
-        sortable
+        align="center" 
         prop="unitName"
         :show-overflow-tooltip="true"
       />
       <el-table-column
-        label="退料工程名称"
-        sortable
+        label="退料工程名称" 
         align="center"
         prop="lotName"
         :show-overflow-tooltip="true"
@@ -183,43 +179,37 @@
       <el-table-column
         label="退料工机具类型"
         align="center"
-        prop="typeName"
-        sortable
+        prop="typeName" 
         :show-overflow-tooltip="true"
       />
       <el-table-column
         label="退料人员"
         align="center"
-        prop="backPerson"
-        sortable
+        prop="backPerson" 
         :show-overflow-tooltip="true"
       />
       <el-table-column
         label="退料人联系电话"
         align="center"
-        prop="phone"
-        sortable
+        prop="phone" 
         :show-overflow-tooltip="true"
       />
       <el-table-column
         label="退料申请时间"
         align="center"
-        prop="backTime"
-        sortable
+        prop="backTime" 
         :show-overflow-tooltip="true"
       />
       <el-table-column
         label="协议号"
         align="center"
-        prop="agreementCode"
-        sortable
+        prop="agreementCode" 
         :show-overflow-tooltip="true"
       />
       <el-table-column
         label="是否异常退料"
         align="center"
-        prop="dictName"
-        sortable
+        prop="dictName" 
         :show-overflow-tooltip="true"
       >
         <template slot-scope="scope">
@@ -231,8 +221,7 @@
       </el-table-column>
       <el-table-column
         label="退料状态"
-        align="center"
-        sortable
+        align="center" 
         :show-overflow-tooltip="true"
       >
         <template slot-scope="scope">
@@ -254,24 +243,21 @@
       <el-table-column
         label="不通过原因"
         align="center"
-        prop="dictName"
-        sortable
+        prop="dictName" 
         :show-overflow-tooltip="true"
       />
       <el-table-column
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
-        width="300"
+        width="250"
       >
         <template slot-scope="scope">
           <el-button
             size="mini"
-            type="primary"
             plain
             icon="el-icon-zoom-in"
             @click="handleSee(scope.row, 'see')"
-            v-hasPermi="['store:labelType:edit']"
             >查看</el-button
           >
           <!-- <el-button
@@ -288,14 +274,12 @@
             type="danger"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['store:labelType:remove']"
             >删除</el-button
           >
           <el-button
             size="mini"
             type="info"
             @click="handlePrint(scope.row)"
-            v-hasPermi="['store:labelType:remove']"
             >退料单</el-button
           >
         </template>
@@ -624,6 +608,7 @@ export default {
     };
   },
   created() {
+    // this.getList();
     this.initSelectData()
     this.InitIGetInfo()
   },
@@ -944,7 +929,7 @@ export default {
 }
 
 ::v-deep.el-table .fixed-width .el-button--mini {
-  width: 70px !important;
+  width: 60px !important;
   margin-bottom: 10px;
 }
 .dialog-footer {
diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnApplyAdd.vue b/sgzb-ui/src/views/claimAndRefund/return/returnApplyAdd.vue
index d55eba4f..46c6aeeb 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/returnApplyAdd.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnApplyAdd.vue
@@ -692,10 +692,7 @@ export default {
               message: '申请成功'
             })
             setTimeout(() => {
-              // this.$router.back()
-              
-
-
+              this.$router.back()
             }, 1000)
           }
         }
diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue b/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue
index 5fe40943..064def9c 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue
@@ -124,7 +124,6 @@
           size="mini"
           @click="handleExam"
           :disabled="!checkResultOne"
-          v-hasPermi="['store:labelType:add']"
           >批量审核</el-button
         >
       </el-col>
@@ -134,7 +133,6 @@
           plain
           size="mini"
           @click="handleSubmit()"
-          v-hasPermi="['store:labelType:add']"
           >批量提交</el-button
         >
       </el-col> -->
@@ -160,25 +158,22 @@
       :data="typeList"
       @selection-change="handleSelectionChange"
     >
-      <el-table-column type="selection" width="55" align="center" />
+      <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <el-table-column label="序号" sortable align="center" type="index" />
       <el-table-column
         label="退料单号"
         align="center"
-        prop="code"
-        sortable
+        prop="code" 
         :show-overflow-tooltip="true"
       />
       <el-table-column
         label="退料单位名称"
-        align="center"
-        sortable
+        align="center" 
         prop="unitName"
         :show-overflow-tooltip="true"
       />
       <el-table-column
-        label="退料工程名称"
-        sortable
+        label="退料工程名称" 
         align="center"
         prop="lotName"
         :show-overflow-tooltip="true"
@@ -186,43 +181,37 @@
       <el-table-column
         label="退料工机具类型"
         align="center"
-        prop="typeName"
-        sortable
+        prop="typeName" 
         :show-overflow-tooltip="true"
       />
       <el-table-column
         label="退料人员"
         align="center"
-        prop="backPerson"
-        sortable
+        prop="backPerson" 
         :show-overflow-tooltip="true"
       />
       <el-table-column
         label="退料人联系电话"
         align="center"
-        prop="phone"
-        sortable
+        prop="phone" 
         :show-overflow-tooltip="true"
       />
       <el-table-column
         label="退料申请时间"
         align="center"
-        prop="backTime"
-        sortable
+        prop="backTime" 
         :show-overflow-tooltip="true"
       />
       <el-table-column
         label="协议号"
         align="center"
-        prop="agreementCode"
-        sortable
+        prop="agreementCode" 
         :show-overflow-tooltip="true"
       />
       <el-table-column
         label="是否异常退料"
         align="center"
-        prop="dictName"
-        sortable
+        prop="dictName" 
         :show-overflow-tooltip="true"
       >
         <template slot-scope="scope">
@@ -234,8 +223,7 @@
       </el-table-column>
       <el-table-column
         label="退料状态"
-        align="center"
-        sortable
+        align="center" 
         :show-overflow-tooltip="true"
       >
         <template slot-scope="scope">
@@ -257,40 +245,35 @@
       <el-table-column
         label="不通过原因"
         align="center"
-        prop="dictName"
-        sortable
+        prop="dictName" 
         :show-overflow-tooltip="true"
       />
       <el-table-column
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
-        width="300"
+        width="250"
       >
         <template slot-scope="scope">
           <el-button
             size="mini"
-            type="primary"
             plain
             icon="el-icon-zoom-in"
             @click="handleSee(scope.row, 'see')"
-            v-hasPermi="['store:labelType:edit']"
             >查看</el-button
           >
           <el-button
             size="mini"
-            type="warning"
-            icon="el-icon-icon"
+            type="primary"
+            icon="el-icon-edit"
             :disabled="scope.row.taskStatus == '38'"
             @click="handleUpdate(scope.row, 'update')"
-            v-hasPermi="['store:labelType:remove']"
             >审核</el-button
           >
           <el-button
             size="mini"
             type="info"
             @click="handlePrint(scope.row)"
-            v-hasPermi="['store:labelType:remove']"
             >退料单</el-button
           >
         </template>
@@ -887,7 +870,7 @@ export default {
 }
 
 ::v-deep.el-table .fixed-width .el-button--mini {
-  width: 70px !important;
+  width: 60px !important;
   margin-bottom: 10px;
 }
 .dialog-footer {
diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnFinshed.vue b/sgzb-ui/src/views/claimAndRefund/return/returnFinshed.vue
index ef8746bf..3e9540d8 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/returnFinshed.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnFinshed.vue
@@ -93,8 +93,7 @@
           type="warning"
           plain
           size="mini"
-          @click="handleFinish"
-          v-hasPermi="['store:labelType:add']"
+          @click="handleFinish" 
           >完成退料</el-button
         >
       </el-col>
@@ -121,51 +120,51 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" sortable align="center" prop="dictId" />
+      <el-table-column label="序号"  align="center" prop="dictId" />
       <el-table-column
-        sortable
+        
         label="退料单号"
         align="center"
         prop="dictName"
         :show-overflow-tooltip="true"
       />
       <el-table-column
-        sortable
+        
         label="退料单位名称"
         align="center"
         prop="dictName"
         :show-overflow-tooltip="true"
       />
       <el-table-column
-        sortable
+        
         label="退料工程名称"
         align="center"
         prop="dictName"
         :show-overflow-tooltip="true"
       />
       <el-table-column
-        sortable
+        
         label="退料工机具类型"
         align="center"
         prop="dictName"
         :show-overflow-tooltip="true"
       />
       <el-table-column
-        sortable
+        
         label="退料人员"
         align="center"
         prop="dictName"
         :show-overflow-tooltip="true"
       />
       <el-table-column
-        sortable
+        
         label="退料人联系电话"
         align="center"
         prop="dictName"
         :show-overflow-tooltip="true"
       />
       <el-table-column
-        sortable
+        
         label="退料申请时间"
         align="center"
         prop="dictName"
@@ -175,11 +174,11 @@
         label="协议号"
         align="center"
         prop="dictName"
-        sortable
+        
         :show-overflow-tooltip="true"
       />
       <el-table-column
-        sortable
+        
         label="退料状态"
         align="center"
         prop="dictName"
@@ -197,14 +196,12 @@
             type="primary"
             icon="el-icon-zoom-in"
             @click="handleUpdate(scope.row, 'see')"
-            v-hasPermi="['store:labelType:edit']"
             >查看</el-button
           >
           <el-button
             size="mini"
             type="warning"
             @click="handleFinish(scope.row, 'see')"
-            v-hasPermi="['store:labelType:edit']"
             >完成退料</el-button
           >
           <el-button
@@ -212,7 +209,6 @@
             type="primary"
             icon="el-icon-document"
             @click="handleUpdateOrder(scope.row)"
-            v-hasPermi="['store:labelType:edit']"
             >退料单</el-button
           >
         </template>
@@ -292,7 +288,7 @@
         @selection-change="handleSelectionChange"
       >
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="序号" sortable align="center" prop="dictId" />
+        <el-table-column label="序号"  align="center" prop="dictId" />
         <el-table-column
           label="类型名称"
           align="center"
@@ -440,7 +436,7 @@ export default {
       openTextThree: '',
       isShowOneFlag: false,
       // 遮罩层
-      loading: true,
+      loading: false,
       // 选中数组
       ids: [],
       // 非单个禁用
@@ -481,7 +477,7 @@ export default {
     };
   },
   created() {
-    this.getList();
+    // this.getList();
   },
   methods: {
     /** 查询字典类型列表 */
diff --git a/sgzb-ui/src/views/login.vue b/sgzb-ui/src/views/login.vue
index cab09e29..a7e245c4 100644
--- a/sgzb-ui/src/views/login.vue
+++ b/sgzb-ui/src/views/login.vue
@@ -218,7 +218,7 @@ export default {
           }
         });
       } else {
-        this.$modal.msgError("手机号格式不正确");
+        this.$modal.msgError("请输入正确手机号");
       }
 
     },
diff --git a/sgzb-ui/src/views/repairTest/repair/dialogOneForm.vue b/sgzb-ui/src/views/repairTest/repair/dialogOneForm.vue
index 2f0cce22..80999fc9 100644
--- a/sgzb-ui/src/views/repairTest/repair/dialogOneForm.vue
+++ b/sgzb-ui/src/views/repairTest/repair/dialogOneForm.vue
@@ -155,7 +155,7 @@
               :prop="'premiumListTwo.' + index + '.repairNum'"
               label="维修数量："
               :rules="{
-                required: false,
+                required: true,
                 validator: numberIntegerValidator,
                 trigger: 'blur',
               }"
diff --git a/sgzb-ui/src/views/repairTest/repair/dialogThreeForm.vue b/sgzb-ui/src/views/repairTest/repair/dialogThreeForm.vue
index 4eee182e..bf8de89e 100644
--- a/sgzb-ui/src/views/repairTest/repair/dialogThreeForm.vue
+++ b/sgzb-ui/src/views/repairTest/repair/dialogThreeForm.vue
@@ -79,6 +79,22 @@
         <p class="form_box_title">数量管理设备</p>
         <div class="form_box_line"></div>
         <div class="form_box_item">
+          <el-form-item
+            label="报废数量："
+            prop="scrapNum"
+            :rules="{
+              required: true,
+              validator: numberIntegerValidator,
+              trigger: 'blur',
+            }"
+          >
+            <el-input
+              v-model="dynamicValidateFormTwo.scrapNum"
+              placeholder="请输入"
+              size="small"
+              style="width: 350px"
+            ></el-input>
+          </el-form-item>
           <el-form-item label="报废原因：">
             <el-input
               v-model="dynamicValidateFormTwo.scrapReason"
@@ -96,22 +112,7 @@
               <el-radio :label="0">自然</el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item
-            label="报废数量："
-            prop="scrapNum"
-            :rules="{
-              required: false,
-              validator: numberIntegerValidator,
-              trigger: 'blur',
-            }"
-          >
-            <el-input
-              v-model="dynamicValidateFormTwo.scrapNum"
-              placeholder="请输入"
-              size="small"
-              style="width: 350px"
-            ></el-input>
-          </el-form-item>
+         
           <el-form-item label="损坏照片：">
             <!-- <uploadImage
               style="width: 250px"
diff --git a/sgzb-ui/src/views/repairTest/repair/dialogTwoForm.vue b/sgzb-ui/src/views/repairTest/repair/dialogTwoForm.vue
index 82e55720..ecee6ec8 100644
--- a/sgzb-ui/src/views/repairTest/repair/dialogTwoForm.vue
+++ b/sgzb-ui/src/views/repairTest/repair/dialogTwoForm.vue
@@ -13,7 +13,7 @@
         ref="dynamicValidateForm"
         :model="dynamicValidateForm"
         class="demo-dynamic"
-        label-width="90px"
+        label-width="100px"
       >
         <div
           v-for="(domain, index) in dynamicValidateForm.premiumList"
@@ -53,6 +53,11 @@
               v-if="index == 0"
               :prop="'premiumListTwo.' + index + '.supplierId'"
               label="选择厂家："
+              :rules="{
+                message: '请选择厂家',
+                required: true,
+                trigger: 'blur',
+              }"
             >
               <el-select
                 v-model="domain.supplierId"
@@ -68,7 +73,7 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item
+            <!-- <el-form-item
               :prop="'premiumList.' + index + '.partPrice'"
               label="配件单价(元)："
               label-width="120px"
@@ -77,6 +82,11 @@
                 validator: meneyIntegerValidator,
                 trigger: 'blur',
               }"
+            > -->
+            <el-form-item
+              :prop="'premiumList.' + index + '.partPrice'"
+              label="配件单价(元)："
+              label-width="120px"
             >
               <el-input
                 v-model="domain.partPrice"
@@ -132,7 +142,7 @@
         ref="dynamicValidateFormTwo"
         :model="dynamicValidateFormTwo"
         class="demo-dynamic"
-        label-width="90px"
+        label-width="100px"
       >
         <div
           v-for="(domain, index) in dynamicValidateFormTwo.premiumListTwo"
@@ -148,6 +158,22 @@
                 trigger: 'blur',
               }"
               label="选择配件：" -->
+              <el-form-item
+              :prop="'premiumListTwo.' + index + '.repairNum'"
+              label="维修数量："
+              :rules="{
+                required: true,
+                validator: numberIntegerValidator,
+                trigger: 'blur',
+              }"
+            >
+              <el-input
+                v-model="domain.repairNum"
+                placeholder="请输入"
+                size="small"
+                style="width: 350px"
+              ></el-input>
+            </el-form-item>
             <el-form-item
               :prop="'premiumListTwo.' + index + '.partName'"
               label="配件名称："
@@ -172,6 +198,11 @@
               v-if="index == 0"
               :prop="'premiumListTwo.' + index + '.supplierId'"
               label="选择厂家："
+              :rules="{
+                message: '请选择厂家',
+                required: true,
+                trigger: 'blur',
+              }"
             >
               <el-select
                 v-model="domain.supplierId"
@@ -187,7 +218,7 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item
+            <!-- <el-form-item
               :prop="'premiumListTwo.' + index + '.partPrice'"
               label="配件单价(元)："
               label-width="120px"
@@ -196,6 +227,11 @@
                 validator: meneyIntegerValidator,
                 trigger: 'blur',
               }"
+            > -->
+            <el-form-item
+              :prop="'premiumListTwo.' + index + '.partPrice'"
+              label="配件单价(元)："
+              label-width="120px"
             >
               <el-input
                 v-model="domain.partPrice"
@@ -220,22 +256,7 @@
                 style="width: 350px"
               ></el-input>
             </el-form-item>
-            <el-form-item
-              :prop="'premiumListTwo.' + index + '.repairNum'"
-              label="维修数量："
-              :rules="{
-                required: false,
-                validator: numberIntegerValidator,
-                trigger: 'blur',
-              }"
-            >
-              <el-input
-                v-model="domain.repairNum"
-                placeholder="请输入"
-                size="small"
-                style="width: 350px"
-              ></el-input>
-            </el-form-item>
+           
             <el-form-item
               :prop="'premiumListTwo.' + index + '.repairContent'"
               label="维修内容："
diff --git a/sgzb-ui/src/views/store/label/labelBinding.vue b/sgzb-ui/src/views/store/label/labelBinding.vue
index b8cc992f..3767b3c1 100644
--- a/sgzb-ui/src/views/store/label/labelBinding.vue
+++ b/sgzb-ui/src/views/store/label/labelBinding.vue
@@ -228,7 +228,7 @@
                 !(scope.row.status === '1' && scope.row.isBind === '1')
               "
               size="mini"
-              type="text"
+              type="danger"
               icon="el-icon-delete"
               @click="handleDelete(scope.row)"
               >解绑</el-button
@@ -869,7 +869,7 @@ export default {
   }
 };
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .uploadImg {
   display: flex;
   align-items: center;
@@ -879,5 +879,8 @@ export default {
   margin-top: 15px;
   font-size: 18px;
 }
-</style>
-
+::v-deep.el-table .fixed-width .el-button--mini {
+  width: 60px !important;
+  margin-bottom: 10px;
+}
+</style> 
diff --git a/sgzb-ui/src/views/store/label/labelBindingHistory.vue b/sgzb-ui/src/views/store/label/labelBindingHistory.vue
index fd54cb0e..1dea607d 100644
--- a/sgzb-ui/src/views/store/label/labelBindingHistory.vue
+++ b/sgzb-ui/src/views/store/label/labelBindingHistory.vue
@@ -424,3 +424,9 @@ export default {
   }
 };
 </script>
+<style lang="scss" scoped>
+::v-deep.el-table .fixed-width .el-button--mini {
+  width: 60px !important;
+  margin-bottom: 10px;
+}
+</style>
\ No newline at end of file
diff --git a/sgzb-ui/src/views/store/label/labelType.vue b/sgzb-ui/src/views/store/label/labelType.vue
index 64875902..5ea8c44b 100644
--- a/sgzb-ui/src/views/store/label/labelType.vue
+++ b/sgzb-ui/src/views/store/label/labelType.vue
@@ -86,13 +86,13 @@
         <template slot-scope="scope">
           <el-button
             size="mini"
-            type="text"
+            type="primary"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
           >修改</el-button>
           <el-button
             size="mini"
-            type="text"
+            type="danger"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
           >删除</el-button>
@@ -296,3 +296,9 @@ export default {
   }
 };
 </script>
+<style lang="scss" scoped>
+::v-deep.el-table .fixed-width .el-button--mini {
+  width: 60px !important;
+  margin-bottom: 10px;
+}
+</style>
\ No newline at end of file
diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue
index 9659fa7d..3058d508 100644
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue
@@ -83,11 +83,11 @@
           <span v-if="scope.row.status==4">已入库</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="250">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150">
         <template slot-scope="scope">
           <el-button
               size="mini"
-              type="text"
+              type="primary"
               icon="el-icon-edit"
               v-show="scope.row.status==0 || scope.row.status==3"
               @click="handleCheck(scope.row)"
@@ -516,7 +516,7 @@ export default {
         console.log(row)
         let rowData = row
         rowData.checkNum = rowData.purchaseNum;
-        rowData.checkResult = rowData.purchaseNum || "通过";
+        rowData.checkResult = rowData.checkResult || "通过";
         this.form = rowData;
         this.open = true;
         this.imageUrl = rowData.checkUrl
@@ -649,3 +649,9 @@ export default {
   }
 };
 </script>
+<style lang="scss" scoped>
+::v-deep.el-table .fixed-width .el-button--mini {
+  width: 60px !important;
+  margin-bottom: 10px;
+}
+</style>
\ No newline at end of file
diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesArrival.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesArrival.vue
index bbfdb0b5..9934e346 100644
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesArrival.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesArrival.vue
@@ -182,7 +182,7 @@
           >修改</el-button> -->
           <el-button
               size="mini"
-              type="text"
+              type="danger"
               icon="el-icon-delete"
               @click="handleDelete(scope.row)"
               v-hasPermi="['system:role:remove']"
@@ -559,3 +559,9 @@ export default {
   }
 };
 </script>
+<style lang="scss" scoped>
+::v-deep.el-table .fixed-width .el-button--mini {
+  width: 60px !important;
+  margin-bottom: 10px;
+}
+</style>
\ No newline at end of file
diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesCode.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesCode.vue
index a3bba316..d138af76 100644
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesCode.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesCode.vue
@@ -75,7 +75,7 @@
         <template slot-scope="scope">
           <el-button
               size="mini"
-              type="text"
+              type="primary"
               icon="el-icon-edit"
               @click="handleCode(scope.row)"
           >绑定编码</el-button>
@@ -497,3 +497,9 @@ export default {
 }
 
 </style>
+<style lang="scss" scoped>
+::v-deep.el-table .fixed-width .el-button--mini {
+  width: 60px !important;
+  margin-bottom: 10px;
+}
+</style>
\ No newline at end of file
diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue
index f7fb2bf9..137dc0d5 100644
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue
@@ -95,28 +95,28 @@
         <template slot-scope="scope">
           <el-button
               size="mini"
-              type="text"
+              type="primary"
               icon="el-icon-edit"
               @click="handleUpdate(scope.row)"
               v-if="scope.row.taskStatus==24"
           >编辑</el-button>
           <el-button
               size="mini"
-              type="text"
+              type="success"
               icon="el-icon-edit"
               v-if="scope.row.purchasingStatus!='已入库'&&scope.row.purchasingStatus!='已验收合格'"
               @click="handleAccept(scope.row)"
           >验收</el-button>
           <el-button
               size="mini"
-              type="text"
+              type="warning"
               icon="el-icon-edit"
               v-if="scope.row.purchasingStatus=='已验收合格'"
               @click="handleCode(scope.row)"
           >编码管理</el-button>
           <el-button
               size="mini"
-              type="text"
+              type="info"
               icon="el-icon-edit"
               v-if="scope.row.purchasingStatus=='已验收合格'||scope.row.purchasingStatus=='已入库'"
               @click="handlePrint(scope.row)"
@@ -124,7 +124,7 @@
           
           <el-button
               size="mini"
-              type="text"
+              type="danger"
               icon="el-icon-delete"
               v-if="scope.row.purchasingStatus!='已入库'"
               @click="handleDelete(scope.row)"
@@ -456,3 +456,9 @@ export default {
   }
 };
 </script>
+<style lang="scss" scoped>
+::v-deep.el-table .fixed-width .el-button--mini {
+  width: 60px !important;
+  margin-bottom: 10px;
+}
+</style>
\ No newline at end of file
diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue
index 9f506b6f..91110db2 100644
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue
@@ -128,24 +128,24 @@
         <template slot-scope="scope">
           <el-button
             size="mini"
-            type="text"
-            icon="el-icon-edit"
+            icon="el-icon-zoom-in"
             @click="handleView(scope.row)"
           >查看</el-button>
+         
           <el-button
             size="mini"
-            type="text"
-            icon="el-icon-edit"
-            v-if="scope.row.taskStatus=='28'"
-            @click="handlePrint(scope.row)"
-          >入库单</el-button>
-          <el-button
-            size="mini"
-            type="text"
+            type="primary"
             icon="el-icon-edit"
             v-if="scope.row.taskStatus=='26'"
             @click="handleUpdate(scope.row)"
           >审核</el-button>
+          <el-button
+            size="mini"
+            type="info"
+            icon="el-icon-edit"
+            v-if="scope.row.taskStatus=='28'"
+            @click="handlePrint(scope.row)"
+          >入库单</el-button>
           <!--          <el-button-->
           <!--            size="mini"-->
           <!--            type="text"-->
@@ -224,7 +224,7 @@
           <!-- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> -->
         </el-form-item>
       </el-form>
-      <el-row :gutter="10" class="mb8">
+      <el-row :gutter="10" class="mb8" v-if="showHandle">
         <el-col :span="1.5">
           <el-button
             type="primary"
@@ -710,4 +710,8 @@ export default {
       justify-content: space-between;
     }
   }
+  ::v-deep.el-table .fixed-width .el-button--mini {
+  width: 60px !important;
+  margin-bottom: 10px;
+}
 </style>
\ No newline at end of file
diff --git a/sgzb-ui/src/views/store/newBuy/plan.vue b/sgzb-ui/src/views/store/newBuy/plan.vue
index 6529fd69..9b9c7011 100644
--- a/sgzb-ui/src/views/store/newBuy/plan.vue
+++ b/sgzb-ui/src/views/store/newBuy/plan.vue
@@ -79,18 +79,18 @@
 
 <!--        </template>-->
 <!--      </el-table-column>-->
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
               size="mini"
-              type="text"
+              type="primary"
               icon="el-icon-edit"
               @click="handleUpdate(scope.row)"
               v-hasPermi="['store:labelType:edit']"
           >编辑</el-button>
           <el-button
               size="mini"
-              type="text"
+              type="danger"
               icon="el-icon-delete"
               @click="handleDelete(scope.row)"
               v-hasPermi="['store:labelType:remove']"
@@ -309,3 +309,9 @@ export default {
   }
 };
 </script>
+<style lang="scss" scoped>
+::v-deep.el-table .fixed-width .el-button--mini {
+  width: 60px !important;
+  margin-bottom: 10px;
+}
+</style>
\ No newline at end of file
diff --git a/sgzb-ui/src/views/store/newBuy/planSecond.vue b/sgzb-ui/src/views/store/newBuy/planSecond.vue
index c8e14dab..e74591e1 100644
--- a/sgzb-ui/src/views/store/newBuy/planSecond.vue
+++ b/sgzb-ui/src/views/store/newBuy/planSecond.vue
@@ -70,18 +70,18 @@
 
       <el-table-column label="备注" align="center" prop="dictName" :show-overflow-tooltip="true" />
 
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
               size="mini"
-              type="text"
+              type="primary"
               icon="el-icon-edit"
               @click="handleUpdate(scope.row)"
               v-hasPermi="['store:labelType:edit']"
           >编辑</el-button>
           <el-button
               size="mini"
-              type="text"
+              type="danger"
               icon="el-icon-delete"
               @click="handleDelete(scope.row)"
               v-hasPermi="['store:labelType:remove']"
@@ -337,3 +337,9 @@ export default {
   }
 };
 </script>
+<style lang="scss" scoped>
+::v-deep.el-table .fixed-width .el-button--mini {
+  width: 60px !important;
+  margin-bottom: 10px;
+}
+</style>
\ No newline at end of file
diff --git a/sgzb-ui/src/views/store/shelves/shelvesList.vue b/sgzb-ui/src/views/store/shelves/shelvesList.vue
index a352a66c..2c003a5d 100644
--- a/sgzb-ui/src/views/store/shelves/shelvesList.vue
+++ b/sgzb-ui/src/views/store/shelves/shelvesList.vue
@@ -60,7 +60,7 @@
         <template slot-scope="scope">
           <el-button
             size="mini"
-            type="text"
+            type="primary"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:dept:edit']"
@@ -68,7 +68,7 @@
           <el-button
             v-if="scope.row.parentId != 0"
             size="mini"
-            type="text"
+            type="danger"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:dept:remove']"
@@ -308,3 +308,9 @@ export default {
   }
 };
 </script>
+<style lang="scss" scoped>
+::v-deep.el-table .fixed-width .el-button--mini {
+  width: 60px !important;
+  margin-bottom: 10px;
+}
+</style>
\ No newline at end of file
diff --git a/sgzb-ui/src/views/store/tools/accessory.vue b/sgzb-ui/src/views/store/tools/accessory.vue
index 824cbbd5..1e834a31 100644
--- a/sgzb-ui/src/views/store/tools/accessory.vue
+++ b/sgzb-ui/src/views/store/tools/accessory.vue
@@ -40,7 +40,7 @@
       <!--      </el-table-column>-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="160px">
         <template slot-scope="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+          <el-button size="mini" type="primary" icon="el-icon-edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['system:dept:edit']">修改</el-button>
           <!--          <el-button-->
           <!--              size="mini"-->
@@ -49,7 +49,7 @@
           <!--              @click="handleAdd(scope.row)"-->
           <!--              v-hasPermi="['system:dept:add']"-->
           <!--          >新增</el-button>-->
-          <el-button v-if="scope.row.parentId != 0" size="mini" type="text" icon="el-icon-delete"
+          <el-button v-if="scope.row.parentId != 0" size="mini" type="danger" icon="el-icon-delete"
             @click="handleDelete(scope.row)" v-hasPermi="['system:dept:remove']">删除</el-button>
         </template>
       </el-table-column>
@@ -342,3 +342,9 @@ export default {
   }
 };
 </script>
+<style lang="scss" scoped>
+::v-deep.el-table .fixed-width .el-button--mini {
+  width: 60px !important;
+  margin-bottom: 10px;
+}
+</style>
\ No newline at end of file
diff --git a/sgzb-ui/src/views/store/tools/devices.vue b/sgzb-ui/src/views/store/tools/devices.vue
index 836e3461..66514b18 100644
--- a/sgzb-ui/src/views/store/tools/devices.vue
+++ b/sgzb-ui/src/views/store/tools/devices.vue
@@ -130,17 +130,17 @@
 <!--          <span>{{ parseTime(scope.row.createTime) }}</span>-->
 <!--        </template>-->
 <!--      </el-table-column>-->
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
               size="mini"
-              type="text"
+              type="primary"
               icon="el-icon-edit"
               @click="handleUpdate(scope.row)"
           >编辑</el-button>
           <el-button
               size="mini"
-              type="text"
+              type="danger"
               icon="el-icon-delete"
               @click="handleDelete(scope.row)"
           >删除</el-button>
@@ -597,7 +597,7 @@ export default {
   }
 };
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .uploadImg {
   display: flex;
   align-items: center;
@@ -607,4 +607,8 @@ export default {
   margin-top: 15px;
   font-size: 18px;
 }
-</style>
\ No newline at end of file
+::v-deep.el-table .fixed-width .el-button--mini {
+  width: 60px !important;
+  margin-bottom: 10px;
+}
+</style>
diff --git a/sgzb-ui/src/views/store/tools/keeper.vue b/sgzb-ui/src/views/store/tools/keeper.vue
index a3803f23..2df82592 100644
--- a/sgzb-ui/src/views/store/tools/keeper.vue
+++ b/sgzb-ui/src/views/store/tools/keeper.vue
@@ -129,7 +129,7 @@
               <!--              >修改</el-button>-->
               <el-button
                   size="mini"
-                  type="text"
+                  type="danger"
                   icon="el-icon-delete"
                   @click="handleDelete(scope.row)"
               >解绑</el-button>
@@ -612,3 +612,9 @@ export default {
   }
 };
 </script>
+<style lang="scss" scoped>
+::v-deep.el-table .fixed-width .el-button--mini {
+  width: 60px !important;
+  margin-bottom: 10px;
+}
+</style>
\ No newline at end of file
diff --git a/sgzb-ui/src/views/store/tools/repair.vue b/sgzb-ui/src/views/store/tools/repair.vue
index d85cb720..d3e048e8 100644
--- a/sgzb-ui/src/views/store/tools/repair.vue
+++ b/sgzb-ui/src/views/store/tools/repair.vue
@@ -139,7 +139,7 @@
               <!--              >修改</el-button>-->
               <el-button
                   size="mini"
-                  type="text"
+                  type="danger"
                   icon="el-icon-delete"
                   @click="handleDelete(scope.row)"
               >解绑</el-button>
@@ -622,3 +622,9 @@ export default {
   }
 };
 </script>
+<style lang="scss" scoped>
+::v-deep.el-table .fixed-width .el-button--mini {
+  width: 60px !important;
+  margin-bottom: 10px;
+}
+</style>
\ No newline at end of file
diff --git a/sgzb-ui/src/views/store/tools/safeTools.vue b/sgzb-ui/src/views/store/tools/safeTools.vue
index 0dff2393..9e70c02b 100644
--- a/sgzb-ui/src/views/store/tools/safeTools.vue
+++ b/sgzb-ui/src/views/store/tools/safeTools.vue
@@ -92,14 +92,14 @@
         <template slot-scope="scope">
           <el-button
               size="mini"
-              type="text"
+              type="primary"
               icon="el-icon-edit"
               @click="handleUpdate(scope.row)"
               v-hasPermi="['store:labelType:edit']"
           >编辑</el-button>
           <el-button
               size="mini"
-              type="text"
+              type="danger"
               icon="el-icon-delete"
               @click="handleDelete(scope.row)"
               v-hasPermi="['store:labelType:remove']"
@@ -304,3 +304,9 @@ export default {
   }
 };
 </script>
+<style lang="scss" scoped>
+::v-deep.el-table .fixed-width .el-button--mini {
+  width: 60px !important;
+  margin-bottom: 10px;
+}
+</style>
\ No newline at end of file
diff --git a/sgzb-ui/src/views/store/tools/toolsSupplier.vue b/sgzb-ui/src/views/store/tools/toolsSupplier.vue
index 26407f21..09f8adc8 100644
--- a/sgzb-ui/src/views/store/tools/toolsSupplier.vue
+++ b/sgzb-ui/src/views/store/tools/toolsSupplier.vue
@@ -99,14 +99,14 @@
         <template slot-scope="scope">
           <el-button
               size="mini"
-              type="text"
+              type="primary"
               icon="el-icon-edit"
               @click="handleUpdate(scope.row)"
               v-hasPermi="['store:labelType:edit']"
           >编辑</el-button>
           <el-button
               size="mini"
-              type="text"
+              type="danger"
               icon="el-icon-delete"
               @click="handleDelete(scope.row)"
               v-hasPermi="['store:labelType:remove']"
@@ -386,3 +386,9 @@ export default {
   }
 };
 </script>
+<style lang="scss" scoped>
+::v-deep.el-table .fixed-width .el-button--mini {
+  width: 60px !important;
+  margin-bottom: 10px;
+}
+</style>
\ No newline at end of file
diff --git a/sgzb-ui/src/views/store/tools/toolsType.vue b/sgzb-ui/src/views/store/tools/toolsType.vue
index 8018412a..59b1c9b1 100644
--- a/sgzb-ui/src/views/store/tools/toolsType.vue
+++ b/sgzb-ui/src/views/store/tools/toolsType.vue
@@ -127,31 +127,32 @@
           <el-table-column
             label="操作"
             align="center"
-            width="160"
+            width="250"
             class-name="small-padding fixed-width"
           >
             <template slot-scope="scope" v-if="scope.row.typeId !== 1">
               <el-button
                 size="mini"
-                type="text"
+                type="success"
+                icon="el-icon-edit"
+                @click="handleConfig(scope.row)"
+              >配置
+              </el-button>
+              <el-button
+                size="mini"
+                type="primary"
                 icon="el-icon-edit"
                 @click="handleUpdate(scope.row)"
               >修改
               </el-button>
               <el-button
                 size="mini"
-                type="text"
+                type="danger"
                 icon="el-icon-delete"
                 @click="handleDelete(scope.row)"
               >删除
               </el-button>
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-delete"
-                @click="handleConfig(scope.row)"
-              >配置
-              </el-button>
+          
           
             </template>
           </el-table-column>
@@ -817,3 +818,9 @@ export default {
   }
 };
 </script>
+<style lang="scss" scoped>
+::v-deep.el-table .fixed-width .el-button--mini {
+  width: 60px !important;
+  margin-bottom: 10px;
+}
+</style>
\ No newline at end of file
diff --git a/sgzb-ui/src/views/store/warehousing/accessoryWarehousing.vue b/sgzb-ui/src/views/store/warehousing/accessoryWarehousing.vue
index 48f9ac80..26b118cb 100644
--- a/sgzb-ui/src/views/store/warehousing/accessoryWarehousing.vue
+++ b/sgzb-ui/src/views/store/warehousing/accessoryWarehousing.vue
@@ -137,7 +137,7 @@
         <template slot-scope="scope">
           <el-button
             size="mini"
-            type="text"
+            type="primary"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:dict:edit']"
@@ -475,3 +475,9 @@ export default {
   }
 };
 </script>
+<style lang="scss" scoped>
+::v-deep.el-table .fixed-width .el-button--mini {
+  width: 60px !important;
+  margin-bottom: 10px;
+}
+</style>
\ No newline at end of file
diff --git a/sgzb-ui/src/views/store/warehousing/devicesWarehousing.vue b/sgzb-ui/src/views/store/warehousing/devicesWarehousing.vue
index 229555a6..68bf9fcd 100644
--- a/sgzb-ui/src/views/store/warehousing/devicesWarehousing.vue
+++ b/sgzb-ui/src/views/store/warehousing/devicesWarehousing.vue
@@ -105,7 +105,7 @@
     </el-row>
 
     <el-table v-loading="loading" :data="returnList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+      <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <el-table-column label="退料单号" align="center" prop="code" />
       <el-table-column label="退料单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
       <el-table-column label="退料工程" align="center" prop="lotName" :show-overflow-tooltip="true" />
@@ -480,3 +480,9 @@ export default {
   }
 };
 </script>
+<style lang="scss" scoped>
+::v-deep.el-table .fixed-width .el-button--mini {
+  width: 60px !important;
+  margin-bottom: 10px;
+}
+</style>
\ No newline at end of file
diff --git a/sgzb-ui/src/views/store/warehousing/repairWarehousing.vue b/sgzb-ui/src/views/store/warehousing/repairWarehousing.vue
index 672cf0d7..1c71232c 100644
--- a/sgzb-ui/src/views/store/warehousing/repairWarehousing.vue
+++ b/sgzb-ui/src/views/store/warehousing/repairWarehousing.vue
@@ -126,13 +126,12 @@
         <template slot-scope="scope">
           <el-button
             size="mini"
-            type="text"
-            icon="el-icon-edit"
+            icon="el-icon-zoom-in"
             @click="handleView(scope.row)"
           >查看</el-button>
           <el-button
             size="mini"
-            type="text"
+            type="primary"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-if="scope.row.taskStatus=='入库进行中'"
@@ -607,3 +606,9 @@ export default {
   }
 };
 </script>
+<style lang="scss" scoped>
+::v-deep.el-table .fixed-width .el-button--mini {
+  width: 60px !important;
+  margin-bottom: 10px;
+}
+</style>
\ No newline at end of file
diff --git a/sgzb-ui/vue.config.js b/sgzb-ui/vue.config.js
index 90180f96..eb1d2f88 100644
--- a/sgzb-ui/vue.config.js
+++ b/sgzb-ui/vue.config.js
@@ -36,11 +36,11 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         //  target:  `http://112.29.103.165:21626`,//线上环境-重庆
-        target: `http://112.29.103.165:21624`,//线上环境-宁夏
-        // target: `http://192.168.0.14:21624`,//线上环境
-        // target: `http://192.168.5.12:8080`,//丁
+        // target: `http://112.29.103.165:21624`,//线上环境-宁夏
+        target: `http://192.168.0.14:21624`,//线上环境
+        // target: `http://192.168.5.21:8080`,//
         // target: `http://10.40.92.21:8080`,
-          
+        // target: `http://10.40.92.13:8080`,
         // target: `http://10.40.92.126:8080`,//高
         // target: `http://10.40.92.104:8080`,//亮
         // target: `http://192.168.0.166:8080`,//刘川