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

src/views/AllPersonnelBase/AllPersonnelBase.vue

@@ -5,7 +5,7 @@
     id="AllPersonnelBase"
   >
     <!--一-->
-    <div class='title'>全部人员库</div>
+    <!-- <div class='title'>全部人员库</div> -->
     <!--二-->
     <div class='search'>
       <el-input
@@ -462,7 +462,7 @@ export default {
       width3: 180,
       width2: 100,
       width1: 220,
-      height: 500,
+      height: 550,
       isSelected: false,// 是否批量操作
       isShowTjddl: false,// 添加到队列
       isShowGz: false,// 关注

src/views/AllPersonnelBase/modules/dcfptxAj.vue

@@ -6,13 +6,6 @@
     append-to-body
     :before-close="handleClose"
   >
-    <!-- <div class="head">
-      文字:<el-checkbox v-model="wzChecked">基本信息</el-checkbox>
-    </div>
-    <div class="content">
-
-    </div> -->
-
     <el-form
       label-width="6.25rem"
       class="demo-ruleForm"
@@ -22,8 +15,25 @@
         <el-checkbox v-model="wzChecked">基本信息</el-checkbox>
       </el-form-item>
 
-      <el-form-item label="指掌纹序号:">
-        <el-checkbox v-model="wzChecked">基本信息</el-checkbox>
+      <el-form-item
+        label="指掌纹序号:"
+        class='zzwxh'
+      >
+        <el-checkbox
+          :indeterminate="isIndeterminate"
+          v-model="checkAll"
+          @change="handleCheckAllChange"
+        >全选</el-checkbox>
+        <el-checkbox-group
+          v-model="checkedTargets"
+          @change="handleCheckedTargetsChange"
+        >
+          <el-checkbox
+            v-for="city in targts"
+            :label="city"
+            :key="city"
+          >{{city}}</el-checkbox>
+        </el-checkbox-group>
       </el-form-item>
 
       <el-form-item label="数据类型：">
@@ -42,7 +52,7 @@
         <el-radio-group v-model="dcms">
           <el-radio :label="1">分开文件</el-radio>
           <el-radio :label="2">同一文件</el-radio>
-          <el-checkbox v-model="wzChecked">脱密</el-checkbox>
+          <el-checkbox v-model="tm">脱密</el-checkbox>
         </el-radio-group>
       </el-form-item>
       <el-form-item label="条码补值：">
@@ -78,6 +88,7 @@
 </template>
 
 <script>
+let targtOptions = [];
 export default {
   name: "dcftpx",
   props: {
@@ -100,6 +111,12 @@ export default {
       wjgs: 1,//文件格式
       dcms: 1, //导出模式
       tmbz: 1,// 条码补值
+      tm: 'true', // 脱密
+
+      checkAll: false, // 是否全选
+      checkedTargets: [], // 选定指位
+      targts: targtOptions, // 指位列表
+      isIndeterminate: false,
     };
   },
   mounted () {
@@ -108,6 +125,9 @@ export default {
   watch: {
     isShowDcfptx (newVal, oldVal) {
       this.dialogVisible = newVal;
+      if (newVal == true) {
+        this.getHpseqno()
+      }
     },
     dialogVisible (val) {
       console.log(this.dialogVisible, 123)
@@ -130,14 +150,70 @@ export default {
       document.body.removeChild(eleLink)
       this.dialogVisible = false;
     },
+    // 发查询指位信息
+    getHpseqno () {
+      let reqParam = {
+        ysxtAsjbhs: '',  // 条码号
+      };
+      let barcodeArr = []
+      for (let i = 0; i < this.rowData.length; i++) {
+        barcodeArr.push(this.rowData[i].ysxtAsjbh)
+      }
+      reqParam.ysxtAsjbhs = barcodeArr
+      this.$axios
+        .post("/api/casestore/getHpseqno", reqParam)
+        .then(response => {
+          if (response.data.code === 0) {
+            let arr = response.data.ret
+            for (let i = 0; i < arr.length; i++) {
+              targtOptions.push(arr[i].hpseqno)
+            }
+            console.info("指位返回列表===>", arr);
+          } else {
+            this.$message.error(response.data.message);
+          }
+        });
+    },
     handleClose (done) {
+      targtOptions = [];
+      this.targts = targtOptions
       this.dialogVisible = false;
+
     },
+    handleCheckAllChange (val) {
+      this.checkedTargets = val ? targtOptions : [];
+      this.isIndeterminate = false;
+    },
+    handleCheckedTargetsChange (value) {
+      let checkedCount = value.length;
+      this.checkAll = checkedCount === this.targts.length;
+      this.isIndeterminate = checkedCount > 0 && checkedCount < this.targts.length;
+    }
   }
 };
 </script>
 
 <style lang="scss" scoped>
+/deep/.zzwxh .el-form-item__content {
+  display: flex;
+  .el-checkbox {
+    margin-right: 24px;
+  }
+}
+/deep/.el-checkbox-group {
+  height: 160px;
+  overflow: auto;
+}
+// 滚动条的宽度
+/deep/ .el-checkbox-group::-webkit-scrollbar {
+  width: 6px; // 横向滚动条
+  height: 6px; // 纵向滚动条 必写
+}
+// 滚动条的滑块
+/deep/ .el-checkbox-group::-webkit-scrollbar-thumb {
+  background-color: #dadde0;
+  border-radius: 3px;
+}
 /deep/.el-dialog {
   border-radius: 6px;
   font-family: MicrosoftYaHei;

src/views/AllPersonnelBase/qbalk.vue

@@ -4,7 +4,7 @@
     direction="vertical"
   >
     <!--一-->
-    <div class="title">全部案件库</div>
+    <!-- <div class="title">全部案件库</div> -->
     <!--二-->
     <div class="search">
       <el-input
@@ -433,7 +433,7 @@ export default {
       width3: 100,
       width2: 180,
       width1: 220,
-      height: 500,
+      height: 550,
       isShowTjddl: false,// 添加到队列
       isShowGz: false,// 关注
       isShowDcfptx: false,// 导出FPTX

vue.config.js

@@ -92,11 +92,11 @@ module.exports = {
         // target: "http://192.168.0.137:8080/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/
         // target: "http://172.18.108.2:8099/", // 张 认定
         // target: "http://192.168.128.112:8099", // 湖南-张
-        // target: "http://192.168.128.113:8099",  // 湖南-马
+        target: "http://192.168.128.114:8099",  // 湖南-马
         // target: "http://172.18.116.73:8099/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/   ma
         // target: "http://127.0.0.1:8099",
         // target: "http://47.92.225.109:5602",
-        target: "http://www.meetfood.cn:2390/",  // 湖南-线上
+        // target: "http://www.meetfood.cn:2390/",  // 湖南-线上
 
         ws: true,
         changeOrigin: true,