导出 关注及列表

src/views/AllPersonnelBase/gzlb.vue

@@ -8,6 +8,7 @@
       class="head"
       v-if="showType == 1"
     >
+      <div class="headleft">
         <div class='search barcode'>
           <div class='item'> 条码号：</div>
           <el-input
@@ -32,7 +33,15 @@
         </div>
         <div class="search ljfk">
           <div class="item">性别：</div>
-        <el-select
+          <SelectCode
+            codeUrl="/api/code/sex"
+            width="9.75"
+            clearable
+            :form="ruleForm"
+            id="sex"
+          ></SelectCode>
+
+          <!-- <el-select
           v-model="sex"
           placeholder="请选择性别"
         >
@@ -43,7 +52,7 @@
             :value="item.value"
           >
           </el-option>
-        </el-select>
+        </el-select> -->
         </div>
         <div class='search taskNumber'>
           <div class='item'> 身份证号：</div>
@@ -56,15 +65,23 @@
           >
           </el-input>
         </div>
-      <div class="right">
-        <el-button @click="clear">清空</el-button>
-        <el-button @click="search">筛选</el-button>
+      </div>
+      <div class="headright">
+        <el-button
+          type="text"
+          @click="clear"
+        >清空</el-button>
+        <el-button
+          class="sx"
+          @click="search"
+        >筛选</el-button>
       </div>
     </div>
     <div
       class='head'
       v-if="showType==2"
     >
+      <div class="headleft">
         <div class='search barcode'>
           <div class='item'> 条码号：</div>
           <el-input
@@ -78,7 +95,13 @@
         </div>
         <div class="search ljfk">
           <div class="item">案件类型：</div>
-        <el-select
+          <Cascader
+            :form="ruleForm"
+            id="caseType"
+            width="9.75"
+            codeName="CODE_AJLB"
+          ></Cascader>
+          <!-- <el-select
             v-model="caseType"
             placeholder="请选择案件类型"
           >
@@ -89,11 +112,16 @@
               :value="item.value"
             >
             </el-option>
-        </el-select>
+          </el-select> -->
         </div>
         <div class="search ljfk">
           <div class="item">提取单位：</div>
-        <el-select
+          <Cascader
+            :form="ruleForm"
+            id="collectunitName"
+            codeName="CODE_XZQH"
+          ></Cascader>
+          <!-- <el-select
             v-model="collectunitName"
             placeholder="请选择提取单位"
           >
@@ -104,11 +132,18 @@
               :value="item.value"
             >
             </el-option>
-        </el-select>
+          </el-select> -->
         </div>
-      <div class="right">
-        <el-button @click="clear">清空</el-button>
-        <el-button @click="search">筛选</el-button>
+      </div>
+      <div class="headright">
+        <el-button
+          type="text"
+          @click="clear"
+        >清空</el-button>
+        <el-button
+          class="sx"
+          @click="search"
+        >筛选</el-button>
       </div>
     </div>
     <!-- 二 -->
@@ -581,6 +616,8 @@ import fztm from "../AllPersonnelBase/modules/fztm.vue"; // 复制数据弹窗
 import dcftpx from "../AllPersonnelBase/modules/dcftpx.vue"; //导出FPTX弹窗
 import dcfptxAj from "../AllPersonnelBase/modules/dcfptxAj.vue" //导出FPTX弹窗
 import fcx from "../AllPersonnelBase/modules/fcx.vue"; // 发查询弹窗
