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

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