From f49b64a342e7f050c424b541f4b3b683504bacbb Mon Sep 17 00:00:00 2001
From: quyixiao <2621048238@qq.com>
Date: Wed, 26 Aug 2020 12:10:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/api_result.js                         |  4 ++++
 .../result/record/lzresultrecordapp.vue       | 21 ++++++++++++-------
 .../record/recorddetail-add-or-update.vue     |  5 +++--
 .../modules/result/record/recorddetail.vue    | 20 ++++++++++--------
 4 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/src/api/api_result.js b/src/api/api_result.js
index ae41dc3..cc166ce 100644
--- a/src/api/api_result.js
+++ b/src/api/api_result.js
@@ -59,3 +59,7 @@ export const downZip = params => {
 export const deleteRecord = params => {
   return http({url: '/lz_management/user/lzresultrecord/deleteRecord', method: 'get', params})
 }
+
+export const preWeightCheck = params => {
+  return http({url: '/lz_management/user/lzresultrecord/preWeightCheck', method: 'post', params})
+}
diff --git a/src/views/modules/result/record/lzresultrecordapp.vue b/src/views/modules/result/record/lzresultrecordapp.vue
index 9c2c851..4165194 100644
--- a/src/views/modules/result/record/lzresultrecordapp.vue
+++ b/src/views/modules/result/record/lzresultrecordapp.vue
@@ -230,7 +230,8 @@ export default {
       departmentList3: [],
       addOrUpdateVisible: false,
       recordIdsSelect: [],
-      tabValue: '1,2,5'
+      tabValue: '1,2,5',
+      isChangeDepartmentrtment: 0
     }
   },
   computed: {},
@@ -280,6 +281,7 @@ export default {
       })
     },
     async changeDepartment (i) {
+      this.isChangeDepartmentrtment = 1
       let departmentId = 0
       if (i === '2') {
         departmentId = this.dataForm.department1
@@ -320,17 +322,20 @@ export default {
         'department3': this.dataForm.department3,
         'name': this.dataForm.name,
         'remark': this.dataForm.remark,
-        'isSelf': 2
+        'isSelf': 2,
+        'isChangeDepartmentrtment': this.isChangeDepartmentrtment
       }).then(data => {
         if (data && data.code === 0) {
           this.dataList = data.page.list
           this.totalPage = data.page.totalCount
-          this.departmentList1 = data.departmentList1
-          this.departmentList2 = data.departmentList2
-          this.departmentList3 = data.departmentList3
-          this.dataForm.department1 = data.department1
-          this.dataForm.department2 = data.department2
-          this.dataForm.department3 = data.department3
+          if (this.isChangeDepartmentrtment === 0) {
+            this.departmentList1 = data.departmentList1
+            this.departmentList2 = data.departmentList2
+            this.departmentList3 = data.departmentList3
+            this.dataForm.department1 = data.department1
+            this.dataForm.department2 = data.department2
+            this.dataForm.department3 = data.department3
+          }
         } else {
           this.dataList = []
           this.totalPage = 0
diff --git a/src/views/modules/result/record/recorddetail-add-or-update.vue b/src/views/modules/result/record/recorddetail-add-or-update.vue
index fd89a6a..6a471b9 100644
--- a/src/views/modules/result/record/recorddetail-add-or-update.vue
+++ b/src/views/modules/result/record/recorddetail-add-or-update.vue
@@ -55,8 +55,9 @@
 
 
 <script>
-import {apiDetailInfo, recorddetailAddOrUpdate, recorddetailDelete, weightCheck} from '@/api/api_result'
+import {apiDetailInfo, recorddetailAddOrUpdate, recorddetailDelete, weightCheck, preWeightCheck} from '@/api/api_result'
 import E from 'wangeditor'
+
 var Base64 = require('js-base64').Base64
 
 export default {
@@ -177,7 +178,7 @@ export default {
       this.auth = auth
       this.recordType = recordType
       this.dataForm.id = id || 0
-      let data = await weightCheck({
+      let data = await preWeightCheck({
         'recordResultId': this.recordResultId,
         'type': this.type,
         'id': this.dataForm.id
diff --git a/src/views/modules/result/record/recorddetail.vue b/src/views/modules/result/record/recorddetail.vue
index 96cc48c..0f3712a 100644
--- a/src/views/modules/result/record/recorddetail.vue
+++ b/src/views/modules/result/record/recorddetail.vue
@@ -184,8 +184,10 @@ export default {
     UploadAddOrUpdate
   },
   activated () {
-    this.recordResultId = this.$route.query.id
-    this.recordType = this.$route.query.recordType
+    if (this.$route.query.id >= 0) {
+      this.recordResultId = this.$route.query.id
+      this.recordType = this.$route.query.recordType
+    }
     this.getDataList()
   },
   methods: {
@@ -260,14 +262,14 @@ export default {
         }).then(data => {
           if (data && data.code === 0) {
             this.getDataList()
-            this.$message({
-              message: data.msg,
-              type: 'success',
-              duration: 1500,
-              onClose: () => {
-              }
-            })
           }
+          this.$message({
+            message: data.msg,
+            type: 'success',
+            duration: 3000,
+            onClose: () => {
+            }
+          })
         })
       }).catch(() => {
       })