From e3046eadbc354ace9f15166940366aea6480f55a Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 06 三月 2026 17:44:00 +0800
Subject: [PATCH] Merge branch 'dev_KTHG' of http://114.132.189.42:9002/r/product-inventory-management into dev_KTHG
---
src/views/productionManagement/productionOrder/index.vue | 109 ++++++++++++++----------------------------------------
1 files changed, 29 insertions(+), 80 deletions(-)
diff --git a/src/views/productionManagement/productionOrder/index.vue b/src/views/productionManagement/productionOrder/index.vue
index 761139e..f20fd80 100644
--- a/src/views/productionManagement/productionOrder/index.vue
+++ b/src/views/productionManagement/productionOrder/index.vue
@@ -3,22 +3,6 @@
<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"
- placeholder="璇疯緭鍏�"
- clearable
- prefix-icon="Search"
- style="width: 160px;"
- @change="handleQuery" />
- </el-form-item>
<el-form-item label="浜у搧鍚嶇О:">
<el-input v-model="searchForm.productCategory"
placeholder="璇疯緭鍏�"
@@ -52,7 +36,6 @@
:tableData="tableData"
:page="page"
:tableLoading="tableLoading"
- :row-class-name="tableRowClassName"
:isSelection="true"
@selection-change="handleSelectionChange"
@pagination="pagination">
@@ -119,21 +102,21 @@
const isShowNewModal = ref(false);
const tableColumn = ref([
- {
- label: "鐢熶骇璁㈠崟鍙�",
- prop: "npsNo",
- width: '120px',
- },
- {
- label: "閿�鍞悎鍚屽彿",
- prop: "salesContractNo",
- width: '150px',
- },
- {
- label: "瀹㈡埛鍚嶇О",
- prop: "customerName",
- width: '200px',
- },
+ // {
+ // label: "鐢熶骇璁㈠崟鍙�",
+ // prop: "npsNo",
+ // width: '120px',
+ // },
+ // {
+ // label: "閿�鍞悎鍚屽彿",
+ // prop: "salesContractNo",
+ // width: '150px',
+ // },
+ // {
+ // label: "瀹㈡埛鍚嶇О",
+ // prop: "customerName",
+ // width: '200px',
+ // },
{
label: "浜у搧鍚嶇О",
prop: "productCategory",
@@ -165,23 +148,23 @@
width: 180,
},
{
- label: "寮�濮嬫棩鏈�",
- prop: "startTime",
+ label: "鐢熶骇鏃ユ湡",
+ prop: "productionDate",
formatData: val => (val ? dayjs(val).format("YYYY-MM-DD") : ""),
width: 120,
},
- {
- label: "缁撴潫鏃ユ湡",
- prop: "endTime",
- formatData: val => (val ? dayjs(val).format("YYYY-MM-DD") : ""),
- width: 120,
- },
- {
- label: "浜や粯鏃ユ湡",
- prop: "deliveryDate",
- formatData: val => (val ? dayjs(val).format("YYYY-MM-DD") : ""),
- width: 120,
- },
+ // {
+ // label: "缁撴潫鏃ユ湡",
+ // prop: "endTime",
+ // formatData: val => (val ? dayjs(val).format("YYYY-MM-DD") : ""),
+ // width: 120,
+ // },
+ // {
+ // label: "浜や粯鏃ユ湡",
+ // prop: "deliveryDate",
+ // formatData: val => (val ? dayjs(val).format("YYYY-MM-DD") : ""),
+ // width: 120,
+ // },
{
dataType: "action",
label: "鎿嶄綔",
@@ -225,7 +208,6 @@
const data = reactive({
searchForm: {
- customerName: "",
salesContractNo: "",
projectName: "",
productCategory: "",
@@ -249,23 +231,6 @@
if (p < 50) return "#e6a23c";
if (p < 80) return "#409eff";
return "#67c23a";
- };
-
- // 娣诲姞琛ㄨ绫诲悕鏂规硶
- const tableRowClassName = ({ row }) => {
- if (!row.deliveryDate) 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';
- }
};
// 缁戝畾宸ヨ壓璺嚎寮规
@@ -453,21 +418,5 @@
<style scoped lang="scss">
.search_form{
align-items: start;
-}
-
-::v-deep .yellow {
- background-color: #FAF0DE;
-}
-
-::v-deep .pink {
- background-color: #FAE1DE;
-}
-
-::v-deep .red {
- background-color: #f80202;
-}
-
-::v-deep .purple{
- background-color: #F4DEFA;
}
</style>
--
Gitblit v1.9.3