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

@@ -47,7 +47,7 @@
           <div class="triangle"></div>
           <div class="triangle"></div>
         </div>
         </div>
 
 
-        <el-button type="primary" style="float: right;margin-right: 20px; " @click="onClick">数据查看</el-button>
+        <el-button type="primary" style="float: right;margin-right: 20px; " @click="dataSelectClick">数据查看</el-button>
 
 
         <el-row :gutter="10" v-if="ruleForm.qlxx">
         <el-row :gutter="10" v-if="ruleForm.qlxx">
           <el-col :span="8">
           <el-col :span="8">
@@ -137,9 +137,10 @@
           <el-col :span="14" v-if="ruleForm.qlxx">
           <el-col :span="14" v-if="ruleForm.qlxx">
             <el-form-item :class="flag ? 'marginBot0' : ''" label="共有方式：">
             <el-form-item :class="flag ? 'marginBot0' : ''" label="共有方式：">
               <el-radio-group :disabled="$route.query.viewtype==1" v-model="ruleForm.slywxx.gyfs">
               <el-radio-group :disabled="$route.query.viewtype==1" v-model="ruleForm.slywxx.gyfs">
-                <el-radio label="1">单独所有</el-radio>
-                <el-radio label="2">共同共有</el-radio>
-                <el-radio label="3">按份所有</el-radio>
+                <el-radio label="0">单独所有</el-radio>
+                <el-radio label="1">共同共有</el-radio>
+                <el-radio label="2">按份所有</el-radio>
+                <el-radio label="3">其它共有</el-radio>
               </el-radio-group>
               </el-radio-group>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
@@ -188,6 +189,7 @@
 import InformationTable from "@/views/workflow/components/InformationTable";
 import InformationTable from "@/views/workflow/components/InformationTable";
 import {Init, saveBatchData} from "@/api/fwsyqFlow.js";
 import {Init, saveBatchData} from "@/api/fwsyqFlow.js";
 import { mapGetters } from "vuex";
 import { mapGetters } from "vuex";
+import SERVER from "@/api/config";
 export default {
 export default {
   async created () {
   async created () {
     this.propsParam = this.$attrs;
     this.propsParam = this.$attrs;
@@ -252,8 +254,8 @@ export default {
     };
     };
   },
   },
   methods: {
   methods: {
-    onClick(){
-      this.$popup("房屋信息比对","ywbl/fdcq2/slxxCompareDetai",
+    dataSelectClick(){
+      this.$popup("房屋信息比对",SERVER.SERVERAPI + "/rest/ywbl/fdcq2/slxxCompareDetai",
          {
          {
          formData: {
          formData: {
            bsmSldy: this.propsParam.bsmSldy,
            bsmSldy: this.propsParam.bsmSldy,