修改订单,添加假删字段
This commit is contained in:
@ -71,18 +71,28 @@
|
||||
>详情</el-button
|
||||
>
|
||||
<el-button
|
||||
v-if="scope.row.orderType === 'main'"
|
||||
v-if="
|
||||
scope.row.orderType === 'main' &&
|
||||
(checkPermi(['custom:order:review']) ||
|
||||
(checkPermi(['custom:order:edit']) &&
|
||||
userId === scope.row.preSaleId &&
|
||||
scope.row.reviewStatus === 'no'))
|
||||
"
|
||||
size="mini"
|
||||
type="text"
|
||||
@click="handleOnEditClick(scope.row)"
|
||||
v-hasPermi="['custom:order:edit']"
|
||||
>修改</el-button
|
||||
>
|
||||
<el-button
|
||||
v-if="scope.row.orderType === 'main'"
|
||||
size="mini"
|
||||
type="text"
|
||||
v-hasPermi="['custom:order:remove']"
|
||||
v-if="
|
||||
scope.row.orderType === 'main' &&
|
||||
(checkPermi(['custom:order:review']) ||
|
||||
(checkPermi(['custom:order:remove']) &&
|
||||
userId === scope.row.preSaleId &&
|
||||
scope.row.reviewStatus === 'no'))
|
||||
"
|
||||
@click="handleOnDeleteClick(scope.row)"
|
||||
>删除</el-button
|
||||
>
|
||||
@ -103,8 +113,10 @@
|
||||
<script>
|
||||
import { listOrder, delOrder } from "@/api/custom/order";
|
||||
import OrderEdit from "@/components/OrderEdit";
|
||||
import OrderAdd from "@/components/OrderAdd";
|
||||
// import OrderAdd from "@/components/OrderAdd";
|
||||
import OrderDetail from "@/components/OrderDetail";
|
||||
import { mapGetters } from "vuex";
|
||||
import { checkPermi } from "@/utils/permission";
|
||||
|
||||
export default {
|
||||
name: "CustomerOrderDrawer",
|
||||
@ -121,7 +133,11 @@ export default {
|
||||
orderList: [],
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
...mapGetters(["userId"]),
|
||||
},
|
||||
methods: {
|
||||
checkPermi,
|
||||
showDrawer(data) {
|
||||
// console.log(data);
|
||||
this.data = data;
|
||||
@ -150,6 +166,7 @@ export default {
|
||||
}
|
||||
return arr;
|
||||
}, []);
|
||||
console.log(this.orderList);
|
||||
|
||||
this.visible = true;
|
||||
});
|
||||
|
@ -74,32 +74,34 @@ const mutations = {
|
||||
|
||||
const actions = {
|
||||
async init({ commit, dispatch }, payload) {
|
||||
// console.log(payload);
|
||||
//
|
||||
commit("updateStateData", payload);
|
||||
//
|
||||
getDicts("cus_cus_unit").then(response => {
|
||||
commit("updateStateData", { cusUnitOptions: response.data });
|
||||
});
|
||||
getDicts("cus_cus_weight").then(response => {
|
||||
commit("updateStateData", { cusWeightOptions: response.data });
|
||||
});
|
||||
getDicts("cus_dishes_type").then(response => {
|
||||
commit("updateStateData", { typeOptions: response.data });
|
||||
});
|
||||
getDicts("cus_dishes_type").then(response => {
|
||||
commit("updateStateData", { dishesTypeOptions: response.data });
|
||||
});
|
||||
return new Promise((res, rej) => {
|
||||
// console.log(payload);
|
||||
//
|
||||
commit("updateStateData", payload);
|
||||
//
|
||||
getDicts("cus_cus_unit").then(response => {
|
||||
commit("updateStateData", { cusUnitOptions: response.data });
|
||||
});
|
||||
getDicts("cus_cus_weight").then(response => {
|
||||
commit("updateStateData", { cusWeightOptions: response.data });
|
||||
});
|
||||
getDicts("cus_dishes_type").then(response => {
|
||||
commit("updateStateData", { typeOptions: response.data });
|
||||
});
|
||||
getDicts("cus_dishes_type").then(response => {
|
||||
commit("updateStateData", { dishesTypeOptions: response.data });
|
||||
});
|
||||
|
||||
// 健康数据
|
||||
if (payload.cusId) {
|
||||
dispatch("getHealthyData", payload);
|
||||
}
|
||||
// 健康数据
|
||||
if (payload.cusId) {
|
||||
dispatch("getHealthyData", payload).catch(err => rej(err));
|
||||
}
|
||||
|
||||
// 食谱数据
|
||||
if (payload.recipesId) {
|
||||
dispatch("getRecipesInfo", payload);
|
||||
}
|
||||
// 食谱数据
|
||||
if (payload.recipesId) {
|
||||
dispatch("getRecipesInfo", payload).catch(err => rej(err));
|
||||
}
|
||||
});
|
||||
},
|
||||
async getHealthyData({ commit }, payload) {
|
||||
commit("updateStateData", { healthDataLoading: true });
|
||||
|
@ -1,4 +1,4 @@
|
||||
import store from '@/store'
|
||||
import store from "@/store";
|
||||
|
||||
/**
|
||||
* 字符权限校验
|
||||
@ -7,20 +7,26 @@ import store from '@/store'
|
||||
*/
|
||||
export function checkPermi(value) {
|
||||
if (value && value instanceof Array && value.length > 0) {
|
||||
const permissions = store.getters && store.getters.permissions
|
||||
const permissionDatas = value
|
||||
const permissions = store.getters && store.getters.permissions;
|
||||
const permissionDatas = value;
|
||||
|
||||
if (permissions.includes("*:*:*")) {
|
||||
return true;
|
||||
}
|
||||
|
||||
const hasPermission = permissions.some(permission => {
|
||||
return permissionDatas.includes(permission)
|
||||
})
|
||||
return permissionDatas.includes(permission);
|
||||
});
|
||||
|
||||
if (!hasPermission) {
|
||||
return false
|
||||
return false;
|
||||
}
|
||||
return true
|
||||
return true;
|
||||
} else {
|
||||
console.error(`need roles! Like checkPermi="['system:user:add','system:user:edit']"`)
|
||||
return false
|
||||
console.error(
|
||||
`need roles! Like checkPermi="['system:user:add','system:user:edit']"`
|
||||
);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
@ -31,19 +37,19 @@ export function checkPermi(value) {
|
||||
*/
|
||||
export function checkRole(value) {
|
||||
if (value && value instanceof Array && value.length > 0) {
|
||||
const roles = store.getters && store.getters.roles
|
||||
const permissionRoles = value
|
||||
const roles = store.getters && store.getters.roles;
|
||||
const permissionRoles = value;
|
||||
|
||||
const hasRole = roles.some(role => {
|
||||
return permissionRoles.includes(role)
|
||||
})
|
||||
return permissionRoles.includes(role);
|
||||
});
|
||||
|
||||
if (!hasRole) {
|
||||
return false
|
||||
return false;
|
||||
}
|
||||
return true
|
||||
return true;
|
||||
} else {
|
||||
console.error(`need roles! Like checkRole="['admin','editor']"`)
|
||||
return false
|
||||
console.error(`need roles! Like checkRole="['admin','editor']"`);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -222,6 +222,7 @@
|
||||
<el-table-column
|
||||
label="操作"
|
||||
align="center"
|
||||
fixed="right"
|
||||
class-name="small-padding fixed-width"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
|
@ -213,6 +213,7 @@
|
||||
<div v-if="showWxFlag">
|
||||
<div
|
||||
v-for="(item, index) in wxList"
|
||||
:key="item.wxAccount"
|
||||
style="margin: 10px auto auto 40px"
|
||||
>
|
||||
<span>{{ item.wxAccount }}</span
|
||||
|
@ -379,27 +379,37 @@
|
||||
>详情</el-button
|
||||
>
|
||||
<el-button
|
||||
v-if="
|
||||
checkPermi(['custom:order:review']) ||
|
||||
(checkPermi(['custom:order:edit']) &&
|
||||
userId === scope.row.preSaleId &&
|
||||
scope.row.reviewStatus === 'no')
|
||||
"
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-edit"
|
||||
@click="handleUpdate(scope.row)"
|
||||
v-hasPermi="['custom:order:edit']"
|
||||
>修改
|
||||
</el-button>
|
||||
<el-button
|
||||
<!-- <el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-s-data"
|
||||
@click="orderPauseManage(scope.row)"
|
||||
v-hasPermi="['orderPause:pause:query']"
|
||||
>暂停记录管理
|
||||
</el-button>
|
||||
</el-button> -->
|
||||
<el-button
|
||||
size="mini"
|
||||
v-if="
|
||||
checkPermi(['custom:order:review']) ||
|
||||
(checkPermi(['custom:order:remove']) &&
|
||||
userId === scope.row.preSaleId &&
|
||||
scope.row.reviewStatus === 'no')
|
||||
"
|
||||
type="text"
|
||||
icon="el-icon-delete"
|
||||
@click="handleDelete(scope.row)"
|
||||
v-hasPermi="['custom:order:remove']"
|
||||
>删除
|
||||
</el-button>
|
||||
</template>
|
||||
@ -443,12 +453,7 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import {
|
||||
delOrder,
|
||||
exportOrder,
|
||||
getOptions,
|
||||
listOrder,
|
||||
} from "@/api/custom/order";
|
||||
import { delOrder, exportOrder, listOrder } from "@/api/custom/order";
|
||||
import dayjs from "dayjs";
|
||||
import orderPause from "./orderPause";
|
||||
|
||||
@ -456,6 +461,7 @@ import OrderDetail from "@/components/OrderDetail";
|
||||
import OrderEdit from "@/components/OrderEdit";
|
||||
import AutoHideMessage from "@/components/AutoHideMessage";
|
||||
import { mapGetters } from "vuex";
|
||||
import { checkPermi } from "@/utils/permission";
|
||||
|
||||
const beginTime = dayjs().startOf("month").format("YYYY-MM-DD");
|
||||
const endTime = dayjs().format("YYYY-MM-DD");
|
||||
@ -542,6 +548,8 @@ export default {
|
||||
"operatorIdOptions",
|
||||
// 运营助理字典
|
||||
"operatorAssisIdOptions",
|
||||
//
|
||||
"userId",
|
||||
]),
|
||||
},
|
||||
created() {
|
||||
@ -563,6 +571,7 @@ export default {
|
||||
});
|
||||
},
|
||||
methods: {
|
||||
checkPermi,
|
||||
/** 查询销售订单列表 */
|
||||
getList() {
|
||||
this.loading = true;
|
||||
@ -650,7 +659,6 @@ export default {
|
||||
},
|
||||
/** 删除按钮操作 */
|
||||
handleDelete(row) {
|
||||
const orderIds = row.orderId || this.ids;
|
||||
this.$confirm(
|
||||
'是否确认删除销售订单编号为"' + orderIds + '"的数据项?',
|
||||
"警告",
|
||||
@ -661,7 +669,7 @@ export default {
|
||||
}
|
||||
)
|
||||
.then(function () {
|
||||
return delOrder(orderIds);
|
||||
return delOrder(row.orderId);
|
||||
})
|
||||
.then(() => {
|
||||
this.getList();
|
||||
|
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user