liuxiangqi пре 1 година
родитељ
комит
28cb785b91

+ 1 - 1
src/api/common/common.js

@@ -19,7 +19,7 @@ export function getRegionChildrenApi(id) {
 //首页数据
 export function getIndexDataApi(query) {
   return request({
-    url: `/index/report`,
+    url: `/index/report/project`,
     method: 'get',
     params: query
   })

+ 3 - 0
src/assets/styles/index.scss

@@ -837,3 +837,6 @@ $border: #ddd;
   font-weight: 700;
   line-height: 19px;
 }
+.th_tips {
+  color: #4882B5;
+}

+ 2 - 2
src/assets/styles/ruoyi.scss

@@ -272,5 +272,5 @@
 	float: right;
 }
 .el-table--medium .el-table__cell {
-  padding: 0;
-}
+  padding: 4px 0;
+}

+ 1 - 1
src/layout/components/Sidebar/index.vue

@@ -55,7 +55,7 @@ export default {
     },
     data() {
       return {
-        openeds: ['/enterprise', '/project', '/message', '/operate', '/enterprise-info']
+        openeds: ['/enterprise', '/project', '/message', '/enterprise-info']
       }
     },
     methods: {

+ 10 - 10
src/views/enterprise/ent/edit.vue

@@ -5,7 +5,7 @@
       <el-form ref="form" :model="form" :rules="registerRules">
         <table class="table_register media">
           <tr>
-            <th rowspan="6" style="width: 10%;">企业信息</th>
+            <th rowspan="6" style="width: 10%;" class="th_tips">企业信息</th>
             <th style="width: 20%;"><span style="color: red;">*</span>企业名称</th>
             <td>
               <el-form-item label-width="0" prop="entName">
@@ -111,7 +111,7 @@
             </td>
           </tr>
           <tr>
-            <th rowspan="3">法人信息</th>
+            <th rowspan="3" class="th_tips">法人信息</th>
             <th><span style="color: red;">*</span>姓名</th>
             <td>
               <el-form-item label-width="0" prop="legalName">
@@ -160,7 +160,7 @@
             </td>
           </tr>
           <tr>
-            <th rowspan="3">联系人信息</th>
+            <th rowspan="3" class="th_tips">联系人信息</th>
             <th><span style="color: red;">*</span>姓名</th>
             <td>
               <el-form-item label-width="0" prop="linkName">
@@ -209,7 +209,7 @@
             </td>
           </tr>
           <tr>
-            <th>企业上市信息</th>
+            <th class="th_tips">企业上市信息</th>
             <th><span style="color: red;">*</span>企业是否上市</th>
             <td>
               <el-form-item label-width="0" prop="listedFlag">
@@ -229,7 +229,7 @@
             </template>
           </tr>
           <tr>
-            <th>风险投资信息</th>
+            <th class="th_tips">风险投资信息</th>
             <th><span style="color: red;">*</span>是否引入风险投资</th>
             <td>
               <el-form-item label-width="0" prop="investFlag">
@@ -250,7 +250,7 @@
             </template>
           </tr>
           <tr>
-            <th>高新企业</th>
+            <th class="th_tips">高新企业</th>
             <th><span style="color: red;">*</span>是否为高新企业</th>
             <td>
               <el-form-item label-width="0" prop="techFlag">
@@ -270,7 +270,7 @@
             </template>
           </tr>
           <tr>
-            <th>加计扣除</th>
+            <th class="th_tips">加计扣除</th>
             <th><span style="color: red;">*</span>上年度是否做加计扣除</th>
             <td colspan="3">
               <el-form-item label-width="0" prop="deductionFlag">
@@ -281,7 +281,7 @@
             </td>
           </tr>
           <tr v-if="type == 'add'">
-            <th>服务时间</th>
+            <th class="th_tips">服务时间</th>
             <th><span style="color: red;">*</span>服务时间段</th>
             <td colspan="3">
               <el-form-item prop="serviceDate" label-width="0">
@@ -291,7 +291,7 @@
             </td>
           </tr>
           <tr>
-            <th rowspan="2">附件</th>
+            <th rowspan="2" class="th_tips">附件</th>
             <th><span style="color: red;">*</span>企业营业执照</th>
             <td colspan="3">
               <el-form-item label-width="3" prop="licensePath" ref="licenseUpload">
@@ -300,7 +300,7 @@
             </td>
           </tr>
           <tr>
-            <th>其他附件</th>
+            <th class="th_tips">其他附件</th>
             <td colspan="3">
               <el-form-item prop="attachIds" label-width="0">
                 <el-upload

+ 4 - 4
src/views/enterprise/ent/index.vue

@@ -72,9 +72,9 @@
         </template>
       </el-table-column>
       <!-- <el-table-column label="社会信用代码" prop="license" align="center" width="240"></el-table-column> -->
-      <el-table-column label="联系人" align="center" prop="nickName" width="240"></el-table-column>
-      <el-table-column label="联系人手机号" prop="phonenumber" align="center" width="240"></el-table-column>
-      <el-table-column label="联系人邮箱" prop="email" align="center" width="240"></el-table-column>
+      <el-table-column label="联系人" align="center" prop="linkName" width="240"></el-table-column>
+      <el-table-column label="联系人手机号" prop="linkMobile" align="center" width="240"></el-table-column>
+      <!-- <el-table-column label="联系人邮箱" prop="linkEmail" align="center" width="240"></el-table-column> -->
       <el-table-column label="创建时间" prop="createTime" align="center" width="240"></el-table-column>
       <el-table-column label="服务时间" align="center" width="240">
         <template slot-scope="scope">
@@ -119,7 +119,7 @@
             <!-- 只有服务状态为已到期才可以提醒 -->
             <el-button type="text" @click="handleRemind(scope.row)" v-if="scope.row.entState == '3'">提醒</el-button>
             <!-- 审核状态为已驳回不可以删除 -->
-            <el-button type="text" @click="handleDelete(scope.row)" v-if="scope.row.authState != '3'">删除</el-button>
+            <!-- <el-button type="text" @click="handleDelete(scope.row)" v-if="scope.row.authState != '3'">删除</el-button> -->
           </template>
         </template>
       </el-table-column>

Разлика између датотеке није приказан због своје велике величине
+ 0 - 171
src/views/enterprise/project/components/EntEnclosure.vue


+ 0 - 153
src/views/enterprise/project/components/FinDataEnclosure.vue

@@ -1,153 +0,0 @@
-<template>
-  <div class="app-container">
-    <h3 class="toolbar">
-      <div class="tool">
-        <el-button type="primary" plain icon="el-icon-upload2" size="mini" @click="handleUpload" v-if="userType == 'ENT_FIN' || userType == 'ENT_ADMIN_FIN'">一键上传</el-button>
-        <el-button type="primary" plain icon="el-icon-download" size="mini" @click="handleDownload">批量下载</el-button>
-        <el-button type="primary" plain icon="el-icon-delete" size="mini" @click="handleBatchDelte" v-if="userType == 'ENT_FIN' || userType == 'ENT_ADMIN_FIN'">批量删除</el-button>
-      </div>
-    </h3>
-    <el-table v-loading="loading" :data="list" border @selection-change="handleSelectionChange" style="width: 100%" @select-all="selectAll">
-      <el-table-column type="selection" width="55"></el-table-column>
-      <el-table-column label="序号" type="index" width="50" align="center"></el-table-column>
-      <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="handleDownload(scope.row)">下载</el-button>
-          <el-button type="text" @click="handleDelete(scope.row)" v-if="userType == 'ENT_FIN' || userType == 'ENT_ADMIN_FIN'">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"/>
-    <upload-enclosure ref="uploadEnclosure" v-if="enclosureVisible" @refreshData="getList()" :dataId="dataId" :attachType="'FINACIAL'"></upload-enclosure>
-  </div>
-</template>
-
-<script>
-  import {getEnclosureApi,deleteEnclosureApi,getProjectInfoApi} from '@/api/enterprise/project/project'
-  import UploadEnclosure from './UploadEnclosure'
-  export default {
-    components: {
-      UploadEnclosure
-    },
-    data() {
-      return {
-        total: 0,
-        enclosureVisible: false,
-        list: [],
-        dataId: undefined,
-        id: this.$route.query.id,
-        attachType: 'FINACIAL',
-        loading: false,
-        selectionList: [],
-        ids: '',
-        queryParams: {
-          pageNum: 1,
-          pageSize: 10
-        }
-      };
-    },
-    created() {
-      this.id = this.$route.query.id || undefined;
-      this.getData()
-    },
-    computed: {
-      userType() {
-        return this.$store.state.user.userType
-      }
-    },
-    methods: {
-      getData() {
-        getProjectInfoApi(this.id).then(res => {
-          let obj = res.data.finProject || {}
-          this.dataId = obj.id //财务资料id
-          this.getList()
-        })
-      },
-      getList() {
-        getEnclosureApi(this.attachType,this.dataId).then(res => {
-          if(res.code == 200) {
-            this.list = res.data.records
-            this.total = res.data.total
-          }
-        })
-      },
-      handleUpload() {
-        this.enclosureVisible = true
-        this.$nextTick(() => {
-          this.$refs.uploadEnclosure.init()
-        })
-      },
-      handleDownload() {
-
-      },
-      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({
-          path: '/enclosurePreview',
-          query: {url: row.url,fileName: row.fileName,id: row.id}
-        });
-        window.open(routeUrl.href, "_blank");
-      },
-      handleDelete(row) {
-        const id = row.id;
-        this.$confirm('是否确认删除该数据?', "警告", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          }).then(function() {
-            return deleteEnclosureApi(id);
-          }).then(() => {
-            this.queryParams.pageNum = 1;
-            this.getList();
-            this.$modal.msgSuccess("删除成功");
-          })
-      },
-      // 取消全选
-      selectAll(selection) {
-        if (selection.length == 0) {
-          let list = this.selectedList.filter(item => !this.list.some(ele => ele.id === item.id));
-          this.selectionList = list;
-        }
-      },
-      handleSelectionChange(val) {
-        this.selectionList = val;
-        if(this.selectionList.length > 0) {
-          let selectionIds = []
-          for (let i = 0, len = this.selectionList.length; i < len; i++) {
-          	selectionIds.push(this.selectionList[i].id)
-          }
-          this.ids = selectionIds.join(',')
-        }else {
-          this.ids = ''
-        }
-      }
-    }
-  };
-  </script>
-
-</script>
-
-<style>
-</style>

