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

@@ -8,6 +8,7 @@
     <el-tabs v-model="titleName" type="card" @tab-click="handleTitleTab">
     <el-tabs v-model="titleName" type="card" @tab-click="handleTitleTab">
       <el-tab-pane label="数据模型" name="sjmx"></el-tab-pane>
       <el-tab-pane label="数据模型" name="sjmx"></el-tab-pane>
       <el-tab-pane label="xml报文" name="xml"></el-tab-pane>
       <el-tab-pane label="xml报文" name="xml"></el-tab-pane>
+      <el-tab-pane label="响应结果" name="xyjg"></el-tab-pane>
     </el-tabs>
     </el-tabs>
     <div v-if="titleName == 'sjmx'" class="sjmx">
     <div v-if="titleName == 'sjmx'" class="sjmx">
       <div class="dialog-from">
       <div class="dialog-from">
@@ -99,7 +100,10 @@
           :bsmYwsjb="bsmYwsjb" :bsmSjsb="dataReport.bsmReport" />
           :bsmYwsjb="bsmYwsjb" :bsmSjsb="dataReport.bsmReport" />
       </div>
       </div>
     </div>
     </div>
-    <JsonEditor :resultInfo="resultInfo" v-else />
+    <div v-if="titleName == 'xyjg'">
+      <Xyjg :form-data = 'dataReport'></Xyjg>
+    </div>
+    <JsonEditor :resultInfo="resultInfo" v-if="titleName == 'xml'" />
     <!-- <div slot="footer" class="dialog_footer" ref="dialogFooter">
     <!-- <div slot="footer" class="dialog_footer" ref="dialogFooter">
       <div class="dialog_button">
       <div class="dialog_button">
         <el-button type="primary" plain @click="submitForm" v-if="!Edit" :loading="saveloding">确定
         <el-button type="primary" plain @click="submitForm" v-if="!Edit" :loading="saveloding">确定
@@ -113,10 +117,11 @@
 <script>
 <script>
 import { mapGetters } from "vuex";
 import { mapGetters } from "vuex";
 import JsonEditor from "@/components/JsonEditor/index";
 import JsonEditor from "@/components/JsonEditor/index";
+import Xyjg from "./result";
 import { getDetail, getXml } from "@/api/sbbwcx.js";
 import { getDetail, getXml } from "@/api/sbbwcx.js";
 import { MessageBox } from "element-ui";
 import { MessageBox } from "element-ui";
 export default {
 export default {
-  components: { JsonEditor },
+  components: { JsonEditor, Xyjg },
   props: {
   props: {
     title: {
     title: {
       type: String,
       type: String,
@@ -169,6 +174,7 @@ export default {
     },
     },
     isShow (item) {
     isShow (item) {
       this.dataReport = item;
       this.dataReport = item;
+      this.titleName = 'sjmx';
       this.dialogVisible = true;
       this.dialogVisible = true;
       //获取表头列表
       //获取表头列表
       getDetail({ bsmReport: this.dataReport.bsmReport }).then((res) => {
       getDetail({ bsmReport: this.dataReport.bsmReport }).then((res) => {

+<!--
+  功能：结果
+  作者：calliope
+-->
+<template>
+  <div class='result'>
+    <p>响应xml</p>
+    <el-input type="textarea" :rows="6" class="resulttext" placeholder="请输入内容" v-model="REPMSGXML">
+    </el-input>
+    <p>错误信息</p>
+    <el-input type="textarea" :rows="6" class="resulttext" placeholder="请输入内容" v-model="ERRORINFO">
+    </el-input>
+  </div>
+</template>
+<script>
+import { getReceiveDataReportResult } from "@/api/sbbwcx.js";
+export default {
+  components: {},
+  props: {
+    formData: {
+      type: Object,
+      default: {}
+    }
+  },
+  data () {
+    return {
+      REPMSGXML: '',
+      ERRORINFO: '',
+    }
+  },
+  created () {
+    getReceiveDataReportResult(this.formData.bsmReport).then(res => {
+      let data = res.result
+      this.REPMSGXML = data.REPMSGXML
+      this.ERRORINFO = data.ERRORINFO
+    })
+  }
+}
+</script>
+<style scoped lang='scss'>
+@import '~@/styles/public.scss';
+
+.result {
+  padding: 15px;
+
+  p {
+    color: #ffffff;
+    line-height: 26px;
+    font-size: 18px;
+  }
+
+  /deep/.el-textarea__inner {
+    min-height: 33vh !important;
+    background-color: #08346F !important;
+    color: #ffffff;
+    border: none !important;
+  }
+
+}
+
+</style>

@@ -42,4 +42,4 @@ let mixin = {
     }
     }
   }
   }
 }
 }
-export default mixin
\ No newline at end of file
+export default mixin

@@ -185,9 +185,6 @@ export default {
                     >
                     >
                       详情
                       详情
                     </el-button>
                     </el-button>
-                    <el-button type="primary" onClick={() => {
-                      this.handleResult(scope.row);
-                    }}>结果</el-button>
                   </div>
                   </div>
                 )
                 )
               }
               }