From ada2de76afaa9c884a860786ea97992f97dadff0 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 11 六月 2026 09:22:54 +0800
Subject: [PATCH] Merge branch 'dev_河南_鹤壁天沐玻璃厂' of http://114.132.189.42:9002/r/product-inventory-management into dev_河南_鹤壁天沐玻璃厂
---
src/views/salesManagement/salesLedger/components/ProcessFlowConfigSelectDialog.vue | 181 +++++++++++++++++++++++++++++++++++---------
1 files changed, 142 insertions(+), 39 deletions(-)
diff --git a/src/views/salesManagement/salesLedger/components/ProcessFlowConfigSelectDialog.vue b/src/views/salesManagement/salesLedger/components/ProcessFlowConfigSelectDialog.vue
index 1dc7e25..f400877 100644
--- a/src/views/salesManagement/salesLedger/components/ProcessFlowConfigSelectDialog.vue
+++ b/src/views/salesManagement/salesLedger/components/ProcessFlowConfigSelectDialog.vue
@@ -7,33 +7,55 @@
@close="handleClose"
>
<el-row :gutter="20">
- <el-col :span="10">
- <div style="font-weight: 600; margin-bottom: 8px;">閰嶇疆</div>
+ <el-col :span="24">
+ <div class="dialog-topbar">
+ <div>
+ <div style="font-weight: 600; margin-bottom: 8px;">閰嶇疆</div>
+ <div style="font-size: 12px; margin-bottom: 8px;">
+ <span v-if="boundRouteName" style="color: #67c23a;">宸茬粦瀹氾細{{ boundRouteName }}</span>
+ <span v-else style="color: #e6a23c;">鏈粦瀹�</span>
+ </div>
+ </div>
+ <div class="export-toolbar">
+ <el-date-picker
+ v-model="exportDateRange"
+ type="daterange"
+ value-format="YYYY-MM-DD"
+ format="YYYY-MM-DD"
+ range-separator="鑷�"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ clearable
+ style="width: 280px;"
+ />
+ <el-button type="success" plain @click="exportSelectedSteps">瀵煎嚭宸插嬀閫�</el-button>
+ </div>
+ </div>
<el-select
- v-model="selectedConfigId"
+ v-model="selectedRouteId"
filterable
clearable
- placeholder="璇烽�夋嫨宸ヨ壓璺嚎閰嶇疆"
+ placeholder="璇烽�夋嫨宸ヨ壓璺嚎"
style="width: 100%;"
- @change="handleConfigChange"
+ @change="handleRouteChange"
>
<el-option
- v-for="cfg in configList"
- :key="cfg.configId"
- :label="cfg.configName"
- :value="cfg.configId"
+ v-for="cfg in routeList"
+ :key="cfg.routeId"
+ :label="cfg.processRouteName"
+ :value="cfg.routeId"
/>
</el-select>
<el-divider style="margin: 16px 0;" />
<div style="font-weight: 600; margin-bottom: 8px;">姝ラ棰勮</div>
- <div style="font-size: 12px; color: #909399; margin-bottom: 6px;">
+ <div style="font-size: 12px; color: #909399; margin-bottom: 10px;">
鏍规嵁鎵�閫夐厤缃睍绀烘祦绋嬪浘
</div>
</el-col>
- <el-col :span="14">
+ <el-col :span="24">
<div class="process-diagram">
<div v-if="steps.length === 0" class="process-diagram-empty">鏆傛棤姝ラ</div>
<div
@@ -42,13 +64,18 @@
class="process-diagram-segment"
>
<div class="process-diagram-node">
+ <el-checkbox
+ v-model="step.checked"
+ class="process-diagram-checkbox"
+ @change="() => handleStepCheckedChange(step)"
+ />
<div class="process-diagram-index">{{ idx + 1 }}</div>
<div class="process-diagram-name">{{ step.processName }}</div>
</div>
<div v-if="idx < steps.length - 1" class="process-diagram-arrow">鈫�</div>
</div>
</div>
- <div v-if="selectedConfigId === null" style="margin-top: 10px; font-size: 12px; color: #909399;">
+ <div v-if="selectedRouteId === null" style="margin-top: 10px; font-size: 12px; color: #909399;">
璇峰厛閫夋嫨涓�鏉″凡缁存姢濂界殑宸ヨ壓璺嚎
</div>
</el-col>
@@ -67,13 +94,16 @@
<script setup>
import { computed, getCurrentInstance, ref, watch } from "vue";
-import { salesProcessFlowConfigList, salesProcessFlowConfigGetById } from "@/api/salesManagement/salesProcessFlowConfig.js";
+import { salesProcessFlowConfigList, salesProcessFlowConfigItemList } from "@/api/salesManagement/salesProcessFlowConfig.js";
const emit = defineEmits(["update:visible", "confirm"]);
const props = defineProps({
visible: { type: Boolean, default: false },
- defaultConfigId: { type: [Number, String, null], default: null },
+ // 鎵撳紑寮圭獥鏃剁殑鍥炴樉锛氳嫢涓氬姟宸茬粦瀹氬伐鑹鸿矾绾垮垯浼犲叆璇� routeId锛涘惁鍒欓粯璁ゅ睍绀哄垪琛ㄧ涓�鏉�
+ defaultRouteId: { type: [Number, String, null], default: null },
+ // 椤甸潰鎻愮ず锛氳鍗曞凡缁戝畾鐨勫伐鑹鸿矾绾垮悕绉�
+ boundRouteName: { type: String, default: "" },
});
const { proxy } = getCurrentInstance();
@@ -87,9 +117,10 @@
},
});
-const configList = ref([]);
-const selectedConfigId = ref(null);
+const routeList = ref([]);
+const selectedRouteId = ref(null);
const steps = ref([]);
+const exportDateRange = ref([]);
const saving = ref(false);
const normalizeStepsFromApi = (list) => {
@@ -99,29 +130,35 @@
processId: s.processId ?? s.process_id ?? s.id ?? null,
processName: s.processName ?? s.process_name ?? s.name ?? "",
sortNo: s.sortNo ?? idx + 1,
+ isCompleted: Number(s.isCompleted ?? s.completed ?? 0),
+ checked: Boolean(s.checked ?? false),
}));
};
-const fetchConfigList = async () => {
- const res = await salesProcessFlowConfigList();
- const list = res?.data ?? res?.records ?? res ?? [];
- configList.value = Array.isArray(list) ? list : [];
+const normalizeRouteList = (list) => {
+ if (!Array.isArray(list)) return [];
+ return list.map((r) => ({
+ routeId: r.routeId ?? r.id ?? null,
+ processRouteName: r.processRouteName ?? r.routeName ?? r.name ?? "",
+ isDefault: Boolean(r.isDefault),
+ }));
};
-const fetchConfigDetail = async (id) => {
- if (!id) {
+const fetchRouteList = async () => {
+ // 閫夋嫨寮圭獥锛氬敖閲忎竴娆℃�ф媺鍏紝閬垮厤鍒嗛〉褰卞搷閫夋嫨浣撻獙
+ const res = await salesProcessFlowConfigList({ current: 1, size: 1000 });
+ const records = res?.records ?? res?.data?.records ?? res?.data ?? res ?? [];
+ routeList.value = normalizeRouteList(records).filter((r) => r.routeId !== null && r.routeId !== undefined && r.routeId !== "");
+};
+
+const fetchRouteSteps = async (routeId) => {
+ if (!routeId) {
steps.value = [];
return;
}
- const res = await salesProcessFlowConfigGetById(id);
- const detail = res?.data ?? res ?? {};
- steps.value = normalizeStepsFromApi(detail?.steps ?? []);
-};
-
-const initDefault = async () => {
- await fetchConfigList();
- selectedConfigId.value = props.defaultConfigId ?? null;
- await fetchConfigDetail(selectedConfigId.value);
+ const res = await salesProcessFlowConfigItemList(routeId);
+ const raw = res?.data ?? res ?? [];
+ steps.value = normalizeStepsFromApi(raw);
};
watch(
@@ -129,7 +166,18 @@
async (v) => {
if (v) {
try {
- await initDefault();
+ await fetchRouteList();
+
+ // 鍥炴樉缁戝畾锛�
+ // 1. 鑻ヤ紶鍏� defaultRouteId锛屽垯浼樺厛浣跨敤瀹�
+ // 2. 鍚﹀垯浼樺厛閫変腑鏍囪涓洪粯璁�(isDefault=true)鐨勫伐鑹鸿矾绾�
+ // 3. 鑻ラ兘娌℃湁锛屽垯鍥為��涓虹涓�鏉�
+ const first = routeList.value?.[0] ?? null;
+ const defaultRoute =
+ routeList.value.find((r) => r.isDefault) ?? first;
+ const desired = props.defaultRouteId ?? (defaultRoute ? defaultRoute.routeId : null);
+ selectedRouteId.value = desired ?? null;
+ await fetchRouteSteps(selectedRouteId.value);
} catch {
proxy?.$modal?.msgError?.("鑾峰彇宸ヨ壓璺嚎閰嶇疆澶辫触");
}
@@ -137,8 +185,12 @@
}
);
-const handleConfigChange = async () => {
- await fetchConfigDetail(selectedConfigId.value);
+const handleRouteChange = async () => {
+ await fetchRouteSteps(selectedRouteId.value);
+};
+
+const handleStepCheckedChange = step => {
+ step.checked = Boolean(step.checked);
};
const handleClose = () => {
@@ -148,19 +200,50 @@
const confirmSelect = async () => {
if (saving.value) return;
- if (selectedConfigId.value === null || selectedConfigId.value === undefined || selectedConfigId.value === "") {
- proxy?.$modal?.msgWarning?.("璇烽�夋嫨宸ヨ壓璺嚎閰嶇疆");
+ if (selectedRouteId.value === null || selectedRouteId.value === undefined || selectedRouteId.value === "") {
+ proxy?.$modal?.msgWarning?.("璇烽�夋嫨宸ヨ壓璺嚎");
return;
}
saving.value = true;
try {
- emit("confirm", selectedConfigId.value);
- handleClose();
+ emit("confirm", selectedRouteId.value);
} catch (e) {
proxy?.$modal?.msgError?.("纭澶辫触锛岃绋嶅悗閲嶈瘯");
} finally {
saving.value = false;
}
+};
+
+const exportSelectedSteps = () => {
+ const selectedSteps = steps.value.filter(step => step.checked);
+ if (selectedSteps.length === 0) {
+ proxy?.$modal?.msgWarning?.("璇峰厛鍕鹃�夎瀵煎嚭鐨勫伐搴�");
+ return;
+ }
+ const payload = {
+ exportDateRange: Array.isArray(exportDateRange.value) ? exportDateRange.value : [],
+ routeId: selectedRouteId.value,
+ routeName: routeList.value.find(item => String(item.routeId) === String(selectedRouteId.value))?.processRouteName || "",
+ steps: selectedSteps.map(step => ({
+ processId: step.processId,
+ processName: step.processName,
+ sortNo: step.sortNo,
+ isCompleted: Number(step.isCompleted ?? 0),
+ })),
+ };
+ const blob = new Blob([JSON.stringify(payload, null, 2)], {
+ type: "application/json;charset=utf-8",
+ });
+ const url = URL.createObjectURL(blob);
+ const a = document.createElement("a");
+ const dateText =
+ Array.isArray(exportDateRange.value) && exportDateRange.value.length === 2
+ ? `${exportDateRange.value[0]}_${exportDateRange.value[1]}`
+ : "all";
+ a.href = url;
+ a.download = `宸ヨ壓璺嚎瀵煎嚭_${dateText}.json`;
+ a.click();
+ URL.revokeObjectURL(url);
};
</script>
@@ -192,6 +275,13 @@
padding: 10px 12px;
margin-right: 10px;
box-sizing: border-box;
+ position: relative;
+}
+
+.process-diagram-checkbox {
+ position: absolute;
+ top: 8px;
+ right: 8px;
}
.process-diagram-index {
@@ -230,5 +320,18 @@
justify-content: flex-end;
gap: 10px;
}
-</style>
+.dialog-topbar {
+ display: flex;
+ justify-content: space-between;
+ align-items: flex-start;
+ gap: 16px;
+}
+
+.export-toolbar {
+ display: flex;
+ align-items: center;
+ gap: 10px;
+ flex-wrap: wrap;
+}
+</style>
--
Gitblit v1.9.3