diff --git a/config.js b/config.js index 7101f2f..07e5515 100644 --- a/config.js +++ b/config.js @@ -1,9 +1,9 @@ // 应用全局配置 module.exports = { - baseUrl: 'https://www.nuoyunr.com', + // baseUrl: 'https://www.nuoyunr.com', // baseUrl: 'http://124.222.105.7:48080', // baseUrl: 'http://192.168.1.4:48080', - // baseUrl: "http://localhost:48080", + baseUrl: "http://localhost:48080", imagesUrl: 'http://shequ.0315e.com/static/images/pages/', baseImageUrl: 'https://www.nuoyunr.com/minio/', shareUrl: 'https://www.lighting-it.cn/share?inviteId=', diff --git a/pages-warehouse/inOutWarehouse/part.vue b/pages-warehouse/inOutWarehouse/part.vue index f3103fa..71b9c5a 100644 --- a/pages-warehouse/inOutWarehouse/part.vue +++ b/pages-warehouse/inOutWarehouse/part.vue @@ -193,7 +193,6 @@ export default { }, getUnitName(id) { if (this.unitList && this.unitList.length > 0) { - console.log("我第一次就拿到了") const index = this.unitList.findIndex(item => item.value === id) if (index !== -1) { return this.unitList[index].label @@ -201,7 +200,6 @@ export default { return "请选择" } } - console.log("我是重新去拿的") this.listUnit() return "请选择" }, @@ -394,10 +392,10 @@ export default { method: 'get' }).then(res => { this.partList = Object.entries(res.data) - this.partList = this.partList.filter(([key, value]) => { - const newValue = value.filter(item => item.inCount !== item.goodsCount) - return newValue && newValue.length > 0 + this.partList = this.partList.map(([key, value]) => { + return [key, value.filter(item => (!item.inCount && item.inCount !== item.goodsCount))] }) + this.partList = this.partList.filter(([key, value]) => value.length > 0) this.partList.forEach(([key, value]) => { value.forEach(item => { item.goodsCount = item.goodsCount - item?.inCount | 0 @@ -419,35 +417,6 @@ export default { }) } }) - // request({ - // url: '/admin-api/repair/so/get', - // method: 'get', - // params: { - // id: this.soId - // } - // }).then((res) => { // 将 `.then` 移到这里 - // // console.log(res) - // res.data.goodsList.forEach(item => { - // this.soiIds.push(item.id) - // }) - // console.log('返回', res.data) - // - // request({ - // url: '/admin-api/repair/soi/get', - // method: 'get', - // params: { - // ids: this.soiIds.join(',') - // } - // }).then((res) => { // 同样这里也要移到外层括号后 - // console.log('配件信息', res.data) - // res.data.map(item => { - // item.wares = item.repairWares - // item.waresCount = 0 - // }) - // this.wares = res.data - // this.init() - // }) - // }) }, /** * 入库