yu
/
CostumingPlatform
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
zhc4dev
wangjiadong 2 years ago
parent 9abbea76a7 d3995a030b
commit 303a0833d8
15 changed files with 454 additions and 201 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      ant-design-vue-jeecg/src/config/router.config.js
  2. 57
      ant-design-vue-jeecg/src/views/ordergoods/OrderGoodsList.vue
  3. 41
      ant-design-vue-jeecg/src/views/ordergoodsaccessories/OrderGoodsAccessoriesList.vue
  4. 41
      ant-design-vue-jeecg/src/views/ordergoodsfabric/OrderGoodsFabricList.vue
  5. 47
      ant-design-vue-jeecg/src/views/ordergoodsmodule/OrderGoodsModuleList.vue
  6. 42
      ant-design-vue-jeecg/src/views/productplan/ZyPlanWuLiaoDataDetail.vue
  7. 208
      ant-design-vue-jeecg/src/views/shopping/pages/gerenzhongxin.vue
  8. 48
      ant-design-vue-jeecg/src/views/shopping/pages/orderDetails.vue
  9. 27
      ant-design-vue-jeecg/src/views/zyorders/ZyOrdersList.vue
  10. 3
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/delivery/service/IDeliveryService.java
  11. 79
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/delivery/service/impl/DeliveryServiceImpl.java
  12. 29
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/ordergoods/controller/OrderGoodsController.java
  13. 3
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/ordergoodsaccessories/controller/OrderGoodsAccessoriesController.java
  14. 3
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/ordergoodsfabric/controller/OrderGoodsFabricController.java
  15. 3
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/ordergoodsmodule/controller/OrderGoodsModuleController.java

4
ant-design-vue-jeecg/src/config/router.config.js
Unescape View File

@ -646,4 +646,8 @@ export const constantRouterMap = [
path: '/shopping/views/person',//这里是你需要设置新窗口打开的页面的路径s
component: () => import('@/views/shopping/pages/gerenzhongxin'),
},
{
path: '/shopping/views/order',//这里是你需要设置新窗口打开的页面的路径s
component: () => import('@/views/shopping/pages/orderDetails'),
},
]

57
ant-design-vue-jeecg/src/views/ordergoods/OrderGoodsList.vue
Unescape View File

