css

src/views/Store/list.vue

@@ -19,6 +19,9 @@
         <el-form-item label="更新日期" prop="date">
           <el-date-picker v-model="formParam.date" type="daterange" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
         </el-form-item>
+        <el-form-item label="过期时间" prop="date">
+          <el-date-picker v-model="cp_time_val" type="daterange" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+        </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="onSubmit">搜索</el-button>
           <el-button @click="resetForm('formParam')">重置</el-button>
@@ -333,11 +336,13 @@ export default {
       dialogVisible2: false,//交期弹窗
       dialogVisible3: false,//上架有效期
       downHref: "",
+      cp_time_val: '',
       formParam: {
         goods_name: '',
         status: '',
         brand_name: '',
-        date: ''
+        date: '',
+        cp_time: ''
       },
       multipleSelection: [],
       selectData: [],
@@ -365,16 +370,20 @@ export default {
      * 获取数据
      */
     getData() {
-      this.$http('get', "/api/sku/list", {
-        page: this.page,
-        limit: this.limit,
-        goods_name: this.formParam.goods_name,
-        status: this.formParam.status,
-        brand_id: this.formParam.brand_id,
-        brand_name: this.formParam.brand_name,
-        action_time: this.formParam.date ? this.formParam.date[0] : '',
-        end_time: this.formParam.date ? this.formParam.date[1] : ''
-      }).then(res => {
+      //格式化时间
+      if (this.cp_time_val) {
+        this.formParam.cp_time = this.cp_time_val[0] + '~' + this.cp_time_val[1];
+      } else {
+        this.formParam.cp_time = '';
+      }
+      var params = Object.assign({},
+          {page: this.page},
+          {limit: this.limit},
+          this.formParam,
+          {taction_time: this.formParam.date ? this.formParam.date[0] : ''},
+          {end_time: this.formParam.date ? this.formParam.date[1] : ''})
+
+      this.$http('get', "/api/sku/list", params).then(res => {
         if (res.code === 0) {
           this.tableData = res.data.list || [];
           this.total = Number(res.data.count) || 0;