Merge branch 'dev'

renchao@pashanhoo.com
Showing 4 changed files with 30 additions and 29 deletions
src/views/sqcx/dydjb/components/addDydjb.vue
src/views/sqcx/sqcxjl/sqcxjl.vue
src/views/system/dymbgl/components/editDialog.vue
src/views/system/dymbgl/dymbgl.vue
--- a/src/views/sqcx/dydjb/components/addDydjb.vue
View file @b8f6cf6
+++ b/src/views/sqcx/dydjb/components/addDydjb.vue
View file @b8f6cf6
 <template>
-  <dialogBox title="房屋明细查询" @closeDialog="closeDialog" width="70%" :isButton="false" v-model="myValue">
+  <dialogBox title="房屋明细查询" @closeDialog="closeDialog" width="75%" :isButton="false" v-model="myValue">
    <el-steps :active="activeStep" finish-status="success">
      <el-step title="条件录入"></el-step>
      <el-step title="结果查询"></el-step>
      <el-step title="结果展示"></el-step>
    </el-steps>
    <div v-if="isSearch">
-        <dydjbInfo ref="dydjbInfo"/>
+      <dydjbInfo ref="dydjbInfo" />
    </div>
    <div class="jtfccx-edit" v-else>
      <div class="jtfccx-edit-con">
        <b class="title"></b>
-        <el-form :model="form" label-width="120px">
+        <el-form :model="form" label-width="110px">
          <el-row>
            <el-col :span="6">
              <el-form-item label="查询用途" label-width="90px">
-                <el-input v-model="form.djSqcxDO.cxyt" class="width200px"></el-input>
+                <el-input v-model="form.djSqcxDO.cxyt" class="width100"></el-input>
              </el-form-item>
            </el-col>
-            <el-col :span="6">
+            <el-col :span="8">
-              <el-form-item label="不动产权证号" label-width="120px">
+              <el-form-item label="不动产权证号">
-                <el-input v-model="form.djSqcxDO.bdcqzh" class="width200px"></el-input>
+                <el-input v-model="form.djSqcxDO.bdcqzh" class="width100"></el-input>
              </el-form-item>
            </el-col>
-            <el-col :span="12">
+            <el-col :span="10">
              <el-form-item label="与产权人的关系">
                <el-radio-group v-model="form.djSqcxDO.ycqrgx">
                  <el-radio label="1">房屋权利人</el-radio>
@@ -53,13 +53,13 @@
 </template>
 <script>
-import { addFwmxCxjgXx, getFwmxInfo,printJtcfInfo } from "@/api/jtfc.js";
+  import { addFwmxCxjgXx, getFwmxInfo, printJtcfInfo } from "@/api/jtfc.js";
-import { getPrintTemplateByCode } from "@/api/print";
+  import { getPrintTemplateByCode } from "@/api/print";
-import { datas, sendThis } from "./dydjbdata";
+  import { datas, sendThis } from "./dydjbdata";
-import { getLodop } from "@/utils/LodopFuncs"
+  import { getLodop } from "@/utils/LodopFuncs"
-import dydjbInfo from "./dydjbInfo.vue";
+  import dydjbInfo from "./dydjbInfo.vue";
-import { mapGetters } from "vuex";
+  import { mapGetters } from "vuex";
-export default {
+  export default {
    computed: {
      ...mapGetters(["dictData"]),
    },
@@ -91,7 +91,7 @@ export default {
          inputErr: false,
        },
        form: {
-        djSqcxDO: { ycqrgx: "1", cxyt: "",bdcqzh: "" },
+          djSqcxDO: { ycqrgx: "1", cxyt: "", bdcqzh: "" },
          sqrList: [],
          qlrList: [],
          cxjgList: [],
@@ -138,7 +138,7 @@ export default {
        this.$emit("input", false);
        this.activeStep = 0;
        this.form = {
-        djSqcxDO: { ycqrgx: "1", cxyt: "" ,bdcqzh: ""},
+          djSqcxDO: { ycqrgx: "1", cxyt: "", bdcqzh: "" },
          sqrList: [],
          qlrList: [],
          cxjgList: [],
@@ -189,7 +189,7 @@ export default {
       * @author: renchao
       */
      resetClick () {
-      this.form.djSqcxDO = { ycqrgx: "1", cxyt: "",bdcqzh: "" };
+        this.form.djSqcxDO = { ycqrgx: "1", cxyt: "", bdcqzh: "" };
        this.form.sqrList = _.cloneDeep([this.newData]);
        this.form.qlrList = _.cloneDeep([this.newData]);
        this.form.cxjgList = [];
@@ -246,20 +246,20 @@ export default {
        }
      },
    },
-};
+  };
 </script>
 <style scoped lang="scss">
-@import "~@/styles/mixin.scss";
+  @import "~@/styles/mixin.scss";
-@import "~@/styles/public.scss";
+  @import "~@/styles/public.scss";
-.title {
+  .title {
    padding-bottom: 10px;
    margin-bottom: 10px;
    display: block;
    border-bottom: 1px solid $borderColor;
-}
+  }
-.jtfccx-edit {
+  .jtfccx-edit {
    @include flex;
    flex-direction: column;
    overflow-y: hidden;
@@ -278,5 +278,5 @@ export default {
      padding-top: 10px;
      background-color: #fff;
    }
-}
+  }
 </style>
--- a/src/views/sqcx/sqcxjl/sqcxjl.vue
View file @b8f6cf6
+++ b/src/views/sqcx/sqcxjl/sqcxjl.vue
View file @b8f6cf6
@@ -51,7 +51,7 @@
          <el-col :span="12" class="btnColRight">
            <el-form-item>
              <el-button type="primary" native-type="submit" @click="handleSearch">查询</el-button>
-              <el-button @click="moreQueryClick()">高级查询</el-button>
+              <!-- <el-button @click="moreQueryClick()">高级查询</el-button> -->
            </el-form-item>
          </el-col>
        </el-row>
--- a/src/views/system/dymbgl/components/editDialog.vue
View file @b8f6cf6
+++ b/src/views/system/dymbgl/components/editDialog.vue
View file @b8f6cf6
 <!--
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2023-08-29 09:50:32
+ * @LastEditTime: 2023-08-29 14:13:09
 -->
 <template>
  <el-form ref="ruleForm" :model="ruleForm" label-width="100px" :rules="rules">
@@ -193,7 +193,8 @@
            }, 1000);
          };
        if (['zsdy', 'zmdy'].includes(that.ruleForm.tmpno)) {
-          LODOP.SET_PRINT_MODE("RESELECT_ORIENT", true); // 设置为横向打印
+          LODOP.SET_PRINT_PAGESIZE(2, 0, 0, "B4");
+          // LODOP.SET_PRINT_MODE("RESELECT_ORIENT", true); // 手动设置方向
        }
        LODOP.PRINT_DESIGN(); //打印设计或者打印维护需要放到最后
      }
--- a/src/views/system/dymbgl/dymbgl.vue
View file @b8f6cf6
+++ b/src/views/system/dymbgl/dymbgl.vue
View file @b8f6cf6
@@ -5,7 +5,7 @@
        <el-row>
          <el-col :span="24" class="btnColRight">
            <el-form-item>
-              <el-button type="primary" @click="fetchData">查询</el-button>
+              <!-- <el-button type="primary" @click="fetchData">查询</el-button> -->
              <el-button type="primary" @click="openAddDialog">新增</el-button>
            </el-form-item>
          </el-col>