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

src/views/setting/sample/index.vue

@@ -360,7 +360,7 @@
               height="150px"
             ></image-preview>
           </div>
-          <div v-else>暂无数据</div>
+          <div v-else>--未上传--</div>
         </el-form-item>
         <el-form-item label="样品照片:" prop="samplePhotos">
           <div v-if="clickNameForm.samplePhotos">
@@ -373,7 +373,7 @@
               :src="item"
             ></image-preview>
           </div>
-          <div v-else>暂无数据</div>
+          <div v-else>--未上传--</div>
         </el-form-item>
       </el-form>
     </el-dialog>
@@ -646,8 +646,10 @@ export default {
     clickSampleName(row) {
       this.dialogFormVisible = true
       this.clickNameForm = row
-      this.clickNameForm.samplePhotos =
-        this.clickNameForm.samplePhotos.split(',')
+      if (this.clickNameForm.samplePhotos) {
+        this.clickNameForm.samplePhotos =
+          this.clickNameForm.samplePhotos.split(',')
+      }
       console.log(row)
     },
     closeSamplePhoto() {