diff --git a/ant-design-vue-jeecg/src/views/gdmlb/ZyProductionTypesettingList.vue b/ant-design-vue-jeecg/src/views/gdmlb/ZyProductionTypesettingList.vue
index d72b387d..4ccb6b98 100644
--- a/ant-design-vue-jeecg/src/views/gdmlb/ZyProductionTypesettingList.vue
+++ b/ant-design-vue-jeecg/src/views/gdmlb/ZyProductionTypesettingList.vue
@@ -257,7 +257,7 @@
       getSuperFieldList(){
         let fieldList=[];
         fieldList.push({type:'string',value:'workOrderId',text:'工单编号',dictCode:'zy_work_order,code,id'})
-        fieldList.push({type:'string',value:'goodsId',text:'商品',dictCode:'zy_goods,goods_num,id'})
+        fieldList.push({type:'string',value:'goodsId',text:'商品',dictCode:'zy_goods,goods_code,id'})
         fieldList.push({type:'string',value:'workshopId',text:'车间',dictCode:''})
         fieldList.push({type:'string',value:'factory',text:'工厂',dictCode:''})
         fieldList.push({type:'string',value:'teamId',text:'班组',dictCode:''})
diff --git a/ant-design-vue-jeecg/src/views/gdmlb/modules/ZyProductionTypesettingForm.vue b/ant-design-vue-jeecg/src/views/gdmlb/modules/ZyProductionTypesettingForm.vue
index aee7bfc8..3cda2d2f 100644
--- a/ant-design-vue-jeecg/src/views/gdmlb/modules/ZyProductionTypesettingForm.vue
+++ b/ant-design-vue-jeecg/src/views/gdmlb/modules/ZyProductionTypesettingForm.vue
@@ -10,7 +10,7 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="商品" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="goodsId">
-              <j-dict-select-tag type="list" v-model="model.goodsId" dictCode="zy_goods,goods_num,id" placeholder="请选择商品" />
+              <j-dict-select-tag type="list" v-model="model.goodsId" dictCode="zy_goods,goods_code,id" placeholder="请选择商品" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -151,7 +151,7 @@
               that.confirmLoading = false;
             })
           }
-         
+
         })
       },
     }
diff --git a/ant-design-vue-jeecg/src/views/process/ZyClothsComponentList.vue b/ant-design-vue-jeecg/src/views/process/ZyClothsComponentList.vue
index 711921fa..67c2036d 100644
--- a/ant-design-vue-jeecg/src/views/process/ZyClothsComponentList.vue
+++ b/ant-design-vue-jeecg/src/views/process/ZyClothsComponentList.vue
@@ -100,6 +100,7 @@
 
     <zy-cloths-component-modal ref="modalForm" @ok="modalFormOk"></zy-cloths-component-modal>
     <ZyProcessComponentList ref="ZyProcessComponentList"></ZyProcessComponentList>
+    <ZyClothsComponentListDetail ref="ZyClothsComponentListDetail"></ZyClothsComponentListDetail>
   </a-card>
 </template>
 
@@ -111,14 +112,15 @@
   import ZyClothsComponentModal from './modules/ZyClothsComponentModal'
   import ZyProcessComponentList from "@views/process/ZyProcessComponentList"
   import {filterMultiDictText} from '@/components/dict/JDictSelectUtil';
-
+import ZyClothsComponentListDetail from './modules/ZyClothsComponentListDetail'
 
   export default {
     name: 'ZyClothsComponentList',
     mixins:[JeecgListMixin, mixinDevice],
     components: {
       ZyProcessComponentList,
-      ZyClothsComponentModal
+      ZyClothsComponentModal,
+      ZyClothsComponentListDetail
     },
     data () {
       return {
@@ -239,6 +241,9 @@
         fieldList.push({type:'string',value:'modularId',text:'模块',dictCode:'zy_cloths_modular,modular_name,id'})
         fieldList.push({type:'string',value:'enterpriseId',text:'企业',dictCode:''})
         this.superFieldList = fieldList
+      },
+      handleDetail(record){
+        this.$refs.ZyClothsComponentListDetail.showModal(record)
       }
     }
   }
diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentForm.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentForm.vue
index 5ae1cd1a..dc5f966a 100644
--- a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentForm.vue
+++ b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentForm.vue
@@ -3,46 +3,88 @@
     <j-form-container :disabled="formDisabled">
       <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
         <a-row>
-          <a-col :span="24">
+          <a-col :span="48">
             <a-form-model-item label="企业" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="enterpriseId">
               <j-select-depart  v-model="model.enterpriseId"   />
             </a-form-model-item>
           </a-col>
-<!--          <a-col :span="24">-->
-<!--            <a-form-model-item label="编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="nums">-->
-<!--              <a-input v-model="model.nums" placeholder="请输入编号"  ></a-input>-->
-<!--            </a-form-model-item>-->
-<!--          </a-col>-->
-          <a-col :span="24">
+        </a-row>
+        <a-row>
+          <a-col :span="48">
             <a-form-model-item label="服装类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="clothsTypeId">
               <j-dict-select-tag type="list" v-model="model.clothsTypeId" dictCode="zy_cloths_type,type_name,id" placeholder="请选择衣服类型" />
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+        </a-row>
+        <a-row>
+          <a-col :span="48">
             <a-form-model-item label="部件名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="partsName">
               <a-input v-model="model.partsName" placeholder="请输入部件名称"  ></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+        </a-row>
+        <a-row>
+          <a-col :span="48">
             <a-form-model-item label="模块" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="modularId">
               <j-dict-select-tag type="list" v-model="model.modularId" dictCode="zy_cloths_modular,modular_name,id" placeholder="请选择模块" />
             </a-form-model-item>
           </a-col>
+        </a-row>
+        <a-row>
+          <a-col :span="48">
+            <a-form-model-item label="描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="description">
+              <a-textarea v-model="model.description" rows="2" placeholder="请输入描述"/>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+        <a-row>
+          <a-col :span="48">
+              <a-form-model-item label="图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pictureUrl">
+                <j-image-upload isMultiple  v-model="model.pictureUrl" ></j-image-upload>
+              </a-form-model-item>
+          </a-col>
+        </a-row>
+        <a-row>
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="企业" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="enterpriseId">-->
+<!--              <j-select-depart  v-model="model.enterpriseId"   />-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="nums">-->
+<!--              <a-input v-model="model.nums" placeholder="请输入编号"  ></a-input>-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="服装类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="clothsTypeId">-->
+<!--              <j-dict-select-tag type="list" v-model="model.clothsTypeId" dictCode="zy_cloths_type,type_name,id" placeholder="请选择衣服类型" />-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="部件名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="partsName">-->
+<!--              <a-input v-model="model.partsName" placeholder="请输入部件名称"  ></a-input>-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="模块" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="modularId">-->
+<!--              <j-dict-select-tag type="list" v-model="model.modularId" dictCode="zy_cloths_modular,modular_name,id" placeholder="请选择模块" />-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
 <!--          <a-col :span="24">-->
 <!--            <a-form-model-item label="部件类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="componentType">-->
 <!--              <a-input v-model="model.componentType" placeholder="请输入部件类型"  ></a-input>-->
 <!--            </a-form-model-item>-->
 <!--          </a-col>-->
-          <a-col :span="24">
-            <a-form-model-item label="描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="description">
-              <a-textarea v-model="model.description" rows="4" placeholder="请输入描述"/>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pictureUrl">
-              <j-image-upload isMultiple  v-model="model.pictureUrl" ></j-image-upload>
-            </a-form-model-item>
-          </a-col>
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="description">-->
+<!--              <a-textarea v-model="model.description" rows="4" placeholder="请输入描述"/>-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pictureUrl">-->
+<!--              <j-image-upload isMultiple  v-model="model.pictureUrl" ></j-image-upload>-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
 
 <!--          <a-col :span="24">-->
 <!--            <a-form-model-item label="制衣模块类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="modularType">-->
