kubbo/dvcp_v2_webapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
aixianling
2022-04-07 09:44:10 +08:00
parent 3241623df2 3b89905b0b
commit bd62cf7b8b
9 changed files with 28 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
project/xiushan/apps/AppAdministrativeLicense/components/Add.vue
View File

@@ -55,7 +55,7 @@
</el-col> </el-col>
<el-col :span="20"> <el-col :span="20">
<el-form-item label="统一信用代码" prop="unifiedCode"> <el-form-item label="统一信用代码" prop="unifiedCode">
<el-input v-model="forms.unifiedCode" placeholder="请输入" maxlength="18" type="number"></el-input> <el-input v-model="forms.unifiedCode" placeholder="请输入" maxlength="18"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@@ -74,7 +74,7 @@
</ai-detail> </ai-detail>
<ai-detail class="add" v-if="id && !isEdit"> <ai-detail class="add" v-if="id && !isEdit">
<template slot="title"> <template slot="title">
<ai-title title="详情" isShowBack isShowBottomBorder @onBackClick="cancel(false)"></ai-title> <ai-title title="行政许可信息详情" isShowBack isShowBottomBorder @onBackClick="cancel(false)"></ai-title>
</template> </template>
<template slot="content"> <template slot="content">
<ai-card title="基本信息"> <ai-card title="基本信息">
@@ -119,7 +119,8 @@ export default {
endDate: [{required: true,message:"请选择许可有效期至",trigger: "blur"}], endDate: [{required: true,message:"请选择许可有效期至",trigger: "blur"}],
licenseOrganization: [{required: true,message:"请输入许可机关",trigger: "blur"}], licenseOrganization: [{required: true,message:"请输入许可机关",trigger: "blur"}],
enterpriseName: [{required: true,message:"请输入经营主体",trigger: "blur"}], enterpriseName: [{required: true,message:"请输入经营主体",trigger: "blur"}],
unifiedCode: [{required: true,message:"请输入统一信用编号",trigger: "blur"}], unifiedCode: [{required: true,message:"请输入统一信用编号",trigger: "blur"},
{ min: 18, max: 18, message: '长度为18个字符', trigger: 'blur' }],
licenseContent: [{required: true,message:"请输入许可内容",trigger: "blur"}], licenseContent: [{required: true,message:"请输入许可内容",trigger: "blur"}],
} }
} }

2
project/xiushan/apps/AppAdministrativeLicense/components/List.vue
View File

@@ -1,7 +1,7 @@
<template> <template>
<div class="AppAdministrativeLicense"> <div class="AppAdministrativeLicense">
<ai-list> <ai-list>
<ai-title slot="title" title="行政许可登记" isShowBottomBorder /> <ai-title slot="title" title="行政许可信息" isShowBottomBorder />
<template #content> <template #content>
<ai-search-bar> <ai-search-bar>
<template #left> <template #left>

9
project/xiushan/apps/AppAdministrativePenalty/components/Add.vue
View File

@@ -58,7 +58,7 @@
</el-col> </el-col>
<el-col :span="20"> <el-col :span="20">
<el-form-item label="统一信用代码" prop="unifiedCode"> <el-form-item label="统一信用代码" prop="unifiedCode">
<el-input v-model="forms.unifiedCode" placeholder="请输入" maxlength="18" type="number"></el-input> <el-input v-model="forms.unifiedCode" placeholder="请输入" maxlength="18"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@@ -79,7 +79,7 @@
<ai-detail class="add" v-if="id && !isEdit"> <ai-detail class="add" v-if="id && !isEdit">
<template slot="title"> <template slot="title">
<ai-title title="详情" isShowBack isShowBottomBorder @onBackClick="cancel(false)"></ai-title> <ai-title title="行政处罚信息详情" isShowBack isShowBottomBorder @onBackClick="cancel(false)"></ai-title>
</template> </template>
<template slot="content"> <template slot="content">
<ai-card title="基本信息"> <ai-card title="基本信息">
@@ -92,7 +92,7 @@
<ai-info-item label="处罚机关" :value="data.sanctionOrganization"></ai-info-item> <ai-info-item label="处罚机关" :value="data.sanctionOrganization"></ai-info-item>
<ai-info-item label="处罚决定日期" :value="data.sanctionDate"></ai-info-item> <ai-info-item label="处罚决定日期" :value="data.sanctionDate"></ai-info-item>
<ai-info-item label="处罚类型">{{ dict.getLabel('administrativeSanctionType',data.sanctionType) }}</ai-info-item> <ai-info-item label="处罚类型">{{ dict.getLabel('administrativeSanctionType',data.sanctionType) }}</ai-info-item>
<ai-info-item label="处罚内容" :value="data.sanctionContent"></ai-info-item> <ai-info-item label="处罚内容" :value="data.sanctionContent" isLine></ai-info-item>
<ai-info-item label="处罚依据" isLine :value="data.sanctionBasis"></ai-info-item> <ai-info-item label="处罚依据" isLine :value="data.sanctionBasis"></ai-info-item>
<ai-info-item label="受罚主体" isLine :value="data.enterpriseName"></ai-info-item> <ai-info-item label="受罚主体" isLine :value="data.enterpriseName"></ai-info-item>
<ai-info-item label="统一信用代码" isLine :value="data.unifiedCode"></ai-info-item> <ai-info-item label="统一信用代码" isLine :value="data.unifiedCode"></ai-info-item>
@@ -124,7 +124,8 @@ export default {
sanctionContent: [{required: true,message:"请输入处罚内容",trigger: "blur"}], sanctionContent: [{required: true,message:"请输入处罚内容",trigger: "blur"}],
sanctionBasis: [{required: true,message:"请输入处罚依据",trigger: "blur"}], sanctionBasis: [{required: true,message:"请输入处罚依据",trigger: "blur"}],
enterpriseName: [{required: true,message:"请输入受罚主体",trigger: "blur"}], enterpriseName: [{required: true,message:"请输入受罚主体",trigger: "blur"}],
unifiedCode: [{required: true,message:"请输入统一信用代码",trigger: "blur"}], unifiedCode: [{required: true,message:"请输入统一信用代码",trigger: "blur"},
{ min: 18, max: 18, message: '长度为18个字符', trigger: 'blur' }],
lllegalFact: [{required: true,message:"请输入违法事实",trigger: "blur"}], lllegalFact: [{required: true,message:"请输入违法事实",trigger: "blur"}],
} }
} }

