Browse Source

Merge commit 'ff37146a845f3a319e0a182c8531304ef41707ae' into HEAD

gitadmin 2 days ago
parent
commit
83a88f9618

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1757904068571
+  "version": 1760057668573
 }

+ 1 - 1
src/api/sales.js

@@ -179,7 +179,7 @@ export const supperCodeByVin = (params) => {
 // 销售 详情  打印
 export const salesDetailPrint = params => {
   const data = {
-    url: `/sales/print/${params.sn}/${params.type}/${params.printOrgCode}/${params.printAllName}/${params.remarksShowFlag}/${params.priceFlag}`,
+    url: `/sales/print/${params.sn}/${params.type}/${params.printOrgCode}/${params.printAllName}/${params.remarksShowFlag}/${params.priceFlag}/${params.printDate}/${params.printNo}`,
     method: 'get',
     headers: {
       'module': encodeURIComponent(params.type == 'INK' ? '喷墨打印' : '针式打印')

+ 29 - 1
src/api/settle.js

@@ -126,6 +126,34 @@ export const settleUnitExport = params => {
   })
 }
 
+// 单位首付款记录详情打印
+export const settleUnitDetailPrint = params => {
+  const data = {
+    url: `/settle/unit/record/print/${params.id}/${params.type}/${params.printDate}/${params.printNo}`,
+    data: params,
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent(params.type == 'INK' ? '喷墨打印' : '针式打印')
+    }
+  }
+  // 喷墨打印
+  if (params.type == 'INK') {
+    data.responseType = 'blob'
+  }
+  return axios.request(data)
+}
+// 单位首付款记录详情导出
+export const settleUnitDetailExport = params => {
+  return axios.request({
+    url: `/settle/unit/record/excel/${params.id}`,
+    data: params,
+    method: 'post',
+    responseType: 'blob',
+    headers: {
+      'module': encodeURIComponent('单位首付款记录详情导出')
+    }
+  })
+}
 
 //  单位收付款 全部单据
 export const settleInfoAllList = (params) => {
@@ -163,7 +191,7 @@ export const settleInfoQueryReceiptOrPaySum = (params) => {
 //  单位收付款  列表 合计
 export const settleInfoQuerySum = (params) => {
   return axios({
-    url: '/settle/info/querySum',
+    url: '/settle/unit/queryClientUnSettleSum',
     data: params,
     method: 'post'
   })

+ 8 - 8
src/config/router.config.js

@@ -1503,7 +1503,7 @@ export const asyncRouterMap = [
             name: 'companyReceivablePayable',
             component: BlankLayout,
             meta: {
-              title: '单位付管理',
+              title: '单位收付管理',
               icon: 'transaction',
               permission: 'M_companyReceivablePayableList'
             },
@@ -1514,7 +1514,7 @@ export const asyncRouterMap = [
                 name: 'companyReceivablePayableList',
                 component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/companyReceivablePayable/list.vue'),
                 meta: {
-                  title: '单位付列表',
+                  title: '单位收付列表',
                   icon: 'transaction',
                   hidden: true,
                   permission: 'M_companyReceivablePayableList'
@@ -1525,7 +1525,7 @@ export const asyncRouterMap = [
                 name: 'companyReceivablePayableCollectionPayment',
                 component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/companyReceivablePayable/collectionPayment.vue'),
                 meta: {
-                  title: '编辑单位付',
+                  title: '编辑单位收付',
                   icon: 'transaction',
                   hidden: true,
                   permission: 'M_collectionPayment'
@@ -1536,7 +1536,7 @@ export const asyncRouterMap = [
                 name: 'companyReceivablePayableDetail',
                 component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/companyReceivablePayable/detail.vue'),
                 meta: {
-                  title: '单位付详情',
+                  title: '单位收付详情',
                   icon: 'transaction',
                   hidden: true,
                   permission: 'M_companyReceivablePayable_detail'
@@ -1550,7 +1550,7 @@ export const asyncRouterMap = [
             name: 'companyReceivablePayableNew',
             component: BlankLayout,
             meta: {
-              title: '单位付管理(新版)',
+              title: '单位收付管理(新版)',
               icon: 'transaction',
               permission: 'M_companyReceivablePayableList'
             },
@@ -1561,7 +1561,7 @@ export const asyncRouterMap = [
                 name: 'companyReceivablePayableNewList',
                 component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/companyReceivablePayableNew/list.vue'),
                 meta: {
-                  title: '单位付列表(新版)',
+                  title: '单位收付列表(新版)',
                   icon: 'transaction',
                   hidden: true,
                   permission: 'M_companyReceivablePayableList'
@@ -1572,7 +1572,7 @@ export const asyncRouterMap = [
                 name: 'companyReceivablePayableNewCollectionPayment',
                 component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/companyReceivablePayableNew/collectionPayment.vue'),
                 meta: {
-                  title: '编辑单位付(新版)',
+                  title: '编辑单位收付(新版)',
                   icon: 'transaction',
                   hidden: true,
                   permission: 'M_collectionPayment'
@@ -1583,7 +1583,7 @@ export const asyncRouterMap = [
                 name: 'companyReceivablePayableNewDetail',
                 component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/companyReceivablePayableNew/detail.vue'),
                 meta: {
-                  title: '单位付详情(新版)',
+                  title: '单位收付详情(新版)',
                   icon: 'transaction',
                   hidden: true,
                   permission: 'M_companyReceivablePayable_detail'

+ 1 - 1
src/utils/request.js

@@ -101,7 +101,7 @@ service.interceptors.request.use(config => {
   }
   // console.log(config.url)
   // console.log(decodeURIComponent(config.headers['module']))
-  
+  config.url += "?t=" + new Date().getTime()
   config.retry = 3
   config.retryDelay = 1000
   store.commit('SET_loadingStatus', true)

+ 1 - 1
src/views/chainReportData/chainSalesDetailReport/list.vue

@@ -1,6 +1,6 @@
 <template>
   <a-spin :spinning="spinning" tip="Loading...">
-    <a-alert :show-icon="false" type="error" message="注:连锁销售单报表包含急件销售数量、售价,连锁销售明细报表不包含急件销售数量、成本、售价" banner style="margin-bottom: 10px;" />
+    <a-alert :show-icon="false" type="error" message="注:报表中成本包含急件冲减的成本" banner style="margin-bottom: 10px;" />
     <!-- 搜索条件 -->
     <div class="table-page-search-wrapper">
       <a-form-model

+ 6 - 6
src/views/chainReportData/chainSalesReport/list.vue

@@ -1,6 +1,6 @@
 <template>
   <a-spin :spinning="spinning" tip="Loading...">
-    <a-alert :show-icon="false" type="error" message="注:连锁销售单报表包含急件销售数量、售价,连锁销售明细报表不包含急件销售数量、成本、售价" banner style="margin-bottom: 10px;" />
+    <a-alert :show-icon="false" type="error" message="注:报表中成本包含急件冲减的成本" banner style="margin-bottom: 10px;" />
     <!-- 搜索条件 -->
     <div class="table-page-search-wrapper">
       <a-form-model
@@ -60,11 +60,11 @@
                 <a-input id="chainSalesReportList-salesManName" v-model.trim="queryParam.salesManName" allowClear placeholder="请输入业务员"/>
               </a-form-model-item>
             </a-col>
-           <a-col :md="6" :sm="24">
-             <a-form-item label="客户类型">
-               <custType id="chainSalesReportList-custType" v-model="queryParam.salesTargetType" allowClear placeholder="请选择客户类型"></custType>
-             </a-form-item>
-           </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="客户类型">
+                <custType id="chainSalesReportList-custType" v-model="queryParam.salesTargetType" allowClear placeholder="请选择客户类型"></custType>
+              </a-form-item>
+            </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="客户所在区">
                 <AreaList id="chainSalesReportList-area" changeOnSelect ref="areaList" @change="areaChange"></AreaList>

+ 54 - 9
src/views/financialManagement/companyCollectionPayment/detail.vue

@@ -7,6 +7,18 @@
           <a id="companyCollectionPaymentDetail-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
           <p style=" display: inline-block;margin: 0 0 0 20px;color: #000;font-size: 14px;font-weight: 600;">单号:{{ (basicInfoData&&basicInfoData.unitSettleNo) || '--' }}</p>
         </template>
+        <!-- 操作区,位于 title 行的行尾 -->
+        <template slot="extra">
+          <div style="margin-top: 5px;">
+            <PrintPanel ref="printBox" position="bottomRight" @handlePrint="handlePrint">
+              <div style="padding:10px;line-height: 30px;" slot="extendCons">
+                <div>打印内容(多选)</div>
+                <a-checkbox v-model="printNo" :checked="printNo" id="companyCollectionPaymentDetail-printNo">结算单号</a-checkbox>
+                <a-checkbox v-model="printDate" :checked="printDate" id="companyCollectionPaymentDetail-printDate">打印时间</a-checkbox>
+              </div>
+            </PrintPanel>
+          </div>
+        </template>
       </a-page-header>
       <!-- 基础信息 -->
       <a-card size="small" :bordered="false" class="companyCollectionPaymentDetail-cont" v-if="basicInfoData">
@@ -57,10 +69,12 @@
 <script>
 import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
-import { settleUnitDetailList, settleUnitDetail } from '@/api/settle'
+import PrintPanel from '@/views/common/printPanel.vue'
+import { hdPrint } from '@/libs/JGPrint'
+import { settleUnitDetailList, settleUnitDetail, settleUnitDetailPrint, settleUnitDetailExport } from '@/api/settle'
 export default {
   name: 'CompanyCollectionPaymentDetail',
-  components: { STable, VSelect },
+  components: { STable, VSelect, PrintPanel },
   mixins: [commonMixin],
   data () {
     const _this = this
@@ -69,12 +83,13 @@ export default {
       // 表头
       columns: [
         { title: '序号', dataIndex: 'no', align: 'center', width: '5%' },
-        { title: '单据号', dataIndex: 'bizNo', align: 'center', width: '30%', customRender: function (text) { return text || '--' } },
-        { title: '类型', dataIndex: 'bizTypeDictValue', align: 'center', width: '25%', customRender: function (text) { return text || '--' } },
-        // { title: '总款数', dataIndex: 'totalTypeNum', align: 'center', width: '10%', customRender: function (text) { return (text || text == 0)?text: '--' } },
-        // { title: '总数量', dataIndex: 'totalNum', align: 'center', width: '10%', customRender: function (text) { return (text || text == 0)?text: '--'  } },
-        { title: '金额', dataIndex: 'totalAmount', align: 'right', width: '20%', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '结算金额', dataIndex: 'settleAmount', align: 'right', width: '20%', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
+        { title: '单据号', dataIndex: 'bizNo', align: 'center', width: '20%', customRender: function (text) { return text || '--' } },
+        { title: '单据类型', dataIndex: 'bizTypeDictValue', align: 'center', width: '15%', customRender: function (text) { return text || '--' } },
+        { title: '审核时间', dataIndex: 'auditTime', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '总款数', dataIndex: 'bizTotalCategory', align: 'center', width: '10%', customRender: function (text) { return (text || text == 0) ? text : '--' } },
+        { title: '总数量', dataIndex: 'bizTotalQty', align: 'center', width: '10%', customRender: function (text) { return (text || text == 0) ? text : '--' } },
+        { title: '金额', dataIndex: 'totalAmount', align: 'right', width: '10%', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '结算金额', dataIndex: 'settleAmount', align: 'right', width: '10%', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -96,7 +111,9 @@ export default {
         })
       },
       total: 0, //  总条数
-      basicInfoData: null //  基本信息
+      basicInfoData: null, //  基本信息
+      printNo: false, // 是否打印销售单号
+      printDate: false // 是否打印日期
     }
   },
   computed: {
@@ -114,6 +131,24 @@ export default {
     handleBack () {
       this.$router.push({ name: 'companyCollectionPaymentList' })
     },
+    // 打印预览/快捷打印
+    handlePrint (type, printerType) {
+      const _this = this
+      _this.spinning = true
+      let url = settleUnitDetailPrint
+      const params = {
+        id: this.$route.params.id,
+        printNo: this.printNo ? 1 : 0,
+        printDate: this.printDate ? 1 : 0
+      }
+      if (type == 'export') { //  导出
+        url = settleUnitDetailExport
+      }
+      // 打印或导出
+      hdPrint(printerType, type, url, params, '单位收付款记录详情', function () {
+        _this.spinning = false
+      })
+    },
     // 详情
     getDetail () {
       settleUnitDetail({ id: this.$route.params.id }).then(res => {
@@ -128,9 +163,19 @@ export default {
       })
     }
   },
+  watch: {
+    printDate (newValue, oldValue) {
+      localStorage.setItem('printDate-ccp-' + this.$store.state.user.info.orgId, newValue)
+    },
+    printNo (newValue, oldValue) {
+      localStorage.setItem('printNo-ccp-' + this.$store.state.user.info.orgId, newValue)
+    }
+  },
   activated () {
     // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
     if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
+      this.printDate = localStorage.getItem('printDate-ccp-' + this.$store.state.user.info.orgId) == 'true'
+      this.printNo = localStorage.getItem('printNo-ccp-' + this.$store.state.user.info.orgId) == 'true'
       this.getDetail()
     }
   },

+ 3 - 3
src/views/financialManagement/companyCollectionPayment/list.vue

@@ -149,10 +149,10 @@ export default {
         { title: '结算类型', dataIndex: 'settleTypeDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '结算方式', dataIndex: 'settleStyleSnDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '结算单号', scopedSlots: { customRender: 'unitSettleNo' }, width: '11%', align: 'center' },
-        { title: '应收金额', dataIndex: 'settlePayAmount', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '应付金额', dataIndex: 'settleReceiptAmount', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '应收金额', dataIndex: 'settleReceiptAmount', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '应付金额', dataIndex: 'settlePayAmount', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '折让金额', dataIndex: 'discountAmount', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '结算金额', dataIndex: 'realSettleAmount', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '结算金额', dataIndex: 'realSettleAmount', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '结算时间', dataIndex: 'createDate', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作人', dataIndex: 'operateName', width: '16%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true }
       ],

+ 63 - 13
src/views/financialManagement/companyReceivablePayable/list.vue

@@ -21,6 +21,17 @@
                   allowClear></v-select>
               </a-form-item>
             </a-col>
+            <a-col :span="6">
+              <a-form-item label="审核时间">
+                <rangeDate
+                  id="companyReceivablePayableList-auditdate"
+                  allowClear
+                  :hasDisabledAreaTime="false"
+                  ref="rangeDate"
+                  :value="auditTime"
+                  @change="auditDateChange" />
+              </a-form-item>
+            </a-col>
             <a-col :md="6" :sm="24">
               <span class="table-page-search-submitButtons">
                 <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="companyReceivablePayableList-refresh">查询</a-button>
@@ -42,8 +53,14 @@
       <a-alert type="info" style="margin-bottom:10px">
         <div slot="message">
           共 <strong>{{ total }}</strong> 条记录,
-          应收金额合计 <strong>{{ (productTotal&&(productTotal.receipt || productTotal.receipt==0)) ? toThousands(productTotal.receipt) : '--' }}</strong> ,
-          应付金额合计 <strong>{{ (productTotal&&productTotal.pay) ? toThousands(productTotal.pay) : 0 }}</strong>
+          应收合计 <strong>{{ (productTotal&&(productTotal.receiveSettleAmountReceipt || productTotal.receiveSettleAmountReceipt==0)) ? toThousands(productTotal.receiveSettleAmountReceipt) : '--' }}</strong> ,
+          已收合计 <strong>{{ (productTotal&&(productTotal.settleAmountReceipt || productTotal.settleAmountReceipt==0)) ? toThousands(productTotal.settleAmountReceipt) : '--' }}</strong> ,
+          待收合计 <strong>{{ (productTotal&&(productTotal.unsettleAmountReceipt || productTotal.unsettleAmountReceipt==0)) ? toThousands(productTotal.unsettleAmountReceipt) : '--' }}</strong> ,
+          应付合计 <strong>{{ (productTotal&&(productTotal.receiveSettleAmountPay || productTotal.receiveSettleAmountPay==0)) ? toThousands(productTotal.receiveSettleAmountPay) : '--' }}</strong> ;
+          已付合计 <strong>{{ (productTotal&&(productTotal.settleAmountPay || productTotal.settleAmountPay==0)) ? toThousands(productTotal.settleAmountPay) : '--' }}</strong> ,
+          待付合计 <strong>{{ (productTotal&&(productTotal.unsettleAmountPay || productTotal.unsettleAmountPay==0)) ? toThousands(productTotal.unsettleAmountPay) : '--' }}</strong> ,
+          折让合计 <strong>{{ (productTotal&&(productTotal.discountAmount || productTotal.discountAmount==0)) ? toThousands(productTotal.discountAmount) : '--' }}</strong> ;
+          余额合计 <strong>{{ (productTotal&&(productTotal.balance || productTotal.balance==0)) ? toThousands(productTotal.balance) : '--' }}</strong> ;
         </div>
       </a-alert>
       <!-- 列表 -->
@@ -91,10 +108,12 @@
 import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import { downloadExcel } from '@/libs/JGPrint.js'
+import getDate from '@/libs/getDate.js'
+import rangeDate from '@/views/common/rangeDate.vue'
 import { settleUnitClientList, settleInfoQuerySum, exportClientUnSettle } from '@/api/settle'
 export default {
   name: 'CollectionPaymentList',
-  components: { STable, VSelect },
+  components: { STable, VSelect, rangeDate },
   mixins: [commonMixin],
   data () {
     const _this = this
@@ -103,34 +122,56 @@ export default {
       exportLoading: false,
       disabled: false, //  查询、重置按钮是否可操作
       tableHeight: 0,
+      auditTime: [ // 创建时间
+        getDate.getMonthDays(3).starttime,
+        getDate.getMonthDays(3).endtime
+      ],
       // 查询参数
       queryParam: {
         settleClientNameCurrent: '', // 客户名称
-        settleClientType: undefined // 单位类型
+        settleClientType: undefined, // 单位类型
+        beginDate: '', // 开始审核时间
+        endDate: '' // 结束审核时间
       },
       // 表头
       columns: [
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
-        { title: '客户名称', width: '20%', align: 'center', scopedSlots: { customRender: 'customerName' } },
-        { title: '单位类型', dataIndex: 'settleClientTypeDictValue', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '应收金额', dataIndex: 'unSettleAmountReceipt', width: '20%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '应付金额', dataIndex: 'unSettleAmountPay', width: '20%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: '15%', align: 'center' }
+        { title: '客户名称', width: '15%', align: 'center', scopedSlots: { customRender: 'customerName' } },
+        { title: '单位类型', dataIndex: 'settleClientTypeDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '应收金额', dataIndex: 'receiveSettleAmountReceipt', width: '8%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '已收金额', dataIndex: 'settleAmountReceipt', width: '8%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '待收金额', dataIndex: 'unsettleAmountReceipt', width: '8%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '应付金额', dataIndex: 'receiveSettleAmountPay', width: '8%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '已付金额', dataIndex: 'settleAmountPay', width: '8%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '待付金额', dataIndex: 'unsettleAmountPay', width: '8%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '折让金额', dataIndex: 'discountAmount', width: '8%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '余额', dataIndex: 'balance', width: '8%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
         this.spinning = true
-        return settleUnitClientList(Object.assign(parameter, this.queryParam)).then(res => {
+        const sortFiled = {
+          'receiveSettleAmountReceipt': 'RECEIVE_SETTLE_AMOUNT_RECEIPT',
+          'settleAmountReceipt': 'SETTLE_AMOUNT_RECEIPT',
+          'unsettleAmountReceipt': 'UNSETTLE_AMOUNT_RECEIPT',
+          'receiveSettleAmountPay': 'RECEIVE_SETTLE_AMOUNT_PAY',
+          'settleAmountPay': 'SETTLE_AMOUNT_PAY',
+          'unsettleAmountPay': 'UNSETTLE_AMOUNT_PAY',
+          'discountAmount': 'DISCOUNT_AMOUNT',
+          'balance': 'BALANCE'
+        }
+        const sortOrder = { 'descend': 'desc', 'ascend': 'asc' }
+        const params = Object.assign(parameter, this.queryParam, { sortField: sortFiled[parameter.sortField], sortOrder: sortOrder[parameter.sortOrder] })
+        this.getTotal(params)
+        return settleUnitClientList(params).then(res => {
           let data
           if (res.status == 200) {
             data = res.data
-            this.getTotal(Object.assign(parameter, this.queryParam))
             const no = (data.pageNo - 1) * data.pageSize
             for (var i = 0; i < data.list.length; i++) {
               data.list[i].no = no + i + 1
-              // 应付金额  值为负,应显示为正
-              data.list[i].unSettleAmountPay = Math.abs(data.list[i].unSettleAmountPay) || 0
             }
             this.disabled = false
             this.total = data.count || 0
@@ -156,6 +197,12 @@ export default {
         downloadExcel(res, '单位收付款客户')
       })
     },
+    // 选择审核时间
+    auditDateChange (date) {
+      this.auditTime = date
+      this.queryParam.beginDate = date[0]
+      this.queryParam.endDate = date[1]
+    },
     //  详情
     handleDetail (row) {
       if (row.settleClientType == 'CUSTOMER') {
@@ -186,6 +233,9 @@ export default {
     resetSearchForm () {
       this.queryParam.settleClientNameCurrent = ''
       this.queryParam.settleClientType = undefined
+      this.$refs.rangeDate.resetDate(this.auditTime)
+      this.queryParam.beginDate = getDate.getMonthDays(3).starttime
+      this.queryParam.endDate = getDate.getMonthDays(3).endtime
       this.$refs.table.refresh(true)
     },
     // 页面初始化

+ 12 - 5
src/views/financialManagement/companyReceivablePayableNew/chooseBillModal.vue

@@ -40,7 +40,7 @@
               </a-form-item>
             </a-col>
             <a-col :md="8" :sm="24">
-              <a-button style="margin-bottom: 18px;" type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="chooseBillModal-refresh">查询</a-button>
+              <a-button style="margin-bottom: 18px;" type="primary" @click="searchForm" :disabled="disabled" id="chooseBillModal-refresh">查询</a-button>
               <a-button style="margin: 0 0 18px 8px" @click="resetSearchForm" :disabled="disabled" id="chooseBillModal-reset">重置</a-button>
             </a-col>
           </a-row>
@@ -193,6 +193,15 @@ export default {
         this.$message.info('请选择单据')
       }
     },
+    searchForm () {
+      this.clearTable()
+      this.$refs.table.refresh(true)
+    },
+    clearTable () {
+      this.$refs.table.clearSelected() // 清空表格选中项
+      this.selectedRowKeys = []
+      this.selectedRows = []
+    },
     // 重置
     resetSearchForm () {
       this.$refs.rangeDate.resetDate()
@@ -204,7 +213,7 @@ export default {
       this.queryParam.bizNo = ''
       this.queryParam.bizType = undefined
       this.$refs.table.refresh(true)
-      this.$refs.table.clearSelected()
+      this.clearTable()
     }
   },
   watch: {
@@ -218,9 +227,7 @@ export default {
       if (!newValue) {
         _this.$emit('close')
         // 重置
-        _this.$refs.table.clearSelected() // 清空表格选中项
-        _this.selectedRowKeys = []
-        _this.selectedRows = []
+        _this.clearTable()
         _this.resetSearchForm()
       } else {
         setTimeout(() => {

+ 64 - 14
src/views/financialManagement/companyReceivablePayableNew/list.vue

@@ -21,6 +21,17 @@
                   allowClear></v-select>
               </a-form-item>
             </a-col>
+            <a-col :span="6">
+              <a-form-item label="审核时间">
+                <rangeDate
+                  id="crpnList-auditdate"
+                  allowClear
+                  :hasDisabledAreaTime="false"
+                  ref="rangeDate"
+                  :value="auditTime"
+                  @change="auditDateChange" />
+              </a-form-item>
+            </a-col>
             <a-col :md="6" :sm="24">
               <span class="table-page-search-submitButtons">
                 <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="crpnList-refresh">查询</a-button>
@@ -43,10 +54,16 @@
       <a-spin :spinning="spinning" tip="Loading...">
         <!-- 统计 -->
         <div class="table-operator">
-          <div class="alert-message">
+          <div slot="message">
             共 <strong>{{ total }}</strong> 条记录,
-            应收金额合计 <strong>{{ (productTotal&&(productTotal.receipt || productTotal.receipt==0)) ? toThousands(productTotal.receipt) : '--' }}</strong> ,
-            应付金额合计 <strong>{{ (productTotal&&productTotal.pay) ? toThousands(productTotal.pay) : 0 }}</strong>
+            应收合计 <strong>{{ (productTotal&&(productTotal.receiveSettleAmountReceipt || productTotal.receiveSettleAmountReceipt==0)) ? toThousands(productTotal.receiveSettleAmountReceipt) : '--' }}</strong> ,
+            已收合计 <strong>{{ (productTotal&&(productTotal.settleAmountReceipt || productTotal.settleAmountReceipt==0)) ? toThousands(productTotal.settleAmountReceipt) : '--' }}</strong> ,
+            待收合计 <strong>{{ (productTotal&&(productTotal.unsettleAmountReceipt || productTotal.unsettleAmountReceipt==0)) ? toThousands(productTotal.unsettleAmountReceipt) : '--' }}</strong> ,
+            应付合计 <strong>{{ (productTotal&&(productTotal.receiveSettleAmountPay || productTotal.receiveSettleAmountPay==0)) ? toThousands(productTotal.receiveSettleAmountPay) : '--' }}</strong> ;
+            已付合计 <strong>{{ (productTotal&&(productTotal.settleAmountPay || productTotal.settleAmountPay==0)) ? toThousands(productTotal.settleAmountPay) : '--' }}</strong> ,
+            待付合计 <strong>{{ (productTotal&&(productTotal.unsettleAmountPay || productTotal.unsettleAmountPay==0)) ? toThousands(productTotal.unsettleAmountPay) : '--' }}</strong> ,
+            折让合计 <strong>{{ (productTotal&&(productTotal.discountAmount || productTotal.discountAmount==0)) ? toThousands(productTotal.discountAmount) : '--' }}</strong> ;
+            余额合计 <strong>{{ (productTotal&&(productTotal.balance || productTotal.balance==0)) ? toThousands(productTotal.balance) : '--' }}</strong> ;
           </div>
         </div>
         <!-- 列表 -->
@@ -95,10 +112,12 @@
 import { commonMixin } from '@/utils/mixin'
 import { downloadExcel } from '@/libs/JGPrint.js'
 import { STable, VSelect } from '@/components'
+import getDate from '@/libs/getDate.js'
+import rangeDate from '@/views/common/rangeDate.vue'
 import { settleUnitClientList, settleInfoQuerySum, exportClientUnSettle } from '@/api/settle'
 export default {
   name: 'CollectionPaymentList',
-  components: { STable, VSelect },
+  components: { STable, VSelect, rangeDate },
   mixins: [commonMixin],
   data () {
     const _this = this
@@ -107,34 +126,56 @@ export default {
       disabled: false, //  查询、重置按钮是否可操作
       tableHeight: 0, // 表格高度
       exportLoading: false,
+      auditTime: [ // 创建时间
+        getDate.getMonthDays(3).starttime,
+        getDate.getMonthDays(3).endtime
+      ],
       // 查询参数
       queryParam: {
         settleClientNameCurrent: '', // 客户名称
-        settleClientType: undefined // 单位类型
+        settleClientType: undefined, // 单位类型
+        beginDate: '', // 开始审核时间
+        endDate: '' // 结束审核时间
       },
       // 表头
       columns: [
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
-        { title: '客户名称', width: '20%', align: 'center', scopedSlots: { customRender: 'customerName' } },
-        { title: '单位类型', dataIndex: 'settleClientTypeDictValue', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '应收金额', dataIndex: 'unSettleAmountReceipt', width: '20%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '应付金额', dataIndex: 'unSettleAmountPay', width: '20%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: '15%', align: 'center' }
+        { title: '客户名称', width: '15%', align: 'center', scopedSlots: { customRender: 'customerName' } },
+        { title: '单位类型', dataIndex: 'settleClientTypeDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '应收金额', dataIndex: 'receiveSettleAmountReceipt', width: '8%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '已收金额', dataIndex: 'settleAmountReceipt', width: '8%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '待收金额', dataIndex: 'unsettleAmountReceipt', width: '8%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '应付金额', dataIndex: 'receiveSettleAmountPay', width: '8%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '已付金额', dataIndex: 'settleAmountPay', width: '8%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '待付金额', dataIndex: 'unsettleAmountPay', width: '8%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '折让金额', dataIndex: 'discountAmount', width: '8%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '余额', dataIndex: 'balance', width: '8%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
         this.spinning = true
-        return settleUnitClientList(Object.assign(parameter, this.queryParam)).then(res => {
+        const sortFiled = {
+          'receiveSettleAmountReceipt': 'RECEIVE_SETTLE_AMOUNT_RECEIPT',
+          'settleAmountReceipt': 'SETTLE_AMOUNT_RECEIPT',
+          'unsettleAmountReceipt': 'UNSETTLE_AMOUNT_RECEIPT',
+          'receiveSettleAmountPay': 'RECEIVE_SETTLE_AMOUNT_PAY',
+          'settleAmountPay': 'SETTLE_AMOUNT_PAY',
+          'unsettleAmountPay': 'UNSETTLE_AMOUNT_PAY',
+          'discountAmount': 'DISCOUNT_AMOUNT',
+          'balance': 'BALANCE'
+        }
+        const sortOrder = { 'descend': 'desc', 'ascend': 'asc' }
+        const params = Object.assign(parameter, this.queryParam, { sortField: sortFiled[parameter.sortField], sortOrder: sortOrder[parameter.sortOrder] })
+        this.getTotal(params)
+        return settleUnitClientList(params).then(res => {
           let data
           if (res.status == 200) {
             data = res.data
-            this.getTotal(Object.assign(parameter, this.queryParam))
             const no = (data.pageNo - 1) * data.pageSize
             for (var i = 0; i < data.list.length; i++) {
               data.list[i].no = no + i + 1
-              // 应付金额  值为负,应显示为正
-              data.list[i].unSettleAmountPay = Math.abs(data.list[i].unSettleAmountPay) || 0
             }
             this.disabled = false
             this.total = data.count || 0
@@ -148,6 +189,12 @@ export default {
     }
   },
   methods: {
+    // 选择审核时间
+    auditDateChange (date) {
+      this.auditTime = date
+      this.queryParam.beginDate = date[0]
+      this.queryParam.endDate = date[1]
+    },
     //  导出
     handleExport () {
       const _this = this
@@ -182,6 +229,9 @@ export default {
     },
     //  重置
     resetSearchForm () {
+      this.$refs.rangeDate.resetDate(this.auditTime)
+      this.queryParam.beginDate = getDate.getMonthDays(3).starttime
+      this.queryParam.endDate = getDate.getMonthDays(3).endtime
       this.queryParam.settleClientNameCurrent = ''
       this.queryParam.settleClientType = undefined
       this.$refs.table.refresh(true)

+ 9 - 2
src/views/reportData/salesReturnReport/detailList.vue

@@ -23,6 +23,11 @@
               <a-input id="salesDetailReportList-salesReturnNo" v-model.trim="queryParam.salesReturnNo" allowClear placeholder="请输入销售退货单号"/>
             </a-form-model-item>
           </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-model-item label="客户关系">
+              <v-select code="CUSTOMER_RELATION_TYPE" id="salesDetailReportList-customerRelationType" v-model="queryParam.customerRelationType" allowClear placeholder="请选择客户关系"></v-select>
+            </a-form-model-item>
+          </a-col>
           <a-col :md="6" :sm="24">
             <a-form-model-item label="客户名称">
               <custList id="salesDetailReportList-buyerName" ref="custSatelliteList" @change="custSatelliteChange"></custList>
@@ -50,7 +55,7 @@
               </a-form-model-item>
             </a-col>
           </template>
-          <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+          <a-col :md="24" :sm="24" style="margin-bottom: 10px;text-align: center;">
             <a-button type="primary" @click="handleSearch" :disabled="disabled" id="salesDetailReportList-refresh">查询</a-button>
             <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="salesDetailReportList-reset">重置</a-button>
             <a-button
@@ -132,7 +137,8 @@ export default {
           code: '', //  产品编码
           name: '' //  产品名称
         },
-        salesReturnNo: ''
+        salesReturnNo: '',
+        customerRelationType: undefined //  客户类型
       },
       rules: {
         'time': [{ required: true, message: '请选择审核时间', trigger: 'change' }]
@@ -236,6 +242,7 @@ export default {
       this.queryParam.salesReturnNo = ''
       this.queryParam.buyerNameCurrent = undefined
       this.queryParam.buyerSnCurrent = undefined
+      this.queryParam.customerRelationType = undefined
       this.$refs.custSatelliteList.resetForm()
       this.queryParam.productEntity.productBrandSn = undefined
       this.queryParam.productEntity.productTypeSn1 = ''

+ 9 - 2
src/views/reportData/salesReturnReport/list.vue

@@ -23,12 +23,17 @@
               <a-input id="salesReturnReportList-salesReturnNo" v-model.trim="queryParam.salesReturnNo" allowClear placeholder="请输入销售退货单号"/>
             </a-form-model-item>
           </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-model-item label="客户关系">
+              <v-select code="CUSTOMER_RELATION_TYPE" id="salesReturnReportList-customerRelationType" v-model="queryParam.customerRelationType" allowClear placeholder="请选择客户关系"></v-select>
+            </a-form-model-item>
+          </a-col>
           <a-col :md="6" :sm="24">
             <a-form-model-item label="客户名称">
               <custList id="salesReturnReportList-buyerName" ref="custSatelliteList" @change="custSatelliteChange"></custList>
             </a-form-model-item>
           </a-col>
-          <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+          <a-col :md="24" :sm="24" style="margin-bottom: 10px;text-align: center;">
             <a-button type="primary" @click="handleSearch" :disabled="disabled" id="salesReturnReportList-refresh">查询</a-button>
             <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="salesReturnReportList-reset">重置</a-button>
             <a-button
@@ -96,7 +101,8 @@ export default {
         endDate: '', // 结束时间
         buyerNameCurrent: undefined, // 客户名称
         buyerSnCurrent: undefined, // 客户sn
-        salesReturnNo: '' // 销售退货单号
+        salesReturnNo: '', // 销售退货单号
+        customerRelationType: undefined // 客户关系
       },
       rules: {
         'time': [{ required: true, message: '请选择审核时间', trigger: 'change' }]
@@ -199,6 +205,7 @@ export default {
       this.queryParam.salesReturnNo = ''
       this.queryParam.buyerNameCurrent = undefined
       this.queryParam.buyerSnCurrent = undefined
+      this.queryParam.customerRelationType = undefined
       this.$refs.custSatelliteList.resetForm()
       this.$refs.ruleForm.resetFields()
       this.totalData = null

+ 1 - 1
src/views/salesManagement/salesQuery/detail.vue

@@ -250,7 +250,7 @@ export default {
       const _this = this
       _this.spinning = true
       let url = salesDetailPrint
-      const params = { sn: this.outBizSn || this.$route.params.sn, printOrgCode: this.printOrgCode ? 1 : 0, printAllName: this.printAllName ? 1 : 0, remarksShowFlag: 0, priceFlag: 1, printNo: 1 }
+      const params = { sn: this.outBizSn || this.$route.params.sn, printOrgCode: this.printOrgCode ? 1 : 0, printAllName: this.printAllName ? 1 : 0, remarksShowFlag: 0, priceFlag: 1, printNo: 1, printDate: 1 }
       if (type == 'export') { //  导出
         url = salesDetailExport
       }

+ 16 - 7
src/views/salesManagement/salesQueryNew/detail.vue

@@ -18,12 +18,15 @@
           <div style="margin-top: 5px;">
             <PrintPanel ref="printBox" position="bottomRight" :disabled="localDataSource.length==0" @handlePrint="handlePrint">
               <div style="padding:10px;line-height: 30px;" slot="extendCons">
-                <a-checkbox v-model="printAllName" :checked="printAllName" id="salesQuery-printAllName">打印完整产品名称</a-checkbox>
-                <a-checkbox v-model="printOrgCode" :checked="printOrgCode" id="salesQuery-printOrgCode">打印原厂编码</a-checkbox>
-                <a-checkbox v-model="printPrice" :checked="printPrice" id="salesQuery-printPrice">打印售价</a-checkbox>
+                <div>打印内容(多选)</div>
+                <a-checkbox v-model="printNo" :checked="printNo" id="salesQuery-printNo">销售单号</a-checkbox>
+                <a-checkbox v-model="printAllName" :checked="printAllName" id="salesQuery-printAllName">完整产品名称</a-checkbox>
+                <a-checkbox v-model="printOrgCode" :checked="printOrgCode" id="salesQuery-printOrgCode">原厂编码</a-checkbox>
                 <br>
-                <a-checkbox v-model="printRemarks" :checked="printRemarks" id="salesQuery-printRemarks">打印备注</a-checkbox>
-                <!-- <a-checkbox v-model="printNo" :checked="printNo" id="salesQuery-printNo">打印销售单号</a-checkbox> -->
+                <a-checkbox v-model="printPrice" :checked="printPrice" id="salesQuery-printPrice">售价</a-checkbox>
+                <a-checkbox v-model="printRemarks" :checked="printRemarks" id="salesQuery-printRemarks">备注</a-checkbox>
+                <!-- <a-checkbox v-model="printWarehouse" :checked="printWarehouse" id="salesQuery-printWarehouse">仓库仓位</a-checkbox> -->
+                <a-checkbox v-model="printDate" :checked="printDate" id="salesQuery-printDate">打印时间</a-checkbox>
               </div>
             </PrintPanel>
           </div>
@@ -162,6 +165,7 @@ export default {
       printRemarks: false, // 是否打印备注
       printPrice: false, // 是否打印价格
       printNo: true, // 是否打印销售单号
+      printDate: true, // 是否打印日期
       showOutInModal: false, // 出库明细弹框
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -267,7 +271,8 @@ export default {
         printAllName: this.printAllName ? 1 : 0,
         remarksShowFlag: this.printRemarks ? 1 : 0,
         printNo: this.printNo ? 1 : 0,
-        priceFlag: this.printPrice ? 1 : 0
+        priceFlag: this.printPrice ? 1 : 0,
+        printDate: this.printDate ? 1 : 0
       }
       if (type == 'export') { //  导出
         url = salesDetailExport
@@ -307,8 +312,9 @@ export default {
         vm.printAllName = localStorage.getItem('printAllName-' + this.$store.state.user.info.orgId) == 'true'
         vm.printRemarks = localStorage.getItem('printRemarks-' + this.$store.state.user.info.orgId) == 'true'
         vm.printPrice = localStorage.getItem('printPrice-' + this.$store.state.user.info.orgId) == 'true'
+        const printDate = localStorage.getItem('printDate-' + this.$store.state.user.info.orgId)
+        vm.printDate = printDate ? printDate == 'true' : true
         const printNo = localStorage.getItem('printNo-' + this.$store.state.user.info.orgId)
-        console.log(printNo)
         vm.printNo = printNo ? printNo == 'true' : true
         // 查询列表
         vm.$refs.table.refresh(true)
@@ -331,6 +337,9 @@ export default {
     printAllName (newValue, oldValue) {
       localStorage.setItem('printAllName-' + this.$store.state.user.info.orgId, newValue)
     },
+    printDate (newValue, oldValue) {
+      localStorage.setItem('printDate-' + this.$store.state.user.info.orgId, newValue)
+    },
     printNo (newValue, oldValue) {
       localStorage.setItem('printNo-' + this.$store.state.user.info.orgId, newValue)
     }

+ 23 - 6
src/views/salesManagement/salesQueryNew/edit.vue

@@ -24,11 +24,16 @@
         <div style="margin-top: 5px;">
           <PrintPanel ref="printBox" :disabled="dataSource.length==0" @handlePrint="handlePrint">
             <div style="padding:10px;" slot="extendCons">
-              <a-checkbox v-model="printAllName" :checked="printAllName" id="salesQuery-printAllName">打印完整产品名称</a-checkbox>
-              <a-checkbox v-model="printOrgCode" :checked="printOrgCode" id="salesQuery-printOrgCode">打印原厂编码</a-checkbox>
-              <a-checkbox v-model="printPrice" :checked="printPrice" id="salesQuery-printPrice">打印售价</a-checkbox>
-              <a-checkbox v-model="printRemarks" :checked="printRemarks" id="salesQuery-printRemarks">打印备注</a-checkbox>
-              <a-checkbox v-model="printNo" :checked="printNo" id="salesQuery-printNo">打印销售单号</a-checkbox>
+              <div style="padding:10px 0">打印内容(多选)</div>
+              <a-checkbox v-model="printNo" :checked="printNo" id="salesQuery-printNo">销售单号</a-checkbox>
+              <a-checkbox v-model="printAllName" :checked="printAllName" id="salesQuery-printAllName">完整产品名称</a-checkbox>
+              <a-checkbox v-model="printOrgCode" :checked="printOrgCode" id="salesQuery-printOrgCode">原厂编码</a-checkbox>
+              <div style="padding:10px 0">
+                <a-checkbox v-model="printPrice" :checked="printPrice" id="salesQuery-printPrice">售价</a-checkbox>
+                <a-checkbox v-model="printRemarks" :checked="printRemarks" id="salesQuery-printRemarks">备注</a-checkbox>
+                <!-- <a-checkbox v-model="printWarehouse" :checked="printWarehouse" id="salesQuery-printWarehouse">仓库仓位</a-checkbox> -->
+                <a-checkbox v-model="printDate" :checked="printDate" id="salesQuery-printDate">打印时间</a-checkbox>
+              </div>
             </div>
           </PrintPanel>
           <a-divider type="vertical" v-if="detailData&&detailData.totalCategory" />
@@ -387,6 +392,8 @@ export default {
       printAllName: false, // 是否打印全部名称
       printRemarks: false, // 是否打印备注
       printNo: true, // 是否打印销售单号
+      printDate: false, // 是否打印日期
+      // printWarehouse: false, // 是否打印仓库
       printPrice: false, // 是否打印价格
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -493,7 +500,9 @@ export default {
         printAllName: this.printAllName ? 1 : 0,
         remarksShowFlag: this.printRemarks ? 1 : 0,
         printNo: this.printNo ? 1 : 0,
-        priceFlag: this.printPrice ? 1 : 0
+        priceFlag: this.printPrice ? 1 : 0,
+        // printWarehouse: this.printWarehouse ? 1 : 0,
+        printDate: this.printDate ? 1 : 0
       }
       if (type == 'export') { //  导出
         url = salesDetailExport
@@ -935,6 +944,8 @@ export default {
         vm.printAllName = localStorage.getItem('printAllName-' + this.$store.state.user.info.orgId) == 'true'
         vm.printRemarks = localStorage.getItem('printRemarks-' + this.$store.state.user.info.orgId) == 'true'
         vm.printPrice = localStorage.getItem('printPrice-' + this.$store.state.user.info.orgId) == 'true'
+        vm.printWarehouse = localStorage.getItem('printWarehouse-' + this.$store.state.user.info.orgId) == 'true'
+        vm.printDate = localStorage.getItem('printDate-' + this.$store.state.user.info.orgId) == 'true'
         const printNo = localStorage.getItem('printNo-' + this.$store.state.user.info.orgId)
         vm.printNo = printNo ? printNo == 'true' : true
         // 获取详情
@@ -956,6 +967,12 @@ export default {
     printRemarks (newValue, oldValue) {
       localStorage.setItem('printRemarks-' + this.$store.state.user.info.orgId, newValue)
     },
+    printDate (newValue, oldValue) {
+      localStorage.setItem('printDate-' + this.$store.state.user.info.orgId, newValue)
+    },
+    printWarehouse (newValue, oldValue) {
+      localStorage.setItem('printWarehouse-' + this.$store.state.user.info.orgId, newValue)
+    },
     printNo (newValue, oldValue) {
       localStorage.setItem('printNo-' + this.$store.state.user.info.orgId, newValue)
     },

+ 9 - 5
src/views/salesManagement/urgentItemsOffset/list.vue

@@ -112,6 +112,7 @@ export default {
   components: { STable, VSelect, rangeDate, custList, stateIcon },
   mixins: [commonMixin],
   data () {
+    const _this = this
     return {
       spinning: false,
       tableHeight: 0, // 表格高度
@@ -133,14 +134,17 @@ export default {
       columns: [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '急件单号', scopedSlots: { customRender: 'urgentBillNo' }, width: '15%', align: 'center' },
-        { title: '关联单号', dataIndex: 'bizBillNo', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '关联单号', dataIndex: 'bizBillNo', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
         // { title: '销售单来源', dataIndex: 'sourceTypeDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '客户名称', dataIndex: 'buyerNameCurrent', width: '24%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '客户名称', dataIndex: 'buyerNameCurrent', width: '16%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '总款数', dataIndex: 'totalCategory', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总数量', dataIndex: 'totalQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '创建时间', dataIndex: 'createDate', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '冲减时间', dataIndex: 'offSetTime', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '状态', scopedSlots: { customRender: 'status' }, width: '3%', align: 'center' },
+        { title: '总成本', dataIndex: 'totalCost', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '总售价', dataIndex: 'totalAmount', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '毛利', dataIndex: 'grossProfit', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '创建时间', dataIndex: 'createDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '冲减时间', dataIndex: 'offSetTime', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '状态', scopedSlots: { customRender: 'status' }, width: '4%', align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ],
       // 加载数据方法 必须为 Promise 对象