From 92a2a38e18fd503dd81c719d7e3d95a986cd2958 Mon Sep 17 00:00:00 2001
From: admin <>
Date: Mon, 18 Mar 2024 14:17:04 +0800
Subject: [PATCH] =?UTF-8?q?update:=20=E6=96=B0=E5=A2=9E=E4=BA=BA=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages.json                                |  12 +
 src/pagesApp/components/addReceiveProduct.vue |  25 +-
 src/pagesApp/components/addShipmentType.vue   |  28 ++-
 src/pagesApp/components/addUser.vue           | 216 ++++++++++++++++++
 src/pagesApp/receiveProduct.vue               |   2 +-
 src/pagesApp/user.vue                         | 139 +++++++++++
 src/pagesHome/index.vue                       | 117 +++++-----
 src/pagesHome/static/17.png                   | Bin 0 -> 5518 bytes
 src/pagesHome/static/18.png                   | Bin 0 -> 4418 bytes
 src/services/goods.ts                         |   8 +
 src/static/style/common.scss                  |   8 +-
 src/types/user.d.ts                           |   1 +
 12 files changed, 474 insertions(+), 82 deletions(-)
 create mode 100644 src/pagesApp/components/addUser.vue
 create mode 100644 src/pagesApp/user.vue
 create mode 100644 src/pagesHome/static/17.png
 create mode 100644 src/pagesHome/static/18.png

diff --git a/src/pages.json b/src/pages.json
index 3fb7dcd..0f653a3 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -347,6 +347,12 @@
             "navigationBarTitleText": "出货分类"
           }
         },
+        {
+          "path": "user",
+          "style": {
+            "navigationBarTitleText": "人员管理"
+          }
+        },
         {
           "path": "components/addSupplierType",
           "style": {
@@ -394,6 +400,12 @@
           "style": {
             "navigationBarTitleText": "新增库存卡"
           }
+        },
+        {
+          "path": "components/addUser",
+          "style": {
+            "navigationBarTitleText": "新增人员"
+          }
         }
       ]
     }
diff --git a/src/pagesApp/components/addReceiveProduct.vue b/src/pagesApp/components/addReceiveProduct.vue
index fbea25f..2631f03 100644
--- a/src/pagesApp/components/addReceiveProduct.vue
+++ b/src/pagesApp/components/addReceiveProduct.vue
@@ -51,7 +51,9 @@
         @select="(v: any) => handleSelect(item.childKey, v)"
         @close="contrlModalParams[item.childKey].isShow = false"
         :closeOnClickAction="true"
+        :scroll="true"
       ></u-action-sheet>
+      
     </block>
   </view>
   <view class="btn-box">
