Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

xiaomiao
Showing 13 changed files with 188 additions and 178 deletions
src/views/workflow/components/dialog/zsdy.vue
src/views/ywbl/dbx/dbx.vue
src/views/ywbl/dbx/dbxdata.js
src/views/ywbl/ybx/ybx.vue
src/views/ywbl/ybx/ybxdata.js
src/views/ywbl/ywsq/components/diyaq.vue
src/views/ywbl/ywsq/javascript/diyaq.js
src/views/ywbl/ywsq/javascript/selecBdcql.js
src/views/ywbl/ywsq/javascript/selectDjbbl.js
src/views/ywbl/ywsq/javascript/selectJsydsyqhbfg.js
src/views/ywbl/ywsq/javascript/selectTdsyq.js
src/views/zhcx/djbcx/djbcxdata.js
src/views/zhcx/zslqcx/zslqcx.js
--- a/src/views/workflow/components/dialog/zsdy.vue
View file @c1b96e4
+++ b/src/views/workflow/components/dialog/zsdy.vue
View file @c1b96e4
 <!--
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2023-08-10 15:20:52
+ * @LastEditTime: 2023-08-23 15:36:24
 -->
 <template>
  <div>
@@ -117,7 +117,7 @@
        const image = new Image();
        image.onload = () => {
          context.drawImage(image, 0, 0);
-          context.font = '18px 楷体';
+          context.font = '16px 楷体';
          context.fillStyle = '#000000';
          context.fillText(this.bdcqz.sjjc ? this.bdcqz.sjjc : '', 60, 56);
          context.fillText(this.bdcqz.djnd ? this.bdcqz.djnd : '', 113, 56);
@@ -131,7 +131,32 @@
          context.fillText(this.bdcqz.qlxz ? this.bdcqz.qlxz : '', 138, 303);
          context.fillText(this.bdcqz.yt ? this.bdcqz.yt : '', 138, 346);
          context.fillText(this.bdcqz.mj ? this.bdcqz.mj : '', 138, 386);
-          context.fillText(this.bdcqz.syqx ? this.bdcqz.syqx : '', 138, 429);
+          // 使用期限
+          if (this.bdcqz.syqx && this.bdcqz.syqx.length > 28) {
+            let lines3 = this.bdcqz.syqx ? this.bdcqz.syqx.split(' ') : [];
+            lines3.forEach((line, index) => {
+              const y = 427 + (index * 27); // 每行文本的垂直位置
+              let currentLine = '';
+              let arr = [];
+              for (let word of line) {
+                const testLine = currentLine + word;
+                const lineWidth = context.measureText(testLine).width;
+                if (lineWidth <= 315) {
+                  currentLine = testLine;
+                } else {
+                  arr.push(currentLine);
+                  currentLine = word;
+                }
+              }
+              arr.push(currentLine);
+              arr.forEach((line, index) => {
+                context.fillText(line, 138, y + (index * 20)); // 调整行高
+              })
+            })
+          } else {
+            context.fillText(this.bdcqz.syqx ? this.bdcqz.syqx : '', 138, 429);
+          }
          // qlqtzk
          const maxWidth = 280; // 最大宽度限制
          let lines = this.bdcqz.qlqtzk ? this.bdcqz.qlqtzk.split('\n') : [];
@@ -155,7 +180,7 @@
            })
          })
