Merge branch 'dev' of http://git.patzn.com/zhuxiaomei/double-random-sampling-app into dev

src/page/sampling-list/SamplingListAdd.vue

@@ -381,6 +381,15 @@
                                 </van-radio>
                             </van-radio-group>
                         </table-col>
+                        <table-col>
+                            <van-field
+                                    label-class="cus-field-class"
+                                    label-width="50%"
+                                    label-align="center"
+                                    v-model="sample.sampleDate"
+                                    label=""
+                            ></van-field>
+                        </table-col>
                     </table-row>
                     <table-row>
                         <table-col>
@@ -812,6 +821,7 @@
                     properties: '',
                     propertiesRemark: '',
                     dateType: '',
+                    sampleDate:'',
                     standard: '',
                     batchNo: '',
                     specification: '',

src/page/sampling-list/SamplingListAddNet.vue

@@ -380,6 +380,15 @@
                                     label-class="cus-field-class"
                                     label-width="50%"
                                     label-align="center"
+                                    v-model="sample.sampleDate"
+                                    label=""
+                            ></van-field>
+                        </table-col>
+                        <table-col>
+                            <van-field
+                                    label-class="cus-field-class"
+                                    label-width="50%"
+                                    label-align="center"
                                     v-model="sample.shelfLife"
                                     label="保质期"
                             ></van-field>
@@ -812,6 +821,7 @@
                     properties: '',
                     propertiesRemark: '',
                     dateType: '',
+                    sampleDate:'',
                     shelfLife: '',
                     standard: '',
                     qualityGrade: '',

src/page/sampling-list/SamplingListDetail.vue

@@ -381,6 +381,15 @@
                                 </van-radio>
                             </van-radio-group>
                         </table-col>
+                        <table-col>
+                            <van-field
+                                    label-class="cus-field-class"
+                                    label-width="50%"
+                                    label-align="center"
+                                    v-model="sample.sampleDate"
+                                    label=""
+                            ></van-field>
+                        </table-col>
                     </table-row>
                     <table-row>
                         <table-col>
@@ -812,6 +821,7 @@
                     properties: '',
                     propertiesRemark: '',
                     dateType: '',
+                    sampleDate:'',
                     standard: '',
                     batchNo: '',
                     specification: '',
@@ -888,12 +898,12 @@
                     }
                     for(let key in this.netTested){
                         if(result.netTested[key]){
-                            this.netTested = result.netTested[key]
+                            this.netTested[key] = result.netTested[key]
                         }
                     }
                     for(let key in this.sample){
                         if(result.sample[key]){
-                            this.sample = result.sample[key]
+                            this.sample[key] = result.sample[key]
                         }
                     }
                     this.testedType = result.testedType

src/page/sampling-list/SamplingListDetailNet.vue

@@ -376,6 +376,15 @@
                             </van-radio-group>
                         </table-col>
                         <table-col>
+                            <van-field
+                                    label-class="cus-field-class"
+                                    label-width="50%"
+                                    label-align="center"
+                                    v-model="sample.sampleDate"
+                                    label=""
+                            ></van-field>
+                        </table-col>
+                        <table-col>
                             <van-field readonly
                                        label-class="cus-field-class"
                                        label-width="50%"
@@ -812,6 +821,7 @@
                     properties: '',
                     propertiesRemark: '',
                     dateType: '',
+                    sampleDate:'',
                     shelfLife: '',
                     standard: '',
                     qualityGrade: '',
@@ -863,12 +873,12 @@
                     }
                     for (let key in this.netTested) {
                         if (result.netTested[key]) {
-                            this.netTested = result.netTested[key]
+                            this.netTested[key] = result.netTested[key]
                         }
                     }
                     for (let key in this.sample) {
                         if (result.sample[key]) {
-                            this.sample = result.sample[key]
+                            this.sample[key] = result.sample[key]
                         }
                     }
                     this.testedType = result.testedType