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/sd/customer/SelectCustomerOrder.vue | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/sd/customer/SelectCustomerOrder.vue b/north-glass-erp/northglass-erp/src/views/sd/customer/SelectCustomerOrder.vue
index beb0461..5bb2123 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/customer/SelectCustomerOrder.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/customer/SelectCustomerOrder.vue
@@ -9,6 +9,7 @@
import {ElMessage} from "element-plus";
import { useI18n } from 'vue-i18n'
import footSum from "@/hook/footSum";
+import useOrderInfoStore from "@/stores/sd/order/orderInfo";
//璇█鑾峰彇
const { t } = useI18n()
@@ -17,6 +18,7 @@
const userStore = useUserInfoStore()
const username = userStore.user.userName
const userid = userStore.user.userId
+const orderInfo = useOrderInfoStore()
let produceList = ref([])
const getTableRow = (row,type) =>{
@@ -68,13 +70,13 @@
if (typeof str != 'undefined' && str != null && str !== '' && str !== '\n' && str !== '\r'){
filterData.value.order.customerId = Number(str)
filterData.value.order.batch=route.query.type
- request.post(`/customer/getSelectCustomerOderDate/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
+ request.post(`/customer/getSelectCustomerOderDate/1/${total.pageSize}/${orderInfo.reportFormDate}`,filterData.value).then((res) => {
if(res.code==200){
console.log(res.data.data)
console.log(res.data.total)
total.dataTotal = res.data.total.total*1
total.pageTotal= res.data.total.pageTotal
- selectDate.value = res.data.selectDate
+ orderInfo.reportFormDate = res.data.selectDate
produceList = deepClone(res.data.data)
xGrid.value.loadData(produceList)
gridOptions.loading=false
@@ -110,12 +112,12 @@
}else{
filterData.value[column.property] = value
}
- request.post(`/customer/getSelectCustomerOderDate/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
+ request.post(`/customer/getSelectCustomerOderDate/1/${total.pageSize}/${orderInfo.reportFormDate}`,filterData.value).then((res) => {
if(res.code==200){
total.dataTotal = res.data.total.total*1
total.pageTotal= res.data.total.pageTotal
- selectDate.value = res.data.selectDate
+ orderInfo.reportFormDate = res.data.selectDate
pageNum.value=1
produceList = deepClone(res.data.data)
xGrid.value.loadData(produceList)
@@ -128,14 +130,13 @@
}
const selectOrderList = ()=>{
- request.post(`/customer/getSelectCustomerOderDate/${pageNum.value}/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
+ request.post(`/customer/getSelectCustomerOderDate/${pageNum.value}/${total.pageSize}/${orderInfo.reportFormDate}`,filterData.value).then((res) => {
if(res.code==200){
if (res.data.total!=null){
total.dataTotal = res.data.total.total*1
total.pageTotal= res.data.total.pageTotal
}
- console.log(res.data.total)
produceList = deepClone(res.data.data)
xGrid.value.loadData(produceList)
gridOptions.loading=false
@@ -198,6 +199,7 @@
{field: 'customer_id',width:120, title: t('customer.customerNumber')},
{field: 'customer_name',width:120, title: t('customer.customerName')},
{field: 'quantity',width:120, title: t('order.quantity')},
+ {field: 'price',width:120, title: t('order.price'), sortable: true},
//{field: 'product_id',width:120, title: t('order.productId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
{field: 'product_name',width:120, title: t('order.product'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
{field: 'project',width:120, title: t('order.project'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
@@ -219,7 +221,7 @@
custom: true
},
footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
- let footList = ['quantity','area','order.money']
+ let footList = ['quantity','area','money']
return[
columns.map((column, columnIndex) => {
if (columnIndex === 0) {
@@ -261,7 +263,7 @@
const exportExcel = () => {
if(filterData.value.order.batch==='1'){
- request.post(`/customer/exportSelectCustomerOderDate/${selectDate.value}`,filterData.value,{responseType :'blob'}).then(res => {
+ request.post(`/customer/exportSelectCustomerOderDate/${orderInfo.reportFormDate}`,filterData.value,{responseType :'blob'}).then(res => {
const blob = new Blob([res])
if ('download' in document.createElement('a')) { // 闈濱E涓嬭浇
const elink = document.createElement('a')
@@ -277,7 +279,7 @@
}
})
}else{
- request.post(`/customer/exportSelectCustomerDeliveryDate/${selectDate.value}`,filterData.value,{responseType :'blob'}).then(res => {
+ request.post(`/customer/exportSelectCustomerDeliveryDate/${orderInfo.reportFormDate}`,filterData.value,{responseType :'blob'}).then(res => {
const blob = new Blob([res])
if ('download' in document.createElement('a')) { // 闈濱E涓嬭浇
const elink = document.createElement('a')
@@ -305,7 +307,7 @@
<template>
<div style="width: 100%;height: 100%">
<el-date-picker
- v-model="selectDate"
+ v-model="orderInfo.reportFormDate"
type="daterange"
:start-placeholder="t('basicData.startDate')"
:end-placeholder="t('basicData.endDate')"
@@ -349,7 +351,11 @@
<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