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

tianhaohao@pashanhoo.com
Showing 5 changed files with 96 additions and 95 deletions
src/views/workflow/components/dialog/addQlr.vue
src/views/workflow/components/dialog/zsyl.vue
src/views/workflow/components/qlrCommonTable.vue
src/views/ywbl/slsqxx/fdcq2/slxxOverview.vue
src/views/ywbl/slsqxx/ygdj/slxx.vue
--- a/src/views/workflow/components/dialog/addQlr.vue
View file @8721ac4
+++ b/src/views/workflow/components/dialog/addQlr.vue
View file @8721ac4
 <!--
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2023-08-04 13:29:47
+ * @LastEditTime: 2023-08-16 16:45:42
 -->
 <template>
  <dialogBox title="申请人信息" width="60%" isMain v-model="myValue" :isFullscreen="false" @submitForm="submitForm"
@@ -10,7 +10,7 @@
      <el-row>
        <el-col :span="8">
          <el-form-item label="权利人类型" prop="sqrlx">
-            <el-select clearable v-model="ruleForm.sqrlx" class="width100" placeholder="请选择">
+            <el-select clearable v-model="ruleForm.sqrlx" class="width100" :disabled="!showButton" placeholder="请选择">
              <el-option v-for="item in dictData['A36']" :key="item.dcode" :label="item.dname" :value="item.dcode">
              </el-option>
            </el-select>
@@ -18,12 +18,12 @@
        </el-col>
        <el-col :span="8">
          <el-form-item label="姓名/名称" prop="sqrmc">
-            <el-input v-model="ruleForm.sqrmc" maxlegth="15"></el-input>
+            <el-input v-model="ruleForm.sqrmc" maxlegth="15" :disabled="!showButton"></el-input>
          </el-form-item>
        </el-col>
        <el-col :span="8">
          <el-form-item label="证件种类" prop="zjzl">
-            <el-select clearable v-model="ruleForm.zjzl" class="width100" placeholder="请选择">
+            <el-select clearable v-model="ruleForm.zjzl" :disabled="!showButton" class="width100" placeholder="请选择">
              <el-option v-for="item in dictData['A30']" :key="item.dcode" :label="item.dname" :value="item.dcode">
              </el-option>
            </el-select>
@@ -33,17 +33,17 @@
      <el-row>
        <el-col :span="8">
          <el-form-item label="证件号" prop="zjh">
-            <el-input v-model="ruleForm.zjh" maxlength="15" oninput="this.value=this.value.replace(/[^\X0-9]/g,'')"></el-input>
+            <el-input v-model="ruleForm.zjh" :disabled="!showButton" maxlength="15" oninput="this.value=this.value.replace(/[^\X0-9]/g,'')"></el-input>
          </el-form-item>
        </el-col>
        <el-col :span="8">
          <el-form-item label="联系电话" prop="dh">
-            <el-input v-model="ruleForm.dh" maxlength="11" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
+            <el-input v-model="ruleForm.dh" :disabled="!showButton" maxlength="11" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
          </el-form-item>
        </el-col>
        <el-col :span="8">
          <el-form-item label="份数" prop="fs">
-            <el-input v-model="ruleForm.fs" maxlength="8" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
+            <el-input v-model="ruleForm.fs" :disabled="!showButton" maxlength="8" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
          </el-form-item>
        </el-col>
@@ -51,17 +51,17 @@
      <el-row>
        <el-col :span="8">
          <el-form-item label="法人名称" prop="frmc">
-            <el-input v-model="ruleForm.frmc"></el-input>
+            <el-input v-model="ruleForm.frmc" :disabled="!showButton"></el-input>
          </el-form-item>
        </el-col>
        <el-col :span="8">
          <el-form-item label="国家/地区" prop="gj">
-            <el-input v-model="ruleForm.gj"></el-input>
+            <el-input v-model="ruleForm.gj" :disabled="!showButton"></el-input>
          </el-form-item>
        </el-col>
        <el-col :span="8">
          <el-form-item label="户籍所在省市" prop="hjszss">
-            <el-input v-model="ruleForm.hjszss"></el-input>
+            <el-input v-model="ruleForm.hjszss" :disabled="!showButton"></el-input>
          </el-form-item>
        </el-col>
      </el-row>
@@ -69,12 +69,12 @@
      <el-row>
        <el-col :span="16">
          <el-form-item label="地址" prop="txdz">
