From f03902bb74a6c89ac5969c42b6551687b30e5c49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Thu, 28 Jul 2022 23:55:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8A=9F=E8=83=BD=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/api/api.js                     |  2 +
 jshERP-web/src/views/system/FunctionList.vue  | 13 ++--
 .../views/system/modules/FunctionModal.vue    | 75 +++++++++++++++----
 3 files changed, 69 insertions(+), 21 deletions(-)

diff --git a/jshERP-web/src/api/api.js b/jshERP-web/src/api/api.js
index fd077785..7a2c3285 100644
--- a/jshERP-web/src/api/api.js
+++ b/jshERP-web/src/api/api.js
@@ -72,6 +72,7 @@ const getAllMaterialAttribute = (params)=>getAction("/materialAttribute/getAll",
 const addFunction = (params)=>postAction("/function/add",params);
 const editFunction = (params)=>putAction("/function/update",params);
 const checkFunction = (params)=>getAction("/function/checkIsNameExist",params);
+const checkNumber = (params)=>getAction("/function/checkIsNumberExist",params);
 //系统配置
 const addSystemConfig = (params)=>postAction("/systemConfig/add",params);
 const editSystemConfig = (params)=>putAction("/systemConfig/update",params);
@@ -163,6 +164,7 @@ export {
   addFunction,
   editFunction,
   checkFunction,
+  checkNumber,
   addSystemConfig,
   editSystemConfig,
   checkSystemConfig,
diff --git a/jshERP-web/src/views/system/FunctionList.vue b/jshERP-web/src/views/system/FunctionList.vue
index 1c82393a..197285c7 100644
--- a/jshERP-web/src/views/system/FunctionList.vue
+++ b/jshERP-web/src/views/system/FunctionList.vue
@@ -104,20 +104,21 @@
             }
           },
           {title: '编号 ', dataIndex: 'number', width: 80},
-          {title: '名称', dataIndex: 'name', width: 100},
+          {title: '名称', dataIndex: 'name', width: 120, ellipsis:true},
           {title: '上级编号', dataIndex: 'parentNumber', width: 80},
-          {title: '链接', dataIndex: 'url', width: 250},
-          {title: '组件', dataIndex: 'component', width: 250},
-          {title: '排序', dataIndex: 'sort', width: 80},
+          {title: '上级名称', dataIndex: 'parentName', width: 120, ellipsis:true},
+          {title: '链接', dataIndex: 'url', width: 250, ellipsis:true},
+          {title: '组件', dataIndex: 'component', width: 250, ellipsis:true},
+          {title: '排序', dataIndex: 'sort', width: 60},
           {
             title: '是否启用', dataIndex: 'enabled', width: 80, align: "center",
             scopedSlots: { customRender: 'customRenderFlag' }
           },
-          {title: '图标', dataIndex: 'icon', width: 110},
+          {title: '图标', dataIndex: 'icon', width: 120},
           {
             title: '操作',
             dataIndex: 'action',
-            width: 200,
+            width: 150,
             align:"center",
             scopedSlots: { customRender: 'action' },
           }
diff --git a/jshERP-web/src/views/system/modules/FunctionModal.vue b/jshERP-web/src/views/system/modules/FunctionModal.vue
index 5a9e52f1..9cebdf0b 100644
--- a/jshERP-web/src/views/system/modules/FunctionModal.vue
+++ b/jshERP-web/src/views/system/modules/FunctionModal.vue
@@ -23,22 +23,22 @@
           <a-input placeholder="请输入名称" v-decorator.trim="[ 'name', validatorRules.name]" />
         </a-form-item>
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="上级编号">
-          <a-input placeholder="请输入上级编号" v-decorator.trim="[ 'parentNumber' ]" />
+          <a-input placeholder="请输入上级编号" v-decorator.trim="[ 'parentNumber', validatorRules.parentNumber ]" />
         </a-form-item>
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="链接">
-          <a-input placeholder="请输入链接" v-decorator.trim="[ 'url' ]" />
+          <a-input placeholder="请输入链接" v-decorator.trim="[ 'url', validatorRules.url ]" />
         </a-form-item>
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="组件">
-          <a-input placeholder="请输入组件" v-decorator.trim="[ 'component' ]" />
+          <a-input placeholder="请输入组件" v-decorator.trim="[ 'component', validatorRules.component ]" />
         </a-form-item>
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="排序">
-          <a-input placeholder="请输入排序" v-decorator.trim="[ 'sort' ]" />
+          <a-input placeholder="请输入排序" v-decorator.trim="[ 'sort', validatorRules.sort ]" />
         </a-form-item>
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="功能按钮">
           <j-select-multiple placeholder="请选择功能按钮" v-model="jselectMultiple.value" :options="jselectMultiple.options"/>
         </a-form-item>
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="图标">
-          <a-input placeholder="请输入图标" v-decorator.trim="[ 'icon' ]" />
+          <a-input placeholder="请输入图标" v-decorator.trim="[ 'icon', validatorRules.icon ]" />
         </a-form-item>
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="是否启用">
           <a-switch checked-children="启用" un-checked-children="禁用" v-model="enabledSwitch" @change="onChange"/>
@@ -49,7 +49,7 @@
 </template>
 <script>
   import pick from 'lodash.pick'
-  import {addFunction,editFunction,checkFunction } from '@/api/api'
+  import {addFunction,editFunction,checkFunction, checkNumber } from '@/api/api'
   import {autoJumpNextInput} from "@/utils/util"
   import JSelectMultiple from '@/components/jeecg/JSelectMultiple'
   export default {
@@ -87,17 +87,45 @@
         confirmLoading: false,
         form: this.$form.createForm(this),
         validatorRules:{
+          number:{
+            rules: [
+              { required: true, message: '请输入编号!' },
+              { min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' },
+              { validator: this.validateNumber}
+            ]
+          },
           name:{
             rules: [
               { required: true, message: '请输入名称!' },
               { min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' },
-              { validator: this.validatePersonName}
-            ]},
-          type:{
-            rules: [
-              { required: true, message: '请选择类型!' }
+              { validator: this.validateName}
             ]
-          }
+          },
+          parentNumber:{
+            rules: [
+              { required: true, message: '请输入上级编号!' }
+            ]
+          },
+          url:{
+            rules: [
+              { required: true, message: '请输入链接!' }
+            ]
+          },
+          component:{
+            rules: [
+              { required: true, message: '请输入组件!' }
+            ]
+          },
+          sort:{
+            rules: [
+              { required: true, message: '请输入排序!' }
+            ]
+          },
+          icon:{
+            rules: [
+              { required: true, message: '请输入图标!' }
+            ]
+          },
         },
       }
     },
@@ -125,7 +153,7 @@
           this.jselectMultiple.value = ''
         }
         this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.model,'number', 'name', 'parentNumber', 'url', 'component', 'sort', 'pushBtn', 'icon', 'enabled'))
+          this.form.setFieldsValue(pick(this.model,'number', 'name', 'parentNumber', 'parentName', 'url', 'component', 'sort', 'pushBtn', 'icon', 'enabled'))
           autoJumpNextInput('functionModal')
         });
       },
@@ -163,7 +191,24 @@
       handleCancel () {
         this.close()
       },
-      validatePersonName(rule, value, callback){
+      validateNumber(rule, value, callback){
+        let params = {
+          number: value,
+          id: this.model.id?this.model.id:0
+        };
+        checkNumber(params).then((res)=>{
+          if(res && res.code===200) {
+            if(!res.data.status){
+              callback();
+            } else {
+              callback("编号已经存在！");
+            }
+          } else {
+            callback(res.data);
+          }
+        });
+      },
+      validateName(rule, value, callback){
         let params = {
           name: value,
           id: this.model.id?this.model.id:0
@@ -173,7 +218,7 @@
             if(!res.data.status){
               callback();
             } else {
-              callback("名称已经存在");
+              callback("名称已经存在！");
             }
           } else {
             callback(res.data);