|
|
@@ -225,7 +225,7 @@ export default {
|
|
|
taskId:this.$route.query.id,
|
|
|
}
|
|
|
taskDetails(data).then(res=>{
|
|
|
- res = json;
|
|
|
+ //res = json;
|
|
|
console.log(res,'res')
|
|
|
let {areaScanN,areaScanY,nfcScanN,nfcScanY} = res.data;
|
|
|
this.taskInfo = {
|
|
|
@@ -262,7 +262,6 @@ export default {
|
|
|
|
|
|
})
|
|
|
})
|
|
|
- console.log(pointdata,'pointdata')
|
|
|
let data = {
|
|
|
dateTime:new Date(),
|
|
|
isSubmit:0,
|
|
|
@@ -272,7 +271,6 @@ export default {
|
|
|
nfcData:[],
|
|
|
pointdata,
|
|
|
}
|
|
|
- console.log(data,'555')
|
|
|
saveTaskData(data).then(res=>{
|
|
|
this.$toast('提交成功');
|
|
|
this.$router.go(-1);
|
|
|
@@ -327,18 +325,35 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
this.NFCNum = num;
|
|
|
- console.log(num,'num111')
|
|
|
},
|
|
|
//提交数据
|
|
|
submitData(){
|
|
|
+ let pointdata = [];
|
|
|
+ this.areaList.forEach(area=>{
|
|
|
+ area.checklist.forEach(item=>{
|
|
|
+ item.checkitemlist.forEach(checkItem=>{
|
|
|
+ checkItem.protections = checkItem.protectionVo;
|
|
|
+ checkItem.resRemark = checkItem.resremark;
|
|
|
+ checkItem.resStatus = checkItem.resstatus;
|
|
|
+ checkItem.areaId = checkItem.areaid;
|
|
|
+ checkItem.id = checkItem.pointdataid;
|
|
|
+ checkItem.pointId = checkItem.pointid;
|
|
|
+ checkItem.resValue = checkItem.resvalue;
|
|
|
+ checkItem.resumptionId = this.$route.query.id;
|
|
|
+ pointdata.push(checkItem);
|
|
|
+ })
|
|
|
+
|
|
|
+ })
|
|
|
+ })
|
|
|
+ console.log(pointdata,'pointdata')
|
|
|
let data = {
|
|
|
- taskId:this.$route.query.id,
|
|
|
- taskAreaId:this.selectArea.taskareaid,
|
|
|
- taskAreaName:this.selectArea.areaname,
|
|
|
- taskAreaStatus:this.selectArea.status,
|
|
|
- taskAreaRemark:this.selectArea.remark,
|
|
|
- taskAreaCheckList:this.checkList,
|
|
|
- isSubmit:1
|
|
|
+ dateTime:new Date(),
|
|
|
+ isSubmit:1,
|
|
|
+ resumptionId:this.$route.query.id,
|
|
|
+ year: this.taskInfo.year,
|
|
|
+ quarter: this.taskInfo.quarter,
|
|
|
+ nfcData:[],
|
|
|
+ pointdata,
|
|
|
}
|
|
|
saveTaskData(data).then(res=>{
|
|
|
this.$toast('提交成功');
|
|
|
@@ -367,7 +382,7 @@ export default {
|
|
|
nfcTakePhotos(){
|
|
|
let uploader = this.$refs.imageUpload;
|
|
|
console.log(uploader,'uploader')
|
|
|
- uploader.chooseFile();
|
|
|
+ uploader.chooseFiles();
|
|
|
},
|
|
|
switchChange(item){
|
|
|
console.log(item,'666')
|