@ -112,7 +112,15 @@
下载
</a-button>
</template>
<template slot="mk" slot-scope="text, record">
<a @click="goodsModule(record)">管理</a>
</template>
<template slot="ml" slot-scope="text, record">
<a @click="goodsModule2(record)">管理</a>
</template>
<template slot="fl" slot-scope="text, record">
<a @click="goodsModule3(record)">管理</a>
</template>
<span slot="action" slot-scope="text, record">
<!--<a @click="handleEdit(record)">编辑</a>-->
<a @click="handleDetail(record)">详情</a>
@ -279,6 +287,21 @@
align:"center",
dataIndex: 'payTotalPrice'
},
{
title: '订单商品模块',
align: "center",
scopedSlots: {customRender: 'mk'}
},
{
title: '订单商品面料',
align: "center",
scopedSlots: {customRender: 'ml'}
},
{
title: '订单商品辅料',
align: "center",
scopedSlots: {customRender: 'fl'}
},
{
title: '操作',
dataIndex: 'action',
@ -289,7 +312,7 @@
}
],
url: {
list: "/ordergoods/orderGoods/list",
list: "/ordergoods/orderGoods/list?orderid="+this.$route.query.orderid+"&ischild="+this.$route.query.ischild,
delete: "/ordergoods/orderGoods/delete",
deleteBatch: "/ordergoods/orderGoods/deleteBatch",
exportXlsUrl: "/ordergoods/orderGoods/exportXls",
@ -309,6 +332,36 @@
},
},
methods: {
goodsModule(record)
{
this.$router.push({
path: '/ordergoodsmodule/OrderGoodsModuleList',
query: { // 路由携带参数
'ordergoodsid': record.id,
'goodsname':record.goodsName,
}
});
},
goodsModule2(record)
{
this.$router.push({
path: '/ordergoodsfabric/OrderGoodsFabricList',
query: { // 路由携带参数
'ordergoodsid': record.id,
'goodsname':record.goodsName,
}
});
},
goodsModule3(record)
{
this.$router.push({
path: '/ordergoodsaccessories/OrderGoodsAccessoriesList',
query: { // 路由携带参数
'ordergoodsid': record.id,
'goodsname':record.goodsName,
}
});
},
initDictConfig(){
},
getSuperFieldList(){

41
ant-design-vue-jeecg/src/views/ordergoodsaccessories/OrderGoodsAccessoriesList.vue
Unescape View File

@ -1,34 +1,19 @@
<template>
<a-card :bordered="false">
<p style="font-size: 30px;color:#333;padding-left: 40%">{{biaoTi}}</p>
<!-- 查询区域 -->
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="订单商品">
<j-dict-select-tag placeholder="请选择订单商品" v-model="queryParam.orderGoodsId" dictCode="order_goods,goods_name,id"/>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="商品">
<j-dict-select-tag placeholder="请选择商品" v-model="queryParam.goodsId" dictCode="zy_goods,goods_name,id"/>
</a-form-item>
</a-col>
<template v-if="toggleSearchStatus">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="辅料">
<j-dict-select-tag placeholder="请选择辅料" v-model="queryParam.accessoriesId" dictCode="zy_accessories,contents,id"/>
</a-form-item>
</a-col>
</template>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
<a @click="handleToggleSearch" style="margin-left: 8px">
{{ toggleSearchStatus ? '收起' : '展开' }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
</span>
</a-col>
</a-row>
@ -38,18 +23,12 @@
<!-- 操作按钮区域 -->
<div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('订单商品辅料表')">导出</a-button>
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
<!-- 高级查询区域 -->
<j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay">
<a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
</a-menu>
<a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
</a-dropdown>
</div>
@ -95,22 +74,7 @@
</template>
<span slot="action" slot-scope="text, record">
<a @click="handleEdit(record)">编辑</a>
<a-divider type="vertical" />
<a-dropdown>
<a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
<a-menu slot="overlay">
<a-menu-item>
<a @click="handleDetail(record)">详情</a>
</a-menu-item>
<a-menu-item>
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
<a>删除</a>
</a-popconfirm>
</a-menu-item>
</a-menu>
</a-dropdown>
</span>
</a-table>
@ -174,7 +138,7 @@
}
],
url: {
list: "/ordergoodsaccessories/orderGoodsAccessories/list",
list: "/ordergoodsaccessories/orderGoodsAccessories/list?ordergoodsid="+this.$route.query.ordergoodsid,
delete: "/ordergoodsaccessories/orderGoodsAccessories/delete",
deleteBatch: "/ordergoodsaccessories/orderGoodsAccessories/deleteBatch",
exportXlsUrl: "/ordergoodsaccessories/orderGoodsAccessories/exportXls",
@ -187,6 +151,7 @@
},
created() {
this.getSuperFieldList();
this.biaoTi = this.$route.query.goodsname+"订单商品辅料管理";
},
computed: {
importExcelUrl: function(){

41
ant-design-vue-jeecg/src/views/ordergoodsfabric/OrderGoodsFabricList.vue
Unescape View File

@ -1,34 +1,19 @@
<template>
<a-card :bordered="false">
<p style="font-size: 30px;color:#333;padding-left: 40%">{{biaoTi}}</p>
<!-- 查询区域 -->
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="订单商品">
<j-dict-select-tag placeholder="请选择订单商品" v-model="queryParam.orderGoodsId" dictCode="order_goods,goods_name,id"/>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="商品">
<j-dict-select-tag placeholder="请选择商品" v-model="queryParam.goodsId" dictCode="zy_goods,goods_name,id"/>
</a-form-item>
</a-col>
<template v-if="toggleSearchStatus">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="面料">
<j-dict-select-tag placeholder="请选择面料" v-model="queryParam.fabricId" dictCode="zy_fabric,name,id"/>
</a-form-item>
</a-col>
</template>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
<a @click="handleToggleSearch" style="margin-left: 8px">
{{ toggleSearchStatus ? '收起' : '展开' }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
</span>
</a-col>
</a-row>
@ -38,18 +23,12 @@
<!-- 操作按钮区域 -->
<div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('订单商品面料表')">导出</a-button>
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
<!-- 高级查询区域 -->
<j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay">
<a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
</a-menu>
<a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
</a-dropdown>
</div>
@ -95,22 +74,7 @@
</template>
<span slot="action" slot-scope="text, record">
<a @click="handleEdit(record)">编辑</a>
<a-divider type="vertical" />
<a-dropdown>
<a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
<a-menu slot="overlay">
<a-menu-item>
<a @click="handleDetail(record)">详情</a>
</a-menu-item>
<a-menu-item>
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
<a>删除</a>
</a-popconfirm>
</a-menu-item>
</a-menu>
</a-dropdown>
</span>
</a-table>
@ -174,7 +138,7 @@
}
],
url: {
list: "/ordergoodsfabric/orderGoodsFabric/list",
list: "/ordergoodsfabric/orderGoodsFabric/list?ordergoodsid="+this.$route.query.ordergoodsid,
delete: "/ordergoodsfabric/orderGoodsFabric/delete",
deleteBatch: "/ordergoodsfabric/orderGoodsFabric/deleteBatch",
exportXlsUrl: "/ordergoodsfabric/orderGoodsFabric/exportXls",
@ -187,6 +151,7 @@
},
created() {
this.getSuperFieldList();
this.biaoTi = this.$route.query.goodsname+"订单商品面料管理";
},
computed: {
importExcelUrl: function(){

47
ant-design-vue-jeecg/src/views/ordergoodsmodule/OrderGoodsModuleList.vue
Unescape View File

@ -1,44 +1,24 @@
<template>
<a-card :bordered="false">
<p style="font-size: 30px;color:#333;padding-left: 40%">{{biaoTi}}</p>
<!-- 查询区域 -->
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="订单商品">
<j-dict-select-tag placeholder="请选择订单商品" v-model="queryParam.orderGoodsId" dictCode="order_goods,goods_name,id"/>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="商品">
<j-dict-select-tag placeholder="请选择商品" v-model="queryParam.goodsId" dictCode="zy_goods,goods_name,id"/>
</a-form-item>
</a-col>
<template v-if="toggleSearchStatus">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="款式">
<j-dict-select-tag placeholder="请选择款式" v-model="queryParam.styleId" dictCode="zy_cloths_style,style_names,id"/>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="款式模块">
<a-input placeholder="请输入款式模块" v-model="queryParam.styleModuleId"></a-input>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="模块">
<j-dict-select-tag placeholder="请选择模块" v-model="queryParam.moduleId" dictCode="zy_cloths_modular ,modular_name,id"/>
</a-form-item>
</a-col>
</template>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
<a @click="handleToggleSearch" style="margin-left: 8px">
{{ toggleSearchStatus ? '收起' : '展开' }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
</span>
</a-col>
</a-row>
@ -48,18 +28,12 @@
<!-- 操作按钮区域 -->
<div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('订单商品模块表')">导出</a-button>
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
<!-- 高级查询区域 -->
<j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay">
<a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
</a-menu>
<a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
</a-dropdown>
</div>
@ -105,22 +79,7 @@
</template>
<span slot="action" slot-scope="text, record">
<a @click="handleEdit(record)">编辑</a>
<a-divider type="vertical" />
<a-dropdown>
<a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
<a-menu slot="overlay">
<a-menu-item>
<a @click="handleDetail(record)">详情</a>
</a-menu-item>
<a-menu-item>
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
<a>删除</a>
</a-popconfirm>
</a-menu-item>
</a-menu>
</a-dropdown>
</span>
</a-table>
@ -148,6 +107,7 @@
return {
description: '订单商品模块表管理页面',
// 表头
biaoTi: '',
columns: [
{
title: '#',
@ -189,7 +149,7 @@
}
],
url: {
list: "/ordergoodsmodule/orderGoodsModule/list",
list: "/ordergoodsmodule/orderGoodsModule/list?ordergoodsid="+this.$route.query.ordergoodsid,
delete: "/ordergoodsmodule/orderGoodsModule/delete",
deleteBatch: "/ordergoodsmodule/orderGoodsModule/deleteBatch",
exportXlsUrl: "/ordergoodsmodule/orderGoodsModule/exportXls",
@ -202,6 +162,7 @@
},
created() {
this.getSuperFieldList();
this.biaoTi = this.$route.query.goodsname+"订单商品模块管理";
},
computed: {
importExcelUrl: function(){

42
ant-design-vue-jeecg/src/views/productplan/ZyPlanWuLiaoDataDetail.vue
Unescape View File

@ -38,8 +38,8 @@
<a-spin :spinning="confirmLoading">
<h3 style="width: 98%;;margin:20px auto 0">计划面料清单</h3>
<a-table style="width: 98%;font-size:14px;margin:10px auto" :columns="columns1" :data-source="data1" bordered
rowKey="nums" :pagination="false">
<a-table style="width: 98%;font-size:14px;margin:10px auto 0" :columns="columns1" :data-source="data1" bordered
rowKey="id" :pagination="false">
</a-table>
<h3 style="width: 98%;;margin:20px auto 0">计划辅料清单</h3>
@ -71,11 +71,11 @@ import {mixinDevice} from '@/utils/mixin'
import {JeecgListMixin} from '@/mixins/JeecgListMixin'
import {filterObj} from "@/utils/util";
const columns1 = [
{
title: '计划ID',
align: "center",
dataIndex: 'planId'
},
// {
// title: '计划ID',
// align: "center",
// dataIndex: 'planId'
// },
{
title: '面料',
align: "center",
@ -89,11 +89,11 @@ const columns1 = [
];
const columns2 = [
{
title: '计划ID',
align: "center",
dataIndex: 'planId'
},
// {
// title: '计划ID',
// align: "center",
// dataIndex: 'planId'
// },
{
title: '辅料',
align: "center",
@ -244,23 +244,7 @@ export default {
this.loadRouteType = true;
}
},
// showModal(id) {
// this.visible = true;
// this.id = id
// this.getDetailData()
// },
// getDetailData() {
// getAction(this.url.detail, {id: this.id}).then((res) => {
// if (res.success) {
// this.data = res.result.records || res.result.records;
// console.log("data------------:" + JSON.stringify(this.data));
// } else {
// this.$message.warning(res.message)
// }
// }).finally(() => {
// this.confirmLoading = false
// })
// },
handleOk(e) {
this.confirmLoading = true;
setTimeout(() => {

208
ant-design-vue-jeecg/src/views/shopping/pages/gerenzhongxin.vue
Unescape View File

@ -8,28 +8,75 @@
<a>量体数据</a>
</div>
<div class="jz">
<a-tabs default-active-key="1" :tabBarGutter="200" @change="callback">
<a-tab-pane key="1" tab="我的账户">
我的账户
</a-tab-pane>
<a-tab-pane key="2" tab="我的收藏" force-render>
我的收藏
</a-tab-pane>
<a-tab-pane key="3" tab="地址管理">
地址管理
</a-tab-pane>
<a-tab-pane key="4" tab="发票管理" force-render>
发票管理
</a-tab-pane>
<a-tab-pane key="5">
<span slot="tab">
全部订单
<a-icon type="down" />
</span>
全部订单
</a-tab-pane>
</a-tabs>
<a-menu class="menu" v-model="current" mode="horizontal" @click="menuChange">
<a-menu-item key="mail"> 我的账户 </a-menu-item>
<a-menu-item key="collect"> 我的收藏 </a-menu-item>
<a-menu-item key="addr"> 地址管理 </a-menu-item>
<a-sub-menu>
<span slot="title" class="submenu-title-wrapper">发票管理<a-icon type="down" /></span>
<a-menu-item key="invoice:1">
Option 1
</a-menu-item>
<a-menu-item key="invoice:2">
Option 2
</a-menu-item>
<a-menu-item key="invoice:3">
Option 3
</a-menu-item>
<a-menu-item key="invoice:4">
Option 4
</a-menu-item>
</a-sub-menu>
<a-sub-menu>
<span slot="title" class="submenu-title-wrapper">全部订单<a-icon type="down" /></span>
<a-menu-item key="daizhifu">
待支付
</a-menu-item>
<a-menu-item key="daishouhuo">
待收货
</a-menu-item>
<a-menu-item key="yiwancheng">
已完成
</a-menu-item>
<a-menu-item key="tuihuan">
退换服务
</a-menu-item>
</a-sub-menu>
</a-menu>
<div class="orderList">
<div class="item" v-for="(item,index) in allOrders" :key="index">
<div class="top d-flex">
<span>订单编号：{{item.orderNum}}</span>
<span>
<a class="delete">删除</a>
<a class="pay" v-if="!item.pay">未支付</a>
<a class="pay" v-if="item.pay">已支付</a>
</span>
</div>
<div class="bottom d-flex">
<div class="l">
<img :src="item.url">
</div>
<div class="r">
<p class="name f_18 c_333">{{item.name}}</p>
<p class="kuanshi f_16 c_666 d-flex">
<span>款式：{{item.type}}<span class="line">|</span>尺码：{{item.size}}<span class="line">|</span>数量：{{item.num}}件</span>
<span class="f_20 c_333">¥ {{item.price}}</span>
</p>
<p><span class="c_666 f_16">主辅料：{{item.material}}</span><span class="c_333 f_14"></span></p>
<p class="heji d-flex">
<span class="f_20 c_1B">总计：¥ {{item.total}}</span>
<span class="f_16 c_333 ">
<a class="btn ljzf" v-if="!item.pay">立即支付</a>
<router-link to="/shopping/views/order" class="btn ckxq">查看详情</router-link>
</span>
</p>
</div>
</div>
</div>
</div>
</div>
<Footer></Footer>
</div>
@ -42,6 +89,35 @@
components: { Header,Footer },
data() {
return {
current: ['mail'],
allOrders:[
{
id:1,
orderNum:'CN172839729',
pay:false,
url:require("../assets/cloth001.png"),
name:'商品名商品名商品名商品名商品',
type:'衬衫',
size:'XXL',
num:2,
price:2456,
material:'主料1，辅料2，辅料3，辅料4，辅料5，辅料6',
total:5912
},
{
id:2,
orderNum:'CN172839730',
pay:true,
url:require("../assets/cloth002.png"),
name:'商品名商品名商品名商品名商品',
type:'衬衫',
size:'XXL',
num:3,
price:2456,
material:'主料1，辅料2，辅料3，辅料4，辅料5，辅料6',
total:5912
}
],
};
},
@ -49,6 +125,11 @@
callback(key) {
console.log(key);
},
menuChange(key){
if(key == daizhifu){
// this.allOrders.forEach()
}
}
},
};
</script>
@ -82,12 +163,83 @@
margin-bottom: 60px;
}
}
/*/deep/ .ant-tabs-nav{*/
/* width: 100%;*/
/* & >div{*/
/* display: flex;*/
/* justify-content: space-around;*/
/* }*/
/*}*/
.menu{width: 1114px;margin:0 auto}
/deep/ .ant-menu{
display: flex;
justify-content: space-between;
}
.orderList{
/*margin-top: 60px;*/
width: 1114px;margin:0 auto;
padding: 20px;
.item{
border-bottom: 1px solid #DADADA;
padding-top: 30px;
.top{
justify-content: space-between;
color: #333;
.delete{
text-decoration: underline;
color: #1B1B1B;
margin-right: 20px;
}
.pay{
color: #E53E41;
}
}
.bottom{
justify-content: space-between;
.l{
img{
width: 230px;
height: 230px;
}
}
.r{
min-width: 800px;
padding-top: 30px;
.name{
font-weight: 500;
}
.kuanshi{
justify-content: space-between;
}
.line{
margin-left: 30px;
margin-right: 30px;
}
.heji{
justify-content: space-between;
.btn{
display: inline-block;
width: 145px;
height: 40px;
line-height: 40px;
text-align: center;
}
.ljzf{
background: #333333;
color: #fff;
margin-right: 20px;
border: 1px solid #333333;
&:hover{
background: rgba(0,0,0,0.7);
/*color: #333;*/
}
}
.ckxq{
color: #333;
border: 1px solid #333333;
&:hover{
background: #333;
color: #fff;
}
}
}
}
}
}
}
</style>

48
ant-design-vue-jeecg/src/views/shopping/pages/orderDetails.vue
Unescape View File

@ -0,0 +1,48 @@
<template>
<div class="orderDetails">
<Header fontColor="#000"></Header>
<div style="padding-top: 88px"></div>
<div class="orderMain">
<div class="jz">
<el-breadcrumb class="breadcrumb" separator="/">
<el-breadcrumb-item :to="{ path: '/shopping/views/clothType' }">上级页面</el-breadcrumb-item>
<el-breadcrumb-item :to="{ path: '/shopping/views/clothType' }">上级页面</el-breadcrumb-item>
<el-breadcrumb-item :to="{ path: '/shopping/views/clothType' }">上级页面</el-breadcrumb-item>
<!-- <el-breadcrumb-item>{{this.$route.query.title }}</el-breadcrumb-item>-->
</el-breadcrumb>
</div>
</div>
<Footer></Footer>
</div>
</template>
<script>
import Header from "../components/Header/HeaderView";
import Footer from "../components/Footer/FooterView"
export default {
name: "orderDetails",
components: { Header,Footer },
data() {
return {
};
},
methods: {
},
};
</script>
<style>
.orderDetails .top .middle .router-link-exact-active.router-link-active {
border-bottom: 2px solid #000;
}
</style>
<style lang="less" scoped>
@import '../assets/common.css';
.orderMain{
background: #F6F6F6;
.breadcrumb{
padding-top: 50px;
padding-bottom: 50px;
}
}
</style>

27
ant-design-vue-jeecg/src/views/zyorders/ZyOrdersList.vue
Unescape View File

@ -141,6 +141,8 @@
<a-divider type="vertical" />
<a @click="shengchan(record)">生产</a>
<a-divider type="vertical" />
<a @click="shangpin(record)">商品</a>
<a-divider type="vertical" />
<!-- <a @click="handleEdit(record)">编辑</a>
<a-divider type="vertical" />-->
<a @click="handleDetail(record)">详情</a>
@ -188,6 +190,14 @@
return parseInt(index)+1;
}
},
{
title:'下单时间',
align:"center",
dataIndex: 'orderTime',
customRender:function (text) {
return !text?"":(text.length>10?text.substr(0,10):text)
}
},
{
title:'是否子单',
align:"center",
@ -198,14 +208,6 @@
align:"center",
dataIndex: 'orderId_dictText'
},
{
title:'下单时间',
align:"center",
dataIndex: 'orderTime',
customRender:function (text) {
return !text?"":(text.length>10?text.substr(0,10):text)
}
},
{
title:'订单编号',
align:"center",
@ -424,6 +426,15 @@
}
},
shangpin(record){
this.$router.push({
path: '/ordergoods/OrderGoodsList',
query: { // 路由携带参数
'orderid': record.id,
'ischild':record.ischild,
}
});
},
getPcaText(code){
return this.pcaData.getText(code);
},

3
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/delivery/service/IDeliveryService.java
Unescape View File

@ -3,6 +3,7 @@ package org.jeecg.modules.demo.delivery.service;
import org.jeecg.modules.demo.delivery.entity.Delivery;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.productplan.entity.ZyPlanProcess;
/**
* @Description: 出库表
@ -12,4 +13,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/
public interface IDeliveryService extends IService<Delivery> {
void sendToRepository(String planId);
}

79
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/delivery/service/impl/DeliveryServiceImpl.java
Unescape View File

@ -1,12 +1,29 @@
package org.jeecg.modules.demo.delivery.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.modules.demo.accessories.entity.ZyAccessories;
import org.jeecg.modules.demo.accessories.service.IZyAccessoriesService;
import org.jeecg.modules.demo.delivery.entity.Delivery;
import org.jeecg.modules.demo.delivery.mapper.DeliveryMapper;
import org.jeecg.modules.demo.delivery.service.IDeliveryService;
import org.jeecg.modules.demo.fabric.entity.ZyFabric;
import org.jeecg.modules.demo.fabric.service.IZyFabricService;
import org.jeecg.modules.productplan.entity.ZyPlanAccessories;
import org.jeecg.modules.productplan.entity.ZyPlanFabric;
import org.jeecg.modules.productplan.entity.ZyProductPlan;
import org.jeecg.modules.productplan.service.IZyPlanAccessoriesService;
import org.jeecg.modules.productplan.service.IZyPlanFabricService;
import org.jeecg.modules.productplan.service.IZyProductPlanService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import java.util.LinkedList;
import java.util.List;
import java.util.Optional;
/**
* @Description: 出库表
@ -17,4 +34,64 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@Service
public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> implements IDeliveryService {
@Autowired
private IZyProductPlanService iZyProductPlanService;
@Autowired
private IZyPlanFabricService iZyPlanFabricService;
@Autowired
private IZyPlanAccessoriesService iZyPlanAccessoriesService;
@Autowired
IZyFabricService iZyFabricService;
@Autowired
private IZyAccessoriesService iZyAccessoriesService;
@Override
public void sendToRepository(String planId) {
ZyProductPlan zyProductPlan = iZyProductPlanService.getById(planId);
Optional.ofNullable(zyProductPlan).orElseThrow(() -> new JeecgBootException("生产计划不存在!"));
List<ZyPlanFabric> fabricList = iZyPlanFabricService.list(new LambdaQueryWrapper<ZyPlanFabric>()
.eq(ZyPlanFabric::getPlanId, planId));
List<Delivery> deliveryList4Fabric = new LinkedList<>();
Optional.ofNullable(fabricList).orElse(new LinkedList<>()).forEach(e -> {
Delivery delivery = new Delivery();
delivery.setDeliveryReason("0");
delivery.setItemType("0");
delivery.setAmount(e.getAmount().doubleValue());
// delivery.setDeliveryTime(new Date());
// delivery.setCarrierId("TODO");
// delivery.setAdminId("TODO");
// delivery.setStorehouseId("TODO");
ZyFabric zyFabric = iZyFabricService.getById(e.getFabricId());
if (!ObjectUtils.isEmpty(zyFabric)) {
delivery.setItemCode(zyFabric.getFabricNumber());
}
deliveryList4Fabric.add(delivery);
});
this.saveBatch(deliveryList4Fabric);
List<ZyPlanAccessories> accessoriesList = iZyPlanAccessoriesService.list(new LambdaQueryWrapper<ZyPlanAccessories>()
.eq(ZyPlanAccessories::getPlanId, planId));
List<Delivery> deliveryList4accessories = new LinkedList<>();
Optional.ofNullable(accessoriesList).orElse(new LinkedList<>()).forEach(e -> {
Delivery delivery2 = new Delivery();
delivery2.setDeliveryReason("0");
delivery2.setItemType("1");
delivery2.setAmount(e.getAmount().doubleValue());
// delivery2.setDeliveryTime(new Date());
// delivery2.setCarrierId("TODO");
// delivery2.setAdminId("TODO");
// delivery2.setStorehouseId("TODO");
ZyAccessories zyAccessories = iZyAccessoriesService.getById(e.getAccessoriesId());
if (!ObjectUtils.isEmpty(zyAccessories)) {
delivery2.setItemCode(zyAccessories.getNums());
}
deliveryList4accessories.add(delivery2);
});
this.saveBatch(deliveryList4accessories);
}
}

29
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/ordergoods/controller/OrderGoodsController.java
Unescape View File

@ -20,6 +20,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.modules.demo.zyorders.entity.ZyOrders;
import org.jeecg.modules.demo.zyorders.service.IZyOrdersService;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
@ -49,6 +51,8 @@ import org.jeecg.common.aspect.annotation.AutoLog;
public class OrderGoodsController extends JeecgController<OrderGoods, IOrderGoodsService> {
@Autowired
private IOrderGoodsService orderGoodsService;
@Autowired
private IZyOrdersService zyOrdersService;
/**
* 分页列表查询
@ -65,11 +69,34 @@ public class OrderGoodsController extends JeecgController<OrderGoods, IOrderGood
public Result<?> queryPageList(OrderGoods orderGoods,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
HttpServletRequest req,@RequestParam(name="orderid",required=true)String orderid,@RequestParam(name="ischild",required=true)String ischild) {
if(orderid.equals("undefined")&&ischild.equals("undefined")){
QueryWrapper<OrderGoods> queryWrapper = QueryGenerator.initQueryWrapper(orderGoods, req.getParameterMap());
Page<OrderGoods> page = new Page<OrderGoods>(pageNo, pageSize);
IPage<OrderGoods> pageList = orderGoodsService.page(page, queryWrapper);
return Result.OK(pageList);
}else if(ischild.equals("0")){
ZyOrders zyOrders = new ZyOrders();
QueryWrapper<ZyOrders> queryWrapper1 = QueryGenerator.initQueryWrapper(zyOrders, req.getParameterMap());
queryWrapper1.eq("order_id",orderid);
List<ZyOrders> list = zyOrdersService.list(queryWrapper1);
String ids = "";
for (int i = 0 ; i < list.size() ; i++){
ids = ids + list.get(i).getId()+",";
}
QueryWrapper<OrderGoods> queryWrapper2 = QueryGenerator.initQueryWrapper(orderGoods, req.getParameterMap());
queryWrapper2.in("orders_id",ids.substring(0,ids.length()-1).split(","));
Page<OrderGoods> page = new Page<OrderGoods>(pageNo, pageSize);
IPage<OrderGoods> pageList = orderGoodsService.page(page, queryWrapper2);
return Result.OK(pageList);
}else {
QueryWrapper<OrderGoods> queryWrapper3 = QueryGenerator.initQueryWrapper(orderGoods, req.getParameterMap());
queryWrapper3.eq("orders_id",orderid);
Page<OrderGoods> page = new Page<OrderGoods>(pageNo, pageSize);
IPage<OrderGoods> pageList = orderGoodsService.page(page, queryWrapper3);
return Result.OK(pageList);
}
}
/**

3
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/ordergoodsaccessories/controller/OrderGoodsAccessoriesController.java
Unescape View File

@ -65,8 +65,9 @@ public class OrderGoodsAccessoriesController extends JeecgController<OrderGoodsA
public Result<?> queryPageList(OrderGoodsAccessories orderGoodsAccessories,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
HttpServletRequest req,String ordergoodsid) {
QueryWrapper<OrderGoodsAccessories> queryWrapper = QueryGenerator.initQueryWrapper(orderGoodsAccessories, req.getParameterMap());
queryWrapper.eq("order_goods_id",ordergoodsid);
Page<OrderGoodsAccessories> page = new Page<OrderGoodsAccessories>(pageNo, pageSize);
IPage<OrderGoodsAccessories> pageList = orderGoodsAccessoriesService.page(page, queryWrapper);
return Result.OK(pageList);

3
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/ordergoodsfabric/controller/OrderGoodsFabricController.java
Unescape View File

@ -65,8 +65,9 @@ public class OrderGoodsFabricController extends JeecgController<OrderGoodsFabric
public Result<?> queryPageList(OrderGoodsFabric orderGoodsFabric,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
HttpServletRequest req,String ordergoodsid) {
QueryWrapper<OrderGoodsFabric> queryWrapper = QueryGenerator.initQueryWrapper(orderGoodsFabric, req.getParameterMap());
queryWrapper.eq("order_goods_id",ordergoodsid);
Page<OrderGoodsFabric> page = new Page<OrderGoodsFabric>(pageNo, pageSize);
IPage<OrderGoodsFabric> pageList = orderGoodsFabricService.page(page, queryWrapper);
return Result.OK(pageList);

3
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/ordergoodsmodule/controller/OrderGoodsModuleController.java
Unescape View File

@ -65,8 +65,9 @@ public class OrderGoodsModuleController extends JeecgController<OrderGoodsModule
public Result<?> queryPageList(OrderGoodsModule orderGoodsModule,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
HttpServletRequest req,String ordergoodsid) {
QueryWrapper<OrderGoodsModule> queryWrapper = QueryGenerator.initQueryWrapper(orderGoodsModule, req.getParameterMap());
queryWrapper.eq("order_goods_id",ordergoodsid);
Page<OrderGoodsModule> page = new Page<OrderGoodsModule>(pageNo, pageSize);
IPage<OrderGoodsModule> pageList = orderGoodsModuleService.page(page, queryWrapper);
return Result.OK(pageList);

Write Preview
Loading…
Cancel
Save