Merge branch 'dev'

renchao@pashanhoo.com
Showing 2 changed files with 51 additions and 43 deletions
src/views/ywbl/slsqxx/fdcq2/slxxOverview.vue
src/views/ywbl/ywsq/components/selectLqsc.vue
--- a/src/views/ywbl/slsqxx/fdcq2/slxxOverview.vue
View file @93d851f
+++ b/src/views/ywbl/slsqxx/fdcq2/slxxOverview.vue
View file @93d851f
 <!--
 * @Description: 受理信息
 * @Autor: renchao
- * @LastEditTime: 2023-11-15 15:47:02
+ * @LastEditTime: 2024-01-18 16:19:51
 -->
 <template>
  <div class="slxx">
@@ -132,8 +132,8 @@
          <el-col :span="5">
            <el-form-item label="发证方式：" :disabled="!viewEdit">
              <el-radio-group v-model="ruleForm.slsq.fzfs">
-                <el-radio label="1">小证</el-radio>
                <el-radio label="2">大证</el-radio>
+                <el-radio label="1">小证</el-radio>
              </el-radio-group>
            </el-form-item>
          </el-col>
--- a/src/views/ywbl/ywsq/components/selectLqsc.vue
View file @93d851f
+++ b/src/views/ywbl/ywsq/components/selectLqsc.vue
View file @93d851f
 <!--
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2023-11-16 14:12:35
+ * @LastEditTime: 2024-01-19 13:35:33
 -->
 <template>
  <div class="from-clues">
    <!-- 表单部分 林权首次 -->
    <div class="from-clues-header">
-      <el-form :model="queryForm" ref="queryForm">
+      <el-form :model="queryForm" ref="queryForm" label-width="100px">
-        <el-row :gutter="20">
+        <el-row>
          <el-col :span="6">
            <el-form-item label="宗地代码">
              <el-input placeholder="请输入宗地代码" maxlength="19" v-model="queryForm.zddm" clearable class="width100">
@@ -27,10 +27,22 @@
              </el-input>
            </el-form-item>
          </el-col>
-          <el-col :span="6" class="btnColRight">
+          <el-col :span="6">
+            <el-form-item label="权利人">
+              <el-input placeholder="请输入权利人" v-model.trim="queryForm.qlr" clearable class="width100">
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证件号">
+              <el-input placeholder="请输入证件号" v-model.trim="queryForm.zjh" clearable class="width100">
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="18" class="btnColRight">
            <el-form-item>
-              <!-- <el-button type="primary" @click="resetForm(true)">重置</el-button> -->
              <el-button type="primary" @click="handleSearch">查询</el-button>
+              <el-button type="primary" @click="resetForm(true)">重置</el-button>
            </el-form-item>
          </el-col>
        </el-row>
@@ -39,7 +51,7 @@
    <!-- 表格 -->
    <div class="from-clues-content loadingtext">
      <lb-table ref="table" @row-click="handleRowClick" :page-size="pageData.pageSize" :calcHeight="300"
-        :current-page.sync="pageData.currentPage" :total="tableData.total" @size-change="handleSizeChange" @select="select"
+        :current-page.sync="pageData.currentPage" :total="tableData.total" @size-change="handleSizeChange"
        @p-current-change="handleCurrentChange" @selection-change="handleSelectionChange" :column="tableData.columns"
        :data="tableData.data">
      </lb-table>
@@ -68,6 +80,7 @@
    },
    data () {
      return {
+        radioVal: '',
        loading: false,
        queryForm: defaultParameters.defaultParameters(),
        tableData: {
@@ -80,6 +93,28 @@
    },
    mounted () {
      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: {
      /**
@@ -157,49 +192,22 @@
        }
      },
      /**
-       * @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
       * @param {*} row
       * @author: renchao
       */
+      handleChange () {
+        let arr = this.tableData.data.filter(item => item.bdcdyid == this.radioVal)
+        this.bdcdysz = arr
+      },
      handleRowClick (row) {
        // 如果状态是1，那就是单选
+        let refs = 'table';
        if (this.sqywInfo.sqywdylx == "1") {
-          const bdcdysz = this.bdcdysz
+          this.bdcdysz = [row]
-          this.$refs.table.clearSelection()
+          this.radioVal = row.bdcdyid
-          if (bdcdysz.length == 1) {
-            bdcdysz.forEach(item => {
-              // 判断 如果当前的一行被勾选, 再次点击的时候就会取消选中
-              if (item == row) {
-                this.$refs.table.toggleRowSelection(row, false);
-              }
-              // 不然就让当前的一行勾选
-              else {
-                this.$refs.table.toggleRowSelection(row, true);
-              }
-            })
-          }
-          else {
-            this.$refs.table.toggleRowSelection(row, true);
-          }
        } else {
-          this.$refs.table.toggleRowSelection(row);
+          this.$refs[refs].toggleRowSelection(row)
        }
      },
      /**