刘湘琪 hace 2 años
padre
commit
2a17233870

+ 1 - 1
src/utils/request.js

@@ -17,7 +17,7 @@ const service = axios.create({
   // axios中请求配置有baseURL选项,表示请求URL公共部分
   baseURL: process.env.VUE_APP_BASE_API,
   // 超时
-  timeout: 100000
+  timeout: 20000
 })
 
 // request拦截器

+ 2 - 2
src/views/enterprise/declare/components/BasicInfo.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="app-container" v-loading="loading">
-    <h3 class="toolbar">
+    <!-- <h3 class="toolbar">
       <div class="tool">
         <el-button type="primary" plain icon="el-icon-download" size="mini" @click="handleDownload">下载</el-button>
       </div>
-    </h3>
+    </h3> -->
     <h3 class="toolbar">
       <span class="title">项目基本信息</span>
     </h3>

+ 7 - 5
src/views/enterprise/declare/index.vue

@@ -26,7 +26,7 @@
         <el-form-item label="社会信用代码" prop="license">
           <el-input v-model="queryParams.license" style="width: 200px;" placeholder="请输入社会信用代码"></el-input>
         </el-form-item>
-      </template>    
+      </template>
       <el-form-item label="项目编号" prop="projectNo">
         <el-input v-model="queryParams.projectNo" style="width: 200px;" placeholder="请输入项目编号"></el-input>
       </el-form-item>
@@ -41,8 +41,8 @@
     <h3 class="toolbar">
       <span class="title">列表</span>
       <div class="tool">
-         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleBatchDel" v-if="roleType == 'entAdmin' || roleType == 'entUser' || roleType == 'manager'">批量删除</el-button>
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleDownloadBatch">下载</el-button>
+         <el-button type="primary" plain icon="el-icon-delete" size="mini" @click="handleBatchDel" v-if="roleType == 'entAdmin' || roleType == 'entUser' || roleType == 'manager'">批量删除</el-button>
+        <el-button type="primary" plain icon="el-icon-download" size="mini" @click="handleDownloadBatch">下载</el-button>
       </div>
     </h3>
     <el-table v-loading="loading" :data="list" border @selection-change="handleSelectionChange" style="width: 100%">
@@ -53,12 +53,14 @@
       <el-table-column label="社会信用代码" prop="license" align="center"/>
       <el-table-column label="项目年份" prop="projectYear" align="center"/>
       <el-table-column label="项目跨年" prop="overYearFlag" align="center" :formatter="fmtOverYear"></el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime"></el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="160"></el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180">
         <template slot-scope="scope">
           <el-button type="text" @click="handleView(scope.row)">查看</el-button>
           <el-button type="text" @click="handleDelete(scope.row)">删除</el-button>
-          <el-button type="text" @click="handleDownload(scope.row)">下载</el-button>
+          <template v-if="scope.row.attachCnt != 0">
+            <el-button type="text" @click="handleDownload(scope.row)">下载</el-button>
+          </template>
         </template>
       </el-table-column>
     </el-table>

+ 2 - 2
src/views/enterprise/project/index.vue

@@ -42,8 +42,8 @@
       <span class="title">列表</span>
       <div class="tool">
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-if="roleType == 'entAdmin' || roleType == 'entUser'">新增</el-button>
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleDownloadBatch">下载</el-button>
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleBatchDel" v-if="roleType == 'entAdmin' || roleType == 'entUser' || roleType == 'manager'">批量删除</el-button>
+        <el-button type="primary" plain icon="el-icon-download" size="mini" @click="handleDownloadBatch">下载</el-button>
+        <el-button type="primary" plain icon="el-icon-delete" size="mini" @click="handleBatchDel" v-if="roleType == 'entAdmin' || roleType == 'entUser' || roleType == 'manager'">批量删除</el-button>
       </div>
     </h3>
     <el-table v-loading="loading" :data="list" border @selection-change="handleSelectionChange">

+ 1 - 12
src/views/enterprise/project/info.vue

@@ -2,7 +2,6 @@
   <div class="app-container" v-loading="loading">
     <el-tabs :tab-position="tabPosition" stretch ref="tabsFirst" v-model="activeName" @tab-click="handleClick">
       <el-tab-pane label="企业自填" name="1">
-        <!-- <basic-info :projectOwner="'1'"></basic-info> -->
         <el-tabs type="border-card" v-if="entVisible">
           <el-tab-pane label="项目基本信息">
             <basic-info :projectOwner="'1'"></basic-info>
@@ -12,10 +11,7 @@
           </el-tab-pane>
         </el-tabs>
       </el-tab-pane>
-      <!-- 用户不是企业管理员 -->
-      <!-- <template v-if="userType ! = 'ENT_ADMIN'"> -->
         <el-tab-pane label="企业技术" name="2">
-          <!-- <basic-info :projectOwner="'2'"></basic-info> -->
           <el-tabs type="border-card" v-if="techVisible">
             <el-tab-pane label="项目基本信息">
               <basic-info :projectOwner="'2'"></basic-info>
@@ -25,10 +21,7 @@
             </el-tab-pane>
           </el-tabs>
         </el-tab-pane>
-      <!-- </template> -->
-      <!-- <template v-if="userType != 'ENT_ADMIN' || userType != 'ENT_TECH' || userType != 'ENT_ADMIN_TECH'"> -->
         <el-tab-pane label="企业财务" name="3">
-          <!-- <basic-info :projectOwner="'3'"></basic-info> -->
           <el-tabs type="border-card" v-if="finVisible">
             <el-tab-pane label="项目基本信息">
               <basic-info :projectOwner="'3'"></basic-info>
@@ -41,8 +34,6 @@
             </el-tab-pane>
           </el-tabs>
         </el-tab-pane>
-      <!-- </template> -->
-      <!-- 用户不是企业管理员 技术员 -->
 
     </el-tabs>
   </div>
@@ -51,9 +42,7 @@
 <script>
 
 import BasicInfo from './components/BasicInfo'
-import EnclosureInfo from './components/EnclosureInfo'
-
-// import BasicInfo from './info/BasicInfo'
+import EnclosureInfo from './components/EnclosureInfo'
 export default {
   name: "First",
   computed: {