From 085787350952483c1ba83cbca70250226cccd0ab Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期四, 05 十一月 2026 14:47:40 +0800
Subject: [PATCH] feat(app): 销售订单/供应商准入按流程key判断免审批,仓储单据补提交与生成入口

---
 src/pages/supplier/access/index.vue         |   11 +++
 src/pages/wls/components/WlsFlowDocList.vue |  122 ++++++++++++++++++++++++++++++++++++++++
 src/api/bpm.ts                              |   12 ++++
 src/pages/sale/order/index.vue              |   34 +++++++----
 4 files changed, 165 insertions(+), 14 deletions(-)

diff --git a/src/api/bpm.ts b/src/api/bpm.ts
index f25489d..cfa8008 100644
--- a/src/api/bpm.ts
+++ b/src/api/bpm.ts
@@ -3,6 +3,18 @@
 
 const header = (accessToken: string) => ({ Authorization: `Bearer ${accessToken}` });
 
+/**
+ * 鏌ヨ鏌愪釜娴佺▼鏄惁鍏嶅鎵广��
+ * 鍚庣鍒ゅ畾锛氬叏灞�鎬诲紑鍏冲紑鍚紝鎴栬娴佺▼ Key 鍗曠嫭閰嶇疆浜嗗厤瀹℃壒锛岄兘绠楀厤瀹℃壒銆�
+ * 鎺ュ彛寮傚父鏃堕��鍥� false锛堣蛋姝e父瀹℃壒娴佺▼閫夋嫨锛夛紝閬垮厤璇斁琛屻��
+ */
+export function isAutoApproveByKey(accessToken: string, processDefinitionKey: string) {
+  return request<boolean>(
+    `/bpm/process-auto-approve/ui-policy${query({ key: processDefinitionKey })}`,
+    { header: header(accessToken) },
+  ).catch(() => false);
+}
+
 type QueryValue = string | number | boolean | string[] | number[] | undefined;
 
 function query(params: Record<string, QueryValue>) {
diff --git a/src/pages/sale/order/index.vue b/src/pages/sale/order/index.vue
index 31dd3f0..a366b30 100644
--- a/src/pages/sale/order/index.vue
+++ b/src/pages/sale/order/index.vue
@@ -11,6 +11,7 @@
     submitSaleOrder,
     type SaleOrder,
   } from "../../../api/sale";
+  import { isAutoApproveByKey } from "../../../api/bpm";
   import { useAuth } from "../../../stores/auth";
   import { statusToneClass } from "../../../utils/status";
 
