Merge remote-tracking branch 'origin/master'

zhc4dev
wangjiadong 2 years ago
commit a32a0fc39c
  1. 2
      ant-design-vue-jeecg/src/views/gdmlb/ZyProductionTypesettingList.vue
  2. 2
      ant-design-vue-jeecg/src/views/gdmlb/modules/ZyProductionTypesettingForm.vue
  3. 9
      ant-design-vue-jeecg/src/views/process/ZyClothsComponentList.vue
  4. 83
      ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentForm.vue
  5. 118
      ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentListDetail.vue
  6. 5
      ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularForm.vue
  7. 3
      ant-design-vue-jeecg/src/views/team/GroupxMemberList.vue
  8. 2
      ant-design-vue-jeecg/src/views/team/StationMachineList.vue
  9. 2
      ant-design-vue-jeecg/src/views/team/StationToolList.vue
  10. 4
      jeecg-boot/jeecg-boot-module-gdnk/src/main/java/org/jeecg/modules/demo/gdmlb/entity/ZyProductionTypesetting.java
  11. 2
      jeecg-boot/jeecg-boot-module-mall/src/main/java/org/jeecg/modules/demo/mall/entity/ZyGoods.java
  12. 2
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyworkorder/controller/ZyWorkOrderController.java

@ -257,7 +257,7 @@
getSuperFieldList(){ getSuperFieldList(){
let fieldList=[]; let fieldList=[];
fieldList.push({type:'string',value:'workOrderId',text:'工单编号',dictCode:'zy_work_order,code,id'}) fieldList.push({type:'string',value:'workOrderId',text:'工单编号',dictCode:'zy_work_order,code,id'})
fieldList.push({type:'string',value:'goodsId',text:'商品',dictCode:'zy_goods,goods_num,id'}) fieldList.push({type:'string',value:'goodsId',text:'商品',dictCode:'zy_goods,goods_code,id'})
fieldList.push({type:'string',value:'workshopId',text:'车间',dictCode:''}) fieldList.push({type:'string',value:'workshopId',text:'车间',dictCode:''})
fieldList.push({type:'string',value:'factory',text:'工厂',dictCode:''}) fieldList.push({type:'string',value:'factory',text:'工厂',dictCode:''})
fieldList.push({type:'string',value:'teamId',text:'班组',dictCode:''}) fieldList.push({type:'string',value:'teamId',text:'班组',dictCode:''})

@ -10,7 +10,7 @@
</a-col> </a-col>
<a-col :span="24"> <a-col :span="24">
<a-form-model-item label="商品" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="goodsId"> <a-form-model-item label="商品" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="goodsId">
<j-dict-select-tag type="list" v-model="model.goodsId" dictCode="zy_goods,goods_num,id" placeholder="请选择商品" /> <j-dict-select-tag type="list" v-model="model.goodsId" dictCode="zy_goods,goods_code,id" placeholder="请选择商品" />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="24">

@ -100,6 +100,7 @@
<zy-cloths-component-modal ref="modalForm" @ok="modalFormOk"></zy-cloths-component-modal> <zy-cloths-component-modal ref="modalForm" @ok="modalFormOk"></zy-cloths-component-modal>
<ZyProcessComponentList ref="ZyProcessComponentList"></ZyProcessComponentList> <ZyProcessComponentList ref="ZyProcessComponentList"></ZyProcessComponentList>
<ZyClothsComponentListDetail ref="ZyClothsComponentListDetail"></ZyClothsComponentListDetail>
</a-card> </a-card>
</template> </template>
@ -111,14 +112,15 @@
import ZyClothsComponentModal from './modules/ZyClothsComponentModal' import ZyClothsComponentModal from './modules/ZyClothsComponentModal'
import ZyProcessComponentList from "@views/process/ZyProcessComponentList" import ZyProcessComponentList from "@views/process/ZyProcessComponentList"
import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'; import {filterMultiDictText} from '@/components/dict/JDictSelectUtil';
import ZyClothsComponentListDetail from './modules/ZyClothsComponentListDetail'
export default { export default {
name: 'ZyClothsComponentList', name: 'ZyClothsComponentList',
mixins:[JeecgListMixin, mixinDevice], mixins:[JeecgListMixin, mixinDevice],
components: { components: {
ZyProcessComponentList, ZyProcessComponentList,
ZyClothsComponentModal ZyClothsComponentModal,
ZyClothsComponentListDetail
}, },
data () { data () {
return { return {
@ -239,6 +241,9 @@
fieldList.push({type:'string',value:'modularId',text:'模块',dictCode:'zy_cloths_modular,modular_name,id'}) fieldList.push({type:'string',value:'modularId',text:'模块',dictCode:'zy_cloths_modular,modular_name,id'})
fieldList.push({type:'string',value:'enterpriseId',text:'企业',dictCode:''}) fieldList.push({type:'string',value:'enterpriseId',text:'企业',dictCode:''})
this.superFieldList = fieldList this.superFieldList = fieldList
},
handleDetail(record){
this.$refs.ZyClothsComponentListDetail.showModal(record)
} }
} }
} }

@ -3,46 +3,88 @@
<j-form-container :disabled="formDisabled"> <j-form-container :disabled="formDisabled">
<a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail"> <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
<a-row> <a-row>
<a-col :span="24"> <a-col :span="48">
<a-form-model-item label="企业" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="enterpriseId"> <a-form-model-item label="企业" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="enterpriseId">
<j-select-depart v-model="model.enterpriseId" /> <j-select-depart v-model="model.enterpriseId" />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<!-- <a-col :span="24">--> </a-row>
<!-- <a-form-model-item label="编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="nums">--> <a-row>
<!-- <a-input v-model="model.nums" placeholder="请输入编号" ></a-input>--> <a-col :span="48">
<!-- </a-form-model-item>-->
<!-- </a-col>-->
<a-col :span="24">
<a-form-model-item label="服装类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="clothsTypeId"> <a-form-model-item label="服装类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="clothsTypeId">
<j-dict-select-tag type="list" v-model="model.clothsTypeId" dictCode="zy_cloths_type,type_name,id" placeholder="请选择衣服类型" /> <j-dict-select-tag type="list" v-model="model.clothsTypeId" dictCode="zy_cloths_type,type_name,id" placeholder="请选择衣服类型" />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="24"> </a-row>
<a-row>
<a-col :span="48">
<a-form-model-item label="部件名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="partsName"> <a-form-model-item label="部件名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="partsName">
<a-input v-model="model.partsName" placeholder="请输入部件名称" ></a-input> <a-input v-model="model.partsName" placeholder="请输入部件名称" ></a-input>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="24"> </a-row>
<a-row>
<a-col :span="48">
<a-form-model-item label="模块" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="modularId"> <a-form-model-item label="模块" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="modularId">
<j-dict-select-tag type="list" v-model="model.modularId" dictCode="zy_cloths_modular,modular_name,id" placeholder="请选择模块" /> <j-dict-select-tag type="list" v-model="model.modularId" dictCode="zy_cloths_modular,modular_name,id" placeholder="请选择模块" />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<!-- <a-col :span="24">--> </a-row>
<!-- <a-form-model-item label="部件类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="componentType">--> <a-row>
<!-- <a-input v-model="model.componentType" placeholder="请输入部件类型" ></a-input>--> <a-col :span="48">
<!-- </a-form-model-item>-->
<!-- </a-col>-->
<a-col :span="24">
<a-form-model-item label="描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="description"> <a-form-model-item label="描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="description">
<a-textarea v-model="model.description" rows="4" placeholder="请输入描述"/> <a-textarea v-model="model.description" rows="2" placeholder="请输入描述"/>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="24"> </a-row>
<a-row>
<a-col :span="48">
<a-form-model-item label="图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pictureUrl"> <a-form-model-item label="图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pictureUrl">
<j-image-upload isMultiple v-model="model.pictureUrl" ></j-image-upload> <j-image-upload isMultiple v-model="model.pictureUrl" ></j-image-upload>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
</a-row>
<a-row>
<!-- <a-col :span="24">-->
<!-- <a-form-model-item label="企业" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="enterpriseId">-->
<!-- <j-select-depart v-model="model.enterpriseId" />-->
<!-- </a-form-model-item>-->
<!-- </a-col>-->
<!-- <a-col :span="24">-->
<!-- <a-form-model-item label="编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="nums">-->
<!-- <a-input v-model="model.nums" placeholder="请输入编号" ></a-input>-->
<!-- </a-form-model-item>-->
<!-- </a-col>-->
<!-- <a-col :span="24">-->
<!-- <a-form-model-item label="服装类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="clothsTypeId">-->
<!-- <j-dict-select-tag type="list" v-model="model.clothsTypeId" dictCode="zy_cloths_type,type_name,id" placeholder="请选择衣服类型" />-->
<!-- </a-form-model-item>-->
<!-- </a-col>-->
<!-- <a-col :span="24">-->
<!-- <a-form-model-item label="部件名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="partsName">-->
<!-- <a-input v-model="model.partsName" placeholder="请输入部件名称" ></a-input>-->
<!-- </a-form-model-item>-->
<!-- </a-col>-->
<!-- <a-col :span="24">-->
<!-- <a-form-model-item label="模块" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="modularId">-->
<!-- <j-dict-select-tag type="list" v-model="model.modularId" dictCode="zy_cloths_modular,modular_name,id" placeholder="请选择模块" />-->
<!-- </a-form-model-item>-->
<!-- </a-col>-->
<!-- <a-col :span="24">-->
<!-- <a-form-model-item label="部件类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="componentType">-->
<!-- <a-input v-model="model.componentType" placeholder="请输入部件类型" ></a-input>-->
<!-- </a-form-model-item>-->
<!-- </a-col>-->
<!-- <a-col :span="24">-->
<!-- <a-form-model-item label="描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="description">-->
<!-- <a-textarea v-model="model.description" rows="4" placeholder="请输入描述"/>-->
<!-- </a-form-model-item>-->
<!-- </a-col>-->
<!-- <a-col :span="24">-->
<!-- <a-form-model-item label="图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pictureUrl">-->
<!-- <j-image-upload isMultiple v-model="model.pictureUrl" ></j-image-upload>-->
<!-- </a-form-model-item>-->
<!-- </a-col>-->
<!-- <a-col :span="24">--> <!-- <a-col :span="24">-->
<!-- <a-form-model-item label="制衣模块类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="modularType">--> <!-- <a-form-model-item label="制衣模块类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="modularType">-->
@ -84,7 +126,7 @@
}, },
labelCol: { labelCol: {
xs: { span: 24 }, xs: { span: 24 },
sm: { span: 5 }, sm: { span: 4 },
}, },
wrapperCol: { wrapperCol: {
xs: { span: 24 }, xs: { span: 24 },
@ -165,3 +207,8 @@
} }
} }
</script> </script>
<style scoped>
.ant-form-item{
margin-bottom: 16px;
}
</style>

