Merge branch 'dev'

@@ -40,7 +40,7 @@
 
 
     <br>
     <br>
     <el-pagination class="lb-table-pagination" v-if="pagination" v-bind="$attrs" v-on="$listeners" background
     <el-pagination class="lb-table-pagination" v-if="pagination" v-bind="$attrs" v-on="$listeners" background
-      layout="total,  prev, pager, next" @current-change="paginationCurrentChange"
+      layout="total, sizes, prev, pager, next" @current-change="paginationCurrentChange" @size-change="handleSizeChange"
       :style="{ 'margin-top': paginationTop, 'text-align': paginationAlign }">
       :style="{ 'margin-top': paginationTop, 'text-align': paginationAlign }">
     </el-pagination>
     </el-pagination>
   </div>
   </div>
@@ -306,6 +306,9 @@
       paginationCurrentChange (val) {
       paginationCurrentChange (val) {
         this.$emit('p-current-change', val)
         this.$emit('p-current-change', val)
       },
       },
+      handleSizeChange (val) {
+        this.$emit('size-change', val)
+      },
       /**
       /**
        * @description: getMergeArr
        * @description: getMergeArr
        * @param {*} tableData
        * @param {*} tableData

 <!--
 <!--
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2024-01-19 16:10:10
+ * @LastEditTime: 2024-01-25 15:06:08
 -->
 -->
 <template>
 <template>
   <div class="tableBox">
   <div class="tableBox">
@@ -257,7 +257,7 @@
         let that = this
         let that = this
         let sjlx = row.sjlx,
         let sjlx = row.sjlx,
           bsmQlxx = row.bsmQlxx
           bsmQlxx = row.bsmQlxx
-        if (sjlx == '系统数据') {
+        if (['系统数据', '存量数据'].includes(sjlx)) {
           getXtParamsByYwh(ywh).then(res => {
           getXtParamsByYwh(ywh).then(res => {
             let data = res.result
             let data = res.result
             that.$popup('材料信息', 'registerBook/components/clxx/index', {
             that.$popup('材料信息', 'registerBook/components/clxx/index', {

 <!--
 <!--
  * @Description:
  * @Description:
  * @Autor: miaofang
  * @Autor: miaofang
- * @LastEditTime: 2024-01-19 16:09:59
+ * @LastEditTime: 2024-01-25 15:08:01
 -->
 -->
 <template>
 <template>
   <div class="djxxTable">
   <div class="djxxTable">
@@ -304,7 +304,7 @@
         let that = this
         let that = this
         let sjlx = row.sjlx,
         let sjlx = row.sjlx,
           bsmQlxx = row.bsmQlxx
           bsmQlxx = row.bsmQlxx
-        if (sjlx == '系统数据') {
+        if (['系统数据', '存量数据'].includes(sjlx)) {
           getXtParamsByYwh(ywh).then(res => {
           getXtParamsByYwh(ywh).then(res => {
             let data = res.result
             let data = res.result
             that.$popup('材料信息', 'registerBook/components/clxx/index', {
             that.$popup('材料信息', 'registerBook/components/clxx/index', {

@@ -29,12 +29,12 @@
   </div>
   </div>
 </template>
 </template>
 <script>
 <script>
-import { mapGetters } from "vuex";
-import table from "@/utils/mixin/table";
-import { datas, sendThis } from "./djbcxdata";
-import { list, detail } from "@/api/sysPushRecord.js";
+  import { mapGetters } from "vuex";
+  import table from "@/utils/mixin/table";
+  import { datas, sendThis } from "./djbcxdata";
+  import { list, detail } from "@/api/sysPushRecord.js";
 
 
-export default {
+  export default {
     name: "djbcx",
     name: "djbcx",
     mixins: [table],
     mixins: [table],
     mounted () {
     mounted () {
@@ -123,16 +123,16 @@ export default {
         })
         })
       }
       }
     }
     }
-}
+  }
 </script>
 </script>
 <style scoped lang="scss">
 <style scoped lang="scss">
-@import "~@/styles/public.scss";
+  @import "~@/styles/public.scss";
 
 
-.icon-circle {
+  .icon-circle {
     position: relative;
     position: relative;
-}
+  }
 
 
-.icon-circle::before {
+  .icon-circle::before {
     content: "";
     content: "";
     width: 4px;
     width: 4px;
     height: 4px;
     height: 4px;
@@ -140,5 +140,5 @@ export default {
     background: #000;
     background: #000;
     top: 0px;
     top: 0px;
     left: 0px;
     left: 0px;
-}
+  }
 </style>
 </style>

 <!--
 <!--
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2024-01-17 17:30:08
+ * @LastEditTime: 2024-01-25 15:01:43
 -->
 -->
 <template>
 <template>
   <div class="from-clues">
   <div class="from-clues">
@@ -69,7 +69,6 @@
         :current-page.sync="pageData.currentPage"
         :current-page.sync="pageData.currentPage"
         :total="tableData.total"
         :total="tableData.total"
         @size-change="handleSizeChange"
         @size-change="handleSizeChange"
-        @select="select"
         @p-current-change="handleCurrentChange"
         @p-current-change="handleCurrentChange"
         @selection-change="handleSelectionChange"
         @selection-change="handleSelectionChange"
         :column="tableData.columns"
         :column="tableData.columns"
@@ -99,6 +98,7 @@
     mixins: [ywsqTable, jump],
     mixins: [ywsqTable, jump],
     data () {
     data () {
       return {
       return {
+        radioVal: '',
         loading: false,
         loading: false,
         queryForm: defaultParameters.defaultParameters(),
         queryForm: defaultParameters.defaultParameters(),
         tableData: {
         tableData: {
@@ -111,6 +111,28 @@
     },
     },
     mounted () {
     mounted () {
       sendThis(this);
       sendThis(this);
+      if (this.sqywInfo.sqywdylx == "1") {
+        this.tableData.columns = [{
+          label: '选择',
+          width: '50px',
+          render: (h, scope) => {
+            return (
+              <div class="orgColumn">
+                <el-radio onChange={() => { this.handleChange(scope.row) }} v-model={this.radioVal} label={scope.row.bdcdyid}>
+                  &ensp;
+                </el-radio>
+              </div>
+            )
+          }
+        }].concat(datas.columns())
+      } else {
+        this.tableData.columns =
+          [{
+            type: 'selection',
+            label: '全选',
+            width: '50'
+          }].concat(datas.columns())
+      }
     },
     },
     methods: {
     methods: {
       /**
       /**
@@ -207,54 +229,26 @@
         }
         }
       },
       },
       /**
       /**
-       * @description: select
-       * @param {*} selection
-       * @param {*} row
-       * @author: renchao
-       */
-      select (selection, row) {
-        if (this.sqywInfo.sqywdylx == "1") {
-          // 清除 所有勾选项
-          this.$refs.table.clearSelection();
-          // 当表格数据都没有被勾选的时候 就返回
-          // 主要用于将当前勾选的表格状态清除
-          if (selection.length == 0) return;
-          this.$refs.table.toggleRowSelection(row, true);
-        }
-      },
-      /**
        * @description: handleRowClick
        * @description: handleRowClick
        * @param {*} row
        * @param {*} row
        * @author: renchao
        * @author: renchao
        */
        */
