Merge branch 'dev_zwpt' of http://39.99.224.27:9022/changchao/founder_vue into dev_zwpt

src/views/AllPersonnelBase/dclb.vue

@@ -492,8 +492,18 @@ export default {
           taskNumber: null,
           barcode: null,
           offSet: null, // 当前页数
-          limit: null // 当页条数
+          limit: null, // 当页条数
+
+          personLogicIds: '', // 人员逻辑库
         };
+
+        let personLogicIds = []
+        let arr = this.$store.state.ljk.targetOptions_ry
+        for (let i = 0; i < arr.length; i++) {
+          personLogicIds.push(arr[i].id)
+        }
+        reqParam.personLogicIds = personLogicIds.toString()
+
         reqParam.taskNumber = this.taskNumber;
         reqParam.barcode = this.barcode;
         reqParam.offSet = this.currPage1;
@@ -506,8 +516,16 @@ export default {
           taskNumber: null,
           barcode: null,
           offSet: null, // 当前页数
-          limit: null // 当页条数
+          limit: null, // 当页条数
+
+          caseLogicIds: null // 案件逻辑库
         };
+        let caseLogicIds = []
+        let arr = this.$store.state.ljk.targetOptions_aj
+        for (let i = 0; i < arr.length; i++) {
+          caseLogicIds.push(arr[i].id)
+        }
+        reqParam.caseLogicIds = caseLogicIds.toString()
         reqParam.taskNumber = this.taskNumber;
         reqParam.barcode = this.barcode;
         reqParam.offSet = this.currPage1;

src/views/drFPTX/RAList.vue

@@ -998,8 +998,16 @@ export default {
           sendTimeStart: null, // 开始时间
           sendTimeEnd: null, // 结束时间
           offSet: null, // 当前页数
-          limit: null // 当页条数
+          limit: null, // 当页条数
+
+          personLogicIds: '' // 人员逻辑库
         };
+        let personLogicIds = []
+        let arr = this.$store.state.ljk.targetOptions_ry
+        for (let i = 0; i < arr.length; i++) {
+          personLogicIds.push(arr[i].id)
+        }
+        reqParam.personLogicIds = personLogicIds.toString()
         reqParam.taskNumber = this.taskNumber;
         // reqParam.status = Number(this.status)
         reqParam.status = this.status != null ? Number(this.status) : null;
@@ -1018,8 +1026,23 @@ export default {
           logicName: "", // 逻辑分库
           queryType: "", // 类型
           offSet: null, // 当前页数
-          limit: null // 当页条数
+          limit: null, // 当页条数
+
+          caseLogicIds: '', // 案件逻辑库
+          personLogicIds: '' // 人员逻辑库
         };
+        let caseLogicIds = []
+        let arr = this.$store.state.ljk.targetOptions_aj
+        for (let i = 0; i < arr.length; i++) {
+          caseLogicIds.push(arr[i].id)
+        }
+        let personLogicIds = []
+        let arr1 = this.$store.state.ljk.targetOptions_ry
+        for (let i = 0; i < arr1.length; i++) {
+          personLogicIds.push(arr1[i].id)
+        }
+        reqParam.personLogicIds = personLogicIds.toString()
+        reqParam.caseLogicIds = caseLogicIds.toString()
         reqParam.status = this.status != null ? Number(this.status) : null;
         reqParam.barcode = this.barcode;
         reqParam.logicName = this.logicDatabase;
@@ -1037,8 +1060,15 @@ export default {
           sendTimeStart: null, // 开始时间
           sendTimeEnd: null, // 结束时间
           offSet: null, // 当前页数
-          limit: null // 当页条数
+          limit: null, // 当页条数
+          caseLogicIds: '', // 案件逻辑库
         };
+        let caseLogicIds = [];
+        let arr = this.$store.state.ljk.targetOptions_aj
+        for (let i = 0; i < arr.length; i++) {
+          caseLogicIds.push(arr[i].id)
+        }
+        reqParam.caseLogicIds = caseLogicIds.toString()
         reqParam.taskNumber = this.taskNumber;
         // reqParam.status = Number(this.status)
         reqParam.status = this.status != null ? Number(this.status) : null;

src/views/zljc/Index.vue

@@ -277,7 +277,7 @@
       </div>
     </div>
     <div class="footer">
-      <span class="record">共&nbsp;{{ total }}&nbsp;条记录 第{{ currPage }}/{{ Tpage }}页</span>
+      <span class="record">共&nbsp;{{ total }}&nbsp;条记录 第{{ currPage }}/{{ pages }}页</span>
       <el-pagination
         class="paging"
         @size-change="handleSizeChange"
@@ -358,6 +358,7 @@ export default {
       jssj: "", // 捺印结束时间
 
       barcode: "", // 复制条码
+      pages: '',
     };
   },
   methods: {
@@ -413,6 +414,7 @@ export default {
           // console.log(response.data.ret)
           this.tableDate = response.data.ret.rows;
           this.total = response.data.ret.total;
+          this.pages = response.data.ret.pages
           console.log("查询结果===>", this.tableDate);
           // 给每一列生成一个时间戳
           this.tableDate.forEach((el) => {
@@ -661,14 +663,6 @@ export default {
     roleArr () {
       return this.$store.state.layout.Menu;
     },
-    /**
-     * @description: 计算总页数
-     * @param {*}
-     * @return {*}
-     */
-    Tpage () {
-      return Math.floor(this.total / this.currentPageSize) + 1;
-    },
   },
 };
 </script>

src/views/zljc/jcxq.vue

@@ -496,17 +496,24 @@ export default {
         font-size: 14px;
         font-family: HarmonyOS_Sans_SC;
         color: #282f3c;
-        border:none
+        border: none;
       }
       /deep/.el-radio-button__orig-radio:checked + .el-radio-button__inner {
         width: 129px;
         height: 32px;
-        background: #DDEBFF;
+        background: #ddebff;
         border-radius: 2px;
         font-size: 14px;
         font-family: HarmonyOS_Sans_SC;
-        color: #055fe7;
+        background-color: #055fe7;
+        color: #fff;
         border: none;
+        &:hover {
+          background: #377fec;
+        }
+        &:active {
+          background: #044cb9;
+        }
       }
     }
     .headRight {