Browse Source

人员人工费用和无形资产摊销费用bug修改

ljb 9 months ago
parent
commit
d20e065cc0

+ 1 - 0
src/components/print-wide-table/index.vue

@@ -289,6 +289,7 @@ export default {
       }
       }
       if (col.align === 'center') style.textAlign = 'center'
       if (col.align === 'center') style.textAlign = 'center'
       if (col.align === 'right') style.textAlign = 'right'
       if (col.align === 'right') style.textAlign = 'right'
+
       return style
       return style
     },
     },
     calculateColumnWidths() {
     calculateColumnWidths() {

+ 1 - 1
src/option/projectManage/wxzctxCost.js

@@ -24,7 +24,7 @@ export default {
       span: 24,
       span: 24,
       dicUrl: '/api/kd-scientific/asset/simple/list',
       dicUrl: '/api/kd-scientific/asset/simple/list',
       dicFormatter:(res)=>{
       dicFormatter:(res)=>{
-        return res.data.filter(item => "软件,专利权,非专利技术,其他".indexOf(item.zclb) > -1)
+        return res.data.filter(item => "软件,专利权,非专利技术,其他".indexOf(item.zclb) > -1)
       },
       },
       props: {
       props: {
         label: 'zcmc',
         label: 'zcmc',

+ 2 - 3
src/views/project-manage/components/all-budget-table.vue

@@ -3,10 +3,9 @@
     <div class="container">
     <div class="container">
       <div class="operate-btn" style="text-align: right; margin: 10px 16px;">
       <div class="operate-btn" style="text-align: right; margin: 10px 16px;">
         <el-button @click="handleRefresh">刷新</el-button>
         <el-button @click="handleRefresh">刷新</el-button>
-        <el-button type="primary">下载</el-button>
-        <el-button type="primary">打印</el-button>
+        <el-button type="primary" v-print="'#printMe'">打印</el-button>
       </div>
       </div>
-      <table class="doc-page">
+      <table id="printMe" class="doc-page">
         <thead>
         <thead>
           <th colspan="3">研发项目经费预算表</th>
           <th colspan="3">研发项目经费预算表</th>
         </thead>
         </thead>

+ 1 - 1
src/views/project-manage/components/person-cost.vue

@@ -177,7 +177,7 @@ export default window.$crudCommon({
       let zzsc = new Decimal(item.zzsc || 0);
       let zzsc = new Decimal(item.zzsc || 0);
       let pjrgfy = new Decimal(item.pjrgfy || 0);
       let pjrgfy = new Decimal(item.pjrgfy || 0);
 
 
-      item.technicianId = item.technician.id;
+      item.technicianId = item.technicianId.toString();
       item.name = item.technician.name;
       item.name = item.technician.name;
       item.number = item.technician.number;
       item.number = item.technician.number;
       item.idCard = item.technician.idCard;
       item.idCard = item.technician.idCard;