产品模块详情

zhc4dev
赵玉瑞 2 years ago
parent 0c6630fe07
commit e9dfa60227
  1. 2
      ant-design-vue-jeecg/src/views/product/pdaccessories/ProductAccessoriesList.vue
  2. 2
      ant-design-vue-jeecg/src/views/product/pdfabric/ProductFabricList.vue
  3. 122
      ant-design-vue-jeecg/src/views/product/productModule/ProductModuleList.vue
  4. 112
      ant-design-vue-jeecg/src/views/product/productModule/modules/ProductModuleDetail.vue
  5. 2
      ant-design-vue-jeecg/src/views/product/productProcess/ZyProductProcessList.vue
  6. 2
      ant-design-vue-jeecg/src/views/zyWorkProduct/ZyProductList.vue
  7. 38
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/productModule/entity/ProductModule.java

@ -28,7 +28,7 @@
<!-- 操作按钮区域 --> <!-- 操作按钮区域 -->
<div class="table-operator"> <div class="table-operator">
<a-button @click="fanhui" type="primary" icon="plus">返回</a-button> <a-button @click="fanhui" type="primary" icon="rollback">返回</a-button>
<!-- <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>--> <!-- <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
<!-- <a-button type="primary" icon="download" @click="handleExportXls('产品辅料表')">导出</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-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->

@ -42,7 +42,7 @@
<!-- </a-menu>--> <!-- </a-menu>-->
<!-- <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>--> <!-- <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>-->
<!-- </a-dropdown>--> <!-- </a-dropdown>-->
<a-button @click="fanhui" type="primary" icon="plus">返回</a-button> <a-button @click="fanhui" type="primary" icon="rollback">返回</a-button>
</div> </div>
<!-- table区域-begin --> <!-- table区域-begin -->

