From a660db06773007b1be690e0674829c00a57aeb7b Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 24 十二月 2025 16:21:23 +0800
Subject: [PATCH] 订单首页流程卡新增楼层编号显示
---
north-glass-erp/northglass-erp/src/views/pp/workOrder/AddWorkOrder.vue | 163 ++++++++++++++++++++++++++++++------------------------
1 files changed, 90 insertions(+), 73 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 6af2006..b83babf 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,13 @@
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()
const userStore = useUserInfoStore()
const username = userStore.user.userName
@@ -21,10 +24,6 @@
case 'edit' : {
//alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
router.push({path: '/main/workOrder/addWorkOrder', query: {id: row.id}})
- break
- }
- case 'delete': {
- alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鍒犻櫎淇℃伅')
break
}
}
@@ -67,20 +66,23 @@
const {currentRoute} = useRouter()
const route = currentRoute.value
-
let id = route.query.orderId
+onMounted(() => {
-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)
+ }
+ })
})
+
+
/*浣跨敤绛涢�夛紝鍚庣鑾峰彇鏁版嵁*/
@@ -89,6 +91,7 @@
$panel.changeOption(event, !!option.data, option)
}
+//绛涢�夋椂鏌ヨ
function filterChanged(column) {
gridOptions.loading = true
//绛涢�夋潯浠跺彂鐢熷彉鍖栨潯浠跺彂鐢熷彉鍖�
@@ -103,7 +106,6 @@
} else {
filterData.value[column.property] = value
}
-
request.post(`/workOrder/addWork/${id}`, filterData.value).then((res) => {
if (res.code == 200) {
@@ -140,7 +142,7 @@
align: 'center',//鏂囧瓧灞呬腑
stripe: true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true, height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'demo_1',
+ id: 'addWorkOrder',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
@@ -165,19 +167,20 @@
},//琛ㄥご鍙傛暟
columns: [
{type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
- {type: 'checkbox', fixed: "left", title: '閫夋嫨', width: 80},
- {type: 'seq', fixed: "left", title: '鑷簭', width: 50},
- {field: 'orderId', title: '閿�鍞崟鍙�', filters: [{data: ''}], slots: {filter: 'num1_filter'},},
- {field: 'productId',title: '浜у搧缂栧彿',showOverflow: "ellipsis",filters: [{data: ''}],slots: {filter: 'num1_filter'}},
- {field: 'productName', title: '浜у搧鍚嶇О', filters: [{data: ''}], slots: {filter: 'num1_filter'}, },
- {field: 'quantity', title: '鎬绘暟閲�', },
- {field: 'computeGrossArea', title: '鎬婚潰绉�', },
- {field: 'perimeter', title: '鍛ㄩ暱', showOverflow: "ellipsis"}
+ {type: 'checkbox', fixed: "left", title: t('basicData.check'), width: 80},
+ {type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
+ {field: 'orderId', title: t('order.orderId'), filters: [{data: ''}], slots: {filter: 'num1_filter'},},
+ {field: 'productId',title: t('order.productId'),showOverflow: "ellipsis",filters: [{data: ''}],slots: {filter: 'num1_filter'}},
+ {field: 'productName', title: t('order.product'), filters: [{data: ''}], slots: {filter: 'num1_filter'}, },
+ {field: 'quantity', title: t('order.quantity'), },
+ {field: 'computeGrossArea', title: t('order.area'), },
+ {field: 'perimeter', title: t('workOrder.perimeter'), showOverflow: "ellipsis"},
+ {field: 'orderGlassDetail.process', title: t('craft.process'), },
],//琛ㄥご鎸夐挳
toolbarConfig: {
buttons: [
- {code: 'saveWorkOrder', name: '淇濆瓨', status: 'primary', icon: 'vxe-icon-save'},
+ {code: 'saveWorkOrder', name: t('basicData.save'), status: 'primary', icon: 'vxe-icon-save'},
],
// import: false,
// export: true,
@@ -187,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 '鍚堣:'
+ 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 ''
})
@@ -213,19 +216,24 @@
const $table = xGrid.value
if ($table) {
const selectRecords = $table.getCheckboxRecords()
-
+ if(selectRecords.length!=$table.getTableData().fullData.length){
+ ElMessage.warning(t('workOrder.msg'))
+ return;
+ }
+ gridOptions.loading=true
let workOrderData = ref({
orderdetail: selectRecords,
userName:username
})
request.post("/workOrder/addOrderWork", workOrderData.value).then((res) => {
- if (res.code == 200) {
- ElMessage.success("淇濆瓨鎴愬姛")
- location.reload();
+ if (res.code == 200 && res.data===true) {
+ ElMessage.success(t('basicData.msg.saveSuccess'))
+ router.push({path: '/main/workOrder/addWorkOrder', query: {orderId:route.query.orderId,random:Math.random()}})
+ gridOptions.loading=false
} else {
+ gridOptions.loading=false
ElMessage.warning(res.msg)
- router.push("/login")
}
})
@@ -243,51 +251,60 @@
</script>
<template>
- <div class="main-div-customer">
- <vxe-grid
- max-height="100%"
- @filter-change="filterChanged"
- class="mytable-scrollbar"
- ref="xGrid"
- v-bind="gridOptions"
- v-on="gridEvents"
+ <div style="width: 100%;height: 100%">
+ <div class="main-table">
+ <vxe-grid
+ height="100%"
+ @filter-change="filterChanged"
+ class="mytable-scrollbar"
+ ref="xGrid"
+ v-bind="gridOptions"
+ v-on="gridEvents"
- >
- <!-- @toolbar-button-click="toolbarButtonClickEvent"-->
- <!-- 涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
- <template #content="{ row }">
- <ul class="expand-wrapper">
- <li v-for="(item,index) in gridOptions.columns" v-show="item.field!=undefined ">
- <span style="font-weight: bold">{{ item.title + ': ' }}</span>
- <span v-if="hasDecimal(item.field)">{{ row[item.field.split('.')[0]][item.field.split('.')[1]] }}</span>
- <span v-else>{{ row[item.field] }}</span>
+ >
+ <!-- @toolbar-button-click="toolbarButtonClickEvent"-->
+ <!-- 涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
+ <template #content="{ row }">
+ <ul class="expand-wrapper">
+ <li v-for="(item,index) in gridOptions.columns" v-show="item.field!=undefined ">
+ <span style="font-weight: bold">{{ item.title + ': ' }}</span>
+ <span v-if="hasDecimal(item.field)">{{ row[item.field.split('.')[0]][item.field.split('.')[1]] }}</span>
+ <span v-else>{{ row[item.field] }}</span>
- </li>
- </ul>
- </template>
+ </li>
+ </ul>
+ </template>
- <!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
- <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>
- </template>
+ <!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
+ <template #button_slot="{ row }">
+ <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)"/>
+ <template #num1_filter="{ column, $panel }">
+ <div>
+ <div v-for="(option, index) in column.filters" :key="index">
+ <input type="type" v-model="option.data"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
+ </div>
</div>
- </div>
- </template>
+ </template>
- </vxe-grid>
+ </vxe-grid>
+ </div>
</div>
</template>
<style scoped>
-.main-div-customer {
- width: 99%;
- height: 100%;
+.head{
+ width: 100%;
+ height: 35px;
+}
+
+.main-table{
+ width: 100%;
+ height: calc(100% - 0px);
}
</style>
\ No newline at end of file
--
Gitblit v1.8.0