diff --git a/src/views/bigScreen/component/detailTransfer.vue b/src/views/bigScreen/component/detailTransfer.vue
index 36b3bd3..4818646 100644
--- a/src/views/bigScreen/component/detailTransfer.vue
+++ b/src/views/bigScreen/component/detailTransfer.vue
@@ -26,6 +26,7 @@
{{ data.content }}
+ 执行状态:{{ typeMap.get(data.status) }}
|
@@ -47,7 +48,15 @@ export default {
data() {
return {
isShow: false,
- data: {}
+ data: {},
+ typeMap: new Map([
+ [1,'待下发'],
+ [2,'已下发'],
+ [3,'待执行'],
+ [4,'执行中'],
+ [5,'已取消'],
+ [6,'已完成']
+ ])
}
},
methods: {
diff --git a/src/views/order/component/createDispatch.vue b/src/views/order/component/createDispatch.vue
index 395feb0..a6d3391 100644
--- a/src/views/order/component/createDispatch.vue
+++ b/src/views/order/component/createDispatch.vue
@@ -43,15 +43,19 @@
{{ abilities.find(i => i.value === ability) ? abilities.find(i => i.value === ability).key : '' }}
调令
-
+ 天
+ 周
+
+ (date = e)"
- >
+ >
@@ -79,38 +83,29 @@ export default {
inject: ["equipments"],
props: {},
data() {
- const _this = this;
return {
- options: {
- shortcuts: [
- {
- text: "今天",
- onClick() {
- _this.date = _this.$moment().format("YYYY-MM-DD");
- },
- },
- {
- text: "明天",
- onClick() {
- _this.date = _this.$moment().add(1, "days").format("YYYY-MM-DD");
- },
- },
- {
- text: "一周后",
- onClick() {
- _this.date = _this.$moment().add(1, "weeks").format("YYYY-MM-DD");
- },
- },
- {
- text: "一个月后",
- onClick() {
- _this.date = _this
- .$moment()
- .add(1, "months")
- .format("YYYY-MM-DD");
- },
- },
- ],
+ createType: 1,
+ pickerOptions: {
+ shortcuts: [{
+ text: '今天',
+ onClick(picker) {
+ picker.$emit('pick', new Date());
+ }
+ }, {
+ text: '明天',
+ onClick(picker) {
+ const date = new Date();
+ date.setTime(date.getTime() + 3600 * 1000 * 24);
+ picker.$emit('pick', date);
+ }
+ }, {
+ text: '下周',
+ onClick(picker) {
+ const date = new Date();
+ date.setTime(date.getTime() + 3600 * 1000 * 24 * 7);
+ picker.$emit('pick', date);
+ }
+ }]
},
areas: [],
types: [],
@@ -337,6 +332,9 @@ export default {
};
},
methods: {
+ datePick (e) {
+ console.log(e)
+ },
clear () {
this.select = {