2
project/xiushan/apps/AppAdministrativePenalty/components/List.vue
View File

@@ -8,7 +8,7 @@
<el-button type="primary" icon="iconfont iconAdd" @click="toAdd('')">添加</el-button> <el-button type="primary" icon="iconfont iconAdd" @click="toAdd('')">添加</el-button>
</template> </template>
<template #right> <template #right>
<el-input size="small" placeholder="许可文书号/许可对象" v-model="search.sanctionCode" clearable suffix-icon="iconfont iconSearch" @change="getTableData()" <el-input size="small" placeholder="处罚文书号/受罚主体" v-model="search.sanctionCode" clearable suffix-icon="iconfont iconSearch" @change="getTableData()"
@clear="page.current = 1, search.sanctionCode = '', getTableData()" v-throttle="() => {(page.current = 1), getTableData();}"/> @clear="page.current = 1, search.sanctionCode = '', getTableData()" v-throttle="() => {(page.current = 1), getTableData();}"/>
<ai-import :instance="instance" :dict="dict" importUrl="appcreditadministrativesanction/import" <ai-import :instance="instance" :dict="dict" importUrl="appcreditadministrativesanction/import"
url="appcreditadministrativesanction/downloadTemplate" name="行政处罚信息" @success="getTableData(), $message.success('导入成功!')"> url="appcreditadministrativesanction/downloadTemplate" name="行政处罚信息" @success="getTableData(), $message.success('导入成功!')">

7
project/xiushan/apps/AppDishonestExecutee/components/Add.vue
View File

@@ -45,7 +45,7 @@
</el-col> </el-col>
<el-col :span="20"> <el-col :span="20">
<el-form-item label="统一信用代码" prop="unifiedCode"> <el-form-item label="统一信用代码" prop="unifiedCode">
<el-input v-model="forms.unifiedCode" placeholder="请输入" maxlength="18" type="number"></el-input> <el-input v-model="forms.unifiedCode" placeholder="请输入" maxlength="18"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@@ -64,7 +64,7 @@
<ai-detail class="add" v-if="id && !isEdit"> <ai-detail class="add" v-if="id && !isEdit">
<template slot="title"> <template slot="title">
<ai-title title="详情" isShowBack isShowBottomBorder @onBackClick="cancel(false)"></ai-title> <ai-title title="失信被执行人信息详情" isShowBack isShowBottomBorder @onBackClick="cancel(false)"></ai-title>
</template> </template>
<template slot="content"> <template slot="content">
<ai-card title="基本信息"> <ai-card title="基本信息">
@@ -105,7 +105,8 @@ export default {
executionTime: [{required: true,message:"请输入执行时间",trigger: "blur"}], executionTime: [{required: true,message:"请输入执行时间",trigger: "blur"}],
executionSituation: [{required: true,message:"请选择履行情况",trigger: "blur"}], executionSituation: [{required: true,message:"请选择履行情况",trigger: "blur"}],
enterpriseName: [{required: true,message:"请输入失信被执行主体",trigger: "blur"}], enterpriseName: [{required: true,message:"请输入失信被执行主体",trigger: "blur"}],
unifiedCode: [{required: true,message:"请输入统一信用代码",trigger: "blur"}], unifiedCode: [{required: true,message:"请输入统一信用代码",trigger: "blur"},
{ min: 18, max: 18, message: '长度为18个字符', trigger: 'blur' }],
dishonestFact: [{required: true,message:"请输入失信事实",trigger: "blur"}], dishonestFact: [{required: true,message:"请输入失信事实",trigger: "blur"}],
} }
} }

