Browse Source

修改bug

xiangyiyong 10 months ago
parent
commit
cecd01af69

+ 2 - 2
src/views/dcSystem/assayWaterQuality/assayManage/assayMtuResult/index.vue

@@ -505,7 +505,7 @@ export default {
 
         // 验证是否每个值都存在
         for (const key in row) {
-          if (key === 'assayTime') continue
+          if (key === 'assayTime' || key === 'isEdit') continue
           if (!row[key]) {
             flag = true
             break
@@ -515,7 +515,7 @@ export default {
 
         // 保存存在的值
         for (const key in row) {
-          if (key === 'assayTime') continue
+          if (key === 'assayTime' || key === 'isEdit') 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.userId) // 化验人员

+ 7 - 4
src/views/dcSystem/fillingSystem/watchRecords/index.vue

@@ -290,16 +290,19 @@ export default {
         })
     },
     submitBtn(row) {
-      const params = {
-        ...row,
-        status: '1'
-      }
       this.$confirm('是否确定提交所选的数据?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
         this.loading = true
+        const params = {
+          ...JSON.parse(row.content),
+          dutyDate: row.dutyDate,
+          status: '1',
+          id: row.id
+        }
+
         updateWatchRecords(params).then((res) => {
           this.loading = false
           if (res.code === 1) {