yu
/
CostumingPlatform
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
zhc4dev
YTD 2 years ago
parent ca9495a46e 472cbb6035
commit c76807b295
13 changed files with 308 additions and 50498 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 39223
      ant-design-vue-jeecg/package-lock.json
  2. 4
      ant-design-vue-jeecg/src/views/erp/accessories/ZyAccessoriesList.vue
  3. 31
      ant-design-vue-jeecg/src/views/erp/accessories/modules/ZyAccessoriesForm.vue
  4. 32
      ant-design-vue-jeecg/src/views/erp/fabric/modules/ZyFabricForm.vue
  5. 13
      ant-design-vue-jeecg/src/views/process/modules/ZyClothActionForm.vue
  6. 12
      ant-design-vue-jeecg/src/views/process/modules/ZyProcessForm.vue
  7. 411
      ant-design-vue-jeecg/src/views/zyclothsstyle/ZyClothsStyleList.vue
  8. 12
      ant-design-vue-jeecg/src/views/zystylemodular/modules/ZyStyleModularForm.vue
  9. 4
      ant-design-vue-jeecg/src/views/zystylemodular/modules/ZyStyleModularModal__Style#Drawer.vue
  10. 11048
      ant-design-vue-jeecg/yarn.lock
  11. 5
      jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/entity/ZyAccessories.java
  12. 5
      jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/entity/ZyFabric.java
  13. 4
      jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/zyStyleModular/entity/ZyStyleModular.java

39223
ant-design-vue-jeecg/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

4
ant-design-vue-jeecg/src/views/erp/accessories/ZyAccessoriesList.vue
Unescape View File

@ -124,9 +124,9 @@
} }
}, },
{ {
title:'类型id', title:'类型',
align:"center", align:"center",
dataIndex: 'typeId' dataIndex: 'typeId_dictText'
}, },
{ {
title:'编号', title:'编号',

31
ant-design-vue-jeecg/src/views/erp/accessories/modules/ZyAccessoriesForm.vue
Unescape View File

@ -4,10 +4,20 @@
<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="24">
<a-form-model-item label="类型id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="typeId"> <a-form-model-item label="辅料类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="typeId">
<a-input v-model="model.typeId" placeholder="请输入类型id" ></a-input> <j-popup
v-model="model.typeName"
field="typeName"
org-fields="id,contents"
dest-fields="typeId,typeName"
code="zy_accessories_type"
:multi="false"
@input="popupCallback"
/>
<a-input v-model="model.typeId" hidden />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="24">
<a-form-model-item label="编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="nums"> <a-form-model-item label="编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="nums">
<a-input v-model="model.nums" placeholder="请输入编号" ></a-input> <a-input v-model="model.nums" placeholder="请输入编号" ></a-input>
@ -19,8 +29,8 @@
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="24">
<a-form-model-item label="图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="picture"> <a-form-model-item label="图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="imageUrl">
<a-input v-model="model.picture" placeholder="请输入图片" ></a-input> <j-image-upload isMultiple v-model="model.picture" ></j-image-upload>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="24">
@ -84,6 +94,15 @@
}, },
confirmLoading: false, confirmLoading: false,
validatorRules: { validatorRules: {
typeId: [
{ required: true, message: '请选择类型!'},
],
nums: [
{ required: true, message: '请输入编号!'},
],
contents: [
{ required: true, message: '请输入名称!'},
],
}, },
url: { url: {
add: "/accessories/zyAccessories/add", add: "/accessories/zyAccessories/add",
@ -138,6 +157,10 @@
}) })
}, },
popupCallback(value,row){
this.model = Object.assign(this.model, row);
console.log(row);
},
} }
} }
</script> </script>

32
ant-design-vue-jeecg/src/views/erp/fabric/modules/ZyFabricForm.vue
Unescape View File

