1

src/views/profitable/oilcost.vue

@@ -74,7 +74,9 @@
             </template></el-table-column>
           <el-table-column prop="approveStatus" width="100" label="状态">
             <template slot-scope="scope">
-              <span v-if="scope.row.approveStatus">{{scope.row.approveStatus}}</span><span v-else>{{scope.row.travelStatus}}</span>
+              <span v-if="scope.row.approveStatus">{{scope.row.approveStatus}}</span>
+              <span v-else-if="scope.row.status=='待付款'">{{scope.row.status}}</span>
+              <span v-else>{{scope.row.travelStatus}}</span>
             </template>
           </el-table-column>
           <el-table-column prop="expenseRemarks" label="附件">
@@ -100,7 +102,7 @@
               <el-button v-if='scope.row.approveStatus&&scope.row.strokeType == 1' @click="pass(scope.row)" type="primary">通过</el-button>
               <el-button v-if='scope.row.approveStatus&&scope.row.strokeType == 1' @click="reject(scope.row)" type="primary">驳回</el-button>
               <!-- <el-button v-if='scope.row.status=="已驳回"' @click="expenseedit(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.status=="待付款"' @click="payment(scope.row)" type="primary">付款</el-button>
             </template>
           </el-table-column>
         </el-table>

src/views/warehousenew/warehousingOrder.vue

@@ -1144,6 +1144,13 @@ export default {
         })
     },
     withdraw(item) {
+      if(!this.multipleSelection1[item.id]){
+        this.$message({
+            message: '至少选择一条请款审核中的条目',
+            type: 'error'
+          });
+      }
+      else{
       var arr1 = this.multipleSelection1[item.id]
       for (let i = 0; i < arr1.length; i++) {
         if (!arr1[i].approveStatus || arr1[i].approveStatus == '发起人撤回') {
@@ -1177,6 +1184,7 @@ export default {
         }
       }
       this.getList()
+      }
     },
     unique(arr) {
       const res = new Map();