Merge branch 'dev/ver/3.0.0' into 'master'

Dev/ver/3.0.0

See merge request !15

public/uploadSku.csv

 *上架有效期,*商品型号,*制造商,*库存数量,"*最小起订量
 *上架有效期,*商品型号,*制造商,*库存数量,"*最小起订量
-(MOQ)",标准包装量（MPQ）,封装,*批次,大陆交期,香港交期,简短描述,物料编码,*显示类型（国内现货，国际现货，猎芯期货）,成本价(RMB),成本价(USD),阶梯数量1,国内含税价1(￥),香港交货价1($),阶梯数量2,国内含税价2(￥),香港交货价2($),阶梯数量3,国内含税价3(￥),香港交货价3($),阶梯数量4,国内含税价4（￥）,香港交货价4（$）,阶梯数量5,国内含税价5（￥）,香港交货价5（$）,阶梯数量6,国内含税价6（￥）,香港交货价6（$）,阶梯数量7,国内含税价7（￥）,香港交货价7（$）,阶梯数量8,国内含税价8（￥）,香港交货价8（$）,阶梯数量9,国内含税价9（￥）,香港交货价9（$）
-2022/2/20,NFM18CC471R1C3D,ws-brand-test-1,1200,1000,1000,,2205,2-5工作日,7-10工作日,,,国内现货,,,1000,0.08,0.06,2000,0.05,0.04,3000,0.03,0.02,,,,,,,,,,,,,,,,,,
-2022/2/20,FM18CC1R1C3,ws-brand-01,1200,1000,1000,,22+,2-5工作日,7-10工作日,,,国际现货,,,1000,0.08,0.06,2000,0.05,0.04,3000,0.03,0.02,,,,,,,,,,,,,,,,,,
-2022/2/20,FM18CC1R1C3,ws-brand-01,1200,1000,1000,,2201-2205,2-5工作日,7-10工作日,,,猎芯期货,,,1000,0.08,0.06,2000,0.05,0.04,3000,0.03,0.02,,,,,,,,,,,,,,,,,,
+(MOQ)",标准包装量（MPQ）,递增量,封装,*批次,大陆交期,香港交期,简短描述,物料编码,*显示类型（国内现货，国际现货，猎芯期货）,成本价(RMB),成本价(USD),阶梯数量1,国内含税价1(￥),香港交货价1($),阶梯数量2,国内含税价2(￥),香港交货价2($),阶梯数量3,国内含税价3(￥),香港交货价3($),阶梯数量4,国内含税价4（￥）,香港交货价4（$）,阶梯数量5,国内含税价5（￥）,香港交货价5（$）,阶梯数量6,国内含税价6（￥）,香港交货价6（$）,阶梯数量7,国内含税价7（￥）,香港交货价7（$）,阶梯数量8,国内含税价8（￥）,香港交货价8（$）,阶梯数量9,国内含税价9（￥）,香港交货价9（$）
+2022/2/20,NFM18CC471R1C3D,ws-brand-test-1,1200,1000,1000,1,,2205,2-5工作日,7-10工作日,,,国内现货,,,1000,0.08,0.06,2000,0.05,0.04,3000,0.03,0.02,,,,,,,,,,,,,,,,,,
+2022/2/20,FM18CC1R1C3,ws-brand-01,1200,1000,1000,1,,22+,2-5工作日,7-10工作日,,,国内现货,,,1000,0.08,0.06,2000,0.05,0.04,3000,0.03,0.02,,,,,,,,,,,,,,,,,,
+2022/2/20,FM18CC1R1C3,ws-brand-01,1200,1000,1000,1,,2201-2205,2-5工作日,7-10工作日,,,国内现货,,,1000,0.08,0.06,2000,0.05,0.04,3000,0.03,0.02,,,,,,,,,,,,,,,,,,

src/views/Store/list.vue

@@ -303,7 +303,7 @@
             <el-table-column prop="cp_time_temp" label="上架有效期" width="160" :show-overflow-tooltip="true"></el-table-column>
             <el-table-column prop="cp_time_temp" label="上架有效期" width="160" :show-overflow-tooltip="true"></el-table-column>
             <el-table-column label="修改上架有效期" width="160">
             <el-table-column label="修改上架有效期" width="160">
               <template slot-scope="scope">
               <template slot-scope="scope">
-                <el-date-picker v-model="scope.row.cp_time" :picker-options="pickerOptions(scope.row.cp_time)" type="date" placeholder="选择日期" style="width: 128px" value-format="yyyy-MM-dd"></el-date-picker>
+                <el-date-picker v-model="scope.row.cp_time" type="date" placeholder="选择日期" style="width: 128px" value-format="yyyy-MM-dd"></el-date-picker>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
           </el-table>
           </el-table>
@@ -329,7 +329,6 @@ export default {
   name: "list",
   name: "list",
   data() {
   data() {
     return {
     return {
-      pickerOptions: {},
       total: 0,
       total: 0,
       limit: 10,
       limit: 10,
       page: 1,
       page: 1,
@@ -365,14 +364,6 @@ export default {
     }
     }
     this.getData();
     this.getData();
     this.getSkuRankList();
     this.getSkuRankList();
-    this.pickerOptions = function (val) {
-      return {
-        disabledDate(time) {
-          let limit_date = new Date(val);
-          return time.getTime() > limit_date.getTime() + 3600 * 1000 * 24 * 30;
-        }
-      }
-    }
   },
   },
   methods: {
   methods: {
     /**
     /**