Merge remote-tracking branch 'origin/dev' into dev

src/page/sampling-list/SamplingList.vue

@@ -253,7 +253,7 @@
                     forbidClick: true,
                 });
                 var dtask = plus.downloader.createDownload(
-                    this.$global.baseURL + '/drs/v1/sampling_summary/export_sampling?id=' + item.id, {}, (d, status) => {
+                    this.$global.baseURL + '/drs/v1/sampling_summary/export_sampling_gk?id=' + item.id, {}, (d, status) => {
                         if (status == 200) {
                             plus.runtime.openFile(d.filename);//cn.wps.moffice_eng-----wps的包名
                         }

src/page/sampling-list/SamplingListAdd.vue

@@ -570,9 +570,9 @@
                          label-class="cus-field-class"
                          label-width="50%"
                          label-align="center"
-                         v-model="sample.sandDeadline"
+                         v-model="sample.sendDeadline"
                          label="寄送样品截止日期"
-                         @click="_selectDate('sample.sandDeadline')"
+                         @click="_selectDate('sample.sendDeadline')"
               ></van-field>
             </table-col>
           </table-row>
@@ -582,7 +582,7 @@
                   label-class="cus-field-class"
                   label-width="50%"
                   label-align="center"
-                  v-model="sample.sandAddress"
+                  v-model="sample.sendAddress"
                   label="寄送样品地址"
               ></van-field>
             </table-col>
@@ -829,8 +829,8 @@ export default {
         packClass: '',
         storageCondition: '',
         storageConditionRemark: '',
-        sandDeadline: '',
-        sandAddress: '',
+        sendDeadline: '',
+        sendAddress: '',
         samplingMethod: '',
       },
       taskTypeList: ['监督抽检', '风险监测'],
@@ -1016,7 +1016,7 @@ export default {
     _initData(result) {
       for (let key in this.formObj) {
         if (result[key] !== '') {
-          if (key === 'sandDeadline') {
+          if (key === 'sendDeadline') {
             this.formObj[key] = result[key] ? this.$dateformat(result[key], 'yyyy-mm-dd') : ''
           } else {
             this.formObj[key] = result[key]
@@ -1044,7 +1044,7 @@ export default {
         if (result.sample[key] !== '') {
           if (key === 'sampleDate') {
             this.sample[key] = result.sample[key] ? this.$dateformat(result.sample[key], 'yyyy-mm-dd') : ''
-          } else if (key === 'sandDeadline') {
+          } else if (key === 'sendDeadline') {
             this.sample[key] = result.sample[key] ? this.$dateformat(result.sample[key], 'yyyy-mm-dd') : ''
           } else if (key === 'storageCondition') {
             this.storageCondition = result.sample[key] ? result.sample[key].split(',') : []
@@ -1138,8 +1138,8 @@ export default {
         case 'sample.sampleDate':
           this.sample.sampleDate = this.$dateformat(date, 'yyyy-mm-dd')
           break
-        case 'sample.sandDeadline':
-          this.sample.sandDeadline = this.$dateformat(date, 'yyyy-mm-dd')
+        case 'sample.sendDeadline':
+          this.sample.sendDeadline = this.$dateformat(date, 'yyyy-mm-dd')
           break
       }
       this.showDatePicker = false

src/page/sampling-list/SamplingListDetail.vue

@@ -567,7 +567,7 @@
                          label-class="cus-field-class"
                          label-width="50%"
                          label-align="center"
-                         v-model="sample.sandDeadline"
+                         v-model="sample.sendDeadline"
                          label="寄送样品截止日期"
               ></van-field>
             </table-col>
@@ -578,7 +578,7 @@
                   label-class="cus-field-class"
                   label-width="50%"
                   label-align="center"
-                  v-model="sample.sandAddress"
+                  v-model="sample.sendAddress"
                   label="寄送样品地址"
               ></van-field>
             </table-col>
@@ -825,8 +825,8 @@ export default {
         packClass: '',
         storageCondition: '',
         storageConditionRemark: '',
-        sandDeadline: '',
-        sandAddress: '',
+        sendDeadline: '',
+        sendAddress: '',
         samplingMethod: '',
       },
       taskTypeList: ['监督抽检', '风险监测'],
@@ -1012,7 +1012,7 @@ export default {
     _initData(result) {
       for (let key in this.formObj) {
         if (result[key] !== '') {
-          if (key === 'sandDeadline') {
+          if (key === 'sendDeadline') {
             this.formObj[key] = result[key] ? this.$dateformat(result[key], 'yyyy-mm-dd') : ''
           } else {
             this.formObj[key] = result[key]
@@ -1040,7 +1040,7 @@ export default {
         if (result.sample[key] !== '') {
           if (key === 'sampleDate') {
             this.sample[key] = result.sample[key] ? this.$dateformat(result.sample[key], 'yyyy-mm-dd') : ''
-          } else if (key === 'sandDeadline') {
+          } else if (key === 'sendDeadline') {
             this.sample[key] = result.sample[key] ? this.$dateformat(result.sample[key], 'yyyy-mm-dd') : ''
           } else if (key === 'storageCondition') {
             this.storageCondition = result.sample[key] ? result.sample[key].split(',') : []
@@ -1088,8 +1088,8 @@ export default {
         case 'sample.sampleDate':
           this.sample.sampleDate = this.$dateformat(date, 'yyyy-mm-dd')
           break
-        case 'sample.sandDeadline':
-          this.sample.sandDeadline = this.$dateformat(date, 'yyyy-mm-dd')
+        case 'sample.sendDeadline':
+          this.sample.sendDeadline = this.$dateformat(date, 'yyyy-mm-dd')
           break
       }
       this.showDatePicker = false