diff --git a/src/views/modules/Abnormal/AbnormalFeedBack.vue b/src/views/modules/Abnormal/AbnormalFeedBack.vue
index a3722bf..bc36470 100644
--- a/src/views/modules/Abnormal/AbnormalFeedBack.vue
+++ b/src/views/modules/Abnormal/AbnormalFeedBack.vue
@@ -153,6 +153,20 @@
width="100"
label="异常原因">
+
+
+
+
查看
@@ -202,12 +216,30 @@
+
+
+
+
+
+
+
+
-
+
+
+
+ 将文件拖到此处，或点击上传
+
+
+
保存
取消
@@ -227,6 +259,11 @@
+
+
+
+
+
工艺变更记录:
@@ -252,6 +289,9 @@
+
+
+
工艺变更记录:
@@ -302,7 +342,8 @@
name: 'AbnormalFeedBack',
data () {
return {
-
+ folder: 'abnormal',
+ fileList: [],
searchData:{
userId:this.$store.state.user.name,
startDate:'',
@@ -327,8 +368,11 @@
"反馈人": "feedbackBy",
"状态": "status",
"异常原因": "abnormalDesc",
+ "异常数量": "abnormalQty",
+ "异常情况影响分析": "abnormalInfluence",
"异常描述": "abnormalRemark",
"紧急处理方式": "treatmentTemporary",
+ "临时性措施结论": "temporaryConclusion",
"温度": "temperatureTemporary",
"压力": "pressureTemporary",
"时间": "timeTemporary",
@@ -341,6 +385,7 @@
"工装": "workClothesTemporary",
"根本原因分析": "rootCause",
"长久处理方式": "treatment",
+ "效果验证结论": "permanentConclusion",
"温度 ": "temperature",
"压力 ": "pressure",
"时间 ": "time",
@@ -370,6 +415,8 @@
feedbackBy:this.$store.state.user.name,
abnormalCode:'',
abnormalRemark:'',
+ abnormalInfluence:'',
+ abnormalQty:'',
},
addModalFlag:false,
@@ -400,6 +447,10 @@
this.tableData = data.rows;
})
},
+ /*选择上传文件时*/
+ onChange(file,fileList){
+ this.fileList = fileList;
+ },
addAbnormal(){
this.addData.seqNo='',
this.addData.shiftNo='',
@@ -454,8 +505,26 @@
})
return false;
}
- saveAbnormalData(this.addData).then(({data}) => {
+ const formData = new FormData();
+ //片接文件
+ for (let i = 0; i < this.fileList.length; i++) {
+ formData.append("file",this.fileList[i].raw)
+ }
+ formData.append("folder", this.folder);
+ formData.append("site", this.addData.site);
+ formData.append("seqNo", this.addData.seqNo);
+ formData.append("orderNo", this.addData.orderNo);
+ formData.append("shiftNo", this.addData.shiftNo);
+ formData.append("resourceDesc", this.addData.resourceDesc);
+ formData.append("feedbackBy", this.addData.feedbackBy);
+ formData.append("abnormalCode", this.addData.abnormalCode);
+ formData.append("abnormalRemark", this.addData.abnormalRemark);
+ formData.append("abnormalInfluence", this.addData.abnormalInfluence);
+ formData.append("abnormalQty", this.addData.abnormalQty);
+ saveAbnormalData(formData).then(({data}) => {
if (data && data.code === 0) {
+ this.$refs.uploadFile.clearFiles();
+ this.fileList = [];
this.addModalFlag=false
this.search()
this.$message({
diff --git a/src/views/modules/production/generateReport.vue b/src/views/modules/production/generateReport.vue
index f82b302..f46e231 100644
--- a/src/views/modules/production/generateReport.vue
+++ b/src/views/modules/production/generateReport.vue
@@ -333,17 +333,7 @@
取消
-
-
-
-
-
-
-
-
-
-
-
+
@@ -370,12 +360,30 @@
+
+
+
+
+
+
+
+
-
+
+
+
+ 将文件拖到此处，或点击上传
+
+
+
保存
取消
@@ -635,6 +643,15 @@
},
data () {
return {
+ pageData: {
+ site: this.$store.state.user.site,
+ username: this.$store.state.user.name,
+ projectId: '',
+ projectName: '',
+ fileType: '',
+ },
+ folder: 'abnormal',
+ fileList: [],
toolHistList:[],// 工具
cavity:'',
setUp: {
@@ -780,6 +797,8 @@
feedbackBy:this.$store.state.user.name,
abnormalCode:'',
abnormalRemark:'',
+ abnormalInfluence:'',
+ abnormalQty:'',
},
}
},
@@ -1400,13 +1419,31 @@
})
return false;
}
+ const formData = new FormData();
+ //片接文件
+ for (let i = 0; i < this.fileList.length; i++) {
+ formData.append("file",this.fileList[i].raw)
+ }
+ formData.append("folder", this.folder);
+ formData.append("site", this.stopData.site);
+ formData.append("seqNo", this.stopData.seqNo);
+ formData.append("orderNo", this.stopData.orderNo);
+
+ formData.append("resourceDesc", this.stopData.resourceDesc);
+ formData.append("feedbackBy", this.stopData.feedbackBy);
+ formData.append("abnormalCode", this.stopData.abnormalCode);
+ formData.append("abnormalRemark", this.stopData.abnormalRemark);
+ formData.append("abnormalInfluence", this.stopData.abnormalInfluence);
+ formData.append("abnormalQty", this.stopData.abnormalQty);
// let inData={
// username:this.$store.state.user.name,
// seqNo:this.scanSeqNo
// }
- stopWork(this.stopData).then(({data}) => {
+ stopWork(formData).then(({data}) => {
if (data && data.code === 0) {
this.stopModalFlag=false;
+ this.$refs.uploadFile.clearFiles();
+ this.fileList = [];
this.$message({
message: '派工单已暂停',
type: 'success',
@@ -1456,6 +1493,11 @@
this.badCodeList = data.rows;
})
},
+ /*选择上传文件时*/
+ onChange(file,fileList){
+ this.fileList = fileList;
+ },
+
},
created () {
this.getBadCodeList();