From 286f1671263d79a6dd4b5ec1025c4755f1d46f25 Mon Sep 17 00:00:00 2001 From: lenovo <123> Date: Mon, 16 Jan 2023 16:49:59 +0800 Subject: [PATCH] =?UTF-8?q?2023-1-16=E5=B7=A5=E5=BA=8F=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/ZyProcessAccessoriesList.vue | 14 +++++--- .../process/modules/ZyProcessActionList.vue | 12 +++++-- .../process/modules/ZyProcessFabricList.vue | 12 +++++-- .../views/process/modules/ZyProcessForm.vue | 36 ++++++++++++++++--- .../pdaccessories/ProductAccessoriesList.vue | 5 +-- .../product/pdfabric/ProductFabricList.vue | 7 ++-- .../product/pdmachine/ProductMachineList.vue | 5 +-- .../ProductOperationtoolList.vue | 9 ++--- 8 files changed, 74 insertions(+), 26 deletions(-) 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..1a0de3d8 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 @@