fix: 自提点

src/views/gift-manage/module/pickup-update-dialog.vue

@@ -70,7 +70,7 @@ export default {
     return {
       ruleForm: {
         type: 1,
-        chooseTimeFlag: 1,
+        chooseTimeFlag: 0,
         dateType: 1, // 日期类型 1、动态日期 2、固定日期
         fixedTime: [ { dataRange: '' } ], // 固定日期
         // 动态日期start

src/views/gift-manage/pickup-form.vue

@@ -93,7 +93,7 @@ export default {
       pickupId: this.$route.query.id, // 主键
       ruleForm: {
         type: 1,
-        chooseTimeFlag: 1,
+        chooseTimeFlag: 0,
         dateType: 1, // 日期类型 1、动态日期 2、固定日期
         fixedTime: [ { dataRange: '' } ], // 固定日期
         // 动态日期start
@@ -143,9 +143,12 @@ export default {
         this.info = info;
         // 表单的
         Object.keys(this.ruleForm).map(key => {
+          const obj = {};
           if (key in res.result) {
-            this.ruleForm[key] = info[key];
+            obj[key] == info[key];
+            // this.ruleForm[key] = info[key];
           }
+          Object.assign(this.ruleForm, obj);
         });
         if(info.chooseTimeFlag) {
           const pickupDateInfo = JSON.parse(info.pickupDateInfo);

src/views/gift-manage/pickup-list.vue

@@ -31,7 +31,7 @@
     <div class="clearfix">
       <dm-pagination class="fr mb0" v-if="tableList.length" background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></dm-pagination>
     </div>
-    <pickup-update-dialog :dialog-visible.sync="dialogVisible" :ids="selectList.map(v => v.ids)" @mutiUpdate="mutiUpdate"></pickup-update-dialog>
+    <pickup-update-dialog :dialog-visible.sync="dialogVisible" :ids="selectList.map(v => v.pickupId)" @mutiUpdate="mutiUpdate"></pickup-update-dialog>
   </div>
 </template>
 
@@ -71,7 +71,9 @@ export default {
   },
   methods: {
     exportExcel() {
-      window.location = exportPickupStoreExcel + `?dataUrl=/welfare/setting/pickup-list&areaId=${this.currentAreaId}&name=${this.listParams.name}`;
+      exportPickupStoreExcel;
+      // window.location = exportPickupStoreExcel + `?dataUrl=/welfare/setting/pickup-list&name=${this.listParams.name}`;
+      window.location = `https://four.gicdev.com/api-welfare/export-pickup-store-excel?dataUrl=/welfare/setting/pickup-list&name=${this.listParams.name}`;
     },
     mutiUpdate() {
       this.selectList = [];