From fe2e556036fa37011168655eec719b43c0fab49c Mon Sep 17 00:00:00 2001
From: wangjiadong <1654135867@qq.com>
Date: Mon, 9 Jan 2023 14:55:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/starehouse/admin/StarehouseList.vue | 20 +++++++++----
 .../admin/modules/StarehouseForm.vue          | 28 +++++++++++++++----
 .../demo/starehouse/entity/Starehouse.java    |  8 ++++--
 3 files changed, 44 insertions(+), 12 deletions(-)

diff --git a/ant-design-vue-jeecg/src/views/starehouse/admin/StarehouseList.vue b/ant-design-vue-jeecg/src/views/starehouse/admin/StarehouseList.vue
index d44ef7ec..c391050f 100644
--- a/ant-design-vue-jeecg/src/views/starehouse/admin/StarehouseList.vue
+++ b/ant-design-vue-jeecg/src/views/starehouse/admin/StarehouseList.vue
@@ -21,10 +21,15 @@
               </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.phoe"></a-input>
+              </a-form-item>
+            </a-col>
+           <!-- <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="仓库存储规则">
                 <j-dict-select-tag placeholder="请选择仓库存储规则" v-model="queryParam.type" dictCode="goods_category"/>
               </a-form-item>
-            </a-col>
+            </a-col>-->
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="管理员">
                 <j-search-select-tag placeholder="请选择管理员" v-model="queryParam.userId" dict="sys_user,realname,id"/>
@@ -165,9 +170,9 @@
             }
           },
           {
-            title:'更新日期',
+            title:'创建日期',
             align:"center",
-            dataIndex: 'updateTime'
+            dataIndex: 'createTime'
           },
           {
             title:'名称',
@@ -184,16 +189,21 @@
             align:"center",
             dataIndex: 'exclusive_dictText'
           },
-          {
+          /*{
             title:'仓库存储规则',
             align:"center",
             dataIndex: 'type_dictText'
-          },
+          },*/
           {
             title:'地址',
             align:"center",
             dataIndex: 'address'
           },
+          {
+            title:'电话',
+            align:"center",
+            dataIndex: 'phoe'
+          },
           {
             title:'管理员',
             align:"center",
diff --git a/ant-design-vue-jeecg/src/views/starehouse/admin/modules/StarehouseForm.vue b/ant-design-vue-jeecg/src/views/starehouse/admin/modules/StarehouseForm.vue
index b7698e44..a993d17c 100644
--- a/ant-design-vue-jeecg/src/views/starehouse/admin/modules/StarehouseForm.vue
+++ b/ant-design-vue-jeecg/src/views/starehouse/admin/modules/StarehouseForm.vue
@@ -4,8 +4,8 @@
       <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="updateTime">
-              <j-date placeholder="请选择更新日期"  v-model="model.updateTime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" disabled/>
+            <a-form-model-item label="创建日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="updateTime">
+              <j-date placeholder="请选择创建日期"  v-model="model.createTime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" disabled/>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -31,16 +31,24 @@
               <j-dict-select-tag type="radio" v-model="model.exclusive" dictCode="yn" 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="type">
               <j-dict-select-tag type="list" v-model="model.type" dictCode="goods_category" placeholder="请选择仓库存储规则" />
             </a-form-model-item>
-          </a-col>
+          </a-col>-->
           <a-col :span="24">
             <a-form-model-item label="地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="address">
               <a-input v-model="model.address" placeholder="请输入地址"  ></a-input>
             </a-form-model-item>
           </a-col>
+
+          <a-col :span="24">
+            <a-form-model-item label="电话" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="phoe">
+              <a-input v-model="model.phoe" placeholder="请输入电话"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+
+
           <a-col :span="24">
             <a-form-model-item label="管理员" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="username">
               <j-popup
@@ -85,7 +93,7 @@
     data () {
       return {
         model:{
-          exclusive : "1",
+          exclusive : "0",
           state : "1"
          },
         labelCol: {
@@ -98,6 +106,16 @@
         },
         confirmLoading: false,
         validatorRules: {
+          name: [
+            { required: true, message: '请输入名称!'},
+          ],
+          partmentnae: [
+            { required: true, message: '请输入部门!'},
+          ],
+          phoe: [
+            { required: false},
+            { pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号码!'},
+          ],
         },
         url: {
           add: "/starehouse/starehouse/add",
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/starehouse/entity/Starehouse.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/starehouse/entity/Starehouse.java
index 96fdd2a4..a4579728 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/starehouse/entity/Starehouse.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/starehouse/entity/Starehouse.java
@@ -74,10 +74,10 @@ public class Starehouse implements Serializable {
     @ApiModelProperty(value = "是否专属")
     private Integer exclusive;
     /**仓库存储规则*/
-    @Excel(name = "仓库存储规则", width = 15, dicCode = "goods_category")
+/*    @Excel(name = "仓库存储规则", width = 15, dicCode = "goods_category")
     @Dict(dicCode = "goods_category")
     @ApiModelProperty(value = "仓库存储规则")
-    private java.lang.String type;
+    private java.lang.String type;*/
 	/**地址*/
 	@Excel(name = "地址", width = 15)
     @ApiModelProperty(value = "地址")
@@ -96,4 +96,8 @@ public class Starehouse implements Serializable {
 	@Dict(dicCode = "yn")
     @ApiModelProperty(value = "库存预定")
     private String state;
+    /**电话*/
+    @Excel(name = "电话", width = 15)
+    @ApiModelProperty(value = "电话")
+    private java.lang.String phoe;
 }