update: 自提点增加调货配置

src/views/goods/gift/info.vue

@@ -1196,8 +1196,8 @@ export default {
           //上架时间
           this.giftForm.releaseType = res.data.result.releaseType;
           if (this.giftForm.releaseType === 2) {
-            this.giftForm.limitTimeBegin[0] = res.data.result.limitTimeBegin;
-            this.giftForm.limitTimeBegin[1] = res.data.result.limitTimeEnd;
+            this.giftForm.limitTimeBegin[0] = res.data.result.limitTimeBegin || '';
+            this.giftForm.limitTimeBegin[1] = res.data.result.limitTimeEnd || '';
           } else {
             this.giftForm.limitTimeBegin = [];
           }

src/views/order/couponExchange.vue

@@ -111,11 +111,11 @@
                 <memberInfo :memberObj="scope.row" :requestProject="requestProject" :placement="placement"></memberInfo>
               </template>
             </el-table-column>
-            <el-table-column prop="memberCardStatus" label="会员状态" min-width="120px">
+            <!-- <el-table-column prop="memberCardStatus" label="会员状态" min-width="120px">
               <template slot-scope="{ row }">
                 <span>{{ row.memberCardStatus == 1 ? '正常' : row.memberCardStatus == 2 ? '冻结' : '--' }}</span>
               </template>
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column fixed="right" prop="saleNum" label="实付金额" min-width="120px">
               <template slot-scope="scope">
                 <p style="line-height:18px">积分：{{ scope.row.unitCostIntegral }}</p>

src/views/order/giftExchange.vue

@@ -120,11 +120,11 @@
                 </p> -->
               </template>
             </el-table-column>
-            <el-table-column prop="memberCardStatus" label="会员状态" min-width="120px">
+            <!-- <el-table-column prop="memberCardStatus" label="会员状态" min-width="120px">
               <template slot-scope="{ row }">
                 <span>{{ row.memberCardStatus == 1 ? '正常' : row.memberCardStatus == 2 ? '冻结' : '--' }}</span>
               </template>
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column prop="refundStatus" label="售后" min-width="120px">
               <template slot-scope="scope">
                 <p style="line-height:18px" v-if="scope.row.refundStatusNowLog === 0">退款中</p>

src/views/setting/convenSet.vue

@@ -133,7 +133,7 @@ export default {
             openAutoShelf: this.form.openAutoShelf ? 1 : 0,
             showStoreType: this.form.showStoreType.join(','),
             stockShow: this.form.stockShow,
-            stockShowAmount: this.form.stockShow ? this.form.stockShowAmount : null
+            stockShowAmount: this.form.stockShowAmount
           };
           if (params.autoConfirmReceipt === 1) params.autoConfirmReceiptDay = this.form.autoConfirmReceiptDay;
           this.btnLoading = true;

src/views/setting/editDeliver.vue

@@ -65,10 +65,10 @@
                 </el-radio-group>
               </el-form-item>
               <div v-if="form.dateType === 1">
-                <el-form-item label="商户备货设置" required>
+                <el-form-item label="现货提货配置" required>
                   <template>
                     <div class="radio-item">
-                      <el-radio v-model="form.radio" :label="1">下单当天</el-radio>
+                      <el-radio v-model="form.radio" :label="1">门店有货可提情况，下单当天</el-radio>
                       <el-form-item style="display:inline-block;margin-left:0px" prop="timeHours">
                         <el-input type="text" v-model="form.timeHours" style="width:120px;" size="mini"> </el-input>
                       </el-form-item>
@@ -79,7 +79,7 @@
                       <span>分钟后，买家可提货</span>
                     </div>
                     <div class="radio-item">
-                      <el-radio v-model="form.radio" :label="2">下单</el-radio>
+                      <el-radio v-model="form.radio" :label="2">门店有货可提情况，下单</el-radio>
                       <el-form-item style="display:inline-block;margin-left:0px" prop="timeDay">
                         <el-input type="text" v-model="form.timeDay" style="width:120px;" size="mini"> </el-input>
                       </el-form-item>
@@ -87,6 +87,14 @@
                     </div>
                   </template>
                 </el-form-item>
+                <el-form-item v-if="erpGoodsFlag" label="商户调货配置" prop="transferDelayDay">
+                  门店调货情况，下单<el-input type="text" v-model="form.transferDelayDay" style="width:120px;margin-left:30px" size="mini" />
+                  <span>天后，买家可提货</span>
+                  <div class="tip-warm">
+                    <p>门店调货必须对接erp，开启【商品兑换库存同步接口】，否则该配置不生效。</p>
+                    <p>门店调货情况，建议设置较长的提货有效期，以防订单超期关闭引起客诉。</p>
+                  </div>
+                </el-form-item>
                 <el-form-item label="提货有效期" prop="overTime">
                   <span>备货完成</span>
                   <el-input v-model="form.overTime" style="width:120px"></el-input>
@@ -203,6 +211,16 @@ export default {
         callback();
       }
     };