@@ -84,7 +126,7 @@
          },
         labelCol: {
           xs: { span: 24 },
-          sm: { span: 5 },
+          sm: { span: 4 },
         },
         wrapperCol: {
           xs: { span: 24 },
@@ -164,4 +206,9 @@
       },
     }
   }
-</script>
\ No newline at end of file
+</script>
+<style scoped>
+  .ant-form-item{
+    margin-bottom: 16px;
+  }
+</style>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentListDetail.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentListDetail.vue
new file mode 100644
index 00000000..a10bb3fd
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentListDetail.vue
@@ -0,0 +1,118 @@
+<template>
+  <div>
+    <a-modal
+      title="制衣部件详情"
+      :visible="visible"
+      :confirm-loading="confirmLoading"
+      :width='1000'
+      @ok="handleOk"
+      @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.clothsTypeId_dictText}}</a-descriptions-item>
+        <a-descriptions-item label="部件名称">{{model.partsName}}</a-descriptions-item>
+        <a-descriptions-item label="模块">{{model.modularId_dictText}}</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>
+          <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>
+    </a-modal>
+  </div>
+</template>
+<script>
+  // 部件
+  // 工序
+  // 是否瓶颈工序
+  // 创建时间
+  const columns1 = [
+    {
+      title:'索引',
+      customRender:(text, record, index)=>index+1,
+      align:'center'
+    },
+    {
+      title: '部件',
+      dataIndex: 'nums',
+      key: 'nums',
+      align:'center'
+    },
+    {
+      title: '工序',
+      dataIndex: 'modularId_dictText',
+      key: 'modularId_dictText',
+      align:'center'
+    },
+    {
+      title: '是否瓶颈工序',
+      dataIndex: 'partsName',
+      key: 'partsName',
+      align:'center'
+    },
+    {
+      title: '创建时间',
+      key: 'createTime',
+      dataIndex: 'createTime',
+      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,
+        model:{
+        },
+        data1,
+        columns1,
+      }
+    },
+    methods: {
+      showModal(record) {
+        this.visible = true;
+        this.model = record
+        console.log('record')
+        console.log(record)
+      },
+      handleOk(e) {
+        this.confirmLoading = true;
+        setTimeout(() => {
+          this.visible = false;
+          this.confirmLoading = false;
+        }, 1);
+      },
+      handleCancel(e) {
+        this.visible = false;
+      },
+    },
+  }
+</script >
+<style scoped>
+  .title{
+    font-size: 18px;
+    margin: 1em 0;
+    font-weight: bold;
+  }
+</style>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularForm.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularForm.vue
index 6a197d96..e6699a8e 100644
--- a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularForm.vue
+++ b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularForm.vue
@@ -183,4 +183,9 @@
       },
     }
   }
