css

src/views/Store/goodslist.vue

@@ -16,15 +16,18 @@
             <el-option label="不参与询价" value="2"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="币种" prop="join_inquiry">
-          <el-select v-model="formParam.join_inquiry" placeholder="全部" clearable>
+        <el-form-item label="币种" prop="currency">
+          <el-select v-model="formParam.currency" placeholder="全部" clearable>
             <el-option label="全部" value=""></el-option>
-            <el-option label="参与询价" value="1"></el-option>
-            <el-option label="不参与询价" value="2"></el-option>
+            <el-option label="RMB（人民币）" value="1"></el-option>
+            <el-option label="USD（美元）" value="2"></el-option>
+            <el-option label="HKD（港币）" value="3"></el-option>
+            <el-option label="EUR（欧元）" value="4"></el-option>
+            <el-option label="GBP（英镑）" value="5"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="创建时间">
-          <el-date-picker v-model="formParam.date" value-format="yyyy-MM-dd" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+          <el-date-picker v-model="date_val" value-format="yyyy-MM-dd" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="onSubmit">搜索</el-button>
@@ -214,13 +217,15 @@
       <div class="data-box">
         <el-table :data="list" border max-height="600" @selection-change="handleSelectionChange">
           <el-table-column fixed type="selection" width="40" align="center"></el-table-column>
-          <el-table-column prop="goods_name" label="型号" :show-overflow-tooltip="true" align="center"></el-table-column>
-          <el-table-column prop="brand_name" label="品牌" :show-overflow-tooltip="true" align="center"></el-table-column>
+          <el-table-column prop="goods_name" label="型号" min-width="150" :show-overflow-tooltip="true" align="center"></el-table-column>
+          <el-table-column prop="brand_name" label="品牌" width="150" :show-overflow-tooltip="true" align="center"></el-table-column>
           <el-table-column prop="start_order_number" label="起订量" width="120" :show-overflow-tooltip="true" align="center"></el-table-column>
           <el-table-column prop="currency_str" label="币种" width="120" :show-overflow-tooltip="true" align="center"></el-table-column>
-          <el-table-column prop="price_origin" label="价格" width="120" :show-overflow-tooltip="true" align="center"></el-table-column>
+          <el-table-column prop="price_origin" label="价格" width="150" :show-overflow-tooltip="true" align="center"></el-table-column>
           <el-table-column prop="batch" label="批次" width="120" :show-overflow-tooltip="true" align="center"></el-table-column>
           <el-table-column prop="stock_number" label="库存" width="120" :show-overflow-tooltip="true" align="center"></el-table-column>
+          <el-table-column prop="delivery_time_cn" label="大陆交期" width="120" :show-overflow-tooltip="true" align="center"></el-table-column>
+          <el-table-column prop="delivery_time_hk" label="香港交期" width="120" :show-overflow-tooltip="true" align="center"></el-table-column>
           <el-table-column prop="join_inquiry_str" label="状态" width="120" :show-overflow-tooltip="true" align="center">
             <template slot-scope="scope">
               <el-tag :type="scope.row.join_inquiry === 1 ? 'success' : 'primary'" disable-transitions>{{ scope.row.join_inquiry_str }}</el-tag>
@@ -546,11 +551,13 @@ export default {
         }
       ],
       updateBestgoodsParam: [],
+      date_val: '',//创建时间
       formParam: {
-        date: '',
-        goods_name: '',
-        brand_name: '',
-        join_inquiry: ''
+        goods_name: '',//型号
+        brand_name: '',//品牌
+        join_inquiry: '',//状态
+        currency: '',//币种
+        date: ''//创建时间
       },
       multipleSelection: [],
       gridData: [{
@@ -999,7 +1006,16 @@ export default {
         this.periodIndexTwo = index;
       }
     },
+    /**
+     * 获取数据
+     */
     getData() {
+      //格式化时间
+      if (this.date_val) {
+        this.formParam.date = this.date_val[0] + '~' + this.date_val[1];
+      } else {
+        this.formParam.date = '';
+      }
       var params = Object.assign({}, {page: this.page, limit: this.limit}, this.formParam);
       this.$http('GET', "/api/bestgoods/getBestGoodsList", params).then(res => {
         if (res.code === 0) {