From 31cb1d49afd0721bf7ea4a47ce02de34deeb2084 Mon Sep 17 00:00:00 2001 From: shenyuan Date: Tue, 20 Dec 2022 18:09:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=B6=E8=A1=A3=E6=A8=A1=E5=9D=97+=E5=88=B6?= =?UTF-8?q?=E8=A1=A3=E9=83=A8=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/process/ZyClothsComponentList.vue | 6 +- .../src/views/process/ZyClothsModularList.vue | 6 +- .../modules/ZyClothsComponentListDetail.vue | 66 ++++++++----------- .../modules/ZyClothsModularListDetail.vue | 13 ++-- 4 files changed, 41 insertions(+), 50 deletions(-) diff --git a/ant-design-vue-jeecg/src/views/process/ZyClothsComponentList.vue b/ant-design-vue-jeecg/src/views/process/ZyClothsComponentList.vue index dd5936d8..8aaf926c 100644 --- a/ant-design-vue-jeecg/src/views/process/ZyClothsComponentList.vue +++ b/ant-design-vue-jeecg/src/views/process/ZyClothsComponentList.vue @@ -82,7 +82,7 @@ 编辑 - 详情 + 详情 删除 @@ -249,8 +249,8 @@ export default { fieldList.push({type: 'string', value: 'enterpriseId', text: '企业', dictCode: ''}) this.superFieldList = fieldList }, - handleDetail(record) { - this.$refs.ZyClothsComponentListDetail.showModal(record) + handleDetail(id) { + this.$refs.ZyClothsComponentListDetail.showModal(id) } } } diff --git a/ant-design-vue-jeecg/src/views/process/ZyClothsModularList.vue b/ant-design-vue-jeecg/src/views/process/ZyClothsModularList.vue index 168a5ff7..97506aa5 100644 --- a/ant-design-vue-jeecg/src/views/process/ZyClothsModularList.vue +++ b/ant-design-vue-jeecg/src/views/process/ZyClothsModularList.vue @@ -114,7 +114,7 @@ 编辑 - 详情 + 详情 删除 @@ -291,8 +291,8 @@ export default { fieldList.push({type: 'string', value: 'pictureUrl', text: '图片', dictCode: ''}) this.superFieldList = fieldList }, - handleDetail(record) { - this.$refs.ZyClothsModularListDetail.showModal(record) + handleDetail(id) { + this.$refs.ZyClothsModularListDetail.showModal(id) } } } diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentListDetail.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentListDetail.vue index f81c86f2..4f59de85 100644 --- a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentListDetail.vue +++ b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentListDetail.vue @@ -7,12 +7,13 @@ :width='1000' @ok="handleOk" @cancel="handleCancel"> +

制衣部件详情

- {{model.enterpriseId_dictText}} - {{model.clothsTypeId_dictText}} + {{model.enterpriseId}} + {{model.clothsTypeId}} {{model.partsName}} - {{model.modularId_dictText}} + {{model.modularId}} {{model.description}} 无法显示 @@ -20,8 +21,9 @@

部件工序详情

- + + @@ -38,20 +40,20 @@ }, { title: '部件', - dataIndex: 'nums', - key: 'nums', + dataIndex: 'componentId', + key: 'componentId', align:'center' }, { title: '工序', - dataIndex: 'modularId_dictText', - key: 'modularId_dictText', + dataIndex: 'processId', + key: 'processId', align:'center' }, { title: '是否瓶颈工序', - dataIndex: 'partsName', - key: 'partsName', + dataIndex: 'bottleneck', + key: 'bottleneck', align:'center' }, { @@ -61,55 +63,41 @@ 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, + confirmLoading:true, model:{ }, - data1, + data1:[], columns1, } }, methods: { - showModal(record) { + showModal(id) { this.visible = true; - this.model = record - this.$http.get('/base/zyClothsComponent/detail?id='+record.id).then( + this.$http.get('/base/zyClothsComponent/detail?id='+id).then( res=>{ - // this.data = res.result + this.model = res.result.zyClothsComponent + this.data1 = res.result.zyProcessComponents + this.confirmLoading = false + // this.model = res.result.zyClothsComponent // this.ProcessData = res.result.zyProcess // this.basicActionData = res.result.zyClothActions // this.accessoriesData = res.result.zyFabrics // this.fabricData = res.result.zyAccessories console.log('工序详情页') - console.log(this.data) - console.log(this.accessoriesData) - console.log(this.fabricData) - this.img = "http://10.100.200.112/jeecg-boot/sys/common/static/"+this.data.image; - this.mp4 = "http://10.100.200.112/jeecg-boot/sys/common/static/"+this.data.vedio; + console.log(res.result) + // console.log(this.data) + // console.log(this.accessoriesData) + // console.log(this.fabricData) + // this.img = "http://10.100.200.112/jeecg-boot/sys/common/static/"+this.data.image; + // this.mp4 = "http://10.100.200.112/jeecg-boot/sys/common/static/"+this.data.vedio; } ) - console.log('record') - console.log(record.id) }, handleOk(e) { this.confirmLoading = true; diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularListDetail.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularListDetail.vue index c08d6788..29e46cea 100644 --- a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularListDetail.vue +++ b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularListDetail.vue @@ -7,6 +7,7 @@ :width='1000' @ok="handleOk" @cancel="handleCancel"> +

制衣模块详情

{{model.enterpriseId}} @@ -25,6 +26,7 @@

模块工序详情

+ @@ -92,7 +94,6 @@ data () { return { visible: false, - confirmLoading: false, model:{ }, data1:[], @@ -101,25 +102,27 @@ columns2, img:'', mp4:'', + confirmLoading:true } }, methods: { - showModal(record) { + showModal(id) { this.visible = true; // this.model = record - this.$http.get('/base/zyClothsModular/detail?id='+record.id).then( + this.$http.get('/base/zyClothsModular/detail?id='+id).then( res=>{ // this.data = res.result this.model = res.result.zyClothsModular this.data1 = res.result.zyClothsModularComponents this.data2 = res.result.zyProcessModularVos + this.confirmLoading = false // this.ProcessData = res.result.zyProcess // this.basicActionData = res.result.zyClothActions // this.accessoriesData = res.result.zyFabrics // this.fabricData = res.result.zyAccessories - this.img = "http://10.100.200.112/jeecg-boot/sys/common/static/"+this.data.image; - this.mp4 = "http://10.100.200.112/jeecg-boot/sys/common/static/"+this.data.vedio; + // this.img = "http://10.100.200.112/jeecg-boot/sys/common/static/"+this.data.image; + // this.mp4 = "http://10.100.200.112/jeecg-boot/sys/common/static/"+this.data.vedio; } ) },