bug

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},

project/xiushan/apps/creditScore/scorePersonal/detail.vue

@@ -68,9 +68,11 @@ export default {
       tableData: []
     }
   },
-  created() {
+  mounted() {
-    this.getInfo()
+    this.$dict.load(['atWillReportType']).then(() => {
-    this.getList()
+      this.getInfo()
+      this.getList()
+    });
   },
   computed: {
     colConfigs() {
@@ -81,10 +83,12 @@ export default {
           align: 'left'
         },
         {
-          prop: 'doType',
+          prop: "bizType",
+          label: "类型",
+          width: 160,
           align: 'center',
-          label: '类型',
+          formart: (bizType) =>
-          dict:"integralDetailType",
+            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

project/xiushan/apps/creditScore/scorePersonal/spList.vue

@@ -32,7 +32,8 @@
           <el-table-column label="操作" slot="options" fixed="right" align="center" width="180">
             <template v-slot="{row}">
               <div class="table-options">
-                <el-button type="text" :disabled="!$permissions('app_appvillagerintegralfamily_detail')" title="详情"
+                <!-- :disabled="!$permissions('app_appvillagerintegralfamily_detail')" -->
+                <el-button type="text"  title="详情"
                            @click="goDetail(row)">详情
                 </el-button>
               </div>

project/xiushan/apps/finance/AppLoanAudit/loanDetail.vue

@@ -28,7 +28,7 @@
                   <el-row type="flex">
                     {{ detail.enterpriseName }}
                     <el-link type="primary"
-                             @click="$router.push({name:'973f0339e5904d99bc8afe86b8cf4e9c',query:{id:detail.enterpriseId}})">
+                             @click="isShow=true">
                       企业详情
                     </el-link>
                   </el-row>
@@ -90,6 +90,81 @@
         </el-form-item>
       </el-form>
     </ai-dialog>
+    <ai-dialog
+      class="dialog"
+      :title="info.enterpriseName"
+      :visible.sync="isShow"
+      @close="isShow = false"
+      @onConfirm="isShow = false"
+      width="1200px">
+      <div class="top">
+        <div class="top-left">{{ info.subEnterpriseName }}</div>
+        <div class="top-right">
+          <div class="top-right__top">
+            <h2>{{ info.enterpriseName }}</h2>
+            <!-- <div class="right">
+              <span>下载报告</span>
+            </div> -->
+          </div>
+          <div class="top-right__bottom">
+            <ai-wrapper
+              label-width="130px">
+              <ai-info-item label="法人姓名："><span style="color: #1890FF;">{{ info.legalPersonName }}</span></ai-info-item>
+              <ai-info-item label="企业类型：" :value="$dict.getLabel('enterpriseType', info.enterpriseType)"></ai-info-item>
+              <ai-info-item label="统一社会信用代码：" :value="info.unifiedCode"></ai-info-item>
+              <ai-info-item label="地址：" isLine :value="info.areaName + info.address"></ai-info-item>
+              <ai-info-item label="经营范围：" isLine :value="info.businessScope"></ai-info-item>
+            </ai-wrapper>
+          </div>
+        </div>
+      </div>
+      <div class="bottom">
+        <div class="tab">
+          <span :class="[currIndex === 0 ? 'active' : '']" @click="currIndex = 0">行政许可</span>
+          <span :class="[currIndex === 1 ? 'active' : '']" @click="currIndex = 1">行政处罚</span>
+          <span :class="[currIndex === 2 ? 'active' : '']" @click="currIndex = 2">良好信息</span>
+          <span :class="[currIndex === 3 ? 'active' : '']" @click="currIndex = 3">失信信息</span>
+        </div>
+        <div class="table">
+          <ai-table
+            v-show="currIndex === 0"
+            :tableData="info.adminstrativeLicenseList"
+            :col-configs="colConfigs1"
+            :isShowPagination="false"
+            border
+            tableSize="small"
+            @getList="() => {}">
+          </ai-table>
+          <ai-table
+            v-show="currIndex === 1"
+            :tableData="info.administrativeSanctionList"
+            :col-configs="colConfigs2"
+            :isShowPagination="false"
+            border
+            tableSize="small"
+            @getList="() => {}">
+          </ai-table>
+          <ai-table
+            v-show="currIndex === 2"
+            :tableData="info.taxInfoList"
+            :col-configs="colConfigs3"
+            :isShowPagination="false"
+            border
+            tableSize="small"
+            @getList="() => {}">
+          </ai-table>
+          <ai-table
+            v-show="currIndex === 3"
+            :tableData="info.dishonestPersonList"
+            :col-configs="colConfigs4"
+            :isShowPagination="false"
+            border
+            tableSize="small"
+            @getList="() => {}">
+          </ai-table>
+        </div>
+      </div>
+    </ai-dialog>
   </section>
 </template>
 
@@ -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;
+      }
+    }
+  }
 }
 </style>