@@ -97,20 +98,27 @@
   }
   async function submit(item: SaleOrder) {
     if (!state.accessToken || !item.id) return;
-    if (
-      !(await confirm(
-        "纭鎻愪氦瀹℃壒",
-        `纭鎻愪氦${item.no || "璇ラ攢鍞鍗�"}鐨勫鎵瑰悧锛熸彁浜ゅ悗瀹℃壒灏嗗湪鍗忓悓鍔炲叕涓畬鎴恅
-      ))
-    )
-      return;
     try {
-      const list = await getSaleOrderApproveProcessList(state.accessToken);
-      const process = list[0];
-      if (!process?.key)
-        return uni.showToast({ title: "閿�鍞鍗曞鎵规祦绋嬫湭閰嶇疆", icon: "none" });
-      await submitSaleOrder(state.accessToken, item.id, process.key);
-      uni.showToast({ title: "鎻愪氦瀹℃壒鎴愬姛", icon: "success" });
+      // 鎸夋祦绋� Key 鍒ゆ柇鍏嶅鎵癸細鍏ㄥ眬寮�鍏冲紑鍚垨璇ユ祦绋嬪崟鐙厤缃厤瀹℃壒閮界畻
+      const autoApprove = await isAutoApproveByKey(
+        state.accessToken,
+        "sale_order_approve"
+      );
+      const confirmContent = autoApprove
+        ? `纭鎻愪氦${item.no || "璇ラ攢鍞鍗�"}鍚楋紵鎻愪氦鍚庡皢鑷姩瀹℃牳閫氳繃`
+        : `纭鎻愪氦${item.no || "璇ラ攢鍞鍗�"}鐨勫鎵瑰悧锛熸彁浜ゅ悗瀹℃壒灏嗗湪鍗忓悓鍔炲叕涓畬鎴恅;
+      if (!(await confirm("纭鎻愪氦", confirmContent))) return;
+      if (autoApprove) {
+        await submitSaleOrder(state.accessToken, item.id, "sale_order_approve");
+        uni.showToast({ title: "鎻愪氦鎴愬姛锛屽凡鑷姩瀹℃牳閫氳繃", icon: "none" });
+      } else {
+        const list = await getSaleOrderApproveProcessList(state.accessToken);
+        const process = list[0];
+        if (!process?.key)
+          return uni.showToast({ title: "閿�鍞鍗曞鎵规祦绋嬫湭閰嶇疆", icon: "none" });
+        await submitSaleOrder(state.accessToken, item.id, process.key);
+        uni.showToast({ title: "鎻愪氦瀹℃壒鎴愬姛锛岃鍒板崗鍚屽姙鍏腑澶勭悊", icon: "none" });
+      }
       load(true);
     } catch (e) {
       uni.showToast({ title: message(e), icon: "none" });
diff --git a/src/pages/supplier/access/index.vue b/src/pages/supplier/access/index.vue
index a7cf580..16f4de7 100644
--- a/src/pages/supplier/access/index.vue
+++ b/src/pages/supplier/access/index.vue
@@ -16,6 +16,7 @@
     type SupplierApplyItem,
     type SupplierItem,
   } from "../../../api/supplier";
+  import { isAutoApproveByKey } from "../../../api/bpm";
   import { useAuth } from "../../../stores/auth";
   import { statusToneClass } from "../../../utils/status";
   const { hasPermission, isLoggedIn, state } = useAuth();
@@ -169,7 +170,17 @@
   }
   async function submit(item: SupplierApplyItem) {
     if (!state.accessToken || !item.id) return;
+    // 渚涘簲鍟嗗噯鍏ュ鎵规祦绋� Key锛堝厤瀹℃壒閰嶇疆涔熸寜姝� Key 璁板綍锛�
+    const PROCESS_KEY = "supplier_apply_approve";
     try {
+      // 鍛戒腑鍏嶅鎵癸紙鍏ㄥ眬寮�鍏虫垨璇ユ祦绋嬪崟鐙紑鍚級鏃剁洿鎺ユ彁浜ょ敓鏁堬紝涓嶅啀鎷夊彇瀹℃壒娴佺▼
+      const autoApprove = await isAutoApproveByKey(state.accessToken, PROCESS_KEY);
+      if (autoApprove) {
+        await submitApply(state.accessToken, item.id, PROCESS_KEY);
+        uni.showToast({ title: "宸叉彁浜ょ敓鏁�", icon: "success" });
+        load(true);
+        return;
+      }
       const list = await getApplyProcessList(state.accessToken);
       const process = list[0];
       const processKey = process?.processDefinitionKey || process?.key || process?.id;
diff --git a/src/pages/wls/components/WlsFlowDocList.vue b/src/pages/wls/components/WlsFlowDocList.vue
index 922af32..f0eb266 100644
--- a/src/pages/wls/components/WlsFlowDocList.vue
+++ b/src/pages/wls/components/WlsFlowDocList.vue
@@ -31,8 +31,11 @@
   stockProductSales,
   stockReturnIssue,
   stockReturnSales,
+  submitProductSales,
+  submitSalesNotice,
   type WlsDocBase,
 } from "../../../api/wls";
+import { generateSalesNoticeFromSaleOrder, getSaleOrderPage, type SaleOrder } from "../../../api/sale";
 import { useAuth } from "../../../stores/auth";
 import { dateText, dayText, dictLabel, documentStatusClass } from "./shared";
 
@@ -151,6 +154,71 @@
     uni.navigateTo({ url: `/pages/wls/product-sales/form?id=${id}` });
   });
 }
