Merge remote-tracking branch 'origin/dev_zwpt' into dev_zwpt

src/views/AllPersonnelBase/AllPersonnelBase.vue

@@ -188,6 +188,7 @@
               effect="dark"
               content="编辑"
               placement="top"
+              open-delay='200'
               @click="handleClick(scope.row)"
             >
               <div
@@ -204,6 +205,7 @@
               class="item"
               effect="dark"
               content="收藏"
+              open-delay='200'
               placement="top"
             >
               <div
@@ -221,6 +223,7 @@
               effect="dark"
               content="改号"
               placement="top"
+              open-delay='200'
             >
               <div
                 class="icon gx"
@@ -237,6 +240,7 @@
               effect="dark"
               content="发查询"
               placement="top"
+              open-delay='200'
             >
               <div
                 class="icon look"
@@ -253,6 +257,7 @@
               effect="dark"
               content="复制数据"
               placement="top"
+              open-delay='200'
             >
               <div
                 class="icon bz"
@@ -269,6 +274,7 @@
               effect="dark"
               content="打印"
               placement="top"
+              open-delay='200'
             >
               <div
                 class="icon print"
@@ -285,6 +291,7 @@
               effect="dark"
               content="删除"
               placement="top"
+              open-delay='200'
             >
               <el-popconfirm
                 placement="top-start"
@@ -333,6 +340,7 @@
       <gz
         :isShowGz="isShowGz"
         :rowData="rowData"
+        :type="type"
         @closeGz="closeGz"
       ></gz>
       <!-- 导出FTPX弹窗 -->
@@ -345,6 +353,7 @@
       <fztm
         :isShowFztm="isShowFztm"
         :rowData="rowData"
+        :type="type"
         @closeFztm="closeFztm"
       ></fztm>
       <!-- 更改人员条码弹窗 -->
@@ -355,7 +364,7 @@
         @closeGgrytm="closeGgrytm"
       >
       </ggrytm>
-      <!-- 更改人员条码弹窗 -->
+      <!-- 发查询弹窗 -->
       <fcx
         :isShowFcx="isShowFcx"
         :rowData="rowData"

src/views/AllPersonnelBase/modules/fztm.vue

 <template>
   <el-dialog
-    title="复制数据"
+    :title="title"
     :visible.sync="dialogVisible"
     width="418px"
     append-to-body
