制衣模块详情

ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularListDetail.vue

@@ -9,21 +9,21 @@
       @cancel="handleCancel">
       <p class="title">制衣模块详情</p>
       <a-descriptions title="" bordered>
-        <a-descriptions-item label="企业">{{model.enterpriseId_dictText}}</a-descriptions-item>
+        <a-descriptions-item label="企业">{{model.enterpriseId}}</a-descriptions-item>
         <a-descriptions-item label="编号">{{model.nums}}</a-descriptions-item>
         <a-descriptions-item label="模块名称">{{model.modularName}}</a-descriptions-item>
-        <a-descriptions-item label="服装类型">{{model.clothsTypeId_dictText}}</a-descriptions-item>
+        <a-descriptions-item label="服装类型">{{model.clothsTypeId}}</a-descriptions-item>
         <a-descriptions-item label="描述" :span="2">{{model.description}}</a-descriptions-item>
         <a-descriptions-item label="图片" :span="3">
-          <img v-if="model.pictureUrl"  :src="model.pictureUrl" alt="无法显示"></img>
+          <img v-if="img"  :src="img" alt="无法显示"></img>
           <span v-else>暂无图片</span>
         </a-descriptions-item>
       </a-descriptions>
       <p class="title">模块部件详情</p>
-      <a-table :columns="columns1" :data-source="data1" bordered :pagination="false">
+      <a-table :columns="columns1" :data-source="data1" rowKey="id" bordered :pagination="false">
       </a-table>
       <p  class="title">模块工序详情</p>
-      <a-table :columns="columns2" :data-source="data2" bordered :pagination="false">
+      <a-table :columns="columns2" :data-source="data2" rowKey="id" bordered :pagination="false">
       </a-table>
     </a-modal>
   </div>
@@ -43,8 +43,10 @@
     },
     {
       title: '模块名称',
-      dataIndex: 'modularId_dictText',
-      key: 'modularId_dictText',
+      // dataIndex: 'modularId_dictText',
+      // key: 'modularId_dictText',
+      dataIndex: 'modularId',
+      key: 'modularId',
       align:'center'
     },
     {
@@ -60,29 +62,6 @@
       align:'center'
     },
   ];
-  const data1 = [
-    {
-      key: '1',
-      nums:'tttt',
-      modularId_dictText:'tttt',
-      partsName:'大袖衩',
-      createTime:'2022-12-06 19:00:07'
-    },
-    {
-      key: '2',
-      nums:'aaff',
-      modularId_dictText:'tttt',
-      partsName:'外片',
-      createTime:'2022-12-06 18:30:49'
-    },
-    {
-      key: '3',
-      nums:'test01',
-      modularId_dictText:'tttt',
-      partsName:'大片',
-      createTime:'2022-12-06 09:07:05'
-    }
-  ]
   const columns2 = [
     {
       title:'索引',
@@ -91,14 +70,14 @@
     },
     {
       title: '模块名称',
-      dataIndex: 'modularId_dictText',
-      key: 'modularId_dictText',
+      dataIndex: 'modularId',
+      key: 'modularId',
       align:'center'
     },
     {
       title: '工序名称',
-      dataIndex: 'processId_dictText',
-      key: 'processId_dictText',
+      dataIndex: 'processId',
+      key: 'processId',
       align:'center'
     },
     {
@@ -108,26 +87,6 @@
       align:'center'
     },
   ];
-  const data2 = [
-    {
-      key: '1',
-      modularId_dictText:'tttt',
-      processId_dictText:'1-3合后育克',
-      createTime:'2022-12-06 19:00:07'
-    },
-    {
-      key: '2',
-      modularId_dictText:'tttt',
-      processId_dictText:'模板运袋盖',
-      createTime:'2022-12-06 18:30:49'
-    },
-    {
-      key: '3',
-      modularId_dictText:'tttt',
-      processId_dictText:'1-4辑后育克0.1cm明线',
-      createTime:'2022-12-06 09:07:05'
-    }
-  ]
   export default {
     name: 'ZyClothsModularListDetail',//此处填组件名称
     data () {
@@ -136,34 +95,33 @@
         confirmLoading: false,
         model:{
         },
-        data1,
+        data1:[],
         columns1,
-        data2,
+        data2:[],
         columns2,
+        img:'',
+        mp4:'',
       }
     },
     methods: {
       showModal(record) {
         this.visible = true;
-        this.model = record
+        // this.model = record
         this.$http.get('/base/zyClothsModular/detail?id='+record.id).then(
           res=>{
             // this.data = res.result
+            this.model = res.result.zyClothsModular
+            this.data1 = res.result.zyClothsModularComponents
+            this.data2 = res.result.zyProcessModularVos
             // 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('制衣模块 record id')
-        console.log(record.id)
       },
       handleOk(e) {
         this.confirmLoading = true;