diff --git a/WinIn.FasterZ.Wms.Fe/public/config.js b/WinIn.FasterZ.Wms.Fe/public/config.js
index 4690bed5d..e77f3c85f 100644
--- a/WinIn.FasterZ.Wms.Fe/public/config.js
+++ b/WinIn.FasterZ.Wms.Fe/public/config.js
@@ -1,6 +1,6 @@
// dev_win
-window.SITE_CONFIG['baseApi'] = 'http://dev.ccwin-in.com:60081'
-window.SITE_CONFIG['authApi'] = 'http://dev.ccwin-in.com:60080'//192.168.0.240
+window.SITE_CONFIG['baseApi'] = 'http://192.168.0.240:60081'
+window.SITE_CONFIG['authApi'] = 'http://192.168.0.240:60080'//192.168.0.240
window.SITE_CONFIG['businessApi'] = 'http://dev.ccwin-in.com:10097'
//是否登录配置信息【loginName】
window.SITE_CONFIG['isConfigLogin'] = false
diff --git a/fe/PC/src/views/basicData/DictionaryManage/Dict.vue b/fe/PC/src/views/basicData/DictionaryManage/Dict.vue
index b6d99a646..41cac8328 100644
--- a/fe/PC/src/views/basicData/DictionaryManage/Dict.vue
+++ b/fe/PC/src/views/basicData/DictionaryManage/Dict.vue
@@ -40,16 +40,20 @@
(displayDialog.detailsDialog = val)"
@drawerbutton="drawerbutton"
- @handleCommand="drawerHandle"
@close-value="closeValue"
+ :tableColumns="detailsTableColumns"
+ :dropdownData="dropdownData"
+ @handleCommand="drawerHandle"
+ :totalCount="totalCountDetails"
+ :MaxResultCount="MaxResultCountDetails"
+ @alterResultCountDetails="alterResultCountDetails"
+ @alertoldSkipCountDetails="alertoldSkipCountDetails"
>
{
res.details = res.items
delete res.items
- this.propsData = res
+ this.tableDataDetails = JSON.parse(JSON.stringify(res))
+ let linshiTableDataDetails = JSON.parse(JSON.stringify(this.tableDataDetails))
+ this.totalCountDetails = res.details.length
+ // 删除除当前页面最大数以外数据
+ linshiTableDataDetails.details.splice(this.MaxResultCountDetails,this.totalCountDetails);
+ this.propsData = linshiTableDataDetails
this.Loading.DrawerLoading = false
}).catch(err => {
this.Loading.DrawerLoading = false
diff --git a/fe/PC/src/views/inventoryManage/InventoryQuery/splitPackingList.vue b/fe/PC/src/views/inventoryManage/InventoryQuery/splitPackingList.vue
index 4ab83e03c..f8ef04f26 100644
--- a/fe/PC/src/views/inventoryManage/InventoryQuery/splitPackingList.vue
+++ b/fe/PC/src/views/inventoryManage/InventoryQuery/splitPackingList.vue
@@ -127,7 +127,7 @@
}]}
getPageListWip(this.PageListParams, 'wms/store/transfer-note/get-split-packing-list?includeDetails=true').then(res => {
this.propsData = res.items[0]
- console.log(130,this.propsData)
+ this.totalCountDetails = 1
this.Loading.DrawerLoading = false
}).catch(err => {
this.Loading.DrawerLoading = false