Merge branch 'master' of http://47.107.61.133:3000/nm-project/aiccs

src/views/comprehensive/details.vue

@@ -566,7 +566,9 @@
           <span v-if="eOtPermitList.length === 0" class="header-label">该企业暂没有行政许可信息</span>
         </div>
       </el-tab-pane> -->
-      <el-tab-pane label="年度报告信息" name="fourth" />
+      <el-tab-pane label="年度报告信息" name="fourth">
+        <iframe v-if="activeName === 'fourth'" style="width: 100%;height: calc(100vh - 250px);" :src="iframeURL" frameborder="0" />
+      </el-tab-pane>
       <el-tab-pane label="异常经营目录" name="abnormal">
         <div v-if="activeName === 'abnormal'" class="tab-pane">
           <table v-if="isAbnListDetails === true" class="apply-table" wdith="100%">
@@ -960,6 +962,7 @@ import { getAssignLogList } from '@/api/marketAssign'
 import EasyForm from '@/components/EasyForm'
 import dynamicSupervisionBase from '@/views/market/dynamicsupervision/index'
 import dailySupervisionBase from '@/views/market/dailysupervision/index'
+import { oauth } from '@/api/user'
 
 export default {
   components: {
@@ -1029,7 +1032,8 @@ export default {
           readOnly: true
         }
       },
-      fromPath: ''
+      fromPath: '',
+      iframeURL: ''
     }
   },
   mounted() {
@@ -1218,8 +1222,14 @@ export default {
     handleClick(tab, event) {
       console.log(this.activeName)
       this.loading = true
-      if((this.activeName === 'administrativeSanction' || this.activeName === 'bizSerIllegalRem')
+      if (this.activeName === 'fourth') {
-        && !this.isRead1){
+        oauth().then((res) => {
+          const { data } = res
+          const path = `/annualReportService/unifiedMGT/annualReportProgress/baseInfo/detail?pripid=${this.$route.query.pripid}&yearReportMode=1`
+          this.iframeURL = `${process.env.VUE_APP_AICEPS_SERVICE_URL || ''}/aiceps-service-web/#/oauthLogin?redirectUri=${encodeURIComponent(path)}&isIframe=1&encryptedData=${data}`
+        })
+      } else if ((this.activeName === 'administrativeSanction' || this.activeName === 'bizSerIllegalRem') &&
+        !this.isRead1) {
         const p4 = queryEOtCaseDetails(this.pripid).then(res => {
           if (res.code === 0) {
             const data = res.data.tsSerIllegalList

src/views/todo/index.vue

@@ -693,7 +693,7 @@
                     />
                   </el-select>
                 </el-col>
-                <el-col :span="14">
+                <el-col :span="10">
                   <label class="label-name_3u">倒计时工作日：</label>
                   <el-switch
                     v-model="searchForm.gzrNumSwitch"
@@ -703,6 +703,18 @@
                   <el-input-number v-model="searchForm.gzrNum" size="mini" :min="-1" :max="4" />
                 </el-col>
               </el-row>
+              <el-row style="margin:10px;margin-left: 50px">
+                <el-col :span="10">
+                  <label class="label-name_3u">是否显示下级单位待办：</label>
+                  <span>否</span>
+                  <el-switch
+                    v-model="searchForm.childUnitSwitch"
+                    active-color="#13ce66"
+                    inactive-color="#ff4949"
+                  />
+                  <span>是</span>
+                </el-col>
+              </el-row>
               <el-col :span="24" :offset="1" style="margin-bottom: 10px;margin-top: 10px;">
                 <div class="btn-box" style="font-size: 14px">
                   <el-button type="primary" size="mini" @click="search">查询</el-button>
@@ -2721,15 +2733,13 @@
 </template>
 
 <script>
-import { taskCommonPage, taskUnionPage, taskUnionPageStatistic, checkPrint } from '@/api/task'
+import { taskUnionPage, taskUnionPageStatistic, checkPrint } from '@/api/task'
 import {
   saveAbnormalAccept,
-  getRegulatory,
   checkoutToincludeabn,
   batchReviewAndExamine,
   isPassDissentApply
 } from '@/api/abnormal'
-import { queryOlderP } from '@/api/updatePassword'
 import { getUsersWithPermission } from '@/api/user'
 import { batchJyycxfShAndSp, batchYzfwShAndSp, batchShAndSp, getRemInfoByBatch } from '@/api/credit'
 import { isMenHu } from '@/utils/utils'
@@ -2861,6 +2871,7 @@ export default {
         busstatus: '',
         currentNodeOrBizStatus: '',
         gzrNumSwitch: false,
+        childUnitSwitch: false,
         gzrNum: 0
       },
       loading: false,
@@ -3539,6 +3550,7 @@ export default {
           break
           // 严重违法名录列入
         case '15':
+          // eslint-disable-next-line no-case-declarations
           let path = ''
           if (row.currentNodeOrBizStatus === 'accept') {
             path = 'accept'
@@ -3558,6 +3570,7 @@ export default {
           break
           // 严重违法名录异议
         case '16':
+          // eslint-disable-next-line no-case-declarations
           const page = row.currentNodeOrBizStatus === 'acceptDissentEnter' ? 'applyAccept' : row.currentNodeOrBizStatus === 'handleDissentAccept' ? 'applyExamine' : 'approvalExamine'
           this.$router.push({
             path: `/illegal/dissent/${page}`,