Skip to content

bdc / bdcjg-web

Go to a project
Toggle navigation
Toggle navigation pinning
c02892fb by 田浩浩
Options

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

2 parents 8dd2ad05 9491b6d8
Inline Side-by-side
Showing 6 changed files with 90 additions and 13 deletions
...@@ -49,3 +49,13 @@ export function getDetail (params) { ...@@ -49,3 +49,13 @@ export function getDetail (params) {
49 }) 49 })
50 } 50 }
51 51
52 // 结果
53 export function getReceiveDataReportResult (bsmReport) {
54 return request({
55 url: SERVER.SERVERAPI + '/rest/sjsb/DataReport/getReceiveDataReportResult',
56 method: 'get',
57 params: {
58 bsmReport: bsmReport
59 }
60 })
61 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
69 <p class="label-detail">（SQZSBS）</p> 69 <p class="label-detail">（SQZSBS）</p>
70 </span> 70 </span>
71 <el-select :disabled="$store.state.business.Edit" v-model="ruleForm.SQZSBS" placeholder="申请证书版式"> 71 <el-select :disabled="$store.state.business.Edit" v-model="ruleForm.SQZSBS" placeholder="申请证书版式">
72 <el-option v-for="item in dicData['A41']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE"> 72 <el-option v-for="item in dicData['A41']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE-0">
73 </el-option> 73 </el-option>
74 </el-select> 74 </el-select>
75 </el-form-item> 75 </el-form-item>
...@@ -178,7 +178,7 @@ ...@@ -178,7 +178,7 @@
178 </el-input> 178 </el-input>
179 </el-form-item> 179 </el-form-item>
180 </el-col> 180 </el-col>
181 <el-col :span="8"> 181 <el-col :span="8">
182 <el-form-item prop="SFWTAJ"> 182 <el-form-item prop="SFWTAJ">
183 <span slot="label"> 183 <span slot="label">
184 是否问题案件： <br /> 184 是否问题案件： <br />
...@@ -245,7 +245,7 @@ export default { ...@@ -245,7 +245,7 @@ export default {
245 default: "", 245 default: "",
246 }, 246 },
247 }, 247 },
248 data() { 248 data () {
249 return { 249 return {
250 ruleForm: { 250 ruleForm: {
251 YSDM: "", 251 YSDM: "",
...@@ -271,7 +271,7 @@ export default { ...@@ -271,7 +271,7 @@ export default {
271 }; 271 };
272 }, 272 },
273 methods: { 273 methods: {
274 async featchData() { 274 async featchData () {
275 try { 275 try {
276 let { result: res } = await business.getDjtDjSlsqById(this.bsmSjsb); 276 let { result: res } = await business.getDjtDjSlsqById(this.bsmSjsb);
277 this.ruleForm = res; 277 this.ruleForm = res;
...@@ -280,7 +280,7 @@ export default { ...@@ -280,7 +280,7 @@ export default {
280 this.$refs.msg.messageShow(); 280 this.$refs.msg.messageShow();
281 } 281 }
282 }, 282 },
283 handleUpdateForm() { 283 handleUpdateForm () {
284 return new Promise(async (resolve) => { 284 return new Promise(async (resolve) => {
285 try { 285 try {
286 let res = await business.updateDjtDjSlsq(this.ruleForm); 286 let res = await business.updateDjtDjSlsq(this.ruleForm);
......
...@@ -57,7 +57,8 @@ ...@@ -57,7 +57,8 @@
57 } 57 }
58 } 58 }
59 59
60 .el-icon-date { 60 .el-icon-date,
61 .el-icon-time {
61 display: none; 62 display: none;
62 } 63 }
63 64
...@@ -65,6 +66,7 @@ ...@@ -65,6 +66,7 @@
65 // refine element ui upload 66 // refine element ui upload
66 .el-input.is-disabled .el-input__inner { 67 .el-input.is-disabled .el-input__inner {
67 color: #FFFFFF !important; 68 color: #FFFFFF !important;
69 background-color: transparent !important;
68 } 70 }
69 71
70 .upload-container { 72 .upload-container {
......
1 <!--
2 功能：结果
3 作者：calliope
4 -->
5 <template>
6 <div class='result'>
7 <p>响应xml</p>
8 <el-input type="textarea" :rows="6" class="resulttext" placeholder="请输入内容" v-model="REPMSGXML">
9 </el-input>
10 <p>错误信息</p>
11 <el-input type="textarea" :rows="6" class="resulttext" placeholder="请输入内容" v-model="ERRORINFO">
12 </el-input>
13 </div>
14 </template>
15 <script>
16 import { getReceiveDataReportResult } from "@/api/sbbwcx.js";
17 export default {
18 components: {},
19 props: {
20 formData: {
21 type: Object,
22 default: {}
23 }
24 },
25 data () {
26 return {
27 REPMSGXML: '',
28 ERRORINFO: '',
29 }
30 },
31 created () {
32 getReceiveDataReportResult(this.formData.bsmReport).then(res => {
33 let data = res.result
34 this.REPMSGXML = data.REPMSGXML
35 this.ERRORINFO = data.ERRORINFO
36 })
37 }
38 }
39 </script>
40 <style scoped lang='scss'>
41 @import '~@/styles/public.scss';
42
43 .result {
44 padding: 15px;
45
46 p {
47 color: #ffffff;
48 line-height: 26px;
49 font-size: 18px;
50 }
51 }
52
53 /deep/.el-textarea__inner {
54 min-height: 33vh !important;
55 background-color: #08346F !important;
56 color: #ffffff;
57 border: none !important;
58 }
59 </style>
...\ No newline at end of file ...\ No newline at end of file
...@@ -185,7 +185,9 @@ export default { ...@@ -185,7 +185,9 @@ export default {
185 > 185 >
186 详情 186 详情
187 </el-button> 187 </el-button>
188 <el-button type="primary">结果</el-button> 188 <el-button type="primary" onClick={() => {
189 this.handleResult(scope.row);
190 }}>结果</el-button>
189 </div> 191 </div>
190 ) 192 )
191 } 193 }
...@@ -226,6 +228,10 @@ export default { ...@@ -226,6 +228,10 @@ export default {
226 featchData () { 228 featchData () {
227 this.pageData.currentPage = 1 229 this.pageData.currentPage = 1
228 this.queryClick(); 230 this.queryClick();
231 },
232 // 结果
233 handleResult (row) {
234 this.$popupDialog('响应结果', 'views/jsbwcx/components/result', row)
229 } 235 }
230 } 236 }
231 } 237 }
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <div class="from-clues"> 2 <div class="from-clues">
3 <!-- 表单部分 --> 3 <!-- 表单部分 -->
4 <div class="from-clues-header"> 4 <div class="from-clues-header">
5 <el-form @submit.native.prevent :model="ruleForm" label-width="120px"> 5 <el-form @submit.native.prevent :model="ruleForm" label-width="120px">
6 <el-row :gutter="20"> 6 <el-row :gutter="20">
7 <el-col :span="6"> 7 <el-col :span="6">
8 <el-form-item label="字典类型编码"> 8 <el-form-item label="字典类型编码">
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
14 <el-input v-model="ruleForm.dname" @clear="queryClick" clearable placeholder="字典类型名称"></el-input> 14 <el-input v-model="ruleForm.dname" @clear="queryClick" clearable placeholder="字典类型名称"></el-input>
15 </el-form-item> 15 </el-form-item>
16 </el-col> 16 </el-col>
17 <!-- 操作按钮 --> 17 <!-- 操作按钮 -->
18 <el-col :span="12" class="btnColRight"> 18 <el-col :span="12" class="btnColRight">
19 19
20 <btn nativeType="cx" @click="queryClick">查询</btn> 20 <btn nativeType="cx" @click="queryClick">查询</btn>
...@@ -71,8 +71,8 @@ export default { ...@@ -71,8 +71,8 @@ export default {
71 <div> 71 <div>
72 { 72 {
73 scope.row.isenable == '1' ? 73 scope.row.isenable == '1' ?
74 <el-button type="text" icon="el-icon-edit-outline" onClick={() => { this.editClick(scope.row, 1) }}>修改</el-button> : 74 <el-button type="text" icon="el-icon-edit-outline" onClick={() => { this.editClick(scope.row, 1) }}>修改</el-button> :
75 <el-button type="text" icon="el-icon-view" onClick={() => { this.editClick(scope.row, 2) }}>查看</el-button> 75 <el-button type="text" icon="el-icon-view" onClick={() => { this.editClick(scope.row, 2) }}>查看</el-button>
76 } 76 }
77 </div> 77 </div>
78 ); 78 );
...@@ -86,9 +86,9 @@ export default { ...@@ -86,9 +86,9 @@ export default {
86 methods: { 86 methods: {
87 // 初始化数据 87 // 初始化数据
88 queryClick () { 88 queryClick () {
89 this.$startLoading(); 89 // this.$startLoading();
90 getQlxxDictList({ ...this.ruleForm, ...this.pageData }).then(res => { 90 getQlxxDictList({ ...this.ruleForm, ...this.pageData }).then(res => {
91 this.$endLoading(); 91 // this.$endLoading();
92 let { records, total } = res.result 92 let { records, total } = res.result
93 this.tableData.data = records ? records : [] 93 this.tableData.data = records ? records : []
94 this.tableData.total = total ? total : 0 94 this.tableData.total = total ? total : 0
......