diff --git a/pages/modules/taskmanage.vue b/pages/modules/taskmanage.vue
index d989be0..9f262ec 100644
--- a/pages/modules/taskmanage.vue
+++ b/pages/modules/taskmanage.vue
@@ -21,7 +21,7 @@
{{e.task_no}} |
{{e.start_devicecode}} |
{{e.next_devicecode}} |
- {{e.inst_status}} |
+ {{e.inst_status_name}} |
{{e.priority}} |
{{e.create_time}} |
{{e.carrier}} |
@@ -64,6 +64,17 @@
async _tasks () {
let res = await tasks(this.keyword, this.startPoint, this.endPoint)
if (res.code === '1') {
+ res.result.map(el => {
+ if(el.inst_status === '0') {
+ this.$set(el, 'inst_status_name', '就绪')
+ }
+ if(el.inst_status === '1') {
+ this.$set(el, 'inst_status_name', '执行中')
+ }
+ if(el.inst_status === '2') {
+ this.$set(el, 'inst_status_name', '完成')
+ }
+ })
this.dataList = [...res.result]
} else {
uni.showToast({
diff --git a/pages/modules/zlmanage.vue b/pages/modules/zlmanage.vue
index 616e353..61efd7e 100644
--- a/pages/modules/zlmanage.vue
+++ b/pages/modules/zlmanage.vue
@@ -25,8 +25,8 @@
{{e.inst_no}} |
{{e.start_devicecode}} |
{{e.next_devicecode}} |
- {{e.inst_status}} |
- {{e.inst_step}} |
+ {{e.inst_status_name}} |
+ {{e.inst_step_name}} |
{{e.carrier}} |
{{e.priority}} |
{{e.create_time}} |
@@ -71,6 +71,35 @@
async _insts () {
let res = await insts(this.keyword, this.startPoint, this.endPoint)
if (res.code === '1') {
+ res.result.map(el => {
+ if(el.inst_status === '0') {
+ this.$set(el, 'inst_status_name', '就绪')
+ }
+ if(el.inst_status === '1') {
+ this.$set(el, 'inst_status_name', '执行中')
+ }
+ if(el.inst_status === '2') {
+ this.$set(el, 'inst_status_name', '完成')
+ }
+ if(el.inst_status === '3') {
+ this.$set(el, 'inst_status_name', '取消')
+ }
+ if(el.inst_status === '4') {
+ this.$set(el, 'inst_status_name', '异常')
+ }
+ if(el.inst_step === '1') {
+ this.$set(el, 'inst_step_name', '请求取货')
+ }
+ if(el.inst_step === '2') {
+ this.$set(el, 'inst_step_name', '取货完成')
+ }
+ if(el.inst_step === '3') {
+ this.$set(el, 'inst_step_name', '请求放货')
+ }
+ if(el.inst_step === '4') {
+ this.$set(el, 'inst_step_name', '放货完成')
+ }
+ })
this.dataList = [...res.result]
} else {
uni.showToast({