From 0177daf2022ff2b760e8cd00df8bba105f96db81 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 28 二月 2024 09:29:12 +0800
Subject: [PATCH] 销售订单&原材料检验
---
src/views/plan/productionschedul/index.vue | 85 +++++++++++++++---------------------------
1 files changed, 30 insertions(+), 55 deletions(-)
diff --git a/src/views/plan/productionschedul/index.vue b/src/views/plan/productionschedul/index.vue
index e762066..5030d7e 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,25 +51,17 @@
<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"
- @click="deleteHandle(row, index)">鍒犻櫎</el-button>
- </template> -->
</avue-crud>
</el-col>
</el-row>
@@ -110,8 +102,7 @@
title="缂栬緫鏃堕棿绾�"
:visible.sync="dialogVisible"
top="5vh"
- width="50%"
- :before-close="handleClose">
+ width="50%">
<div style="height:60vh;overflow-y: scroll;">
<el-timeline>
<el-timeline-item
@@ -129,8 +120,8 @@
style="width:100%"
v-model="item.planTime"
value-format="yyyy-MM-dd HH:mm:ss"
- type="datetime"
- placeholder="閫夋嫨鏃ユ湡鏃堕棿">
+ type="datetime"
+ placeholder="閫夋嫨璁″垝鏃堕棿">
</el-date-picker>
</el-col>
</el-row>
@@ -143,8 +134,8 @@
style="width:100%"
v-model="item.actualTime"
value-format="yyyy-MM-dd HH:mm:ss"
- type="datetime"
- placeholder="閫夋嫨鏃ユ湡鏃堕棿">
+ type="datetime"
+ placeholder="閫夋嫨瀹為檯鏃堕棿">
</el-date-picker>
</el-col>
</el-row>
@@ -454,7 +445,7 @@
}, {
prop: 'contractNo',
span: []
- },
+ },
{
prop: 'orderTime',
span: []
@@ -594,12 +585,6 @@
"productActualTime": data[5].actualTime,
"productPlanTime": data[5].planTime,
"mids": mIds,
- // "contractNo": orderObj.contractNo,
- // "customerName": orderObj.customerName,
- // "deliveryDate": orderObj.deliveryDate,
- // "orderTime": orderObj.orderTime,
- // "productType": orderObj.productType,
- // "projectName": orderObj.projectName
}
fillTime(obj).then(res=>{
if(res.status===200){
@@ -613,9 +598,6 @@
console.error(error);
})
- },
- handleClose(done){
- done()
},
initTimeLine(data){
let scheduleList = []
@@ -666,15 +648,8 @@
}
},
selectionRow(val){
- if (val.length > 1) {
- const preVal = val.shift();
- this.$refs.crud.toggleRowSelection(preVal, false);
- }
- else{
- this.scheduleList=[]
- }
this.multipleSelection = val
- this.getScheduleById(val[0].mid)
+ this.getScheduleById(val[val.length-1].mid)
},
selectionFinishedRow(val){
if (val.length > 1) {
--
Gitblit v1.9.3