|
|
@@ -75,11 +75,27 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column width='150' prop="status" label="状态">
|
|
|
<template slot-scope="scope">
|
|
|
- <div v-if="scope.row.status != '执行中'">
|
|
|
- <span v-if="scope.row.approveStatus">{{
|
|
|
+ <div v-if="scope.row.status != '执行中'&&scope.row.status != '发运结束'">
|
|
|
+ <!-- <span v-if="scope.row.approveStatus">{{
|
|
|
scope.row.approveStatus
|
|
|
- }}</span>
|
|
|
- <el-popover v-else placement="left" :width="285" trigger="click" visible-arrow="false"
|
|
|
+ }}</span> -->
|
|
|
+ <el-select v-if="scope.row.approveStatus" v-model="scope.row.approveStatus" placeholder="" class="statusselect"
|
|
|
+ @change='selectstatuschange($event,scope.row)'
|
|
|
+ disabled
|
|
|
+ :value="scope.row.approveStatus">
|
|
|
+ <el-option label="待决策人审核" value="待决策人审核"
|
|
|
+ style="color: #8890b1" />
|
|
|
+ </el-select>
|
|
|
+ <el-select v-else v-model="scope.row.status" placeholder="" class="statusselect"
|
|
|
+ @change='selectstatuschange($event,scope.row)'
|
|
|
+
|
|
|
+ :value="scope.row.status">
|
|
|
+ <el-option label="待执行" value="待执行"
|
|
|
+ style="color: #8890b1" />
|
|
|
+ <el-option label="执行中" value="执行中"
|
|
|
+ style="color: #8890b1" />
|
|
|
+ </el-select>
|
|
|
+ <!-- <el-popover v-else placement="left" :width="285" trigger="click" visible-arrow="false"
|
|
|
@show="history(scope.row)">
|
|
|
<template>
|
|
|
<span slot="reference">
|
|
|
@@ -106,7 +122,7 @@
|
|
|
</el-popover>
|
|
|
<img v-if="!scope.row.approveStatus" width="17" height="18"
|
|
|
style="vertical-align: text-top; position: relative; top: -1px;" src="../../../public/img/edit.png"
|
|
|
- @click="editClick(scope.row)" alt="" />
|
|
|
+ @click="editClick(scope.row)" alt="" /> -->
|
|
|
</div>
|
|
|
<div v-else>
|
|
|
<!-- {{scope.row.status}} -->
|
|
|
@@ -120,9 +136,9 @@
|
|
|
</div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="signingDate" label="签订日期"> </el-table-column>
|
|
|
- <el-table-column prop="contractRevenue" label="合同收入"> </el-table-column>
|
|
|
- <el-table-column prop="expenses" label="费用支出"> </el-table-column>
|
|
|
+ <el-table-column width='120' prop="signingDate" label="签订日期"> </el-table-column>
|
|
|
+ <el-table-column width='120' prop="contractRevenue" label="合同收入"> </el-table-column>
|
|
|
+ <el-table-column width='120' prop="expenses" label="费用支出"> </el-table-column>
|
|
|
<el-table-column width='120' prop="mildewGrain" label="未回款（元）">
|
|
|
<template slot-scope="scope">
|
|
|
<span style='color:red;' v-if='scope.row.datestatus&&scope.row.invoiced>scope.row.contractRevenue'>{{scope.row.mildewGrain}}</span>
|
