Merge branch 'dev_zwpt' of http://47.92.108.28/changchao/founder_vue into dev_zwpt

src/views/AllPersonnelBase/AllPersonnelBase.vue

@@ -455,7 +455,7 @@
         @closeFcx="closeFcx"
       >
       </fcx>
-      <!-- 新增案件弹窗 -->
+      <!-- 新增人员弹窗 -->
       <xzry
         :isShowXzry="isShowXzry"
         @closeXzry="closeXzry"
@@ -624,6 +624,9 @@ export default {
       // 增加毛玻璃
       this.$bus.emit('isBlur', val)
       this.isShowXzry = val;
+      if (val == false) {
+        this.search()
+      }
       // this.search();
     },
     // 人员信息卡操作
@@ -1008,7 +1011,7 @@ export default {
     },
   },
   computed: {
-    roleArr() {
+    roleArr () {
       return this.$store.state.layout.Menu;
     },
     /**

src/views/AllPersonnelBase/modules/xzaj.vue

@@ -473,9 +473,12 @@ export default {
                 if (response.data.code === 0) {
                   this.$message.success("新增成功");
                   this.dialogVisible = false;
-                  this.$router.push(
-                    "/ajzwbj/" + "xz" + "/" + this.ruleForm.ysxtAsjbh
-                  );
+                  this.$router.push({
+                    path: "/ajzwbj/" + "xz" + "/" + this.ruleForm.ysxtAsjbh,
+                    query: {
+                      id: response.data.ret.id
+                    }
+                  })
                 } else {
                   this.$message.error("新增失败");
                 }

src/views/AllPersonnelBase/modules/xzry.vue

@@ -98,6 +98,8 @@
               clearable
               :form="ruleForm"
               id="cjxxyydm"
+              multiple
+              :multipleLimit="5"
             ></SelectCode>
           </el-form-item>
         </el-col>
@@ -576,6 +578,10 @@ export default {
       }
     },
     submitForm (formName) {
+
+      console.log(this.ruleForm.cjxxyydm, 'caijiyuanying')
+
+
       console.log(this.checkedTargets)
       this.$refs[formName].validate((valid) => {
         if (valid) {
@@ -602,8 +608,11 @@ export default {
             // console.log(this.logicDatabaseCode)
             let reqParam = {
               personDo: "",
-              logicList: []
+              logicList: [],
+              cjxxyyList: []
             };
+            reqParam.cjxxyyList = this.ruleForm.cjxxyydm
+            delete this.ruleForm.cjxxyydm
             reqParam.personDo = this.ruleForm;
             reqParam.personDo.ysxtAsjxgrybh = 'R' + this.ruleForm.ysxtAsjxgrybh
             reqParam.logicList = this.logicList
@@ -613,7 +622,6 @@ export default {
                 if (response.data.code === 0) {
                   this.$message.success("新增成功");
                   this.dialogVisible = false;
-
                 } else {
                   this.$message.error("新增失败");
                 }

src/views/zljc/Index.vue

@@ -100,7 +100,10 @@
         <div
           class="btn"
           v-if="roleArr.includes('D-1-2')"
-          @click="batch"
+          v-clipboard:copy="barcode"
+          @click="getbarcode"
+          v-clipboard:success="onCopy"
+          v-clipboard:error="onError"
         >复制条码</div>
       </div>
     </div>
@@ -309,6 +312,8 @@ export default {
 
       kssj: '',// 捺印开始时间
       jssj: '',// 捺印结束时间
+
+      barcode: '',// 复制条码
     }
   },
   methods: {
@@ -403,6 +408,37 @@ export default {
         }
       })
     },
+    getbarcode () {
+      let self = this;
+      this.barcode = [];
+      if (this.multipleSelection.length === 0) {
+        this.$message.error("请选择需要复制条码号的数据！");
+        this.selectBoo = true;
+      } else {
+        self.multipleSelection.forEach((item) => {
+          self.barcode.push(item.barcode);
+        });
+        this.barcode = this.barcode.join(",");
+      }
+    },
+    // 复制成功时的回调函数
+    onCopy (e) {
+      if (this.multipleSelection.length != 0) {
+        this.$message({
+          type: "success",
+          // message: "复制条码号:" + this.ysxtAsjxgrybh + "成功！"
+          message: "已复制到剪切板",
+        });
+      }
+
+    },
+    // 复制失败时的回调函数
+    onError (e) {
+      if (this.multipleSelection.length != 0) {
+        this.$message.error("抱歉，复制条码号失败！");
+      }
+
+    },
     // 格式化参数(开始时间，结束时间)
     getParam () {
       if (this.formInline.nysj !== null) {