From a0010bcabbfbc3771aa05d54094f5d02bcdd5609 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期一, 15 十二月 2025 08:42:50 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/component/PackStockDetail/index.vue | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/views/component/PackStockDetail/index.vue b/src/views/component/PackStockDetail/index.vue
index 2509806..9fa23cd 100644
--- a/src/views/component/PackStockDetail/index.vue
+++ b/src/views/component/PackStockDetail/index.vue
@@ -110,13 +110,13 @@
loading: false, //椤甸潰鍔犺浇鍔ㄧ敾鏄剧ず鏍囪
dialogVisible: false, //鍖呰瀹瑰櫒鍑哄叆搴撴槑缁嗘暟鎹樉绀烘爣璁�
columnDialogVisible: false, //鍒楄缃寜閽樉绀烘爣璁�
-
+
tableData: [], //琛ㄦ牸鏁版嵁
tableColumns: [], //琛ㄦ牸鍒楁暟鎹�
- allColumns: [],
+ allColumns: [],
selectedColumns: [],
selectedRows: [],
- baseURL: process.env.VUE_APP_BASE_URL || "http://47.96.97.237/API/"
+ baseURL: process.env.VUE_APP_BASE_API || "http://47.96.97.237/API/"
}
},
methods: {
@@ -129,8 +129,8 @@
const hmainid = record.hmainid || record.HInterID
const billNo = record.鍗曟嵁鍙� || record.HBillNo
-
-
+
+
let billTypeDesc = ''
switch (record.鍗曟嵁绫诲瀷 || '') {
case '1201': billTypeDesc = '澶栬喘鍏ュ簱鍗�'; break
@@ -163,10 +163,10 @@
this.loading = true
try {
const sWhere = " and hmainid = " + `${HInterID}` ;
-
+
const url = `${this.baseURL}/Kf_ICStockInOutBill/Kf_PackStockDetailQuery`
const params = { sWhere }
-
+
const response = await axios.get(url, { params })
const data = response.data
@@ -191,7 +191,7 @@
const columns = []
const allColumns = []
-
+
columns.push({
type: 'selection',
width: 55,
@@ -208,7 +208,7 @@
sortable: true
}
-
+
switch (colName) {
case 'HItemID':
columnConfig.hide = true
@@ -241,12 +241,12 @@
applyColumnSettings() {
this.tableColumns = [
- this.tableColumns[0],
+ this.tableColumns[0],
...this.allColumns.filter(col => this.selectedColumns.includes(col.field))
]
this.columnDialogVisible = false
-
-
+
+
this.saveColumnSettings()
},
@@ -256,7 +256,7 @@
saveColumnSettings() {
-
+
},
//#endregion
@@ -265,13 +265,13 @@
getSummaries(param) {
const { columns, data } = param
const sums = []
-
+
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '鍚堣'
return
}
-
+
const values = data.map(item => Number(item[column.property]))
if (!values.every(value => isNaN(value))) {
sums[index] = values.reduce((prev, curr) => {
--
Gitblit v1.9.1