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

tianhaohao@pashanhoo.com
Showing 13 changed files with 117 additions and 92 deletions
src/store/getters.js
src/store/modules/user.js
src/styles/slxx/slxx.scss
src/views/djbworkflow/djbBook/components/blxxtabs/cfdj.vue
src/views/djbworkflow/djbBook/components/blxxtabs/jsydsyq.vue
src/views/djbworkflow/djbBook/components/blxxtabs/tdsyq.vue
src/views/djbworkflow/djbBook/components/blxxtabs/ygmmdj.vue
src/views/djbworkflow/mixin/index.js
src/views/workflow/components/dialog/zsdy.vue
src/views/workflow/components/dialog/zslq.vue
src/views/workflow/components/fzxx.vue
src/views/workflow/components/szxx.vue
src/views/ywbl/slsqxx/diyaq/slxx.vue
--- a/src/store/getters.js
View file @8ac9d42
+++ b/src/store/getters.js
View file @8ac9d42
 /*
 * @Description: 
 * @Autor: renchao
- * @LastEditTime: 2023-05-04 11:14:25
+ * @LastEditTime: 2023-07-28 15:49:38
 */
 const getters = {
  sidebar: state => state.app.sidebar,
@@ -20,6 +20,7 @@ const getters = {
  djbxx: state => state.djbxx.djbxx,
  // workflow
  isRefresh: state => state.user.isRefresh,
+  workFresh: state => state.user.workFresh,
  yjsqOptions: state => state.workflow.yjsqOptions
 }
 export default getters
--- a/src/store/modules/user.js
View file @8ac9d42
+++ b/src/store/modules/user.js
View file @8ac9d42
 /*
 * @Description: 
 * @Autor: renchao
- * @LastEditTime: 2023-04-12 10:47:33
+ * @LastEditTime: 2023-07-28 15:45:21
 */
 import { getUserInfo } from '@/api/user'
 const state = {
    name: '',
    avatar: 'https://cube.elemecdn.com/0/88/03b0d39583f48206768a7534e55bcpng.png',
    isRefresh: false,
+    // 业务流程刷新
+    workFresh: false
 }
 const mutations = {
    SET_NAME: (state, data) => {
@@ -15,6 +17,9 @@ const mutations = {
    },
    REFRESH: (state, data) => {
        state.isRefresh = data
+    },
+    SETWORKFRESH: (state, data) => {
+        state.workFresh = data
    }
 }
@@ -29,6 +34,9 @@ const actions = {
    refreshPage ({ commit }, data) {
        commit('REFRESH', data)
    },
+    reWorkFresh ({ commit }, data) {
+        commit('SETWORKFRESH', data)
+    }
 }
 export default {
    namespaced: true,
--- a/src/styles/slxx/slxx.scss
View file @8ac9d42
+++ b/src/styles/slxx/slxx.scss
View file @8ac9d42
@@ -82,4 +82,8 @@
  /deep/.el-form-item__content{
       pointer-events: none!important;
     }
+     /deep/.el-input .el-input__inner {
+      background-color: #F5F7FA;
+     }
 }
--- a/src/views/djbworkflow/djbBook/components/blxxtabs/cfdj.vue
View file @8ac9d42
+++ b/src/views/djbworkflow/djbBook/components/blxxtabs/cfdj.vue
View file @8ac9d42
@@ -182,7 +182,9 @@
            </el-form-item>
          </el-col>
          <el-col :span="8">
-            <el-form-item label="是否被续封：">
+             <el-form-item label="是否被续封："
+              prop="cfdj.sfbxf"
+              :rules="rules.sfbxfrules">
              <el-select v-model="ruleForm.cfdj.sfbxf" @change="djlxchange">
                <el-option
                  v-for="item in sfbxflist"
@@ -473,10 +475,10 @@ export default {
        bdcqzhrules: [
          { required: true, message: "不动产登记证明号", trigger: "blur" },
        ],
-        qxdmrules: [{ required: true, message: "区县代码", trigger: "blur" }],
        djjgrules: [{ required: true, message: "登记机构", trigger: "blur" }],
        dbrrules: [{ required: true, message: "登簿人", trigger: "blur" }],
        djsjrules: [{ required: true, message: "登记时间", trigger: "blur" }],
+         sfbxfrules: [{ required: true, message: "是否被续封", trigger: "change" }],
      },
    };
  },
--- a/src/views/djbworkflow/djbBook/components/blxxtabs/jsydsyq.vue
View file @8ac9d42
+++ b/src/views/djbworkflow/djbBook/components/blxxtabs/jsydsyq.vue
View file @8ac9d42
@@ -14,8 +14,6 @@
      ref="ruleForm"
      :label-position="flag ? 'top' : ''"
      :inline="flag"
