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

@@ -2,9 +2,12 @@ import Vue from 'vue'
 import Popup from './index.vue'
 
 const PopupBox = Vue.extend(Popup)
-Popup.install = function (title, editItem, data) {
+Popup.install = function (title, editItem, data, formData) {
   data.title = title
   data.editItem = editItem
+  if (formData) {
+    data.formData = formData
+  }
   let instance = new PopupBox({
     data
   }).$mount()

@@ -97,7 +97,6 @@ export default {
     }
   },
   destroyed () {
-    // if appendToBody is true, remove DOM node after destroy
     if (this.appendToBody && this.$el && this.$el.parentNode) {
       this.$el.parentNode.removeChild(this.$el);
     }

-// import { Loading } from 'element-ui'
 import Loading from '@/components/loading/index.js';
 // 定义 loading 
 let loading
 
 // loading开始 方法
-function startLoading (target = "body") {
+function startLoading (target, loadingText = '正在加载中...') {
   loading = Loading.service({
-    text: '正在加载中...',
+    text: loadingText,
     spinner: 'el-icon-loading',
     background: 'rgba(255, 255, 255, 0.5)',
-    target: '#' + target
+    target: target ? '#' + target : 'body'
   })
 }
 

@@ -39,7 +39,7 @@
         }
 
         .xxTable {
-            border-spacing: 1px;
+            //border-spacing: 1px;
             width: 100%;
 
             tr>th {
@@ -146,4 +146,4 @@
             margin-left: 2px;
         }
     }
-}
\ No newline at end of file
+}

@@ -355,4 +355,4 @@ export default {
 /deep/.el-form-item__label {
   padding-bottom: 0px;
 }
-</style>
\ No newline at end of file
+</style>

@@ -140,6 +140,15 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
+          <el-col :span="5">
+            <el-form-item :class="flag ? 'marginBot0' : ''" label="发证方式：">
+              <el-radio-group v-model="ruleForm.slywxx.fzfs">
+                <el-radio label="1">小证</el-radio>
+                <el-radio label="2">大证</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+
           <el-col :span="5" v-show="ruleForm.qlxx&&ruleForm.qlxx.gyfs == '2'">
             <el-form-item :class="flag ? 'marginBot0' : ''" label="是否分别持证：">
               <el-radio-group v-model="ruleForm.slywxx.sffbcz">
@@ -195,9 +204,7 @@ export default {
       if (res.code === 200 && res.result) {
         this.ruleForm = {
           ...res.result,
-          ...res.result.zdjbxxdatas,
           ...res.result.qlxxdatas,
-          ...res.result.jsydsyqdatas,
         }
       }
     });
@@ -231,8 +238,18 @@ export default {
     },
     onSubmit () {
       saveBatchData(this.ruleForm).then((res) => {
-        if (res.code === 200 && res.result) {
-          console.log(res);
+        if (res.code === 200) {
+          this.$message({
+            showClose: true,
+            message: "保存成功！",
+            type: "success",
+          });
+        } else {
+          this.$message({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
         }
       });
     },

@@ -249,10 +249,18 @@ export default {
     },
     onSubmit () {
       saveData(this.ruleForm).then((res) => {
-        console.log(this.ruleForm);
-        if (res.code === 200 && res.result) {
-          console.log(res);
-          //this.ruleForm = { ...res.result, ...res.result.zdjbxxdatas, ...res.result.qlxxdatas, ...res.result.jsydsyqdatas }
+        if (res.code === 200) {
+          this.$message({
+            showClose: true,
+            message: "保存成功！",
+            type: "success",
+          });
+        } else {
+          this.$message({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
         }
       });
     },

@@ -253,24 +253,12 @@ export default {
   },
   methods: {
     onClick(){
-      this.$popup({
-        titleStyle: "left",
-        title: "登记簿详情", // 弹窗标题
-        editItem: "ywbl/fdcq2/slxxCompareDetai", // 弹窗内容
-        formData: {
-          bsmSldy: this.propsParam.bsmSldy,
-          qllx: this.propsParam.qllx
-        },
-        width: "1220px",
-        height: "790px",
-        // cancelText: '取消摆烂', // 右边按钮文本
-        // confirmText: '确定点击', //左边按钮文本
-        cancel: () => {
-          console.log("取消回调");
-        },
-        confirm: () => {
-          console.log("确认回调");
-        },
+      this.$popup("房屋信息比对","ywbl/fdcq2/slxxCompareDetai",
+         {
+         formData: {
+           bsmSldy: this.propsParam.bsmSldy,
+           qllx: this.propsParam.qllx
+         }
       });
     },
     // 更新权利人信息
@@ -284,9 +272,18 @@ export default {
 
     onSubmit () {
       saveGZBatchData(this.ruleForm).then((res) => {
-        if (res.code === 200 && res.result) {
-          console.log(res);
-          //this.ruleForm = { ...res.result, ...res.result.zdjbxxdatas, ...res.result.qlxxdatas, ...res.result.jsydsyqdatas }
+        if (res.code === 200) {
+          this.$message({
+            showClose: true,
+            message: "保存成功！",
+            type: "success",
+          });
+        } else {
+          this.$message({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
         }
       });
     },

@@ -266,9 +266,18 @@ export default {
     },
     onSubmit () {
       saveLogoutData(this.ruleForm).then((res) => {
-        if (res.code === 200 && res.result) {
-          console.log(res);
-          //this.ruleForm = { ...res.result, ...res.result.zdjbxxdatas, ...res.result.qlxxdatas, ...res.result.jsydsyqdatas }
+        if (res.code === 200) {
+          this.$message({
+            showClose: true,
+            message: "保存成功！",
+            type: "success",
+          });
+        } else {
+          this.$message({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
         }
       });
     },

@@ -228,26 +228,20 @@ export default {
     upDateYwrxxList (val) {
       this.ruleForm.ywrList = _.cloneDeep(val);
     },
-    list (bsmSldy) {
-      var formdata = new FormData();
-      formdata.append("bsmSldy", bsmSldy);
-      Init(formdata).then((res) => {
-        if (res.code === 200 && res.result) {
-          this.ruleForm = {
-            ...res.result,
-            ...res.result.zdjbxxdatas,
-            ...res.result.qlxxdatas,
-            ...res.result.jsydsyqdatas,
-          };
-        }
-      });
-    },
     onSubmit () {
       saveBHZData(this.ruleForm).then((res) => {
-        console.log(this.ruleForm);
-        if (res.code === 200 && res.result) {
-          console.log(res);
-          //this.ruleForm = { ...res.result, ...res.result.zdjbxxdatas, ...res.result.qlxxdatas, ...res.result.jsydsyqdatas }
+        if (res.code === 200) {
+          this.$message({
+            showClose: true,
+            message: "保存成功！",
+            type: "success",
+          });
+        } else {
+          this.$message({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
         }
       });
     },

@@ -44,6 +44,7 @@
 <script>
 import {getFdcqLSInfo} from "@/api/registerBook.js";
 import { datas } from "@/views/registerBook/qlxxFormData.js";
+
 export default {
   data() {
     return {
@@ -73,7 +74,6 @@ export default {
   },
   methods: {
     loadData() {
-      console.log(this.propsParam.formData);
       var formdata = new FormData();
       formdata.append("bsmSldy", this.propsParam.formData.bsmSldy);
       formdata.append("qllx", this.propsParam.formData.qllx);