自然人更新A

product
mhsnet 2 years ago
parent 9da16916ed
commit 1cc0e7d33c

@ -9,8 +9,8 @@ import java.util.Date;
/**
*
*
*
* @ V3.2.0
* @ LINKAGE-BOOT
* @ LINKAGE-BOOT
@ -68,4 +68,19 @@ public class Jg_naturalEntity {
@TableField("CONTACT")
private String contact;
@TableField("IDENTITY")
private String identity;
@TableField("BANK_ACCOUNT")
private String bankAccount;
@TableField("BANK")
private String bank;
@TableField("BANK_NO")
private String bankNo;
@TableField("PHOTOS")
private String photos;
}

@ -62,6 +62,21 @@ public class Jg_naturalMobileEntity {
@TableField("CONTACT")
private String contact;
@TableField("IDENTITY")
private String identity;
@TableField("BANK_ACCOUNT")
private String bankAccount;
@TableField("BANK")
private String bank;
@TableField("BANK_NO")
private String bankNo;
@TableField("PHOTOS")
private String photos;
//运输总量
private Integer naturalSum;
// 总次数

@ -7,8 +7,6 @@ import lombok.Data;
/**
*
*
* @ V3.2.0
* @ LINKAGE-BOOT
* @ LINKAGE-BOOT
@ -17,26 +15,64 @@ import lombok.Data;
@Data
public class Jg_naturalCrForm {
/** 姓名 **/
/**
*
**/
@JsonProperty("name")
private String name;
/** 地址 **/
/**
*
**/
@JsonProperty("adress")
private String adress;
/** 手机号 **/
/**
*
**/
@JsonProperty("contact")
private String contact;
/** 录入人 **/
/**
*
**/
@JsonProperty("identity")
private String identity;
/**
*
**/
@JsonProperty("bankAccount")
private String bankAccount;
/**
*
**/
@JsonProperty("bank")
private String bank;
/**
*
**/
@JsonProperty("bankNo")
private String bankNo;
/**
*
**/
@JsonProperty("photos")
private String photos;
/**
*
**/
@JsonProperty("creatorUserName")
private String creatorUserName;
/** 创建时间 **/
/**
*
**/
@JsonProperty("creatorTime")
private String creatorTime;
}

@ -8,9 +8,8 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import java.util.Date;
/**
*
*
* @ V3.2.0
* @ LINKAGE-BOOT
* @ LINKAGE-BOOT
@ -18,27 +17,69 @@ import java.util.Date;
*/
@Data
public class Jg_naturalInfoVO {
/** 主键 **/
/**
*
**/
@JsonProperty("id")
private String id;
/** 姓名 **/
/**
*
**/
@JsonProperty("name")
private String name;
/** 地址 **/
/**
*
**/
@JsonProperty("adress")
private String adress;
/** 手机号 **/
/**
*
**/
@JsonProperty("contact")
private String contact;
/** 录入人 **/
/**
*
**/
@JsonProperty("identity")
private String identity;
/**
*
**/
@JsonProperty("bankAccount")
private String bankAccount;
/**
*
**/
@JsonProperty("bank")
private String bank;
/**
*
**/
@JsonProperty("bankNo")
private String bankNo;
/**
*
**/
@JsonProperty("photos")
private String photos;
/**
*
**/
@JsonProperty("creatorUserName")
private String creatorUserName;
/** 创建时间 **/
/**
*
**/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@JsonProperty("creatorTime")
private Date creatorTime;

@ -4,8 +4,6 @@ import jnpf.base.Pagination;
import lombok.Data;
/**
*
*
* @ V3.2.0
* @ LINKAGE-BOOT
* @ LINKAGE-BOOT
@ -14,11 +12,19 @@ import lombok.Data;
@Data
public class Jg_naturalListQuery extends Pagination {
/** 姓名 */
/**
*
*/
private String name;
/** 手机号 */
/**
*
*/
private String contact;
/**
*
*/
private String bankAccount;
/**
* id
*/

@ -10,8 +10,6 @@ import lombok.Data;
import java.util.Date;
/**
*
*
* @ V3.2.0
* @ LINKAGE-BOOT
* @ LINKAGE-BOOT
@ -20,32 +18,76 @@ import java.util.Date;
@Data
public class Jg_naturalListVO {
/** 主键 */
/**
*
*/
private String id;
/** 姓名 **/
/**
*
**/
@JsonProperty("name")
private String name;
/** 地址 **/
/**
*
**/
@JsonProperty("adress")
private String adress;
/** 手机号 **/
/**
*
**/
@JsonProperty("contact")
private String contact;
/**
*
**/
@JsonProperty("identity")
private String identity;
/**
*
**/
@JsonProperty("bankAccount")
private String bankAccount;
/** 录入人 **/
/**
*
**/
@JsonProperty("bank")
private String bank;
/**
*
**/
@JsonProperty("bankNo")
private String bankNo;
/**
*
**/
@JsonProperty("photos")
private String photos;
/**
*
**/
@JsonProperty("creatorUserName")
private String creatorUserName;
/** 创建时间 **/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
/**
*
**/
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@JsonProperty("creatorTime")
private Date creatorTime;

@ -5,8 +5,6 @@ import jnpf.base.Pagination;
import lombok.Data;
/**
*
*
* @ V3.2.0
* @ LINKAGE-BOOT
* @ LINKAGE-BOOT
@ -15,11 +13,19 @@ import lombok.Data;
@Data
public class Jg_naturalPagination extends Pagination {
/** 姓名 */
/**
*
*/
private String name;
/** 手机号 */
/**
*
*/
private String contact;
/**
*
*/
private String bankAccount;
/**
* id
*/

@ -4,8 +4,6 @@ import jnpf.base.Pagination;
import lombok.Data;
/**
*
*
* @ V3.2.0
* @ LINKAGE-BOOT
* @ LINKAGE-BOOT
@ -21,9 +19,17 @@ public class Jg_naturalPaginationExportModel extends Pagination {
private String dataType;
/** 姓名 */
/**
*
*/
private String name;
/** 手机号 */
/**
*
*/
private String contact;
/**
*
*/
private String bankAccount;
}

