diff --git a/pages.json b/pages.json
index eabc633..500800a 100644
--- a/pages.json
+++ b/pages.json
@@ -33,8 +33,10 @@
{
"path": "pages/management/ZlOperate",
"style": {
- "navigationStyle": "custom"
- }
+ "navigationStyle": "custom",
+ "enablePullDownRefresh": true,
+ "onReachBottomDistance": 50
+ }
},
{
"path": "pages/management/HcxErrorHandle",
diff --git a/pages/management/HcxOutError.vue b/pages/management/HcxOutError.vue
index 3fb7ca0..f6f1c0b 100644
--- a/pages/management/HcxOutError.vue
+++ b/pages/management/HcxOutError.vue
@@ -53,7 +53,7 @@
|
- {{e.instructorder_no}} |
+ {{e.instructoperate_num}} |
{{e.wcsdevice_code}} |
{{e.vehicle_code}} |
{{e.startpoint_code}} |
diff --git a/pages/management/ZlOperate.vue b/pages/management/ZlOperate.vue
index a67505e..b0b1b77 100644
--- a/pages/management/ZlOperate.vue
+++ b/pages/management/ZlOperate.vue
@@ -88,7 +88,7 @@
{{e.mes_no}} |
{{e.startpoint_code}} |
{{e.nextpoint_code}} |
- {{e.invehicle_code}} |
+ {{e.vehicle_code}} |
{{e.outvehicle_code}} |
{{e.status_name}} |
{{e.processmaterial_code}} |
@@ -151,7 +151,7 @@
},
totalCount: 0,
pageNum: 1,
- pageSize: 10
+ pageSize: 5
};
},
created() {
@@ -192,8 +192,8 @@
/** 初始化查询 */
async _instPageQuery () {
let form = {
- nPageStart: this.pageNum + '',
- nPageRecordNum: this.pageSize + '',
+ page: this.pageNum + '',
+ size: this.pageSize + '',
status: this.index1,
inst_num: this.instNum,
agv_num: this.agvNum,
@@ -204,8 +204,8 @@
end_date: this.endDate || ''
}
let res = await instPageQuery(form)
- this.totalCount = res.totalElements
- if (res.totalElements > 0) {
+ this.totalCount = res.size
+ if (res.size > 0) {
const dataMap = res.content
this.dataList = this.reload ? dataMap : this.dataList.concat(dataMap)
this.reload = false
@@ -229,7 +229,7 @@
this.status = 'noMore'
}
},
- toSure (type) {
+ async toSure (type) {
this.disabled = true
if (!this.pkId) {
uni.showToast({
@@ -239,11 +239,17 @@
this.disabled = false
return
}
- this._instOperation(type)
- },
- async _instOperation (type) {
+ try {
let res = await instOperation(type)
- this.dataList = [...res]
+ this.disabled = false
+ this.toSearch()
+ uni.showToast({
+ title: res.message,
+ icon: 'none'
+ })
+ } catch (e) {
+ this.disabled = false
+ }
},
toRadio (e) {
this.pkId = this.pkId === e.instruct_uuid ? '' : e.instruct_uuid
@@ -255,5 +261,7 @@
\ No newline at end of file