diff --git a/src/lang/i18n/en/module/basicData.js b/src/lang/i18n/en/module/basicData.js
index 5678de2..6553123 100644
--- a/src/lang/i18n/en/module/basicData.js
+++ b/src/lang/i18n/en/module/basicData.js
@@ -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'
}
}
diff --git a/src/lang/i18n/zh/module/basicData.js b/src/lang/i18n/zh/module/basicData.js
index 66b5b8e..3f85060 100644
--- a/src/lang/i18n/zh/module/basicData.js
+++ b/src/lang/i18n/zh/module/basicData.js
@@ -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: '任务类型'
}
}
diff --git a/src/views/basicData/Warehouse/CurrentTask.vue b/src/views/basicData/Warehouse/CurrentTask.vue
index 8a93c20..aed2e5c 100644
--- a/src/views/basicData/Warehouse/CurrentTask.vue
+++ b/src/views/basicData/Warehouse/CurrentTask.vue
@@ -1,8 +1,8 @@
@@ -47,6 +47,7 @@
{{ 'btn.search' | i18nFilter }}
{{ $t('module.basicData.Warehouse.PerformTaskManual') | i18nFilter }}
+ {{ $t('module.basicData.Warehouse.publishTask') | i18nFilter }}
+
@@ -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()
+ })
}
}
}
diff --git a/src/views/basicData/Warehouse/components/PublishTask.vue b/src/views/basicData/Warehouse/components/PublishTask.vue
new file mode 100644
index 0000000..c0eb783
--- /dev/null
+++ b/src/views/basicData/Warehouse/components/PublishTask.vue
@@ -0,0 +1,75 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 466b15b..9a9db38 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -2,7 +2,7 @@
* @Author: gtz
* @Date: 2022-03-03 09:16:10
* @LastEditors: gtz
- * @LastEditTime: 2022-03-08 14:34:24
+ * @LastEditTime: 2022-03-11 09:06:18
* @Description: file content
* @FilePath: \mt-ck-wms-ui\src\views\dashboard\index.vue
-->
@@ -41,7 +41,7 @@
@@ -68,7 +68,7 @@
diff --git a/src/views/dashboard/testdata.js b/src/views/dashboard/testdata.js
index 20de52c..39a2725 100644
--- a/src/views/dashboard/testdata.js
+++ b/src/views/dashboard/testdata.js
@@ -2,7 +2,7 @@
* @Author: gtz
* @Date: 2022-03-03 15:47:47
* @LastEditors: gtz
- * @LastEditTime: 2022-03-07 20:41:47
+ * @LastEditTime: 2022-03-11 09:05:55
* @Description: file content
* @FilePath: \mt-ck-wms-ui\src\views\dashboard\testdata.js
*/
@@ -2949,5 +2949,6 @@ export default {
4: '#FFA08F'
},
current: 1,
- totalPage: 1
+ totalPage: 1,
+ rowIndex: ['一', '二']
}