소스 검색

修改bug

chenrui 11 달 전
부모
커밋
a9a4a2f34d
2개의 변경된 파일22개의 추가작업 그리고 23개의 파일을 삭제
  1. 18 19
      src/views/promotionManagement/promotionInfo/detailModal.vue
  2. 4 4
      src/views/promotionManagement/promotionInfo/edit.vue

+ 18 - 19
src/views/promotionManagement/promotionInfo/detailModal.vue

@@ -58,7 +58,7 @@
               </video>
             </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>
@@ -104,24 +104,24 @@
               </div>
               <div>--</div>
             </a-form-model-item>
+            <a-form-model-item label="产品范围" prop="productRangeList" >
+              <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>
@@ -368,8 +368,7 @@ export default {
       background:#fff;
    }
    .productTable{
-     width:85%;
-     margin:0 auto;
+     width:100%;
    }
   }
 

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

@@ -250,7 +250,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>
@@ -267,7 +267,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>
@@ -284,9 +284,9 @@
                       :precision="2"
                       :max="99999999"
                       size="small"/> 元
-                    <a-button type="primary" class="button-primary" size="small" @click="handleBatchAdd">批量添加</a-button>
+                    <a-button type="primary" class="button-primary" size="small" @click="handleBatchAdd">批量设置</a-button>
                   </div>
-                  <a-button type="primary" :disabled="sellForm.productRangeList&&sellForm.productRangeList.length>0" @click="handleAddProduct" size="small">添加产品</a-button>
+                  <a-button type="primary" v-if="sellForm.productRangeList&&sellForm.productRangeList.length>0" @click="handleAddProduct" size="small">添加产品</a-button>
                 </div>
               </a-form-model-item>
             </a-col>