@ -6,14 +6,15 @@
<a-col :span="24"> <a-col :span="24">
<a-form-model-item label="面料类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="typeId"> <a-form-model-item label="面料类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="typeId">
<j-popup <j-popup
v-model="model.typeId" v-model="model.typeName"
field="id" field="typeName"
org-fields="id" org-fields="id,content"
dest-fields="id" dest-fields="typeId,typeName"
code="zy_fabric_type" code="zy_fabric_type"
:multi="false" :multi="false"
@input="popupCallback" @input="popupCallback"
/> />
<a-input v-model="model.typeId" hidden />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="24">
@ -53,7 +54,7 @@
</a-col> </a-col>
<a-col :span="24"> <a-col :span="24">
<a-form-model-item label="单价" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="money"> <a-form-model-item label="单价" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="money">
<a-input-number v-model="model.money" placeholder="请输入单价" style="width: 100%" /> <a-input-number v-model="model.money" placeholder="请输入单价" :precision="2" :min="0" style="width: 100%" />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="24">
@ -136,6 +137,7 @@
import { httpAction, getAction } from '@/api/manage' import { httpAction, getAction } from '@/api/manage'
import { validateDuplicateValue } from '@/utils/util' import { validateDuplicateValue } from '@/utils/util'
import OnlineCamera from './Components/OnlineCamera' import OnlineCamera from './Components/OnlineCamera'
import pick from 'lodash.pick'
export default { export default {
name: 'ZyFabricForm', name: 'ZyFabricForm',
@ -181,14 +183,14 @@
name: [ name: [
{ required: true, message: '请输入名称!'}, { required: true, message: '请输入名称!'},
], ],
money: [ // money: [
{ required: false}, // { required: false},
{ pattern: /^\d{0,11}$/, message: '长度不能超过11位数字'}, // { pattern: /^\d{0,11}$/, message: '长度不能超过11位数字'},
], // ],
retailPrice: [ // retailPrice: [
{ required: false}, // { required: false},
{ pattern: /^\d{0,11}$/, message: '长度不能超过11位数字'}, // { pattern: /^\d{0,11}$/, message: '长度不能超过11位数字'},
], // ],
location: [ location: [
{ required: false}, { required: false},
{ pattern: /^.{0,30}$/, message: '长度不能超过30位字符'}, { pattern: /^.{0,30}$/, message: '长度不能超过30位字符'},
@ -256,6 +258,10 @@
changeOnlineVisible(value){ changeOnlineVisible(value){
this.model.imageUrl=value; this.model.imageUrl=value;
}, },
popupCallback(value,row){
this.model = Object.assign(this.model, row);
},
} }
} }

13
ant-design-vue-jeecg/src/views/process/modules/ZyClothActionForm.vue
Unescape View File

