mt-ck-00a/mt-ck-wms-ui
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: mt-ck-00a:114bfeccf3a988bed07abeb9e6fc9c7fc9f79986
Branches Tags
mt-ck-00a:develop
mt-ck-00a:zwq
mt-ck-00a:fzq
mt-ck-00a:gtz
mt-ck-00a:test
mt-ck-00a:dy
mt-ck-00a:cicd
mt-ck-00a:master
..
compare: mt-ck-00a:9aaffbb8b44fe3d4953b99a770e4f3f7a9c368fa
Branches Tags
mt-ck-00a:develop
mt-ck-00a:zwq
mt-ck-00a:fzq
mt-ck-00a:gtz
mt-ck-00a:test
mt-ck-00a:dy
mt-ck-00a:cicd
mt-ck-00a:master

No commits in common. "114bfeccf3a988bed07abeb9e6fc9c7fc9f79986" and "9aaffbb8b44fe3d4953b99a770e4f3f7a9c368fa" have entirely different histories.
114bfeccf3 ... 9aaffbb8b4

2 changed files with 24 additions and 33 deletions
Show Stats Expand all files Collapse all files

34
src/views/basicData/Warehouse/components/processStorageLink.vue
View File

@ -2,7 +2,7 @@
* @Author: gtz * @Author: gtz
* @Date: 2022-03-03 09:16:10 * @Date: 2022-03-03 09:16:10
* @LastEditors: zwq * @LastEditors: zwq
* @LastEditTime: 2022-03-18 09:25:04 * @LastEditTime: 2022-03-17 10:56:14
* @Description: file content * @Description: file content
* @FilePath: \mt-ck-wms-ui\src\views\basicData\Warehouse\components\processStorageLink.vue * @FilePath: \mt-ck-wms-ui\src\views\basicData\Warehouse\components\processStorageLink.vue
--> -->
@ -151,15 +151,17 @@
}" }"
/> />
<div <div
v-if=" :class="
StorageList.some( StorageList.some(
StorageItem => StorageItem =>
StorageItem.id === StorageItem.id ===
z.portVoList[ z.portVoList[
(current - 1) * 80 + (item - 1) * 20 + (x - 1) (current - 1) * 80 + (item - 1) * 20 + (x - 1)
].id ].id
)" )
class="dashboard-layout-item-horn" ? 'dashboard-layout-item-horn'
: ''
"
/> />
{{ {{
z.portVoList[ z.portVoList[
@ -280,15 +282,17 @@
}" }"
/> />
<div <div
v-if=" :class="
StorageList.some( StorageList.some(
StorageItem => StorageItem =>
StorageItem.id === StorageItem.id ===
z.portVoList[ z.portVoList[
(current - 1) * 80 + (item - 1) * 20 + (x - 1) (current - 1) * 80 + (item - 1) * 20 + (x - 1)
].id ].id
)" )
class="dashboard-layout-item-horn" ? 'dashboard-layout-item-horn'
: ''
"
/> />
{{ {{
z.portVoList[ z.portVoList[
@ -372,15 +376,17 @@
}" }"
/> />
<div <div
v-if=" :class="
StorageList.some( StorageList.some(
StorageItem => StorageItem =>
StorageItem.id === StorageItem.id ===
z.portVoList[ z.portVoList[
(current - 1) * 80 + (item - 1) * 20 + (x - 1) (current - 1) * 80 + (item - 1) * 20 + (x - 1)
].id ].id
)" )
class="dashboard-layout-item-horn" ? 'dashboard-layout-item-horn'
: ''
"
/> />
{{ {{
z.portVoList[ z.portVoList[
@ -451,7 +457,7 @@ export default {
if (response.data.records) { if (response.data.records) {
this.StorageList = response.data.records this.StorageList = response.data.records
} else { } else {
this.StorageList.splice(0, this.StorageList.length) this.StorageList.splice(0, this.list.length)
} }
}) })
this.selectStorageList.splice(0, this.selectStorageList.length) this.selectStorageList.splice(0, this.selectStorageList.length)
@ -470,13 +476,9 @@ export default {
1 1
) )
} else { } else {
const isExist = this.StorageList.some(
StorageItem =>
StorageItem.id === item.id
)
this.typeVisible = true this.typeVisible = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.typeRef.init(item.id, item.name, item.attribute, isExist) this.$refs.typeRef.init(item.id, item.name)
}) })
} }
} }

23
src/views/basicData/Warehouse/components/processStorageType.vue
View File

@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2020-12-29 16:37:56 * @Date: 2020-12-29 16:37:56
* @LastEditors: zwq * @LastEditors: zwq
* @LastEditTime: 2022-03-18 09:39:09 * @LastEditTime: 2022-03-16 09:47:01
* @Description: * @Description:
--> -->
<template> <template>
@ -18,9 +18,9 @@
label-position="left" label-position="left"
> >
<el-form-item :label="$t('module.basicData.Warehouse.SelectStorageType')" prop="portAttrId"> <el-form-item :label="$t('module.basicData.Warehouse.SelectStorageType')" prop="portAttrId">
<el-radio v-model="dataForm.portAttrId" label="1">Working Port</el-radio> <el-radio v-model="dataForm.portAttrId" :label="1">Working Port</el-radio>
<el-radio v-model="dataForm.portAttrId" label="2">Buffer Port</el-radio> <el-radio v-model="dataForm.portAttrId" :label="2">Buffer Port</el-radio>
<el-radio v-model="dataForm.portAttrId" label="3">Exception Port</el-radio> <el-radio v-model="dataForm.portAttrId" :label="3">Exception Port</el-radio>
</el-form-item> </el-form-item>
<el-form-item :label="$t('module.basicData.storageBox.name')" prop="storageId"> <el-form-item :label="$t('module.basicData.storageBox.name')" prop="storageId">
<el-select v-model="dataForm.storageId" filterable :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.storageBox.name')])" clearable> <el-select v-model="dataForm.storageId" filterable :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.storageBox.name')])" clearable>
@ -41,7 +41,6 @@
</template> </template>
<script> <script>
import { getPortDetail } from '@/api/dashboard'
import { storageBoxList } from '@/api/basicData/Cache/storageBox' import { storageBoxList } from '@/api/basicData/Cache/storageBox'
export default { export default {
@ -51,7 +50,7 @@ export default {
locationId: '', locationId: '',
locationName: '', locationName: '',
dataForm: { dataForm: {
portAttrId: '1', portAttrId: 1,
storageId: '' storageId: ''
}, },
dataRule: { dataRule: {
@ -66,7 +65,7 @@ export default {
} }
}, },
methods: { methods: {
init(id, name, attribute, isExist) { init(id, name) {
this.locationId = id this.locationId = id
this.locationName = name this.locationName = name
const listQuery = { const listQuery = {
@ -82,16 +81,6 @@ export default {
}) })
this.$nextTick(() => { this.$nextTick(() => {
this.$refs['dataForm'].resetFields() this.$refs['dataForm'].resetFields()
if (attribute) {
this.dataForm.portAttrId = attribute
} else {
this.dataForm.portAttrId = '1'
}
if (isExist) {
getPortDetail(id).then(res => {
if (res.code === 0) { this.dataForm.storageId = res.data.storageBoxId }
})
}
}) })
this.visible = true this.visible = true
}, },