Ver Fonte

Merge branch 'develop_yh29' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_yh29

chenrui há 1 ano atrás
pai
commit
6e23214010

+ 1 - 1
public/version.json

@@ -1,4 +1,4 @@
 {
-    "version": "2.2.28",
+    "version": "2.2.29",
     "message": "发现有新版本发布,确定更新系统?"
 }

+ 2 - 3
src/views/salesManagement/waitDispatchNew/queryPart.vue

@@ -37,7 +37,7 @@
           </a-col>
           <a-col :md="4" :sm="24">
             <a-form-item label="下推类型">
-              <a-select allowClear v-model.trim="queryParam.pushProductType" :dropdownMatchSelectWidth="false" >
+              <a-select allowClear v-model.trim="queryParam.pushProductType" :dropdownMatchSelectWidth="false" placeholder="请选择下推类型">
                 <a-select-option value="">
                   全部产品
                 </a-select-option>
@@ -204,8 +204,7 @@ export default {
       return this.detailData&&this.detailData.promoFlag==1
     },
     hasNoPushedActive(){
-      const a = this.dataSource.filter(item => item.pushedQty>0)
-      return this.dataSource.length==0 ? false : !(a.length > 0)
+      return this.detailData&&this.detailData.totalPushedQty==0||!this.detailData.totalPushedQty
     },
     checkboxOption () {
       return {