@@ -50,10 +50,14 @@ export default {
     },
     rowData: {
       default: false
+    },
+    type: {
+      default: false
     }
   },
   data () {
     return {
+      title: "",
       labelPosition: 'left', // 标签对齐方式
       dialogVisible: false, // 弹窗状态
       barcode: '', // 增加条码号
@@ -63,6 +67,7 @@ export default {
   },
   mounted () {
     this.dialogVisible = this.isShowFztm;
+    this.type == 'ry' ? this.title = '复制人员数据' : this.title = '复制案件数据'
 
   },
   watch: {
@@ -76,10 +81,22 @@ export default {
   },
   methods: {
     updata () {
-      Object.assign(this.reqParam, this.rowData);
-      delete this.reqParam.pid;
-      this.reqParam.barcode = this.barcode;
-      console.log(this.reqParam, '复制数据')
+      let reqUrl = '';
+      if (this.type == 'ry') {
+        reqUrl = '/api/personstore/copy'
+        Object.assign(this.reqParam, this.rowData);
+        delete this.reqParam.pid;
+        this.reqParam.barcode = this.barcode;
+        console.log(this.reqParam, '人员复制数据')
+      } else if (this.type == 'aj') {
+        reqUrl = '/api/casestore/copyBarcode'
+        let caseBase = {}
+        Object.assign(caseBase, this.rowData);
+        delete caseBase.cid;
+        caseBase.barcode = this.barcode
+        this.reqParam.caseBase = caseBase
+        console.log(this.reqParam, '案件复制数据')
+      }
       // 确认提示
       this.$confirm("是否确定复制数据?", "提示", {
         confirmButtonText: "确定",
@@ -88,7 +105,7 @@ export default {
       })
         .then(() => {
           this.$axios
-            .put("/api/personstore/copy", this.reqParam)
+            .put(reqUrl, this.reqParam)
             .then(response => {
               if (response.data.code === 0) {
                 this.$message.success("复制成功");

src/views/AllPersonnelBase/modules/ggrytm.vue

 <template>
   <el-dialog
-    title="更改人员条码"
+    :title="title"
     :visible.sync="dialogVisible"
     width="418px"
     append-to-body
@@ -57,6 +57,7 @@ export default {
   },
   data () {
     return {
+      title: "",
       labelPosition: 'left', // 标签对齐方式
       dialogVisible: false, // 弹窗状态
       reqParam: {  // 请求参数
@@ -69,6 +70,7 @@ export default {
   mounted () {
     this.dialogVisible = this.isShowGgrytm;
     console.log('更改条码类型', this.type)
+    this.type == 'ry' ? this.title = '更改人员条码' : this.title = '更改案件条码'
   },
   watch: {
     isShowGgrytm (newVal, oldVal) {
@@ -89,8 +91,11 @@ export default {
         newReqParams.barcode = this.reqParam.barcode
       } else if (this.type == 'aj') {
         reqUrl = 'api/casestore/updateBarcode'
-        newReqParams.cid = this.rowData.cid
-        newReqParams.barcode = this.reqParam.barcode
+        let caseBase = {}
+        caseBase.cid = this.rowData.cid
+        caseBase.barcode = this.reqParam.barcode
+        newReqParams.caseBase = caseBase
+
       }
       // 确认提示
       this.$confirm("是否确定更改数据?", "提示", {

src/views/AllPersonnelBase/modules/gz.vue

 <template>
   <el-dialog
-    title="加入关注人员列表"
+    :title="title"
     :visible.sync="dialogVisible"
-    width="757px"
+    width="950px"
     append-to-body
     :before-close="handleClose"
   >
     <el-table
+      v-if="type=='ry'"
       :data="rowData"
       :header-cell-style="{background:'#eef1f6',color:'#606266'}"
       style="width: 100%"
@@ -26,13 +27,13 @@
       <el-table-column
         prop="name"
         label="姓名"
-        width="80"
+        width="150"
       >
       </el-table-column>
       <el-table-column
         prop="sex"
         label="性别"
-        width="80"
+        width="150"
         :formatter="sexFormat"
       >
       </el-table-column>
@@ -42,6 +43,43 @@
       >
       </el-table-column>
     </el-table>
+    <el-table
+      v-else
+      :data="rowData"
+      :header-cell-style="{background:'#eef1f6',color:'#606266'}"
+      style="width: 100%"
+    >
+      <el-table-column
+        type="index"
+        label="#"
+        width="50"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="barcode"
+        label="条码号"
+        width="240"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="caseTypeNames"
+        label="案件类型"
+        width="240"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="briefdesc"
+        label="简要案情"
+        width="240"
+        :formatter="sexFormat"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="collectunitname"
+        label="提取单位"
+      >
+      </el-table-column>
+    </el-table>
     <div class='total'>
       <span>共计{{rowData.length}}条数据</span>
     </div>
@@ -50,7 +88,7 @@
       type="textarea"
       :rows="5"
       placeholder="请输入备注信息"
-      v-model="reqParam.myPerson.comments"
+      v-model="comments"
     >
     </el-input>
     <span
@@ -77,25 +115,24 @@ export default {
     },
     rowData: {
       default: false
+    },
+    type: {
+      default: false
     }
   },
   data () {
     return {
+      title: '',
       labelPosition: 'left', // 标签对齐方式
       dialogVisible: false, // 弹窗状态
+      comments: '',//备注
       reqParam: {  // 请求参数
-        pid: '',// 关注ID
-        barcode: '',//条码号
-        myPerson: {
-          comments: '',//备注
-          pid: '',// 关注ID
-          barcode: '',//条码号
-        }
       },
     };
   },
   mounted () {
     this.dialogVisible = this.isShowGz;
+    this.type == 'ry' ? this.title = '加入人员关注列表' : this.title = '加入案件关注列表'
   },
   watch: {
     isShowGz (newVal, oldVal) {
@@ -108,18 +145,58 @@ export default {
   },
   methods: {
     focus () {
-      let barCode = [];
-      let myPerson = [];
-      for (let i = 0; i < this.rowData.length; i++) {
-        myPerson.push(this.rowData[i].pid);
-        barCode.push(this.rowData[i].barcode);
+      let reqUrl = '';
+      if (this.type == 'ry') {
+        reqUrl = "/api/mypsn/add"
+        let newReqParams = {  // 请求参数
+          pid: '',// 关注ID
+          barcode: '',//条码号
+          myPerson: {
+            comments: '',//备注
+            pid: '',// 关注ID
+            barcode: '',//条码号
+          }
+        };
+        let barCode = [];
+        let myPerson = [];
+        for (let i = 0; i < this.rowData.length; i++) {
+          myPerson.push(this.rowData[i].pid);
+          barCode.push(this.rowData[i].barcode);
+        }
+        newReqParams.pid = myPerson[0];
+        newReqParams.myPerson.pid = myPerson;
+        newReqParams.barcode = barCode[0];
+        newReqParams.myPerson.barcode = barCode;
+        newReqParams.myPerson.comments = this.comments;
+        this.reqParam = newReqParams
+        console.log('关注人员ID', myPerson);
+      } else if (this.type == 'aj') {
+        reqUrl = "/api/mycase/add"
+        let newReqParams = {
+          cid: '',// 关注ID
+          barcode: '',//条码号
+          myCase: {
+            comments: '',//备注
+            cid: '',// 关注ID
+            barcode: '',//条码号
+          }
+        }
+        let barCode = [];
+        let myCase = [];
+        for (let i = 0; i < this.rowData.length; i++) {
+          myCase.push(this.rowData[i].cid);
+          barCode.push(this.rowData[i].barcode);
+        }
+        newReqParams.cid = myCase[0];
+        newReqParams.myCase.cid = myCase;
+        newReqParams.barcode = barCode[0];
+        newReqParams.myCase.barcode = barCode;
+        newReqParams.myCase.comments = this.comments;
+        this.reqParam = newReqParams
+        console.log('关注案件ID', myCase);
       }
-      this.reqParam.pid = myPerson[0];
-      this.reqParam.myPerson.pid = myPerson;
-      this.reqParam.barcode = barCode[0];
-      this.reqParam.myPerson.barcode = barCode;
-      console.log('关注ID', myPerson);
-      if (this.reqParam.myPerson.comments.length == 0) {
+
+      if (this.comments.length == 0) {
         console.log('没输入')
         this.$message.error("请输入备注信息！");
       } else {
@@ -132,11 +209,11 @@ export default {
         })
           .then(() => {
             this.$axios
-              .post("/api/mypsn/add", this.reqParam)
+              .post(reqUrl, this.reqParam)
               .then(response => {
                 if (response.data.code === 0) {
                   this.$message.success("关注成功");
-                  this.reqParam.myPerson.comments = ''
+                  this.comments = ''
                   this.dialogVisible = false;
                 } else {
                   this.$message.error("关注失败");

src/views/AllPersonnelBase/modules/tjddl.vue

 <template>
   <el-dialog
-    title="添加到队列"
+    :title="title"
     :visible.sync="dialogVisible"
     width="418px"
     append-to-body
@@ -9,35 +9,51 @@
     <el-form
       :label-position="labelPosition"
       label-width="120px"
-      :model="reqParam"
     >
-      <el-form-item label="选择队列">
+      <el-form-item
+        label="选择队列"
+        v-if="type== 'ry'"
+      >
         <el-select
-          v-model="reqParam.checkQue"
+          v-model="checkQue"
           placeholder="请选择队列"
         >
           <el-option
-            label="处理队列"
+            label="人员队列"
             value="personque"
           ></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item
+        label="选择队列"
+        v-else
+      >
+        <el-select
+          v-model="checkQue"
+          placeholder="请选择队列"
+        >
+          <el-option
+            label="案件队列"
+            value="caseque"
+          ></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="删除原图">
         <el-switch
-          v-model="reqParam.delbmp"
+          v-model="delbmp"
           active-value="是"
           inactive-value="否"
         ></el-switch>
       </el-form-item>
       <el-form-item label="覆盖原图">
         <el-switch
-          v-model="reqParam.replacecpr"
+          v-model="replacecpr"
           active-value="1"
           inactive-value="0"
         ></el-switch>
       </el-form-item>
       <el-form-item label="处理模式">
-        <el-radio-group v-model="reqParam.managetype">
+        <el-radio-group v-model="managetype">
           <el-radio
             label="全部处理"
             value='全部处理'
@@ -49,7 +65,7 @@
         </el-radio-group>
       </el-form-item>
       <el-form-item label="处理对象">
-        <el-radio-group v-model="reqParam.manageorgCpr">
+        <el-radio-group v-model="manageorgCpr">
           <el-radio :label="0">处理原图</el-radio>
           <el-radio :label="1">处理压缩图</el-radio>
         </el-radio-group>
@@ -86,21 +102,22 @@ export default {
   },
   data () {
     return {
+      title: '',
       labelPosition: 'left', // 标签对齐方式
       dialogVisible: false, // 弹窗状态
+      checkQue: '', //选择队列
+      delbmp: '', // 删除原图
+      replacecpr: '',// 覆盖原图
+      managetype: '',// 处理模式
+      manageorgCpr: '',//处理对象
       reqParam: {  // 请求参数
-        checkQue: '', //选择队列
-        delbmp: '', // 删除原图
-        replacecpr: '',// 覆盖原图
-        managetype: '',// 处理模式
-        manageorgCpr: '',//处理对象
-        personDoList: []
       },
     };
   },
   mounted () {
     this.dialogVisible = this.isShowTjddl;
     console.log('添加到队列类型', this.type)
+    this.type == 'ry' ? this.title = '添加到人员队列' : this.title = '添加到案件队列'
   },
   watch: {
     isShowTjddl (newVal, oldVal) {
@@ -113,20 +130,61 @@ export default {
   },
   methods: {
     addList () {
-      for (let i = 0; i < this.rowData.length; i++) {
-        let arr = {
-          barcode: '',
-          pid: ''
+      let reqUrl = '';
+      let newReqParams = {}
+      if (this.type == 'ry') {
+        reqUrl = "/api/psn/handleque/add"
+        newReqParams = {
+          checkQue: '', //选择队列
+          delbmp: '', // 删除原图
+          replacecpr: '',// 覆盖原图
+          managetype: '',// 处理模式
+          manageorgCpr: '',//处理对象
+          personDoList: []
+        }
+        for (let i = 0; i < this.rowData.length; i++) {
+          let arr = {
+            barcode: '',
+            pid: ''
+          }
+          arr.barcode = this.rowData[i].barcode;
+          arr.pid = this.rowData[i].pid;
+          newReqParams.personDoList.push(arr)
+          this.reqParam = newReqParams
+        }
+        newReqParams.checkQue = this.checkQue
+        newReqParams.delbmp = this.delbmp
+        newReqParams.replacecpr = this.replacec
+        newReqParams.managetype = this.managetype
+        newReqParams.manageorgCpr = this.manageorgCpr
+        console.log(this.reqParam, '人员添加到队列')
+      } else if (this.type == 'aj') {
+        reqUrl = "api/case/handlecaseque/add"
+        newReqParams = {
+          checkQue: '', //选择队列
+          delbmp: '', // 删除原图
+          replacecpr: '',// 覆盖原图
+          managetype: '',// 处理模式
+          manageorgCpr: '',//处理对象
+          caseBaseList: []
+        }
+        for (let i = 0; i < this.rowData.length; i++) {
+          let arr = {
+            barcode: '',
+            cid: ''
+          }
+          arr.barcode = this.rowData[i].barcode;
+          arr.cid = this.rowData[i].cid;
+          newReqParams.caseBaseList.push(arr)
+          this.reqParam = newReqParams
         }
-        arr.barcode = this.rowData[i].barcode;
-        arr.pid = this.rowData[i].pid;
-        // myPerson.push(this.rowData[i].pid);
-        // barCode.push(this.rowData[i].barcode);
-        this.reqParam.personDoList.push(arr)
-      }
-      // this.reqParam.personDoList.pid = myPerson;
-      // this.reqParam.personDoList.barcode = barCode;
-      console.log(this.reqParam, '添加到队列')
+        newReqParams.checkQue = this.checkQue
+        newReqParams.delbmp = this.delbmp
+        newReqParams.replacecpr = this.replacec
+        newReqParams.managetype = this.managetype
+        newReqParams.manageorgCpr = this.manageorgCpr
+        console.log(this.reqParam, '案件添加到队列')
+      };
       // 确认提示
       this.$confirm("是否确定添加到队列?", "提示", {
         confirmButtonText: "确定",
@@ -135,7 +193,7 @@ export default {
       })
         .then(() => {
           this.$axios
-            .post("/api/psn/handleque/add", this.reqParam)
+            .post(reqUrl, this.reqParam)
             .then(response => {
               if (response.data.code === 0) {
                 this.$message.success("添加成功");

src/views/AllPersonnelBase/qbalk.vue

@@ -11,6 +11,8 @@
         clear="search-input"
         placeholder="请输入条码，*支持模糊搜索"
         v-model="reqParam.caseStoreCustomSearchReq.barcode"
+        maxlength="23"
+        show-word-limit
       ></el-input>
       <div
         class="search-icon el-icon-search"
@@ -52,12 +54,18 @@
           v-clipboard:error="onError"
         >复制条码</div>
         <div class="btn">导出FTPX</div>
-        <div class="btn">关注</div>
+        <div
+          class="btn"
+          @click="isShowGzBtn"
+        >关注</div>
         <div
           class="btn"
           @click="delMore"
         >删除</div>
-        <div class="btn send">发查询</div>
+        <div
+          class="btn send"
+          @click="isShowFcxBtn"
+        >发查询</div>
       </div>
     </div>
     <!--四 -->
@@ -148,6 +156,7 @@
               effect="dark"
               content="编辑"
               placement="top"
+              open-delay='200'
             >
               <div
                 class="icon bj"
@@ -164,10 +173,11 @@
               effect="dark"
               content="收藏"
               placement="top"
+              open-delay='200'
             >
               <div
                 class="icon sc"
-                @click="handleClick(scope.row)"
+                @click="isShowGzBtn1(scope.row)"
               >
                 <img
                   src="../../assets/img/qbryk/sc.png"
@@ -180,6 +190,7 @@
               effect="dark"
               content="改号"
               placement="top"
+              open-delay='200'
             >
               <div
                 class="icon gx"
@@ -196,6 +207,7 @@
               effect="dark"
               content="发查询"
               placement="top"
+              open-delay='200'
             >
               <div
                 class="icon look"
@@ -212,10 +224,11 @@
               effect="dark"
               content="复制数据"
               placement="top"
+              open-delay='200'
             >
               <div
                 class="icon bz"
-                @click="handleClick(scope.row)"
+                @click="isShowFztmBtn(scope.row)"
               >
                 <img
                   src="../../assets/img/qbryk/bz.png"
@@ -228,6 +241,7 @@
               effect="dark"
               content="打印"
               placement="top"
+              open-delay='200'
             >
               <div
                 class="icon print"
@@ -244,12 +258,13 @@
               effect="dark"
               content="删除"
               placement="top"
+              open-delay='200'
             >
               <el-popconfirm
                 placement="top-start"
                 :hide-icon="true"
                 confirm-button-text="确认"
-                @onConfirm="deleteClick(scope.row)"
+                @onConfirm="delOne(scope.row.cid)"
                 class="icon del"
                 title="确认要删除该数据吗？该操作无法撤消！"
               >
@@ -289,7 +304,14 @@
         :type="type"
         @closeTjddl="closeTjddl"
       ></tjddl>
-      <!-- 更改人员条码弹窗 -->
+      <!-- 关注弹窗 -->
+      <gz
+        :isShowGz="isShowGz"
+        :rowData="rowData"
+        :type="type"
+        @closeGz="closeGz"
+      ></gz>
+      <!-- 更改条码弹窗 -->
       <ggrytm
         :isShowGgrytm="isShowGgrytm"
         :rowData="rowData"
@@ -297,6 +319,21 @@
         @closeGgrytm="closeGgrytm"
       >
       </ggrytm>
+      <!-- 复制数据弹窗 -->
+      <fztm
+        :isShowFztm="isShowFztm"
+        :rowData="rowData"
+        :type="type"
+        @closeFztm="closeFztm"
+      ></fztm>
+      <!-- 发查询弹窗 -->
+      <fcx
+        :isShowFcx="isShowFcx"
+        :rowData="rowData"
+        :type="type"
+        @closeFcx="closeFcx"
+      >
+      </fcx>
 
     </div>
   </el-container>
@@ -308,6 +345,7 @@ import gz from "./modules/gz.vue" // 关注
 import fztm from "./modules/fztm.vue" // 复制数据弹窗 
 import dcftpx from "./modules/dcftpx.vue" //导出FTPX弹窗
 import ggrytm from "./modules/ggrytm.vue"// 更改人员条码弹窗
+import fcx from "./modules/fcx.vue" // 发查询弹窗
 export default {
   name: "AllPersonnelBase",
   components: {
@@ -315,12 +353,16 @@ export default {
     gz,
     fztm,
     dcftpx,
-    ggrytm
+    ggrytm,
+    fcx
   },
   data () {
     return {
       isShowTjddl: false,// 添加到队列
-      isShowGgrytm: false,// 更改人员条码
+      isShowGz: false,// 关注
+      isShowGgrytm: false,// 更改条码
+      isShowFztm: false, //复制条码
+      isShowFcx: false, //发查询
       type: 'aj', // 人员还是案件
       reqParam: {
         caseStoreCustomSearchReq: {
@@ -360,8 +402,57 @@ export default {
           }
         });
     },
-    // 多条删除
-    delMore () { },
+    // 多选删除
+    delMore () {
+      // 检查table选择的数据 如果没有选择则不可以删除
+      if (this.multipleSelection.length === 0) {
+        this.$message.error("请选择需要删除的数据！");
+        return;
+      }
+      // 封装删除的psns为数组
+      let cids = [];
+      for (let i = 0; i < this.multipleSelection.length; i++) {
+        cids.push(this.multipleSelection[i].cid);
+      }
+      this.doDelete(cids.toString());
+    },
+    // 单选删除
+    delOne (val) {
+      console.log("删除数据")
+      // 将传入的psns转为数组
+      let cids = [];
+      cids.push(val);
+      console.info("删除接口里的cids：", cids);
+      this.doDelete(cids.toString());
+    },
+    // 请求删除接口
+    doDelete (cids) {
+      console.log('111111', cids)
+      // 删除确认提示
+      this.$confirm("是否确定删除已选择的数据?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          this.$axios
+            .delete("api/casestore/casebase", { params: { cids } })
+            .then(response => {
+              if (response.data.code === 0) {
+                this.$message.success("删除成功");
+                this.search();
+              } else {
+                this.$message.error("删除失败");
+              }
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消删除"
+          });
+        });
+    },
     // 时间格式化
     dateTimeFormat (row, colnum) {
       let prop = colnum.property;
@@ -423,6 +514,28 @@ export default {
       console.log('添加到队列关闭', val)
       this.isShowTjddl = val
     },
+    // 关注
+    isShowGzBtn () { // 多行
+      console.log('关注')
+      if (this.multipleSelection.length === 0) {
+        this.$message.error("请选择需要关注的数据！");
+      } else {
+        this.rowData = this.multipleSelection
+        this.isShowGz = true;
+      }
+    },
+    isShowGzBtn1 (val) { // 单行
+      console.log(val, 123)
+      let rowVal = [];
+      rowVal.push(val)
+      this.rowData = rowVal
+      this.isShowGz = true;
+    },
+    closeGz (val) {
+      console.log('关注关闭', val)
+      this.isShowGz = val
+      this.search()
+    },
     // 更改条码操作
     isShowGgrytmBtn (val) {
       console.log('更改条码', val)
@@ -434,6 +547,28 @@ export default {
       this.isShowGgrytm = val
       this.search()
     },
+    //复制条码列表操作
+    isShowFztmBtn (val) {
+      console.log('复制条码', val)
+      this.rowData = val
+      this.isShowFztm = true;
+    },
+    closeFztm (val) {
+      console.log('closeFztm复制条码关闭', val)
+      this.isShowFztm = val
+      this.search()
+    },
+    //发查询操作
+    isShowFcxBtn (val) {
+      console.log('发查询', val)
+      this.rowData = val
+      this.isShowFcx = true;
+    },
+    closeFcx (val) {
+      console.log('发查询关闭', val)
+      this.isShowFcx = val
+      this.search()
+    },
     /**
      * @description: 是否是批量操作
      * @param {*}
@@ -446,14 +581,6 @@ export default {
       alert(888);
     },
     /**
-     * @description: 删除数据
-     * @param {*} row
-     * @return {*}
-     */
-    deleteClick (row) {
-      console.log(row);
-    },
-    /**
      * @description: 编辑数据
      * @param {*} row
      * @return {*}