028a8633 by renchao@pashanhoo.com

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

2 parents aba8cd42 315b0f4c
......@@ -14,7 +14,7 @@ let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('Ap
*/
export function addYh (data) {
return request({
url: SERVER.SERVERAPI + 'y/rest/sys/company/addYh',
url: SERVER.SERVERAPI + '/rest/sys/company/addYh',
method: 'post',
data
})
......@@ -26,7 +26,7 @@ export function addYh (data) {
*/
export function addQy (data) {
return request({
url: SERVER.SERVERAPI + 'y/rest/sys/company/addQy',
url: SERVER.SERVERAPI + '/rest/sys/company/addQy',
method: 'post',
data
})
......@@ -35,26 +35,26 @@ export function addQy (data) {
/**
* @description: 查询企业列表
* @author:
* @param pageSize
* @param pageNumber
* @param data
*/
export function queryQyByPage (pageSize, pageNumber) {
export function queryQyByPage (data) {
return request({
url: SERVER.SERVERAPI + '/rest/sys/company/queryQyByPage?pageSize=' + pageSize + '&pageNumber=' + pageNumber,
method: 'get'
url: SERVER.SERVERAPI + '/rest/sys/company/queryQyByPage',
method: 'post',
data
})
}
/**
* @description: 查询银行列表
* @author:
* @param pageSize
* @param pageNumber
* @param data
*/
export function queryYhByPage (pageSize, pageNumber) {
export function queryYhByPage (data) {
return request({
url: SERVER.SERVERAPI + '/rest/sys/company/queryYhByPage?pageSize=' + pageSize + '&pageNumber=' + pageNumber,
method: 'get'
url: SERVER.SERVERAPI + '/rest/sys/company/queryYhByPage',
method: 'post',
data
})
}
......
......@@ -2,63 +2,54 @@
<el-form ref="ruleForm" :model="ruleForm" label-width="100px" :rules="rules">
<el-row>
<el-col :span="12">
<el-form-item label="入库编号:" prop="batchno">
<el-input v-model="ruleForm.batchno" :disabled="true"></el-input>
<el-form-item label="企业名称:" prop="qymc">
<el-input v-model="ruleForm.qymc" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="登记机构:" prop="djjg">
<el-select v-model="ruleForm.djjg" class="width100" placeholder="请选择" :disabled="!readOnly">
<el-option v-for="item in DJJGLIST" :key="item.dname" :label="item.dname" :value="item.dname">
</el-option>
</el-select>
<el-form-item label="电话:" prop="dh">
<el-input v-model="ruleForm.dh" ></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="入库人员:">
<el-input v-model="ruleForm.operator" :disabled="true"></el-input>
<el-form-item label="证件种类:">
<el-input v-model="ruleForm.zjzl" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="入库时间:" prop="operationtime">
<el-date-picker v-model="ruleForm.operationtime" class="width100" type="datetime" :disabled="!readOnly"
value-format="yyyy-MM-dd HH:mm:ss">
</el-date-picker>
<el-form-item label="证件号:" prop="zjh">
<el-input v-model="ruleForm.zjh" ></el-input>
</el-form-item>
</el-col>
</el-row>
<div>
<el-table :data="tableForm" border style="width: 100%"
:header-cell-style="{ 'text-align': 'center', background: 'rgb(236, 245, 255)' }"
:cell-style="{ 'text-align': 'center' }">
<el-table-column prop="name" label="纸质证书类型" width="200"></el-table-column>
<el-table-column prop="ksysxlh" label="开始印刷序列号" width="200">
<template slot-scope="scope">
<el-input v-model="scope.row.ksysxlh" @blur="ysxlhDeal(scope.row)" maxlength="11"
oninput="value=value.replace(/[^\d.]/g,'')" :disabled="!readOnly"></el-input>
</template>
</el-table-column>
<el-table-column prop="jsysxlh" label="结束印刷序列号" width="200">
<template slot-scope="scope">
<el-input v-model="scope.row.jsysxlh" @blur="ysxlhDeal(scope.row)" maxlength="11"
oninput="value=value.replace(/[^\d.]/g,'')" :disabled="!readOnly"></el-input>
</template>
</el-table-column>
<el-table-column prop="bs" label="本数">
<template slot-scope="scope">
<span v-if="scope.row.bs == 0" class="font-red">系统计算</span>
<span v-else-if="scope.row.bs < 0" class="font-red">印刷序列号有误</span>
<span v-else>{{ scope.row.bs }}</span>
</template>
</el-table-column>
</el-table>
</div>
<el-form-item label="备注" class="middle-margin-bottom">
<el-input type="textarea" v-model="ruleForm.bz" :rows="4" :disabled="!readOnly"></el-input>
</el-form-item>
<el-form-item v-if="readOnly">
<el-row>
<el-col :span="12">
<el-form-item label="法人名称:" prop="frmc">
<el-input v-model="ruleForm.frmc" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="法人电话:" prop="frdh">
<el-input v-model="ruleForm.frdh" ></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="单位地址:">
<el-input v-model="ruleForm.dwdz" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="邮编:" prop="yb">
<el-input v-model="ruleForm.yb" ></el-input>
</el-form-item>
</el-col>
</el-row>
<el-form-item >
<el-button type="primary" @click="submitForm">保存</el-button>
<el-button @click="closeDialog">取消</el-button>
</el-form-item>
......@@ -67,8 +58,7 @@
<script>
import store from '@/store/index.js'
import { zsrk, getZsglInfo } from "@/api/zsgl.js"
import { getSysSerialSingle } from "@/api/sysSerial.js"
import { addQy } from "@/api/xxba.js"
export default {
props: {
formData: {
......@@ -136,9 +126,7 @@ export default {
this.tableForm[0].bs = null;
this.tableForm[1].bs = null;
this.getDetailInfo(this.formData.bsmBatch);
} else {
this.ywhSerial();
}
} else {}
},
methods: {
//表单提交
......@@ -152,31 +140,19 @@ export default {
return;
}
})
zsrk(this.ruleForm).then(res => {
addQy(this.ruleForm).then(res => {
if (res.code == 200) {
this.$message.success('保存成功')
this.$emit("input", false);
this.$refs['ruleForm'].resetFields();
this.resetTableFields();
this.closeDialog();
this.$parent.queryClick();
} else {
this.$message.error(res.message);
}
})
},
//序列号获取
/**
* @description: 序列号获取
* @author: renchao
*/
ywhSerial () {
getSysSerialSingle(this.ywhQueryForm).then(res => {
if (res.code == 200) {
this.ruleForm.batchno = res.message;
this.readOnly = true;
}
})
},
//获取详情信息
/**
* @description: 获取详情信息
......
......@@ -11,7 +11,7 @@
<el-row>
<el-col :span="5">
<el-form-item label="姓名/名称">
<el-input placeholder="姓名/名称" v-model="queryForm.sqrmc" clearable class="width100">
<el-input placeholder="姓名/名称" v-model="queryForm.qymc" clearable class="width100">
</el-input>
</el-form-item>
</el-col>
......@@ -48,6 +48,8 @@
mixins: [table],
mounted () {
sendThis(this);
},
activated () {
this.queryClick()
},
computed: {
......@@ -55,7 +57,7 @@
data () {
return {
queryForm: {
sqrmc: "",
qymc: "",
zjh: "",
},
pageData: {
......@@ -75,7 +77,12 @@
*/
queryClick () {
this.$startLoading();
queryQyByPage(10,1).then((res) => {
let pageForm = {
pageSize: this.pageData.size,
pageNumber: this.pageData.current
}
let data = {...this.queryForm, ...pageForm}
queryQyByPage(data).then((res) => {
this.$endLoading();
if (res.code === 200) {
let { total, records } = res.result;
......@@ -84,8 +91,12 @@
}
});
},
handleSearch () { },
handleAdd () { },
handleSearch () {
this.queryClick();
},
handleAdd () {
this.$popupDialog("添加企业", "xxba/qyxxba/components/addDialog", {}, "50%")
},
handleDelete () { }
}
}
......
<template>
<el-form ref="ruleForm" :model="ruleForm" label-width="100px" :rules="rules">
<el-row>
<el-col :span="12">
<el-form-item label="企业名称:" prop="qymc">
<el-input v-model="ruleForm.qymc" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="电话:" prop="dh">
<el-input v-model="ruleForm.dh" ></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="证件种类:">
<el-input v-model="ruleForm.zjzl" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="证件号:" prop="zjh">
<el-input v-model="ruleForm.zjh" ></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="法人名称:" prop="frmc">
<el-input v-model="ruleForm.frmc" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="法人电话:" prop="frdh">
<el-input v-model="ruleForm.frdh" ></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="单位地址:">
<el-input v-model="ruleForm.dwdz" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="邮编:" prop="yb">
<el-input v-model="ruleForm.yb" ></el-input>
</el-form-item>
</el-col>
</el-row>
<el-form-item >
<el-button type="primary" @click="submitForm">保存</el-button>
<el-button @click="closeDialog">取消</el-button>
</el-form-item>
</el-form>
</template>
<script>
import store from '@/store/index.js'
import { addYh } from "@/api/xxba.js"
export default {
props: {
formData: {
type: Object,
default: () => { },
},
},
data () {
return {
DJJGLIST: store.getters.dictData['ywly'],
readOnly: false,
//表单提交数据
ruleForm: {
batchno: '',
djjg: '',
operator: '超级管理员',
operationtime: '',
bz: '',
zsstarno: '',
zsendno: '',
zsnum: '',
zmstarno: '',
zmendno: '',
zmnum: ''
},
//表格数据
tableForm: [
{
name: '不动产权证书',
ksysxlh: '',
jsysxlh: '',
bs: 0,
zslx: 1
},
{
name: '不动产登记证明',
ksysxlh: '',
jsysxlh: '',
bs: 0,
zslx: 2
}
],
//证书入库业务号参数
ywhQueryForm: {
serialtype: 'zsrkbh',
serialname: '证书入库编号',
serialcode: 'zsrk',
digit: '5'
},
rules: {
batchNo: [
{ required: true, message: '入库编号不能为空', trigger: 'blur' }
],
djjg: [
{ required: true, message: '请选择登记机构', trigger: 'change' }
],
rksj: [
{ required: true, message: '请选择入库时间', trigger: 'change' }
],
},
}
},
mounted () {
if (this.formData.bsmBatch) {
this.tableForm[0].bs = null;
this.tableForm[1].bs = null;
this.getDetailInfo(this.formData.bsmBatch);
} else {}
},
methods: {
//表单提交
/**
* @description: 表单提交
* @author: renchao
*/
submitForm () {
this.tableForm.forEach((item, index) => {
if (item.bs < 0) {
return;
}
})
addYh(this.ruleForm).then(res => {
if (res.code == 200) {
this.$message.success('保存成功')
this.$emit("input", false);
this.$refs['ruleForm'].resetFields();
this.resetTableFields();
this.closeDialog();
this.$parent.queryClick();
} else {
this.$message.error(res.message);
}
})
},
//获取详情信息
/**
* @description: 获取详情信息
* @param {*} bsmBatch
* @author: renchao
*/
getDetailInfo (bsmBatch) {
getZsglInfo({ "bsmBatch": bsmBatch }).then(res => {
if (res.code == 200) {
this.ruleForm = res.result;
this.readOnly = false;
this.tableForm[0].ksysxlh = res.result.zsstarno;
this.tableForm[0].jsysxlh = res.result.zsendno;
this.tableForm[0].bs = res.result.zsnum;
this.tableForm[1].ksysxlh = res.result.zmstarno;
this.tableForm[1].jsysxlh = res.result.zmendno;
this.tableForm[1].bs = res.result.zmnum;
}
})
},
//印刷序列号处理
/**
* @description: 印刷序列号处理
* @param {*} item
* @author: renchao
*/
ysxlhDeal (item) {
if (item.ksysxlh && item.jsysxlh) {
if (item.ksysxlh.length == item.jsysxlh.length) {
if (item.ksysxlh.length != 11) {
item.bs = -1;
return;
}
if (item.ksysxlh > item.jsysxlh) {
item.bs = -1;
return;
}
item.bs = item.jsysxlh - item.ksysxlh + 1;
if (item.zslx == 1) {
this.ruleForm.zsstarno = item.ksysxlh;
this.ruleForm.zsendno = item.jsysxlh;
this.ruleForm.zsnum = item.bs
} else if (item.zslx == 2) {
this.ruleForm.zmstarno = item.ksysxlh;
this.ruleForm.zmendno = item.jsysxlh;
this.ruleForm.zmnum = item.bs
}
} else {
item.bs = -1;
}
} else {
item.bs = 0;
if (item.zslx == 1) {
this.ruleForm.zsstarno = '';
this.ruleForm.zsendno = '';
this.ruleForm.zsnum = item.bs
} else if (item.zslx == 2) {
this.ruleForm.zmstarno = '';
this.ruleForm.zmendno = '';
this.ruleForm.zmnum = item.bs
}
}
},
/**
* @description: resetTableFields
* @author: renchao
*/
resetTableFields () {
this.tableForm = [
{
name: '不动产权证书',
ksysxlh: '',
jsysxlh: '',
bs: 0,
zslx: 1
},
{
name: '不动产权登记证明',
ksysxlh: '',
jsysxlh: '',
bs: 0,
zslx: 2
}
]
},
/**
* @description: closeDialog
* @author: renchao
*/
closeDialog () {
this.$popupCacel()
this.$refs['ruleForm'].resetFields();
this.resetTableFields();
}
}
}
</script>
<style scoped lang="scss">
@import "~@/styles/mixin.scss";
@import "~@/styles/dialogBoxheader.scss";
.font-red {
color: red
}
.middle-margin-bottom {
margin-top: 20px
}
</style>
/*
* @Description:
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-01 10:17:27
*/
......@@ -28,8 +28,8 @@ class data extends filter {
}
},
{
prop: "sqrmc",
label: "姓名/名称",
prop: "qymc",
label: "名称",
},
{
prop: "zjzl",
......@@ -65,7 +65,7 @@ class data extends filter {
label: "法人名称",
},
{
prop: "txdz",
prop: "dwdz",
label: "地址",
},
{
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-04 16:59:15
* @LastEditTime: 2023-09-01 10:17:48
-->
<template>
<div class="from-clues">
......@@ -11,7 +11,7 @@
<el-row>
<el-col :span="5">
<el-form-item label="姓名/名称">
<el-input placeholder="姓名/名称" v-model="queryForm.sqrmc" clearable class="width100">
<el-input placeholder="姓名/名称" v-model="queryForm.qymc" clearable class="width100">
</el-input>
</el-form-item>
</el-col>
......@@ -24,6 +24,7 @@
<el-col :span="14" class="btnColRight">
<el-form-item>
<el-button type="primary" native-type="submit" @click="handleSearch">查询</el-button>
<el-button type="primary" native-type="submit" @click="handleAdd">添加</el-button>
</el-form-item>
</el-col>
</el-row>
......@@ -31,54 +32,76 @@
</div>
<div class="from-clues-content">
<lb-table :page-size="pageData.size" border :current-page.sync="pageData.currentPage" :heightNum="280"
:total="tableData.total" @size-change="handleSizeChange" @p-current-change="handleCurrentChange"
:column="tableData.columns" :data="tableData.data">
:total="tableData.total" @size-change="handleSizeChange" @p-current-change="handleCurrentChange"
:column="tableData.columns" :data="tableData.data">
</lb-table>
</div>
</div>
</template>
<script>
import table from "@/utils/mixin/table"
import { datas, sendThis } from "./data"
export default {
name: "cwrz",
components: {},
mixins: [table],
mounted () {
sendThis(this);
import table from "@/utils/mixin/table"
import { datas, sendThis } from "./data"
import { queryYhByPage, addYh } from "@/api/xxba.js";
export default {
name: "cwrz",
components: {},
mixins: [table],
mounted () {
sendThis(this);
},
activated () {
this.queryClick()
},
computed: {
},
data () {
return {
queryForm: {
qymc: "",
zjh: "",
},
pageData: {
current: 1,
size: 10,
},
tableData: {
total: 0,
columns: datas.columns(),
data: [],
},
};
},
methods: {
/**
* @description: queryClick
*/
queryClick () {
this.$startLoading();
let pageForm = {
pageSize: this.pageData.size,
pageNumber: this.pageData.current
}
let data = {...this.queryForm, ...pageForm}
queryYhByPage(data).then((res) => {
this.$endLoading();
if (res.code === 200) {
let { total, records } = res.result;
this.tableData.total = total;
this.tableData.data = records;
}
});
},
computed: {
handleSearch () {
this.queryClick();
},
data () {
return {
queryForm: {
sqrmc: "",
zjh: "",
},
pageData: {
current: 1,
size: 10,
},
tableData: {
total: 0,
columns: datas.columns(),
data: [],
},
};
handleAdd () {
this.$popupDialog("添加企业", "xxba/yhjgba/components/addDialog", {}, "50%")
},
methods: {
/**
* @description: queryClick
* @author: renchao
*/
queryClick () {
},
handleSearch () { },
handleDelete () { }
}
handleDelete () { }
}
}
</script>
<style scoped lang="scss">
@import "~@/styles/public.scss";
@import "~@/styles/public.scss";
</style>
......