lilei há 7 meses atrás
pai
commit
1f5ba8ff61

+ 1 - 1
src/views/financialManagement/financialCollection/selectGlSalesModal.vue

@@ -88,7 +88,7 @@
       <!-- 查看销售单或备货单详情 -->
       <commonModal
         :modalTit="detailType?'备货单详情':'销售单详情'"
-        bodyPadding="10px"
+        bodyPadding="0"
         width="70%"
         :showFooter="false"
         :openModal="showDetailModal"

+ 11 - 17
src/views/salesManagement/backorder/detailModal.vue

@@ -9,23 +9,17 @@
     @cancel="isShow=false"
     width="70%">
     <a-spin :spinning="spinning" tip="Loading...">
-      <div style="padding: 0 12px;text-align: right;" v-if="$hasPermissions('B_oosPrint')">
-        <a-button id="backorderDetail-preview-btn" :disabled="localDataSource.length==0" @click="handlePrint('preview')" style="margin-right: 15px;">打印预览</a-button>
-        <a-button type="primary" id="backorderDetail-print-btn" :disabled="localDataSource.length==0" @click="handlePrint('print')">快捷打印</a-button>
-      </div>
       <!-- 基础信息 -->
-      <div style="padding: 10px 12px 0" class="backorderDetail-cont">
-        <a-collapse :activeKey="['1']">
-          <a-collapse-panel key="1" header="基础信息">
-            <a-descriptions size="small" :column="2">
-              <a-descriptions-item label="销售单号">
-                {{ detailData&&detailData.salesBillNo || '--' }}
-                <a-badge count="促" v-if="detailData&&detailData.promoFlag==1" :number-style="{ backgroundColor: '#52c41a', zoom:'80%' }"></a-badge>
-              </a-descriptions-item>
-            </a-descriptions>
-          </a-collapse-panel>
-        </a-collapse>
-      </div>
+      <a-page-header :ghost="false" :backIcon="false" class="backorderDetail-cont">
+        <template slot="subTitle">
+          <span style="color: #666;font-weight: bold;">销售单号:{{ detailData&&detailData.salesBillNo || '--' }}</span>
+          <a-badge count="促" v-if="detailData&&detailData.promoFlag==1" :number-style="{ backgroundColor: '#52c41a', zoom:'80%' }"></a-badge>
+        </template>
+        <template slot="extra" v-if="$hasPermissions('B_oosPrint')">
+          <a-button id="backorderDetail-preview-btn" :disabled="localDataSource.length==0" @click="handlePrint('preview')" style="margin-right: 15px;">打印预览</a-button>
+          <a-button type="primary" id="backorderDetail-print-btn" :disabled="localDataSource.length==0" @click="handlePrint('print')">快捷打印</a-button>
+        </template>
+      </a-page-header>
       <a-card size="small" :bordered="false" class="backorderDetail-cont">
         <!-- alert -->
         <a-alert type="info" style="margin-bottom:10px">
