问题调整

src/views/AllPersonnelBase/AllPersonnelBase.vue

@@ -599,21 +599,31 @@ export default {
     },
     // 复制条码号 获取选中条码值
     getysxtAsjxgrybh () {
-      this.ysxtAsjxgrybh = null;
+      let self = this;
+      this.ysxtAsjxgrybh = [];
       if (this.multipleSelection.length === 0) {
         this.$message.error("请选择需要复制条码号的数据！");
         this.isSelected = true
-      } else if (this.multipleSelection.length === 1) {
-        this.ysxtAsjxgrybh = this.multipleSelection[0].ysxtAsjxgrybh;
       } else {
-        this.$message.error("只能复制单条数据的条码号！");
+        self.multipleSelection.forEach(item => {
+          self.ysxtAsjxgrybh.push(item.ysxtAsjxgrybh);
+        });
+        this.ysxtAsjxgrybh = this.ysxtAsjxgrybh.join(",");
       }
+
+
+      // else if (this.multipleSelection.length === 1) {
+      //   this.ysxtAsjxgrybh = this.multipleSelection[0].ysxtAsjxgrybh;
+      // } else {
+      //   this.$message.error("只能复制单条数据的条码号！");
+      // }
     },
     // 复制成功时的回调函数
     onCopy (e) {
       this.$message({
         type: "success",
-        message: "复制条码号:" + this.ysxtAsjxgrybh + "成功！"
+        // message: "复制条码号:" + this.ysxtAsjxgrybh + "成功！"
+        message: "已复制到剪切板"
       });
     },
     // 复制失败时的回调函数
