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

src/views/comprehensive/details.vue

@@ -92,12 +92,12 @@
               广州天河科技股份有限公司
             </td>
           </tr> -->
-<!--            <tr>-->
+            <!--            <tr>-->
-<!--              <th>联系电话</th>-->
+            <!--              <th>联系电话</th>-->
-<!--              <td>-->
+            <!--              <td>-->
-<!--                {{ entInfo.phone }}-->
+            <!--                {{ entInfo.phone }}-->
-<!--              </td>-->
+            <!--              </td>-->
-<!--            </tr>-->
+            <!--            </tr>-->
             <!-- <tr>
             <th>手机号码：</th>
             <td>
@@ -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%">
@@ -870,7 +872,7 @@
         </el-table>
         <span v-if="eAlterRecoder.length === 0" class="header-label">该企业暂没有变更记录</span>
       </el-tab-pane>
-      <el-tab-pane  v-if="showTab1" label="联系方式" name="contactInfoa">
+      <el-tab-pane v-if="showTab1" label="联系方式" name="contactInfoa">
         <div style="display: flex; align-items: center; margin-bottom: 10px;">
           <el-button style="margin-left: 0px" size="mini" type="primary" @click="showPone">查看号码</el-button>
           <span style="color: red; margin-left: 10px; font-size: 25px;">注意：点击按钮查看联系电话</span>
@@ -879,13 +881,13 @@
           <el-table-column label="序号" type="index" width="60" />
           <el-table-column label="职务" prop="position" min-width="100" show-overflow-tooltip />
           <el-table-column label="姓名" prop="name" show-overflow-tooltip />
-          <el-table-column label="固定电话"  show-overflow-tooltip />
+          <el-table-column label="固定电话" show-overflow-tooltip />
-          <el-table-column label="移动电话"  show-overflow-tooltip />
+          <el-table-column label="移动电话" show-overflow-tooltip />
-          <el-table-column label="联系电话"  show-overflow-tooltip />
+          <el-table-column label="联系电话" show-overflow-tooltip />
         </el-table>
         <span v-if="contactList.length === 0" class="header-label">该企业暂没有联系方式信息</span>
       </el-tab-pane>
-      <el-tab-pane  v-if="showTab2" label="联系方式" name="contactInfo">
+      <el-tab-pane v-if="showTab2" label="联系方式" name="contactInfo">
         <el-table v-if="contactList.length !== 0 " v-loading="loading" :data="contactList">
           <el-table-column label="序号" type="index" width="60" />
           <el-table-column label="职务" prop="position" min-width="100" show-overflow-tooltip />
@@ -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: {
@@ -968,11 +971,11 @@ export default {
   mixins: [dynamicSupervisionBase, dailySupervisionBase],
   data() {
     return {
-      isRead1 : false,
+      isRead1: false,
-      isRead2 : false,
+      isRead2: false,
-      isRead3 : false,
+      isRead3: false,
-      isRead4 : false,
+      isRead4: false,
-      isRead5 : false,
+      isRead5: false,
       isRead6: false,
       isRead7: false,
       showTab2: false,
@@ -1029,7 +1032,8 @@ export default {
           readOnly: true
         }
       },
-      fromPath: ''
+      fromPath: '',
+      iframeURL: ''
     }
   },
   mounted() {
@@ -1082,7 +1086,7 @@ export default {
     //     // }
     //   }
     // })
-    //const p5 = this.getRevokeListPage()
+    // const p5 = this.getRevokeListPage()
 
     // // 认领记录查询
     // const p6 = getAssignLogList(this.pripid).then(res => {
@@ -1096,7 +1100,7 @@ export default {
     // 现场核查
     // const p8 = this.getUsualInspectList()
     this.loading = true
-    Promise.all([p1]).finally(() => {//, p2, p3, p4, p5, p6, p7, p8
+    Promise.all([p1]).finally(() => { //, p2, p3, p4, p5, p6, p7, p8
       this.loading = false
     })
   },
@@ -1218,27 +1222,33 @@ 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) {
+          if (res.code === 0) {
-          const data = res.data.tsSerIllegalList
+            const data = res.data.tsSerIllegalList
-          this.eOtCaseList = res.data.eOtCase
+            this.eOtCaseList = res.data.eOtCase
-          this.eOtPermitList = res.data.eOtPermit
+            this.eOtPermitList = res.data.eOtPermit
-          const list = []
+            const list = []
-          data.forEach(each => {
+            data.forEach(each => {
-            each.operationStatus = this.illeaglStatusFormat(each.operationStatus)
+              each.operationStatus = this.illeaglStatusFormat(each.operationStatus)
-            list.push(each)
+              list.push(each)
-          })
+            })
-          this.tsSerIllegalList = list
+            this.tsSerIllegalList = list
           // if (this.eOtPermit.candate !== null) {
           //   this.eOtPermit.candate = this.$util.formatDate.format(new Date(Date.parse(this.eOtPermit.candate)), 'yyyy-MM-dd')
           // }
-        }
+          }
         })
         this.isRead1 = true
         this.loading = false
-      }else if(this.activeName === 'abnormal' && !this.isRead2){
+      } else if (this.activeName === 'abnormal' && !this.isRead2) {
         // 列异信息
         const p3 = listAbnormalRecord(this.pripid).then(res => {
           if (res.code === 0) {
@@ -1255,11 +1265,11 @@ export default {
         })
         this.isRead2 = true
         this.loading = false
-      }else if(this.activeName === 'revoke' && !this.isRead3){
+      } else if (this.activeName === 'revoke' && !this.isRead3) {
         const p5 = this.getRevokeListPage()
         this.isRead3 = true
         this.loading = false
-      }else if(this.activeName === 'assign' && !this.isRead4){
+      } else if (this.activeName === 'assign' && !this.isRead4) {
         const p6 = getAssignLogList(this.pripid).then(res => {
           if (res.code === 0) {
             this.assignLogList = res.data
@@ -1267,7 +1277,7 @@ export default {
         })
         this.isRead4 = true
         this.loading = false
-      }else if (this.activeName === 'third' && !this.isRead5) {
+      } else if (this.activeName === 'third' && !this.isRead5) {
         // 投诉处理
         const p7 = this.getSueInspectList()
 
@@ -1276,7 +1286,7 @@ export default {
         this.subActiveName = 'first'
         this.isRead5 = true
         this.loading = false
-      }else if(this.activeName === 'basicInfo'){
+      } else if (this.activeName === 'basicInfo') {
         this.loading = false
       } else if (this.activeName === 'alterInfo' && !this.isRead6) {
         this.loading = true
@@ -1294,7 +1304,7 @@ export default {
         })
         this.isRead6 = true
         this.loading = false
-      }else if (this.activeName === 'contactInfo' && !this.isRead7) {
+      } else if (this.activeName === 'contactInfo' && !this.isRead7) {
         this.loading = true
         queryContactByEntNo(this.pripid).then(res => {
           if (res.code === 0) {
@@ -1309,7 +1319,7 @@ export default {
         })
         this.isRead7 = true
         this.loading = false
-      }else if (this.activeName === 'contactInfoa' && !this.isRead7) {
+      } else if (this.activeName === 'contactInfoa' && !this.isRead7) {
         this.loading = true
         queryContactByEntNo(this.pripid).then(res => {
           if (res.code === 0) {

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