+ 19 - 5
src/views/enterprise/project/components/ent-edit.vue

@@ -543,11 +543,25 @@ export default {
             this.form.projectStartDate = ''
             this.form.projectEndDate = ''
           }
-          declareUpdateApi(this.form).then(res => {
-            this.loading = false
-            this.$store.dispatch("tagsView/delView", this.$route);
-            this.$router.go(-1);
-          })
+          let _self = this;
+          this.$confirm('是否确认保存?', "警告", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          }).then(function() {
+            declareUpdateApi(_self.form).then(res => {
+              _self.$alert('企业研发项目情况保存成功', '提示', {
+                confirmButtonText: '确定',
+                callback: action => {
+                  _self.loading = false
+                  _self.$store.dispatch("tagsView/delView", _self.$route);
+                  _self.$router.go(-1);
+                }
+              })
+            })
+          }).catch(() => {
+              _self.loading = false
+          });
         }
       })
     }

+ 42 - 17
src/views/enterprise/project/components/year-edit.vue

@@ -297,10 +297,10 @@ export default {
           { required: true, trigger: "blur", message: "请输入年度研发投入(万元)" },
           { validator: validAmount, trigger: 'blur'}
         ],
-        techRate: [
-          { required: true, trigger: "blur", message: "请输入占销售收入比例(%)" },
-          { validator: validPercentage, trigger: 'blur'}
-        ],
+        // techRate: [
+        //   { required: true, trigger: "blur", message: "请输入占销售收入比例(%)" },
+        //   { validator: validPercentage, trigger: 'blur'}
+        // ],
         industry: [
           { required: true, trigger: "blur", message: "请选择企业所属行业" }
         ],
