lilei vor 6 Monaten
Ursprung
Commit
b7d2fd7df4

+ 23 - 13
src/views/salesManagement/pushOrderManagement/list.vue

@@ -119,14 +119,13 @@
           <span v-if="$hasPermissions('M_pushOrderManagementList_salesPrice')">下推总金额:<strong>{{ totalData&&(totalData.totalAmount || totalData.totalAmount==0) ? toThousands(totalData.totalAmount) : '--' }}</strong>;</span>
         </div>
         <!-- 列表 -->
-        <s-table
+        <v-table
           class="sTable fixPagination"
           ref="table"
-          :style="{ height: tableHeight+70+'px' }"
-          size="small"
-          :rowKey="(record) => record.id"
+          :style="{ height: tableHeight+35+'px' }"
           :columns="columns"
           :data="loadData"
+          :pagination="{pageSize:20}"
           :scroll="{ y:tableHeight, x:1890 }"
           :defaultLoadData="false"
           bordered>
@@ -144,6 +143,10 @@
           <template slot="explainInfo" slot-scope="text, record">
             <span class="link-bule" @click="handleExplainInfo(record)" :title="record.explainInfo">{{ record.explainInfo||'--' }}</span>
           </template>
+          <!-- 单据状态 -->
+          <template slot="voidFlag" slot-scope="text, record">
+            <span :style="{color:record.voidFlag==1?'red':''}">{{ record.voidFlagDictValue||'--' }}</span>
+          </template>
           <!-- 操作 -->
           <template slot="action" slot-scope="text, record">
             <div>
@@ -165,7 +168,7 @@
               >取消打印</a-button>
             </div>
           </template>
-        </s-table>
+        </v-table>
 
         <!-- 允许此单进行备货打印操作提示 -->
         <commonModal modalTit="操作提示" :openModal="showTipModal" @cancel="canselModal" @ok="updatePrintStatus">
@@ -201,7 +204,7 @@ import { commonMixin } from '@/utils/mixin'
 import moment from 'moment'
 import getDate from '@/libs/getDate.js'
 import rangeDate from '@/views/common/rangeDate.vue'
-import { STable, VSelect } from '@/components'
+import { VTable, VSelect } from '@/components'
 import subarea from '@/views/common/subarea.js'
 import Area from '@/views/common/area.js'
 import chooseWarehouse from '@/views/common/chooseWarehouse'
