Browse Source

Merge branch 'develop_yh48' of jianguan-web/qpls-md-html into pre-release

刘俊俊 8 tháng trước cách đây
mục cha
commit
757c5bbdcf

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

@@ -33,11 +33,11 @@
                 {{ form.sort||form.sort==0?form.sort:'--' }}
               </a-form-model-item>
             </a-col>
-            <a-col :xs="12" :sm="12">
+            <!-- <a-col :xs="12" :sm="12">
               <a-form-model-item label="参与经销商" prop="allDealerFlag" :label-col="{span:8}" :wrapper-col="{span:14}">
                 {{ form.allDealerFlag=='1'?'全部经销商':'部分经销商' }}
               </a-form-model-item>
-            </a-col>
+            </a-col> -->
             <a-col :xs="24" :sm="24">
               <a-form-model-item label="封面图片" prop="imageUrl">
                 <img
@@ -54,11 +54,11 @@
                 {{ form.description||'--' }}
               </a-form-model-item>
             </a-col>
-            <a-col :xs="24" :sm="24">
+            <!-- <a-col :xs="24" :sm="24">
               <a-form-model-item label="加盟商开关权限:" prop="dealerOpenFlag" >
                 {{ form.dealerOpenFlag?form.dealerOpenFlag==='1'?'是':'否':'--' }}
               </a-form-model-item>
-            </a-col>
+            </a-col> -->
             <div v-if="form.promoType==='BUY_PROD_GIVE_VALID'">
               <a-col :xs="12" :sm="12">
                 <a-form-model-item label="券名称" prop="validName" :label-col="{span:8}" :wrapper-col="{span:14}">

+ 1 - 1
src/views/salesManagement/salesQuery/edit.vue

@@ -14,7 +14,7 @@
             @click="handleEdit"
             style="margin-left:10px"
             key="0">编辑客户信息</a-button>
-          <span style="margin-right:10px;color: #ED1C24;" v-if="detailData.sourceType==='XPRH_PURCHASE'">请注意:该销售单若为促销订单,增删改产品会影响促销活动s</span>
+          <span style="margin-right:10px;color: #ED1C24;" v-if="detailData.sourceType==='XPRH_PURCHASE'">请注意:该销售单若为促销订单,增删改产品会影响促销活动</span>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
         <template slot="extra" v-if="$hasPermissions('B_salesPrint')">

+ 1 - 1
src/views/salesManagement/salesQueryNew/edit.vue

@@ -17,7 +17,7 @@
           @click="handleEdit"
           key="0"><a-icon type="edit" /> 编辑</a-button>
         <a-button id="purchaseNewOrderEdit-back-btn" type="link" @click="handleBack" class="button-default"> <a-icon type="rollback" /> 返回列表</a-button>
-        <span style="margin-right:10px;color: #ED1C24;" v-if="detailData.sourceType==='XPRH_PURCHASE'">请注意:该销售单若为促销订单,增删改产品会影响促销活动s</span>
+        <span style="margin-right:10px;color: #ED1C24;" v-if="detailData.sourceType==='XPRH_PURCHASE'">请注意:该销售单若为促销订单,增删改产品会影响促销活动</span>
       </template>
       <!-- 操作区,位于 title 行的行尾 -->
       <template slot="extra" v-if="$hasPermissions('B_salesPrint')">