+      handleChange () {
+        let arr = this.tableData.data.filter(item => item.bdcdyid == this.radioVal)
+        arr[0].bsm = arr[0].zdbsm
+        this.bdcdysz = arr
+      },
       handleRowClick (row) {
       handleRowClick (row) {
         // 如果状态是1，那就是单选
         // 如果状态是1，那就是单选
+        let refs = 'table';
         if (this.sqywInfo.sqywdylx == "1") {
         if (this.sqywInfo.sqywdylx == "1") {
-          const bdcdysz = this.bdcdysz;
-          this.$refs.table.clearSelection();
-          if (bdcdysz.length == 1) {
-            bdcdysz.forEach((item) => {
-              // 判断 如果当前的一行被勾选, 再次点击的时候就会取消选中
-              if (item == row) {
-                this.$refs.table.toggleRowSelection(row, false);
-              }
-              // 不然就让当前的一行勾选
-              else {
-                this.$refs.table.toggleRowSelection(row, true);
-              }
-            });
+          row.bsm = row.zdbsm
+          this.bdcdysz = [row]
+          this.radioVal = row.bdcdyid
         } else {
         } else {
-            this.$refs.table.toggleRowSelection(row, true);
-          }
-        } else {
-          this.$refs.table.toggleRowSelection(row);
+          this.$refs[refs].toggleRowSelection(row)
         }
         }
       },
       },
