diff --git a/pages/common/mater-list.vue b/pages/common/mater-list.vue
index a34d69d..3eff11d 100644
--- a/pages/common/mater-list.vue
+++ b/pages/common/mater-list.vue
@@ -94,20 +94,18 @@
},
async _getMaterialList () {
let res = await getMaterialList( this.val1, this.pageNum + '', this.pageSize + '')
- if (res.code === '200') {
- // this.dataList = res.data
- this.totalCount = res.totalElements
- if (res.totalElements > 0) {
- const dataMap = res.data
- this.dataList = this.reload ? dataMap : this.dataList.concat(dataMap)
- this.reload = false
- } else {
- this.dataList = []
- }
- if (this.totalCount == this.dataList.length) {
- this.reload = false
- this.status = 'noMore'
- }
+ // this.dataList = res.data
+ this.totalCount = res.totalElements
+ if (res.totalElements > 0) {
+ const dataMap = res.data
+ this.dataList = this.reload ? dataMap : this.dataList.concat(dataMap)
+ this.reload = false
+ } else {
+ this.dataList = []
+ }
+ if (this.totalCount == this.dataList.length) {
+ this.reload = false
+ this.status = 'noMore'
}
},
onReachBottom () {
diff --git a/pages/outbound/out-store-confirm.vue b/pages/outbound/out-store-confirm.vue
index a48e4a6..e5d2a11 100644
--- a/pages/outbound/out-store-confirm.vue
+++ b/pages/outbound/out-store-confirm.vue
@@ -60,7 +60,7 @@
出库数量
-
+
diff --git a/utils/getData3.js b/utils/getData3.js
index bf4dab5..93e3314 100644
--- a/utils/getData3.js
+++ b/utils/getData3.js
@@ -38,6 +38,338 @@ export const getMaterialList = (search, page, size) => request({
data: {search: search, page: page, size: size}
})
+// export const getMaterialList = () => {
+// let res = {
+// "totalElements": 2067,
+// "message": "查询成功",
+// "content": null,
+// "code": "200",
+// "msg": null,
+// "data": [
+// {
+// "cubage": null,
+// "material_model": null,
+// "is_used_time": null,
+// "net_weight": null,
+// "english_name": null,
+// "weight_unit_id": null,
+// "cubage_unit_id": null,
+// "material_spec": "塑料托盘",
+// "update_time": "2025-07-08 16:32:10",
+// "update_optname": "admin",
+// "ext_id": null,
+// "len_unit_id": null,
+// "create_id": "1",
+// "gross_weight": null,
+// "material_name": "空托盘",
+// "height": null,
+// "create_time": "2025-07-08 16:32:10",
+// "ass_unit_id": null,
+// "print_no": null,
+// "length": null,
+// "material_type_id": null,
+// "base_unit_id": "14",
+// "is_used": "1",
+// "is_delete": "0",
+// "approve_fileno": null,
+// "width": null,
+// "material_id": "1",
+// "material_code": "KT001",
+// "create_name": "admin",
+// "update_optid": "1"
+// },
+// {
+// "cubage": null,
+// "material_model": null,
+// "is_used_time": null,
+// "net_weight": null,
+// "english_name": null,
+// "weight_unit_id": null,
+// "cubage_unit_id": null,
+// "material_spec": "SJD-208E，国标，3*1.0*2.1m，带漏电保护",
+// "update_time": "2025-07-10 15:55:55",
+// "update_optname": "admin",
+// "ext_id": null,
+// "len_unit_id": null,
+// "create_id": "1",
+// "gross_weight": null,
+// "material_name": "漏保电源线",
+// "height": null,
+// "create_time": "2025-07-10 15:55:55",
+// "ass_unit_id": null,
+// "print_no": null,
+// "length": null,
+// "material_type_id": null,
+// "base_unit_id": "1",
+// "is_used": "1",
+// "is_delete": "0",
+// "approve_fileno": null,
+// "width": null,
+// "material_id": "1943217608350371840",
+// "material_code": "105030400000055",
+// "create_name": "admin",
+// "update_optid": "1"
+// },
+// {
+// "cubage": null,
+// "material_model": "CFZ-8.8S10S-DYX",
+// "is_used_time": null,
+// "net_weight": null,
+// "english_name": null,
+// "weight_unit_id": null,
+// "cubage_unit_id": null,
+// "material_spec": "CFZ-8.8S10S-DYX YZ3*2.5+2*1.5，线长2.8m/根",
+// "update_time": "2025-07-10 15:55:55",
+// "update_optname": "admin",
+// "ext_id": null,
+// "len_unit_id": null,
+// "create_id": "1",
+// "gross_weight": null,
+// "material_name": "电源线10S",
+// "height": null,
+// "create_time": "2025-07-10 15:55:55",
+// "ass_unit_id": null,
+// "print_no": null,
+// "length": null,
+// "material_type_id": null,
+// "base_unit_id": "1",
+// "is_used": "1",
+// "is_delete": "0",
+// "approve_fileno": null,
+// "width": null,
+// "material_id": "1943217608367149056",
+// "material_code": "105030300101001",
+// "create_name": "admin",
+// "update_optid": "1"
+// },
+// {
+// "cubage": null,
+// "material_model": "OL-503-501B",
+// "is_used_time": null,
+// "net_weight": null,
+// "english_name": null,
+// "weight_unit_id": null,
+// "cubage_unit_id": null,
+// "material_spec": "欧标烟斗插，16A/250V，3*1.0mm2，3.2m，黑色，TUV;VDE，旧图号：OL-503-501，250旗型插片，外露2.5m.",
+// "update_time": "2025-07-10 15:55:55",
+// "update_optname": "admin",
+// "ext_id": null,
+// "len_unit_id": null,
+// "create_id": "1",
+// "gross_weight": null,
+// "material_name": "电源线OL-503E",
+// "height": null,
+// "create_time": "2025-07-10 15:55:55",
+// "ass_unit_id": null,
+// "print_no": null,
+// "length": null,
+// "material_type_id": null,
+// "base_unit_id": "1",
+// "is_used": "1",
+// "is_delete": "0",
+// "approve_fileno": null,
+// "width": null,
+// "material_id": "1943217608388120576",
+// "material_code": "105010205031001",
+// "create_name": "admin",
+// "update_optid": "1"
+// },
+// {
+// "cubage": null,
+// "material_model": "OL-503-501C",
+// "is_used_time": null,
+// "net_weight": null,
+// "english_name": null,
+// "weight_unit_id": null,
+// "cubage_unit_id": null,
+// "material_spec": "美标插，13A/125V，3*16AWG，3.5m，耐温105℃，黑色，UL，SJT，旧图号：OL-503-501，250旗型插片，外露2.8m",
+// "update_time": "2025-07-10 15:55:55",
+// "update_optname": "admin",
+// "ext_id": null,
+// "len_unit_id": null,
+// "create_id": "1",
+// "gross_weight": null,
+// "material_name": "电源线",
+// "height": null,
+// "create_time": "2025-07-10 15:55:55",
+// "ass_unit_id": null,
+// "print_no": null,
+// "length": null,
+// "material_type_id": null,
+// "base_unit_id": "1",
+// "is_used": "1",
+// "is_delete": "0",
+// "approve_fileno": null,
+// "width": null,
+// "material_id": "1943217608425869312",
+// "material_code": "105010250301002",
+// "create_name": "admin",
+// "update_optid": "1"
+// },
+// {
+// "cubage": null,
+// "material_model": "G001-501D",
+// "is_used_time": null,
+// "net_weight": null,
+// "english_name": null,
+// "weight_unit_id": null,
+// "cubage_unit_id": null,
+// "material_spec": "韩规，16A/250V，3*0.75mm2，2.52m，灰色，KC，250旗插带锁，外露1.8m",
+// "update_time": "2025-07-10 15:55:55",
+// "update_optname": "admin",
+// "ext_id": null,
+// "len_unit_id": null,
+// "create_id": "1",
+// "gross_weight": null,
+// "material_name": "电源线",
+// "height": null,
+// "create_time": "2025-07-10 15:55:55",
+// "ass_unit_id": null,
+// "print_no": null,
+// "length": null,
+// "material_type_id": null,
+// "base_unit_id": "1",
+// "is_used": "1",
+// "is_delete": "0",
+// "approve_fileno": null,
+// "width": null,
+// "material_id": "1943217608438452224",
+// "material_code": "105011500101001",
+// "create_name": "admin",
+// "update_optid": "1"
+// },
+// {
+// "cubage": null,
+// "material_model": "G125-501C",
+// "is_used_time": null,
+// "net_weight": null,
+// "english_name": null,
+// "weight_unit_id": null,
+// "cubage_unit_id": null,
+// "material_spec": "美标插，15A/125V，3*14AWG，8.15m，耐温105℃，黑色，UL，SJT，旧图号：OJ-G125E-501A，250直插带锁，外露7.6m",
+// "update_time": "2025-07-10 15:55:55",
+// "update_optname": "admin",
+// "ext_id": null,
+// "len_unit_id": null,
+// "create_id": "1",
+// "gross_weight": null,
+// "material_name": "电源线OL-G125E",
+// "height": null,
+// "create_time": "2025-07-10 15:55:55",
+// "ass_unit_id": null,
+// "print_no": null,
+// "length": null,
+// "material_type_id": null,
+// "base_unit_id": "1",
+// "is_used": "1",
+// "is_delete": "0",
+// "approve_fileno": null,
+// "width": null,
+// "material_id": "1943217608451035136",
+// "material_code": "105010201251001",
+// "create_name": "admin",
+// "update_optid": "1"
+// },
+// {
+// "cubage": null,
+// "material_model": "D080-501C",
+// "is_used_time": null,
+// "net_weight": null,
+// "english_name": null,
+// "weight_unit_id": null,
+// "cubage_unit_id": null,
+// "material_spec": "美标插，15A/125V，3*14AWG，8.15m，耐温105℃，黑色，UL，，15A/125V，3*14AWG，8.15m，耐温105℃，黑色，UL，SJT，250旗插带锁，外露7.6m",
+// "update_time": "2025-07-10 15:55:55",
+// "update_optname": "admin",
+// "ext_id": null,
+// "len_unit_id": null,
+// "create_id": "1",
+// "gross_weight": null,
+// "material_name": "电源线",
+// "height": null,
+// "create_time": "2025-07-10 15:55:55",
+// "ass_unit_id": null,
+// "print_no": null,
+// "length": null,
+// "material_type_id": null,
+// "base_unit_id": "1",
+// "is_used": "1",
+// "is_delete": "0",
+// "approve_fileno": null,
+// "width": null,
+// "material_id": "1943217608459423744",
+// "material_code": "105011008001001",
+// "create_name": "admin",
+// "update_optid": "1"
+// },
+// {
+// "cubage": null,
+// "material_model": "901-501C",
+// "is_used_time": null,
+// "net_weight": null,
+// "english_name": null,
+// "weight_unit_id": null,
+// "cubage_unit_id": null,
+// "material_spec": "美标插，15A/125V，3*14AWG，3.5m，耐温105℃，黑色，UL，旧图号：901E-501，尾部O型圈，外露3m",
+// "update_time": "2025-07-10 15:55:55",
+// "update_optname": "admin",
+// "ext_id": null,
+// "len_unit_id": null,
+// "create_id": "1",
+// "gross_weight": null,
+// "material_name": "电源线SJ-901E",
+// "height": null,
+// "create_time": "2025-07-10 15:55:55",
+// "ass_unit_id": null,
+// "print_no": null,
+// "length": null,
+// "material_type_id": null,
+// "base_unit_id": "1",
+// "is_used": "1",
+// "is_delete": "0",
+// "approve_fileno": null,
+// "width": null,
+// "material_id": "1943217608467812352",
+// "material_code": "105010209011002",
+// "create_name": "admin",
+// "update_optid": "1"
+// },
+// {
+// "cubage": null,
+// "material_model": "D059-210D",
+// "is_used_time": null,
+// "net_weight": null,
+// "english_name": null,
+// "weight_unit_id": null,
+// "cubage_unit_id": null,
+// "material_spec": "韩插，16A/250V，3*1.5mm2，2.43m，黑色，KC，外露1.8m，，蓝色250#直插带锁，棕色250#旗插带锁",
+// "update_time": "2025-07-10 15:55:55",
+// "update_optname": "admin",
+// "ext_id": null,
+// "len_unit_id": null,
+// "create_id": "1",
+// "gross_weight": null,
+// "material_name": "电源线-韩标",
+// "height": null,
+// "create_time": "2025-07-10 15:55:55",
+// "ass_unit_id": null,
+// "print_no": null,
+// "length": null,
+// "material_type_id": null,
+// "base_unit_id": "1",
+// "is_used": "1",
+// "is_delete": "0",
+// "approve_fileno": null,
+// "width": null,
+// "material_id": "1943217608480395264",
+// "material_code": "105010200591005",
+// "create_name": "admin",
+// "update_optid": "1"
+// }
+// ]
+// }
+// return res
+// }
// 入库管理
// 物料组盘确认
diff --git a/vuex/modules/user.js b/vuex/modules/user.js
index 502d21b..1399f57 100644
--- a/vuex/modules/user.js
+++ b/vuex/modules/user.js
@@ -1,6 +1,6 @@
import * as types from '../types'
-const baseUrl = process.env.NODE_ENV === 'development' ? 'http://192.168.10.49:8099' : 'http://192.168.10.49:8099'
+const baseUrl = process.env.NODE_ENV === 'development' ? 'http://172.18.51.221:8011' : 'http://172.18.51.221:8011'
const acsUrl = process.env.NODE_ENV === 'development' ? 'http://192.168.18.250:8012' : 'http://192.168.18.250:8012'
const printUrl = process.env.NODE_ENV === 'development' ? 'http://192.168.81.162:8010' : 'http://192.168.81.162:8010'
const state = {