lilei 2 dienas atpakaļ
vecāks
revīzija
989875c5f6

+ 2 - 1
src/views/salesManagement/pushOrderManagement/detail.vue

@@ -4,7 +4,8 @@
       <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>
-          <span style="margin: 0 15px;color: #666;font-weight: bold;">单号:{{ detailData&&detailData.dispatchBillNo }}</span>
+          <span style="margin: 0 5px 0 15px;color: #666;font-weight: bold;">单号:{{ detailData&&detailData.dispatchBillNo }}</span>
+          <a-tag v-if="detailData&&detailData.newCustFlag == 1" color="green" style="zoom:0.9;">新</a-tag>
           <span style="margin: 0 10px;color: #666;">客户名称:{{ detailData&&detailData.buyerName }}</span>
           <a-button type="link" size="small" class="button-default" @click="showDetail=!showDetail">
             <a-icon :type="showDetail ? 'eye-invisible' : 'eye'"/> {{ showDetail?'隐藏':'查看' }}信息

+ 9 - 7
src/views/salesManagement/pushOrderManagement/list.vue

@@ -138,7 +138,7 @@
           :rowKey="(record) => record.id"
           :columns="columns"
           :data="loadData"
-          :scroll="{ y:tableHeight, x:1900 }"
+          :scroll="{ y:tableHeight, x:1920 }"
           :defaultLoadData="false"
           bordered>
           <!-- 销售单号 -->
@@ -148,11 +148,13 @@
           </template>
           <!-- 备货单号 -->
           <template slot="dispatchBillNo" slot-scope="text, record">
-            <span class="link-bule" v-if="$hasPermissions('B_dispatchDetail')" @click="handleDetail(record,1)">
-              {{ record.dispatchBillNo }}
-            </span>
-            <span v-else>{{ record.dispatchBillNo }}</span>
-            <a-tag v-if="record.newCustFlag==1">新</a-tag>
+            <div style="display: flex;align-items: center;justify-content: center;">
+              <span class="link-bule" v-if="$hasPermissions('B_dispatchDetail')" @click="handleDetail(record,1)">
+                {{ record.dispatchBillNo }}
+              </span>
+              <span v-else>{{ record.dispatchBillNo }}</span>
+              <a-tag v-if="record.newCustFlag == 1" color="green" style="zoom:0.9;margin-left: 5px;">新</a-tag>
+            </div>
           </template>
           <!-- 发货说明  -->
           <template slot="explainInfo" slot-scope="text, record">
@@ -300,7 +302,7 @@ export default {
         { title: '序号', dataIndex: 'no', width: '60px', align: 'center' },
         { title: '下推时间', dataIndex: 'pushedDate', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: '120px', align: 'center' },
-        { title: '备货单号', scopedSlots: { customRender: 'dispatchBillNo' }, width: '130px', align: 'center' },
+        { title: '备货单号', scopedSlots: { customRender: 'dispatchBillNo' }, width: '150px', align: 'center' },
         { title: '发货编号', dataIndex: 'sendNo', width: '80px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '发货说明', scopedSlots: { customRender: 'explainInfo' }, width: '150px', align: 'center', ellipsis: true },
         { title: '客户名称', dataIndex: 'buyerName', width: '150px', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },