From 5881cf33d6410528f713f8b49c708d83cff27c11 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期二, 26 十二月 2023 14:33:34 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/plan/productionschedul/index.vue | 75 ++++++++++++++++++++++---------------
1 files changed, 45 insertions(+), 30 deletions(-)
diff --git a/src/views/plan/productionschedul/index.vue b/src/views/plan/productionschedul/index.vue
index ea93866..9117ea8 100644
--- a/src/views/plan/productionschedul/index.vue
+++ b/src/views/plan/productionschedul/index.vue
@@ -2,13 +2,13 @@
<div class="mod-config">
<basic-container>
<el-row>
- <el-col :span="14">
- <el-row>
+ <el-col :span="14" style="height:100vh">
+ <el-row style="height:50%;padding:0px 10px;">
<el-col :span="24">
- <div style="height:40vh;padding: 0px 10px;">
- <span style="position: relative;top:40px;">鏈畬鎴�</span>
- <span style="position: relative;top:30px;left:60%;z-index: 11">
- <el-button @click="tagFinished" size="mini" round type="primary">鏍囪宸插畬鎴�</el-button>
+ <div>
+ <span style="position: relative;top:40px;color:#E84738">鏈畬鎴�</span>
+ <span style="position: relative;top:30px;left:61%;z-index: 11">
+ <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"
@click="openEditDialog">缂栬緫鏃堕棿绾�</el-button>
@@ -18,7 +18,7 @@
ref="crud"
:option="option"
:span-method="spanMethod"
- @refresh-change="getUnFinishedData"
+ @refresh-change="getDataList"
@current-change="handleCurrentChange"
@size-change="handleSizeChange"
:page="page"
@@ -42,10 +42,10 @@
</div>
</el-col>
</el-row>
- <el-row>
+ <el-row style="height:50%;padding:0px 10px;">
<el-col :span="24">
- <div style="height:40vh;padding: 0px 10px;">
- <span style="position: relative;top:40px">宸插畬鎴�</span>
+ <div>
+ <span style="position: relative;top:0px;color:#34BD66">宸插畬鎴�</span>
<avue-crud
:data="finishedTableData"
ref="finished"
@@ -75,7 +75,7 @@
<div slot="header" class="clearfix">
<span>璋冨害鏃堕棿绾�</span>
</div>
- <div style="height:70vh;overflow-y: scroll;">
+ <div style="height:100vh;overflow-y: scroll;">
<el-timeline>
<el-timeline-item
placement="top"
@@ -223,7 +223,7 @@
prop:'id',
order:'descending'
},
- height: 200,
+ height: 230,
selection: true,
columnBtn: false,
index: true,
@@ -333,7 +333,7 @@
prop:'id',
order:'descending'
},
- height: 180,
+ height: 250,
selection: true,
columnBtn: false,
index: true,
@@ -497,6 +497,11 @@
productionStatus: null,
}
}
+ },
+ multipleSelection(newVal){
+ if(newVal.length==0){
+ this.scheduleList = []
+ }
}
},
mounted() {
@@ -507,7 +512,7 @@
methods: {
tagFinished(){
if(this.multipleSelection.length < 1){
- this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�")
+ this.$message.warning("璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�")
return
}
let ids = this.multipleSelection.map(ele=>{
@@ -545,17 +550,20 @@
},
openEditDialog(){
if(this.multipleSelection.length<1){
- this.$message.error("璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�")
+ this.$message.warning("璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�")
return
}
let mIds = this.multipleSelection.map(ele=>{
return ele.mid
})
checkTimeLines(mIds).then(res=>{
- console.log(res);
- if(res.data.code===200){
- this.scheduleEditList = JSON.parse(JSON.stringify(this.scheduleList))
+ 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("閫変腑鏁版嵁鐨勮皟搴︽椂闂寸嚎涓嶄竴鑷�!")
}
}).catch(error=>{
console.error(error);
@@ -563,7 +571,9 @@
},
confirmEditSchedul(){
let data = this.scheduleEditList
- let orderObj = this.multipleSelection[0]
+ let mIds = this.multipleSelection.map(ele=>{
+ return ele.mid
+ })
let obj = {
"documentActualTime": data[0].actualTime,
"documentPlanTime": data[0].planTime,
@@ -577,13 +587,13 @@
"checkPlanTime": data[4].planTime,
"productActualTime": data[5].actualTime,
"productPlanTime": data[5].planTime,
- "id": orderObj.id,
- "contractNo": orderObj.contractNo,
- "customerName": orderObj.customerName,
- "deliveryDate": orderObj.deliveryDate,
- "orderTime": orderObj.orderTime,
- "productType": orderObj.productType,
- "projectName": orderObj.projectName
+ "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){
@@ -602,7 +612,7 @@
done()
},
initTimeLine(data){
- this.scheduleList = []
+ let scheduleList = []
if(data){
let arr = [
{
@@ -636,13 +646,14 @@
planTime: data.productPlanTime,
},
]
- this.scheduleList = arr
+ scheduleList = arr
+ return scheduleList
}
},
getScheduleById(id){
if(id){
fetchScheduleById(id).then(res=>{
- this.initTimeLine(res.data.data)
+ this.scheduleList = this.initTimeLine(res.data.data)
}).catch(error=>{
console.log(error);
})
@@ -692,6 +703,10 @@
}
},
// 鑾峰彇鏁版嵁鍒楄〃
+ getDataList(){
+ this.getUnFinishedData()
+ this.getFinishedData()
+ },
getUnFinishedData() {
this.loading = true
let param = {
@@ -725,7 +740,7 @@
// 鍒犻櫎
deleteHandle(row,index) {
const _than = this
- _than.$confirm('鏄惁纭鍒犻櫎', '鎻愮ず', {
+ _than.$confirm('鏄惁纭鍒犻櫎璇ョ敓浜ц皟搴︿俊鎭�', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
type: 'warning'
--
Gitblit v1.9.3