Merge remote-tracking branch 'origin/master'

zhc4dev
wangjiadong 2 years ago
commit bf64430d2f
  1. 65
      ant-design-vue-jeecg/src/views/product/productModule/ProductModuleList.vue
  2. 14
      ant-design-vue-jeecg/src/views/zyWorkProduct/ZyProductList.vue
  3. 12
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsTypeController.java
  4. 4
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/productModule/entity/ProductModule.java

@ -1,9 +1,29 @@
<template>
<a-card :bordered="false">
<p style="font-size: 30px;color:#333;padding-left: 35%">{{biaoTi}}</p>
<!-- 查询区域 -->
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :xl="7" :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="请选择模块名称" dictCode="zy_cloths_modular,modular_name,id"
v-model="queryParam.modularId"></j-dict-select-tag>
</a-form-item>
</a-col>
<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>
</span>
</a-col>
</a-row>
</a-form>
</div>
@ -11,19 +31,13 @@
<!-- 操作按钮区域 -->
<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>-->
<a-button type="primary" icon="rollback" @click="fanHui()">返回</a-button>
<!-- <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>-->
</div>
<!-- table区域-begin -->
@ -68,7 +82,7 @@
</template>
<span slot="action" slot-scope="text, record">
<a @click="handleEdit(record)">编辑</a>
<!-- <a @click="handleEdit(record)">编辑</a>-->
<a-divider type="vertical" />
<a @click="handleDetail(record)">详情</a>
<a-divider type="vertical" />
@ -100,6 +114,8 @@
data () {
return {
description: '工单管理下面的产品模块管理页面',
biaoTi:'',
loadRouteType: false,
//
columns: [
{
@ -118,12 +134,13 @@
dataIndex: 'productId'
},
{
title:'款式模块id',
// title:'id',
title:'模块编号',
align:"center",
dataIndex: 'styleModuleId'
},
{
title:'模块id',
title:'模块名称',
align:"center",
dataIndex: 'moduleId'
},
@ -159,7 +176,8 @@
}
},
created() {
this.getSuperFieldList();
// this.getSuperFieldList();
this.loadParameter();
},
computed: {
importExcelUrl: function(){
@ -167,6 +185,19 @@
},
},
methods: {
fanHui(){
this.$router.push({
/*返回产品*/
path: '/WorkProduct',/*在引号中填写返回vue*/
});
},
loadParameter() {
if (this.loadRouteType === false) {
this.biaoTi=this.$route.query.productName+" 产品模块管理";
console.log("***********",this.$route.query.productName)
this.loadRouteType = true;
}
},
initDictConfig(){
},
getSuperFieldList(){

@ -121,7 +121,9 @@
<a @click="jumpProcesses(record)">工序</a>
<a-divider type="vertical" />
<a @click="handleDetail(record)">模块</a>
<!-- <a @click="handleDetail(record)">模块</a>-->
<a @click="jumpModules(record)">模块</a>
<a-divider type="vertical" />
<a @click="jumpFabrics(record)">面料</a>
@ -366,14 +368,14 @@
});
},
//-
jumpModules(record)
{
jumpModules(record) {
this.$router.push({
path: '/src/views/product/productModule/ProductModuleList',
// query: { //
path: '/product/productModule/ProductModuleList',
query: { //
'productName': record.productName,
// 'pid': record.id,
// 'tname': record.name,
// }
}
});
},
//-

@ -72,6 +72,18 @@ public class ZyClothsTypeController extends JeecgController<ZyClothsType, IZyClo
return Result.OK(pageList);
}
/**
* 根据id拿到服装类型的类型名称
* getTypeNameById
*/
@AutoLog(value = "zy_cloths_type-分页列表查询")
@ApiOperation(value = "zy_cloths_type-分页列表查询", notes = "zy_cloths_type-分页列表查询")
@GetMapping(value = "/getTypeName")
public Result<?> getTypeNameById(@RequestParam(name = "id", required = true)String id){
ZyClothsType zyClothsType = zyClothsTypeService.getById(id);
return Result.OK(zyClothsType.getTypeName());
}
/**
* 添加
*

@ -63,9 +63,9 @@ public class ProductModule implements Serializable {
@ApiModelProperty(value = "款式模块id")
private String styleModuleId;
/**模块id*/
@Excel(name = "模块id", width = 15)
@Excel(name = "模块名称", width = 15)
@Dict(dictTable = "zy_cloths_modular ", dicText = "modular_name", dicCode = "id")
@ApiModelProperty(value = "模块id")
@ApiModelProperty(value = "模块名称")
private String moduleId;
/**部位*/
@Excel(name = "部位", width = 15)

Loading…
Cancel
Save