diff --git a/ant-design-vue-jeecg/src/views/erp/accessories/ZyAccessoriesList.vue b/ant-design-vue-jeecg/src/views/erp/accessories/ZyAccessoriesList.vue index ca716b1f..88341d34 100644 --- a/ant-design-vue-jeecg/src/views/erp/accessories/ZyAccessoriesList.vue +++ b/ant-design-vue-jeecg/src/views/erp/accessories/ZyAccessoriesList.vue @@ -165,11 +165,11 @@ align:"center", dataIndex: 'specs' }, - { - title:'库存量', - align:"center", - dataIndex: 'store' - }, + // { + // title:'库存量', + // align:"center", + // dataIndex: 'store' + // }, { title:'供货商信息', align:"center", diff --git a/ant-design-vue-jeecg/src/views/product/pdaccessories/ProductAccessoriesList.vue b/ant-design-vue-jeecg/src/views/product/pdaccessories/ProductAccessoriesList.vue index 1a0de3d8..80d3b134 100644 --- a/ant-design-vue-jeecg/src/views/product/pdaccessories/ProductAccessoriesList.vue +++ b/ant-design-vue-jeecg/src/views/product/pdaccessories/ProductAccessoriesList.vue @@ -81,6 +81,9 @@ + 详情 + + 编辑 @@ -92,7 +95,7 @@ - + @@ -105,12 +108,13 @@ import ProductAccessoriesModal from './modules/ProductAccessoriesModal' import {getAction} from "@api/manage"; import {filterObj} from "@/utils/util"; - + import ZyAccessoriesFormDetail from '@/views/erp/accessories/modules/ZyAccessoriesFormDetail' export default { name: 'ProductAccessoriesList', mixins:[JeecgListMixin, mixinDevice], components: { - ProductAccessoriesModal + ProductAccessoriesModal, + ZyAccessoriesFormDetail }, data () { return { @@ -129,16 +133,16 @@ return parseInt(index)+1; } }, - { - title:'产品编号', - align:"center", - dataIndex: 'productId' - }, // { // title:'产品编号', // align:"center", - // dataIndex: 'productId_dictText' + // dataIndex: 'productId' // }, + { + title:'产品编号', + align:"center", + dataIndex: 'productId_dictText' + }, { title:'辅料', align:"center", @@ -193,7 +197,7 @@ fanhui(){ this.$router.push({ /*返回产品*/ - path: '',/*在引号中填写返回vue*/ + path: '/WorkProduct',/*在引号中填写返回vue*/ }); }, initDictConfig(){ @@ -264,6 +268,9 @@ this.accessoriesId = '' this.loadData(1); }, + handleDetail(id){ + this.$refs.ZyAccessoriesFormDetail.showModal(id) + } } } diff --git a/ant-design-vue-jeecg/src/views/product/pdfabric/ProductFabricList.vue b/ant-design-vue-jeecg/src/views/product/pdfabric/ProductFabricList.vue index a0b2f6d1..a485c5fc 100644 --- a/ant-design-vue-jeecg/src/views/product/pdfabric/ProductFabricList.vue +++ b/ant-design-vue-jeecg/src/views/product/pdfabric/ProductFabricList.vue @@ -81,6 +81,9 @@ + 详情 + + 编辑 @@ -91,7 +94,7 @@ - + @@ -104,12 +107,13 @@ import ProductFabricModal from './modules/ProductFabricModal' import {getAction} from "@api/manage"; import {filterObj} from "@/utils/util"; - + import ZyFabricFormDetailModel from '@/views/erp/fabric/modules/ZyFabricFormDetailModel' export default { name: 'ProductFabricList', mixins:[JeecgListMixin, mixinDevice], components: { - ProductFabricModal + ProductFabricModal, + ZyFabricFormDetailModel }, data () { return { @@ -131,7 +135,7 @@ { title:'产品编号', align:"center", - dataIndex: 'productId' + dataIndex: 'productId_dictText' }, { title:'面料', @@ -189,7 +193,7 @@ fanhui(){ this.$router.push({ /*返回产品*/ - path: '',/*在引号中填写返回vue*/ + path: '/WorkProduct',/*在引号中填写返回vue*/ }); }, getSuperFieldList(){ @@ -258,6 +262,10 @@ this.fabricId = '' this.loadData(1); }, + handleDetail(id,name){ + this.$refs.ZyFabricFormDetailModel.showModal(id,name) + // this.$children[0].showModal(id) + } } } diff --git a/ant-design-vue-jeecg/src/views/product/pdmachine/ProductMachineList.vue b/ant-design-vue-jeecg/src/views/product/pdmachine/ProductMachineList.vue index d86dd01c..9b950959 100644 --- a/ant-design-vue-jeecg/src/views/product/pdmachine/ProductMachineList.vue +++ b/ant-design-vue-jeecg/src/views/product/pdmachine/ProductMachineList.vue @@ -132,7 +132,7 @@ { title:'产品编号', align:"center", - dataIndex: 'productId' + dataIndex: 'productId_dictText' }, // { // title:'产品编号', @@ -189,7 +189,7 @@ fanhui(){ this.$router.push({ /*返回产品*/ - path: '',/*在引号中填写返回vue*/ + path: '/WorkProduct',/*在引号中填写返回vue*/ }); }, up(id){ diff --git a/ant-design-vue-jeecg/src/views/product/pdoperationtool/ProductOperationtoolList.vue b/ant-design-vue-jeecg/src/views/product/pdoperationtool/ProductOperationtoolList.vue index c28d076b..1578bd04 100644 --- a/ant-design-vue-jeecg/src/views/product/pdoperationtool/ProductOperationtoolList.vue +++ b/ant-design-vue-jeecg/src/views/product/pdoperationtool/ProductOperationtoolList.vue @@ -132,7 +132,7 @@ { title:'产品编号', align:"center", - dataIndex: 'productId' + dataIndex: 'productId_dictText' }, // { // title:'产品编号', @@ -189,7 +189,7 @@ fanhui(){ this.$router.push({ /*返回产品*/ - path: '',/*在引号中填写返回vue*/ + path: '/WorkProduct',/*在引号中填写返回vue*/ }); }, up(id){ diff --git a/ant-design-vue-jeecg/src/views/product/productProcess/ZyProductProcessList.vue b/ant-design-vue-jeecg/src/views/product/productProcess/ZyProductProcessList.vue index 6351464e..7fba391a 100644 --- a/ant-design-vue-jeecg/src/views/product/productProcess/ZyProductProcessList.vue +++ b/ant-design-vue-jeecg/src/views/product/productProcess/ZyProductProcessList.vue @@ -1,5 +1,6 @@ @@ -105,17 +108,19 @@ import ZyProductProcessModal from './modules/ZyProductProcessModal' import {getAction} from "@api/manage"; import {filterObj} from "@/utils/util"; - + import ZyProcessDetail from '@/views/process/modules/ZyProcessDetail' export default { name: 'ZyProductProcessList', mixins:[JeecgListMixin, mixinDevice], components: { - ZyProductProcessModal + ZyProductProcessModal, + ZyProcessDetail }, data () { return { description: '产品工序管理页面', processId:'', + biaoTi:'', // 表头 columns: [ { @@ -175,6 +180,10 @@ }, }, methods: { + openDetail(id) { + this.$refs.zyProcessDetail.showModal(id) + // this.$children[0].showModal(id) + }, up(id){ getAction(this.url.up,{id:id}).then((res)=>{ if(res.success){ @@ -208,6 +217,7 @@ loadParameter() { if (this.loadRouteType === false) { this.id = this.$route.query.id; + this.biaoTi=this.$route.query.productName+"产品工序管理"; console.log("***********") this.loadRouteType = true; } @@ -261,6 +271,12 @@ this.processId = '' this.loadData(1); }, + fanhui(){ + this.$router.push({ + /*返回产品*/ + path: '/WorkProduct',/*在引号中填写返回vue*/ + }); + }, } } diff --git a/ant-design-vue-jeecg/src/views/zyclothsample/modules/ZyClothSampleForm.vue b/ant-design-vue-jeecg/src/views/zyclothsample/modules/ZyClothSampleForm.vue index 1b679a74..1a81430f 100644 --- a/ant-design-vue-jeecg/src/views/zyclothsample/modules/ZyClothSampleForm.vue +++ b/ant-design-vue-jeecg/src/views/zyclothsample/modules/ZyClothSampleForm.vue @@ -76,6 +76,16 @@ + + + + + + + + + + diff --git a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/entity/ZyAccessories.java b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/entity/ZyAccessories.java index 5c7caa1c..8572c149 100644 --- a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/entity/ZyAccessories.java +++ b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/entity/ZyAccessories.java @@ -61,9 +61,9 @@ public class ZyAccessories implements Serializable { @ApiModelProperty(value = "规格") private java.lang.String specs; /**库存量*/ - @Excel(name = "库存量", width = 15) - @ApiModelProperty(value = "库存量") - private java.lang.Integer store; +// @Excel(name = "库存量", width = 15) +// @ApiModelProperty(value = "库存量") +// private java.lang.Integer store; /**供货商信息*/ @Excel(name = "供货商信息", width = 15) @ApiModelProperty(value = "供货商信息") diff --git a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/controller/ZyFabricController.java b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/controller/ZyFabricController.java index 32a8c77e..e624072a 100644 --- a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/controller/ZyFabricController.java +++ b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/controller/ZyFabricController.java @@ -265,7 +265,7 @@ public class ZyFabricController extends JeecgController add(@RequestBody ZyFabric zyFabric) { - zyFabric.setCreateTime(new Date().toLocaleString()); +// zyFabric.setCreateTime(new Date().toLocaleString()); List list = zyFabricService.list(); for (ZyFabric zy : list){ if (zy.getName().equals(zyFabric.getName())){ @@ -286,7 +286,7 @@ public class ZyFabricController extends JeecgController edit(@RequestBody ZyFabric zyFabric) { - zyFabric.setUpdateTime(new Date().toLocaleString()); +// zyFabric.setUpdateTime(new Date().toLocaleString()); List list = zyFabricService.list(); ZyFabric zyFabric1 = zyFabricService.getById(zyFabric.getId()); list.remove(zyFabric1); diff --git a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/entity/ZyFabric.java b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/entity/ZyFabric.java index 07a4f8a7..3f7de85d 100644 --- a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/entity/ZyFabric.java +++ b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/entity/ZyFabric.java @@ -144,20 +144,20 @@ public class ZyFabric implements Serializable { @ApiModelProperty(value = "创建人") private java.lang.String createBy; /**创建时间*/ -// @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") -// @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @TableField(fill = FieldFill.INSERT) @ApiModelProperty(value = "创建时间") - private java.lang.String createTime; + private Date createTime; /**更新人*/ @ApiModelProperty(value = "更新人") private java.lang.String updateBy; /**更新时间*/ -// @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") -// @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @TableField(fill = FieldFill.INSERT_UPDATE) @ApiModelProperty(value = "更新时间") - private java.lang.String updateTime; + private Date updateTime; /**所属部门*/ @ApiModelProperty(value = "所属部门") private java.lang.String sysOrgCode; diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/pdcomponentprocess/entity/ProductComponentProcess.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/pdcomponentprocess/entity/ProductComponentProcess.java index a5394730..5e24ec05 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/pdcomponentprocess/entity/ProductComponentProcess.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/pdcomponentprocess/entity/ProductComponentProcess.java @@ -46,7 +46,7 @@ public class ProductComponentProcess implements Serializable { /**产品id*/ @Excel(name = "产品id", width = 15) @ApiModelProperty(value = "产品id") - //@Dict(dictTable = "zy_product",dicText = "product_code",dicCode = "id") 表暂未设计暂时不打开 + @Dict(dictTable = "zy_product",dicText = "product_code",dicCode = "id") private String productComponentId; /**产品模块部件id*/ @Excel(name = "产品模块部件id", width = 15) diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/pdmodulecomponent/entity/ProductModuleComponent.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/pdmodulecomponent/entity/ProductModuleComponent.java index d909362b..4a7338a9 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/pdmodulecomponent/entity/ProductModuleComponent.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/pdmodulecomponent/entity/ProductModuleComponent.java @@ -47,7 +47,7 @@ public class ProductModuleComponent implements Serializable { /**产品id*/ @Excel(name = "产品id", width = 15) @ApiModelProperty(value = "产品id") - //@Dict(dictTable = "zy_product",dicText = "product_code",dicCode = "id") 表暂未设计暂时不打开 + @Dict(dictTable = "zy_product",dicText = "product_code",dicCode = "id") private String productId; /**产品模块id*/ @Excel(name = "产品模块id", width = 15) diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/pdmoduleprocess/entity/ProductModuleProcess.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/pdmoduleprocess/entity/ProductModuleProcess.java index 2d991040..39f7285d 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/pdmoduleprocess/entity/ProductModuleProcess.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/pdmoduleprocess/entity/ProductModuleProcess.java @@ -48,7 +48,7 @@ public class ProductModuleProcess implements Serializable { /**产品id*/ @Excel(name = "产品id", width = 15) @ApiModelProperty(value = "产品id") - //@Dict(dictTable = "zy_product",dicText = "product_code",dicCode = "id") 表暂未设计暂时不打开 + @Dict(dictTable = "zy_product",dicText = "product_code",dicCode = "id") private String productId; /**产品模块id*/ @Excel(name = "产品模块id", width = 15) diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/pdaccessories/entity/ProductAccessories.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/pdaccessories/entity/ProductAccessories.java index aa010945..583ca4bc 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/pdaccessories/entity/ProductAccessories.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/pdaccessories/entity/ProductAccessories.java @@ -48,7 +48,7 @@ public class ProductAccessories implements Serializable { /**产品id*/ @Excel(name = "产品id", width = 15) @ApiModelProperty(value = "产品id") - // @Dict(dictTable = "zy_product",dicText = "product_code",dicCode = "id") 由于当前产品还没有，需要后期打开 + @Dict(dictTable = "zy_product",dicText = "product_code",dicCode = "id") private String productId; /**辅料id*/ @Excel(name = "辅料id", width = 15) diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/pdfabric/entity/ProductFabric.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/pdfabric/entity/ProductFabric.java index b8b805f2..b55eff14 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/pdfabric/entity/ProductFabric.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/pdfabric/entity/ProductFabric.java @@ -48,7 +48,7 @@ public class ProductFabric implements Serializable { /**产品id*/ @Excel(name = "产品id", width = 15) @ApiModelProperty(value = "产品id") - // @Dict(dictTable = "zy_product",dicText = "product_code",dicCode = "id") 由于当前产品还没有，需要后期打开 + @Dict(dictTable = "zy_product",dicText = "product_code",dicCode = "id") private String productId; /**面料id*/ @Excel(name = "面料id", width = 15) diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/pdmachine/entity/ProductMachine.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/pdmachine/entity/ProductMachine.java index 34911d5e..0b13ed11 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/pdmachine/entity/ProductMachine.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/pdmachine/entity/ProductMachine.java @@ -44,7 +44,7 @@ public class ProductMachine implements Serializable { /**产品id*/ @Excel(name = "产品id", width = 15) @ApiModelProperty(value = "产品id") - // @Dict(dictTable = "zy_product",dicText = "product_code",dicCode = "id") 由于当前产品还没有，需要后期打开 + @Dict(dictTable = "zy_product",dicText = "product_code",dicCode = "id") private String productId; /**设备d*/ @Excel(name = "设备d", width = 15) diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/pdoperationtool/entity/ProductOperationtool.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/pdoperationtool/entity/ProductOperationtool.java index 0fa100c2..5db4859e 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/pdoperationtool/entity/ProductOperationtool.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/pdoperationtool/entity/ProductOperationtool.java @@ -45,7 +45,7 @@ public class ProductOperationtool implements Serializable { /**产品id*/ @Excel(name = "产品id", width = 15) @ApiModelProperty(value = "产品id") - // @Dict(dictTable = "zy_product",dicText = "product_code",dicCode = "id") 由于当前产品还没有，需要后期打开 + @Dict(dictTable = "zy_product",dicText = "product_code",dicCode = "id") private String productId; /**工具id*/ @Excel(name = "工具id", width = 15) diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/zyproductprocess/entity/ZyProductProcess.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/zyproductprocess/entity/ZyProductProcess.java index 2e8b9098..7b90cfcb 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/zyproductprocess/entity/ZyProductProcess.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/zyproductprocess/entity/ZyProductProcess.java @@ -56,7 +56,7 @@ public class ZyProductProcess implements Serializable { /**产品id*/ @Excel(name = "产品id", width = 15) @ApiModelProperty(value = "产品id") -// @Dict(dictTable = "zy_product",dicText = "product_code",dicCode = "id") 由于当前产品还没有，需要后期打开 + @Dict(dictTable = "zy_product",dicText = "product_code",dicCode = "id") private String productId; /**工序id*/ @Excel(name = "工序id", width = 15)