From 954126079af7662585d0e0233cfc2cb9a6fc6474 Mon Sep 17 00:00:00 2001
From: admin <>
Date: Wed, 17 Apr 2024 09:51:39 +0800
Subject: [PATCH] =?UTF-8?q?update:=20=E6=9B=B4=E6=96=B0=E5=87=BA=E8=B4=A7?=
 =?UTF-8?q?=E4=BA=A7=E5=93=81=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pagesApp/role.vue                         | 25 ++++++++++--
 src/pagesApp/shipmentProduct.vue              |  2 +-
 src/pagesReceive/pricing.vue                  |  1 -
 .../components/ProductDialog.vue              | 38 ++++++++++---------
 src/pagesShipment/form/shipmentForm.vue       |  2 +-
 src/services/goods.ts                         | 19 ++++++++++
 6 files changed, 64 insertions(+), 23 deletions(-)

diff --git a/src/pagesApp/role.vue b/src/pagesApp/role.vue
index 24e0d4b..8748581 100644
--- a/src/pagesApp/role.vue
+++ b/src/pagesApp/role.vue
@@ -30,24 +30,43 @@
           </view>
           <view class="op-box">
             <view class="btn" @click="edit(item)"> 编辑 </view>
-            <view class="btn" @click="deleteRole(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 { ProfileApi, StockCardApi } 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 = () => {
+  deleteRole({id: deleteId.value})
+};
 
 const state = reactive<any>({
   name: "",
 });
 const pageList: PageResult<{
   roleName: string;
+  id: number
 }> = reactive({
   noMoreData: false,
   total: 0,
diff --git a/src/pagesApp/shipmentProduct.vue b/src/pagesApp/shipmentProduct.vue
index dbd9380..3501597 100644
--- a/src/pagesApp/shipmentProduct.vue
+++ b/src/pagesApp/shipmentProduct.vue
@@ -76,7 +76,7 @@ const handleSearch = () => {
 };
 
 const update = (item: any) => {
-  GoodsApi.EditReceiveProduct({ isDeleted: true, id: item.id }).then((res) => {
+  GoodsApi.deleteShmProducts({ id: item.id }).then((res) => {
     if (res.code === 200) {
       resetPageList();
       getList();
diff --git a/src/pagesReceive/pricing.vue b/src/pagesReceive/pricing.vue
index fcd0c95..57351a4 100644
--- a/src/pagesReceive/pricing.vue
+++ b/src/pagesReceive/pricing.vue
@@ -129,7 +129,6 @@ const getList = (v?: boolean) => {
   });
 };
 const handleOk = () => {
-  console.log(deleteId.value);
   ReceiveApi.deleteOrder({ ids: [deleteId.value] }).then((res) => {
     if (res.code === 200) {
       getList();
diff --git a/src/pagesShipment/components/ProductDialog.vue b/src/pagesShipment/components/ProductDialog.vue
index ce36778..b0fa90a 100644
--- a/src/pagesShipment/components/ProductDialog.vue
+++ b/src/pagesShipment/components/ProductDialog.vue
@@ -5,23 +5,27 @@
       <view v-if="isShipment">
         <view v-for="(item, index) in state.list" :key="index">
           <view class="first-title">{{ item.shmCategoryName }}</view>
-          <view class="dialog-product-layout">
-            <view v-if="item.childrenList">
-              <text
-                v-for="(cItem, cIndex) in item.childrenList"
-                :key="cIndex"
-                :class="{ active: state.current === cItem.id }"
-                @click="handleSelect(cItem)"
-                >{{ cItem.shmCategoryName }}</text
-              >
-            </view>
+          <view v-for="(cItem, cIndex) in item.childrenList" :key="cIndex">
+            <view class="second-title">{{ cItem.shmCategoryName }}</view>
 
-            <view v-else style="flex: auto;">
-              <u-empty
-                mode="data"
-                icon="http://cdn.uviewui.com/uview/empty/data.png"
-              >
-              </u-empty>
+            <view class="dialog-product-layout">
+              <view v-if="cItem.childrenLists">
+                <text
+                  v-for="(child, childIndex) in cItem.childrenLists"
+                  :key="childIndex"
+                  :class="{ active: state.current === child.childIndex }"
+                  @click="handleSelect(child)"
+                  >{{ child.shmProductsName }}</text
+                >
+              </view>
+
+              <view v-else style="flex: auto">
+                <u-empty
+                  mode="data"
+                  icon="http://cdn.uviewui.com/uview/empty/data.png"
+                >
+                </u-empty>
+              </view>
             </view>
           </view>
         </view>
@@ -67,7 +71,7 @@ const getList = () => {
     //   }
     // });
 
-    GoodsApi.getShipmentCategory().then((res) => {
+    GoodsApi.getChildrenList().then((res) => {
       if (res.code === 200) {
         if (res.code === 200) {
           state.list = res.data;
diff --git a/src/pagesShipment/form/shipmentForm.vue b/src/pagesShipment/form/shipmentForm.vue
index 7fa6c88..57bac20 100644
--- a/src/pagesShipment/form/shipmentForm.vue
+++ b/src/pagesShipment/form/shipmentForm.vue
@@ -136,7 +136,7 @@ const handleDialog = (key: string, v: boolean) => {
 
 // 收货产品选择
 const changeProduct = (obj: any) => {
-  model1.order.productName = obj.shmCategoryName; // 收货产品名称
+  model1.order.productName = obj.shmProductsName; // 收货产品名称
   model1.order.productId = obj.id; // 收货产品Id,
 };
 
diff --git a/src/services/goods.ts b/src/services/goods.ts
index 2120d6a..84198f2 100644
--- a/src/services/goods.ts
+++ b/src/services/goods.ts
@@ -193,3 +193,22 @@ export const getShipmentProductList = () => {
     url: '/api/shmproducts/allShmProducts',
   })
 }
+
+// 出货产品删除
+export const deleteShmProducts = (data: any) => {
+  return http({
+    method: 'POST',
+    url: '/api/shmproducts/deleteShmProducts',
+    data,
+  })
+}
+
+// 出货产品分类树
+export const getChildrenList = () => {
+  return http({
+    method: 'GET',
+    url: '/api/shmcategory/getChildrenList',
+  })
+}
+
+