lex-xin 4 yıl önce
ebeveyn
işleme
d3d59415e5

+ 48 - 1
src/views/accompanyManager/accompanyBuys.vue

@@ -42,7 +42,6 @@
       <el-form-item>
         <el-button @click="search" type="danger">搜索</el-button>
         <el-button @click="onReSet" type="primary">重置</el-button>
-       
       </el-form-item>
       <el-form-item>
            <!-- <div class="newBand" @click="onExport">导出</div> -->
@@ -68,6 +67,22 @@
           </template>
         </el-table-column>
         <el-table-column align="center" prop="lastClassDate" label="结束日期">
+          <template slot="header"
+                      slot-scope="scope">
+            <p style="position: relative; "> 结束日期 <el-tooltip placement="top"
+                          popper-class="mTooltip">
+                <div slot="content">
+                  免费网管课最后一节课截止日期
+                </div>
+                <!-- <img :src="imageIcon"
+                      class="micon el-tooltip"
+                      style="width:8px height:8px"
+                      alt /> -->
+                <i class="el-icon-question"
+                    style="font-size: 18px; color: #F56C6C"></i>
+              </el-tooltip>
+            </p>
+          </template>
           <template slot-scope="scope">
             <div>
               <p>{{scope.row.lastClassDate | formatTimer}}</p>
@@ -75,6 +90,22 @@
           </template>
         </el-table-column>
         <el-table-column align="center" prop="firstBuyTime" label="购买日期">
+          <template slot="header"
+                      slot-scope="scope">
+            <p style="position: relative; "> 购买日期 <el-tooltip placement="top"
+                          popper-class="mTooltip">
+                <div slot="content">
+                  付费网管课第一次购买时间
+                </div>
+                <!-- <img :src="imageIcon"
+                      class="micon el-tooltip"
+                      style="width:8px height:8px"
+                      alt /> -->
+                <i class="el-icon-question"
+                    style="font-size: 18px; color: #F56C6C"></i>
+              </el-tooltip>
+            </p>
+          </template>
           <template slot-scope="scope">
             <div>
               <p>{{scope.row.firstBuyTime | formatTimer}}</p>
@@ -82,6 +113,22 @@
           </template>
         </el-table-column>
         <el-table-column align="center" prop="intervalDay" label="时间差">
+          <template slot="header"
+                      slot-scope="scope">
+            <p style="position: relative; "> 时间差 <el-tooltip placement="top"
+                          popper-class="mTooltip">
+                <div slot="content">
+                  付费网管课结束后与购买日期的时间差
+                </div>
+                <!-- <img :src="imageIcon"
+                      class="micon el-tooltip"
+                      style="width:8px height:8px"
+                      alt /> -->
+                <i class="el-icon-question"
+                    style="font-size: 18px; color: #F56C6C"></i>
+              </el-tooltip>
+            </p>
+          </template>
               <template slot-scope="scope">
             <div>
               <p>{{scope.row.intervalDay + '天'}}</p>

+ 8 - 0
src/views/businessManager/shopManager/shopList.vue

@@ -7,6 +7,10 @@
       <div @click="onShopOperation('create')"
            v-permission="'/shopOperation'"
            class='newBand'>添加</div>
+
+      <!-- <el-button style="background-color: #14928a; border-color: #14928a; color: #fff;">主要按钮</el-button>
+      <el-button style="background-color: #14928a; border-color: #14928a; color: #fff;">主要按钮</el-button>
+      <el-button style="background-color: #14928a; border-color: #14928a; color: #fff;">主要按钮</el-button> -->
       <!-- 搜索类型 -->
       <!-- <el-form :inline="true"
                class="searchForm"
@@ -38,6 +42,10 @@
                            label="商品编号">
           </el-table-column>
           <el-table-column align='center'
+                           prop="sn"
+                           label="货号">
+          </el-table-column>
+          <el-table-column align='center'
                            prop="brand"
                            label="品牌">
           </el-table-column>

+ 1 - 1
src/views/businessManager/shopManager/shopOperation.vue

@@ -167,7 +167,7 @@ export default {
         desc: null
       },
       rules: {
-        sm: [{ required: true, message: '请输入商品货号', trigger: 'blur' }],
+        sn: [{ required: true, message: '请输入商品货号', trigger: 'blur' }],
         brand: [{ required: true, message: '请输入品牌', trigger: 'blur' },
         { min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' }],
         name: [{ required: true, message: '请输入商品名称', trigger: 'blur' },