diff --git a/src/api/quality/income.js b/src/api/quality/income.js
index ce130e45..e23fa500 100644
--- a/src/api/quality/income.js
+++ b/src/api/quality/income.js
@@ -171,3 +171,11 @@ export function getProductWorkOrder(query) {
params: query
});
}
+// 查询巡检任务列表
+export function getCkeckProjectXJList(query) {
+ return request({
+ url: '/quality/qcIncome/getCkeckProjectXJList',
+ method: 'get',
+ params: query
+ });
+ }
\ No newline at end of file
diff --git a/src/api/quality/produceReport.js b/src/api/quality/produceReport.js
index e7467dee..9b81f2b0 100644
--- a/src/api/quality/produceReport.js
+++ b/src/api/quality/produceReport.js
@@ -53,3 +53,29 @@ export function getProduceReportXJ(orderNo) {
data: data
});
}
+
+// 生产过程报告任务详情
+export function getTaskInfo(data) {
+ return request({
+ url: '/quality/qcProduceReport/getTaskInfo',
+ method: 'post',
+ data: data
+ });
+}
+
+//提交确认
+export function submitConfirm(recordId,orderNo,checkType,confirmRemark,confirm) {
+ const data = {
+ recordId,
+ orderNo,
+ checkType,
+ confirmRemark,
+ confirm
+ }
+ return request({
+ url: '/quality/qcProduceReport/submitConfirm',
+ method: 'post',
+ data: data
+ });
+}
+
diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue
index b6463af9..af13f802 100644
--- a/src/views/mes/reportWork/index.vue
+++ b/src/views/mes/reportWork/index.vue
@@ -188,7 +188,7 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ YES
+ NO
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 确 定
+ 取 消
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ YES
+ NO
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 确 定
+ 取 消
+
+
+
+
+
+
+
+
+
+
+
+ {{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
+
+
+
+
+
+
+
+
+
+
+
+ {{item}}
+
+
+
+
+
+
+
+
+ {{item}}
+
+
+
+
+
+
+
+
+ {{item}}
+
+
+
+
+
+
+
+ {{item}}
+
+
+
-
-
-
-
+
+
+
+
+ {{item}}
+
+
+
+
+
+
+
+ {{item}}
+
+
+
+
+
+
+
+ {{item}}
+
+
+
+
+
+
+
+ {{item}}
+
+
+
-
-
-
-
+
+
+
+
+ {{item}}
+
+
+
+
+
+
+
+ {{item}}
+
+
+
+
+
+
+
+ {{item}}
+
+
+
+
+
+
+
+ {{item}}
+
+
+
@@ -260,8 +431,15 @@
+
+
+
+
+
+
+
-
+
@@ -332,6 +510,10 @@
确 定
+
+
+
+
@@ -339,16 +521,20 @@
import { listProduce, getProduce, delProduce, addProduce, updateIncome,getProduceReportXJ} from "@/api/quality/produceReport";
import { getCkeckProjectList} from "@/api/quality/incomeReport";
import { getCheckTypes } from "@/api/quality/qcProduce";
+import ItemCheckProjects from "./ItemCheckProjects.vue";
+import ItemCheckProjectsXJ from "./ItemCheckProjectsXJ.vue";
import moment from 'moment';
export default {
name: "Income",
- dicts: ["unit","check_status","check_result","qc_rule_prop"],
+ components: {ItemCheckProjects,ItemCheckProjectsXJ},
+ dicts: ["unit","check_status","check_result","qc_rule_prop","device_yes_no"],
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
+ selectRow:{},
// 非单个禁用
single: true,
// 非多个禁用
@@ -437,7 +623,14 @@ export default {
this.getCheckTypes();
},
methods: {
-
+ //巡检检验结果格式化
+ checkStatusFormate(row, column, cellValue){
+ if(cellValue == 'Y'){
+ return '✓'
+ }else if(cellValue == 'N'){
+ return '✘'
+ }
+ },
//检验结果格式化
checkStatusFormate(row, column, cellValue){
if(cellValue == 'Y'){
@@ -477,9 +670,12 @@ export default {
getList() {
this.loading = true;
- if(this.queryParams.checkTimeArray.length>0){
+ if(this.queryParams.checkTimeArray!=null && this.queryParams.checkTimeArray.length>0){
this.queryParams.checkTimeStart = moment(this.queryParams.checkTimeArray[0]).format('YYYY-MM-DD HH:mm:ss');
this.queryParams.checkTimeEnd = moment(this.queryParams.checkTimeArray[1]).format('YYYY-MM-DD HH:mm:ss');
+ }else{
+ this.queryParams.checkTimeStart = null;
+ this.queryParams.checkTimeEnd = null;
}
listProduce(this.queryParams).then(response => {
@@ -540,6 +736,7 @@ export default {
},
// 多选框选中数据
handleSelectionChange(selection) {
+ this.selectRow = selection
this.ids = selection.map(item => item.recordId)
this.single = selection.length!==1
this.multiple = !selection.length
@@ -647,6 +844,17 @@ export default {
this.firstReportOpen = false;
this.reset();
},
+ /** 检验报告确认操作 */
+ handleConfirm(row) {
+ if(this.selectRow[0].checkType == 'checkTypeSC'){
+ this.$refs.itemCheckProjects.showFlag = true;
+ this.$refs.itemCheckProjects.init(this.selectRow[0]);
+ }else if(this.selectRow[0].checkType == 'checkTypeSCXJ'){
+ this.$refs.itemCheckProjectsXJ.showFlag = true;
+ this.$refs.itemCheckProjectsXJ.init(this.selectRow[0]);
+ }
+
+ },
}
};
diff --git a/src/views/quality/qcIncome/checkProjectType.vue b/src/views/quality/qcIncome/checkProjectType.vue
index 381bcc02..5f552391 100644
--- a/src/views/quality/qcIncome/checkProjectType.vue
+++ b/src/views/quality/qcIncome/checkProjectType.vue
@@ -4,7 +4,7 @@
v-if="showFlag"
:visible.sync="showFlag"
:modal= false
- width="1000px"
+ width="1400px"
>
diff --git a/src/views/quality/qcProduce/index.vue b/src/views/quality/qcProduce/index.vue
index 1ed30d5a..70ae2c32 100644
--- a/src/views/quality/qcProduce/index.vue
+++ b/src/views/quality/qcProduce/index.vue
@@ -60,7 +60,20 @@
/>
-
+
+
+
+
+
-
-
-
-
-
搜索
重置
@@ -172,12 +171,12 @@
-
- {{
- scope.row.checkNo
- }}
-
-
+
+ {{
+ scope.row.checkNo
+ }}
+
+
-
+
{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -429,11 +451,12 @@ import moment from 'moment';
import ItemSelectWorkOrder from "./selectWorkOrder.vue";
import ItemSelectWorkCenter from "./selectWorkCenter";
import ItemSelectUser from "../qcIncome/selectUser.vue";
+import ItemSelectConfirmUser from "./selectUser.vue";
import ItemSelectProject from "../qcIncome/checkProjectType.vue";
import { getDefectTypeListByDefectType } from "@/api/quality/defectType.js";
export default {
name: "QcProduce",
- components: { ItemSelectWorkCenter,ItemSelectUser,ItemSelectProject,ItemSelectWorkOrder},
+ components: { ItemSelectWorkCenter,ItemSelectUser,ItemSelectProject,ItemSelectWorkOrder,ItemSelectConfirmUser},
dicts: ["unit","check_status","check_result"],
data() {
return {
@@ -577,6 +600,9 @@ export default {
if(this.queryParams.checkTimeArray != null &&this.queryParams.checkTimeArray.length>0){
this.queryParams.checkTimeStart = moment(this.queryParams.checkTimeArray[0]).format('YYYY-MM-DD HH:mm:ss');
this.queryParams.checkTimeEnd = moment(this.queryParams.checkTimeArray[1]).format('YYYY-MM-DD HH:mm:ss');
+ }else{
+ this.queryParams.checkTimeStart = null;
+ this.queryParams.checkTimeEnd = null;
}
listQcProduce(this.queryParams).then(response => {
@@ -608,6 +634,8 @@ export default {
checkStatus: null,
checkManCode: null,
checkManName: null,
+ confirmManCode: null,
+ confirmManName: null,
checkTime: null,
checkResult: null,
status: null,
@@ -749,6 +777,15 @@ export default {
this.form.checkManCode = obj.code;
this.form.checkManName = obj.name;
},
+ /**确认人员选择弹出框**/
+ handleSelectConfirmUser() {
+ this.$refs.itemSelectConfirmUser.showFlag = true;
+ },
+ //人员选择确认
+ onSelectConfirmUser(obj) {
+ this.form.confirmManCode = obj.code;
+ this.form.confirmManName = obj.name;
+ },
//检验项目弹窗
handleCheckProject(row){
if(row.checkStatus != '0'){
diff --git a/src/views/quality/qcProduce/selectUser.vue b/src/views/quality/qcProduce/selectUser.vue
new file mode 100644
index 00000000..a7e9c5ef
--- /dev/null
+++ b/src/views/quality/qcProduce/selectUser.vue
@@ -0,0 +1,150 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+