+/** 鍒楄〃琛屽唴鎻愪氦锛氬彂璐ч�氱煡 鑽夌(0)鈫掑緟鍑哄簱(3)锛涢攢鍞嚭搴� 鑽夌(0)鈫掑緟鎷h揣(2) */
+function submitDoc(row: WlsDocBase) {
+  const token = state.accessToken;
+  if (!token || !row.id) return;
+  const label = props.kind === "sales-notice" ? "鍙戣揣閫氱煡鍗�" : "閿�鍞嚭搴撳崟";
+  confirmAction("纭鎻愪氦", `纭鎻愪氦${label} ${row.code || ""} 鍚楋紵鎻愪氦鍚庢墠鑳界户缁悗缁祦绋媊, async () => {
+    if (props.kind === "sales-notice") return submitSalesNotice(token, row.id!);
+    return submitProductSales(token, row.id!);
+  });
+}
+// 鍙戣揣閫氱煡銆屼粠閿�鍞鍗曠敓鎴愩��
+const orderPickerOpen = ref(false);
+const orderRows = ref<SaleOrder[]>([]);
+const orderKeyword = ref("");
+const orderPageNo = ref(1);
+const orderTotal = ref(0);
+const orderLoading = ref(false);
+const generatingId = ref<number>();
+const orderHasMore = computed(() => orderRows.value.length < orderTotal.value);
+async function loadOrders(reset = false) {
+  if (!state.accessToken || orderLoading.value) return;
+  if (reset) { orderPageNo.value = 1; orderRows.value = []; orderTotal.value = 0; }
+  orderLoading.value = true;
+  try {
+    const data = await getSaleOrderPage(state.accessToken, {
+      pageNo: orderPageNo.value,
+      pageSize: 15,
+      no: orderKeyword.value.trim() || undefined,
+      status: 20,
+    });
+    const list = (data.list || []).filter(item => item.canCreateSalesNotice !== false);
+    orderRows.value = reset ? list : [...orderRows.value, ...list];
+    orderTotal.value = Number(data.total || 0);
+    orderPageNo.value += 1;
+  } catch (error) { uni.showToast({ title: errorText(error), icon: "none" }); }
+  finally { orderLoading.value = false; }
+}
+function openOrderPicker() {
+  orderPickerOpen.value = true;
+  loadOrders(true);
+}
+function closeOrderPicker() {
+  if (generatingId.value) return;
+  orderPickerOpen.value = false;
+}
+async function pickOrder(order: SaleOrder) {
+  if (!state.accessToken || !order.id || generatingId.value) return;
+  const ok = await new Promise<boolean>(resolve => uni.showModal({
+    title: "纭鐢熸垚",
+    content: `纭鏍规嵁閿�鍞鍗� ${order.no || order.id} 鐢熸垚鍙戣揣閫氱煡鍗曪紵`,
+    success: r => resolve(r.confirm),
+  }));
+  if (!ok) return;
+  generatingId.value = order.id;
+  try {
+    await generateSalesNoticeFromSaleOrder(state.accessToken, order.id);
+    uni.showToast({ title: "鐢熸垚鎴愬姛", icon: "success" });
+    orderPickerOpen.value = false;
+    load(true);
+  } catch (error) {
+    uni.showToast({ title: errorText(error), icon: "none" });
+  } finally {
+    generatingId.value = undefined;
+  }
+}
 function qcTip() { uni.showToast({ title: "璇峰墠寰�璐ㄩ噺绠$悊鎵ц璐ㄦ", icon: "none" }); }
 function stockText() {
   if (props.kind === "product-receipt" || props.kind === "return-issue" || props.kind === "return-sales") return "鎵ц涓婃灦";
@@ -180,6 +248,7 @@
   <view class="page">
     <template v-if="isLoggedIn">
       <view v-if="canQuery" class="search"><input v-model="keyword" :placeholder="`鎼滅储${config.code}`" confirm-type="search" @confirm="load(true)" /><text v-if="keyword" @click="keyword='';load(true)">娓呴櫎</text></view>
+      <view v-if="canQuery && kind === 'sales-notice' && canCreate" class="top-actions"><button @click="openOrderPicker">浠庨攢鍞鍗曠敓鎴�</button></view>
       <scroll-view v-if="canQuery" class="content" scroll-y lower-threshold="80" @scrolltolower="hasMore && load()">
         <view v-if="loadError" class="state error" @click="load(true)">{{ loadError }}锛岀偣鍑婚噸璇�</view>
         <view v-else-if="rows.length">
@@ -201,6 +270,7 @@
             <view class="actions" @click.stop>
               <button v-if="canQuery" @click="go(row,'detail')">璇︽儏</button>
               <button v-if="canUpdate && isDraft(row)" @click="go(row)">缂栬緫</button>
+              <button v-if="canUpdate && isDraft(row) && (kind === 'sales-notice' || kind === 'product-sales')" @click="submitDoc(row)">鎻愪氦</button>
               <button v-if="canDelete && isDraft(row)" class="danger" @click="remove(row)">鍒犻櫎</button>
               <button v-if="(kind === 'return-issue' || kind === 'return-sales') && isConfirmed(row)" @click="qcTip">鎵ц璐ㄦ</button>
               <button v-if="kind === 'sales-notice' && canGenerateSales && isApproved(row)" @click="generateSales(row)">鐢熸垚鍑哄簱鍗�</button>
@@ -217,10 +287,60 @@
       <view v-else class="state">鏆傛棤{{ config.title }}鏌ョ湅鏉冮檺</view>
     </template>
     <view v-else class="state">鐧诲綍鍚庢煡鐪媨{ config.title }}</view>
-    <button v-if="canCreate" class="fab" @click="go()"><view /></button>
+    <!-- 鍙戣揣閫氱煡鍙兘浠庨攢鍞鍗曠敓鎴愶紝涓嶆彁渚涙墜宸ユ柊寤哄叆鍙� -->
+    <button v-if="canCreate && kind !== 'sales-notice'" class="fab" @click="go()"><view /></button>
+    <!-- 浠庨攢鍞鍗曠敓鎴愬彂璐ч�氱煡 -->
+    <view v-if="orderPickerOpen" class="picker-mask" @click="closeOrderPicker">
+      <view class="picker-panel" @click.stop>
+        <view class="picker-head">
+          <text class="picker-title">閫夋嫨閿�鍞鍗曠敓鎴愬彂璐ч�氱煡</text>
+          <text class="picker-close" @click="closeOrderPicker">脳</text>
+        </view>
+        <view class="picker-search">
+          <input v-model="orderKeyword" placeholder="鎼滅储璁㈠崟鍙�" confirm-type="search" @confirm="loadOrders(true)" />
+          <text @click="loadOrders(true)">鎼滅储</text>
+        </view>
+        <scroll-view class="picker-list" scroll-y lower-threshold="80" @scrolltolower="orderHasMore && loadOrders()">
+          <view v-if="orderRows.length">
+            <view v-for="order in orderRows" :key="order.id" class="order-card" @click="pickOrder(order)">
+              <view class="order-head">
+                <text class="order-no">{{ order.no || '--' }}</text>
+                <text class="order-pick">{{ generatingId === order.id ? '鐢熸垚涓�...' : '閫夋嫨' }}</text>
+              </view>
+              <text class="order-customer">{{ order.customerName || '--' }}</text>
+              <view class="order-grid">
+                <text>浜у搧锛歿{ order.productNames || '鈥�' }}</text>
+                <text>鎬绘暟閲忥細{{ order.totalCount ?? '鈥�' }}</text>
+                <text>璁㈠崟鏃堕棿锛歿{ order.orderTime?.replace('T', ' ').slice(0, 16) || '鈥�' }}</text>
+              </view>
+            </view>
+            <text class="more">{{ orderLoading ? '鍔犺浇涓�...' : orderHasMore ? '涓婃媺鍔犺浇鏇村' : '娌℃湁鏇村浜�' }}</text>
+          </view>
+          <view v-else class="state">{{ orderLoading ? '鍔犺浇涓�...' : '鏆傛棤鍙敓鎴愬彂璐ч�氱煡鐨勫凡瀹℃牳璁㈠崟' }}</view>
+        </scroll-view>
+      </view>
+    </view>
   </view>
 </template>
 
 <style lang="scss" scoped>
 .page{height:100vh;display:flex;flex-direction:column;padding:0 30rpx;box-sizing:border-box;overflow:hidden;background:#f3f6fb}.search{display:flex;align-items:center;height:80rpx;margin:20rpx 0 16rpx;padding:0 20rpx;background:#fff;border-radius:16rpx;box-shadow:0 8rpx 20rpx rgba(43,69,107,.06)}.search input{flex:1;font-size:27rpx}.search text{color:var(--color-primary, #1769d8);font-size:24rpx}.content{height:0;flex:1;padding-bottom: 132rpx;box-sizing:border-box}.row{padding:24rpx 22rpx 20rpx;margin-bottom:18rpx;background:#fff;border-radius:16rpx;box-shadow:0 10rpx 24rpx rgba(43,69,107,.08)}.head{display:flex;align-items:flex-start;justify-content:space-between;gap:16rpx}.head>view:first-child{display:flex;min-width:0;flex:1;flex-direction:column;gap:8rpx}.head>view:first-child text:last-child{color:#78879b;font-size:23rpx}.name{overflow:hidden;color:#20334c;font-size:30rpx;font-weight:600;text-overflow:ellipsis;white-space:nowrap}.status-wrap{display:flex;align-items:flex-start;justify-content:center;flex:none;min-height:44rpx}.status{display:inline-flex;align-items:center;justify-content:center;height:44rpx;padding:0 18rpx;font-size:23rpx;line-height:44rpx;border-radius:999rpx;white-space:nowrap}.tag-draft{color:#6f7e92;background:#f3f6fa;border:1rpx solid #dce4ee}.tag-progress{color:#b57800;background:#fff7dd;border:1rpx solid #f3dc98}.tag-approved{color:var(--color-primary, #1769d8);background:var(--color-primary-soft, #edf5ff);border:1rpx solid var(--color-primary-border, #bfdbff)}.tag-finished{color:#17865a;background:#eafaf2;border:1rpx solid #b8efd5}.tag-cancelled{color:#c65050;background:#fff7f7;border:1rpx solid #e3a0a0}.tag-info{color:#66778c;background:#f6f8fb;border:1rpx solid #dce4ee}.grid{display:grid;gap:10rpx;padding:16rpx 0;margin-top:16rpx;color:#66778c;font-size:23rpx;border-top:1rpx solid #edf1f6;border-bottom:1rpx solid #edf1f6}.grid text{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.actions{display:flex;flex-wrap:wrap;justify-content:flex-end;gap:12rpx;padding-top:16rpx}.actions button{min-height:50rpx;padding:0 16rpx;margin:0;color:var(--color-primary, #1769d8);font-size:22rpx;line-height:48rpx;background:var(--color-primary-soft, #f5f8ff);border:1rpx solid var(--color-primary-border, #8ab3ee);border-radius:8rpx}.actions .danger{color:#c65050;background:#fff7f7;border-color:#e3a0a0}.actions button::after,.fab::after{border:0}.more,.state{display:block;padding:35rpx;color:#8795a8;font-size:26rpx;text-align:center}.error{color:#c3654d}.fab{position:fixed;right:30rpx;bottom:calc(32rpx + env(safe-area-inset-bottom));display:flex;align-items:center;justify-content:center;width: 104rpx; height: 104rpx; min-height: 104rpx;padding:0;margin:0;background:var(--color-primary, #1769d8);border-radius:50%;box-shadow:0 12rpx 24rpx rgba(23,105,216,.3)}.fab view{width:38rpx;height:38rpx;background:linear-gradient(#fff,#fff) center/38rpx 8rpx no-repeat,linear-gradient(#fff,#fff) center/8rpx 38rpx no-repeat}.fab view::before,.fab view::after{display:none;content:none}
+.top-actions{display:flex;justify-content:flex-end;flex:none;margin-bottom:14rpx}
+.top-actions button{min-height:56rpx;padding:0 24rpx;margin:0;color:#fff;font-size:24rpx;line-height:54rpx;background:var(--color-primary, #1769d8);border-radius:8rpx}
+.top-actions button::after{border:0}
+.picker-mask{position:fixed;top:0;right:0;bottom:0;left:0;z-index:999;background:rgba(0,0,0,.45)}
+.picker-panel{position:absolute;top:0;right:0;bottom:0;left:0;display:flex;flex-direction:column;background:#f3f6fb}
+.picker-head{display:flex;align-items:center;justify-content:space-between;flex:none;padding:28rpx 30rpx;background:#fff}
+.picker-title{font-size:30rpx;font-weight:600;color:#20334c}
+.picker-close{color:#8a97a8;font-size:48rpx;line-height:1}
+.picker-search{display:flex;align-items:center;flex:none;height:80rpx;margin:20rpx 30rpx 12rpx;padding:0 20rpx;background:#fff;border-radius:16rpx}
+.picker-search input{flex:1;font-size:27rpx}
+.picker-search text{color:var(--color-primary, #1769d8);font-size:24rpx}
+.picker-list{flex:1;height:0;padding:0 30rpx 30rpx;box-sizing:border-box}
+.order-card{padding:22rpx;margin-bottom:16rpx;background:#fff;border-radius:16rpx;box-shadow:0 8rpx 20rpx rgba(43,69,107,.06)}
+.order-head{display:flex;align-items:center;justify-content:space-between;gap:16rpx}
+.order-no{overflow:hidden;font-size:28rpx;font-weight:600;color:#20334c;text-overflow:ellipsis;white-space:nowrap}
+.order-pick{flex:none;padding:6rpx 20rpx;color:#fff;font-size:22rpx;background:var(--color-primary, #1769d8);border-radius:999rpx}
+.order-customer{display:block;margin-top:10rpx;color:#20334c;font-size:25rpx}
+.order-grid{display:grid;grid-template-columns:1fr;gap:8rpx;padding-top:12rpx;margin-top:12rpx;color:#78879b;font-size:22rpx;border-top:1rpx solid #edf1f6}
 </style>

--
Gitblit v1.9.3