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

src/views/AllPersonnelBase/modules/fcx.vue

@@ -306,8 +306,8 @@
           <el-radio-group v-model="ruleForm.cxlx.querytype">
             <el-radio
               label="2"
-              style="color: #00ccb5"
-              class='color_00ccb5'
+              style="color: #00b47a"
+              class='color_00b47a'
             >正查</el-radio>
             <el-radio
               label="3"
@@ -1085,8 +1085,8 @@ export default {
 /deep/.color_fa9500 .el-radio__input.is-checked + .el-radio__label {
   color: #fa9500;
 }
-/deep/.color_00ccb5 .el-radio__input.is-checked + .el-radio__label {
-  color: #00ccb5;
+/deep/.color_00b47a .el-radio__input.is-checked + .el-radio__label {
+  color: #00b47a;
 }
 /deep/.color_055fe7 .el-radio__input.is-checked + .el-radio__label {
   color: #055fe7;

src/views/SystemManage/GroupManage.vue

@@ -48,6 +48,7 @@
     </div>
     <div class="operation">
       <div class="btn1" @click="batch">批量操作</div>
+      <div @click="addgroup" class="clear-btn">addgroup</div>
       <div class="btns">
         <div class="btn1" @click="delMore()">删除</div>
         <div class="add" @click="open">
@@ -593,6 +594,18 @@ export default {
     }
   },
   methods: {
+    addgroup() {
+      var group = {
+        userId: 39898889,
+        status: -17476821,
+        describe: "sit laborum Excepteur officia",
+        name: "ullamco esse",
+        roleId: -70041648
+      };
+      this.$axios.post("/system/user-groups", group).then(res => {
+        console.info(res);
+      });
+    },
     clear() {
       this.searchParams.page.page = 1; //必填
       this.searchParams.page.total = 20; //必填

src/views/SystemManage/RoleManage.vue

@@ -60,6 +60,7 @@
               数据权限
             </div>
           </div>
+          <div @click="addrole">addrole</div>
           <div class="save">
             <div class="btn" @click="save">保存</div>
             <!--            <el-button @click="add">add</el-button>-->
@@ -333,6 +334,15 @@ export default {
     };
   },
   methods: {
+    addrole() {
+      var role = {
+        name: "do aute officia irure voluptate",
+        permissionIds: []
+      };
+      this.$axios.post("/system/roles", role).then(res => {
+        console.info(res);
+      });
+    },
     // 复制
     copy() {
       console.info("复制数据");

src/views/SystemManage/UserManage.vue

@@ -56,6 +56,8 @@
     </div>
     <div class="operation">
       <div class="btn1" @click="batch">批量操作</div>
+      <div class="clear-btn" @click="adduser">adduser</div>
+      <div class="clear-btn" @click="searchuser">searchuser</div>
       <div class="btns">
         <div class="btn1" @click="delMore()">删除</div>
         <div class="add" @click="open">
@@ -384,6 +386,8 @@
 
 <script>
 import "@/icons/ic_add.svg";
+import qs from "qs";
+
 export default {
   name: "UserManage",
   created() {
@@ -632,6 +636,28 @@ export default {
     }
   },
   methods: {
+    adduser() {
+      var user = {
+        username: "2021",
+        phoneNumber: "15806613121",
+        password: "2021",
+        policeNumber: "223",
+        unitName: "长沙",
+        unitCode: "123",
+        name: "王明光",
+        status: 1,
+        userGroupId: 1,
+        roleId: 1
+      };
+      this.$axios.post("/system/users", user).then(res => {
+        console.info(res);
+      });
+    },
+    searchuser() {
+      this.$axios.get("/system/users").then(res => {
+        console.info(res);
+      });
+    },
     // 新增
     submitForm(formName) {
       this.$refs.addFormParams.validate(valid => {

src/views/cxyrd/LT.vue

@@ -87,7 +87,11 @@
           </div>
           <div class="bzitem">
             <div class="bzname">比中人联系电话：</div>
-            <el-input class="bzphone" v-model="phone" placeholder="请输入内容"></el-input>
+            <el-input
+              class="bzphone"
+              v-model="phone"
+              placeholder="请输入内容"
+            ></el-input>
             <div class="input-error" v-show="isPhoneError">
               <!-- <img src="@/assets/img/inputerror.png" alt=""> -->
               <svg-icon icon-class="error" class="icon" />
@@ -100,7 +104,12 @@
         <div class="line"></div>
         <div class="bzfooter">
           <div class="footer-title">备注</div>
-          <el-input type="textarea" :rows="5" placeholder="在此输入备注信息" v-model="textarea">
+          <el-input
+            type="textarea"
+            :rows="5"
+            placeholder="在此输入备注信息"
+            v-model="textarea"
+          >
           </el-input>
         </div>
         <div class="bzbtns">
@@ -111,7 +120,11 @@
     </div>
 
     <!-- 认定完成确认框 -->
-    <div class="rdwcDialog" v-show="isShowrdwcDialogBg" @click="cancelrdwc"></div>
+    <div
+      class="rdwcDialog"
+      v-show="isShowrdwcDialogBg"
+      @click="cancelrdwc"
+    ></div>
     <div class="rdwccontent" v-show="isShowrdwcDialog">
       <div class="title">当前候选未全部查看，是否确认认定完成？</div>
       <div class="rdwcbtns">
@@ -136,7 +149,7 @@ export default {
     LTCandidate,
     ImageEd
   },
-  data () {
+  data() {
     return {
       qid: null,
       radio: 6,
@@ -161,12 +174,12 @@ export default {
       isShowrdwcDialog: false
     };
   },
-  created () {
+  created() {
     this.qid = this.$route.query.rowData;
     console.log("源qid====>", this.qid);
   },
   watch: {
-    phone (newValue, oldValue) {
+    phone(newValue, oldValue) {
       if (newValue.length < 7) {
         this.isPhoneError = true;
         document
@@ -186,7 +199,7 @@ export default {
      * @param {*}
      * @return {*}
      */
-    confirmrdwc () {
+    confirmrdwc() {
       let self = this;
       this.isShowrdwcDialogBg = false;
       this.isShowrdwcDialog = false;
@@ -228,7 +241,7 @@ export default {
      * @param {*}
      * @return {*}
      */
-    cancelrdwc () {
+    cancelrdwc() {
       this.isShowrdwcDialogBg = false;
       this.isShowrdwcDialog = false;
     },
@@ -237,7 +250,7 @@ export default {
      * @param {*}
      * @return {*}
      */
-    cancelbz () {
+    cancelbz() {
       this.isShowbzDialogBg = false;
       this.isShowbzDialog = false;
     },
@@ -246,7 +259,7 @@ export default {
      * @param {*}
      * @return {*}
      */
-    confirmbz () {
+    confirmbz() {
       let self = this;
       console.log("比中");
       let affirmstatus = "1";
@@ -302,7 +315,7 @@ export default {
      * @param {*}
      * @return {*}
      */
-    getUserInfo2 () {
+    getUserInfo2() {
       let self = this;
       let destbarcode = sessionStorage.getItem("destbarcode") || "";
       console.log(destbarcode);
@@ -323,7 +336,7 @@ export default {
      * @param {*} id
      * @return {*}
      */
-    getUserInfo (id = 1234) {
+    getUserInfo(id = 1234) {
       let self = this;
       this.$axios({
         method: "post",
@@ -354,7 +367,7 @@ export default {
      * @param {*}
      * @return {*}
      */
-    Bz () {
+    Bz() {
       this.getUserInfo();
       this.getUserInfo2();
       this.asjbh = sessionStorage.getItem("srcbarcode");
@@ -369,7 +382,7 @@ export default {
      * @param {*}
      * @return {*}
      */
-    Rdwc () {
+    Rdwc() {
       console.log("认定完成");
       let qqid = sessionStorage.getItem("qqid") || "";
 
@@ -396,7 +409,7 @@ export default {
      * @param {*} code
      * @return {*}
      */
-    judgeZw (code) {
+    judgeZw(code) {
       console.log(code);
       switch (code) {
         case 1:
@@ -462,7 +475,7 @@ export default {
       }
     }
   },
-  beforeDestroy () {
+  beforeDestroy() {
     //组件销毁前需要解绑事件。否则会出现重复触发事件的问题
     this.$bus.$off("updateFinderSource");
   }
@@ -508,7 +521,7 @@ div {
     height: 22px;
     font-size: 16px;
     font-weight: bold;
-    color: #00ccb5;
+    color: #00b47a;
     line-height: 22px;
     margin-top: 14px;
   }

src/views/cxyrd/QueryConfirm.vue

@@ -85,7 +85,7 @@
               :class="[
                 reqParam.contrastCustomSearchReq.querytypes.includes(btn.value)
                   ? 'btn-active'
-                  : '',
+                  : ''
               ]"
             >
               {{ btn.name }}
@@ -101,7 +101,7 @@
               :class="[
                 reqParam.contrastCustomSearchReq.queryclasss.includes(btn.value)
                   ? 'btn-active'
-                  : '',
+                  : ''
               ]"
             >
               {{ btn.name }}
@@ -117,7 +117,7 @@
               :class="[
                 reqParam.contrastCustomSearchReq.remoteflags.includes(btn.value)
                   ? 'btn-active'
-                  : '',
+                  : ''
               ]"
             >
               {{ btn.name }}
@@ -141,7 +141,7 @@
             :class="[
               reqParam.contrastCustomSearchReq.querystates.includes(btn.value)
                 ? 'btn-active'
-                : '',
+                : ''
             ]"
           >
             {{ btn.name }}
@@ -316,7 +316,7 @@
                 </div>
                 <div
                   v-else-if="scope.row.querytype === '2'"
-                  style="color: #08bd9e"
+                  style="color: #00b47a"
                 >
                   {{ scope.row.queryTypeName }}
                 </div>
@@ -442,7 +442,7 @@ export default {
         page: {
           total: 0,
           pageSize: 10,
-          currPage: 1,
+          currPage: 1
         },
         contrastCustomSearchReq: {
           barcode: "",
@@ -454,8 +454,8 @@ export default {
           querytypes: [],
           querystates: [],
           remoteflags: [],
-          queryclasss: [],
-        },
+          queryclasss: []
+        }
       },
       list: [],
       currentPage: 5,
@@ -486,7 +486,7 @@ export default {
         "queryclass",
         "affirmtime",
         "requestdatetime",
-        "userdesc",
+        "userdesc"
       ],
       defaultTableProps: content,
       //标签数组
@@ -495,20 +495,20 @@ export default {
         { value: "2", name: "正查", type: "querytypes" },
         { value: "1", name: "倒查", type: "querytypes" },
         { value: "0", name: "查重", type: "querytypes" },
-        { value: "3", name: "串查", type: "querytypes" },
+        { value: "3", name: "串查", type: "querytypes" }
       ],
       queryClassBtns: [
         { value: "1", name: "最高", type: "queryclasss" },
         { value: "2", name: "高", type: "queryclasss" },
         { value: "3", name: "中", type: "queryclasss" },
         { value: "4", name: "低", type: "queryclasss" },
-        { value: "5", name: "最低", type: "queryclasss" },
+        { value: "5", name: "最低", type: "queryclasss" }
       ],
       remoteFlagBtns: [
         { value: "0", name: "本地查询", type: "remoteflags" },
         { value: "0", name: "远程查询", type: "remoteflags" },
         { value: "0", name: "城市", type: "remoteflags" },
-        { value: "0", name: "国家库", type: "remoteflags" },
+        { value: "0", name: "国家库", type: "remoteflags" }
       ],
       queryStateBtns: [
         { value: "0", name: "等待比对", type: "querystates" },
@@ -522,12 +522,12 @@ export default {
         { value: "29", name: "复核出错", type: "querystates" },
         { value: "99", name: "标记删除", type: "querystates" },
         { value: "-1", name: "无效", type: "querystates" },
-        { value: "-2", name: "同步特征", type: "querystates" },
+        { value: "-2", name: "同步特征", type: "querystates" }
       ],
       expanded: false, // 展开标志
       historyDialogVisible: false,
       cxyrdWidth1: 200,
-      height: 450,
+      height: 450
       // cxyrdWidth1: sessionStorage.getItem('cxyrdWidth1'),
       // height: sessionStorage.getItem('tableHeight')
     };
@@ -540,7 +540,7 @@ export default {
     this.height = (h1 * w2) / w1;
     this.cxyrdWidth1 = (this.cxyrdWidth1 * w2) / w1;
 
-    content.forEach((item) => {
+    content.forEach(item => {
       // console.log(item);
       self.$set(item, "width", (item.width * w2) / w1);
     });
@@ -550,11 +550,11 @@ export default {
     // 批量处理
     checkedProps(val) {
       this.tableProps = this.defaultTableProps.filter(
-        (i) => val.indexOf(i.prop) >= 0
+        i => val.indexOf(i.prop) >= 0
       );
       //挑选被选中的对象
       this.key = this.key + 1; //为了保证table 每次都会重渲，这样做体验感更好，如果不为table设置key值的话，用户一旦选中了复选框选项，就是在原来table基础上添加删除每一列，页面就有跳动的感觉，体验感不好
-    },
+    }
   },
   computed: {
     // 计算总页数
@@ -562,7 +562,7 @@ export default {
       return (
         Math.floor(this.reqParam.page.total / this.reqParam.page.pageSize) + 1
       );
-    },
+    }
   },
   methods: {
     // 获取认定列表
@@ -571,7 +571,7 @@ export default {
       // console.info("请求===>", this.reqParam.contrastCustomSearchReq);
       this.$axios
         .post("/api/queryque/standardQid", this.reqParam)
-        .then((response) => {
+        .then(response => {
           if (response.data.code === 0) {
             this.list = response.data.ret.list;
             this.reqParam.page.total = response.data.ret.total;
@@ -610,13 +610,13 @@ export default {
     // 获取用户信息
     getUserInfo(val) {
       var userInfo = [];
-      val.forEach((item) => {
+      val.forEach(item => {
         var user = {};
         user.userid = item.userid;
         user.userdesc = item.userdesc;
         userInfo.push(user);
         if (item.children) {
-          item.children.forEach((ite) => {
+          item.children.forEach(ite => {
             var use = {};
             use.userid = ite.userid;
             use.userdesc = ite.userdesc;
@@ -635,7 +635,7 @@ export default {
       // 返回arr数组过滤后对结果，结果为一个数组  过滤条件是对象中的value值
       // 如果res中没有某个键，就设置这个键为1
       return arr.filter(
-        (arr) => !res.has(arr.username) && res.set(arr.username, arr.username)
+        arr => !res.has(arr.username) && res.set(arr.username, arr.username)
       );
     },
     // 多条件查询 获取查询条件
@@ -643,17 +643,17 @@ export default {
       let { name, value } = data;
       let list = this.reqParam.contrastCustomSearchReq[type];
       if (list.includes(value)) {
-        list = list.filter((item) => item !== value);
+        list = list.filter(item => item !== value);
         this.dynamicTags = this.dynamicTags.filter(
-          (item) => item.value !== value
+          item => item.value !== value
         );
       } else {
         //点击优先级先清除优先级的按钮在添加
         if (type == "queryclasss") {
-          this.queryClassBtns.forEach((i) => {
-            let listIndex = list.findIndex((j) => j == i.value);
+          this.queryClassBtns.forEach(i => {
+            let listIndex = list.findIndex(j => j == i.value);
             let dynamicTagsIndex = this.dynamicTags.findIndex(
-              (j) => j.name == i.name
+              j => j.name == i.name
             );
             if (listIndex >= 0) list.splice(listIndex, 1);
             if (dynamicTagsIndex >= 0)
@@ -718,12 +718,12 @@ export default {
       this.$confirm("是否确定删除已选择的数据?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning",
+        type: "warning"
       })
         .then(() => {
           this.$axios
             .post("/api/queryque/delete", { qqid: qqid })
-            .then((response) => {
+            .then(response => {
               if (response.data.code === 0) {
                 this.$message.success("删除成功");
                 this.search();
@@ -735,7 +735,7 @@ export default {
         .catch(() => {
           this.$message({
             type: "info",
-            message: "已取消删除",
+            message: "已取消删除"
           });
         });
     },
@@ -752,8 +752,8 @@ export default {
               qqid: row.qqid,
               qid: row.qid,
               barcode: row.barcode,
-              type: "father",
-            },
+              type: "father"
+            }
           });
           window.open(routeUrl.href, "_blank");
         } else {
@@ -763,8 +763,8 @@ export default {
               qqid: row.qqid,
               qid: row.qid,
               barcode: row.barcode,
-              type: "son",
-            },
+              type: "son"
+            }
           });
           window.open(routeUrl.href, "_blank");
         }
@@ -777,14 +777,14 @@ export default {
           // 父级
           let routeUrl = this.$router.resolve({
             path: "/confirm/TL",
-            query: { qid: row.qid, qqid: row.qqid, type: "father" },
+            query: { qid: row.qid, qqid: row.qqid, type: "father" }
           });
           window.open(routeUrl.href, "_blank");
         } else {
           // 子级
           let routeUrl = this.$router.resolve({
             path: "/confirm/TL",
-            query: { qid: row.qid, qqid: row.qqid, type: "son" },
+            query: { qid: row.qid, qqid: row.qqid, type: "son" }
           });
           window.open(routeUrl.href, "_blank");
         }
@@ -796,13 +796,13 @@ export default {
         if (row.children) {
           let routeUrl = this.$router.resolve({
             path: "/confirm/LT",
-            query: { qid: row.qid, qqid: row.qqid, type: "father" },
+            query: { qid: row.qid, qqid: row.qqid, type: "father" }
           });
           window.open(routeUrl.href, "_blank");
         } else {
           let routeUrl = this.$router.resolve({
             path: "/confirm/LT",
-            query: { qid: row.qid, qqid: row.qqid, type: "son" },
+            query: { qid: row.qid, qqid: row.qqid, type: "son" }
           });
           window.open(routeUrl.href, "_blank");
         }
@@ -815,14 +815,14 @@ export default {
       // 获取展开标志
       this.expanded = expanded;
       // 获取下标
-      var i = this.list.findIndex((table) => table.queryId === row.queryId);
+      var i = this.list.findIndex(table => table.queryId === row.queryId);
       // var i = this.tableData.findIndex(table => table.id === row.id);
       // console.log(i);
       if (expanded) {
         this.list[i] = {
           qid: row.qid,
           children: row.children,
-          queryId: row.queryId,
+          queryId: row.queryId
         };
         this.$forceUpdate();
         // console.info("展开时row数据", this.list[i]);
@@ -854,7 +854,7 @@ export default {
           affirmtime: row.children[0].affirmtime,
           requestdatetime: row.children[0].requestdatetime,
           userdesc: row.children[0].userdesc,
-          queryTypeName: row.children[0].queryTypeName,
+          queryTypeName: row.children[0].queryTypeName
         };
         console.log(this.list[i]);
         this.$forceUpdate();
@@ -886,7 +886,7 @@ export default {
         this.$message.error("请选择需要复制条码号的数据！");
       } else {
         console.log(this.selectionData);
-        self.selectionData.forEach((item) => {
+        self.selectionData.forEach(item => {
           self.barcode.push(item.barcode);
         });
         this.barcode = this.barcode.join(",");
@@ -898,7 +898,7 @@ export default {
       this.$message({
         type: "success",
         // message: "复制条码号:" + this.barcode + "成功！"
-        message: "已复制到剪切板",
+        message: "已复制到剪切板"
       });
     },
     // 复制失败时的回调函数
@@ -912,24 +912,23 @@ export default {
       // console.info("选中", this.checkedProps);
     },
     // 当期页发生变化
-    handleCurrPageChange: function (val) {
+    handleCurrPageChange: function(val) {
       this.reqParam.page.currPage = val;
       this.search();
     },
     // 每页展示数量发生变化
-    handleSizeChange: function (val) {
+    handleSizeChange: function(val) {
       this.reqParam.page.pageSize = val;
       this.search();
     },
     // 标签关闭 isTag：是否为标签点击
     handleClose(tag) {
       let { type, value } = tag;
-      this.dynamicTags = this.dynamicTags.filter(
-        (item) => item.value !== value
-      );
-      this.reqParam.contrastCustomSearchReq[type] =
-        this.reqParam.contrastCustomSearchReq[type].filter(
-          (item) => item !== value
+      this.dynamicTags = this.dynamicTags.filter(item => item.value !== value);
+      this.reqParam.contrastCustomSearchReq[
+        type
+      ] = this.reqParam.contrastCustomSearchReq[type].filter(
+        item => item !== value
       );
       this.search();
     },
@@ -998,14 +997,14 @@ export default {
      */
     toggleSelection(rows) {
       if (rows) {
-        rows.forEach((row) => {
+        rows.forEach(row => {
           this.$refs.confirmTable.toggleRowSelection(row);
         });
       } else {
         this.$refs.confirmTable.clearSelection();
       }
       console.log(this.selectionData);
-    },
+    }
   },
   mounted() {
     console.log(this.height);
@@ -1019,7 +1018,7 @@ export default {
     // this.height = h1 -h2 -h3
     // console.log(this.height);
     this.search();
-  },
+  }
 };
 // 用户ID 下拉的数据
 const users = [{ username: "张三" }, { username: "李四" }, { username: "赵6" }];
@@ -1034,7 +1033,7 @@ const content = [
   { colume: "优先级", prop: "queryclass", width: 100 },
   { colume: "认定时间", prop: "affirmtime", width: 200 },
   { colume: "发送时间", prop: "requestdatetime", width: 200 },
-  { colume: "用户名", prop: "username", width: 100 },
+  { colume: "用户名", prop: "username", width: 100 }
 ];
 // 数据
 const datas1 = [
@@ -1109,7 +1108,7 @@ const datas1 = [
           '<?xml version="1.0"?><TEXT>=#54*$!#11?$</TEXT><LOGICPSN>0000000000000111</LOGICPSN>',
         queryStateName: "正在复核",
         queryTypeName: "串案",
-        private: "0",
+        private: "0"
       },
       {
         qid: 21,
@@ -1146,7 +1145,7 @@ const datas1 = [
           '<?xml version="1.0"?><TEXT>=#54*$!#11?$</TEXT><LOGICPSN>0000000000000111</LOGICPSN>',
         queryStateName: "认定出错",
         queryTypeName: "倒查",
-        private: "0",
+        private: "0"
       },
       {
         qid: 21,
@@ -1183,9 +1182,9 @@ const datas1 = [
           '<?xml version="1.0"?><TEXT>=#54*$!#11?$</TEXT><LOGICPSN>0000000000000111</LOGICPSN>',
         queryStateName: "复核出错",
         queryTypeName: "倒查",
-        private: "0",
-      },
-    ],
+        private: "0"
+      }
+    ]
   },
   {
     qid: 23,
@@ -1223,7 +1222,7 @@ const datas1 = [
     queryStateName: "正在复核",
     queryTypeName: "查重",
     children: null,
-    private: "0",
+    private: "0"
   },
   {
     qid: 8,
@@ -1297,18 +1296,18 @@ const datas1 = [
           '<?xml version="1.0"?><TEXT>=#54*$!#11?$</TEXT><LOGICPSN>0000000000000111</LOGICPSN>',
         queryStateName: "复核出错",
         queryTypeName: "倒查",
-        private: "0",
-      },
+        private: "0"
+      }
     ],
-    private: "0",
-  },
+    private: "0"
+  }
 ];
 const setQueryClass = [
   { queryclass: "1", name: "最高" },
   { queryclass: "2", name: "高" },
   { queryclass: "3", name: "中" },
   { queryclass: "4", name: "低" },
-  { queryclass: "5", name: "最低" },
+  { queryclass: "5", name: "最低" }
 ];
 </script>
 <style scoped lang="scss">

src/views/drFPTX/Index.vue

@@ -85,8 +85,8 @@
             >
             </el-table-column>
             <el-table-column
-              prop="name"
-              label="文件名称"
+              prop="index"
+              label="内序"
             >
             </el-table-column>
             <!-- <el-table-column label="条码号">
@@ -150,8 +150,8 @@
             >
             </el-table-column>
             <el-table-column
-              prop="name"
-              label="文件名称"
+              prop="index"
+              label="内序"
             >
             </el-table-column>
             <el-table-column
@@ -225,7 +225,7 @@
               <template slot-scope="scope">
                 <div
                   v-if='scope.row.type==0'
-                  style="color: #ffa219;"
+                  style="color: #fa9500;"
                 >{{scope.row.type | typeNum}}</div>
                 <div
                   v-if='scope.row.type==1'
@@ -233,7 +233,7 @@
                 >{{scope.row.type | typeNum}}</div>
                 <div
                   v-if='scope.row.type==2'
-                  style="color: #08BD9E;"
+                  style="color: #00b47a;"
                 >{{scope.row.type | typeNum}}</div>
                 <div
                   v-if='scope.row.type==3'
@@ -282,7 +282,7 @@
           <el-table
             height="550"
             :data="selectArr"
-            ref="selection"
+            ref="dataTable"
             @selection-change="checkRightAll"
             style="width: 100%"
           >
@@ -306,7 +306,7 @@
               <template slot-scope="scope">
                 <div
                   v-if='scope.row.type==0'
-                  style="color: #ffa219;"
+                  style="color: #fa9500;"
                 >{{scope.row.type | typeNum}}</div>
                 <div
                   v-if='scope.row.type==1'
@@ -314,7 +314,7 @@
                 >{{scope.row.type | typeNum}}</div>
                 <div
                   v-if='scope.row.type==2'
-                  style="color: #08BD9E;"
+                  style="color: #00b47a;"
                 >{{scope.row.type | typeNum}}</div>
                 <div
                   v-if='scope.row.type==3'
@@ -584,7 +584,6 @@ export default {
         var reader = new FileReader();
         reader.readAsText(file);
         if (this.drlx == 3) {
-          console.log('333333')
           that.action = '/api/upload/person'
           reader.onload = function () {
             const reg = /\<ysxt_asjxgrybh\>(.*?)\<\/ysxt_asjxgrybh\>/
@@ -592,7 +591,7 @@ export default {
             that.$set(newlist[i], 'barcode', barcode[1])
           }
         } else if (this.drlx == 6) {
-          that.action = '/api/upload/person'
+          that.action = '/api/upload/case'
           reader.onload = function () {
             const reg = /\<ysxt_asjbh\>(.*?)\<\/ysxt_asjbh\>/
             let barcode = this.result.match(reg)
@@ -813,12 +812,13 @@ export default {
       this.nowSelectData = val;
     },
     checkRightAll (val) {
-      console.log('val', val)
+      console.log('val111', val)
       this.nowSelectRightData = val;
     },
     // 选中
     handelSelect () {
       this.selectArr = this.handleConcatArr(this.selectArr, this.nowSelectData)
+      this.nowSelectRightData = this.selectArr
       this.handleRemoveTabList(this.nowSelectData, this.datas);
       this.nowSelectData = [];
     },

src/views/drFPTX/RAList.vue

@@ -8,15 +8,18 @@
       class='head'
       v-if="showType==1"
     >
-      <el-radio-group v-model="drlx">
-        <el-radio :label="3">人员</el-radio>
-        <el-radio :label="6">案件</el-radio>
+      <el-radio-group
+        v-model="dataType"
+        class="chooseType"
+      >
+        <el-radio :label="1">人员</el-radio>
+        <el-radio :label="2">案件</el-radio>
       </el-radio-group>
-      <div class='search tmh'>
+      <div class='search barcode'>
         <div class='item'> 条码号：</div>
         <el-input
           placeholder="请输入条码号"
-          v-model="tmh"
+          v-model="barcode"
           clearable
         >
         </el-input>
@@ -24,12 +27,11 @@
       <div class='search ljfk'>
         <div class='item'> 逻辑分库：</div>
         <el-select
-          v-model="value"
-          clearable
+          v-model="logicDatabase"
           placeholder="请选择逻辑分库"
         >
           <el-option
-            v-for="item in options"
+            v-for="item in logicDatabaseoptions"
             :key="item.value"
             :label="item.label"
             :value="item.value"
@@ -37,11 +39,11 @@
           </el-option>
         </el-select>
       </div>
-      <div class='search rwh'>
+      <div class='search taskNumber'>
         <div class='item'> 任务号：</div>
         <el-input
           placeholder="请输入任务号"
-          v-model="rwh"
+          v-model="taskNumber"
           clearable
         >
         </el-input>
@@ -49,12 +51,11 @@
       <div class='search rkzt'>
         <div class='item'> 入库状态：</div>
         <el-select
-          v-model="value"
-          clearable
+          v-model="status"
           placeholder="请选择入库状态"
         >
           <el-option
-            v-for="item in options"
+            v-for="item in statusoptions"
             :key="item.value"
             :label="item.label"
             :value="item.value"
@@ -77,24 +78,38 @@
       class='head'
       v-if="showType==2"
     >
-      <div class='search tmh'>
+      <div class='search barcode'>
         <div class='item'> 条码号：</div>
         <el-input
           placeholder="请输入条码号"
-          v-model="tmh"
+          v-model="barcode"
           clearable
         >
         </el-input>
       </div>
       <div class='search ljfk'>
+        <div class='item'>查询类型：</div>
+        <el-select
+          v-model="queryType"
+          placeholder="请选择查询类型"
+        >
+          <el-option
+            v-for="item in queryTypeOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+      </div>
+      <div class='search ljfk'>
         <div class='item'> 逻辑分库：</div>
         <el-select
-          v-model="value"
-          clearable
+          v-model="logicDatabase"
           placeholder="请选择逻辑分库"
         >
           <el-option
-            v-for="item in options"
+            v-for="item in logicDatabaseoptions"
             :key="item.value"
             :label="item.label"
             :value="item.value"
@@ -102,24 +117,23 @@
           </el-option>
         </el-select>
       </div>
-      <div class='search rwh'>
+      <!-- <div class='search taskNumber'>
         <div class='item'> 任务号：</div>
         <el-input
           placeholder="请输入任务号"
-          v-model="rwh"
+          v-model="taskNumber"
           clearable
         >
         </el-input>
-      </div>
+      </div> -->
       <div class='search rkzt'>
         <div class='item'> 入库状态：</div>
         <el-select
-          v-model="value"
-          clearable
+          v-model="status"
           placeholder="请选择入库状态"
         >
           <el-option
-            v-for="item in options"
+            v-for="item in statusoptions"
             :key="item.value"
             :label="item.label"
             :value="item.value"
@@ -127,7 +141,7 @@
           </el-option>
         </el-select>
       </div>
-      <div class='search sjxz'>
+      <!-- <div class='search sjxz'>
         <div class='item'> 时间选择：</div>
         <el-date-picker
           v-model="value1"
@@ -136,7 +150,7 @@
           end-placeholder="结束日期"
         >
         </el-date-picker>
-      </div>
+      </div> -->
     </div>
     <!-- 二 -->
     <div class="buttons">
@@ -150,7 +164,7 @@
         </el-radio-group>
       </div>
       <div class='right'>
-        <el-button>筛选</el-button>
+        <el-button @click='search'>筛选</el-button>
       </div>
 
     </div>
@@ -204,10 +218,11 @@
       >清除</el-link>
     </el-tag>
     <!-- 五 -->
+    <div v-if="showType==1">
       <el-table
-      max-height="550"
+        max-height="500"
         ref="multipleTable"
-      :data="tableDate"
+        :data="tableDate1"
         tooltip-effect="dark"
         style="width: 100%"
         row-key="sequenceNumber"
@@ -245,7 +260,7 @@
         >
         </el-table-column>
         <el-table-column
-        prop="dataType"
+          prop="logicDatabase"
           label="逻辑分库"
           width="auto"
         >
@@ -321,6 +336,129 @@
         </el-table-column>
 
       </el-table>
+    </div>
+
+    <el-table
+      v-if="showType==2"
+      max-height="500"
+      ref="multipleTable"
+      :data="tableDate2"
+      tooltip-effect="dark"
+      style="width: 100%"
+      row-key="sequenceNumber"
+      :tree-props="{children: 'affirmImportRecordGrandchildren', hasChildren: 'hasChildren'}"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column
+        type="selection"
+        width="auto"
+        v-if="isSelected"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="taskNumber"
+        label="任务号"
+        width="200"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="fileName"
+        label="文件名"
+        width="300"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="queryType"
+        label="查询类型"
+        width="auto"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="barcode"
+        label="人员编号/案事件编号"
+        width="300"
+      >
+        <template slot-scope="scope">
+          <div>{{scope.row.srcBarcode}}</div>
+          <div>{{scope.row.destBarcode}}</div>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="logicDatabase"
+        label="逻辑分库"
+        width="auto"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="status"
+        label="状态"
+        width="auto"
+      >
+      </el-table-column>
+      <el-table-column
+        fixed="right"
+        label="操作"
+        width="100"
+      >
+        <template slot-scope="scope">
+          <div class="ops">
+            <el-tooltip
+              class="item"
+              effect="dark"
+              content="编辑"
+              placement="top"
+              :open-delay='500'
+              @click="handleClick(scope.row)"
+            >
+              <div
+                class="icon bj"
+                @click="handleClick(scope.row)"
+              >
+                <img
+                  src="../../assets/img/qbryk/bj.svg"
+                  alt=""
+                >
+              </div>
+            </el-tooltip>
+            <el-tooltip
+              class="item"
+              effect="dark"
+              content="复制数据"
+              placement="top"
+              :open-delay='500'
+            >
+              <div
+                class="icon bz"
+                @click='isShowFztmBtn(scope.row)'
+              >
+                <img
+                  src="../../assets/img/qbryk/bz.svg"
+                  alt=""
+                >
+              </div>
+            </el-tooltip>
+            <el-tooltip
+              class="item"
+              effect="dark"
+              content="发查询"
+              placement="top"
+              :open-delay='500'
+            >
+              <div
+                class="icon look"
+                @click="isShowFcxBtn1(scope.row)"
+              >
+                <img
+                  src="../../assets/img/qbryk/search.svg"
+                  alt=""
+                >
+              </div>
+            </el-tooltip>
+
+          </div>
+        </template>
+      </el-table-column>
+    </el-table>
     <!-- 六 -->
     <div class="block">
       <span class="record">共{{ reqParam.page.total }}条记录 第{{ reqParam.page.currPage }}/{{ Tpage }}页</span>
@@ -375,16 +513,51 @@ export default {
   },
   data () {
     return {
-      drlx: 3,// 导入类型
-      tmh: '',// 条码号
-      options: [{
-        value: '选项1',
-        label: '黄金糕'
+      dataType: 1,// 导入类型
+      barcode: '',// 条码号
+      logicDatabaseoptions: [{  // 逻辑库
+        value: '1',
+        label: '人员逻辑库'
       }],
-      value: '',// 逻辑库
-      value1: '',
-      rwh: '',// 任务号
-      showType: '1',
+      statusoptions: [
+        {  // 入库状态
+          value: '1',
+          label: '成功'
+        }, {
+          value: '0',
+          label: '失败'
+        }
+      ],
+      status: null, // 入库状态
+      logicDatabase: '',// 逻辑库
+      value1: '', // 时间
+      taskNumber: '',// 任务号
+      showType: '1', // 1:人案   2：比中
+      queryType: '',// 比中类型
+      queryTypeOptions: [
+        {  //  比中类型
+          value: '0',
+          label: '查重'
+        },
+        {
+          value: '1',
+          label: '倒查'
+        },
+        {
+          value: '2',
+          label: '正查'
+        },
+        {
+          value: '3',
+          label: '串查'
+        },
+      ],
+      tableDate1: [
+
+      ], // 人员列表数据
+      tableDate2: [
+
+      ], // 人员列表数据
 
 
 
@@ -407,27 +580,66 @@ export default {
           checkboxQuery: [], //滚动平面等筛选条件
         }
       },
-      tableDate: [
 
-      ], // 人员列表数据
       multipleSelection: [], // 表单选择项目
       isShowTip: false,//批量操作提示
       selectionData: [],
     };
   },
+  watch: {
+    showType (newNum, oldNum) {
+      // ...
+      console.log(newNum, 123)
+      this.search()
+    }
+  },
   methods: {
     // 获取全部人员列表请求
     search () {
+      let reqUrl = null;
+      let reqParam = null;
+      if (this.showType == 1) {
+        reqUrl = "/api/record/import/pc/search"
+        reqParam = {
+          taskNumber: "", // 任务号
+          dataType: null, // 人员or案件
+          status: null,// 状态
+          barcode: '',// 条码号
+          logicDatabase: '',// 逻辑分库
+        }
+        reqParam.taskNumber = this.taskNumber
+        reqParam.dataType = Number(this.dataType)
+        // reqParam.status = Number(this.status)
+        reqParam.status = this.status != null ? Number(this.status) : null
+        reqParam.barcode = this.barcode
+        reqParam.logicDatabase = this.logicDatabase
+      } else if (this.showType == 2) {
+        // console.log('bizhong bizhong ')
+        reqUrl = "/api/record/import/affirm/search"
+        reqParam = {
+          status: null,// 状态
+          barcode: '',// 条码号
+          logicDatabase: '',// 逻辑分库
+          queryType: '',// 类型
+        }
+        reqParam.status = this.status != null ? Number(this.status) : null
+        reqParam.barcode = this.barcode
+        reqParam.logicDatabase = this.logicDatabase
+        reqParam.queryType = this.queryType
+      }
       // console.info("请求===>", this.reqParam);
       this.$axios
-        .get("/api/record/import/pc/search")
+        .post(reqUrl, reqParam)
         .then(response => {
           // console.info("查询结果===>", response);
           if (response.data.code === 0) {
-            this.tableDate = response.data.ret.pcImportRecordChildren;
+            if (this.showType == 1) {
+              this.tableDate1 = response.data.ret.pcImportRecordChildren;
+            } else if (this.showType == 2) {
+              this.tableDate2 = response.data.ret.affirmImportRecordChildren;
+            }
             // this.reqParam.page.total = response.data.ret.total;
             console.info("查询结果===>", this.tableDate);
-            // this.userInfo = this.getUserInfo(this.tableDate);
           } else {
             this.$message.error(response.data.message);
           }
@@ -628,9 +840,13 @@ export default {
       display: flex;
       align-items: center;
     }
-    .tmh {
+    .chooseType {
+      margin-top: 3px;
+      margin-right: 24px;
+    }
+    .barcode {
       // margin-left: 65px;
-      margin-left: 24px;
+      // margin-left: 24px;
       .item {
         width: 60px;
         font-size: 14px;
@@ -661,7 +877,7 @@ export default {
         height: 32px;
       }
     }
-    .rwh {
+    .taskNumber {
       margin-left: 24px;
       .item {
         width: 80px;
@@ -722,11 +938,11 @@ export default {
       /deep/.el-button {
         width: 72px;
         height: 32px;
-        background: #ecedf1;
+        background: #055fe7;
         border-radius: 4px;
         font-size: 14px;
         font-family: MicrosoftYaHei;
-        color: #aeafb4;
+        color: #ffffff;
         line-height: 22px;
       }
     }

vue.config.js

@@ -8,13 +8,13 @@
  */
 const path = require("path");
 // 引入等比适配插件
-const px2rem = require('postcss-px2rem')
+const px2rem = require("postcss-px2rem");
 
 // 配置基本大小
 const postcss = px2rem({
   // 基准大小 baseSize，需要和rem.js中相同
   remUnit: 16
-})
+});
 // const CompressionPlugin = require('compression-webpack-plugin');
 // const productionGzipExtensions = /\.(js|css|json|txt|html|ico|svg)(\?.*)?$/i;
 
@@ -97,6 +97,7 @@ module.exports = {
         // 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://192.168.128.109:8765", // 湖南-王
         target: "http://www.meetfood.cn:2390/", // 湖南-线上
 
         ws: true,
@@ -107,11 +108,20 @@ module.exports = {
       },
       "/login": {
         target: "http://47.92.226.24:3004/", // 登录
+        // target: "http://192.168.128.109:8765/", // 王
         ws: true,
         changeOrigin: true,
         pathRewrite: {
           "^/login": ""
         }
+      },
+      "/system": {
+        target: "http://192.168.128.109:8765", // 湖南-王
+        ws: true,
+        changeOrigin: true,
+        pathRewrite: {
+          "^/system": ""
+        }
       }
       // 阿里
       // "/api": {
@@ -127,9 +137,7 @@ module.exports = {
   css: {
     loaderOptions: {
       postcss: {
-        plugins: [
-          postcss
-        ]
+        plugins: [postcss]
       }
     },
     sourceMap: process.env.NODE_ENV === "development" ? true : false // 在开发环境下开启 CSS sourcemaps