Merge pull request 'gtz' (#54) from gtz into develop
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #54
This commit is contained in:
commit
d21c69e883
@ -1,8 +1,8 @@
|
|||||||
/*
|
/*
|
||||||
* @Author: gtz
|
* @Author: gtz
|
||||||
* @Date: 2021-03-04 16:13:51
|
* @Date: 2021-03-04 16:13:51
|
||||||
* @LastEditors: zwq
|
* @LastEditors: gtz
|
||||||
* @LastEditTime: 2022-03-11 10:55:37
|
* @LastEditTime: 2022-03-12 14:22:52
|
||||||
* @Description: file content
|
* @Description: file content
|
||||||
*/
|
*/
|
||||||
export default {
|
export default {
|
||||||
@ -343,6 +343,10 @@ export default {
|
|||||||
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'
|
LocationStorageSetting: 'Location Storage Setting',
|
||||||
|
publishTask: 'Publish The Task',
|
||||||
|
startPosition: 'Start',
|
||||||
|
endPosition: 'End',
|
||||||
|
taskType: 'Task Type'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
/*
|
/*
|
||||||
* @Author: gtz
|
* @Author: gtz
|
||||||
* @Date: 2021-03-04 16:13:51
|
* @Date: 2021-03-04 16:13:51
|
||||||
* @LastEditors: zwq
|
* @LastEditors: gtz
|
||||||
* @LastEditTime: 2022-03-11 10:55:25
|
* @LastEditTime: 2022-03-12 14:23:06
|
||||||
*/
|
*/
|
||||||
export default {
|
export default {
|
||||||
visual: {
|
visual: {
|
||||||
@ -349,6 +349,10 @@ export default {
|
|||||||
PerformTaskManual: '手动执行任务',
|
PerformTaskManual: '手动执行任务',
|
||||||
processStorageLink: '工序关联库位',
|
processStorageLink: '工序关联库位',
|
||||||
SelectStorageType: '选择库位类型',
|
SelectStorageType: '选择库位类型',
|
||||||
LocationStorageSetting: '库位存储箱设置'
|
LocationStorageSetting: '库位存储箱设置',
|
||||||
|
publishTask: '发布任务',
|
||||||
|
startPosition: '起点',
|
||||||
|
endPosition: '终点',
|
||||||
|
taskType: '任务类型'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
<!--
|
<!--
|
||||||
* @Author: zwq
|
* @Author: zwq
|
||||||
* @Date: 2020-12-29 15:41:11
|
* @Date: 2020-12-29 15:41:11
|
||||||
* @LastEditors: zwq
|
* @LastEditors: gtz
|
||||||
* @LastEditTime: 2022-03-04 10:56:41
|
* @LastEditTime: 2022-03-12 14:21:37
|
||||||
* @Description:
|
* @Description:
|
||||||
-->
|
-->
|
||||||
<template>
|
<template>
|
||||||
@ -47,6 +47,7 @@
|
|||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button type="primary" @click="getList()"> {{ 'btn.search' | i18nFilter }} </el-button>
|
<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="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-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
<base-table
|
<base-table
|
||||||
@ -72,6 +73,7 @@
|
|||||||
/>
|
/>
|
||||||
<current-task-info v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getList" />
|
<current-task-info v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getList" />
|
||||||
<current-task-add v-if="manualTaskVisible" ref="manualTaskRef" @refreshDataList="getList" />
|
<current-task-add v-if="manualTaskVisible" ref="manualTaskRef" @refreshDataList="getList" />
|
||||||
|
<publish-task v-if="publishTaskVisible" ref="publishTask" />
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@ -79,6 +81,7 @@
|
|||||||
import { CurrentTaskList } from '@/api/basicData/Warehouse/HistoricalTask'
|
import { CurrentTaskList } from '@/api/basicData/Warehouse/HistoricalTask'
|
||||||
import CurrentTaskInfo from './components/CurrentTaskInfo.vue'
|
import CurrentTaskInfo from './components/CurrentTaskInfo.vue'
|
||||||
import CurrentTaskAdd from './components/CurrentTask-add.vue'
|
import CurrentTaskAdd from './components/CurrentTask-add.vue'
|
||||||
|
import PublishTask from './components/PublishTask.vue'
|
||||||
import i18n from '@/lang'
|
import i18n from '@/lang'
|
||||||
import BaseTable from '@/components/BaseTable'
|
import BaseTable from '@/components/BaseTable'
|
||||||
import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
|
import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
|
||||||
@ -171,12 +174,13 @@ const tableProps = [
|
|||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'ScrapInfo',
|
name: 'ScrapInfo',
|
||||||
components: { Pagination, BaseTable, MethodBtn, CurrentTaskInfo, CurrentTaskAdd },
|
components: { Pagination, BaseTable, MethodBtn, CurrentTaskInfo, CurrentTaskAdd, PublishTask },
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
trueWidth: 100,
|
trueWidth: 100,
|
||||||
addOrUpdateVisible: false,
|
addOrUpdateVisible: false,
|
||||||
manualTaskVisible: false,
|
manualTaskVisible: false,
|
||||||
|
publishTaskVisible: false,
|
||||||
tableProps,
|
tableProps,
|
||||||
tableBtn,
|
tableBtn,
|
||||||
list: [],
|
list: [],
|
||||||
@ -248,6 +252,13 @@ export default {
|
|||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
this.$refs.manualTaskRef.init()
|
this.$refs.manualTaskRef.init()
|
||||||
})
|
})
|
||||||
|
},
|
||||||
|
// 发布任务
|
||||||
|
publishTask() {
|
||||||
|
this.publishTaskVisible = true
|
||||||
|
this.$nextTick(() => {
|
||||||
|
this.$refs.publishTask.init()
|
||||||
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
75
src/views/basicData/Warehouse/components/PublishTask.vue
Normal file
75
src/views/basicData/Warehouse/components/PublishTask.vue
Normal 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>
|
@ -2,7 +2,7 @@
|
|||||||
* @Author: gtz
|
* @Author: gtz
|
||||||
* @Date: 2022-03-03 09:16:10
|
* @Date: 2022-03-03 09:16:10
|
||||||
* @LastEditors: gtz
|
* @LastEditors: gtz
|
||||||
* @LastEditTime: 2022-03-08 14:34:24
|
* @LastEditTime: 2022-03-11 09:06:18
|
||||||
* @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
|
||||||
-->
|
-->
|
||||||
@ -41,7 +41,7 @@
|
|||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
<div class="dashboard-layout-footer">
|
<div class="dashboard-layout-footer">
|
||||||
{{ '第' + (index + 1) + '排(' + ((current - 1) * 4 + item) + ')' }}
|
{{ '第' + rowIndex[index] + '排(' + ((current - 1) * 4 + item) + ')' }}
|
||||||
</div>
|
</div>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
@ -68,7 +68,7 @@
|
|||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
<div class="dashboard-layout-footer">
|
<div class="dashboard-layout-footer">
|
||||||
{{ '第' + (index + 1) + '排(' + ((current - 1) * 4 + item) + ')' }}
|
{{ '第' + rowIndex[index] + '排(' + ((current - 1) * 4 + item) + ')' }}
|
||||||
</div>
|
</div>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
* @Author: gtz
|
* @Author: gtz
|
||||||
* @Date: 2022-03-03 15:47:47
|
* @Date: 2022-03-03 15:47:47
|
||||||
* @LastEditors: gtz
|
* @LastEditors: gtz
|
||||||
* @LastEditTime: 2022-03-07 20:41:47
|
* @LastEditTime: 2022-03-11 09:05:55
|
||||||
* @Description: file content
|
* @Description: file content
|
||||||
* @FilePath: \mt-ck-wms-ui\src\views\dashboard\testdata.js
|
* @FilePath: \mt-ck-wms-ui\src\views\dashboard\testdata.js
|
||||||
*/
|
*/
|
||||||
@ -2949,5 +2949,6 @@ export default {
|
|||||||
4: '#FFA08F'
|
4: '#FFA08F'
|
||||||
},
|
},
|
||||||
current: 1,
|
current: 1,
|
||||||
totalPage: 1
|
totalPage: 1,
|
||||||
|
rowIndex: ['一', '二']
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user