Browse Source

处理项目进度总览,科研预算打印bug

ljb 8 months ago
parent
commit
9886e6ad64

+ 1 - 1
src/views/basic-resource/comp-basic-info/ky-asset-list.vue

@@ -49,7 +49,7 @@
 
       <template slot-scope="{row, index, size}" slot="menu">
         <el-button v-if="!isSelAnnual && [0,1].indexOf(row.status) > -1" type="text" :size="size"  icon="el-icon-edit" @click="handleEdit(row, index)">编辑</el-button>
-        <el-button type="text" :size="size" icon="el-icon-delete" @click="rowDel(row, index)">删除</el-button>
+        <el-button v-if="!isSelAnnual" type="text" :size="size" icon="el-icon-delete" @click="rowDel(row, index)">删除</el-button>
         <el-button v-if="!isSelAnnual && row.status === 0" type="text" :size="size" @click="handleChangeStatus(row, 3)">改造</el-button>
         <el-button v-if="!isSelAnnual && row.status === 0" type="text" :size="size" @click="handleChangeStatus(row, 1)">停用</el-button>
         <el-button v-if="!isSelAnnual && row.status === 0" type="text" :size="size" @click="handleChangeStatus(row, 4)">资产处置</el-button>

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

@@ -32,7 +32,7 @@
 
       <template slot="body">
         <h3 class="page-title">{{ pageTitle }}</h3>
-        <year-month-select v-model="params.yearAndMonth"></year-month-select>
+        <year-month-select v-model="params.yearAndMonth" :showAllYear="false"></year-month-select>
       </template>
 
       <template slot="lxbg" slot-scope="{ row }">
@@ -53,6 +53,7 @@
     </avue-crud>
 
     <WideTablePrinter
+      v-if="!drawerVisible"
       ref="printWideTable"
       :columns="wideTableColumns"
       :data="data"