From ed36047f6ce0b91dad25efc10c8a0e83dd533a68 Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期五, 20 三月 2026 17:15:37 +0800
Subject: [PATCH] change
---
src/views/productionManagement/productionOrder/index.vue | 985 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 890 insertions(+), 95 deletions(-)
diff --git a/src/views/productionManagement/productionOrder/index.vue b/src/views/productionManagement/productionOrder/index.vue
index 3af5008..3116256 100644
--- a/src/views/productionManagement/productionOrder/index.vue
+++ b/src/views/productionManagement/productionOrder/index.vue
@@ -3,16 +3,8 @@
<div class="search_form">
<el-form :model="searchForm"
:inline="true">
- <el-form-item label="瀹㈡埛鍚嶇О:">
- <el-input v-model="searchForm.customerName"
- placeholder="璇疯緭鍏�"
- clearable
- prefix-icon="Search"
- style="width: 160px;"
- @change="handleQuery" />
- </el-form-item>
- <el-form-item label="鍚堝悓鍙�:">
- <el-input v-model="searchForm.salesContractNo"
+ <el-form-item label="璁㈠崟鍙�:">
+ <el-input v-model="searchForm.npsNo"
placeholder="璇疯緭鍏�"
clearable
prefix-icon="Search"
@@ -20,30 +12,67 @@
@change="handleQuery" />
</el-form-item>
<el-form-item label="浜у搧鍚嶇О:">
- <el-input v-model="searchForm.productCategory"
+ <el-input v-model="searchForm.productName"
placeholder="璇疯緭鍏�"
clearable
prefix-icon="Search"
style="width: 160px;"
@change="handleQuery" />
</el-form-item>
+ <el-form-item label="浜у搧绫诲瀷:">
+ <el-select v-model="searchForm.strength"
+ style="width: 200px;"
+ placeholder="璇烽�夋嫨浜у搧绫诲瀷"
+ clearable
+ @change="handleQuery">
+ <el-option v-for="option in productTypeOptions2"
+ :key="option.dictLabel"
+ :label="option.dictLabel"
+ :value="option.dictLabel" />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鍒涘缓鏃堕棿:">
+ <el-date-picker v-model="createTime"
+ type="daterange"
+ range-separator="鑷�"
+ start-placeholder="寮�濮嬫棩鏈�"
+ value-format="YYYY-MM-DD"
+ format="YYYY-MM-DD"
+ end-placeholder="缁撴潫鏃ユ湡"
+ style="width: 300px;"
+ @change="handleQuery" />
+ </el-form-item>
<el-form-item label="瑙勬牸:">
- <el-input v-model="searchForm.specificationModel"
+ <el-input v-model="searchForm.model"
placeholder="璇疯緭鍏�"
clearable
prefix-icon="Search"
style="width: 160px;"
@change="handleQuery" />
+ </el-form-item>
+ <el-form-item label="鐘舵��:">
+ <el-select v-model="searchForm.status"
+ placeholder="璇烽�夋嫨"
+ style="width: 160px;"
+ @change="handleQuery">
+ <el-option v-for="item in statusOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value" />
+ </el-select>
</el-form-item>
<el-form-item>
<el-button type="primary"
@click="handleQuery">鎼滅储</el-button>
+ <el-button type="primary"
+ @click="handleReset">閲嶇疆</el-button>
+ <el-button type="danger"
+ @click="handleDelete">閫�鍥�</el-button>
+ <el-button @click="handleOut">瀵煎嚭</el-button>
</el-form-item>
</el-form>
- <div>
- <el-button type="primary" @click="isShowNewModal = true">鏂板</el-button>
- <el-button @click="handleOut">瀵煎嚭</el-button>
- </div>
+ <!-- <div style="width:350px;text-align:right;">
+ </div> -->
</div>
<div class="table_list">
<PIMTable rowKey="id"
@@ -52,13 +81,20 @@
:page="page"
:tableLoading="tableLoading"
:row-class-name="tableRowClassName"
+ :isSelection="true"
+ :selectable="row => row.status != 4"
+ @selection-change="handleSelectionChange"
@pagination="pagination">
<template #completionStatus="{ row }">
- <el-progress
- :percentage="toProgressPercentage(row?.completionStatus)"
- :color="progressColor(toProgressPercentage(row?.completionStatus))"
- :status="toProgressPercentage(row?.completionStatus) >= 100 ? 'success' : ''"
- />
+ <el-progress :percentage="toProgressPercentage(row?.completionStatus)"
+ :color="progressColor(toProgressPercentage(row?.completionStatus))"
+ :status="toProgressPercentage(row?.completionStatus) >= 100 ? 'success' : ''" />
+ </template>
+ <template #quantity="{ row }">
+ {{ row.quantity || '-' }}<span style="color:rgb(63, 95, 211)"> 鍧�</span>
+ </template>
+ <template #completeQuantity="{ row }">
+ {{ row.completeQuantity || '-' }}<span style="color:rgb(42, 169, 146)"> 鏂�</span>
</template>
</PIMTable>
</div>
@@ -87,10 +123,130 @@
</span>
</template>
</el-dialog>
-
<new-product-order v-if="isShowNewModal"
- v-model:visible="isShowNewModal"
- @completed="handleQuery" />
+ v-model:visible="isShowNewModal"
+ @completed="handleQuery" />
+ <!-- 鏉ユ簮鏁版嵁寮圭獥 -->
+ <el-dialog v-model="sourceDataDialogVisible"
+ title="鏉ユ簮鏁版嵁"
+ width="1000px">
+ <div class="applyno-summary1">
+ <div class="summary-item">
+ <span class="summary-label">浜у搧鍚嶇О锛�</span>
+ <span class="summary-value">
+ <el-tag type="primary">{{ sourceRowData.productName || '-' }}</el-tag>
+ </span>
+ </div>
+ <div class="summary-item">
+ <span class="summary-label">浜у搧瑙勬牸锛�</span>
+ <span class="summary-value">{{ sourceRowData.model || '-' }}</span>
+ </div>
+ <div class="summary-item">
+ <span class="summary-label">鐗╂枡缂栫爜锛�</span>
+ <span class="summary-value">{{ sourceRowData.materialCode || '-' }}</span>
+ </div>
+ <div class="summary-item">
+ <span class="summary-label">寮哄害锛�</span>
+ <span class="summary-value">{{ sourceRowData.strength || '-' }}</span>
+ </div>
+ </div>
+ <div class="source-data-container">
+ <!-- 宸︿晶applyNo鍒楄〃 -->
+ <div class="applyno-list">
+ <div class="list-header">鐢宠鍗曞垪琛�</div>
+ <div class="list-body">
+ <div v-for="(item, index) in sourceTableData"
+ :key="item.applyNo || index"
+ class="applyno-item"
+ :class="{ active: selectedApplyNo === item.applyNo }"
+ @click="selectApplyNo(item)">
+ <div class="applyno-text">{{ item.applyNo }}</div>
+ <div class="applyno-info">{{ item.customerName }}</div>
+ </div>
+ </div>
+ </div>
+ <!-- 鍙充晶璇︾粏淇℃伅 -->
+ <div class="detail-info">
+ <div v-if="selectedSourceData && selectedSourceData.items && selectedSourceData.items.length > 0">
+ <div v-for="item in selectedSourceData.items"
+ :key="item.id"
+ class="source-data-card">
+ <!-- <div class="card-header">
+ <div class="data-source-tag">
+ </div>
+ <div class="card-title">浜у搧鏄庣粏</div>
+ </div> -->
+ <div class="card-body">
+ <div class="info-grid">
+ <div class="info-item">
+ <div class="info-label">鏁版嵁鏉ユ簮</div>
+ <div class="info-value">
+ <el-tag :type="item.dataSourceType == 1 ? 'primary' : 'warning'">
+ {{ item.dataSourceType == 1 ? '閽夐拤鍚屾' : '鎵嬪姩鏂板' }}
+ </el-tag>
+ </div>
+ </div>
+ <div class="info-item">
+ <div class="info-label">鍧楁暟</div>
+ <div class="info-value">{{ item.quantity || '-' }}<span style="color:rgb(63, 95, 211)"> 鍧�</span></div>
+ </div>
+ <div class="info-item">
+ <div class="info-label">鏂规暟</div>
+ <div class="info-value">{{ item.volume || '-' }}<span style="color:rgba(27, 104, 90, 0.76)"> 鏂�</span></div>
+ </div>
+ <div class="info-item">
+ <div class="info-label">涓嬪彂鐘舵��</div>
+ <div class="info-value">
+ <el-tag :type="{
+ 0: 'warning',
+ 1: 'primary',
+ 2: 'info'
+ }[item.status] || 'info'">
+ {{ item.status == 0 ? '寰呬笅鍙�' : item.status == 1 ? '閮ㄥ垎涓嬪彂' : '宸蹭笅鍙�' }}
+ </el-tag>
+ </div>
+ </div>
+ <div class="info-item">
+ <div class="info-label">宸蹭笅鍙戞柟鏁�</div>
+ <div class="info-value">{{ item.assignedQuantity ? `${item.assignedQuantity}` : 0 }}<span style="color:rgba(214, 134, 22, 0.76)"> 鏂�</span></div>
+ </div>
+ <div class="info-item">
+ <div class="info-label">灏哄</div>
+ <div class="info-value">{{ item.length || '-' }}mm 脳 {{ item.width || '-' }}mm 脳 {{ item.height || '-' }}mm</div>
+ </div>
+ <div class="info-item">
+ <div class="info-label">璁″垝寮�濮嬫棩鏈�</div>
+ <div class="info-value">{{ item.startDate ? dayjs(item.startDate).format('YYYY-MM-DD') : '' }}</div>
+ </div>
+ <div class="info-item">
+ <div class="info-label">璁″垝缁撴潫鏃ユ湡</div>
+ <div class="info-value">{{ item.endDate ? dayjs(item.endDate).format('YYYY-MM-DD') : '' }}</div>
+ </div>
+ <!-- <div class="info-item">
+ <div class="info-label">寮哄害</div>
+ <div class="info-value">{{ item.strength || '' }}</div>
+ </div> -->
+ </div>
+ <div class="remarks-section">
+ <div class="info-item full-width">
+ <div class="info-label">澶囨敞 1</div>
+ <div class="info-value">{{ item.remarkOne || '-' }}</div>
+ </div>
+ <div class="info-item full-width">
+ <div class="info-label">澶囨敞 2</div>
+ <div class="info-value">{{ item.remarkTwo || '-' }}</div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div v-else
+ class="empty-state">
+ <el-empty :description="selectedSourceData ? '璇ョ敵璇峰崟鏆傛棤鏁版嵁' : '璇烽�夋嫨涓�涓敵璇峰崟'" />
+ </div>
+ </div>
+ </div>
+ </el-dialog>
</div>
</template>
@@ -99,58 +255,108 @@
import { ElMessageBox } from "element-plus";
import dayjs from "dayjs";
import { useRouter } from "vue-router";
+ import { getDicts } from "@/api/system/dict/data";
import {
productOrderListPage,
listProcessRoute,
bindingRoute,
listProcessBom,
+ delProductOrder,
+ revokeProductOrder,
+ getProductOrderSource,
} from "@/api/productionManagement/productionOrder.js";
+ import { listPage } from "@/api/productionManagement/processRoute.js";
import { listMain as getOrderProcessRouteMain } from "@/api/productionManagement/productProcessRoute.js";
- const NewProductOrder = defineAsyncComponent(() => import("@/views/productionManagement/productionOrder/New.vue"));
+ import { fileDel } from "@/api/financialManagement/revenueManagement.js";
+ import PIMTable from "@/components/PIMTable/PIMTable.vue";
+ const NewProductOrder = defineAsyncComponent(() =>
+ import("@/views/productionManagement/productionOrder/New.vue")
+ );
const { proxy } = getCurrentInstance();
const router = useRouter();
const isShowNewModal = ref(false);
+ const sourceDataDialogVisible = ref(false);
+ const sourceTableData = ref([]);
+ const selectedApplyNo = ref("");
+ const selectedSourceData = ref(null);
+ const sourceRowData = ref(null);
const tableColumn = ref([
{
+ label: "鐘舵��",
+ prop: "status",
+ dataType: "tag",
+
+ formatData: val => {
+ const statusMap = {
+ 1: "寰呭紑濮�",
+ 2: "杩涜涓�",
+ 3: "宸插畬鎴�",
+ 4: "宸插彇娑�",
+ };
+ return statusMap[val] || "";
+ },
+ formatType: val => {
+ const statusMap = {
+ 1: "error",
+ 2: "warning",
+ 3: "success",
+ 4: "info",
+ };
+ return statusMap[val] || "info";
+ },
+ width: 100,
+ },
+ {
label: "鐢熶骇璁㈠崟鍙�",
prop: "npsNo",
- width: '120px',
- },
- {
- label: "閿�鍞悎鍚屽彿",
- prop: "salesContractNo",
- width: '150px',
- },
- {
- label: "瀹㈡埛鍚嶇О",
- prop: "customerName",
- width: '200px',
+ width: "120px",
},
{
label: "浜у搧鍚嶇О",
- prop: "productCategory",
- width: '120px',
+ prop: "productName",
+ width: "120px",
+ dataType: "tag",
},
{
label: "瑙勬牸",
- prop: "specificationModel",
- width: '120px',
+ prop: "model",
+ width: "120px",
+ },
+ {
+ label: "寮哄害",
+ prop: "strength",
+ width: "120px",
+ dataType: "tag",
+ },
+ {
+ label: "鐗╂枡缂栫爜",
+ prop: "materialCode",
+ width: "120px",
},
{
label: "宸ヨ壓璺嚎缂栧彿",
prop: "processRouteCode",
- width: '200px',
+ width: "200px",
+ className: "status-cell",
},
{
label: "闇�姹傛暟閲�",
prop: "quantity",
+ dataType: "slot",
+ align: "right",
+ slot: "quantity",
+ width: 120,
},
{
label: "瀹屾垚鏁伴噺",
prop: "completeQuantity",
+ dataType: "slot",
+ align: "right",
+ slot: "completeQuantity",
+ width: 120,
},
{
dataType: "slot",
@@ -173,17 +379,31 @@
},
{
label: "浜や粯鏃ユ湡",
- prop: "deliveryDate",
+ prop: "planCompleteTime",
formatData: val => (val ? dayjs(val).format("YYYY-MM-DD") : ""),
width: 120,
},
+ {
+ label: "鍒涘缓鏃堕棿",
+ prop: "createTime",
+ formatData: val => (val ? dayjs(val).format("YYYY-MM-DD HH:mm:ss") : ""),
+ width: 120,
+ },
+
{
dataType: "action",
label: "鎿嶄綔",
align: "center",
fixed: "right",
- width: 200,
+ width: 300,
operation: [
+ {
+ name: "鏉ユ簮",
+ type: "text",
+ clickFun: row => {
+ showSourceData(row);
+ },
+ },
{
name: "宸ヨ壓璺嚎",
type: "text",
@@ -194,18 +414,26 @@
{
name: "缁戝畾宸ヨ壓璺嚎",
type: "text",
- showHide: row => !row.processRouteCode,
+ showHide: row => !row.routeId,
clickFun: row => {
openBindRouteDialog(row);
},
},
{
- name: "浜у搧缁撴瀯",
+ name: "鍒犻櫎",
type: "text",
+ showHide: row => row.status == 4,
clickFun: row => {
- showProductStructure(row);
+ handleDeleteSolo(row);
},
},
+ // {
+ // name: "浜у搧缁撴瀯",
+ // type: "text",
+ // clickFun: row => {
+ // showProductStructure(row);
+ // },
+ // },
],
},
]);
@@ -216,14 +444,170 @@
size: 100,
total: 0,
});
+ const selectedRows = ref([]);
+
+ // 鏉ユ簮鏁版嵁寮圭獥鐩稿叧
+ const sourceTableColumn = ref([
+ {
+ label: "鏁版嵁鏉ユ簮",
+ width: "100px",
+ prop: "dataSourceType",
+ dataType: "tag",
+ formatType: params => {
+ const typeMap = {
+ 2: "warning",
+ 1: "primary",
+ };
+ return typeMap[params] || "info";
+ },
+ formatData: cell => (cell == 1 ? "閽夐拤鍚屾" : "鎵嬪姩鏂板"),
+ },
+ {
+ label: "鐢宠鍗曠紪鍙�",
+ prop: "applyNo",
+ width: "150px",
+ },
+ {
+ label: "瀹㈡埛鍚嶇О",
+ prop: "customerName",
+ width: "150px",
+ },
+ {
+ label: "浜у搧鍚嶇О",
+ prop: "productName",
+ width: "200px",
+ dataType: "tag",
+ formatType: params => {
+ return "primary";
+ },
+ },
+ {
+ label: "浜у搧瑙勬牸",
+ prop: "model",
+ width: "150px",
+ className: "spec-cell",
+ },
+ {
+ label: "鐗╂枡缂栫爜",
+ prop: "materialCode",
+ width: "150px",
+ },
+ {
+ label: "鍧楁暟",
+ prop: "quantity",
+ align: "right",
+ dataType: "slot",
+ slot: "quantity",
+ },
+ {
+ label: "鏂规暟",
+ prop: "volume",
+ width: "150px",
+ align: "right",
+ dataType: "slot",
+ slot: "volume",
+ className: "volume-cell",
+ },
+ {
+ label: "涓嬪彂鐘舵��",
+ prop: "status",
+ width: "150px",
+ className: "status-cell",
+ dataType: "tag",
+ formatType: params => {
+ const typeMap = {
+ 0: "warning",
+ 1: "primary",
+ 2: "info",
+ };
+ return typeMap[params] || "info";
+ },
+ formatData: cell => {
+ const statusMap = {
+ 0: "寰呬笅鍙�",
+ 1: "閮ㄥ垎涓嬪彂",
+ 2: "宸蹭笅鍙�",
+ };
+ return statusMap[cell] || "";
+ },
+ },
+ {
+ label: "宸蹭笅鍙戞柟鏁�",
+ prop: "assignedQuantity",
+ width: "150px",
+ className: "spec-cell",
+ formatData: cell => (cell ? `${cell}鏂筦 : 0),
+ },
+ {
+ label: "闀�",
+ prop: "length",
+ className: "dimension-cell",
+ formatData: cell => (cell ? `${cell}mm` : ""),
+ },
+ {
+ label: "瀹�",
+ prop: "width",
+ className: "dimension-cell",
+ formatData: cell => (cell ? `${cell}mm` : ""),
+ },
+ {
+ label: "楂�",
+ prop: "height",
+ className: "dimension-cell",
+ formatData: cell => (cell ? `${cell}mm` : ""),
+ },
+ {
+ label: "璁″垝寮�濮嬫棩鏈�",
+ prop: "startDate",
+ width: "150px",
+ className: "date-cell",
+ formatData: cell => (cell ? dayjs(cell).format("YYYY-MM-DD") : ""),
+ },
+ {
+ label: "璁″垝缁撴潫鏃ユ湡",
+ prop: "endDate",
+ width: "150px",
+ className: "date-cell",
+ formatData: cell => (cell ? dayjs(cell).format("YYYY-MM-DD") : ""),
+ },
+ {
+ label: "寮哄害",
+ prop: "strength",
+ formatData: cell => {
+ if (!cell) return "";
+ return cell;
+ },
+ },
+ {
+ label: "澶囨敞 1",
+ width: "150px",
+ prop: "remarkOne",
+ },
+ {
+ label: "澶囨敞 2",
+ width: "150px",
+ prop: "remarkTwo",
+ },
+ ]);
+ const sourceTableLoading = ref(false);
+ const sourcePage = reactive({
+ current: 1,
+ size: 100,
+ total: 0,
+ });
const data = reactive({
searchForm: {
customerName: "",
salesContractNo: "",
projectName: "",
- productCategory: "",
- specificationModel: "",
+ productName: "",
+ model: "",
+ dictCode: null,
+ startTime: null,
+ endTime: null,
+ strength: null,
+ status: "",
},
});
const { searchForm } = toRefs(data);
@@ -247,18 +631,18 @@
// 娣诲姞琛ㄨ绫诲悕鏂规硶
const tableRowClassName = ({ row }) => {
- if (row.isFh) return '';
-
- const diff = row.deliveryDaysDiff;
- if (diff === 15) {
- return 'yellow';
- } else if (diff === 10) {
- return 'pink';
- } else if (diff === 2) {
- return 'purple';
- } else if (diff < 2) {
- return 'red';
- }
+ // if (!row.planCompleteTime) return "";
+ // if (row.isFh) return "";
+ // const diff = row.deliveryDaysDiff;
+ // if (diff === 15) {
+ // return "yellow";
+ // } else if (diff === 10) {
+ // return "pink";
+ // } else if (diff === 2) {
+ // return "purple";
+ // } else if (diff < 2) {
+ // return "red";
+ // }
};
// 缁戝畾宸ヨ壓璺嚎寮规
@@ -266,6 +650,7 @@
const bindRouteLoading = ref(false);
const bindRouteSaving = ref(false);
const routeOptions = ref([]);
+ const productTypeOptions = ref([]);
const bindForm = reactive({
orderId: null,
routeId: null,
@@ -276,15 +661,32 @@
bindForm.routeId = null;
bindRouteDialogVisible.value = true;
routeOptions.value = [];
- if (!row.productModelId) {
+ if (!row.model) {
proxy.$modal.msgWarning("褰撳墠璁㈠崟缂哄皯浜у搧鍨嬪彿锛屾棤娉曟煡璇㈠伐鑹鸿矾绾�");
bindRouteDialogVisible.value = false;
return;
}
bindRouteLoading.value = true;
+ const distName =
+ row.productName == "鏉挎潗"
+ ? row.productName
+ : row.productName + "-" + row.strength;
+
try {
- const res = await listProcessRoute({ productModelId: row.productModelId });
- routeOptions.value = res.data || [];
+ // 鑾峰彇浜у搧绫诲瀷瀛楀吀
+ const dictRes = await getDicts("product_type");
+ if (dictRes.code === 200) {
+ productTypeOptions.value = dictRes.data;
+ // 鐢╠istName鍖归厤dictLabel锛岃幏鍙杁ictCode
+ const matchedType = productTypeOptions.value.find(
+ item => item.dictLabel === distName
+ );
+ const dictCode = matchedType ? matchedType.dictCode : row.productType;
+
+ // 浣跨敤dictCode鏌ヨ宸ヨ壓璺嚎鍒楄〃
+ const res = await listPage({ dictCode, status: true });
+ routeOptions.value = res.data.records || [];
+ }
} catch (e) {
console.error("鑾峰彇宸ヨ壓璺嚎鍒楄〃澶辫触锛�", e);
proxy.$modal.msgError("鑾峰彇宸ヨ壓璺嚎鍒楄〃澶辫触");
@@ -314,7 +716,27 @@
bindRouteSaving.value = false;
}
};
-
+ const statusOptions = ref([
+ { value: 1, label: "寰呭紑濮�" },
+ { value: 2, label: "杩涜涓�" },
+ { value: 3, label: "宸插畬鎴�" },
+ { value: 4, label: "宸插彇娑�" },
+ ]);
+ const handleReset = () => {
+ searchForm.value = {
+ customerName: "",
+ salesContractNo: "",
+ projectName: "",
+ productName: "",
+ model: "",
+ status: "",
+ strength: null,
+ startTime: null,
+ endTime: null,
+ };
+ createTime.value = [];
+ handleQuery();
+ };
// 鏌ヨ鍒楄〃
/** 鎼滅储鎸夐挳鎿嶄綔 */
const handleQuery = () => {
@@ -336,11 +758,25 @@
}
handleQuery();
};
+ const createTime = ref([]);
const getList = () => {
tableLoading.value = true;
// 鏋勯�犱竴涓柊鐨勫璞★紝涓嶅寘鍚玡ntryDate瀛楁
const params = { ...searchForm.value, ...page };
params.entryDate = undefined;
+ params.startTime =
+ createTime.value.length > 0
+ ? dayjs(createTime.value[0]).format("YYYY-MM-DD HH:mm:ss")
+ : undefined;
+ params.endTime =
+ createTime.value.length > 0
+ ? dayjs(createTime.value[1])
+ .hour(23)
+ .minute(59)
+ .second(59)
+ .format("YYYY-MM-DD HH:mm:ss")
+ : undefined;
+
productOrderListPage(params)
.then(res => {
tableLoading.value = false;
@@ -355,23 +791,23 @@
const showRouteItemModal = async row => {
const orderId = row.id;
try {
- const res = await getOrderProcessRouteMain(orderId);
- const data = res.data || {};
- if (!data || !data.id) {
- proxy.$modal.msgWarning("鏈壘鍒板叧鑱旂殑宸ヨ壓璺嚎");
- return;
- }
router.push({
path: "/productionManagement/processRouteItem",
query: {
- id: data.id,
- processRouteCode: data.processRouteCode || "",
- productName: data.productName || "",
- model: data.model || "",
- bomNo: data.bomNo || "",
- description: data.description || "",
- orderId,
+ id: row.routeId,
+ processRouteCode: row.processRouteCode || "",
+ productName: row.productName || "",
+ model: row.model || "",
+ bomNo: row.bomNo || "",
+ bomId: row.bomId || "",
+ description: row.description || "",
+ dictLabel:
+ row.productName == "鏉挎潗"
+ ? row.productName
+ : row.productName + "-" + row.strength,
+ orderId: row.id,
type: "order",
+ editable: true,
},
});
} catch (e) {
@@ -381,17 +817,128 @@
};
const showProductStructure = row => {
+ if (!row.processRouteCode) {
+ proxy.$modal.msgWarning("璇峰厛缁戝畾宸ヨ壓璺嚎");
+ return;
+ }
router.push({
path: "/productionManagement/productStructureDetail",
query: {
id: row.id,
bomNo: row.bomNo || "",
- productName: row.productCategory || "",
- productModelName: row.specificationModel || "",
+ productName: row.productName || "",
+ productModelName: row.model || "",
orderId: row.id,
type: "order",
},
});
+ };
+
+ // 閫夋嫨鐢宠鍗�
+ const selectApplyNo = item => {
+ selectedApplyNo.value = item.applyNo;
+ selectedSourceData.value = item;
+ };
+
+ // 鏌ョ湅鏉ユ簮鐢熶骇璁″垝鏁版嵁
+ const showSourceData = row => {
+ // 瀛樺偍鐐瑰嚮鏉ユ簮鎸夐挳鏃朵紶閫掔殑row鍙傛暟
+ sourceRowData.value = row;
+ // 璋冪敤API鑾峰彇鏉ユ簮鏁版嵁
+ getProductOrderSource(row.id)
+ .then(res => {
+ if (res.code === 200) {
+ // 澶勭悊鎺ュ彛杩斿洖鐨勬暟鎹紝璋冩暣涓烘垜浠渶瑕佺殑鏍煎紡
+ sourceTableData.value = res.data.map(item => {
+ return {
+ applyNo: item.applyNo,
+ customerName: item.productPlans[0]?.customerName || "",
+ items: item.productPlans.map(plan => {
+ return {
+ id: plan.id,
+ dataSourceType: plan.dataSourceType,
+ productName: plan.productName,
+ model: plan.model,
+ materialCode: plan.materialCode,
+ quantity: plan.quantity,
+ volume: plan.volume,
+ status: plan.status,
+ assignedQuantity: plan.assignedQuantity,
+ length: plan.length,
+ width: plan.width,
+ height: plan.height,
+ startDate: plan.startDate,
+ endDate: plan.endDate,
+ strength: plan.strength,
+ remarkOne: plan.remarkOne,
+ remarkTwo: plan.remarkTwo,
+ };
+ }),
+ };
+ });
+ sourcePage.total = sourceTableData.value.length;
+ // 榛樿閫夋嫨绗竴涓敵璇峰崟
+ if (sourceTableData.value.length > 0) {
+ selectApplyNo(sourceTableData.value[0]);
+ } else {
+ selectedApplyNo.value = "";
+ selectedSourceData.value = null;
+ }
+ // 鎵撳紑寮圭獥
+ sourceDataDialogVisible.value = true;
+ } else {
+ proxy.$modal.msgError(res.msg || "鑾峰彇鏉ユ簮鏁版嵁澶辫触");
+ }
+ })
+ .catch(err => {
+ proxy.$modal.msgError("鑾峰彇鏉ユ簮鏁版嵁澶辫触");
+ console.error(err);
+ });
+ };
+
+ // 琛ㄦ牸閫夋嫨鏁版嵁
+ const handleSelectionChange = selection => {
+ selectedRows.value = selection;
+ };
+ const handleDeleteSolo = row => {
+ ElMessageBox.confirm("閫変腑鐨勫唴瀹瑰皢琚垹闄わ紝鏄惁纭鍒犻櫎锛�", "瀵煎嚭", {
+ confirmButtonText: "纭",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ })
+ .then(() => {
+ delProductOrder(row.id).then(res => {
+ proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ getList();
+ });
+ })
+ .catch(() => {
+ proxy.$modal.msg("宸插彇娑�");
+ });
+ };
+
+ const handleDelete = () => {
+ let ids = [];
+ if (selectedRows.value.length > 0) {
+ ids = selectedRows.value.map(item => item.id);
+ } else {
+ proxy.$modal.msgWarning("璇烽�夋嫨鏁版嵁");
+ return;
+ }
+ ElMessageBox.confirm("閫変腑鐨勫唴瀹瑰皢琚��鍥烇紝鏄惁纭閫�鍥烇紵", "瀵煎嚭", {
+ confirmButtonText: "纭",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ })
+ .then(() => {
+ revokeProductOrder(ids).then(res => {
+ proxy.$modal.msgSuccess("閫�鍥炴垚鍔�");
+ getList();
+ });
+ })
+ .catch(() => {
+ proxy.$modal.msg("宸插彇娑�");
+ });
};
// 瀵煎嚭
@@ -402,7 +949,11 @@
type: "warning",
})
.then(() => {
- proxy.download("/productOrder/export", {...searchForm.value}, "鐢熶骇璁㈠崟.xlsx");
+ proxy.download(
+ "/productOrder/export",
+ { ...searchForm.value },
+ "鐢熶骇璁㈠崟.xlsx"
+ );
})
.catch(() => {
proxy.$modal.msg("宸插彇娑�");
@@ -410,30 +961,274 @@
};
const handleConfirmRoute = () => {};
+ const productTypeOptions2 = ref([]);
+ // 鑾峰彇浜у搧绫诲瀷瀛楀吀
+ const getProductTypeOptions = () => {
+ getDicts("block_strength")
+ .then(res => {
+ if (res.code === 200) {
+ productTypeOptions2.value = res.data;
+ }
+ })
+ .catch(err => {
+ console.error("鑾峰彇浜у搧绫诲瀷瀛楀吀澶辫触锛�", err);
+ });
+ };
onMounted(() => {
+ getProductTypeOptions();
getList();
});
</script>
<style scoped lang="scss">
-.search_form{
- align-items: start;
-}
+ .search_form {
+ align-items: start;
+ }
-::v-deep .yellow {
- background-color: #FAF0DE;
-}
+ ::v-deep .yellow {
+ background-color: #faf0de;
+ }
-::v-deep .pink {
- background-color: #FAE1DE;
-}
+ ::v-deep .pink {
+ background-color: #fae1de;
+ }
-::v-deep .red {
- background-color: #f80202;
-}
+ ::v-deep .red {
+ background-color: #f80202;
+ }
-::v-deep .purple{
- background-color: #F4DEFA;
-}
+ ::v-deep .purple {
+ background-color: #f4defa;
+ }
+</style>
+<style lang="scss">
+ .status-cell {
+ font-weight: 600;
+ color: #409eff;
+ font-family: "Courier New", monospace;
+ text-shadow: 0 1px 2px rgba(64, 158, 255, 0.2);
+ }
+
+ .source-data-container {
+ display: flex;
+ gap: 20px;
+ height: 500px;
+
+ .applyno-list {
+ width: 250px;
+ background: #fff;
+ border-radius: 8px;
+ box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+ overflow: hidden;
+
+ .list-header {
+ padding: 12px 16px;
+ background: #f5f7fa;
+ border-bottom: 1px solid #e4e7ed;
+ font-weight: 600;
+ color: #303133;
+ }
+
+ .list-body {
+ height: calc(100% - 48px);
+ overflow-y: auto;
+
+ .applyno-item {
+ padding: 12px 16px;
+ border-bottom: 1px solid #f0f2f5;
+ cursor: pointer;
+ transition: all 0.3s;
+
+ &:hover {
+ background: #f5f7fa;
+ }
+
+ &.active {
+ background: #ecf5ff;
+ border-left: 4px solid #409eff;
+ }
+
+ .applyno-text {
+ font-weight: 600;
+ color: #303133;
+ font-family: "Courier New", monospace;
+ margin-bottom: 4px;
+ }
+
+ .applyno-info {
+ font-size: 12px;
+ color: #909399;
+ }
+ }
+ }
+ }
+
+ .detail-info {
+ flex: 1;
+ background: #fff;
+ border-radius: 8px;
+ // box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+ overflow: auto;
+ display: flex;
+ flex-direction: column;
+
+ .applyno-summary {
+ padding: 16px 20px;
+ background: #f5f7fa;
+ border-bottom: 1px solid #e4e7ed;
+ display: flex;
+ flex-wrap: wrap;
+ gap: 16px;
+
+ .summary-item {
+ display: flex;
+ align-items: center;
+
+ .summary-label {
+ font-size: 13px;
+ color: #909399;
+ margin-right: 8px;
+ font-weight: 500;
+ }
+
+ .summary-value {
+ font-size: 14px;
+ color: #303133;
+ font-weight: 500;
+ }
+ }
+ }
+
+ .empty-state {
+ flex: 1;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+
+ .source-data-card {
+ flex: 1;
+ display: flex;
+ flex-direction: column;
+ overflow: hidden;
+ margin-top: 20px;
+ margin-right: 20px;
+ box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+
+ .card-header {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ padding: 16px 20px;
+ background: #f5f7fa;
+ border-bottom: 1px solid #e4e7ed;
+
+ .data-source-tag {
+ flex-shrink: 0;
+ }
+
+ .card-title {
+ font-weight: 600;
+ color: #303133;
+ font-size: 14px;
+ }
+ }
+
+ .card-body {
+ flex: 1;
+ padding: 20px;
+ overflow-y: auto;
+ background-color: #f5f7fa;
+
+ .info-grid {
+ display: grid;
+ grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
+ gap: 16px;
+ margin-bottom: 20px;
+
+ .info-item {
+ display: flex;
+ flex-direction: column;
+
+ .info-label {
+ font-size: 12px;
+ color: #909399;
+ margin-bottom: 4px;
+ font-weight: 500;
+ }
+
+ .info-value {
+ font-size: 14px;
+ color: #303133;
+ font-weight: 500;
+ }
+ }
+
+ .info-item.full-width {
+ grid-column: 1 / -1;
+ }
+ }
+
+ .remarks-section {
+ display: flex;
+ // flex-direction: column;
+ gap: 12px;
+ border-top: 1px solid #e4e7ed;
+ padding-top: 16px;
+
+ .info-item {
+ display: flex;
+ width: 50%;
+ flex-direction: column;
+
+ .info-label {
+ font-size: 12px;
+ color: #909399;
+ margin-bottom: 4px;
+ font-weight: 500;
+ }
+
+ .info-value {
+ font-size: 14px;
+ color: #303133;
+ line-height: 1.5;
+ padding: 8px;
+ background: #f9fafc;
+ border-radius: 4px;
+ border: 1px solid #ecf5ff;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ .applyno-summary1 {
+ padding: 16px 20px;
+ background: #f5f7fa;
+ border-bottom: 1px solid #e4e7ed;
+ display: flex;
+ flex-wrap: wrap;
+ gap: 16px;
+
+ .summary-item {
+ display: flex;
+ align-items: center;
+ margin-right: 20px;
+
+ .summary-label {
+ font-size: 13px;
+ color: #909399;
+ margin-right: 8px;
+ font-weight: 500;
+ }
+
+ .summary-value {
+ font-size: 14px;
+ color: #303133;
+ font-weight: 500;
+ }
+ }
+ }
</style>
--
Gitblit v1.9.3