@ -42,11 +42,6 @@
<!-- table区域-begin --> <!-- table区域-begin -->
<div> <div>
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
<i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>
<a style="margin-left: 24px" @click="onClearSelected">清空</a>
</div>
<a-table <a-table
ref="table" ref="table"
size="middle" size="middle"
@ -61,31 +56,12 @@
class="j-table-force-nowrap" class="j-table-force-nowrap"
@change="handleTableChange"> @change="handleTableChange">
<template slot="htmlSlot" slot-scope="text">
<div v-html="text"></div>
</template>
<template slot="imgSlot" slot-scope="text">
<span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
<img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
</template>
<template slot="fileSlot" slot-scope="text">
<span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
<a-button
v-else
:ghost="true"
type="primary"
icon="download"
size="small"
@click="downloadFile(text)">
下载
</a-button>
</template>
<span slot="action" slot-scope="text, record"> <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 @click="handleDetail(record)">详情</a>-->
<a-divider type="vertical" /> <a @click="openDetail(record.id)">详情</a>
<a-divider type="vertical"/>
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)"> <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
<a>删除</a> <a>删除</a>
</a-popconfirm> </a-popconfirm>
@ -94,61 +70,59 @@
</a-table> </a-table>
</div> </div>
<product-module-detail ref="ProductModuleDetail"/>
<product-module-modal ref="modalForm" @ok="modalFormOk"></product-module-modal> <product-module-modal ref="modalForm" @ok="modalFormOk"></product-module-modal>
</a-card> </a-card>
</template> </template>
<script> <script>
import '@/assets/less/TableExpand.less' import '@/assets/less/TableExpand.less'
import { mixinDevice } from '@/utils/mixin' import {mixinDevice} from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin' import {JeecgListMixin} from '@/mixins/JeecgListMixin'
import ProductModuleModal from './modules/ProductModuleModal' import ProductModuleModal from './modules/ProductModuleModal'
import ProductModuleDetail from '@/views/product/productModule/modules/ProductModuleDetail'
export default { export default {
name: 'ProductModuleList', name: 'ProductModuleList',
mixins:[JeecgListMixin, mixinDevice], mixins: [JeecgListMixin, mixinDevice],
components: { components: {
ProductModuleDetail,
ProductModuleModal ProductModuleModal
}, },
data () { data() {
return { return {
description: '工单管理下面的产品模块管理页面', description: '工单管理下面的产品模块管理页面',
biaoTi:'', biaoTi: '',
loadRouteType: false, loadRouteType: false,
// //
columns: [ columns: [
{ {
title: '#', title: '#',
dataIndex: '', dataIndex: '',
key:'rowIndex', key: 'rowIndex',
width:60, width: 60,
align:"center", align: "center",
customRender:function (t,r,index) { customRender: function (t, r, index) {
return parseInt(index)+1; return parseInt(index) + 1;
} }
}, },
{ {
title:'产品id', title: '产品编号',
align:"center", align: "center",
dataIndex: 'productId' dataIndex: 'productId'
}, },
{ {
// title:'id', // title:'id',
title:'模块编号', title: '模块编号',
align:"center", align: "center",
dataIndex: 'styleModuleId' dataIndex: 'styleModuleId'
}, },
{ {
title:'模块名称', title: '模块名称',
align:"center", align: "center",
dataIndex: 'moduleId' dataIndex: 'moduleId'
}, },
{
title:'部位',
align:"center",
dataIndex: 'place'
},
{ {
title: '创建时间', title: '创建时间',
align: "center", align: "center",
@ -157,10 +131,10 @@
{ {
title: '操作', title: '操作',
dataIndex: 'action', dataIndex: 'action',
align:"center", align: "center",
fixed:"right", fixed: "right",
width:147, width: 147,
scopedSlots: { customRender: 'action' } scopedSlots: {customRender: 'action'}
} }
], ],
url: { url: {
@ -171,8 +145,8 @@
importExcelUrl: "productModule/productModule/importExcel", importExcelUrl: "productModule/productModule/importExcel",
}, },
dictOptions:{}, dictOptions: {},
superFieldList:[], superFieldList: [],
} }
}, },
created() { created() {
@ -180,12 +154,16 @@
this.loadParameter(); this.loadParameter();
}, },
computed: { computed: {
importExcelUrl: function(){ importExcelUrl: function () {
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`; return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
}, },
}, },
methods: { methods: {
fanHui(){ openDetail(id) {
this.$refs.ProductModuleDetail.showModal(id)
// this.$children[0].showModal(id)
},
fanHui() {
this.$router.push({ this.$router.push({
/*返回产品*/ /*返回产品*/
path: '/WorkProduct',/*在引号中填写返回vue*/ path: '/WorkProduct',/*在引号中填写返回vue*/
@ -193,24 +171,24 @@
}, },
loadParameter() { loadParameter() {
if (this.loadRouteType === false) { if (this.loadRouteType === false) {
this.biaoTi=this.$route.query.productName+" 产品模块管理"; this.biaoTi = this.$route.query.productName + " 产品模块管理";
console.log("***********",this.$route.query.productName) //console.log("***********", this.$route.query.productName)
this.loadRouteType = true; this.loadRouteType = true;
} }
}, },
initDictConfig(){ initDictConfig() {
}, },
getSuperFieldList(){ getSuperFieldList() {
let fieldList=[]; let fieldList = [];
fieldList.push({type:'string',value:'productId',text:'产品id',dictCode:''}) fieldList.push({type: 'string', value: 'productId', text: '产品id', dictCode: ''})
fieldList.push({type:'string',value:'styleModuleId',text:'款式模块id',dictCode:''}) fieldList.push({type: 'string', value: 'styleModuleId', text: '款式模块id', dictCode: ''})
fieldList.push({type:'string',value:'moduleId',text:'模块id',dictCode:''}) fieldList.push({type: 'string', value: 'moduleId', text: '模块id', dictCode: ''})
fieldList.push({type:'string',value:'place',text:'部位',dictCode:''}) fieldList.push({type: 'string', value: 'place', text: '部位', dictCode: ''})
this.superFieldList = fieldList this.superFieldList = fieldList
} }
} }
} }
</script> </script>
<style scoped> <style scoped>
@import '~@assets/less/common.less'; @import '~@assets/less/common.less';
</style> </style>

@ -0,0 +1,112 @@
<template>
<div>
<a-modal
title="模块管理-详情"
:visible="visible"
:confirm-loading="confirmLoading"
:width='1200'
@ok="handleOk"
@cancel="handleCancel"
style="display:flex;"
>
<div style="width: 96%;margin:0 auto 40px;padding-bottom: 30px">
<h1 style="text-align: center;margin-bottom: 0px;padding-bottom: 20px">黄淮学院服装智能制造管理平台 - <span>模块管理</span></h1>
<div>
<el-descriptions class="margin-top" :column="4" border style="margin-top: 50px">
<el-descriptions-item>
<template slot="label"><i class="el-icon-receiving"></i>产品名称</template>
{{model.productId}}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label"><i class="el-icon-coin"></i>模块编号</template>
{{model.styleModuleId}}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label"><i class="el-icon-postcard"></i>模块名称</template>
{{model.moduleId}}
</el-descriptions-item>
<!-- <el-descriptions-item>-->
<!-- <template slot="label"><i class="el-icon-copy-document"></i>颜色</template>-->
<!-- {{model.color}}-->
<!-- </el-descriptions-item>-->
<el-descriptions-item>
<template slot="label"><i class="el-icon-copy-document"></i>创建时间</template>
{{model.createTime}}
</el-descriptions-item>
</el-descriptions>
</div>
</div>
</a-modal>
</div>
</template>
<script>
export default {
name: "ProductModuleDetail.vue",
components: {
},
props: {
//
disabled: {
type: Boolean,
default: false,
required: false
}
},
data() {
return {
model: {},
labelCol: {xs: {span: 24}, sm: {span: 5}},
wrapperCol: {xs: {span: 24}, sm: {span: 16}},
confirmLoading: false,
url: {
add: "/fabric/zyFabric/add",
edit: "/fabric/zyFabric/edit",
queryById: "/fabric/zyFabric/queryById"
},
visible: false
}
},
computed: {
formDisabled() {
return this.disabled
},
},
created() {
//model
this.modelDefault = JSON.parse(JSON.stringify(this.model));
},
methods: {
showModal(id) {
this.visible = true;
this.$http.get('/productModule/productModule/queryById?id=' + id).then(
res => {
this.model = res.result
console.log(this.model)
}
)
},
handleOk() {
this.ModalText = 'The modal will be closed after two seconds';
this.confirmLoading = true;
setTimeout(() => {
this.visible = false;
this.confirmLoading = false;
}, 1);
},
handleCancel() {
this.visible = false;
},
}
}
</script>
<style scoped>
</style>

@ -28,7 +28,7 @@
<!-- 操作按钮区域 --> <!-- 操作按钮区域 -->
<div class="table-operator"> <div class="table-operator">
<a-button @click="fanhui" type="primary" icon="plus">返回</a-button> <a-button @click="fanhui" type="primary" icon="rollback">返回</a-button>
<!-- <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>--> <!-- <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
<!-- <a-button type="primary" icon="download" @click="handleExportXls('产品工序')">导出</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-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->

@ -356,7 +356,7 @@
}, },
// //
//- //-
jumpProcesses(record) jumpProcesses(record)
{ {
this.$router.push({ this.$router.push({

@ -2,6 +2,7 @@ package org.jeecg.modules.product.productModule.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
@ -43,31 +44,38 @@ public class ProductModule implements Serializable {
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建日期") @ApiModelProperty(value = "创建日期")
private Date createTime; private Date createTime;
// /**更新人*/
// @ApiModelProperty(value = "更新人") /**
// private String updateBy; * 产品id 应该是产品编号
// /**更新日期*/ * 关联产品表 zy_product ZyProductList.vue ZyProduct.java
// @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") */
// @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
// @ApiModelProperty(value = "更新日期")
// private Date updateTime;
// /**所属部门*/
// @ApiModelProperty(value = "所属部门")
// private String sysOrgCode;
/**产品id*/
@Excel(name = "产品id", width = 15) @Excel(name = "产品id", width = 15)
@ApiModelProperty(value = "产品id") @ApiModelProperty(value = "产品id")
private String productId; private String productId;
/**款式模块id*/
@TableField(exist = false)
private String productName;
/**
* 款式模块id 应该是模块编号
* 关联款式模块表 zy_style_module
* 款式表联动筛选款式模块表数据
*/
@Excel(name = "款式模块id", width = 15) @Excel(name = "款式模块id", width = 15)
@ApiModelProperty(value = "款式模块id") @ApiModelProperty(value = "款式模块id")
private String styleModuleId; private String styleModuleId;
/**模块id*/ /**
* 模块id 应该是模块名称
* 关联制衣模块表 zy_cloths_modular
* 从款式模块表同步读取
*/
@Excel(name = "模块名称", width = 15) @Excel(name = "模块名称", width = 15)
@Dict(dictTable = "zy_cloths_modular ", dicText = "modular_name", dicCode = "id") @Dict(dictTable = "zy_cloths_modular ", dicText = "modular_name", dicCode = "id")
@ApiModelProperty(value = "模块名称") @ApiModelProperty(value = "模块名称")
private String moduleId; private String moduleId;
/**部位*/ /**
* 暂时弃用
* 部位
*/
@Excel(name = "部位", width = 15) @Excel(name = "部位", width = 15)
@ApiModelProperty(value = "部位") @ApiModelProperty(value = "部位")
private String place; private String place;

Loading…
Cancel
Save