@@ -214,7 +217,7 @@ import customerService from '@/views/common/customerService'
 export default {
   name: 'PushOrderManagementList',
   mixins: [commonMixin],
-  components: { STable, VSelect, dealerSubareaScopeList, rangeDate, subarea, commonModal, Area, salesDetail, explainInfoModal, chooseWarehouse, customerService },
+  components: { VTable, VSelect, dealerSubareaScopeList, rangeDate, subarea, commonModal, Area, salesDetail, explainInfoModal, chooseWarehouse, customerService },
   data () {
     return {
       spinning: false,
@@ -281,9 +284,16 @@ export default {
   },
   computed: {
     columns () {
+      const formatDate = function (text) {
+        if (text) {
+          const ret = text.split(' ')
+          return (<div>{ret[0]}<br/>{ret[1]}</div>)
+        }
+        return '--'
+      }
       const arr = [
-        { title: '序号', dataIndex: 'no', width: '60px', align: 'center' },
-        { title: '下推时间', dataIndex: 'pushedDate', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '序号', dataIndex: 'no', width: '40px', align: 'center' },
+        { title: '下推时间', dataIndex: 'pushedDate', width: '100px', align: 'center', customRender: function (text) { return formatDate(text) } },
         { title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: '120px', align: 'center' },
         { title: '备货单号', scopedSlots: { customRender: 'dispatchBillNo' }, width: '120px', align: 'center' },
         { title: '发货编号', dataIndex: 'sendNo', width: '80px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
@@ -298,9 +308,9 @@ export default {
         { title: '收款打印状态', dataIndex: 'settlePrintStateDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '对单状态', dataIndex: 'checkStatusDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '业务状态', dataIndex: 'billStatusDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '单据状态', dataIndex: 'voidFlagDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '备货时间', dataIndex: 'stockUpDate', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '出库时间', dataIndex: 'stockOutDate', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '单据状态', dataIndex: 'voidFlagDictValue', scopedSlots: { customRender: 'voidFlag' }, width: '100px', align: 'center' },
+        { title: '备货时间', dataIndex: 'stockUpDate', width: '100px', align: 'center', customRender: function (text) { return formatDate(text) } },
+        { title: '出库时间', dataIndex: 'stockOutDate', width: '100px', align: 'center', customRender: function (text) { return formatDate(text) } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '100px', align: 'center', fixed: 'right' }
       ]
       //  售价权限
@@ -410,7 +420,7 @@ export default {
     // 计算表格高度
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 230
+      this.tableHeight = window.innerHeight - tableSearchH - 200
     }
   },
   watch: {

+ 8 - 9
src/views/salesManagement/salesOrderWarehouse/list.vue

@@ -73,15 +73,14 @@
           总数量:<strong>{{ totalData&&(totalData.totalQty || totalData.totalQty==0) ? totalData.totalQty : '--' }}</strong>;
         </div>
         <!-- 列表 -->
-        <s-table
+        <v-table
           class="sTable fixPagination"
           ref="table"
-          :style="{ height: tableHeight+68+'px' }"
+          :style="{ height: tableHeight+35+'px' }"
           size="small"
-          :rowKey="(record) => record.no"
           rowKeyName="no"
           :columns="columns"
-          :pageSize="30"
+          :pagination="{pageSize:30}"
           :data="loadData"
           :scroll="{ y: tableHeight }"
           :defaultLoadData="false"
@@ -91,7 +90,7 @@
             <span class="link-bule" @click="handleDetail(record)">{{ record.salesBillNo }}</span>
             <a-badge count="促" v-if="record.promoFlag==1" :number-style="{ backgroundColor: '#52c41a', zoom:'80%' }"></a-badge>
           </template>
-        </s-table>
+        </v-table>
       </a-spin>
       <!-- 导出提示框 -->
       <reportModal :visible="showExport" @close="showExport=false"></reportModal>
@@ -106,7 +105,7 @@ import rangeDate from '@/views/common/rangeDate.vue'
 import getDate from '@/libs/getDate.js'
 import Area from '@/views/common/area.js'
 import reportModal from '@/views/common/reportModal.vue'
-import { STable, VSelect } from '@/components'
+import { VTable, VSelect } from '@/components'
 import chooseWarehouse from '@/views/common/chooseWarehouse'
 import { queryPageForWarehouse, queryCountForWarehouse, exportForWarehouse } from '@/api/salesNew'
 import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
@@ -114,7 +113,7 @@ import { hdExportExcel } from '@/libs/exportExcel'
 export default {
   name: 'SalesOrderWarehouseList',
   mixins: [commonMixin],
-  components: { STable, VSelect, rangeDate, Area, chooseWarehouse, reportModal, dealerSubareaScopeList },
+  components: { VTable, VSelect, rangeDate, Area, chooseWarehouse, reportModal, dealerSubareaScopeList },
   data () {
     return {
       spinning: false,
@@ -166,7 +165,7 @@ export default {
   computed: {
     columns () {
       const arr = [
-        { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
+        { title: '序号', dataIndex: 'no', width: '3.5%', align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '销售单号', scopedSlots: { customRender: 'stockOutNo' }, width: '15%', align: 'center' },
         { title: '提交时间', dataIndex: 'submitDate', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -261,7 +260,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 225
+      this.tableHeight = window.innerHeight - tableSearchH - 190
     }
   },
   watch: {

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

@@ -506,6 +506,7 @@ export default {
         return '--'
       }
       let arr = [
+        { title: '序号', dataIndex: 'no', width: '3%', align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: '6%', align: 'center', customRender: function (text) { return formatDate(text) }, sorter: true },
         { title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: '8%', align: 'left' },
         { title: '提交时间', slots: { title: 'customDateTitle' }, dataIndex: 'firstSubmitDate', width: '6%', align: 'center', customRender: function (text) { return formatDate(text) }, sorter: true },