bonus
/
bonus-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

订单组织树

This commit is contained in:
zzyuan 2025-03-19 18:46:40 +08:00
parent f569800226
commit 5c13b2161e
8 changed files with 63 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/api/order/offline.js
View File

@ -78,17 +78,6 @@ export function queryPsnTypeByPageApi(data) {
params: data params: data
}) })
} }
// 组织
export function custOrgTreeApi(data) {
return request({
url: '/smart-canteen/custOrg/tenant/tree',
method: 'get',
headers: {
"merchant-id":"378915229716713472",
},
params: data
})
}

11
src/api/order/reserve.js
View File

@ -102,17 +102,6 @@ export function queryPsnTypeByPageApi(data) {
params: data params: data
}) })
} }
// 组织
export function custOrgTreeApi(data) {
return request({
url: '/smart-canteen/custOrg/tenant/tree',
method: 'get',
headers: {
"merchant-id":"378915229716713472",
},
params: data
})
}
// 订单列表-分页 // 订单列表-分页
export function orderPageListApi(data) { export function orderPageListApi(data) {

11
src/api/superStore/orderShenhe.js
View File

@ -110,17 +110,6 @@ export function queryPsnTypeByPageApi(data) {
params: data params: data
}) })
} }
// 组织
export function custOrgTreeApi(data) {
return request({
url: '/smart-canteen/custOrg/tenant/tree',
method: 'get',
headers: {
"merchant-id":"378915229716713472",
},
params: data
})
}
// 退款状态下拉 // 退款状态下拉
export function orderRefundStateListApi(data) { export function orderRefundStateListApi(data) {

11
src/api/superStore/superOrder.js
View File

@ -115,17 +115,6 @@ export function queryPsnTypeByPageApi(data) {
params: data params: data
}) })
} }
// 组织
export function custOrgTreeApi(data) {
return request({
url: '/smart-canteen/custOrg/tenant/tree',
method: 'get',
headers: {
"merchant-id":"378915229716713472",
},
params: data
})
}
// 订单列表-分页 // 订单列表-分页
export function orderPageListApi(data) { export function orderPageListApi(data) {

46
src/views/order/offlineManagement/index.vue
View File

@ -123,17 +123,17 @@
<el-form-item label="流水号"> <el-form-item label="流水号">
<el-input v-model="queryParams.mealCode" placeholder="请输入流水号" maxlength="20" clearable style="width: 220px"/> <el-input v-model="queryParams.mealCode" placeholder="请输入流水号" maxlength="20" clearable style="width: 220px"/>
</el-form-item> </el-form-item>
<!-- <el-form-item label="所属区域" prop="orgIdList"> <el-form-item label="所属组织" prop="orgIdList">
<el-cascader v-model="queryParams.orgIdList" <el-cascader v-model="queryParams.orgIdList"
:options="treeOrgOptions" :filterable="true" style="width: 220px" :show-all-levels="false" :options="deptOptions" :filterable="true" style="width: 240px" :show-all-levels="false"
:props="{ :props="{
multiple: true, multiple: true,
emitPath: false,// 若设置 false，则只返回该节点的值，只返回最后选择的id emitPath: false,// 若设置 false，则只返回该节点的值，只返回最后选择的id
checkStrictly: true,//来设置父子节点取消选中关联，从而达到选择任意一级选项的目的 checkStrictly: false,//来设置父子节点取消选中关联，从而达到选择任意一级选项的目的
value:'id',label:'text' value:'id',label:'label'
}" clearable> }" clearable collapse-tags >
</el-cascader> </el-cascader>
</el-form-item> --> </el-form-item>
<el-form-item> <el-form-item>
@ -527,7 +527,8 @@
</template> </template>
<script> <script>
import { systemAreaTreeApi,getCanteenByAreaApi,getStallByCanteenApi,orderStateListApi,orderPayAllTypeApi,queryPsnTypeByPageApi,orderNuclearModeListApi,custOrgTreeApi} from "@/api/order/offline"; import { deptTreeSelect } from '@/api/system/user'
import { systemAreaTreeApi,getCanteenByAreaApi,getStallByCanteenApi,orderStateListApi,orderPayAllTypeApi,queryPsnTypeByPageApi,orderNuclearModeListApi} from "@/api/order/offline";
import { orderPageListApi,orderDetailInfoApi,refundOrderPartApi,refundOrderApi,writeOffOrderApi,syncOrderPayStateApi } from "@/api/order/offline"; import { orderPageListApi,orderDetailInfoApi,refundOrderPartApi,refundOrderApi,writeOffOrderApi,syncOrderPayStateApi } from "@/api/order/offline";
export default { export default {
@ -587,8 +588,7 @@
orderPayOptions:[], orderPayOptions:[],
nuclearModeOptions:[], nuclearModeOptions:[],
psnTypeOptions:[], psnTypeOptions:[],
//组织树 deptOptions:[],//组织树
treeOrgOptions:[],
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
@ -643,8 +643,7 @@
this.orderStateList(); this.orderStateList();
this.orderPayAllType(); this.orderPayAllType();
this.orderNuclearModeList(); this.orderNuclearModeList();
this.queryPsnTypeByPage(); this.queryPsnTypeByPage();
// this.getOrgTreeData();//组织树-暂无接口
this.getList() this.getList()
}, },
methods: { methods: {
@ -696,13 +695,22 @@
this.psnTypeOptions = response.rows this.psnTypeOptions = response.rows
}); });
}, },
//组织树-暂无接口 /** 查询部门下拉树结构 */
getOrgTreeData() { getDeptTree() {
custOrgTreeApi({}).then((response) => { deptTreeSelect().then((response) => {
this.treeOrgOptions = response; this.deptOptions = this.filterTree(response.data)
}); })
},
filterTree(nodes) {
return nodes
.map((node) => {
if (node.children) {
node.children = this.filterTree(node.children)
}
return node
})
.filter((node) => node.status !== '1')
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.queryParams.pageNum = 1;
@ -748,7 +756,7 @@
console.log(this.rowData) console.log(this.rowData)
this.orderDetailList.forEach((item,index)=>{ this.orderDetailList.forEach((item,index)=>{
this.$set(this.orderDetailList[index],"refundNum",item.quantity) this.$set(this.orderDetailList[index],"refundNum",item.quantity)
this.$set(this.orderDetailList[index],"refundMoney",(item.prefPrice).toFixed(2)) this.$set(this.orderDetailList[index],"refundMoney",Number(item.quantity)*(item.prefPrice).toFixed(2))
}) })
this.refundList=[] this.refundList=[]
this.openPart = true; this.openPart = true;

56
src/views/order/reserveManagement/index.vue
View File

@ -126,17 +126,17 @@
<el-form-item label="流水号"> <el-form-item label="流水号">
<el-input v-model="queryParams.mealCode" placeholder="请输入流水号" maxlength="20" clearable style="width: 220px"/> <el-input v-model="queryParams.mealCode" placeholder="请输入流水号" maxlength="20" clearable style="width: 220px"/>
</el-form-item> </el-form-item>
<!-- <el-form-item label="所属区域" prop="orgIdList"> <el-form-item label="所属组织" prop="orgIdList">
<el-cascader v-model="queryParams.orgIdList" <el-cascader v-model="queryParams.orgIdList"
:options="treeOrgOptions" :filterable="true" style="width: 220px" :show-all-levels="false" :options="deptOptions" :filterable="true" style="width: 240px" :show-all-levels="false"
:props="{ :props="{
multiple: true, multiple: true,
emitPath: false,// 若设置 false，则只返回该节点的值，只返回最后选择的id emitPath: false,// 若设置 false，则只返回该节点的值，只返回最后选择的id
checkStrictly: true,//来设置父子节点取消选中关联，从而达到选择任意一级选项的目的 checkStrictly: false,//来设置父子节点取消选中关联，从而达到选择任意一级选项的目的
value:'id',label:'text' value:'id',label:'label'
}" clearable> }" clearable collapse-tags >
</el-cascader> </el-cascader>
</el-form-item> --> </el-form-item>
<el-form-item> <el-form-item>
@ -530,8 +530,9 @@
</div> </div>
</template> </template>
<script> <script>
import { systemAreaTreeApi,getCanteenByAreaApi,getStallByCanteenApi,orderStateListApi,orderPayAllTypeApi,queryPsnTypeByPageApi,deliveryTypeListApi,custOrgTreeApi,orderTypeListApi} from "@/api/order/reserve"; import { deptTreeSelect } from '@/api/system/user'
import { systemAreaTreeApi,getCanteenByAreaApi,getStallByCanteenApi,orderStateListApi,orderPayAllTypeApi,queryPsnTypeByPageApi,deliveryTypeListApi,orderTypeListApi} from "@/api/order/reserve";
import { orderPageListApi,orderDetailInfoApi,refundOrderPartApi,refundOrderApi,writeOffOrderApi,syncOrderPayStateApi } from "@/api/order/reserve"; import { orderPageListApi,orderDetailInfoApi,refundOrderPartApi,refundOrderApi,writeOffOrderApi,syncOrderPayStateApi } from "@/api/order/reserve";
export default { export default {
@ -592,8 +593,7 @@ export default {
deliveryTypeOptions:[], deliveryTypeOptions:[],
psnTypeOptions:[], psnTypeOptions:[],
orderTypeOptions:[], orderTypeOptions:[],
//组织树 deptOptions:[], //组织树
treeOrgOptions:[],
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
@ -648,8 +648,8 @@ export default {
this.orderPayAllType(); this.orderPayAllType();
this.deliveryTypeList(); this.deliveryTypeList();
this.queryPsnTypeByPage(); this.queryPsnTypeByPage();
this.orderTypeList(); this.orderTypeList();
// this.getOrgTreeData();//组织树-暂无接口 this.getDeptTree();
this.getList() this.getList()
}, },
methods: { methods: {
@ -706,12 +706,22 @@ export default {
orderTypeListApi({}).then((response) => { orderTypeListApi({}).then((response) => {
this.orderTypeOptions = response.data; ; this.orderTypeOptions = response.data; ;
}); });
},
/** 查询部门下拉树结构 */
getDeptTree() {
deptTreeSelect().then((response) => {
this.deptOptions = this.filterTree(response.data)
})
}, },
//组织树-暂无接口 filterTree(nodes) {
getOrgTreeData() { return nodes
custOrgTreeApi({}).then((response) => { .map((node) => {
this.treeOrgOptions = response; if (node.children) {
}); node.children = this.filterTree(node.children)
}
return node
})
.filter((node) => node.status !== '1')
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
@ -758,7 +768,7 @@ export default {
console.log(this.rowData) console.log(this.rowData)
this.orderDetailList.forEach((item,index)=>{ this.orderDetailList.forEach((item,index)=>{
this.$set(this.orderDetailList[index],"refundNum",item.quantity) this.$set(this.orderDetailList[index],"refundNum",item.quantity)
this.$set(this.orderDetailList[index],"refundMoney",(item.prefPrice).toFixed(2)) this.$set(this.orderDetailList[index],"refundMoney",Number(item.quantity)*(item.prefPrice).toFixed(2))
}) })
this.refundList=[] this.refundList=[]
this.openPart = true; this.openPart = true;

11
src/views/superstore/orderShenhe/index.vue
View File

@ -290,7 +290,7 @@
<script> <script>
import { deptTreeSelect } from '@/api/system/user' import { deptTreeSelect } from '@/api/system/user'
import { orderRefundStateListApi,systemAreaTreeApi,getSupermarketByAreaApi,getCanteenByAreaApi,getStallByCanteenApi,orderStateListApi,orderPayAllTypeApi,queryPsnTypeByPageApi,deliveryTypeListApi,custOrgTreeApi,orderTypeListApi} from "@/api/superStore/orderShenhe"; import { orderRefundStateListApi,systemAreaTreeApi,getSupermarketByAreaApi,getCanteenByAreaApi,getStallByCanteenApi,orderStateListApi,orderPayAllTypeApi,queryPsnTypeByPageApi,deliveryTypeListApi,orderTypeListApi} from "@/api/superStore/orderShenhe";
import { refundOrderPageListApi,orderDetailInfoApi,refundOrderPartApi,refundOrderApi,writeOffOrderApi,syncOrderPayStateApi,syncOrderRefundStateApi } from "@/api/superStore/orderShenhe"; import { refundOrderPageListApi,orderDetailInfoApi,refundOrderPartApi,refundOrderApi,writeOffOrderApi,syncOrderPayStateApi,syncOrderRefundStateApi } from "@/api/superStore/orderShenhe";
export default { export default {
name: "", name: "",
@ -395,8 +395,7 @@
this.orderPayAllType(); this.orderPayAllType();
this.deliveryTypeList(); this.deliveryTypeList();
this.queryPsnTypeByPage(); this.queryPsnTypeByPage();
this.orderTypeList(); this.orderTypeList();
// this.getOrgTreeData();//组织树-暂无接口
this.orderRefundTypeList(); this.orderRefundTypeList();
this.getList() this.getList()
}, },
@ -473,12 +472,6 @@
this.orderTypeOptions = response.data; this.orderTypeOptions = response.data;
}); });
}, },
//组织树-暂无接口
getOrgTreeData() {
custOrgTreeApi({}).then((response) => {
this.treeOrgOptions = response;
});
},
//退款状态类型 //退款状态类型
orderRefundTypeList(){ orderRefundTypeList(){

8
src/views/superstore/superOrder/index.vue
View File

@ -404,7 +404,7 @@
<script> <script>
import { deptTreeSelect } from '@/api/system/user' import { deptTreeSelect } from '@/api/system/user'
import { systemAreaTreeApi,getSupermarketByAreaApi,getCanteenByAreaApi,getStallByCanteenApi,orderStateListApi,orderPayAllTypeApi,queryPsnTypeByPageApi,deliveryTypeListApi,custOrgTreeApi,orderTypeListApi} from "@/api/superStore/superOrder"; import { systemAreaTreeApi,getSupermarketByAreaApi,getCanteenByAreaApi,getStallByCanteenApi,orderStateListApi,orderPayAllTypeApi,queryPsnTypeByPageApi,deliveryTypeListApi,orderTypeListApi} from "@/api/superStore/superOrder";
import { orderPageListApi,orderDetailInfoApi,refundOrderPartApi,refundOrderApi,writeOffOrderApi,syncOrderPayStateApi } from "@/api/superStore/superOrder"; import { orderPageListApi,orderDetailInfoApi,refundOrderPartApi,refundOrderApi,writeOffOrderApi,syncOrderPayStateApi } from "@/api/superStore/superOrder";
export default { export default {
name: "", name: "",
@ -598,12 +598,6 @@
this.orderTypeOptions = response.data; ; this.orderTypeOptions = response.data; ;
}); });
}, },
//组织树-暂无接口
getOrgTreeData() {
custOrgTreeApi({}).then((response) => {
this.treeOrgOptions = response;
});
},
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {