2022-12-1 赵玉瑞 修改相关部分问题

ant-design-vue-jeecg/src/views/process/ZyClothsComponentList.vue

@@ -17,7 +17,7 @@
         <a-button type="primary" icon="import">导入</a-button>
       </a-upload>
       <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+<!--      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay">
           <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
@@ -68,7 +68,7 @@
         </template>
 
         <span slot="action2" slot-scope="text, record"  >
-          <a @click="viewVid2(record)" >查看</a>
+          <a @click="viewVid2(record)" >管理</a>
         </span>
 
         <span slot="action" slot-scope="text, record">
@@ -151,11 +151,11 @@
             dataIndex: 'componentType'
           },
 
-          {
+          // {
-            title:'描述',
+          //   title:'描述',
-            align:"center",
+          //   align:"center",
-            dataIndex: 'description'
+          //   dataIndex: 'description'
-          },
+          // },
           {
             title:'图片',
             align:"center",
@@ -167,11 +167,11 @@
             align:"center",
             dataIndex: 'modularId_dictText'
           },
-          {
+          // {
-            title:'制衣模块类型',
+          //   title:'制衣模块类型',
-            align:"center",
+          //   align:"center",
-            dataIndex: 'modularType_dictText'
+          //   dataIndex: 'modularType_dictText'
-          },
+          // },
           {
             title:'企业',
             align:"center",

ant-design-vue-jeecg/src/views/process/ZyClothsModularCompentList.vue

@@ -2,7 +2,7 @@
   <!--  <a-card :bordered="false">-->
   <a-modal
     width="70%"
-    title="评分项管理"
+    title="模块部件管理"
     :visible="visible"
     :confirm-loading="confirmLoading"
     @ok="handleOk"
@@ -20,14 +20,14 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <a-button @click="handleAdd1(yid)" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('制衣模块部件中间表')">导出</a-button>
+<!--      <a-button type="primary" icon="download" @click="handleExportXls('制衣模块部件中间表')">导出</a-button>-->
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
+<!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"-->
-                @change="handleImportExcel">
+<!--                @change="handleImportExcel">-->
-        <a-button type="primary" icon="import">导入</a-button>
+<!--        <a-button type="primary" icon="import">导入</a-button>-->
-      </a-upload>
+<!--      </a-upload>-->
-      <!-- 高级查询区域 -->
+<!--      &lt;!&ndash; 高级查询区域 &ndash;&gt;-->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal"
+<!--      <j-super-query :fieldList="superFieldList" ref="superQueryModal"-->
-                     @handleSuperQuery="handleSuperQuery"></j-super-query>
+<!--                     @handleSuperQuery="handleSuperQuery"></j-super-query>-->
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay">
           <a-menu-item key="1" @click="batchDel">

ant-design-vue-jeecg/src/views/process/ZyClothsModularList.vue

@@ -12,14 +12,14 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('zy_cloths_modular')">导出</a-button>
+<!--      <a-button type="primary" icon="download" @click="handleExportXls('zy_cloths_modular')">导出</a-button>-->
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
+<!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"-->
-                @change="handleImportExcel">
+<!--                @change="handleImportExcel">-->
-        <a-button type="primary" icon="import">导入</a-button>
+<!--        <a-button type="primary" icon="import">导入</a-button>-->
-      </a-upload>
+<!--      </a-upload>-->
       <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal"
+<!--      <j-super-query :fieldList="superFieldList" ref="superQueryModal"-->
-                     @handleSuperQuery="handleSuperQuery"></j-super-query>
+<!--                     @handleSuperQuery="handleSuperQuery"></j-super-query>-->
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay">
           <a-menu-item key="1" @click="batchDel">
@@ -77,10 +77,10 @@
         </template>
 
         <span slot="action2" slot-scope="text, record">
-            <a @click="viewVid(record)">查看</a>
+            <a @click="viewVid(record)">管理</a>
         </span>
         <span slot="action3" slot-scope="text, record">
-            <a @click="viewVid2(record)">查看</a>
+            <a @click="viewVid2(record)">管理</a>
         </span>
 
         <span slot="action" slot-scope="text, record">
@@ -167,11 +167,11 @@ export default {
         //   align: "center",
         //   dataIndex: 'modularType_dictText'
         // },
-        {
+        // {
-          title: '描述',
+        //   title: '描述',
-          align: "center",
+        //   align: "center",
-          dataIndex: 'description'
+        //   dataIndex: 'description'
-        },
+        // },
         {
           title: '衣服类型',
           align: "center",

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

@@ -3,6 +3,11 @@
     <j-form-container :disabled="formDisabled">
       <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
         <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>
@@ -33,21 +38,17 @@
               <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-col :span="24">-->
-            <a-form-model-item label="制衣模块类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="modularType">
+<!--            <a-form-model-item label="制衣模块类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="modularType">-->
-              <j-dict-select-tag type="list" v-model="model.modularType" dictCode="zyModularType" placeholder="请选择制衣模块类型" />
+<!--              <j-dict-select-tag type="list" v-model="model.modularType" dictCode="zyModularType" placeholder="请选择制衣模块类型" />-->
-            </a-form-model-item>
+<!--            </a-form-model-item>-->
-          </a-col>
+<!--          </a-col>-->
 <!--          <a-col :span="24">-->
 <!--            <a-form-model-item label="企业" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="enterpriseId">-->
 <!--              <a-input v-model="model.enterpriseId" placeholder="请输入企业"  ></a-input>-->
 <!--            </a-form-model-item>-->
 <!--          </a-col>-->
-          <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-row>
       </a-form-model>
     </j-form-container>

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

@@ -3,11 +3,7 @@
     <j-form-container :disabled="formDisabled">
       <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
         <a-row>
-          <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="modularType">-->
 <!--              <j-dict-select-tag type="list" v-model="model.modularType" dictCode="zyModularType" placeholder="请选择制衣模块类型" />-->
@@ -28,6 +24,11 @@
             </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-row>
       </a-form-model>
     </j-form-container>

ant-design-vue-jeecg/src/views/zyclothsstyle/modules/ZyClothsStyleForm.vue

@@ -3,6 +3,12 @@
     <j-form-container :disabled="formDisabled">
       <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
         <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="企业" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="enterpriseId">
+              <j-select-depart v-model="model.enterpriseId" multi  />
+            </a-form-model-item>
+          </a-col>
+
           <a-col :span="24">
             <a-form-model-item label="服装类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="typeId">
               <j-popup
@@ -97,11 +103,7 @@
               <j-dict-select-tag v-model="model.sewingForm" placeholder="请选择缝纫形式" dict-code="sewingForm"/>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+
-            <a-form-model-item label="企业" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="enterpriseId">
-              <j-select-depart v-model="model.enterpriseId" multi  />
-            </a-form-model-item>
-          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/controller/ZyClothsStyleController.java

@@ -10,6 +10,7 @@ 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;
@@ -93,7 +94,6 @@ public class ZyClothsStyleController extends JeecgController<ZyClothsStyle, IZyC
     }
 
     /**
-	  *
      * @return
      */
     @AutoLog(value = "服装款式表-查询所有")
@@ -114,6 +114,7 @@ public class ZyClothsStyleController extends JeecgController<ZyClothsStyle, IZyC
 
     /**
      * 制衣部件
+     *
      * @return
      */
     @AutoLog(value = "服装款式表-制衣部件查询所有")
@@ -146,6 +147,7 @@ public class ZyClothsStyleController extends JeecgController<ZyClothsStyle, IZyC
         return Result.OK(list);
 
     }
+
     /**
      * 添加
      *
@@ -156,6 +158,8 @@ public class ZyClothsStyleController extends JeecgController<ZyClothsStyle, IZyC
     @ApiOperation(value = "服装款式表-添加", notes = "服装款式表-添加")
     @PostMapping(value = "/add")
     public Result<?> add(@RequestBody ZyClothsStyle zyClothsStyle) {
+    	//生成编号 类型编号（10位）+顺序号（8位）在service层处理
+		zyClothsStyle.setNums(zyClothsStyleService.generateNumber(zyClothsStyle));
         zyClothsStyleService.save(zyClothsStyle);
         return Result.OK("添加成功！");
     }

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/service/IZyClothsStyleService.java

@@ -12,4 +12,6 @@ import org.jeecg.modules.zyclothsstyle.entity.ZyClothsStyle;
  */
 public interface IZyClothsStyleService extends IService<ZyClothsStyle> {
 
+    /**生成编号 类型编号（10位）+顺序号（8位）*/
+    String generateNumber(ZyClothsStyle zyClothsStyle);
 }

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/service/impl/ZyClothsStyleServiceImpl.java

@@ -17,4 +17,17 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class ZyClothsStyleServiceImpl extends ServiceImpl<ZyClothsStyleMapper, ZyClothsStyle> implements IZyClothsStyleService {
 
+    /**
+     * 生成编号 类型编号（10位）+顺序号（8位）
+     *
+     * @param zyClothsStyle
+     */
+    @Override
+    public String generateNumber(ZyClothsStyle zyClothsStyle) {
+        //先拿到类型编号
+
+        //在来一个顺序号
+        //生成编码
+        return null;
+    }
 }