From 30b5d2a409a45f3c181025f49caee490843a440e Mon Sep 17 00:00:00 2001
From: YTD <1158283261@qq.com>
Date: Mon, 14 Nov 2022 22:28:33 +0800
Subject: [PATCH] =?UTF-8?q?2022-11-14=E5=BC=B9=E7=AA=97=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ZyStyleAccessoriesList.vue                |  29 +-
 .../modules/ZyAccessoriesList.vue             | 174 ++++++++++++
 .../modules/ZyStyleAccessoriesModal.vue       |  35 ++-
 .../views/zystylefabric/ZyStyleFabricList.vue |  15 +-
 .../zystylefabric/modules/ZyFabricList.vue    | 268 ++++++++++++++++++
 .../modules/ZyStyleFabricModal.vue            |  34 ++-
 .../views/zystylemodule/ZyStyleModuleList.vue |  37 +--
 .../modules/ZyClothsModularList.vue           | 149 ++++++++++
 .../modules/ZyStyleModuleModal.vue            |  34 ++-
 .../ZyStyleAccessoriesController.java         |  13 +-
 .../controller/ZyStyleFabricController.java   |  39 ++-
 .../controller/ZyStyleModuleController.java   |  44 +--
 12 files changed, 772 insertions(+), 99 deletions(-)
 create mode 100644 ant-design-vue-jeecg/src/views/zystyleaccessories/modules/ZyAccessoriesList.vue
 create mode 100644 ant-design-vue-jeecg/src/views/zystylefabric/modules/ZyFabricList.vue
 create mode 100644 ant-design-vue-jeecg/src/views/zystylemodule/modules/ZyClothsModularList.vue

diff --git a/ant-design-vue-jeecg/src/views/zystyleaccessories/ZyStyleAccessoriesList.vue b/ant-design-vue-jeecg/src/views/zystyleaccessories/ZyStyleAccessoriesList.vue
index 8752662e..31cf5d2e 100644
--- a/ant-design-vue-jeecg/src/views/zystyleaccessories/ZyStyleAccessoriesList.vue
+++ b/ant-design-vue-jeecg/src/views/zystyleaccessories/ZyStyleAccessoriesList.vue
@@ -89,28 +89,28 @@
         </template>
 
         <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
+<!--          <a @click="handleEdit(record)">编辑</a>-->
 
-          <a-divider type="vertical" />
-          <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a @click="handleDetail(record)">详情</a>
-              </a-menu-item>
-              <a-menu-item>
+<!--          <a-divider type="vertical" />-->
+<!--          <a-dropdown>-->
+<!--            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>-->
+<!--            <a-menu slot="overlay">-->
+<!--              <a-menu-item>-->
+<!--                <a @click="handleDetail(record)">详情</a>-->
+<!--              </a-menu-item>-->
+<!--              <a-menu-item>-->
                 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
                   <a>删除</a>
                 </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
+<!--              </a-menu-item>-->
+<!--            </a-menu>-->
+<!--          </a-dropdown>-->
         </span>
 
       </a-table>
     </div>
 
-    <zy-style-accessories-modal ref="modalForm" @ok="modalFormOk"></zy-style-accessories-modal>
+    <zy-style-accessories-modal  @valueChange="valueChange" ref="modalForm" @ok="modalFormOk"></zy-style-accessories-modal>
   </a-card>
 </template>
 
