Merge branch 'dev'

renchao@pashanhoo.com
Showing 5 changed files with 79 additions and 106 deletions
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/javascript/selecBdcql.js
--- a/src/views/ywbl/dbx/dbx.vue
View file @5fe118f
+++ b/src/views/ywbl/dbx/dbx.vue
View file @5fe118f
 <!--
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2023-07-25 09:21:53
+ * @LastEditTime: 2023-08-23 15:07:51
 -->
 <template>
  <div class="from-clues">
@@ -10,8 +10,7 @@
        :model="queryForm"
        ref="queryForm"
        @submit.native.prevent
-        label-width="100px"
+        label-width="100px">
-      >
        <el-row>
          <el-col :span="5">
            <el-form-item label="业务来源">
@@ -22,14 +21,12 @@
                @change="handleSelect('ywly', 'ywlymc', 'ywly')"
                @clear="handleEmpty('ywlymc')"
                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>
@@ -43,14 +40,12 @@
                @clear="handleEmpty('qllxmc')"
                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>
@@ -64,14 +59,12 @@
                @clear="handleEmpty('djlxmc')"
                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>
@@ -82,8 +75,7 @@
                placeholder="请输入业务号"
                v-model="queryForm.ywh"
                clearable
-                class="width100"
+                class="width100">
-              >
              </el-input>
            </el-form-item>
          </el-col>
@@ -93,9 +85,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>
@@ -107,8 +97,7 @@
                placeholder="请输入不动产单元号"
                v-model="queryForm.bdcdyh"
                clearable
-                class="width100"
+                class="width100">
-              >
              </el-input>
            </el-form-item>
          </el-col>
@@ -118,8 +107,7 @@
                placeholder="如需要模糊查询，前后输入%"
                v-model="queryForm.sqrmc"
                clearable
-                class="width100"
+                class="width100">
-              >
              </el-input>
            </el-form-item>
          </el-col>
@@ -129,8 +117,7 @@
                placeholder="如需要模糊查询，前后输入%"
                v-model="queryForm.sqrzjhm"
                clearable
-                class="width100"
+                class="width100">
-              >
              </el-input>
            </el-form-item>
          </el-col>
@@ -140,8 +127,7 @@
                placeholder="如需要模糊查询，前后输入%"
                v-model.trim="queryForm.zl"
                clearable
-                class="width100"
+                class="width100">
-              >
              </el-input>
            </el-form-item>
          </el-col>
@@ -153,16 +139,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>
@@ -177,37 +161,34 @@
        @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 searchBox from "../components/search.vue";
