Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
aixianling
2022-04-01 17:28:28 +08:00
9 changed files with 206 additions and 103 deletions

View File

@@ -2,7 +2,7 @@
<section class="Add">
<ai-detail class="add">
<template #title>
<ai-title :title="params.id ? '行政许可信息详情' : '新增行政许可信息'" :isShowBack="true" :isShowBottomBorder="true" @onBackClick="cancel(false)" />
<ai-title :title="params.id ? '编辑' : '新增行政许可信息'" :isShowBack="true" :isShowBottomBorder="true" @onBackClick="cancel(false)" />
</template>
<template #content>
<div class="add-form">
@@ -118,15 +118,6 @@ export default {
this.$refs.forms.validate((valid) => {
if (valid) {
this.instance.post(`/appcreditadminstrativelicense/addOrUpdate`, {
// licenseName: this.forms.licenseName,
// licenseCode: this.forms.licenseCode,
// decisionDate: this.forms.decisionDate,
// startDate: JSON.stringify(this.forms.startDate),
// endtDate: JSON.stringify(this.forms.endtDate),
// licenseOrganization: this.forms.licenseOrganization,
// enterpriseName: this.forms.enterpriseName,
// unifiedCode: this.forms.unifiedCode,
// licenseContent: this.forms.licenseContent,
...this.forms,
id: this.params.id || '',
// picture: this.form.picture.length ? this.form.picture[0].url : ''

View File

@@ -6,8 +6,9 @@
</template>
<template #content>
<div class="add-form">
<ai-bar title="基本信息"></ai-bar>
<el-form ref="forms" :model="forms" size="small" label-width="150px">
<div class="info">
<ai-bar title="基本信息"></ai-bar>
<el-form ref="forms" :model="forms" size="small" label-width="150px">
<el-form-item label="许可文书名称" prop="num">
{{ forms.licenseName }}
</el-form-item>
@@ -53,7 +54,8 @@
<el-form-item label="许可内容" prop="num">
{{ forms.licenseContent }}
</el-form-item>
</el-form>
</el-form>
</div>
</div>
</template>
</ai-detail>
@@ -106,7 +108,7 @@ export default {
.Detail {
height: 100%;
overflow: hidden;
background: #f2f4f6 !important;
background: #f2f4f6 ;
.add-form__item {
display: flex;
@@ -118,7 +120,7 @@ export default {
}
::v-deep .ai-detail__content--active {
padding: 20px;
padding: 0 400px;
background: #FFF;
.ai-detail__content--wrapper {
@@ -135,6 +137,11 @@ export default {
.add-form {
background: #fff;
.info {
box-sizing: border-box;
padding: 0 100px 0 0;
background: #FFF;
}
}
}

View File

@@ -1,5 +1,5 @@
<template>
<section class="AppDishonestExecutee">
<section class="AppAdministrativePenalty">
<keep-alive :include="['List']">
<component ref="component" :is="component" :instance="instance" :params="params" :dict="dict" @change="onChange"/>
</keep-alive>
@@ -12,7 +12,7 @@ import Add from "./components/Add.vue";
import Detail from "./components/Detail.vue";
export default {
name: "AppDishonestExecutee",
name: "AppAdministrativePenalty",
label: "行政处罚信息",
props: {
instance: Function,
@@ -57,7 +57,7 @@ export default {
</script>
<style lang="scss" scoped>
.AppDishonestExecutee {
.AppAdministrativePenalty {
height: 100%;
}
</style>

View File

@@ -2,70 +2,70 @@
<section class="Add">
<ai-detail class="add">
<template #title>
<ai-title :title="params.id ? '行政处罚详情' : '新增行政处罚'" :isShowBack="true" :isShowBottomBorder="true" @onBackClick="cancel(false)" />
<ai-title :title="params.id ? '编辑' : '新增行政处罚'" :isShowBack="true" :isShowBottomBorder="true" @onBackClick="cancel(false)" />
</template>
<template #content>
<div class="add-form">
<ai-bar title="行政处罚信息"></ai-bar>
<el-form ref="rules" :model="forms" :rules="formRules" size="small" label-width="150px">
<el-form ref="forms" :model="forms" :rules="formRules" size="small" label-width="150px">
<el-row type="flex">
<el-col :span="20">
<el-form-item label="处罚文书号" prop="num">
<el-input v-model="input" placeholder="请输入"></el-input>
<el-form-item label="处罚文书号" prop="sanctionCode">
<el-input v-model="forms.sanctionCode" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
<el-col :span="20">
<el-form-item label="处罚机关" prop="num">
<el-input v-model="input" placeholder="请输入"></el-input>
<el-form-item label="处罚机关" prop="sanctionOrganization">
<el-input v-model="forms.sanctionOrganization" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex">
<el-col :span="20">
<el-form-item label="处罚决定日期" prop="num">
<el-date-picker v-model="value1" type="date" placeholder="选择日期" style="width:375px">
<el-form-item label="处罚决定日期" prop="sanctionDate">
<el-date-picker v-model="forms.sanctionDate" value-format="yyyy-MM-dd" type="date" placeholder="选择日期" style="width:375px">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="20">
<el-form-item label="处罚类型" prop="num">
<ai-select v-model="readType" @change="onChange" placeholder="请选择文档类型" :selectList="$dict.getDict('readType')"></ai-select>
<el-form-item label="处罚类型" prop="sanctionType">
<ai-select v-model="forms.sanctionType" @change="onChange" placeholder="请选择文档类型" :selectList="$dict.getDict('administrativeSanctionType')"></ai-select>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex">
<el-col :span="20">
<el-form-item label="处罚内容" prop="num">
<el-input v-model="input" placeholder="请输入"></el-input>
<el-form-item label="处罚内容" prop="sanctionContent">
<el-input v-model="forms.sanctionContent" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
<el-col :span="20">
<el-form-item label="处罚依据" prop="num">
<el-input v-model="input" placeholder="请输入"></el-input>
<el-form-item label="处罚依据" prop="sanctionBasis">
<el-input v-model="forms.sanctionBasis" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex">
<el-col :span="20">
<el-form-item label="受罚主体" prop="num">
<el-input v-model="input" placeholder="请输入"></el-input>
<el-form-item label="受罚主体" prop="enterpriseName">
<el-input v-model="forms.enterpriseName" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
<el-col :span="20">
<el-form-item label="统一信用代码" prop="num">
<el-input v-model="input" placeholder="请输入"></el-input>
<el-form-item label="统一信用代码" prop="unifiedCode">
<el-input v-model="forms.unifiedCode" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="违法事实" prop="num">
<el-input v-model="input" placeholder="请输入违法事实" type="textarea" show-word-limit maxlength="500" :rows="5"></el-input>
<el-form-item label="违法事实" prop="lllegalFact">
<el-input v-model="forms.lllegalFact" placeholder="请输入违法事实" type="textarea" show-word-limit maxlength="500" :rows="5"></el-input>
</el-form-item>
</el-form>
</div>
</template>
<template slot="footer" class="footer">
<el-button class="delete-btn footer-btn" @click="cancel(false)">取消</el-button>
<el-button class="footer-btn" type="primary" @click="onSubmit('0')">保存</el-button>
<el-button class="footer-btn" type="primary" @click="confirm()">保存</el-button>
</template>
</ai-detail>
</section>
@@ -83,16 +83,36 @@ export default {
computed: {
formRules() {
return {
num: [{required: true,message:"请输入执行编号",trigger: "blur"}]
sanctionCode: [{required: true,message:"请输入处罚文书号",trigger: "blur"}],
sanctionOrganization: [{required: true,message:"请输入处罚机关",trigger: "blur"}],
sanctionDate: [{required: true,message:"请输入处罚决定日期",trigger: "blur"}],
sanctionType: [{required: true,message:"请输入处罚类型",trigger: "blur"}],
sanctionContent: [{required: true,message:"请输入处罚内容",trigger: "blur"}],
sanctionBasis: [{required: true,message:"请输入处罚依据",trigger: "blur"}],
enterpriseName: [{required: true,message:"请输入受罚主体",trigger: "blur"}],
unifiedCode: [{required: true,message:"请输入统一信用代码",trigger: "blur"}],
lllegalFact: [{required: true,message:"请输入违法事实",trigger: "blur"}],
}
}
},
data() {
return {
forms
forms: {
sanctionCode: '',
sanctionOrganization: '',
sanctionDate: '',
sanctionType: '',
sanctionContent: '',
sanctionBasis: '',
enterpriseName: '',
unifiedCode: '',
lllegalFact: '',
}
}
},
created() {},
created() {
this.$dict.load('administrativeSanctionType')
},
methods: {
cancel(isRefresh) {
this.$emit('change', {
@@ -100,6 +120,24 @@ export default {
isRefresh: !!isRefresh,
})
},
confirm( ) {
this.$refs.forms.validate((valid) => {
if (valid) {
this.instance.post(`/appcreditadministrativesanction/addOrUpdate`, {
...this.forms,
id: this.params.id || '',
// picture: this.form.picture.length ? this.form.picture[0].url : ''
}).then(res => {
if (res.code == 0) {
this.$message.success('提交成功')
setTimeout(() => {
this.cancel(true)
}, 600)
}
})
}
})
},
},
}

View File

@@ -120,29 +120,13 @@ export default {
background: #fff !important;
}
::v-deep .ai-detail__content--active {
padding: 20px;
.ai-detail__content--wrapper {
width: 100%;
}
.aibar {
padding: 0 16px;
}
.el-form {
padding: 0 96px 20px 50px;
}
.add-form {
background: #fff;
}
::v-deep .ai-list.ai-list__single .ai-list__content--right-wrapper {
margin: 0 400px;
}
::v-deep .ai-wrapper {
align-items: inherit !important;
}
// ::v-deep .ai-wrapper {
// align-items: inherit !important;
// }
.user-wrapper {
display: flex;

View File

@@ -17,10 +17,8 @@
@getList="getTableData" :col-configs="colConfigs" :dict="dict">
<el-table-column slot="options" label="操作" align="center">
<template slot-scope="{ row }">
<el-button type="text" @click="toDetail(row.id)">详情</el-button>
</template>
<template slot-scope="{ row }">
<el-button type="text" @click="delete row.id">删除</el-button>
<el-button type="text" @click.native="toDetail(row.id)">详情</el-button>
<el-button type="text" @click.native="handleDelete(row.id)">删除</el-button>
</template>
</el-table-column>
</ai-table>
@@ -47,19 +45,31 @@ export default {
computed: {
colConfigs() {
return [
{ prop: "position", label: '处罚文书号', align: "center", width: "200px", },
{ prop: "position", label: '受处罚主体', align: "center", width: "200px", },
{ prop: "position", label: '统一信用代码', align: "center", width: "200px", },
{ prop: "position", label: '处罚内容', align: "center", width: "200px", },
{ prop: "position", label: '处罚决定日期', align: "center", width: "200px", },
{ prop: "position", label: '更新时间', align: "center", width: "200px", },
{ prop: "position", label: '操作人', align: "center", width: "200px", },
{ prop: "sanctionCode", label: '处罚文书号', align: "center", width: "200px", },
{ prop: "enterpriseName", label: '受处罚主体', align: "center", width: "200px", },
{ prop: "unifiedCode", label: '统一信用代码', align: "center", width: "200px", },
{ prop: "sanctionContent", label: '处罚内容', align: "center", width: "200px", },
{ prop: "sanctionDate", label: '处罚决定日期', align: "center", width: "200px", },
{ prop: "createTime", label: '更新时间', align: "center", width: "200px", },
{ prop: "createUserName", label: '操作人', align: "center", width: "200px", },
{ slot: "options" ,},
]
}
},
created() {
this.getTableData()
},
methods: {
getTableData() {},
getTableData() {
this.instance.post("/appcreditadministrativesanction/list", null, {
params: {...this.page, ...this.search, status: 1,...this.select}
}).then(res => {
if (res?.data) {
this.tableData = res.data?.records
this.page.total = res.data.total
}
})
},
toAdd(id) {
this.$emit('change', {
type: 'Add',
@@ -70,12 +80,22 @@ export default {
},
toDetail(id) {
this.$emit('change', {
type: 'Add',
type: 'Detail',
params: {
id: id || ''
}
})
},
handleDelete(id) {
this.$confirm("是否要删除?").then(() => {
this.instance.post(`/appcreditadministrativesanction/delete?ids=${id}`).then(res => {
if (res.code == 0) {
this.$message.success("删除成功")
this.getTableData()
}
})
})
},
}
}
</script>

View File

@@ -2,58 +2,58 @@
<section class="Add">
<ai-detail class="add">
<template #title>
<ai-title :title="params.id ? '失信被执行人详情' : '新增失信被执行人'" :isShowBack="true" :isShowBottomBorder="true" @onBackClick="cancel(false)" />
<ai-title :title="params.id ? '编辑' : '新增失信被执行人'" :isShowBack="true" :isShowBottomBorder="true" @onBackClick="cancel(false)" />
</template>
<template #content>
<div class="add-form">
<ai-bar title="失信被执行人信息"></ai-bar>
<el-form ref="rules" :model="forms" :rules="formRules" size="small" label-width="150px">
<el-form ref="forms" :model="forms" :rules="formRules" size="small" label-width="150px">
<el-row type="flex">
<el-col :span="20">
<el-form-item label="执行号" prop="num">
<el-input v-model="input" placeholder="请输入"></el-input>
<el-form-item label="执行号" prop="executionCode">
<el-input v-model="forms.executionCode" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
<el-col :span="20">
<el-form-item label="执行法院" prop="num">
<el-input v-model="input" placeholder="请输入"></el-input>
<el-form-item label="执行法院" prop="executionCourt">
<el-input v-model="forms.executionCourt" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex">
<el-col :span="20">
<el-form-item label="执行时间" prop="num">
<el-date-picker v-model="value1" type="date" placeholder="选择日期" style="width:375px">
<el-form-item label="执行时间" prop="executionTime">
<el-date-picker v-model="forms.executionTime" type="date" value-format="yyyy-MM-dd" placeholder="选择日期" style="width:375px">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="20">
<el-form-item label="履行情况" prop="num">
<ai-select v-model="readType" @change="onChange" placeholder="请选择文档类型" :selectList="$dict.getDict('readType')"></ai-select>
<el-form-item label="履行情况" prop="executionSituation">
<ai-select v-model="forms.executionSituation" @change="onChange" placeholder="请选择文档类型" :selectList="$dict.getDict('dishonestPersonSituation')"></ai-select>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex">
<el-col :span="20">
<el-form-item label="失信被执行主体" prop="num">
<el-input v-model="input" placeholder="请输入"></el-input>
<el-form-item label="失信被执行主体" prop="enterpriseName">
<el-input v-model="forms.enterpriseName" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
<el-col :span="20">
<el-form-item label="统一信用代码" prop="num">
<el-input v-model="input" placeholder="请输入"></el-input>
<el-form-item label="统一信用代码" prop="unifiedCode">
<el-input v-model="forms.unifiedCode" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="失信事实" prop="num">
<el-input v-model="input" placeholder="请输入失信事实" type="textarea" show-word-limit maxlength="500" :rows="5"></el-input>
<el-form-item label="失信事实" prop="dishonestFact">
<el-input v-model="forms.dishonestFact" placeholder="请输入失信事实" type="textarea" show-word-limit maxlength="500" :rows="5"></el-input>
</el-form-item>
</el-form>
</div>
</template>
<template slot="footer" class="footer">
<el-button class="delete-btn footer-btn" @click="cancel(false)">取消</el-button>
<el-button class="footer-btn" type="primary" @click="onSubmit('0')">保存</el-button>
<el-button class="footer-btn" type="primary" @click="confirm()">保存</el-button>
</template>
</ai-detail>
</section>
@@ -71,16 +71,32 @@ export default {
computed: {
formRules() {
return {
num: [{required: true,message:"请输入执行编号",trigger: "blur"}]
executionCode: [{required: true,message:"请输入执行编号",trigger: "blur"}],
executionCourt: [{required: true,message:"请输入执行法院",trigger: "blur"}],
executionTime: [{required: true,message:"请输入执行时间",trigger: "blur"}],
executionSituation: [{required: true,message:"请选择履行情况",trigger: "blur"}],
enterpriseName: [{required: true,message:"请输入失信被执行主体",trigger: "blur"}],
unifiedCode: [{required: true,message:"请输入统一信用代码",trigger: "blur"}],
dishonestFact: [{required: true,message:"请输入失信事实",trigger: "blur"}],
}
}
},
created() {
this.$dict.load('dishonestPersonSituation')
},
data() {
return {
forms
forms: {
executionCode: '',
executionCourt: '',
executionTime: '',
executionSituation: '',
enterpriseName: '',
unifiedCode: '',
dishonestFact: '',
}
}
},
created() {},
methods: {
cancel(isRefresh) {
this.$emit('change', {
@@ -88,6 +104,24 @@ export default {
isRefresh: !!isRefresh,
})
},
confirm( ) {
this.$refs.forms.validate((valid) => {
if (valid) {
this.instance.post(`/appcreditdishonestperson/addOrUpdate`, {
...this.forms,
id: this.params.id || '',
// picture: this.form.picture.length ? this.form.picture[0].url : ''
}).then(res => {
if (res.code == 0) {
this.$message.success('提交成功')
setTimeout(() => {
this.cancel(true)
}, 600)
}
})
}
})
},
},
}

View File

@@ -18,9 +18,7 @@
<el-table-column slot="options" label="操作" align="center">
<template slot-scope="{ row }">
<el-button type="text" @click="toDetail(row.id)">详情</el-button>
</template>
<template slot-scope="{ row }">
<el-button type="text" @click="delete row.id">删除</el-button>
<el-button type="text" @click="handleDelete(row.id)">删除</el-button>
</template>
</el-table-column>
</ai-table>
@@ -58,8 +56,20 @@ export default {
]
}
},
created() {
this.getTableData()
},
methods: {
getTableData() {},
getTableData() {
this.instance.post("/appcreditdishonestperson/list", null, {
params: {...this.page, ...this.search, status: 1,...this.select}
}).then(res => {
if (res?.data) {
this.tableData = res.data?.records
this.page.total = res.data.total
}
})
},
toAdd(id) {
this.$emit('change', {
type: 'Add',
@@ -70,12 +80,22 @@ export default {
},
toDetail(id) {
this.$emit('change', {
type: 'Add',
type: 'Detail',
params: {
id: id || ''
}
})
},
handleDelete(id) {
this.$confirm("是否要删除?").then(() => {
this.instance.post(`/appcreditdishonestperson/delete?ids=${id}`).then(res => {
if (res.code == 0) {
this.$message.success("删除成功")
this.getTableData()
}
})
})
},
}
}
</script>

View File

@@ -59,7 +59,16 @@ export default {
}
},
methods: {
getTableData() {},
getTableData() {
this.instance.post("/appcredittaxinfo/list", null, {
params: {...this.page, ...this.search, status: 1,...this.select}
}).then(res => {
if (res?.data) {
this.tableData = res.data?.records
this.page.total = res.data.total
}
})
},
toAdd(id) {
this.$emit('change', {
type: 'Add',
@@ -70,7 +79,7 @@ export default {
},
toDetail(id) {
this.$emit('change', {
type: 'Add',
type: 'Detail',
params: {
id: id || ''
}