From ca24e514400e386de5066ec6e423d7fd2de43f65 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 31 一月 2024 16:30:17 +0800
Subject: [PATCH] 不合格状态
---
src/views/plan/productionschedul/index.vue | 204 +++++++++++++++++++-------------------------------
1 files changed, 77 insertions(+), 127 deletions(-)
diff --git a/src/views/plan/productionschedul/index.vue b/src/views/plan/productionschedul/index.vue
index cd1b614..5030d7e 100644
--- a/src/views/plan/productionschedul/index.vue
+++ b/src/views/plan/productionschedul/index.vue
@@ -2,74 +2,71 @@
<div class="mod-config">
<basic-container>
<el-row>
- <el-col :span="14" style="height:100vh">
- <el-row style="height:70%;padding:0px 10px;">
- <el-col :span="24">
- <div>
- <span style="position: relative;top:40px;color:#E84738">鏈畬鎴�</span>
- <span style="position: relative;top:30px;left:61%;z-index: 11">
+ <el-col :span="16" style="height:100vh">
+ <el-row style="height:65%;padding:0px 10px;">
+ <el-col :span="24" style="margin: 0;">
+ <div style="display:flex;height:36px;justify-content: space-between;align-items:center;">
+ <div><span style="color:#E84738;font-weight: bold;">鏈畬鎴�</span></div>
+ <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>
- </span>
- <avue-crud
- :data="tableData"
- ref="crud"
- :option="option"
- :span-method="spanMethod"
- @refresh-change="getDataList"
- @current-change="handleCurrentChange"
- @size-change="handleSizeChange"
- :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"
- @click="editHandle(row, index)">缂栬緫</el-button>
- <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-tooltip content="鍒锋柊">
+ <el-button circle icon="el-icon-refresh" @click="getDataList"></el-button>
+ </el-tooltip>
+ </div>
</div>
+ <avue-crud
+ class="unfinished-crud"
+ :data="tableData"
+ ref="crud"
+ :option="option"
+ :span-method="spanMethod"
+ @refresh-change="getDataList"
+ @current-change="handleCurrentChange"
+ @size-change="handleSizeChange"
+ :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"
+ @click="editHandle(row, index)">缂栬緫</el-button>
+ <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>
- <el-row style="height:30%;padding:0px 10px;">
- <el-col :span="24">
- <div>
- <span style="position: relative;top:0px;color:#34BD66">宸插畬鎴�</span>
- <avue-crud
- :data="finishedTableData"
- ref="finished"
- :option="finishedOption"
- :span-method="spanMethod"
- @refresh-change="getFinishedData"
- @current-change="handleCurrentChange"
- @size-change="handleSizeChange"
- :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-row style="height:35%;padding:0px 10px;">
+ <el-col :span="24" style="margin: 0;">
+ <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
+ class="finished-crud"
+ :data="finishedTableData"
+ ref="finished"
+ :option="finishedOption"
+ :span-method="spanMethod"
+ @refresh-change="getFinishedData"
+ @current-change="handleCurrentChange"
+ @size-change="handleSizeChange"
+ :page="finishedPage"
+ @selection-change="selectionFinishedRow">
+ </avue-crud>
</el-col>
</el-row>
</el-col>
- <el-col :span="10" style="padding-left: 10px">
+ <el-col :span="8" style="padding-left: 10px">
<div style="">
<el-card>
<div slot="header" class="clearfix">
@@ -105,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
@@ -124,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>
@@ -138,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>
@@ -225,7 +221,7 @@
prop:'id',
order:'descending'
},
- height: 360,
+ height: 370,
selection: true,
columnBtn: false,
index: true,
@@ -335,7 +331,7 @@
prop:'id',
order:'descending'
},
- height: 150,
+ height: 230,
selection: true,
columnBtn: false,
index: true,
@@ -449,7 +445,7 @@
}, {
prop: 'contractNo',
span: []
- },
+ },
{
prop: 'orderTime',
span: []
@@ -562,7 +558,6 @@
if(res.data.data.length==1){
let dataList = this.initTimeLine(res.data.data[0])
this.scheduleEditList = dataList
- console.log(this.scheduleEditList);
this.dialogVisible = true
}else{
this.$message.error("閫変腑鏁版嵁鐨勮皟搴︽椂闂寸嚎涓嶄竴鑷�!")
@@ -590,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){
@@ -606,12 +595,9 @@
this.getScheduleById(orderObj.id)
this.dialogVisible = false
}).catch(error=>{
- console.log(error);
+ console.error(error);
})
- },
- handleClose(done){
- done()
},
initTimeLine(data){
let scheduleList = []
@@ -657,20 +643,13 @@
fetchScheduleById(id).then(res=>{
this.scheduleList = this.initTimeLine(res.data.data)
}).catch(error=>{
- console.log(error);
+ console.error(error);
})
}
},
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) {
@@ -824,51 +803,22 @@
}
</script>
<style>
-.avue-crud__tip{
+.unfinished-crud .avue-crud__tip{
+ display: none;
+}
+.unfinished-crud .avue-crud__menu{
+ display: none;
+}
+.finished-crud .avue-crud__tip{
+ display: none;
+}
+.finished-crud .avue-crud__menu{
display: none;
}
.avue-crud__pagination {
position: relative;
- padding: 5px 0 20px 20px;
+ padding: 0px 0 0px 20px;
text-align: right;
z-index: 10;
-}
-.basic-template-table .el-table__body .el-table__row td:first-child .cell {
- padding-left: 0px;
- padding-right: 0px;
-}
-
-.basic-template-table .el-table__body .el-table__row:hover {
- cursor: move;
-}
-
-.basic-template-table .el-table__body .el-table__row:hover .icon {
- display: inline-block;
-}
-
-.basic-template-table .el-table__body .el-table__row .icon {
- color: rgba(0, 0, 0, 0.45);
- font-size: 12px;
- line-height: 18px;
- display: none;
-}
-
-.aufontAll {
- font-family: aufontAll !important;
- font-size: 14px;
- font-style: normal;
- -webkit-font-smoothing: antialiased;
- -moz-osx-font-smoothing: grayscale;
-}
-
-.h-icon-all-drag {
- background: url('/img/tz.png') center center no-repeat;
- background-size: cover;
- font-size: 14px;
-}
-.h-icon-all-drag:before {
- content: '\E63E';
- font-size: 14px;
- visibility: hidden;
}
</style>
--
Gitblit v1.9.3