diff --git a/src/api/quality/produceReport.js b/src/api/quality/produceReport.js
index 58b8bd6..d8b4e8f 100644
--- a/src/api/quality/produceReport.js
+++ b/src/api/quality/produceReport.js
@@ -1,6 +1,6 @@
import request from '@/utils/request'
-// 查询来料报告列表
+// 查询生产过程报告列表
export function listProduce(query) {
return request({
url: '/quality/qcProduceReport/list',
@@ -9,7 +9,7 @@ export function listProduce(query) {
});
}
-// 查询来料报告详细
+// 查询生产过程报告详细
export function getProduce(recordId) {
return request({
url: '/quality/qcProduceReport/' + recordId,
@@ -17,7 +17,7 @@ export function getProduce(recordId) {
});
}
-// 新增来料报告
+// 新增生产过程报告
export function addProduce(data) {
return request({
url: '/quality/qcProduceReport',
@@ -26,7 +26,7 @@ export function addProduce(data) {
});
}
-// 修改来料报告
+// 修改生产过程报告
export function updateProduce(data) {
return request({
url: '/quality/qcProduceReport',
@@ -35,7 +35,7 @@ export function updateProduce(data) {
});
}
-// 删除来料报告
+// 删除生产过程报告
export function delProduce(recordId) {
return request({
url: '/quality/qcProduceReport/' + recordId,
diff --git a/src/views/quality/incomeReport/index.vue b/src/views/quality/incomeReport/index.vue
index 6c82201..e596450 100644
--- a/src/views/quality/incomeReport/index.vue
+++ b/src/views/quality/incomeReport/index.vue
@@ -93,7 +93,11 @@
{{ parseTime(scope.row.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
-
+
+
+
+
+
-
+
+
+
+
+
@@ -329,7 +337,7 @@ export default {
};
},
created() {
- //this.getDate();
+ this.getDate();
this.getList();
this.getCheckTypes();
},
@@ -341,12 +349,12 @@ export default {
});
},
/**获取默认查询时间段**/
- //getDate() {
- //let start = this.Fungetdate (0)
- //let end = this.Fungetdate (1)
+ getDate() {
+ let start = this.Fungetdate (0)
+ let end = this.Fungetdate (1)
//this.queryParams.incomeTimeArray.push(start,end)
- //this.queryParams.checkTimeArray.push(start,end)
- //},
+ this.queryParams.checkTimeArray.push(start,end)
+ },
Fungetdate (num) {
var dd = new Date();
dd.setDate(dd.getDate() + num);
@@ -500,7 +508,7 @@ export default {
type: params.type || 'html',
maxWidth: 1500, // 最大宽度
font_size: "",// 设置字体大小
- header: params.header, // '表单',
+ header: "来料检验结果报告",//params.header, // '表单',
targetStyles: ['*'],
style: '@page {margin:0 10mm};', // 可选-打印时去掉眉页眉尾
ignoreElements: params.ignore || [], // ['no-print']
diff --git a/src/views/quality/produceReport/index.vue b/src/views/quality/produceReport/index.vue
index 8e4abcb..581c702 100644
--- a/src/views/quality/produceReport/index.vue
+++ b/src/views/quality/produceReport/index.vue
@@ -93,7 +93,11 @@
{{ parseTime(scope.row.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
-
+
+
+
+
+
-
+
+
+
+
+
@@ -293,6 +301,7 @@ export default {
// 查询参数
queryParams: {
checkTimeArray: [],
+ incomeTimeArray: [],
pageNum: 1,
pageSize: 10,
checkNo: null,
@@ -330,7 +339,7 @@ export default {
};
},
created() {
- //this.getDate();
+ this.getDate();
this.getList();
this.getCheckTypes();
},
@@ -342,12 +351,12 @@ export default {
});
},
/**获取默认查询时间段**/
- //getDate() {
- //let start = this.Fungetdate (0)
- //let end = this.Fungetdate (1)
- //this.queryParams.incomeTimeArray.push(start,end)
- //this.queryParams.checkTimeArray.push(start,end)
- //},
+ getDate() {
+ let start = this.Fungetdate (0)
+ let end = this.Fungetdate (1)
+ this.queryParams.incomeTimeArray.push(start,end)
+ this.queryParams.checkTimeArray.push(start,end)
+ },
Fungetdate (num) {
var dd = new Date();
dd.setDate(dd.getDate() + num);
@@ -501,7 +510,7 @@ export default {
type: params.type || 'html',
maxWidth: 1500, // 最大宽度
font_size: "",// 设置字体大小
- header: params.header, // '表单',
+ header: "生产过程检验结果报告",//params.header, // '表单',
targetStyles: ['*'],
style: '@page {margin:0 10mm};', // 可选-打印时去掉眉页眉尾
ignoreElements: params.ignore || [], // ['no-print']
diff --git a/src/views/quality/productReport/index.vue b/src/views/quality/productReport/index.vue
index cee65aa..91b80c9 100644
--- a/src/views/quality/productReport/index.vue
+++ b/src/views/quality/productReport/index.vue
@@ -93,7 +93,11 @@
{{ parseTime(scope.row.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
-
+
+
+
+
+
-
+
+
+
+
+
@@ -330,7 +338,7 @@ export default {
};
},
created() {
- //this.getDate();
+ this.getDate();
this.getList();
this.getCheckTypes();
},
@@ -342,12 +350,12 @@ export default {
});
},
/**获取默认查询时间段**/
- //getDate() {
- //let start = this.Fungetdate (0)
- //let end = this.Fungetdate (1)
- //this.queryParams.incomeTimeArray.push(start,end)
- //this.queryParams.checkTimeArray.push(start,end)
- //},
+ getDate() {
+ let start = this.Fungetdate (0)
+ let end = this.Fungetdate (1)
+ this.queryParams.incomeTimeArray.push(start,end)
+ this.queryParams.checkTimeArray.push(start,end)
+ },
Fungetdate (num) {
var dd = new Date();
dd.setDate(dd.getDate() + num);
@@ -444,7 +452,7 @@ export default {
this.form.printable = 'printFrom'; //打印时需要
this.form.ignore = ['no-print'];//打印时需要
this.open = true;
- this.title = "查看来料报告";
+ this.title = "查看成品入库报告";
});
this.getCheckedProjectList();
},
@@ -501,7 +509,7 @@ export default {
type: params.type || 'html',
maxWidth: 1500, // 最大宽度
font_size: "",// 设置字体大小
- header: params.header, // '表单',
+ header: "成品入库检验结果报告",//params.header, // '表单',
targetStyles: ['*'],
style: '@page {margin:0 10mm};', // 可选-打印时去掉眉页眉尾
ignoreElements: params.ignore || [], // ['no-print']
diff --git a/src/views/quality/qcProduce/index.vue b/src/views/quality/qcProduce/index.vue
index a9f8521..ba739cc 100644
--- a/src/views/quality/qcProduce/index.vue
+++ b/src/views/quality/qcProduce/index.vue
@@ -9,9 +9,9 @@
@keyup.enter.native="handleQuery"
/>
-
+
-
+
@@ -240,8 +240,8 @@
-
-
+
+
@@ -406,7 +406,7 @@ export default {
pageNum: 1,
pageSize: 10,
checkNo: null,
- batchNo: null,
+ incomeBatchNo: null,
orderNo: null,
materialCode: null,
materialName: null,
@@ -435,7 +435,7 @@ export default {
// 表单校验
rules: {
- batchNo: [
+ incomeBatchNo: [
{ required: true, message: "批次号不能为空", trigger: "blur" }
],
orderNo: [
@@ -526,7 +526,7 @@ export default {
this.form = {
recordId: null,
checkNo: null,
- batchNo: null,
+ incomeBatchNo: null,
orderNo: null,
materialCode: null,
materialName: null,
diff --git a/src/views/quality/qcProduce/selectWorkCenter.vue b/src/views/quality/qcProduce/selectWorkCenter.vue
index 01e23e0..55cabc0 100644
--- a/src/views/quality/qcProduce/selectWorkCenter.vue
+++ b/src/views/quality/qcProduce/selectWorkCenter.vue
@@ -11,7 +11,7 @@
-
-
+
+
-
+
-
+
@@ -236,8 +236,8 @@
-
-
+
+
@@ -403,7 +403,7 @@ export default {
pageNum: 1,
pageSize: 10,
checkNo: null,
- batchNo: null,
+ incomeBatchNo: null,
orderNo: null,
materialCode: null,
materialName: null,
@@ -429,7 +429,7 @@ export default {
form: {},
// 表单校验
rules: {
- batchNo: [
+ incomeBatchNo: [
{ required: true, message: "批次号不能为空", trigger: "blur" }
],
orderNo: [
@@ -519,7 +519,7 @@ export default {
this.form = {
recordId: null,
checkNo: null,
- batchNo: null,
+ incomeBatchNo: null,
orderNo: null,
materialCode: null,
materialName: null,