From 06367391d2f853a302266a1dfba8da5e813f8761 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 30 一月 2024 15:56:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/plan/productionschedul/index.vue | 33 ++++-----------------------------
src/views/quality/finishedProductInspection/index.vue | 2 +-
src/views/quality/Packaging_ledger/index.vue | 3 ---
3 files changed, 5 insertions(+), 33 deletions(-)
diff --git a/src/views/plan/productionschedul/index.vue b/src/views/plan/productionschedul/index.vue
index 4f05a4f..5030d7e 100644
--- a/src/views/plan/productionschedul/index.vue
+++ b/src/views/plan/productionschedul/index.vue
@@ -62,14 +62,6 @@
@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-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
@@ -130,7 +121,7 @@
v-model="item.planTime"
value-format="yyyy-MM-dd HH:mm:ss"
type="datetime"
- placeholder="閫夋嫨鏃ユ湡鏃堕棿">
+ placeholder="閫夋嫨璁″垝鏃堕棿">
</el-date-picker>
</el-col>
</el-row>
@@ -144,7 +135,7 @@
v-model="item.actualTime"
value-format="yyyy-MM-dd HH:mm:ss"
type="datetime"
- placeholder="閫夋嫨鏃ユ湡鏃堕棿">
+ placeholder="閫夋嫨瀹為檯鏃堕棿">
</el-date-picker>
</el-col>
</el-row>
@@ -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) {
diff --git a/src/views/quality/Packaging_ledger/index.vue b/src/views/quality/Packaging_ledger/index.vue
index 19433f0..d72861a 100644
--- a/src/views/quality/Packaging_ledger/index.vue
+++ b/src/views/quality/Packaging_ledger/index.vue
@@ -565,7 +565,4 @@
font-size: 12pt;
font-family: 瀹嬩綋;
}
-.avue-main .el-card__body {
- padding: 4px 0px 5px;
-}
</style>
diff --git a/src/views/quality/finishedProductInspection/index.vue b/src/views/quality/finishedProductInspection/index.vue
index d71804a..89c80e9 100644
--- a/src/views/quality/finishedProductInspection/index.vue
+++ b/src/views/quality/finishedProductInspection/index.vue
@@ -169,7 +169,7 @@
{
minWidth: '120',
prop: 'createTime',
- label: '妫�楠屾棩鏈�',
+ label: '鎶ユ鏃ユ湡',
sort: true,
isTrue: true,
isSearch: true,
--
Gitblit v1.9.3