From 6a3acef55d73692b23b3611d954a399a60ecc97a Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期四, 11 一月 2024 17:06:45 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/plan/productionschedul/index.vue | 62 +++++++++++++++---------------
1 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/src/views/plan/productionschedul/index.vue b/src/views/plan/productionschedul/index.vue
index e762066..4f05a4f 100644
--- a/src/views/plan/productionschedul/index.vue
+++ b/src/views/plan/productionschedul/index.vue
@@ -10,37 +10,37 @@
<div>
<el-button @click="tagFinished" size="mini" round type="success">鏍囪宸插畬鎴�</el-button>
<el-button size="mini" round type="primary"
- v-if="permissions.plan_productionschedul_edit_line"
+ v-if="permissions.plan_productionschedul_edit_line"
@click="openEditDialog">缂栬緫鏃堕棿绾�</el-button>
<el-tooltip content="鍒锋柊">
<el-button circle icon="el-icon-refresh" @click="getDataList"></el-button>
</el-tooltip>
</div>
</div>
- <avue-crud
+ <avue-crud
class="unfinished-crud"
- :data="tableData"
- ref="crud"
- :option="option"
- :span-method="spanMethod"
+ :data="tableData"
+ ref="crud"
+ :option="option"
+ :span-method="spanMethod"
@refresh-change="getDataList"
@current-change="handleCurrentChange"
@size-change="handleSizeChange"
- :page="page"
+ :page="page"
@selection-change="selectionRow"
:table-loading="loading">
<template #menu="{ row, index }">
- <el-button
- v-if="permissions.plan_productionschedul_edit"
- type="text"
- icon="el-icon-edit"
- size="small"
+ <el-button
+ v-if="permissions.plan_productionschedul_edit"
+ type="text"
+ icon="el-icon-edit"
+ size="small"
@click="editHandle(row, index)">缂栬緫</el-button>
- <el-button
- v-if="permissions.plan_productionschedul_del"
- type="text"
- icon="el-icon-delete"
- size="small"
+ <el-button
+ v-if="permissions.plan_productionschedul_del"
+ type="text"
+ icon="el-icon-delete"
+ size="small"
@click="deleteHandle(row, index)">鍒犻櫎</el-button>
</template>
</avue-crud>
@@ -51,23 +51,23 @@
<div style="display:flex;height:36px;justify-content: space-between;align-items:center;">
<div><span style="color:#34BD66;font-weight: bold;">宸插畬鎴�</span></div>
</div>
- <avue-crud
+ <avue-crud
class="finished-crud"
- :data="finishedTableData"
- ref="finished"
- :option="finishedOption"
- :span-method="spanMethod"
+ :data="finishedTableData"
+ ref="finished"
+ :option="finishedOption"
+ :span-method="spanMethod"
@refresh-change="getFinishedData"
@current-change="handleCurrentChange"
@size-change="handleSizeChange"
- :page="finishedPage"
+ :page="finishedPage"
@selection-change="selectionFinishedRow">
<!-- <template #menu="{ row, index }">
- <el-button
- v-if="permissions.plan_productionschedul_del"
- type="text"
- icon="el-icon-delete"
- size="small"
+ <el-button
+ v-if="permissions.plan_productionschedul_del"
+ type="text"
+ icon="el-icon-delete"
+ size="small"
@click="deleteHandle(row, index)">鍒犻櫎</el-button>
</template> -->
</avue-crud>
@@ -129,7 +129,7 @@
style="width:100%"
v-model="item.planTime"
value-format="yyyy-MM-dd HH:mm:ss"
- type="datetime"
+ type="datetime"
placeholder="閫夋嫨鏃ユ湡鏃堕棿">
</el-date-picker>
</el-col>
@@ -143,7 +143,7 @@
style="width:100%"
v-model="item.actualTime"
value-format="yyyy-MM-dd HH:mm:ss"
- type="datetime"
+ type="datetime"
placeholder="閫夋嫨鏃ユ湡鏃堕棿">
</el-date-picker>
</el-col>
@@ -454,7 +454,7 @@
}, {
prop: 'contractNo',
span: []
- },
+ },
{
prop: 'orderTime',
span: []
--
Gitblit v1.9.3