Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev
This commit is contained in:
		| @@ -12,57 +12,57 @@ | ||||
|           </template> | ||||
|           <template #content> | ||||
|             <div class="add-form"> | ||||
|           <ai-bar :title="params.id ? '编辑行政许可信息' : '新增行政许可信息'"></ai-bar> | ||||
|           <el-form ref="forms" :model="forms" :rules="formRules" size="small"  label-width="150px"> | ||||
|             <el-form-item label="许可文书名称" prop="licenseName"> | ||||
|               <el-input v-model="forms.licenseName" placeholder="请输入"></el-input> | ||||
|             </el-form-item> | ||||
|             <el-row type="flex"> | ||||
|               <el-col :span="20"> | ||||
|                 <el-form-item label="许可文书号" prop="licenseCode"> | ||||
|                   <el-input v-model="forms.licenseCode" placeholder="请输入"></el-input> | ||||
|               <!-- <ai-bar :title="params.id ? '编辑行政许可信息' : '新增行政许可信息'"></ai-bar> --> | ||||
|               <el-form ref="forms" :model="forms" :rules="formRules" size="small"  label-width="150px"> | ||||
|                 <el-form-item label="许可文书名称" prop="licenseName"> | ||||
|                   <el-input v-model="forms.licenseName" placeholder="请输入"></el-input> | ||||
|                 </el-form-item> | ||||
|               </el-col> | ||||
|               <el-col :span="20"> | ||||
|                 <el-form-item label="许可决定日期" prop="decisionDate"> | ||||
|                   <el-date-picker v-model="forms.decisionDate" value-format="yyyy-MM-dd" type="date" placeholder="选择日期" style="width:338px"> | ||||
|                   </el-date-picker> | ||||
|                 <el-row type="flex"> | ||||
|                   <el-col :span="20"> | ||||
|                     <el-form-item label="许可文书号" prop="licenseCode"> | ||||
|                       <el-input v-model="forms.licenseCode" placeholder="请输入"></el-input> | ||||
|                     </el-form-item> | ||||
|                   </el-col> | ||||
|                   <el-col :span="20"> | ||||
|                     <el-form-item label="许可决定日期" prop="decisionDate"> | ||||
|                       <el-date-picker v-model="forms.decisionDate" value-format="yyyy-MM-dd" type="date" placeholder="选择日期" style="width:338px"> | ||||
|                       </el-date-picker> | ||||
|                     </el-form-item> | ||||
|                   </el-col> | ||||
|                 </el-row> | ||||
|                 <el-row type="flex"> | ||||
|                   <el-col :span="20"> | ||||
|                     <el-form-item label="许可有效期自" prop="startDate"> | ||||
|                       <el-date-picker v-model="forms.startDate" value-format="yyyy-MM-dd" type="date" placeholder="选择日期" style="width:338px"> | ||||
|                       </el-date-picker> | ||||
|                     </el-form-item> | ||||
|                   </el-col> | ||||
|                   <el-col :span="20"> | ||||
|                     <el-form-item label="许可有效期至" prop="endDate"> | ||||
|                       <el-date-picker v-model="forms.endDate" value-format="yyyy-MM-dd" type="date" placeholder="选择日期" style="width:338px"> | ||||
|                       </el-date-picker> | ||||
|                     </el-form-item> | ||||
|                   </el-col> | ||||
|                 </el-row> | ||||
|                 <el-form-item label="许可机关" prop="licenseOrganization"> | ||||
|                   <el-input v-model="forms.licenseOrganization" placeholder="请输入"></el-input> | ||||
|                 </el-form-item> | ||||
|               </el-col> | ||||
|             </el-row> | ||||
|             <el-row type="flex"> | ||||
|               <el-col :span="20"> | ||||
|                 <el-form-item label="许可有效期自" prop="startDate"> | ||||
|                   <el-date-picker v-model="forms.startDate" value-format="yyyy-MM-dd" type="date" placeholder="选择日期" style="width:338px"> | ||||
|                   </el-date-picker> | ||||
|                 <el-row type="flex"> | ||||
|                   <el-col :span="20"> | ||||
|                     <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="unifiedCode"> | ||||
|                       <el-input v-model="forms.unifiedCode" placeholder="请输入" maxlength="18"></el-input> | ||||
|                     </el-form-item> | ||||
|                   </el-col> | ||||
|                 </el-row> | ||||
|                 <el-form-item label="许可内容" prop="licenseContent"> | ||||
|                   <el-input v-model="forms.licenseContent" placeholder="请输入许可内容" type="textarea" show-word-limit maxlength="500" :rows="5"></el-input> | ||||
|                 </el-form-item> | ||||
|               </el-col> | ||||
|               <el-col :span="20"> | ||||
|                 <el-form-item label="许可有效期至" prop="endDate"> | ||||
|                   <el-date-picker v-model="forms.endDate" value-format="yyyy-MM-dd" type="date" placeholder="选择日期" style="width:338px"> | ||||
|                   </el-date-picker> | ||||
|                 </el-form-item> | ||||
|               </el-col> | ||||
|             </el-row> | ||||
|             <el-form-item label="许可机关" prop="licenseOrganization"> | ||||
|               <el-input v-model="forms.licenseOrganization" placeholder="请输入"></el-input> | ||||
|             </el-form-item> | ||||
|             <el-row type="flex"> | ||||
|               <el-col :span="20"> | ||||
|                 <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="unifiedCode"> | ||||
|                   <el-input v-model="forms.unifiedCode" placeholder="请输入"></el-input> | ||||
|                 </el-form-item> | ||||
|               </el-col> | ||||
|             </el-row> | ||||
|             <el-form-item label="许可内容" prop="licenseContent"> | ||||
|               <el-input v-model="forms.licenseContent" placeholder="请输入许可内容" type="textarea" show-word-limit maxlength="500" :rows="5"></el-input> | ||||
|             </el-form-item> | ||||
|           </el-form> | ||||
|               </el-form> | ||||
|             </div> | ||||
|           </template> | ||||
|         </ai-card> | ||||
| @@ -74,7 +74,7 @@ | ||||
|     </ai-detail> | ||||
|     <ai-detail class="add" v-if="id && !isEdit"> | ||||
|       <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 slot="content"> | ||||
|         <ai-card title="基本信息"> | ||||
| @@ -114,12 +114,13 @@ export default { | ||||
|       return { | ||||
|         licenseName: [{required: true,message:"请输入许可文书名称",trigger: "blur"}], | ||||
|         licenseCode: [{required: true,message:"请输入许可文书号",trigger: "blur"}], | ||||
|         decisionDate: [{required: true,message:"请输入许可决定日期",trigger: "blur"}], | ||||
|         decisionDate: [{required: true,message:"请选择许可决定日期",trigger: "blur"}], | ||||
|         startDate: [{required: true,message:"请选择许可有效期自",trigger: "blur"}], | ||||
|         endDate: [{required: true,message:"请选择许可有效期至",trigger: "blur"}], | ||||
|         licenseOrganization: [{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"}], | ||||
|       } | ||||
|     } | ||||
|   | ||||
| @@ -1,7 +1,7 @@ | ||||
| <template> | ||||
|   <div class="AppAdministrativeLicense"> | ||||
|     <ai-list> | ||||
|       <ai-title slot="title" title="行政许可登记" isShowBottomBorder /> | ||||
|       <ai-title slot="title" title="行政许可信息" isShowBottomBorder /> | ||||
|       <template #content> | ||||
|         <ai-search-bar> | ||||
|           <template #left> | ||||
| @@ -57,10 +57,10 @@ export default { | ||||
|         { label: "许可文书号", prop: "licenseCode", align: "center", width: "260px",}, | ||||
|         { label: "许可有效期至", prop: "endDate", align: "center", width: "200px",}, | ||||
|         { label: "许可机关", prop: "licenseOrganization", align: "center", width: "200px",}, | ||||
|         { label: "许可对象", prop: "licenseContent", align: "center", width: "200px",}, | ||||
|         { label: "经营主体", prop: "enterpriseName", align: "center", width: "200px",}, | ||||
|         { label: "统一信用代码", prop: "unifiedCode", align: "center", width: "200px",}, | ||||
|         { label: "更新时间", prop: "startDate", align: "center", width: "120px",}, | ||||
|         { label: "操作人", prop: "createUserName", align: "center", width: "150px" }, | ||||
|         { label: "更新时间", prop: "createTime", align: "center", width: "160px",}, | ||||
|         { label: "操作人", prop: "createUserName", align: "center", width: "100px" }, | ||||
|         { slot: "options", }, | ||||
|       ]; | ||||
|     }, | ||||
|   | ||||
| @@ -28,7 +28,7 @@ | ||||
|                 <el-row type="flex"> | ||||
|                   <el-col :span="20"> | ||||
|                     <el-form-item label="处罚决定日期" prop="sanctionDate"> | ||||
|                       <el-date-picker v-model="forms.sanctionDate" value-format="yyyy-MM-dd" type="date" placeholder="选择日期" style="width:338px"> | ||||
|                       <el-date-picker v-model="forms.sanctionDate" value-format="yyyy-MM-dd" type="date" placeholder="选择日期" style="width:3px"> | ||||
|                       </el-date-picker> | ||||
|                     </el-form-item> | ||||
|                   </el-col> | ||||
| @@ -58,7 +58,7 @@ | ||||
|                   </el-col> | ||||
|                   <el-col :span="20"> | ||||
|                     <el-form-item label="统一信用代码" prop="unifiedCode"> | ||||
|                       <el-input v-model="forms.unifiedCode" placeholder="请输入"></el-input> | ||||
|                       <el-input v-model="forms.unifiedCode" placeholder="请输入" maxlength="18"></el-input> | ||||
|                     </el-form-item> | ||||
|                   </el-col> | ||||
|                 </el-row> | ||||
| @@ -79,7 +79,7 @@ | ||||
|  | ||||
|     <ai-detail class="add" v-if="id && !isEdit"> | ||||
|       <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 slot="content"> | ||||
|         <ai-card title="基本信息"> | ||||
| @@ -92,7 +92,7 @@ | ||||
|               <ai-info-item label="处罚机关" :value="data.sanctionOrganization"></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="处罚内容" :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.enterpriseName"></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"}], | ||||
|         sanctionBasis: [{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"}], | ||||
|       } | ||||
|     } | ||||
|   | ||||
| @@ -8,7 +8,7 @@ | ||||
|             <el-button type="primary" icon="iconfont iconAdd" @click="toAdd('')">添加</el-button> | ||||
|           </template> | ||||
|           <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();}"/> | ||||
|             <ai-import :instance="instance" :dict="dict" importUrl="appcreditadministrativesanction/import"  | ||||
|             url="appcreditadministrativesanction/downloadTemplate" name="行政处罚信息" @success="getTableData(), $message.success('导入成功!')"> | ||||
|   | ||||
| @@ -45,7 +45,7 @@ | ||||
|               </el-col> | ||||
|               <el-col :span="20"> | ||||
|                 <el-form-item label="统一信用代码" prop="unifiedCode"> | ||||
|                   <el-input v-model="forms.unifiedCode" placeholder="请输入"></el-input> | ||||
|                   <el-input v-model="forms.unifiedCode" placeholder="请输入" maxlength="18"></el-input> | ||||
|                 </el-form-item> | ||||
|               </el-col> | ||||
|             </el-row> | ||||
| @@ -64,7 +64,7 @@ | ||||
|  | ||||
|     <ai-detail class="add" v-if="id && !isEdit"> | ||||
|       <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 slot="content"> | ||||
|         <ai-card title="基本信息"> | ||||
| @@ -105,7 +105,8 @@ export default { | ||||
|         executionTime: [{required: true,message:"请输入执行时间",trigger: "blur"}], | ||||
|         executionSituation: [{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"}], | ||||
|       } | ||||
|     } | ||||
| @@ -150,7 +151,7 @@ export default { | ||||
|     confirm( ) { | ||||
|       this.$refs.forms.validate((valid) => { | ||||
|         if (valid) { | ||||
|           this.instance.post(`/appcreditdishonestperson/queryDetailById`, { | ||||
|           this.instance.post(`/appcreditdishonestperson/addOrUpdate`, { | ||||
|             ...this.forms, | ||||
|             id: this.params.id || '', | ||||
|           }).then(res => { | ||||
|   | ||||
| @@ -8,7 +8,7 @@ | ||||
|             <el-button type="primary" icon="iconfont iconAdd" @click="toAdd('')">添加</el-button> | ||||
|           </template> | ||||
|           <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();}"/> | ||||
|             <ai-import :instance="instance" :dict="dict" importUrl="/appcreditdishonestperson/import" url="/appcreditdishonestperson/downloadTemplate" name="失信被执行人信息" @success="getTableData(), $message.success('导入成功!')"> | ||||
|               <el-button size="small">导入</el-button> | ||||
| @@ -51,7 +51,7 @@ export default { | ||||
|   computed: { | ||||
|     colConfigs() { | ||||
|       return [ | ||||
|         { prop: "executionCode", label: '被执行号', align: "center", width: "200px", }, | ||||
|         { prop: "executionCode", label: '执行案号', align: "center", width: "200px", }, | ||||
|         { prop: "executionTime", label: '执行时间', align: "center", width: "200px", }, | ||||
|         { prop: "enterpriseName", label: '失信被执行主体', align: "center", width: "200px", }, | ||||
|         { prop: "unifiedCode", label: '统一信用代码', align: "center", width: "200px", }, | ||||
|   | ||||
| @@ -11,7 +11,7 @@ | ||||
|             <span style="color:#2266FF;margin-left: 16px;cursor: pointer;font-size: 12px;" v-if="isEdit==true" @click="confirm()">保存</span> | ||||
|           </template> | ||||
|           <template #content> | ||||
|             <ai-bar :title="params.id ? '编辑纳税信息' : '新增纳税信息'"></ai-bar> | ||||
|             <!-- <ai-bar :title="params.id ? '编辑纳税信息' : '新增纳税信息'"></ai-bar> --> | ||||
|             <el-form ref="forms" :model="forms" :rules="formRules" size="small"  label-width="150px"> | ||||
|               <el-row type="flex"> | ||||
|                 <el-col :span="20"> | ||||
| @@ -46,10 +46,13 @@ | ||||
|                 </el-col> | ||||
|                 <el-col :span="20"> | ||||
|                   <el-form-item label="统一信用代码" prop="unifiedCode"> | ||||
|                     <el-input v-model="forms.unifiedCode" placeholder="请输入"></el-input> | ||||
|                     <el-input v-model="forms.unifiedCode" placeholder="请输入" maxlength="18"></el-input> | ||||
|                   </el-form-item> | ||||
|                 </el-col> | ||||
|               </el-row> | ||||
|               <el-form-item label="评价单位" prop="evaluationUnit"> | ||||
|                 <el-input v-model="forms.evaluationUnit" placeholder="请输入"></el-input> | ||||
|               </el-form-item> | ||||
|             </el-form> | ||||
|           </template> | ||||
|         </ai-card> | ||||
| @@ -62,7 +65,7 @@ | ||||
|  | ||||
|     <ai-detail class="add" v-if="id && !isEdit"> | ||||
|       <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 slot="content"> | ||||
|         <ai-card title="基本信息"> | ||||
| @@ -77,6 +80,7 @@ | ||||
|               <ai-info-item label="纳税等级">{{ dict.getLabel('taxInfoLevel', data.taxLevel) }}</ai-info-item> | ||||
|               <ai-info-item label="纳税主体" :value="data.enterpriseName"></ai-info-item> | ||||
|               <ai-info-item label="统一信用代码" :value="data.unifiedCode"></ai-info-item> | ||||
|               <ai-info-item label="评价单位" :value="data.evaluationUnit"></ai-info-item> | ||||
|             </ai-wrapper> | ||||
|           </template> | ||||
|         </ai-card> | ||||
| @@ -102,7 +106,9 @@ export default { | ||||
|         taxYear: [{required: true,message:"请输入纳税年份",trigger: "blur"}], | ||||
|         taxLevel: [{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"}], | ||||
|       } | ||||
|     } | ||||
|   }, | ||||
| @@ -115,6 +121,7 @@ export default { | ||||
|         taxLevel: '', | ||||
|         enterpriseName: '', | ||||
|         unifiedCode: '', | ||||
|         evaluationUnit: '', | ||||
|       }, | ||||
|       data: {}, | ||||
|       isEdit: false, | ||||
|   | ||||
| @@ -1,7 +1,7 @@ | ||||
| <template> | ||||
|   <ai-list> | ||||
|     <template slot="title"> | ||||
|       <ai-title title="积分管理" :isShowBottomBorder="false"/> | ||||
|       <ai-title title="积分维护" :isShowBottomBorder="false"/> | ||||
|     </template> | ||||
|     <template slot="tabs"> | ||||
|       <el-tabs v-model="currIndex"> | ||||
| @@ -23,7 +23,7 @@ import scoreChange from "./scoreChange"; | ||||
|  | ||||
| export default { | ||||
|     name: 'AppScoreManage', | ||||
|     label: "积分管理(秀山)", | ||||
|     label: "积分维护(秀山)", | ||||
|     components: {pointsDeclaration, pointsDetails, pointsAppeal, scoreChange}, | ||||
|     props: { | ||||
|       instance: Function, | ||||
|   | ||||
| @@ -14,7 +14,7 @@ | ||||
|                 v-model="search.portalUserPhone" | ||||
|                 class="search-input" | ||||
|                 size="small" | ||||
|                 placeholder="对象、用户账号、事件类型" | ||||
|                 placeholder="用户账号、事件类型" | ||||
|                 clearable | ||||
|                 @change="search.current = 1, getList()" | ||||
|                 suffix-icon="iconfont iconSearch"/> | ||||
|   | ||||
		Reference in New Issue
	
	Block a user