|
@@ -227,9 +227,12 @@
|
|
|
<span class="link-span"><el-link type="primary" @click="handleDetailList(row)">查看详情</el-link></span>
|
|
|
<el-link v-if="row.payStatus=='10'" type="primary" @click="handlePush(row)">推送账单</el-link>
|
|
|
</div>
|
|
|
- <div v-if="row.status=='0'">
|
|
|
- <span class="link-span"><el-link type="warning" @click="handleClose(row)">作废账单</el-link></span>
|
|
|
- <el-link type="danger" @click="handleDelete(row)">删除账单</el-link>
|
|
|
+ <div>
|
|
|
+ <!--未支付且未作废时-->
|
|
|
+ <span class="link-span" v-if="row.payStatus!='20' && row.status!='3'">
|
|
|
+ <el-link type="warning" @click="handleClose(row)">作废账单</el-link>
|
|
|
+ </span>
|
|
|
+ <el-link v-if="row.status=='0'" type="danger" @click="handleDelete(row)">删除账单</el-link>
|
|
|
</div>
|
|
|
<div v-if="row.payStatus=='10'">
|
|
|
<span class="link-span"><el-link type="primary" @click="handlePayTime(row)">确认收款</el-link></span>
|
|
@@ -568,30 +571,33 @@ export default {
|
|
|
handleDelete(record) {
|
|
|
var self = this;
|
|
|
|
|
|
- self.$confirm("是否确认作废账单?", "提示", {
|
|
|
+ self.$confirm("是否确认删除账单?", "提示", {
|
|
|
confirmButtonText: "确定",
|
|
|
cancelButtonText: "取消",
|
|
|
type: "warning"
|
|
|
})
|
|
|
.then(() => {
|
|
|
- billPushApi.remove(record.id).then(function(response) {
|
|
|
- var jsonData = response.data;
|
|
|
-
|
|
|
- if (jsonData.result) {
|
|
|
- var rs = self.loopDelete(self.tableData,record.id);
|
|
|
-
|
|
|
- self.$message({
|
|
|
- type: "success",
|
|
|
- message: "账单作废成功!"
|
|
|
+ billPushApi.remove(record.id).then(function(response) {
|
|
|
+ var jsonData = response.data;
|
|
|
+
|
|
|
+ if (jsonData.result) {
|
|
|
+ self.loopDelete(self.tableData,record.id);
|
|
|
+
|
|
|
+ self.$message({
|
|
|
+ type: "success",
|
|
|
+ message: "账单删除成功!"
|
|
|
+ });
|
|
|
+ }
|
|
|
+ else{
|
|
|
+ self.$message.error(jsonData.message + "");
|
|
|
+ }
|
|
|
});
|
|
|
- }
|
|
|
});
|
|
|
- });
|
|
|
},
|
|
|
handleClose(record) {
|
|
|
var self = this;
|
|
|
|
|
|
- self.$confirm("是否确认关闭?", "提示", {
|
|
|
+ self.$confirm("是否确认作废?", "提示", {
|
|
|
confirmButtonText: "确定",
|
|
|
cancelButtonText: "取消",
|
|
|
type: "warning"
|
|
@@ -602,7 +608,7 @@ export default {
|
|
|
|
|
|
if (jsonData.result) {
|
|
|
self.changePage(self.pageIndex);
|
|
|
- this.$message.success("关闭成功!");
|
|
|
+ this.$message.success("作废成功!");
|
|
|
} else {
|
|
|
this.$message.error(jsonData.message + "");
|
|
|
}
|