-</script>
\ No newline at end of file
+</script>
+<style scoped>
+  .ant-form-item{
+    margin-bottom: 16px;
+  }
+</style>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/team/GroupxMemberList.vue b/ant-design-vue-jeecg/src/views/team/GroupxMemberList.vue
index 68b1a873..b2a0f564 100644
--- a/ant-design-vue-jeecg/src/views/team/GroupxMemberList.vue
+++ b/ant-design-vue-jeecg/src/views/team/GroupxMemberList.vue
@@ -178,7 +178,8 @@ export default {
   methods: {
     fanHui() {
       this.$router.push({
-        path: '/src/views/team/GroupxList',
+        //这里的路径是要返回的对应菜单的路由配置地址
+        path: '/team/GroupxList',
       });
     },
     // initDictConfig() {
diff --git a/ant-design-vue-jeecg/src/views/team/StationMachineList.vue b/ant-design-vue-jeecg/src/views/team/StationMachineList.vue
index 71ed4218..dae8deff 100644
--- a/ant-design-vue-jeecg/src/views/team/StationMachineList.vue
+++ b/ant-design-vue-jeecg/src/views/team/StationMachineList.vue
@@ -179,7 +179,7 @@ export default {
   methods: {
     fanHui() {
       this.$router.push({
-        path: '/src/views/team/StationList',
+        path: '/team/StationList',
         // path: '/src/views/zyclothsstyle/ZyClothsStyleList',
       });
     },
diff --git a/ant-design-vue-jeecg/src/views/team/StationToolList.vue b/ant-design-vue-jeecg/src/views/team/StationToolList.vue
index 0ab1b756..0162e70f 100644
--- a/ant-design-vue-jeecg/src/views/team/StationToolList.vue
+++ b/ant-design-vue-jeecg/src/views/team/StationToolList.vue
@@ -177,7 +177,7 @@ export default {
   methods: {
     fanHui() {
       this.$router.push({
-        path: '/src/views/team/StationList',
+        path: '/team/StationList',
         // path: '/src/views/zyclothsstyle/ZyClothsStyleList',
       });
     },
diff --git a/jeecg-boot/jeecg-boot-module-gdnk/src/main/java/org/jeecg/modules/demo/gdmlb/entity/ZyProductionTypesetting.java b/jeecg-boot/jeecg-boot-module-gdnk/src/main/java/org/jeecg/modules/demo/gdmlb/entity/ZyProductionTypesetting.java
index cab4b708..605d90de 100644
--- a/jeecg-boot/jeecg-boot-module-gdnk/src/main/java/org/jeecg/modules/demo/gdmlb/entity/ZyProductionTypesetting.java
+++ b/jeecg-boot/jeecg-boot-module-gdnk/src/main/java/org/jeecg/modules/demo/gdmlb/entity/ZyProductionTypesetting.java
@@ -40,8 +40,8 @@ public class ZyProductionTypesetting implements Serializable {
     @ApiModelProperty(value = "工单编号")
     private String workOrderId;
 	/**商品*/
-	@Excel(name = "商品", width = 15, dictTable = "zy_goods", dicText = "goods_num", dicCode = "id")
-	@Dict(dictTable = "zy_goods", dicText = "goods_num", dicCode = "id")
+	@Excel(name = "商品", width = 15, dictTable = "zy_goods", dicText = "goods_code", dicCode = "id")
+	@Dict(dictTable = "zy_goods", dicText = "goods_code", dicCode = "id")
     @ApiModelProperty(value = "商品")
     private String goodsId;
 	/**车间*/
diff --git a/jeecg-boot/jeecg-boot-module-mall/src/main/java/org/jeecg/modules/demo/mall/entity/ZyGoods.java b/jeecg-boot/jeecg-boot-module-mall/src/main/java/org/jeecg/modules/demo/mall/entity/ZyGoods.java
index e70574bb..46598b32 100644
--- a/jeecg-boot/jeecg-boot-module-mall/src/main/java/org/jeecg/modules/demo/mall/entity/ZyGoods.java
+++ b/jeecg-boot/jeecg-boot-module-mall/src/main/java/org/jeecg/modules/demo/mall/entity/ZyGoods.java
@@ -32,7 +32,7 @@ public class ZyGoods implements Serializable {
     /**商品编号*/
     @Excel(name = "商品编号", width = 15)
     @ApiModelProperty(value = "商品编号")
-    private java.lang.String goodsNum;
+    private java.lang.String goodsCode;
     /**商品来源*/
     @Excel(name = "商品来源", width = 15)
     @ApiModelProperty(value = "商品来源")
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyworkorder/controller/ZyWorkOrderController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyworkorder/controller/ZyWorkOrderController.java
index 5b8c18fb..e236aca1 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyworkorder/controller/ZyWorkOrderController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyworkorder/controller/ZyWorkOrderController.java
@@ -107,7 +107,7 @@ public class ZyWorkOrderController extends JeecgController<ZyWorkOrder, IZyWorkO
         ZyWorkOrder zyWorkOrder = zyWorkOrderService.getById(zyProductionTypesetting.getWorkOrderId());
         ZyGoods zyGoods = zyGoodsService.getById(zyProductionTypesetting.getGoodsId());
         zyProductionTypesetting.setWorkOrderId(zyWorkOrder.getOrderCode());
-        zyProductionTypesetting.setGoodsId(zyGoods.getGoodsNum());
+        zyProductionTypesetting.setGoodsId(zyGoods.getGoodsCode());
         return Result.OK(zyProductionTypesetting);
     }