lilei 1 vuosi sitten
vanhempi
commit
13039c0b51

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

@@ -30,18 +30,18 @@
           <!-- 总计 -->
           <a-alert type="info" style="width:auto;display: inline-block;" banner :showIcon="false">
             <div slot="message">
-              <div style="margin-bottom: 5px;">
-                已满足1000元门槛金额,已选择180元正价产品配额,<strong>再满2件产品,可享受满赠优惠/已满足促销要求,可享受优惠</strong>
-              </div>
               <div>
-                <span v-if="$hasPermissions('B_salesEdit_salesPrice')">总金额:<strong>{{ detailData&&(detailData.totalCommonAmount || detailData.totalCommonAmount==0) ? toThousands(detailData.totalCommonAmount) : '--' }}</strong>;</span>
-                <span v-if="$hasPermissions('B_salesEdit_salesPrice')">优惠金额:<strong>{{ detailData&&(detailData.totalCommonAmount || detailData.totalCommonAmount==0) ? toThousands(detailData.totalCommonAmount) : '--' }}</strong>;</span>
+                已满足1000元门槛金额,已选择180元正价产品配额,<strong>再满2件产品,可享受满赠优惠/已满足促销要求,可享受优惠</strong>
               </div>
             </div>
           </a-alert>
+          <div>
+            <span v-if="$hasPermissions('B_salesEdit_salesPrice')">总金额:<strong>{{ detailData&&(detailData.totalCommonAmount || detailData.totalCommonAmount==0) ? toThousands(detailData.totalCommonAmount) : '--' }}</strong>;</span>
+            <span v-if="$hasPermissions('B_salesEdit_salesPrice')">优惠金额:<strong>{{ detailData&&(detailData.totalCommonAmount || detailData.totalCommonAmount==0) ? toThousands(detailData.totalCommonAmount) : '--' }}</strong>;</span>
+          </div>
         </a-col>
         <a-col :md="12" :sm="24" style="text-align:right;">
-          <span style="margin-right:5px;">已选{{ selectTotal }}项</span>
+          <span v-if="selectTotal" style="margin-right:5px;">已选{{ selectTotal }}项</span>
           <a-dropdown>
             <a-menu slot="overlay" @click="handleMenuClick">
               <a-menu-item key="0">

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

@@ -4,16 +4,14 @@
       <a-row :gutter="15" type="flex" justify="space-between" align="middle">
         <a-col :md="12" :sm="24" style="text-align:left;">
           <!-- 总计 -->
-          <a-alert type="info" style="width:auto;display: inline-block;" banner :showIcon="false">
-            <div slot="message">
-               <span v-if="$hasPermissions('B_salesEdit_salesPrice')">总售价:<strong>{{ detailData&&(detailData.totalCommonAmount || detailData.totalCommonAmount==0) ? toThousands(detailData.totalCommonAmount) : '--' }}</strong>;</span>
-               总款数:<strong>{{ detailData&&(detailData.totalCommonCategory || detailData.totalCommonCategory==0) ? detailData.totalCommonCategory : '--' }}</strong>;
-               总数量:<strong>{{ detailData&&(detailData.totalCommonQty || detailData.totalCommonQty==0) ? detailData.totalCommonQty : '--' }}</strong>;
-            </div>
-          </a-alert>
+         <div>
+            <span v-if="$hasPermissions('B_salesEdit_salesPrice')">总售价:<strong>{{ detailData&&(detailData.totalCommonAmount || detailData.totalCommonAmount==0) ? toThousands(detailData.totalCommonAmount) : '--' }}</strong>;</span>
+            总款数:<strong>{{ detailData&&(detailData.totalCommonCategory || detailData.totalCommonCategory==0) ? detailData.totalCommonCategory : '--' }}</strong>;
+            总数量:<strong>{{ detailData&&(detailData.totalCommonQty || detailData.totalCommonQty==0) ? detailData.totalCommonQty : '--' }}</strong>;
+         </div>
         </a-col>
         <a-col :md="12" :sm="24" style="text-align:right;">
-          <span style="margin-right:5px;">已选{{ selectTotal }}项</span>
+          <span v-if="selectTotal" style="margin-right:5px;">已选{{ selectTotal }}项</span>
           <a-dropdown>
             <a-menu slot="overlay" @click="handleMenuClick">
               <a-menu-item key="0">
