From 4cc27f93a1901e12eb12a198029911c483dd991f Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 27 八月 2025 14:30:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_JLMY' into dev_JLMY
---
src/views/production/operationScheduling/index.vue | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/views/production/operationScheduling/index.vue b/src/views/production/operationScheduling/index.vue
index ff8b2a6..f44b496 100644
--- a/src/views/production/operationScheduling/index.vue
+++ b/src/views/production/operationScheduling/index.vue
@@ -2,12 +2,12 @@
<div class="app-container">
<!-- 鎼滅储琛ㄥ崟 -->
<el-form :inline="true" :model="queryParams" class="search-form">
- <el-form-item label="鎼滅储">
- <el-input
- v-model="queryParams.searchAll"
- placeholder="璇疯緭鍏ュ叧閿瘝"
- clearable
- />
+ <el-form-item label="鐘舵��">
+ <el-select style="width: 200px;" clearable v-model="queryParams.searchAll" placeholder="璇烽�夋嫨鐘舵��">
+ <el-option label="寰呮帓浜�" value="1"></el-option>
+ <el-option label="鎺掍骇涓�" value="2"></el-option>
+ <el-option label="宸叉帓浜�" value="3"></el-option>
+ </el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="handleSearch">鏌ヨ</el-button>
@@ -107,7 +107,12 @@
}
},
{ prop: "producer", label: "鐢熶骇浜�", minWidth: 150 },
- { prop: "productionQuantity", label: "鐢熶骇鏁伴噺", minWidth: 120 },
+ { prop: "productionQuantity", label: "鎺掍骇鏁伴噺", minWidth: 120 },
+ { prop: "pendingQuantity", label: "宸叉帓浜ф暟閲�", minWidth: 120,
+ formatter: (row) => {
+ return row.pendingQuantity || '0';
+ }
+ },
{ prop: "laborCost", label: "浜哄伐鎴愭湰", minWidth: 150 },
{ prop: "energyConsumptionCost", label: "鑳借�楁垚鏈�", minWidth: 120 },
{ prop: "equipmentDepreciation", label: "璁惧鎶樻棫", minWidth: 143 },
--
Gitblit v1.9.3