刘湘琪 пре 2 година
родитељ
комит
0358d0a9a7

BIN
public/favicon.ico


BIN
src/assets/logo/kede.png


BIN
src/assets/logo/logo.png


+ 10 - 0
src/views/enterprise/declare/components/BasicInfo.vue

@@ -45,6 +45,12 @@
         <th>国家自主创新示范区企业</th>
         <td>{{info.innovateFlag}}</td>
       </tr>
+      <tr>
+        <th>技术分配人</th>
+        <td>{{techUser}}</td>
+        <th>财务分配人</th>
+        <td>{{finUser}}</td>
+      </tr>
     </table>
     <h3 class="toolbar mt20">
       <span class="title">项目是否跨年</span>
@@ -94,6 +100,8 @@
       return {
         loading: false,
         id: undefined,
+        finUser: '',
+        techUser: '',
         info: {
         },
       }
@@ -107,6 +115,8 @@
     methods: {
       getData() {
         getProjectInfoCommonApi(this.id).then(res => {
+          this.finUser = res.data.finUser
+          this.techUser = res.data.techUser
           this.info = res.data.finProject || {}
         })
       },

+ 1 - 1
src/views/enterprise/declare/components/EnclosureInfo.vue

@@ -3,7 +3,7 @@
     <h3 class="toolbar">
       <div class="tool">
         <el-button type="primary" plain icon="el-icon-download" size="mini" @click="handleDownloadBatch">批量下载</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-download" size="mini">一键打印</el-button>
       </div>
     </h3>
     <el-table v-loading="loading" :data="list" border @selection-change="handleSelectionChange" style="width: 100%" @select-all="selectAll">

+ 7 - 3
src/views/enterprise/project/components/BasicInfo.vue

@@ -42,9 +42,9 @@
       </tr>
       <tr>
         <th>技术分配人</th>
-        <th>{{info.techUser}}</th>
+        <td>{{techUser}}</td>
         <th>财务分配人</th>
-        <th>{{info.finUser}}</th>
+        <td>{{finUser}}</td>
       </tr>
     </table>
     <h3 class="toolbar mt20">
@@ -119,6 +119,8 @@
         loading: false,
         id: undefined,
         roleType: '',
+        finUser: '',
+        techUser: '',
         info: {
           projectLogList: []
         },
@@ -166,6 +168,8 @@
       //判断是科德管理员 还是企业角色
       getData() {
         getProjectInfoCommonApi(this.id).then(res => {
+          this.finUser = res.data.finUser
+          this.techUser = res.data.techUser
           if(this.projectOwner == '1') {
             this.info = res.data.entProject || {}
             if(this.info.projectLogList.length > 0) {
@@ -191,7 +195,7 @@
         }else {
           this.list = this.info.projectLogList || []
         }
-        
+
       },
       cancel() {
         this.$store.dispatch("tagsView/delView", this.$route); // 关闭当前tab

+ 7 - 3
src/views/enterprise/project/components/EnclosureInfo.vue

@@ -11,7 +11,7 @@
       <el-table-column label="文件名称" prop="fileName" align="center"></el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <!-- <el-button type="text" @click="handleView(scope.row)">查看</el-button> -->
+          <el-button type="text" @click="handleView(scope.row)">查看</el-button>
           <el-button type="text" @click="handleDownload(scope.row)">下载</el-button>
           <el-button type="text" @click="handleDelete(scope.row)">删除</el-button>
         </template>
@@ -117,8 +117,12 @@
         	})
         })
       },
-      handleView() {
-
+      // 查看
+      handleView(row) {
+        let fileUrl = row.url
+        let url = encodeURIComponent(fileUrl)
+        let officeUrl = 'https://view.xdocin.com/view?src='+url
+        window.open(officeUrl, '_target')
       },
       handleDelete(row) {
         const id = row.id;

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

@@ -94,7 +94,10 @@
             <template v-if="scope.row.finCompRate == '100.0%' && scope.row.reportState == '1'">
               <el-button type="text" @click="handleDeclare(scope.row)">提交申报</el-button>
             </template>
-            <template v-if="scope.row.finCompRate == '100.0%' && (userType == 'ENT_TECH' || userType == 'ENT_FIN') && scope.row.authState == '1'">
+            <template v-if="scope.row.finCompRate == '100.0%' && (scope.row.reportState == '2' || scope.row.reportState == '3') ">
+              <el-button type="text" @click="handleDeclare(scope.row)">重新申报</el-button>
+            </template>
+            <template v-if="scope.row.finCompRate == '100.0%' && (userType == 'ENT_TECH' || userType == 'ENT_FIN') && (scope.row.authState == '1' || scope.row.authState == '4')">
               <el-button type="text" @click="handleAudit(scope.row)">提交审核</el-button>
             </template>
             <template v-if="scope.row.authState == '2' && (userType == 'ENT_ADMIN_TECH' || userType == 'ENT_ADMIN_FIN')">

+ 2 - 2
src/views/login.vue

@@ -104,8 +104,8 @@ export default {
       pwdVisible: false,
       codeUrl: "",
       loginForm: {
-        username: "admin",
-        password: "admin123",
+        username: "",
+        password: "",
         rememberMe: false,
         code: "",
         uuid: ""