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

tianhaohao@pashanhoo.com
Showing 12 changed files with 254 additions and 160 deletions
src/image/bdclogo.png
src/layout/components/Navbar.vue
src/utils/filter.js
src/views/lpb/lpbContent/index.vue
src/views/system/dymbgl/components/editDialog.vue
src/views/workflow/main/fzxx/zslq.vue
src/views/workflow/main/slsqxx/fdcq2/slxx.vue
src/views/workflow/main/szxx/zsdy.vue
src/views/workflow/mixin/index.js
src/views/workflow/top/zsyl/index.vue
src/views/ywbl/ywsq/components/selectJsydsyqSplitMerge.vue
src/views/zhcx/djbcx/djbcx.vue
--- a/src/image/bdclogo.png 0 → 100644
View file @74b5cb3
+++ b/src/image/bdclogo.png 0 → 100644
View file @74b5cb3
--- a/src/layout/components/Navbar.vue
View file @74b5cb3
+++ b/src/layout/components/Navbar.vue
View file @74b5cb3
@@ -2,7 +2,8 @@
  <div class="navbar-con">
    <div class="navbar" v-theme.background="mTheme">
      <div class="logo">
-        <img v-if="logo" :src="logo" class="header-logo">
+        <img v-if="logo" :src="logo" class="header-logo" />
+        <h4>{{ userInfo.districtName }}不动产登记平台</h4>
      </div>
      <!-- <div class="backdrop">
        <theme style="float: right;height: 26px;width: 26px;margin-top: 26px;" @change="themeChange" />
@@ -10,29 +11,46 @@
      <div class="right-menu">
        <!-- <svg-icon class="function" icon-class='function' /> -->
        <div class="avatar-wrapper">
-          <!-- <span style="padding-right:10px">{{ name }}</span> -->
+          <p>
-          <div> {{ userInfo.departmentName }}</div>
+            <span style="padding-right: 10px">{{
-          <div> {{ userInfo.name }}</div>
+              userInfo.departmentName
+            }}</span>
+            <span style="padding-right: 10px">{{ userInfo.name }}</span>
+          </p>
          <img :src="avatar + '?imageView2/1/w/80/h/80'" class="user-avatar" />
        </div>
-        <svg-icon class="shutdown" @click.native="logout" icon-class='shutdown' />
+        <svg-icon
+          class="shutdown"
+          @click.native="logout"
+          icon-class="shutdown"
+        />
      </div>
    </div>
-    <NoticeBar class="NoticeBar" :noticeList="noticeList" v-if="noticeList.length > 0" />
+    <NoticeBar
+      class="NoticeBar"
+      :noticeList="noticeList"
+      v-if="noticeList.length > 0"
+    />
  </div>
 </template>
 <script>
