From d71aa3a053f94e8e462609a255f92bf1a60b3109 Mon Sep 17 00:00:00 2001
From: CD配唱片 <CD配唱片>
Date: 星期五, 25 四月 2025 14:23:26 +0800
Subject: [PATCH] 提交计划大表字段冲突解决
---
src/views/mainPlan/platePlanList/index.vue | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/src/views/mainPlan/platePlanList/index.vue b/src/views/mainPlan/platePlanList/index.vue
index 9a41267..a5ca6a5 100644
--- a/src/views/mainPlan/platePlanList/index.vue
+++ b/src/views/mainPlan/platePlanList/index.vue
@@ -49,7 +49,7 @@
plain
icon="Edit"
@click="handleUpdate"
- v-hasPermi="['apsPlateProcessStat:edit']"
+ v-hasPermi="['plateProcessShopStat:update']"
>鏇存柊</el-button
>
</el-col>
@@ -171,11 +171,19 @@
field: "documentNumber",
width: 200,
},
+<<<<<<< HEAD
{
title: "褰撳墠宸ュ簭鍙�",
field: "currentProcessNumberTxt",
width: 150,
},
+=======
+ // {
+ // title: "褰撳墠宸ュ簭鍙�",
+ // field: "processNumber",
+ // width: 150,
+ // },
+>>>>>>> 8c613f17337c8e7fc68a12d02cafa05d0dca81ba
{
title: "闇�姹傚垎绫�",
field: "requirementType",
@@ -192,10 +200,14 @@
width: 200,
},
{
- title: "璁″垝寮�宸ユ棩",
- field: "processPlanStartDaytxt",
+ title: "褰撳墠宸ュ簭璐熻矗浜�",
+ field: "department",
width: 200,
- type: "html",
+ },
+ {
+ title: "涓嬩竴宸ュ簭宸ュ簭璐熻矗浜�",
+ field: "nextProcessDeparment",
+ width: 200,
},
{
title: "鏂欏彿",
@@ -222,7 +234,7 @@
type: "html",
},
{
- title: "璁″垝瀹屽伐鏃�",
+ title: "绯荤粺瀹屽伐鏃堕棿",
field: "planEndDay",
width: 150,
format: "YYYY-MM-DD hh:mm:ss",
--
Gitblit v1.9.3