@ -6,8 +6,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
/**
*
*
* @ V3.2.0
* @ LINKAGE-BOOT
* @ LINKAGE-BOOT
@ -15,31 +13,77 @@ import lombok.Data;
*/
@Data
public class Jg_naturalUpForm {
/** 主键 */
/**
*
*/
private String id;
/** 姓名 **/
/**
*
**/
@JsonProperty("name")
private String name;
/** 地址 **/
/**
*
**/
@JsonProperty("adress")
private String adress;
/** 手机号 **/
/**
*
**/
@JsonProperty("contact")
private String contact;
/**
*
**/
@JsonProperty("identity")
private String identity;
/** 录入人 **/
/**
*
**/
@JsonProperty("bankAccount")
private String bankAccount;
/**
*
**/
@JsonProperty("bank")
private String bank;
/**
*
**/
@JsonProperty("bankNo")
private String bankNo;
/**
*
**/
@JsonProperty("photos")
private String photos;
/**
*
**/
@JsonProperty("creatorUserName")
private String creatorUserName;
/** 创建时间 **/
/**
*
**/
@JsonProperty("creatorTime")
private String creatorTime;

@ -4,7 +4,7 @@
:visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
width="600px">
<el-row :gutter="15" class="">
<el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" >
<el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="left" >
<template v-if="!loading">
<el-col :span="24" >
<el-form-item label-width="0">
@ -13,36 +13,63 @@
</JNPF-Text>
</el-form-item>
</el-col>
<el-col :span="24" >
<el-col :span="24" v-if="jnpf.hasFormP('name')" >
<el-form-item label="姓名"
prop="name" >
<p>{{dataForm.name}}</p>
</el-form-item>
</el-col>
<el-col :span="24" >
<el-col :span="24" v-if="jnpf.hasFormP('adress')" >
<el-form-item label="地址"
prop="adress" >
<p>{{dataForm.adress}}</p>
</el-form-item>
</el-col>
<el-col :span="24" >
<el-col :span="24" v-if="jnpf.hasFormP('contact')" >
<el-form-item label="手机号"
prop="contact" >
<p>{{dataForm.contact}}</p>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-col :span="24" v-if="jnpf.hasFormP('identity')" >
<el-form-item label="身份证"
prop="identity" >
<p>{{dataForm.identity}}</p>
</el-form-item>
</el-col>
<el-col :span="24" v-if="jnpf.hasFormP('bankAccount')" >
<el-form-item label="银行账户"
prop="bankAccount" >
<p>{{dataForm.bankAccount}}</p>
</el-form-item>
</el-col>
<el-col :span="24" v-if="jnpf.hasFormP('bank')" >
<el-form-item label="开户行"
prop="bank" >
<p>{{dataForm.bank}}</p>
</el-form-item>
</el-col>
<el-col :span="24" v-if="jnpf.hasFormP('bankNo')" >
<el-form-item label="行号"
prop="bankNo" >
<p>{{dataForm.bankNo}}</p>
</el-form-item>
</el-col>
<el-col :span="24" v-if="jnpf.hasFormP('photos')" >
<el-form-item label="证件照"
prop="photos" >
<JNPF-UploadImg v-model="dataForm.photos"
disabled
detailed :fileSize="5" sizeUnit="MB" :limit="9" >
</JNPF-UploadImg>
</el-form-item>
</el-col>
<el-col :span="12" v-if="jnpf.hasFormP('creatorUserName')" >
<el-form-item label="录入人"
prop="creatorUserName" >
<p>{{dataForm.creatorUserName}}</p>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-form-item label="创建时间"
prop="creatorTime" >
<p>{{dataForm.creatorTime}}</p>
</el-form-item>
</el-col>
</template>
</el-form>
</el-row>
@ -69,6 +96,11 @@
name : '',
adress : '',
contact : '',
identity : '',
bankAccount : '',
bank : '',
bankNo : '',
photos : [],
creatorUserName : '',
creatorTime : "",
},
@ -84,6 +116,7 @@
methods: {
dataInfo(dataAll){
let _dataAll =dataAll
_dataAll.photos = _dataAll.photos ? JSON.parse( _dataAll.photos):[]
this.dataForm = _dataAll
},

@ -1,10 +1,8 @@
<template>
<el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'编辑'"
:close-on-click-modal="false" append-to-body
:visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
width="800px">
<el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情' : '编辑'" :close-on-click-modal="false" append-to-body
:visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll width="600px">
<el-row :gutter="15" class="">
<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right">
<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="left">
<template v-if="!loading">
<el-col :span="24">
<el-form-item label-width="0">
@ -15,50 +13,70 @@
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="姓名"
prop="name">
<el-input v-model="dataForm.name"
placeholder="请输入姓名" clearable :style='{"width":"100%"}'>
<el-form-item label="姓名" prop="name">
<el-input v-model="dataForm.name" placeholder="请输入姓名" clearable :style='{ "width": "100%" }'>
</el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="地址"
prop="adress">
<el-input v-model="dataForm.adress"
placeholder="请输入地址" clearable :style='{"width":"100%"}'>
<el-form-item label="地址" prop="adress">
<el-input v-model="dataForm.adress" placeholder="请输入地址" clearable :style='{ "width": "100%" }'>
</el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="手机号"
prop="contact">
<el-input v-model="dataForm.contact"
placeholder="请输入手机号" clearable :style='{"width":"100%"}'>
<el-form-item label="手机号" prop="contact">
<el-input v-model="dataForm.contact" placeholder="请输入手机号" clearable :style='{ "width": "100%" }'>
</el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="12">-->
<!-- <el-form-item label="录入人"-->
<!-- prop="creatorUserName">-->
<!-- <el-input v-model="dataForm.creatorUserName"-->
<!-- placeholder="请输入录入人" clearable :style='{"width":"100%"}'>-->
<el-col :span="24">
<el-form-item label="身份证" prop="identity">
<el-input v-model="dataForm.identity" placeholder="请输入身份证" clearable :style='{ "width": "100%" }'>
</el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="银行账户" prop="bankAccount">
<el-input v-model="dataForm.bankAccount" placeholder="请输入银行账户" clearable
:style='{ "width": "100%" }'>
</el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="开户行" prop="bank">
<el-input v-model="dataForm.bank" placeholder="请输入开户行" clearable :style='{ "width": "100%" }'>
</el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="行号" prop="bankNo">
<el-input v-model="dataForm.bankNo" placeholder="请输入行号" clearable :style='{ "width": "100%" }'>
<!-- </el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12">-->
<!-- <el-form-item label="创建时间"-->
<!-- prop="creatorTime">-->
<!-- <el-input v-model="dataForm.creatorTime"-->
<!-- placeholder="系统自动生成" readonly>-->
</el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="证件照" prop="photos">
<JNPF-UploadImg v-model="dataForm.photos" :fileSize="5" sizeUnit="MB" :limit="9">
<!-- </el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
</JNPF-UploadImg>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="录入人" prop="creatorUserName">
<el-input v-model="dataForm.creatorUserName" placeholder="请输入录入人" clearable
:style='{ "width": "100%" }'>
</el-input>
</el-form-item>
</el-col>
</template>
</el-form>
</el-row>
@ -72,7 +90,6 @@
import request from '@/utils/request'
import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
export default {
components: {},
props: [],
@ -85,8 +102,13 @@
name: '',
adress: '',
contact: '',
identity: '',
bankAccount: '',
bank: '',
bankNo: '',
photos: [],
creatorUserName: '',
creatorTime: ''
creatorTime: "",
},
rules:
{
@ -95,14 +117,9 @@
required: true,
message: '请输入姓名',
trigger: 'blur'
}
},
],
contact: [{
pattern: /^1[3456789]\d{9}$/,
message: '请输入正确的手机号码',
trigger: 'blur'
},]
}
},
}
},
@ -110,26 +127,25 @@
watch: {},
created() {
},
mounted() {
},
mounted() { },
methods: {
clearData(data) {
for (let key in data) {
if (data[key] instanceof Array) {
data[key] = []
data[key] = [];
} else if (data[key] instanceof Object) {
this.clearData(data[key])
this.clearData(data[key]);
} else {
data[key] = ''
data[key] = "";
}
}
},
init(id, isDetail) {
this.dataForm.id = id || 0
this.visible = true
this.isDetail = isDetail || false
this.dataForm.id = id || 0;
this.visible = true;
this.isDetail = isDetail || false;
this.$nextTick(() => {
this.$refs['elForm'].resetFields()
this.$refs['elForm'].resetFields();
if (this.dataForm.id) {
this.loading = true
request({
@ -138,11 +154,11 @@
}).then(res => {
this.dataInfo(res.data)
this.loading = false
})
});
} else {
this.clearData(this.dataForm)
}
})
});
this.$store.commit('generator/UPDATE_RELATION_DATA', {})
},
//
@ -157,7 +173,7 @@
var _data = this.dataList()
if (!this.dataForm.id) {
request({
url: '/api/example/Jg_natural',
url: '/api/example/Natural',
method: 'post',
data: _data
}).then((res) => {
@ -190,14 +206,16 @@
}
},
dataList() {
var _data = JSON.parse(JSON.stringify(this.dataForm))
return _data
var _data = JSON.parse(JSON.stringify(this.dataForm));
_data.photos = JSON.stringify(_data.photos)
return _data;
},
dataInfo(dataAll) {
let _dataAll = dataAll
_dataAll.photos = JSON.parse(_dataAll.photos)
this.dataForm = _dataAll
}
}
},
},
}
</script>