+    let transferDelayDayValidator = (rule, value, callback) => {
+      var reg = /^[1-9]\d*$/;
+      if (!reg.test(Number(value))) {
+        callback(new Error('请输入1-90之间的整数'));
+      } else if (Number(value) > 90) {
+        callback(new Error('请输入1-90之间的整数'));
+      } else {
+        callback();
+      }
+    };
     let orderTimeHoursValidator = (rule, value, callback) => {
       // var reg = /^[1-9]\d*$/;
       var reg = /^\+?(0|[1-9][0-9]*)$/;
@@ -262,7 +280,8 @@ export default {
         timeRangeList: [{ timeRange: '' }],
         dataRangeList: [{ dataRange: '' }],
         orderTimeHours: '',
-        validateTime
+        validateTime,
+        transferDelayDay: 7
       },
       //限制开始时间
       pickerOptionsEnd: {
@@ -276,6 +295,7 @@ export default {
         timeHours: [{ validator: timeHoursValidator, trigger: 'blur' }],
         timeMinuter: [{ validator: timeMinuterValidator, trigger: 'blur' }],
         timeDay: [{ validator: timeDayValidator, trigger: 'blur' }],
+        transferDelayDay: [{ validator: transferDelayDayValidator, trigger: 'blur' }],
         orderTimeHours: [{ required: true, message: '请输入时间', trigger: 'blur' }, { validator: orderTimeHoursValidator, trigger: 'blur' }],
         overTime: [{ required: true, message: '请输入提货有效期', trigger: 'blur' }, { validator: overTimeValidator, trigger: 'blur' }]
       },
@@ -287,7 +307,8 @@ export default {
       storeWidgetKey: '', //传递的门店的KeyId
       integralMallPickUpPointId: '-1', //自提点id
       clearableBtn: false,
-      enableAccessControl: false
+      enableAccessControl: false,
+      erpGoodsFlag: 0
     };
   },
   created() {
@@ -301,6 +322,7 @@ export default {
     //   let currentTime1 = new Date(new Date(new Date().getTime() + 1000 * 60).valueOf());
     //   this.form.timeRangeList[0].timeRange = [currentTime, currentTime1];
     // }
+    this.getErpGoodsFlag();
   },
   methods: {
     //添加时间段
@@ -558,7 +580,8 @@ export default {
             choosenTime: [],
             overTime: this.form.status ? Number(this.form.overTime) : null,
             overTimeType: this.form.status ? this.form.overTimeType : 1,
-            dateType: this.form.status ? this.form.dateType : 1
+            dateType: this.form.status ? this.form.dateType : 1,
+            transferDelayDay: this.form.transferDelayDay
           }
         };
 
@@ -665,6 +688,17 @@ export default {
       this.$router.push({
         name: 'deliverSet'
       });
+    },
+    // 检测是否开启 erp商品兑换接口
+    getErpGoodsFlag() {
+      request.get('/api-integral-mall/get-erp-config').then(res => {
+        if (res.data.errorCode === 0) {
+          const result = res.data.result || {};
+          this.erpGoodsFlag = result.goodsStockSync || 0;
+        } else {
+          this.$message.error(res.data.message);
+        }
+      });
     }
   },
   components: {}
@@ -722,7 +756,10 @@ export default {
   border-radius: 4px;
   border: 1px solid #e4e7ed;
 }
-
+.tip {
+  color: #909399;
+  padding-left: 22px;
+}
 /* .time-range .el-date-editor .el-range__close-icon {
   display: none !important;
 } */