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

renchao@pashanhoo.com
Showing 4 changed files with 94 additions and 68 deletions
src/views/djbworkflow/djbBook/components/blxxtabs/cfdj.vue
src/views/djbworkflow/djbBook/components/blxxtabs/dyiq.vue
src/views/djbworkflow/djbBook/components/blxxtabs/yydj.vue
src/views/ywbl/mixin/index.js
--- a/src/views/djbworkflow/djbBook/components/blxxtabs/cfdj.vue
View file @b16ca7c
+++ b/src/views/djbworkflow/djbBook/components/blxxtabs/cfdj.vue
View file @b16ca7c
@@ -17,7 +17,8 @@
      inline-message
      :show-message="false"
      :class="{ readonly: editDisabled }"
-      class="loadingtext">
+      class="loadingtext"
+    >
      <div class="slxx_con" v-if="isShow" :class="flag ? 'formMarginBot0' : ''">
        <div class="slxx_title title-block">
          补录信息
@@ -46,24 +47,29 @@
            <el-form-item
              label="查封不动产权信息："
              prop="ztQlxx.bdcqzh"
-              :rules="rules.ztQlxxrules">
+              :rules="rules.ztQlxxrules"
+            >
              <select-table
                v-model="ruleForm.ztQlxx"
                :table-width="730"
                :tableData="ztQlxxList"
                :props="props"
-                @change="ztQlxxchange">
+                @change="ztQlxxchange"
+              >
                <el-table-column
                  prop="qllxmc"
                  width="130"
-                  label="权利类型"></el-table-column>
+                  label="权利类型"
+                ></el-table-column>
                <el-table-column
                  prop="bdcqzh"
                  width="160"
-                  label="不动产权证书"></el-table-column>
+                  label="不动产权证书"
+                ></el-table-column>
                <el-table-column
                  prop="qlrmc"
-                  label="被执行人"></el-table-column>
+                  label="被执行人"
+                ></el-table-column>
                <el-table-column prop="mjmc" label="面积"></el-table-column>
                <el-table-column prop="ytmc" label="用途"></el-table-column>
                <el-table-column prop="zl" label="坐落"></el-table-column>
@@ -74,9 +80,7 @@
          <div class="triangle"></div>
        </div>
-        <el-row :gutter="10">
+        <el-row :gutter="10"> </el-row>
-        </el-row>
        <el-row :gutter="10" v-if="ruleForm.ztQlxx != null">
          <el-col :span="8">
            <el-form-item label="权利人：">
@@ -135,21 +139,25 @@
              label="上手权利信息："
              prop="ssQlxx.bdcqzh"
              :rules="rules.ssQlxxrules"
-              v-if="ruleForm.cfdj.sfbxf == '1'">
+              v-if="ruleForm.cfdj.sfbxf == '1'"
+            >
              <select-table
                v-model="ruleForm.ssQlxx"
                :table-width="730"
                :tableData="ssQlxxList"
                :props="props"
-                @change="ssQlxxchange">
+                @change="ssQlxxchange"
+              >
                <el-table-column
                  prop="qllxmc"
                  width="130"
-                  label="权利类型"></el-table-column>
+                  label="权利类型"
+                ></el-table-column>
                <el-table-column
                  prop="bdcqzh"
                  width="160"
-                  label="不动产权证书"></el-table-column>
+                  label="不动产权证书"
+                ></el-table-column>
                <el-table-column prop="qlrmc" label="权利人"></el-table-column>
                <el-table-column prop="mjmc" label="面积"></el-table-column>
                <el-table-column prop="ytmc" label="用途"></el-table-column>
@@ -169,7 +177,8 @@
            <el-form-item
              label="业务号："
              prop="qlxx.ywh"
-              :rules="rules.ywhrules">
+              :rules="rules.ywhrules"
+            >
              <el-input v-model="ruleForm.qlxx.ywh"></el-input>
            </el-form-item>
          </el-col>
