|
@@ -165,26 +165,6 @@
|
|
|
<el-button type="primary" class="submit-btn" @click.stop="commitRemark(orderId, item)">确定</el-button>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
- <!-- 忽略订单弹出层 -->
|
|
|
- <el-dialog width="580px" center title="忽略订单" destroy-on-close :visible.sync="ignoreStatus">
|
|
|
- <div class="ignore-modal">
|
|
|
- <div class="title">请选择忽略该笔订单的原因</div>
|
|
|
- <div class="check-item">
|
|
|
- <img src="../../../static/image/check-radio.png" @click.stop="changeRadio(1)" v-if="radio != 1" class="radio" />
|
|
|
- <img src="../../../static/image/check-radio-active.png" v-if="radio == 1" class="radio" />
|
|
|
- <span>通过其他配送方式完成</span>
|
|
|
- </div>
|
|
|
- <div class="check-item">
|
|
|
- <img src="../../../static/image/check-radio.png" @click.stop="changeRadio(2)" v-if="radio != 2" class="radio" />
|
|
|
- <img src="../../../static/image/check-radio-active.png" v-if="radio == 2" class="radio" />
|
|
|
- <span>取消该笔订单(由于用户取消或其他原因)</span>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
- <div style="text-align: center;margin-top: 20px;">
|
|
|
- <el-button @click.stop="ignoreStatus = false">取消</el-button>
|
|
|
- <el-button type="primary" class="submit-btn" @click.stop="commitIGnore(orderId)">确定</el-button>
|
|
|
- </div>
|
|
|
- </el-dialog>
|
|
|
<!-- 设置预约发单时间弹出层 -->
|
|
|
<el-dialog width="580px" center title="设置预约时间" destroy-on-close :visible.sync="settingTimeStatus">
|
|
|
<div>
|
|
@@ -319,7 +299,6 @@ export default {
|
|
|
orderDetailStutus: 0,
|
|
|
isLoading: false,
|
|
|
dialogTableVisible: false,
|
|
|
- ignoreStatus: false, // 忽略订单弹出层
|
|
|
remark: "",
|
|
|
orderId: "",
|
|
|
item: {},
|
|
@@ -539,40 +518,38 @@ export default {
|
|
|
this.getDetailOrder();
|
|
|
this.getTrackOrder();
|
|
|
},
|
|
|
- changeRadio(i) {
|
|
|
- this.radio = i;
|
|
|
- },
|
|
|
// 忽略订单
|
|
|
iGnoreOrder(orderId) {
|
|
|
this.orderId = orderId;
|
|
|
- this.ignoreStatus = true;
|
|
|
- },
|
|
|
- commitIGnore(orderId) {
|
|
|
- if (!this.radio) {
|
|
|
- return this.$message({
|
|
|
- message: "请选择忽略原因",
|
|
|
- type: "error",
|
|
|
- });
|
|
|
- }
|
|
|
- let params = {
|
|
|
- orderId,
|
|
|
- ignoreReason: this.radio == 1 ? 0 : 1,
|
|
|
- };
|
|
|
- ignoreOrder(params).then((res) => {
|
|
|
- this.ignoreStatus = false;
|
|
|
- if (res.code == 200) {
|
|
|
- this.$message({
|
|
|
- message: "操作成功",
|
|
|
- type: "success",
|
|
|
+ this.$confirm("确定要忽略此单?", "提示", {
|
|
|
+ confirmButtonText: "确定",
|
|
|
+ cancelButtonText: "取消",
|
|
|
+ center: true,
|
|
|
+ type: "warning",
|
|
|
+ })
|
|
|
+ .then(() => {
|
|
|
+ console.log(11111);
|
|
|
+ ignoreOrder({ orderId }).then((res) => {
|
|
|
+ if (res.code == 200) {
|
|
|
+ this.$message({
|
|
|
+ type: "success",
|
|
|
+ message: "已忽略!",
|
|
|
+ });
|
|
|
+ bus.$emit("refreshData");
|
|
|
+ } else {
|
|
|
+ this.$message({
|
|
|
+ message: res.msg,
|
|
|
+ type: "error",
|
|
|
+ });
|
|
|
+ }
|
|
|
});
|
|
|
- bus.$emit("refreshData");
|
|
|
- } else {
|
|
|
+ })
|
|
|
+ .catch(() => {
|
|
|
this.$message({
|
|
|
- message: res.msg,
|
|
|
- type: "error",
|
|
|
+ type: "info",
|
|
|
+ message: "已取消",
|
|
|
});
|
|
|
- }
|
|
|
- });
|
|
|
+ });
|
|
|
},
|
|
|
itemAddRemark(orderId, item) {
|
|
|
this.dialogTableVisible = true;
|
|
@@ -789,15 +766,17 @@ export default {
|
|
|
showDeliveryStatus(item) {
|
|
|
let name = "";
|
|
|
if (item.wmstatus === 4) {
|
|
|
- name = "其他平台完成";
|
|
|
+ return (name = "其他平台完成");
|
|
|
}
|
|
|
if (item.deliveryStatus === 4) {
|
|
|
- name = "已完成";
|
|
|
+ return (name = "已完成");
|
|
|
}
|
|
|
if (item.deliveryStatus === -1) {
|
|
|
- name = "已取消";
|
|
|
+ return (name = "已取消");
|
|
|
}
|
|
|
- return name;
|
|
|
+ // if (item.deliveryStatus === -2) {
|
|
|
+ // return this.showCancelType(item.cancelType);
|
|
|
+ // }
|
|
|
},
|
|
|
},
|
|
|
};
|