diff --git a/src/lang/i18n/en/module/basicData.js b/src/lang/i18n/en/module/basicData.js index 26e771a..735dd4a 100644 --- a/src/lang/i18n/en/module/basicData.js +++ b/src/lang/i18n/en/module/basicData.js @@ -1,13 +1,8 @@ /* * @Author: gtz * @Date: 2021-03-04 16:13:51 -<<<<<<< HEAD - * @LastEditors: fzq - * @LastEditTime: 2022-03-14 16:22:38 -======= * @LastEditors: zwq - * @LastEditTime: 2022-03-14 10:58:20 ->>>>>>> develop + * @LastEditTime: 2022-03-15 10:17:01 * @Description: file content */ export default { diff --git a/src/lang/i18n/zh/module/basicData.js b/src/lang/i18n/zh/module/basicData.js index 4af5db4..25a9836 100644 --- a/src/lang/i18n/zh/module/basicData.js +++ b/src/lang/i18n/zh/module/basicData.js @@ -1,14 +1,8 @@ /* * @Author: gtz * @Date: 2021-03-04 16:13:51 -<<<<<<< HEAD - * @LastEditors: fzq - * @LastEditTime: 2022-03-14 16:22:20 - * @Description: file content -======= * @LastEditors: zwq - * @LastEditTime: 2022-03-14 10:58:12 ->>>>>>> develop + * @LastEditTime: 2022-03-15 10:16:52 */ export default { visual: { diff --git a/src/views/basicData/Warehouse/components/processStorageLink.vue b/src/views/basicData/Warehouse/components/processStorageLink.vue index ec463b1..c98174b 100644 --- a/src/views/basicData/Warehouse/components/processStorageLink.vue +++ b/src/views/basicData/Warehouse/components/processStorageLink.vue @@ -2,7 +2,7 @@ * @Author: gtz * @Date: 2022-03-03 09:16:10 * @LastEditors: zwq - * @LastEditTime: 2022-03-11 16:33:41 + * @LastEditTime: 2022-03-15 11:03:18 * @Description: file content * @FilePath: \mt-ck-wms-ui\src\views\dashboard\index.vue --> @@ -117,26 +117,8 @@ ) " > -
- {{ - z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)] - .name - }} +
+ {{ z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3 ? z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name : 'XXXX' }}
@@ -216,26 +198,8 @@ ) " > -
- {{ - z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)] - .name - }} +
+ {{ z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3 ? z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name : 'XXXX' }}
@@ -283,26 +247,8 @@ ) " > -
- {{ - z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)] - .name - }} +
+ {{ z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3 ? z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name : 'XXXX' }}
@@ -353,13 +299,13 @@ export default { } else { this.typeVisible = true this.$nextTick(() => { - this.$refs.typeRef.init(item.id) + this.$refs.typeRef.init(item.id, item.name) }) } } }, - setStorageList(locationId, dataForm) { - const obj = Object.assign({ locationId }, dataForm) + setStorageList(locationId, locationName, dataForm) { + const obj = Object.assign({ locationId, locationName }, dataForm) this.selectStorageList.push(obj) }, handleChange(v) { @@ -367,7 +313,7 @@ export default { }, submitLinkList() { const tipArr = this.selectStorageList.map(item => { - return item.locationId + return item.locationName }) const obj = { id: this.id, diff --git a/src/views/basicData/Warehouse/components/processStorageType.vue b/src/views/basicData/Warehouse/components/processStorageType.vue index cc90779..4ec0f05 100644 --- a/src/views/basicData/Warehouse/components/processStorageType.vue +++ b/src/views/basicData/Warehouse/components/processStorageType.vue @@ -2,7 +2,7 @@ * @Author: zwq * @Date: 2020-12-29 16:37:56 * @LastEditors: zwq - * @LastEditTime: 2022-03-11 14:48:18 + * @LastEditTime: 2022-03-15 11:02:46 * @Description: -->