From f2a092218ece0821351440331c90064c8cbd5241 Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期一, 25 十二月 2023 16:57:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-ui/src/views/main/om/productionOrde/index.vue | 41 +++++++++++++++++++++++++++--------------
1 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/jcdm-ui/src/views/main/om/productionOrde/index.vue b/jcdm-ui/src/views/main/om/productionOrde/index.vue
index 0212c92..a88a4af 100644
--- a/jcdm-ui/src/views/main/om/productionOrde/index.vue
+++ b/jcdm-ui/src/views/main/om/productionOrde/index.vue
@@ -265,7 +265,7 @@
/>
<!-- 娣诲姞鎴栦慨鏀圭敓浜у伐鍗曞璇濇 -->
- <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
+ <el-dialog v-dialogpop-up :title="title" :visible.sync="open" width="1000px" append-to-body>
<span slot="title">
<i class="el-icon-s-order"></i>
{{titleName}}
@@ -466,6 +466,7 @@
this.queryParams.idNums = ids
this.queryParams.flag = 'up'
upDownMove(this.queryParams).then(response => {
+ this.$modal.msgSuccess("绉诲姩鎴愬姛");
this.getList();
});
},
@@ -477,6 +478,7 @@
this.queryParams.idNums = ids
this.queryParams.flag = 'down'
upDownMove(this.queryParams).then(response => {
+ this.$modal.msgSuccess("绉诲姩鎴愬姛");
this.getList();
});
},
@@ -593,24 +595,35 @@
},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
+ // this.ids = selection.map(item => item.id)
+ // const statusSize = selection.map(item => item.orderStatus)
+ // const intArr = statusSize.map(str => parseInt(str));
+ // const sum = intArr.reduce((a, b) => a + b, 0);
+ // this.single = selection.length!==1
+ // this.multiple = !selection.length
+ // if(selection[0].orderStatus!== '1'||sum!==selection.length){
+ // this.single = true
+ // this.multiple = true
+ // }
+ // if(selection.length > 1){
+ // this.move = true
+ // }else {
+ // this.move = false
+ // }
+
this.ids = selection.map(item => item.id)
- const statusSize = selection.map(item => item.orderStatus)
- const intArr = statusSize.map(str => parseInt(str));
- const sum = intArr.reduce((a, b) => a + b, 0);
- this.single = selection.length!==1
- this.multiple = !selection.length
- if(selection[0].orderStatus!== '1'||sum!==selection.length){
+ // this.single = selection.length!==1
+ // this.multiple = !selection.length
+ this.move = selection.length!==1
+ if(!selection.length){
this.single = true
this.multiple = true
- }
- if(selection.length > 1){
- this.move = true
}else {
- this.move = false
+ if(selection[0].orderStatus === '1' && selection.length === 1){
+ this.single = false
+ this.multiple = false
+ }
}
- // if (selection.length === 1) {
- // this.move = false;
- // }
},
/** 鏂板鎸夐挳鎿嶄綔 */
--
Gitblit v1.9.3