diff --git a/src/api/inspection/inspectionresult.js b/src/api/inspection/inspectionresult.js index 53d852a..b304a4c 100644 --- a/src/api/inspection/inspectionresult.js +++ b/src/api/inspection/inspectionresult.js @@ -32,14 +32,11 @@ export const remove = (ids) => { }) } -export const add = (row, taskNo) => { +export const add = (row) => { return request({ url: '/api/inspection/inspectionresult/submit', method: 'post', - params:{ - row, - taskNo, - } + data: row }) } diff --git a/src/views/inspection/inspectiontasks.vue b/src/views/inspection/inspectiontasks.vue index 69c6c86..5d6f6e1 100644 --- a/src/views/inspection/inspectiontasks.vue +++ b/src/views/inspection/inspectiontasks.vue @@ -50,7 +50,7 @@ </template> <template #menu="{row,index,size}"> <el-button @click="handleDetailSearch(row,index)" type="text">详情</el-button> - <el-button @click="resultAdd()" type="text">上传巡检结果</el-button> + <el-button @click="resultAdd(row)" type="text">上传巡检结果</el-button> <el-button @click="rowDel(row)" type="text">删除</el-button> </template> </avue-crud> @@ -88,6 +88,7 @@ search:{}, loading: true, resultBox: false, + currTaskNo: null, page: { pageSize: 10, currentPage: 1, @@ -405,15 +406,17 @@ }, }); }, - resultAdd() { + resultAdd(row) { this.resultBox = true; - + this.currTaskNo = row.taskNo; }, submitResult(row, done, loading) { + this.resultForm.taskNo = this.currTaskNo; + console.log(this.currTaskNo) const form = this.$refs.resultForm; form.validate((valid) => { if (valid) { - add(this.resultForm,row.taskNo).then(() => { + add(this.resultForm).then(() => { this.resultBox = false; this.resultForm.executeStartDate= ''; this.resultForm.executeEndDate= ''; diff --git a/src/views/inspection/inspectiontasksDetail.vue b/src/views/inspection/inspectiontasksDetail.vue index ed5447b..f256525 100644 --- a/src/views/inspection/inspectiontasksDetail.vue +++ b/src/views/inspection/inspectiontasksDetail.vue @@ -185,8 +185,8 @@ export default { routeNo: val } }).then((res) => { - const routeName = this.findObject(this.information_option.column, "routeName"); - routeName.value = res.data.data.routeName; + console.log(123) + this.information_option.routeType = res.data.data.routeName; }) } }, @@ -212,7 +212,7 @@ export default { label: "路线类型", prop: "routeType", span: 7, - disabled: true, + // disabled: true, }, { label: "计划编号",