liuxiangqi 1 рік тому
батько
коміт
26afbc6415

+ 7 - 0
src/api/common/common.js

@@ -49,3 +49,10 @@ export function validLicenseApi(license) {
     method: 'get',
   })
 }
+export function uploadApi(data) {
+	return request({
+		url: `/common/attach/uploads`,
+		method: 'post',
+		data: data
+	})
+}

+ 33 - 1
src/assets/styles/index.scss

@@ -232,7 +232,6 @@ $border: #ddd;
     color: #666;
   }
 }
-
 .tool {
   float: right;
   .el-button--medium {
@@ -805,3 +804,36 @@ $border: #ddd;
     margin: 5px 0;
   }
 }
+// .tablebar {
+//   position: relative;
+//   padding-left: 15px;
+//   margin-right: 15px;
+//   font-size: 16px;
+//   line-height: 28px;
+//   font-weight: bold;
+//   color: #363636;
+//   margin-left: 2%;
+//   &:before {
+//     content: "1、";
+//     display: block;
+//     position: absolute;
+//     left: -2%;
+//     transform: translate(0, -50%);
+//     width: 5px;
+//     height: 16px;
+//     font-size: 16px;
+//   }
+// }
+.table-con {
+  counter-reset: myCounter;
+}
+.table-con table::before {
+  counter-increment: myCounter;
+  content: counter(myCounter) '.';
+  position: absolute;
+  left: 2%;
+  color: #5282b6;
+  font-size: 18px;
+  font-weight: 700;
+  line-height: 19px;
+}

+ 1 - 1
src/utils/request.js

