2022-12-14 修改产品管理部分问题

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

@@ -11,8 +11,15 @@
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="类型名称" >
-              <a-input placeholder="请输入类型名称" v-model="queryParam.typeName" ></a-input>
+              <j-tree-select v-model="queryParam.id"
+                             dict="zy_cloths_type,type_name,id"
+                             pidField="type_id"
+                             placeholder="请选择类型名称" >
+              </j-tree-select>
             </a-form-item>
+<!--            <a-form-item label="类型名称">-->
+<!--              <a-input placeholder="请输入类型名称" v-model="queryParam.typeName" ></a-input>-->
+<!--            </a-form-item>-->
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="企业名称">
@@ -111,6 +118,8 @@
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import ZyClothsTypeModal from './modules/ZyClothsTypeModal'
+  import {filterObj} from "@/utils/util";
+  import {getAction} from "@api/manage";
 
   export default {
     name: 'ZyClothsTypeList',
@@ -147,7 +156,7 @@
             title:'类型名称',
             align:"center",
             dataIndex: 'typeName',
-            sorter:true
+            sorter:true,
           },
           {
             title:'企业',
@@ -174,7 +183,6 @@
           deleteBatch: "/base/zyClothsType/deleteBatch",
           exportXlsUrl: "/base/zyClothsType/exportXls",
           importExcelUrl: "base/zyClothsType/importExcel",
-
         },
         dictOptions:{},
         superFieldList:[],
@@ -182,6 +190,7 @@
     },
     created() {
     this.getSuperFieldList();
+    //   this.loadParameter();
     },
     computed: {
       importExcelUrl: function(){

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

@@ -81,7 +81,7 @@
           // ],
           typeName: [
             { required: true, message: '请输入类型名称!'},
-            { pattern: /^[0-9A-Za-z\u4e00-\u9fa5.,;，。；、!?]{0,5}$/, message: '文本长度过长'},
+            { pattern: /^[0-9A-Za-z\u4e00-\u9fa5.,;，。；、!?]{0,50}$/, message: '文本长度过长'},
           ],
           enterpriseId: [
             { required: true, message: '请输入企业!'},

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

@@ -1,7 +1,8 @@
 <template>
   <a-spin :spinning="confirmLoading">
     <j-form-container :disabled="formDisabled">
-      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail" :layout="horizontal">
+      <!--      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail" :layout="horizontal">-->
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
         <a-row>
           <a-col :span="12">
             <a-form-model-item label="企业" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="enterpriseId">
@@ -13,8 +14,8 @@
               <j-popup
                 v-model="model.typeName"
                 field="type_name"
-                org-fields="type_name,id"
+                org-fields="type_name,nums"
-                dest-fields="typeName,typeId"
+                dest-fields="typeName,styleId"
                 code="cloths_type"
                 :multi="false"
                 @input="popupCallback"
@@ -26,14 +27,11 @@
         <a-row>
           <a-col :span="12">
             <a-form-model-item label="形式" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="shape">
-              <j-dict-select-tag  type="radio" v-model="model.shape" dictCode="style_shape" placeholder="请输入形式"  ></j-dict-select-tag>
+              <j-dict-select-tag type="radio" v-model="model.shape" dictCode="style_shape"
+                                 placeholder="请输入形式"></j-dict-select-tag>
             </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="12">
             <a-form-model-item label="款式名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="styleNames">
               <a-input v-model="model.styleNames" placeholder="请输入款式名称"></a-input>
@@ -43,20 +41,22 @@
 
         <a-row>
           <a-col :span="12">
-            <a-form-model-item label="规格" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="specification">
+            <a-form-model-item label="编号" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="nums">
-              <a-input v-model="model.specification" placeholder="请输入规格"  ></a-input>
+              <a-input v-model="model.nums" placeholder="请输入编号" disabled=""></a-input>
             </a-form-model-item>
           </a-col>
+
           <a-col :span="12">
             <a-form-model-item label="定额用料" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="quotaMaterials">
               <a-input v-model="model.quotaMaterials" placeholder="请输入定额用料"></a-input>
             </a-form-model-item>
           </a-col>
         </a-row>
+
         <a-row>
           <a-col :span="12">
-            <a-form-model-item label="风格" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="characteristic">
+            <a-form-model-item label="规格" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="specification">
-              <a-input v-model="model.characteristic" placeholder="请输入风格"  ></a-input>
+              <a-input v-model="model.specification" placeholder="请输入规格"></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="12">
@@ -67,8 +67,8 @@
         </a-row>
         <a-row>
           <a-col :span="12">
-            <a-form-model-item label="结构" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="structure">
+            <a-form-model-item label="风格" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="characteristic">
-              <a-input v-model="model.structure" placeholder="请输入结构"  ></a-input>
+              <a-input v-model="model.characteristic" placeholder="请输入风格"></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="12">
@@ -76,12 +76,21 @@
               <j-dict-select-tag v-model="model.sewingForm" placeholder="请选择缝纫形式" dict-code="sewingForm"/>
             </a-form-model-item>
           </a-col>
+        </a-row>
+
+        <a-row>
+          <a-col :span="12">
+            <a-form-model-item label="结构" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="structure">
+              <a-input v-model="model.structure" placeholder="请输入结构"></a-input>
+            </a-form-model-item>
+          </a-col>
 
         </a-row>
         <a-row>
           <a-col :span="12">
             <a-form-model-item label="折叠搭配及包装" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="foldingPackaging">
-              <j-dict-select-tag v-model="model.foldingPackaging"  placeholder="请选择折叠搭配及包装" dict-code="foldingPackaging" />
+              <j-dict-select-tag v-model="model.foldingPackaging" placeholder="请选择折叠搭配及包装"
+                                 dict-code="foldingPackaging"/>
             </a-form-model-item>
           </a-col>
         </a-row>
@@ -94,7 +103,10 @@
         </a-row>
         <a-row>
           <a-col>
-            <a-form-model-item label="销售地区" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="salesTerritory" :labelAlign="left">
+            <!--            <a-form-model-item label="销售地区" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="salesTerritory" :labelAlign="left">-->
+            <!--              <a-textarea v-model="model.salesTerritory"  placeholder="请输入销售地区" />-->
+            <!--            </a-form-model-item>-->
+            <a-form-model-item label="销售地区" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="salesTerritory">
               <a-textarea v-model="model.salesTerritory" placeholder="请输入销售地区"/>
             </a-form-model-item>
           </a-col>
@@ -234,17 +246,6 @@
           <!--          </a-col>-->
         </a-row>
 
-
-
-
-
-
-
-
-
-
-
-
         <!--        <a-row>-->
         <!--        <a-col :span="24">-->
         <!--          <a-form-model-item label="企业" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="enterpriseId">-->
@@ -357,11 +358,11 @@
 
 import {httpAction, getAction} from '@/api/manage'
 import {validateDuplicateValue} from '@/utils/util'
+import store from '@/store'
 
 export default {
   name: 'ZyClothsStyleForm',
-    components: {
+  components: {},
-    },
   props: {
     //表单禁用
     disabled: {
@@ -375,6 +376,7 @@
       typeId: "",
       typeName: "",
       model: {
+        nums: '',
         shape: 1
       },
       labelCol: {
@@ -411,7 +413,9 @@
       url: {
         add: "/zyclothsstyle/zyClothsStyle/add",
         edit: "/zyclothsstyle/zyClothsStyle/edit",
-          queryById: "/zyclothsstyle/zyClothsStyle/queryById"
+        queryById: "/zyclothsstyle/zyClothsStyle/queryById",
+        //getAction的url
+        sort:"/base/zyProcess/sort"
       }
     }
   },
@@ -462,7 +466,19 @@
       })
     },
     popupCallback(value, row) {
+      console.log("1222346584" + "++++++")
+      var n = 8;
       this.model = Object.assign(this.model, row);
+      getAction(this.url.sort, {id: this.model.styleId}).then((res) => {
+        console.log("aaaaaa"+res.result);
+        var num = parseInt(res.result, 10) + 1
+        num = num.toString()
+        while (num.length < n) {
+          num = "0" + num
+        }
+        this.model.nums = this.model.styleId + num;
+        // console.log(this.model.processCode)
+      })
     },
   }
 }

jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsTypeController.java

@@ -60,6 +60,13 @@ public class ZyClothsTypeController extends JeecgController<ZyClothsType, IZyClo
         QueryWrapper<ZyClothsType> queryWrapper = QueryGenerator.initQueryWrapper(zyClothsType, req.getParameterMap());
         Page<ZyClothsType> page = new Page<ZyClothsType>(pageNo, pageSize);
         IPage<ZyClothsType> pageList = zyClothsTypeService.page(page, queryWrapper);
+        List<ZyClothsType> records = pageList.getRecords();
+        for (ZyClothsType zy : records) {
+            String typeId = zy.getTypeId();
+            if (StringUtils.isEmpty(typeId)){
+                zy.setTypeId("1455487094925819901");
+            }
+        }
         return Result.OK(pageList);
     }