Browse Source

高新人员汇总表接口联调

ljb 9 months ago
parent
commit
a9c65509c1

+ 1 - 29
src/api/techPerson/highTechPersonSumList.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/technician/ndgkjryhzb',
     method: 'get',
     params: {
       ...params,
@@ -11,31 +11,3 @@ export const getList = (current, size, params) => {
     }
   })
 }
-
-export const add = (row) => {
-  return request({
-    url: '/api/kd-scientific/technician/save',
-    method: 'post',
-    data: row
-  })
-}
-
-
-export const update = (row) => {
-  return request({
-    url: '/api/kd-scientific/technician/update',
-    method: 'post',
-    data: row
-  })
-}
-
-
-export const remove = (ids) => {
-  return request({
-    url: '/api/kd-scientific/technician/remove',
-    method: 'post',
-    params: {
-      ids,
-    }
-  })
-}

+ 1 - 0
src/option/techPerson/cyPersonRoster.js

@@ -10,6 +10,7 @@ export default {
   selection: true,
   addBtn: false,
   delBtn: false,
+  menu: false,
   searchLabelWidth: 140,
   labelWidth: 140,
   menuWidth: 160,

+ 17 - 24
src/option/techPerson/highTechPersonSumList.js

@@ -8,8 +8,8 @@ export default {
   index: true,
   addBtn: false,
   viewBtn: true,
-  printBtn: true,
   selection: true,
+  menu: false,
   searchLabelWidth: 140,
   labelWidth: 140,
   menuWidth: 220,
@@ -23,7 +23,7 @@ export default {
       type: 'input',
       span: 12,
       search: true,
-      width: 100,
+      width: 80,
       align: 'center',
       showOverflowTooltip: true,
       rules: [
@@ -39,7 +39,7 @@ export default {
       prop: 'number',
       type: 'input',
       span: 12,
-      width: 160,
+      width: 90,
       align: 'center',
       search: true,
       showOverflowTooltip: true,
@@ -57,7 +57,7 @@ export default {
       type: 'input',
       span: 12,
       search: true,
-      width: 160,
+      width: 150,
       align: 'center',
       showOverflowTooltip: true,
       // rules: [
@@ -111,7 +111,7 @@ export default {
       prop: 'ethnic',
       type: 'input',
       span: 12,
-      width: 120,
+      width: 80,
       align: 'center',
       showOverflowTooltip: true,
       rules: [
@@ -127,7 +127,7 @@ export default {
       prop: 'secondaryUnit',
       type: 'input',
       span: 12,
-      width: 140,
+      width: 100,
       search: true,
       align: 'center',
       showOverflowTooltip: true,
@@ -144,7 +144,7 @@ export default {
       prop: 'department',
       type: 'input',
       span: 12,
-      width: 140,
+      width: 120,
       search: true,
       align: 'center',
       showOverflowTooltip: true,
@@ -217,7 +217,7 @@ export default {
       type: 'datetime',
       valueFormat: 'yyyy-MM-dd HH:mm:ss',
       span: 12,
-      width: 140,
+      width: 90,
       align: 'center',
       search: true,
       showOverflowTooltip: true,
@@ -256,7 +256,7 @@ export default {
       prop: 'degree',
       type: 'select',
       span: 12,
-      width: 90,
+      width: 70,
       align: 'center',
       search: true,
       dicUrl: '/api/kd-system/dict-biz/dictionary?code=xuewei',
@@ -278,7 +278,7 @@ export default {
       prop: 'schoolName',
       type: 'input',
       span: 12,
-      width: 160,
+      width: 130,
       align: 'center',
       showOverflowTooltip: true,
       rules: [
@@ -294,7 +294,7 @@ export default {
       prop: 'major',
       type: 'input',
       span: 12,
-      width: 140,
+      width: 120,
       align: 'center',
       showOverflowTooltip: true,
       rules: [
@@ -310,7 +310,7 @@ export default {
       prop: 'rank',
       type: 'select',
       span: 12,
-      width: 120,
+      width: 100,
       align: 'center',
       search: true,
       dicUrl: '/api/kd-system/dict-biz/dictionary?code=zhicheng',
@@ -332,7 +332,7 @@ export default {
       prop: 'practicingRequirement',
       type: 'input',
       span: 12,
-      width: 100,
+      width: 80,
       align: 'center',
       search: true,
       showOverflowTooltip: true,
@@ -349,7 +349,7 @@ export default {
       prop: 'situation',
       type: 'select',
       span: 12,
-      width: 100,
+      width: 80,
       align: 'center',
       search: true,
       dicUrl: '/api/kd-system/dict-biz/dictionary?code=canyanqingkuang',
@@ -371,7 +371,7 @@ export default {
       prop: 'personnelType',
       type: 'select',
       span: 12,
-      width: 100,
+      width: 80,
       align: 'center',
       dicUrl: '/api/kd-system/dict-biz/dictionary?code=renyuanleixing',
       props: {
@@ -397,21 +397,14 @@ export default {
     },
     {
       label: '本年度从事研发工作天数',
-      prop: 'yfts',
+      prop: 'workDaysByYear',
       type: 'number',
       span: 12,
-      width: 170,
+      width: 160,
       align: 'center',
       fixed: 'right',
       showOverflowTooltip: true,
       editDisplay: false,
-      rules: [
-        {
-          required: true,
-          message: '请输入本年度从事研发工作天数',
-          trigger: 'change',
-        },
-      ],
     },
   ],
 };

+ 2 - 33
src/views/tech-person/high-tech-person-sum-list.vue

@@ -11,24 +11,6 @@
     >
       <template slot="menuLeft">
         <el-button
-          type="danger"
-          size="small"
-          icon="el-icon-delete"
-          plain
-          @click="handleDelete"
-        >
-          删 除
-        </el-button>
-        <el-button
-          type="success"
-          size="small"
-          plain
-          icon="el-icon-upload2"
-          @click="handleImport"
-        >
-          导入
-        </el-button>
-        <el-button
           type="warning"
           size="small"
           plain
@@ -46,8 +28,6 @@
       
     </avue-crud>
 
-    <upload-excel-dialog ref="uploadExcelDialog" :uploadAfter="uploadAfter"/>
-
     <WideTablePrinter
       ref="printWideTable"
       :columns="wideTableColumns"
@@ -60,9 +40,8 @@
 </template>
 
 <script>
-import {exportBloByPost} from "@/api/common";
+import {exportBlob} from "@/api/common";
 import YearMonthSelect from "@/components/year-month-select";
-import UploadExcelDialog from "@/components/upload-excel-dialog";
 import moment from "moment";
 import {getToken} from "@/util/auth";
 import {downloadXls} from "@/util/util";
@@ -71,7 +50,6 @@ import {downloadXls} from "@/util/util";
 export default window.$crudCommon({
   components: {
     YearMonthSelect,
-    UploadExcelDialog
   },
   data() {
     return {
@@ -90,17 +68,8 @@ export default window.$crudCommon({
     }
   },
   methods: {
-    loadData() {},
-    handleImport() {
-      let excelParams = { yearAndMonth: this.params.yearAndMonth };
-      this.$refs.uploadExcelDialog.open('/api/kd-scientific/technician/import', excelParams);
-    },
-    uploadAfter() {
-      this.page.currentPage = 1;
-      this.getList(this.page);
-    },
     handleExport() {
-      exportBloByPost(`/api/kd-scientific/technician/export?${this.website.tokenHeader}=${getToken()}`, this.params).then(res => {
+      exportBlob(`/api/kd-scientific/technician/ndgkjryhzb/export?${this.website.tokenHeader}=${getToken()}`, this.params).then(res => {
         downloadXls(res.data, `${this.params.yearAndMonth}年度高新科技人员汇总表.xlsx`);
       });
     },