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

tianhaohao@pashanhoo.com
Showing 8 changed files with 83 additions and 52 deletions
src/views/registerBook/components/djbDetail.vue
src/views/ywbl/dbx/dbxdata.js
src/views/ywbl/slsqxx/diyaq/slxx.vue
src/views/ywbl/slsqxx/zjgcdy/batchSlxx.vue
src/views/ywbl/slsqxx/zjgcdy/slxx.vue
src/views/ywbl/ybx/ybxdata.js
src/views/ywbl/ywsq/components/cfdj.vue
src/views/ywbl/ywsq/javascript/cfdj.js
--- a/src/views/registerBook/components/djbDetail.vue
View file @f666d4d
+++ b/src/views/registerBook/components/djbDetail.vue
View file @f666d4d
 <!--
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2024-01-25 15:06:08
+ * @LastEditTime: 2024-01-26 16:13:12
 -->
 <template>
  <div class="tableBox">
--- a/src/views/ywbl/dbx/dbxdata.js
View file @f666d4d
+++ b/src/views/ywbl/dbx/dbxdata.js
View file @f666d4d
 /*
 * @Description: 
 * @Autor: renchao
- * @LastEditTime: 2023-09-25 10:58:15
+ * @LastEditTime: 2024-01-26 16:16:51
 */
 import filter from '@/utils/filter.js'
 let vm = null
