From f9e420517e261d7a59be912c866987154ea3b8f6 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 13 十二月 2023 16:08:21 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/equipment/metering/index.vue | 2 +-
src/views/common/ztt-table.vue | 2 +-
src/views/plan/manufacturingorder/routing.vue | 18 +++++++++---------
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/views/common/ztt-table.vue b/src/views/common/ztt-table.vue
index 590dad8..64d8045 100644
--- a/src/views/common/ztt-table.vue
+++ b/src/views/common/ztt-table.vue
@@ -1578,7 +1578,7 @@
if (response.code != '0') {
this.$message.warning(response.msg)
} else {
- if(response.data!=""&&response.data!=[]){
+ if(response.data!=""&&response.data!=[]&&response.data!=null){
this.$message({
message: response.data,
type: 'success'
diff --git a/src/views/equipment/metering/index.vue b/src/views/equipment/metering/index.vue
index 022b8cd..3f858da 100644
--- a/src/views/equipment/metering/index.vue
+++ b/src/views/equipment/metering/index.vue
@@ -85,7 +85,7 @@
isRefresh: true, // 鏄惁鏄剧ず鍒锋柊鎸夐挳
isShowHide: true, // 鏄惁鏄剧ず鏄惧奖鎸夐挳
isSearch: false, // 楂樼骇鏌ヨ鎸夐挳
- defaultOrderBy: { column: 'manufactureDate', direction: 'desc' }
+ defaultOrderBy: { column: 'id', direction: 'desc' }
},
table: {
total: 0,
diff --git a/src/views/plan/manufacturingorder/routing.vue b/src/views/plan/manufacturingorder/routing.vue
index ded6d3f..4726c8e 100644
--- a/src/views/plan/manufacturingorder/routing.vue
+++ b/src/views/plan/manufacturingorder/routing.vue
@@ -96,15 +96,15 @@
isSearch: true,
searchInfoType: 'text'
},
- {
- minWidth: '100',
- prop: 'name',
- label: '宸ヨ壓鍚嶇О',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text'
- },
+ // {
+ // minWidth: '100',
+ // prop: 'name',
+ // label: '宸ヨ壓鍚嶇О',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'text'
+ // },
// 宸ヨ壓绫诲瀷
{
minWidth: '120',
--
Gitblit v1.9.3