-  import axios from 'axios'
+import axios from "axios";
-  import Cookies from 'js-cookie'
+import Cookies from "js-cookie";
-  import { mapGetters } from 'vuex'
+import { mapGetters } from "vuex";
-  import NoticeBar from '@/components/NoticeBar/index'
+import NoticeBar from "@/components/NoticeBar/index";
-  import { getHomeNoticeList } from "@/api/home"
+import { getHomeNoticeList } from "@/api/home";
-  import { setToken } from "@/utils/util";
+import { setToken } from "@/utils/util";
-  export default {
+export default {
  components: {
-      NoticeBar
+    NoticeBar,
  },
  computed: {
+    ...mapGetters(["sidebar", "avatar", "name", "userInfo"]),
+    baseUrl() {
+      return window._config.baseUrl;
+    },
+<<<<<<< HEAD
+    computed: {
      ...mapGetters(['sidebar', 'avatar', 'name','userInfo']),
      baseUrl () {
        return window._config.baseUrl;
@@ -42,45 +60,57 @@
      return {
        logo: require('../../image/logo.png'),
        noticeList: []
-      }
+=======
  },
-    created () {
+  data() {
-      this.queryNoticeList()
+    return {
+      logo: require("../../image/bdclogo.png"),
+      noticeList: [],
+    };
+  },
+  created() {
+    this.queryNoticeList();
  },
-    mounted () {
+  mounted() {
-      let that = this
+    let that = this;
-      window.addEventListener('message', function (messageEvent) {
+    window.addEventListener("message", function (messageEvent) {
      if (messageEvent.data.update) {
-          that.queryNoticeList()
+        that.queryNoticeList();
+>>>>>>> b4f3275250be77c94de397972ae05502fc7b7f3c
      }
-      })
+    });
  },
-    destroyed () {
+  destroyed() {
-      window.removeEventListener('message')
+    window.removeEventListener("message");
  },
  methods: {
    /**
     * @description: queryNoticeList
     * @author: renchao
     */
-      queryNoticeList () {
+    queryNoticeList() {
-        getHomeNoticeList().then(res => {
+      getHomeNoticeList().then((res) => {
        if (res.result) {
-            this.noticeList = res.result.noticeList
+          this.noticeList = res.result.noticeList;
        }
-        })
+      });
    },
    /**
     * @description: logout
     * @author: renchao
     */
-      logout () {
+    logout() {
-        axios.post(window._config.services.management + "/management/logout").then(() => {
+      axios
-          setToken(undefined)
+        .post(window._config.services.management + "/management/logout")
-          sessionStorage.removeItem('token')
+        .then(() => {
-          localStorage.setItem('dj-location', window.location.href)
+          setToken(undefined);
-          window.location.href = window._config.casBaseURL + '/logout?service=' + encodeURIComponent(window.location.href);
+          sessionStorage.removeItem("token");
-        })
+          localStorage.setItem("dj-location", window.location.href);
+          window.location.href =
+            window._config.casBaseURL +
+            "/logout?service=" +
+            encodeURIComponent(window.location.href);
+        });
    },
    /**
@@ -88,37 +118,37 @@
     * @param {*} val
     * @author: renchao
     */
-      themeChange (val) {
+    themeChange(val) {
-        this.$store.dispatch('app/updateTheme', val)
+      this.$store.dispatch("app/updateTheme", val);
    },
-      searchMessageCenter () {
+    searchMessageCenter() {
-        this.$router.push({ name: 'messagecenter' })
+      this.$router.push({ name: "messagecenter" });
    },
    /**
     * @description: handleCommand
     * @param {*} command
     * @author: renchao
     */
-      handleCommand (command) {
+    handleCommand(command) {
-        if (command == 'a') {
+      if (command == "a") {
        //个人中心
-          this.$router.push({ name: 'personal' })
+        this.$router.push({ name: "personal" });
-        }
-      }
-    }
      }
+    },
+  },
+};
 </script>
 <style lang="scss" scoped>
-  .navbar-con {
+.navbar-con {
  position: relative;
-  }
+}
-  .NoticeBar {
+.NoticeBar {
  position: absolute;
  bottom: 0;
-  }
+}
-  .el-dropdown-menu {
+.el-dropdown-menu {
  padding: 0 !important;
  border: 1px solid #ebeef5;
  box-shadow: 0 2px 10px 0 rgba(0, 0, 0, 0.12);
@@ -151,9 +181,9 @@
    background: #f6f7f9;
    color: #4a4a4a;
  }
-  }
+}
-  .navbar {
+.navbar {
  height: $headerHeight;
  overflow: hidden;
  position: relative;
@@ -165,8 +195,22 @@
  padding: 0 20px;
  justify-content: space-between;
+  .logo {
+    // margin-top: -20px;
    .header-logo {
-      width: 300px;
+      width: 40px;
+      float: left;
+      vertical-align: middle;
+    }
+    h4 {
+      float: left;
+      vertical-align: middle;
+      line-height: 40px;
+      font-size: 22px;
+      color: #fff;
+      text-indent: 6px;
+      letter-spacing: 2px;
+    }
  }
  .backdrop {
@@ -264,7 +308,15 @@
      height: 40px;
      align-items: center;
      color: #ffffff;
+      p {
+        font-size: 14px;
+        height: 40px;
+        span {
+          display: block;
+          line-height: 20px;
+          text-align: right;
+        }
+      }
      .user-avatar {
        cursor: pointer;
        width: 35px;
@@ -281,5 +333,5 @@
      }
    }
  }
-  }
+}
 </style>
--- a/src/utils/filter.js
View file @74b5cb3
+++ b/src/utils/filter.js
View file @74b5cb3
@@ -159,13 +159,15 @@ export default class filter {
    };
    for (let key in row) {
-      console.log("row[key]11",row[key],key);
-      console.log("www",strategies[key],key);
      if (row[key] === 1 && strategies[key]) {
-        console.log("row[key]22",row[key]);
        keys++;
        if (keys == 1) {
+          if(text){
+            text += ',' +strategies[key];
+          }else{
            text += strategies[key];
+          }
        } else {
          text += ',' + strategies[key];
        }
--- a/src/views/lpb/lpbContent/index.vue
View file @74b5cb3
+++ b/src/views/lpb/lpbContent/index.vue
View file @74b5cb3
@@ -4,12 +4,12 @@
      <!-- 纵向倒序排列 逻辑幢位于独立幢单元和独立层户的上方 -->
      <div class="ch-zdy-wrap">
        <!-- 幢单元 -->
-        <zdy-cpn v-if="lpbData.zdys.length"  :zdys="lpbData.zdys" :onlyShow="onlyShow"/>
+        <zdy-cpn v-if="lpbData.zdys.length" :zdys="lpbData.zdys" :onlyShow="onlyShow" />
        <!-- 独立层户 -->
-        <ch-cpn v-if="lpbData.cs.length" :ch="lpbData.cs" :onlyShow="onlyShow"/>
+        <ch-cpn v-if="lpbData.cs.length" :ch="lpbData.cs" :onlyShow="onlyShow" />
      </div>
      <!-- 逻辑幢 -->
-      <ljzs-cpn v-if="lpbData.ljzs.length" :ljzs="lpbData.ljzs" :onlyShow="onlyShow"/>
+      <ljzs-cpn v-if="lpbData.ljzs.length" :ljzs="lpbData.ljzs" :onlyShow="onlyShow" />
    </div>
    <!-- 自然幢名称 -->
    <p class="lpb-xmmc" v-if="onlyShow" style="border-bottom: 1px solid #e6e6e6">{{ lpbData.xmmc }}</p>
@@ -24,31 +24,30 @@
    <ul
      v-show="lpbChVisible"
      :style="{ left: lpbChLeft + 'px', top: lpbChTop + 'px' }"
-      class="contextmenu"
+      class="contextmenu">
-    >
      <li @click="menuClick">菜单一</li>
      <li @click="menuClick">菜单二</li>
    </ul>
  </div>
 </template>
 <script>
-import { getLpb } from "@/api/lpcx.js";
+  import { getLpb } from "@/api/lpcx.js";
-import chCpn from "./ch.vue";
+  import chCpn from "./ch.vue";
-import zdyCpn from "./zdys.vue";
+  import zdyCpn from "./zdys.vue";
-import ljzsCpn from "./ljzs.vue";
+  import ljzsCpn from "./ljzs.vue";
-import { startBusinessFlow, choiceBdcdy,againAddSldy } from "@/api/workFlow.js";
+  import { startBusinessFlow, choiceBdcdy, againAddSldy } from "@/api/workFlow.js";
-import jump from "../../ywbl/ywsq/components/mixin/jump";
+  import jump from "../../ywbl/ywsq/components/mixin/jump";
-import store from '@/store/index.js'
+  import store from '@/store/index.js'
-import { ywPopupCacel } from "@/utils/popup.js";
+  import { ywPopupCacel } from "@/utils/popup.js";
-export default {
+  export default {
    mixins: [jump],
-  provide() {
+    provide () {
      return {
        openMenu: this.openMenu,
        selectAll: this.selectAllObj,
-      changeChoosedObj:this.changeChoosedObj,
+        changeChoosedObj: this.changeChoosedObj,
-      clearChangeChoosedObj:this.clearChangeChoosedObj,
+        clearChangeChoosedObj: this.clearChangeChoosedObj,
-      getBsmList:this.getBsmList
+        getBsmList: this.getBsmList
      };
    },
    name: "",
@@ -66,11 +65,42 @@ export default {
        type: Boolean,
        default: true,
      },
-    onlyShow:{
+      onlyShow: {
        type: Boolean,
        default: true,
      },
-    showSave:{
+      showSave: {
+        type: Boolean,
+        default: false,
+      },
+      scyclx: {
+        type: Number,
+        default: 0,
+      },
+      sqywInfo: {
+        type: Object,
+        default: () => { }
+      },
+      name: "",
+      components: { chCpn, zdyCpn, ljzsCpn },
+      props: {
+        zrzbsm: {
+          type: String,
+          default: "",
+        },
+        lpbParent: {
+          type: String,
+          default: "isLpb",
+        },
+        isHb: {
+          type: Boolean,
+          default: true,
+        },
+        onlyShow: {
+          type: Boolean,
+          default: true,
+        },
+        showSave: {
          type: Boolean,
          default: false,
        },
@@ -84,7 +114,7 @@ export default {
        },
        isJump: { type: Boolean, default: false },
      },
-  data() {
+      data () {
        return {
          lpbData: {
            ljzs: [],
@@ -101,37 +131,24 @@ export default {
          lpbChLeft: 100,
          lpbChTop: 100,
          // 改变户选中状态
-      changeChoosedObj:{
+          changeChoosedObj: {
-        bsms:[],
+            bsms: [],
-        color:''
+            color: ''
          },
          // 选中户bsm合集
-      bsmList:[],
+          bsmList: [],
          loading: false,
        };
      },
-  mounted() {
+      mounted () {
-    this.scyclx ? this.getLpb(this.zrzbsm,this.scyclx):this.getLpb(this.zrzbsm);
+        this.scyclx ? this.getLpb(this.zrzbsm, this.scyclx) : this.getLpb(this.zrzbsm);
        window.lpbContent = this;
      },
-  methods: {
-    /**
-     * @description: 获取当前楼盘表选中户信息
-     * @param {Array} bsmList
-     * @author: renchao
-     */
-    getBsmList(bsmList,compFlag){
-      // 根据本次传入的组件标识删除之前对应组件标识存入hbsmList的数据
-      this.bsmList = this.bsmList.filter((i) => i.flag != compFlag)
-      // 合并本次数据
-      this.bsmList = this.bsmList.concat([...new Map(bsmList.map(item => [item.bdcdyh, item])).values()]);
-      // })
-    },
      /**
       * @description: 保存当前楼盘表
       * @author: renchao
       */
-    saveLpb(){
+      saveLpb () {
        if (this.bsmList.length == 0) {
          this.$message.error("请至少选择一条数据");
          return;
@@ -159,9 +176,13 @@ export default {
            this.$popupCacel();
          } else {
            if (res.result && res.result.length > 0) {
-            this.$popup("申请错误明细", "components/ywdialog", { width:'36%', formData:{result: res.result} })
+              this.$popup("申请错误明细", "components/ywdialog", { width: '36%', formData: { result: res.result } })
+            } else {
+              if (res.result && res.result.length > 0) {
+                this.$popup("申请错误明细", "components/ywdialog", { width: '36%', formData: { result: res.result } })
              } else {
-            this.$popup("申请错误明细", "components/ywdialog", { width:'36%', formData:{message: res.message} })
+                this.$popup("申请错误明细", "components/ywdialog", { width: '36%', formData: { message: res.message } })
+              }
            }
          }
        }).catch(() => {
@@ -179,7 +200,7 @@ export default {
       * @param {*} color
       * @author: renchao
       */
-    changeChoosed(bsms, color){
+      changeChoosed (bsms, color) {
        this.changeChoosedObj.bsms = bsms;
        this.changeChoosedObj.color = color;
      },
@@ -187,7 +208,7 @@ export default {
       * @description: clearChangeChoosedObj
       * @author: renchao
       */
-    clearChangeChoosedObj(){
+      clearChangeChoosedObj () {
        this.changeChoosedObj.bsms = [];
      },
      //全选户
@@ -196,7 +217,7 @@ export default {
       * @param {*} val
       * @author: renchao
       */
-    zdySelectAll(val) {
+      zdySelectAll (val) {
        this.selectAllObj.selectAll = val;
      },
      //获取楼盘表数据
@@ -207,17 +228,25 @@ export default {
       * @param {*} actual
       * @author: renchao
       */
-    getLpb(zrzbsm, scyclx, actual) {
+      getLpb (zrzbsm, scyclx, actual) {
+        if (!zrzbsm) {
+          this.$message({
+            message: "暂无楼盘表",
+            type: "warning",
+          });
+        } else {
          getLpb(zrzbsm, scyclx).then((res) => {
            if (res.code == 200) {
-          if(scyclx){
+              if (scyclx) {
-            if(res.result.syclx == "1") {
+                if (res.result.syclx == "1") {
                  res.result.lpb.ljzs = res.result.lpb.ljzs.sort(this.compare("place"));
                  this.lpbData = res.result.lpb == null ? this.lpbData : res.result.lpb;
                }
-          }else{
+              } else {
-              res.result.lpb.ljzs = res.result.lpb.ljzs.sort(this.compare("place"));
+                this.$message({
-              this.lpbData = res.result.lpb == null ? this.lpbData : res.result.lpb;
+                  message: res.message,
+                  type: "warning",
+                });
              }
            } else {
              this.$message({
@@ -226,6 +255,8 @@ export default {
              });
            }
          });
+        }
      },
      //户右键点击事件
      /**
@@ -235,7 +266,7 @@ export default {
       * @param {*} type
       * @author: renchao
       */
-    openMenu(e, item, type) {
+      openMenu (e, item, type) {
        this.lpbChLeft = e.pageX - 96;
        this.lpbChTop = e.pageY - 23;
        // this.lpbChVisible = true;
@@ -245,7 +276,7 @@ export default {
       * @description: 关闭户右键菜单
       * @author: renchao
       */
-    closeMenu() {
+      closeMenu () {
        this.lpbChVisible = false;
      },
      //右键菜单点击
@@ -253,7 +284,7 @@ export default {
       * @description: 右键菜单点击
       * @author: renchao
       */
-    menuClick() {
+      menuClick () {
        this.closeMenu();
      },
      /**
@@ -261,7 +292,7 @@ export default {
       * @param {*} property
       * @author: renchao
       */
-    compare(property) {
+      compare (property) {
        return function (a, b) {
          var value1 = a[property];
          var value2 = b[property];
@@ -297,9 +328,9 @@ export default {
            this.close()
          } else {
            if (res.result && res.result.length > 0) {
-            this.$popup("申请错误明细", "components/ywdialog", { width:'36%', formData:{result: res.result} })
+              this.$popup("申请错误明细", "components/ywdialog", { width: '36%', formData: { result: res.result } })
            } else {
-            this.$popup("申请错误明细", "components/ywdialog", { width:'36%', formData:{message: res.message} })
+              this.$popup("申请错误明细", "components/ywdialog", { width: '36%', formData: { message: res.message } })
            }
          }
        }).catch(() => {
@@ -311,19 +342,19 @@ export default {
       * @param {*} val
       * @author: renchao
       */
-    close(){
+      close () {
        ywPopupCacel()
      },
    },
-  computed:{
+    computed: {
-    lpbContentHeight(){
+      lpbContentHeight () {
        return this.onlyShow ? 32 : 76
        // return 76
      }
    },
    watch: {
      //户右键菜单显示时，监听到鼠标点击时关闭户右键菜单
-    lpbChVisible(value) {
+      lpbChVisible (value) {
        if (value) {
          document.body.addEventListener("click", this.closeMenu);
        } else {
@@ -331,10 +362,10 @@ export default {
        }
      }
    },
-};
+  };
 </script>
 <style scoped lang="scss">
-.lpbContent-wrap {
+  .lpbContent-wrap {
    width: 100%;
    height: 100%;
    overflow: hidden;
@@ -359,7 +390,7 @@ export default {
      border: 0;
      border-top: 1px solid #e6e6e6;
    }
-  .save-btn{
+    .save-btn {
      display: block;
      margin: 5px auto;
    }
@@ -406,5 +437,5 @@ export default {
        background: #ffffff;
      }
    }
-}
+  }
 </style>
--- a/src/views/system/dymbgl/components/editDialog.vue
View file @74b5cb3
+++ b/src/views/system/dymbgl/components/editDialog.vue
View file @74b5cb3
 <!--
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2023-12-19 09:40:39
+ * @LastEditTime: 2024-03-05 16:03:50
 -->
 <template>
  <el-form ref="ruleForm" :model="ruleForm" label-width="100px" :rules="rules">
@@ -169,11 +169,11 @@
        that.loadStatus = '1';
        let LODOP = getLodop(document.getElementById('LODOP_OB'), document.getElementById('LODOP_EM'));
        if (['zsdy', 'zmdy', 'zsdy1'].includes(that.ruleForm.tmpno)) {
-          // LODOP.SET_PRINT_PAGESIZE(2, 0, 0, "B4 (JIS) 旋转"); // 设置纸张大小为 B4
+          LODOP.SET_PRINT_PAGESIZE(1, 0, 0, "B4 (JIS) 旋转"); // 设置纸张大小为 B4
-          LODOP.SET_PRINT_MODE("RESELECT_ORIENT", true); // 手动设置方向
        } else {
          LODOP.SET_PRINT_PAGESIZE(1, 0, 0, "A4"); // 设置纸张大小为 A4
        }
+        LODOP.SET_PRINT_MODE("RESELECT_ORIENT", true); // 手动设置方向
        LODOP.ADD_PRINT_DATA("ProgramData", this.ruleForm.tmpcontent); //装载模板
        //窗口关闭后，回调函数中保存的设计代码
        if (LODOP.CVERSION)
--- a/src/views/workflow/main/fzxx/zslq.vue
View file @74b5cb3
+++ b/src/views/workflow/main/fzxx/zslq.vue
View file @74b5cb3
@@ -30,17 +30,17 @@
    <el-row>
      <el-col :span="3">
        <el-form-item label="身份证读卡器">
-          <el-button type="text" icon="el-icon-tickets" @click="readClick">读取</el-button>
+          <el-button type="text" icon="el-icon-tickets" :disabled="show" @click="readClick">读取</el-button>
        </el-form-item>
      </el-col>
      <el-col :span="5">
        <el-form-item label="领证人" prop="lzrxm" label-width="70px">
-          <el-input v-model="ruleForm.lzrxm"></el-input>
+          <el-input :disabled="show" v-model="ruleForm.lzrxm"></el-input>
        </el-form-item>
      </el-col>
      <el-col :span="5">
        <el-form-item label="证件类型" prop="lzrzjlb" label-width="80px">
-          <el-select v-model="ruleForm.lzrzjlb" filterable clearable placeholder="请选择">
+          <el-select :disabled="show" v-model="ruleForm.lzrzjlb" filterable clearable placeholder="请选择">
            <el-option  v-for="item in lzrzjlbData" :key="item.dcode" :label="item.dname" :value="item.dcode">
            </el-option>
          </el-select>
@@ -48,12 +48,12 @@
      </el-col>
      <el-col :span="5">
        <el-form-item label="证件号" prop="lzrzjh" label-width="70px">
-          <el-input v-model="ruleForm.lzrzjh"></el-input>
+          <el-input :disabled="show" v-model="ruleForm.lzrzjh"></el-input>
        </el-form-item>
      </el-col>
      <el-col :span="5">
        <el-form-item label="领证人电话" prop="lzrdh">
-          <el-input v-model="ruleForm.lzrdh"></el-input>
+          <el-input :disabled="show" v-model="ruleForm.lzrdh"></el-input>
        </el-form-item>
      </el-col>
    </el-row>
@@ -133,7 +133,8 @@
          total: 0,
          columns: datas.columns().lzgrid,
          data: []
-        }
+        },
+        show:true
      }
    },
    mounted () {
@@ -202,6 +203,7 @@
        getUnclaimedBdcqz({ bsmSlsq: Vue.prototype.$currentRoute.query.bsmSlsq }).then(res => {
          if (res.code === 200) {
            this.tableData.data = res.result.list;
+            this.show=!res.result.list.length>0;
            this.$nextTick(() => {
              this.tableData.data.forEach(item => {
                that.$refs.table.toggleRowSelection(item)
--- a/src/views/workflow/main/slsqxx/fdcq2/slxx.vue
View file @74b5cb3
+++ b/src/views/workflow/main/slsqxx/fdcq2/slxx.vue
View file @74b5cb3
@@ -380,9 +380,9 @@
          </el-col>
        </el-row>
        <qlrCommonTable
-          @upDateQlrxxList="upDateQlrxxList"
-          :disabled="!viewEdit"
        :tableData="ruleForm.qlrList"
+          @upDateQlrxxList="upDateQlrxxList"
+          :disabled="viewEdit"
          :gyfs="ruleForm.sldy.gyfs" />
        <div class="slxx_title title-block">
          登记原因
--- a/src/views/workflow/main/szxx/zsdy.vue
View file @74b5cb3
+++ b/src/views/workflow/main/szxx/zsdy.vue
View file @74b5cb3
 <!--
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2024-02-06 13:26:37
+ * @LastEditTime: 2024-03-05 16:43:23
 -->
 <template>
  <div>
@@ -635,7 +635,7 @@
          // 保存当前字体设置
          const originalFont = context.font;
          // 设置新的字体大小
-          context.font = '16px 楷体'; // 替换为你想要的字体和大小
+          context.font = '15px 楷体'; // 替换为你想要的字体和大小
          // 绘制 bdcdyh
          context.fillText(this.bdcdyh ? this.bdcdyh : '', 775, 373);
          // 恢复原始字体设置
--- a/src/views/workflow/mixin/index.js
View file @74b5cb3
+++ b/src/views/workflow/mixin/index.js
View file @74b5cb3
 /*
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2024-02-23 16:27:17
+ * @LastEditTime: 2024-03-07 09:13:26
 */
 import Vue from 'vue'
-import { getPrintTemplateByCode, getPrintAcceptance,getPrintReceiveSupplementalMaterials,getPrintRejectForms,getPrintSendBackMaterials,getPrintRiviseForms} from "@/api/print";
+import { getPrintTemplateByCode, getPrintAcceptance, getPrintReceiveSupplementalMaterials, getPrintRejectForms, getPrintSendBackMaterials, getPrintRiviseForms } from "@/api/print";
 import { uploadUndo } from "@/api/clxx";
 import { getLodop } from "@/utils/LodopFuncs";
 import { getNewDate } from '@/utils/util'
@@ -151,7 +151,8 @@ export default {
                unitData: window.unitData,
                bsmSlsq: this.bsmSlsq,
                showSave: true,
-                djlx: window.djlx
+                djlx: window.djlx,
+                isworkFrame: true
              }, '85%', true, false)
            } else {
              this.$message.error(res.message)
@@ -259,8 +260,8 @@ export default {
                    })
                  }
                  infoRes.result.nownian = this.newDate.split(' ')[0].split('年')[0]
-                  infoRes.result.nowyue = this.newDate.slice(5,7)
+                  infoRes.result.nowyue = this.newDate.slice(5, 7)
-                  infoRes.result.nowri = this.newDate.slice(8,10)
+                  infoRes.result.nowri = this.newDate.slice(8, 10)
                  let date = infoRes.result.sqrq
                  infoRes.result.sqnian = date.split(' ')[0].split('-')[0]
                  infoRes.result.sqyue = date.split(' ')[0].split('-')[1]
@@ -288,7 +289,7 @@ export default {
        // 补充材料通知书
        case "bccltzs":
          this.$popupDialog("补充材料通知书", "workflow/top/bccltzs/index",
-            { bsmSlsq: this.$route.query.bsmSlsq, bsmSldy: this.currentSelectProps.bsmSldy,type:"bccltzs" },
+            { bsmSlsq: this.$route.query.bsmSlsq, bsmSldy: this.currentSelectProps.bsmSldy, type: "bccltzs" },
            '70%', true)
          break;
        // 补充材料接收凭证
@@ -302,12 +303,12 @@ export default {
                      let key = index + 1
                      this.$set(infoRes.result, "file" + key, it.sjmc)
                      this.$set(infoRes.result, "file" + key + 'ys', it.ys)
-                      this.$set(infoRes.result, "file" + key + 'lx', it.sjlx==1?"原件":"复印件")
+                      this.$set(infoRes.result, "file" + key + 'lx', it.sjlx == 1 ? "原件" : "复印件")
                    })
                  }
                  infoRes.result.nownian = this.newDate.split(' ')[0].split('年')[0]
-                  infoRes.result.nowyue = this.newDate.slice(5,7)
+                  infoRes.result.nowyue = this.newDate.slice(5, 7)
-                  infoRes.result.nowri = this.newDate.slice(8,10)
+                  infoRes.result.nowri = this.newDate.slice(8, 10)
                  let date = infoRes.result.sqrq
                  infoRes.result.sqnian = date.split(' ')[0].split('-')[0]
                  infoRes.result.sqyue = date.split(' ')[0].split('-')[1]
@@ -347,8 +348,8 @@ export default {
                    })
                  }
                  infoRes.result.nownian = this.newDate.split(' ')[0].split('年')[0]
-                  infoRes.result.nowyue = this.newDate.slice(5,7)
+                  infoRes.result.nowyue = this.newDate.slice(5, 7)
-                  infoRes.result.nowri = this.newDate.slice(8,10)
+                  infoRes.result.nowri = this.newDate.slice(8, 10)
                  let date = infoRes.result.sqrq
                  infoRes.result.sqnian = date.split(' ')[0].split('-')[0]
                  infoRes.result.sqyue = date.split(' ')[0].split('-')[1]
@@ -387,8 +388,8 @@ export default {
                    })
                  }
                  infoRes.result.nownian = this.newDate.split(' ')[0].split('年')[0]
-                  infoRes.result.nowyue = this.newDate.slice(5,7)
+                  infoRes.result.nowyue = this.newDate.slice(5, 7)
-                  infoRes.result.nowri = this.newDate.slice(8,10)
+                  infoRes.result.nowri = this.newDate.slice(8, 10)
                  let date = infoRes.result.sqrq
                  infoRes.result.sqnian = date.split(' ')[0].split('-')[0]
                  infoRes.result.sqyue = date.split(' ')[0].split('-')[1]
@@ -428,8 +429,8 @@ export default {
                    })
                  }
                  infoRes.result.nownian = this.newDate.split(' ')[0].split('年')[0]
-                  infoRes.result.nowyue = this.newDate.slice(5,7)
+                  infoRes.result.nowyue = this.newDate.slice(5, 7)
-                  infoRes.result.nowri = this.newDate.slice(8,10)
+                  infoRes.result.nowri = this.newDate.slice(8, 10)
                  let date = infoRes.result.sqrq
                  infoRes.result.sqnian = date.split(' ')[0].split('-')[0]
                  infoRes.result.sqyue = date.split(' ')[0].split('-')[1]
--- a/src/views/workflow/top/zsyl/index.vue
View file @74b5cb3
+++ b/src/views/workflow/top/zsyl/index.vue
View file @74b5cb3
 <!--
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2024-02-06 13:23:44
+ * @LastEditTime: 2024-03-05 16:42:30
 -->
 <template>
  <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="text-align: center;">
@@ -558,7 +558,7 @@
          // 保存当前字体设置
          const originalFont = context.font;
          // 设置新的字体大小
-          context.font = '16px 楷体'; // 替换为你想要的字体和大小
+          context.font = '15px 楷体'; // 替换为你想要的字体和大小
          // 绘制 bdcdyh
          context.fillText(this.bdcdyh ? this.bdcdyh : '', 775, 373);
          // 恢复原始字体设置
--- a/src/views/ywbl/ywsq/components/selectJsydsyqSplitMerge.vue
View file @74b5cb3
+++ b/src/views/ywbl/ywsq/components/selectJsydsyqSplitMerge.vue
View file @74b5cb3
@@ -207,6 +207,7 @@
      queryClick () {
        this.$startLoading();
        this.queryForm.sqywbm = this.sqywInfo.djywbm;
+        this.queryForm.bhqkbsm = ""
        selectJsydQlxxSplitMergeBefore({ ...this.queryForm, ...this.pageData }).then((res) => {
          this.$endLoading();
          if (res.code === 200) {
--- a/src/views/zhcx/djbcx/djbcx.vue
View file @74b5cb3
+++ b/src/views/zhcx/djbcx/djbcx.vue
View file @74b5cb3
@@ -98,6 +98,7 @@
  import table from "@/utils/mixin/table";
  import { datas, sendThis } from "./djbcxdata";
  import { getDjbBysearch } from "@/api/search.js";
+    import { getZrzListByBsmSlsq } from "@/api/workflow/zjgcdyFlow.js";
  export default {
    name: "djbcx",
@@ -137,7 +138,8 @@
        },
        qllxs: [],
        isDialog: false,
-        djbxxData: {}
+        djbxxData: {},
+        zrzbsm:""
      }
    },
    computed: {
@@ -188,15 +190,18 @@
       * @author: renchao
       */
      handleLpbClick (item) {
-        this.$popup('楼盘表', 'lpb/index', {
+     let params = {zdbsm:item.bsmZd};
-          width: '85%',
+ getZrzListByBsmSlsq(params).then((res) => {
-          formData: {
+        if (res.code === 200) {
+        }
+      });
+        console.log("zrzbsm",item,item.zrzbsm);
+         this.$popupDialog('楼盘表', 'lpb/index', {
              bsm: item.zrzbsm,
            zrzbsm: item.zrzbsm,
            zdbsm: item.zrzbsm,
            onlyShow: true
-          }
+        }, '90%', true)
-        })
      }
    }
  }