From caff3373cde7f6bdaa139c72c91a3e0d472a7c7f Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期四, 05 二月 2026 17:24:49 +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/New.vue | 18 ++++++++
src/views/productionManagement/productionOrder/index.vue | 62 +++++--------------------------
2 files changed, 27 insertions(+), 53 deletions(-)
diff --git a/src/views/productionManagement/productionOrder/New.vue b/src/views/productionManagement/productionOrder/New.vue
index c9c478b..1e93cfb 100644
--- a/src/views/productionManagement/productionOrder/New.vue
+++ b/src/views/productionManagement/productionOrder/New.vue
@@ -48,13 +48,27 @@
:value="item.id" />
</el-select>
</el-form-item>
-
+ <el-form-item
+ label="鐢熶骇鏃ユ湡"
+ prop="productionDate"
+ >
+ <el-date-picker
+ v-model="formState.productionDate"
+ type="date"
+ placeholder="璇烽�夋嫨鐢熶骇鏃ユ湡"
+ :size="size"
+ format="YYYY-MM-DD"
+ value-format="YYYY-MM-DD"
+ style="width: 100%"
+ />
+ </el-form-item>
<el-form-item
label="闇�姹傛暟閲�"
prop="quantity"
>
<el-input-number v-model="formState.quantity" :step="1" :min="1" style="width: 100%" />
</el-form-item>
+
</el-form>
<!-- 浜у搧閫夋嫨寮圭獥 -->
@@ -102,6 +116,7 @@
productModelName: "",
unit: "",
quantity: 0,
+ productionDate: new Date().toISOString().substr(0, 10),
});
const isShow = computed({
@@ -126,6 +141,7 @@
productName: "",
productModelName: "",
quantity: '',
+ productionDate: new Date().toISOString().substr(0, 10),
};
isShow.value = false;
};
diff --git a/src/views/productionManagement/productionOrder/index.vue b/src/views/productionManagement/productionOrder/index.vue
index 761139e..185c1e1 100644
--- a/src/views/productionManagement/productionOrder/index.vue
+++ b/src/views/productionManagement/productionOrder/index.vue
@@ -11,14 +11,6 @@
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 +44,6 @@
:tableData="tableData"
:page="page"
:tableLoading="tableLoading"
- :row-class-name="tableRowClassName"
:isSelection="true"
@selection-change="handleSelectionChange"
@pagination="pagination">
@@ -119,16 +110,16 @@
const isShowNewModal = ref(false);
const tableColumn = ref([
- {
- label: "鐢熶骇璁㈠崟鍙�",
- prop: "npsNo",
- width: '120px',
- },
- {
- label: "閿�鍞悎鍚屽彿",
- prop: "salesContractNo",
- width: '150px',
- },
+ // {
+ // label: "鐢熶骇璁㈠崟鍙�",
+ // prop: "npsNo",
+ // width: '120px',
+ // },
+ // {
+ // label: "閿�鍞悎鍚屽彿",
+ // prop: "salesContractNo",
+ // width: '150px',
+ // },
{
label: "瀹㈡埛鍚嶇О",
prop: "customerName",
@@ -249,23 +240,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 +427,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