lilei 3 weeks ago
parent
commit
ab99721bf0

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

@@ -117,9 +117,11 @@
       bordered>
       <!-- 产品编码 -->
       <template slot="productCode" slot-scope="text, record">
-        <a-badge count="缺" v-if="Number(record.stockQty||0) < Number(record.unpushedQty||0)" :number-style="{ zoom:'0.7' }">
-          <div style="padding-right: 15px;">{{ text }}</div>
-        </a-badge>
+        <div style="display: flex;align-items: center;" v-if="Number(record.stockQty||0) < Number(record.unpushedQty||0)" >
+          <div style="padding-right: 5px;">{{ text }}</div>
+          <a-badge count="缺" :number-style="{ zoom:'0.7' }">
+          </a-badge>
+        </div>
         <span v-if="!(Number(record.stockQty||0) < Number(record.unpushedQty||0))">{{ text }}</span>
       </template>
       <!-- 销售数量 -->

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

@@ -122,12 +122,12 @@
               <a-form layout="inline" @keyup.enter.native="searchTable">
                 <a-row :gutter="15" type="flex">
                   <a-col flex="300px">
-                    <a-form-item label="出库仓库" style="margin-bottom: 0!important;">
+                    <a-form-item label="出库仓库">
                       <chooseWarehouse id="salesDetail-warehouse" ref="warehouse" v-model="warehouseSn"></chooseWarehouse>
                     </a-form-item>
                   </a-col>
                   <a-col flex="300px" v-if="hasPrompActive">
-                    <a-form-item label="产品类型" style="margin-bottom: 0!important;">
+                    <a-form-item label="产品类型">
                       <a-select v-model.trim="promoFlag" id="salesDetail-promoFlag" allowClear :dropdownMatchSelectWidth="false" placeholder="请选择产品类型">
                         <a-select-option value="0">
                           正常产品
@@ -150,13 +150,13 @@
                       </a-select>
                     </a-form-item>
                   </a-col>
-                  <a-col flex="200px">
+                  <a-col flex="200px" v-if="hasPrompActive">
                     <a-form-item label="累计产品">
                       <v-select code="FLAG" v-model="borrowFlag" allowClear placeholder="请选择是否累计产品"></v-select>
                     </a-form-item>
                   </a-col>
                   <a-col flex="300px" v-if="showTransferDealer">
-                    <a-form-item label="发货经销商库存" style="margin-bottom: 0!important;">
+                    <a-form-item label="发货经销商库存">
                       <v-select
                         code="STOCK_LABEL"
                         id="purchaseOrder-basicInfo-transferQty"