Browse Source

提交研发项目成果表页面

ljb 9 months ago
parent
commit
4d8c9ea71a

+ 1 - 18
src/api/projectManage/resultTable.js

@@ -2,7 +2,7 @@ import request from '@/router/axios';
 
 
 export const getList = (current, size, params) => {
 export const getList = (current, size, params) => {
   return request({
   return request({
-    url: '/api/kd-scientific/xm-bgrz/list',
+    url: '/api/kd-scientific/xm-result/list',
     method: 'get',
     method: 'get',
     params: {
     params: {
       ...params,
       ...params,
@@ -11,20 +11,3 @@ export const getList = (current, size, params) => {
     }
     }
   })
   })
 }
 }
-
-export const add = (row) => {
-  return request({
-    url: '/api/kd-scientific/xm-bgrz/save',
-    method: 'post',
-    data: row
-  })
-}
-
-
-export const update = (row) => {
-  return request({
-    url: '/api/kd-scientific/xm-bgrz/update',
-    method: 'post',
-    data: row
-  })
-}

+ 11 - 55
src/option/projectManage/resultTable.js

@@ -17,79 +17,35 @@ export default {
   dialogType: "drawer",
   dialogType: "drawer",
   column: [
   column: [
     {
     {
-      label: '专利名称',
-      prop: 'zlmc',
-      type: 'input',
-      search: true,
+      label: '成果名称',
+      prop: 'cgmc',
       minWidth: 240,
       minWidth: 240,
       showOverflowTooltip: true,
       showOverflowTooltip: true,
     },
     },
     {
     {
-      label: '专利类型',
-      prop: 'zllx',
-      type: 'select',
+      label: '成果编号',
+      prop: 'cgbh',
       minWidth: 160,
       minWidth: 160,
       align: 'center',
       align: 'center',
-      search: true,
-      showOverflowTooltip: true,
-      dicUrl: '/api/kd-system/dict-biz/dictionary?code=xm_biangeng_field',
-      props: {
-        label: 'dictValue',
-        value: 'dictKey',
-      },
     },
     },
     {
     {
-      label: '申请号/专利号',
+      label: '申请日/完成日',
       prop: 'sqh',
       prop: 'sqh',
-      type: 'input',
-      minWidth: 140,
-      align: 'center',
-      search: true,
-      showOverflowTooltip: true,
-    },
-    {
-      label: '申请日',
-      prop: 'sqr',
-      width: 140,
-      align: 'center',
-      type: 'date',
-      valueFormat: 'yyyy-MM-dd',
-      showOverflowTooltip: true,
-    },
-    {
-      label: '授权日',
-      prop: 'sqr',
-      type: 'date',
-      valueFormat: 'yyyy-MM-dd',
       minWidth: 160,
       minWidth: 160,
-      showOverflowTooltip: true,
-    },
-    {
-      label: '申请单位',
-      prop: 'sqdw',
-      type: 'input',
-      minWidth: 160,
-      search: true,
-      showOverflowTooltip: true,
-    },
-    {
-      label: '专利权人',
-      prop: 'zlqr',
-      width: 160,
       align: 'center',
       align: 'center',
       showOverflowTooltip: true,
       showOverflowTooltip: true,
     },
     },
     {
     {
-      label: '发明人',
-      prop: 'fmr',
-      width: 160,
+      label: '授权日/生效日',
+      prop: 'sxr',
+      minWidth: 160,
       align: 'center',
       align: 'center',
       showOverflowTooltip: true,
       showOverflowTooltip: true,
     },
     },
     {
     {
-      label: '关联研发项目情况',
-      prop: 'fmr',
-      width: 160,
+      label: '成果类型',
+      prop: 'cglx',
+      minWidth: 160,
       align: 'center',
       align: 'center',
       showOverflowTooltip: true,
       showOverflowTooltip: true,
     },
     },

+ 5 - 1
src/views/project-manage/project-list.vue

@@ -69,7 +69,9 @@
         <el-tab-pane label="5、项目结题" lazy>
         <el-tab-pane label="5、项目结题" lazy>
           <accept-form :projectId="currProjectId"></accept-form>
           <accept-form :projectId="currProjectId"></accept-form>
         </el-tab-pane>
         </el-tab-pane>
-        <el-tab-pane label="6、项目成果" lazy></el-tab-pane>
+        <el-tab-pane label="6、项目成果" lazy>
+          <result-table :projectId="currProjectId"></result-table>
+        </el-tab-pane>
         <el-tab-pane label="7、委外材料" lazy>
         <el-tab-pane label="7、委外材料" lazy>
           <outsourcing-doc :projectId="currProjectId"></outsourcing-doc>
           <outsourcing-doc :projectId="currProjectId"></outsourcing-doc>
         </el-tab-pane>
         </el-tab-pane>
@@ -89,6 +91,7 @@ import projectBudget from "./components/project-budget.vue";
 import implement from './implement.vue';
 import implement from './implement.vue';
 import change from "./change.vue";
 import change from "./change.vue";
 import acceptForm from "./components/accept-form.vue";
 import acceptForm from "./components/accept-form.vue";
+import resultTable from "./result-table.vue";
 import outsourcingDoc from "./components/outsourcing-doc.vue";
 import outsourcingDoc from "./components/outsourcing-doc.vue";
 
 
 
 
@@ -100,6 +103,7 @@ export default window.$crudCommon({
     implement,
     implement,
     change,
     change,
     acceptForm,
     acceptForm,
+    resultTable,
     outsourcingDoc,
     outsourcingDoc,
   },
   },
   data() {
   data() {

+ 40 - 13
src/views/project-manage/result-table.vue

@@ -1,12 +1,21 @@
 <template>
 <template>
   <basic-container>
   <basic-container>
+    <div style="margin-top: 6px;">
+      <el-form :inline="true">
+        <el-form-item label="研发项目名称">
+          <project-select v-model="params.xmId" @change="handleProjectChange"></project-select>
+        </el-form-item>
+        <el-form-item label="研发项目编号">
+          {{ selProject.xmbh }}
+        </el-form-item>
+      </el-form>
+    </div>
+
     <avue-crud
     <avue-crud
+      ref="crud"
       v-bind="bindVal"
       v-bind="bindVal"
       v-on="onEvent"
       v-on="onEvent"
-      v-model="form"
       :page.sync="page"
       :page.sync="page"
-      :before-open="handleBeforeOpen"
-      :permission="permissionList"
     >
     >
       <template slot="menuLeft">
       <template slot="menuLeft">
         <el-button
         <el-button
@@ -31,32 +40,53 @@
       :rows-per-page="30"
       :rows-per-page="30"
       :default-landscape="true"
       :default-landscape="true"
     />
     />
+
   </basic-container>
   </basic-container>
 </template>
 </template>
 
 
 <script>
 <script>
-import {exportBloByPost} from "@/api/common";
+import {exportBlob} from "@/api/common";
 import {getToken} from "@/util/auth";
 import {getToken} from "@/util/auth";
+import projectSelect from "@/components/project-select";
 import {downloadXls} from "@/util/util";
 import {downloadXls} from "@/util/util";
-import changeForm from "./components/change-form.vue";
 
 
 
 
 export default window.$crudCommon({
 export default window.$crudCommon({
+  props: {
+    projectId: [String, Number]
+  },
   components: {
   components: {
-    changeForm
+    projectSelect
   },
   },
   data() {
   data() {
     return {
     return {
-      drawerVisible: false,
+      params: {
+        xmId: ''
+      },
+      selProject: {},
 
 
       wideTableColumns: [],
       wideTableColumns: [],
       printTitle: "",
       printTitle: "",
+
     };
     };
   },
   },
+  watch: {
+    "params.xmId"() {
+      this.page.currentPage = 1;
+      this.getList(this.page);
+    }
+  },
+  created() {
+    this.params.xmId = this.projectId;
+  },
   methods: {
   methods: {
+    loadData() {},
+    handleProjectChange(data) {
+      this.selProject = data;
+    },
     handleExport() {
     handleExport() {
-      exportBloByPost(`/api/kd-scientific/xm-bgrz/export?${this.website.tokenHeader}=${getToken()}`, this.params).then(res => {
-        downloadXls(res.data, `项目变更列表.xlsx`);
+      exportBlob(`/api/kd-scientific/xm-bgrz/export?${this.website.tokenHeader}=${getToken()}`, this.params).then(res => {
+        downloadXls(res.data, `${this.selProject.xmmc}项目成果.xlsx`);
       });
       });
     },
     },
     /**
     /**
@@ -65,14 +95,11 @@ export default window.$crudCommon({
      */
      */
     printTable(isLandscape) {
     printTable(isLandscape) {
       this.wideTableColumns = this.$refs.crud.columnOption;
       this.wideTableColumns = this.$refs.crud.columnOption;
-      this.printTitle = `项目变更列表`;
+      this.printTitle = `${this.selProject.xmmc}项目成果`;
       this.$nextTick(() => {
       this.$nextTick(() => {
         this.$refs.printWideTable.printTable(isLandscape);
         this.$refs.printWideTable.printTable(isLandscape);
       })
       })
     },
     },
-    handleAddChange() {
-      this.drawerVisible = true;
-    }
   },
   },
 }, {
 }, {
   // 模块路径
   // 模块路径