Merge remote-tracking branch 'origin/master'

zhc4dev
暖暖 2 years ago
commit ec245a85b6
  1. 4
      ant-design-vue-jeecg/src/views/cloths/ZyClothsComponentList.vue
  2. 2
      ant-design-vue-jeecg/src/views/cloths/modules/ZyClothActionForm.vue
  3. 4
      ant-design-vue-jeecg/src/views/cloths/modules/ZyClothsComponentForm.vue
  4. 2
      ant-design-vue-jeecg/src/views/erp/fabric/modules/ZyFabricForm.vue
  5. 2
      ant-design-vue-jeecg/src/views/erp/fabric/modules/ZyFabricFormDetail.vue
  6. 2
      ant-design-vue-jeecg/src/views/gdmlb/modules/ZyOrderFabricFormDetail.vue
  7. 2
      ant-design-vue-jeecg/src/views/mall/ZyPostureList.vue
  8. 2
      ant-design-vue-jeecg/src/views/mall/clothSample/modules/ZyClothSampleForm.vue
  9. 2
      ant-design-vue-jeecg/src/views/mall/modules/ZyMallPostureForm.vue
  10. 2
      ant-design-vue-jeecg/src/views/mall/modules/ZyPostureModal.vue
  11. 4
      ant-design-vue-jeecg/src/views/process/ZyClothsComponentList.vue
  12. 91
      ant-design-vue-jeecg/src/views/process/ZyClothsModularCompentList.vue
  13. 19
      ant-design-vue-jeecg/src/views/process/ZyClothsModularList.vue
  14. 2
      ant-design-vue-jeecg/src/views/process/modules/ZyClothActionForm.vue
  15. 17
      ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentForm.vue
  16. 25
      ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularCompentForm.vue
  17. 4
      ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularCompentModal.vue
  18. 13
      ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularForm.vue
  19. 9
      ant-design-vue-jeecg/src/views/process/modules/ZyProcessComponentForm.vue
  20. 5
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyClothsModularCompent.java

