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/workOrder/SelectWorkOrder.vue | 42 +++++++++++++++++++++---------------------
1 files changed, 21 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 dab7819..f2abf94 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,7 +8,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 { useI18n } from 'vue-i18n'
//璇█鑾峰彇
@@ -26,23 +26,21 @@
break
}
case 'delete': {
- request.post(`/workOrder/deleteOrderWork/${row.orderId}/${row.orderDetail.productName}`).then((res) => {
+ let startTime = form.date1[0]
+ let endTime = form.date1[1]
+ let state = optionVal.value
+ request.post(`/workOrder/deleteOrderWork/${row.orderId}/${row.productionId}`).then((res) => {
if (res.code == 200) {
ElMessage.success(t('workOrder.deleteOk'))
- location.reload();
+ //location.reload();
+ router.push({path: '/main/workOrder/SelectWorkOrder', query: {startTime:startTime,endTime:endTime,state:state,random:Math.random()}})
} else {
ElMessage.warning(res.msg)
- router.push("/login")
}
})
break
}
}
-}
-
-
-function padLeftZero(str) {
- return ('00' + str).substr(str.length)
}
//瀹氫箟鏃堕棿
@@ -108,7 +106,7 @@
let pageNum = $ref(1)
let pageState = null
-//鑾峰彇涓冨ぉ鍓嶅埌褰撳墠鏃堕棿
+//鑾峰彇3澶╁墠鍒板綋鍓嶆椂闂�
function getNowTime() {
const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 3)
.toISOString()
@@ -122,14 +120,13 @@
}
-//绗竴娆″姞杞借幏鍙栬繎涓冨ぉ鏃堕棿鍜岄粯璁ょ姸鎬�
+//绗竴娆″姞杞借幏鍙栬繎3澶╂椂闂村拰榛樿鐘舵��
form.date1 = getNowTime()
let startTime = form.date1[0]
let endTime = form.date1[1]
let state = optionVal.value
//绗竴娆″姞杞芥暟鎹�
-
request.post(`/workOrder/orderGlassDetail/${startTime}/${endTime}/${state}`, filterData.value).then((res) => {
if (res.code == 200) {
@@ -166,6 +163,7 @@
$panel.changeOption(event, !!option.data, option)
}
+//绛涢�夋椂鏌ヨ
function filterChanged(column) {
gridOptions.loading = true
//绛涢�夋潯浠跺彂鐢熷彉鍖栨潯浠跺彂鐢熷彉鍖�
@@ -206,7 +204,6 @@
}
//瀛愮粍浠舵帴鏀跺弬鏁�
-
const xGrid = ref()
const gridOptions = reactive({
loading: true,
@@ -252,13 +249,11 @@
, width: 130
},
{field: 'order.batch', title: t('order.batch'), filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 110},
- {field: 'orderDetail.productName', title: t('order.product'), filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 210},
- {field: 'orderDetail.computeArea', title: t('order.area'), showOverflow: "ellipsis", width: 110},
- {field: 'orderDetail.quantity', title: t('order.quantity'), width: 70},
- {field: 'orderDetail.computeGrossArea', title: t('order.trueGrossArea'),},
- {field: 'orderDetail.perimeter', title: t('workOrder.perimeter'), showOverflow: "ellipsis"},
- {field: 'orderDetail.bendRadius', title: t('order.trueGrossArea'),},
- {field: 'orderDetail.processingNote', title: t('order.processingNote'),}
+ {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: '鍒涘缓浜�',},
],//琛ㄥご鎸夐挳
data: null,//琛ㄦ牸鏁版嵁
toolbarConfig: {
@@ -350,7 +345,12 @@
<!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
<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== 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>
+ </template>
+ </el-popconfirm>
</template>
<template #num1_filter="{ column, $panel }">
--
Gitblit v1.8.0