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

src/views/AllPersonnelBase/AllPersonnelBase.vue

@@ -346,7 +346,10 @@
                 class="icon del"
                 title="确认要删除该数据吗？该操作无法撤消！"
               >
-                <div slot="reference">
+                <div
+                  slot="reference"
+                  @click="closeSelected"
+                >
                   <img
                     src="../../assets/img/qbryk/del.svg"
                     alt=""
@@ -510,6 +513,12 @@ export default {
     };
   },
   methods: {
+    closeSelected () {
+      // alert(1)
+      if (this.isSelected == true) {
+        this.batch()
+      }
+    },
     // 获取全部人员列表请求
     search () {
       // console.info("请求===>", this.reqParam);
@@ -822,6 +831,7 @@ export default {
      * @return {*}
      */
     handleClick (row) {
+      this.closeSelected()
       console.log(row);
       this.$router.push('/ryzwbj/' + row.id + '/' + row.ysxtAsjxgrybh)
     },
@@ -1110,22 +1120,23 @@ export default {
       }
       .disabled {
         border: none;
-        border: 1px solid #ccc;
+        border: 1px solid #ecedf1;
         font-size: 14px;
         font-family: MicrosoftYaHei;
-        color: #ccc;
+        background-color: #fff;
+        color: #c2c4c7;
         i {
           font-size: 14px;
           margin-right: 5px;
         }
-        &:hover {
-          border: 1px solid #ccc;
-          color: #ccc;
-        }
-        &:active {
-          border: 1px solid #ccc;
-          color: #ccc;
-        }
+        // &:hover {
+        //   border: 1px solid #ccc;
+        //   color: #ccc;
+        // }
+        // &:active {
+        //   border: 1px solid #ccc;
+        //   color: #ccc;
+        // }
       }
     }
   }

src/views/AllPersonnelBase/modules/dcfptxAj.vue

@@ -45,9 +45,16 @@
 
       <el-form-item label="数据类型：">
         <el-radio-group v-model="sjlx">
-          <el-radio :label="1">原图</el-radio>
-          <el-radio :label="2">压缩图</el-radio>
-          <el-radio :label="3">特征</el-radio>
+          <el-radio
+            @click.native.prevent="clickitemsjlx(1)"
+            :label="1"
+          >原图</el-radio>
+          <el-radio
+            @click.native.prevent="clickitemsjlx(2)"
+            :label="2"
+          >压缩图</el-radio>
+          <!-- <el-radio :label="3">特征</el-radio> -->
+          <el-checkbox v-model="tz">特征</el-checkbox>
         </el-radio-group>
       </el-form-item>
       <el-form-item label="文件格式：">
@@ -70,10 +77,12 @@
         >
           <el-radio
             :label="1"
+            @click.native.prevent="clickitemtmbz(1)"
             border
           >000</el-radio>
           <el-radio
             :label="2"
+            @click.native.prevent="clickitemtmbz(2)"
             border
           >999</el-radio>
         </el-radio-group>
@@ -122,11 +131,12 @@ export default {
       dialogVisible: false, // 弹窗状态
       wzChecked: true, // 文字单选 
 
-      sjlx: 1, // 数据类型
+      sjlx: null, // 数据类型
       wjgs: 1,//文件格式
       dcms: 1, //导出模式
-      tmbz: 1,// 条码补值
-      tm: 'true', // 脱密
+      tmbz: null,// 条码补值
+      tm: null, // 脱密
+      tz: null,// 特征
 
       checkAll: false, // 是否全选
       checkedTargets: [], // 选定指位
@@ -189,6 +199,12 @@ export default {
           }
         });
     },
