From e50fa16b6dbc4e7c50d5fbdbc04d2a556ca01c4e Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 02 十二月 2024 11:26:36 +0800
Subject: [PATCH] 补片流程卡调整
---
north-glass-erp/northglass-erp/src/views/pp/workOrder/AddWorkOrder.vue | 62 +++++++++++++++++--------------
1 files changed, 34 insertions(+), 28 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/workOrder/AddWorkOrder.vue b/north-glass-erp/northglass-erp/src/views/pp/workOrder/AddWorkOrder.vue
index 75d4809..da8d7a2 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/workOrder/AddWorkOrder.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/workOrder/AddWorkOrder.vue
@@ -9,10 +9,11 @@
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 { useI18n } from 'vue-i18n'
+import footSum from "@/hook/footSum"
//璇█鑾峰彇
const { t } = useI18n()
let router = useRouter()
@@ -23,10 +24,6 @@
case 'edit' : {
//alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
router.push({path: '/main/workOrder/addWorkOrder', query: {id: row.id}})
- break
- }
- case 'delete': {
- alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鍒犻櫎淇℃伅')
break
}
}
@@ -70,19 +67,23 @@
const {currentRoute} = useRouter()
const route = currentRoute.value
-let id = route.query.orderId
+onMounted(() => {
+ let id = route.query.orderId
-request.post(`/workOrder/addWork/${id}`, filterData.value).then((res) => {
+ request.post(`/workOrder/addWork/${id}`, filterData.value).then((res) => {
- if (res.code == 200) {
- pageTotal.value = res.data.total
- produceList = produceList.value.concat(deepClone(res.data.data))
- xGrid.value.reloadData(produceList)
- gridOptions.loading = false
- } else {
- ElMessage.warning(res.msg)
- }
+ if (res.code == 200) {
+ pageTotal.value = res.data.total
+ produceList = produceList.value.concat(deepClone(res.data.data))
+ xGrid.value.reloadData(produceList)
+ gridOptions.loading = false
+ } else {
+ ElMessage.warning(res.msg)
+ }
+ })
})
+
+
/*浣跨敤绛涢�夛紝鍚庣鑾峰彇鏁版嵁*/
@@ -142,7 +143,7 @@
align: 'center',//鏂囧瓧灞呬腑
stripe: true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true, height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'demo_1',
+ id: 'addWorkOrder',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
@@ -189,15 +190,15 @@
},
data: null,//琛ㄦ牸鏁版嵁
//鑴氶儴姹傚拰
- footerMethod({columns, data}) {//椤佃剼鍑芥暟
- let footList = ['total', 'totalArea']
- return [
+ footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
+ return[
columns.map((column, columnIndex) => {
if (columnIndex === 0) {
- return t('basicData.total')
+ return t('basicData.total')
}
- if (footList.includes(column.field)) {
- return sumNum(data, column.field)
+ const List = ["quantity",'computeGrossArea']
+ if (List.includes(column.field)) {
+ return footSum(data, column.field)
}
return ''
})
@@ -215,6 +216,10 @@
const $table = xGrid.value
if ($table) {
const selectRecords = $table.getCheckboxRecords()
+ if(selectRecords.length!=$table.getTableData().fullData.length){
+ ElMessage.warning(t('workOrder.msg'))
+ return;
+ }
let workOrderData = ref({
orderdetail: selectRecords,
@@ -222,12 +227,11 @@
})
request.post("/workOrder/addOrderWork", workOrderData.value).then((res) => {
- if (res.code == 200) {
+ if (res.code == 200 && res.data===true) {
ElMessage.success(t('basicData.msg.saveSuccess'))
- location.reload();
+ router.push({path: '/main/workOrder/addWorkOrder', query: {orderId:route.query.orderId,random:Math.random()}})
} else {
ElMessage.warning(res.msg)
- // router.push("/login")
}
})
@@ -270,14 +274,16 @@
<!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
<template #button_slot="{ row }">
- <el-button @click="getTableRow(row,'edit')" link type="primary" size="small">杞伐鍗�</el-button>
- <el-button @click="getTableRow(row,'delete')" link type="primary" size="small">鍒犻櫎</el-button>
+ <el-button @click="getTableRow(row,'edit')" link type="primary" size="small">{{ $t('workOrder.transferOrder') }}</el-button>
+ <el-button @click="getTableRow(row,'delete')" link type="primary" size="small">{{ $t('basicData.delete') }}</el-button>
</template>
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
- <input type="type" v-model="option.data" @input="changeFilterEvent($event, option, $panel)"/>
+ <input type="type" v-model="option.data"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
--
Gitblit v1.8.0