From a85adf40d5e30d3b9e2a848cf8fd073998ff5c8b Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期三, 29 五月 2024 15:26:07 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue | 77 ++------------------------------------
1 files changed, 4 insertions(+), 73 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue b/north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue
index 37b28b8..e5643b1 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue
@@ -12,6 +12,7 @@
import { useI18n } from 'vue-i18n'
import OrderOtherMoney from "@/components/sd/order/OrderOtherMoney.vue";
import footSum from "@/hook/footSum";
+import {changeFilterEvent,filterChanged} from "@/hook"
//璇█鑾峰彇
const { t } = useI18n()
@@ -194,7 +195,6 @@
if(res.code==200){
pageTotal.value=res.data.total
- console.log(res.data.delivery)
titleUploadData.value=deepClone(res.data.delivery)
@@ -243,76 +243,6 @@
//瀹氫箟褰撳墠椤垫暟
let pageNum=$ref(1)
-const changeFilterEvent = (event, option, $panel) => {
- // 鎵嬪姩瑙﹀彂绛涢��
- $panel.changeOption(event, !!option.data, option)
-}
-//鍓嶇绛涢��
-const filterChanged = ({ option, row, column }) => {
- if (option.data) {
- let param = column.field
- if(param.indexOf(".")>-1){
- let array = param.split('.')
- return row[array[0]][array[1]].toString().toLowerCase().indexOf(option.data) > -1
- }else{
- return row[param].toString().toLowerCase().indexOf(option.data) > -1
- }
-
- }
- return true
- //@filter-change="filterChanged"
-
- /*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
- }
-
- const str = route.query.deliveryID
- if (typeof str != 'undefined' && str != null && str !== '' && str !== '\n' && str !== '\r'){
- filterData.value.deliveryDetail.deliveryId=str
- request.post("/Delivery/getseletShippingOrderDetail/1/100",filterData.value).then((res) => {
-
- if(res.code==200){
- pageTotal.value=res.data.total
- pageNum=1
- produceList = deepClone(res.data.data)
- xGrid.value.reloadData(produceList)
- gridOptions.loading=false
- }else{
- ElMessage.warning(res.msg)
- router.push("/login")
- }
- })
- }
- const orderId = route.query.orderId
- if (typeof orderId !== 'undefined' && orderId !== null && orderId !== '' && orderId !== '\n' && orderId !== '\r'){
- filterData.value.orderId=orderId
- request.post("/Delivery/getseletShippingOrderDetails/1/100",filterData.value).then((res) => {
-
- if(res.code==200){
- pageTotal.value=res.data.total
-
- pageNum=1
- produceList = deepClone(res.data.data)
- xGrid.value.loadData(produceList)
- gridOptions.loading=false
- }else{
- ElMessage.warning(res.msg)
- router.push("/login")
- }
- })
- }*/
-
-}
@@ -399,8 +329,8 @@
custom: true
},
footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
- //let footList=['deliveryDetail.quantity','quantity']
- let footList=[]
+ let footList=['deliveryDetail.quantity','quantity','deliveryDetail.money']
+ //let footList=[]
return[
columns.map((column, columnIndex) => {
if (columnIndex === 0) {
@@ -417,6 +347,7 @@
})
+
const gridEvents = {
async toolbarButtonClick({code}) {
const $grid = xGrid.value
--
Gitblit v1.8.0