Compare commits
No commits in common. "507b9da3194eb5609d2d03ab9f00d373b087e18f" and "02ac7ee486c8d5fd95550806471dd7dbb38244dc" have entirely different histories.
507b9da319
...
02ac7ee486
@ -2,7 +2,7 @@
|
|||||||
* @Author: gtz
|
* @Author: gtz
|
||||||
* @Date: 2021-03-04 16:13:51
|
* @Date: 2021-03-04 16:13:51
|
||||||
* @LastEditors: zwq
|
* @LastEditors: zwq
|
||||||
* @LastEditTime: 2022-03-09 15:14:15
|
* @LastEditTime: 2022-03-09 14:24:45
|
||||||
* @Description: file content
|
* @Description: file content
|
||||||
*/
|
*/
|
||||||
export default {
|
export default {
|
||||||
@ -320,7 +320,6 @@ export default {
|
|||||||
LocationCode: 'Location Code',
|
LocationCode: 'Location Code',
|
||||||
PerformTaskManual: 'Perform Task Manual',
|
PerformTaskManual: 'Perform Task Manual',
|
||||||
processStorageLink: 'Process Storage Link',
|
processStorageLink: 'Process Storage Link',
|
||||||
SelectStorageType: 'Select Storage Type',
|
SelectStorageType: 'Select Storage Type'
|
||||||
LocationStorageSetting: 'Location Storage Setting'
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
* @Author: gtz
|
* @Author: gtz
|
||||||
* @Date: 2021-03-04 16:13:51
|
* @Date: 2021-03-04 16:13:51
|
||||||
* @LastEditors: zwq
|
* @LastEditors: zwq
|
||||||
* @LastEditTime: 2022-03-09 15:14:07
|
* @LastEditTime: 2022-03-09 14:24:03
|
||||||
*/
|
*/
|
||||||
export default {
|
export default {
|
||||||
visual: {
|
visual: {
|
||||||
@ -334,7 +334,6 @@ export default {
|
|||||||
LocationCode: '库位编码',
|
LocationCode: '库位编码',
|
||||||
PerformTaskManual: '手动执行任务',
|
PerformTaskManual: '手动执行任务',
|
||||||
processStorageLink: '工序关联库位',
|
processStorageLink: '工序关联库位',
|
||||||
SelectStorageType: '选择库位类型',
|
SelectStorageType: '选择库位类型'
|
||||||
LocationStorageSetting: '库位存储箱设置'
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -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-09 15:17:46
|
* @LastEditTime: 2022-03-09 14:30:59
|
||||||
* @Description: file content
|
* @Description: file content
|
||||||
* @FilePath: \mt-ck-wms-ui\src\views\dashboard\index.vue
|
* @FilePath: \mt-ck-wms-ui\src\views\dashboard\index.vue
|
||||||
-->
|
-->
|
||||||
@ -355,8 +355,11 @@ export default {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
setStorageList(id, dataForm) {
|
setStorageList(id, type) {
|
||||||
const obj = Object.assign({ id }, dataForm)
|
const obj = {
|
||||||
|
id,
|
||||||
|
type
|
||||||
|
}
|
||||||
this.selectStorageList.push(obj)
|
this.selectStorageList.push(obj)
|
||||||
},
|
},
|
||||||
handleChange(v) {
|
handleChange(v) {
|
||||||
|
@ -2,37 +2,17 @@
|
|||||||
* @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-09 15:14:20
|
* @LastEditTime: 2022-03-09 11:18:51
|
||||||
* @Description:
|
* @Description:
|
||||||
-->
|
-->
|
||||||
<template>
|
<template>
|
||||||
<el-dialog
|
<el-dialog
|
||||||
:title="$t('module.basicData.Warehouse.LocationStorageSetting') | i18nFilter"
|
:title="$t('module.basicData.Warehouse.SelectStorageType') | i18nFilter"
|
||||||
:visible.sync="visible"
|
:visible.sync="visible"
|
||||||
>
|
>
|
||||||
<el-form
|
<el-radio v-model="storageType" :label="1">Working Port</el-radio>
|
||||||
ref="dataForm"
|
<el-radio v-model="storageType" :label="2">Buffer Port</el-radio>
|
||||||
:model="dataForm"
|
<el-radio v-model="storageType" :label="3">Exception Port</el-radio>
|
||||||
size="medium"
|
|
||||||
label-width="110px"
|
|
||||||
label-position="left"
|
|
||||||
>
|
|
||||||
<el-form-item :label="$t('module.basicData.Warehouse.SelectStorageType')" prop="storageType">
|
|
||||||
<el-radio v-model="dataForm.storageType" :label="1">Working Port</el-radio>
|
|
||||||
<el-radio v-model="dataForm.storageType" :label="2">Buffer Port</el-radio>
|
|
||||||
<el-radio v-model="dataForm.storageType" :label="3">Exception Port</el-radio>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item :label="$t('module.basicData.storageBox.name')" prop="storageBoxName">
|
|
||||||
<el-select v-model="dataForm.storageBoxName" filterable :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.storageBox.name')])" clearable>
|
|
||||||
<el-option
|
|
||||||
v-for="item in storageBoxArr"
|
|
||||||
:key="item.id"
|
|
||||||
:label="item.storageBoxName"
|
|
||||||
:value="item.id"
|
|
||||||
/>
|
|
||||||
</el-select>
|
|
||||||
</el-form-item>
|
|
||||||
</el-form>
|
|
||||||
<span slot="footer" class="dialog-footer">
|
<span slot="footer" class="dialog-footer">
|
||||||
<el-button @click="visible = false">{{ 'btn.cancel' | i18nFilter }}</el-button>
|
<el-button @click="visible = false">{{ 'btn.cancel' | i18nFilter }}</el-button>
|
||||||
<el-button type="primary" @click="dataFormSubmit()">{{ 'btn.confirm' | i18nFilter }}</el-button>
|
<el-button type="primary" @click="dataFormSubmit()">{{ 'btn.confirm' | i18nFilter }}</el-button>
|
||||||
@ -41,40 +21,24 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { storageBoxList } from '@/api/basicData/Cache/storageBox'
|
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
visible: false,
|
visible: false,
|
||||||
storageId: '',
|
storageId: '',
|
||||||
dataForm: {
|
storageType: 1
|
||||||
storageType: 1,
|
|
||||||
storageBoxName: ''
|
|
||||||
},
|
|
||||||
storageBoxArr: []
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
init(id) {
|
init(id) {
|
||||||
this.storageId = id
|
this.storageId = id
|
||||||
const listQuery = {
|
|
||||||
current: 1,
|
|
||||||
size: 999
|
|
||||||
}
|
|
||||||
storageBoxList(listQuery).then(response => {
|
|
||||||
if (response.data.records) {
|
|
||||||
this.storageBoxArr = response.data.records
|
|
||||||
} else {
|
|
||||||
this.storageBoxArr.splice(0, this.list.length)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
this.visible = true
|
this.visible = true
|
||||||
},
|
},
|
||||||
// 表单提交
|
// 表单提交
|
||||||
dataFormSubmit() {
|
dataFormSubmit() {
|
||||||
this.visible = false
|
this.visible = false
|
||||||
this.$emit('refreshDataList', this.storageId, this.dataForm)
|
this.$emit('refreshDataList', this.storageId, this.storageType)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user