-      :show-message="false"
-      inline-message
      label-width="145px"
    >
      <div class="slxx_con" v-if="isShow" :class="flag ? 'formMarginBot0' : ''">
@@ -298,11 +296,12 @@
 <script>
 import store from "@/store/index.js";
 import { mapGetters } from "vuex";
-import { init, save } from "@/api/djbRepair.js";
+import { init,getSsQlxx, save } from "@/api/djbRepair.js";
 import qlrCommonTable from "@/views/djbworkflow/components/qlrCommonTable";
 import tdytTable from "@/views/workflow/components/tdytTable";
+import selectTable from "@/components/selectTable/index.vue";
 export default {
-  components: { qlrCommonTable, tdytTable },
+  components: { qlrCommonTable, tdytTable,selectTable },
  computed: {
    ...mapGetters(["dictData", "flag"]),
    // 根据流程判断表单是否为只读
@@ -443,6 +442,10 @@ export default {
      init(this.propsParam).then((res) => {
        if (res.code == 200) {
         this.ruleForm = res.result;
+          let djlx = this.ruleForm.qlxx.djlx;
+          if (djlx == null || djlx == 100) {
+            this.ssqlxxshow = false;
+          }
           this.$endLoading();
          if (this.ruleForm.tdytqxList.length > 0) {
            this.tdxz = this.ruleForm.tdytqxList[0].qlxzbm;
@@ -483,16 +486,7 @@ export default {
      this.czrOptions = this.ruleForm.qlrData;
      this.key++;
    },
-    // 更新义务人信息
+    // 保存
-    /**
-     * @description: 更新义务人信息
-     * @param {*} val
-     * @author: renchao
-     */
-    upDateYwrxxList(val) {
-      this.ruleForm.ywrData && (this.ruleForm.ywrData = _.cloneDeep(val));
-      this.key++;
-    },
    /**
     * @description: onSubmit
     * @author: renchao
--- a/src/views/djbworkflow/djbBook/components/blxxtabs/tdsyq.vue
View file @8ac9d42
+++ b/src/views/djbworkflow/djbBook/components/blxxtabs/tdsyq.vue
View file @8ac9d42
@@ -71,27 +71,10 @@
            </el-form-item>
          </el-col>
             <el-col :span="8">
-            <el-form-item label="不动产单元号：">
-              <el-input disabled v-model="ruleForm.qlxx.bdcdyh"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="业务号：">
-              <el-input v-model="ruleForm.qlxx.ywh"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
            <el-form-item label="上手业务号：">
              <el-input disabled v-model="ruleForm.qlxx.ssywh"></el-input>
            </el-form-item>
          </el-col>
-        </el-row>
-        <el-row :gutter="10">
-          <el-col :span="8">
-            <el-form-item label="权利类型：">
-              <el-input disabled v-model="ruleForm.qlxx.qllxmc"></el-input>
-            </el-form-item>
-          </el-col>
               <el-col :span="8">
            <el-form-item
              label="登记类型："
@@ -109,6 +92,24 @@
              </el-select>
            </el-form-item>
          </el-col>
+           </el-row>
+            <el-row :gutter="10">
+          <el-col :span="8">
+            <el-form-item label="不动产单元号：">
+              <el-input disabled v-model="ruleForm.qlxx.bdcdyh"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="业务号：">
+              <el-input v-model="ruleForm.qlxx.ywh"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="权利类型：">
+              <el-input disabled v-model="ruleForm.qlxx.qllxmc"></el-input>
+            </el-form-item>
+          </el-col>
          <el-col :span="8">
            <el-form-item
              label="登簿人："
@@ -175,7 +176,7 @@
                  oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"
                ></el-input>
                <el-select
-                  v-model="ruleForm.tdsyq.mjdw1"
+                  v-model="ruleForm.tdsyq.mjdw"
                  :disabled="!ableOperation"
                  style="width: 20%"
                >
@@ -199,7 +200,7 @@
                  oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"
                ></el-input>
                <el-select
-                  v-model="ruleForm.tdsyq.mjdw2"
+                  v-model="ruleForm.tdsyq.mjdw"
                  :disabled="!ableOperation"
                  style="width: 20%"
                >
@@ -223,7 +224,7 @@
                  oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"
                ></el-input>
                <el-select
-                  v-model="ruleForm.tdsyq.mjdw3"
+                  v-model="ruleForm.tdsyq.mjdw"
                  :disabled="!ableOperation"
                  style="width: 20%"
                >
@@ -249,7 +250,7 @@
                  oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"
                ></el-input>
                <el-select
-                  v-model="ruleForm.tdsyq.mjdw4"
+                  v-model="ruleForm.tdsyq.mjdw"
                  :disabled="!ableOperation"
                  style="width: 20%"
                >
@@ -273,7 +274,7 @@
                  oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"
                ></el-input>
                <el-select
-                  v-model="ruleForm.tdsyq.mjdw5"
+                  v-model="ruleForm.tdsyq.mjdw"
                  :disabled="!ableOperation"
                  style="width: 20%"
                >
@@ -297,7 +298,7 @@
                  oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"
                ></el-input>
                <el-select
-                  v-model="ruleForm.tdsyq.mjdw6"
+                  v-model="ruleForm.tdsyq.mjdw"
                  :disabled="!ableOperation"
                  style="width: 20%"
                >
@@ -323,7 +324,7 @@
                  oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"
                ></el-input>
                <el-select
-                  v-model="ruleForm.tdsyq.mjdw7"
+                  v-model="ruleForm.tdsyq.mjdw"
                  :disabled="!ableOperation"
                  style="width: 20%"
                >
@@ -598,11 +599,6 @@ export default {
      this.czrOptions = this.ruleForm.qlrData;
      this.key++;
    },
-    // // 更新义务人信息
-    // upDateYwrxxList(val) {
-    //   this.ruleForm.ywrData && (this.ruleForm.ywrData = _.cloneDeep(val));
-    //   this.key++;
-    // },
    /**
     * @description: onSubmit
     * @author: renchao
@@ -673,6 +669,7 @@ export default {
 </script>
 <style scoped lang="scss">
 @import "~@/styles/public.scss";
+@import "~@/styles/slxx/slxx.scss";
 /deep/.el-form {
  display: flex;
  flex-direction: column;
--- a/src/views/djbworkflow/djbBook/components/blxxtabs/ygmmdj.vue
View file @8ac9d42
+++ b/src/views/djbworkflow/djbBook/components/blxxtabs/ygmmdj.vue
View file @8ac9d42
@@ -73,6 +73,30 @@
            </el-form-item>
          </el-col>
              <el-col :span="8">
+            <el-form-item label="上手业务号：">
+              <el-input disabled v-model="ruleForm.qlxx.ssywh"></el-input>
+            </el-form-item>
+          </el-col>
+               <el-col :span="8">
+            <el-form-item
+              label="登记类型："
+              prop="qlxx.djlx"
+              :rules="rules.djlxrules"
+            >
+              <el-select v-model="ruleForm.qlxx.djlx" @change="djlxchange">
+                <el-option
+                  v-for="item in djlxlist"
+                  :key="item.dcode"
+                  :label="item.dname"
+                  :value="item.dcode"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+           </el-row>
+           <el-row>
+          <el-col :span="8">
            <el-form-item label="不动产单元号：">
              <el-input disabled v-model="ruleForm.qlxx.bdcdyh"></el-input>
            </el-form-item>
@@ -83,11 +107,6 @@
            </el-form-item>
          </el-col>
          <el-col :span="8">
-            <el-form-item label="上手业务号：">
-              <el-input disabled v-model="ruleForm.qlxx.ssywh"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
            <el-form-item label="权利类型：">
              <el-input disabled v-model="ruleForm.qlxx.qllxmc"></el-input>
            </el-form-item>
@@ -98,19 +117,6 @@
            </el-form-item>
          </el-col>
          <el-col :span="8">
-            <el-form-item label="登记类型："  prop="qlxx.djlx" :rules="rules.djlxrules">
-              <el-select v-model="ruleForm.qlxx.djlx" @change="djlxchange">
-                <el-option
-                  v-for="item in djlxlist"
-                  :key="item.dcode"
-                  :label="item.dname"
-                  :value="item.dcode"
-                >
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
            <el-form-item label="不动产坐落：">
              <el-input v-model="ruleForm.qlxx.zl"></el-input>
            </el-form-item>
--- a/src/views/djbworkflow/mixin/index.js
View file @8ac9d42
+++ b/src/views/djbworkflow/mixin/index.js
View file @8ac9d42
@@ -60,7 +60,7 @@ export default {
      stepExpandInfo(formdata).then((res) => {
        if (res.code === 200) {
          this.leftButtonList = res.result.button;
-          if (res.result.properties.length) {
+          if (res.result.properties&&res.result.properties.length) {
            this.showidea = res.result.properties[0].value
          }
@@ -68,12 +68,9 @@ export default {
          let arr = this.rightButtonList.filter((item) => {
            return item.name == "删除"
          })
-          if (arr.length) {
          this.$refs.Menu.getleftMenubl();
-          } else {
+          if (!arr.length) {
-            this.ableOperation = false
+            this.isEdit = false
-            this.$refs.Menu.getleftMenubl(1);
          }
        }
      })
--- a/src/views/workflow/components/dialog/zsdy.vue
View file @8ac9d42
+++ b/src/views/workflow/components/dialog/zsdy.vue
View file @8ac9d42
 <!--
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2023-06-25 11:13:07
+ * @LastEditTime: 2023-07-28 15:47:25
 -->
 <template>
  <div>
@@ -179,7 +179,7 @@
            this.$popupCacel()
            this.$message.success("提交成功")
            //刷新列表
-            store.dispatch('user/refreshPage', true)
+            store.dispatch('user/reWorkFresh', true)
          } else {
            this.$message.error(res.message)
          }
--- a/src/views/workflow/components/dialog/zslq.vue
View file @8ac9d42
+++ b/src/views/workflow/components/dialog/zslq.vue
View file @8ac9d42
 <!--
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2023-07-24 10:22:41
+ * @LastEditTime: 2023-07-28 15:45:56
 -->
 <template>
  <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px">
@@ -123,9 +123,6 @@
        getUnclaimedBdcqz({ bsmSlsq: Vue.prototype.$currentRoute.query.bsmSlsq }).then(res => {
          if (res.code === 200) {
            this.tableData.data = res.result.list;
-            if(this.tableData.data.length>0) {
-              this.ruleForm.lzrxm = this.tableData.data[0].qlr
-            }
            this.ruleForm.fzrmc = res.result.fzrmc
            this.ruleForm.fzsj = res.result.fzsj
            this.ruleForm.fzsl = res.result.fzsl
@@ -160,7 +157,7 @@
              if (res.code == 200) {
                this.$message.success('保存成功');
                //刷新列表
-                store.dispatch('user/refreshPage', true)
+                store.dispatch('user/reWorkFresh', true)
                this.$popupCacel()
              } else {
                this.$message.error(res.message)
--- a/src/views/workflow/components/fzxx.vue
View file @8ac9d42
+++ b/src/views/workflow/components/fzxx.vue
View file @8ac9d42
 <!--
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2023-07-25 09:26:10
+ * @LastEditTime: 2023-07-28 16:28:43
 -->
 <template>
  <div class="from-clues">
@@ -40,9 +40,11 @@
  </div>
 </template>
 <script>
+  import { mapGetters } from 'vuex'
+  import store from '@/store/index.js'
  import table from "@/utils/mixin/table";
-  import { getCertificateList } from "@/api/bdcqz.js";
  import { datas } from "../javascript/fzxxdata";
+  import { getCertificateList } from "@/api/bdcqz.js";
  export default {
    mixins: [table],
    data () {
@@ -66,6 +68,16 @@
    created () {
      this.ableOperation = this.$parent.currentSelectTab.ableOperation
    },
+    computed: {
+      ...mapGetters(['workFresh'])
+    },
+    watch: {
+      workFresh: {
+        handler (newVal, oldVal) {
+          if (newVal) this.queryClick()
+        }
+      }
+    },
    methods: {
      /**
       * @description: queryClick
@@ -84,6 +96,7 @@
       * @author: renchao
       */
      zslqClick () {
+        store.dispatch('user/reWorkFresh', false)
        this.$popupDialog("不动产权证领取", "workflow/components/dialog/zslq", {}, '80%', true)
      }
    }
--- a/src/views/workflow/components/szxx.vue
View file @8ac9d42
+++ b/src/views/workflow/components/szxx.vue
View file @8ac9d42
 <!--
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2023-06-25 11:15:01
+ * @LastEditTime: 2023-07-28 15:46:24
 -->
 <template>
  <div class="szxx">
@@ -74,6 +74,7 @@
 </template>
 <script>
  import { mapGetters } from 'vuex'
+  import store from '@/store/index.js'
  import { getSlsqBdcqzList, invalidCertificate } from "@/api/bdcqz.js";
  export default {
    props: {},
@@ -92,10 +93,10 @@
      };
    },
    computed: {
-      ...mapGetters(['isRefresh'])
+      ...mapGetters(['workFresh'])
    },
    watch: {
-      isRefresh: {
+      workFresh: {
        handler (newVal, oldVal) {
          if (newVal) this.list()
        }
@@ -130,6 +131,7 @@
       * @author: renchao
       */
      openZsylDialog (item, type) {
+        store.dispatch('user/reWorkFresh', false)
        if (type == 1) {
          //证书预览
          this.$popupDialog("证书预览", "workflow/components/dialog/zsyl", { bdcqz: item, bsmSlsq: this.$route.query.bsmSlsq }, "70%", true);
--- a/src/views/ywbl/slsqxx/diyaq/slxx.vue
View file @8ac9d42
+++ b/src/views/ywbl/slsqxx/diyaq/slxx.vue
View file @8ac9d42
@@ -126,7 +126,7 @@
          </el-col>
          <el-col :span="8">
            <el-form-item label="是否存在禁止或者限制转让抵押不动产的约定：" label-width="350px">
-              <el-radio-group v-model="ruleForm.diyaq.sfczjzhxz" :disabled="!ableOperation">
+              <el-radio-group v-model="ruleForm.diyaq.sfczjzhxz" :disabled="!ableOperation|| isJfOperation">
                <el-radio label="1">启用</el-radio>
                <el-radio label="0">禁用</el-radio>
              </el-radio-group>
@@ -138,8 +138,8 @@
          <el-col :span="8" v-show="ruleForm.diyaq.dyfs == 1">
            <el-form-item label="被担保主债权数额：">
              <div style="display:flex">
-                <el-input v-model="ruleForm.diyaq.bdbzzqse" :disabled="!ableOperation" style="width:500%"></el-input>
+                <el-input v-model="ruleForm.diyaq.bdbzzqse" :disabled="!ableOperation|| isJfOperation" style="width:500%"></el-input>
-                <el-select v-model="ruleForm.diyaq.jedw" :disabled="!ableOperation">
+                <el-select v-model="ruleForm.diyaq.jedw" :disabled="!ableOperation|| isJfOperation">
                  <el-option v-for="item in dictData['A57']" :key="item.dcode" :label="item.dname" :value="item.dcode">
                  </el-option>
                </el-select>
@@ -149,19 +149,19 @@
          <el-col :span="8" v-show="ruleForm.diyaq.dyfs == 2">
            <el-form-item label="最高债权额：">
-              <el-input v-model="ruleForm.diyaq.zgzqse" :disabled="!ableOperation"></el-input>
+              <el-input v-model="ruleForm.diyaq.zgzqse" :disabled="!ableOperation|| isJfOperation"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item label="债务履行起始时间：">
-              <el-date-picker v-model="ruleForm.diyaq.zwlxqssj" :disabled="!ableOperation" type="date">
+              <el-date-picker v-model="ruleForm.diyaq.zwlxqssj" :disabled="!ableOperation|| isJfOperation" type="date">
              </el-date-picker>
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item label="债务履行结束时间：">
-              <el-date-picker v-model="ruleForm.diyaq.zwlxjssj" :disabled="!ableOperation" type="date">
+              <el-date-picker v-model="ruleForm.diyaq.zwlxjssj" :disabled="!ableOperation|| isJfOperation" type="date">
              </el-date-picker>
            </el-form-item>
          </el-col>
@@ -170,21 +170,21 @@
          <el-col :span="24">
            <el-form-item label="担保范围：">
              <el-input v-model="ruleForm.diyaq.dbfw"
-                :disabled="ruleForm.sldy.djlx == '300'&& !ableOperation"></el-input>
+                :disabled="ruleForm.sldy.djlx == '300'&& !ableOperation|| isJfOperation"></el-input>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          <el-col :span="24">
            <el-form-item label="最高债权确定事实和数额：">
-              <el-input v-model="ruleForm.diyaq.zgzqqdss" :disabled="!ableOperation"></el-input>
+              <el-input v-model="ruleForm.diyaq.zgzqqdss" :disabled="!ableOperation|| isJfOperation"></el-input>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          <el-col>
            <el-form-item label="附记：" prop="fj">
-              <el-input type="textarea" v-model="ruleForm.diyaq.fj" :disabled="!ableOperation"></el-input>
+              <el-input type="textarea" v-model="ruleForm.diyaq.fj" :disabled="!ableOperation|| isJfOperation"></el-input>
            </el-form-item>
          </el-col>
        </el-row>
@@ -267,6 +267,9 @@
      this.ableOperation = this.$parent.currentSelectTab.ableOperation
      this.propsParam = this.$attrs;
      var formdata = new FormData();
+        if (this.propsParam.djlx == '400') {
+        this.isJfOperation = true;
+      }
      this.$startLoading();
      formdata.append("bsmSldy", this.propsParam.bsmSldy);
      formdata.append("bsmSlsq", this.$route.query.bsmSlsq);
@@ -296,6 +299,7 @@
          diyaq: {},
          gyfs: "",
        },
+        isJfOperation: false,
        //传递参数
        propsParam: {},
        rules: {},