修改化验室水质

src/api/dcApi/assayMngApi.js

@@ -20,7 +20,7 @@ export function addSampleplaced(data) {
   })
 }
 
-//分页查询采样点接口
+// 分页查询采样点接口
 export function getSampleplacedPage(params) {
   return request({
     url: '/water-quality/sampleplaced/page',
@@ -29,8 +29,7 @@ export function getSampleplacedPage(params) {
   })
 }
 
-
-//修改采样点接口
+// 修改采样点接口
 export function editSampleplaced(data) {
   return request({
     url: `/water-quality/sampleplaced`,
@@ -48,8 +47,6 @@ export function deleteSampleplaced(params) {
   })
 }
 
-
-
 // 新增报告类别接口
 export function addreportCategory(data) {
   return request({
@@ -86,8 +83,6 @@ export function deletereportCategory(params) {
   })
 }
 
-
-
 // 化验字典
 // 新增化验字典接口
 export function addassayDic(data) {
@@ -125,9 +120,6 @@ export function deleteAssayDic(params) {
   })
 }
 
-
-
-
 // 化验项配置
 // 新增化验项配置
 export function addassayConfig(data) {
@@ -138,7 +130,7 @@ export function addassayConfig(data) {
   })
 }
 
-//分页查询化验项配置接口
+// 分页查询化验项配置接口
 export function getassayConfigPage(params) {
   return request({
     url: '/water-quality/assayconfigd/page',
@@ -156,8 +148,7 @@ export function deleteassayConfig(params) {
   })
 }
 
-
-//修改化验项配置接口
+// 修改化验项配置接口
 export function editassayConfig(data) {
   return request({
     url: `/water-quality/assayconfigd`,
@@ -166,7 +157,6 @@ export function editassayConfig(data) {
   })
 }
 
-
 // 采样记录分页查询接口
 export function getCollectRecordPage(params) {
   return request({
@@ -185,7 +175,6 @@ export function getNoCollectRecordList(params) {
   })
 }
 
-
 // 新增采样记录
 export function addCollectRecord(data) {
   return request({
@@ -213,7 +202,7 @@ export function deleteCollectRecord(params) {
   })
 }
 
-//分页查询化验报告管理接口
+// 分页查询化验报告管理接口
 export function getAssayReportManagePage(params) {
   return request({
     url: '/water-quality/assayreportw/page',
@@ -221,7 +210,7 @@ export function getAssayReportManagePage(params) {
     params
   })
 }
-//鹿厂报表
+// 鹿厂报表
 export function getStatisticsPage(params) {
   return request({
     url: '/water-quality/api/assayStatistics/statistics',
@@ -229,7 +218,7 @@ export function getStatisticsPage(params) {
     params
   })
 }
-//鹿厂报表
+// 鹿厂报表
 export function getAssayStatisticsPage(params) {
   return request({
     url: '/water-quality/api/assayStatistics/page',
@@ -237,11 +226,11 @@ export function getAssayStatisticsPage(params) {
     params
   })
 }
-//鹿厂报表导出
+// 鹿厂报表导出
 export function getAssayStatisticsExport(params) {
   return request({
     url: '/water-quality/api/assayStatistics/export',
-    responseType: "blob",
+    responseType: 'blob',
     method: 'get',
     params
   })
@@ -252,12 +241,11 @@ export function addAssayReportManage(data) {
   return request({
     url: '/water-quality/assayreportw',
     method: 'post',
-    data,
+    data
   })
 }
 
-
-//修改化验报告管理接口
+// 修改化验报告管理接口
 export function editAssayReportManage(data) {
   return request({
     url: `/water-quality/assayreportw`,
@@ -266,7 +254,6 @@ export function editAssayReportManage(data) {
   })
 }
 
-
 // 删除化验报告管理接口
 export function deleteAssayReportManage(params) {
   return request({
@@ -276,10 +263,7 @@ export function deleteAssayReportManage(params) {
   })
 }
 
-
-
-
-//分页查询化验结果接口
+// 分页查询化验结果接口
 export function getAssayResultPage(params) {
   return request({
     url: '/water-quality/assayresultw/page',
@@ -288,7 +272,7 @@ export function getAssayResultPage(params) {
   })
 }
 
-//查询没有化验报告的化验结果接口
+// 查询没有化验报告的化验结果接口
 export function getNoAssayResultList(params) {
   return request({
     url: '/water-quality/assayresultw/getAssayResultList',
@@ -297,7 +281,6 @@ export function getNoAssayResultList(params) {
   })
 }
 
-
 // 新增化验结果接口
 export function addAssayResult(data) {
   return request({
@@ -307,8 +290,7 @@ export function addAssayResult(data) {
   })
 }
 
-
-//修改化验结果接口
+// 修改化验结果接口
 export function editAssayResult(data) {
   return request({
     url: `/water-quality/assayresultw`,
@@ -326,7 +308,6 @@ export function deleteAssayResultIds(params) {
   })
 }
 
-
 // 化验结果归档操作
 export function guidangAssayResult(params) {
   return request({
@@ -362,4 +343,13 @@ export function getFile(params) {
     responseType: 'blob',
     params
   })
-}
+}
+
+// 下载文件
+export function assayresultwSaveBatch(data) {
+  return request({
+    url: '/water-quality/assayresultw/saveBatch',
+    method: 'post',
+    data
+  })
+}

src/views/dcSystem/assayWaterQuality/assayManage/assayMtuResult/index.vue

@@ -296,7 +296,8 @@ import {
   getassayConfigPage,
   getCollectRecordPage,
   getSampleplacedPage,
-  addCollectRecord
+  addCollectRecord,
+  assayresultwSaveBatch
 } from '@/api/dcApi/assayMngApi'
 
 import ReturnPdf from '../../../common/ReturnPdf'
@@ -359,7 +360,8 @@ export default {
       pdfData: [],
       column: [],
       samplingLocationData: [],
-      excelFileName: ''
+      excelFileName: '',
+      commitType: 'JSON' // JSON OR FORMDATA
     }
   },
 
@@ -484,12 +486,13 @@ export default {
     /**
  * 验证数据
  */
-    validationData() {
+    validationData(type) {
       if (this.tableData.length == 0) {
         this.$message.warning('请选择化验项配置！')
         return false
       }
       const formData = new FormData()
+      const result = []
       let currentDay = moment().format('YYYY-MM-DD')
       const find = this.tableData.find(item => item.assayTime === currentDay)
       if (find) {
@@ -527,22 +530,32 @@ export default {
             currentDay = row[key]
             continue
           }
-          formData.append(`assayResultDetails[${indexNum}].assayDicId`, key.replace('value', '')) // 化验项id
-          formData.append(`assayResultDetails[${indexNum}].assayCheckValue`, row[key]) // 化验值
-          formData.append(`assayResultDetails[${indexNum}].assayUser`, this.$store.state.user.realName) // 化验人员
-          formData.append(`assayResultDetails[${indexNum}].assayTime`, currentDay) // 化验时间
-          formData.append(`assayResultDetails[${indexNum}].assayResult`, '合格') // 化验结果
+          if (type === 'JSON') {
+            result.push({
+              assayDicId: key.replace('value', ''),
+              assayCheckValue: row[key],
+              assayUser: this.$store.state.user.realName,
+              assayTime: currentDay,
+              assayResult: '合格'
+            })
+          } else {
+            formData.append(`assayResultDetails[${indexNum}].assayDicId`, key.replace('value', '')) // 化验项id
+            formData.append(`assayResultDetails[${indexNum}].assayCheckValue`, row[key]) // 化验值
+            formData.append(`assayResultDetails[${indexNum}].assayUser`, this.$store.state.user.realName) // 化验人员
+            formData.append(`assayResultDetails[${indexNum}].assayTime`, currentDay) // 化验时间
+            formData.append(`assayResultDetails[${indexNum}].assayResult`, '合格') // 化验结果
+          }
           indexNum++
         }
       }
-      return formData
+      return type === 'JSON' ? result : formData
     },
 
     commit() {
       this.$refs['ruleForm'].validate(async(valid) => {
         if (valid) {
           this.dialogLoading = true
-          const formData = this.validationData()
+          let formData = this.validationData(this.commitType)
           if (!formData) return
           if (!this.ruleForm.collectNo) {
             this.ruleForm.collectNo = await this.getItemList()
@@ -551,11 +564,25 @@ export default {
               return
             }
           }
-          formData.append('assayResultName', this.ruleForm.assayResultName)
-          formData.append('assayConfigId', this.ruleForm.assayConfigId)
-          formData.append('collectNo', this.ruleForm.collectNo)
-          formData.append('remark', this.ruleForm.remark)
-          addAssayResult(formData).then((res) => {
+          let _run = addAssayResult
+          if (this.commitType === 'JSON') {
+            formData = {
+              assayResultDetails: formData,
+              id: this.ruleForm.id,
+              assayResultName: this.ruleForm.assayResultName,
+              assayConfigId: this.ruleForm.assayConfigId,
+              collectNo: this.ruleForm.collectNo,
+              remark: this.ruleForm.remark
+            }
+            _run = assayresultwSaveBatch
+          } else {
+            formData.append('assayResultName', this.ruleForm.assayResultName)
+            formData.append('assayConfigId', this.ruleForm.assayConfigId)
+            formData.append('collectNo', this.ruleForm.collectNo)
+            formData.append('remark', this.ruleForm.remark)
+          }
+
+          _run(formData).then((res) => {
             if (res.code == 1) {
               this.$message.success('新增成功')
               this.dialogVisible = false
@@ -630,15 +657,29 @@ export default {
     upData() {
       this.$refs['ruleForm'].validate(async(valid) => {
         if (valid) {
-          const formData = this.validationData()
+          let formData = this.validationData(this.commitType)
           if (!formData) return
-          formData.append('id', this.ruleForm.id)
-          formData.append('assayResultName', this.ruleForm.assayResultName)
-          formData.append('assayConfigId', this.ruleForm.assayConfigId)
-          formData.append('collectNo', this.ruleForm.collectNo)
-          formData.append('remark', this.ruleForm.remark)
+          let _run = editAssayResult
+          debugger
+          if (this.commitType === 'JSON') {
+            formData = {
+              assayResultDetails: formData,
+              id: this.ruleForm.id,
+              assayResultName: this.ruleForm.assayResultName,
+              assayConfigId: this.ruleForm.assayConfigId,
+              collectNo: this.ruleForm.collectNo,
+              remark: this.ruleForm.remark
+            }
+            _run = assayresultwSaveBatch
+          } else {
+            formData.append('id', this.ruleForm.id)
+            formData.append('assayResultName', this.ruleForm.assayResultName)
+            formData.append('assayConfigId', this.ruleForm.assayConfigId)
+            formData.append('collectNo', this.ruleForm.collectNo)
+            formData.append('remark', this.ruleForm.remark)
+          }
 
-          editAssayResult(formData).then((res) => {
+          _run(formData).then((res) => {
             if (res.code == 1) {
               this.$message.success('修改成功')
               this.dialogVisible = false