ソースを参照

页面问题解决

liuxiangqi 1 年間 前
コミット
524d098cc6
共有3 個のファイルを変更した103 個の追加33 個の削除を含む
  1. 7 0
      src/api/enterprise/project/project.js
  2. 37 23
      src/views/enterprise/project/components/ent-edit.vue
  3. 59 10
      src/views/enterprise/project/components/year-edit.vue

+ 7 - 0
src/api/enterprise/project/project.js

@@ -160,6 +160,13 @@ export function getYearDataApi(projectYear, entId, query) {
     params: query
   })
 }
+export function getYearApi(projectYear, query) {
+  return request({
+    url: `/ent/data/year-project/${projectYear}`,
+    method: 'get',
+    params: query
+  })
+}
 //获取附件列表
 // export function getEnclosureApi(attachType, dataId) {
 //   return request({

+ 37 - 23
src/views/enterprise/project/components/ent-edit.vue

@@ -340,7 +340,13 @@ export default {
         projectEndDate: '',
         industryArray: [],
         industry: '',
-        headAddVOList: []
+        headAddVOList: [],
+        projectYear: '',
+        projectDate: '',
+        projectName: '',
+        projectType: '',
+        projectTime: '',
+        developFlag: ''
       },
       rules: {
         userName: [
@@ -424,6 +430,9 @@ export default {
         this.form.projectTime = value; // 将选中的值赋给组件中的变量
       }
     });
