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

@@ -33,7 +33,7 @@ export function Init (data) {
         data
         data
     })
     })
 }
 }
-// 初始化内容
+// 受理信息保存
 export function saveData (data) {
 export function saveData (data) {
     return request({
     return request({
         url: SERVER.SERVERAPI + '/rest/ywbl/jsydsyqlr/saveData',
         url: SERVER.SERVERAPI + '/rest/ywbl/jsydsyqlr/saveData',
@@ -42,52 +42,6 @@ export function saveData (data) {
     })
     })
 }
 }
 
 
-// // 初始化内容
-// export function Init (data) {
-//     return request({
-//         url: SERVER.SERVERAPI +'/rest/ywbl/tdsyqlr/Init',
-//         method: 'post',
-//         data
-//     })
-// }
-
-// 首次登记保存
-export function fristReg (data) {
-    return request({
-        url: SERVER.SERVERAPI + '/rest/ywbl/jsydsyqlr/fristReg',
-        method: 'post',
-        data
-    })
-}
-
-// 转移登记保存
-export function transferReg (data) {
-    return request({
-        url: SERVER.SERVERAPI + '/rest/ywbl/jsydsyqlr/transferReg',
-        method: 'post',
-        data
-    })
-}
-
-
-// 变更登记保存
-export function changeReg (data) {
-    return request({
-        url: SERVER.SERVERAPI + '/rest/ywbl/jsydsyqlr/changeReg',
-        method: 'post',
-        data
-    })
-}
-
-
-// 注销登记保存
-export function logoutReg (data) {
-    return request({
-        url: SERVER.SERVERAPI + '/rest/ywbl/jsydsyqlr/logoutReg',
-        method: 'post',
-        data
-    })
-}
 // 流程图
 // 流程图
 export function getWorkFlowImage (bsmSlsq, bestepid) {
 export function getWorkFlowImage (bsmSlsq, bestepid) {
     return request({
     return request({
@@ -102,7 +56,7 @@ export function getWorkFlowImage (bsmSlsq, bestepid) {
 // 上传单个文件 
 // 上传单个文件 
 export function sjClmxUpload (data) {
 export function sjClmxUpload (data) {
     return request({
     return request({
-        url: 'zhcx/sjClmx/upload',
+        url: SERVER.SERVERAPI + '/rest/zhcx/sjClmx/upload',
         method: 'post',
         method: 'post',
         data
         data
     })
     })
@@ -110,7 +64,7 @@ export function sjClmxUpload (data) {
 // 删除上传文件
 // 删除上传文件
 export function sjClmxDelete (bsmClmx) {
 export function sjClmxDelete (bsmClmx) {
     return request({
     return request({
-        url: 'zhcx/sjClmx/delete?bsmClmx=' + bsmClmx,
+        url: SERVER.SERVERAPI + '/rest/zhcx/sjClmx/delete?bsmClmx=' + bsmClmx,
         method: 'delete'
         method: 'delete'
     })
     })
 }
 }
\ No newline at end of file

@@ -155,6 +155,7 @@ export default {
     	this._beforeUnload_time = new Date().getTime()
     	this._beforeUnload_time = new Date().getTime()
     },
     },
     unloadHandler(e) {
     unloadHandler(e) {
+      thsi.$alert("234234");
         this._gap_time = new Date().getTime() - this._beforeUnload_time
         this._gap_time = new Date().getTime() - this._beforeUnload_time
         //判断是窗口关闭还是刷新
         //判断是窗口关闭还是刷新
         if (this._gap_time <= 10) {
         if (this._gap_time <= 10) {
@@ -286,10 +287,7 @@ export default {
           }
           }
           break;
           break;
         case "B4":
         case "B4":
-          this.$popup({
-            titleStyle: "left",
-            title: "登记簿详情", // 弹窗标题
-            editItem: "registerBook/djbFrame", // 弹窗内容
+          this.$popup("登记簿详情","registerBook/djbFrame",{
             formData: this.currentSelectProps,
             formData: this.currentSelectProps,
             width: "1220px",
             width: "1220px",
             height: "790px",
             height: "790px",
@@ -304,16 +302,13 @@ export default {
           });
           });
           break;
           break;
         case "B5":
         case "B5":
-          this.$popup({
-            title: "证书预览",
-            editItem: "workflow/components/zsyl",
+          this.$popup( "证书预览","workflow/components/zsyl",{
             height: "600px",
             height: "600px",
             width: "800px",
             width: "800px",
             formData: {
             formData: {
               bsmSlsq: this.bsmSlsq,
               bsmSlsq: this.bsmSlsq,
               entryType: '1'
               entryType: '1'
             },
             },
-            btnShow: false,
             cancel: () => {
             cancel: () => {
               console.log("取消回调");
               console.log("取消回调");
             },
             },

@@ -147,6 +147,14 @@
         </el-row>
         </el-row>
         <InformationTable :tableData="ruleForm.qlrList" @upDateQlrxxList="upDateQlrxxList"
         <InformationTable :tableData="ruleForm.qlrList" @upDateQlrxxList="upDateQlrxxList"
           :viewtype="$route.query.viewtype" :gyfs="ruleForm.slywxx.gyfs" />
           :viewtype="$route.query.viewtype" :gyfs="ruleForm.slywxx.gyfs" />
+          <div v-if="ruleForm.ywrList.length>0">
+         <div class="slxx_title title-block">
+          义务人信息
+          <div class="triangle"></div> </div>
+           <InformationTable :tableData="ruleForm.ywrList" @upDateQlrxxList="upDateYwrxxList"
+          :viewtype="$route.query.viewtype" />
+          </div>
+         
         <div class="slxx_title title-block">
         <div class="slxx_title title-block">
           登记原因
           登记原因
           <div class="triangle"></div>
           <div class="triangle"></div>
@@ -223,13 +231,11 @@ export default {
   methods: {
   methods: {
     // 更新权利人信息
     // 更新权利人信息
     upDateQlrxxList (val) {
     upDateQlrxxList (val) {
-      this.ruleForm.qlrList = _.cloneDeep(val)
-      // this.$store.dispatch('slxx/setQlrxxNew', {
-      //   qlrxx: this.ruleForm.qlrxx,
-      //   fj: this.ruleForm.fj,
-      //   gyfs: this.ruleForm.gyfs,
-      //   djyy: this.ruleForm.djyy
-      // })
+      this.ruleForm.qlrList = _.cloneDeep(val);     
+    },
+     // 更新义务人信息
+    upDateYwrxxList (val) {
+      this.ruleForm.ywrList = _.cloneDeep(val);
     },
     },
     onSubmit () {
     onSubmit () {
       saveData(this.ruleForm).then((res) => {
       saveData(this.ruleForm).then((res) => {