Browse Source

考勤导出接口更改

ljb 8 months ago
parent
commit
aaf2621378

+ 11 - 130
src/printOption/yfCostManage/basicDataSetting/houseDetailList.js

@@ -1,26 +1,9 @@
-import { ZC_STATUS } from "@/config/dict";
-
 export default {
-  height: 'auto',
-  calcHeight: 30,
-  tip: false,
-  searchShow: true,
-  searchMenuSpan: 6,
-  border: true,
-  index: true,
-  delBtn: false,
-  menu: false,
-  selection: true,
-  labelWidth: 120,
-  menuWidth: 220,
-  dialogClickModal: false,
-  dialogWidth: 500,
-  dialogType: "drawer",
   column: [
     {
       label: '月份',
       prop: 'yearAndMonth',
-      width: 65,
+      width: 60,
       align: 'center',
       showOverflowTooltip: true,
       display: false
@@ -28,186 +11,84 @@ export default {
     {
       label: '研发项目编号',
       prop: 'xmbh',
-      type: 'input',
-      span: 24,
-      width: 100,
+      width: 110,
       align: 'center',
-      showOverflowTooltip: true,
-      display: false,
-    },
-    {
-      label: '研发项目名称',
-      prop: 'xmId',
-      span: 24,
-      hide: true,
-      rules: [{
-        required: true,
-        message: '请选择资产名称',
-        trigger: 'blur'
-      }]
     },
     {
       label: '研发项目名称',
       prop: 'xmmc',
-      type: 'input',
-      span: 24,
-      search: true,
-      width: 120,
-      showOverflowTooltip: true,
-      display: false,
+      width: 300,
     },
     {
       label: '资产编码',
       prop: 'zcbm',
-      type: 'input',
-      span: 24,
       width: 100,
       align: 'center',
-      showOverflowTooltip: true,
-      display: false,
-    },
-    {
-      label: '资产名称',
-      prop: 'assetId',
-      span: 24,
-      hide: true,
-      rules: [{
-        required: true,
-        message: '请选择资产名称',
-        trigger: 'blur'
-      }]
     },
     {
       label: '资产名称',
       prop: 'zcmc',
-      type: 'input',
-      span: 24,
-      minWidth: 140,
-      search: true,
-      showOverflowTooltip: true,
-      display: false,
+      width: 260,
     },
     {
       label: '资产类别',
       prop: 'zclb',
-      type: 'select',
-      dicUrl: '/api/kd-system/dict/dictionary?code=zclb',
-      props: {
-        label: 'dictValue',
-        value: 'dictKey',
-      },
-      span: 24,
-      width: 85,
+      width: 100,
       align: 'center',
-      showOverflowTooltip: true,
-      display: false,
     },
     {
       label: '功率',
       prop: 'gl',
-      type: 'input',
-      span: 24,
       width: 70,
       align: 'center',
-      showOverflowTooltip: true,
-      display: false,
     },
     {
       label: '用途',
       prop: 'yt',
-      type: 'select',
-      dicUrl: '/api/kd-system/dict/dictionary?code=zcyt',
-      props: {
-        label: 'dictValue',
-        value: 'dictKey',
-      },
-      search: true,
-      span: 24,
       width: 60,
       align: 'center',
-      showOverflowTooltip: true,
-      display: false,
     },
     {
       label: '折旧开始时间',
       prop: 'kssj',
-      type: 'date',
-      valueFormat: 'yyyy-MM-dd',
-      span: 24,
-      width: 95,
+      width: 110,
       align: 'center',
-      showOverflowTooltip: true,
-      display: false,
     },
     {
       label: '使用寿命(月)',
       prop: 'sysm',
-      type: 'number',
-      span: 24,
       width: 90,
-      search: true,
-      align: 'center',
-      showOverflowTooltip: true,
-      display: false,
+      align: 'center'
     },
     {
       label: '已使用月数',
       prop: 'ysysm',
-      type: 'number',
-      span: 24,
       width: 85,
       align: 'center',
-      display: false,
-      search: true,
-      showOverflowTooltip: true,
-      display: false,
     },
     {
       label: '资产原值(元)',
       prop: 'zcyz',
-      type: 'number',
-      span: 24,
-      width: 95,
+      width: 90,
       align: 'center',
-      search: true,
-      showOverflowTooltip: true,
-      display: false,
     },
     {
       label: '净残值率(%)',
       prop: 'jcz',
-      type: 'number',
-      span: 24,
-      width: 80,
+      width: 90,
       align: 'center',
-      showOverflowTooltip: true,
-      display: false,
-      formatter:(row, value)=>{
-        return value+'%'
-      }
     },
     {
       label: '月折旧额(每台/套)(K)',
       prop: 'yzje',
-      type: 'number',
-      span: 24,
       width: 120,
       align: 'center',
-      search: true,
-      showOverflowTooltip: true,
-      display: false,
     },
     {
       label: '状态',
-      prop: 'status',
-      type: 'select',
-      dicData: ZC_STATUS,
-      search: true,
-      span: 24,
-      width: 90,
+      prop: '$status',
+      width: 100,
       align: 'center',
-      showOverflowTooltip: true,
-      display: false,
     }
   ],
 };

+ 2 - 2
src/views/yf-cost-manage/basic-data-setting/atten-info.vue

@@ -62,7 +62,7 @@
 <script>
 import YearMonthSelect from "@/components/year-month-select";
 import UploadExcelDialog from "@/components/upload-excel-dialog";
-import {exportBlob} from "@/api/common";
+import {exportBloByPost} from "@/api/common";
 import {getToken} from "@/util/auth";
 import {downloadXls} from "@/util/util";
 import { deepClone, getMonthDatesWithMarkers } from "@/util/util";
@@ -194,7 +194,7 @@ export default window.$crudCommon({
       this.getList(this.page);
     },
     handleExport() {
-      exportBlob(`/api/kd-scientific/attendance/export?${this.website.tokenHeader}=${getToken()}`, this.params).then(res => {
+      exportBloByPost(`/api/kd-scientific/attendance/export?${this.website.tokenHeader}=${getToken()}`, this.params).then(res => {
         downloadXls(res.data, `${this.pageTitle}.xlsx`);
       });
     },

+ 16 - 7
src/views/yf-cost-manage/basic-data-setting/hourse-details-list.vue

@@ -107,10 +107,11 @@
     <WideTablePrinter
       ref="printWideTable"
       :columns="wideTableColumns"
-      :data="data"
-      :print-title="printTitle"
+      :data="wideTableData"
+      :print-title="pageTitle"
       :rows-per-page="30"
       :default-landscape="true"
+      :zoom="80"
     />
   </basic-container>
 </template>
@@ -122,6 +123,7 @@ import UploadExcelDialog from "@/components/upload-excel-dialog";
 import projectSelect from "@/components/project-select";
 import assetSelect from "@/components/asset-select";
 import moment from "moment";
+import Decimal from "decimal.js";
 
 
 export default window.$crudCommon({
@@ -139,7 +141,7 @@ export default window.$crudCommon({
       isSelAnnual: false,
 
       wideTableColumns: [],
-      printTitle: "",
+      wideTableData: [],
     };
   },
   watch: {
@@ -162,6 +164,13 @@ export default window.$crudCommon({
         delBtn: !this.isSelAnnual,
       };
     },
+    pageTitle() {
+      let yearAndMonthCN = moment(this.params.yearAndMonth).format("yyyy年MM月");
+      if (this.isSelAnnual) {
+        yearAndMonthCN = moment(this.params.yearAndMonth).format("yyyy年");
+      }
+      return `${yearAndMonthCN}科研房屋建筑物明细表`;
+    }
   },
   methods: {
     handleImport() {
@@ -174,7 +183,7 @@ export default window.$crudCommon({
     },
     handleExport() {
       exportBloByPost(`/api/kd-scientific/asset/fangwujianzhuwu/export?${this.website.tokenHeader}=${getToken()}`, this.params).then(res => {
-        downloadXls(res.data, `科研房屋建筑物明细表${this.params.yearAndMonth}.xlsx`);
+        downloadXls(res.data, `${this.pageTitle}.xlsx`);
       });
     },
     /**
@@ -182,8 +191,8 @@ export default window.$crudCommon({
      * @param isLandscape 是否横向打印
      */
     printTable(isLandscape) {
-      this.wideTableColumns = this.$refs.crud.columnOption;
-      this.printTitle = `科研房屋建筑物明细表${this.params.yearAndMonth}`;
+      this.wideTableColumns = this.printOption.column;
+      this.wideTableData = this.$refs.crud.list;
       this.$nextTick(() => {
         this.$refs.printWideTable.printTable(isLandscape);
       })
@@ -220,7 +229,7 @@ export default window.$crudCommon({
       item.sysm = item.asset ? item.asset.sysm : '';
       item.ysysm = item.asset ? item.asset.ysysm : '';
       item.zcyz = item.asset ? item.asset.zcyz : '';
-      item.jcz = item.asset ? item.asset.jcz : '';
+      item.jcz = item.asset ? new Decimal(item.asset.jcz || 0).mul(new Decimal(100)) : '';
       item.yzje = item.asset ? item.asset.yzje : '';
       item.status = item.status ? item.asset.status : '';
       return item;