@@ -47,7 +45,7 @@
       </a-row>
     </div>
     <!-- 筛选条件 -->
-    <div class="table-page-search-wrapper" style="margin:0" v-if="showSearch">
+    <div class="table-page-search-wrapper" style="margin:0" v-show="showSearch">
       <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
         <a-row :gutter="15">
           <a-col :md="4" :sm="24">

+ 26 - 4
src/views/salesManagement/salesQueryNew/edit.vue

@@ -5,9 +5,27 @@
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
           <a id="salesEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
-          <span style="margin: 0 15px;color: #666;">客户名称:{{ detailData&&detailData.buyerName }}</span>
+          <span style="margin: 0 15px;color: #666;font-weight: bold;">单号:{{ detailData&&detailData.salesBillNo }}</span>
+          <span v-if="detailData&&detailData.salesBillNoSource">(原:{{ detailData&&detailData.salesBillNoSource || '--' }})</span>
+          <span style="margin-left:15px;color:#00aaff;cursor:pointer;"  @click="showDetail=!showDetail">
+            <a-icon title="查看信息" type="eye"/> 查看信息
+          </span>
         </template>
       </a-page-header>
+      <!-- 单据详情 -->
+      <a-card size="small" :bordered="false" class="salesEdit-cont" v-show="showDetail">
+        <a-descriptions size="small" :column="3">
+          <a-descriptions-item label="客户名称">{{ detailData&&detailData.buyerName || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="收货地址" :span="2">{{ shippingAddress||'--' }}</a-descriptions-item>
+          <a-descriptions-item label="收货人">{{ detailData&&detailData.salesBillExtEntity&&detailData.salesBillExtEntity.consigneeName || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="收货电话">{{ detailData&&detailData.salesBillExtEntity&&detailData.salesBillExtEntity.consigneeTel || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="收款方式">{{ detailData&&detailData.settleStyleSnDictValue || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="审核时间">{{ detailData&&detailData.auditDate || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="业务状态">{{ detailData&&detailData.billStatusDictValue || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="财务状态">{{ detailData&&detailData.financialStatusDictValue || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="备注" :span="3">{{ detailData&&detailData.remarks || '--' }}</a-descriptions-item>
+        </a-descriptions>
+      </a-card>
       <!-- 正常产品 -->
       <a-card size="small" :bordered="false" class="salesEdit-cont" v-if="salesBillSn">
         <productNormalList ref="productNormalList" :detailData="detailData" :warehouseSn="warehouseSn" :salesBillSn="salesBillSn"></productNormalList>
@@ -23,7 +41,7 @@
             <div>
               <strong style="margin-right:10px;font-size:16px;">{{item.activeName}}</strong> ({{item.activeDesc}})
               <span style="margin-left:10px;color:#00aaff;"  @click="(event) => {showDesc(event, item.activeId)}">
-                <a-icon title="查看活动详情" type="eye"/> 查看详情
+                <a-icon title="查看活动详情" type="eye"/> 详情
               </span>
             </div>
           </div>
@@ -33,11 +51,14 @@
     </a-spin>
     <div class="affix-cont">
       <div class="footer-price">
-        <div>产品总款数:<strong>12</strong>;总数量:<strong>111</strong>;总售价:<strong>17898.88</strong></div>
+        <div></div>
         <div>
           <div class="totalPrice">合计:¥<span>121.60</span></div>
           <div>
-            <span style="margin-right:10px;">优惠金额:¥<strong>121.60</strong></span>
+            产品总款数:<strong>12</strong>;
+            总数量:<strong>111</strong>;
+            总售价:<strong>17898.88</strong>;
+            <span style="margin-right:10px;">优惠金额:<strong>121.60</strong></span>
             <a-popover title="优惠明细">
               <a-button shape="round" size="small">优惠明细</a-button>
               <div slot="content">
@@ -111,6 +132,7 @@ export default {
         totalAmount: ''
       },
       priceUpdateModal: false, // 价格更新弹窗
+      showDetail: false
     }
   },
   methods: {