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

@@ -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>
+        <el-row :gutter="10"> </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">
-              <el-radio-group v-model="ruleForm.cfdj.sfbxf" @change="djlxchange">
+              :rules="rules.sfbxfrules"
+            >
+              <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,150 +392,157 @@
   </div>
 </template>
 <script>
-  import { mapGetters } from "vuex";
-  import { init, getSsQlxx, getZtQlxx, getQlxxByQlxxBsm, 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 () {
-        if (!this.ableOperation) {
-          //只读状态
-          return true;
-        }
-        return false;
-      },
+import { mapGetters } from "vuex";
+import {
+  init,
+  getSsQlxx,
+  getZtQlxx,
+  getQlxxByQlxxBsm,
+  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() {
+      if (!this.ableOperation) {
+        //只读状态
+        return true;
+      }
+      return false;
     },
-    data () {
-      return {
-        //表单是否可操作
-        props: {
-          label: "bdcqzh",
-          value: "bdcdyid",
+  },
+  data() {
+    return {
+      //表单是否可操作
+      props: {
+        label: "bdcqzh",
+        value: "bdcdyid",
+      },
+      propsParam: this.$attrs,
+      key: 0,
+      isShow: false,
+      ssqlxxshow: true,
+      disabled: true,
+      czrOptions: [],
+      ruleForm: {},
+      rules: {},
+      // 登记类型
+      djlxlist: [
+        {
+          dcode: "100",
+          dname: "首次登记",
+        },
+        {
+          dcode: "200",
+          dname: "转移登记",
+        },
+        {
+          dcode: "300",
+          dname: "变更登记",
+        },
+        {
+          dcode: "500",
+          dname: "更正登记",
         },
-        propsParam: this.$attrs,
-        key: 0,
-        isShow: false,
-        ssqlxxshow: true,
-        disabled: true,
-        czrOptions: [],
-        ruleForm: {},
-        rules: {},
-        // 登记类型
-        djlxlist: [
-          {
-            dcode: "100",
-            dname: "首次登记",
-          },
-          {
-            dcode: "200",
-            dname: "转移登记",
-          },
-          {
-            dcode: "300",
-            dname: "变更登记",
-          },
-          {
-            dcode: "500",
-            dname: "更正登记",
-          },
 
-          {
-            dcode: "901",
-            dname: "补证",
-          },
-          {
-            dcode: "902",
-            dname: "换证",
-          },
-        ],
+        {
+          dcode: "901",
+          dname: "补证",
+        },
+        {
+          dcode: "902",
+          dname: "换证",
+        },
+      ],
 
-        // 权属状态
-        qsztlist: [
-          {
-            dcode: "1",
-            dname: "现势",
-          },
-          {
-            dcode: "2",
-            dname: "历史",
-          },
+      // 权属状态
+      qsztlist: [
+        {
+          dcode: "1",
+          dname: "现势",
+        },
+        {
+          dcode: "2",
+          dname: "历史",
+        },
+      ],
+      // 是否被续封
+      sfbxflist: [
+        {
+          dcode: "0",
+          dname: "否",
+        },
+        {
+          dcode: "1",
+          dname: "是",
+        },
+      ],
+      ableOperation: false,
+      //传递参数\
+
+      ssQlxxList: [],
+      ztQlxxList: [],
+      rules: {
+        ztQlxxrules: [
+          { required: true, message: "抵押不动产信息", trigger: "blur" },
         ],
-        // 是否被续封
-        sfbxflist: [
-          {
-            dcode: "0",
-            dname: "否",
-          },
-          {
-            dcode: "1",
-            dname: "是",
-          },
+        ssQlxxrules: [
+          { required: true, message: "上手权利信息", trigger: "blur" },
         ],
-        ableOperation: false,
-        //传递参数\
-
-        ssQlxxList: [],
-        ztQlxxList: [],
-        rules: {
-          ztQlxxrules: [
-            { required: true, message: "抵押不动产信息", trigger: "blur" },
-          ],
-          ssQlxxrules: [
-            { required: true, message: "上手权利信息", trigger: "blur" },
-          ],
-          bdcqzhrules: [
-            { required: true, message: "不动产登记证明号", trigger: "blur" },
-          ],
-          djjgrules: [{ required: true, message: "登记机构", trigger: "blur" }],
-          dbrrules: [{ required: true, message: "登簿人", trigger: "blur" }],
-          djsjrules: [{ required: true, message: "登记时间", trigger: "blur" }],
-          ywhrules: [{ required: true, message: "业务号", trigger: "blur" }],
-          sfbxfrules: [
-            { required: true, message: "是否被续封", trigger: "change" },
-          ],
-        },
-      };
-    },
-    created () {
-      this.loadData();
+        bdcqzhrules: [
+          { required: true, message: "不动产登记证明号", trigger: "blur" },
+        ],
+        djjgrules: [{ required: true, message: "登记机构", trigger: "blur" }],
+        dbrrules: [{ required: true, message: "登簿人", trigger: "blur" }],
+        djsjrules: [{ required: true, message: "登记时间", trigger: "blur" }],
+        ywhrules: [{ required: true, message: "业务号", trigger: "blur" }],
+        sfbxfrules: [
+          { required: true, message: "是否被续封", trigger: "change" },
+        ],
+      },
+    };
+  },
+  created() {
+    this.loadData();
+  },
+  mounted() {
+    this.ableOperation = this.$parent.ableOperation;
+  },
+  methods: {
+    /**
+     * @description: ztQlxxchange
+     * @param {*} val
+     * @author: renchao
+     */
+    ztQlxxchange(val) {
+      this.ruleForm.ztQlxx = val;
     },
-    mounted () {
-      this.ableOperation = this.$parent.ableOperation;
+    /**
+     * @description: ssQlxxchange
+     * @param {*} val
+     * @author: renchao
+     */
+    ssQlxxchange(val) {
+      this.ruleForm.ssQlxx = val;
+      this.ruleForm.qlxx.ssywh = val.ywh;
+      this.ssQlxxchangediolog(val);
     },
-    methods: {
-      /**
-       * @description: ztQlxxchange
-       * @param {*} val
-       * @author: renchao
-       */
-      ztQlxxchange (val) {
-        this.ruleForm.ztQlxx = val;
-      },
-      /**
-       * @description: ssQlxxchange
-       * @param {*} val
-       * @author: renchao
-       */
-      ssQlxxchange (val) {
-        this.ruleForm.ssQlxx = val;
-        this.ruleForm.qlxx.ssywh = val.ywh;
-        this.ssQlxxchangediolog(val);
-      },
-      // 弹框事件
-      ssQlxxchangediolog (val) {
-        this.$confirm("是否将上手权利信息同步到表单", "提示", {
-          iconClass: "el-icon-question", //自定义图标样式
-          confirmButtonText: "确认", //确认按钮文字更换
-          cancelButtonText: "取消", //取消按钮文字更换
-          showClose: true, //是否显示右上角关闭按钮
-          type: "warning",
-        }).then(() => {
+    // 弹框事件
+    ssQlxxchangediolog(val) {
+      this.$confirm("是否将上手权利信息同步到表单", "提示", {
+        iconClass: "el-icon-question", //自定义图标样式
+        confirmButtonText: "确认", //确认按钮文字更换
+        cancelButtonText: "取消", //取消按钮文字更换
+        showClose: true, //是否显示右上角关闭按钮
+        type: "warning",
+      })
+        .then(() => {
           getQlxxByQlxxBsm({ qlxxBsm: val.bsmQlxx }).then((res) => {
             if (res.code == 200) {
               this.nowlist = res.result;
@@ -541,114 +570,115 @@
               });
             }
           });
-        }).catch(() => {
+        })
+        .catch(() => {
           this.$message({
             type: "info",
             message: "已取消同步",
           });
-        })
-      },
-      /**
-       * @description: djlxchange
-       * @param {*} val
-       * @author: renchao
-       */
-      djlxchange (val) {
-        if (val == null || val == 100) {
-          this.ssqlxxshow = false;
-        } else {
-          this.ssqlxxshow = true;
-        }
-      },
-      /**
-       * @description: loadData
-       * @author: renchao
-       */
-      loadData () {
-        this.$startLoading();
-        this.propsParam.isEdit = this.$parent.isEdit;
-        init(this.propsParam).then((res) => {
-          if (res.code == 200) {
-            this.ruleForm = res.result;
-            this.isShow = true;
-            let djlx = this.ruleForm.qlxx.djlx;
-            this.$endLoading();
-            if (djlx == null || djlx == 100) {
-              this.ssqlxxshow = false;
-            }
-
-            //获取主体信息
-            getSsQlxx({
-              bdcdyid: this.propsParam.bdcdyid,
-              qllx: this.propsParam.qllx,
-              bsmQlxx: this.ruleForm.qlxx.bsmQlxx,
-            }).then((res) => {
-              if (res.code == 200) {
-                this.ssQlxxList = res.result;
-              }
-            });
-            //获取上手信息
-            getZtQlxx({
-              bdcdyid: this.propsParam.bdcdyid,
-              bsmQlxx: this.ruleForm.qlxx.bsmQlxx,
-            }).then((res) => {
-              if (res.code == 200) {
-                this.ztQlxxList = res.result;
-              }
-            });
-          }
         });
-      },
-      // // 更新土地用途信息
-      // upDateTdytxxList(val) {
-      //   this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
-      //   this.key++;
-      // },
-      // // 更新权利人信息
-      // upDateQlrxxList(val) {
-      //   this.ruleForm.qlrData && (this.ruleForm.qlrData = _.cloneDeep(val));
-      //   this.czrOptions = this.ruleForm.qlrData;
-      //   this.key++;
-      // },
-      // // 更新义务人信息
-      // upDateYwrxxList(val) {
-      //   this.ruleForm.ywrData && (this.ruleForm.ywrData = _.cloneDeep(val));
-      //   this.key++;
-      // },
-      /**
-       * @description: onSubmit
-       * @author: renchao
-       */
-      onSubmit () {
-        this.$refs.ruleForm.validate((valid) => {
-          console.log("valid", valid);
-          if (valid) {
-            save(this.ruleForm).then((res) => {
-              if (res.code === 200) {
-                this.$message({
-                  showClose: true,
-                  message: "保存成功！",
-                  type: "success",
-                });
-                this.$parent.changeywh();
-                this.$store.dispatch("user/refreshPage", true);
-              } else {
-                this.$message({
-                  showClose: true,
-                  message: res.message,
-                  type: "error",
-                });
-              }
-            });
-          } else {
-            return false;
+    },
+    /**
+     * @description: djlxchange
+     * @param {*} val
+     * @author: renchao
+     */
+    djlxchange(val) {
+      if (val == null || val == 100) {
+        this.ssqlxxshow = false;
+      } else {
+        this.ssqlxxshow = true;
+      }
+    },
+    /**
+     * @description: loadData
+     * @author: renchao
+     */
+    loadData() {
+      this.$startLoading();
+      this.propsParam.isEdit = this.$parent.isEdit;
+      init(this.propsParam).then((res) => {
+        if (res.code == 200) {
+          this.ruleForm = res.result;
+          this.isShow = true;
+          let djlx = this.ruleForm.qlxx.djlx;
+          this.$endLoading();
+          if (djlx == null || djlx == 100) {
+            this.ssqlxxshow = false;
           }
-        });
-      },
+
+          //获取主体信息
+          getSsQlxx({
+            bdcdyid: this.propsParam.bdcdyid,
+            qllx: this.propsParam.qllx,
+            bsmQlxx: this.ruleForm.qlxx.bsmQlxx,
+          }).then((res) => {
+            if (res.code == 200) {
+              this.ssQlxxList = res.result;
+            }
+          });
+          //获取上手信息
+          getZtQlxx({
+            bdcdyid: this.propsParam.bdcdyid,
+            bsmQlxx: this.ruleForm.qlxx.bsmQlxx,
+          }).then((res) => {
+            if (res.code == 200) {
+              this.ztQlxxList = res.result;
+            }
+          });
+        }
+      });
+    },
+    // // 更新土地用途信息
+    // upDateTdytxxList(val) {
+    //   this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
+    //   this.key++;
+    // },
+    // // 更新权利人信息
+    // upDateQlrxxList(val) {
+    //   this.ruleForm.qlrData && (this.ruleForm.qlrData = _.cloneDeep(val));
+    //   this.czrOptions = this.ruleForm.qlrData;
+    //   this.key++;
+    // },
+    // // 更新义务人信息
+    // upDateYwrxxList(val) {
+    //   this.ruleForm.ywrData && (this.ruleForm.ywrData = _.cloneDeep(val));
+    //   this.key++;
+    // },
+    /**
+     * @description: onSubmit
+     * @author: renchao
+     */
+    onSubmit() {
+      this.$refs.ruleForm.validate((valid) => {
+        console.log("valid", valid);
+        if (valid) {
+          save(this.ruleForm).then((res) => {
+            if (res.code === 200) {
+              this.$message({
+                showClose: true,
+                message: "保存成功！",
+                type: "success",
+              });
+              this.$parent.changeywh();
+              this.$store.dispatch("user/refreshPage", true);
+            } else {
+              this.$message({
+                showClose: true,
+                message: res.message,
+                type: "error",
+              });
+            }
+          });
+        } else {
+          return false;
+        }
+      });
     },
-  };
+  },
+};
 </script>
 <style scoped lang="scss">
-  @import "~@/styles/public.scss";
-  @import "~@/styles/slxx/slxx.scss";
+@import "~@/styles/public.scss";
+@import "~@/styles/slxx/slxx.scss";
 </style>

@@ -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"

@@ -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";
-                }
-              });
-            }
-          }
+          } else {
+              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({

+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({