From 1c13bd7a2cd2c8ba69a185da69344c8b59f4e561 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 04 七月 2024 09:29:15 +0800
Subject: [PATCH] 选中求和功能以及还原双击回车才能点击单元格
---
north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue | 54 +++++++++++++++++++++++++++++++++---------------------
1 files changed, 33 insertions(+), 21 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue b/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue
index 44250ec..001dd58 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue
@@ -8,11 +8,14 @@
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 { useI18n } from 'vue-i18n'
+import useUserInfoStore from '@/stores/userInfo'
+import footSum from "@/hook/footSum"
//璇█鑾峰彇
const { t } = useI18n()
+const userStore = useUserInfoStore()
let productGlassTypeStore = useProductGlassTypeStore()
let router = useRouter()
@@ -29,15 +32,15 @@
let startTime = form.date1[0]
let endTime = form.date1[1]
let state = optionVal.value
- console.log(startTime, endTime, state)
request.post(`/workOrder/deleteOrderWork/${row.orderId}/${row.productionId}`).then((res) => {
- if (res.code == 200) {
- ElMessage.success(t('workOrder.deleteOk'))
- //location.reload();
- router.push({path: '/main/workOrder/SelectWorkOrder', query: {startTime:startTime,endTime:endTime,state:state,random:Math.random()}})
- } else {
- ElMessage.warning(res.msg)
- }
+ if (res.code == 200 && res.data===true) {
+ ElMessage.success(t('workOrder.deleteOk'))
+ router.push({path: '/main/workOrder/SelectWorkOrder', query: {startTime:startTime,endTime:endTime,state:state,random:Math.random()}})
+ } else {
+
+ ElMessage.warning(t('workOrder.deleteNo'))
+
+ }
})
break
}
@@ -250,11 +253,11 @@
, width: 130
},
{field: 'order.batch', title: t('order.batch'), filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 110},
- {field: 'order.project', title: '椤圭洰鍚嶇О', filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 210},
- {field: 'order.orderType', title: '璁㈠崟绫诲瀷', showOverflow: "ellipsis", width: 110},
- {field: 'orderDetail.grossArea', title: '闈㈢Н', width: 70},
- {field: 'orderDetail.quantity', title: '鏁伴噺',},
- {field: 'order.creator', title: '鍒涘缓浜�',},
+ {field: 'order.project', title: t('order.project'), filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 210},
+ {field: 'order.orderType', title: t('order.orderType'), showOverflow: "ellipsis", width: 110},
+ {field: 'orderDetail.grossArea', title: t('order.grossArea'), width: 70},
+ {field: 'orderDetail.quantity', title: t('order.quantity'),},
+ {field: 'order.creator', title: t('order.creator'),},
],//琛ㄥご鎸夐挳
data: null,//琛ㄦ牸鏁版嵁
toolbarConfig: {
@@ -268,15 +271,15 @@
custom: true
},
//鑴氶儴姹傚拰
- footerMethod({columns, data}) {//椤佃剼鍑芥暟
- let footList = ['', '', '']
- return [
+ footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
+ return[
columns.map((column, columnIndex) => {
if (columnIndex === 0) {
return t('basicData.total')
}
- if (footList.includes(column.field)) {
- return sumNum(data, column.field)
+ const List = ["orderDetail.grossArea",'orderDetail.quantity']
+ if (List.includes(column.field)) {
+ return footSum(data, column.field)
}
return ''
})
@@ -345,8 +348,17 @@
<!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
<template #button_slot="{ row }">
- <el-button :class="{disable: optionVal== 0}" :disabled="optionVal == 0" @click="getTableRow(row,'edit')" link type="primary" size="small">{{$t('workOrder.transferOrder')}}</el-button>
-<!-- <el-button :class="{disable: optionVal== 1}" :disabled="optionVal == 1" @click="getTableRow(row,'delete')" link type="primary" size="small">{{$t('basicData.delete')}}</el-button>-->
+<!-- <el-button :class="{disable: optionVal== 0}" :disabled="optionVal == 0" @click="getTableRow(row,'edit')" link type="primary" size="small">{{$t('workOrder.transferOrder')}}</el-button>-->
+ <el-button :class="{disable: optionVal== 0}" :disabled="optionVal == 0"
+ @click="getTableRow(row,'edit')"
+ v-if="userStore.user.permissions.indexOf('SelectWorkOrder.edit') > -1"
+ link
+ type="primary"
+ size="small">
+ {{$t('workOrder.transferOrder')}}
+ </el-button>
+
+ <!-- <el-button :class="{disable: optionVal== 1}" :disabled="optionVal == 1" @click="getTableRow(row,'delete')" link type="primary" size="small">{{$t('basicData.delete')}}</el-button>-->
<el-popconfirm @confirm="getTableRow(row,'delete')" :title="$t('searchOrder.deleteConfirm')">
<template #reference>
<el-button :class="{disable: optionVal== 1}" :disabled="optionVal == 1" link type="primary" size="small">{{ $t('basicData.delete') }}</el-button>
--
Gitblit v1.8.0