+import SelectCode from "@/components/SelectCode.vue";
+import Cascader from "@/components/Cascader.vue";
 import moment from "moment";
 export default {
   name: "gzlb",
@@ -589,16 +626,21 @@ export default {
     fztm,
     fcx,
     dcftpx,
-    dcfptxAj
+    dcfptxAj,
+    SelectCode,
+    Cascader
   },
   data () {
     return {
       barcode: "", // 条码号
       name: '', // 姓名
       sex: '',// 性别
-      idcard: "", // 身份证号
-      caseType: '', // 案件类型
+      ruleForm: {
+        sex: '',// 性别
         collectunitName: '', // 提取单位
+        caseType: '', // 案件类型
+      },
+      idcard: "", // 身份证号
       logicDatabaseoptions: [
         {
           // 逻辑库
@@ -725,7 +767,7 @@ export default {
         }
         reqParam.selectParam.barcode = this.barcode
         reqParam.selectParam.name = this.name
-        reqParam.selectParam.sex = this.sex
+        reqParam.selectParam.sex = this.ruleForm.sex
         reqParam.selectParam.idcard = this.idcard
       } else if (this.showType == 2) {
         // //console.log('bizhong bizhong ')
@@ -742,8 +784,8 @@ export default {
           }
         }
         reqParam.selectParam.barcode = this.barcode
-        reqParam.selectParam.caseType = this.caseType
-        reqParam.selectParam.collectunitName = this.collectunitName
+        reqParam.selectParam.caseType = this.ruleForm.caseType
+        reqParam.selectParam.collectunitName = this.ruleForm.collectunitName
       }
       // //console.info("请求===>", this.reqParam);
       this.$axios.post(reqUrl, reqParam).then((response) => {
@@ -771,6 +813,11 @@ export default {
       this.barcode = ""; // 条码号
       this.logicDatabase = "";// 逻辑分库
       this.queryType = "";// 类型
+      this.name = '';// 姓名
+      this.ruleForm.sex = '';// 性别
+      this.ruleForm.collectunitName = '';// 提取单位
+      this.ruleForm.caseType = '';// 案件类型
+      this.idcard = '';// 身份证号
       this.multipleSelection = [];
       this.ysxtAsjxgrybh = null;
       this.search()
@@ -1222,6 +1269,7 @@ export default {
 }
 .RAList {
   height: 700px;
+  width: 100%;
   box-sizing: border-box;
   padding: 0 24px;
   font-family: MicrosoftYaHei;
@@ -1229,33 +1277,28 @@ export default {
     margin-top: 10px;
     height: 55px;
     display: flex;
+    flex-direction: row;
     align-items: center;
-    /deep/.el-radio:nth-child(2) {
-      margin-left: 24px;
-    }
-    /deep/.el-radio__label {
-      font-size: 14px;
-      font-family: MicrosoftYaHei;
-      color: #666666;
-    }
+    justify-content: space-between;
     /deep/.el-input__icon {
       line-height: 32px;
     }
+    .headleft {
+      // width: 1200px;
+      // background-color: #fff;
+      display: flex;
+    }
     .search {
       display: flex;
       align-items: center;
-    }
-    .barcode {
-      // margin-left: 65px;
-      // margin-left: 24px;
       .item {
-        width: 60px;
+        width: 70px;
         font-size: 14px;
         font-family: MicrosoftYaHei;
         color: #333333;
       }
       /deep/.el-input.el-input--suffix {
-        width: 168px;
+        width: 156px;
         height: 32px;
       }
       /deep/.el-input--suffix .el-input__inner {
@@ -1263,72 +1306,28 @@ export default {
       }
     }
     .name {
-      // margin-left: 65px;
-      // margin-left: 24px;
-      .item {
-        width: 60px;
-        font-size: 14px;
-        font-family: MicrosoftYaHei;
-        color: #333333;
-      }
-      /deep/.el-input.el-input--suffix {
-        width: 168px;
-        height: 32px;
-      }
-      /deep/.el-input--suffix .el-input__inner {
-        height: 32px;
-      }
+      margin-left: 24px;
     }
     .ljfk {
       margin-left: 24px;
       .item {
-        width: 70px;
-        font-size: 14px;
-        font-family: MicrosoftYaHei;
-        color: #333333;
-      }
-      /deep/.el-input.el-input--suffix {
-        width: 156px;
-        height: 32px;
-      }
-      /deep/.el-input--suffix .el-input__inner {
-        height: 32px;
+        width: 80px;
       }
     }
     .taskNumber {
       margin-left: 24px;
       .item {
-        width: 80px;
-        font-size: 14px;
-        font-family: MicrosoftYaHei;
-        color: #333333;
-      }
-      /deep/.el-input.el-input--suffix {
-        width: 156px;
-        height: 32px;
-      }
-      /deep/.el-input--suffix .el-input__inner {
-        height: 32px;
+        width: 90px;
       }
     }
     .rkzt {
       margin-left: 24px;
       .item {
-        width: 80px;
-        font-size: 14px;
-        font-family: MicrosoftYaHei;
-        color: #333333;
+        width: 90px;
       }
-      /deep/.el-input.el-input--suffix {
-        width: 156px;
-        height: 32px;
     }
-      /deep/.el-input--suffix .el-input__inner {
-        height: 32px;
-      }
-    }
-    .right {
-      /deep/.el-button {
+    .headright {
+      /deep/.sx {
         width: 72px;
         height: 32px;
         background: #055fe7;

src/views/AllPersonnelBase/modules/ajxxk.vue

@@ -122,16 +122,15 @@
           <div class='zwDivHead'>
             <!-- <div class="blueDiv"></div>滚动<div class="Num"><span>8</span>/10</div> -->
           </div>
-
           <div
             class='zwDivBodyNoImg'
-            v-if='caseLoading'
+            v-if="caseLoading"
           >
             正在加载
           </div>
           <div
             class='zwDivBody'
-            v-if="CaseImgNum&&caseLoading==false"
+            v-else-if="CaseImgNum&&caseLoading==false"
           >
             <div
               v-for="(item, index) in CaseImg"
@@ -150,7 +149,7 @@
           </div>
           <div
             class='zwDivBodyNoImg'
-            v-if='CaseImgNum==0&&caseLoading==false'
+            v-else-if='CaseImgNum==0&&caseLoading==false'
           >
             该案件无图像信息
           </div>
@@ -223,8 +222,10 @@ export default {
         )
         .then((response) => {
           if (response.data.code == 0) {
-            this.CaseImgNum = response.data.ret.length;
-            if (this.CaseImgNum > 0) {
+            debugger
+            self.CaseImgNum = response.data.ret.length;
+            if (self.CaseImgNum > 0) {
+
               for (let i = 0; i <= response.data.ret.length; i++) {
                 let arr = {
                   code: null,
@@ -232,14 +233,13 @@ export default {
                 }
                 arr.code = response.data.ret[i].seq
                 arr.img = response.data.ret[i].image
-                this.CaseImg.push(arr)
+                self.CaseImg.push(arr)
               }
-              console.log(this.CaseImg, 'CaseImg')
+              // self.$forceUpdate()
+              console.log(self.CaseImg, 'CaseImg')
             }
             // 去掉加载状态 
             self.caseLoading = false;
-
-
           } else if (response.data.code == 4) {
             // 去掉加载状态
             self.caseLoading = false;

src/views/AllPersonnelBase/modules/dcftpx.vue

@@ -280,6 +280,7 @@
           <el-radio :label="1">分开文件</el-radio>
           <el-radio :label="2">同一文件</el-radio>
         </el-radio-group>
+        <el-checkbox v-model="tm">脱密</el-checkbox>
       </el-form-item>
       <!-- <el-form-item label="保存路径：">
         <el-input placeholder="请选择保存路径"></el-input>
@@ -409,6 +410,7 @@ export default {
       sjlx: null, // 数据类型
       wjgs: 1,//文件格式
       dcms: 1, //导出模式
+      tm: false, // 脱密
       tmbz: null,// 条码补值
     };
   },

src/views/AllPersonnelBase/modules/gz.vue

@@ -212,6 +212,7 @@ export default {
             if (response.data.code === 0) {
               this.$message.success("关注成功");
               this.comments = ''
+              this.$store.commit('layout/delcachePageName', 'gzlb');
               this.dialogVisible = false;
             } else {
               this.$message.error("关注失败");