刘湘琪 лет назад: 2
Родитель
Сommit
ab091ee7ac

+ 13 - 5
src/views/enterprise/ent/edit.vue

@@ -488,10 +488,18 @@ export default {
         }
         this.form.provinceId = res.data.provinceId
         if(this.form.provinceId) {
-          this.getCityData()
+          getRegionChildrenApi(this.form.provinceId).then(res => {
+            if(res.code == 200) {
+              this.cityDataList = res.data
+            }
+          })
         }
         if(this.form.cityId) {
-          this.getDistrictData()
+          getRegionChildrenApi(this.form.cityId).then(res => {
+            if(res.code == 200) {
+              this.districtDataList = res.data
+            }
+          })
         }
       })
     },
@@ -514,8 +522,8 @@ export default {
     },
     //选择省份
     getCityData() {
-      // this.form.cityId = ''
-      // this.form.districtId = ''
+      this.form.cityId = ''
+      this.form.districtId = ''
       getRegionChildrenApi(this.form.provinceId).then(res => {
         if(res.code == 200) {
           this.cityDataList = res.data
@@ -531,7 +539,7 @@ export default {
     },
     //选择市
     getDistrictData() {
-      // this.form.districtId = ''
+      this.form.districtId = ''
       getRegionChildrenApi(this.form.cityId).then(res => {
         if(res.code == 200) {
           this.districtDataList = res.data

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

@@ -38,7 +38,7 @@
         <th>企业所属行业</th>
         <td>{{info.industry}}</td>
         <th>国家自主创新示范区企业</th>
-        <td>{{info.innovateFlag}}</td>
+        <td>{{innovateFlag}}</td>
       </tr>
     </table>
     <h3 class="toolbar mt20">
@@ -47,9 +47,9 @@
     <table class="table_view">
       <tr>
         <th>是否跨年</th>
-        <td>{{info.overYearFlag}}</td>
+        <td>{{overYearFlag}}</td>
         <th>项目期限</th>
-        <td>{{info.projectTime}}</td>
+        <td>{{info.projectStartDate}}-{{info.projectEndDate}}</td>
       </tr>
     </table>
     <h3 class="toolbar mt20">
@@ -58,7 +58,7 @@
     <table class="table_view">
       <tr>
         <th>是否科技型中小企业</th>
-        <td>{{info.smallFlag}}</td>
+        <td>{{smallFlag}}</td>
       </tr>
     </table>
     <h3 class="toolbar mt20">
@@ -67,15 +67,17 @@
     <table class="table_view">
       <tr>
         <th>企业是否高新技术</th>
-        <td>{{info.techFlag}}</td>
+        <td>{{techFlag}}</td>
         <th>高新技术企业所属技术领域</th>
         <td>{{info.techScope}}</td>
       </tr>
       <tr>
         <th>证书有限期限</th>
-        <td>{{info.lisenceTime}}</td>
+        <td>{{info.techStartDate}}-{{info.techEndDate}}</td>
         <th>高新证书</th>
-        <td>{{info.listingCode}}</td>
+        <td>
+          <a :href="info.techLicense" class="link">高新证书</a>
+        </td>
       </tr>
     </table>
   </div>
@@ -83,6 +85,7 @@
 
 <script>
   import { getProjectInfoApi,getProjectInfoAdminApi,getProjectInfoCommonApi } from "@/api/enterprise/project/project"
+  import {getLabel,yesOrNoOptions} from '@/utils/dataFormat'
   export default {
     name: 'projectInfo',
     data () {
@@ -105,6 +108,18 @@
       },
       roles() {
         return this.$store.state.user.roles
+      },
+      innovateFlag() {
+        return getLabel(yesOrNoOptions, this.info.innovateFlag)
+      },
+      overYearFlag() {
+        return getLabel(yesOrNoOptions, this.info.overYearFlag)
+      },
+      smallFlag() {
+        return getLabel(yesOrNoOptions, this.info.smallFlag)
+      },
+      techFlag() {
+        return getLabel(yesOrNoOptions, this.info.techFlag)
       }
     },
     created () {

+ 0 - 56
src/views/enterprise/project/components/TestBasic.vue

@@ -1,56 +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 './EntBasic'
-import EntEnclosure from './EntEnclosure'
-// import EntBasic from './components/EntBasic'
-// import TechBasic from './components/TechBasic'
-// import FinBasic from './components/FinBasic'
-// import {getProjectInfoApi} from '@/api/enterprise/project/project'
-// import EntEnclosure from './components/EntEnclosure'
-// import FinEnclosure from './components/FinEnclosure'
-// import TechEnclosure from './components/TechEnclosure'
-// import FinDataEnclosure from './components/FinDataEnclosure'
-export default {
-  name: "First",
-  components: {
-    EntBasic,
-    // TechBasic,
-    // FinBasic,
-    EntEnclosure,
-    // FinEnclosure,
-    // TechEnclosure,
-    // FinDataEnclosure
-  },
-  data() {
-    return {
-      activeName: '1',
-      loading: false,
-      id: undefined
-    };
-  },
-  created() {
-    this.id = this.$route.query.id || undefined;
-  },
-  methods: {
-  }
-};
-</script>
-
-<style rel="stylesheet/scss" lang="scss">
-  .el-tabs__nav {
-    width: 96px
-  }
-</style>

+ 15 - 10
src/views/enterprise/project/edit.vue

@@ -2,28 +2,30 @@
   <div class="app-container" v-loading="loading">
     <el-tabs :tab-position="tabPosition" stretch v-model="activeName">
       <el-tab-pane label="企业自填" name="1">
-        <!-- <test-basic></test-basic> -->
-        <el-tabs type="border-card">
+        <first></first>
+        <!-- <el-tabs type="border-card">
           <el-tab-pane label="项目基本信息">
             <ent-basic></ent-basic>
           </el-tab-pane>
           <el-tab-pane label="资料附件">
             <ent-enclosure></ent-enclosure>
           </el-tab-pane>
-        </el-tabs>
+        </el-tabs> -->
       </el-tab-pane>
       <el-tab-pane label="企业技术" name="2">
-        <el-tabs type="border-card">
+        <second></second>
+        <!-- <el-tabs type="border-card">
           <el-tab-pane label="项目基本信息">
             <tech-basic></tech-basic>
           </el-tab-pane>
           <el-tab-pane label="资料附件">
             <tech-enclosure></tech-enclosure>
           </el-tab-pane>
-        </el-tabs>
+        </el-tabs> -->
       </el-tab-pane>
       <el-tab-pane label="企业财务" name="3">
-        <el-tabs type="border-card">
+        <third></third>
+        <!-- <el-tabs type="border-card">
           <el-tab-pane label="项目基本信息">
             <fin-basic></fin-basic>
           </el-tab-pane>
@@ -33,7 +35,7 @@
           <el-tab-pane label="财务资料附件">
             <fin-data-enclosure></fin-data-enclosure>
           </el-tab-pane>
-        </el-tabs>
+        </el-tabs> -->
       </el-tab-pane>
     </el-tabs>
   </div>
@@ -50,7 +52,9 @@ import FinEnclosure from './components/FinEnclosure'
 import TechEnclosure from './components/TechEnclosure'
 import FinDataEnclosure from './components/FinDataEnclosure'
 
-import TestBasic from './components/TestBasic'
+import first from './edit/first'
+import second from './edit/second'
+import third from './edit/third'
 export default {
   name: "First",
   computed: {
@@ -66,8 +70,9 @@ export default {
     FinEnclosure,
     TechEnclosure,
     FinDataEnclosure,
-
-    TestBasic
+    first,
+    second,
+    third
   },
   data() {
     return {

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

@@ -0,0 +1,38 @@
+<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>

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

@@ -0,0 +1,38 @@
+<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>

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

@@ -0,0 +1,43 @@
+<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>

+ 17 - 25
src/views/enterprise/project/info.vue

@@ -2,31 +2,34 @@
   <div class="app-container" v-loading="loading">
     <el-tabs :tab-position="tabPosition" stretch ref="tabsFirst" v-model="activeName">
       <el-tab-pane label="企业自填" name="1">
-        <el-tabs type="border-card">
+        <basic-info :projectOwner="'1'"></basic-info>
+        <!-- <el-tabs type="border-card">
           <el-tab-pane label="项目基本信息">
             <basic-info :projectOwner="'1'"></basic-info>
           </el-tab-pane>
           <el-tab-pane label="资料附件">
             <enclosure-info :projectOwner="'1'"></enclosure-info>
           </el-tab-pane>
-        </el-tabs>
+        </el-tabs> -->
       </el-tab-pane>
       <!-- 用户不是企业管理员 -->
       <!-- <template v-if="userType ! = 'ENT_ADMIN'"> -->
-        <el-tab-pane label="企业技术" name="2" v-if="tabVisible">
-          <el-tabs type="border-card">
+        <el-tab-pane label="企业技术" name="2">
+          <basic-info :projectOwner="'2'"></basic-info>
+          <!-- <el-tabs type="border-card">
             <el-tab-pane label="项目基本信息">
               <basic-info :projectOwner="'2'"></basic-info>
             </el-tab-pane>
             <el-tab-pane label="资料附件">
               <enclosure-info :projectOwner="'2'"></enclosure-info>
             </el-tab-pane>
-          </el-tabs>
+          </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" v-if="finVisible">
-          <el-tabs type="border-card">
+        <el-tab-pane label="企业财务" name="3">
+          <basic-info :projectOwner="'3'"></basic-info>
+          <!-- <el-tabs type="border-card">
             <el-tab-pane label="项目基本信息">
               <basic-info :projectOwner="'3'"></basic-info>
             </el-tab-pane>
@@ -36,7 +39,7 @@
             <el-tab-pane label="财务资料附件">
               <enclosure-info :projectOwner="'3'" :finOwner="'fin'"></enclosure-info>
             </el-tab-pane>
-          </el-tabs>
+          </el-tabs> -->
         </el-tab-pane>
       <!-- </template> -->
       <!-- 用户不是企业管理员 技术员 -->
@@ -47,8 +50,10 @@
 
 <script>
 
-import BasicInfo from './components/BasicInfo'
-import EnclosureInfo from './components/EnclosureInfo'
+// import BasicInfo from './components/BasicInfo'
+import EnclosureInfo from './components/EnclosureInfo'
+
+import BasicInfo from './info/BasicInfo'
 export default {
   name: "First",
   computed: {
@@ -64,23 +69,10 @@ export default {
     return {
       activeName: '1',
       tabPosition: 'left',
-      loading: false,
-      entOwnVisible: false,
-      entTechVisible: false,
-      entFinVisible: false,
-      id: undefined,
-      tabVisible: false,
-      finVisible: false
+      loading: false,
     };
   },
-  created() {
-    this.id = this.$route.query.id || undefined;
-    if(this.userType != 'ENT_ADMIN') {
-      this.tabVisible = true
-    }
-    if(this.userType != 'ENT_ADMIN' || this.userType != 'ENT_TECH' || this.userType != 'ENT_ADMIN_TECH') {
-      this.finVisible = true
-    }
+  created() {
   }
 };
 </script>

+ 49 - 0
src/views/enterprise/project/info/BasicInfo.vue

@@ -0,0 +1,49 @@
+<template>
+  <div class="app-container" v-loading="loading">
+    <el-tabs type="border-card">
+      <el-tab-pane label="项目基本信息">
+        <basic-info :projectOwner="projectOwner"></basic-info>
+      </el-tab-pane>
+      <el-tab-pane label="资料附件">
+        <enclosure-info :projectOwner="projectOwner"></enclosure-info>
+      </el-tab-pane>
+      <el-tab-pane label="财务资料附件" v-if="projectOwner == '3'">
+        <enclosure-info :projectOwner="projectOwner" :finOwner="'fin'"></enclosure-info>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+import BasicInfo from '../components/BasicInfo'
+import EnclosureInfo from '../components/EnclosureInfo'
+
+export default {
+  name: "First",
+  components: {
+    BasicInfo,
+    EnclosureInfo,
+  },
+  props: {
+    projectOwner: {
+      type: String
+    },
+  },
+  data() {
+    return {
+      activeName: '1',
+      loading: false,
+    };
+  },
+  created() {
+  },
+  methods: {
+  }
+};
+</script>
+
+<style rel="stylesheet/scss" lang="scss">
+  .el-tabs__nav {
+    width: 96px
+  }
+</style>