chenrui hace 10 meses
padre
commit
4fe7865f56

+ 1 - 4
src/views/salesManagement/salesQueryNew/detail.vue

@@ -358,10 +358,7 @@ export default {
     // 取消时,跳转编辑页面
     closeTipModal () {
       this.openTipModal = false
-      this.$router.push({ name: 'salesNewEdit', params: { sn: this.tempSalesBillSn } })
-      this.$nextTick(() => {
-        this.tempSalesBillSn = null
-      })
+      this.$router.push({ name: 'salesNewEdit', params: { sn: this.$route.params.sn } })
     },
     //  重置
     resetSearchForm () {

+ 7 - 1
src/views/salesManagement/salesQueryNew/tipModal.vue

@@ -3,6 +3,7 @@
     centered
     :footer="null"
     :maskClosable="false"
+    :closable="false"
     class="sales-print-type-modal"
     v-model="isShow"
     @cancel="isShow=false"
@@ -22,6 +23,11 @@
           :scroll="{ y: 300 }"
           :pagination="false"
           bordered>
+          <!-- 产品编码 -->
+          <template slot="productCode" slot-scope="text, record">
+            <span>{{ record.productCode||'--' }}</span>
+            <a-badge count="促" v-if="record.promotionFlag==='GIFT'" :number-style="{ backgroundColor: '#52c41a', zoom:'80%' }"></a-badge>
+          </template>
           <!-- 初始价 省  市  特约-->
           <template slot="provincePriceOrig" slot-scope="text, record">
             <span v-if="record.provincePriceOrig||record.provincePriceOrig==0">
@@ -102,7 +108,7 @@ export default {
       sourceData: [],
       priceVal: undefined,
       columns: [
-        { title: '产品编码', dataIndex: 'productCode', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品编码', dataIndex: 'productCode', scopedSlots: { customRender: 'productCode' }, width: '20%', align: 'center' },
         { title: '价格级别', dataIndex: 'priceLevelDictValue', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '价格变更前',
           children: [