-            <el-input v-model="ruleForm.txdz"></el-input>
+            <el-input v-model="ruleForm.txdz" :disabled="!showButton"></el-input>
          </el-form-item>
        </el-col>
        <el-col :span="8">
          <el-form-item label="邮编" prop="yb">
-            <el-input v-model="ruleForm.yb"></el-input>
+            <el-input v-model="ruleForm.yb" :disabled="!showButton"></el-input>
          </el-form-item>
        </el-col>
      </el-row>
@@ -82,17 +82,17 @@
      <el-row>
        <el-col :span="8">
          <el-form-item label="发证机关" prop="fzjg">
-            <el-input v-model="ruleForm.fzjg"></el-input>
+            <el-input v-model="ruleForm.fzjg" :disabled="!showButton"></el-input>
          </el-form-item>
        </el-col>
        <el-col :span="8">
          <el-form-item label="电子邮件" prop="dzyj">
-            <el-input v-model="ruleForm.dzyj"></el-input>
+            <el-input v-model="ruleForm.dzyj" :disabled="!showButton"></el-input>
          </el-form-item>
        </el-col>
        <el-col :span="8">
          <el-form-item label="权利比例" prop="qlbl">
-            <el-input v-model="ruleForm.qlbl"></el-input>
+            <el-input v-model="ruleForm.qlbl" :disabled="!showButton"></el-input>
          </el-form-item>
        </el-col>
      </el-row>
@@ -100,12 +100,12 @@
      <el-row>
        <el-col :span="8">
          <el-form-item label="工作单位" prop="gzdw">
-            <el-input v-model="ruleForm.gzdw"></el-input>
+            <el-input v-model="ruleForm.gzdw" :disabled="!showButton"></el-input>
          </el-form-item>
        </el-col>
        <el-col :span="16">
          <el-form-item label="代理机构" prop="dlrjg">
-            <el-input v-model="ruleForm.dlrjg"></el-input>
+            <el-input v-model="ruleForm.dlrjg" :disabled="!showButton"></el-input>
          </el-form-item>
        </el-col>
      </el-row>
@@ -113,17 +113,17 @@
      <el-row>
        <el-col :span="8">
          <el-form-item label="联系电话" prop="dlrdh">
-            <el-input v-model="ruleForm.dlrdh" maxlength="11" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
+            <el-input v-model="ruleForm.dlrdh" :disabled="!showButton" maxlength="11" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
          </el-form-item>
        </el-col>
        <el-col :span="8">
          <el-form-item label="代理人姓名" prop="dlrmc">
-            <el-input v-model="ruleForm.dlrmc"></el-input>
+            <el-input v-model="ruleForm.dlrmc" :disabled="!showButton"></el-input>
          </el-form-item>
        </el-col>
        <el-col :span="8">
          <el-form-item label="代理人证件类型" prop="dlrzjlx">
-            <el-select clearable v-model="ruleForm.dlrzjlx" class="width100" placeholder="请选择">
+            <el-select clearable v-model="ruleForm.dlrzjlx" :disabled="!showButton" class="width100" placeholder="请选择">
              <el-option v-for="item in dictData['A30']" :key="item.dcode" :label="item.dname" :value="item.dcode">
              </el-option>
            </el-select>
@@ -133,7 +133,7 @@
      <el-row>
        <el-col :span="8">
          <el-form-item label="性别" prop="xb">
-            <el-select clearable v-model="ruleForm.xb" class="width100" placeholder="请选择">
+            <el-select clearable v-model="ruleForm.xb" :disabled="!showButton" class="width100" placeholder="请选择">
              <el-option v-for="item in dictData['A43']" :key="item.dcode" :label="item.dname" :value="item.dcode">
              </el-option>
            </el-select>
@@ -141,7 +141,7 @@
        </el-col>
        <el-col :span="8">
          <el-form-item label="代理人证件号" prop="dlrzjh">
-            <el-input v-model="ruleForm.dlrzjh" maxlength="20"></el-input>
+            <el-input v-model="ruleForm.dlrzjh" :disabled="!showButton" maxlength="20"></el-input>
          </el-form-item>
        </el-col>
      </el-row>
--- a/src/views/workflow/components/dialog/zsyl.vue
View file @8721ac4
+++ b/src/views/workflow/components/dialog/zsyl.vue
View file @8721ac4
 <!--
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2023-08-16 11:22:21
+ * @LastEditTime: 2023-08-16 17:02:36
 -->
 <template>
  <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px;text-align: center;">
