Pārlūkot izejas kodu

费用报销的发票类型支持NULL
修改成本报表查看报销详情时的数据排序,按费用日期倒序排列

seyason 2 gadi atpakaļ
vecāks
revīzija
6151dfc5a2

+ 1 - 1
fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ExpenseItemMapper.xml

@@ -46,7 +46,7 @@
         from expense_item a left join expense_sheet b on a.expense_id = b.id
         from expense_item a left join expense_sheet b on a.expense_id = b.id
         left join user on user.id = b.owner_id
         left join user on user.id = b.owner_id
         left join department on department.department_id = user.department_id
         left join department on department.department_id = user.department_id
-        where a.project_id = #{projectId}
+        where a.project_id = #{projectId} order by a.happen_date desc
     </select>
     </select>
 
 
     <select id="selectExpenseByProject" resultType="java.lang.Double">
     <select id="selectExpenseByProject" resultType="java.lang.Double">

+ 1 - 1
fhKeeper/formulahousekeeper/timesheet/src/views/corpreport/list.vue

@@ -978,7 +978,7 @@
                 <el-table-column prop="expenseType" :label="$t('costtype')"></el-table-column>
                 <el-table-column prop="expenseType" :label="$t('costtype')"></el-table-column>
                 <el-table-column prop="invoiceType" :label="$t('ppertype')">
                 <el-table-column prop="invoiceType" :label="$t('ppertype')">
                   <template slot-scope="scope">
                   <template slot-scope="scope">
-                    {{scope.row.invoiceType == 0 ? '增值税专用发票' : '增值税普通发票'}}
+                    {{scope.row.invoiceType == null?'':(scope.row.invoiceType == 0 ? '增值税专用发票' : '增值税普通发票')}}
                   </template>
                   </template>
                 </el-table-column>
                 </el-table-column>
                 <el-table-column prop="amount" :label="$t('amountof')+'('+ $t('tax') +')'"   align="right">
                 <el-table-column prop="amount" :label="$t('amountof')+'('+ $t('tax') +')'"   align="right">