+    clickitemsjlx (e) {
+      e === this.sjlx ? this.sjlx = '' : this.sjlx = e
+    },
+    clickitemtmbz (e) {
+      e === this.tmbz ? this.tmbz = '' : this.tmbz = e
+    },
     handleClose (done) {
       targtOptions = [];
       this.targts = targtOptions

src/views/AllPersonnelBase/modules/dcftpx.vue

@@ -257,9 +257,16 @@
     >
       <el-form-item label="数据类型：">
         <el-radio-group v-model="sjlx">
-          <el-radio :label="1">原图</el-radio>
-          <el-radio :label="2">压缩图</el-radio>
-          <el-radio :label="3">特征</el-radio>
+          <el-radio
+            @click.native.prevent="clickitemsjlx(1)"
+            :label="1"
+          >原图</el-radio>
+          <el-radio
+            @click.native.prevent="clickitemsjlx(2)"
+            :label="2"
+          >压缩图</el-radio>
+          <!-- <el-radio :label="3">特征</el-radio> -->
+          <el-checkbox v-model="tz">特征</el-checkbox>
         </el-radio-group>
       </el-form-item>
       <el-form-item label="文件格式：">
@@ -293,10 +300,12 @@
         >
           <el-radio
             :label="1"
+            @click.native.prevent="clickitemtmbz(1)"
             border
           >000</el-radio>
           <el-radio
             :label="2"
+            @click.native.prevent="clickitemtmbz(2)"
             border
           >999</el-radio>
         </el-radio-group>
@@ -350,6 +359,7 @@ export default {
       filenameexport: '文件',
       dialogVisible: false, // 弹窗状态
       wzChecked: true, // 文字单选 
+      tz: null,// 特征
       // 滚动指纹
       gdzwisIndeterminate: false, // 滚动指纹状态
       gdzwCheckAll: true, // 滚动指纹全选
@@ -395,10 +405,10 @@ export default {
       checkedrxs: ['正面照', '左侧照', '右侧照', '身份证'],
       rxs: rxOptions,
 
-      sjlx: 1, // 数据类型
+      sjlx: null, // 数据类型
       wjgs: 1,//文件格式
       dcms: 1, //导出模式
-      tmbz: 1,// 条码补值
+      tmbz: null,// 条码补值
     };
   },
   mounted () {
@@ -647,6 +657,12 @@ export default {
       this.rxcheckAll = checkedCount === this.rxs.length;
       this.rxisIndeterminate = checkedCount > 0 && checkedCount < this.rxs.length;
     },
+    clickitemsjlx (e) {
+      e === this.sjlx ? this.sjlx = '' : this.sjlx = e
+    },
+    clickitemtmbz (e) {
+      e === this.tmbz ? this.tmbz = '' : this.tmbz = e
+    },
   }
 };
 </script>

src/views/AllPersonnelBase/modules/xzry.vue

@@ -26,12 +26,13 @@
         <el-col :span="12">
           <el-form-item label="人员编号：" prop="ysxtAsjxgrybh">
             <el-input
+              class="inputBh"
               v-model.trim="ruleForm.ysxtAsjxgrybh"
               placeholder="请输入人员编号"
-              maxlength="23"
+              maxlength="22"
               show-word-limit
               clearable
-            ></el-input>
+            ><template slot="prepend">R</template></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -507,6 +508,8 @@ export default {
             personDo: "",
           };
           reqParam.personDo = this.ruleForm;
+          let defaultArr = 'R'
+          reqParam.personDo.ysxtAsjxgrybh = defaultArr.concat(this.ruleForm.ysxtAsjxgrybh)
           this.$axios
             .post("/api/personstore/personadd", reqParam)
             .then((response) => {
@@ -545,6 +548,16 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.inputBh {
+  /deep/.el-input-group__prepend {
+    width: 40px;
+    text-align: center;
+    padding: 0;
+  }
+  /deep/.el-input__inner {
+    width: 224px;
+  }
+}
 // 滚动条的宽度
 /deep/ .el-form::-webkit-scrollbar {
   width: 6px; // 横向滚动条

src/views/AllPersonnelBase/qbalk.vue

@@ -996,22 +996,22 @@ const datas1 = [
       }
       .disabled {
         border: none;
-        border: 1px solid #ccc;
+        border: 1px solid #ecedf1;
         font-size: 14px;
         font-family: MicrosoftYaHei;
-        color: #ccc;
+        color: #c2c4c7;
         i {
           font-size: 14px;
           margin-right: 5px;
         }
-        &:hover {
-          border: 1px solid #ccc;
-          color: #ccc;
-        }
-        &:active {
-          border: 1px solid #ccc;
-          color: #ccc;
-        }
+        // &:hover {
+        //   border: 1px solid #ccc;
+        //   color: #ccc;
+        // }
+        // &:active {
+        //   border: 1px solid #ccc;
+        //   color: #ccc;
+        // }
       }
     }
   }