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 53 additions and 117 deletions
......@@ -47,7 +47,6 @@
</template>
<script>
import { log } from 'bpmn-js-token-simulation'
import LbColumn from './lb-column'
export default {
props: {
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-01 10:23:30
* @LastEditTime: 2023-09-01 10:56:29
-->
<template>
<dialogBox
......@@ -253,7 +253,7 @@
</el-row>
</el-form>
<div v-if="activeName==2">
<el-form :model="queryForm">
<el-form :model="queryForm" label-width="80px">
<el-row>
<el-col :span="8">
<el-form-item label="证件号">
......@@ -274,16 +274,34 @@
</el-col>
</el-row>
</el-form>
<lb-table
:page-size="pageData.pageSize" :heightNum="487"
:current-page.sync="pageData.currentPage" :total="tableDataGr.total" @size-change="handleSizeChange"
@p-current-change="handleCurrentChange" :column="tableDataGr.columns"
:data="tableDataGr.data">
</lb-table>
<el-table :data="tableDataGr.data" border v-Loading="loading" :height="368">
<el-table-column v-for="item in tableDataGr.columns" :key="item.index" :prop="item.prop" :label="item.label" align="center">
</el-table-column>
<el-table-column label="证件种类">
<template slot-scope="scope">
<el-select v-model="scope.row.zjh" placeholder="请选择">
<el-option
v-for="item in dictData['A30']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode">
</el-option>
</el-select>
</template>
</el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
<el-button type="text" @click="handlesGrSelect(scope.row)">使用</el-button>
</template>
</el-table-column>
</el-table>
<el-pagination background layout="prev, pager, next,total" :total="tableDataGr.total"
@current-change="handleCurrentChange"></el-pagination>
</div>
<div v-if="activeName==3">
<el-form :model="queryForm">
<el-form :model="queryForm" label-width="80px">
<el-row>
<el-col :span="8">
<el-form-item label="证件号">
......@@ -304,12 +322,29 @@
</el-col>
</el-row>
</el-form>
<lb-table
:page-size="pageData.pageSize" :heightNum="487"
:current-page.sync="pageData.currentPage" :total="tableDataQy.total" @size-change="handleSizeChange"
@p-current-change="handleCurrentChange" :column="tableDataQy.columns"
:data="tableDataQy.data">
</lb-table>
<el-table :data="tableDataQy.data" border v-Loading="loading" :height="368">
<el-table-column v-for="item in tableDataQy.columns" :key="item.index" :prop="item.prop" :label="item.label" align="center">
</el-table-column>
<el-table-column label="证件种类">
<template slot-scope="scope">
<el-select v-model="scope.row.zjh" placeholder="请选择">
<el-option
v-for="item in dictData['A30']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode">
</el-option>
</el-select>
</template>
</el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
<el-button type="text" @click="handlesGrSelect(scope.row)">使用</el-button>
</template>
</el-table-column>
</el-table>
<el-pagination background layout="prev, pager, next,total" :total="tableDataQy.total"
@current-change="handleCurrentChange"></el-pagination>
</div>
</dialogBox>
......@@ -332,6 +367,7 @@
data () {
return {
activeName: '1',
loading: false,
myValue: this.value,
ruleForm: {
sqrlx: "",
......
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-29 13:09:45
* @LastEditTime: 2023-09-01 10:53:12
*/
import filter from '@/utils/filter.js'
let vm = null
......@@ -16,46 +16,10 @@ class data1 extends filter {
columns () {
return [
{
label: '序号',
type: 'index',
width: '50',
render: (h, scope) => {
return (
<div>
{(vm.pageData.currentPage - 1) * vm.pageData.pageSize + scope.$index + 1}
</div>
)
}
},
{
prop: "sqrmc",
label: "姓名/名称",
},
{
prop: "zjzl",
label: "证件种类",
render: (h, scope) => {
return (
<el-select
class="width100"
clearable
value={scope.row[scope.column.property]}
onChange={(val) => {
scope.row[scope.column.property] = val;
}}
>
{vm.dictData["A30"].map((option) => {
return (
<el-option
label={option.dname}
value={option.dcode}
></el-option>
);
})}
</el-select>
);
},
},
{
prop: "zjh",
label: "证件号",
......@@ -71,20 +35,7 @@ class data1 extends filter {
{
prop: "dh",
label: "联系电话",
},
{
label: '操作',
width: '80',
align: 'center',
fixed: 'right',
render: (h, scope) => {
return (
<div>
<el-button type="text" onClick={() => { this.handlesGrSelect(scope.row) }}>使用</el-button>
</div>
)
}
},
]
}
......@@ -97,47 +48,10 @@ class data2 extends filter {
columns () {
return [
{
label: '序号',
type: 'index',
width: '50',
render: (h, scope) => {
return (
<div>
{(vm.pageData.currentPage - 1) * vm.pageData.pageSize + scope.$index + 1}
</div>
)
}
},
{
prop: "sqrmc",
label: "姓名/名称",
},
{
prop: "zjzl",
label: "证件种类",
render: (h, scope) => {
return (
<el-select
class="width100"
clearable
value={scope.row[scope.column.property]}
onChange={(val) => {
scope.row[scope.column.property] = val;
}}
>
{vm.dictData["A30"].map((option) => {
return (
<el-option
label={option.dname}
value={option.dcode}
></el-option>
);
})}
</el-select>
);
},
},
{
prop: "zjh",
label: "证件号",
},
......@@ -153,19 +67,6 @@ class data2 extends filter {
prop: "dh",
label: "联系电话",
},
{
label: '操作',
width: '80',
align: 'center',
fixed: 'right',
render: (h, scope) => {
return (
<div>
<el-button type="text" onClick={() => { this.handlesGrSelect(scope.row) }}>使用</el-button>
</div>
)
}
},
]
}
......