e4ae665c by 任超

style:登簿日志

1 parent 5437389a
...@@ -271,18 +271,6 @@ export default { ...@@ -271,18 +271,6 @@ export default {
271 @import "~@/styles/mixin.scss"; 271 @import "~@/styles/mixin.scss";
272 @import "~@/styles/dialogBox.scss"; 272 @import "~@/styles/dialogBox.scss";
273 273
274 .regularHeight {
275 height: 80vh;
276 display: flex;
277 flex-direction: column;
278
279 .editDialogBox-con,
280 .JsonEditor {
281 flex: 1;
282 height: 100%;
283 }
284 }
285
286 /deep/.el-dialog__body { 274 /deep/.el-dialog__body {
287 display: flex; 275 display: flex;
288 flex-direction: column; 276 flex-direction: column;
......
...@@ -17,7 +17,7 @@ export default { ...@@ -17,7 +17,7 @@ export default {
17 17
18 <style scoped lang="scss"> 18 <style scoped lang="scss">
19 /deep/.el-textarea__inner { 19 /deep/.el-textarea__inner {
20 height: 72vh !important; 20 height: 67vh !important;
21 border: none !important; 21 border: none !important;
22 background-color: #08346F !important; 22 background-color: #08346F !important;
23 color: #ffffff; 23 color: #ffffff;
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 overflow: hidden; 2 overflow: hidden;
3 background: url("~@/image/dialogBg.png") no-repeat !important; 3 background: url("~@/image/dialogBg.png") no-repeat !important;
4 background-size: 100% 100% !important; 4 background-size: 100% 100% !important;
5 min-height: 89vh; 5 min-height: 90vh;
6 6
7 .dialog_title { 7 .dialog_title {
8 display: flex; 8 display: flex;
...@@ -60,6 +60,18 @@ ...@@ -60,6 +60,18 @@
60 } 60 }
61 } 61 }
62 62
63 .regularHeight {
64 height: 80vh;
65 display: flex;
66 flex-direction: column;
67
68 .editDialogBox-con,
69 .JsonEditor {
70 flex: 1;
71 height: 100%;
72 }
73 }
74
63 .dialog-from { 75 .dialog-from {
64 padding: 13px; 76 padding: 13px;
65 border-radius: 2px; 77 border-radius: 2px;
......
...@@ -50,7 +50,7 @@ export default { ...@@ -50,7 +50,7 @@ export default {
50 } 50 }
51 51
52 /deep/.el-textarea__inner { 52 /deep/.el-textarea__inner {
53 min-height: 33vh !important; 53 min-height: 27vh !important;
54 background-color: #08346F !important; 54 background-color: #08346F !important;
55 color: #ffffff; 55 color: #ffffff;
56 border: none !important; 56 border: none !important;
......
...@@ -6,6 +6,31 @@ class data { ...@@ -6,6 +6,31 @@ class data {
6 columns () { 6 columns () {
7 return [ 7 return [
8 { 8 {
9 width: "70",
10 renderHeader: (h, scope) => {
11 return (
12 <div>
13 <i
14 class="el-icon-plus"
15 onClick={() => {
16 vm.handleSBAdd();
17 }}
18 style="cursor:pointer;color:#409EFF"
19 ></i>
20 </div>
21 );
22 },
23 render: (h, scope) => {
24 return <i
25 class="el-icon-minus"
26 onClick={() => {
27 vm.handleSBMinus(scope.row);
28 }}
29 style="cursor:pointer;color:#409EFF"
30 ></i>
31 },
32 },
33 {
9 prop: 'ywh', 34 prop: 'ywh',
10 label: '业务号', 35 label: '业务号',
11 render: (h, scope) => { 36 render: (h, scope) => {
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
4 <div slot="title" class="dialog_title" ref="dialogTitle"> 4 <div slot="title" class="dialog_title" ref="dialogTitle">
5 {{ title || '标题' }} 5 {{ title || '标题' }}
6 </div> 6 </div>
7 <div class="regularHeight">
7 <div class="editDialogBox-box"> 8 <div class="editDialogBox-box">
8 <el-tabs v-model="titleName" type="card"> 9 <el-tabs v-model="titleName" type="card">
9 <el-tab-pane label="登薄详情" name="sjmx"></el-tab-pane> 10 <el-tab-pane label="登薄详情" name="sjmx"></el-tab-pane>
...@@ -181,12 +182,12 @@ ...@@ -181,12 +182,12 @@
181 <el-tab-pane label="当日上报详单" name="sbslxd"></el-tab-pane> 182 <el-tab-pane label="当日上报详单" name="sbslxd"></el-tab-pane>
182 </el-tabs> 183 </el-tabs>
183 <div class="from-clues-content" v-show="titleName2 == 'drdbxd'" :key="key"> 184 <div class="from-clues-content" v-show="titleName2 == 'drdbxd'" :key="key">
184 <lb-table :column="tableDBData.column" :pagination="false" :heightNumSetting="true" :heightNum="165" 185 <lb-table :column="tableDBData.column" :pagination="false" :heightNumSetting="true" :heightNum="200"
185 :data="tableDBData.data"> 186 :data="tableDBData.data">
186 </lb-table> 187 </lb-table>
187 </div> 188 </div>
188 <div class="from-clues-content" v-show="titleName2 == 'sbslxd'"> 189 <div class="from-clues-content" v-show="titleName2 == 'sbslxd'">
189 <lb-table :column="tableSBData.column" :pagination="false" :heightNumSetting="true" :heightNum="165" 190 <lb-table :column="tableSBData.column" :pagination="false" :heightNumSetting="true" :heightNum="200"
190 :data="tableSBData.data"> 191 :data="tableSBData.data">
191 </lb-table> 192 </lb-table>
192 </div> 193 </div>
...@@ -194,15 +195,19 @@ ...@@ -194,15 +195,19 @@
194 </div> 195 </div>
195 </div> 196 </div>
196 <div class="editDialogBox-box" v-if="titleName == 'xml'"> 197 <div class="editDialogBox-box" v-if="titleName == 'xml'">
197 <JsonEditor :resultInfo="resultInfo" class="JsonEditor" /> 198 <JsonEditor :resultInfo="resultInfo" />
198 </div> 199 </div>
199 <div class="editDialogBox-box" v-if="titleName == 'xyjg'"> 200 <div class="editDialogBox-box JsonEditor" v-if="titleName == 'xyjg'">
200 <Xyjg :form-data='dataReport'></Xyjg> 201 <Xyjg :form-data='dataReport'></Xyjg>
201 </div> 202 </div>
203 </div>
202 <div class="d-center" v-if="titleName == 'sjmx'"> 204 <div class="d-center" v-if="titleName == 'sjmx'">
203 <btn nativeType="cz" @click="dialogVisible = false">取 消</btn> 205 <btn nativeType="cz" @click="dialogVisible = false">取 消</btn>
204 <btn nativeType="cx" @click="submitForm">确 定</btn> 206 <btn nativeType="cx" @click="submitForm">确 定</btn>
205 </div> 207 </div>
208 <div class="d-center" v-if="!$store.state.business.Edit && titleName == 'xml'">
209 <btn nativeType="cx" @click="handleResubmit">重新上报</btn>
210 </div>
206 </el-dialog> 211 </el-dialog>
207 </template> 212 </template>
208 213
...@@ -252,6 +257,8 @@ export default { ...@@ -252,6 +257,8 @@ export default {
252 data: [], 257 data: [],
253 column: sbdata.columns() 258 column: sbdata.columns()
254 }, 259 },
260 // XML详情
261 resultInfo: '',
255 dataReport: {} 262 dataReport: {}
256 } 263 }
257 }, 264 },
...@@ -267,6 +274,7 @@ export default { ...@@ -267,6 +274,7 @@ export default {
267 this.titleName = 'sjmx'; 274 this.titleName = 'sjmx';
268 this.dialogVisible = true; 275 this.dialogVisible = true;
269 }, 276 },
277 // 当日登薄详单
270 handleDBAdd () { 278 handleDBAdd () {
271 this.tableDBData.data.push({ 279 this.tableDBData.data.push({
272 ywh: '', 280 ywh: '',
...@@ -285,6 +293,25 @@ export default { ...@@ -285,6 +293,25 @@ export default {
285 handleDBMinus (row) { 293 handleDBMinus (row) {
286 this.tableDBData.data.splice(row.index, 1) 294 this.tableDBData.data.splice(row.index, 1)
287 }, 295 },
296 // 当日上报详单
297 handleSBAdd () {
298 this.tableSBData.data.push({
299 ywh: '',
300 djlx: '',
301 qllx: '',
302 bdcdyh: '',
303 zszmh: '',
304 sfsb: '',
305 bwid: ''
306 })
307 this.tableSBData.data.forEach((item, indx) => {
308 this.$set(item, 'index', index)
309 })
310 this.key++
311 },
312 handleSBMinus (row) {
313 this.tableSBData.data.splice(row.index, 1)
314 },
288 submitForm () { } 315 submitForm () { }
289 } 316 }
290 } 317 }
...@@ -294,6 +321,22 @@ export default { ...@@ -294,6 +321,22 @@ export default {
294 @import "~@/styles/public.scss"; 321 @import "~@/styles/public.scss";
295 @import "~@/styles/dialogBox.scss"; 322 @import "~@/styles/dialogBox.scss";
296 323
324
325 /deep/.el-tabs__header {
326 margin: 0;
327 }
328
329 .regularHeight {
330 height: 77vh;
331 display: flex;
332 flex-direction: column;
333
334 .editDialogBox-con,
335 .JsonEditor {
336 flex: 1;
337 }
338 }
339
297 /deep/.el-tabs__item { 340 /deep/.el-tabs__item {
298 color: #CEF8FF !important; 341 color: #CEF8FF !important;
299 342
......