chenrui 8 månader sedan
förälder
incheckning
83c2d1943f

+ 3 - 15
src/views/promotionManagement/promotionInfo/detailModal.vue

@@ -107,17 +107,6 @@
                     :style="{ maxHeight: 300+'px' }"
                     :scroll="{ y:230 }"
                     bordered>
-                    <!-- 特价产品 标题 -->
-                    <template slot="titleType">
-                      {{ form.promoType==='PROMO_PROD'?form.discountTypes==='STRAIGHT_DOWN'?'直降金额':'折扣(%)':form.promoType==='BUY_PROD_GIVE_VALID'?'返券金额':'--' }}
-                    </template>
-                    <!-- 特价价格-->
-                    <template slot="specialOffer" slot-scope="text,record">
-                      <!-- 直降 -->
-                      <span v-if="form.discountType==='STRAIGHT_DOWN'">{{ (record.shopProductPrice-record.resultValue).toFixed(2) }}</span>
-                      <!-- 折扣 -->
-                      <span v-else>{{ (record.shopProductPrice*record.resultValue/100).toFixed(2) }}</span>
-                    </template>
                   </s-table>
                 </div>
               </a-form-model-item>
@@ -235,16 +224,15 @@ export default {
         { title: '产品编码', dataIndex: 'productCode', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'productName', width: '18%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '原厂编码', dataIndex: 'productOrigCode', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '售价', dataIndex: 'shopProductPrice', width: '10%', align: 'right', customRender: text => { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
+        { title: '商城售价', dataIndex: 'shopProductPrice', width: '10%', align: 'right', customRender: text => { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
       ]
       if (_this.form.promoType === 'BUY_PROD_GIVE_PROD') {
         arr.splice(4, 0, { title: '买', dataIndex: 'conditionValue', width: '10%', align: 'center', customRender: function (text) { return text || '--' } })
         arr.splice(5, 0, { title: '赠', dataIndex: 'resultValue', width: '10%', align: 'center', customRender: function (text) { return text || '--' } })
       } else if (_this.form.promoType === 'PROMO_PROD') {
-        arr.splice(5, 0, { slots: { title: 'titleType' }, dataIndex: 'resultValue', width: '10%', align: 'center', customRender: function (text) { return text || '--' } })
-        arr.splice(6, 0, { title: '特价价格', width: '10%', align: 'right', scopedSlots: { customRender: 'specialOffer' } })
+        arr.splice(5, 0, { title: '特价价格', dataIndex: 'conditionValue', width: '10%', align: 'right', customRender: text => { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       } else {
-        arr.splice(5, 0, { slots: { title: 'titleType' }, dataIndex: 'resultValue', width: '10%', align: 'center', customRender: function (text) { return text || '--' } })
+        arr.splice(5, 0, { title: '返券金额', dataIndex: 'resultValue', width: '10%', align: 'center', customRender: text => { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       return arr
     }

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

@@ -14,6 +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>
         </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'">请注意:该订单为促销订单,增删产品会影响促销活动</span>
+        <span style="margin-right:10px;color: #ED1C24;" v-if="detailData.sourceType==='XPRH_PURCHASE'">请注意:该销售单若为促销订单,增删改产品会影响促销活动s</span>
       </template>
       <!-- 操作区,位于 title 行的行尾 -->
       <template slot="extra" v-if="$hasPermissions('B_salesPrint')">