lilei 1 jaar geleden
bovenliggende
commit
bc697c4175

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

@@ -342,7 +342,7 @@
               for (var i = 0; i < data.list.length; i++) {
                 data.list[i].no = no + i + 1
                 data.list[i].qtyBackups = data.list[i].qty
-                data.list[i].unitQtyV = data.list[i].unitQty + data.list[i].productEntity.unit
+                data.list[i].unitQtyV = data.list[i].unitQty ? (data.list[i].unitQty + data.list[i].productEntity.unit) : '--'
               }
               this.disabled = false
               this.dataSource = data.list

+ 7 - 3
src/views/salesManagement/salesQueryNew/comps/productNormalList.vue

@@ -86,7 +86,7 @@
       :data="loadData"
       :row-selection="{ columnWidth: 40 }"
       @rowSelection="rowSelectionFun"
-      :pageSize="10"
+      :pageSize="showTotal?10:30"
       bordered>
       <!-- 产品编码 -->
       <template slot="productCode" slot-scope="text, record">
@@ -152,9 +152,9 @@
           @click="handleDel(record)"
         >删除</a-button>
       </template>
-      <template slot="footer" slot-scope="currentPageData">
+      <template slot="footer">
         <!-- 总计 -->
-        <a-alert type="info" banner :showIcon="false">
+        <a-alert type="info" v-if="showTotal" banner :showIcon="false">
           <div slot="message">
               <span v-if="$hasPermissions('B_salesEdit_salesPrice')">总售价:<strong>{{ countData&&(countData.totalAmount || countData.totalAmount==0) ? toThousands(countData.totalAmount) : '--' }}</strong>;</span>
               总款数:<strong>{{ countData&&(countData.totalCategory || countData.totalCategory==0) ? countData.totalCategory : '--' }}</strong>;
@@ -218,6 +218,10 @@
       salesBillSn: {
         type: String,
         default: ''
+      },
+      showTotal:{
+        type: Boolean,
+        default: true
       }
     },
     data () {

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

@@ -35,6 +35,7 @@
           ref="productNormalList" 
           @insterOk="insterActiveOk"
           @openCpModal="openProductModal" 
+          :showTotal="activeList.length>0"
           :detailData="detailData" 
           :warehouseSn="warehouseSn" 
           :salesBillSn="salesBillSn"></productNormalList>