-      /**
-  * @description: openBook
-  * @param {*} row
-  * @author: miaofang
-  */
       openBook (row) {
       openBook (row) {
         var param = {
         var param = {
           bdcdyid: row.bdcdyid,
           bdcdyid: row.bdcdyid,

 <!--
 <!--
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2024-01-17 15:34:28
+ * @LastEditTime: 2024-01-25 14:59:59
 -->
 -->
 <template>
 <template>
   <div class="from-clues">
   <div class="from-clues">
@@ -74,7 +74,7 @@
       </div>
       </div>
       <div class="from-clues-content loadingtext">
       <div class="from-clues-content loadingtext">
         <lb-table ref="table1" @row-click="handleRowClick" :page-size="pageData.pageSize" :calcHeight="300"
         <lb-table ref="table1" @row-click="handleRowClick" :page-size="pageData.pageSize" :calcHeight="300"
-          :current-page.sync="pageData.currentPage" :total="zrztableData.total"
+          :current-page.sync="pageData.currentPage" :total="zrztableData.total" @size-change="handleSizeChange"
           @p-current-change="handleCurrentChange" @selection-change="handleSelectionChange" :column="zrztableData.columns"
           @p-current-change="handleCurrentChange" @selection-change="handleSelectionChange" :column="zrztableData.columns"
           :data="zrztableData.data">
           :data="zrztableData.data">
         </lb-table>
         </lb-table>

 <!--
 <!--
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2024-01-17 17:20:34
+ * @LastEditTime: 2024-01-25 14:59:36
 -->
 -->
 <template>
 <template>
   <div class="from-clues">
   <div class="from-clues">
@@ -62,7 +62,7 @@
       </div>
       </div>
       <div class="from-clues-content loadingtext">
       <div class="from-clues-content loadingtext">
         <lb-table ref="table1" @row-click="handleRowClick" :page-size="pageData.pageSize" :calcHeight="300"
         <lb-table ref="table1" @row-click="handleRowClick" :page-size="pageData.pageSize" :calcHeight="300"
-          :current-page.sync="pageData.currentPage" :total="zrztableData.total"
+          :current-page.sync="pageData.currentPage" :total="zrztableData.total" @size-change="handleSizeChange"
           @p-current-change="handleCurrentChange" @selection-change="handleSelectionChange" :column="zrztableData.columns"
           @p-current-change="handleCurrentChange" @selection-change="handleSelectionChange" :column="zrztableData.columns"
           :data="zrztableData.data">
           :data="zrztableData.data">
         </lb-table>
         </lb-table>

 <!--
 <!--
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2024-01-17 17:15:13
+ * @LastEditTime: 2024-01-25 14:57:59
 -->
 -->
 <template>
 <template>
   <div class="from-clues">
   <div class="from-clues">
@@ -62,7 +62,7 @@
       </div>
       </div>
       <div class="from-clues-content loadingtext">
       <div class="from-clues-content loadingtext">
         <lb-table ref="table1" @row-click="handleRowClick" :page-size="pageData.pageSize" :calcHeight="300"
         <lb-table ref="table1" @row-click="handleRowClick" :page-size="pageData.pageSize" :calcHeight="300"
-          :current-page.sync="pageData.currentPage" :total="zrztableData.total"
+          :current-page.sync="pageData.currentPage" :total="zrztableData.total" @size-change="handleSizeChange"
           @p-current-change="handleCurrentChange" @selection-change="handleSelectionChange" :column="zrztableData.columns"
           @p-current-change="handleCurrentChange" @selection-change="handleSelectionChange" :column="zrztableData.columns"
           :data="zrztableData.data">
           :data="zrztableData.data">
         </lb-table>
         </lb-table>