按钮的大小，重置按钮的颜色，开始盘点和结束盘点的二次验证，废弃表单的fq_ys数字校验，以及废弃表单取消按钮的无效bug

src/views/equipment/check.vue

@@ -33,8 +33,8 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" size="small" icon="el-icon-search" @click="handleQuery">查询</el-button>
-        <el-button type="primary" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
+        <el-button type="primary"   style="padding: 8px 7px;" size="small" icon="el-icon-search" @click="handleQuery">查询</el-button>
+        <el-button   style="padding: 8px 7px;" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
       </el-form-item>
       <div style="float: right">
         <el-form-item>
@@ -401,36 +401,60 @@ export default {
       this.title = '详情信息'
       this.openDetails = !this.openDetails
     },
-    deleteByType(){
+    deleteByType() {
+  // 添加二次确认对话框
+  this.$confirm("确认要结束盘点吗？", "提示", {
+    confirmButtonText: "确定",
+    cancelButtonText: "取消",
+    type: "warning",
+  })
+    .then(() => {
+      // 用户点击确定按钮时执行的回调函数
       deleteByType(1).then(flag => {
-        if(flag.data > 0 && flag.code === 200){
-          this.$message.success("结束盘点成功")
-        }else{
-            this.$message.error("结束盘点失败")
+        if (flag.data > 0 && flag.code === 200) {
+          this.$message.success("结束盘点成功");
+        } else {
+          this.$message.error("结束盘点失败");
         }
+      });
+    })
+    .catch(() => {
+      // 用户点击取消按钮时执行的回调函数，可以忽略这里的实现
+    });
+},
+    checkType() {
+  checkType(1).then(total => {
+    if (total.data !== 0) {
+      this.$message.error("请先结束盘点");
+    } else {
+      let data = [];
+      if (this.selectList.length === 0) {
+        data = this.equipmentList;
+      } else {
+        data = this.selectList;
+      }
+      // 添加二次确认对话框
+      this.$confirm("确认要进行盘点吗？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
-    },
-    checkType(){
-      checkType(1).then(total => {
-        if(total.data !== 0){
-          this.$message.error("请先结束盘点")
-        }else{
-          let data = []
-          if(this.selectList.length === 0){
-            data = this.equipmentList
-          }else{
-            data = this.selectList
-          }
+        .then(() => {
+          // 用户点击确定按钮时执行的回调函数
           addList(data).then(flag => {
-            if(flag.data.influence > 0){
-              this.$message.success("盘点成功")
-            }else{
-              this.$message.error("盘点失败")
+            if (flag.data.influence > 0) {
+              this.$message.success("盘点成功");
+            } else {
+              this.$message.error("盘点失败");
             }
-          })
-        }
-      })
-    },
+          });
+        })
+        .catch(() => {
+          // 用户点击取消按钮时执行的回调函数，可以忽略这里的实现
+        });
+    }
+  });
+},
 
     handelTab(i, e) {
       const that = this

src/views/equipment/checkProcess.vue

@@ -33,8 +33,8 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" size="small" icon="el-icon-search" @click="handleQuery">查询</el-button>
-        <el-button type="primary" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
+        <el-button type="primary"  style="padding: 8px 7px;" size="small" icon="el-icon-search" @click="handleQuery">查询</el-button>
+        <el-button  style="padding: 8px 7px;" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
       </el-form-item>
       <div style="float: right">
         <el-form-item>
@@ -392,36 +392,60 @@ export default {
       this.title = '详情信息'
       this.openDetails = !this.openDetails
     },
-    deleteByType(){
+    deleteByType() {
+  // 添加二次确认对话框
+  this.$confirm("确认要结束盘点吗？", "提示", {
+    confirmButtonText: "确定",
+    cancelButtonText: "取消",
+    type: "warning",
+  })
+    .then(() => {
+      // 用户点击确定按钮时执行的回调函数
       deleteByType(2).then(flag => {
-        if(flag.data > 0){
-          this.$message.success("结束盘点成功")
-        }else{
-              this.$message.error("结束盘点失败")
+        if (flag.data > 0) {
+          this.$message.success("结束盘点成功");
+        } else {
+          this.$message.error("结束盘点失败");
         }
-      })
-    },
-    checkType(){
+      });
+    })
+    .catch(() => {
+      // 用户点击取消按钮时执行的回调函数，可以忽略这里的实现
+    });
+},
+checkType() {
+  // 添加二次确认对话框
+  this.$confirm("确认要盘点吗？", "提示", {
+    confirmButtonText: "确定",
+    cancelButtonText: "取消",
+    type: "warning",
+  })
+    .then(() => {
+      // 用户点击确定按钮时执行的回调函数
       checkType(2).then(total => {
-        if(total.data !== 0){
-          this.$message.error("请先结束盘点")
-        }else{
-          let data = []
-          if(this.selectList.length === 0){
-            data = this.equipmentList
-          }else{
-            data = this.selectList
+        if (total.data !== 0) {
+          this.$message.error("请先结束盘点");
+        } else {
+          let data = [];
+          if (this.selectList.length === 0) {
+            data = this.equipmentList;
+          } else {
+            data = this.selectList;
           }
           addList(data).then(flag => {
-            if(flag.data.influence > 0){
-              this.$message.success("盘点成功")
-            }else{
-              this.$message.error("盘点失败")
+            if (flag.data.influence > 0) {
+              this.$message.success("盘点成功");
+            } else {
+              this.$message.error("盘点失败");
             }
-          })
+          });
         }
-      })
-    },
+      });
+    })
+    .catch(() => {
+      // 用户点击取消按钮时执行的回调函数，可以忽略这里的实现
+    });
+},
     handelTab(i, e) {
       const that = this
       if (!that.$refs['input' + i]) {

src/views/equipment/equipmentAbandonment.vue

@@ -33,8 +33,8 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" size="small" icon="el-icon-search" @click="handleQuery">查询</el-button>
-        <el-button type="primary" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
+        <el-button type="primary" style="padding: 8px 7px;" size="small" icon="el-icon-search" @click="handleQuery">查询</el-button>
+        <el-button  icon="el-icon-refresh" style="padding: 8px 7px;" size="small" @click="resetQuery">重置</el-button>
       </el-form-item>
       <div style="float: right">
         <!-- <el-form-item>
@@ -214,22 +214,22 @@
     <el-dialog :title="abandonTitle" :visible.sync="abandonOpen" width="500px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="abandonFrom" :rules="abandonFromRules" size="small" label-width="80px">
         <el-form-item label="fq_bz" prop="fq_bz">
-          <el-input v-model.trim="abandonFrom.fq_bz" show-word-limit :maxlength="30" placeholder="请输入fq_bz" />
+          <el-input v-model.trim="abandonFrom.fq_bz"  :maxlength="30" placeholder="请输入fq_bz" />
         </el-form-item>
         <el-form-item label="fq_dd" prop="fq_dd">
-          <el-input v-model.trim="abandonFrom.fq_dd" show-word-limit :maxlength="30" placeholder="请输入fq_dd" />
+          <el-input v-model.trim="abandonFrom.fq_dd"  :maxlength="30" placeholder="请输入fq_dd" />
         </el-form-item>
         <el-form-item label="fq_mcode" prop="fq_mcode">
-          <el-input v-model.trim="abandonFrom.fq_mcode" show-word-limit :maxlength="30" placeholder="请输入fq_mcode" />
+          <el-input v-model.trim="abandonFrom.fq_mcode"  :maxlength="30" placeholder="请输入fq_mcode" />
         </el-form-item>
         <el-form-item label="fq_ys" prop="fq_ys">
-          <el-input v-model.trim="abandonFrom.fq_ys" show-word-limit :maxlength="30" placeholder="请输入fq_ys" />
+          <el-input v-model.trim="abandonFrom.fq_ys"  :maxlength="30" placeholder="请输入fq_ys" />
         </el-form-item>
         <el-form-item label="fq_dbxi" prop="fq_dbxi">
-          <el-input v-model.trim="abandonFrom.fq_dbxi" show-word-limit :maxlength="30" placeholder="请输入fq_dbxi" />
+          <el-input v-model.trim="abandonFrom.fq_dbxi"  :maxlength="30" placeholder="请输入fq_dbxi" />
         </el-form-item>
         <el-form-item label="fq_yy" prop="fq_yy">
-          <el-input v-model.trim="abandonFrom.fq_yy" show-word-limit :maxlength="30" placeholder="请输入fq_yy" />
+          <el-input v-model.trim="abandonFrom.fq_yy"  :maxlength="30" placeholder="请输入fq_yy" />
         </el-form-item>
 
       </el-form>
@@ -276,7 +276,7 @@ export default {
 
       },
       abandonFromRules: {
-
+        fq_ys: [{ pattern: /^\d+$/, message: '仅能输入数字', trigger: 'change' }]
       },
       // TODO: 表单里的单项详情参数
       singleDetails: {
@@ -586,7 +586,7 @@ export default {
     },
     // 取消按钮
     cancel() {
-      this.open = false
+      this.abandonOpen = false
       this.reset()
     },
     // 取消按钮（数据权限）
@@ -756,6 +756,7 @@ export default {
        this.abandonTitle = "废弃表单信息"
        this.abandonFrom.businessId = row.businessId
        this.abandonOpen = true
+       
   // const EquipmentIds = row.businessId || this.ids;
   // const vm = this; // 保存当前上下文