From fca294e1f3ed4175e0e2494e1f6b47c8ac462295 Mon Sep 17 00:00:00 2001
From: liulujia1 <759670076@qq.com>
Date: Thu, 16 Apr 2020 09:52:42 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=96=87=E6=A1=A3V9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Assembly/QualityInspectionInformationInquiry/index.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
index 5174f898..4abb320a 100644
--- a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
+++ b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
@@ -166,7 +166,7 @@
-
+
-
+
Date: Thu, 16 Apr 2020 15:16:57 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E6=96=87=E6=A1=A3V9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../QualityInspectionInformationInquiry/index.vue | 6 +++---
src/views/Inventory/PickingListApproval/index.vue | 2 +-
src/views/Outsourcing/OutsourcingPartsQuery/index.vue | 10 ++++++++--
3 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
index 4abb320a..37ac7820 100644
--- a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
+++ b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
@@ -59,7 +59,7 @@
:label="item.label"
:value="item.value"/>
- 查询
+ 查询
导出
@@ -153,7 +153,7 @@
-
+
{{ scope.row.不合格数量 =0 }}
@@ -754,7 +754,7 @@ export default {
AddTableData_disable: false,
loading: false,
total: 0, // 总条数
- pageSize: 20, // 每页显示条数
+ pageSize: 10, // 每页显示条数
pageCurrent: 1, // 后台获取页
dialogmethod: false // false新增 true 编辑
// total1: 0, // 总条数
diff --git a/src/views/Inventory/PickingListApproval/index.vue b/src/views/Inventory/PickingListApproval/index.vue
index 2e129bf3..15349e42 100644
--- a/src/views/Inventory/PickingListApproval/index.vue
+++ b/src/views/Inventory/PickingListApproval/index.vue
@@ -172,7 +172,7 @@ export default {
type: 'warning'
}).then(() => {
if (this.pickListTable2.length === 0) {
- this.$message.error('空领料单,不能审批!')
+ this.$message.error('不能审批空领料单')
return
}
const param = {
diff --git a/src/views/Outsourcing/OutsourcingPartsQuery/index.vue b/src/views/Outsourcing/OutsourcingPartsQuery/index.vue
index ebde7af2..feb72b46 100644
--- a/src/views/Outsourcing/OutsourcingPartsQuery/index.vue
+++ b/src/views/Outsourcing/OutsourcingPartsQuery/index.vue
@@ -11,7 +11,7 @@
:label="item.label"
:value="item.value"/>
- 查询
+ 查询
导出
@@ -121,12 +121,18 @@ export default {
}, {
value: 1,
label: '已到'
+ }, {
+ value: 2,
+ label: '未提交'
+ }, {
+ value: 3,
+ label: '未外协'
}],
tableData: [],
procedure: [],
procedureTime: [],
pageCurrent: 1,
- pageSize: 500,
+ pageSize: 50,
tableData1: []
}
},