Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
		| @@ -7,7 +7,7 @@ | ||||
|       <template slot="content"> | ||||
|         <ai-card title="基本信息"> | ||||
|           <template #right v-if="params.id"> | ||||
|             <span style="color:#2266FF;margin-left: 16px;cursor: pointer;font-size: 12px;" v-if="isEdit==true" @click="getDetail(),isEdit=false">取消</span> | ||||
|             <span style="color:#2266FF;margin-left: 16px;cursor: pointer;font-size: 12px;" v-if="isEdit==true" @click="getDetail(params.id),isEdit=false">取消</span> | ||||
|             <span style="color:#2266FF;margin-left: 16px;cursor: pointer;font-size: 12px;" v-if="isEdit==true" @click="confirm()">保存</span> | ||||
|           </template> | ||||
|           <template #content> | ||||
| @@ -79,12 +79,12 @@ | ||||
|       <template slot="content"> | ||||
|         <ai-card title="基本信息"> | ||||
|           <template #right> | ||||
|             <span style="color:#2266FF;cursor: pointer;font-size: 12px;" class="iconfont iconEdit" v-if="isEdit==false" @click="forms=data,isEdit=true">修改</span> | ||||
|             <span style="color:#2266FF;cursor: pointer;font-size: 12px;" class="iconfont iconEdit" v-if="isEdit==false" @click="edit">修改</span> | ||||
|           </template> | ||||
|           <template #content v-if="isEdit == false"> | ||||
|             <ai-wrapper> | ||||
|               <ai-info-item label="许可文书名称" :value="data.licenseName"></ai-info-item> | ||||
|               <ai-info-item label="许可文书号" :value="data.licenseName"></ai-info-item> | ||||
|               <ai-info-item label="许可文书号" :value="data.licenseCode"></ai-info-item> | ||||
|               <ai-info-item label="许可决定日期" :value="data.decisionDate"></ai-info-item> | ||||
|               <ai-info-item label="许可有效期自" :value="data.startDate"></ai-info-item> | ||||
|               <ai-info-item label="许可有效期至" :value="data.endDate"></ai-info-item> | ||||
| @@ -156,6 +156,10 @@ export default { | ||||
|         isRefresh: !!isRefresh, | ||||
|       }) | ||||
|     }, | ||||
|     edit() { | ||||
|       this.isEdit=true | ||||
|       this.forms = JSON.parse(JSON.stringify(this.data)) | ||||
|     }, | ||||
|     getDetail(id) { | ||||
|       this.instance.post(`/appcreditadminstrativelicense/queryDetailById?id=${id}`).then(res => { | ||||
|         if (res.code === 0) { | ||||
|   | ||||
| @@ -7,7 +7,7 @@ | ||||
|       <template slot="content"> | ||||
|         <ai-card title="基本信息"> | ||||
|           <template #right v-if="params.id"> | ||||
|             <span style="color:#2266FF;margin-left: 16px;cursor: pointer;font-size: 12px;" v-if="isEdit==true" @click="getDetail(),isEdit=false">取消</span> | ||||
|             <span style="color:#2266FF;margin-left: 16px;cursor: pointer;font-size: 12px;" v-if="isEdit==true" @click="getDetail(params.id),isEdit=false">取消</span> | ||||
|             <span style="color:#2266FF;margin-left: 16px;cursor: pointer;font-size: 12px;" v-if="isEdit==true" @click="confirm()">保存</span> | ||||
|           </template> | ||||
|           <template #content> | ||||
| @@ -34,7 +34,7 @@ | ||||
|                   </el-col> | ||||
|                   <el-col :span="20"> | ||||
|                     <el-form-item label="处罚类型" prop="sanctionType"> | ||||
|                       <ai-select v-model="forms.sanctionType" @change="onChange" placeholder="请选择文档类型" :selectList="$dict.getDict('administrativeSanctionType')"></ai-select> | ||||
|                       <ai-select v-model="forms.sanctionType" placeholder="请选择文档类型" :selectList="$dict.getDict('administrativeSanctionType')"></ai-select> | ||||
|                     </el-form-item> | ||||
|                   </el-col> | ||||
|                 </el-row> | ||||
| @@ -84,7 +84,7 @@ | ||||
|       <template slot="content"> | ||||
|         <ai-card title="基本信息"> | ||||
|           <template #right> | ||||
|              <span style="color:#2266FF;cursor: pointer;font-size: 12px;" class="iconfont iconEdit" v-if="isEdit==false" @click="isEdit=true,forms=data,id=params.id">修改</span> | ||||
|              <span style="color:#2266FF;cursor: pointer;font-size: 12px;" class="iconfont iconEdit" v-if="isEdit==false" @click="edit">修改</span> | ||||
|           </template> | ||||
|           <template #content> | ||||
|             <ai-wrapper> | ||||
| @@ -162,6 +162,10 @@ export default { | ||||
|         isRefresh: !!isRefresh, | ||||
|       }) | ||||
|     }, | ||||
|     edit(){ | ||||
|       this.isEdit=true | ||||
|       this.forms = JSON.parse(JSON.stringify(this.data)) | ||||
|     }, | ||||
|     getDetail(id) { | ||||
|       this.instance.post(`/appcreditadministrativesanction/queryDetailById?id=${id}`).then(res => { | ||||
|         if (res.code === 0) { | ||||
|   | ||||
| @@ -7,7 +7,7 @@ | ||||
|       <template slot="content"> | ||||
|         <ai-card title="基本信息"> | ||||
|           <template #right v-if="params.id"> | ||||
|             <span style="color:#2266FF;margin-left: 16px;cursor: pointer;font-size: 12px;" v-if="isEdit==true" @click="getDetail(),isEdit=false">取消</span> | ||||
|             <span style="color:#2266FF;margin-left: 16px;cursor: pointer;font-size: 12px;" v-if="isEdit==true" @click="getDetail(params.id),isEdit=false">取消</span> | ||||
|             <span style="color:#2266FF;margin-left: 16px;cursor: pointer;font-size: 12px;" v-if="isEdit==true" @click="confirm()">保存</span> | ||||
|           </template> | ||||
|           <template #content> | ||||
| @@ -69,7 +69,7 @@ | ||||
|       <template slot="content"> | ||||
|         <ai-card title="基本信息"> | ||||
|           <template #right> | ||||
|               <span style="color:#2266FF;cursor: pointer;font-size: 12px;" class="iconfont iconEdit" v-if="isEdit==false" @click="isEdit=true,forms=data">修改</span> | ||||
|               <span style="color:#2266FF;cursor: pointer;font-size: 12px;" class="iconfont iconEdit" v-if="isEdit==false" @click="edit">修改</span> | ||||
|             </template> | ||||
|           <template #content> | ||||
|             <ai-wrapper> | ||||
| @@ -141,6 +141,10 @@ export default { | ||||
|         isRefresh: !!isRefresh, | ||||
|       }) | ||||
|     }, | ||||
|     edit(){ | ||||
|       this.isEdit=true | ||||
|       this.forms=JSON.parse(JSON.stringify(this.data)) | ||||
|     }, | ||||
|     getDetail(id) { | ||||
|       this.instance.post(`/appcreditdishonestperson/queryDetailById?id=${id}`).then(res => { | ||||
|         if (res.code === 0) { | ||||
|   | ||||
| @@ -9,7 +9,7 @@ | ||||
|  | ||||
|         <ai-card title="基本信息"> | ||||
|           <template #right v-if="params.id"> | ||||
|             <span style="color:#2266FF;margin-left: 16px;cursor: pointer;font-size: 12px;" v-if="isEdit==true" @click="getDetail(),isEdit=false">取消</span> | ||||
|             <span style="color:#2266FF;margin-left: 16px;cursor: pointer;font-size: 12px;" v-if="isEdit==true" @click="getDetail(params.id),isEdit=false">取消</span> | ||||
|             <span style="color:#2266FF;margin-left: 16px;cursor: pointer;font-size: 12px;" v-if="isEdit==true" @click="confirm()">保存</span> | ||||
|           </template> | ||||
|           <template #content> | ||||
| @@ -30,7 +30,7 @@ | ||||
|               <el-row type="flex"> | ||||
|                 <el-col :span="12"> | ||||
|                   <el-form-item label="所在地区" prop="areaId"> | ||||
|                     <ai-area-get :instance="instance"  :fullname.sync="form.areaName" v-model="form.areaId" :root="user.info.areaId"></ai-area-get> | ||||
|                     <ai-area-get :instance="instance"  :fullname.sync="form.areaName" v-model="form.areaId" :root="user.info.areaId" ></ai-area-get> | ||||
|                   </el-form-item> | ||||
|                 </el-col> | ||||
|               </el-row> | ||||
| @@ -82,7 +82,7 @@ | ||||
|  | ||||
|         <ai-card title="基本信息"> | ||||
|           <template #right> | ||||
|               <span style="color:#2266FF;cursor: pointer;font-size: 12px;" class="iconfont iconEdit" v-if="isEdit==false" @click="isEdit=true,getDetail(),form=data">修改</span> | ||||
|               <span style="color:#2266FF;cursor: pointer;font-size: 12px;" class="iconfont iconEdit" v-if="isEdit==false" @click="edit">修改</span> | ||||
|             </template> | ||||
|           <template #content> | ||||
|             <ai-wrapper> | ||||
| @@ -228,6 +228,10 @@ export default { | ||||
|         isRefresh: !!isRefresh, | ||||
|       }) | ||||
|     }, | ||||
|     edit() { | ||||
|       this.isEdit=true | ||||
|       this.form = JSON.parse(JSON.stringify(this.data)) | ||||
|     }, | ||||
|     deleteBtn(row, index) { | ||||
|       console.log(row); | ||||
|       if(row.householdRelation == 11) { | ||||
| @@ -258,6 +262,7 @@ export default { | ||||
|           }else{//新增 | ||||
|             this.tableData.push(this.table) | ||||
|           } | ||||
|           | ||||
|           this.sysInfoDialog = false | ||||
|           this.$forceUpdate() | ||||
|         } | ||||
|   | ||||
| @@ -7,7 +7,7 @@ | ||||
|       <template #content> | ||||
|         <ai-card title="宅基地所有权信息"> | ||||
|           <template #right v-if="params.id"> | ||||
|             <span style="color:#2266FF;margin-left: 16px;cursor: pointer;font-size: 12px;" v-if="isEdit==true" @click="getDetail(),isEdit=false">取消</span> | ||||
|             <span style="color:#2266FF;margin-left: 16px;cursor: pointer;font-size: 12px;" v-if="isEdit==true" @click="getDetail(params.id),isEdit=false">取消</span> | ||||
|             <span style="color:#2266FF;margin-left: 16px;cursor: pointer;font-size: 12px;" v-if="isEdit==true" @click="confirm()">保存</span> | ||||
|           </template> | ||||
|           <template #content> | ||||
| @@ -80,7 +80,7 @@ | ||||
|       <template slot="content"> | ||||
|         <ai-card title="合同信息"> | ||||
|           <template #right> | ||||
|               <span style="color:#2266FF;cursor: pointer;font-size: 12px;" class="iconfont iconEdit" v-if="isEdit==false" @click="isEdit=true,form=data">修改</span> | ||||
|               <span style="color:#2266FF;cursor: pointer;font-size: 12px;" class="iconfont iconEdit" v-if="isEdit==false" @click="edit">修改</span> | ||||
|             </template> | ||||
|           <template #content> | ||||
|             <ai-wrapper> | ||||
| @@ -169,6 +169,10 @@ export default { | ||||
|         isRefresh: !!isRefresh, | ||||
|       }) | ||||
|     }, | ||||
|     edit() { | ||||
|       this.isEdit=true | ||||
|       this.form = JSON.parse(JSON.stringify(this.data)) | ||||
|     }, | ||||
|     getDetail(id) { | ||||
|       this.instance.post(`/apphomesteadinfo/queryDetailById?id=${id}`).then(res => { | ||||
|         if (res.code === 0) { | ||||
|   | ||||
| @@ -7,7 +7,7 @@ | ||||
|       <template #content> | ||||
|         <ai-card title="合同信息"> | ||||
|           <template #right v-if="params.id"> | ||||
|             <span style="color:#2266FF;margin-left: 16px;cursor: pointer;font-size: 12px;" v-if="isEdit==true" @click="getDetail(),isEdit=false">取消</span> | ||||
|             <span style="color:#2266FF;margin-left: 16px;cursor: pointer;font-size: 12px;" v-if="isEdit==true" @click="getDetail(params.id),isEdit=false">取消</span> | ||||
|             <span style="color:#2266FF;margin-left: 16px;cursor: pointer;font-size: 12px;" v-if="isEdit==true" @click="confirm()">保存</span> | ||||
|           </template> | ||||
|           <template #content> | ||||
| @@ -99,7 +99,7 @@ | ||||
|       <template slot="content"> | ||||
|         <ai-card title="基本信息"> | ||||
|           <template #right> | ||||
|               <span style="color:#2266FF;cursor: pointer;font-size: 12px;" class="iconfont iconEdit" v-if="isEdit==false" @click="isEdit=true,form=data">修改</span> | ||||
|               <span style="color:#2266FF;cursor: pointer;font-size: 12px;" class="iconfont iconEdit" v-if="isEdit==false" @click="edit">修改</span> | ||||
|             </template> | ||||
|           <template #content> | ||||
|             <ai-wrapper> | ||||
| @@ -214,6 +214,10 @@ export default { | ||||
|         isRefresh: !!isRefresh, | ||||
|       }) | ||||
|     }, | ||||
|     edit() { | ||||
|       this.isEdit=true | ||||
|       this.form = JSON.parse(JSON.stringify(this.data)) | ||||
|     }, | ||||
|     getDetail(id) { | ||||
|       this.instance.post(`/applandcirculateinfo/queryDetailById?id=${id}`).then(res => { | ||||
|         if (res.code === 0) { | ||||
|   | ||||
| @@ -7,7 +7,7 @@ | ||||
|       <template slot="content"> | ||||
|         <ai-card title="基本信息"> | ||||
|           <template #right v-if="params.id"> | ||||
|             <span style="color:#2266FF;margin-left: 16px;cursor: pointer;font-size: 12px;" v-if="isEdit==true" @click="getDetail(),isEdit=false">取消</span> | ||||
|             <span style="color:#2266FF;margin-left: 16px;cursor: pointer;font-size: 12px;" v-if="isEdit==true" @click="getDetail(params.id),isEdit=false">取消</span> | ||||
|             <span style="color:#2266FF;margin-left: 16px;cursor: pointer;font-size: 12px;" v-if="isEdit==true" @click="confirm()">保存</span> | ||||
|           </template> | ||||
|           <template #content> | ||||
| @@ -59,7 +59,7 @@ | ||||
|       <template slot="content"> | ||||
|         <ai-card title="基本信息"> | ||||
|           <template #right> | ||||
|               <span style="color:#2266FF;cursor: pointer;font-size: 12px;" class="iconfont iconEdit" v-if="isEdit==false" @click="isEdit=true,forms=data">修改</span> | ||||
|               <span style="color:#2266FF;cursor: pointer;font-size: 12px;" class="iconfont iconEdit" v-if="isEdit==false" @click="edit">修改</span> | ||||
|             </template> | ||||
|           <template #content> | ||||
|             <ai-wrapper> | ||||
| @@ -139,6 +139,10 @@ export default { | ||||
|         isRefresh: !!isRefresh, | ||||
|       }) | ||||
|     }, | ||||
|     edit() { | ||||
|       this.isEdit=true | ||||
|       this.forms = JSON.parse(JSON.stringify(this.data)) | ||||
|     }, | ||||
|     getDetail(id) { | ||||
|       this.instance.post(`/appcreditpublicutilitiesarrears/queryDetailById?id=${id}`).then(res => { | ||||
|         if (res.code === 0) { | ||||
|   | ||||
| @@ -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.arrearsSubject" clearable @clear="page.current = 1, search.arrearsSubject = '',getTableData()"  | ||||
|             <el-input size="small" placeholder="欠费主体/统一信用社会代码" v-model="search.organizationName" clearable @clear="page.current = 1, search.organizationName = '',getTableData()"  | ||||
|             suffix-icon="iconfont iconSearch" v-throttle="() => {(page.current = 1), getTableData();}"/> | ||||
|             <ai-import :instance="instance" :dict="dict" importUrl="/appcreditpublicutilitiesarrears/import" url="/appcreditpublicutilitiesarrears/downloadTemplate" name="公共事业欠费信息" @success="getTableData(), $message.success('导入成功!')"> | ||||
|               <el-button size="small">导入</el-button> | ||||
| @@ -43,7 +43,7 @@ export default { | ||||
|   }, | ||||
|   data() { | ||||
|     return { | ||||
|       search: {arrearsSubject: ""}, | ||||
|       search: {organizationName: ""}, | ||||
|       page: {current: 1, size: 10, total: 0}, | ||||
|       tableData: [], | ||||
|     } | ||||
|   | ||||
| @@ -7,7 +7,7 @@ | ||||
|       <template slot="content"> | ||||
|         <ai-card title="基本信息"> | ||||
|           <template #right v-if="params.id"> | ||||
|             <span style="color:#2266FF;margin-left: 16px;cursor: pointer;font-size: 12px;" v-if="isEdit==true" @click="getDetail(),isEdit=false">取消</span> | ||||
|             <span style="color:#2266FF;margin-left: 16px;cursor: pointer;font-size: 12px;" v-if="isEdit==true" @click="getDetail(params.id),isEdit=false">取消</span> | ||||
|             <span style="color:#2266FF;margin-left: 16px;cursor: pointer;font-size: 12px;" v-if="isEdit==true" @click="confirm()">保存</span> | ||||
|           </template> | ||||
|           <template #content> | ||||
| @@ -70,7 +70,7 @@ | ||||
|       <template slot="content"> | ||||
|         <ai-card title="基本信息"> | ||||
|           <template #right> | ||||
|               <span style="color:#2266FF;cursor: pointer;font-size: 12px;" class="iconfont iconEdit" v-if="isEdit==false" @click="isEdit=true,forms=data">修改</span> | ||||
|               <span style="color:#2266FF;cursor: pointer;font-size: 12px;" class="iconfont iconEdit" v-if="isEdit==false" @click="edit">修改</span> | ||||
|             </template> | ||||
|           <template #content> | ||||
|             <ai-wrapper> | ||||
| @@ -142,6 +142,10 @@ export default { | ||||
|         isRefresh: !!isRefresh, | ||||
|       }) | ||||
|     }, | ||||
|     edit() { | ||||
|       this.isEdit=true | ||||
|       this.forms = JSON.parse(JSON.stringify(this.data)) | ||||
|     }, | ||||
|     getDetail(id) { | ||||
|       this.instance.post(`/appcredittaxinfo/queryDetailById?id=${id}`).then(res => { | ||||
|         if (res.code === 0) { | ||||
|   | ||||
| @@ -61,7 +61,7 @@ export default { | ||||
|   }, | ||||
|   data() { | ||||
|     return { | ||||
|       search: {name: ""}, | ||||
|       search: {status: '',applyType: '',applyTime: '',enterpriseName:''}, | ||||
|       page: {current: 1, size: 10, total: 0}, | ||||
|       tableData: [], | ||||
|       colConfigs: [ | ||||
|   | ||||
| @@ -136,9 +136,9 @@ export default { | ||||
|     getTableData() { | ||||
|       this.instance.post(`/appfinancingdemand/staticFinancialDemandByOrganization?areaId=${this.search.areaId}&organizationId=${this.search.organizationId}`).then(res => { | ||||
|         if (res?.data) { | ||||
|           if (res.data['对接成功率(%)']) { | ||||
|             res.data['对接成功率(%)'] = Number(res.data['对接成功率(%)'] * 100) + '%' | ||||
|           } | ||||
|           // if (res.data['对接成功率(%)']) { | ||||
|           //   res.data['对接成功率(%)'] = Number(res.data['对接成功率(%)'] * 100) + '%' | ||||
|           // } | ||||
|           this.cloList = res.data | ||||
|         } | ||||
|       }) | ||||
|   | ||||
		Reference in New Issue
	
	Block a user