@@ -189,8 +198,12 @@
            <el-form-item
              label="是否被续封："
              prop="cfdj.sfbxf"
-              :rules="rules.sfbxfrules">
+              :rules="rules.sfbxfrules"
-              <el-radio-group v-model="ruleForm.cfdj.sfbxf" @change="djlxchange">
+            >
+              <el-radio-group
+                v-model="ruleForm.cfdj.sfbxf"
+                @change="djlxchange"
+              >
                <el-radio label="1">是</el-radio>
                <el-radio label="2">否</el-radio>
              </el-radio-group>
@@ -208,7 +221,8 @@
                  v-for="item in qsztlist"
                  :key="item.dcode"
                  :label="item.dname"
-                  :value="item.dcode"></el-option>
+                  :value="item.dcode"
+                ></el-option>
              </el-select>
            </el-form-item>
          </el-col>
@@ -233,7 +247,8 @@
                  v-for="item in dictData['A32']"
                  :key="item.dcode"
                  :label="item.dname"
-                  :value="item.dcode"></el-option>
+                  :value="item.dcode"
+                ></el-option>
              </el-select>
            </el-form-item>
          </el-col>
@@ -250,7 +265,8 @@
                type="date"
                placeholder="选择日期"
                value-format="yyyy-MM-dd HH:mm:ss"
-                format="yyyy-MM-dd"></el-date-picker>
+                format="yyyy-MM-dd"
+              ></el-date-picker>
            </el-form-item>
          </el-col>
          <el-col :span="8">
@@ -261,7 +277,8 @@
                type="date"
                placeholder="选择日期"
                value-format="yyyy-MM-dd HH:mm:ss"
-                format="yyyy-MM-dd"></el-date-picker>
+                format="yyyy-MM-dd"
+              ></el-date-picker>
            </el-form-item>
          </el-col>
          <el-col :span="8">
@@ -287,7 +304,8 @@
            <el-form-item
              label="登记机构："
              prop="qlxx.djjg"
-              :rules="rules.djjgrules">
+              :rules="rules.djjgrules"
+            >
              <el-input v-model="ruleForm.qlxx.djjg"></el-input>
            </el-form-item>
          </el-col>
@@ -296,7 +314,8 @@
            <el-form-item
              label="登簿人："
              prop="qlxx.dbr"
-              :rules="rules.dbrrules">
+              :rules="rules.dbrrules"
+            >
              <el-input v-model="ruleForm.qlxx.dbr"></el-input>
            </el-form-item>
          </el-col>
@@ -304,14 +323,16 @@
            <el-form-item
              label="登记时间："
              prop="qlxx.djsj"
-              :rules="rules.djsjrules">
+              :rules="rules.djsjrules"
+            >
              <el-date-picker
                v-model="ruleForm.qlxx.djsj"
                type="date"
                placeholder="选择日期"
                class="width100"
                value-format="yyyy-MM-dd HH:mm:ss"
-                format="yyyy-MM-dd">
+                format="yyyy-MM-dd"
+              >
              </el-date-picker>
            </el-form-item>
          </el-col>
@@ -355,7 +376,8 @@
                type="date"
                placeholder="选择日期"
                value-format="yyyy-MM-dd HH:mm:ss"
-                format="yyyy-MM-dd">
+                format="yyyy-MM-dd"
+              >
              </el-date-picker>
            </el-form-item>
          </el-col>
@@ -370,18 +392,24 @@
  </div>
 </template>
 <script>
