sunlupeng пре 6 месеци
родитељ
комит
7c66d0bca3

+ 4 - 4
config/dev.env.js

@@ -3,11 +3,11 @@ module.exports = {
 	ENV_CONFIG: '"dev"',
   // 登录用户名 admin123,密码 admin123
   // 本地环境
-  // BASE_API: '"http://192.168.100.188:9086/admin"',
-  // OS_API: '"http://192.168.100.188:9086/oneportal/login"',
+  BASE_API: '"http://192.168.100.188:9086/admin"',
+  OS_API: '"http://192.168.100.188:9086/oneportal/login"',
 	// 阿里云环境
-  BASE_API: '"http://47.103.79.143:9086/admin"',
-  OS_API: '"http://dgtcloud.dgtis.com/oneportal/login"'
+  // BASE_API: '"http://47.103.79.143:9086/admin"',
+  // OS_API: '"http://dgtcloud.dgtis.com/oneportal/login"'
   //正式环境
   // BASE_API: '"https://xiaoyou.dgtis.com/admin"',
   // OS_API: '"http://dgt.dgtis.com/oneportal/login"'

+ 1 - 1
src/views/stock/assembly/assemblyAdd.vue

@@ -215,7 +215,7 @@ export default {
                 this.$message.error('请先选择仓库!')
                 return
             } else {
-                let selectedIds = val=='inventoryEntryInfos' ? this.dataForm.inventoryEntryInfos.map(item => item.productId) : this.dataForm.inventoryOutInfos.map(item => item.productId);
+                let selectedIds = val=='inventoryEntryInfos' ? this.dataForm.inventoryEntryInfos.map(item => item.id) : this.dataForm.inventoryOutInfos.map(item => item.id);
                 const Goods = await this.$EnPickerGoods({
                     // goodsApi: '/warehouse-entry/info/inventory',
                     selectedIds: selectedIds,

+ 1 - 1
src/views/stock/breakage/breakageAdd.vue

@@ -194,7 +194,7 @@ export default {
                 return
             }else{
                 console.log(this.dataForm.inventoryOutInfos)
-                let selectedIds = this.dataForm.inventoryOutInfos.map(item => item.productId);
+                let selectedIds = this.dataForm.inventoryOutInfos.map(item => item.id);
                 const Goods = await this.$EnPickerGoods({
                     // goodsApi: '/warehouse-entry/info/inventory',
                     selectedIds: selectedIds,

+ 1 - 1
src/views/stock/disassembly/disassemblyAdd.vue

@@ -218,7 +218,7 @@ export default {
                 this.$message.error('请先选择仓库!')
                 return
             } else {
-                let selectedIds = val=='inventoryEntryInfos' ? this.dataForm.inventoryEntryInfos.map(item => item.productId) : this.dataForm.inventoryOutInfos.map(item => item.productId);
+                let selectedIds = val=='inventoryEntryInfos' ? this.dataForm.inventoryEntryInfos.map(item => item.id) : this.dataForm.inventoryOutInfos.map(item => item.id);
                 const Goods = await this.$EnPickerGoods({
                     // goodsApi: '/warehouse-entry/info/inventory',
                     selectedIds: selectedIds,

+ 1 - 1
src/views/stock/requisition/requisitionAdd.vue

@@ -219,7 +219,7 @@ export default {
                 return
             }else{
                 console.log(this.dataForm.inventoryEntryInfos)
-                let selectedIds = this.dataForm.inventoryEntryInfos.map(item => item.productId);
+                let selectedIds = this.dataForm.inventoryEntryInfos.map(item => item.id);
                 const Goods = await this.$EnPickerGoods({
                     // goodsApi: '/warehouse-entry/info/inventory',
                     selectedIds: selectedIds,

+ 1 - 1
src/views/stock/retrieval/retrievalAdd.vue

@@ -216,7 +216,7 @@ export default {
                 return
             }else{
                 console.log(this.dataForm.inventoryOutInfos)
-                let selectedIds = this.dataForm.inventoryOutInfos.map(item => item.productId);
+                let selectedIds = this.dataForm.inventoryOutInfos.map(item => item.id);
                 const Goods = await this.$EnPickerGoods({
                     // goodsApi: '/warehouse-entry/info/inventory',
                     selectedIds: selectedIds,

+ 1 - 1
src/views/stock/stockCount/stockCountAdd.vue

@@ -191,7 +191,7 @@ export default {
                 this.$message.error('请先选择仓库!')
                 return
             } else {
-                let selectedIds = val=='inventoryEntryInfos' ? this.dataForm.inventoryEntryInfos.map(item => item.productId) : this.dataForm.inventoryOutInfos.map(item => item.productId);
+                let selectedIds = val=='inventoryEntryInfos' ? this.dataForm.inventoryEntryInfos.map(item => item.id) : this.dataForm.inventoryOutInfos.map(item => item.id);
                 const Goods = await this.$EnPickerGoods({
                     // goodsApi: '/warehouse-entry/info/inventory',
                     selectedIds: selectedIds,

+ 1 - 1
src/views/stock/swap/swapAdd.vue

@@ -259,7 +259,7 @@ export default {
                 this.$message.error('请先选择仓库!')
                 return
             } else {
-                let selectedIds = val=='inventoryEntryInfos' ? this.dataForm.inventoryEntryInfos.map(item => item.productId) : this.dataForm.inventoryOutInfos.map(item => item.productId);
+                let selectedIds = val=='inventoryEntryInfos' ? this.dataForm.inventoryEntryInfos.map(item => item.id) : this.dataForm.inventoryOutInfos.map(item => item.id);
                 const Goods = await this.$EnPickerGoods({
                     // goodsApi: '/warehouse-entry/info/inventory',
                     selectedIds: selectedIds,

+ 1 - 1
src/views/stock/warehousing/warehousingAdd.vue

@@ -208,7 +208,7 @@ export default {
                 return
             }else{
                 console.log(this.dataForm.inventoryEntryInfos)
-                let selectedIds = this.dataForm.inventoryEntryInfos.map(item => item.productId);
+                let selectedIds = this.dataForm.inventoryEntryInfos.map(item => item.id);
                 const Goods = await this.$EnPickerGoods({
                     // goodsApi: '/warehouse-entry/info/inventory',
                     selectedIds: selectedIds,