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

@@ -49,3 +49,13 @@ export function getDetail (params) {
   })
 }
 
+// 结果
+export function getReceiveDataReportResult (bsmReport) {
+  return request({
+    url: SERVER.SERVERAPI + '/rest/sjsb/DataReport/getReceiveDataReportResult',
+    method: 'get',
+    params: {
+      bsmReport: bsmReport
+    }
+  })
+}
\ No newline at end of file

@@ -69,7 +69,7 @@
               <p class="label-detail">（SQZSBS）</p>
             </span>
             <el-select :disabled="$store.state.business.Edit" v-model="ruleForm.SQZSBS" placeholder="申请证书版式">
-              <el-option v-for="item in dicData['A41']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
+              <el-option v-for="item in dicData['A41']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE-0">
               </el-option>
             </el-select>
           </el-form-item>
@@ -245,7 +245,7 @@ export default {
       default: "",
     },
   },
-  data() {
+  data () {
     return {
       ruleForm: {
         YSDM: "",
@@ -271,7 +271,7 @@ export default {
     };
   },
   methods: {
-    async featchData() {
+    async featchData () {
       try {
         let { result: res } = await business.getDjtDjSlsqById(this.bsmSjsb);
         this.ruleForm = res;
@@ -280,7 +280,7 @@ export default {
         this.$refs.msg.messageShow();
       }
     },
-    handleUpdateForm() {
+    handleUpdateForm () {
       return new Promise(async (resolve) => {
         try {
           let res = await business.updateDjtDjSlsq(this.ruleForm);

@@ -57,7 +57,8 @@
   }
 }
 
-.el-icon-date {
+.el-icon-date,
+.el-icon-time {
   display: none;
 }
 
@@ -65,6 +66,7 @@
 // refine element ui upload
 .el-input.is-disabled .el-input__inner {
   color: #FFFFFF !important;
+  background-color: transparent !important;
 }
 
 .upload-container {

+<!--
+  功能：结果
+  作者：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>
\ No newline at end of file

@@ -185,7 +185,9 @@ export default {
                     >
                       详情
                     </el-button>
-                    <el-button type="primary">结果</el-button>
+                    <el-button type="primary" onClick={() => {
+                      this.handleResult(scope.row);
+                    }}>结果</el-button>
                   </div>
                 )
               }
@@ -226,6 +228,10 @@ export default {
     featchData () {
       this.pageData.currentPage = 1
       this.queryClick();
+    },
+    // 结果
+    handleResult (row) {
+      this.$popupDialog('响应结果', 'views/jsbwcx/components/result', row)
     }
   }
 }

@@ -86,9 +86,9 @@ export default {
   methods: {
     // 初始化数据
     queryClick () {
-      this.$startLoading();
+      // this.$startLoading();
       getQlxxDictList({ ...this.ruleForm, ...this.pageData }).then(res => {
-        this.$endLoading();
+        // this.$endLoading();
         let { records, total } = res.result
         this.tableData.data = records ? records : []
         this.tableData.total = total ? total : 0