@@ -60,7 +60,7 @@ class data extends filter {
      {
        label: '业务号',
        align: 'center',
-        minWidth: '100',
+        width: '110',
        render: (h, scope) => {
          return (
            <el-link type="primary" onClick={() => { vm.ywhClick(scope.row) }}>{this.joinItem(scope.row.ywh)}</el-link>
--- a/src/views/ywbl/slsqxx/diyaq/slxx.vue
View file @f666d4d
+++ b/src/views/ywbl/slsqxx/diyaq/slxx.vue
View file @f666d4d
 <!--
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2023-10-19 10:49:17
+ * @LastEditTime: 2024-01-26 15:29:54
 -->
 <template>
  <!-- 受理信息 -->
--- a/src/views/ywbl/slsqxx/zjgcdy/batchSlxx.vue
View file @f666d4d
+++ b/src/views/ywbl/slsqxx/zjgcdy/batchSlxx.vue
View file @f666d4d
@@ -62,7 +62,7 @@
          抵押户信息列表信息（{{ ruleForm.hlist.length }} 户）
          <div class="triangle"></div>
        </div>
-        <cfBdcdyTable :tableData="ruleForm.qlxxList"  v-if="ruleForm.slsq.djywbm.includes('400')"/>
+        <cfBdcdyTable :tableData="ruleForm.qlxxList" v-if="ruleForm.slsq.djywbm.includes('400')" />
        <qjhTable v-else :tableData="ruleForm.hlist" />
        <div class="slxx_title title-block">
          抵押信息
@@ -83,7 +83,7 @@
            <el-form-item label="抵押金额类型：">
              <el-radio-group
                v-model="ruleForm.diyaqList[0].dyjelx"
-                :disabled="!viewEdit">
+                :disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')">
                <el-radio label="0">独立抵押</el-radio>
                <el-radio label="1">整体抵押</el-radio>
              </el-radio-group>
@@ -92,28 +92,29 @@
          <el-col :span="8">
            <el-form-item
              label="是否存在禁止或者限制转让抵押不动产的约定："
-              label-width="350px">
+              label-width="300px">
              <el-radio-group
                v-model="ruleForm.diyaqList[0].sfczjzhxz"
-                :disabled="!viewEdit">
+                :disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')">
                <el-radio label="1">启用</el-radio>
                <el-radio label="0">禁用</el-radio>
              </el-radio-group>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row
          :gutter="10"
          v-if="ruleForm.diyaqList && ruleForm.diyaqList.length > 0">
          <el-col :span="8" v-show="ruleForm.diyaqList[0].dyfs == 1">
            <el-form-item label="被担保主债权数额：">
+              <div style="display: flex">
                <el-input
                  v-model="ruleForm.diyaqList[0].bdbzzqse"
-                :disabled="!viewEdit"></el-input>
+                  :disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')"></el-input>
                <el-select
+                  style="width: 68px"
                  v-model="ruleForm.diyaqList[0].jedw"
-                :disabled="!viewEdit">
+                  :disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')">
                  <el-option
                    v-for="item in dictData['A57']"
                    :key="item.dcode"
@@ -121,6 +122,7 @@
                    :value="item.dcode">
                  </el-option>
                </el-select>
+              </div>
            </el-form-item>
          </el-col>
@@ -128,10 +130,10 @@
            <el-form-item label="最高债权额：">
              <el-input
                v-model="ruleForm.diyaqList[0].zgzqse"
-                :disabled="!viewEdit"></el-input>
+                :disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')"></el-input>
              <el-select
                v-model="ruleForm.diyaqList[0].jedw"
-                :disabled="!viewEdit">
+                :disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')">
                <el-option
                  v-for="item in dictData['A57']"
                  :key="item.dcode"
@@ -146,7 +148,7 @@
            <el-form-item label="债务履行起始时间：">
              <el-date-picker
                v-model="ruleForm.diyaqList[0].zwlxqssj"
-                :disabled="!viewEdit"
+                :disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')"
                type="date">
              </el-date-picker>
            </el-form-item>
@@ -155,7 +157,7 @@
            <el-form-item label="债务履行结束时间：">
              <el-date-picker
                v-model="ruleForm.diyaqList[0].zwlxjssj"
-                :disabled="!viewEdit"
+                :disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')"
                type="date">
              </el-date-picker>
            </el-form-item>
@@ -167,7 +169,7 @@
            <el-form-item label="担保范围：">
              <el-input
                v-model="ruleForm.diyaqList[0].dbfw"
-                :disabled="ruleForm.sldyList[0].djlx == '300' && !viewEdit"></el-input>
+                :disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')"></el-input>
            </el-form-item>
          </el-col>
        </el-row>
@@ -176,7 +178,7 @@
            <el-form-item label="最高债权确定事实和数额：">
              <el-input
                v-model="ruleForm.diyaqList[0].zgzqqdss"
-                :disabled="!viewEdit"></el-input>
+                :disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')"></el-input>
            </el-form-item>
          </el-col>
        </el-row>
@@ -188,7 +190,7 @@
                maxlength="500"
                show-word-limit
                v-model="ruleForm.diyaqList[0].fj"
-                :disabled="!viewEdit"></el-input>
+                :disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')"></el-input>
            </el-form-item>
          </el-col>
        </el-row>
@@ -342,7 +344,7 @@
        this.loading = false
      })
    },
-    components: { qlrCommonTable, qjhTable,cfBdcdyTable },
+    components: { qlrCommonTable, qjhTable, cfBdcdyTable },
    computed: {
      ...mapGetters(["dictData", "flag"]),
    },
--- a/src/views/ywbl/slsqxx/zjgcdy/slxx.vue
View file @f666d4d
+++ b/src/views/ywbl/slsqxx/zjgcdy/slxx.vue
View file @f666d4d
@@ -8,7 +8,7 @@
      ref="ruleForm"
      :label-position="flag ? 'top' : ''"
      :inline="flag"
-      label-width="140px">
+      label-width="170px">
      <div class="slxx_con" :class="flag ? 'formMarginBot0' : ''">
        <div class="slxx_title title-block">
          申请业务信息
@@ -55,14 +55,7 @@
        <el-row :gutter="10">
          <el-col :span="8">
            <el-form-item label="房屋用途：">
-              <treeselect
+              <el-input disabled v-model="ruleForm.qjh.showfwyt"></el-input>
-                v-model="ruleForm.qjh.showfwyt"
-                noOptionsText=""
-                disabled
-                placeholder=""
-                :normalizer="normalizer"
-                :show-count="true"
-                :options="dictData['A17']" />
            </el-form-item>
          </el-col>
          <el-col :span="8">
@@ -79,17 +72,56 @@
        <el-row :gutter="10">
          <el-col :span="8">
            <el-form-item label="建筑面积：">
-              <el-input disabled v-model="ruleForm.qjh.jzmj"></el-input>
+              <div class="flex">
+                <el-input
+                  maxlength="12"
+                  v-model="ruleForm.qjh.jzmj" disabled
+                  oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
+                <el-select disabled v-model="mjdw" style="width: 68px">
+                  <el-option
+                    v-for="item in dictData['A7']"
+                    :key="item.dcode"
+                    :label="item.dname"
+                    :value="item.dcode">
+                  </el-option>
+                </el-select>
+              </div>
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item label="套内建筑面积：">
-              <el-input disabled v-model="ruleForm.qjh.tnjzmj"></el-input>
+              <div class="flex">
+                <el-input
+                  maxlength="12"
+                  v-model="ruleForm.qjh.tnjzmj" disabled
+                  oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
+                <el-select disabled v-model="mjdw" style="width: 68px">
+                  <el-option
+                    v-for="item in dictData['A7']"
+                    :key="item.dcode"
+                    :label="item.dname"
+                    :value="item.dcode">
+                  </el-option>
+                </el-select>
+              </div>
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item label="分摊建筑面积：">
-              <el-input disabled v-model="ruleForm.qjh.ftjzmj"></el-input>
+              <div class="flex">
+                <el-input
+                  maxlength="12"
+                  v-model="ruleForm.qjh.ftjzmj" disabled
+                  oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
+                <el-select disabled v-model="mjdw" style="width: 68px">
+                  <el-option
+                    v-for="item in dictData['A7']"
+                    :key="item.dcode"
+                    :label="item.dname"
+                    :value="item.dcode">
+                  </el-option>
+                </el-select>
+              </div>
            </el-form-item>
          </el-col>
        </el-row>
@@ -132,9 +164,9 @@
              label-width="350px">
              <el-radio-group
                v-model="ruleForm.diyaq.sfczjzhxz"
-                :disabled="!viewEdit">
+                :disabled="!viewEdit || ruleForm.sldy.djlx == '400'">
-                <el-radio label="1">启用</el-radio>
+                <el-radio label="1">是</el-radio>
-                <el-radio label="0">禁用</el-radio>
+                <el-radio label="0">否</el-radio>
              </el-radio-group>
            </el-form-item>
          </el-col>
@@ -146,8 +178,9 @@
              <div style="display:flex">
                <el-input
                  v-model="ruleForm.diyaq.bdbzzqse"
-                  :disabled="!viewEdit"></el-input>
+                  :disabled="!viewEdit || ruleForm.sldy.djlx == '400'"></el-input>
-                <el-select style="width: 68px" v-model="ruleForm.diyaq.jedw" :disabled="!viewEdit">
+                <el-select style="width: 68px" v-model="ruleForm.diyaq.jedw"
+                  :disabled="!viewEdit || ruleForm.sldy.djlx == '400'">
                  <el-option
                    v-for="item in dictData['A57']"
                    :key="item.dcode"
@@ -163,8 +196,8 @@
            <el-form-item label="最高债权额：">
              <el-input
                v-model="ruleForm.diyaq.zgzqse"
-                :disabled="!viewEdit"></el-input>
+                :disabled="!viewEdit || ruleForm.sldy.djlx == '400'"></el-input>
-              <el-select v-model="ruleForm.diyaq.jedw" :disabled="!viewEdit">
+              <el-select v-model="ruleForm.diyaq.jedw" :disabled="!viewEdit || ruleForm.sldy.djlx == '400'">
                <el-option
                  v-for="item in dictData['A57']"
                  :key="item.dcode"
@@ -179,7 +212,7 @@
            <el-form-item label="债务履行起始时间：">
              <el-date-picker
                v-model="ruleForm.diyaq.zwlxqssj"
-                :disabled="!viewEdit"
+                :disabled="!viewEdit || ruleForm.sldy.djlx == '400'"
                type="date">
              </el-date-picker>
            </el-form-item>
@@ -188,7 +221,7 @@
            <el-form-item label="债务履行结束时间：">
              <el-date-picker
                v-model="ruleForm.diyaq.zwlxjssj"
-                :disabled="!viewEdit"
+                :disabled="!viewEdit || ruleForm.sldy.djlx == '400'"
                type="date">
              </el-date-picker>
            </el-form-item>
@@ -200,7 +233,7 @@
            <el-form-item label="担保范围：">
              <el-input
                v-model="ruleForm.diyaq.dbfw"
-                :disabled="ruleForm.sldy.djlx == '300' && !viewEdit"></el-input>
+                :disabled="(ruleForm.sldy.djlx == '300' && !viewEdit) || ruleForm.sldy.djlx == '400'"></el-input>
            </el-form-item>
          </el-col>
        </el-row>
@@ -209,7 +242,7 @@
            <el-form-item label="最高债权确定事实和数额：">
              <el-input
                v-model="ruleForm.diyaq.zgzqqdss"
-                :disabled="!viewEdit"></el-input>
+                :disabled="!viewEdit || ruleForm.sldy.djlx == '400'"></el-input>
            </el-form-item>
          </el-col>
        </el-row>
@@ -221,7 +254,7 @@
                maxlength="500"
                show-word-limit
                v-model="ruleForm.diyaq.fj"
-                :disabled="!viewEdit"></el-input>
+                :disabled="!viewEdit || ruleForm.sldy.djlx == '400'"></el-input>
            </el-form-item>
          </el-col>
        </el-row>
@@ -370,6 +403,7 @@
    },
    data () {
      return {
+        mjdw: '1',
        isSave: true,
        loading: false,
        //表单是否可操作
--- a/src/views/ywbl/ybx/ybxdata.js
View file @f666d4d
+++ b/src/views/ywbl/ybx/ybxdata.js
View file @f666d4d
 /*
 * @Description: 
 * @Autor: renchao
- * @LastEditTime: 2023-10-11 10:52:08
+ * @LastEditTime: 2024-01-26 16:16:24
 */
 import filter from '@/utils/filter.js'
 let vm = null
@@ -54,7 +54,7 @@ class data extends filter {
      },
      {
        label: "业务号",
-        width: '100',
+        width: '110',
        render: (h, scope) => {
          return <el-link type="primary" onClick={() => { vm.ywhClick(scope.row) }}>{this.joinItem(scope.row.ywh)}</el-link>
        }
--- a/src/views/ywbl/ywsq/components/cfdj.vue
View file @f666d4d
+++ b/src/views/ywbl/ywsq/components/cfdj.vue
View file @f666d4d
 <!--
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2024-01-25 15:01:43
+ * @LastEditTime: 2024-01-26 16:19:43
 -->
 <template>
  <div class="from-clues">
@@ -27,7 +27,7 @@
          <el-col :span="6">
            <el-form-item label="查封文号">
              <el-input
-                placeholder="请输入不动产权证号"
+                placeholder="请输入查封文号"
                v-model="queryForm.cfwh"
                clearable
                class="width100"></el-input>
--- a/src/views/ywbl/ywsq/javascript/cfdj.js
View file @f666d4d
+++ b/src/views/ywbl/ywsq/javascript/cfdj.js
View file @f666d4d
@@ -16,11 +16,6 @@ class data extends filter {
  columns () {
    return [
      {
-        type: 'selection',
-        label: '全选',
-        selectable: this.selected
-      },
-      {
        label: '序号',
        type: 'index',
        width: '50',