Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
94ef8a68 by xiaomiao
Options

Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

2 parents dd453277 ba4935f5
Inline Side-by-side
Showing 3 changed files with 54 additions and 118 deletions
...@@ -47,7 +47,6 @@ ...@@ -47,7 +47,6 @@
47 </template> 47 </template>
48 48
49 <script> 49 <script>
50 import { log } from 'bpmn-js-token-simulation'
51 import LbColumn from './lb-column' 50 import LbColumn from './lb-column'
52 export default { 51 export default {
53 props: { 52 props: {
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-01 10:23:30 4 * @LastEditTime: 2023-09-01 10:56:29
5 --> 5 -->
6 <template> 6 <template>
7 <dialogBox 7 <dialogBox
...@@ -253,7 +253,7 @@ ...@@ -253,7 +253,7 @@
253 </el-row> 253 </el-row>
254 </el-form> 254 </el-form>
255 <div v-if="activeName==2"> 255 <div v-if="activeName==2">
256 <el-form :model="queryForm"> 256 <el-form :model="queryForm" label-width="80px">
257 <el-row> 257 <el-row>
258 <el-col :span="8"> 258 <el-col :span="8">
259 <el-form-item label="证件号"> 259 <el-form-item label="证件号">
...@@ -274,16 +274,34 @@ ...@@ -274,16 +274,34 @@
274 </el-col> 274 </el-col>
275 </el-row> 275 </el-row>
276 </el-form> 276 </el-form>
277 <lb-table 277 <el-table :data="tableDataGr.data" border v-Loading="loading" :height="368">
278 :page-size="pageData.pageSize" :heightNum="487" 278 <el-table-column v-for="item in tableDataGr.columns" :key="item.index" :prop="item.prop" :label="item.label" align="center">
279 :current-page.sync="pageData.currentPage" :total="tableDataGr.total" @size-change="handleSizeChange" 279 </el-table-column>
280 @p-current-change="handleCurrentChange" :column="tableDataGr.columns" 280 <el-table-column label="证件种类">
281 :data="tableDataGr.data"> 281 <template slot-scope="scope">
282 </lb-table> 282 <el-select v-model="scope.row.zjh" placeholder="请选择">
283 <el-option
284 v-for="item in dictData['A30']"
285 :key="item.dcode"
286 :label="item.dname"
287 :value="item.dcode">
288 </el-option>
289 </el-select>
290 </template>
291 </el-table-column>
292 <el-table-column label="操作">
293 <template slot-scope="scope">
294 <el-button type="text" @click="handlesGrSelect(scope.row)">使用</el-button>
295 </template>
296 </el-table-column>
297 </el-table>
298 <el-pagination background layout="prev, pager, next,total" :total="tableDataGr.total"
299 @current-change="handleCurrentChange"></el-pagination>
300
283 </div> 301 </div>
284 302
285 <div v-if="activeName==3"> 303 <div v-if="activeName==3">
286 <el-form :model="queryForm"> 304 <el-form :model="queryForm" label-width="80px">
287 <el-row> 305 <el-row>
288 <el-col :span="8"> 306 <el-col :span="8">
289 <el-form-item label="证件号"> 307 <el-form-item label="证件号">
...@@ -304,12 +322,29 @@ ...@@ -304,12 +322,29 @@
304 </el-col> 322 </el-col>
305 </el-row> 323 </el-row>
306 </el-form> 324 </el-form>
307 <lb-table 325 <el-table :data="tableDataQy.data" border v-Loading="loading" :height="368">
308 :page-size="pageData.pageSize" :heightNum="487" 326 <el-table-column v-for="item in tableDataQy.columns" :key="item.index" :prop="item.prop" :label="item.label" align="center">
309 :current-page.sync="pageData.currentPage" :total="tableDataQy.total" @size-change="handleSizeChange" 327 </el-table-column>
310 @p-current-change="handleCurrentChange" :column="tableDataQy.columns" 328 <el-table-column label="证件种类">
311 :data="tableDataQy.data"> 329 <template slot-scope="scope">
312 </lb-table> 330 <el-select v-model="scope.row.zjh" placeholder="请选择">
331 <el-option
332 v-for="item in dictData['A30']"
333 :key="item.dcode"
334 :label="item.dname"
335 :value="item.dcode">
336 </el-option>
337 </el-select>
338 </template>
339 </el-table-column>
340 <el-table-column label="操作">
341 <template slot-scope="scope">
342 <el-button type="text" @click="handlesGrSelect(scope.row)">使用</el-button>
343 </template>
344 </el-table-column>
345 </el-table>
346 <el-pagination background layout="prev, pager, next,total" :total="tableDataQy.total"
347 @current-change="handleCurrentChange"></el-pagination>
313 </div> 348 </div>
314 349
315 </dialogBox> 350 </dialogBox>
...@@ -332,6 +367,7 @@ ...@@ -332,6 +367,7 @@
332 data () { 367 data () {
333 return { 368 return {
334 activeName: '1', 369 activeName: '1',
370 loading: false,
335 myValue: this.value, 371 myValue: this.value,
336 ruleForm: { 372 ruleForm: {
337 sqrlx: "", 373 sqrlx: "",
......
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-29 13:09:45 4 * @LastEditTime: 2023-09-01 10:53:12
5 */ 5 */
6 import filter from '@/utils/filter.js' 6 import filter from '@/utils/filter.js'
7 let vm = null 7 let vm = null
...@@ -16,46 +16,10 @@ class data1 extends filter { ...@@ -16,46 +16,10 @@ class data1 extends filter {
16 columns () { 16 columns () {
17 return [ 17 return [
18 { 18 {
19 label: '序号',
20 type: 'index',
21 width: '50',
22 render: (h, scope) => {
23 return (
24 <div>
25 {(vm.pageData.currentPage - 1) * vm.pageData.pageSize + scope.$index + 1}
26 </div>
27 )
28 }
29 },
30 {
31 prop: "sqrmc", 19 prop: "sqrmc",
32 label: "姓名/名称", 20 label: "姓名/名称",
33 }, 21 },
34 { 22
35 prop: "zjzl",
36 label: "证件种类",
37 render: (h, scope) => {
38 return (
39 <el-select
40 class="width100"
41 clearable
42 value={scope.row[scope.column.property]}
43 onChange={(val) => {
44 scope.row[scope.column.property] = val;
45 }}
46 >
47 {vm.dictData["A30"].map((option) => {
48 return (
49 <el-option
50 label={option.dname}
51 value={option.dcode}
52 ></el-option>
53 );
54 })}
55 </el-select>
56 );
57 },
58 },
59 { 23 {
60 prop: "zjh", 24 prop: "zjh",
61 label: "证件号", 25 label: "证件号",
...@@ -71,20 +35,7 @@ class data1 extends filter { ...@@ -71,20 +35,7 @@ class data1 extends filter {
71 { 35 {
72 prop: "dh", 36 prop: "dh",
73 label: "联系电话", 37 label: "联系电话",
74 }, 38 }
75 {
76 label: '操作',
77 width: '80',
78 align: 'center',
79 fixed: 'right',
80 render: (h, scope) => {
81 return (
82 <div>
83 <el-button type="text" onClick={() => { this.handlesGrSelect(scope.row) }}>使用</el-button>
84 </div>
85 )
86 }
87 },
88 ] 39 ]
89 } 40 }
90 41
...@@ -97,47 +48,10 @@ class data2 extends filter { ...@@ -97,47 +48,10 @@ class data2 extends filter {
97 columns () { 48 columns () {
98 return [ 49 return [
99 { 50 {
100 label: '序号',
101 type: 'index',
102 width: '50',
103 render: (h, scope) => {
104 return (
105 <div>
106 {(vm.pageData.currentPage - 1) * vm.pageData.pageSize + scope.$index + 1}
107 </div>
108 )
109 }
110 },
111 {
112 prop: "sqrmc", 51 prop: "sqrmc",
113 label: "姓名/名称", 52 label: "姓名/名称",
114 }, 53 },
115 { 54 {
116 prop: "zjzl",
117 label: "证件种类",
118 render: (h, scope) => {
119 return (
120 <el-select
121 class="width100"
122 clearable
123 value={scope.row[scope.column.property]}
124 onChange={(val) => {
125 scope.row[scope.column.property] = val;
126 }}
127 >
128 {vm.dictData["A30"].map((option) => {
129 return (
130 <el-option
131 label={option.dname}
132 value={option.dcode}
133 ></el-option>
134 );
135 })}
136 </el-select>
137 );
138 },
139 },
140 {
141 prop: "zjh", 55 prop: "zjh",
142 label: "证件号", 56 label: "证件号",
143 }, 57 },
...@@ -153,19 +67,6 @@ class data2 extends filter { ...@@ -153,19 +67,6 @@ class data2 extends filter {
153 prop: "dh", 67 prop: "dh",
154 label: "联系电话", 68 label: "联系电话",
155 }, 69 },
156 {
157 label: '操作',
158 width: '80',
159 align: 'center',
160 fixed: 'right',
161 render: (h, scope) => {
162 return (
163 <div>
164 <el-button type="text" onClick={() => { this.handlesGrSelect(scope.row) }}>使用</el-button>
165 </div>
166 )
167 }
168 },
169 ] 70 ]
170 } 71 }
171 72
......