Merge branch 'dev'

renchao@pashanhoo.com
Showing 3 changed files with 38 additions and 29 deletions
src/views/registerBook/djbFrame.vue
src/views/ywbl/ywsq/components/selectFwfgSplitMerge.vue
src/views/ywbl/ywsq/components/selectJsydsyqSplitMerge.vue
--- a/src/views/registerBook/djbFrame.vue
View file @8d47b47
+++ b/src/views/registerBook/djbFrame.vue
View file @8d47b47
 <!--
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2023-11-14 15:10:12
+ * @LastEditTime: 2023-11-14 15:43:23
 -->
 <template>
  <div class="content">
@@ -230,6 +230,14 @@
  }
 </script>
 <style scoped lang="scss">
+  /deep/.el-collapse-item__header:hover {
+    background-color: #f5f7fa;
+  }
+  /deep/.el-collapse-item__content {
+    .unselected:hover {
+      background-color: #f5f7fa;
+    }
+  }
  /deep/.el-collapse-item__header .el-collapse-item__arrow:hover {
    transition: transform 0.3s;
    transform: scale(1.3);
--- a/src/views/ywbl/ywsq/components/selectFwfgSplitMerge.vue
View file @8d47b47
+++ b/src/views/ywbl/ywsq/components/selectFwfgSplitMerge.vue
View file @8d47b47
 <!--
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2023-11-14 15:15:10
+ * @LastEditTime: 2023-11-14 15:36:05
 -->
 <template>
  <div class="from-clues">
@@ -61,17 +61,10 @@
          label="状态"
          width="150">
          <template slot-scope="scope">
-            <a style='color:#3498db;' v-show="scope.row.djblzt==1">正在办理</a>
+            <div>
-            <span v-show="scope.row.zjgcdyzt==1">>,在建工程抵押</span>
+              <a style='color:#3498db;' v-show="scope.row.djblzt==1">{{getStatusText(scope.row)}}</a>
-            <span v-show="scope.row.ycfzt==1">>,已预查封</span>
+              <span v-show="scope.row.djblzt !=1">{{getStatusText(scope.row)}}</span>
-            <span v-show="scope.row.ycfzt==1">>,已预查封</span>
+            </div>
-            <span v-show="scope.row.cfzt==1">>,已查封</span>
-            <span v-show="scope.row.diyizt==1">>,已地役</span>
-            <span v-show="scope.row.yyzt==1">>,异议中</span>
-            <span v-show="scope.row.xzzt==1">,已限制</span>
-            <span v-show="scope.row.ygmmzt==1">>,已预告买卖</span>
-            <span v-show="scope.row.ygdyzt==1">>,已预告抵押</span>
-            <span v-show="scope.row.dyzt==1">>,已抵押</span>
          </template>
        </el-table-column>
        <el-table-column
@@ -142,11 +135,13 @@
  //首次登记
  import jump from "./mixin/jump";
  import store from '@/store/index.js'
+  import Filter from '@/utils/filter.js'
+  const filter = new Filter();
  import table from "@/utils/mixin/table";
  import { ywPopupDialog } from "@/utils/popup.js";
  import { datas, sendThis } from "../javascript/selectFwfgSplitMerge.js";
  import { defaultParameters } from "../javascript/publicDefaultPar.js";
-  import { selectJsydQlxxSplitMergeBefore, selectZdjbxxSplitMerge } from "@/api/ywsq.js";
+  import { selectFwsyq, selectJsydQlxxSplitMergeBefore, selectZdjbxxSplitMerge } from "@/api/ywsq.js";
  import { startBusinessFlow } from "@/api/workFlow.js";
  export default {
    mixins: [table, jump],
@@ -156,6 +151,7 @@
    },
    data () {
      return {
+        Filter: {},
        loading: false,
        queryForm: defaultParameters.defaultParameters(),
        // 表格数据
@@ -172,6 +168,10 @@
      sendThis(this)
    },
    methods: {
+      // 使用 yWstatus 方法
+      getStatusText (row) {
+        return filter.yWstatus(row);
+      },
      /**
       * @description: 单选事件
       * @author: renchao
@@ -202,12 +202,14 @@
      queryClick () {
        this.$startLoading();
        this.queryForm.sqywbm = this.sqywInfo.djywbm;
-        selectJsydQlxxSplitMergeBefore({ ...this.queryForm, ...this.pageData }).then((res) => {
+        selectFwsyq({ ...this.queryForm, ...this.pageData }).then((res) => {
          this.$endLoading();
          if (res.code === 200) {
-            this.tableData.data = res.result
+            this.tableData.data = res.result.records
          }
-        });
+        }).catch(() => {
+          this.$endLoading();
+        })
      },
      /**
       * @description: submitForm
--- a/src/views/ywbl/ywsq/components/selectJsydsyqSplitMerge.vue
View file @8d47b47
+++ b/src/views/ywbl/ywsq/components/selectJsydsyqSplitMerge.vue
View file @8d47b47
 <!--
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2023-11-14 15:16:22
+ * @LastEditTime: 2023-11-14 15:45:23
 -->
 <template>
  <div class="from-clues">
@@ -70,17 +70,10 @@
          label="状态"
          width="150">
          <template slot-scope="scope">
-            <a style='color:#3498db;' v-show="scope.row.djblzt==1">正在办理</a>
+            <div>
-            <span v-show="scope.row.zjgcdyzt==1">>,在建工程抵押</span>
+              <a style='color:#3498db;' v-show="scope.row.djblzt==1">{{getStatusText(scope.row)}}</a>
-            <span v-show="scope.row.ycfzt==1">>,已预查封</span>
+              <span v-show="scope.row.djblzt !=1">{{getStatusText(scope.row)}}</span>
-            <span v-show="scope.row.ycfzt==1">>,已预查封</span>
+            </div>
-            <span v-show="scope.row.cfzt==1">>,已查封</span>
-            <span v-show="scope.row.diyizt==1">>,已地役</span>
-            <span v-show="scope.row.yyzt==1">>,异议中</span>
-            <span v-show="scope.row.xzzt==1">,已限制</span>
-            <span v-show="scope.row.ygmmzt==1">>,已预告买卖</span>
-            <span v-show="scope.row.ygdyzt==1">>,已预告抵押</span>
-            <span v-show="scope.row.dyzt==1">>,已抵押</span>
          </template>
        </el-table-column>
        <el-table-column
@@ -139,6 +132,8 @@
  //首次登记
  import jump from "./mixin/jump";
  import store from '@/store/index.js'
+  import Filter from '@/utils/filter.js'
+  const filter = new Filter();
  import table from "@/utils/mixin/table";
  import { ywPopupDialog } from "@/utils/popup.js";
  import { datastwo, sendThis } from "../javascript/selectJsydsyqhbfg.js";
@@ -169,6 +164,10 @@
      sendThis(this)
    },
    methods: {
+      // 使用 yWstatus 方法
+      getStatusText (row) {
+        return filter.yWstatus(row);
+      },
      /**
       * @description: 单选事件
       * @author: renchao