@ -0,0 +1,118 @@
<template>
<div>
<a-modal
title="制衣部件详情"
:visible="visible"
:confirm-loading="confirmLoading"
:width='1000'
@ok="handleOk"
@cancel="handleCancel">
<p class="title">制衣部件详情</p>
<a-descriptions title="" bordered>
<a-descriptions-item label="企业">{{model.enterpriseId_dictText}}</a-descriptions-item>
<a-descriptions-item label="服装类型">{{model.clothsTypeId_dictText}}</a-descriptions-item>
<a-descriptions-item label="部件名称">{{model.partsName}}</a-descriptions-item>
<a-descriptions-item label="模块">{{model.modularId_dictText}}</a-descriptions-item>
<a-descriptions-item label="描述" :span="2">{{model.description}}</a-descriptions-item>
<a-descriptions-item label="图片" :span="3">
<img v-if="model.pictureUrl" :src="model.pictureUrl" alt="无法显示"></img>
<span v-else>暂无图片</span>
</a-descriptions-item>
</a-descriptions>
<p class="title">部件工序详情</p>
<a-table :columns="columns1" :data-source="data1" bordered :pagination="false">
</a-table>
</a-modal>
</div>
</template>
<script>
//
//
//
//
const columns1 = [
{
title:'索引',
customRender:(text, record, index)=>index+1,
align:'center'
},
{
title: '部件',
dataIndex: 'nums',
key: 'nums',
align:'center'
},
{
title: '工序',
dataIndex: 'modularId_dictText',
key: 'modularId_dictText',
align:'center'
},
{
title: '是否瓶颈工序',
dataIndex: 'partsName',
key: 'partsName',
align:'center'
},
{
title: '创建时间',
key: 'createTime',
dataIndex: 'createTime',
align:'center'
},
];
const data1 = [
{
key: '1',
nums:'gfhjf',
modularId_dictText:'1-3合后育克',
partsName:'是',
createTime:'2022-12-06 19:00:07'
},
// {
// key: '2',
// nums:'aaff',
// modularId_dictText:'1-3',
// partsName:'',
// createTime:'2022-12-06 18:30:49'
// }
]
export default {
name: 'ZyClothsComponentListDetail',//
data () {
return {
visible: false,
confirmLoading: false,
model:{
},
data1,
columns1,
}
},
methods: {
showModal(record) {
this.visible = true;
this.model = record
console.log('record')
console.log(record)
},
handleOk(e) {
this.confirmLoading = true;
setTimeout(() => {
this.visible = false;
this.confirmLoading = false;
}, 1);
},
handleCancel(e) {
this.visible = false;
},
},
}
</script >
<style scoped>
.title{
font-size: 18px;
margin: 1em 0;
font-weight: bold;
}
</style>

