From 3f3b65c9a76bf1d4a006f2a93ae780cb6b494a11 Mon Sep 17 00:00:00 2001
From: admin <>
Date: Wed, 17 Apr 2024 17:03:55 +0800
Subject: [PATCH] =?UTF-8?q?update:=20=E4=BE=9B=E5=BA=94=E5=95=86=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E3=80=81=E4=BE=9B=E5=BA=94=E5=95=86=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E3=80=81=E5=AE=A2=E6=88=B7=E7=AE=A1=E7=90=86=E3=80=81=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E5=8D=A1=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pagesApp/components/addCustomer.vue  |  8 ++++-
 src/pagesApp/components/addStockCard.vue | 12 ++++----
 src/pagesApp/components/addSupplier.vue  | 29 ++++++++++++++++++-
 src/pagesApp/components/addUser.vue      | 37 ++++++++++++++++++------
 src/pagesApp/customerMgt.vue             | 23 ++++++++++++++-
 src/pagesApp/stockCard.vue               | 24 +++++++++++++--
 src/pagesApp/supplierMgt.vue             | 24 +++++++++++++--
 src/pagesApp/supplierType.vue            | 27 +++++++++++++----
 src/pagesApp/user.vue                    | 29 +++++++++++++++----
 src/types/baseInfo.d.ts                  | 10 +++++++
 src/types/order.d.ts                     |  1 +
 src/types/user.d.ts                      |  1 +
 src/utils/validate.ts                    |  4 +++
 13 files changed, 198 insertions(+), 31 deletions(-)
 create mode 100644 src/types/baseInfo.d.ts

diff --git a/src/pagesApp/components/addCustomer.vue b/src/pagesApp/components/addCustomer.vue
index ea13f14..269822d 100644
--- a/src/pagesApp/components/addCustomer.vue
+++ b/src/pagesApp/components/addCustomer.vue
@@ -31,6 +31,8 @@
           :clearable="true"
           :customStyle="{}"
           border="none"
+          :disabled="item.type === 'select'"
+          disabledColor="#ffffff"
         >
           <template #suffix>
             <text>
