From ed6f35069824d71ee6da599a328d865eb0c58550 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 25 四月 2024 09:16:26 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/a1536384743/erp_-override
---
north-glass-erp/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue | 56 ++++++++++++++++++++++++++++++++------------------------
1 files changed, 32 insertions(+), 24 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue
index 3c8ba1d..93408a3 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue
@@ -9,7 +9,7 @@
import GlassType from "@/components/sd/product/GlassType.vue"
import {useRouter} from 'vue-router'
import Sortable from 'sortablejs'
-import BasicTable from '@/components/basic/BasicTable.vue'
+import BasicTable from '@/components/sd/product/BasicTable.vue'
import {VXETable} from "vxe-table";
import useUserInfoStore from "@/stores/userInfo";
import {changeFilterEvent, filterChanged} from "@/hook"
@@ -251,6 +251,7 @@
//瀛愮粍浠舵帴鏀跺弬鏁�
const xGrid = ref()
const gridOptions = reactive({
+ loading: true,
border: "full",//琛ㄦ牸鍔犺竟妗�
keepSource: true,//淇濇寔婧愭暟鎹�
align: 'center',//鏂囧瓧灞呬腑
@@ -537,39 +538,46 @@
switch (menu.code) {
case 'copyChecked' :{
let result = toolbarButtonClickEvent()
- if(result){
- const dataList = xGrid.value.getTableData().visibleData
- const val = dataList[result.start][result.cell]
- dataList.forEach((item,index) =>{
- if(index>=result.start && index<=result.end){
- item[result.cell] = val
- }
- })
+ if (result.cell === "scheduled_start_time" ||result.cell === "plan_end_time"){
+ if(result){
+ const dataList = xGrid.value.getTableData().visibleData
+ const val = dataList[result.start][result.cell]
+ dataList.forEach((item,index) =>{
+ if(index>=result.start && index<=result.end){
+ item[result.cell] = val
+ }
+ })
+ }
}
+
break
}
case 'copyAll' :{
let result = toolbarButtonClickEvent()
- if(result){
- const dataList = xGrid.value.getTableData().visibleData
- const val = dataList[result.start][result.cell]
- dataList.forEach((item,index) =>{
- if(index>=result.start ){
- item[result.cell] = val
- }
- })
+ if (result.cell === "scheduled_start_time" ||result.cell === "plan_end_time") {
+ if (result) {
+ const dataList = xGrid.value.getTableData().visibleData
+ const val = dataList[result.start][result.cell]
+ dataList.forEach((item, index) => {
+ if (index >= result.start) {
+ item[result.cell] = val
+ }
+ })
+ }
}
break
}
case 'clearChecked' :{
let result = toolbarButtonClickEvent()
- if(result){
- const dataList = xGrid.value.getTableData().visibleData
- dataList.forEach((item,index) =>{
- if(index>=result.start && index<=result.end){
- item[result.cell] = ''
- }
- })
+ if (result.cell === "scheduled_start_time" ||result.cell === "plan_end_time") {
+ if (result) {
+ const dataList = xGrid.value.getTableData().visibleData
+ dataList.forEach((item, index) => {
+ if (index >= result.start && index <= result.end) {
+ item[result.cell] = ''
+ }
+ })
+ }
}
break
}
--
Gitblit v1.8.0