From d0a63d7ee08bf4976193ee4622977dbf4240b5c4 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期二, 28 十月 2025 13:42:04 +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 | 13 +++++++++++++
north-glass-erp/northglass-erp/src/views/sd/glassPrice/ProductList.vue | 25 +++++++++++++++++++++----
2 files changed, 34 insertions(+), 4 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 5bd0f80..c976809 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
@@ -18,6 +18,7 @@
import companyInfo from "@/stores/sd/companyInfo";
import {multiply} from "@/utils/decimal";
import MaterialAddition from "@/views/mm/ingredientStock/MaterialAddition.vue";
+import {copyTableCellValue} from "@/hook/copyTableCellValue";
//璇█鑾峰彇
const { t } = useI18n()
@@ -434,6 +435,10 @@
titleUploadData.value.freightQuantity=0
}
+ if($grid.getCheckedFilters().length!==0){
+ ElMessage.error(t('order.msg.pleaseCancelTheFilteringFirst'))
+ return
+ }
let flowData = ref({
delivery: selectRecords,
@@ -566,6 +571,11 @@
titleUploadData.value.freightQuantity=0
}
+ if($grid.getCheckedFilters().length!==0){
+ ElMessage.error(t('order.msg.pleaseCancelTheFilteringFirst'))
+ return
+ }
+
let flowData = ref({
delivery: selectRecords,
@@ -677,6 +687,9 @@
}
}
+ },
+ cellDblclick ({row,column}) {
+ copyTableCellValue(row,column)
}
}
diff --git a/north-glass-erp/northglass-erp/src/views/sd/glassPrice/ProductList.vue b/north-glass-erp/northglass-erp/src/views/sd/glassPrice/ProductList.vue
index 17c6346..bc5c6fc 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/glassPrice/ProductList.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/glassPrice/ProductList.vue
@@ -23,10 +23,20 @@
rowIndex:{}
})
+
+let sortData = ref({
+ field:'id',
+ order:null
+})
+
let glassType = ref([])
const getProduct = () => {
- request.post(`/product/1/100/${productGlassTypeStore.GlassType}`,filterData.value).then((res) => {
+ const config = {
+ filter: filterData.value,
+ sort: sortData.value
+ }
+ request.post(`/product/1/100/${productGlassTypeStore.GlassType}`,config).then((res) => {
if(res.code==200){
pageTotal.value=res.data.total
xGrid.value.loadData(res.data.data)
@@ -104,7 +114,11 @@
}
if(pageState!==null){
gridOptions.loading=true
- request.post(`/product/${pageNum}/100/${productGlassTypeStore.GlassType}`,filterData.value).then((res) => {
+ const config = {
+ filter: filterData.value,
+ sort: sortData.value
+ }
+ request.post(`/product/${pageNum}/100/${productGlassTypeStore.GlassType}`,config).then((res) => {
try{
if(res.code==200){
if(pageState){
@@ -134,9 +148,12 @@
})
-
+const config = {
+ filter: filterData.value,
+ sort: sortData.value
+}
//绗竴娆″姞杞芥暟鎹�
-request.post(`/product/1/100/${productGlassTypeStore.GlassType}`,filterData.value).then((res) => {
+request.post(`/product/1/100/${productGlassTypeStore.GlassType}`,config).then((res) => {
if(res.code==200){
pageTotal.value=res.data.total
produceList = produceList.value.concat(deepClone(res.data.data))
--
Gitblit v1.8.0