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

update

Browse Source
This commit is contained in:
gtz217 2022-03-12 14:24:40 +08:00
parent c58d4fb90b
commit 4921ba62ed
4 changed files with 103 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/lang/i18n/en/module/basicData.js
View File

@ -1,8 +1,8 @@
/*
* @Author: gtz
* @Date: 2021-03-04 16:13:51
* @LastEditors: zwq
* @LastEditTime: 2022-03-11 10:55:37
* @LastEditors: gtz
* @LastEditTime: 2022-03-12 14:22:52
* @Description: file content
*/
export default {
@ -343,6 +343,10 @@ export default {
PerformTaskManual: 'Perform Task Manual',
processStorageLink: 'Process Storage Link',
SelectStorageType: 'Select Storage Type',
LocationStorageSetting: 'Location Storage Setting'
LocationStorageSetting: 'Location Storage Setting',
publishTask: 'Publish The Task',
startPosition: 'Start',
endPosition: 'End',
taskType: 'Task Type'
}
}

10
src/lang/i18n/zh/module/basicData.js
View File

@ -1,8 +1,8 @@
/*
* @Author: gtz
* @Date: 2021-03-04 16:13:51
* @LastEditors: zwq
* @LastEditTime: 2022-03-11 10:55:25
* @LastEditors: gtz
* @LastEditTime: 2022-03-12 14:23:06
*/
export default {
visual: {
@ -349,6 +349,10 @@ export default {
PerformTaskManual: '手动执行任务',
processStorageLink: '工序关联库位',
SelectStorageType: '选择库位类型',
LocationStorageSetting: '库位存储箱设置'
LocationStorageSetting: '库位存储箱设置',
publishTask: '发布任务',
startPosition: '起点',
endPosition: '终点',
taskType: '任务类型'
}
}

17
src/views/basicData/Warehouse/CurrentTask.vue
View File

@ -1,8 +1,8 @@
<!--
* @Author: zwq
* @Date: 2020-12-29 15:41:11
* @LastEditors: zwq
* @LastEditTime: 2022-03-04 10:56:41
* @LastEditors: gtz
* @LastEditTime: 2022-03-12 14:21:37
* @Description:
-->
<template>
@ -47,6 +47,7 @@
<el-form-item>
<el-button type="primary" @click="getList()"> {{ 'btn.search' | i18nFilter }} </el-button>
<el-button type="primary" @click="manualTask()"> {{ $t('module.basicData.Warehouse.PerformTaskManual') | i18nFilter }} </el-button>
<el-button type="primary" @click="publishTask()"> {{ $t('module.basicData.Warehouse.publishTask') | i18nFilter }} </el-button>
</el-form-item>
</el-form>
<base-table
@ -72,6 +73,7 @@
/>
<current-task-info v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getList" />
<current-task-add v-if="manualTaskVisible" ref="manualTaskRef" @refreshDataList="getList" />
<publish-task v-if="publishTaskVisible" ref="publishTask" />
</div>
</template>
@ -79,6 +81,7 @@
import { CurrentTaskList } from '@/api/basicData/Warehouse/HistoricalTask'
import CurrentTaskInfo from './components/CurrentTaskInfo.vue'
import CurrentTaskAdd from './components/CurrentTask-add.vue'
import PublishTask from './components/PublishTask.vue'
import i18n from '@/lang'
import BaseTable from '@/components/BaseTable'
import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
@ -171,12 +174,13 @@ const tableProps = [
export default {
name: 'ScrapInfo',
components: { Pagination, BaseTable, MethodBtn, CurrentTaskInfo, CurrentTaskAdd },
components: { Pagination, BaseTable, MethodBtn, CurrentTaskInfo, CurrentTaskAdd, PublishTask },
data() {
return {
trueWidth: 100,
addOrUpdateVisible: false,
manualTaskVisible: false,
publishTaskVisible: false,
tableProps,
tableBtn,
list: [],
@ -248,6 +252,13 @@ export default {
this.$nextTick(() => {
this.$refs.manualTaskRef.init()
})
},
// 发布任务
publishTask() {
this.publishTaskVisible = true
this.$nextTick(() => {
this.$refs.publishTask.init()
})
}
}
}

75
src/views/basicData/Warehouse/components/PublishTask.vue Normal file
View File

@ -0,0 +1,75 @@
<!--
* @Author: gtz
* @Date: 2022-03-12 14:17:55
* @LastEditors: gtz
* @LastEditTime: 2022-03-12 14:23:43
* @Description: file content
* @FilePath: \mt-ck-wms-ui\src\views\basicData\Warehouse\components\PublishTask.vue
-->
<template>
<el-dialog
:title="'btn.see' | i18nFilter"
:visible.sync="visible"
>
<el-row :gutter="10">
<el-form
ref="dataForm"
:model="dataForm"
:rules="dataRule"
size="medium"
label-width="110px"
label-position="left"
>
<el-form-item :label="$t('module.basicData.Warehouse.startPosition')" prop="startPosition">
<el-input v-model="dataForm.startPosition" readonly :style="{width: '100%'}" />
</el-form-item>
<el-form-item :label="$t('module.basicData.Warehouse.endPosition')" prop="endPosition">
<el-input v-model="dataForm.endPosition" readonly :style="{width: '100%'}" />
</el-form-item>
<el-form-item :label="$t('module.basicData.Warehouse.taskType')" prop="taskType">
<el-input v-model="dataForm.taskType" readonly :style="{width: '100%'}" />
</el-form-item>
</el-form>
</el-row>
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false">{{ 'btn.cancel' | i18nFilter }}</el-button>
<el-button type="primary" @click="visible = false">{{ 'btn.submit' | i18nFilter }} </el-button>
</span>
</el-dialog>
</template>
<script>
// import { CurrentTaskDetail } from '@/api/basicData/Warehouse/HistoricalTask'
export default {
data() {
return {
visible: false,
dataForm: {
startPosition: null,
endPosition: null,
taskType: null
},
dataRule: {
startPosition: [
{ required: true, message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.Warehouse.startPosition')]), trigger: 'blur' }
],
endPosition: [
{ required: true, message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.Warehouse.endPosition')]), trigger: 'blur' }
],
taskType: [
{ required: true, message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.Warehouse.taskType')]), trigger: 'blur' }
]
}
}
},
methods: {
init() {
this.visible = true
this.$nextTick(() => {
this.$refs['dataForm'].resetFields()
})
}
}
}
</script>