@@ -30,6 +30,7 @@
    },
    data () {
      return {
+        key: 0,
        noData: false,
        imgSrc: require('@/image/bdcqz/bdcqzs2.jpg'),
        bdczmSrc: require('@/image/bdcqz/bdczm.jpg'),
@@ -133,9 +134,9 @@
          context.fillText(this.bdcqz.qlr ? this.bdcqz.qlr : '', 129, 97);
          context.fillText(this.bdcqz.gyqk ? this.bdcqz.gyqk : '', 129, 136);
-          this.bdcqz.bdcdyh = this.bdcqz.bdcdyh.slice(0, 6) + ' ' + this.bdcqz.bdcdyh.slice(6, 12) + ' ' +
+          this.bdcdyh = this.bdcqz.bdcdyh.slice(0, 6) + ' ' + this.bdcqz.bdcdyh.slice(6, 12) + ' ' +
            this.bdcqz.bdcdyh.slice(12, 19) + ' ' + this.bdcqz.bdcdyh.slice(19, this.bdcqz.bdcdyh.length)
-          context.fillText(this.bdcqz.bdcdyh ? this.bdcqz.bdcdyh : '', 129, 223);
+          context.fillText(this.bdcdyh ? this.bdcdyh : '', 129, 223);
--- a/src/views/workflow/components/qlrCommonTable.vue
View file @8721ac4
+++ b/src/views/workflow/components/qlrCommonTable.vue
View file @8721ac4
 <!--
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2023-08-16 16:29:35
+ * @LastEditTime: 2023-08-16 16:44:04
 -->
 <template>
  <div>
@@ -51,7 +51,7 @@
            width: '50',
            renderHeader: (h, scope) => {
              return <div> {
-                this.disabled ? '序号' : <i class="el-icon-plus pointer" onClick={() => { this.addClick() }}></i>
+                !this.disabled ? '序号' : <i class="el-icon-plus pointer" onClick={() => { this.addClick() }}></i>
              }
              </div>
            },
@@ -59,7 +59,7 @@
              return (
                <div>
                  {
-                    this.disabled ? <span>{scope.$index + 1}</span> :
+                    !this.disabled ? <span>{scope.$index + 1}</span> :
                      <i class="el-icon-minus pointer" onClick={() => { this.deleClick(scope.$index, scope.row) }}></i>
                  }
                </div>
@@ -211,7 +211,6 @@
        });
      },