project/xiushan/apps/financing/AppFinancingNeeds/needsDetail.vue

@@ -27,7 +27,7 @@
                   <el-row type="flex">
                     {{ detail.enterpriseName }}
                     <el-link type="primary"
-                             @click="$router.push({name:'973f0339e5904d99bc8afe86b8cf4e9c',query:{id:detail.enterpriseId}})">
+                             @click="isShow=true">
                       企业详情
                     </el-link>
                   </el-row>
@@ -43,7 +43,83 @@
             </template>
           </ai-card>
         </el-form>
+        <ai-dialog
+          class="dialog"
+          :title="info.enterpriseName"
+          :visible.sync="isShow"
+          @close="isShow = false"
+          @onConfirm="isShow = false"
+          width="1200px">
+          <div class="top">
+            <div class="top-left">{{ info.subEnterpriseName }}</div>
+            <div class="top-right">
+              <div class="top-right__top">
+                <h2>{{ info.enterpriseName }}</h2>
+                <!-- <div class="right">
+                  <span>下载报告</span>
+                </div> -->
+              </div>
+              <div class="top-right__bottom">
+                <ai-wrapper
+                  label-width="130px">
+                  <ai-info-item label="法人姓名："><span style="color: #1890FF;">{{ info.legalPersonName }}</span></ai-info-item>
+                  <ai-info-item label="企业类型：" :value="$dict.getLabel('enterpriseType', info.enterpriseType)"></ai-info-item>
+                  <ai-info-item label="统一社会信用代码：" :value="info.unifiedCode"></ai-info-item>
+                  <ai-info-item label="地址：" isLine :value="info.areaName + info.address"></ai-info-item>
+                  <ai-info-item label="经营范围：" isLine :value="info.businessScope"></ai-info-item>
+                </ai-wrapper>
+              </div>
+            </div>
+          </div>
+          <div class="bottom">
+            <div class="tab">
+              <span :class="[currIndex === 0 ? 'active' : '']" @click="currIndex = 0">行政许可</span>
+              <span :class="[currIndex === 1 ? 'active' : '']" @click="currIndex = 1">行政处罚</span>
+              <span :class="[currIndex === 2 ? 'active' : '']" @click="currIndex = 2">良好信息</span>
+              <span :class="[currIndex === 3 ? 'active' : '']" @click="currIndex = 3">失信信息</span>
+            </div>
+            <div class="table">
+              <ai-table
+                v-show="currIndex === 0"
+                :tableData="info.adminstrativeLicenseList"
+                :col-configs="colConfigs1"
+                :isShowPagination="false"
+                border
+                tableSize="small"
+                @getList="() => {}">
+              </ai-table>
+              <ai-table
+                v-show="currIndex === 1"
+                :tableData="info.administrativeSanctionList"
+                :col-configs="colConfigs2"
+                :isShowPagination="false"
+                border
+                tableSize="small"
+                @getList="() => {}">
+              </ai-table>
+              <ai-table
+                v-show="currIndex === 2"
+                :tableData="info.taxInfoList"
+                :col-configs="colConfigs3"
+                :isShowPagination="false"
+                border
+                tableSize="small"
+                @getList="() => {}">
+              </ai-table>
+              <ai-table
+                v-show="currIndex === 3"
+                :tableData="info.dishonestPersonList"
+                :col-configs="colConfigs4"
+                :isShowPagination="false"
+                border
+                tableSize="small"
+                @getList="() => {}">
+              </ai-table>
+            </div>
+          </div>
+        </ai-dialog>
       </template>
+      
     </ai-detail>
   </section>
 </template>
@@ -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;
+      }
+    }
+  }
 }
 </style>

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;
     }
   }
+  
 
 }
 </style>

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() {

project/xiushan/apps/processManagement/mattersConfig/components/attachmentMaterial.vue

@@ -39,7 +39,7 @@
         <template slot-scope="scope">
           <el-switch
               v-model="scope.row.mustFill"
-              active-value="0" inactive-value="1"
+              active-value="1" inactive-value="0"
               active-color="#D0D4DC"
               inactive-color="#5088FF">
           </el-switch>

project/xiushan/apps/processManagement/mattersConfig/components/baseInfo.vue

@@ -41,7 +41,7 @@
         <el-switch
             v-model="form.processDefStatus"
             active-color="#D0D4DC"
-            inactive-color="#5088FF" active-value="0" inactive-value="1">
+            inactive-color="#5088FF" active-value="1" inactive-value="0">
         </el-switch>
       </el-form-item>
     </el-form>