diff --git a/ant-design-vue-jeecg/babel.config.js b/ant-design-vue-jeecg/babel.config.js index bef7ac49..7fba455d 100644 --- a/ant-design-vue-jeecg/babel.config.js +++ b/ant-design-vue-jeecg/babel.config.js @@ -4,3 +4,4 @@ module.exports = { { useBuiltIns: 'entry' }] ] } + diff --git a/ant-design-vue-jeecg/package.json b/ant-design-vue-jeecg/package.json index b1b83cdb..49a2b6b6 100644 --- a/ant-design-vue-jeecg/package.json +++ b/ant-design-vue-jeecg/package.json @@ -121,4 +121,4 @@ "last 2 versions", "not ie <= 10" ] -} +} \ No newline at end of file diff --git a/ant-design-vue-jeecg/public/index.html b/ant-design-vue-jeecg/public/index.html index 2ea92aad..0abf6db9 100644 --- a/ant-design-vue-jeecg/public/index.html +++ b/ant-design-vue-jeecg/public/index.html @@ -8,6 +8,12 @@ 黄淮学院服装智能制造管理平台 + + + + + + diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentForm.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentForm.vue index a2921c8a..2d4323e8 100644 --- a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentForm.vue +++ b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentForm.vue @@ -5,7 +5,7 @@ - + @@ -167,7 +167,9 @@ export default { edit: "/base/zyClothsComponent/edit", queryById: "/base/zyClothsComponent/queryById", //编号 - sort: "/base/zyClothsComponent/sort" + sort: "/base/zyClothsComponent/sort", + //企业编号问题 + enterpriseNum: "/base/zyClothsType/getEnterpriseNum" } } }, @@ -181,6 +183,25 @@ export default { this.modelDefault = JSON.parse(JSON.stringify(this.model)); }, methods: { + getEnterNums() { + if (this.model.id) { + getAction(this.url.enterpriseNum, {id: this.model.enterpriseId}).then((res) => { + if (res.code === 500) { + this.$message({ + type: 'error', + message: '只能选择一个企业！' + }); + } else if (res.code !== 200) { + this.$message({ + type: 'error', + message: '未查询到数据！' + }); + } + this.model.nums = res.result + this.model.nums.substring(4); + console.log('编辑中改变企业编号 res.result ' + this.model.nums) + }) + } + }, async getNumberClothsComponentList() { //const {data: res} = await this.$axios.get('/jeecg-boot/base/zyClothsComponent/sort?id=' + this.model.clothsTypeId) getAction(this.url.sort, {id: this.model.clothsTypeId}).then((res) => { diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularForm.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularForm.vue index 62607b6f..879df058 100644 --- a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularForm.vue +++ b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularForm.vue @@ -5,7 +5,7 @@ - + @@ -49,7 +49,8 @@ - + @@ -68,44 +69,44 @@ - - - - - - - + + + + + + + - - - - - + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - + + + + + + @@ -162,7 +163,9 @@ export default { edit: "/base/zyClothsModular/edit", queryById: "/base/zyClothsModular/queryById", //getAction的url - sort: "/base/zyClothsModular/sort" + sort: "/base/zyClothsModular/sort", + //企业编号问题 + enterpriseNum: "/base/zyClothsType/getEnterpriseNum" } } }, @@ -176,8 +179,26 @@ export default { this.modelDefault = JSON.parse(JSON.stringify(this.model)); }, methods: { + getEnterNums() { + if (this.model.id) { + getAction(this.url.enterpriseNum, {id: this.model.enterpriseId}).then((res) => { + if (res.code === 500) { + this.$message({ + type: 'error', + message: '只能选择一个企业！' + }); + } else if (res.code !== 200) { + this.$message({ + type: 'error', + message: '未查询到数据！' + }); + } + this.model.nums = res.result + this.model.nums.substring(4); + console.log('编辑中改变企业编号 res.result ' + this.model.nums) + }) + } + }, async bianhao() { - //var n=6 getAction(this.url.sort, {id: this.model.clothsTypeId}).then((res) => { //let num = res.result; console.log("+6++++aaa: " + res.result) diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsTypeForm.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsTypeForm.vue index c4974fc1..1da5c58c 100644 --- a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsTypeForm.vue +++ b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsTypeForm.vue @@ -78,16 +78,16 @@ export default { }, confirmLoading: false, validatorRules: { - // nums: [ - // { required: true, message: '请输入编号!'}, - // ], + enterpriseId: [ + {required: true, message: '请选择一个企业!'}, + ], + nums: [ + {required: true, message: '请输入编号!'}, + ], typeName: [ {required: true, message: '请输入类型名称!'}, {pattern: /^[0-9A-Za-z\u4e00-\u9fa5.,;，。；、!()?]{0,50}$/, message: '文本长度过长'}, ], - enterpriseId: [ - {required: true, message: '请选择一个企业!'}, - ], }, url: { add: "/base/zyClothsType/add", @@ -95,7 +95,7 @@ export default { queryById: "/base/zyClothsType/queryById", weiyi: "/base/zyClothsType/weiyi", //企业编号问题 - enterpriseNum: "/zyclothsstyle/zyClothsStyle/enterpriseNum" + enterpriseNum: "/base/zyClothsType/getEnterpriseNum" } } }, diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessAccessoriesList.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessAccessoriesList.vue index bed9aef8..5bd49a89 100644 --- a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessAccessoriesList.vue +++ b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessAccessoriesList.vue @@ -79,9 +79,9 @@ - + 详情 - + @@ -94,7 +94,7 @@ - + @@ -105,12 +105,13 @@ import { mixinDevice } from '@/utils/mixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin' import ZyProcessAccessoriesModal from './ZyProcessAccessoriesModal' - + import ZyAccessoriesFormDetail from '@/views/erp/accessories/modules/ZyAccessoriesFormDetail' export default { name: 'ZyProcessAccessoriesList', mixins:[JeecgListMixin, mixinDevice], components: { - ZyProcessAccessoriesModal + ZyProcessAccessoriesModal, + ZyAccessoriesFormDetail }, data () { return { @@ -205,6 +206,9 @@ fieldList.push({type:'popup',value:'processId',text:'工序表id', popup:{code:'',field:'',orgFields:'',destFields:''}}) fieldList.push({type:'popup',value:'accessoriesId',text:'辅料表id', popup:{code:'',field:'',orgFields:'',destFields:''}}) this.superFieldList = fieldList + }, + handleDetail(id){ + this.$refs.ZyAccessoriesFormDetail.showModal(id) } } } diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessActionList.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessActionList.vue index e652faba..dc7b3123 100644 --- a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessActionList.vue +++ b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessActionList.vue @@ -80,8 +80,8 @@ - - + 详情 + @@ -98,6 +98,7 @@ + @@ -107,6 +108,7 @@ import { mixinDevice } from '@/utils/mixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin' import ZyProcessActionModal from './ZyProcessActionModal' + import ZyClothActionFormDetail from './ZyClothActionFormDetail' import {filterMultiDictText} from '@/components/dict/JDictSelectUtil' import {getAction} from "@api/manage"; @@ -114,7 +116,8 @@ name: 'ZyProcessActionList', mixins:[JeecgListMixin, mixinDevice], components: { - ZyProcessActionModal + ZyProcessActionModal, + ZyClothActionFormDetail }, data () { return { @@ -237,6 +240,9 @@ fieldList.push({type:'string',value:'processId',text:'工序id',dictCode:'zy_process,process_name,id'}) fieldList.push({type:'string',value:'actionId',text:'动作id',dictCode:'zy_cloth_action,descr,nums'}) this.superFieldList = fieldList + }, + handleDetail(id){ + this.$refs.ZyClothActionFormDetail.showModal(id) } } } diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessFabricList.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessFabricList.vue index db8a05bd..33b75a1c 100644 --- a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessFabricList.vue +++ b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessFabricList.vue @@ -85,8 +85,9 @@ + 详情 - + @@ -100,6 +101,7 @@ + @@ -110,12 +112,14 @@ import { JeecgListMixin } from '@/mixins/JeecgListMixin' import ZyProcessFabricModal from './ZyProcessFabricModal' import {filterMultiDictText} from '@/components/dict/JDictSelectUtil' + import ZyFabricFormDetailModel from '@/views/erp/fabric/modules/ZyFabricFormDetailModel' export default { name: 'ZyProcessFabricList', mixins:[JeecgListMixin, mixinDevice], components: { - ZyProcessFabricModal + ZyProcessFabricModal, + ZyFabricFormDetailModel }, data () { return { @@ -209,6 +213,10 @@ fieldList.push({type:'string',value:'processId',text:'工序',dictCode:'zy_process,process_name,id'}) fieldList.push({type:'string',value:'fabricId',text:'面料',dictCode:'zy_fabric,name,id'}) this.superFieldList = fieldList + }, + handleDetail(id,name){ + this.$refs.ZyFabricFormDetailModel.showModal(id,name) + // this.$children[0].showModal(id) } } } diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessForm.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessForm.vue index 61122e2f..934ae5f2 100644 --- a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessForm.vue +++ b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessForm.vue @@ -42,7 +42,7 @@ - + @@ -78,12 +78,12 @@ - + - + @@ -93,7 +93,7 @@ - + @@ -108,7 +108,7 @@ - + @@ -265,9 +265,35 @@ }, confirmLoading: false, validatorRules: { + processTime:[ + { + pattern: /^\d+$/,message:'请输入正整数' + }, + ], + manualWide:[ + { + pattern: /^\d+$/,message:'请输入正整数' + }, + ], + machineWide:[ + { + pattern: /^\d+$/,message:'请输入正整数' + }, + ], + bundleWide:[ + { + pattern: /^\d+$/,message:'请输入正整数' + }, + ], fabricNum: [ { required: true, message: '请输入面料代码!'}, ], + enterpriseId: [ + { required: true, message: '请选择企业!'}, + ], + typeId: [ + { required: true, message: '请选择款式!'}, + ], price:[{ pattern: /^\d*\.?\d+$/,message:'请输入正数' },], 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 0b68e93d..80d3b134 100644 --- a/ant-design-vue-jeecg/src/views/product/pdaccessories/ProductAccessoriesList.vue +++ b/ant-design-vue-jeecg/src/views/product/pdaccessories/ProductAccessoriesList.vue @@ -1,6 +1,6 @@ + 详情 + + 编辑 @@ -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", @@ -178,6 +182,7 @@ }, dictOptions:{}, superFieldList:[], + loadRouteType:false, } }, created() { @@ -192,7 +197,7 @@ fanhui(){ this.$router.push({ /*返回产品*/ - path: '',/*在引号中填写返回vue*/ + path: '/WorkProduct',/*在引号中填写返回vue*/ }); }, initDictConfig(){ @@ -209,7 +214,7 @@ loadParameter() { if (this.loadRouteType === false) { this.id = this.$route.query.id; - this.biaoTi = this.$route.query.styleNames+"产品辅料管理"; + this.biaoTi = this.$route.query.productName+"产品辅料管理"; console.log("***********") this.loadRouteType = true; } @@ -263,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 6bb3c4de..a485c5fc 100644 --- a/ant-design-vue-jeecg/src/views/product/pdfabric/ProductFabricList.vue +++ b/ant-design-vue-jeecg/src/views/product/pdfabric/ProductFabricList.vue @@ -1,6 +1,6 @@ + 详情 + + 编辑 @@ -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:'面料', @@ -172,6 +176,7 @@ }, dictOptions:{}, superFieldList:[], + loadRouteType:false, } }, created() { @@ -188,7 +193,7 @@ fanhui(){ this.$router.push({ /*返回产品*/ - path: '',/*在引号中填写返回vue*/ + path: '/WorkProduct',/*在引号中填写返回vue*/ }); }, getSuperFieldList(){ @@ -203,8 +208,8 @@ loadParameter() { if (this.loadRouteType === false) { this.id = this.$route.query.id; - this.biaoTi = this.$route.query.styleNames+"产品面料管理"; - console.log("***********") + this.biaoTi = this.$route.query.productName+"产品面料管理"; + console.log("***********想看看") this.loadRouteType = true; } }, @@ -257,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 995ca46e..9b950959 100644 --- a/ant-design-vue-jeecg/src/views/product/pdmachine/ProductMachineList.vue +++ b/ant-design-vue-jeecg/src/views/product/pdmachine/ProductMachineList.vue @@ -1,6 +1,6 @@