-      // 身份证读取
      /**
       * @description: 身份证读取
       * @param {*} row
--- a/src/views/ywbl/slsqxx/fdcq2/slxxOverview.vue
View file @8721ac4
+++ b/src/views/ywbl/slsqxx/fdcq2/slxxOverview.vue
View file @8721ac4
 <!--
 * @Description: 受理信息
 * @Autor: renchao
- * @LastEditTime: 2023-08-14 12:58:35
+ * @LastEditTime: 2023-08-16 16:36:31
 -->
 <template>
  <div class="slxx">
@@ -11,8 +11,7 @@
      ref="ruleForm"
      :label-position="flag ? 'top' : ''"
      :inline="flag"
-      label-width="130px"
+      label-width="130px">
-    >
      <div class="slxx_con" :class="flag ? 'formMarginBot0' : ''">
        <div class="slxx_title title-block">
          受理信息
@@ -66,8 +65,7 @@
                    v-for="item in dictData['A7']"
                    :key="item.dcode"
                    :label="item.dname"
-                    :value="item.dcode"
+                    :value="item.dcode"></el-option>
-                  ></el-option>
                </el-select>
              </div>
            </el-form-item>
@@ -124,7 +122,7 @@
            </el-form-item>
          </el-col>
          <el-col :span="5">
-            <el-form-item label="发证方式：">
+            <el-form-item label="发证方式：" :disabled="!viewEdit">
              <el-radio-group v-model="ruleForm.slsq.fzfs">
                <el-radio label="1">小证</el-radio>
                <el-radio label="2">大证</el-radio>
@@ -140,10 +138,9 @@
          <el-col :span="12" v-if="ruleForm.sldyList.length>0">
            <el-form-item label="共有方式：">
              <el-radio-group
-                :disabled="!ableOperation"
+                :disabled="!viewEdit"
                @change="showCZInfo"
-                v-model="ruleForm.sldyList[0].gyfs"
+                v-model="ruleForm.sldyList[0].gyfs">
-              >
                <el-radio label="0">单独所有</el-radio>
                <el-radio label="1">共同共有</el-radio>
                <el-radio label="2">按份所有</el-radio>
@@ -154,7 +151,9 @@
          <el-col :span="6" v-if="ruleForm.sldyList[0].gyfs!=0">
            <el-form-item label="是否分别持证：">
-              <el-radio-group v-model="ruleForm.sldyList[0].sqfbcz" :disabled="!ableOperation">
+              <el-radio-group
+                v-model="ruleForm.sldyList[0].sqfbcz"
+                :disabled="!viewEdit">
                <el-radio :label="1">是</el-radio>
                <el-radio :label="0">否</el-radio>
              </el-radio-group>
@@ -162,22 +161,24 @@
          </el-col>
          <el-col :span="6" v-if="ruleForm.sldyList[0].gyfs!=0">
            <el-form-item label="持证人：">
-              <el-select v-model="ruleForm.czr" placeholder="持证人" :disabled="!ableOperation">
+              <el-select
+                v-model="ruleForm.czr"
+                placeholder="持证人"
+                :disabled="!viewEdit">
                <el-option
                  v-for="item in czrOptions"
                  :key="item.zjh"
                  :label="item.sqrmc"
-                  :value="item.zjh"
+                  :value="item.zjh"></el-option>
-                ></el-option>
              </el-select>
            </el-form-item>
          </el-col>
        </el-row>
        <qlrCommonTable
+          :disabled="viewEdit"
          @upDateQlrxxList="upDateQlrxxList"
          :tableData="ruleForm.qlrList"
-          :gyfs="ruleForm.sldyList[0].gyfs"
+          :gyfs="ruleForm.sldyList[0].gyfs" />
-        />
        <div class="slxx_title title-block">
          登记原因
          <div class="triangle"></div>
@@ -190,14 +191,14 @@
                type="textarea"
                maxlength="500"
                show-word-limit
-                :disabled="!ableOperation"
+                :disabled="!viewEdit"
-                v-model="ruleForm.fdcq2List[0].djyy"
+                v-model="ruleForm.fdcq2List[0].djyy">
-              ></el-input>
+              </el-input>
            </el-form-item>
          </el-col>
        </el-row>
      </div>
-      <el-row class="btn" v-if="ableOperation">
+      <el-row class="btn" v-if="viewEdit">
        <el-form-item>
          <el-button type="primary" @click="onSubmit">保存</el-button>
        </el-form-item>
@@ -206,16 +207,16 @@
  </div>
 </template>
 <script>
-import ywmix from "@/views/ywbl/mixin/index";
+  import ywmix from "@/views/ywbl/mixin/index";
-import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
+  import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
-import {
+  import {
    BatchInit,
    Init,
    saveBatchData,
    saveData,
-} from "@/api/workflow/fwsyqFlow.js";
+  } from "@/api/workflow/fwsyqFlow.js";
-import { mapGetters } from "vuex";
+  import { mapGetters } from "vuex";
-export default {
+  export default {
    mixins: [ywmix],
    computed: {
      ...mapGetters(["dictData", "flag"]),
@@ -228,10 +229,10 @@ export default {
     * @param {*} val
     * @author: renchao
     */