@ -184,3 +184,8 @@
} }
} }
</script> </script>
<style scoped>
.ant-form-item{
margin-bottom: 16px;
}
</style>

@ -178,7 +178,8 @@ export default {
methods: { methods: {
fanHui() { fanHui() {
this.$router.push({ this.$router.push({
path: '/src/views/team/GroupxList', //
path: '/team/GroupxList',
}); });
}, },
// initDictConfig() { // initDictConfig() {

@ -179,7 +179,7 @@ export default {
methods: { methods: {
fanHui() { fanHui() {
this.$router.push({ this.$router.push({
path: '/src/views/team/StationList', path: '/team/StationList',
// path: '/src/views/zyclothsstyle/ZyClothsStyleList', // path: '/src/views/zyclothsstyle/ZyClothsStyleList',
}); });
}, },

@ -177,7 +177,7 @@ export default {
methods: { methods: {
fanHui() { fanHui() {
this.$router.push({ this.$router.push({
path: '/src/views/team/StationList', path: '/team/StationList',
// path: '/src/views/zyclothsstyle/ZyClothsStyleList', // path: '/src/views/zyclothsstyle/ZyClothsStyleList',
}); });
}, },

@ -40,8 +40,8 @@ public class ZyProductionTypesetting implements Serializable {
@ApiModelProperty(value = "工单编号") @ApiModelProperty(value = "工单编号")
private String workOrderId; private String workOrderId;
/**商品*/ /**商品*/
@Excel(name = "商品", width = 15, dictTable = "zy_goods", dicText = "goods_num", dicCode = "id") @Excel(name = "商品", width = 15, dictTable = "zy_goods", dicText = "goods_code", dicCode = "id")
@Dict(dictTable = "zy_goods", dicText = "goods_num", dicCode = "id") @Dict(dictTable = "zy_goods", dicText = "goods_code", dicCode = "id")
@ApiModelProperty(value = "商品") @ApiModelProperty(value = "商品")
private String goodsId; private String goodsId;
/**车间*/ /**车间*/

@ -32,7 +32,7 @@ public class ZyGoods implements Serializable {
/**商品编号*/ /**商品编号*/
@Excel(name = "商品编号", width = 15) @Excel(name = "商品编号", width = 15)
@ApiModelProperty(value = "商品编号") @ApiModelProperty(value = "商品编号")
private java.lang.String goodsNum; private java.lang.String goodsCode;
/**商品来源*/ /**商品来源*/
@Excel(name = "商品来源", width = 15) @Excel(name = "商品来源", width = 15)
@ApiModelProperty(value = "商品来源") @ApiModelProperty(value = "商品来源")

@ -107,7 +107,7 @@ public class ZyWorkOrderController extends JeecgController<ZyWorkOrder, IZyWorkO
ZyWorkOrder zyWorkOrder = zyWorkOrderService.getById(zyProductionTypesetting.getWorkOrderId()); ZyWorkOrder zyWorkOrder = zyWorkOrderService.getById(zyProductionTypesetting.getWorkOrderId());
ZyGoods zyGoods = zyGoodsService.getById(zyProductionTypesetting.getGoodsId()); ZyGoods zyGoods = zyGoodsService.getById(zyProductionTypesetting.getGoodsId());
zyProductionTypesetting.setWorkOrderId(zyWorkOrder.getOrderCode()); zyProductionTypesetting.setWorkOrderId(zyWorkOrder.getOrderCode());
zyProductionTypesetting.setGoodsId(zyGoods.getGoodsNum()); zyProductionTypesetting.setGoodsId(zyGoods.getGoodsCode());
return Result.OK(zyProductionTypesetting); return Result.OK(zyProductionTypesetting);
} }

Loading…
Cancel
Save