@ -71,6 +71,19 @@
}, },
confirmLoading: false, confirmLoading: false,
validatorRules: { validatorRules: {
freq: [
{ required: true, message: '请输入频率!'},
],
machineTmu: [
{ required: true, message: '请输入机器TMU!'},
],
manualTmu: [
{ required: true, message: '请输入手工TMU!'},
],
nums: [
{ required: true, message: '请输入编号!'},
],
}, },
url: { url: {
add: "/base/zyClothAction/add", add: "/base/zyClothAction/add",

12
ant-design-vue-jeecg/src/views/process/modules/ZyProcessForm.vue
Unescape View File

@ -15,12 +15,12 @@
</a-col> </a-col>
<a-col :span="24"> <a-col :span="24">
<a-form-model-item label="工艺描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="processDescribe"> <a-form-model-item label="工艺描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="processDescribe">
<a-input v-model="model.processDescribe" placeholder="请输入工艺描述" ></a-input> <a-textarea v-model="model.processDescribe" rows="4" placeholder="请输入工艺描述"/>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="24">
<a-form-model-item label="做工说明" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="mkExplain"> <a-form-model-item label="做工说明" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="mkExplain">
<a-input v-model="model.mkExplain" placeholder="请输入做工说明" ></a-input> <a-textarea v-model="model.mkExplain" rows="4" placeholder="请输入做工说明"/>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="24">
@ -225,6 +225,14 @@
fabricNum: [ fabricNum: [
{ required: true, message: '请输入面料代码!'}, { required: true, message: '请输入面料代码!'},
], ],
processCode: [
{ required: true, message: '请输入工序代码!'},
],
processName: [
{ required: true, message: '请输入工序名称!'},
],
}, },
url: { url: {
add: "/base/zyProcess/add", add: "/base/zyProcess/add",

411
ant-design-vue-jeecg/src/views/zyclothsstyle/ZyClothsStyleList.vue
Unescape View File

@ -6,27 +6,28 @@
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :xl="6" :lg="7" :md="8" :sm="24"> <a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="编号"> <a-form-item label="编号">
<a-input placeholder="请输入编号" v-model="queryParam.nums" ></a-input> <a-input placeholder="请输入编号" v-model="queryParam.nums"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24"> <a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="形式"> <a-form-item label="形式">
<j-dict-select-tag placeholder="请选择形式" dictCode="style_shape" v-model="queryParam.shape" ></j-dict-select-tag> <j-dict-select-tag placeholder="请选择形式" dictCode="style_shape"
v-model="queryParam.shape"></j-dict-select-tag>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24"> <a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="名称"> <a-form-item label="名称">
<a-input placeholder="请输入名称" v-model="queryParam.styleNames" ></a-input> <a-input placeholder="请输入名称" v-model="queryParam.styleNames"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24"> <a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="规格"> <a-form-item label="规格">
<a-input placeholder="请输入规格" v-model="queryParam.specification" ></a-input> <a-input placeholder="请输入规格" v-model="queryParam.specification"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24"> <a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="企业名称"> <a-form-item label="企业名称">
<j-select-depart placeholder="请输入企业名称" v-model="queryParam.enterpriseId" /> <j-select-depart placeholder="请输入企业名称" v-model="queryParam.enterpriseId"/>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24"> <a-col :xl="6" :lg="7" :md="8" :sm="24">
@ -44,23 +45,29 @@
<div class="table-operator"> <div class="table-operator">
<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">
<a-button type="primary" icon="import">导入</a-button> <a-button type="primary" icon="import">导入</a-button>
</a-upload>--> </a-upload>-->
<!-- 高级查询区域 --> <!-- 高级查询区域 -->
<!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>--> <!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
<a-dropdown v-if="selectedRowKeys.length > 0"> <a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay"> <a-menu slot="overlay">
<a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item> <a-menu-item key="1" @click="batchDel">
<a-icon type="delete"/>
删除
</a-menu-item>
</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>
</div> </div>
<!-- table区域-begin --> <!-- table区域-begin -->
<div> <div>
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;"> <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>项 <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> <a style="margin-left: 24px" @click="onClearSelected">清空</a>
</div> </div>
@ -83,7 +90,8 @@
</template> </template>
<template slot="imgSlot" slot-scope="text"> <template slot="imgSlot" slot-scope="text">
<span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span> <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;"/> <img v-else :src="getImgView(text)" height="25px" alt=""
style="max-width:80px;font-size: 12px;font-style: italic;"/>
</template> </template>
<template slot="fileSlot" slot-scope="text"> <template slot="fileSlot" slot-scope="text">
<span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span> <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
@ -99,21 +107,21 @@
</template> </template>
<span slot="action1" slot-scope="text, record"> <span slot="action1" slot-scope="text, record">
<a @click="jumpPage1(record)" >管理模块</a> <a @click="jumpPage1(record)">管理模块</a>
<a-divider type="vertical" /> <a-divider type="vertical"/>
<a @click="jumpPage2(record)" >管理面料</a> <a @click="jumpPage2(record)">管理面料</a>
<a-divider type="vertical" /> <a-divider type="vertical"/>
<a @click="jumpPage3(record)" >管理辅料</a> <a @click="jumpPage3(record)">管理辅料</a>
<a-divider type="vertical" /> <a-divider type="vertical"/>
<a @click="jumpPage4(record)" >管理型号</a> <a @click="jumpPage4(record)">管理型号</a>
<a-divider type="vertical" /> <a-divider type="vertical"/>
<a @click="jumpPage5(record)" >管理工序</a> <a @click="jumpPage5(record)">管理工序</a>
</span> </span>
<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-divider type="vertical"/>
<a @click="handleDetail(record)">详情</a> <a @click="handleDetail(record)">详情</a>
<a-divider type="vertical" /> <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>
@ -128,188 +136,195 @@
<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 ZyClothsStyleModal from './modules/ZyClothsStyleModal' import ZyClothsStyleModal from './modules/ZyClothsStyleModal'
export default { export default {
name: 'ZyClothsStyleList', name: 'ZyClothsStyleList',
mixins:[JeecgListMixin, mixinDevice], mixins: [JeecgListMixin, mixinDevice],
components: { components: {
ZyClothsStyleModal ZyClothsStyleModal
}, },
data () { data() {
return { return {
description: '服装款式表管理页面', description: '服装款式表管理页面',
// 表头 // 表头
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:'款式名称',
align:"center",
dataIndex: 'styleNames'
},
{
title:'编号',
align:"center",
dataIndex: 'nums'
},
{
title:'规格',
align:"center",
dataIndex: 'specification'
},
{
title:'服装类型',
align:"center",
dataIndex: 'typeId_dictText'
},
{
title:'形式',
align:"center",
dataIndex: 'shape_dictText'
},
{
title:'企业',
align:"center",
dataIndex: 'enterpriseId_dictText'
},
// {
// title:'折叠搭配及包装',
// align:"center",
// dataIndex: 'foldingPackaging_dictText'
// },
// {
// title:'缝纫形式',
// align:"center",
// dataIndex: 'sewingForm_dictText'
// },
{
title:'创建时间',
align:"center",
dataIndex: 'createTime'
},
{
title: '管理模块',
dataIndex: 'action1',
align:"center",
fixed:"right",
width:110,
scopedSlots: { customRender: 'action1' }
},
{
title: '操作',
dataIndex: 'action',
align:"center",
fixed:"right",
width:147,
scopedSlots: { customRender: 'action' }
} }
], },
url: { {
list: "/zyclothsstyle/zyClothsStyle/list", title: '款式名称',
delete: "/zyclothsstyle/zyClothsStyle/delete", align: "center",
deleteBatch: "/zyclothsstyle/zyClothsStyle/deleteBatch", dataIndex: 'styleNames'
exportXlsUrl: "/zyclothsstyle/zyClothsStyle/exportXls", },
importExcelUrl: "zyclothsstyle/zyClothsStyle/importExcel", {
title: '编号',
align: "center",
dataIndex: 'nums'
},
{
title: '规格',
align: "center",
dataIndex: 'specification'
}, },
dictOptions:{}, {
superFieldList:[], title: '服装类型',
} align: "center",
}, dataIndex: 'typeId_dictText'
created() { },
{
title: '形式',
align: "center",
dataIndex: 'shape_dictText'
},
{
title: '企业',
align: "center",
dataIndex: 'enterpriseId_dictText'
},
// {
// title:'折叠搭配及包装',
// align:"center",
// dataIndex: 'foldingPackaging_dictText'
// },
// {
// title:'缝纫形式',
// align:"center",
// dataIndex: 'sewingForm_dictText'
// },
{
title: '创建时间',
align: "center",
dataIndex: 'createTime'
},
{
title: '管理模块',
dataIndex: 'action1',
align: "center",
fixed: "right",
width: 110,
scopedSlots: {customRender: 'action1'}
},
{
title: '操作',
dataIndex: 'action',
align: "center",
fixed: "right",
width: 147,
scopedSlots: {customRender: 'action'}
}
],
url: {
list: "/zyclothsstyle/zyClothsStyle/list",
delete: "/zyclothsstyle/zyClothsStyle/delete",
deleteBatch: "/zyclothsstyle/zyClothsStyle/deleteBatch",
exportXlsUrl: "/zyclothsstyle/zyClothsStyle/exportXls",
importExcelUrl: "zyclothsstyle/zyClothsStyle/importExcel",
},
styleId: '',
dictOptions: {},
superFieldList: [],
}
},
created() {
this.getSuperFieldList(); this.getSuperFieldList();
},
computed: {
importExcelUrl: function () {
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
}, },
computed: { },
importExcelUrl: function(){ methods: {
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`; initDictConfig() {
},
}, },
methods: { //管理模块
initDictConfig(){ jumpPage1(record) {
}, this.$router.push({
//管理模块 path: '/src/views/zystylemodule/ZyStyleModuleList',
jumpPage1(record) { query: { // 路由携带参数
this.$router.push({ 'id': record.id,
path: '/src/views/zystylemodule/ZyStyleModuleList', 'typeId': record.typeId,
query: { // 路由携带参数 }
'id': record.id, });
'typeId': record.typeId, },
} //管理面料
}); jumpPage2(record) {
}, this.$router.push({
//管理面料 path: '/src/views/zystylefabric/ZyStyleFabricList',
jumpPage2(record) { query: { // 路由携带参数
this.$router.push({ 'id': record.id,
path: '/src/views/zystylefabric/ZyStyleFabricList', }
query: { // 路由携带参数 });
'id': record.id, },
} jumpPage3(record) {
}); this.$router.push({
}, path: '/src/views/zystyleaccessories/ZyStyleAccessoriesList',
jumpPage3(record) { query: { // 路由携带参数
this.$router.push({ 'id': record.id,
path: '/src/views/zystyleaccessories/ZyStyleAccessoriesList', }
query: { // 路由携带参数 });
'id': record.id, },
} //管理辅料
}); jumpPage4(record) {
}, this.$router.push({
//管理辅料 path: '/src/views/zystylemodel/ZyStyleModelList',
jumpPage4(record) { query: { // 路由携带参数
this.$router.push({ 'id': record.id,
path: '/src/views/zystylemodel/ZyStyleModelList', }
query: { // 路由携带参数 });
'id': record.id, },
} //管理工序
}); jumpPage5(record) {
}, this.$router.push({
//管理工序 //path: '/process/ZyProcessList',
jumpPage5(record) { path: '/zystylemodular/ZyStyleModularList',
this.$router.push({ query: { // 路由携带参数
path: '/process/ZyProcessList', 'id': record.id,
query: { // 路由携带参数 }
'styleId': record.id, });
} },
}); getSuperFieldList() {
}, let fieldList = [];
getSuperFieldList(){ fieldList.push({
let fieldList=[]; type: 'popup',
fieldList.push({type:'popup',value:'typeId',text:'类型id', popup:{code:'zy_cloths_type',field:'type_name',orgFields:'type_name',destFields:'id'}}) value: 'typeId',
fieldList.push({type:'string',value:'shape',text:'形式',dictCode:''}) text: '类型id',
fieldList.push({type:'string',value:'nums',text:'编号',dictCode:''}) popup: {code: 'zy_cloths_type', field: 'type_name', orgFields: 'type_name', destFields: 'id'}
fieldList.push({type:'string',value:'styleNames',text:'名称',dictCode:''}) })
fieldList.push({type:'string',value:'specification',text:'规格',dictCode:''}) fieldList.push({type: 'string', value: 'shape', text: '形式', dictCode: ''})
fieldList.push({type:'string',value:'salesTerritory',text:'销售地区',dictCode:''}) fieldList.push({type: 'string', value: 'nums', text: '编号', dictCode: ''})
fieldList.push({type:'string',value:'productOverview',text:'产品概述',dictCode:''}) fieldList.push({type: 'string', value: 'styleNames', text: '名称', dictCode: ''})
fieldList.push({type:'string',value:'structure',text:'结构',dictCode:''}) fieldList.push({type: 'string', value: 'specification', text: '规格', dictCode: ''})
fieldList.push({type:'string',value:'characteristic',text:'特征',dictCode:''}) fieldList.push({type: 'string', value: 'salesTerritory', text: '销售地区', dictCode: ''})
fieldList.push({type:'string',value:'designSketch',text:'效果',dictCode:''}) fieldList.push({type: 'string', value: 'productOverview', text: '产品概述', dictCode: ''})
fieldList.push({type:'string',value:'mainMap',text:'主图',dictCode:''}) fieldList.push({type: 'string', value: 'structure', text: '结构', dictCode: ''})
fieldList.push({type:'string',value:'measuringMethod',text:'测量方法',dictCode:''}) fieldList.push({type: 'string', value: 'characteristic', text: '特征', dictCode: ''})
fieldList.push({type:'string',value:'error',text:'误差',dictCode:''}) fieldList.push({type: 'string', value: 'designSketch', text: '效果', dictCode: ''})
fieldList.push({type:'string',value:'quotaMaterials',text:'定额用料',dictCode:''}) fieldList.push({type: 'string', value: 'mainMap', text: '主图', dictCode: ''})
fieldList.push({type:'string',value:'foldingPackaging',text:'折叠搭配及包装',dictCode:''}) fieldList.push({type: 'string', value: 'measuringMethod', text: '测量方法', dictCode: ''})
fieldList.push({type:'string',value:'accLogos',text:'配件及标志',dictCode:''}) fieldList.push({type: 'string', value: 'error', text: '误差', dictCode: ''})
fieldList.push({type:'string',value:'sewingForm',text:'缝纫形式',dictCode:''}) fieldList.push({type: 'string', value: 'quotaMaterials', text: '定额用料', dictCode: ''})
fieldList.push({type:'sel_depart',value:'enterpriseId',text:'企业id'}) fieldList.push({type: 'string', value: 'foldingPackaging', text: '折叠搭配及包装', dictCode: ''})
this.superFieldList = fieldList fieldList.push({type: 'string', value: 'accLogos', text: '配件及标志', dictCode: ''})
} fieldList.push({type: 'string', value: 'sewingForm', text: '缝纫形式', dictCode: ''})
fieldList.push({type: 'sel_depart', value: 'enterpriseId', text: '企业id'})
this.superFieldList = fieldList
} }
} }
}
</script> </script>
<style scoped> <style scoped>
@import '~@assets/less/common.less'; @import '~@assets/less/common.less';
</style> </style>

12
ant-design-vue-jeecg/src/views/zystylemodular/modules/ZyStyleModularForm.vue
Unescape View File

@ -5,12 +5,16 @@
<a-row> <a-row>
<a-col :span="24"> <a-col :span="24">
<a-form-model-item label="款式id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="styleId"> <a-form-model-item label="款式id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="styleId">
<a-input v-model="model.styleId" placeholder="请输入款式id" ></a-input> <!-- <a-input v-model="model.styleId" placeholder="请输入款式id" ></a-input>-->
<j-dict-select-tag v-model="model.styleId" placeholder="请选择款式"
dict-code="zy_cloths_style,style_names,id" />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="24">
<a-form-model-item label="工序id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="processId"> <a-form-model-item label="工序id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="processId">
<a-input v-model="model.processId" placeholder="请输入工序id" ></a-input> <!-- <a-input v-model="model.processId" placeholder="请输入工序id" ></a-input>-->
<j-dict-select-tag v-model="model.processId" placeholder="请选择款式"
dict-code="zy_process,process_name,id" />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
</a-row> </a-row>
@ -39,6 +43,7 @@
data () { data () {
return { return {
model:{ model:{
styleId:'',
}, },
labelCol: { labelCol: {
xs: { span: 24 }, xs: { span: 24 },
@ -68,8 +73,9 @@
this.modelDefault = JSON.parse(JSON.stringify(this.model)); this.modelDefault = JSON.parse(JSON.stringify(this.model));
}, },
methods: { methods: {
add () { add1 (id) {
this.edit(this.modelDefault); this.edit(this.modelDefault);
this.model.styleId = id;
}, },
edit (record) { edit (record) {
this.model = Object.assign({}, record); this.model = Object.assign({}, record);

4
ant-design-vue-jeecg/src/views/zystylemodular/modules/ZyStyleModularModal__Style#Drawer.vue
Unescape View File

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

11048
ant-design-vue-jeecg/yarn.lock
View File

File diff suppressed because it is too large Load Diff

5
jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/entity/ZyAccessories.java
Unescape View File

@ -37,9 +37,14 @@ public class ZyAccessories implements Serializable {
private java.lang.String id; private java.lang.String id;
/**类型id*/ /**类型id*/
@Excel(name = "类型id", width = 15) @Excel(name = "类型id", width = 15)
@Dict(dictTable = "zy_accessories_type", dicText = "contents", dicCode = "id")
@ApiModelProperty(value = "类型id") @ApiModelProperty(value = "类型id")
@Dict(dictTable = "zy_accessories_type", dicText = "contents", dicCode = "id") @Dict(dictTable = "zy_accessories_type", dicText = "contents", dicCode = "id")
private java.lang.String typeId; private java.lang.String typeId;
@ApiModelProperty(value = "类型")
private java.lang.String typeName;
/**编号*/ /**编号*/
@Excel(name = "编号", width = 15) @Excel(name = "编号", width = 15)
@ApiModelProperty(value = "编号") @ApiModelProperty(value = "编号")

5
jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/entity/ZyFabric.java
Unescape View File

@ -70,6 +70,11 @@ public class ZyFabric implements Serializable {
@Dict(dictTable = "zy_fabric_type", dicText = "content", dicCode = "id") @Dict(dictTable = "zy_fabric_type", dicText = "content", dicCode = "id")
@ApiModelProperty(value = "类型") @ApiModelProperty(value = "类型")
private java.lang.String typeId; private java.lang.String typeId;
/**面料类型名称*/
@ApiModelProperty(value = "类型")
private java.lang.String typeName;
/**图片地址*/ /**图片地址*/
@ApiModelProperty(value = "图片地址") @ApiModelProperty(value = "图片地址")
private java.lang.String pictureUrl; private java.lang.String pictureUrl;

4
jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/zyStyleModular/entity/ZyStyleModular.java
Unescape View File

@ -57,11 +57,11 @@ public class ZyStyleModular implements Serializable {
/**款式id*/ /**款式id*/
@Excel(name = "款式id", width = 15) @Excel(name = "款式id", width = 15)
@ApiModelProperty(value = "款式id") @ApiModelProperty(value = "款式id")
@Dict(dictTable = "zy_cloths_style", dicText = "style_names", dicCode = "id") @Dict(dictTable = "zy_cloths_style",dicText = "style_names",dicCode = "id")
private String styleId; private String styleId;
/**工序id*/ /**工序id*/
@Excel(name = "工序id", width = 15) @Excel(name = "工序id", width = 15)
@ApiModelProperty(value = "工序id") @ApiModelProperty(value = "工序id")
@Dict(dictTable = "zy_process", dicText = "process_name", dicCode = "id") @Dict(dictTable = "zy_process",dicText = "process_name",dicCode = "id")
private String processId; private String processId;
} }

Write Preview
Loading…
Cancel
Save