diff --git a/src/views/base/orderInfo/index.vue b/src/views/base/orderInfo/index.vue
index 702b00c..ae59612 100644
--- a/src/views/base/orderInfo/index.vue
+++ b/src/views/base/orderInfo/index.vue
@@ -27,6 +27,14 @@
@keyup.enter.native="handleQuery"
/>
+
+
+
+
+
+
@@ -84,7 +103,7 @@
:disabled="single"
@click="handleUpdate"
v-hasPermi="['base:orderInfo:edit']"
- >修改
+ >修改订单
@@ -117,7 +136,7 @@
icon="el-icon-plus"
size="mini"
@click="sapForm"
- >同步SAP周计划
+ >同步SAP计划
@@ -201,7 +220,7 @@
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['base:orderInfo:edit']"
- >修改工单
+ >修改订单
@@ -336,6 +355,8 @@ export default {
title: '',
// 是否显示弹出层
open: false,
+ // 更新时间时间范围
+ daterangeEndTime: [],
// 查询参数
queryParams: {
pageNum: 1,
@@ -400,6 +421,11 @@ export default {
/** 查询工单信息列表 */
getList() {
this.loading = true
+ this.queryParams.params = {}
+ if (null != this.daterangeEndTime && '' != this.daterangeEndTime) {
+ this.queryParams.params['beginEndTime'] = this.daterangeEndTime[0]
+ this.queryParams.params['endEndTime'] = this.daterangeEndTime[1]
+ }
listOrderInfo(this.queryParams).then(response => {
this.orderInfoList = response.rows
this.total = response.total
diff --git a/src/views/base/qualityProcess/index.vue b/src/views/base/qualityProcess/index.vue
index 7e52e05..d7cf415 100644
--- a/src/views/base/qualityProcess/index.vue
+++ b/src/views/base/qualityProcess/index.vue
@@ -208,7 +208,7 @@
import { listProcessStation, getProcessStation, delProcessStation, addProcessStation, updateProcessStation } from "@/api/base/processStation";
import { findProductLineList } from "@/api/base/productLine";
export default {
- name: "ProcessStation",
+ name: "QualityProcess",
dicts: ['is_flag','process_type'],
data() {
return {
diff --git a/src/views/production/calendarInfo/index.vue b/src/views/production/calendarInfo/index.vue
index 64de808..0919dcb 100644
--- a/src/views/production/calendarInfo/index.vue
+++ b/src/views/production/calendarInfo/index.vue
@@ -71,7 +71,7 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
- >同步SAP计划
+ >同步SAP周计划
diff --git a/src/views/report/productTraceabilityReport/index.vue b/src/views/report/productTraceabilityReport/index.vue
index df110c0..ff3b0ea 100644
--- a/src/views/report/productTraceabilityReport/index.vue
+++ b/src/views/report/productTraceabilityReport/index.vue
@@ -69,16 +69,16 @@
-
- 导出
-
-
+
+ 导出
+
+
@@ -103,6 +103,13 @@
@click="handleOrderDetails(scope.row)"
>检验详情
+ 质检材料
+
@@ -134,12 +141,12 @@
-
+
-
+
@@ -163,7 +170,6 @@
-