浏览代码

修改bug

chenrui 10 月之前
父节点
当前提交
95042e6684

+ 19 - 20
src/views/promotionRulesManagement/promotionManagement/detailModal.vue

@@ -61,7 +61,7 @@
               {{ form.publishFlag?form.publishFlag==='1'?'是':'否':'--' }}
             </a-form-model-item>
           </div>
-          <div v-if="form.contentType==='LINK'">
+          <div v-show="form.contentType==='LINK'&&form.content === '/pagesB/promoDetail'">
             <a-form-model-item label="基本规则" prop="ruleType">
               {{ form.promoRule&&form.promoRule.ruleType?form.promoRule.ruleType==='ticket'?'指定产品返代金券':'--':'--' }}
             </a-form-model-item>
@@ -107,24 +107,24 @@
               </div>
               <div>--</div>
             </a-form-model-item>
+            <a-form-model-item label="返券产品" prop="publishFlag" >
+              <div class="productTable">
+                <s-table
+                  class="sTable"
+                  ref="table"
+                  size="small"
+                  :rowKey="(record) => record.id"
+                  :columns="columns"
+                  :data="loadData"
+                  :defaultLoadData="false"
+                  :style="{ maxHeight: 300+'px' }"
+                  :scroll="{ y:230 }"
+                  bordered>
+                </s-table>
+              </div>
+            </a-form-model-item>
           </div>
         </a-form-model>
-        <a-card size="small" :bordered="false" class="pages-wrap" v-show="form.contentType==='LINK'">
-          <div class="productTable">
-            <s-table
-              class="sTable"
-              ref="table"
-              size="small"
-              :rowKey="(record) => record.id"
-              :columns="columns"
-              :data="loadData"
-              :defaultLoadData="false"
-              :style="{ maxHeight: 300+'px' }"
-              :scroll="{ y:230 }"
-              bordered>
-            </s-table>
-          </div>
-        </a-card>
         <div class="btn-cont">
           <a-button id="promotion-basicInfo-modal-back" @click="isShow = false">关闭</a-button>
         </div>
@@ -238,7 +238,7 @@ export default {
   methods: {
     // 重置
     resetSearchForm () {
-      this.form =  {
+      this.form = {
         promoActiveSn: undefined, // 促销活动sn
         title: '', // 标题
         imageSet: '', // 图片
@@ -384,8 +384,7 @@ export default {
       background:#fff;
    }
    .productTable{
-     width:85%;
-     margin:0 auto;
+     width:100%;
    }
   }
 

+ 4 - 4
src/views/promotionRulesManagement/promotionManagement/edit.vue

@@ -259,7 +259,7 @@
                   :disabled="isDisabled"
                   type="textarea"
                   placeholder="请输入使用说明(最多50个字符)"
-                  :maxLength="200" />
+                  :maxLength="50" />
               </a-form-model-item>
             </a-col>
             <div style="text-align:center;" v-if="!isShowNextStep"><a-button type="primary" size="large" :disabled="isDisabled" @click="handleSave('part')" >保存后设置产品</a-button></div>
@@ -276,7 +276,7 @@
                     :disabled="isDisabled"
                     :getPopupContainer="triggerNode => triggerNode.parentNode"
                     :replaceFields="{children:'children',title: 'productTypeName',key: 'productTypeSn',value: 'productTypeSn'}"
-                    @blur="onChangeTree"
+                    @change="onChangeTree"
                     placeholder="请选择产品范围" />
                 </div>
               </a-form-model-item>
@@ -294,7 +294,7 @@
                       :max="99999999"
                       :disabled="isDisabled"
                       size="small"/> 元
-                    <a-button type="primary" :disabled="isDisabled" class="button-primary" size="small" @click="handleBatchAdd">批量添加</a-button>
+                    <a-button type="primary" :disabled="isDisabled" class="button-primary" size="small" @click="handleBatchAdd">批量设置</a-button>
                   </div>
                   <a-button type="primary" :disabled="isDisabled" @click="handleAddProduct" size="small">添加产品</a-button>
                 </div>
@@ -510,7 +510,7 @@ export default {
             }
           } else if (res.data.contentType == 'LINK') {
             _this.form.contentLink = res.data.content
-            _this.form.linkType = '1'
+            _this.form.linkType = res.data.content != '/pagesB/promoDetail' ? '2' : '1'
             if (res.data.promoRule) {
               _this.isShowNextStep = true
               _this.sellForm.range = '1'

+ 4 - 15
src/views/promotionRulesManagement/promotionManagement/list.vue

@@ -12,21 +12,10 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="促销名称">
-                <a-input id="promotion-promotionName" v-model.trim="queryParam.name" allowClear placeholder="请输入总部销退单号"/>
+                <a-input id="promotion-promotionName" v-model.trim="queryParam.name" allowClear placeholder="请输入促销名称"/>
               </a-form-item>
-            </a-col>
-            <a-col :md="4" :sm="24">
-              <a-form-item label="显示状态">
-                <a-select
-                  v-model="queryParam.showFlag"
-                  placeholder="请选择显示状态"
-                >
-                  <a-select-option :value="1">已显示</a-select-option>
-                  <a-select-option :value="0">未显示</a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-            <a-col :md="4" :sm="24">
+            </a-col>s
+            <a-col :md="6" :sm="24">
               <a-form-item label="促销状态">
                 <v-select
                   v-model="queryParam.state"
@@ -37,7 +26,7 @@
                   allowClear></v-select>
               </a-form-item>
             </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :md="6" :sm="24">
               <span class="table-page-search-submitButtons">
                 <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
                 <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>