@ -14,10 +14,28 @@
<el-input v-model="query.contact" placeholder="请输入" clearable> </el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="银行账户">
<el-input v-model="query.bankAccount" placeholder="请输入" clearable> </el-input>
</el-form-item>
</el-col>
<template v-if="showAll">
<el-col :span="6">
<el-form-item label="身份证">
<el-input v-model="query.identity" placeholder="请输入" clearable> </el-input>
</el-form-item>
</el-col>
</template>
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button>
<el-button icon="el-icon-refresh-right" @click="reset()"></el-button>
<el-button type="text" icon="el-icon-arrow-down" @click="showAll = true" v-if="!showAll">
展开
</el-button>
<el-button type="text" icon="el-icon-arrow-up" @click="showAll = false" v-else>
收起
</el-button>
</el-form-item>
</el-col>
</el-form>
@ -25,13 +43,12 @@
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="primary" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">
<el-button type="primary" icon="el-icon-plus" v-has="'btn_add'" @click="addOrUpdateHandle()">
</el-button>
<el-button type="text" icon="el-icon-download" @click="exportData()" v-has="'btn_download'">
</el-button>
<!-- <el-button type="text" icon="el-icon-download" v-has="'btn_upload'" @click="">-->
<!-- </el-button>-->
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()" v-has="'btn_batchRemove'" >批量删除
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()"
v-has="'btn_batchRemove'">批量删除
</el-button>
</div>
<div class="JNPF-common-head-right">
@ -42,29 +59,23 @@
<screenfull isContainer />
</div>
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c :hasNO="false"
@selection-change="handleSelectionChange" border>
<el-table-column type="index" width="50" label="序号" fixed="left" align="center" />
<el-table-column prop="name" label="姓名" width="300" align="center" fixed="left" sortable
/>
<el-table-column prop="adress" label="地址" width="300" align="center" sortable
/>
<el-table-column prop="contact" label="手机号" width="300" align="center" sortable
/>
<el-table-column prop="creatorUserName" label="录入人" width="300" align="center" sortable
/>
<el-table-column prop="creatorTime" label="创建时间" width="300" align="center" sortable
/>
<el-table-column label="操作" fixed="right"
width="150">
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
@selection-change="handleSelectionChange">
<el-table-column prop="name" label="姓名" width="0" align="left" />
<el-table-column prop="adress" label="地址" width="0" align="left" />
<el-table-column prop="contact" label="手机号" width="0" align="left" />
<el-table-column prop="creatorUserName" label="录入人" width="0" align="left" />
<el-table-column prop="creatorTime" label="创建时间" width="0" align="left" />
<el-table-column prop="identity" label="身份证" width="0" align="left" />
<el-table-column prop="bankAccount" label="银行账户" width="0" align="left" />
<el-table-column prop="bank" label="开户行" width="0" align="left" />
<el-table-column prop="bankNo" label="行号" width="0" align="left" />
<el-table-column label="操作" fixed="right" width="100">
<template slot-scope="scope">
<el-button type="text" v-has="'btn_edit'"
@click="addOrUpdateHandle(scope.row.id)">编辑
<el-button type="text" @click="addOrUpdateHandle(scope.row.id)" v-has="'btn_edit'">
</el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)" v-has="'btn_remove'">
</el-button>
<el-button type="text"
@click="goDetail(scope.row.id)">详情
<el-button type="text" class="JNPF-table-delBtn" v-has="'btn_remove'"
@click="handleDel(scope.row.id)">删除
</el-button>
</template>
</el-table-column>
@ -91,10 +102,13 @@
components: { JNPFForm, ExportBox, Detail },
data() {
return {
showAll: false,
detailVisible: false,
query: {
name: undefined,
contact: undefined
contact: undefined,
bankAccount: undefined,
identity: undefined,
},
treeProps: {
children: 'children',
@ -107,8 +121,8 @@
listQuery: {
currentPage: 1,
pageSize: 20,
sort: 'desc',
sidx: 'creatorTime'
sort: "desc",
sidx: "creatorTime",
},
formVisible: false,
exportBoxVisible: false,
@ -117,8 +131,12 @@
{ prop: 'adress', label: '地址' },
{ prop: 'contact', label: '手机号' },
{ prop: 'creatorUserName', label: '录入人' },
{ prop: 'creatorTime', label: '创建时间' }
]
{ prop: 'creatorTime', label: '创建时间' },
{ prop: 'identity', label: '身份证' },
{ prop: 'bankAccount', label: '银行账户' },
{ prop: 'bank', label: '开户行' },
{ prop: 'bankNo', label: '行号' },
],
}
},
computed: {
@ -142,23 +160,24 @@
this.initData()
},
initData() {
this.listLoading = true
this.listLoading = true;
let _query = {
...this.listQuery,
...this.query,
menuId: this.menuId
}
};
request({
url: `/api/example/Jg_natural/getList`,
method: 'post',
data: _query
}).then(res => {
var _list = []
var _list = [];
for (let i = 0; i < res.data.list.length; i++) {
let _data = res.data.list[i]
let _data = res.data.list[i];
_list.push(_data)
}
this.list = _list
console.log(this.list)
this.total = res.data.pagination.total
this.listLoading = false
@ -178,10 +197,10 @@
onClose: () => {
this.initData()
}
})
});
})
}).catch(() => {
})
});
},
handleSelectionChange(val) {
const res = val.map(item => item.id)
@ -192,7 +211,7 @@
this.$message({
type: 'error',
message: '请选择一条数据',
duration: 1500
duration: 1500,
})
return
}
@ -210,7 +229,7 @@
onClose: () => {
this.initData()
}
})
});
})
}).catch(() => {
})
@ -244,8 +263,8 @@
this.listQuery = {
currentPage: 1,
pageSize: 20,
sort: 'desc',
sidx: 'creatorTime'
sort: "desc",
sidx: "creatorTime",
}
this.initData()
},

Loading…
Cancel
Save