diff --git a/project/xiushan/apps/AppPortalUser/pumDetail.vue b/project/xiushan/apps/AppPortalUser/pumDetail.vue index e63b9fb2..40b6ee21 100644 --- a/project/xiushan/apps/AppPortalUser/pumDetail.vue +++ b/project/xiushan/apps/AppPortalUser/pumDetail.vue @@ -116,7 +116,8 @@ export default { data() { return { detail: {}, - menuList: ['基本信息','股权结构'], + menuList: ['基本信息'], + // menuList: ['基本信息','股权结构'], index: 0, tableData: [], page: {current: 1, size: 10, total: 0}, diff --git a/project/xiushan/apps/creditScore/scorePersonal/detail.vue b/project/xiushan/apps/creditScore/scorePersonal/detail.vue index 17b32950..34936e40 100644 --- a/project/xiushan/apps/creditScore/scorePersonal/detail.vue +++ b/project/xiushan/apps/creditScore/scorePersonal/detail.vue @@ -68,9 +68,11 @@ export default { tableData: [] } }, - created() { - this.getInfo() - this.getList() + mounted() { + this.$dict.load(['atWillReportType']).then(() => { + this.getInfo() + this.getList() + }); }, computed: { colConfigs() { @@ -81,10 +83,12 @@ export default { align: 'left' }, { - prop: 'doType', + prop: "bizType", + label: "类型", + width: 160, align: 'center', - label: '类型', - dict:"integralDetailType", + formart: (bizType) => + this.dict.getLabel("integralDetailType", bizType), }, { prop: 'changeIntegral', @@ -116,7 +120,7 @@ export default { getList() { let {id: portalUserId} = this.$route.query this.instance.post(`/appvillagerintegraldetail/list`, null, { - params: {...this.page, portalUserId} + params: {...this.page, portalUserId, bizType: this.doType} }).then(res => { if (res?.data) { this.tableData = res.data.records diff --git a/project/xiushan/apps/creditScore/scorePersonal/spList.vue b/project/xiushan/apps/creditScore/scorePersonal/spList.vue index 8eae750c..1ea77a53 100644 --- a/project/xiushan/apps/creditScore/scorePersonal/spList.vue +++ b/project/xiushan/apps/creditScore/scorePersonal/spList.vue @@ -32,7 +32,8 @@ @@ -126,7 +201,43 @@ export default { auditLifespan: [{required: true, message: "请选择 使用期限"}], loanDate: [{required: true, message: "请选择 放款日期"}], auditDescription: [{required: true, message: "请输入 审批意见"}], - } + }, + info: {}, + currIndex: 0, + isShow: false, + colConfigs1: [ + { prop: 'licenseCode', label: '行政许可决定文书号' }, + { prop: 'decisionDate', align: 'center', label: '许可决定日期' }, + { prop: 'endDate', align: 'center', label: '许可有效期至' }, + { prop: 'licenseOrganization', align: 'center', label: '许可机关' }, + { prop: 'licenseContent', align: 'center', label: '许可内容' }, + { prop: 'createTime', align: 'center', label: '数据更新时间' } + ], + colConfigs2: [ + { prop: 'sanctionCode', width: '190', label: '行政处罚决定文书号' }, + { prop: 'sanctionDate', align: 'center', label: '处罚决定日期' }, + { prop: 'sanctionType', align: 'center', label: '处罚类型', formart: v => this.$dict.getLabel('administrativeSanctionType', v) }, + { prop: 'sanctionContent', align: 'center', label: '处罚内容' }, + { prop: 'sanctionBasis', align: 'center', label: '处罚依据' }, + { prop: 'sanctionOrganization', align: 'center', label: '处罚机关' }, + { prop: 'createTime', align: 'center', label: '数据更新时间' } + ], + colConfigs3: [ + { prop: 'taxpayer', label: '纳税人名称' }, + { prop: 'taxpayerNumber', align: 'center', label: '纳税人识别号' }, + { prop: 'taxLevel', align: 'center', label: '纳税人等级' }, + { prop: 'taxYear', align: 'center', label: '年份' }, + { prop: 'evaluationUnit', align: 'center', label: '评价单位' }, + { prop: 'createTime', align: 'center', label: '数据更新时间' } + ], + colConfigs4: [ + { prop: 'executionCode', label: '执行案号' }, + { prop: 'executionTime', align: 'center', label: '执行时间' }, + { prop: 'dishonestFact', align: 'center', label: '失信事实' }, + { prop: 'executionSituation', align: 'center', label: '履行情况', formart: v => this.$dict.getLabel('dishonestPersonSituation', v) }, + { prop: 'executionCourt', align: 'center', label: '执行法院' }, + { prop: 'executionTime', align: 'center', label: '数据更新时间' } + ], } }, methods: { @@ -137,6 +248,19 @@ export default { }).then(res => { if (res?.data) { this.detail = res.data + if(this.detail.enterpriseId) { + this.getCompanyInfo() + } + } + }) + }, + getCompanyInfo() { + this.instance.post(`/appportaluserenterprise/queryCreditEnterpriseDetailById?id=${this.detail.enterpriseId}`, null, { + withoutToken: true + }).then(res => { + if (res.code === 0) { + this.info = res.data + this.info.subEnterpriseName = res.data.enterpriseName.substr(0, 4) } }) }, @@ -183,5 +307,115 @@ export default { .el-date-editor { width: 100%; } + + .dialog { + .top { + display: flex; + margin-bottom: 20px; + padding: 34px 30px 16px; + border: 1px solid #EEEEEE; + border-radius: 4px; + + .top-left { + display: flex; + align-items: center; + justify-content: center; + flex-shrink: 1; + width: 88px; + height: 87px; + line-height: 1.3; + margin-right: 31px; + padding: 0 16px; + text-align: justify; + background: #8CA3CD; + color: #FFFFFF; + font-size: 22px; + letter-spacing: 6px; + border-radius: 8px; + } + + .top-right { + flex: 1; + + .top-right__top { + display: flex; + align-items: center; + justify-content: space-between; + margin-bottom: 27px; + + h2 { + color: #333333; + font-size: 22px; + } + + .right { + display: flex; + align-items: center; + justify-content: center; + width: 97px; + height: 32px; + background: #E8F4FF; + border: 1px solid #A3D3FF; + border-radius: 3px; + color: #1890FF; + font-size: 13px; + cursor: pointer; + + &:hover { + opacity: 0.6; + } + } + } + + .top-right__bottom { + padding: 16px 10px 10px 0; + background: #F6FBFF; + } + } + } + + .bottom { + padding-bottom: 20px; + border: 1px solid #DCDFE6; + border-radius: 4px; + + .tab { + display: flex; + align-items: center; + height: 60px; + margin-bottom: 15px; + background: #FAFAFA; + border-radius: 4px; + + span { + flex: 1; + height: 100%; + line-height: 60px; + text-align: center; + color: #555555; + font-size: 16px; + cursor: pointer; + border-bottom: 1px solid #DCDFE6; + border-right: 1px solid #DCDFE6; + transition: all ease 0.3s; + user-select: none; + + &:last-child { + border-right: none; + } + + &.active { + border-bottom: 1px solid transparent; + background: #fff; + color: #1890FF; + } + } + } + + .table { + padding: 0 16px; + } + } + } } diff --git a/project/xiushan/apps/financing/AppFinancingNeeds/needsDetail.vue b/project/xiushan/apps/financing/AppFinancingNeeds/needsDetail.vue index 3fe83f94..c1e1af5d 100644 --- a/project/xiushan/apps/financing/AppFinancingNeeds/needsDetail.vue +++ b/project/xiushan/apps/financing/AppFinancingNeeds/needsDetail.vue @@ -27,7 +27,7 @@ {{ detail.enterpriseName }} + @click="isShow=true"> 企业详情 @@ -43,7 +43,83 @@ + +
+
{{ info.subEnterpriseName }}
+
+
+

{{ info.enterpriseName }}

+ +
+
+ + {{ info.legalPersonName }} + + + + + +
+
+
+
+
+ 行政许可 + 行政处罚 + 良好信息 + 失信信息 +
+
+ + + + + + + + +
+
+
+ @@ -67,6 +143,42 @@ export default { data() { return { detail: {}, + info: {}, + currIndex: 0, + isShow: false, + colConfigs1: [ + { prop: 'licenseCode', label: '行政许可决定文书号' }, + { prop: 'decisionDate', align: 'center', label: '许可决定日期' }, + { prop: 'endDate', align: 'center', label: '许可有效期至' }, + { prop: 'licenseOrganization', align: 'center', label: '许可机关' }, + { prop: 'licenseContent', align: 'center', label: '许可内容' }, + { prop: 'createTime', align: 'center', label: '数据更新时间' } + ], + colConfigs2: [ + { prop: 'sanctionCode', width: '190', label: '行政处罚决定文书号' }, + { prop: 'sanctionDate', align: 'center', label: '处罚决定日期' }, + { prop: 'sanctionType', align: 'center', label: '处罚类型', formart: v => this.$dict.getLabel('administrativeSanctionType', v) }, + { prop: 'sanctionContent', align: 'center', label: '处罚内容' }, + { prop: 'sanctionBasis', align: 'center', label: '处罚依据' }, + { prop: 'sanctionOrganization', align: 'center', label: '处罚机关' }, + { prop: 'createTime', align: 'center', label: '数据更新时间' } + ], + colConfigs3: [ + { prop: 'taxpayer', label: '纳税人名称' }, + { prop: 'taxpayerNumber', align: 'center', label: '纳税人识别号' }, + { prop: 'taxLevel', align: 'center', label: '纳税人等级' }, + { prop: 'taxYear', align: 'center', label: '年份' }, + { prop: 'evaluationUnit', align: 'center', label: '评价单位' }, + { prop: 'createTime', align: 'center', label: '数据更新时间' } + ], + colConfigs4: [ + { prop: 'executionCode', label: '执行案号' }, + { prop: 'executionTime', align: 'center', label: '执行时间' }, + { prop: 'dishonestFact', align: 'center', label: '失信事实' }, + { prop: 'executionSituation', align: 'center', label: '履行情况', formart: v => this.$dict.getLabel('dishonestPersonSituation', v) }, + { prop: 'executionCourt', align: 'center', label: '执行法院' }, + { prop: 'executionTime', align: 'center', label: '数据更新时间' } + ], } }, methods: { @@ -77,6 +189,19 @@ export default { }).then(res => { if (res?.data) { this.detail = res.data + if(this.detail.enterpriseId) { + this.getCompanyInfo() + } + } + }) + }, + getCompanyInfo() { + this.instance.post(`/appportaluserenterprise/queryCreditEnterpriseDetailById?id=${this.detail.enterpriseId}`, null, { + withoutToken: true + }).then(res => { + if (res.code === 0) { + this.info = res.data + this.info.subEnterpriseName = res.data.enterpriseName.substr(0, 4) } }) }, @@ -123,5 +248,115 @@ export default { width: 50%; } } + + .dialog { + .top { + display: flex; + margin-bottom: 20px; + padding: 34px 30px 16px; + border: 1px solid #EEEEEE; + border-radius: 4px; + + .top-left { + display: flex; + align-items: center; + justify-content: center; + flex-shrink: 1; + width: 88px; + height: 87px; + line-height: 1.3; + margin-right: 31px; + padding: 0 16px; + text-align: justify; + background: #8CA3CD; + color: #FFFFFF; + font-size: 22px; + letter-spacing: 6px; + border-radius: 8px; + } + + .top-right { + flex: 1; + + .top-right__top { + display: flex; + align-items: center; + justify-content: space-between; + margin-bottom: 27px; + + h2 { + color: #333333; + font-size: 22px; + } + + .right { + display: flex; + align-items: center; + justify-content: center; + width: 97px; + height: 32px; + background: #E8F4FF; + border: 1px solid #A3D3FF; + border-radius: 3px; + color: #1890FF; + font-size: 13px; + cursor: pointer; + + &:hover { + opacity: 0.6; + } + } + } + + .top-right__bottom { + padding: 16px 10px 10px 0; + background: #F6FBFF; + } + } + } + + .bottom { + padding-bottom: 20px; + border: 1px solid #DCDFE6; + border-radius: 4px; + + .tab { + display: flex; + align-items: center; + height: 60px; + margin-bottom: 15px; + background: #FAFAFA; + border-radius: 4px; + + span { + flex: 1; + height: 100%; + line-height: 60px; + text-align: center; + color: #555555; + font-size: 16px; + cursor: pointer; + border-bottom: 1px solid #DCDFE6; + border-right: 1px solid #DCDFE6; + transition: all ease 0.3s; + user-select: none; + + &:last-child { + border-right: none; + } + + &.active { + border-bottom: 1px solid transparent; + background: #fff; + color: #1890FF; + } + } + } + + .table { + padding: 0 16px; + } + } + } } diff --git a/project/xiushan/apps/processManagement/approvalManage/components/approvalDetail.vue b/project/xiushan/apps/processManagement/approvalManage/components/approvalDetail.vue index 342859a3..5873f19b 100644 --- a/project/xiushan/apps/processManagement/approvalManage/components/approvalDetail.vue +++ b/project/xiushan/apps/processManagement/approvalManage/components/approvalDetail.vue @@ -700,9 +700,11 @@ export default { background: #F7F7F7; border: 1px solid #DDDDDD; padding: 20px; + text-align: center; + width: 100%; .el-image { - width: 100%; + width: 100%!important; height: 100%; background: #fff; border: 1px solid #EEEEEE; @@ -1157,6 +1159,7 @@ export default { justify-content: flex-end; } } + } diff --git a/project/xiushan/apps/processManagement/mattersConfig/AppMattersConfig.vue b/project/xiushan/apps/processManagement/mattersConfig/AppMattersConfig.vue index fe81bdc6..0c98ee64 100644 --- a/project/xiushan/apps/processManagement/mattersConfig/AppMattersConfig.vue +++ b/project/xiushan/apps/processManagement/mattersConfig/AppMattersConfig.vue @@ -44,7 +44,7 @@ export default { tabs() { return [ {label: "网上办事", name: "configList", value: "0", comp: configList, detail: addConfig, permission: ""}, - {label: "办事指南", name: "configList", value: "2", comp: configList, detail: guidance, permission: ""}, + // {label: "办事指南", name: "configList", value: "2", comp: configList, detail: guidance, permission: ""}, ] }, currentTab() { diff --git a/project/xiushan/apps/processManagement/mattersConfig/components/attachmentMaterial.vue b/project/xiushan/apps/processManagement/mattersConfig/components/attachmentMaterial.vue index 24ed601b..9a4c5aff 100644 --- a/project/xiushan/apps/processManagement/mattersConfig/components/attachmentMaterial.vue +++ b/project/xiushan/apps/processManagement/mattersConfig/components/attachmentMaterial.vue @@ -39,7 +39,7 @@