-          let lines1 = this.bdcqz.fj ? this.bdcqz.fj.split(' ') : [];
+          let lines1 = this.bdcqz.fj ? this.bdcqz.fj.split('\n') : [];
          lines1.forEach((line, index) => {
            const y = 100 + (index * 37); // 每行文本的垂直位置
            let currentLine = '';
--- a/src/views/ywbl/dbx/dbx.vue
View file @c1b96e4
+++ b/src/views/ywbl/dbx/dbx.vue
View file @c1b96e4
--- a/src/views/ywbl/dbx/dbxdata.js
View file @c1b96e4
+++ b/src/views/ywbl/dbx/dbxdata.js
View file @c1b96e4
 /*
 * @Description: 
 * @Autor: renchao
- * @LastEditTime: 2023-08-08 14:32:47
+ * @LastEditTime: 2023-08-23 15:06:21
 */
 import filter from '@/utils/filter.js'
 let vm = null
@@ -83,8 +83,8 @@ class data extends filter {
      {
        prop: "zl",
        label: "坐落",
-        minWidth: '130',
+        width: '150',
-        showOverflowTooltip: true
+        showOverflowTooltip: true,
      },
      {
        prop: "slsj",
@@ -95,7 +95,7 @@ class data extends filter {
      {
        prop: "slry",
        label: "受理人员",
-        width: '80'
+        minWidth: '80'
      },
      {
        label: "转入时间",
--- a/src/views/ywbl/ybx/ybx.vue
View file @c1b96e4
+++ b/src/views/ywbl/ybx/ybx.vue
View file @c1b96e4
 <!--
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2023-07-25 09:21:40
+ * @LastEditTime: 2023-08-23 15:07:37
 -->
 <template>
  <div class="from-clues">
@@ -11,8 +11,7 @@
        :model="queryForm"
        ref="queryForm"
        @submit.native.prevent
-        label-width="80px"
+        label-width="80px">
-      >
        <el-row>
          <el-col :span="5">
            <el-form-item label="业务来源" label-width="70px">
@@ -23,14 +22,12 @@
                class="width100"
                filterable
                clearable
-                placeholder="请选择业务来源"
+                placeholder="请选择业务来源">
-              >
                <el-option
                  v-for="item in dictData['ywly']"
                  :key="item.dcode"
                  :label="item.dname"
-                  :value="item.dcode"
+                  :value="item.dcode">
-                >
                </el-option>
              </el-select>
            </el-form-item>
@@ -44,14 +41,12 @@
                class="width100"
                filterable
                clearable
-                placeholder="请选择权利类型"
+                placeholder="请选择权利类型">
-              >
                <el-option
                  v-for="item in dictData['A8']"
                  :key="item.dcode"
                  :label="item.dname"
-                  :value="item.dcode"
+                  :value="item.dcode">
-                >
                </el-option>
              </el-select>
            </el-form-item>
@@ -65,14 +60,12 @@
                class="width100"
                filterable
                clearable
-                placeholder="请选择登记类型"
+                placeholder="请选择登记类型">
-              >
                <el-option
                  v-for="item in dictData['A21']"
                  :key="item.dcode"
                  :label="item.dname"
-                  :value="item.dcode"
+                  :value="item.dcode">
-                >
                </el-option>
              </el-select>
            </el-form-item>
@@ -83,8 +76,7 @@
                placeholder="请输入业务号"
                v-model="queryForm.ywh"
                clearable
-                class="width200px"
+                class="width200px">
-              >
              </el-input>
            </el-form-item>
          </el-col>
@@ -94,9 +86,7 @@
              <el-button
                type="primary"
                native-type="submit"
-                @click="handleSearch"
+                @click="handleSearch">查询</el-button>
-                >查询</el-button
-              >
              <el-button @click="moreQueryClick">高级查询</el-button>
            </el-form-item>
          </el-col>
@@ -108,16 +98,14 @@
              {{ item.name }}:{{ item.value }}
              <i
                class="el-icon-circle-close"
-                @click="handelItem(item, index)"
+                @click="handelItem(item, index)"></i>
-              ></i>
            </li>
          </ul>
          <el-button
            class="clean-btn"
            type="text"
            v-if="searchList.length > 0"
-            @click.native="hanldeCleanAll"
+            @click.native="hanldeCleanAll">清除全部
-            >清除全部
          </el-button>
        </el-row>
      </el-form>
@@ -134,131 +122,128 @@
        @size-change="handleSizeChange"
        @p-current-change="handleCurrentChange"
        :column="tableData.columns"
-        :data="tableData.data"
+        :data="tableData.data">
-      >
      </lb-table>
    </div>
    <searchBox
      v-model="isSearch"
      @getSearch="getSearch"
-      :advancedForm="otherForm"
+      :advancedForm="otherForm" />
-    />
  </div>
 </template>
 <script>
-import { mapGetters } from "vuex";
+  import { mapGetters } from "vuex";
-import searchMin from "../components/mixin/index";
+  import searchMin from "../components/mixin/index";
-import table from "@/utils/mixin/table";
+  import table from "@/utils/mixin/table";
-import { datas, sendThis } from "./ybxdata";
+  import { datas, sendThis } from "./ybxdata";
-import { searchTaskDone } from "@/api/workflow/search.js";
+  import { searchTaskDone } from "@/api/workflow/search.js";
-import searchBox from "../components/search.vue";
+  import searchBox from "../components/search.vue";
-export default {
+  export default {
-  name: "ybx",
+    name: "ybx",
-  components: { searchBox },
+    components: { searchBox },
-  mixins: [table, searchMin],
+    mixins: [table, searchMin],
-  mounted() {
+    mounted () {
-    sendThis(this);
+      sendThis(this);
-  },
+    },
-  computed: {
+    computed: {
-    ...mapGetters(["dictData"]),
+      ...mapGetters(["dictData"]),
-  },
-  data() {
-    return {
-      queryForm: {
-        ywly: "",
-        qllx: "",
-        djlx: "",
-        ywh: "",
-      },
-      searchForm: {
-        ywlymc: "",
-        qllxmc: "",
-        djlxmc: "",
-        ywh: "",
-      },
-      tableData: {
-        total: 0,
-        columns: datas.columns(),
-        data: [],
-      },
-    };
-  },
-  activated() {
-    this.queryClick();
-    window["getBpageList"] = () => {
-      this.queryClick();
-    };
-  },
-  methods: {
-    // 列表渲染接口
-    /**
-     * @description: 列表渲染接口
-     * @author: renchao
-     */
-    queryClick() {
-      this.$startLoading();
-      this.searchForm.ywh = this.queryForm.ywh;
-      this.iterationData();
-      searchTaskDone({
-        ...this.queryForm,
-        ...this.otherForm,
-        ...this.pageData,
-      }).then((res) => {
-        this.$endLoading();
-        if (res.code === 200) {
-          let { total, records } = res.result;
-          records.forEach((item) => {
-            item.qlrmc = item.qlrmc.join(",");
-            item.ywh = item.ywh.join(",");
-            item.zl = item.zl.join(",");
-            item.outstepdate = item.outstepdate[0];
-          });
-          this.tableData.total = total ? total : 0;
-          this.tableData.data = records ? records : [];
-        }
-      });
    },
-    /**
+    data () {
-     * @description: handleSort
+      return {
-     * @param {*} val
+        queryForm: {
-     * @author: renchao
+          ywly: "",
-     */
+          qllx: "",
-    handleSort(val) {
+          djlx: "",
-      this.queryForm.sortField = val.prop;
+          ywh: "",
-      this.queryForm.sortOrder = val.order == "ascending" ? "asc" : "desc";
+        },
+        searchForm: {
+          ywlymc: "",
+          qllxmc: "",
+          djlxmc: "",
+          ywh: "",
+        },
+        tableData: {
+          total: 0,
+          columns: datas.columns(),
+          data: [],
+        },
+      };
+    },
+    activated () {
      this.queryClick();
+      window["getBpageList"] = () => {
+        this.queryClick();
+      };
    },
-    /**
+    methods: {
-     * @description: ywhClick
+      /**
-     * @param {*} item
+       * @description: 列表渲染接口
-     * @author: renchao
+       * @author: renchao
-     */
+       */
-    ywhClick(item) {
+      queryClick () {
-      //有任务权限
+        this.$startLoading();
-      if (item.sjlx == "3") {
+        this.searchForm.ywh = this.queryForm.ywh;
-        item.djywbm = "DJBBL";
+        this.iterationData();
-        const { href } = this.$router.resolve(
+        searchTaskDone({
-          "/djbworkFrameview?bsmSlsq=" +
+          ...this.queryForm,
+          ...this.otherForm,
+          ...this.pageData,
+        }).then((res) => {
+          this.$endLoading();
+          if (res.code === 200) {
+            let { total, records } = res.result;
+            records.forEach((item) => {
+              item.qlrmc = item.qlrmc.join(",");
+              item.ywh = item.ywh.join(",");
+              item.zl = item.zl.join(",");
+              item.outstepdate = item.outstepdate[0];
+            });
+            this.tableData.total = total ? total : 0;
+            this.tableData.data = records ? records : [];
+          }
+        });
+      },
+      /**
+       * @description: handleSort
+       * @param {*} val
+       * @author: renchao
+       */
+      handleSort (val) {
+        this.queryForm.sortField = val.prop;
+        this.queryForm.sortOrder = val.order == "ascending" ? "asc" : "desc";
+        this.queryClick();
+      },
+      /**
+       * @description: ywhClick
+       * @param {*} item
+       * @author: renchao
+       */
+      ywhClick (item) {
+        //有任务权限
+        if (item.sjlx == "3") {
+          item.djywbm = "DJBBL";
+          const { href } = this.$router.resolve(
+            "/djbworkFrameview?bsmSlsq=" +
            item.bsmSlsq +
            "&bestepid=" +
            item.bestepid +
            "&sqywbm=" +
            item.djywbm
-        );
+          );
-        window.open(href, `djbworkFrameview${item.bsmSlsq}`);
+          window.open(href, `djbworkFrameview${item.bsmSlsq}`);
-      } else {
+        } else {
-        const { href } = this.$router.resolve(
+          const { href } = this.$router.resolve(
-          "/workFrameView?bsmSlsq=" +
+            "/workFrameView?bsmSlsq=" +
            item.bsmSlsq +
            "&bestepid=" +
            item.bestepid
-        );
+          );
-        window.open(href, `workFrameView${item.bsmSlsq}`);
+          window.open(href, `workFrameView${item.bsmSlsq}`);
-      }
+        }
+      },
    },
-  },
+  };
-};
 </script>
 <style scoped lang="scss">
-@import "~@/styles/public.scss";
+  @import "~@/styles/public.scss";
 </style>
--- a/src/views/ywbl/ybx/ybxdata.js
View file @c1b96e4
+++ b/src/views/ywbl/ybx/ybxdata.js
View file @c1b96e4
+/*
+ * @Description: 
+ * @Autor: renchao
+ * @LastEditTime: 2023-08-23 15:04:35
+ */
 import filter from '@/utils/filter.js'
 let vm = null
@@ -57,6 +62,7 @@ class data extends filter {
      {
        prop: "sqywmc",
        label: "申请业务名称",
+        width: '150',
      },
      {
        prop: "qlrmc",
--- a/src/views/ywbl/ywsq/components/diyaq.vue
View file @c1b96e4
+++ b/src/views/ywbl/ywsq/components/diyaq.vue
View file @c1b96e4
 <!--
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2023-08-02 09:57:31
+ * @LastEditTime: 2023-08-23 14:51:26
 -->
 <template>
  <!-- 抵押权利信息查询 -->
@@ -39,7 +39,6 @@
          <el-col :span="2" class="btnColRight">
            <el-form-item>
              <el-button type="primary" @click="handleSearch" :loading="loading">查询</el-button>
-              <!-- <el-button type="primary" @click="resetForm(true)">重置</el-button> -->
            </el-form-item>
          </el-col>
        </el-row>
--- a/src/views/ywbl/ywsq/javascript/diyaq.js
View file @c1b96e4
+++ b/src/views/ywbl/ywsq/javascript/diyaq.js
View file @c1b96e4
 /*
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2023-08-04 09:52:09
+ * @LastEditTime: 2023-08-23 14:51:40
 */
 import filter from '@/utils/filter.js'
 let vm = null
@@ -35,22 +35,12 @@ class data extends filter {
      {
        prop: "status",
        label: "状态",
+        minWidth: '120',
        render: (h, scope) => {
          return (
            <div>
              <a style='color:#3498db;' v-show={scope.row.djblzt == 1}>{this.yWstatus(scope.row)}</a>
              <span v-show={scope.row.djblzt != 1}>{this.yWstatus(scope.row)}</span>
-              {/* <a style='color:#3498db;' v-show={scope.row.djblzt == 1} >正在办理</a>
-              <span v-show={scope.row.zjgcdyzt == 1}>,在建工程抵押</span>
-              <span v-show={scope.row.ycfzt == 1}>,已预查封</span>
-              <span v-show={scope.row.ycfzt == 1}>,已预查封</span>
-              <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> */}
            </div>
          )
        }
@@ -58,7 +48,8 @@ class data extends filter {
      {
        prop: "bdcqzh",
        label: "不动产证明号",
-        minWidth: '150'
+        width: '150',
+        showOverflowTooltip: true
      },
      {
        prop: "bdcdyh",
--- a/src/views/ywbl/ywsq/javascript/selecBdcql.js
View file @c1b96e4
+++ b/src/views/ywbl/ywsq/javascript/selecBdcql.js
View file @c1b96e4
 /*
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2023-07-14 16:59:43
+ * @LastEditTime: 2023-08-23 14:56:57
 */
 import filter from '@/utils/filter.js'
 let vm = null
@@ -47,16 +47,20 @@ class data extends filter {
      {
        prop: "qllxmc",
        label: "权利类型",
+        width: '120',
+        showOverflowTooltip: true
      },
      {
        prop: "bdcdyh",
        label: "不动产单元号",
-        minWidth: '150'
+        width: '150',
+        showOverflowTooltip: true
      },
      {
        prop: "bdcqzh",
        label: "不动产权证号",
-        minWidth: '150'
+        width: '150',
+        showOverflowTooltip: true
      },
      {
        prop: "gyqk",
@@ -95,7 +99,8 @@ class data extends filter {
      {
        prop: "zl",
        label: "坐落",
-        minWidth: '130'
+        width: '130',
+        showOverflowTooltip: true
      },
      {
        label: '操作',
--- a/src/views/ywbl/ywsq/javascript/selectDjbbl.js
View file @c1b96e4
+++ b/src/views/ywbl/ywsq/javascript/selectDjbbl.js
View file @c1b96e4
@@ -80,12 +80,14 @@ class data extends filter {
      {
        prop: "bdcdyh",
        label: "不动产单元号",
-        minWidth: '150'
+        width: '150',
+        showOverflowTooltip: true
      },
      {
        prop: "bdcqzh",
        label: "不动产权证号",
-        minWidth: '150'
+        width: '150',
+        showOverflowTooltip: true
      },
      {
        prop: "qlrmc",
@@ -108,7 +110,8 @@ class data extends filter {
      {
        prop: "zl",
        label: "坐落",
-        minWidth: '150'
+        width: '150',
+        showOverflowTooltip: true
      },
      {
        label: '操作',
--- a/src/views/ywbl/ywsq/javascript/selectJsydsyqhbfg.js
View file @c1b96e4
+++ b/src/views/ywbl/ywsq/javascript/selectJsydsyqhbfg.js
View file @c1b96e4
 /*
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2023-07-14 17:00:04
+ * @LastEditTime: 2023-08-23 14:49:24
 */
 import filter from '@/utils/filter.js'
 let vm = null
@@ -35,17 +35,6 @@ class data extends filter {
            <div>
              <a style='color:#3498db;' v-show={scope.row.djblzt == 1}>{this.yWstatus(scope.row)}</a>
              <span v-show={scope.row.djblzt != 1}>{this.yWstatus(scope.row)}</span>
-              {/* <a style='color:#3498db;' v-show={scope.row.djblzt == 1} >正在办理</a>
-              <span v-show={scope.row.zjgcdyzt == 1}>,在建工程抵押</span>
-              <span v-show={scope.row.ycfzt == 1}>,已预查封</span>
-              <span v-show={scope.row.ycfzt == 1}>,已预查封</span>
-              <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> */}
            </div>
          )
        }
@@ -57,12 +46,14 @@ class data extends filter {
      {
        prop: "bdcdyh",
        label: "不动产单元号",
-        minWidth: '150'
+        width: '150',
+        showOverflowTooltip: true
      },
      {
        prop: "bdcqzh",
        label: "不动产权证号",
-        minWidth: '150'
+        width: '150',
+        showOverflowTooltip: true
      },
      {
        prop: "qlrmc",
--- a/src/views/ywbl/ywsq/javascript/selectTdsyq.js
View file @c1b96e4
+++ b/src/views/ywbl/ywsq/javascript/selectTdsyq.js
View file @c1b96e4
@@ -51,12 +51,14 @@ class data extends filter {
      {
        prop: "bdcdyh",
        label: "不动产单元号",
-        minWidth: '150'
+        width: '150',
+        showOverflowTooltip: true
      },
      {
        prop: "bdcqzh",
        label: "不动产权证号",
-        minWidth: '150'
+        width: '150',
+        showOverflowTooltip: true
      },
      {
        prop: "gyqk",
--- a/src/views/zhcx/djbcx/djbcxdata.js
View file @c1b96e4
+++ b/src/views/zhcx/djbcx/djbcxdata.js
View file @c1b96e4
@@ -84,12 +84,14 @@ class data extends filter {
      {
        prop: "bdcdyh",
        label: "不动产单元号",
-        minWidth: '150'
+        width: '150',
+        showOverflowTooltip: true
      },
      {
        prop: "bdcqzh",
        label: "不动产权证号",
-        minWidth: '150'
+        width: '150',
+        showOverflowTooltip: true
      },
      {
        prop: "qlrmc",
--- a/src/views/zhcx/zslqcx/zslqcx.js
View file @c1b96e4
+++ b/src/views/zhcx/zslqcx/zslqcx.js
View file @c1b96e4
@@ -65,7 +65,8 @@ class data extends filter {
      {
        prop: "bdcqzh",
        label: "不动产权证号",
-        minWidth: '120'
+        width: '150',
+        showOverflowTooltip: true
      },
      {
        prop: "qlr",