11.1

fuintAdmin/src/views/member/manage.vue

@@ -239,8 +239,8 @@
     <div class="cot-box" v-if="tabindex==2">
       <div>
         <el-form :model="queryParams2" ref="queryForm" size="small" :inline="true" label-width="120px">
-          <el-form-item label="" prop="groupName" style="width: 180px">
+          <el-form-item label="" prop="activityName" style="width: 180px">
-            <el-input placeholder="请输入活动名称"  v-model="queryParams.tableName"/>
+            <el-input placeholder="请输入活动名称"  v-model="queryParams2.activityName"/>
           </el-form-item>
 
           <el-form-item label="" prop="groupName" style="width: 180px">
@@ -288,7 +288,7 @@
               <span>{{ scope.row.sendGift || "--" }}</span>
             </template>
           </el-table-column>
-          <el-table-column prop="sendWay" align="center" label="群发方式">
+          <!-- <el-table-column prop="sendWay" align="center" label="群发方式">
             <template slot-scope="scope">
               <span>{{ scope.row.sendWay || "--" }}</span>
             </template>
@@ -297,7 +297,7 @@
             <template slot-scope="scope">
               <span>{{ scope.row.massContent || "--" }}</span>
             </template>
-          </el-table-column>
+          </el-table-column> -->
 
           <el-table-column prop="userNum" align="center" label="群发会员数量">
             <template slot-scope="scope">

fuintAdmin/src/views/oilConfig/oilPurchase/list.vue

@@ -17,7 +17,7 @@
         </el-form-item>
 
         <el-form-item label="" prop="numberId">
-          <el-select v-model="queryParams.numberId" placeholder="请选择油品油号">
+          <el-select v-model="queryParams.numberId" placeholder="请选择油品-油号">
             <el-option
               v-for="option in selectOilTypeByPrice"
               :key="option.numberId"
@@ -44,7 +44,7 @@
             type="date"
             placeholder="开始日期">
           </el-date-picker>
-          至
+          ~
           <el-date-picker
             v-model="endTime"
             style="width: 160px"
@@ -70,7 +70,7 @@
                   border
                   :default-sort="defaultSort">
           <el-table-column label="序号" align="center" type="index"/>
-          <el-table-column label="进货单号" align="center" prop="purchaseNo"/>
+          <el-table-column label="进货单号" align="center" width="150px" prop="purchaseNo"/>
           <el-table-column label="供应商" align="center" prop="supplierss"/>
           <el-table-column label="油品-油号" align="center" prop="oils"/>
           <el-table-column label="入库油罐" align="center" prop="tanks"/>
@@ -79,7 +79,7 @@
             <template slot-scope="scope">
               <div slot="reference" class="name-wrapper">
                 <div style="color: #FF770F" v-if="scope.row.status == 'await'">待审核</div>
-                <div style="color: #0DC291" v-if="scope.row.status == 'qrts'">已审核入库</div>
+                <div style="color: #0DC291" v-if="scope.row.status == 'qrts'">已入库</div>
                 <div style="color: #F44522" v-if="scope.row.status == 'yzf'">已作废</div>
                 <div style="color: #00CAFF" v-if="scope.row.status == 'ysh'">已审核</div>
               </div>