-  upDateYwrxxList(val) {
+    upDateYwrxxList (val) {
      this.ruleForm.ywrList = _.cloneDeep(val);
    },
-  data() {
+    data () {
      return {
        disabled: true,
        tdytOption: [],
@@ -254,13 +255,13 @@ export default {
        //传递参数
        propsParam: this.$attrs,
        //表单是否可操作
-      ableOperation: true,
+        viewEdit: true,
        rules: {},
        gyfs: "",
        bsmSlsq: this.$route.query.bsmSlsq, //受理申请标识码
        splicingFdcq2: {
          //前端根据后台数组组装展示内容
-        tdxz:"",//土地性质
+          tdxz: "",//土地性质
          fwxz: "", //房屋性质
          fwjg: "", //房屋结构
          jzmj: "", //建筑面积
@@ -268,14 +269,14 @@ export default {
        },
      };
    },
-  mounted(callbackfn, thisArg) {
+    mounted (callbackfn, thisArg) {
-    this.ableOperation = this.$parent.currentSelectTab.ableOperation;
+      this.viewEdit = this.$parent.currentSelectTab.ableOperation;
      this.propsParam = this.$attrs;
      var formdata = new FormData();
      formdata.append("bsmSldy", this.propsParam.bsmSldy);
      formdata.append("djlx", this.propsParam.djlx);
      formdata.append("bsmSlsq", this.bsmSlsq);
-    formdata.append("isEdit", this.ableOperation);
+      formdata.append("isEdit", this.viewEdit);
      BatchInit(formdata).then((res) => {
        if (res.code == 200) {
          this.ruleForm = res.result;
@@ -291,7 +292,7 @@ export default {
       * @description: 组装房地产权通用信息
       * @author: renchao
       */
-    splicingFdcq2Info() {
+      splicingFdcq2Info () {
        let fdcq2List = this.ruleForm.fdcq2List;
        let fwxzArr = [];
        let fwjgArr = [];
@@ -316,7 +317,7 @@ export default {
       * @param {*} val
       * @author: renchao
       */
-    upDateQlrxxList(val) {
+      upDateQlrxxList (val) {
        this.ruleForm.qlrList = _.cloneDeep(val);
        this.czrOptions = this.ruleForm.qlrList;
      },
@@ -324,7 +325,7 @@ export default {
       * @description: showCZInfo
       * @author: renchao
       */
-    showCZInfo() {
+      showCZInfo () {
        // console.log(this.ruleForm.slsq.gyfs);
      },
      // 更新义务人信息
@@ -333,14 +334,14 @@ export default {
       * @param {*} val
       * @author: renchao
       */
-    upDateYwrxxList(val) {
+      upDateYwrxxList (val) {
        this.ruleForm.ywrList = _.cloneDeep(val);
      },
      /**
       * @description: onSubmit
       * @author: renchao
       */
-    onSubmit() {
+      onSubmit () {
        if (this.ruleForm.sldyList[0].gyfs == "0") {
          if (this.ruleForm.qlrList.length > 1) {
            this.$message({
@@ -379,55 +380,55 @@ export default {
        });
      },
    },
-};
+  };
 </script>
 <style scoped lang="scss">
-@import "~@/styles/public.scss";
+  @import "~@/styles/public.scss";
-/deep/.el-form {
+  /deep/.el-form {
    display: flex;
    flex-direction: column;
    height: calc(100vh - 130px);
-}
+  }
-/deep/.el-form-item__label {
+  /deep/.el-form-item__label {
    padding: 0;
-}
+  }
-/deep/.el-radio {
+  /deep/.el-radio {
    margin-right: 10px;
-}
+  }
-/deep/.el-select {
+  /deep/.el-select {
    width: 100%;
-}
+  }
-/deep/.el-form-item {
+  /deep/.el-form-item {
    margin-bottom: 8px;
-}
+  }
-.marginBot0 {
+  .marginBot0 {
    margin-bottom: 0 !important;
-}
+  }
-.slxx {
+  .slxx {
    box-sizing: border-box;
-}
+  }
-.slxx_con {
+  .slxx_con {
    flex: 1;
    height: 100%;
    background-color: #ffffff;
    overflow-y: auto;
    padding-right: 3px;
    overflow-x: hidden;
-}
+  }
-.submit_btn {
+  .submit_btn {
    height: 50px;
-}
+  }
-.slxx_title {
+  .slxx_title {
    border-bottom: 1px solid $borderColor;
    padding-left: 10px;
    padding-bottom: 5px;
@@ -436,23 +437,23 @@ export default {
    font-size: 16px;
    font-weight: 500;
    color: #4a4a4a;
-}
+  }
-.btn {
+  .btn {
    text-align: center;
    padding-top: 10px;
    height: 36px;
    background-color: #ffffff;
    padding: 5px 0;
-}
+  }
-.textArea {
+  .textArea {
    /deep/.el-textarea__inner {
      min-height: 90px !important;
    }
-}
+  }
-/deep/.el-form-item__label {
+  /deep/.el-form-item__label {
    padding-bottom: 0px;
-}
+  }
 </style>
--- a/src/views/ywbl/slsqxx/ygdj/slxx.vue
View file @8721ac4
+++ b/src/views/ywbl/slsqxx/ygdj/slxx.vue
View file @8721ac4
@@ -175,7 +175,7 @@
          <div class="triangle"></div>
        </div>
        <el-row :gutter="10">
-          <el-col :span="14" v-if="ruleForm.qlxx">
+          <el-col :span="12" v-if="ruleForm.qlxx">
            <el-form-item label="共有方式：">
              <el-radio-group :disabled="!viewEdit" v-model="ruleForm.sldy.gyfs">
                <el-radio label="0">单独所有</el-radio>