Merge branch 'develop' of http://gitlab.91isoft.com:90/car-test/web into mengzixuan

src/views/setting/sample/index.vue

@@ -74,6 +74,7 @@
       v-loading="tableLoding"
       :data="tableData"
       style="width: 100%"
+      border
       @sort-change="sortClick"
     >
       <el-table-column type="index" label="序号" min-width="80">
@@ -81,7 +82,7 @@
       <el-table-column
         v-if="activeName === 'completeSample'"
         prop="identificationCode"
-        label="车辆识别码"
+        label="车辆识别码(VIN)"
         show-overflow-tooltip
         min-width="200"
       />

src/views/task/new/index.vue

@@ -697,7 +697,7 @@ export default {
           this.rules.testScenarioList[0].required = false
         } else {
           // this.$route.meta.title = '发起新任务'
-          // this.getTemporaryStorage()
+          this.getTemporaryStorage()
         }
       })
     },
@@ -1034,8 +1034,14 @@ export default {
             })
             this.taskCreateRequest.auditors = this.tableData
             this.taskCreateRequest.sample = this.currentVehicleSampleInformation
+            this.taskCreateRequest.sample.forEach(item => {
+              delete item.id
+            })
             this.taskCreateRequest.partSample =
               this.currentPartSampleInformation
+            this.taskCreateRequest.partSample.forEach(item => {
+              delete item.id
+            })
             console.log('发布...', this.taskCreateRequest)
             if (this.taskId === undefined) {
               createTask(this.taskCreateRequest).then(response => {
@@ -1103,7 +1109,13 @@ export default {
         })
         this.taskCreateRequest.auditors = this.tableData
         this.taskCreateRequest.sample = this.currentVehicleSampleInformation
+        this.taskCreateRequest.sample.forEach(item => {
+          delete item.id
+        })
         this.taskCreateRequest.partSample = this.currentPartSampleInformation
+        this.taskCreateRequest.partSample.forEach(item => {
+          delete item.id
+        })
         console.log('暂存', this.taskCreateRequest)
         if (this.taskTemporaryStorage !== null) {
           // 暂存有数据再次暂存走编辑