+
+
+
   },
   created() {
     this.$nextTick(() => {
@@ -441,6 +450,7 @@ export default {
     if(this.type == 'view') {
       this.disabledVisible = true
     }
+
   },
   methods: {
     getYears(){
@@ -551,29 +561,33 @@ export default {
     info: {
       immediate: true,
       handler (obj) {
-            this.form.projectDate = obj.projectDate
-            this.form.projectType = obj.projectType + ''
-            this.form.projectYear = obj.projectYear
-            this.form.projectName = obj.projectName
-            this.form.developFlag = obj.developFlag
-            this.form.headAddVOList = obj.headAddVOList || []
-            this.form.industry = obj.industry
-            this.form.fileName = '高新证书'
-            let arr = ['电子信息']
-            this.$set(this.form, 'techScopeArray', arr)
+        let infoObj = Object.assign({}, obj)
+        if(infoObj) {
+          this.form.projectDate = infoObj.projectDate
+          this.form.projectType = infoObj.projectType + ''
+          this.form.projectYear = infoObj.projectYear
+          this.form.projectName = infoObj.projectName
+          this.form.developFlag = infoObj.developFlag
+          this.form.headAddVOList = infoObj.headAddVOList || []
+          this.form.industry = infoObj.industry
+          this.form.fileName = '高新证书'
+          let arr = ['电子信息']
+          this.$set(this.form, 'techScopeArray', arr)
+
+          if(infoObj.technicalField) {
+            this.form.technicalFieldArray = infoObj.technicalField.split(',') || []
+          }
+          if(infoObj.technicalSource) {
+            this.form.technicalSourceArray = infoObj.technicalSource.split(',') || []
+          }
+          if(infoObj.technicalForm) {
+            this.form.technicalFormArray = infoObj.technicalForm.split(',') || []
+          }
+          if(infoObj.projectStartDate && infoObj.projectEndDate) {
+            this.form.projectTime = infoObj.projectStartDate + ' 至 ' + infoObj.projectEndDate
+          }
 
-            if(obj.technicalField) {
-              this.form.technicalFieldArray = obj.technicalField.split(',') || []
-            }
-            if(obj.technicalSource) {
-              this.form.technicalSourceArray = obj.technicalSource.split(',') || []
-            }
-            if(obj.technicalForm) {
-              this.form.technicalFormArray = obj.technicalForm.split(',') || []
-            }
-            if(obj.projectStartDate && obj.projectEndDate) {
-              this.form.projectTime = obj.projectStartDate + ' 至 ' + obj.projectEndDate
-            }
+        }
       }
     },
   }

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

@@ -15,7 +15,7 @@
           <th><span style="color: red;">*</span>申办加计年度</th>
           <td>
             <el-form-item prop="projectYear" label-width="0">
-              <el-select v-model="form.projectYear" filterable :disabled="disabledVisible">
+              <el-select v-model="form.projectYear" filterable :disabled="yearVisible" @change="handleYear">
                 <el-option v-for="(item, index) in yearsOptions" :key="index" :value="item.dictValue" :label="item.dictLabel"></el-option>
               </el-select>
             </el-form-item>
@@ -170,6 +170,18 @@
           </tr>
         </template>
       </table>
+      <h3 class="toolbar">
+        <span class="title">研发项目情况表</span>
+      </h3>
+      <el-table v-loading="tableLoading" :data="list" border>
+        <el-table-column label="项目名称" prop="projectName"></el-table-column>
+        <el-table-column label="项目起止时间" align="center">
+          <template slot-scope="scope">
+            <span>{{scope.row.projectStartDate}} - {{scope.row.projectEndDate}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="研发人员数" prop="projectName" align="center"/>
+      </el-table>
       <template v-if="type == 'year' || type == 'update'">
         <el-row :gutter="40" v-if="!disabledVisible">
           <el-col :span="24">
@@ -180,12 +192,13 @@
           </el-col>
         </el-row>
       </template>
-    </el-form>
+    </el-form>
+
   </div>
 </template>
 
 <script>
-import { editProjectApi,getProjectInfoApi,synTechApi,draftApi,yearApi,devProjectApi,getYearDataApi,yearUpdateApi } from "@/api/enterprise/project/project"
+import { editProjectApi,getProjectInfoApi,synTechApi,draftApi,yearApi,devProjectApi,getYearDataApi,yearUpdateApi,listProjectApi,getYearApi } from "@/api/enterprise/project/project"
 import { techScopeOptions,yesOrNoOptions,businessIndustryOptions,booleanOptions } from "@/utils/dataFormat"
 import FileUpload from '@/components/FileUpload'
 import { listEntUserApi } from "@/api/ent/ent"
@@ -225,7 +238,9 @@ export default {
   },
   data() {
     return {
+      yearVisible: false,
       options: businessIndustryOptions,
+      tableLoading: false,
       disabledVisible: false,
       entId: "",
       serviceDate: [],
@@ -239,7 +254,8 @@ export default {
       provinceDataList: [],
       cityDataList: [],
       districtDataList: [],
-      yearsOptions: [],
+      yearsOptions: [],
+      list: [],
       form: {
         projectYear: "",
         techScopeArray: [],
@@ -324,17 +340,25 @@ export default {
     this.entId = this.$route.query.entId || undefined;
     this.getYears()
     //添加年度信息 获取企业信息
-    if(this.type == 'year') {
-      this.getEntData()
-    }
+
     //如果是财务、科技
     if(this.roleTypeFlag) {
       this.disabledVisible = true
+      this.yearVisible = true
     }else {
       this.disabledVisible = false
+      this.yearVisible = false
     }
     if(this.type == 'view') {
       this.disabledVisible = true
+      this.yearVisible = true
+    }
+    if(this.type == 'year') {
+
+      this.getEntData()
+    }
+    if(this.type == 'update') {
+      this.yearVisible = true
     }
   },
   methods: {
@@ -395,6 +419,31 @@ export default {
         }
       })
     },
+    handleYear(e) {
+      getYearApi(e).then(res => {
+        this.form = res.data
+        if(this.form.techScope) {
+          let techScope = this.form.techScope.split(',') || []
+          this.$set(this.form, 'techScopeArray', techScope)
+        }
+        if(this.form.industry) {
+          let industryArray = this.form.industry.split(',') || [];
+          this.$set(this.form, 'industryArray', industryArray);
+        }
+      })
+    },
+    getList(year) {
+      this.tableLoading = true;
+      let params = {
+        year: year,
+        entId: this.entId
+      }
+      listProjectApi(params).then(response => {
+        this.list = response.data.records;
+        this.total = response.data.total;
+        this.tableLoading = false;
+      });
+    },
     handleSuccess(file) {
       this.$refs.techLicenseUpload.clearValidate()
       this.form.techLicense = file.url;
@@ -452,9 +501,9 @@ export default {
     info: {
       immediate: true,
       handler (obj) {
-        this.form.projectYear = obj.projectYear
-        if(this.form.projectYear) {
-          this.getYearData(this.form.projectYear)
+        if(obj.projectYear) {
+          this.getYearData(obj.projectYear)
+          this.getList(obj.projectYear)
         }
       }
     },