lilei 1 ano atrás
pai
commit
bc9385213b

+ 3 - 3
src/api/salesDetailNew.js

@@ -159,7 +159,7 @@ export const insertBatchOfWaitDispatch = (params) => {
 
 // 缺货明细
 export const salesStockoutDetail = (params) => {
-  const url = `/salesn/detail/queryPageStock`
+  const url = `/sales/detail/queryPageStock`
   delete params.pageNo
   delete params.pageSize
   return axios({
@@ -171,7 +171,7 @@ export const salesStockoutDetail = (params) => {
  
 // 导出缺货明细
 export const exportStockout = params => {
-  const url = `/salesn/detail/exportStockout`
+  const url = `/sales/detail/exportStockout`
   delete params.priceType
   return axios.request({
     url: url,
@@ -182,7 +182,7 @@ export const exportStockout = params => {
 }
 // 导出分组缺货明细
 export const exportGroupStockout = params => {
-  const url = `/salesn/detail/exportGroupStockout`
+  const url = `/sales/detail/exportGroupStockout`
   delete params.priceType
   return axios.request({
     url: url,

+ 1 - 1
src/views/salesManagement/salesQueryNew/comps/productList.vue

@@ -373,7 +373,7 @@
       columns () {
         const arr = [
           { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-          { title: '产品编码', dataIndex: 'productEntity.code', scopedSlots: { customRender: 'productCode' }, width: '13%', align: 'center', sorter: true },
+          { title: '产品编码', dataIndex: 'productEntity.code', scopedSlots: { customRender: 'productCode' }, width: '13%', align: 'center' },
           { title: '产品名称', dataIndex: 'productEntity.name', scopedSlots: { customRender: 'productName' }, width: '20%', align: 'left' },
           // { title: '售价', dataIndex: 'price', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
           { title: '销售数量', scopedSlots: { customRender: 'salesNums' }, width: '8%', align: 'center' },

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

@@ -239,7 +239,6 @@ export default {
       spinningAudit: false,
       auditText: null,
       fromRouter: null,
-      activeList: [],
       warehouseSn: undefined
     }
   },
@@ -292,14 +291,7 @@ export default {
     },
     // 打开缺货明细
     openStockOut () {
-      const showMoad = false
-      this.activeList.map(item => {
-        if(!showMoad){
-          showMoad = this.$refs['active-'+item.promoRuleSn][0].outStockStr != ''
-        }
-      })
-
-      if (this.$refs.normalProduct.outStockStr != ''||showMoad) {
+      if (this.$refs.productList.outStockStr != '') {
         this.showStockOut = true
       } else {
         this.$info({

+ 7 - 2
src/views/salesManagement/salesQueryNew/stockOutDetailModal.vue

@@ -26,6 +26,11 @@
         :showPagination="false"
         :defaultLoadData="false"
         bordered>
+        <template slot="productCode" slot-scope="text, record">
+          <span style="padding-right: 15px;">{{ text }}</span>
+          <a-badge count="促" v-if="record.promotionFlag=='GIFT'" :number-style="{ backgroundColor: '#52c41a', zoom:'80%' }"></a-badge>
+          <a-badge count="特" v-if="record.promotionFlag=='DISCOUNT'" :number-style="{ backgroundColor: '#faad14', zoom:'80%' }"></a-badge>
+        </template>
       </s-table>
       <div class="btn-cont" style="padding:20px 20px 0;text-align: center;">
         <!-- <a-button @click="isShow=false">关闭</a-button> -->
@@ -50,7 +55,7 @@
 <script>
 import { STable } from '@/components'
 import { commonMixin } from '@/utils/mixin'
-import { salesStockoutDetail, exportStockout, exportGroupStockout } from '@/api/salesDetail'
+import { salesStockoutDetail, exportStockout, exportGroupStockout } from '@/api/salesDetailNew'
 import { hdExportExcel } from '@/libs/exportExcel'
 export default {
   name: 'StockOutDetail',
@@ -107,7 +112,7 @@ export default {
       const _this = this
       const arr = [
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
-        { title: '产品编码', dataIndex: 'productEntity.code', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品编码', dataIndex: 'productEntity.code', width: '15%', align: 'center', scopedSlots: { customRender: 'productCode' } },
         { title: '产品名称', dataIndex: 'productEntity.name', width: '25%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '原厂编码', dataIndex: 'productEntity.origCode', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单位', dataIndex: 'productEntity.unit', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },

+ 16 - 7
src/views/salesManagement/waitDispatchNew/queryPart.vue

@@ -96,6 +96,8 @@
               :checkbox-option="checkboxOption"
             />
         <div v-show="showEmpty" class="empty-data">暂无数据</div>
+        <!-- 活动规则详情 -->
+        <detailModal :openModal="openDetailModal" :itemSn="detailSn" @close="closeDetailModal"></detailModal>
     </a-spin>
 
   </div>
@@ -104,13 +106,14 @@
 <script>
 import { commonMixin } from '@/utils/mixin'
 import { salesPromoQueryList } from '@/api/salesNew'
+import detailModal from '@/views/promotionRulesManagement/dealerPromotions/detailModal.vue'
 import { salesDetailAllList, salesPromoDetailCount, salesDetaiCount } from '@/api/salesDetailNew'
 import { STable, VSelect } from '@/components'
 import chooseWarehouse from '@/views/common/chooseWarehouse'
 export default {
   name: 'QueryPart',
   mixins: [commonMixin],
-  components: { STable, VSelect, chooseWarehouse },
+  components: { STable, VSelect, chooseWarehouse, detailModal },
   props: {
     newLoading: {
         type: Boolean,
@@ -128,6 +131,8 @@ export default {
   data () {
     return {
       advanced: true, // 高级搜索 展开/关闭
+      openDetailModal: false,
+      detailSn: null,
       productType: [],
       salesBillSn: '',
       detailData: null,
@@ -261,7 +266,7 @@ export default {
                 {record.promo?(
                   <div>
                     <strong style="margin-right:10px;font-size:14px;">{record.promo.promotion.title} ({record.promo.promotionRule.description})</strong>
-                    <span style="margin-left:10px;color:#00aaff;cursor: pointer;" onClick={()=>_this.showDesc(record)}>
+                    <span style="margin-left:10px;color:#00aaff;cursor: pointer;" onClick={()=>_this.showDesc(record.promo)}>
                       <a-icon title="查看活动详情" type="eye"/> 活动详情
                     </span>
                   </div>
@@ -310,11 +315,15 @@ export default {
     }
   },
   methods: {
-    //  产品分类  change
-    changeProductType (val, opt) {
-      this.queryParam.productTypeSn1 = val[0] ? val[0] : ''
-      this.queryParam.productTypeSn2 = val[1] ? val[1] : ''
-      this.queryParam.productTypeSn3 = val[2] ? val[2] : ''
+    // 查看活动详情
+    showDesc(row){
+      this.detailSn = row.promoRuleSn
+      this.openDetailModal = true
+    },
+    // 关闭详情弹窗
+    closeDetailModal () {
+      this.detailSn = null
+      this.openDetailModal = false
     },
     // 合并活动分类单元格
     bodyCellSpan({ row, column, rowIndex }) {