dev
e 3 years ago
parent bbe3f1792e
commit 72cb889243
  1. 4
      src/setting.js
  2. 41
      src/views/order/Order.vue

@ -13,10 +13,10 @@ if (isDev) {
jumpPath = "http://192.168.31.254:8087/"; // 本地调试-需要启动本地判分点系统 jumpPath = "http://192.168.31.254:8087/"; // 本地调试-需要启动本地判分点系统
// host = "http://39.108.250.202:9000"; // host = "http://39.108.250.202:9000";
// host = "http://39.108.250.202:9000";//线上 host = "http://39.108.250.202:9000";//线上
// host = 'http://192.168.31.151:9000'// 榕 // host = 'http://192.168.31.151:9000'// 榕
// host = 'http://192.168.31.125:9000'// 坤 // host = 'http://192.168.31.125:9000'// 坤
host = 'http://192.168.31.137:9000'// 赓 // host = 'http://192.168.31.137:9000'// 赓
} else if (isTest) { } else if (isTest) {
jumpPath = "http://39.108.250.202/judgmentPoint/"; jumpPath = "http://39.108.250.202/judgmentPoint/";
host = "http://39.108.250.202:9000"; host = "http://39.108.250.202:9000";

@ -81,12 +81,15 @@
</el-table-column> </el-table-column>
<el-table-column prop="orderContent" label="订单内容" align="center"> <el-table-column prop="orderContent" label="订单内容" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-popover trigger="hover" placement="top" style='width: 500px'> <el-popover trigger="hover" placement="top" style='width: 500px' v-if='scope.row.orderContent.length >14'>
<p> {{ scope.row.orderContent }}</p> <p> {{ scope.row.orderContent }}</p>
<div slot="reference" class="name-wrapper"> <div slot="reference" class="name-wrapper">
<el-tag size="medium" class='tags'>{{ scope.row.orderContent }}</el-tag> <el-tag size="medium" class='tags'>{{ scope.row.orderContent }}</el-tag>
</div> </div>
</el-popover> </el-popover>
<span v-else>
{{ scope.row.orderContent }}
</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="orderAmount" label="订单金额(元)" align="center"> <el-table-column prop="orderAmount" label="订单金额(元)" align="center">
@ -180,7 +183,6 @@ export default {
if (val.length > 5) { if (val.length > 5) {
val = 5; val = 5;
} }
}, },
getData() { getData() {
let data = { let data = {
@ -253,18 +255,16 @@ export default {
handleDelete(row) { handleDelete(row) {
this.$confirm("确定要删除吗?", "提示", { this.$confirm("确定要删除吗?", "提示", {
type: "warning" type: "warning"
}) }).then(() => {
.then(() => { var arr = [];
var arr = []; arr.push(row.orderId);
arr.push(row.orderId); this.$post(this.api.orderDelete, { ids: arr }).then(res => {
this.$post(this.api.orderDelete, { ids: arr }).then(res => { this.$message.success("删除成功");
this.$message.success("删除成功"); this.getData();
this.getData(); }).catch(res => {
}).catch(res => {
});
})
.catch(() => {
}); });
}).catch(() => {
});
}, },
// //
handleRenew(row) { handleRenew(row) {
@ -285,15 +285,14 @@ export default {
// //
this.$confirm("确定要删除吗?", "提示", { this.$confirm("确定要删除吗?", "提示", {
type: "warning" type: "warning"
}) }).then(() => {
.then(() => { this.$post(this.api.orderDelete, { ids: this.multipleSelection }).then(res => {
this.$post(this.api.orderDelete, { ids: this.multipleSelection }).then(res => { this.multipleSelection = [];
this.multipleSelection = []; this.$message.success("删除成功");
this.$message.success("删除成功"); this.getData();
this.getData();
}).catch(err => {
});
}).catch(err => { }).catch(err => {
});
}).catch(err => {
}); });
} else { } else {
this.$message.error("请先选择订单 !"); this.$message.error("请先选择订单 !");

Loading…
Cancel
Save