储存条件

src/page/sampling-list/SamplingListAdd.vue

@@ -849,7 +849,7 @@
                     inward: '',
                     originPlace: '',
                     packClass: '',
-                    storageCondition: [],
+                    storageCondition: '',
                     storageConditionRemark: ''
                 },
                 taskTypeList: ['监督抽检', '风险监测', '评价性抽检'],
@@ -915,15 +915,18 @@
                             this.formObj[key] = result[key]
                         }
                     }
-                    for (let key in this.netTested) {
-                        if (result.netTested[key]) {
-                            this.netTested[key] = result.netTested[key]
+                    for (let key in this.nonNetTested) {
+                        if (result.nonNetTested[key]) {
+                            this.nonNetTested[key] = result.nonNetTested[key]
                         }
                     }
                     for (let key in this.sample) {
                         if (result.sample[key]) {
                             if (key === 'sampleDate') {
                                 this.sample[key] = result.sample[key] ? this.$dateformat(result.sample[key], 'yyyy-mm-dd') : ''
+                            }else if(key==='storageCondition'){
+                                this.storageCondition = result.sample[key].split(',')
+                                this.sample[key] = result.sample[key]
                             } else {
                                 this.sample[key] = result.sample[key]
                             }

src/page/sampling-list/SamplingListAddNet.vue

@@ -902,7 +902,10 @@
                         if (result.sample[key]) {
                             if (key === 'sampleDate') {
                                 this.sample[key] = result.sample[key] ? this.$dateformat(result.sample[key], 'yyyy-mm-dd') : ''
-                            } else {
+                            }else if(key==='storageCondition'){
+                                this.storageCondition = result.sample[key].split(',')
+                                this.sample[key] = result.sample[key]
+                            }  else {
                                 this.sample[key] = result.sample[key]
                             }
                         }

src/page/sampling-list/file/File.vue

@@ -19,9 +19,10 @@
                 </van-list>
             </van-pull-refresh>
         </div>
-        <div class="bottom-btn">
-            <van-button type="info" block @click="_goto('/sampling_list/file_upload')">添加附件</van-button>
-            <!--<van-button type="primary" square @click="_uploadImg">添加图片</van-button>-->
+        <div class="bottom-btn bottom-btn-two" >
+            <!--<van-button type="info" block @click="_goto('/sampling_list/file_upload')">添加附件</van-button>-->
+            <van-button type="info" square @click="_goto('/sampling_list/file_upload')">添加附件</van-button>
+            <van-button type="primary" square @click="_uploadImg">添加图片</van-button>
         </div>
         <van-image-preview v-model="showImg" :images="imgList">
             <!--<template #:index>第{{ index }}页</template>-->