From 9e632b100454077e4974254c1a527c4b65a2f01d Mon Sep 17 00:00:00 2001
From: shenyuan <shenyuan2825@163.com>
Date: Wed, 21 Dec 2022 17:09:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=AC=BE=E5=BC=8F=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/ZyClothsStyleListDetail.vue       | 76 +++++++++----------
 1 file changed, 35 insertions(+), 41 deletions(-)

diff --git a/ant-design-vue-jeecg/src/views/zyclothsstyle/modules/ZyClothsStyleListDetail.vue b/ant-design-vue-jeecg/src/views/zyclothsstyle/modules/ZyClothsStyleListDetail.vue
index 63edb66b..73a5a708 100644
--- a/ant-design-vue-jeecg/src/views/zyclothsstyle/modules/ZyClothsStyleListDetail.vue
+++ b/ant-design-vue-jeecg/src/views/zyclothsstyle/modules/ZyClothsStyleListDetail.vue
@@ -70,13 +70,13 @@
         </a-table>
 
         <h3 style="width: 98%;;margin:20px auto 0">管理型号</h3>
-        <!--      <a-table style="width: 98%;font-size:14px;margin:10px auto 0" :columns="columns4" :data-source="data4" bordered :pagination="false">-->
+              <a-table style="width: 98%;font-size:14px;margin:10px auto 0" :columns="columns4" :data-source="data4" rowKey="id"  bordered :pagination="false">
 
-        <!--      </a-table>-->
+              </a-table>
 
         <h3 style="width: 98%;;margin:20px auto 0">管理工序</h3>
         <a-table style="width: 98%;font-size:14px;margin:10px auto 0" :columns="columns5" :data-source="data5"
-                 rowKey="id" bordered :pagination="false">
+                 rowKey="id" bordered :pagination="false" >
 
         </a-table>
       </a-spin>
@@ -228,98 +228,89 @@ const columns3 = [
 const columns4 = [
   {
     title: '服装款式',
-    dataIndex: 'a',
-    key: 'a',
+    dataIndex: 'styleId',
+    key: 'styleId',
     align: 'center'
   },
   {
     title: '是否默认尺码',
-    dataIndex: 'c',
-    key: 'c',
+    dataIndex: 'isDefaultSize',
+    key: 'isDefaultSize',
     align: 'center'
   },
   {
     title: '型号编码',
-    dataIndex: 'e',
-    key: 'e',
+    dataIndex: 'modelNumber',
+    key: 'modelNumber',
     align: 'center'
   },
   {
     title: '码数',
-    dataIndex: 'f',
-    key: 'f',
+    dataIndex: 'size',
+    key: 'size',
     align: 'center'
   },
   {
     title: '型',
-    dataIndex: 'a',
-    key: 'a',
+    dataIndex: 'anumbers',
+    key: 'anumbers',
     align: 'center'
   },
   {
     title: '号',
-    dataIndex: 'a',
-    key: 'a',
+    dataIndex: 'bnumbers',
+    key: 'bnumbers',
     align: 'center'
   },
   {
     title: '领大',
-    dataIndex: 'c',
-    key: 'c',
+    dataIndex: 'collarLarge',
+    key: 'collarLarge',
     align: 'center'
   },
   {
     title: '胸围',
-    dataIndex: 'e',
-    key: 'e',
+    dataIndex: 'bust',
+    key: 'bust',
     align: 'center'
   },
   {
     title: '袖长',
-    dataIndex: 'f',
-    key: 'f',
+    dataIndex: 'sleeveLength',
+    key: 'sleeveLength',
     align: 'center'
   },
   {
     title: '连肩袖长',
-    dataIndex: 'e',
-    key: 'e',
+    dataIndex: 'shslLength',
+    key: 'shslLength',
     align: 'center'
   },
   {
     title: '总肩宽',
-    dataIndex: 'f',
-    key: 'f',
+    dataIndex: 'tsWidth',
+    key: 'tsWidth',
     align: 'center'
   },
   {
     title: '袖口',
-    dataIndex: 'f',
-    key: 'f',
+    dataIndex: 'cuff',
+    key: 'cuff',
     align: 'center'
   },
   {
     title: '腰围',
-    dataIndex: 'f',
-    key: 'f',
+    dataIndex: 'waistline',
+    key: 'waistline',
     align: 'center'
   },
   {
     title: '下摆',
-    dataIndex: 'f',
-    key: 'f',
+    dataIndex: 'hem',
+    key: 'hem',
     align: 'center'
   }
 ];
-const data4 = [
-  {
-    key: '1',
-    a: '女衬衫',
-    c: 'test010',
-    e: '123',
-    f: '2022-12-06 10:02:59',
-  }
-];
 const columns5 = [
   {
     title: '款式名称',
@@ -361,7 +352,7 @@ export default {
       columns3,
       // 管理型号
       columns4,
-      data4,
+      data4:[],
       // 管理工序
       columns5,
       data5: [],
@@ -392,6 +383,8 @@ export default {
           message: '未查询到数据！'
         });
       }
+      console.log('res.result')
+      console.log(res.result)
       this.confirmLoading = false
       if (this.data1.length === 0) {
         this.data1.push(res.result.zyClothsStyles)
@@ -399,6 +392,7 @@ export default {
       this.data1 = res.result.zyClothsStyles
       this.data2 = res.result.zyStyleFabricList
       this.data3 = res.result.zyStyleAccessoriesList
+      this.data4 = res.result.zyStyleModels
       this.data = res.result.zyStyleModuleList
       this.data5 = res.result.zyStyleModularList
     },