@ -138,7 +138,7 @@
dataIndex: 'description'
},
{
title:'图片地址',
title:'图片',
align:"center",
dataIndex: 'pictureUrl',
scopedSlots: {customRender: 'imgSlot'}
@ -190,7 +190,7 @@
fieldList.push({type:'string',value:'nums',text:'编号',dictCode:''})
fieldList.push({type:'string',value:'partsName',text:'部件名称',dictCode:''})
fieldList.push({type:'string',value:'description',text:'描述',dictCode:''})
fieldList.push({type:'string',value:'pictureUrl',text:'图片地址',dictCode:''})
fieldList.push({type:'string',value:'pictureUrl',text:'图片',dictCode:''})
fieldList.push({type:'string',value:'modularId',text:'模块',dictCode:'zy_cloths_modular,modular_name,nums'})
fieldList.push({type:'string',value:'enterpriseId',text:'企业',dictCode:''})
this.superFieldList = fieldList

@ -15,7 +15,7 @@
</a-col>
<a-col :span="24">
<a-form-model-item label="描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="descr">
<a-input v-model="model.descr" placeholder="请输入描述" ></a-input>
<a-textarea v-model="model.descr" rows="4" placeholder="请输入描述"/>
</a-form-model-item>
</a-col>
<a-col :span="24">

@ -15,11 +15,11 @@
</a-col>
<a-col :span="24">
<a-form-model-item label="描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="description">
<a-input v-model="model.description" placeholder="请输入描述" ></a-input>
<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">
<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>

@ -102,7 +102,7 @@
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="图片地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="imageUrl">
<a-form-model-item label="图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="imageUrl">
<j-image-upload isMultiple v-model="model.imageUrl" ></j-image-upload>
</a-form-model-item>
</a-col>

@ -78,7 +78,7 @@
<a-descriptions-item label="物流运费">
{{model.logisticsDetail}}
</a-descriptions-item>
<a-descriptions-item label="图片地址">
<a-descriptions-item label="图片">
<img style="width: 100px;" :src="model.imageUrl">
</a-descriptions-item>
<a-descriptions-item label="二维码">

@ -97,7 +97,7 @@
<a-descriptions-item label="物流运费">
{{model.logisticsDetail}}
</a-descriptions-item>
<a-descriptions-item label="图片地址">
<a-descriptions-item label="图片">
<img style="width: 100px;" :src="model.imageUrl">
</a-descriptions-item>
<a-descriptions-item label="二维码">

@ -116,7 +116,7 @@
dataIndex: 'name'
},
{
title:'图片地址',
title:'图片',
align:"left",
dataIndex: 'imageUrl',
scopedSlots: {customRender: 'imgSlot'}

@ -15,7 +15,7 @@
</a-col>
<a-col :span="24">
<a-form-model-item label="描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="descr">
<a-input v-model="model.descr" placeholder="请输入描述" ></a-input>
<a-textarea v-model="model.descr" rows="4" placeholder="请输入描述"/>
</a-form-model-item>
</a-col>
<a-col :span="24">

@ -14,7 +14,7 @@
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="图片地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="imageUrl">
<a-form-model-item label="图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="imageUrl">
<a-input v-model="model.imageUrl" placeholder="请输入图片地址" ></a-input>
</a-form-model-item>
</a-col>

@ -25,7 +25,7 @@
>
</j-tree-select>
</a-form-model-item>
<a-form-model-item label="图片地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="imageUrl">
<a-form-model-item label="图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="imageUrl">
<j-image-upload isMultiple v-model="model.imageUrl" ></j-image-upload>
</a-form-model-item>

@ -149,7 +149,7 @@
dataIndex: 'description'
},
{
title:'图片地址',
title:'图片',
align:"center",
dataIndex: 'pictureUrl',
scopedSlots: {customRender: 'imgSlot'}
@ -213,7 +213,7 @@
fieldList.push({type:'string',value:'partsName',text:'部件名称',dictCode:''})
fieldList.push({type:'string',value:'componentType',text:'部件类型',dictCode:''})
fieldList.push({type:'string',value:'description',text:'描述',dictCode:''})
fieldList.push({type:'string',value:'pictureUrl',text:'图片地址',dictCode:''})
fieldList.push({type:'string',value:'pictureUrl',text:'图片',dictCode:''})
fieldList.push({type:'string',value:'modularId',text:'模块',dictCode:'zy_cloths_modular,modular_name,id'})
fieldList.push({type:'string',value:'enterpriseId',text:'企业',dictCode:''})
this.superFieldList = fieldList

@ -1,5 +1,13 @@
<template>
<a-card :bordered="false">
<!-- <a-card :bordered="false">-->
<a-modal
width="70%"
title="评分项管理"
:visible="visible"
:confirm-loading="confirmLoading"
@ok="handleOk"
@cancel="handleCancel"
>
<!-- 查询区域 -->
<!-- <div class="table-page-search-wrapper">-->
<!-- <a-form layout="inline" @keyup.enter.native="searchQuery">-->
@ -11,7 +19,7 @@
<!-- 操作按钮区域 -->
<div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
<a-button @click="handleAdd1(yid)" 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">
@ -76,9 +84,9 @@
</a-button>
</template>
<span slot="action2" slot-scope="text, record">
<a @click="viewVid(record)">查看</a>
</span>
<!-- <span slot="action2" slot-scope="text, record">-->
<!-- <a @click="viewVid(record)">查看</a>-->
<!-- </span>-->
<span slot="action" slot-scope="text, record">
<a @click="handleEdit(record)">编辑</a>
@ -107,8 +115,8 @@
</div>
<zy-cloths-modular-compent-modal ref="modalForm" @ok="modalFormOk"></zy-cloths-modular-compent-modal>
<ZyClothsMccList ref="ZyClothsMccList"></ZyClothsMccList>
</a-card>
<!-- <ZyClothsMccList ref="ZyClothsMccList"></ZyClothsMccList>-->
</a-modal>
</template>
<script>
@ -123,12 +131,14 @@ export default {
name: 'ZyClothsModularCompentList',
mixins: [JeecgListMixin, mixinDevice],
components: {
ZyClothsMccList,
ZyClothsModularCompentModal
},
data() {
return {
description: '制衣模块部件中间表管理页面',
visible: false,
confirmLoading: false,
yid:'',
//
columns: [
{
@ -146,11 +156,11 @@ export default {
align: "center",
dataIndex: 'nums'
},
{
title: '模块部件名称',
align: "center",
dataIndex: 'modularType_dictText'
},
// {
// title: '',
// align: "center",
// dataIndex: 'modularType_dictText'
// },
// {
// title:'',
// align:"center",
@ -168,17 +178,27 @@ export default {
// },
{
title: '创建时间',
title: '模块名称',
align: "center",
dataIndex: 'createTime'
dataIndex: 'modularId_dictText'
},
{
title: '制衣部件',
dataIndex: 'action2',
title: '部件名称',
align: "center",
width: "100",
scopedSlots: {customRender: 'action2'}
dataIndex: 'partsName_dictText'
},
{
title: '创建时间',
align: "center",
dataIndex: 'createTime'
},
// {
// title: '',
// dataIndex: 'action2',
// align: "center",
// width: "100",
// scopedSlots: {customRender: 'action2'}
// },
{
title: '操作',
dataIndex: 'action',
@ -209,11 +229,36 @@ export default {
},
},
methods: {
viewVid(record){
this.$refs.ZyClothsMccList.showModal();
this.$refs.ZyClothsMccList.edit(record);
this.$refs.ZyClothsMccList.disableSubmit = false;
edit1(record) {
this.model = Object.assign({}, record);
//this.ax= this.model.id;
//console.log(topicid);
this.yid = this.model.id;
this.queryParam.modularId = this.model.id;
console.log( "aaaaaaa "+this.queryParam.modularId);
this.loadData();
this.visible = true;
},
showModal1() {
this.visible = true;
},
handleOk(e) {
this.ModalText = 'The modal will be closed after two seconds';
this.confirmLoading = true;
setTimeout(() => {
this.visible = false;
this.confirmLoading = false;
}, 2000);
},
handleCancel(e) {
console.log('Clicked cancel button');
this.visible = false;
},
// viewVid(record){
// this.$refs.ZyClothsMccList.showModal();
// this.$refs.ZyClothsMccList.edit(record);
// this.$refs.ZyClothsMccList.disableSubmit = false;
// },
initDictConfig() {
},
getSuperFieldList() {

@ -109,7 +109,8 @@
</div>
<zy-cloths-modular-modal ref="modalForm" @ok="modalFormOk"></zy-cloths-modular-modal>
<ZyClothsMcList ref="ZyClothsMcList"></ZyClothsMcList>
<!-- <ZyClothsMcList ref="ZyClothsMcList"></ZyClothsMcList>-->
<ZyClothsModularCompentList ref="ZyClothsModularCompentList"></ZyClothsModularCompentList>
</a-card>
</template>
@ -120,13 +121,13 @@ import {mixinDevice} from '@/utils/mixin'
import {JeecgListMixin} from '@/mixins/JeecgListMixin'
import ZyClothsModularModal from './modules/ZyClothsModularModal'
import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
import ZyClothsMcList from "@views/process/ZyClothsMcList";
import ZyClothsModularCompentList from "@views/process/ZyClothsModularCompentList";
export default {
name: 'ZyClothsModularList',
mixins: [JeecgListMixin, mixinDevice],
components: {
ZyClothsMcList,
ZyClothsModularCompentList,
ZyClothsModularModal
},
data() {
@ -176,7 +177,7 @@ export default {
dataIndex: 'enterpriseId_dictText'
},
{
title: '图片地址',
title: '图片',
align: "center",
dataIndex: 'pictureUrl',
scopedSlots: {customRender: 'imgSlot'}
@ -224,10 +225,10 @@ export default {
},
methods: {
viewVid(record){
this.$refs.ZyClothsMcList.showModal();
this.$refs.ZyClothsMcList.edit(record);
console.log("zyclothsMclist"+record.ids);
this.$refs.ZyClothsMcList.disableSubmit = false;
this.$refs.ZyClothsModularCompentList.showModal1();
this.$refs.ZyClothsModularCompentList.edit1(record);
console.log("zyclothsMclist"+record.id);
this.$refs.ZyClothsModularCompentList.disableSubmit = false;
},
initDictConfig() {
},
@ -238,7 +239,7 @@ export default {
fieldList.push({type: 'string', value: 'description', text: '描述', dictCode: ''})
fieldList.push({type: 'string', value: 'clothsTypeId', text: '衣服类型', dictCode: 'zy_cloths_type,type_name,id'})
fieldList.push({type: 'string', value: 'enterpriseId', text: '企业', dictCode: ''})
fieldList.push({type: 'string', value: 'pictureUrl', text: '图片地址', dictCode: ''})
fieldList.push({type: 'string', value: 'pictureUrl', text: '图片', dictCode: ''})
this.superFieldList = fieldList
}
}

@ -15,7 +15,7 @@
</a-col>
<a-col :span="24">
<a-form-model-item label="描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="descr">
<a-input v-model="model.descr" placeholder="请输入描述" ></a-input>
<a-textarea v-model="model.descr" rows="4" placeholder="请输入描述"/>
</a-form-model-item>
</a-col>
<a-col :span="24">

@ -20,11 +20,11 @@
</a-col>
<a-col :span="24">
<a-form-model-item label="描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="description">
<a-input v-model="model.description" placeholder="请输入描述" ></a-input>
<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">
<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>
@ -85,6 +85,19 @@
},
confirmLoading: false,
validatorRules: {
nums: [
{ required: true, message: '请输入编号!'},
],
partsName: [
{ required: true, message: '请输入部件名称!'},
],
modularId: [
{ required: true, message: '请选择模块!'},
],
modularType: [
{ required: true, message: '请选择制衣模块类型!'},
],
},
url: {
add: "/base/zyClothsComponent/add",

@ -8,16 +8,25 @@
<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="modularType">-->
<!-- <j-dict-select-tag type="list" v-model="model.modularType" dictCode="zyModularType" placeholder="请选择制衣模块类型" />-->
<!-- </a-form-model-item>-->
<!-- </a-col>-->
<a-col :span="24">
<a-form-model-item label="制衣模块类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="modularType">
<j-dict-select-tag type="list" v-model="model.modularType" dictCode="zyModularType" placeholder="请选择制衣模块类型" />
<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="请选择模块名称" disabled/>
</a-form-model-item>
</a-col>
<!-- <a-col :span="24">-->
<!-- <a-form-model-item label="部件名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="partsName">-->
<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>-->
<j-dict-select-tag type="list" v-model="model.partsName"
dictCode="zy_cloths_component,parts_name,id" placeholder="请选择制衣模块类型" />
</a-form-model-item>
</a-col>
<!-- <a-col :span="24">
<a-form-model-item label="制衣模块类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="modularType">
<a-input v-model="model.modularType" placeholder="请输入制衣模块类型" ></a-input>
@ -55,6 +64,7 @@
data () {
return {
model:{
modularId:'',
},
labelCol: {
xs: { span: 24 },
@ -84,8 +94,9 @@
this.modelDefault = JSON.parse(JSON.stringify(this.model));
},
methods: {
add () {
add1 (id) {
this.edit(this.modelDefault);
this.model.modularId = id;
},
edit (record) {
this.model = Object.assign({}, record);

@ -29,10 +29,10 @@
}
},
methods: {
add () {
add1 (id) {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.add();
this.$refs.realForm.add1(id);
})
},
edit (record) {

@ -20,7 +20,7 @@
<!-- </a-col>-->
<a-col :span="24">
<a-form-model-item label="描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="description">
<a-input v-model="model.description" placeholder="请输入描述" ></a-input>
<a-textarea v-model="model.description" rows="4" placeholder="请输入描述"/>
</a-form-model-item>
</a-col>
<a-col :span="24">
@ -39,7 +39,7 @@
</a-form-model-item>
</a-col>
<a-col :span="24">
<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>
</a-form-model-item>
</a-col>
@ -80,6 +80,15 @@
},
confirmLoading: false,
validatorRules: {
nums: [
{ required: true, message: '请输入编号!'},
],
modularName: [
{ required: true, message: '请输入模块名称!'},
],
clothsTypeId: [
{ required: true, message: '请选择衣服类型!'},
]
},
url: {
add: "/base/zyClothsModular/add",

@ -55,6 +55,15 @@
},
confirmLoading: false,
validatorRules: {
componentId: [
{ required: true, message: '请选择部件!'},
],
processId: [
{ required: true, message: '请选择工艺!'},
],
bottleneck: [
{ required: true, message: '是否瓶颈工序!'},
],
},
url: {
add: "/pro/zyProcessComponent/add",

@ -57,9 +57,14 @@ public class ZyClothsModularCompent implements Serializable {
@Excel(name = "编码", width = 15)
@ApiModelProperty(value = "编码")
private String nums;
@Excel(name = "模块名称", width = 15)
@ApiModelProperty(value = "模块名称")
@Dict(dictTable = "zy_cloths_modular",dicText = "modular_name",dicCode = "id")
private String modularId;
/**部件名称*/
@Excel(name = "部件名称", width = 15)
@ApiModelProperty(value = "部件名称")
@Dict(dictTable = "zy_cloths_component",dicText = "parts_name",dicCode = "id")
private String partsName;
/**制衣模块类型*/
@Excel(name = "制衣模块类型", width = 15)

Loading…
Cancel
Save