lilei пре 5 дана
родитељ
комит
74942a40bc

+ 3 - 3
src/views/salesManagement/salesQueryNew/comps/activeStatisticsList.vue

@@ -198,9 +198,9 @@ export default {
           align: 'center',
           fixed: 'left',
           renderBodyCell: ({ row, column, rowIndex }, h) => {
-            const isTejia = row && row.promotionRule && row.promotionRule.promotionRuleType == 'PROMO_PROD' && row.promotionRule.stackFlag == 1 && _this.type == 'edit' // 是否特价叠加
-            const tejiaLen = _this.tableData.filter(item => item.promotionRule && item.promotionRule.promotionRuleType == 'PROMO_PROD' && item.promotionRule.stackFlag == 1).length // 特价叠加活动数量
-            const tjStart = _this.tableData.findIndex(item => item.promotionRule && item.promotionRule.promotionRuleType == 'PROMO_PROD' && item.promotionRule.stackFlag == 1) // 特价叠加活动开始索引
+            const isTejia = row && row.promotionRule && row.promotionRule.promotionRuleType == 'PROMO_PROD' && row.promotionRule.stackFlag == 1 && row.promotionRule.discountType != '0' && _this.type == 'edit' // 是否特价叠加
+            const tejiaLen = _this.tableData.filter(item => item.promotionRule && item.promotionRule.promotionRuleType == 'PROMO_PROD' && item.promotionRule.stackFlag == 1 && item.promotionRule.discountType != '0').length // 特价叠加活动数量
+            const tjStart = _this.tableData.findIndex(item => item.promotionRule && item.promotionRule.promotionRuleType == 'PROMO_PROD' && item.promotionRule.stackFlag == 1 && item.promotionRule.discountType != '0') // 特价叠加活动开始索引
             // 特价活动上移下移排序
             const equalWord = <div class="table-arrow-box">
               {rowIndex > tjStart ? <span class="up" onClick={() => _this.moveTjRow(row, rowIndex, 1)} title="上移">⇡</span> : ''}

+ 8 - 1
src/views/salesManagement/salesQueryNew/comps/productActiveList.vue

@@ -85,6 +85,11 @@
                 <v-select code="FLAG" v-model="queryParam.borrowFlag" allowClear placeholder="请选择是否累计产品"></v-select>
               </a-form-item>
             </a-col>
+            <a-col flex="1">
+              <a-form-item label="是否缺货">
+                <v-select code="FLAG" v-model="queryParam.outStock" allowClear placeholder="请选择是否缺货"></v-select>
+              </a-form-item>
+            </a-col>
             <a-col flex="2" style="margin-bottom: 10px;">
               <a-button type="primary" @click="searchProduct" :disabled="disabled" :id="'salesEdit-refresh-'+id">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" :id="'salesEdit-reset-'+id">重置</a-button>
@@ -270,7 +275,8 @@ export default {
         promoProductClz: undefined, // 产品类型
         promoFlag: undefined,
         borrowFlag: undefined, // 是否累计
-        unitFlag: undefined // 是否满足起订量
+        unitFlag: undefined, // 是否满足起订量
+        outStock: undefined
       },
       productType: [], // 已选产品分类
       disableSelectedRowKeys: [], // 禁用的行
@@ -647,6 +653,7 @@ export default {
       this.queryParam.productTypeSn2 = ''
       this.queryParam.productTypeSn3 = ''
       this.queryParam.borrowFlag = undefined
+      this.queryParam.outStock = undefined
       this.queryParam.promoProductClz = undefined
       this.queryParam.unitFlag = undefined
       this.productType = []

+ 8 - 1
src/views/salesManagement/salesQueryNew/comps/productNormalList.vue

@@ -29,6 +29,11 @@
               <productTypeAll placeholder="请选择产品分类" @change="changeProductType" v-model="productType" id="salesEdit-productType"></productTypeAll>
             </a-form-item>
           </a-col>
+          <a-col flex="1">
+            <a-form-item label="是否缺货">
+              <v-select code="FLAG" v-model="queryParam.outStock" allowClear placeholder="请选择是否缺货"></v-select>
+            </a-form-item>
+          </a-col>
           <a-col flex="2" style="margin-bottom: 10px;">
             <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="salesEdit-refresh">查询</a-button>
             <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="salesEdit-reset">重置</a-button>
@@ -302,7 +307,8 @@ export default {
         productBrandSn: undefined, // 产品品牌
         productTypeSn1: '', //  产品一级分类
         productTypeSn2: '', //  产品二级分类
-        productTypeSn3: '' //  产品三级分类
+        productTypeSn3: '', //  产品三级分类
+        outStock: undefined
       },
       productType: [], // 产品分类
       rowSelectionInfo: null, // 已选的产品数据
@@ -590,6 +596,7 @@ export default {
       this.queryParam.productName = ''
       this.queryParam.warehouseSn = undefined
       this.queryParam.productBrandSn = undefined
+      this.queryParam.outStock = undefined
       this.queryParam.productTypeSn1 = ''
       this.queryParam.productTypeSn2 = ''
       this.queryParam.productTypeSn3 = ''

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

@@ -197,6 +197,7 @@
     <!-- 提交时校验销售价低于成本价提示 -->
     <vaildPriceModal
       ref="vaildPriceModal"
+      type="edit"
       :openModal="openVaildPriceModal"
       :dataObj="tempData"
       @close="closeVaildPrice"
@@ -485,7 +486,7 @@ export default {
     },
     // 校验销售价低于成本价提示成功,关闭弹窗
     vaildPriceOk (type) {
-      if (type == 'AUDIT_UP_PASS') {
+      if (type == 'SUBMIT') {
         this.submitOrder()
       }
     },

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

@@ -30,7 +30,9 @@
         </div>
         <div style="margin-top:36px;text-align:center;" v-if="modalType == 'price_less_cost'">
           <a-button @click="handleCancel" style="margin-right: 15px" id="chooseCustom-btn-back">取消</a-button>
-          <a-button type="primary" class="button-info" @click="handleSubmit('AUDIT_UP_PASS')" id="chooseCustom-btn-Pass">确定</a-button>
+          <a-button type="primary" v-if="type=='detail'" style="margin-right: 15px" @click="handleSubmit('AUDIT_REJECT')" id="chooseCustom-btn-noPasss">审核不通过</a-button>
+          <a-button type="primary" v-if="type=='detail'" class="button-info" @click="handleSubmit('AUDIT_UP_PASS')" id="chooseCustom-btn-Pass">审核通过</a-button>
+          <a-button type="primary" v-if="type=='edit'" class="button-info" @click="handleSubmit('SUBMIT')" id="chooseCustom-btn-Pass">确定</a-button>
         </div>
         <div style="margin-top:36px;text-align:center;" v-if="modalType == 'price_less_0'">
           <a-button @click="handleCancel" style="margin-right: 15px" id="chooseCustom-btn-back">关闭</a-button>
@@ -55,6 +57,10 @@ export default {
       default: () => {
         return null
       }
+    },
+    type: {
+      type: String,
+      default: 'detail'
     }
   },
   data () {