@@ -110,6 +112,10 @@ const formAttrList = reactive<any>([
     childKey: "stockCard",
     required: true,
     fn: () => {
+      if (contrlModalParams.stockCard.list.length === 0) {
+        uni.showToast({icon: 'none', title: '当前无可用卡号,请添加出库卡'})
+        return
+      }
       contrlModalParams.stockCard.isShow = true;
       contrlModalParams.stockCard.title = "卡号";
     },
@@ -183,7 +189,7 @@ const startSave = () => {
 };
 
 const getStockCardList = () => {
-  StockCardApi.getStockCardListInfo({ vincolante: StockCardType.Receive }).then((res) => {
+  StockCardApi.getStockCardListInfo({ vincolante: StockCardType.Shipment }).then((res) => {
     if (res.code === 200) {
       contrlModalParams.stockCard.list = (res.data as any).map(
         (item: any) => {
diff --git a/src/pagesApp/components/addStockCard.vue b/src/pagesApp/components/addStockCard.vue
index 15f4012..b446b7f 100644
--- a/src/pagesApp/components/addStockCard.vue
+++ b/src/pagesApp/components/addStockCard.vue
@@ -23,14 +23,16 @@
           :placeholder="`请输入${item.name}`"
         ></u-textarea>
         <u-input
-          v-if="item.type === 'select' || item.type === 'input'"
+          v-if="item.type === 'select' || item.type === 'input' || item.type === 'selectCustom'"
           v-model="(model1.formData as any)[item.key]"
-          :placeholder="`请${item.type === 'select' ? '选择' : '输入'}${
+          :placeholder="`请${item.type.indexOf('select') > -1 ? '选择' : '输入'}${
             item.name
           }`"
           :clearable="true"
           :customStyle="{}"
           border="none"
+          :disabled="item.type === 'selectCustom'"
+          disabledColor="#ffffff"
         >
           <template #suffix>
             <text>
@@ -38,14 +40,14 @@
             </text>
           </template>
         </u-input>
-        <template #right v-if="item.type === 'select'">
+        <template #right v-if="item.type === 'select' || item.type === 'selectCustom'">
           <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'"
+        v-if="item.type === 'select' || item.type === 'selectCustom'"
         :actions="contrlModalParams[item.childKey].list"
         :title="contrlModalParams[item.childKey].title"
         :show="contrlModalParams[item.childKey].isShow"
@@ -110,7 +112,7 @@ const formAttrList = reactive<any>([
   {
     name: "类型",
     key: "typeName",
-    type: "select",
+    type: "selectCustom",
     childKey: "cardType",
     required: true,
     fn: () => {
diff --git a/src/pagesApp/components/addSupplier.vue b/src/pagesApp/components/addSupplier.vue
index 463c766..9637839 100644
--- a/src/pagesApp/components/addSupplier.vue
+++ b/src/pagesApp/components/addSupplier.vue
@@ -31,6 +31,9 @@
           :clearable="true"
           :customStyle="{}"
           border="none"
+          @change="(e:any) => {handleInput(e, item)}"
+          :disabled="item.type === 'select'"
+          disabledColor="#ffffff"
         >
           <template #suffix>
             <text>
@@ -63,9 +66,17 @@
 import { StockCardApi, SupplierApi } from "@/services";
 import { formatDate } from "@/utils";
 import { DeviceType, ImagesType, OrderType, StockCardType } from "@/utils/enum";
+import valid from "@/utils/validate";
 import { onLoad } from "@dcloudio/uni-app";
 import _ from "underscore";
-
+const handleInput = (e: any, item: any) => {
+  if (item.key === "phone" || item.key === 'bankNumber') {
+    const temp = e?.replace(valid.valid_number, "");
+    setTimeout(() => {
+      model1.formData[item.key] = temp;
+    }, 100);
+  }
+};
 const model1 = reactive<any>({
   formData: {},
 });
@@ -114,6 +125,10 @@ const formAttrList = reactive<any>([
     childKey: "stockCard",
     required: true,
     fn: () => {
+      if (contrlModalParams.stockCard.list.length === 0) {
+        uni.showToast({icon: 'none', title: '当前无可用卡号,请添加入库卡'})
+        return
+      }
       contrlModalParams.stockCard.isShow = true;
       contrlModalParams.stockCard.title = "卡号";
     },
@@ -221,6 +236,18 @@ const check = () => {
 };
 
 const save = () => {
+  if (model1.formData.phone) {
+    if (!valid.mobile.pattern.test(model1.formData.phone)) {
+      uni.showToast({ icon: "none", title: "请输入正确的手机号" });
+      return;
+    }
+  }
+  if (model1.formData.card) {
+    if (!valid.valid_id_card.pattern.test(model1.formData.card)) {
+      uni.showToast({ icon: "none", title: "请输入正确的身份证号码" });
+      return;
+    }
+  }
   check().then((res) => {
     if (res) {
       startSave();
diff --git a/src/pagesApp/components/addUser.vue b/src/pagesApp/components/addUser.vue
index f68f7d5..305191e 100644
--- a/src/pagesApp/components/addUser.vue
+++ b/src/pagesApp/components/addUser.vue
@@ -24,7 +24,7 @@
         ></u-textarea>
         <u-input
           v-if="item.type === 'select' || item.type === 'input'"
-          :password="item.name === 'password'"
+          :password="item.key === 'password'"
           v-model="(model1.formData as any)[item.key]"
           :placeholder="`请${item.type === 'select' ? '选择' : '输入'}${
             item.name
@@ -32,6 +32,10 @@
           :clearable="true"
           :customStyle="{}"
           border="none"
+          :maxlength="item.key === 'password' ? 6 : -1"
+          @change="(e:any) => {handleInput(e, item)}"
+          :disabled="item.type === 'select'"
+          disabledColor="#ffffff"
         >
           <template #suffix>
             <text>
@@ -64,11 +68,20 @@
 import { ProfileApi, StockCardApi } from "@/services";
 import { formatDate } from "@/utils";
 import { DeviceType, ImagesType, OrderType, StockCardType } from "@/utils/enum";
+import valid from "@/utils/validate";
 import { onLoad } from "@dcloudio/uni-app";
 import _ from "underscore";
-
+const handleInput = (e: any, item: any) => {
+  if (item.key === "phone") {
+    const temp = e?.replace(valid.valid_number, "");
+    setTimeout(() => {
+      model1.formData[item.key] = temp;
+    }, 100);
+  }
+};
 const model1 = reactive<any>({
-  formData: {},
+  formData: {
+  },
 });
 const rules = ref({
   "formData.userName": {
@@ -159,7 +172,7 @@ const handleSelect = (key: string, v: any) => {
   }
   if (key === "gender") {
     model1.formData.genderName = v.name;
-    model1.formData.genderId = v.id;
+    model1.formData.gender = v.id;
   }
 };
 
@@ -182,6 +195,12 @@ const check = () => {
 };
 
 const save = () => {
+  if (model1.formData.phone) {
+    if (!valid.mobile.pattern.test(model1.formData.phone)) {
+      uni.showToast({ icon: "none", title: "请输入正确的手机号" });
+      return;
+    }
+  }
   check().then((res) => {
     if (res) {
       startSave();
@@ -227,11 +246,11 @@ onMounted(() => {
 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 = "入库卡";
+  const obj = JSON.parse((option as any).item)
+  model1.formData = {...obj, genderName: ['未知','男','女'][obj.gender]};
+  if (obj.roleVos.length > 0) {
+    model1.formData.roleIds = [obj.roleVos[0].id]
+    model1.formData.roleName = obj.roleVos[0].roleName
   }
   // 设置页面标题;
   if (title) {
diff --git a/src/pagesApp/customerMgt.vue b/src/pagesApp/customerMgt.vue
index e4f65d8..c43b062 100644
--- a/src/pagesApp/customerMgt.vue
+++ b/src/pagesApp/customerMgt.vue
@@ -33,17 +33,38 @@
           </view>
           <view class="op-box">
             <view class="btn" @click="edit(item)"> 编辑 </view>
-            <view class="btn" @click="deleteCustomer(item)"> 删除 </view>
+            <view class="btn" @click="handleModal(true, item.id)"> 删除 </view>
           </view>
         </view>
       </view>
     </page-view>
   </view>
+
+  <SmallModal
+    :title="'确认删除吗？'"
+    :content="'确认删除后，不能恢复！'"
+    :okText="'确认删除'"
+    :isMain="true"
+    :show="isShowCancelModal"
+    @handleModal="(v:boolean) => {handleModal(v, deleteId)}"
+    @handleOk="handleOk()"
+  />
 </template>
 <script setup lang="ts">
 import { CustomerApi } from "@/services";
 import { UsersType } from "@/utils/enum";
 import PageView from "@/components/PageView/index.vue";
+import type { Customer } from "@/types/user";
+import SmallModal from "@/components/Modal/smallModal.vue";
+const isShowCancelModal = ref(false);
+const deleteId = ref(0);
+const handleModal = (v: boolean, id: number) => {
+  isShowCancelModal.value = v;
+  deleteId.value = id;
+};
+const handleOk = () => {
+  deleteCustomer({id: deleteId.value})
+};
 const state = reactive<any>({
   name: "",
 });
diff --git a/src/pagesApp/stockCard.vue b/src/pagesApp/stockCard.vue
index e532149..3cfe09b 100644
--- a/src/pagesApp/stockCard.vue
+++ b/src/pagesApp/stockCard.vue
@@ -40,17 +40,37 @@
           </view>
           <view class="op-box">
             <view class="btn" @click="edit(item)"> 编辑 </view>
-            <view class="btn" @click="deleteCustomer(item)"> 删除 </view>
+            <view class="btn" @click="handleModal(true, item.id)"> 删除 </view>
           </view>
         </view>
       </view>
     </page-view>
   </view>
+
+  <SmallModal
+    :title="'确认删除吗？'"
+    :content="'确认删除后，不能恢复！'"
+    :okText="'确认删除'"
+    :isMain="true"
+    :show="isShowCancelModal"
+    @handleModal="(v:boolean) => {handleModal(v, deleteId)}"
+    @handleOk="handleOk()"
+  />
 </template>
 <script setup lang="ts">
 import { StockCardApi } from "@/services";
 import { StockCardType } from "@/utils/enum";
 import PageView from "@/components/PageView/index.vue";
+import SmallModal from "@/components/Modal/smallModal.vue";
+const isShowCancelModal = ref(false);
+const deleteId = ref(0);
+const handleModal = (v: boolean, id: number) => {
+  isShowCancelModal.value = v;
+  deleteId.value = id;
+};
+const handleOk = () => {
+  deleteStockCard({id: deleteId.value})
+};
 
 const state = reactive<any>({
   name: "",
@@ -80,7 +100,7 @@ const edit = (item: any) => {
       JSON.stringify(item), // 要跳转到的页面路径
   });
 };
-const deleteCustomer = (item: any) => {
+const deleteStockCard = (item: any) => {
   StockCardApi.updateStockCard({ isDeleted: true, id: item.id }).then((res) => {
     if (res.code === 200) {
       resetPageList();
diff --git a/src/pagesApp/supplierMgt.vue b/src/pagesApp/supplierMgt.vue
index 8de4c5e..99cb407 100644
--- a/src/pagesApp/supplierMgt.vue
+++ b/src/pagesApp/supplierMgt.vue
@@ -35,7 +35,7 @@
           </view>
           <view class="op-box">
             <view class="btn" @click="edit(item)"> 编辑 </view>
-            <view class="btn" @click="update(item)"> 删除 </view>
+            <view class="btn" @click="handleModal(true, item.id)"> 删除 </view>
           </view>
         </view>
       </view>
@@ -50,18 +50,38 @@
     @close="state.isShowType = false"
     @select="handleSelect"
   ></u-action-sheet>
+
+  <SmallModal
+    :title="'确认删除吗？'"
+    :content="'确认删除后，不能恢复！'"
+    :okText="'确认删除'"
+    :isMain="true"
+    :show="isShowCancelModal"
+    @handleModal="(v:boolean) => {handleModal(v, deleteId)}"
+    @handleOk="handleOk()"
+  />
 </template>
 <script setup lang="ts">
 import { SupplierApi } from "@/services";
 import { UsersType } from "@/utils/enum";
 import PageView from "@/components/PageView/index.vue";
+import SmallModal from "@/components/Modal/smallModal.vue";
+const isShowCancelModal = ref(false);
+const deleteId = ref(0);
+const handleModal = (v: boolean, id: number) => {
+  isShowCancelModal.value = v;
+  deleteId.value = id;
+};
+const handleOk = () => {
+  update({id: deleteId.value})
+};
 const state = reactive<any>({
   name: "",
   supplierTypeId: -1,
   isShowType: false,
   typeList: [],
 });
-const pageList: PageResult<User> = reactive({
+const pageList: PageResult<Supplier> = reactive({
   total: 0,
   list: [],
   pageNum: 1,
diff --git a/src/pagesApp/supplierType.vue b/src/pagesApp/supplierType.vue
index 42c67d4..ba51502 100644
--- a/src/pagesApp/supplierType.vue
+++ b/src/pagesApp/supplierType.vue
@@ -30,23 +30,40 @@
           </view>
           <view class="op-box">
             <view class="btn" @click="edit(item)"> 编辑 </view>
-            <view class="btn" @click="deleteType(item)"> 删除 </view>
+            <view class="btn" @click="handleModal(true, item.id)"> 删除 </view>
           </view>
         </view>
       </view>
     </page-view>
   </view>
+
+  <SmallModal
+    :title="'确认删除吗？'"
+    :content="'确认删除后，不能恢复！'"
+    :okText="'确认删除'"
+    :isMain="true"
+    :show="isShowCancelModal"
+    @handleModal="(v:boolean) => {handleModal(v, deleteId)}"
+    @handleOk="handleOk()"
+  />
 </template>
 <script setup lang="ts">
 import { StockCardApi, SupplierApi } from "@/services";
 import PageView from "@/components/PageView/index.vue";
-
-const keyword = ref("");
-
+import SmallModal from "@/components/Modal/smallModal.vue";
+const isShowCancelModal = ref(false);
+const deleteId = ref(0);
+const handleModal = (v: boolean, id: number) => {
+  isShowCancelModal.value = v;
+  deleteId.value = id;
+};
+const handleOk = () => {
+  deleteType({id: deleteId.value})
+};
 const state = reactive<any>({
   name: "",
 });
-const pageList: PageResult<StockCard> = reactive({
+const pageList: PageResult<SupplierType> = reactive({
   noMoreData: false,
   total: 0,
   list: [],
diff --git a/src/pagesApp/user.vue b/src/pagesApp/user.vue
index 9b54359..b722b25 100644
--- a/src/pagesApp/user.vue
+++ b/src/pagesApp/user.vue
@@ -35,20 +35,38 @@
           </view>
           <view class="op-box">
             <view class="btn" @click="edit(item)"> 编辑 </view>
-            <view class="btn" @click="deleteCustomer(item)"> 下线 </view>
+            <view class="btn" @click="handleModal(true, item.id)"> 删除 </view>
           </view>
         </view>
       </view>
     </page-view>
   </view>
+
+  <SmallModal
+    :title="'确认删除吗？'"
+    :content="'确认删除后，不能恢复！'"
+    :okText="'确认删除'"
+    :isMain="true"
+    :show="isShowCancelModal"
+    @handleModal="(v:boolean) => {handleModal(v, deleteId)}"
+    @handleOk="handleOk()"
+  />
 </template>
 <script setup lang="ts">
 import PageView from "@/components/PageView/index.vue";
-import { ProfileApi, StockCardApi } from "@/services";
-import { pageListInit } from "@/utils";
-import { StockCardType } from "@/utils/enum";
+import { ProfileApi } from "@/services";
+import type { User } from "@/types/user";
+import SmallModal from "@/components/Modal/smallModal.vue";
 
-const keyword = ref("");
+const isShowCancelModal = ref(false);
+const deleteId = ref(0);
+const handleModal = (v: boolean, id: number) => {
+  isShowCancelModal.value = v;
+  deleteId.value = id;
+};
+const handleOk = () => {
+  deleteCustomer({id: deleteId.value})
+};
 
 const state = reactive<any>({
   name: "",
@@ -75,6 +93,7 @@ const edit = (item: any) => {
 const deleteCustomer = (item: any) => {
   ProfileApi.updateUserByIdOffline({ id: item.id }).then((res) => {
     if (res.code === 200) {
+      resetPageList();
       getList();
     }
   });
diff --git a/src/types/baseInfo.d.ts b/src/types/baseInfo.d.ts
new file mode 100644
index 0000000..2d937ff
--- /dev/null
+++ b/src/types/baseInfo.d.ts
@@ -0,0 +1,10 @@
+type SupplierType = {
+  id: number,
+  name: string
+}
+
+type Supplier = {
+  id: number,
+  name: string,
+  cardCode: string,
+}
\ No newline at end of file
diff --git a/src/types/order.d.ts b/src/types/order.d.ts
index 83a3630..6ae755c 100644
--- a/src/types/order.d.ts
+++ b/src/types/order.d.ts
@@ -207,6 +207,7 @@ interface ReceiveProduct {
 // 库存卡
 
 interface StockCard {
+  id: number
   cardCode?: string,
   type?: number, // 库存卡类型1=出库2=入库
   cardCode?: string,
diff --git a/src/types/user.d.ts b/src/types/user.d.ts
index 46f4fe5..cae1c0a 100644
--- a/src/types/user.d.ts
+++ b/src/types/user.d.ts
@@ -16,6 +16,7 @@ export type User = {
 } & BaseField;
 
 interface Customer {
+  id: number,
   name?: string,
   stockCardId?: number,
   contacts?:string,
diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index 90c7fdd..d8c89b9 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -24,6 +24,10 @@ const valid = {
   valid_decimal: {
     pattern: /[^0-9.]/g,
     message: "请输入正确的数字",
+  },
+  valid_id_card: {
+    pattern: /^[1-9]\d{5}(18|19|20)\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/,
+    message: '请输入正确的身份证号码'
   }
 };
 export default valid;