Browse Source

科研成果部分处理

朱丽平 10 months ago
parent
commit
fd3e9e85d8

+ 4 - 4
src/api/achievement/patentAchievement.js

@@ -2,7 +2,7 @@ import request from '@/router/axios';
 
 export const getList = (current, size, params) => {
   return request({
-    url: '/api/kd-scientific/technician/page',
+    url: '/api/kd-scientific/kycg/zl/list',
     method: 'get',
     params: {
       ...params,
@@ -14,7 +14,7 @@ export const getList = (current, size, params) => {
 
 export const add = (row) => {
   return request({
-    url: '/api/kd-scientific/technician/save',
+    url: '/api/kd-scientific/kycg/zl/save',
     method: 'post',
     data: row
   })
@@ -23,7 +23,7 @@ export const add = (row) => {
 
 export const update = (row) => {
   return request({
-    url: '/api/kd-scientific/technician/update',
+    url: '/api/kd-scientific/kycg/zl/update',
     method: 'post',
     data: row
   })
@@ -32,7 +32,7 @@ export const update = (row) => {
 
 export const remove = (ids) => {
   return request({
-    url: '/api/kd-scientific/technician/remove',
+    url: '/api/kd-scientific/kycg/zl/remove',
     method: 'post',
     params: {
       ids,

+ 70 - 47
src/option/achievement/patentAchievement.js

@@ -13,14 +13,14 @@ export default {
   delBtn: true,
   searchLabelWidth: 140,
   labelWidth: 140,
-  menuWidth: 160,
+  menuWidth: 200,
   dialogClickModal: false,
   dialogWidth: 760,
   dialogType: "drawer",
   column: [
     {
       label: "专利号",
-      prop: "number",
+      prop: "zlh",
       span: 12,
       width: 130,
       align: "center",
@@ -28,7 +28,7 @@ export default {
       showOverflowTooltip: true,
       rules: [
         {
-          required: true,
+          required: false,
           message: "请输入专利号",
           trigger: "blur",
         },
@@ -36,7 +36,7 @@ export default {
     },
     {
       label: "专利名称",
-      prop: "name",
+      prop: "zlmc",
       span: 12,
       search: true,
       width: 100,
@@ -52,16 +52,21 @@ export default {
     },
     {
       label: "专利类型",
-      prop: "identityCard",
+      prop: "zllx",
       type: "select",
       span: 12,
       search: true,
+      dicUrl: "/api/kd-system/dict-biz/dictionary?code=patent_type",
       width: 155,
       align: "center",
       showOverflowTooltip: true,
+      props:{
+        label: 'dictValue',
+        value: 'dictKey'
+      },
       rules: [
         {
-          required: true,
+          required: false,
           message: "请选择专利类型",
           trigger: "blur",
         },
@@ -69,16 +74,21 @@ export default {
     },
     {
       label: "是否国防专利",
-      prop: "secondaryUnit",
+      prop: "sfgfzl",
       type: "select",
       span: 12,
       width: 140,
       search: true,
       align: "center",
       showOverflowTooltip: true,
+      dicUrl: "/api/kd-system/dict-biz/dictionary?code=yes_or_no",
+       props:{
+        label: 'dictValue',
+        value: 'dictKey'
+      },
       rules: [
         {
-          required: true,
+          required: false,
           message: "请选择是否国防专利",
           trigger: "blur",
         },
@@ -86,16 +96,21 @@ export default {
     },
     {
       label: "国别",
-      prop: "department",
+      prop: "gb",
       type: "select",
       span: 12,
       width: 140,
       search: true,
+      dicUrl: "/api/kd-system/dict-biz/dictionary?code=countries",
+      props:{
+        label: 'dictValue',
+        value: 'dictKey'
+      },
       align: "center",
       showOverflowTooltip: true,
       rules: [
         {
-          required: true,
+          required: false,
           message: "请选择国别",
           trigger: "blur",
         },
@@ -103,7 +118,7 @@ export default {
     },
     {
       label: "申请号/专利号",
-      prop: "post",
+      prop: "sqhZlh",
       type: "input",
       span: 12,
       width: 100,
@@ -112,7 +127,7 @@ export default {
       showOverflowTooltip: true,
       rules: [
         {
-          required: true,
+          required: false,
           message: "请输入申请号/专利号",
           trigger: "blur",
         },
@@ -120,16 +135,18 @@ export default {
     },
     {
       label: "申请日",
-      prop: "postLocation",
-      type: "select",
+      prop: "shenqingRq",
+      type: "date",
       span: 12,
       width: 100,
       search: false,
+      format: "yyyy-MM-dd HH:mm:ss",
+      valueFormat: "yyyy-MM-dd HH:mm:ss",
       showOverflowTooltip: true,
       align: "center",
       rules: [
         {
-          required: true,
+          required: false,
           message: "请选择申请日",
           trigger: "blur",
         },
@@ -137,16 +154,18 @@ export default {
     },
     {
       label: "授权日",
-      prop: "nature",
-      type: "select",
+      prop: "shouquanRq",
+      type: "date",
       span: 12,
       width: 80,
       align: "center",
       search: false,
+      format: "yyyy-MM-dd HH:mm:ss",
+      valueFormat: "yyyy-MM-dd HH:mm:ss",
       showOverflowTooltip: true,
       rules: [
         {
-          required: true,
+          required: false,
           message: "请选择授权日",
           trigger: "change",
         },
@@ -154,21 +173,16 @@ export default {
     },
     {
       label: "申请单位",
-      prop: "situation",
-      type: "select",
+      prop: "sqdw",
+      type: "input",
       span: 12,
       width: 70,
       align: "center",
       search: true,
-      dicUrl: "/api/kd-system/dict-biz/dictionary?code=canyanqingkuang",
-      props: {
-        label: "dictValue",
-        value: "dictKey",
-      },
       showOverflowTooltip: true,
       rules: [
         {
-          required: true,
+          required: false,
           message: "请选择参研情况",
           trigger: "change",
         },
@@ -176,7 +190,7 @@ export default {
     },
     {
       label: "专利权人",
-      prop: "personnelType",
+      prop: "zlqr",
       type: "input",
       span: 12,
       width: 80,
@@ -185,7 +199,7 @@ export default {
       showOverflowTooltip: true,
       rules: [
         {
-          required: true,
+          required: false,
           message: "请输入专利权人",
           trigger: "blur",
         },
@@ -193,8 +207,8 @@ export default {
     },
     {
       label: "共有权人",
-      prop: "personnelType",
-      type: "select",
+      prop: "gyqr",
+      type: "input",
       span: 12,
       width: 80,
       align: "center",
@@ -202,7 +216,7 @@ export default {
       showOverflowTooltip: true,
       rules: [
         {
-          required: true,
+          required: false,
           message: "请输入共有权人",
           trigger: "blur",
         },
@@ -210,7 +224,7 @@ export default {
     },
     {
       label: "发明人",
-      prop: "personnelType",
+      prop: "fmr",
       type: "input",
       span: 12,
       width: 80,
@@ -219,26 +233,33 @@ export default {
       showOverflowTooltip: true,
       rules: [
         {
-          required: true,
+          required: false,
           message: "请输入发明人",
           trigger: "blur",
         },
       ],
     },
     {
-      label: "nhnhx",
+      label: "法律状态",
       prop: "personnelType",
       type: "select",
       span: 12,
       width: 80,
       align: "center",
-      search: false,
-      dicUrl: "/api/kd-system/dict-biz/dictionary?code=renyuanleixing",
+      search: true,
+      dicUrl: "/api/kd-system/dict-biz/dictionary?code=legal_status",
       props: {
         label: "dictValue",
         value: "dictKey",
       },
       showOverflowTooltip: true,
+      rules: [
+        {
+          required: false,
+          message: "请选择法律状态",
+          trigger: "blur",
+        },
+      ],
     },
     {
       label: "关联研发项目情况",
@@ -260,7 +281,7 @@ export default {
           search: true,
           rules: [
             {
-              required: true,
+              required: false,
               message: "请输入发明人",
               trigger: "blur",
             },
@@ -271,7 +292,7 @@ export default {
           search: true,
           rules: [
             {
-              required: true,
+              required: false,
               message: "请输入发明人",
               trigger: "blur",
             },
@@ -280,24 +301,26 @@ export default {
       ],
     },
     {
-      label: "Column 2",
+      label: "附件上传",
       prop: "personnelType",
-      type: "select",
+      type: "upload",
       span: 12,
       width: 80,
       align: "center",
+      dataType: 'string',
       search: false,
-      dicUrl: "/api/kd-system/dict-biz/dictionary?code=renyuanleixing",
-      props: {
-        label: "dictValue",
-        value: "dictKey",
-      },
+      loadText: '附件上传中,请稍等',
       showOverflowTooltip: true,
+      propsHttp: {
+        res: 'data',
+        url: 'link',
+      },
+      action: "/api/kd-resource/oss/endpoint/put-file-attach"
     },
     {
-      label: "附件上传",
+      label: "收件人邮箱",
       prop: "personnelType",
-      type: "select",
+      type: "input",
       span: 12,
       width: 80,
       align: "center",

+ 15 - 3
src/views/achievement/patent-achievement.vue

@@ -44,11 +44,13 @@
         </el-button>
       </template>
     </avue-crud>
+    <upload-excel-dialog ref="uploadExcelDialog" :uploadAfter="uploadAfter"/>
   </basic-container>
 </template>
 
 <script>
 import {exportBloByPost} from "@/api/common";
+import UploadExcelDialog from "@/components/upload-excel-dialog";
 import NProgress from 'nprogress';
 import 'nprogress/nprogress.css';
 import {getToken} from "@/util/auth";
@@ -56,13 +58,23 @@ import {downloadXls} from "@/util/util";
 
 
 export default window.$crudCommon({
-  
+  components: {
+    UploadExcelDialog,
+  },
   data() {
     return {
       params: {},
     };
   },
   methods: {
+    handleImport() {
+      // let excelParams = { yearAndMonth: this.params.yearAndMonth };
+      this.$refs.uploadExcelDialog.open('/api/kd-scientific/kycg/zl/import', {});
+    },
+    uploadAfter() {
+      this.page.currentPage = 1;
+      this.getList(this.page);
+    },
     handleExport() {
       this.$confirm("是否导出吗?", "提示", {
         confirmButtonText: "确定",
@@ -70,8 +82,8 @@ export default window.$crudCommon({
         type: "warning"
       }).then(() => {
         NProgress.start();
-        exportBloByPost(`/api/kd-scientific/technician/export?${this.website.tokenHeader}=${getToken()}`, this.params).then(res => {
-          downloadXls(res.data, `技术人员上一年度平均工资${this.params.yearAndMonth}.xlsx`);
+        exportBlob(`/api/kd-scientific/kycg/zl/export?${this.website.tokenHeader}=${getToken()}`, this.params).then(res => {
+          downloadXls(res.data, `科研成果${this.params.yearAndMonth}.xlsx`);
           NProgress.done();
         })
       });