2
project/xiushan/apps/AppDishonestExecutee/components/List.vue
View File

@@ -8,7 +8,7 @@
<el-button type="primary" icon="iconfont iconAdd" @click="toAdd('')">添加</el-button> <el-button type="primary" icon="iconfont iconAdd" @click="toAdd('')">添加</el-button>
</template> </template>
<template #right> <template #right>
<el-input size="small" placeholder="许可文书号/许可对象" v-model="search.executionCode" clearable @clear="page.current = 1, search.executionCode = '',getTableData()" <el-input size="small" placeholder="执行案号/失信被执行主体" v-model="search.executionCode" clearable @clear="page.current = 1, search.executionCode = '',getTableData()"
suffix-icon="iconfont iconSearch" v-throttle="() => {(page.current = 1), getTableData();}"/> suffix-icon="iconfont iconSearch" v-throttle="() => {(page.current = 1), getTableData();}"/>
<ai-import :instance="instance" :dict="dict" importUrl="/appcreditdishonestperson/import" url="/appcreditdishonestperson/downloadTemplate" name="失信被执行人信息" @success="getTableData(), $message.success('导入成功!')"> <ai-import :instance="instance" :dict="dict" importUrl="/appcreditdishonestperson/import" url="/appcreditdishonestperson/downloadTemplate" name="失信被执行人信息" @success="getTableData(), $message.success('导入成功!')">
<el-button size="small">导入</el-button> <el-button size="small">导入</el-button>

7
project/xiushan/apps/AppRatepayingInfo/components/Add.vue
View File

@@ -46,7 +46,7 @@
</el-col> </el-col>
<el-col :span="20"> <el-col :span="20">
<el-form-item label="统一信用代码" prop="unifiedCode"> <el-form-item label="统一信用代码" prop="unifiedCode">
<el-input v-model="forms.unifiedCode" placeholder="请输入" maxlength="18" type="number"></el-input> <el-input v-model="forms.unifiedCode" placeholder="请输入" maxlength="18"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@@ -65,7 +65,7 @@
<ai-detail class="add" v-if="id && !isEdit"> <ai-detail class="add" v-if="id && !isEdit">
<template slot="title"> <template slot="title">
<ai-title title="详情" isShowBack isShowBottomBorder @onBackClick="cancel(false)"></ai-title> <ai-title title="纳税信息详情" isShowBack isShowBottomBorder @onBackClick="cancel(false)"></ai-title>
</template> </template>
<template slot="content"> <template slot="content">
<ai-card title="基本信息"> <ai-card title="基本信息">
@@ -106,7 +106,8 @@ export default {
taxYear: [{required: true,message:"请输入纳税年份",trigger: "blur"}], taxYear: [{required: true,message:"请输入纳税年份",trigger: "blur"}],
taxLevel: [{required: true,message:"请选择纳税等级",trigger: "blur"}], taxLevel: [{required: true,message:"请选择纳税等级",trigger: "blur"}],
enterpriseName: [{required: true,message:"请输入纳税主体",trigger: "blur"}], enterpriseName: [{required: true,message:"请输入纳税主体",trigger: "blur"}],
unifiedCode: [{required: true,message:"请输入统一信用代码",trigger: "blur"}], unifiedCode: [{required: true,message:"请输入统一信用代码",trigger: "blur"},
{ min: 18, max: 18, message: '长度为18个字符', trigger: 'blur' }],
evaluationUnit: [{required: true,message:"请输入评价单位",trigger: "blur"}], evaluationUnit: [{required: true,message:"请输入评价单位",trigger: "blur"}],
} }
} }

4
project/xiushan/apps/processManagement/mattersConfig/components/addConfig.vue
View File

@@ -158,8 +158,8 @@ export default {
} }
}, },
created() { created() {
if (this.$route.query?.id) { if (this.row.id) {
this.getDetail(this.$route.query?.id) this.getDetail(this.row.id)
} }
} }
} }

7
project/xiushan/apps/processManagement/mattersConfig/components/processApproval.vue
View File

@@ -184,7 +184,12 @@ export default {
}, },
changeCharge (e, i) { changeCharge (e, i) {
this.$set(this.form.processNodeList[i], 'candidateList', e) this.$set(this.form.processNodeList[i], 'candidateList', e.map(v => {
return {
...v,
candidate: v.id
}
}))
}, },
/** /**
* 添加流程 * 添加流程