diff --git a/ant-design-vue-jeecg/src/components/procedure/basicAction.vue b/ant-design-vue-jeecg/src/components/procedure/basicAction.vue new file mode 100644 index 00000000..641b5ce5 --- /dev/null +++ b/ant-design-vue-jeecg/src/components/procedure/basicAction.vue @@ -0,0 +1,58 @@ + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/components/procedure/processFabric.vue b/ant-design-vue-jeecg/src/components/procedure/processFabric.vue new file mode 100644 index 00000000..f06fad2f --- /dev/null +++ b/ant-design-vue-jeecg/src/components/procedure/processFabric.vue @@ -0,0 +1,40 @@ + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/cloths/ZyProcessFabricList.vue b/ant-design-vue-jeecg/src/views/cloths/ZyProcessFabricList.vue index 11bf8380..1aba9052 100644 --- a/ant-design-vue-jeecg/src/views/cloths/ZyProcessFabricList.vue +++ b/ant-design-vue-jeecg/src/views/cloths/ZyProcessFabricList.vue @@ -88,7 +88,7 @@ - 详情 + 详情 删除 @@ -100,6 +100,7 @@ + @@ -110,12 +111,12 @@ import { JeecgListMixin } from '@/mixins/JeecgListMixin' import ZyProcessFabricModal from './modules/ZyProcessFabricModal' import {filterMultiDictText} from '@/components/dict/JDictSelectUtil' - + import ZyProcessFabricFormDetail from './modules/ZyProcessFabricFormDetail' export default { name: 'ZyProcessFabricList', mixins:[JeecgListMixin, mixinDevice], components: { - ZyProcessFabricModal + ZyProcessFabricModal,ZyProcessFabricFormDetail }, data () { return { @@ -197,6 +198,9 @@ 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){ + this.$refs.ZyProcessFabricFormDetail.showModal(id) } } } diff --git a/ant-design-vue-jeecg/src/views/cloths/modules/ZyProcessFabricFormDetail.vue b/ant-design-vue-jeecg/src/views/cloths/modules/ZyProcessFabricFormDetail.vue new file mode 100644 index 00000000..49b68453 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/cloths/modules/ZyProcessFabricFormDetail.vue @@ -0,0 +1,70 @@ + + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/process/ZyClothActionList.vue b/ant-design-vue-jeecg/src/views/process/ZyClothActionList.vue index bbe1717c..4701f83c 100644 --- a/ant-design-vue-jeecg/src/views/process/ZyClothActionList.vue +++ b/ant-design-vue-jeecg/src/views/process/ZyClothActionList.vue @@ -29,9 +29,9 @@
新增 导出 - - - + + + @@ -88,7 +88,7 @@ - 详情 + 详情 删除 @@ -100,6 +100,7 @@
+ @@ -109,12 +110,13 @@ import { mixinDevice } from '@/utils/mixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin' import ZyClothActionModal from './modules/ZyClothActionModal' + import ZyClothActionFormDetail from './modules/ZyClothActionFormDetail' export default { name: 'ZyClothActionList', mixins:[JeecgListMixin, mixinDevice], components: { - ZyClothActionModal + ZyClothActionModal,ZyClothActionFormDetail }, data () { return { @@ -198,7 +200,7 @@ } }, created() { - this.getSuperFieldList(); + this.getSuperFieldList(); }, computed: { importExcelUrl: function(){ @@ -217,10 +219,13 @@ fieldList.push({type:'int',value:'manualTmu',text:'手工TMU',dictCode:''}) fieldList.push({type:'string',value:'nums',text:'编号',dictCode:''}) this.superFieldList = fieldList + }, + handleDetail(id){ + this.$refs.ZyClothActionFormDetail.showModal(id) } } } - \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyClothActionFormDetail.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyClothActionFormDetail.vue new file mode 100644 index 00000000..0f0a0de4 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/process/modules/ZyClothActionFormDetail.vue @@ -0,0 +1,63 @@ + + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessDetail.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessDetail.vue index c0b10288..56262f57 100644 --- a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessDetail.vue +++ b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessDetail.vue @@ -1,5 +1,5 @@ \ No newline at end of file + }, + created(){ + }, + methods: { + showModal(id) { + this.visible = true; + this.$http.get('/base/zyProcess/queryById?id='+id).then( + res=>{ + this.data = res.result + 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(this.data) + } + ) + }, + handleOk() { + this.ModalText = 'The modal will be closed after two seconds'; + this.confirmLoading = true; + setTimeout(() => { + this.visible = false; + this.confirmLoading = false; + }, 1); + }, + handleCancel() { + this.visible = false; + }, + }, + } + + \ No newline at end of file