@@ -123,7 +117,7 @@ export default {
         arr.push({ title: '缺货成本金额', dataIndex: 'totalShowCostAmount', width: '10%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
       }
       if (this.$hasPermissions('B_oosDetail_salesPrice')) { //  售价权限
-        arr.push({ title: '售价', dataIndex: 'price', width: '15%', align: 'right', scopedSlots: { customRender: 'price' }})
+        arr.push({ title: '售价', dataIndex: 'price', width: '15%', align: 'right', scopedSlots: { customRender: 'price' } })
         arr.push({ title: '缺货金额', dataIndex: 'totalAmount', width: '10%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
       }
       return arr

+ 9 - 13
src/views/salesManagement/backorder/list.vue

@@ -55,19 +55,15 @@
           :defaultLoadData="false"
           bordered>
           <template slot="salesBillNo" slot-scope="text, record">
-            <span style="padding-right: 15px;">{{ text }}</span>
-            <a-badge count="促" v-if="record.promoFlag==1" :number-style="{ backgroundColor: '#52c41a', zoom:'80%' }"></a-badge>
-          </template>
-          <!-- 操作 -->
-          <template slot="action" slot-scope="text, record">
             <a-button
-              size="small"
-              type="link"
-              class="button-success"
-              @click="handleDetail(record)"
               v-if="$hasPermissions('B_oosDetail')"
-              id="backorderList-detail-btn">详情</a-button>
-            <span v-else>--</span>
+              id="backorderList-detail-btn"
+              @click="handleDetail(record)"
+              type="link"
+              size="small"
+              class="button-info">{{ text }}</a-button>
+            <span v-else>{{ text }}</span>
+            <a-badge count="促" v-if="record.promoFlag==1" :number-style="{ backgroundColor: '#52c41a', zoom:'80%' }"></a-badge>
           </template>
         </s-table>
       </a-spin>
@@ -134,9 +130,9 @@ export default {
         { title: '客户名称', dataIndex: 'dealerName', width: '25%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         // { title: '仓库', dataIndex: 'warehouseName', width: '15%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '缺货款数', dataIndex: 'totalCategory', width: '11%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '缺货数量', dataIndex: 'totalQty', width: '11%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '缺货数量', dataIndex: 'totalQty', width: '11%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
         // { title: '缺货金额', dataIndex: 'totalAmount', width: '11%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: '11%', align: 'center' }
+        // { title: '操作', scopedSlots: { customRender: 'action' }, width: '11%', align: 'center' }
       ]
       if (this.$hasPermissions('M_backorderList_salesPrice')) { //  售价权限
         arr.splice(6, 0, { title: '缺货金额', dataIndex: 'totalAmount', width: '11%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })

+ 1 - 1
src/views/salesManagement/examineVerify/list.vue

@@ -158,7 +158,7 @@
       <!-- 查看销售单或备货单详情 -->
       <commonModal
         :modalTit="detailType?'备货单详情':'销售单详情'"
-        bodyPadding="10px"
+        bodyPadding="0"
         width="70%"
         :showFooter="false"
         :openModal="showDetailModal"

+ 1 - 1
src/views/salesManagement/matchSendOutOrder/list.vue

@@ -146,7 +146,7 @@
     <!-- 查看销售单或备货单详情 -->
     <commonModal
       :modalTit="detailType?'备货单详情':'销售单详情'"
-      bodyPadding="10px"
+      bodyPadding="0"
       width="70%"
       :showFooter="false"
       :openModal="showDetailModal"

+ 3 - 28
src/views/salesManagement/pushOrderManagement/detail.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="pushOrder-wrap">
     <a-spin :spinning="spinning" tip="Loading...">
-      <a-page-header :ghost="false" :backIcon="false" class="salesDetail-cont" :style="{marginBottom:!outBizSubSn&&!bizSn?'6px':'0px'}">
-        <template slot="subTitle" v-if="!outBizSubSn&&!bizSn">
-          <a href="javascript:;" @click="handleBack"><a-icon type="left"></a-icon> 返回列表</a>
+      <a-page-header :ghost="false" :backIcon="false" class="salesDetail-cont">
+        <template slot="subTitle">
+          <a href="javascript:;" v-if="!outBizSubSn&&!bizSn" @click="handleBack"><a-icon type="left"></a-icon> 返回列表</a>
           <span style="margin: 0 15px;color: #666;font-weight: bold;">单号:{{ detailData&&detailData.dispatchBillNo }}</span>
           <span style="margin: 0 10px;color: #666;">客户名称:{{ detailData&&detailData.buyerName }}</span>
           <a-button type="link" size="small" class="button-default" @click="showDetail=!showDetail">
@@ -68,31 +68,6 @@
           </a-descriptions>
         </div>
       </a-card>
-      <!-- 弹框基础信息 -->
-      <div style="padding: 10px 12px 0 12px" v-show="outBizSubSn||bizSn">
-        <a-collapse :activeKey="['1']">
-          <a-collapse-panel key="1" header="基础信息">
-            <a-descriptions size="small" :column="3">
-              <a-descriptions-item label="客户名称">{{ detailData&&detailData.buyerName || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="销售单号">{{ detailData&&detailData.salesBillNo || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="备货单号">{{ detailData&&detailData.dispatchBillNo || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="收货客户名称">{{ detailData&&detailData.receiverName || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="发货编号">{{ detailData&&detailData.sendNo || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="收款方式">{{ detailData&&detailData.settleStyleSnDictValue || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="收货人" v-if="detailData&&detailData.salesBillExtEntity">{{ detailData&&detailData.salesBillExtEntity&&detailData.salesBillExtEntity.consigneeName || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="收货电话" v-if="detailData&&detailData.salesBillExtEntity">{{ detailData&&detailData.salesBillExtEntity&&detailData.salesBillExtEntity.consigneeTel || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="收货地址" :span="2" v-if="detailData&&detailData.salesBillExtEntity">
-                {{ detailData&&detailData.salesBillExtEntity&&detailData.salesBillExtEntity.shippingAddrProvinceName || '' }}
-                {{ detailData&&detailData.salesBillExtEntity&&detailData.salesBillExtEntity.shippingAddrCityName || '' }}
-                {{ detailData&&detailData.salesBillExtEntity&&detailData.salesBillExtEntity.shippingAddrCountyName || '' }}
-                {{ detailData&&detailData.salesBillExtEntity&&detailData.salesBillExtEntity.shippingAddr || '' }}
-              </a-descriptions-item>
-              <a-descriptions-item label="业务状态">{{ detailData&&detailData.billStatusDictValue || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="备注">{{ detailData&&detailData.remarks || '--' }}</a-descriptions-item>
-            </a-descriptions>
-          </a-collapse-panel>
-        </a-collapse>
-      </div>
       <a-card size="small" :bordered="false" class="pages-wrap">
         <!-- 统计信息 -->
         <a-alert type="info" style="margin-bottom: 10px;" v-if="detailData!=null">

+ 1 - 1
src/views/salesManagement/salesList/list.vue

@@ -166,7 +166,7 @@
         <!-- 查看销售单或备货单详情 -->
         <commonModal
           :modalTit="detailType?'备货单详情':'销售单详情'"
-          bodyPadding="10px"
+          bodyPadding="0"
           width="70%"
           :showFooter="false"
           :openModal="showDetailModal"

+ 1 - 1
src/views/salesManagement/stockPrint/list.vue

@@ -191,7 +191,7 @@
         <!-- 查看销售单或备货单详情 -->
         <commonModal
           :modalTit="detailType?'备货单详情':'销售单详情'"
-          bodyPadding="10px"
+          bodyPadding="0"
           width="70%"
           :showFooter="false"
           :openModal="showDetailModal"