-  import { mapGetters } from "vuex";
+import { mapGetters } from "vuex";
-  import { init, getSsQlxx, getZtQlxx, getQlxxByQlxxBsm, save } from "@/api/djbRepair.js";
+import {
-  import qlrCommonTable from "@/views/djbworkflow/components/qlrCommonTable";
+  init,
-  import ywrCommonTable from "@/views/djbworkflow/components/ywrCommonTable";
+  getSsQlxx,
-  import tdytTable from "@/views/workflow/components/tdytTable";
+  getZtQlxx,
-  import selectTable from "@/components/selectTable/index.vue";
+  getQlxxByQlxxBsm,
-  export default {
+  save,
+} from "@/api/djbRepair.js";
+import qlrCommonTable from "@/views/djbworkflow/components/qlrCommonTable";
+import ywrCommonTable from "@/views/djbworkflow/components/ywrCommonTable";
+import tdytTable from "@/views/workflow/components/tdytTable";
+import selectTable from "@/components/selectTable/index.vue";
+export default {
  components: { qlrCommonTable, ywrCommonTable, tdytTable, selectTable },
  computed: {
    ...mapGetters(["dictData", "flag"]),
    // 根据流程判断表单是否为只读
-      editDisabled () {
+    editDisabled() {
      if (!this.ableOperation) {
        //只读状态
        return true;
@@ -389,7 +417,7 @@
      return false;
    },
  },
-    data () {
+  data() {
    return {
      //表单是否可操作
      props: {
@@ -480,10 +508,10 @@
      },
    };
  },
-    created () {
+  created() {
    this.loadData();
  },
-    mounted () {
+  mounted() {
    this.ableOperation = this.$parent.ableOperation;
  },
  methods: {
@@ -492,7 +520,7 @@
     * @param {*} val
     * @author: renchao
     */
-      ztQlxxchange (val) {
+    ztQlxxchange(val) {
      this.ruleForm.ztQlxx = val;
    },
    /**
@@ -500,20 +528,21 @@
     * @param {*} val
     * @author: renchao
     */
-      ssQlxxchange (val) {
+    ssQlxxchange(val) {
      this.ruleForm.ssQlxx = val;
      this.ruleForm.qlxx.ssywh = val.ywh;
      this.ssQlxxchangediolog(val);
    },
    // 弹框事件
-      ssQlxxchangediolog (val) {
+    ssQlxxchangediolog(val) {
      this.$confirm("是否将上手权利信息同步到表单", "提示", {
        iconClass: "el-icon-question", //自定义图标样式
        confirmButtonText: "确认", //确认按钮文字更换
        cancelButtonText: "取消", //取消按钮文字更换
        showClose: true, //是否显示右上角关闭按钮
        type: "warning",
-        }).then(() => {
+      })
+        .then(() => {
          getQlxxByQlxxBsm({ qlxxBsm: val.bsmQlxx }).then((res) => {
            if (res.code == 200) {
              this.nowlist = res.result;
@@ -541,19 +570,20 @@
              });
            }
          });
-        }).catch(() => {
+        })
+        .catch(() => {
          this.$message({
            type: "info",
            message: "已取消同步",
          });
-        })
+        });
    },
    /**
     * @description: djlxchange
     * @param {*} val
     * @author: renchao
     */
-      djlxchange (val) {
+    djlxchange(val) {
      if (val == null || val == 100) {
        this.ssqlxxshow = false;
      } else {
@@ -564,7 +594,7 @@
     * @description: loadData
     * @author: renchao
     */
-      loadData () {
+    loadData() {
      this.$startLoading();
      this.propsParam.isEdit = this.$parent.isEdit;
      init(this.propsParam).then((res) => {
@@ -619,7 +649,7 @@
     * @description: onSubmit
     * @author: renchao
     */
-      onSubmit () {
+    onSubmit() {
      this.$refs.ruleForm.validate((valid) => {
        console.log("valid", valid);
        if (valid) {
@@ -646,9 +676,9 @@
      });
    },
  },
-  };
+};
 </script>
 <style scoped lang="scss">
-  @import "~@/styles/public.scss";
+@import "~@/styles/public.scss";
-  @import "~@/styles/slxx/slxx.scss";
+@import "~@/styles/slxx/slxx.scss";
 </style>
--- a/src/views/djbworkflow/djbBook/components/blxxtabs/dyiq.vue
View file @b16ca7c
+++ b/src/views/djbworkflow/djbBook/components/blxxtabs/dyiq.vue
View file @b16ca7c
@@ -384,7 +384,7 @@
              </el-radio-group>
            </el-form-item>
          </el-col>
-          <el-col :span="6" v-show="ruleForm.qlxx.gyfs != '0'">
+          <!-- <el-col :span="6" v-show="ruleForm.qlxx.gyfs != '0'">
            <el-form-item label="是否分别持证：">
              <el-radio-group
                v-model="ruleForm.qlxx.sqfbcz"
@@ -410,7 +410,7 @@
                </el-option>
              </el-select>
            </el-form-item>
-          </el-col>
+          </el-col> -->
        </el-row>
        <qlrCommonTable
          :tableData="ruleForm.qlrData"
--- a/src/views/djbworkflow/djbBook/components/blxxtabs/yydj.vue
View file @b16ca7c
+++ b/src/views/djbworkflow/djbBook/components/blxxtabs/yydj.vue
View file @b16ca7c
@@ -345,7 +345,7 @@
              </el-radio-group>
            </el-form-item>
          </el-col>
-          <el-col :span="6" v-show="ruleForm.qlxx.gyfs != '0'">
+          <!-- <el-col :span="6" v-show="ruleForm.qlxx.gyfs != '0'">
            <el-form-item label="是否分别持证：">
              <el-radio-group
                v-model="ruleForm.qlxx.sqfbcz"
@@ -375,7 +375,7 @@
                </el-option>
              </el-select>
            </el-form-item>
-          </el-col>
+          </el-col> -->
        </el-row>
        <qlrCommonTable
          :tableData="ruleForm.qlrData"
@@ -408,7 +408,7 @@
 </template>
 <script>
 import { mapGetters } from "vuex";
-import ywmix from "@/views/ywbl/mixin/index";
+// import ywmix from "@/views/ywbl/mixin/index";
 import {
  init,
  getSsQlxx,
@@ -421,7 +421,7 @@ import ywrCommonTable from "@/views/djbworkflow/components/ywrCommonTable";
 import tdytTable from "@/views/workflow/components/tdytTable";
 import selectTable from "@/components/selectTable/index.vue";
 export default {
-  mixins: [ywmix],
+  // mixins: [ywmix],
  components: { qlrCommonTable, ywrCommonTable, tdytTable, selectTable },
  computed: {
    ...mapGetters(["dictData", "flag"]),
@@ -711,24 +711,17 @@ export default {
              return false;
            }
            this.ruleForm.qlrData[0].sfczr = "1";
-          }
-          if (this.ruleForm.qlxx.gyfs == "1") {
-            //是否分别持证
-            if (this.ruleForm.qlxx.sqfbcz == "1") {
-              //是
-              this.ruleForm.qlrData.forEach((item, index) => {
-                item.sfczr = "1";
-              });
-            } else {
-              this.ruleForm.qlrData.forEach((item, index) => {
-                if (item.zjh == this.ruleForm.czr) {
-                  item.sfczr = "1";
          } else {
-                  item.sfczr = "0";
+              if (this.ruleForm.qlrData.length <= 1) {
-                }
+                this.$message({
+                  showClose: true,
+                  message: "共有方式：共同所有，按份所有，其他所有，权利人必须是两个以上",
+                  type: "error",
                });
+                return false;
              }
              }
          save(this.ruleForm).then((res) => {
            if (res.code === 200) {
              this.$message({
--- a/src/views/ywbl/mixin/index.js
View file @b16ca7c
+++ b/src/views/ywbl/mixin/index.js
View file @b16ca7c
+import { log } from "bpmn-js-token-simulation"
 /*
 * @Description:
 * @Autor: renchao
@@ -11,6 +13,7 @@ export default {
  watch: {
    'ruleForm.sldy.gyfs': {
      handler: function (val, oldVal) {
+        console.log("单独所有",val,oldVal);
        if (val == '0' && this.ruleForm.qlrList.length > 1 && oldVal) {
          this.ruleForm.sldy.gyfs = oldVal
          this.$message({