+  import searchBox from "../components/search.vue";
-import table from "@/utils/mixin/table";
+  import table from "@/utils/mixin/table";
-import searchMin from "../components/mixin/index";
+  import searchMin from "../components/mixin/index";
-import { datas, sendThis } from "./dbxdata";
+  import { datas, sendThis } from "./dbxdata";
-import { searchTaskToDo } from "@/api/workflow/search.js";
+  import { searchTaskToDo } from "@/api/workflow/search.js";
-import {
+  import {
    judgeUserTaskPermission,
    deleteFlow,
    claimTask,
-} from "@/api/workFlow.js";
+  } from "@/api/workFlow.js";
-export default {
+  export default {
-  name: "dbx",
    components: { searchBox },
    mixins: [table, searchMin],
    computed: {
      ...mapGetters(["dictData", "transfer"]),
    },
-  data() {
+    data () {
      return {
        queryForm: {},
        searchForm: {
@@ -224,16 +205,16 @@ export default {
        jumpid: "",
      };
    },
-  mounted() {
+    mounted () {
      sendThis(this);
    },
    watch: {
      queryForm: {
-      handler(newName, oldName) {},
+        handler (newName, oldName) { },
        immediate: true,
      },
    },
-  activated() {
+    activated () {
      this.queryClick();
      window["getBpageList"] = () => {
        this.queryClick();
@@ -245,7 +226,7 @@ export default {
       * @description: 列表渲染接口
       * @author: renchao
       */
-    queryClick() {
+      queryClick () {
        this.$startLoading();
        this.searchForm.ywh = this.queryForm.ywh;
        this.iterationData();
@@ -267,7 +248,7 @@ export default {
       * @param {*} val
       * @author: renchao
       */
-    handleSort(val) {
+      handleSort (val) {
        this.queryForm.sortField = val.prop;
        this.queryForm.sortOrder = val.order == "ascending" ? "asc" : "desc";
        this.queryClick();
@@ -277,7 +258,7 @@ export default {
       * @param {*} item
       * @author: renchao
       */
-    del(item) {
+      del (item) {
        let formdata = new FormData();
        formdata.append("bsmSlsq", item.bsmSlsq);
        this.$confirm("确定要删除吗, 是否继续?", "提示", {
@@ -311,7 +292,7 @@ export default {
       * @param {*} item
       * @author: renchao
       */
-    ywhClick(item) {
+      ywhClick (item) {
        //判断用户是否拥有该任务的权限，若有则跳转，无权限则给予提示并刷新页面
        judgeUserTaskPermission({
          bsmSlsq: item.bsmSlsq,
@@ -364,8 +345,8 @@ export default {
        });
      },
    },
-};
+  };
 </script>
 <style scoped lang="scss">
-@import "~@/styles/public.scss";
+  @import "~@/styles/public.scss";
 </style>
--- a/src/views/ywbl/dbx/dbxdata.js
View file @5fe118f
+++ b/src/views/ywbl/dbx/dbxdata.js
View file @5fe118f
 /*
 * @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 @5fe118f
+++ b/src/views/ywbl/ybx/ybx.vue
View file @5fe118f
 <!--
 * @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,35 +122,33 @@
        @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",
    components: { searchBox },
    mixins: [table, searchMin],
-  mounted() {
+    mounted () {
      sendThis(this);
    },
    computed: {
      ...mapGetters(["dictData"]),
    },
-  data() {
+    data () {
      return {
        queryForm: {
          ywly: "",
@@ -183,19 +169,18 @@ export default {
        },
      };
    },
-  activated() {
+    activated () {
      this.queryClick();
      window["getBpageList"] = () => {
        this.queryClick();
      };
    },
    methods: {
-    // 列表渲染接口
      /**
       * @description: 列表渲染接口
       * @author: renchao
       */
-    queryClick() {
+      queryClick () {
        this.$startLoading();
        this.searchForm.ywh = this.queryForm.ywh;
        this.iterationData();
@@ -223,7 +208,7 @@ export default {
       * @param {*} val
       * @author: renchao
       */
-    handleSort(val) {
+      handleSort (val) {
        this.queryForm.sortField = val.prop;
        this.queryForm.sortOrder = val.order == "ascending" ? "asc" : "desc";
        this.queryClick();
@@ -233,7 +218,7 @@ export default {
       * @param {*} item
       * @author: renchao
       */
-    ywhClick(item) {
+      ywhClick (item) {
        //有任务权限
        if (item.sjlx == "3") {
          item.djywbm = "DJBBL";
@@ -257,8 +242,8 @@ export default {
        }
      },
    },
-};
+  };
 </script>
 <style scoped lang="scss">
-@import "~@/styles/public.scss";
+  @import "~@/styles/public.scss";
 </style>
--- a/src/views/ywbl/ybx/ybxdata.js
View file @5fe118f
+++ b/src/views/ywbl/ybx/ybxdata.js
View file @5fe118f
+/*
+ * @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/javascript/selecBdcql.js
View file @5fe118f
+++ b/src/views/ywbl/ywsq/javascript/selecBdcql.js
View file @5fe118f
 /*
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2023-08-23 14:53:01
+ * @LastEditTime: 2023-08-23 14:56:57
 */
 import filter from '@/utils/filter.js'
 let vm = null
@@ -99,7 +99,8 @@ class data extends filter {
      {
        prop: "zl",
        label: "坐落",
-        minWidth: '130'
+        width: '130',
+        showOverflowTooltip: true
      },
      {
        label: '操作',