From 4098ea2b95d6da283ac62f2ebb30ce37fe0d6d3f Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 05 七月 2024 10:12:31 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/workOrder/AddWorkOrder.vue | 108 ++++++++++++++++++++++++++++++++++++------------------
1 files changed, 72 insertions(+), 36 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 cf516a9..566f718 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
@@ -82,6 +85,41 @@
}
})
+
+/*浣跨敤绛涢�夛紝鍚庣鑾峰彇鏁版嵁*/
+const changeFilterEvent = (event, option, $panel,) => {
+ // 鎵嬪姩瑙﹀彂绛涢��
+ $panel.changeOption(event, !!option.data, option)
+}
+
+//绛涢�夋椂鏌ヨ
+function filterChanged(column) {
+ gridOptions.loading = true
+ //绛涢�夋潯浠跺彂鐢熷彉鍖栨潯浠跺彂鐢熷彉鍖�
+ let value = column.datas[0] != undefined ? column.datas[0] : ''
+ value = value.trim()
+ //鍒ゆ柇鏄惁瀛樺湪澶栭敭
+ if (column.property.indexOf('.') > -1) {
+ const columnArr = column.property.split('.')
+ filterData.value[columnArr[0]] = {
+ [columnArr[1]]: value
+ }
+ } else {
+ filterData.value[column.property] = value
+ }
+
+ request.post(`/workOrder/addWork/${id}`, filterData.value).then((res) => {
+ if (res.code == 200) {
+ pageTotal.value = res.data.total
+
+ produceList = deepClone(res.data.data)
+ xGrid.value.loadData(produceList)
+ gridOptions.loading = false
+ } else {
+ ElMessage.warning(res.msg)
+ }
+ })
+}
//琛ㄥ熬姹傚拰
const sumNum = (list, field) => {
let count = 0
@@ -89,6 +127,11 @@
count += Number(item[field])
})
return count.toFixed(2)
+}
+
+const hasDecimal = (value) => {
+ const regex = /\./; // 瀹氫箟姝ｅ垯琛ㄨ揪寮忥紝鏌ユ壘灏忔暟鐐�
+ return regex.test(value); // 杩斿洖true/false
}
//瀛愮粍浠舵帴鏀跺弬鏁�
@@ -100,7 +143,7 @@
align: 'center',//鏂囧瓧灞呬腑
stripe: true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true, height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'demo_1',
+ id: 'addWorkOrder',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
@@ -125,44 +168,37 @@
},//琛ㄥご鍙傛暟
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'}, sortable: true,},
- {
- field: 'productId',
- title: '浜у搧缂栧彿',
- sortable: true,
- showOverflow: "ellipsis",
- filters: [{data: ''}],
- slots: {filter: 'num1_filter'}
- },
- {field: 'productName', title: '浜у搧鍚嶇О', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
- {field: 'quantity', title: '鎬绘暟閲�', sortable: true},
- {field: 'computeGrossArea', title: '鎬婚潰绉�', sortable: true},
- {field: 'perimeter', title: '鍛ㄩ暱', sortable: true, 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"}
],//琛ㄥご鎸夐挳
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,
- print: true,
+ // import: false,
+ // export: true,
+ // print: true,
zoom: true,
custom: true
},
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 ''
})
@@ -186,14 +222,12 @@
userName:username
})
- console.log(workOrderData.value)
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:id,random:Math.random()}})
} else {
ElMessage.warning(res.msg)
- router.push("/login")
}
})
@@ -227,15 +261,17 @@
<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>{{ row[item.field] }}</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>
<!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
<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 }">
--
Gitblit v1.8.0