订单组织树
This commit is contained in:
parent
f569800226
commit
5c13b2161e
|
|
@ -78,17 +78,6 @@ export function queryPsnTypeByPageApi(data) {
|
|||
params: data
|
||||
})
|
||||
}
|
||||
// 组织
|
||||
export function custOrgTreeApi(data) {
|
||||
return request({
|
||||
url: '/smart-canteen/custOrg/tenant/tree',
|
||||
method: 'get',
|
||||
headers: {
|
||||
"merchant-id":"378915229716713472",
|
||||
},
|
||||
params: data
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -102,17 +102,6 @@ export function queryPsnTypeByPageApi(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) {
|
||||
|
|
|
|||
|
|
@ -110,17 +110,6 @@ export function queryPsnTypeByPageApi(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) {
|
||||
|
|
|
|||
|
|
@ -115,17 +115,6 @@ export function queryPsnTypeByPageApi(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) {
|
||||
|
|
|
|||
|
|
@ -123,17 +123,17 @@
|
|||
<el-form-item label="流水号">
|
||||
<el-input v-model="queryParams.mealCode" placeholder="请输入流水号" maxlength="20" clearable style="width: 220px"/>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item label="所属区域" prop="orgIdList">
|
||||
<el-form-item label="所属组织" prop="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="{
|
||||
multiple: true,
|
||||
emitPath: false,// 若设置 false,则只返回该节点的值,只返回最后选择的id
|
||||
checkStrictly: true,//来设置父子节点取消选中关联,从而达到选择任意一级选项的目的
|
||||
value:'id',label:'text'
|
||||
}" clearable>
|
||||
</el-cascader>
|
||||
</el-form-item> -->
|
||||
checkStrictly: false,//来设置父子节点取消选中关联,从而达到选择任意一级选项的目的
|
||||
value:'id',label:'label'
|
||||
}" clearable collapse-tags >
|
||||
</el-cascader>
|
||||
</el-form-item>
|
||||
|
||||
|
||||
<el-form-item>
|
||||
|
|
@ -527,7 +527,8 @@
|
|||
</template>
|
||||
|
||||
<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";
|
||||
|
||||
export default {
|
||||
|
|
@ -587,8 +588,7 @@
|
|||
orderPayOptions:[],
|
||||
nuclearModeOptions:[],
|
||||
psnTypeOptions:[],
|
||||
//组织树
|
||||
treeOrgOptions:[],
|
||||
deptOptions:[],//组织树
|
||||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
|
|
@ -643,8 +643,7 @@
|
|||
this.orderStateList();
|
||||
this.orderPayAllType();
|
||||
this.orderNuclearModeList();
|
||||
this.queryPsnTypeByPage();
|
||||
// this.getOrgTreeData();//组织树-暂无接口
|
||||
this.queryPsnTypeByPage();
|
||||
this.getList()
|
||||
},
|
||||
methods: {
|
||||
|
|
@ -696,13 +695,22 @@
|
|||
this.psnTypeOptions = response.rows
|
||||
});
|
||||
},
|
||||
//组织树-暂无接口
|
||||
getOrgTreeData() {
|
||||
custOrgTreeApi({}).then((response) => {
|
||||
this.treeOrgOptions = response;
|
||||
});
|
||||
/** 查询部门下拉树结构 */
|
||||
getDeptTree() {
|
||||
deptTreeSelect().then((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() {
|
||||
this.queryParams.pageNum = 1;
|
||||
|
|
@ -748,7 +756,7 @@
|
|||
console.log(this.rowData)
|
||||
this.orderDetailList.forEach((item,index)=>{
|
||||
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.openPart = true;
|
||||
|
|
|
|||
|
|
@ -126,17 +126,17 @@
|
|||
<el-form-item label="流水号">
|
||||
<el-input v-model="queryParams.mealCode" placeholder="请输入流水号" maxlength="20" clearable style="width: 220px"/>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item label="所属区域" prop="orgIdList">
|
||||
<el-cascader v-model="queryParams.orgIdList"
|
||||
:options="treeOrgOptions" :filterable="true" style="width: 220px" :show-all-levels="false"
|
||||
:props="{
|
||||
multiple: true,
|
||||
emitPath: false,// 若设置 false,则只返回该节点的值,只返回最后选择的id
|
||||
checkStrictly: true,//来设置父子节点取消选中关联,从而达到选择任意一级选项的目的
|
||||
value:'id',label:'text'
|
||||
}" clearable>
|
||||
</el-cascader>
|
||||
</el-form-item> -->
|
||||
<el-form-item label="所属组织" prop="orgIdList">
|
||||
<el-cascader v-model="queryParams.orgIdList"
|
||||
:options="deptOptions" :filterable="true" style="width: 240px" :show-all-levels="false"
|
||||
:props="{
|
||||
multiple: true,
|
||||
emitPath: false,// 若设置 false,则只返回该节点的值,只返回最后选择的id
|
||||
checkStrictly: false,//来设置父子节点取消选中关联,从而达到选择任意一级选项的目的
|
||||
value:'id',label:'label'
|
||||
}" clearable collapse-tags >
|
||||
</el-cascader>
|
||||
</el-form-item>
|
||||
|
||||
|
||||
<el-form-item>
|
||||
|
|
@ -530,8 +530,9 @@
|
|||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { systemAreaTreeApi,getCanteenByAreaApi,getStallByCanteenApi,orderStateListApi,orderPayAllTypeApi,queryPsnTypeByPageApi,deliveryTypeListApi,custOrgTreeApi,orderTypeListApi} from "@/api/order/reserve";
|
||||
<script>
|
||||
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";
|
||||
|
||||
export default {
|
||||
|
|
@ -592,8 +593,7 @@ export default {
|
|||
deliveryTypeOptions:[],
|
||||
psnTypeOptions:[],
|
||||
orderTypeOptions:[],
|
||||
//组织树
|
||||
treeOrgOptions:[],
|
||||
deptOptions:[], //组织树
|
||||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
|
|
@ -648,8 +648,8 @@ export default {
|
|||
this.orderPayAllType();
|
||||
this.deliveryTypeList();
|
||||
this.queryPsnTypeByPage();
|
||||
this.orderTypeList();
|
||||
// this.getOrgTreeData();//组织树-暂无接口
|
||||
this.orderTypeList();
|
||||
this.getDeptTree();
|
||||
this.getList()
|
||||
},
|
||||
methods: {
|
||||
|
|
@ -706,12 +706,22 @@ export default {
|
|||
orderTypeListApi({}).then((response) => {
|
||||
this.orderTypeOptions = response.data; ;
|
||||
});
|
||||
},
|
||||
/** 查询部门下拉树结构 */
|
||||
getDeptTree() {
|
||||
deptTreeSelect().then((response) => {
|
||||
this.deptOptions = this.filterTree(response.data)
|
||||
})
|
||||
},
|
||||
//组织树-暂无接口
|
||||
getOrgTreeData() {
|
||||
custOrgTreeApi({}).then((response) => {
|
||||
this.treeOrgOptions = response;
|
||||
});
|
||||
filterTree(nodes) {
|
||||
return nodes
|
||||
.map((node) => {
|
||||
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)
|
||||
this.orderDetailList.forEach((item,index)=>{
|
||||
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.openPart = true;
|
||||
|
|
|
|||
|
|
@ -290,7 +290,7 @@
|
|||
|
||||
<script>
|
||||
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";
|
||||
export default {
|
||||
name: "",
|
||||
|
|
@ -395,8 +395,7 @@
|
|||
this.orderPayAllType();
|
||||
this.deliveryTypeList();
|
||||
this.queryPsnTypeByPage();
|
||||
this.orderTypeList();
|
||||
// this.getOrgTreeData();//组织树-暂无接口
|
||||
this.orderTypeList();
|
||||
this.orderRefundTypeList();
|
||||
this.getList()
|
||||
},
|
||||
|
|
@ -473,12 +472,6 @@
|
|||
this.orderTypeOptions = response.data;
|
||||
});
|
||||
},
|
||||
//组织树-暂无接口
|
||||
getOrgTreeData() {
|
||||
custOrgTreeApi({}).then((response) => {
|
||||
this.treeOrgOptions = response;
|
||||
});
|
||||
},
|
||||
|
||||
//退款状态类型
|
||||
orderRefundTypeList(){
|
||||
|
|
|
|||
|
|
@ -404,7 +404,7 @@
|
|||
|
||||
<script>
|
||||
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";
|
||||
export default {
|
||||
name: "",
|
||||
|
|
@ -598,12 +598,6 @@
|
|||
this.orderTypeOptions = response.data; ;
|
||||
});
|
||||
},
|
||||
//组织树-暂无接口
|
||||
getOrgTreeData() {
|
||||
custOrgTreeApi({}).then((response) => {
|
||||
this.treeOrgOptions = response;
|
||||
});
|
||||
},
|
||||
|
||||
/** 搜索按钮操作 */
|
||||
handleQuery() {
|
||||
|
|
|
|||
Loading…
Reference in New Issue