From 16bcf9bcafb1d4b2750ad8846e65728c9b0fc162 Mon Sep 17 00:00:00 2001
From: yjl <1490736767@qq.com>
Date: Thu, 3 Nov 2022 14:58:38 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=89=88bug=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=EF=BC=88=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0=E3=80=81?=
 =?UTF-8?q?=E6=A0=87=E5=85=BB=E5=AE=A4=E5=B1=82=E7=BA=A7=E9=94=99=E4=B9=B1?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/projectFront/markingRoom/sampleManage.vue   |  9 ++++++++-
 .../quality/recordsModule/inspectionRecord.vue        | 11 +++++++++--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/views/projectFront/markingRoom/sampleManage.vue b/src/views/projectFront/markingRoom/sampleManage.vue
index 367e648f..01c0a21b 100644
--- a/src/views/projectFront/markingRoom/sampleManage.vue
+++ b/src/views/projectFront/markingRoom/sampleManage.vue
@@ -365,8 +365,15 @@ export default {
           return;
         }
         this.workerInfo.locationId = this.selectLocationArr[
-          this.selectLocationArr.length - 1
+          0
         ];
+        if(this.selectLocationArr.length>1){
+                this.workerInfo.secondLocationId = this.selectLocationArr[1];
+        }else{
+          this.workerInfo.secondLocationId = "";
+          this.workerInfo.secondLocationName =""
+        }
+        console.log("编辑选中的位置 ：", this.selectLocationArr);
         this.$refs.addEditForm.validate((valid) => {
           if (valid) {
             this.workerInfo.parentId = this.workerInfo.parentId
diff --git a/src/views/projectFront/quality/recordsModule/inspectionRecord.vue b/src/views/projectFront/quality/recordsModule/inspectionRecord.vue
index df4ab80f..1831b035 100644
--- a/src/views/projectFront/quality/recordsModule/inspectionRecord.vue
+++ b/src/views/projectFront/quality/recordsModule/inspectionRecord.vue
@@ -1173,6 +1173,7 @@
             showPositioning = false;
             pointList = [];
             createdCoord = false;
+          
           "
           icon="el-icon-circle-close"
           size="medium"
@@ -2005,6 +2006,8 @@ export default {
     cancleEvent(){
       this.mapUrl = ''
       this.addDialog = false
+       this.$refs.addForm1.resetFields()//清除所有验证
+       this.$refs.addForm2.resetFields()//清除所有验证
     },
 
     //提交 新增
@@ -2080,8 +2083,10 @@ export default {
           addRecordApi(data).then((res) => {
             if (res.code == 200) {
               this.$message.success(this.$t("message.quality.newSuccess"));
-              this.$refs["addForm1"].resetFields();
-              this.$refs["addForm2"].resetFields();
+                this.$refs.addForm1.resetFields()//清除所有验证
+                this.$refs.addForm2.resetFields()//清除所有验证
+              // this.$refs["addForm1"].resetFields();
+              // this.$refs["addForm2"].resetFields();
               this.addDialog = false;
               this.fileList1 = [];
               this.fileList2 = [];
@@ -2115,6 +2120,8 @@ export default {
       this.fileList2 = []
       this.fileList3 = []
       this.fileList4 = []
+       this.$refs.addForm1.resetFields()//清除所有验证
+       this.$refs.addForm2.resetFields()//清除所有验证
       this.hideUpload = false
     },
     submit() {},