zxz 2 years ago
parent
commit
9f93cb1999
1 changed files with 7 additions and 1 deletions
  1. 7 1
      src/views/profitable/expensemanagementdetails.vue

+ 7 - 1
src/views/profitable/expensemanagementdetails.vue

@@ -134,6 +134,12 @@
               <div v-else-if="scope.row.expensesPurpose == 2">
               <div v-else-if="scope.row.expensesPurpose == 2">
                 {{ scope.row.contractNo }}
                 {{ scope.row.contractNo }}
               </div>
               </div>
+              <!-- <div v-if="scope.row.expensesPurpose == 4 && scope.row.costType=='油费-长途' ">
+                  {{ scope.row.carNo }}
+              </div>
+              <div v-if="scope.row.expensesPurpose == 4 && scope.row.costType=='油费-短途' ">
+                  {{ scope.row.warehouseName }}
+              </div> -->
             </template>
             </template>
           </el-table-column>
           </el-table-column>
           <el-table-column prop="expenseName" label="费用名称"></el-table-column>
           <el-table-column prop="expenseName" label="费用名称"></el-table-column>
@@ -206,7 +212,7 @@
                   scope.row.unallocatedAmount > 0)
                   scope.row.unallocatedAmount > 0)
               " @click="allot(scope.row)" type="primary">分配</el-button>
               " @click="allot(scope.row)" type="primary">分配</el-button>
               <!-- <el-button v-if='scope.row.approveStatus=="已驳回"' @click="del(0,scope.row)" type="primary">删除</el-button> -->
               <!-- <el-button v-if='scope.row.approveStatus=="已驳回"' @click="del(0,scope.row)" type="primary">删除</el-button> -->
-              <el-button v-if='scope.row.status=="已驳回"' @click="del(0,scope.row)" type="danger">删除</el-button>
+              <el-button v-if='scope.row.status=="已驳回" ||scope.row.approveStatus =="发起人撤回" ' @click="del(0,scope.row)" type="danger">删除</el-button>
               <el-button v-if='scope.row.approveStatus=="待财务审核"||scope.row.approveStatus=="待杜大光审核"||scope.row.approveStatus=="待决策人审核"||scope.row.approveStatus=="待内勤审核"||scope.row.approveStatus=="待单证中心审核"' @click="aduit(scope.row)" type="primary">审核</el-button>
               <el-button v-if='scope.row.approveStatus=="待财务审核"||scope.row.approveStatus=="待杜大光审核"||scope.row.approveStatus=="待决策人审核"||scope.row.approveStatus=="待内勤审核"||scope.row.approveStatus=="待单证中心审核"' @click="aduit(scope.row)" type="primary">审核</el-button>
               <el-button v-if='!scope.row.approveStatus&&scope.row.expensesType==2&&scope.row.status=="待付款"' @click="payment(scope.row)" type="primary">付款</el-button>
               <el-button v-if='!scope.row.approveStatus&&scope.row.expensesType==2&&scope.row.status=="待付款"' @click="payment(scope.row)" type="primary">付款</el-button>
             </template>
             </template>