@@ -785,13 +795,6 @@ export default {
     },
     // 请求删除接口
     doDelete (psns) {
-      // 删除确认提示
-      this.$confirm("是否确定删除已选择的数据?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      })
-        .then(() => {
       this.$axios
         .post("/api/personstore/delete", { psns: psns })
         .then(response => {
@@ -802,13 +805,6 @@ export default {
             this.$message.error("删除失败");
           }
         });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消删除"
-          });
-        });
     },
     /**
      * @description: 是否是批量操作
@@ -817,6 +813,9 @@ export default {
      */
     batch () {
       this.isSelected = !this.isSelected
+      this.toggleSelection()
+      // this.$set(this.multipleSelection, [])
+
     },
     cancel () {
       alert(888)
@@ -828,7 +827,7 @@ export default {
      */
     handleClick (row) {
       console.log(row);
-      this.$router.push('/zwbj/ryzwbj/' + row.id + '/' + row.barcode)
+      this.$router.push('/zwbj/ryzwbj/' + row.id + '/' + row.ysxtAsjxgrybh)
     },
     /**
      * @description: 单选事件
@@ -898,7 +897,47 @@ export default {
   }
 }
 </script>
+<style lang="scss">
+.el-popconfirm__main {
+  margin: 23px 24px 17px 24px;
+  font-size: 14px;
+  font-family: MicrosoftYaHei;
+  color: #333333;
+}
+.el-popconfirm__action {
+  margin-bottom: 24px;
+  padding-bottom: 24px;
+  // 交换 确定 和 取消 按钮的位置
+  .el-button:nth-child(1) {
+    float: right;
+    margin-right: 23%;
+    width: 72px;
+    height: 32px;
+    background: #055fe7;
+    border-radius: 4px;
+    font-size: 14px;
+    font-family: MicrosoftYaHei;
+    color: #ffffff;
+  }
+  .el-button:nth-child(2) {
+    float: left;
+    margin-left: 23%;
+    width: 72px;
+    height: 32px;
+    background: #ffffff;
+    border-radius: 4px;
+    border: 1px solid #aeb5c2;
+    font-size: 14px;
+    font-family: MicrosoftYaHei;
+    color: #2e3846;
+  }
+}
+</style>
+
 <style scoped lang="scss">
+.el-popconfirm__action {
+  text-align: right;
+}
 // 滚动条的宽度
 /deep/ .el-table__body-wrapper::-webkit-scrollbar {
   width: 6px; // 横向滚动条

src/views/AllPersonnelBase/modules/fcx.vue

@@ -71,14 +71,20 @@
           prop="cxlx"
         >
           <el-radio-group v-model="ruleForm.cxlx.querytype">
-            <el-radio label="1">人员倒查</el-radio>
-            <el-radio label="0">人员查重</el-radio>
+            <el-radio
+              label="1"
+              class='color_e60012'
+            >倒查</el-radio>
+            <el-radio
+              label="0"
+              style="color: #fa9500"
+            >查重</el-radio>
           </el-radio-group>
           <el-checkbox-group v-model="ruleForm.cxlx.cxtype">
-            <el-checkbox
+            <!-- <el-checkbox
               label="无图像，不发送查询"
               name="type"
-            ></el-checkbox>
+            ></el-checkbox> -->
             <el-checkbox
               label="已比中，不发送查询"
               name="type"
@@ -1048,7 +1054,6 @@ export default {
     text-align: left;
     border-right: 1px solid #eee;
     .middleTop {
-      width: 52px;
       height: 20px;
       font-size: 12px;
       font-family: MicrosoftYaHei;
@@ -1056,7 +1061,6 @@ export default {
       line-height: 20px;
     }
     .middlebottom {
-      width: 52px;
       font-size: 9px;
       font-family: MicrosoftYaHei;
       color: #999999;

src/views/AllPersonnelBase/qbalk.vue

@@ -511,14 +511,6 @@ export default {
     },
     // 请求删除接口
     doDelete (ids) {
-      console.log('111111', ids)
-      // 删除确认提示
-      this.$confirm("是否确定删除已选择的数据?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      })
-        .then(() => {
       this.$axios
         .delete("api/casestore/casebase", { params: { ids } })
         .then(response => {
@@ -529,13 +521,6 @@ export default {
             this.$message.error("删除失败");
           }
         });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消删除"
-          });
-        });
     },
     // 时间格式化
     dateTimeFormat (row, colnum) {
@@ -570,15 +555,22 @@ export default {
     },
     // 复制条码号 获取选中条码值
     getysxtAsjbh () {
-      this.ysxtAsjbh = null;
+      let self = this;
+      this.ysxtAsjbh = [];
       if (this.multipleSelection.length === 0) {
         this.$message.error("请选择需要复制条码号的数据！");
         this.isSelected = true
-      } else if (this.multipleSelection.length === 1) {
-        this.ysxtAsjbh = this.multipleSelection[0].ysxtAsjbh;
       } else {
-        this.$message.error("只能复制单条数据的条码号！");
+        self.multipleSelection.forEach(item => {
+          self.ysxtAsjbh.push(item.ysxtAsjbh);
+        });
+        this.ysxtAsjbh = this.ysxtAsjbh.join(",");
       }
+      // else if (this.multipleSelection.length === 1) {
+      //   this.ysxtAsjbh = this.multipleSelection[0].ysxtAsjbh;
+      // } else {
+      //   this.$message.error("只能复制单条数据的条码号！");
+      // }
     },
     // 导出
     dcFptx () {
@@ -600,7 +592,8 @@ export default {
     onCopy (e) {
       this.$message({
         type: "success",
-        message: "复制条码号:" + this.ysxtAsjbh + "成功！"
+        // message: "复制条码号:" + this.ysxtAsjbh + "成功！"
+        message: "已复制到剪切板"
       });
     },
     // 复制失败时的回调函数
@@ -733,9 +726,7 @@ export default {
      */
     batch () {
       this.isSelected = !this.isSelected;
-    },
-    cancel () {
-      alert(888);
+      this.toggleSelection()
     },
     /**
      * @description: 编辑数据

src/views/drFPTX/RAList.vue

@@ -435,20 +435,28 @@ export default {
     },
     // 复制条码号 获取选中条码值
     getBarcode () {
-      this.ysxtAsjxgrybh = null;
+      let self = this;
+      this.ysxtAsjxgrybh = [];
       if (this.multipleSelection.length === 0) {
         this.$message.error("请选择需要复制条码号的数据！");
-      } else if (this.multipleSelection.length === 1) {
-        this.ysxtAsjxgrybh = this.multipleSelection[0].ysxtAsjxgrybh;
       } else {
-        this.$message.error("只能复制单条数据的条码号！");
+        self.multipleSelection.forEach(item => {
+          self.ysxtAsjxgrybh.push(item.ysxtAsjxgrybh);
+        });
+        this.ysxtAsjxgrybh = this.ysxtAsjxgrybh.join(",");
       }
+      // else if (this.multipleSelection.length === 1) {
+      //   this.ysxtAsjxgrybh = this.multipleSelection[0].ysxtAsjxgrybh;
+      // } else {
+      //   this.$message.error("只能复制单条数据的条码号！");
+      // }
     },
     // 复制成功时的回调函数
     onCopy (e) {
       this.$message({
         type: "success",
-        message: "复制条码号:" + this.ysxtAsjxgrybh + "成功！"
+        // message: "复制条码号:" + this.ysxtAsjxgrybh + "成功！"
+        message: "已复制到剪切板"
       });
     },
     // 复制失败时的回调函数
@@ -511,6 +519,8 @@ export default {
      */
     batch () {
       this.isSelected = !this.isSelected
+      this.toggleSelection()
+
     },
     cancel () {
       alert(888)