@@ -151,12 +153,12 @@ const handleSelect = (key: string, v: any) => {
 const save = () => {
   if (model1.formData.id) {
     GoodsApi.EditReceiveProduct(model1.formData).then((res) => {
-    if (res.code === 200) {
-      uni.redirectTo({
-        url: "/pagesApp/receiveProduct", // 要跳转到的页面路径
-      });
-    }
-  });
+      if (res.code === 200) {
+        uni.redirectTo({
+          url: "/pagesApp/receiveProduct", // 要跳转到的页面路径
+        });
+      }
+    });
   } else {
     GoodsApi.addReProducts(model1.formData).then((res) => {
       if (res.code === 200) {
@@ -168,15 +170,12 @@ const save = () => {
   }
 };
 
-
 const getTypeList = () => {
-  GoodsApi.getPage({ pageNum: 1, pageSize: 10 }).then((res) => {
+  GoodsApi.allReCategory().then((res) => {
     if (res.code === 200) {
-      contrlModalParams.reCategory.list = (res.data as any).list.map(
-        (item: any) => {
-          return { ...item, name: item.reCategoryName };
-        }
-      );
+      contrlModalParams.reCategory.list = (res.data as any).map((item: any) => {
+        return { ...item, name: item.reCategoryName };
+      });
     }
   });
 };
diff --git a/src/pagesApp/components/addShipmentType.vue b/src/pagesApp/components/addShipmentType.vue
index 979c524..09ac4f2 100644
--- a/src/pagesApp/components/addShipmentType.vue
+++ b/src/pagesApp/components/addShipmentType.vue
@@ -83,20 +83,28 @@ const rules = ref({
   },
 });
 const contrlModalParams = reactive<any>({
-  cardType: {
+  parent: {
     isShow: false,
     title: "标题",
     list: [{
-      id: 1,
-      name: '出库卡'
-    },{
-      id: 2,
-      name: '入库卡'
+      id: 0,
+      name: '主分类'
     }],
   }
 });
 
 const formAttrList = reactive<any>([
+  {
+    name: "上级菜单",
+    key: "parentName",
+    type: "select",
+    required: true,
+    childKey: "parent",
+    fn: () => {
+      contrlModalParams.parent.isShow = true;
+      contrlModalParams.parent.title = "库存卡类型";
+    },
+  },
   {
     name: "出货分类",
     key: "shmCategoryName",
@@ -107,9 +115,9 @@ const formAttrList = reactive<any>([
 
 const handleSelect = (key: string, v: any) => {
   contrlModalParams[key].isShow = false;
-  if (key === "cardType") {
-    model1.formData.typeName = v.name;
-    model1.formData.type = v.id;
+  if (key === "parent") {
+    model1.formData.parentName = v.name;
+    model1.formData.parentId = v.id;
   }
 };
 
@@ -123,7 +131,7 @@ const save = () => {
       }
     });
   } else {
-    GoodsApi.addShmCategory({...model1.formData, parentId: 0}).then((res) => {
+    GoodsApi.addShmCategory({...model1.formData}).then((res) => {
       if (res.code === 200) {
         uni.redirectTo({
           url: "/pagesApp/shipmentType", // 要跳转到的页面路径
diff --git a/src/pagesApp/components/addUser.vue b/src/pagesApp/components/addUser.vue
new file mode 100644
index 0000000..d95a781
--- /dev/null
+++ b/src/pagesApp/components/addUser.vue
@@ -0,0 +1,216 @@
+<template>
+  <view class="c-card">
+    <u-form
+      labelPosition="left"
+      :model="model1"
+      :rules="rules"
+      ref="form"
+      :labelWidth="100"
+      :labelStyle="{ padding: '0rpx 10rpx' }"
+    >
+      <u-form-item
+        :prop="`formData[${item.key}]`"
+        :label="item.name"
+        :required="item.required"
+        v-for="(item, index) in formAttrList"
+        :key="index"
+        @click="item.fn"
+      >
+        <u-textarea
+          v-if="item.type === 'textarea'"
+          v-model="(model1.formData as any)[item.key]"
+          :placeholder="`请输入${item.name}`"
+        ></u-textarea>
+        <u-input
+          v-if="item.type === 'select' || item.type === 'input'"
+          v-model="(model1.formData as any)[item.key]"
+          :placeholder="`请${item.type === 'select' ? '选择' : '输入'}${
+            item.name
+          }`"
+          :clearable="true"
+          :customStyle="{}"
+          border="none"
+        >
+          <template #suffix>
+            <text>
+              {{ item.unit }}
+            </text>
+          </template>
+        </u-input>
+        <template #right v-if="item.type === 'select'">
+          <u-icon name="arrow-right"></u-icon>
+        </template>
+      </u-form-item>
+    </u-form>
+    <block v-for="(item, index) in formAttrList" :key="index">
+      <u-action-sheet
+        v-if="item.type === 'select'"
+        :actions="contrlModalParams[item.childKey].list"
+        :title="contrlModalParams[item.childKey].title"
+        :show="contrlModalParams[item.childKey].isShow"
+        @select="(v: any) => handleSelect(item.childKey, v)"
+        @close="contrlModalParams[item.childKey].isShow = false"
+        :closeOnClickAction="true"
+      ></u-action-sheet>
+    </block>
+  </view>
+  <view class="btn-box">
+    <u-button type="primary" text="保存" @click="save()"></u-button>
+  </view>
+</template>
+<script setup lang="ts">
+import { StockCardApi } from "@/services";
+import { formatDate } from "@/utils";
+import { DeviceType, ImagesType, OrderType, StockCardType } from "@/utils/enum";
+import { onLoad } from "@dcloudio/uni-app";
+import _ from "underscore";
+
+const model1 = reactive<any>({
+  formData: {},
+});
+const rules = ref({
+  "userInfo.userName": {
+    type: "string",
+    required: true,
+    message: "请输入手机号",
+    trigger: ["blur", "change"],
+  },
+  "userInfo.password": {
+    type: "string",
+    required: true,
+    message: "请输入密码",
+    trigger: ["blur", "change"],
+  },
+});
+const contrlModalParams = reactive<any>({
+  cardType: {
+    isShow: false,
+    title: "标题",
+    list: [{
+      id: 1,
+      name: '出库卡'
+    },{
+      id: 2,
+      name: '入库卡'
+    }],
+  }
+});
+
+const formAttrList = reactive<any>([
+  {
+    name: "姓名",
+    key: "cardCode",
+    type: "input",
+  },
+  {
+    name: "性别",
+    key: "typeName",
+    type: "select",
+    childKey: "cardType",
+    fn: () => {
+      contrlModalParams.cardType.isShow = true;
+      contrlModalParams.cardType.title = "库存卡类型";
+    },
+  },
+  {
+    name: "用户角色",
+    key: "typeName",
+    type: "select",
+    childKey: "cardType",
+    fn: () => {
+      contrlModalParams.cardType.isShow = true;
+      contrlModalParams.cardType.title = "库存卡类型";
+    },
+  },
+  {
+    name: "用户名",
+    key: "cardCode",
+    type: "input",
+    required: true,
+  },
+  {
+    name: "密码",
+    key: "cardCode",
+    type: "input",
+    required: true,
+  },
+  {
+    name: "联系手机",
+    key: "cardCode",
+    type: "input",
+  },
+]);
+
+const handleSelect = (key: string, v: any) => {
+  contrlModalParams[key].isShow = false;
+  if (key === "cardType") {
+    model1.formData.typeName = v.name;
+    model1.formData.type = v.id;
+  }
+};
+
+const save = () => {
+  if (model1.formData.id) {
+    StockCardApi.updateStockCard(model1.formData).then((res) => {
+      if (res.code === 200) {
+        uni.redirectTo({
+          url: "/pagesApp/stockCard", // 要跳转到的页面路径
+        });
+      }
+    });
+  } else {
+    StockCardApi.addStockCard(model1.formData).then((res) => {
+      if (res.code === 200) {
+        uni.redirectTo({
+          url: "/pagesApp/stockCard", // 要跳转到的页面路径
+        });
+      }
+    });
+  }
+};
+
+
+onLoad((option) => {
+  // 接收传递的标题参数
+  const title = (option as any).title;
+  model1.formData = JSON.parse((option as any).item);
+  if (model1.formData.type === 1) {
+    model1.formData.typeName = '出库卡'
+  }else if (model1.formData.type === 2) {
+    model1.formData.typeName = '入库卡'
+  }
+  // 设置页面标题
+  uni.setNavigationBarTitle({
+    title: title,
+  });
+});
+</script>
+<style lang="scss" scoped>
+.c-card {
+  background: #ffffff;
+  // box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(5, 68, 37, 0.12);
+  border-radius: 13rpx;
+  margin: 30rpx 25rpx;
+  padding: 10rpx 20rpx;
+  ::v-deep .u-form-item {
+    height: auto;
+  }
+  ::v-deep .u-form-item + .u-form-item {
+    border-top: 1rpx solid rgba(233, 233, 233, 0.76);
+  }
+}
+.btn-box {
+  margin-top: 60rpx;
+  display: flex;
+  background: #ffffff;
+  box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(0, 56, 93, 0.12);
+  border-radius: 13rpx 13rpx 0rpx 0rpx;
+  padding: 25rpx 50rpx;
+  position: sticky;
+  bottom: 0rpx;
+  z-index: 999;
+  ::v-deep button {
+    border-radius: 43rpx;
+  }
+}
+</style>
diff --git a/src/pagesApp/receiveProduct.vue b/src/pagesApp/receiveProduct.vue
index a3c780a..5eb50bb 100644
--- a/src/pagesApp/receiveProduct.vue
+++ b/src/pagesApp/receiveProduct.vue
@@ -72,7 +72,7 @@ const getList = () => {
   let params: any = {
     pageSize: 10,
     pageNum: 1,
-    name: state.name,
+    reProductsName: state.name,
   };
   GoodsApi.getReceiveProductListByPage(params).then((res) => {
     if (res.code === 200) {
diff --git a/src/pagesApp/user.vue b/src/pagesApp/user.vue
new file mode 100644
index 0000000..e1d771e
--- /dev/null
+++ b/src/pagesApp/user.vue
@@ -0,0 +1,139 @@
+<template>
+  <view class="c-card">
+    <view class="search">
+      <u-search
+        placeholder="请输入人员名称"
+        v-model="state.name"
+        :showAction="false"
+        :bgColor="'#fff'"
+        :borderColor="'rgba(0, 0, 0, 0.1)'"
+        :placeholderColor="'#C1C1C1'"
+        @search="handleSearch()"
+      ></u-search>
+      <view class="btn" @click="add"> 新增 </view>
+    </view>
+    <view class="box">
+      <view v-for="(item, index) in pageList.list" :key="index">
+        <view>
+          <view>{{ item.name }}</view>
+          <view>{{ item.phone }}</view>
+          <view>{{ item.roleVos.length > 0 ?  item.roleVos[0].roleName : '-'}}</view>
+        </view>
+        <view class="op-box">
+          <view class="btn" @click="edit(item)"> 编辑 </view>
+          <view class="btn" @click="deleteCustomer(item)"> 删除 </view>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+<script setup lang="ts">
+import { ProfileApi, StockCardApi } from "@/services";
+import { StockCardType } from "@/utils/enum";
+
+const keyword = ref("");
+
+const state = reactive<any>({
+  name: "",
+});
+const pageList: PageResult<User> = reactive({
+  total: 0,
+  list: [],
+  pageNum: 1,
+  pageSize: 10,
+});
+const add = () => {
+  uni.navigateTo({
+    url: "/pagesApp/components/addUser", // 要跳转到的页面路径
+  });
+};
+const edit = (item: any) => {
+  uni.navigateTo({
+    url:
+      "/pagesApp/components/addUser?title=编辑人员&item=" +
+      JSON.stringify(item), // 要跳转到的页面路径
+  });
+};
+const deleteCustomer = (item: any) => {
+  StockCardApi.updateStockCard({ isDeleted: true, id: item.id }).then((res) => {
+    if (res.code === 200) {
+      getList();
+    }
+  });
+};
+const handleSearch = () => {
+  getList();
+};
+const getList = () => {
+  let params: any = {
+    pageSize: 10,
+    pageNum: 1,
+    name: state.name,
+  };
+  ProfileApi.getUserListByPage(params).then((res) => {
+    if (res.code === 200) {
+      if (res.code === 200) {
+        (pageList as any).list = (res.data as any).list;
+      }
+    }
+  });
+};
+
+onMounted(() => {
+  getList();
+});
+</script>
+<style lang="scss" scoped>
+.c-card {
+  margin: 30rpx 25rpx;
+  .search {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    .btn {
+      background: #00dcee;
+      border-radius: 24rpx;
+      border: 1px solid #00dcee;
+      font-weight: 500;
+      font-size: 26rpx;
+      color: #ffffff;
+      margin-left: 50rpx;
+      padding: 6rpx 30rpx;
+    }
+  }
+  .box {
+    background: #ffffff;
+    box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(5, 68, 37, 0.12);
+    border-radius: 13rpx;
+    padding: 10rpx 25rpx;
+    font-weight: 400;
+    font-size: 26rpx;
+    color: #000000;
+    line-height: 41rpx;
+    margin-top: 30rpx;
+    > view {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      padding: 20rpx 0rpx;
+      .op-box {
+        display: flex;
+        .btn + .btn {
+          margin-left: 20rpx;
+        }
+        .btn {
+          background: #ff9d55;
+          border-radius: 24rpx;
+          font-weight: 500;
+          font-size: 26rpx;
+          color: #ffffff;
+          padding: 6rpx 30rpx;
+        }
+      }
+    }
+    > view + view {
+      border-top: 1px solid rgba(233, 233, 233, 0.76);
+    }
+  }
+}
+</style>
diff --git a/src/pagesHome/index.vue b/src/pagesHome/index.vue
index bee8dfe..845c563 100644
--- a/src/pagesHome/index.vue
+++ b/src/pagesHome/index.vue
@@ -293,15 +293,6 @@ const appList = reactive([
       });
     },
   },
-  {
-    icon: "02.png",
-    title: "出货补单",
-    fn: () => {
-      uni.navigateTo({
-        url: "/pagesApp/shipmentSpl", // 要跳转到的页面路径
-      });
-    },
-  },
   {
     icon: "03.png",
     title: "收货明细",
@@ -311,15 +302,6 @@ const appList = reactive([
       });
     },
   },
-  {
-    icon: "04.png",
-    title: "出货明细",
-    fn: () => {
-      uni.navigateTo({
-        url: "/pagesApp/shipmentDetail", // 要跳转到的页面路径
-      });
-    },
-  },
   {
     icon: "05.png",
     title: "收货作废",
@@ -329,15 +311,6 @@ const appList = reactive([
       });
     },
   },
-  {
-    icon: "06.png",
-    title: "出货作废",
-    fn: () => {
-      uni.navigateTo({
-        url: "/pagesApp/shipmentCl", // 要跳转到的页面路径
-      });
-    },
-  },
   {
     icon: "07.png",
     title: "供应商管理",
@@ -347,6 +320,36 @@ const appList = reactive([
       });
     },
   },
+  {
+    icon: "02.png",
+    title: "出货补单",
+    fn: () => {
+      uni.navigateTo({
+        url: "/pagesApp/shipmentSpl", // 要跳转到的页面路径
+      });
+    },
+  },
+  
+  {
+    icon: "04.png",
+    title: "出货明细",
+    fn: () => {
+      uni.navigateTo({
+        url: "/pagesApp/shipmentDetail", // 要跳转到的页面路径
+      });
+    },
+  },
+  
+  {
+    icon: "06.png",
+    title: "出货作废",
+    fn: () => {
+      uni.navigateTo({
+        url: "/pagesApp/shipmentCl", // 要跳转到的页面路径
+      });
+    },
+  },
+  
   {
     icon: "08.png",
     title: "客户管理",
@@ -384,30 +387,39 @@ const appList = reactive([
     },
   },
   {
-    icon: "12.png",
-    title: "支付明细",
+    icon: "18.png",
+    title: "出货分类",
     fn: () => {
-      // uni.navigateTo({
-      //   url: "/pagesApp/shipmentDetail", // 要跳转到的页面路径
-      // });
-    },
-  },
-  {
-    icon: "13.png",
-    title: "收入明细",
-    fn: () => {
-      // uni.navigateTo({
-      //   url: "/pagesApp/receiveCl", // 要跳转到的页面路径
-      // });
+      uni.navigateTo({
+        url: "/pagesApp/shipmentType", // 要跳转到的页面路径
+      });
     },
   },
+  // {
+  //   icon: "12.png",
+  //   title: "支付明细",
+  //   fn: () => {
+  //     // uni.navigateTo({
+  //     //   url: "/pagesApp/shipmentDetail", // 要跳转到的页面路径
+  //     // });
+  //   },
+  // },
+  // {
+  //   icon: "13.png",
+  //   title: "收入明细",
+  //   fn: () => {
+  //     // uni.navigateTo({
+  //     //   url: "/pagesApp/receiveCl", // 要跳转到的页面路径
+  //     // });
+  //   },
+  // },
   {
     icon: "14.png",
     title: "人员管理",
     fn: () => {
-      // uni.navigateTo({
-      //   url: "/pagesApp/shipmentCl", // 要跳转到的页面路径
-      // });
+      uni.navigateTo({
+        url: "/pagesApp/user", // 要跳转到的页面路径
+      });
     },
   },
   {
@@ -420,16 +432,7 @@ const appList = reactive([
     },
   },
   {
-    icon: "16.png",
-    title: "库存卡管理",
-    fn: () => {
-      uni.navigateTo({
-        url: "/pagesApp/stockCard", // 要跳转到的页面路径
-      });
-    },
-  },
-  {
-    icon: "16.png",
+    icon: "17.png",
     title: "供应商分类",
     fn: () => {
       uni.navigateTo({
@@ -439,13 +442,15 @@ const appList = reactive([
   },
   {
     icon: "16.png",
-    title: "出货分类",
+    title: "库存卡管理",
     fn: () => {
       uni.navigateTo({
-        url: "/pagesApp/shipmentType", // 要跳转到的页面路径
+        url: "/pagesApp/stockCard", // 要跳转到的页面路径
       });
     },
   },
+  
+  
 ]);
 
 const tabMenuList = reactive([
diff --git a/src/pagesHome/static/17.png b/src/pagesHome/static/17.png
new file mode 100644
index 0000000000000000000000000000000000000000..d5ca9ce94b2130ed0fc0c2d2ef7dcb6c66854687
GIT binary patch
literal 5518
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
Qg8%>k07*qoM6N<$g4Yg<i2wiq

literal 0
HcmV?d00001

diff --git a/src/pagesHome/static/18.png b/src/pagesHome/static/18.png
new file mode 100644
index 0000000000000000000000000000000000000000..d7c20c5689c26e9ea8c406138c6176c9b8b91d10
GIT binary patch
literal 4418
zcmb7|_dgYm_s6fjbB*k{E+VosGA~^#;-cc6U0so6#^qY~64#8Zh}*R?FB!?+va+v?
zTUnQki|ozE_fPo#aL()e_<Won&Uu{^4Kp=hVdP^3001mThER(uefobvPkWV13uv!h
z35Ab^fi9qYNMIEJ0G=5^bsi$@H|&rpoJ*;f6Q!RNJI8r>fTVaJECnb86?1_+Sm2wC
zH&<cZRmEnJm&w?yvrnPk?>{6zSiq75k_R)plqk5(mCMjPaS~dHym@&LD}^~!@Vu;i
zt)##Huyk{Eb=9dP@N?{Iyc(VA4_~X`H=(oVn~RNyheipDSyVtBgq;Zk&-+DHTENEB
z1aOeD2_={gB*?g!dmki3>1Dp;5Q3nG`pks^F+j}CBuFx|2;u)*JzL?Mx7KT`r05A2
zD>ky1E^-<{s-JP=iV~mGBnB}#(L+?P#T1&gtxQv@2h%dsy8!kIBkse->gtA*=;{B9
zR0tHPDYk;}j<Xn<pEH+efdq)?%B?q~ZyHQJcR;(hB{UE7=%@$Pqb{nXA&-IQQ{rrw
zM+(}R=5)XWs@;{@#Pb26c}^C?mz?ayxgPF&icU}Fs;MKNb;|D~a<cT<v{1Y62vj&8
z(RIi(^_GWncKct`8Oya7B2c~;zzQqy1YTRKyXDfj@0OU0^~*V@aw^n<oD@gR^UxSR
zu|6|r(rQc$&*DKHs9#?9uIgm!xIoDzZ0dw83hDTvAIdeI7`Ms$f-<2!cC)A~fq6aX
z1xkWE%XpruBm->G2<H>I$<dQ$`r$*Y%Zn+h0^u*s{4)@jV|~%cgvN_z6rYzT-Hxm_
zOOL{Ng9{wwa)YM6vDWkSK47mUq;I!m-(yu-wEjM7VmH)F7KK8}5}iS!Z#8tL2VQL+
z^3sCWD3e@9#-0oQLj8h;eZhPG$cf7ad__u%N`GG{;w-=<t;pH{zPIAz%wD2knjcGB
z7VBDNhXdy~qScMa+ni>Ck#CkoMNdj}le@HeD5%UitG^G!iDgFKJv?1pGU3WzH*qf$
z4e2+7?=M`x<Q_<C1yu6k)+in~%mlwl{Pa9SZuZZBJiE6m1+^>wofHg&aNTC0W`V_Y
zC7$hB;rt#Pv~sCmn*#PLh$?|w%(NHb7Q3OX6cOvNpL1OlB>N+dEVN9TqmZ8n3?xx7
zZ!BWy_?g0eO+)l`lMVgYUwFYVWVS)j+gtQ0Q<|s1vlo^UO~>p6uXLSeU*&wh>d9M~
z;G?)Mw~Lmaax3TFvYHILbEa6&_wU3?icuhc?zFc@Z~Q?D$fOsjln06o&f}7twc2#>
zJw#2i!I&0f_n{f6c_Aus^~I;lYb5Kc$y;Bfhr)R^iB8#SF;g8&Fm>5|jmFrm)_C&F
z?9l=6qYyn&*L&J3$MnOdN945fk8gg$ryY!{tBRN(wwNyI!+QxgVP|tU@-P3=B^ubH
z4`hQ_tGJd5`qe`DoQEItXcA!>`^qV7>Hn&~_N60f(KXV|YlUTf@7FY)89C`&mC;J*
zu)6(qSdZEDi-xG!wA2o)70$zEcpy=simC78mK2eP9TB)>2I?UuS_cZnh_kjM+{DYq
zw*a4q24cMXpwPdw5xq51!Eh>S;3Y+^`ygY41HW+EP5!>6e7127S89f~scPP1{QBJj
z-9O37UR>-dv%?2{Ls<sfM<FXjmA1YYcXy3y!?H)Abc9V;%#XU5T`khN^@~6A@c49D
zR*v=|tU=(!uvQ$z+E6C6jRRPV)eG6RlsjnpuA865vgAqFT*VC9Fb5yTO0*y&+Sx|G
zPzH2a7iA|0tcpk{-uhti=pbZ&V?D>?zjrH3lc12_f2WZA<P%RSuXQR7OS)a%A9=_`
z`(5J%d2ltCZj2bB+3I^-lyZQ~UN(Qg=P`1v;$K9)h<mb2t)=ge#>g7C&z{P6PJeAV
z2~44;ez_$b5t<i#!fmA~pmxd~VE%a)dUjo>zxur!d2AU0*W(uHl8~E+Fg0=E`aLbx
zjOwu5_MvP8zfK{Ln>=*ccEBq#+l)!h(9*@d5VSF8>gPbzI+VVm*U~Vy%tOsV;(sEe
z(JCy<Ilp_$PCbh3EJyr^lX_T(_fuix7nuDEc@^cHhYYLcTlNamit3;Ae3vH-f1M3u
zS^SJ$puyi~8ucGm@KHk#j(Y+&%z}1y6LV{7U^9==0ZmbwQsO?Q(BHslsHu!3AE`D8
zrteo3j0=X#MrLA#D9xkM&+?8o%~#a12HObMieplVS_*xQdv7IAK7x*Hdp}=$ihpg;
z+I;Qa#}+`P)GhWy?!j-=Ko*BgTRE~VU&iI7QkkVkBQb%U-!(~>uCc7iW2iPv(&&D-
zXg<3mKlt5>E)ma4@BYv0E#x8nfaxc_mrM7^$1aLokdJb|CuogHnR~ZmdJc3pGP{V$
zoB#!`B%UnYG%6iR(fT;$UF~Hl{BL#$HC&`u=>h&o-f;yp>#LGm&Gjh%hZqbj*Su_n
zF~P<kef3XK?08<@hwLvq;l2E5djR)Co|9!GAP-+c51IhF!{8Q@AoN9O?&Oq(>u@wx
zug1RImRHT}xm~T$5;O;UMP)W82Q1J?K5TxQ1^}z_C+V)4X`_>eL0;qBz-%9PUV3kj
zYJS1+(dyJtY~A)JX!JYesK14j;DVSWb*?C<3d^PvPKqIU$EY|}d-=a?>mY9ME?4Y{
zMVPUcqS-|j%1EY}yFY@r!?Th9v8hbwLHAH0LQzryj;;7zn>K>My^2UZ0Tj;$e>zM~
z9%$(pRdm0AfzpuyN^$2lxVVhAZ5qbA5_aicZ?hE|VmaPsOlU`CYetc(=y0Z)nl3L3
z#)=tHMOADWUt4L(U|HGcOyue<a4Y;q+<Ar16AiUXTAnDsJjAP3Ltt$@sZ6Ti9;3%A
z^e-*;XfX$JwJWJR)|~-_u41c+(rM=lF!RlbnhmS;h%Ksd5qf*nv4k12VO}RUN|66h
z?@no{PWym|Fk&Esg^|y8sFfyukbj(vteY@UFgYZ_-RA;RtLm;f{KQd^$QmP6#Hz!u
zLNi+G5vhMl;FNDfE*u;mItk9Q?*9Au>Yl{R=R0@ZOTTNk2+Z8xBGyRfu*KK1{j9en
z*IMB5SuWgt+E4t{#4DpXGZd^yA5Yx>se<Pe-;|q6l8GI~NejgyBMmPw8-$~|TmR%H
zAKrI=J}lh0X`Wd5xW}Hczz58411BK<q#rzV>*BTL__?|$K@NT^LOxnh52zpxOtABf
zdh)j`nFN?uLsP>DTzX>Cg0-rr4Ac1F1x?1mjlciGp!5-R!Zh1SX@J~OWiY)C>p>h4
z(=N(6vSmYwi6mmeB7$>z?x+Ci{6OE1T@!p=Ex)fnlB^fFqFLkI4(xO~u?>i7jN}+$
zhp76ETBQUEgNpJiN2;$UU?a<5soxGC?!*4!<jrZVct`uXM<*tNgzkbQG?M}s3O&7D
z4U>vm{V+KoiZ#ICz17T!+F`BU{YrfDo?F`(3HE4qeHbIawhyMRGO5SQrFH7LRUWJ8
zmc-QA=!!&6=%>8=P;^$%bUQ%GqTEdQ*M%r$)+&DyASX1>*cc$6rJSqfq<mo`42(~&
zEEJD`AlNMzwF&GH=F)hVCX@9*U1I>-3<g!n^7+lc8;5(KCxV!Y`gqCa&07X_Z#7yo
zR`725>oZc2a;`#fh%{}qT5JiH$Zl+TuAD0itWmMkIE!2fuP(xVB{cH_c$_H`M7{PM
z;mr>jO0JrDQBcf?$z=$h)L*G6d%FnSPvrkkC6g;LrdvAJrU{(x5KelJJW1VP0u`0k
z@Dh<xuS81HZuX#3wU~B$`5{RzVv&ZLq#kYWX^xcbah$zEjzd-Dx8ckgWb@(U8cb!m
zlZfgBWL?RIK|5Dq;e{O<M{&@>fFW?OQs~X7Y~hP<kaJL!=B@EKXZ@#w^cHjB(d7qQ
z#YQ)q7YuNr#Y_`YckkmM1P_s>H>p3x8|KfsHXf}sUi9yA_^s7gH`Ha4I+7)*pCY_~
z6X9L*aFXM}D}#_pCR|Fh$>0t*K!o~f9jd5KsBv1HRpfH#WzLNlWl*On4#GUB&pf0t
z0?GIp>INnRZqZlszyMEfZk04V!$E>LUqOYA8&adXp2Map*-py2yCN;5bIT#U*Q59h
z2p~PD1IJunoNBHRF~}jUwO?>8WK-sM)R9ZEV|{RqcH~#46$WWz&c8sRK;O-M6XT@+
zPBD)7Vz$E?j6O_2C+I<QD&OO^J7Z?Bai_Fng|$|JslaRAM2Q+U9jima$xFDDdpNuu
z<ZK4s=r6dk1F{_c@QX8gV$72sPHM)h^@qk(zdohi6@Szac5pmyh!5d0)moB5<7s$?
z$Dr!(jkmaOXHp?l9xAMHdMD;aQyjY$17@a9`Mf`3N!Dn-rwfxok*iTVvgPOi(gXPj
z$@hH_R1s1C_Nf9Py7~m5Q)1@W)=RYm{D8R&;XdQ<FB(G8ydp}Fr@}fm(}6Y!Ca_P%
zx>cTDM?N&a1%AUSpCjX0(C7v{P<XM;kEEhK2)~@zhYhkuxC^(eC_|U+9f<o<ySkID
zstjDSI+QX4=$7>Wl1lk={c6$+p$N6w#w>ebv<!H9>>HknAmPu~U0zqoy4&o9Q1Km0
z;bUn3Oq&Zm%`^SbmlYJ^t#U66-d4eGV6Z%GP~R;TGGWo>ab)1fiMehWdd~YAoi8SH
z5lv*v_Q{qAlCnz(KP$cLxq&CS7<$h_;W)_ASGK)t1>xH4#+#@>*V(0FwvLuL%^Oih
zJc`3--2OSWzb_s*OZPS(wO&oB)OUqOw_7-7QjX8l1qYyk`?8LOLyUvvV{M=5(28Y*
zBS9mO+E$>8WkrNQ;YA(D5mdsbLR{lYHg5o*ruSq#O`s2A06MF!^K`Q8t#xH6ts{-x
zEJ{O#tE!Z)`CnPXp3gdjO8>T&mN}xx);(VT47spWaeo$ZnWbsT4<Gv6e>&UK;MWyG
z7`MMWe>#^gJ52Dl;STWKUf&8+3z-S?GnqZNS|MUN%1)Fd7pN#YrdnB!ttRCbn}?GN
zPRc5oX@wF*8~+;IK^U99@8X4|(cqDc>?*-YN@0|c+?pYeCxc2~y8h-Qi2T`^xxV^y
z`Y<tI`I~?xL2{fVRu>e~)vELl^e(tUC)6E3<si88I@7U}Ta%H(b`xciAG}sqZ1V2G
zYZ))CQ7`7Tsc2hXEg(JNWfsy^Dfz7GCUaY^Y#1glT%wAo9~dBiDP95_4|v@vgb3K~
zyheuK(Fu+m{!#5da(ul~uZvsj7`>(YNfxV$Ia^jDKiWn*%t=tau6idn8uGW*Gi7Uj
zhn3nK@&bEeHahCCIu?L<G9DDcjtDA=?cM@rv;fxf@BWx>zuk9-Xm^vUN_g2u-BIxP
zBd%n3#My*TKkj1V^54dHS8CoS^6tBKjfV8qnTX1l|4y{Z=nn+1b@;_Z7;oW<e$fvH
z-AGbBL=ZEovo3RQQy#jcLvY*7o)YYO^LyF7gk!WCk!b%dG#;1n6syry2FNOP3dy%H
zx8@LHwhmA*zJ;zBVSX*WIQJu-3E`ixQV!Q~v(tIjzndHLAUVDU-Y)YzM|5WNAcOAe
zo>O&6*&3=;3v;x$;qT5vCL#BSgW@0_V^VdJ%_k}Ox<1Bq&1s>cnU9NV?~nA2HI7s&
zm-Cz7I;t|ZRg3G7H<zH9m8ab<)sF9tqX~($76P78_c*NyF5>OJ3^j`v@s+T)>?o$-
zv~9EqMGJtUC(nvBvcLUgx7|5;e!YL{wewhty8bbEg|ZC-9Bw_dlq{jONuWb>Js;Po
z&>cYZ3?T=6x}`o)Q_EWf$Ubx9qX;UZeR_6dU#mgl3virt^%MaZ>6t>ybsf?F1EGz0
AqyPW_

literal 0
HcmV?d00001

diff --git a/src/services/goods.ts b/src/services/goods.ts
index 905aa4b..e564e59 100644
--- a/src/services/goods.ts
+++ b/src/services/goods.ts
@@ -36,6 +36,14 @@ export const getPage = (data: any) => {
   })
 }
 
+// 收货分类查询所有
+export const allReCategory = () => {
+  return http({
+    method: 'GET',
+    url: '/api/recategory/allReCategory',
+  })
+}
+
 // 收货分类修改信息
 export const editReceiveCategory = (data: any) => {
   return http({
diff --git a/src/static/style/common.scss b/src/static/style/common.scss
index 10c4705..2b36649 100644
--- a/src/static/style/common.scss
+++ b/src/static/style/common.scss
@@ -1,4 +1,3 @@
-
 body {
 }
 .c-layout {
@@ -30,4 +29,9 @@ body {
 }
 .mt-30 {
   margin-top: 30rpx;
-}
\ No newline at end of file
+}
+
+.u-action-sheet > view:nth-child(2) {
+  height: 600rpx;
+  overflow-y: auto;
+}
diff --git a/src/types/user.d.ts b/src/types/user.d.ts
index 4095a12..325cb62 100644
--- a/src/types/user.d.ts
+++ b/src/types/user.d.ts
@@ -19,6 +19,7 @@ interface User {
   updateUserName: string;
   isDeleted: boolean;
   cardCode?: string; // 卡号
+  roleVos?: array
 }
 
 interface Customer {