@@ -405,6 +405,9 @@ export default {
       getYearDataApi(projectYear, this.entId).then(res => {
         this.form = res.data
         this.form.fileName = '高新证书'
+        if(this.form.techStartDate && this.form.techEndDate) {
+          this.form.licenseTime = this.form.techStartDate + ' 至 ' + this.form.techEndDate
+        }
         if(this.form.techScope) {
           let techScope = this.form.techScope.split(',') || []
           this.$set(this.form, 'techScopeArray', techScope)
@@ -420,6 +423,9 @@ export default {
         if(res.data) {
           this.form = res.data
           this.form.fileName = '高新证书'
+          if(this.form.techStartDate && this.form.techEndDate) {
+            this.form.licenseTime = this.form.techStartDate + ' 至 ' + this.form.techEndDate
+          }
           if(this.form.techScope) {
             let techScope = this.form.techScope.split(',') || []
             this.$set(this.form, 'techScopeArray', techScope)
@@ -474,19 +480,38 @@ export default {
             this.form.techStartDate = ""
             this.form.techEndDate = ""
           }
-          if(this.type == 'year') {
-            yearApi(this.form).then(res => {
-              this.loading = false
-              this.$store.dispatch("tagsView/delView", this.$route);
-              this.$router.go(-1);
-            })
-          } else {
-            yearUpdateApi(this.form).then(res => {
-              this.loading = false
-              this.$store.dispatch("tagsView/delView", this.$route);
-              this.$router.go(-1);
-            })
-          }
+          let _self = this;
+          this.$confirm('是否确认保存?', "警告", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          }).then(function() {
+            if(_self.type == 'year') {
+              yearApi(_self.form).then(res => {
+                _self.$alert('企业加计年度企业基本信息保存成功', '提示', {
+                  confirmButtonText: '确定',
+                  callback: action => {
+                    _self.loading = false
+                    _self.$store.dispatch("tagsView/delView", _self.$route);
+                    _self.$router.go(-1);
+                  }
+                })
+              })
+            } else {
+              yearUpdateApi(_self.form).then(res => {
+                _self.$alert('企业加计年度企业基本信息保存成功', '提示', {
+                  confirmButtonText: '确定',
+                  callback: action => {
+                    _self.loading = false
+                    _self.$store.dispatch("tagsView/delView", _self.$route);
+                    _self.$router.go(-1);
+                  }
+                })
+              })
+            }
+          }).catch(() => {
+              _self.loading = false      
+          });
         }
       })
     }

+ 0 - 38
src/views/enterprise/project/edit/first.vue

@@ -1,38 +0,0 @@
-<template>
-  <div class="app-container" v-loading="loading">
-    <el-tabs type="border-card" v-model="activeName">
-      <el-tab-pane label="项目基本信息" name="1">
-        <ent-basic></ent-basic>
-      </el-tab-pane>
-      <el-tab-pane label="资料附件" name="2">
-        <ent-enclosure></ent-enclosure>
-      </el-tab-pane>
-    </el-tabs>
-  </div>
-</template>
-
-<script>
-  import EntBasic from "../components/EntBasic"
-  import EntEnclosure from "../components/EntEnclosure"
-
-export default {
-  name: "First",
-  components: {
-    EntBasic,
-    EntEnclosure
-  },
-  data() {
-    return {
-      activeName: '1',
-      loading: false,
-    };
-  },
-  created() {
-  },
-  methods: {
-  }
-};
-</script>
-
-<style rel="stylesheet/scss" lang="scss">
-</style>

+ 0 - 38
src/views/enterprise/project/edit/second.vue

@@ -1,38 +0,0 @@
-<template>
-  <div class="app-container" v-loading="loading">
-    <el-tabs type="border-card" v-model="activeName">
-      <el-tab-pane label="项目基本信息" name="1">
-        <tech-basic></tech-basic>
-      </el-tab-pane>
-      <el-tab-pane label="资料附件" name="2">
-        <tech-enclosure></tech-enclosure>
-      </el-tab-pane>
-    </el-tabs>
-  </div>
-</template>
-
-<script>
-  import TechBasic from "../components/TechBasic"
-  import TechEnclosure from "../components/TechEnclosure"
-
-export default {
-  name: "Second",
-  components: {
-    TechBasic,
-    TechEnclosure
-  },
-  data() {
-    return {
-      activeName: '1',
-      loading: false,
-    };
-  },
-  created() {
-  },
-  methods: {
-  }
-};
-</script>
-
-<style rel="stylesheet/scss" lang="scss">
-</style>

+ 0 - 43
src/views/enterprise/project/edit/third.vue

@@ -1,43 +0,0 @@
-<template>
-  <div class="app-container" v-loading="loading">
-    <el-tabs type="border-card" v-model="activeName">
-      <el-tab-pane label="项目基本信息" name="1">
-        <fin-basic></fin-basic>
-      </el-tab-pane>
-      <el-tab-pane label="资料附件" name="2">
-        <fin-enclosure></fin-enclosure>
-      </el-tab-pane>
-      <el-tab-pane label="财务资料附件" name="3">
-        <fin-data-enclosure></fin-data-enclosure>
-      </el-tab-pane>
-    </el-tabs>
-  </div>
-</template>
-
-<script>
-  import FinBasic from "../components/FinBasic"
-  import FinEnclosure from "../components/FinEnclosure"
-  import FinDataEnclosure from "../components/FinDataEnclosure"
-
-export default {
-  name: "Third",
-  components: {
-    FinBasic,
-    FinEnclosure,
-    FinDataEnclosure
-  },
-  data() {
-    return {
-      activeName: '1',
-      loading: false,
-    };
-  },
-  created() {
-  },
-  methods: {
-  }
-};
-</script>
-
-<style rel="stylesheet/scss" lang="scss">
-</style>

+ 1 - 1
src/views/index.vue

@@ -119,7 +119,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <h3 class="toolbar">
+      <h3 class="toolbar mt10">
         <span class="title">已申报项目</span>
         <div class="tool">
           <el-button type="text" size="mini" @click="$router.push('/project/project-declare')">查看更多</el-button>