@@ -148,7 +148,7 @@ service.interceptors.response.use(res => {
 // 通用下载方法
 export function download(url, params, filename) {
   downloadLoadingInstance = Loading.service({ text: "正在下载数据,请稍候", spinner: "el-icon-loading", background: "rgba(0, 0, 0, 0.7)", })
-  return service.post(url, params, {
+  return service.get(url, params, {
     transformRequest: [(params) => { return tansParams(params) }],
     headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
     responseType: 'blob'

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

@@ -55,7 +55,7 @@
       <el-table-column label="加计扣除年度" prop="projectYear"></el-table-column>
       <el-table-column label="项目名称" prop="projectName" align="center" width="180"></el-table-column>
       <el-table-column label="企业名称" prop="entName" align="center" width="180"/>
-      <el-table-column label="统一社会信用代码" prop="license" align="center" width="180" />
+      <el-table-column label="统一社会信用代码" prop="creditCode" align="center" width="180" />
       <el-table-column label="是否跨年项目" prop="overYearFlag" :formatter="overYearFormat"></el-table-column>
       <!-- <el-table-column label="跨年申报"></el-table-column> -->
       <el-table-column label="是否追溯项目" prop="backFlag" :formatter="flagFormat"></el-table-column>
@@ -66,7 +66,7 @@
       </el-table-column>
       <el-table-column label="资料完善度" prop="linkEmail" align="center" width="340">
         <template slot-scope="scope">
-          <span>企业 {{scope.row.entCompRate}} 技术 {{scope.row.techCompRate}} 财务 {{scope.row.finCompRate}}</span>
+          <span>技术 {{scope.row.techCompRate}} 财务 {{scope.row.finCompRate}}</span>
         </template>
       </el-table-column>
       <el-table-column label="申报状态" prop="reportState" align="center" width="80" :formatter="reportStateFormat"></el-table-column>

+ 20 - 2
src/views/enterprise/project/components/UploadEnclosure.vue

@@ -2,15 +2,15 @@
   <el-dialog title="上传附件" :visible.sync="open" width="500px" append-to-body>
     <el-upload
       ref="upload"
+      action='string'
       :accept="enclosuresAccept"
-      :headers="upload.headers"
       :before-upload="beforeUpload"
-      :action="upload.url"
       :disabled="upload.isUploading"
       :on-progress="handleFileUploadProgress"
       :on-success="handleFileSuccess"
       :auto-upload="false"
       :data="params"
+      :http-request="handleChange"
       multiple
       drag
     >
@@ -31,6 +31,7 @@
 <script>
   import FileUpload from '@/components/FileUpload'
   import { getToken } from "@/utils/auth";
+  import {uploadApi} from "@/api/common/common"
   export default {
     components: {
       FileUpload
@@ -76,6 +77,23 @@
         this.form.fileList = '';
         this.resetForm("form");
       },
+      handleChange(param) {
+      	let fd = new FormData();
+      	let self = this;
+      	fd.append('files', param.file); //传文件
+        fd.append('attachType', this.params.attachType)
+        fd.append('fileType', this.params.fileType)
+        fd.append('dataId', this.params.dataId)
+      	uploadApi(fd).then(res => {
+      		if(res.code == 200) {
+      			this.$message.success(`文件上传成功`)
+            this.$emit('refreshData')
+            this.open = false;
+            this.upload.isUploading = false;
+      		}
+
+      	})
+      },
       handleSuccess(files) {
         this.form.fileList = files;
         this.$refs.form.validateField('fileList');

+ 330 - 357
src/views/enterprise/project/components/enclosure-edit.vue

@@ -2,326 +2,330 @@
   <div class="app-container">
     <h3 class="toolbar">
       <span class="title">加计扣除备查资料清单(<b style="color: red;font-size: 15px;">根据您填报的项目信息,系统自动将需要上传的文件列出,每种类型文件只能上传单个文件(大小限制4M),如有多个请打包上传!</b>)</span>
-      <!-- <div class="tool">
+      <div class="tool">
         <el-button type="primary" plain icon="el-icon-download" size="mini" @click="handleDownloadBatch">批量下载</el-button>
-      </div> -->
+      </div>
     </h3>
-    <!-- 技术 -->
-    <table class="table_register mt20" style="width: 100%;">
-      <tr>
-        <th colspan="4" class="th_title">项目计划书
-        </th>
-      </tr>
-      <tr>
-        <th>项目计划书导入</th>
-        <td colspan="3">
-          <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleUpload('9')" v-if="techFlag">上传</el-button>
-        </td>
-      </tr>
-      <tr>
-        <th>下载</th>
-        <td colspan="3">
-          <ul>
-            <li v-for="(item, index) in list9" :key="index" style="margin: 2px;">
-              <el-row :gutter="20">
-                <el-col :span="12">
-                  <a :href="item.url">{{item.fileName}}</a>
-                </el-col>
-                <el-col :span="12">
-                  <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleDownload(item.id)">下载</el-button>
-                  <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleDelete(item.id)" v-if="techFlag">删除</el-button>
-                </el-col>
-              </el-row>
-            </li>
-          </ul>
+    <div class="table-con">
+      <table class="table_register mt20 tablebar" style="width: 100%;">
+            <tr>
+              <th colspan="4" class="th_title">项目计划书
+              </th>
+            </tr>
+            <tr>
+              <th>项目计划书导入</th>
+              <td colspan="3">
+                <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleUpload('9')" v-if="techFlag">上传</el-button>
+              </td>
+            </tr>
+            <tr>
+              <th>下载</th>
+              <td colspan="3">
+                <ul>
+                  <li v-for="(item, index) in list9" :key="index" style="margin: 2px;">
+                    <el-row :gutter="20">
+                      <el-col :span="12">
+                        <a :href="item.url">{{item.fileName}}</a>
+                      </el-col>
+                      <el-col :span="12">
+                        <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleDownload(item.id)">下载</el-button>
+                        <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleDelete(item.id)" v-if="techFlag">删除</el-button>
+                      </el-col>
+                    </el-row>
+                  </li>
+                </ul>
+
+              </td>
+            </tr>
+          </table>
 
-        </td>
-      </tr>
-    </table>
-    <table class="table_register mt20" style="width: 100%;">
-      <tr>
-        <th colspan="4" class="th_title">研究成果报告
-        </th>
-      </tr>
-      <tr>
-        <th>研究成果导入</th>
-        <td colspan="3">
-          <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleUpload('10')" v-if="techFlag">上传</el-button>
-          <el-button type="primary" size="mini">
-            <a href="/temp/研究成果报告模板.xls">模板下载</a>
-          </el-button>
-        </td>
-      </tr>
-      <tr>
-        <th>下载</th>
-        <td colspan="3">
-          <ul>
-            <li v-for="(item, index) in list10" :key="index" style="margin: 2px;">
-              <el-row :gutter="20">
-                <el-col :span="12">
-                  <a :href="item.url">{{item.fileName}}</a>
-                </el-col>
-                <el-col :span="12">
-                  <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleUpload(item.id)">下载</el-button>
-                  <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleDelete(item.id)" v-if="techFlag">删除</el-button>
-                </el-col>
-              </el-row>
-            </li>
-          </ul>
-        </td>
-      </tr>
-    </table>
-    <table class="table_register mt20" style="width: 100%;">
-      <tr>
-        <th colspan="4" class="th_title">自主、委托、合作研究开发项目计划书和企业有权部门关于自主、委托、合作研究开发项目立项的决议文件
-        </th>
-      </tr>
-      <tr>
-        <th>决议文件导入</th>
-        <td colspan="3">
-          <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleUpload('1')" v-if="techFlag">上传</el-button>
-          <el-button type="primary" size="mini">
-            <a href="/temp/项目立项书模板.doc">模板下载</a>
-          </el-button>
-        </td>
-      </tr>
-      <tr>
-        <th>下载</th>
-        <td colspan="3">
-          <ul>
-            <li v-for="(item, index) in list1" :key="index" style="margin: 2px;">
-              <el-row :gutter="20">
-                <el-col :span="12">
-                  <a :href="item.url">{{item.fileName}}</a>
-                </el-col>
-                <el-col :span="12">
-                  <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleUpload(item.id)">下载</el-button>
-                  <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleDelete(item.id)" v-if="techFlag">删除</el-button>
-                </el-col>
-              </el-row>
-            </li>
-          </ul>
-        </td>
-      </tr>
-    </table>
-    <table class="table_register mt20" style="width: 100%;">
-      <tr>
-        <th colspan="4" class="th_title">自主、委托、合作研究开发专门机构或项目组的编制情况和研发人员名单
-        </th>
-      </tr>
-      <tr>
-        <th>研发人员名单导入</th>
-        <td colspan="3">
-          <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleUpload('2')" v-if="techFlag">上传</el-button>
-          <el-button type="primary" size="mini">
-            <a href="/temp/项目负责人及研发人员模板.xls">模板下载</a>
-          </el-button>
+      <table class="table_register mt20 tablebar" style="width: 100%;">
+        <tr>
+          <th colspan="4" class="th_title">研究成果报告
+          </th>
+        </tr>
+        <tr>
+          <th>研究成果导入</th>
+          <td colspan="3">
+            <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleUpload('10')" v-if="techFlag">上传</el-button>
+            <el-button type="primary" size="mini">
+              <a href="/temp/研究成果报告模板.xls">模板下载</a>
+            </el-button>
+          </td>
+        </tr>
+        <tr>
+          <th>下载</th>
+          <td colspan="3">
+            <ul>
+              <li v-for="(item, index) in list10" :key="index" style="margin: 2px;">
+                <el-row :gutter="20">
+                  <el-col :span="12">
+                    <a :href="item.url">{{item.fileName}}</a>
+                  </el-col>
+                  <el-col :span="12">
+                    <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleDownload(item.id)">下载</el-button>
+                    <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleDelete(item.id)" v-if="techFlag">删除</el-button>
+                  </el-col>
+                </el-row>
+              </li>
+            </ul>
+          </td>
+        </tr>
+      </table>
+      <table class="table_register mt20" style="width: 100%;">
+        <tr>
+          <th colspan="4" class="th_title">自主、委托、合作研究开发项目计划书和企业有权部门关于自主、委托、合作研究开发项目立项的决议文件
+          </th>
+        </tr>
+        <tr>
+          <th>决议文件导入</th>
+          <td colspan="3">
+            <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleUpload('1')" v-if="techFlag">上传</el-button>
+            <el-button type="primary" size="mini">
+              <a href="/temp/项目立项书模板.doc">模板下载</a>
+            </el-button>
+          </td>
+        </tr>
+        <tr>
+          <th>下载</th>
+          <td colspan="3">
+            <ul>
+              <li v-for="(item, index) in list1" :key="index" style="margin: 2px;">
+                <el-row :gutter="20">
+                  <el-col :span="12">
+                    <a :href="item.url">{{item.fileName}}</a>
+                  </el-col>
+                  <el-col :span="12">
+                    <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleDownload(item.id)">下载</el-button>
+                    <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleDelete(item.id)" v-if="techFlag">删除</el-button>
+                  </el-col>
+                </el-row>
+              </li>
+            </ul>
+          </td>
+        </tr>
+      </table>
+      <table class="table_register mt20" style="width: 100%;">
+        <tr>
+          <th colspan="4" class="th_title">自主、委托、合作研究开发专门机构或项目组的编制情况和研发人员名单
+          </th>
+        </tr>
+        <tr>
+          <th>研发人员名单导入</th>
+          <td colspan="3">
+            <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleUpload('2')" v-if="techFlag">上传</el-button>
+            <el-button type="primary" size="mini">
+              <a href="/temp/项目负责人及研发人员模板.xls">模板下载</a>
+            </el-button>
 
-        </td>
-      </tr>
-      <tr>
-        <th>下载</th>
-        <td colspan="3">
-          <ul>
-            <li v-for="(item, index) in list2" :key="index" style="margin: 2px;">
-              <el-row :gutter="20">
-                <el-col :span="12">
-                  <a :href="item.url">{{item.fileName}}</a>
-                </el-col>
-                <el-col :span="12">
-                  <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleUpload(item.id)">下载</el-button>
-                  <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleDelete(item.id)" v-if="techFlag">删除</el-button>
-                </el-col>
-              </el-row>
-            </li>
-          </ul>
-        </td>
-      </tr>
-    </table>
-    <table class="table_register mt20" style="width: 100%;">
-      <tr>
-        <th colspan="4" class="th_title">经科技行政主管部门登记的委托、合作研究开发项目的合同
-        </th>
-      </tr>
-      <tr>
-        <th>研究开发合同导入</th>
-        <td colspan="3">
-          <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleUpload('3')" v-if="techFlag">上传</el-button>
-        </td>
-      </tr>
-      <tr>
-        <th>下载</th>
-        <td colspan="3">
-          <ul>
-            <li v-for="(item, index) in list3" :key="index" style="margin: 2px;">
-              <el-row :gutter="20">
-                <el-col :span="12">
-                  <a :href="item.url">{{item.fileName}}</a>
-                </el-col>
-                <el-col :span="12">
-                  <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleUpload(item.id)">下载</el-button>
-                  <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleDelete(item.id)" v-if="techFlag">删除</el-button>
-                </el-col>
-              </el-row>
-            </li>
-          </ul>
-        </td>
-      </tr>
-    </table>
+          </td>
+        </tr>
+        <tr>
+          <th>下载</th>
+          <td colspan="3">
+            <ul>
+              <li v-for="(item, index) in list2" :key="index" style="margin: 2px;">
+                <el-row :gutter="20">
+                  <el-col :span="12">
+                    <a :href="item.url">{{item.fileName}}</a>
+                  </el-col>
+                  <el-col :span="12">
+                    <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleDownload(item.id)">下载</el-button>
+                    <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleDelete(item.id)" v-if="techFlag">删除</el-button>
+                  </el-col>
+                </el-row>
+              </li>
+            </ul>
+          </td>
+        </tr>
+      </table>
+      <table class="table_register mt20" style="width: 100%;">
+        <tr>
+          <th colspan="4" class="th_title">经科技行政主管部门登记的委托、合作研究开发项目的合同
+          </th>
+        </tr>
+        <tr>
+          <th>研究开发合同导入</th>
+          <td colspan="3">
+            <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleUpload('3')" v-if="techFlag">上传</el-button>
+          </td>
+        </tr>
+        <tr>
+          <th>下载</th>
+          <td colspan="3">
+            <ul>
+              <li v-for="(item, index) in list3" :key="index" style="margin: 2px;">
+                <el-row :gutter="20">
+                  <el-col :span="12">
+                    <a :href="item.url">{{item.fileName}}</a>
+                  </el-col>
+                  <el-col :span="12">
+                    <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleDownload(item.id)">下载</el-button>
+                    <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleDelete(item.id)" v-if="techFlag">删除</el-button>
+                  </el-col>
+                </el-row>
+              </li>
+            </ul>
+          </td>
+        </tr>
+      </table>
 
 
-    <table class="table_register mt20" style="width: 100%;">
-      <tr>
-        <th colspan="4" class="th_title">“研发支出”辅助账及汇总表
-        </th>
-      </tr>
-      <tr>
-        <th>“研发支出”辅助账及汇总表导入</th>
-        <td colspan="3">
-          <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleUpload('6')" v-if="techFlag">上传</el-button>
-        </td>
-      </tr>
-      <tr>
-        <th>下载</th>
-        <td colspan="3">
-          <ul>
-            <li v-for="(item, index) in list6" :key="index" style="margin: 2px;">
-              <el-row :gutter="20">
-                <el-col :span="12">
-                  <a :href="item.url">{{item.fileName}}</a>
-                </el-col>
-                <el-col :span="12">
-                  <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleUpload(item.id)">下载</el-button>
-                  <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleDelete(item.id)" v-if="techFlag">删除</el-button>
-                </el-col>
-              </el-row>
-            </li>
-          </ul>
-        </td>
-      </tr>
-    </table>
-    <table class="table_register mt20" style="width: 100%;">
-      <tr>
-        <th colspan="4" class="th_title">企业如果已取得地市级(含)以上科技行政主管部门出具的鉴定意见,应作为资料留存备查
-        </th>
-      </tr>
-      <tr>
-        <th>科技主管部门鉴定意见导入</th>
-        <td colspan="3">
-          <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleUpload('7')" v-if="techFlag">上传</el-button>
-        </td>
-      </tr>
-      <tr>
-        <th>下载</th>
-        <td colspan="3">
-          <ul>
-            <li v-for="(item, index) in list7" :key="index" style="margin: 2px;">
-              <el-row :gutter="20">
-                <el-col :span="12">
-                  <a :href="item.url">{{item.fileName}}</a>
-                </el-col>
-                <el-col :span="12">
-                  <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleUpload(item.id)">下载</el-button>
-                  <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleDelete(item.id)" v-if="techFlag">删除</el-button>
-                </el-col>
-              </el-row>
-            </li>
-          </ul>
-        </td>
-      </tr>
-    </table>
+      <table class="table_register mt20" style="width: 100%;">
+        <tr>
+          <th colspan="4" class="th_title">“研发支出”辅助账及汇总表
+          </th>
+        </tr>
+        <tr>
+          <th>“研发支出”辅助账及汇总表导入</th>
+          <td colspan="3">
+            <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleUpload('6')" v-if="techFlag">上传</el-button>
+          </td>
+        </tr>
+        <tr>
+          <th>下载</th>
+          <td colspan="3">
+            <ul>
+              <li v-for="(item, index) in list6" :key="index" style="margin: 2px;">
+                <el-row :gutter="20">
+                  <el-col :span="12">
+                    <a :href="item.url">{{item.fileName}}</a>
+                  </el-col>
+                  <el-col :span="12">
+                    <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleDownload(item.id)">下载</el-button>
+                    <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleDelete(item.id)" v-if="techFlag">删除</el-button>
+                  </el-col>
+                </el-row>
+              </li>
+            </ul>
+          </td>
+        </tr>
+      </table>
+      <table class="table_register mt20" style="width: 100%;">
+        <tr>
+          <th colspan="4" class="th_title">企业如果已取得地市级(含)以上科技行政主管部门出具的鉴定意见,应作为资料留存备查
+          </th>
+        </tr>
+        <tr>
+          <th>科技主管部门鉴定意见导入</th>
+          <td colspan="3">
+            <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleUpload('7')" v-if="techFlag">上传</el-button>
+          </td>
+        </tr>
+        <tr>
+          <th>下载</th>
+          <td colspan="3">
+            <ul>
+              <li v-for="(item, index) in list7" :key="index" style="margin: 2px;">
+                <el-row :gutter="20">
+                  <el-col :span="12">
+                    <a :href="item.url">{{item.fileName}}</a>
+                  </el-col>
+                  <el-col :span="12">
+                    <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleDownload(item.id)">下载</el-button>
+                    <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleDelete(item.id)" v-if="techFlag">删除</el-button>
+                  </el-col>
+                </el-row>
+              </li>
+            </ul>
+          </td>
+        </tr>
+      </table>
+
+      <!-- 财务 -->
+      <table class="table_register mt20" style="width: 100%;">
+        <tr>
+          <th colspan="4" class="th_title">从事研发活动的人员(包括外聘人员)和用于研发活动的仪器、设备、无形资产的费用分配说明(包括工作使用情况记录及费用分配计算证据材料)
+          </th>
+        </tr>
+        <tr>
+          <th>费用分配说明导入</th>
+          <td colspan="3">
+            <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleUpload('4')" v-if="finFlag">上传</el-button>
+          </td>
+        </tr>
+        <tr>
+          <th>下载</th>
+          <td colspan="3">
+            <ul>
+              <li v-for="(item, index) in list4" :key="index" style="margin: 2px;">
+                <el-row :gutter="20">
+                  <el-col :span="12">
+                    <a :href="item.url">{{item.fileName}}</a>
+                  </el-col>
+                  <el-col :span="12">
+                    <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleDownload(item.id)">下载</el-button>
+                    <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleDelete(item.id)" v-if="finFlag">删除</el-button>
+                  </el-col>
+                </el-row>
+              </li>
+            </ul>
+          </td>
+        </tr>
+      </table>
+      <table class="table_register mt20" style="width: 100%;">
+        <tr>
+          <th colspan="4" class="th_title">集中研发项目研发费决算表、集中研发项目费用分摊明细情况表和实际分享收益比例等资料
+          </th>
+        </tr>
+        <tr>
+          <th>资料导入</th>
+          <td colspan="3">
+            <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleUpload('5')"v-if="finFlag">上传</el-button>
+          </td>
+        </tr>
+        <tr>
+          <th>下载</th>
+          <td colspan="3">
+            <ul>
+              <li v-for="(item, index) in list5" :key="index" style="margin: 2px;">
+                <el-row :gutter="20">
+                  <el-col :span="12">
+                    <a :href="item.url">{{item.fileName}}</a>
+                  </el-col>
+                  <el-col :span="12">
+                    <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleDownload(item.id)">下载</el-button>
+                    <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleDelete(item.id)" v-if="finFlag">删除</el-button>
+                  </el-col>
+                </el-row>
+              </li>
+            </ul>
+          </td>
+        </tr>
+      </table>
+      <table class="table_register mt20" style="width: 100%;">
+        <tr>
+          <th colspan="4" class="th_title">《研发费用加计扣除优惠明细表》(a107012,选择预缴享受的企业留存备查)
+          </th>
+        </tr>
+        <tr>
+          <th>优惠明细表导入</th>
+          <td colspan="3">
+            <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleUpload('8')" v-if="finFlag">上传</el-button>
+          </td>
+        </tr>
+        <tr>
+          <th>下载</th>
+          <td colspan="3">
+            <ul>
+              <li v-for="(item, index) in list8" :key="index" style="margin: 2px;">
+                <el-row :gutter="20">
+                  <el-col :span="12">
+                    <a :href="item.url">{{item.fileName}}</a>
+                  </el-col>
+                  <el-col :span="12">
+                    <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleDownload(item.id)">下载</el-button>
+                    <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleDelete(item.id)" v-if="finFlag">删除</el-button>
+                  </el-col>
+                </el-row>
+              </li>
+            </ul>
+          </td>
+        </tr>
+      </table>
+    </div>
+    <!-- 技术 -->
 
-    <!-- 财务 -->
-    <table class="table_register mt20" style="width: 100%;">
-      <tr>
-        <th colspan="4" class="th_title">从事研发活动的人员(包括外聘人员)和用于研发活动的仪器、设备、无形资产的费用分配说明(包括工作使用情况记录及费用分配计算证据材料)
-        </th>
-      </tr>
-      <tr>
-        <th>费用分配说明导入</th>
-        <td colspan="3">
-          <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleUpload('4')" v-if="finFlag">上传</el-button>
-        </td>
-      </tr>
-      <tr>
-        <th>下载</th>
-        <td colspan="3">
-          <ul>
-            <li v-for="(item, index) in list4" :key="index" style="margin: 2px;">
-              <el-row :gutter="20">
-                <el-col :span="12">
-                  <a :href="item.url">{{item.fileName}}</a>
-                </el-col>
-                <el-col :span="12">
-                  <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleUpload(item.id)">下载</el-button>
-                  <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleDelete(item.id)" v-if="finFlag">删除</el-button>
-                </el-col>
-              </el-row>
-            </li>
-          </ul>
-        </td>
-      </tr>
-    </table>
-    <table class="table_register mt20" style="width: 100%;">
-      <tr>
-        <th colspan="4" class="th_title">集中研发项目研发费决算表、集中研发项目费用分摊明细情况表和实际分享收益比例等资料
-        </th>
-      </tr>
-      <tr>
-        <th>资料导入</th>
-        <td colspan="3">
-          <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleUpload('5')"v-if="finFlag">上传</el-button>
-        </td>
-      </tr>
-      <tr>
-        <th>下载</th>
-        <td colspan="3">
-          <ul>
-            <li v-for="(item, index) in list5" :key="index" style="margin: 2px;">
-              <el-row :gutter="20">
-                <el-col :span="12">
-                  <a :href="item.url">{{item.fileName}}</a>
-                </el-col>
-                <el-col :span="12">
-                  <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleUpload(item.id)">下载</el-button>
-                  <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleDelete(item.id)" v-if="finFlag">删除</el-button>
-                </el-col>
-              </el-row>
-            </li>
-          </ul>
-        </td>
-      </tr>
-    </table>
-    <table class="table_register mt20" style="width: 100%;">
-      <tr>
-        <th colspan="4" class="th_title">《研发费用加计扣除优惠明细表》(a107012,选择预缴享受的企业留存备查)
-        </th>
-      </tr>
-      <tr>
-        <th>优惠明细表导入</th>
-        <td colspan="3">
-          <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleUpload('8')" v-if="finFlag">上传</el-button>
-        </td>
-      </tr>
-      <tr>
-        <th>下载</th>
-        <td colspan="3">
-          <ul>
-            <li v-for="(item, index) in list8" :key="index" style="margin: 2px;">
-              <el-row :gutter="20">
-                <el-col :span="12">
-                  <a :href="item.url">{{item.fileName}}</a>
-                </el-col>
-                <el-col :span="12">
-                  <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleUpload(item.id)">下载</el-button>
-                  <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleDelete(item.id)" v-if="finFlag">删除</el-button>
-                </el-col>
-              </el-row>
-            </li>
-          </ul>
-        </td>
-      </tr>
-    </table>
     <upload-enclosure ref="uploadEnclosure" v-if="enclosureVisible" @refreshData="getList()" :dataId="dataId" :attachType="'PROJECT'"></upload-enclosure>
   </div>
 </template>
@@ -429,7 +433,7 @@
               if(item.fileType == 'file8') {
                 this.list8.push(item)
               }
-              if(item.fileType == null) {
+              if(item.fileType == 'file9') {
                 this.list9.push(item)
               }
               if(item.fileType == 'file10') {
@@ -452,53 +456,19 @@
           this.$refs.uploadEnclosure.init(params)
         })
       },
+      /** 导出按钮操作 */
+      // handleDownload(id) {
+      //   this.download(`/common/attach/${id}`, {
+      //   }, `附件`)
+      // },
       handleDownload(id) {
-        // window.open("http://124.232.146.72:7015/api/common/attach/"+row.id)
-        downloadApi(id).then(res => {
-        	if (res) {
-        		let fileName = "账单";
-        		const content = res.data
-        		let fileTypeEx = '';
-        		if(fileExtension == 'zip') {
-        			fileTypeEx = 'application/zip'
-        		} else if(fileExtension == 'csv') {
-        			fileTypeEx = 'text/csv'
-        		}
-        		const blob = new Blob([content], { type: fileTypeEx })
-        		const elink = document.createElement('a')
-        		elink.download = fileName
-        		elink.style.display = 'none'
-        		elink.href = URL.createObjectURL(blob)
-        		document.body.appendChild(elink)
-        		elink.click()
-        		URL.revokeObjectURL(elink.href)
-        		document.body.removeChild(elink)
-        	}
-        })
+        window.open(process.env.VUE_APP_BASE_API+`/common/attach/${id}`)
       },
       handleDownloadBatch() {
-        if(this.selectionList.length <=0) {
-          this.$message.error('请选择要下载的数据');
-          return
-        }
-        window.open("http://124.232.146.72:7015/api/common/attach/"+this.ids)
+        let id = this.id
+        window.open(process.env.VUE_APP_BASE_API+`/api/ent/data/download/${id}`)
         this.getList();
       },
-      handleBatchDelte() {
-        if(this.selectionList.length <=0) {
-          this.$message.error('请选择要删除的数据');
-          return
-        }
-        this.$confirm('请确认是否删除所选择的数据!', '提示').then(() => {
-        	deleteEnclosureApi(this.ids).then(res => {
-            if(res.code == 200) {
-              this.queryParams.pageNum = 1;
-              this.getList();
-              this.$modal.msgSuccess("删除成功");
-            }
-        	})
-        })
-      },
       // 从url加载
       handleView(row) {
         let routeUrl = this.$router.resolve({
@@ -546,5 +516,8 @@
 
 </script>
 
-<style>
+<style lang="scss" scoped>
+  .mt20 {
+    margin-left: 3%;
+  }
 </style>

+ 10 - 38
src/views/enterprise/project/components/year-edit.vue

@@ -6,7 +6,7 @@
           <th colspan="4" class="th_title">年度基本信息(<b style="color: red;">年度销售收入、研发投入、职工总人数、研发人员请填写正整数,占销售收入比例为系统自动算出</b>)</th>
         </tr>
         <tr>
-          <th><span style="color: red;">*</span>企业名称</th>
+          <th>企业名称</th>
           <td>
             <el-form-item prop="entName" label-width="0">
               <el-input v-model="form.entName" type="text" placeholder="请输入企业名称" disabled></el-input>
@@ -15,7 +15,6 @@
           <th><span style="color: red;">*</span>申办加计年度</th>
           <td>
             <el-form-item prop="projectYear" label-width="0">
-              <!-- <el-input v-model="form.projectName" type="text" placeholder="请输入项目名称" :disabled="disabledVisible"></el-input> -->
               <el-select v-model="form.projectYear" filterable :disabled="disabledVisible">
                 <el-option v-for="(item, index) in yearsOptions" :key="index" :value="item.dictValue" :label="item.dictLabel"></el-option>
               </el-select>
@@ -23,7 +22,7 @@
           </td>
         </tr>
         <tr>
-          <th><span style="color: red;">*</span>通信地址</th>
+          <th>通信地址</th>
           <td colspan="3">
             <el-form-item prop="address" label-width="0">
               <el-input v-model="form.address" placeholder="请输入通讯地址" disabled></el-input>
@@ -31,13 +30,13 @@
           </td>
         </tr>
         <tr>
-          <th><span style="color: red;">*</span>企业联系人</th>
+          <th>企业联系人</th>
           <td>
             <el-form-item prop="linkName" label-width="0">
               <el-input v-model="form.linkName" placeholder="请输入企业联系人" disabled></el-input>
             </el-form-item>
           </td>
-          <th><span style="color: red;">*</span>联系电话(座机)</th>
+          <th>联系电话(座机)</th>
           <td>
             <el-form-item prop="linkPhone" label-width="0">
               <el-input v-model="form.linkPhone" type="text" auto-complete="off" placeholder="请输入联系电话(座机)" disabled>
@@ -46,7 +45,7 @@
           </td>
         </tr>
         <tr>
-          <th><span style="color: red;">*</span>联系电话(手机)</th>
+          <th>联系电话(手机)</th>
           <td>
             <el-form-item prop="linkMobile" label-width="0">
               <el-input v-model="form.linkMobile" type="text" auto-complete="off" placeholder="请输入联系电话(手机)" disabled>
@@ -85,7 +84,7 @@
               </el-input>
             </el-form-item>
           </td>
-          <th><span style="color: red;">*</span>占销售收入比例(%)</th>
+          <th>占销售收入比例(%)</th>
           <td>
             <el-form-item prop="techRate" label-width="0">
               <el-input v-model="form.techRate" type="text" auto-complete="off" placeholder="请输入占销售收入比例(%)" disabled>
@@ -244,11 +243,11 @@ export default {
       districtDataList: [],
       yearsOptions: [],
       form: {
+        projectYear: "",
         techScopeArray: [],
         licenseTime: "",
         projectTime: "",
         id: undefined,
-        entId: undefined,
         projectOwner: 2,
         techStartDate: "",
         techEndDate: "",
@@ -257,37 +256,11 @@ export default {
         industryArray: [],
         industry: "",
         entName: "",
-        address: ""
+        address: "",
+        linkName: "",
+        linkPhone: ""
       },
       rules: {
-        userName: [
-          { required: true, trigger: "blur", message: "请输入您的账号" },
-          { min: 2, max: 20, message: '用户账号长度必须介于 2 和 20 之间', trigger: 'blur' }
-        ],
-        password: [
-          { required: true, trigger: "blur", message: "请输入您的密码" },
-          { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' }
-        ],
-        address: [
-          { required: true, trigger: "blur", message: "请输入通讯地址" },
-          { max: 100, message: '不超过100字符', trigger: 'blur' }
-        ],
-        linkName: [
-          { required: true, trigger: "blur", message: "请输入企业联系人" },
-          { max: 100, message: '不超过100字符', trigger: 'blur' }
-        ],
-        // linkPhone: [
-        //   { required: true, trigger: "blur", message: "请输入联系电话(座机)" },
-        //   // { max: 11, message: '请输入正确的电话格式', trigger: 'blur' }
-        // ],
-        linkMobile: [
-          { required: true, trigger: "blur", message: "请输入手机号" },
-          {
-            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-            message: "请输入正确的手机号码",
-            trigger: "blur"
-          }
-        ],
         totoalPersons: [
           { required: true, trigger: "blur", message: "请输入职工总人数" },
           { validator: validNumber, trigger: 'blur'}
@@ -350,7 +323,6 @@ export default {
     	this.$refs.form.clearValidate()
     })
     this.form.id = this.$route.query.id || undefined;
-    this.form.entId = this.$route.query.entId || undefined;
     this.getYears()
     //添加年度信息 获取企业信息
     if(this.type == 'year') {

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

@@ -37,7 +37,7 @@
       </el-table-column>
       <el-table-column label="资料完善度" prop="linkEmail" align="center" width="340">
         <template slot-scope="scope">
-          <span>企业 {{scope.row.entCompRate}} 技术 {{scope.row.techCompRate}} 财务 {{scope.row.finCompRate}}</span>
+          <span>技术 {{scope.row.techCompRate}} 财务 {{scope.row.finCompRate}}</span>
         </template>
       </el-table-column>
       <el-table-column label="申报状态" prop="reportState" align="center" width="160" :formatter="reportStateFormat"></el-table-column>