huangmp 2 жил өмнө
parent
commit
37ac6fac9b

+ 19 - 1
src/views/modules/promotion/promotionUp-add-or-update.vue

@@ -53,6 +53,21 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row>
+        <el-col :span="10">
+          <el-form-item label="是否拉黑" prop="isBlack" size="small">
+            <el-select v-model="dataForm.isBlack" clearable style="width: 330px">
+              <el-option label="拉黑" :value="1"></el-option>
+              <el-option label="正常" :value="0"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="10" :offset="1">
+          <el-form-item label="备注" prop="remark" size="small">
+            <el-input v-model="dataForm.remark" type="textarea"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <span slot="footer" class="dialog-footer">
       <el-button class="default-btn" @click="visible = false">{{$t("crud.filter.cancelBtn")}}</el-button>
@@ -74,7 +89,10 @@ export default {
         fansNum: null,
         tgUserName: null,
         shopId: this.$store.state.user.shopId,
-        shopName: null
+        shopName: null,
+        remark: null,
+        isBlack: 0,
+        createTime: null
       },
       dataRule: {
       },

+ 27 - 0
src/views/modules/promotion/promotionUp.vue

@@ -30,6 +30,18 @@
               </el-option>
             </el-select>
           </el-form-item>
+          <el-form-item label="登记时间" prop="orderTime">
+            <el-date-picker
+              :clearable="true"
+              v-model="createTimeRange"
+              type="datetimerange"
+              align="right"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+              :default-time="['00:00:00', '23:59:59']">
+            </el-date-picker>
+          </el-form-item>
           <el-form-item>
             <div class="default-btn primary-btn" @click="searchChange()">{{$t("crud.searchBtn")}}</div>
             <div class="default-btn" @click="clear()">重置</div>
@@ -79,6 +91,18 @@
               <span>{{ scope.row.shopName}}</span>
             </template>
           </el-table-column>
+          <!-- 登记时间 -->
+          <el-table-column label="登记时间" prop="createTime" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.createTime}}</span>
+            </template>
+          </el-table-column>
+          <!-- 备注 -->
+          <el-table-column label="备注" prop="createTime" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.remark}}</span>
+            </template>
+          </el-table-column>
           <el-table-column align="center" fixed="right" :label="$t('publics.operating')" width="auto">
             <template slot-scope="scope">
               <div class="text-btn-con">
@@ -129,6 +153,7 @@ export default {
         {value: '快手', label: '快手'},
         {value: 'B站', label: 'B站'},
       ],
+      createTimeRange:[],
     }
   },
   components: {
@@ -187,6 +212,8 @@ export default {
           Object.assign({
             current: page == null ? this.page.currentPage : page.currentPage,
             size: page == null ? this.page.pageSize : page.pageSize,
+            startTime: this.createTimeRange == null ? null : this.createTimeRange[0] ? this.createTimeRange[0] : null,
+            endTime: this.createTimeRange == null ? null : this.createTimeRange[1] ? this.createTimeRange[1] : null
           },
             this.searchForm
           )