Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
ec606124 by renchao@pashanhoo.com
Options

Merge branch 'dev'

2 parents 124ecac8 9d4473a5
Inline Side-by-side
Showing 8 changed files with 17 additions and 13 deletions
...@@ -18,12 +18,12 @@ ...@@ -18,12 +18,12 @@
18 display: flex; 18 display: flex;
19 font-size: 12px; 19 font-size: 12px;
20 flex-wrap: wrap; 20 flex-wrap: wrap;
21 padding-top: 5px;
22 justify-content: flex-start; 21 justify-content: flex-start;
23 min-height: 30px; 22 min-height: 30px;
24 23
25 span { 24 span {
26 display: flex; 25 display: flex;
26 align-items: center;
27 } 27 }
28 28
29 i { 29 i {
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-10-09 10:50:50 4 * @LastEditTime: 2023-10-30 10:45:10
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
8 9999999999
8 <djbDetail :title="title" ref="djbDetail" :shows="shows" :propsParam="propsParam" 9 <djbDetail :title="title" ref="djbDetail" :shows="shows" :propsParam="propsParam"
9 :columns="columns" :tableData="tableData" /> 10 :columns="columns" :tableData="tableData" />
10 </div> 11 </div>
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-10-23 16:46:47 4 * @LastEditTime: 2023-10-30 11:00:20
5 --> 5 -->
6 <template> 6 <template>
7 <div class="tableBox"> 7 <div class="tableBox">
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
96 </template> 96 </template>
97 <script> 97 <script>
98 import Router from '@/router' 98 import Router from '@/router'
99 import { mapGetters } from "vuex"; 99 import store from '@/store/index.js'
100 import { datas } from "../qlxxFormData.js"; 100 import { datas } from "../qlxxFormData.js";
101 import { ywPopupDialog } from "@/utils/popup.js"; 101 import { ywPopupDialog } from "@/utils/popup.js";
102 import printTemplate from "../components/printTemplate.vue"; 102 import printTemplate from "../components/printTemplate.vue";
...@@ -129,9 +129,6 @@ ...@@ -129,9 +129,6 @@
129 default: () => [] 129 default: () => []
130 }, 130 },
131 }, 131 },
132 computed: {
133 ...mapGetters(["dictData"]),
134 },
135 data () { 132 data () {
136 return { 133 return {
137 qsztList: datas.columns().qsztList, 134 qsztList: datas.columns().qsztList,
...@@ -152,7 +149,7 @@ ...@@ -152,7 +149,7 @@
152 sfygdj: (label) => ztObj[label] || label, 149 sfygdj: (label) => ztObj[label] || label,
153 sfczjzhxz: (label) => ztObj[label] || label, 150 sfczjzhxz: (label) => ztObj[label] || label,
154 dyrlx: (label) => { 151 dyrlx: (label) => {
155 let arr = this.dictData['A36'].filter(item => item.dcode === label); 152 let arr = store.getters.dictData['A36'].filter(item => item.dcode === label);
156 return arr.length > 0 ? arr[0].dname : label; 153 return arr.length > 0 ? arr[0].dname : label;
157 }, 154 },
158 default: (label) => label 155 default: (label) => label
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-10-09 10:44:26 4 * @LastEditTime: 2023-10-30 10:43:28
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: miaofang 3 * @Autor: miaofang
4 * @LastEditTime: 2023-10-09 10:44:45 4 * @LastEditTime: 2023-10-30 10:36:43
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: miaofang 3 * @Autor: miaofang
4 * @LastEditTime: 2023-10-23 16:48:02 4 * @LastEditTime: 2023-10-30 10:59:40
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
...@@ -116,6 +116,7 @@ ...@@ -116,6 +116,7 @@
116 <script> 116 <script>
117 import Router from '@/router' 117 import Router from '@/router'
118 import printJS from "print-js"; 118 import printJS from "print-js";
119 import store from '@/store/index.js'
119 import { datas } from "./qlxxFormData.js"; 120 import { datas } from "./qlxxFormData.js";
120 import { getSjlx } from "@/utils/dictionary.js"; 121 import { getSjlx } from "@/utils/dictionary.js";
121 import { getFdcq1List } from "@/api/djbDetail.js"; 122 import { getFdcq1List } from "@/api/djbDetail.js";
...@@ -165,7 +166,7 @@ ...@@ -165,7 +166,7 @@
165 sfygdj: (label) => ztObj[label] || label, 166 sfygdj: (label) => ztObj[label] || label,
166 sfczjzhxz: (label) => ztObj[label] || label, 167 sfczjzhxz: (label) => ztObj[label] || label,
167 dyrlx: (label) => { 168 dyrlx: (label) => {
168 let arr = this.dictData['A36'].filter(item => item.dcode === label); 169 let arr = store.getters.dictData['A36'].filter(item => item.dcode === label);
169 return arr.length > 0 ? arr[0].dname : label; 170 return arr.length > 0 ? arr[0].dname : label;
170 }, 171 },
171 default: (label) => label 172 default: (label) => label
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: miaofang 3 * @Autor: miaofang
4 * @LastEditTime: 2023-10-09 10:46:58 4 * @LastEditTime: 2023-10-30 10:40:48
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
......
...@@ -65,6 +65,11 @@ class data extends filter { ...@@ -65,6 +65,11 @@ class data extends filter {
65 width: '200' 65 width: '200'
66 }, 66 },
67 { 67 {
68 prop: "djqxmc",
69 label: "登记情形",
70 width: '200'
71 },
72 {
68 label: "权利人", 73 label: "权利人",
69 width: '120', 74 width: '120',
70 render: (h, scope) => { 75 render: (h, scope) => {
......