@@ -193,6 +193,9 @@
     methods: {
       initDictConfig(){
       },
+        valueChange(value){
+            if (value) this.loadData()
+        },
         loadParameter() {
             if (this.loadRouteType === false) {
                 this.styleId = this.$route.query.id;
diff --git a/ant-design-vue-jeecg/src/views/zystyleaccessories/modules/ZyAccessoriesList.vue b/ant-design-vue-jeecg/src/views/zystyleaccessories/modules/ZyAccessoriesList.vue
new file mode 100644
index 00000000..640fbe0a
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/zystyleaccessories/modules/ZyAccessoriesList.vue
@@ -0,0 +1,174 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange1}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+      </a-table>
+    </div>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+
+  export default {
+    name: 'ZyAccessoriesList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+
+    },
+    data () {
+      return {
+        description: 'zy_accessories管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'类型id',
+            align:"center",
+            dataIndex: 'typeId'
+          },
+          {
+            title:'编号',
+            align:"center",
+            dataIndex: 'nums'
+          },
+          {
+            title:'名称',
+            align:"center",
+            dataIndex: 'contents'
+          },
+          {
+            title:'图片',
+            align:"center",
+            dataIndex: 'picture'
+          },
+          {
+            title:'材质',
+            align:"center",
+            dataIndex: 'material'
+          },
+          {
+            title:'规格',
+            align:"center",
+            dataIndex: 'specs'
+          },
+        ],
+        url: {
+          list: "/accessories/zyAccessories/list",
+          delete: "/accessories/zyAccessories/delete",
+          deleteBatch: "/accessories/zyAccessories/deleteBatch",
+          exportXlsUrl: "/accessories/zyAccessories/exportXls",
+          importExcelUrl: "accessories/zyAccessories/importExcel",
+
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+        onSelectChange1(selectedRowKeys, selectionRows) {
+            this.selectedRowKeys = selectedRowKeys;
+            this.selectionRows = selectionRows;
+            let ids = "";
+            for (var a = 0; a < this.selectedRowKeys.length; a++) {
+                ids += this.selectedRowKeys[a] + ",";
+            }
+            this.$emit('onChangeRowKey',ids)
+        },
+        add () {
+        },
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'typeId',text:'类型id'})
+        fieldList.push({type:'string',value:'nums',text:'编号'})
+        fieldList.push({type:'string',value:'contents',text:'名称'})
+        fieldList.push({type:'string',value:'picture',text:'图片'})
+        fieldList.push({type:'string',value:'material',text:'材质'})
+        fieldList.push({type:'string',value:'specs',text:'规格'})
+        fieldList.push({type:'int',value:'store',text:'库存量'})
+        fieldList.push({type:'string',value:'supplierInfo',text:'供货商信息'})
+        this.superFieldList = fieldList
+      },
+      handleDetail(id){
+        this.$refs.ZyAccessoriesFormDetail.showModal(id)
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/zystyleaccessories/modules/ZyStyleAccessoriesModal.vue b/ant-design-vue-jeecg/src/views/zystyleaccessories/modules/ZyStyleAccessoriesModal.vue
index 0f0ba1d8..1e985005 100644
--- a/ant-design-vue-jeecg/src/views/zystyleaccessories/modules/ZyStyleAccessoriesModal.vue
+++ b/ant-design-vue-jeecg/src/views/zystyleaccessories/modules/ZyStyleAccessoriesModal.vue
@@ -8,28 +8,41 @@
     :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
     @cancel="handleCancel"
     cancelText="关闭">
-    <zy-style-accessories-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></zy-style-accessories-form>
+<!--    <zy-style-accessories-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></zy-style-accessories-form>-->
+    <zy-accessories-list  ref="realForm" @onChangeRowKey="chuancan" @ok="submitCallback" :disabled="disableSubmit"></zy-accessories-list>
   </j-modal>
 </template>
 
 <script>
 
-  import ZyStyleAccessoriesForm from './ZyStyleAccessoriesForm'
+  // import ZyStyleAccessoriesForm from './ZyStyleAccessoriesForm'
+  import ZyAccessoriesList from "./ZyAccessoriesList";
+  import {postAction} from "../../../api/manage";
   export default {
     name: 'ZyStyleAccessoriesModal',
     components: {
-      ZyStyleAccessoriesForm
+        ZyAccessoriesList,
     },
     data () {
       return {
+          model:{
+              styleId:'',
+              accessoriesId:''
+          },
         title:'',
         width:800,
         visible: false,
-        disableSubmit: false
+        disableSubmit: false,
+          url: {
+              add: "/zyaccessories/zyStyleAccessories/add",
+              edit: "/zyaccessories/zyStyleAccessories/edit",
+              queryById: "/zyaccessories/zyStyleAccessories/queryById"
+          }
       }
     },
     methods: {
       add () {
+         this.model.styleId=this.$route.query.id;
         this.visible=true
         this.$nextTick(()=>{
           this.$refs.realForm.add();
@@ -45,8 +58,20 @@
         this.$emit('close');
         this.visible = false;
       },
+        chuancan(res){
+            this.model.accessoriesId=res;
+        },
       handleOk () {
-        this.$refs.realForm.submitForm();
+          postAction(this.url.add,this.model).then((res)=>{
+              if(res.success){
+                  this.$message.success(res.message);
+              }else{
+                  this.$message.warning(res.message);
+              }
+              this.$emit('valueChange',1)
+              this.close()
+
+          })
       },
       submitCallback(){
         this.$emit('ok');
diff --git a/ant-design-vue-jeecg/src/views/zystylefabric/ZyStyleFabricList.vue b/ant-design-vue-jeecg/src/views/zystylefabric/ZyStyleFabricList.vue
index a1205153..ee3f6213 100644
--- a/ant-design-vue-jeecg/src/views/zystylefabric/ZyStyleFabricList.vue
+++ b/ant-design-vue-jeecg/src/views/zystylefabric/ZyStyleFabricList.vue
@@ -83,10 +83,10 @@
         </template>
 
         <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
-          <a-divider type="vertical" />
-           <a @click="handleDetail(record)">详情</a>
-          <a-divider type="vertical" />
+<!--          <a @click="handleEdit(record)">编辑</a>-->
+<!--          <a-divider type="vertical" />-->
+<!--           <a @click="handleDetail(record)">详情</a>-->
+<!--          <a-divider type="vertical" />-->
           <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
             <a>删除</a>
           </a-popconfirm>
@@ -95,7 +95,7 @@
       </a-table>
     </div>
 
-    <zy-style-fabric-modal ref="modalForm" @ok="modalFormOk"></zy-style-fabric-modal>
+    <zy-style-fabric-modal @valueChange="valueChange" ref="modalForm" @ok="modalFormOk"></zy-style-fabric-modal>
   </a-card>
 </template>
 
@@ -191,11 +191,14 @@
     methods: {
       initDictConfig(){
       },
+        valueChange(value){
+            if (value) this.loadData()
+        },
       //加载传递参数
       loadParameter() {
         if (this.loadRouteType == false) {
           this.id = this.$route.query.id;
-          console.log("*******传递的id"+this.id)
+          // console.log("*******传递的id"+this.id)
           this.loadRouteType = true;
         }
       },
diff --git a/ant-design-vue-jeecg/src/views/zystylefabric/modules/ZyFabricList.vue b/ant-design-vue-jeecg/src/views/zystylefabric/modules/ZyFabricList.vue
new file mode 100644
index 00000000..a4937e4d
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/zystylefabric/modules/ZyFabricList.vue
@@ -0,0 +1,268 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+<!--          <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
+<!--            <a-form-item label="花样">-->
+<!--              <j-search-select-tag placeholder="请选择花样" v-model="queryParam.pattern" dict="pattern"/>-->
+<!--            </a-form-item>-->
+<!--          </a-col>-->
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="类型">
+              <a-input placeholder="类型" v-model="queryParam.typeId"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="编号">
+              <a-input placeholder="编号" v-model="queryParam.fabricNumber"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="名称">
+              <a-input placeholder="名称" v-model="queryParam.name"></a-input>
+            </a-form-item>
+          </a-col>
+          <template v-if="toggleSearchStatus">
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="颜色">
+              <a-input placeholder="请输入颜色" v-model="queryParam.color"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="花样">
+              <j-search-select-tag placeholder="请选择花样" v-model="queryParam.pattern" dict="pattern"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="材质">
+              <j-search-select-tag placeholder="请选择材质" v-model="queryParam.material" dict="material"/>
+            </a-form-item>
+          </a-col>
+          </template>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange1}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="imgeSlot" slot-scope="text">
+          <img  :src="text" height="" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+
+      </a-table>
+    </div>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  export default {
+    name: 'ZyFabricList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+    },
+    data () {
+      return {
+        description: '面料表管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'类型',
+            align:"center",
+            dataIndex: 'typeId_dictText'
+          },
+          {
+            title:'编号',
+            align:"center",
+            dataIndex: 'fabricNumber'
+          },
+          {
+            title:'名称',
+            align:"center",
+            dataIndex: 'name'
+          },
+          {
+            title:'颜色',
+            align:"center",
+            dataIndex: 'color'
+          },
+          {
+            title:'花样',
+            align:"center",
+            dataIndex: 'pattern_dictText'
+          },
+          {
+            title:'材质',
+            align:"center",
+            dataIndex: 'material_dictText'
+          },
+          {
+            title:'厚度',
+            align:"center",
+            dataIndex: 'ply_dictText'
+          },
+          {
+            title:'单价',
+            align:"center",
+            dataIndex: 'money'
+          },
+          {
+            title:'零售价',
+            align:"center",
+            dataIndex: 'retailPrice'
+          },
+          {
+            title:'品牌',
+            align:"center",
+            dataIndex: 'brandId_dictText'
+          },
+
+          {
+            title:'计量单位',
+            align:"center",
+            dataIndex: 'unit_dictText'
+          },
+
+          {
+            title:'密度',
+            align:"center",
+            dataIndex: 'density_dictText'
+          },
+        ],
+        url: {
+          list: "/fabric/zyFabric/list",
+          delete: "/fabric/zyFabric/delete",
+          deleteBatch: "/fabric/zyFabric/deleteBatch",
+          exportXlsUrl: "/fabric/zyFabric/exportXls",
+          importExcelUrl: "/fabric/zyFabric/importExcel",
+
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+      this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+        onSelectChange1(selectedRowKeys, selectionRows) {
+            this.selectedRowKeys = selectedRowKeys;
+            this.selectionRows = selectionRows;
+            let ids = "";
+            for (var a = 0; a < this.selectedRowKeys.length; a++) {
+                ids += this.selectedRowKeys[a] + ",";
+            }
+            this.$emit('onChangeRowKey',ids)
+        },
+        add (id) {
+        },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'color',text:'颜色',dictCode:''})
+        fieldList.push({type:'sel_search',value:'pattern',text:'花样',dictTable:'', dictText:'', dictCode:'pattern'})
+        fieldList.push({type:'sel_search',value:'material',text:'材质',dictTable:'', dictText:'', dictCode:'material'})
+        fieldList.push({type:'sel_search',value:'ply',text:'厚度',dictTable:'ply', dictText:'', dictCode:''})
+        fieldList.push({type:'int',value:'money',text:'单价',dictCode:''})
+        fieldList.push({type:'string',value:'imageUrl',text:'图片地址',dictCode:''})
+        fieldList.push({type:'popup',value:'typeId',text:'面料类型id', popup:{code:'zy_fabric_type',field:'id',orgFields:'id',destFields:'content'}})
+        fieldList.push({type:'sel_search',value:'brandId',text:'材料品牌id',dictTable:'brand', dictText:'', dictCode:''})
+        fieldList.push({type:'string',value:'fabricNumber',text:'材料编号',dictCode:''})
+        fieldList.push({type:'int',value:'unit',text:'1、为m。2：kg,等',dictCode:'unit1,,'})
+        fieldList.push({type:'int',value:'retailPrice',text:'零售价',dictCode:''})
+        fieldList.push({type:'sel_search',value:'density',text:'密度',dictTable:'density', dictText:'', dictCode:''})
+        fieldList.push({type:'string',value:'clothW',text:'幅宽',dictCode:'clothW,,'})
+        fieldList.push({type:'string',value:'location',text:'所在地区',dictCode:''})
+        fieldList.push({type:'int',value:'status',text:'状态  o 为下架 1为上架   ',dictCode:'fabric_status,,'})
+        fieldList.push({type:'int',value:'fabricGrade',text:'等级',dictCode:'fabric_grade,,'})
+        fieldList.push({type:'string',value:'qRcode',text:'二维码',dictCode:''})
+        fieldList.push({type:'string',value:'name',text:'名称',dictCode:''})
+        fieldList.push({type:'sel_depart',value:'supplierInfo',text:'供货商信息'})
+        fieldList.push({type:'string',value:'createTime',text:'创建时间',dictCode:''})
+        this.superFieldList = fieldList
+      },
+      handleDetail(id){
+        this.$refs.ZyFabricFormDetailModel.showModal(id)
+        // this.$children[0].showModal(id)
+      }
+    }
+  }
+</script>
+<style scoped>
+@import '~@assets/less/common.less';
+</style>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/zystylefabric/modules/ZyStyleFabricModal.vue b/ant-design-vue-jeecg/src/views/zystylefabric/modules/ZyStyleFabricModal.vue
index 6f8cb6cf..6163a2ff 100644
--- a/ant-design-vue-jeecg/src/views/zystylefabric/modules/ZyStyleFabricModal.vue
+++ b/ant-design-vue-jeecg/src/views/zystylefabric/modules/ZyStyleFabricModal.vue
@@ -8,32 +8,42 @@
     :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
     @cancel="handleCancel"
     cancelText="关闭">
-    <zy-style-fabric-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></zy-style-fabric-form>
+    <zy-fabric-list ref="realForm" @onChangeRowKey="chuancan" @ok="submitCallback" :disabled="disableSubmit"></zy-fabric-list>
   </j-modal>
 </template>
 
 <script>
 
-  import ZyStyleFabricForm from './ZyStyleFabricForm'
+  import ZyFabricList from "./ZyFabricList";
+  import {postAction} from "../../../api/manage";
   export default {
     name: 'ZyStyleFabricModal',
     components: {
-      ZyStyleFabricForm
+        ZyFabricList,
     },
     data () {
       return {
+          model:{
+              styleId:'',
+              fabricId:''
+          },
+          url: {
+              add: "/zystylefabric/zyStyleFabric/add",
+              edit: "/zystylefabric/zyStyleFabric/edit",
+              queryById: "/zystylefabric/zyStyleFabric/queryById"
+          },
         title:'',
-        width:800,
+        width:1500,
         visible: false,
         disableSubmit: false
       }
     },
     methods: {
       add (id) {
+          this.model.styleId=id
         this.visible=true
         this.$nextTick(()=>{
           this.$refs.realForm.add(id);
-          console.log("Modal层的id传递"+id);
         })
       },
       edit (record) {
@@ -46,8 +56,20 @@
         this.$emit('close');
         this.visible = false;
       },
+        chuancan(res){
+            this.model.fabricId=res;
+        },
       handleOk () {
-        this.$refs.realForm.submitForm();
+          postAction(this.url.add,this.model).then((res)=>{
+              if(res.success){
+                  this.$message.success(res.message);
+              }else{
+                  this.$message.warning(res.message);
+              }
+              this.$emit('valueChange',1)
+              this.close()
+
+          })
       },
       submitCallback(){
         this.$emit('ok');
diff --git a/ant-design-vue-jeecg/src/views/zystylemodule/ZyStyleModuleList.vue b/ant-design-vue-jeecg/src/views/zystylemodule/ZyStyleModuleList.vue
index 749d98bd..aa63a6e9 100644
--- a/ant-design-vue-jeecg/src/views/zystylemodule/ZyStyleModuleList.vue
+++ b/ant-design-vue-jeecg/src/views/zystylemodule/ZyStyleModuleList.vue
@@ -4,18 +4,18 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="服装类型">
-              <j-dict-select-tag placeholder="请输入服装类型" dictCode="zy_cloths_type,type_name,id"
-                                 v-model="queryParam.typeId"></j-dict-select-tag>
-            </a-form-item>
-          </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="服装款式">
-              <j-dict-select-tag placeholder="请选择服装款式" dictCode="zy_cloths_style,style_names,id"
-                                 v-model="queryParam.styleId"></j-dict-select-tag>
-            </a-form-item>
-          </a-col>
+<!--          <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
+<!--            <a-form-item label="服装类型">-->
+<!--              <j-dict-select-tag placeholder="请输入服装类型" dictCode="zy_cloths_type,type_name,id"-->
+<!--                                 v-model="queryParam.typeId"></j-dict-select-tag>-->
+<!--            </a-form-item>-->
+<!--          </a-col>-->
+<!--          <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
+<!--            <a-form-item label="服装款式">-->
+<!--              <j-dict-select-tag placeholder="请选择服装款式" dictCode="zy_cloths_style,style_names,id"-->
+<!--                                 v-model="queryParam.styleId"></j-dict-select-tag>-->
+<!--            </a-form-item>-->
+<!--          </a-col>-->
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="制衣模块">
               <j-dict-select-tag placeholder="请输入制衣模块" dictCode="zy_cloths_modular ,modular_name,id"
@@ -99,10 +99,10 @@
         </template>
 
         <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
-          <a-divider type="vertical"/>
-           <a @click="handleDetail(record)">详情</a>
-          <a-divider type="vertical"/>
+<!--          <a @click="handleEdit(record)">编辑</a>-->
+<!--          <a-divider type="vertical"/>-->
+<!--           <a @click="handleDetail(record)">详情</a>-->
+<!--          <a-divider type="vertical"/>-->
           <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
             <a>删除</a>
           </a-popconfirm>
@@ -111,7 +111,7 @@
       </a-table>
     </div>
 
-    <zy-style-module-modal ref="modalForm" @ok="modalFormOk"></zy-style-module-modal>
+    <zy-style-module-modal  @valueChange="valueChange" ref="modalForm" @ok="modalFormOk"></zy-style-module-modal>
   </a-card>
 </template>
 
@@ -219,6 +219,9 @@ export default {
   methods: {
     initDictConfig() {
     },
+      valueChange(value){
+          if (value) this.loadData()
+      },
     //加载传递参数
     loadParameter() {
       if (this.loadRouteType === false) {
diff --git a/ant-design-vue-jeecg/src/views/zystylemodule/modules/ZyClothsModularList.vue b/ant-design-vue-jeecg/src/views/zystylemodule/modules/ZyClothsModularList.vue
new file mode 100644
index 00000000..b81510f0
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/zystylemodule/modules/ZyClothsModularList.vue
@@ -0,0 +1,149 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+
+      <!-- 高级查询区域 -->
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange1}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" height="25px" alt=""
+               style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+      </a-table>
+    </div>
+
+<!--    <zy-cloths-modular-modal ref="modalForm" @ok="modalFormOk"></zy-cloths-modular-modal>-->
+  </a-card>
+</template>
+
+<script>
+
+import '@/assets/less/TableExpand.less'
+import {mixinDevice} from '@/utils/mixin'
+import {JeecgListMixin} from '@/mixins/JeecgListMixin'
+import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+
+export default {
+  name: 'ZyClothsModularList',
+  mixins: [JeecgListMixin, mixinDevice],
+  components: {
+
+  },
+  data() {
+    return {
+      description: '制衣模块 zy_cloths_modular管理页面',
+      // 表头
+      columns: [
+        {
+          title: '#',
+          dataIndex: '',
+          key: 'rowIndex',
+          width: 60,
+          align: "center",
+          customRender: function (t, r, index) {
+            return parseInt(index) + 1;
+          }
+        },
+        {
+          title: '编号',
+          align: "center",
+          dataIndex: 'nums'
+        },
+        {
+          title: '模块名称',
+          align: "center",
+          dataIndex: 'modularName'
+        },
+      ],
+      url: {
+        list: "/base/zyClothsModular/list",
+        delete: "/base/zyClothsModular/delete",
+        deleteBatch: "/base/zyClothsModular/deleteBatch",
+        exportXlsUrl: "/base/zyClothsModular/exportXls",
+        importExcelUrl: "base/zyClothsModular/importExcel",
+
+      },
+      dictOptions: {},
+      superFieldList: [],
+    }
+  },
+  created() {
+    this.getSuperFieldList();
+  },
+  computed: {
+    importExcelUrl: function () {
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+    },
+  },
+  methods: {
+      onSelectChange1(selectedRowKeys, selectionRows) {
+          this.selectedRowKeys = selectedRowKeys;
+          this.selectionRows = selectionRows;
+          let ids = "";
+          for (var a = 0; a < this.selectedRowKeys.length; a++) {
+              ids += this.selectedRowKeys[a] + ",";
+          }
+          this.$emit('onChangeRowKey',ids)
+      },
+      add (id,typeId) {
+      },
+    initDictConfig() {
+    },
+    getSuperFieldList() {
+      let fieldList = [];
+      fieldList.push({type: 'string', value: 'nums', text: '编号', dictCode: ''})
+      fieldList.push({type: 'string', value: 'modularName', text: '模块名称', dictCode: ''})
+      fieldList.push({type: 'string', value: 'description', text: '描述', dictCode: ''})
+      fieldList.push({type: 'string', value: 'clothsTypeId', text: '衣服类型', dictCode: 'zy_cloths_type,type_name,id'})
+      fieldList.push({type: 'string', value: 'enterpriseId', text: '企业', dictCode: ''})
+      fieldList.push({type: 'string', value: 'pictureUrl', text: '图片地址', dictCode: ''})
+      this.superFieldList = fieldList
+    }
+  }
+}
+</script>
+<style scoped>
+@import '~@assets/less/common.less';
+</style>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/zystylemodule/modules/ZyStyleModuleModal.vue b/ant-design-vue-jeecg/src/views/zystylemodule/modules/ZyStyleModuleModal.vue
index aac50b97..1d658a1c 100644
--- a/ant-design-vue-jeecg/src/views/zystylemodule/modules/ZyStyleModuleModal.vue
+++ b/ant-design-vue-jeecg/src/views/zystylemodule/modules/ZyStyleModuleModal.vue
@@ -8,28 +8,44 @@
     :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
     @cancel="handleCancel"
     cancelText="关闭">
-    <zy-style-module-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></zy-style-module-form>
+<!--    <zy-style-module-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></zy-style-module-form>-->
+     <zy-cloths-modular-list ref="realForm" @onChangeRowKey="chuancan" @ok="submitCallback" :disabled="disableSubmit"></zy-cloths-modular-list>
   </j-modal>
 </template>
 
 <script>
 
   import ZyStyleModuleForm from './ZyStyleModuleForm'
+  import ZyClothsModularList from "./ZyClothsModularList";
+  import {postAction} from "../../../api/manage";
   export default {
     name: 'ZyStyleModuleModal',
     components: {
+        ZyClothsModularList,
       ZyStyleModuleForm
     },
     data () {
       return {
+          model:{
+              styleId:'',
+              typeId:'',
+              modularId:'',
+        },
         title:'',
         width:800,
         visible: false,
-        disableSubmit: false
+        disableSubmit: false,
+          url: {
+              add: "/zystylemodule/zyStyleModule/add",
+              edit: "/zystylemodule/zyStyleModule/edit",
+              queryById: "/zystylemodule/zyStyleModule/queryById"
+          }
       }
     },
     methods: {
       add (id,typeId) {
+          this.model.styleId=id;
+          this.model.typeId=typeId;
         this.visible=true
         this.$nextTick(()=>{
           this.$refs.realForm.add(id,typeId);
@@ -45,8 +61,20 @@
         this.$emit('close');
         this.visible = false;
       },
+        chuancan(res){
+            this.model.modularId=res;
+        },
       handleOk () {
-        this.$refs.realForm.submitForm();
+          postAction(this.url.add,this.model).then((res)=>{
+              if(res.success){
+                  this.$message.success(res.message);
+              }else{
+                  this.$message.warning(res.message);
+              }
+              this.$emit('valueChange',1)
+              this.close()
+
+          })
       },
       submitCallback(){
         this.$emit('ok');
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyaccessories/controller/ZyStyleAccessoriesController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyaccessories/controller/ZyStyleAccessoriesController.java
index a180cdae..4a5537d0 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyaccessories/controller/ZyStyleAccessoriesController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyaccessories/controller/ZyStyleAccessoriesController.java
@@ -86,10 +86,15 @@ public class ZyStyleAccessoriesController extends JeecgController<ZyStyleAccesso
     @ApiOperation(value = "款式辅料管理-添加", notes = "款式辅料管理-添加")
     @PostMapping(value = "/add")
     public Result<?> add(@RequestBody ZyStyleAccessories zyStyleAccessories) {
-        int a = zyStyleAccessoriesMapper.count(zyStyleAccessories.getAccessoriesId(), zyStyleAccessories.getStyleId());
-        if (a >= 1)
-            return Result.error("添加失败，存在该款式辅料");
-        zyStyleAccessoriesService.save(zyStyleAccessories);
+        String[] split = zyStyleAccessories.getAccessoriesId().split(",");
+        for (String s : split) {
+            zyStyleAccessories.setAccessoriesId(s);
+            zyStyleAccessories.setId(null);
+            int a = zyStyleAccessoriesMapper.count(zyStyleAccessories.getAccessoriesId(), zyStyleAccessories.getStyleId());
+            if (a >= 1)
+                return Result.error("添加失败，存在该款式辅料");
+            zyStyleAccessoriesService.save(zyStyleAccessories);
+        }
         return Result.OK("添加成功！");
     }
 
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylefabric/controller/ZyStyleFabricController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylefabric/controller/ZyStyleFabricController.java
index a7d4e103..8b9be0f1 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylefabric/controller/ZyStyleFabricController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylefabric/controller/ZyStyleFabricController.java
@@ -3,17 +3,9 @@ package org.jeecg.modules.zystylefabric.controller;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -21,8 +13,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
-import org.jeecg.modules.demo.base.entity.ZyClothsModular;
-import org.jeecg.modules.demo.base.entity.ZyClothsType;
 import org.jeecg.modules.demo.fabric.entity.ZyFabric;
 import org.jeecg.modules.demo.fabric.service.IZyFabricService;
 import org.jeecg.modules.zyclothsstyle.entity.ZyClothsStyle;
@@ -31,21 +21,10 @@ import org.jeecg.modules.zystylefabric.entity.NewZyStyleFabric;
 import org.jeecg.modules.zystylefabric.entity.ZyStyleFabric;
 import org.jeecg.modules.zystylefabric.service.INewZyStyleFabricService;
 import org.jeecg.modules.zystylefabric.service.IZyStyleFabricService;
-import org.jeecg.modules.zystylemodel.entity.ZyStyleModel;
-import org.jeecg.modules.zystylemodule.entity.NewStyleModule;
-import org.jeecg.modules.zystylemodule.entity.ZyStyleModule;
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.aspect.annotation.AutoLog;
@@ -102,6 +81,7 @@ public class ZyStyleFabricController extends JeecgController<ZyStyleFabric, IZyS
 		List<ZyStyleFabric> list = zyStyleFabricService.list(queryWrapper);
 		List<NewZyStyleFabric> newZyStyleFabrics = new ArrayList<>();
 		for (ZyStyleFabric zyStyleF : list){
+			System.out.println("****"+zyStyleF);
 			NewZyStyleFabric newZySF = new NewZyStyleFabric();
 			//编辑回显
 			newZySF.setId(zyStyleF.getId());
@@ -114,7 +94,9 @@ public class ZyStyleFabricController extends JeecgController<ZyStyleFabric, IZyS
 			newZySF.setStyleNames(styleById.getStyleNames());
 			//模块编号和名称
 			String fabricId = zyStyleF.getFabricId();
+
 			ZyFabric fabricById = zyFabricService.getById(fabricId);
+
 			newZySF.setFabricNumber(fabricById.getFabricNumber());
 			newZySF.setFabricName(fabricById.getName());
 			newZySF.setCreateTime(zyStyleF.getCreateTime());
@@ -135,8 +117,19 @@ public class ZyStyleFabricController extends JeecgController<ZyStyleFabric, IZyS
 	@ApiOperation(value="款式面料表-添加", notes="款式面料表-添加")
 	//@RequiresPermissions("org.jeecg.modules.demo:zy_style_fabric:add")
 	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody ZyStyleFabric zyStyleFabric) {
-		zyStyleFabricService.save(zyStyleFabric);
+	public Result<Object> add(@RequestBody ZyStyleFabric zyStyleFabric) {
+		String[] split = zyStyleFabric.getFabricId().split(",");
+		QueryWrapper queryWrapper=new QueryWrapper();
+		queryWrapper.eq("style_id",zyStyleFabric.getStyleId());
+		for (String s : split) {
+			zyStyleFabric.setFabricId(s);
+			zyStyleFabric.setId(null);
+			queryWrapper.eq("fabric_id",zyStyleFabric.getFabricId());
+			int a=zyStyleFabricService.count(queryWrapper);
+			if(a>=1)
+				return Result.error("存在以添加过的数据！！！");
+			zyStyleFabricService.save(zyStyleFabric);
+		}
 		return Result.OK("添加成功！");
 	}
 
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/controller/ZyStyleModuleController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/controller/ZyStyleModuleController.java
index 93b65c9a..bf76ba74 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/controller/ZyStyleModuleController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/controller/ZyStyleModuleController.java
@@ -3,19 +3,11 @@ package org.jeecg.modules.zystylemodule.controller;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -28,24 +20,13 @@ import org.jeecg.modules.demo.base.service.IZyClothsModularService;
 import org.jeecg.modules.demo.base.service.IZyClothsTypeService;
 import org.jeecg.modules.zyclothsstyle.entity.ZyClothsStyle;
 import org.jeecg.modules.zyclothsstyle.service.IZyClothsStyleService;
-import org.jeecg.modules.zystylefabric.entity.NewZyStyleFabric;
 import org.jeecg.modules.zystylemodule.entity.NewStyleModule;
 import org.jeecg.modules.zystylemodule.entity.ZyStyleModule;
-import org.jeecg.modules.zystylemodule.mapper.ZyStyleModuleMapper;
-import org.jeecg.modules.zystylemodule.service.INewZyStyleModuleService;
 import org.jeecg.modules.zystylemodule.service.IZyStyleModuleService;
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.aspect.annotation.AutoLog;
@@ -177,9 +158,21 @@ public class ZyStyleModuleController extends JeecgController<ZyStyleModule, IZyS
     @ApiOperation(value = "款式模块表-添加", notes = "款式模块表-添加")
     //@RequiresPermissions("org.jeecg.modules.demo:zy_style_module:add")
     @PostMapping(value = "/add")
-    public Result<String> add(@RequestBody ZyStyleModule zyStyleModule) {
+    public Result<Object> add(@RequestBody ZyStyleModule zyStyleModule) {
+        String[] split = zyStyleModule.getModularId().split(",");
+        QueryWrapper queryWrapper=new QueryWrapper();
+        queryWrapper.eq("type_id",zyStyleModule.getTypeId());
+        queryWrapper.eq("style_id",zyStyleModule.getStyleId());
+        for (String s : split) {
+            zyStyleModule.setModularId(s);
+            zyStyleModule.setId(null);
+            queryWrapper.eq("modular_id",zyStyleModule.getModularId());
+            int a=zyStyleModuleService.count(queryWrapper);
+            if(a>=1)
+                return Result.error("存在以添加过的数据！！！");
+            zyStyleModuleService.save(zyStyleModule);
+        }
 
-        zyStyleModuleService.save(zyStyleModule);
         return Result.OK("添加成功！");
     }
 
@@ -193,7 +186,14 @@ public class ZyStyleModuleController extends JeecgController<ZyStyleModule, IZyS
     @ApiOperation(value = "款式模块表-编辑", notes = "款式模块表-编辑")
     //@RequiresPermissions("org.jeecg.modules.demo:zy_style_module:edit")
     @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
-    public Result<String> edit(@RequestBody ZyStyleModule zyStyleModule) {
+    public Result<Object> edit(@RequestBody ZyStyleModule zyStyleModule) {
+        QueryWrapper queryWrapper=new QueryWrapper();
+        queryWrapper.eq("type_id",zyStyleModule.getTypeId());
+        queryWrapper.eq("style_id",zyStyleModule.getStyleId());
+        queryWrapper.eq("modular_id",zyStyleModule.getModularId());
+        int a=zyStyleModuleService.count(queryWrapper);
+        if(a>=1)
+            return Result.error("修改失败，数据已存在！！！");
         zyStyleModuleService.updateById(zyStyleModule);
         return Result.OK("编辑成功!");
     }