Bläddra i källkod

Merge branch 'develop_yh63' of jianguan-web/jg-ocs-html into pre-release

李磊 1 dag sedan
förälder
incheckning
49c6e60458

+ 1 - 1
public/version.json

@@ -1,4 +1,4 @@
 {
-    "version": "2.2.062",
+    "version": "2.2.063",
     "message": "发现有新版本发布,确定更新系统?"
 }

+ 25 - 3
src/api/verifyAccount.js

@@ -110,15 +110,25 @@ export const verifyAcountBillConfirmCheck = params => {
 // 对账单 对单
 export const verifyAcountBillConfirm = params => {
   return axios({
-    url: `/verifyAccountBill/confirm/${params.sn}`,
+    url: `/verifyAccountBill/confirm`,
+    data: params,
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('对单')
+    }
+  })
+}
+// 对账单同步
+export const verifyAcountBillSyncBill = params => {
+  return axios({
+    url: `/verifyAccountBill/syncBill/${params.sn}`,
     data: {},
     method: 'get',
     headers: {
-      'module': encodeURIComponent('对单')
+      'module': encodeURIComponent('对同步')
     }
   })
 }
-
 // 对账单管理  对账
 export const verifyAcountBillVerify = params => {
   return axios({
@@ -130,6 +140,18 @@ export const verifyAcountBillVerify = params => {
     }
   })
 }
+
+// 调账插入对账单明细
+export const verifyAccountChangeInsert = params => {
+  return axios({
+    url: '/verifyAccountBillDetail/insertChange',
+    data: params,
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('调账插入对账单明细')
+    }
+  })
+}
  
 //  对账单管理  明细 列表  分页
 export const verifyAcountBillDetailList = (params) => {

+ 43 - 5
src/api/verifyAccountChange.js

@@ -25,6 +25,7 @@ export const verifyAccountChangeSave = params => {
     }
   })
 }
+
 // 调账调账  删除
 export const verifyAccountChangeDel = params => {
   return axios({
@@ -62,7 +63,7 @@ export const verifyAcountBillSubmit = params => {
 
 // 经销商余额-分页列表
 export const verifyAccountBalanceQueryPage = (params) => {
-  const url = `/verifyAccountBalance/queryPage/${params.pageNo}/${params.pageSize}`
+  const url = `/verifyAccountDealer/queryPage/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
   delete params.pageSize
   return axios({
@@ -74,10 +75,22 @@ export const verifyAccountBalanceQueryPage = (params) => {
     }
   })
 }
+// 分页列表-合计
+export const verifyAccountBalanceQueryCount = (params) => {
+  const url = `/verifyAccountDealer/queryCount`
+  return axios({
+    url: url,
+    data: params,
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('经销商余额列表统计')
+    }
+  })
+}
 
 //对账余额明细接口
 export const verifyAccountBalanceQueryDetailPage = (params) => {
-  const url = `/verifyAccountBalance/queryDetailPage/${params.pageNo}/${params.pageSize}`
+  const url = `/verifyAccountDealer/queryDetailPage/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
   delete params.pageSize
   return axios({
@@ -92,7 +105,7 @@ export const verifyAccountBalanceQueryDetailPage = (params) => {
 
 // 对账余额明细统计
 export const verifyAccountBalanceQueryDetailCount = (params) => {
-  const url = `/verifyAccountBalance/queryDetailCount`
+  const url = `/verifyAccountDealer/queryDetailCount`
   return axios({
     url: url,
     data: params,
@@ -104,7 +117,7 @@ export const verifyAccountBalanceQueryDetailCount = (params) => {
 }
 // 对账余额导出
 export const verifyAccountBalanceExport = (params) => {
-  const url = `/verifyAccountBalance/export`
+  const url = `/verifyAccountDealer/export`
   return axios({
     url: url,
     data: params,
@@ -117,7 +130,7 @@ export const verifyAccountBalanceExport = (params) => {
 }
 // 对账余额明细导出
 export const verifyAccountBalanceDetailExport = (params) => {
-  const url = `/verifyAccountBalance/detailExport`
+  const url = `/verifyAccountDealer/detailExport`
   return axios({
     url: url,
     data: params,
@@ -127,4 +140,29 @@ export const verifyAccountBalanceDetailExport = (params) => {
       'module': encodeURIComponent('对账余额明细列表导出')
     }
   })
+}
+
+// 人工录入单导出
+export const verifyAccountChangeExport = (params) => {
+  return axios({
+    url: `/verifyAccountChange/export`,
+    data: params,
+    method: 'post',
+    responseType: 'blob',
+    headers: {
+      'module': encodeURIComponent('人工录入单导出')
+    }
+  })
+}
+
+// 查询被引用单据
+export const verifyAccountChangeDeleteValid = (params) => {
+  return axios({
+    url: `/verifyAccountChange/deleteValid/${params.sn}`,
+    data: params,
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('人工录入单查询被引用对账单')
+    }
+  })
 }

+ 4 - 0
src/components/Select/index.js

@@ -23,6 +23,10 @@ export default {
       type: String,
       required: true
     },
+    mode: {
+      type: String,
+      default: 'default'
+    },
     showType: {
       type: String,
       default: 'select'

+ 3 - 3
src/config/financialManagement.js

@@ -166,18 +166,18 @@ export default {
                 name: 'accountStatementBillList',
                 component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/accountStatementBill/list.vue'),
                 meta: {
-                  title: '待对单单据列表',
+                  title: '经销商对账余额列表',
                   icon: 'vertical-align-top',
                   hidden: true,
                   permission: 'M_accountStatementBill_list'
                 }
               },
               {
-                path: 'detail/:sn/:name',
+                path: 'detail/:sn/:name/:type',
                 name: 'accountStatementBillDetail',
                 component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/accountStatementBill/detail.vue'),
                 meta: {
-                  title: '待对单单据明细',
+                  title: '经销商对账余额明细',
                   icon: 'vertical-align-top',
                   hidden: true,
                   permission: 'B_asb_detail',

+ 3 - 3
src/config/sysSetting.js

@@ -330,7 +330,7 @@ export default {
       name: 'salesReturnRemove',
       component: BlankLayout,
       meta: {
-        title: '开单剔除配置',
+        title: '剔除配置',
         icon: 'sketch',
         permission: 'M_salesReturnRemoveList'
       },
@@ -339,9 +339,9 @@ export default {
         {
           path: 'list',
           name: 'salesReturnRemoveList',
-          component: () => import(/* webpackChunkName: "setting" */ '@/views/setting/salesReturnRemove/list.vue'),
+          component: () => import(/* webpackChunkName: "setting" */ '@/views/setting/removeSetting/index.vue'),
           meta: {
-            title: '开单剔除配置',
+            title: '剔除配置',
             icon: 'sketch',
             hidden: true,
             permission: 'M_salesReturnRemoveList'

+ 30 - 18
src/views/financialManagement/accountStatement/confrontModal.vue

@@ -113,7 +113,14 @@
         </div>
         <div class="conFrontModal-footer-bar" v-if="detailData">
           <a-button @click="cancel" style="margin-right: 15px" id="conFrontModal-btn-back">取消</a-button>
-          <a-button type="primary" v-if="orderType==1" :loading="confirmLoading" @click="handleSubmit" id="conFrontModal-btn-submit">对单</a-button>
+          <a-button type="primary" v-if="orderType==1" :loading="confirmLoading" @click="handleSubmit(0)" id="conFrontModal-btn-submit">对单</a-button>
+          <a-button
+            type="primary"
+            class="button-success"
+            v-if="orderType==1"
+            :loading="confirmLoading"
+            @click="handleSubmit(1)"
+            id="conFrontModal-btn-submit-sync">对单并同步</a-button>
         </div>
       </a-card>
     </a-spin>
@@ -162,26 +169,31 @@ export default {
         this.spinning = true
         const params = Object.assign(parameter, this.queryParam)
         params.verifyAccountBillSn = this.verifyAccountBillSn
+        const beginFlag = (!!params.beginDate && !!params.endDate)
+        const a = !params.bizNo && !params.changeType && !params.bizType
+        const b = !params.beginDate && !params.endDate
+        params.beginFlag = beginFlag && a || a && b ? 1 : 0
         return verifyAcountBillDetailQueryList(params).then(res => {
           let data
           if (res.status == 200) {
             data = res.data
             const no = 0
-            let prevTotalAmount = 0
             for (var i = 0; i < data.length; i++) {
               data[i].no = no + i + 1
-              const dates = data[i].bizDate.split('-')
-              data[i].year = dates[0]
-              data[i].month = dates[1]
-              data[i].day = dates[2].split(' ')[0]
-              // 正为借方, 负数为贷方
-              if (data[i].bizAmount > 0) {
-                data[i].debitAmount = Number(data[i].bizAmount).toFixed(2)
-              } else {
-                data[i].creditorAmount = Number(data[i].bizAmount * -1).toFixed(2)
+              if (data[i].bizDate) {
+                const dates = data[i].bizDate.split('-')
+                data[i].year = dates[0]
+                data[i].month = dates[1]
+                data[i].day = dates[2].split(' ')[0]
+              }
+              if (data[i].bizAmount) {
+                // 正为借方, 负数为贷方
+                if (data[i].bizAmount > 0) {
+                  data[i].debitAmount = Number(data[i].bizAmount).toFixed(2)
+                } else {
+                  data[i].creditorAmount = Number(data[i].bizAmount * -1).toFixed(2)
+                }
               }
-              data[i].totalAmount = Number(Number(prevTotalAmount || 0) + Number(data[i].debitAmount || 0) - Number(data[i].creditorAmount || 0)).toFixed(2)
-              prevTotalAmount = data[i].totalAmount
             }
             this.total = data.length || 0 + 1
             this.disabled = false
@@ -219,7 +231,7 @@ export default {
     columns () {
       const renderContent = (value, row, index) => {
         const obj = {
-          children: value || '--',
+          children: value || value === 0 ? value : '--',
           attrs: {}
         }
         return obj
@@ -420,8 +432,8 @@ export default {
       const excelTitle = '(' + this.detailData.dealerName + ')应收账款明细表'
       this.exportTable(this.$refs.table.$el.querySelector('table'), excelTitle)
     },
-    // 对单
-    async handleSubmit () {
+    // 对单, type 0 对单 1 对单且同步
+    async handleSubmit (type) {
       const _this = this
       this.confirmLoading = true
       const ret = await verifyAcountBillConfirmCheck({ sn: this.verifyAccountBillSn })
@@ -439,9 +451,9 @@ export default {
         })
       } else {
         this.confirmLoading = true
-        verifyAcountBillConfirm({ sn: this.verifyAccountBillSn }).then(res => {
+        verifyAcountBillConfirm({ verifyAccountBillSn: this.verifyAccountBillSn, syncFlag: type }).then(res => {
           this.confirmLoading = false
-          this.$message.success('对单成功')
+          this.$message.success(type == 0 ? '对单成功' : '对单同步成功')
           this.$emit('confirm')
           this.cancel()
         })

+ 43 - 12
src/views/financialManagement/accountStatement/edit.vue

@@ -71,13 +71,16 @@
                       allowClear></v-select>
                   </a-form-item>
                 </a-col>
-                <a-col :md="4" :sm="24" style="margin-bottom: 10px;">
+                <a-col :md="4" :sm="24">
                   <a-button id="accountStatement-2-search" type="primary" @click="$refs.table.refresh(true)">查询</a-button>
                   <a-button id="accountStatement-2-restForm" style="margin-left: 5px" @click="resetSearchForm">重置</a-button>
                 </a-col>
               </a-row>
             </a-form>
           </div>
+          <div>
+            <a-button id="accountStatement-tzhang" style="margin-bottom: 10px;" type="primary" @click="handleAdd">调账</a-button>
+          </div>
         </div>
         <!-- 已选配件列表 -->
         <s-table
@@ -127,6 +130,15 @@
     </div>
     <!-- 编辑基础信息弹窗 -->
     <baseModal v-drag :show="openModal" @cancel="openModal=false" :itemSn="verifyAccountBillSn" @refashData="getBasicsData"></baseModal>
+    <!-- 基础信息 -->
+    <baseTzModal
+      v-drag
+      :show="baseModal"
+      type="1"
+      :itemSn="verifyAccountBillSn"
+      :dealerSn="dealerSn"
+      @cancel="baseModal=false"
+      @ok="hanldAudit"></baseTzModal>
   </div>
 </template>
 
@@ -135,6 +147,7 @@ import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import queryPart from './queryPart.vue'
 import baseModal from './baseModal.vue'
+import baseTzModal from '../manualEntryForm/baseModal.vue'
 import rangeDate from '@/views/common/rangeDate.vue'
 import {
   verifyAcountBillDetailList,
@@ -154,19 +167,23 @@ export default {
     VSelect,
     queryPart,
     baseModal,
-    rangeDate
+    rangeDate,
+    baseTzModal
   },
   data () {
     return {
       spinning: false,
       isInster: false, // 是否正在添加产品
+      baseModal: false,
+      openDepartUserModal: false,
       delLoading: false,
       productForm: {
         beginDate: '',
         endDate: '',
         bizNo: '',
         changeType: undefined,
-        bizType: undefined
+        bizType: undefined,
+        bizStatus: undefined
       },
       creatDate: [],
       chooseList: [],
@@ -185,10 +202,12 @@ export default {
             const no = (data.pageNo - 1) * data.pageSize
             for (var i = 0; i < data.list.length; i++) {
               data.list[i].no = no + i + 1
-              const dates = data.list[i].bizDate.split('-')
-              data.list[i].year = dates[0]
-              data.list[i].month = dates[1]
-              data.list[i].day = dates[2].split(' ')[0]
+              if (data.list[i].bizDate) {
+                const dates = data.list[i].bizDate.split('-')
+                data.list[i].year = dates[0]
+                data.list[i].month = dates[1]
+                data.list[i].day = dates[2].split(' ')[0]
+              }
               // 正为借方, 负数为贷方
               if (data.list[i].bizAmount > 0) {
                 data.list[i].debitAmount = data.list[i].bizAmount
@@ -206,7 +225,8 @@ export default {
       countData: null, // 统计明细
       detailData: null, // 基础信息数据
       addMoreLoading: false, // 批量添加动画
-      verifyAccountBillSn: undefined // 单据sn
+      verifyAccountBillSn: undefined, // 单据sn
+      itemSn: null
     }
   },
   computed: {
@@ -248,6 +268,16 @@ export default {
       this.productForm.beginDate = date[0] ? date[0] : ''
       this.productForm.endDate = date[1] ? date[1] : ''
     },
+    // 调账
+    handleAdd () {
+      this.itemSn = null
+      this.baseModal = true
+    },
+    // 打开审核提交弹框
+    hanldAudit (data) {
+      this.$message.success('提交成功')
+      this.resetTable(false)
+    },
     // 删除所选产品
     handleDel (row) {
       const _this = this
@@ -257,15 +287,15 @@ export default {
         centered: true,
         closable: true,
         onOk () {
-          _this.delDetail([row.detailSn])
+          _this.delDetail([row.detailSn], 1)
         }
       })
     },
-    delDetail (snList) {
+    delDetail (snList, type) {
       const _this = this
       _this.delLoading = true
       _this.spinning = true
-      verifyAcountBillDetailDel({ verifyAccountBillSn: _this.verifyAccountBillSn, detailSnList: snList })
+      verifyAcountBillDetailDel({ verifyAccountBillSn: _this.verifyAccountBillSn, detailSnList: snList, cascadeFlag: type })
         .then(res => {
           if (res.status == 200) {
             _this.resetTable(false)
@@ -292,6 +322,7 @@ export default {
       this.productForm.changeType = undefined
       this.productForm.bizType = undefined
       this.productForm.bizStatus = undefined
+      this.productForm.bizStatus = undefined
       this.creatDate = []
       this.$refs.rangeDate.resetDate(this.creatDate)
       this.$refs.table.refresh(!!flag)
@@ -378,7 +409,7 @@ export default {
           centered: true,
           closable: true,
           onOk () {
-            _this.delDetail(snList)
+            _this.delDetail(snList, 0)
           }
         })
       }

+ 67 - 10
src/views/financialManagement/accountStatement/list.vue

@@ -31,7 +31,21 @@
                   allowClear></v-select>
               </a-form-item>
             </a-col>
-            <a-col :md="24" :sm="24" style="margin-bottom: 10px;text-align: center;">
+            <a-col :md="6" :sm="24">
+              <a-form-item label="同步状态">
+                <a-select
+                  v-model="queryParam.syncFlag"
+                  ref="syncFlag"
+                  id="accountStatement-syncFlag"
+                  placeholder="请选择同步状态"
+                  allowClear
+                >
+                  <a-select-option value="1">已同步</a-select-option>
+                  <a-select-option value="0">未同步</a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="accountStatement-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="accountStatement-reset">重置</a-button>
             </a-col>
@@ -67,9 +81,22 @@
             <span v-if="$hasPermissions('B_as_detail')" class="link-bule" @click="handleDetail(record,0)">{{ record.verifyAccountBillNo }}</span>
             <span v-else>{{ record.verifyAccountBillNo }}</span>
           </template>
+          <!-- 业务时间区间 -->
+          <template slot="bizDate" slot-scope="text, record">
+            {{ record.bizFirstDate }} ~ {{ record.bizLastDate }}
+          </template>
           <!-- 操作 -->
           <template slot="action" slot-scope="text, record">
             <div>
+              <a-button
+                v-if="record.syncFlag=='0'&&(record.billStatus=='FINISH'||record.billStatus=='WAIT_VERIFY')"
+                size="small"
+                type="link"
+                class="button-info"
+                @click="handleSync(record)"
+              >
+                同步
+              </a-button>
               <a-button
                 v-if="record.billStatus=='WAIT_CONFIRM'&&$hasPermissions('B_as_confirm')"
                 size="small"
@@ -125,7 +152,7 @@ import rangeDate from '@/views/common/rangeDate.vue'
 import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
 import baseModal from './baseModal.vue'
 import confrontModal from './confrontModal.vue'
-import { verifyAcountBillList, verifyAcountBillDel, verifyAcountBillVerify } from '@/api/verifyAccount.js'
+import { verifyAcountBillList, verifyAcountBillDel, verifyAcountBillVerify, verifyAcountBillSyncBill } from '@/api/verifyAccount.js'
 export default {
   name: 'AccountStatementList',
   mixins: [commonMixin],
@@ -142,7 +169,8 @@ export default {
         verifyAccountBillNo: '',
         dealerName: undefined,
         dealerSn: undefined,
-        billStatus: undefined
+        billStatus: undefined,
+        syncFlag: undefined
       },
       disabled: false, //  查询、重置按钮是否可操作
       creatDate: [], //  创建时间
@@ -177,13 +205,19 @@ export default {
     columns () {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-        { title: '创建时间', dataIndex: 'createDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '对账单号', scopedSlots: { customRender: 'verifyAccountBillNo' }, width: '10%', align: 'center' },
-        { title: '客户名称', dataIndex: 'dealerName', width: '26%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '余额', dataIndex: 'totalAmount', width: '10%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
-        { title: '对单时间', dataIndex: 'confirmDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '对账时间', dataIndex: 'verifyDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '业务状态', dataIndex: 'billStatusDictValue', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '创建时间', dataIndex: 'createDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '对账单号', scopedSlots: { customRender: 'verifyAccountBillNo' }, width: '8%', align: 'center' },
+        { title: '客户名称', dataIndex: 'dealerName', width: '15%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '借方', dataIndex: 'debitAmount', width: '5%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
+        { title: '贷方', dataIndex: 'creditAmount', width: '5%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text * -1) : '--') },
+        { title: '期初余额', dataIndex: 'beginBalance', width: '5%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
+        { title: '余额', dataIndex: 'totalAmount', width: '5%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
+        { title: '业务单数', dataIndex: 'bizNum', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '业务时间区间', dataIndex: 'bizDate', scopedSlots: { customRender: 'bizDate' }, width: '14%', align: 'center' },
+        { title: '对单时间', dataIndex: 'confirmDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '对账时间', dataIndex: 'verifyDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '业务状态', dataIndex: 'billStatusDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '同步状态', dataIndex: 'syncFlag', width: '6%', align: 'center', customRender: function (text) { return ['未同步', '已同步'][text] } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ]
       return arr
@@ -215,6 +249,7 @@ export default {
       this.queryParam.dealerSn = undefined
       this.queryParam.verifyAccountBillNo = ''
       this.queryParam.billStatus = undefined
+      this.queryParam.syncFlag = undefined
       if (this.$refs.dealer) {
         this.$refs.dealer.resetForm()
       }
@@ -250,6 +285,28 @@ export default {
         }
       })
     },
+    // 同步
+    handleSync (row) {
+      const _this = this
+      this.$confirm({
+        title: '提示',
+        content: <div style="font-size:14px;"><div>您要同步对账单【{row.verifyAccountBillNo}】给【{row.dealerName}】客户吗?</div></div>,
+        centered: true,
+        closable: true,
+        onOk () {
+          _this.spinning = true
+          verifyAcountBillSyncBill({ sn: row.verifyAccountBillSn }).then(res => {
+            if (res.status == 200) {
+              _this.$message.success(res.message)
+              _this.$refs.table.refresh()
+              _this.spinning = false
+            } else {
+              _this.spinning = false
+            }
+          })
+        }
+      })
+    },
     // 0详情,1对单
     handleDetail (row, type) {
       this.spinning = true

+ 4 - 2
src/views/financialManagement/accountStatement/queryPart.vue

@@ -37,7 +37,7 @@
                   allowClear></v-select>
               </a-form-item>
             </a-col>
-            <a-col :md="4" :sm="24" v-if="queryParam.bizType&&queryParam.bizType!='FINANCE_BOOK'&&queryParam.bizType!='CHANGE'">
+            <a-col :md="4" :sm="24" v-if="queryParam.bizType&&queryParam.bizType!='FINANCE_BOOK'">
               <a-form-item label="业务状态">
                 <!-- 备货单状态,销售退货单,调拨单,费用报销单 -->
                 <v-select
@@ -191,7 +191,6 @@ export default {
     bizStatusNoCode () {
       const arr = [
         'STOCK_UP_REJECT',
-        'WAIT_SUBMIT',
         'AUDIT_REJECT',
         'WAIT_CHECK',
         'FINANCIAL_REJECT',
@@ -202,6 +201,9 @@ export default {
       if (this.queryParam.bizType == 'SALES_RETURN') {
         arr.push('WAIT_AUDIT')
       }
+      if (this.queryParam.bizType !== 'CHANGE') {
+        arr.push('WAIT_SUBMIT')
+      }
       return arr
     },
     columns () {

+ 2 - 2
src/views/financialManagement/accountStatementBill/baseModal.vue

@@ -104,8 +104,8 @@ export default {
         this.$refs.ruleForm.resetFields()
       })
       this.form = {
-        dealerSn: data.dealerSn,
-        dealerName: data.dealerName,
+        dealerSn: data.dealer.dealerSn,
+        dealerName: data.dealer.dealerName,
         remarks: ''
       }
     }

+ 35 - 16
src/views/financialManagement/accountStatementBill/detail.vue

@@ -67,8 +67,9 @@
             <a-col :md="6" :sm="24">
               <a-form-item label="对单状态">
                 <v-select
-                  v-model="queryParam.billStatus"
+                  v-model="queryParam.bizStatusColl"
                   ref="billStatus"
+                  mode="multiple"
                   id="accountStatement-billStatus"
                   code="VERIFY_ACCOUNT_STATUS"
                   placeholder="请选择对单状态"
@@ -108,7 +109,8 @@
           ref="table"
           :style="{ height: tableHeight+80+'px' }"
           size="small"
-          :rowKey="(record) => record.id"
+          :rowKey="(record) => record.no"
+          rowKeyName="no"
           :scroll="{ y: tableHeight }"
           :columns="columns"
           :data="loadData"
@@ -148,7 +150,7 @@ export default {
         changeType: undefined,
         bizType: undefined,
         waitSelect: undefined,
-        billStatus: undefined
+        bizStatusColl: undefined
       },
       disabled: false, //  查询、重置按钮是否可操作
       creatDate: [], //  创建时间
@@ -169,10 +171,12 @@ export default {
             const no = (data.pageNo - 1) * data.pageSize
             for (var i = 0; i < data.list.length; i++) {
               data.list[i].no = no + i + 1
-              const dates = data.list[i].bizDate.split('-')
-              data.list[i].year = dates[0]
-              data.list[i].month = dates[1]
-              data.list[i].day = dates[2].split(' ')[0]
+              if (data.list[i].bizDate) {
+                const dates = data.list[i].bizDate.split('-')
+                data.list[i].year = dates[0]
+                data.list[i].month = dates[1]
+                data.list[i].day = dates[2].split(' ')[0]
+              }
               // 正为借方, 负数为贷方
               if (data.list[i].bizAmount > 0) {
                 data.list[i].debitAmount = data.list[i].bizAmount
@@ -255,16 +259,38 @@ export default {
       this.queryParam.changeType = undefined
       this.queryParam.bizType = undefined
       this.queryParam.waitSelect = undefined
-      this.queryParam.billStatus = undefined
+      this.queryParam.bizStatusColl = undefined
 
       this.$refs.table.refresh(true)
     },
-    pageInit () {
+    // 默认对单状态
+    setDefaultStatus () {
+      const type = this.$route.params.type
+      if (type == '0') {
+        this.queryParam.bizStatusColl = undefined
+        this.queryParam.waitSelect = undefined
+      }
+      if (type == '1') {
+        this.queryParam.bizStatusColl = ['WAIT_VERIFY', 'FINISH']
+        this.queryParam.waitSelect = undefined
+      }
+      if (type == '2') {
+        this.queryParam.bizStatusColl = ['WAIT_SUBMIT', 'WAIT_CONFIRM']
+        this.queryParam.waitSelect = undefined
+      }
+      if (type == '3') {
+        this.queryParam.bizStatusColl = undefined
+        this.queryParam.waitSelect = '1'
+      }
+      this.$refs.table.refresh(true)
+    },
+    pageInit (flag) {
       const _this = this
       this.dealerSn = this.$route.params.sn
       this.$nextTick(() => { // 页面渲染完成后的回调
         _this.setTableH()
       })
+      _this.setDefaultStatus()
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
@@ -285,19 +311,12 @@ export default {
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
       this.pageInit()
-      this.resetSearchForm()
     }
   },
   activated () {
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
       this.pageInit()
-      this.resetSearchForm()
-    }
-    // 仅刷新列表,不重置页面
-    if (this.$store.state.app.updateList) {
-      this.pageInit()
-      this.$refs.table.refresh()
     }
   },
   beforeRouteEnter (to, from, next) {

+ 121 - 26
src/views/financialManagement/accountStatementBill/list.vue

@@ -35,6 +35,17 @@
                 <a-input id="accountStatementBill-bookNo" v-model.trim="queryParam.kdMidCustomerFnumber" allowClear placeholder="请输入财务编码"/>
               </a-form-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="月度有业务客户" prop="beginDate">
+                <a-month-picker
+                  id="accountStatementBill-monthBox"
+                  class="monthBox"
+                  :disabled-date="disabledDate"
+                  v-model="monthVal"
+                  placeholder="请选择月份"
+                  @change="onChangeMonth" />
+              </a-form-model-item>
+            </a-col>
             <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="accountStatementBill-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="accountStatementBill-reset">重置</a-button>
@@ -55,25 +66,50 @@
     </a-card>
     <a-card size="small" :bordered="false" class="accountStatementBill-wrap">
       <a-spin :spinning="spinning" tip="Loading...">
+        <!-- 操作按钮 -->
+        <div class="table-operator">
+          <div class="tongji-bar">
+            总余额:{{ toThousands(countData&&countData.totalBalance||0) }};
+            已对单余额:{{ toThousands(countData&&countData.confirmBalance||0) }};
+            待对单余额:{{ toThousands(countData&&countData.waitConfirmBalance||0) }};
+            待选余额:{{ toThousands(countData&&countData.newBizBalance||0) }};
+            待选单数:{{ countData&&countData.newBizCount||0 }};
+          </div>
+        </div>
         <!-- 列表 -->
         <s-table
           class="sTable fixPagination"
           ref="table"
           :style="{ height: tableHeight+80+'px' }"
           size="small"
-          :rowKey="(record) => record.id"
+          :rowKey="(record) => record.no"
+          rowKeyName="no"
           :columns="columns"
           :data="loadData"
           :scroll="{ y: tableHeight }"
           :pageSize="30"
           :defaultLoadData="false"
           bordered>
-          <template slot="totalAmount" slot-scope="text, record">
-            <span v-if="$hasPermissions('B_asb_detail')" class="link-bule" @click="handleDetail(record)">{{ record.totalAmount }}</span>
-            <span v-else>{{ record.totalAmount }}</span>
+          <template slot="totalBalance" slot-scope="text, record">
+            <span v-if="$hasPermissions('B_asb_detail')" class="link-bule" @click="handleDetail(record,0)">{{ toThousands(record.totalBalance) }}</span>
+            <span v-else>{{ toThousands(record.totalBalance) }}</span>
+          </template>
+          <template slot="confirmBalance" slot-scope="text, record">
+            <span v-if="$hasPermissions('B_asb_detail')" class="link-bule" @click="handleDetail(record,1)">{{ toThousands(record.confirmBalance) }}</span>
+            <span v-else>{{ toThousands(record.confirmBalance) }}</span>
+          </template>
+          <template slot="waitConfirmBalance" slot-scope="text, record">
+            <span v-if="$hasPermissions('B_asb_detail')" class="link-bule" @click="handleDetail(record,2)">{{ toThousands(record.waitConfirmBalance) }}</span>
+            <span v-else>{{ toThousands(record.waitConfirmBalance) }}</span>
+          </template>
+          <template slot="newBizBalance" slot-scope="text, record">
+            <span v-if="$hasPermissions('B_asb_detail')" class="link-bule" @click="handleDetail(record,3)">{{ toThousands(record.newBizBalance) }}</span>
+            <span v-else>{{ toThousands(record.newBizBalance) }}</span>
           </template>
           <template slot="dealerType" slot-scope="text, record">
-            {{ record.dealerTypeName1 }}>{{ record.dealerTypeName2 }}
+            <span v-if="record.dealer">
+              {{ record.dealer.dealerTypeName1 }}{{ record.dealer.dealerTypeName2?'>':'' }}{{ record.dealer.dealerTypeName2 }}
+            </span>
           </template>
           <!-- 操作 -->
           <template slot="action" slot-scope="text, record">
@@ -97,6 +133,7 @@
 </template>
 
 <script>
+import moment from 'moment'
 import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import { hdExportExcel } from '@/libs/exportExcel'
@@ -104,7 +141,7 @@ import subarea from '@/views/common/subarea.js'
 import dealerType from '@/views/common/dealerType.js'
 import customerService from '@/views/common/customerService.vue'
 import baseModal from './baseModal.vue'
-import { verifyAccountBalanceQueryPage, verifyAccountBalanceExport } from '@/api/verifyAccountChange.js'
+import { verifyAccountBalanceQueryPage, verifyAccountBalanceExport, verifyAccountBalanceQueryCount } from '@/api/verifyAccountChange.js'
 export default {
   name: 'AccountStatementBillList',
   mixins: [commonMixin],
@@ -116,6 +153,7 @@ export default {
       tableHeight: 0,
       openModal: false,
       dealerType: [], // 商户类型
+      monthVal: '', // 初始化月份值
       queryParam: { //  查询条件
         nameLike: '', // 经销商名称/别名
         dealerType1: undefined, //  商户类型
@@ -134,24 +172,43 @@ export default {
       loadData: parameter => {
         this.disabled = true
         this.spinning = true
-        const params = Object.assign(parameter, this.queryParam)
-
-        return verifyAccountBalanceQueryPage(params).then(res => {
+        const params = this.queryParam
+        parameter.sortOrder = parameter.sortOrder == 'ascend' ? 'asc' : parameter.sortOrder == 'descend' ? 'desc' : ''
+        const fileds = { 'lastBizDate': 'last_biz_date', 'totalBalance': 'total_balance', 'confirmBalance': 'confirm_balance', 'waitConfirmBalance': 'wait_confirm_balance', 'newBizBalance': 'new_biz_balance' }
+        parameter.sortField = fileds[parameter.sortField]
+        const params1 = {
+          dealer: {
+            nameLike: params.nameLike,
+            dealerType1: params.dealerType1,
+            dealerType2: params.dealerType2,
+            dealerLevel: params.dealerLevel,
+            subareaArea: params.subareaArea,
+            kdMidCustomerFnumber: params.kdMidCustomerFnumber
+          },
+          bizMonth: this.monthVal ? this.monthVal + '-01' : '',
+          ...parameter
+        }
+        return verifyAccountBalanceQueryPage(params1).then(res => {
           let data
           if (res.status == 200) {
             data = res.data
             const no = (data.pageNo - 1) * data.pageSize
             for (var i = 0; i < data.list.length; i++) {
               data.list[i].no = no + i + 1
+              if (data.list[i].lastBizDate) {
+                data.list[i].lastBizDate = moment(data.list[i].lastBizDate).format('YYYY-MM')
+              }
             }
             this.total = data.count || 0
             this.disabled = false
           }
           this.spinning = false
+          this.getCount(params1)
           return data
         })
       },
-      total: 0 // 合计
+      total: 0, // 合计
+      countData: null
     }
   },
   // 根据权限显示列表字段
@@ -159,23 +216,35 @@ export default {
     columns () {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-        { title: '财务编码', dataIndex: 'kdMidCustomerFnumber', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '经销商名称', dataIndex: 'dealerName', width: '15%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '商户别名', dataIndex: 'dealerAlias', width: '15%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '总余额', scopedSlots: { customRender: 'totalAmount' }, width: '6%', align: 'center' },
-        { title: '待选余额', dataIndex: 'waitAmount', width: '6%', align: 'center', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
-        { title: '待选单数', dataIndex: 'waitCount', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '财务编码', dataIndex: 'dealer.kdMidCustomerFnumber', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '经销商名称', dataIndex: 'dealer.dealerName', width: '14%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '商户别名', dataIndex: 'dealer.dealerAlias', width: '13%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '总余额', scopedSlots: { customRender: 'totalBalance' }, dataIndex: 'totalBalance', width: '6%', align: 'center', sorter: true },
+        { title: '已对单余额', scopedSlots: { customRender: 'confirmBalance' }, dataIndex: 'confirmBalance', width: '7%', align: 'center', sorter: true },
+        { title: '待对单余额', scopedSlots: { customRender: 'waitConfirmBalance' }, dataIndex: 'waitConfirmBalance', width: '7%', align: 'center', sorter: true },
+        { title: '待选余额', scopedSlots: { customRender: 'newBizBalance' }, dataIndex: 'newBizBalance', width: '6%', align: 'center', sorter: true },
+        { title: '待选单数', dataIndex: 'newBizCount', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '最新业务月份', dataIndex: 'lastBizDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' }, sorter: true },
         { title: '客服', dataIndex: 'kfName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '区域', dataIndex: 'subareaArea.subareaName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '分区', dataIndex: 'subareaArea.subareaAreaName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '商户级别', dataIndex: 'dealerLevelDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '商户类型', scopedSlots: { customRender: 'dealerType' }, width: '15%', align: 'center' },
+        { title: '区域', dataIndex: 'dealer.subareaArea.subareaName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '分区', dataIndex: 'dealer.subareaArea.subareaAreaName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '省份', dataIndex: 'dealer.provinceName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '商户级别', dataIndex: 'dealer.dealerLevelDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '商户类型', scopedSlots: { customRender: 'dealerType' }, width: '14%', align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }
       ]
       return arr
     }
   },
   methods: {
+    // 选择月份  禁用选择当月以后日期
+    disabledDate (current) {
+      return current && current >= moment().endOf('day')
+    },
+    // 选择月份 change
+    onChangeMonth (date, dateString) {
+      this.monthVal = dateString
+    },
     // 区域分区
     subareaChange (val) {
       this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
@@ -186,10 +255,15 @@ export default {
       this.queryParam.dealerType1 = v[0]
       this.queryParam.dealerType2 = v[1]
     },
+    // 统计信息
+    getCount (params) {
+      verifyAccountBalanceQueryCount(params).then(res => {
+        this.countData = res.data
+      })
+    },
     //  重置
     resetSearchForm () {
-      this.queryParam.beginDate = ''
-      this.queryParam.endDate = ''
+      this.monthVal = ''
       this.queryParam.nameLike = ''
       this.queryParam.dealerType1 = undefined
       this.queryParam.dealerType2 = undefined
@@ -206,7 +280,19 @@ export default {
     handleExport () {
       const _this = this
       _this.exportLoading = true
-      hdExportExcel(verifyAccountBalanceExport, _this.queryParam, '经销商对账单据余额-', function () {
+      const params = this.queryParam
+      const params1 = {
+        dealer: {
+          nameLike: params.nameLike,
+          dealerType1: params.dealerType1,
+          dealerType2: params.dealerType2,
+          dealerLevel: params.dealerLevel,
+          subareaArea: params.subareaArea,
+          kdMidCustomerFnumber: params.kdMidCustomerFnumber
+        },
+        bizMonth: this.monthVal ? this.monthVal + '-01' : ''
+      }
+      hdExportExcel(verifyAccountBalanceExport, params1, '经销商对账单据余额-', function () {
         _this.exportLoading = false
       })
     },
@@ -221,8 +307,8 @@ export default {
       this.$router.push({ name: 'accountStatementEdit', params: { sn: data.verifyAccountBillSn } })
     },
     // 详情
-    handleDetail (row) {
-      this.$router.push({ name: 'accountStatementBillDetail', params: { sn: row.dealerSn, name: row.dealerName } })
+    handleDetail (row, type) {
+      this.$router.push({ name: 'accountStatementBillDetail', params: { sn: row.dealer.dealerSn, name: row.dealer.dealerName, type: type } })
     },
     pageInit () {
       const _this = this
@@ -232,7 +318,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 250
+      this.tableHeight = window.innerHeight - tableSearchH - 240
     }
   },
   watch: {
@@ -280,4 +366,13 @@ export default {
       color: rgba(0, 0, 0);
     }
   }
+  .monthBox{
+    width: 100%;
+    /deep/.ant-calendar-picker-icon{
+      display:none !important;
+    }
+    /deep/.ant-calendar-picker input{
+      text-align:center;
+    }
+  }
 </style>

+ 23 - 4
src/views/financialManagement/manualEntryForm/baseModal.vue

@@ -17,7 +17,7 @@
         :label-col="formItemLayout.labelCol"
         :wrapper-col="formItemLayout.wrapperCol">
         <a-form-model-item label="客户名称" prop="dealerSn">
-          <dealerSubareaScopeList id="manualEntryForm-dealer" :disabled="!!itemSn" ref="settleClientName" @change="custChange" />
+          <dealerSubareaScopeList id="manualEntryForm-dealer" :disabled="!!itemSn&&type == 0||type==1" ref="settleClientName" @change="custChange" />
         </a-form-model-item>
         <a-form-model-item label="借贷类型" prop="changeType">
           <v-select
@@ -58,6 +58,7 @@ import { VSelect } from '@/components'
 // 组件
 import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
 import { verifyAccountChangeSave, verifyAccountChangeDetail } from '@/api/verifyAccountChange.js'
+import { verifyAccountChangeInsert } from '@/api/verifyAccount.js'
 export default {
   name: 'ASBaseModal',
   mixins: [commonMixin],
@@ -67,6 +68,14 @@ export default {
     itemSn: {
       type: String,
       default: ''
+    },
+    dealerSn: {
+      type: String,
+      default: ''
+    },
+    type: {
+      type: String,
+      default: '0'
     }
   },
   data () {
@@ -137,12 +146,15 @@ export default {
     salesSaveFun () {
       const _this = this
       const form = JSON.parse(JSON.stringify(_this.form))
+      const fun = this.type == 0 ? verifyAccountChangeSave : verifyAccountChangeInsert
+      if (this.type == 1) {
+        form.verifyAccountBillSn = this.itemSn
+      }
       _this.spinning = true
-      verifyAccountChangeSave(form).then(res => {
+      fun(form).then(res => {
         if (res.status == 200) {
           _this.$message.success(res.message)
           this.$emit('ok', res.data)
-          // 选择审批人员
           _this.cancel()
         }
         _this.spinning = false
@@ -194,9 +206,16 @@ export default {
         remarks: ''
       }
       //  编辑页
-      if (this.itemSn) {
+      if (this.itemSn && this.type == 0) {
         this.getDetail()
       }
+      // 回显客户
+      if (this.type == 1) {
+        this.$nextTick(() => {
+          this.form.dealerSn = this.dealerSn
+          this.$refs.settleClientName.getDetail(this.dealerSn)
+        })
+      }
     }
   },
   watch: {

+ 30 - 5
src/views/financialManagement/manualEntryForm/list.vue

@@ -45,7 +45,17 @@
             <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="manualEntryForm-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="manualEntryForm-reset">重置</a-button>
-            </a-col>
+              <a-button
+                style="margin-left: 10px"
+                type="primary"
+                class="button-warning"
+                @click="handleExport"
+                :disabled="disabled"
+                :loading="exportLoading"
+                v-if="$hasPermissions('B_vac_export')"
+                id="manualEntryForm-export">导出</a-button>
+              <a @click="advanced=!advanced" style="margin-left: 5px">
+              </a></a-col>
           </a-row>
         </a-form>
       </div>
@@ -117,12 +127,13 @@
 <script>
 import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
+import { hdExportExcel } from '@/libs/exportExcel'
 import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
 import rangeDate from '@/views/common/rangeDate.vue'
 import baseModal from './baseModal.vue'
 import verifyModal from './verifyModal.vue'
 import chooseDepartUserModal from './chooseDepartUserModal.vue'
-import { verifyAccountChangeList, verifyAcountBillSubmit, verifyAccountChangeDel } from '@/api/verifyAccountChange.js'
+import { verifyAccountChangeList, verifyAcountBillSubmit, verifyAccountChangeDel, verifyAccountChangeExport, verifyAccountChangeDeleteValid } from '@/api/verifyAccountChange.js'
 export default {
   name: 'ManualEntryFormList',
   mixins: [commonMixin],
@@ -132,6 +143,7 @@ export default {
       spinning: false,
       baseModal: false,
       openModal: false,
+      exportLoading: false, // 导出按钮加载状态
       tableHeight: 0,
       queryParam: { //  查询条件
         beginDate: '',
@@ -162,7 +174,7 @@ export default {
                 data.list[i].borrowAmount = this.toThousands(data.list[i].changeAmount, 2)
               }
               // 贷方
-              if (data.list[i].changeType == 'LENDER') {
+              if (data.list[i].changeType == 'CREDIT') {
                 data.list[i].loanAmount = this.toThousands(data.list[i].changeAmount * -1, 2)
               }
             }
@@ -201,6 +213,17 @@ export default {
       this.queryParam.beginDate = date[0] ? date[0] : ''
       this.queryParam.endDate = date[1] ? date[1] : ''
     },
+    // 导出
+    handleExport () {
+      const _this = this
+      const params = _this.queryParam
+      _this.exportLoading = true
+      _this.spinning = true
+      hdExportExcel(verifyAccountChangeExport, params, '人工录入单', function () {
+        _this.exportLoading = false
+        _this.spinning = false
+      })
+    },
     // 客户
     custChange (v) {
       if (v && v.key) {
@@ -233,11 +256,13 @@ export default {
       this.itemSn = row.changeSn
     },
     // 删除
-    handleDel (row) {
+    async handleDel (row) {
       const _this = this
+      const hasDzd = await verifyAccountChangeDeleteValid({ sn: row.changeSn })
+      const str = hasDzd.data.length ? '已被对账单【' + hasDzd.data.toString() + '】引用,会同时删除该引用,' : ''
       this.$confirm({
         title: '提示(' + row.dealerName + ')',
-        content: <div style="font-size:14px;"><div>调账单号:{row.changeNo}</div><div>确定删除吗?</div></div>,
+        content: <div style="font-size:14px;"><div>调账单号:{row.changeNo}</div><div>{str}确定删除吗?</div></div>,
         centered: true,
         closable: true,
         onOk () {

+ 2 - 6
src/views/setting/dailyReportSettings/index.vue

@@ -17,9 +17,6 @@
         <a-tab-pane key="5" tab="分区月目标" force-render>
           <partitionTargetList pageType="PARTITION_MONTHLY_TARGET"></partitionTargetList>
         </a-tab-pane>
-        <a-tab-pane key="6" tab="销售/销售退货剔除" force-render>
-          <salesReturnRemove></salesReturnRemove>
-        </a-tab-pane>
       </a-tabs>
     </a-card>
   </div>
@@ -30,14 +27,13 @@ import { commonMixin } from '@/utils/mixin'
 import estimatedOrderList from './estimatedOrderList.vue'
 import categoryTargetList from './categoryTargetList.vue'
 import partitionTargetList from './partitionTargetList.vue'
-import salesReturnRemove from './salesReturnRemove.vue'
 export default {
   name: 'DailyReportSettingsIndex',
   mixins: [commonMixin],
-  components: { estimatedOrderList, categoryTargetList, partitionTargetList, salesReturnRemove },
+  components: { estimatedOrderList, categoryTargetList, partitionTargetList },
   data () {
     return {
-      tabVal: '1'// tab值  1区域预估订单 2轮胎月目标 3品类月目标 4品类经理月目标  5分区月目标 6销售退货剔除
+      tabVal: '1'// tab值  1区域预估订单 2轮胎月目标 3品类月目标 4品类经理月目标  5分区月目标
     }
   }
 }

+ 5 - 4
src/views/setting/dailyReportSettings/salesReturnRemove.vue

@@ -42,6 +42,7 @@
                   @click="handleExport"
                   :disabled="disabled"
                   :loading="exportLoading"
+                  v-if="$hasPermissions('B_srr_export')"
                   id="salesReturnRemove-export">导出</a-button>
               </span>
             </a-col>
@@ -54,7 +55,7 @@
           <div style="flex-grow: 1;display: flex;align-items: center;">
             <!-- 操作按钮 -->
             <div>
-              <a-button type="primary" v-if="$hasPermissions('B_salesReturnNew')" @click="handleEdit">新增</a-button>
+              <a-button type="primary" v-if="$hasPermissions('B_srr_add')" @click="handleEdit">新增</a-button>
             </div>
           </div>
           <div></div>
@@ -79,14 +80,14 @@
                 size="small"
                 type="link"
                 class="button-info"
-                v-if="record.show"
+                v-if="record.show&&$hasPermissions('B_srr_edit')"
                 @click="handleEdit(record)"
                 :id="'salesReturnRemove-edit-btn'+index">编辑</a-button>
               <a-button
                 size="small"
                 type="link"
                 class="button-error"
-                v-if="record.show"
+                v-if="record.show&&$hasPermissions('B_srr_del')"
                 @click="handleDel(record)"
                 :id="'salesReturnRemove-del-btn'+index">删除</a-button>
             </div>
@@ -219,7 +220,7 @@ export default {
       const _this = this
       this.$confirm({
         title: '提示',
-        content: <div>销退单号:{row.bizNo}<div>确认要删除吗?</div></div>,
+        content: <div>业务单号:{row.bizNo}<div>确认要删除吗?</div></div>,
         centered: true,
         onOk () {
           _this.spinning = true

+ 226 - 0
src/views/setting/removeSetting/baseModal.vue

@@ -0,0 +1,226 @@
+<template>
+  <a-modal
+    v-model="opened"
+    :title="title"
+    centered
+    :maskClosable="false"
+    :confirmLoading="confirmLoading"
+    :width="560"
+    :footer="null"
+    @cancel="cancel"
+  >
+    <a-spin :spinning="spinning" tip="Loading...">
+      <a-form-model
+        id="chooseCustom-form"
+        ref="ruleForm"
+        :model="form"
+        :rules="rules"
+        :label-col="formItemLayout.labelCol"
+        :wrapper-col="formItemLayout.wrapperCol"
+      >
+        <a-row :gutter="15">
+          <a-col :span="20">
+            <a-form-model-item label="业务单号" prop="bizNo">
+              <a-input
+                id="base-bizNo"
+                :disabled="bizSn"
+                v-model.trim="form.bizNo"
+                @change="fetchUser"
+                allowClear
+                placeholder="请输入业务单号"/>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="15">
+          <a-col :span="20">
+            <a-form-model-item label="客户名称" prop="dealerSn">
+              {{ dealerData&&dealerData.dealerName||'--' }}
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="15">
+          <a-col :span="20">
+            <a-form-model-item label="运费、服务费" prop="tireSubsidyYfFwf">
+              <a-radio-group name="radioGroup" v-model="form.tireSubsidyYfFwf">
+                <a-radio value="1">剔除</a-radio>
+                <a-radio value="0">不剔除</a-radio>
+              </a-radio-group>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="15">
+          <a-col :span="20">
+            <a-form-model-item label="增量补贴" prop="tireSubsidyZl">
+              <a-radio-group name="radioGroup1" v-model="form.tireSubsidyZl">
+                <a-radio value="1">剔除</a-radio>
+                <a-radio value="0">不剔除</a-radio>
+              </a-radio-group>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="15">
+          <a-col :span="20">
+            <a-form-model-item label="供应商返利" prop="tireSubsidyGc">
+              <a-radio-group name="radioGroup2" v-model="form.tireSubsidyGc">
+                <a-radio value="1">剔除</a-radio>
+                <a-radio value="0">不剔除</a-radio>
+              </a-radio-group>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+        <a-form-model-item :wrapper-col="{ span: 12, offset: 6 }" style="text-align: center;">
+          <a-button @click="cancel" style="margin-right: 15px" id="chooseCustom-btn-back">取消</a-button>
+          <a-button type="primary" :loading="confirmLoading" @click="handleSubmit" id="chooseCustom-btn-submit">保存</a-button>
+        </a-form-model-item>
+      </a-form-model>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+import { commonMixin } from '@/utils/mixin'
+import { VSelect } from '@/components'
+import debounce from 'lodash/debounce'
+import warehouse from '@/views/common/chooseWarehouse.js'
+import { bizRemoveConfigCreate, bizRemoveConfigModify, bizRemoveConfigDetail, salesReturnDetailByNo } from '@/api/bizRemove'
+export default {
+  name: 'BaseModal',
+  mixins: [commonMixin],
+  components: { VSelect, warehouse },
+  props: {
+    show: [Boolean]
+  },
+  data () {
+    this.lastFetchId = 0
+    this.fetchUser = debounce(this.fetchUser, 800)
+    return {
+      opened: this.show,
+      spinning: false,
+      title: '新增配置',
+      confirmLoading: false,
+      formItemLayout: {
+        labelCol: { span: 8 },
+        wrapperCol: { span: 16 }
+      },
+      form: {
+        bizNo: '',
+        dealerSn: undefined,
+        configType: 'TIRE_SUBSIDY',
+        bizSn: undefined, // bizsn
+        tireSubsidyYfFwf: undefined,
+        tireSubsidyZl: undefined,
+        tireSubsidyGc: undefined
+      },
+      rules: {
+        bizNo: [{ required: true, message: '请输入业务单号', trigger: ['change', 'blur'] }],
+        dealerSn: [{ required: true, message: '请选择客户', trigger: ['change', 'blur'] }],
+        tireSubsidyYfFwf: [{ required: true, message: '请选择', trigger: ['change', 'blur'] }],
+        tireSubsidyZl: [{ required: true, message: '请选择', trigger: ['change', 'blur'] }],
+        tireSubsidyGc: [{ required: true, message: '请选择', trigger: ['change', 'blur'] }]
+      },
+      fetching: false,
+      dealerData: null,
+      bizSn: undefined
+    }
+  },
+  methods: {
+    fetchUser () {
+      if (!this.form.bizNo) return
+      this.lastFetchId += 1
+      const fetchId = this.lastFetchId
+      this.dealerData = null
+      this.spinning = true
+      this.fetching = true
+      salesReturnDetailByNo({ bizNo: this.form.bizNo, configType: 'TIRE_SUBSIDY' }).then(res => {
+        if (fetchId !== this.lastFetchId) {
+          return
+        }
+        if (res.data) {
+          this.dealerData = res.data
+          this.form.dealerSn = res.data.dealerSn
+          this.form.bizSn = res.data.bizSn
+        } else {
+          this.dealerData = null
+          this.form.dealerSn = undefined
+          this.form.bizSn = undefined
+        }
+        this.fetching = false
+        this.spinning = false
+      })
+    },
+    //  保存
+    handleSubmit (e) {
+      e.preventDefault()
+      const _this = this
+      this.$refs.ruleForm.validate(valid => {
+        if (valid) {
+          // 保存
+          _this.salesSaveFun()
+        } else {
+          return false
+        }
+      })
+    },
+    // 新建业务单
+    salesSaveFun () {
+      const _this = this
+      const form = this.form
+      const funs = !this.bizSn ? bizRemoveConfigCreate : bizRemoveConfigModify
+      _this.spinning = true
+      funs(form).then(res => {
+        if (res.status == 200) {
+          _this.$message.success(res.message)
+          _this.$emit('ok', res.data)
+          _this.cancel()
+        }
+        _this.spinning = false
+      })
+    },
+    cancel () {
+      this.opened = false
+      this.form = {
+        configType: 'TIRE_SUBSIDY',
+        bizNo: '',
+        dealerSn: undefined,
+        bizSn: undefined, // bizsn
+        tireSubsidyYfFwf: undefined,
+        tireSubsidyZl: undefined,
+        tireSubsidyGc: undefined
+      }
+      this.bizSn = undefined
+      this.dealerData = null
+      this.$refs.ruleForm.resetFields()
+      this.$emit('cancel')
+    },
+    getDetail () {
+      bizRemoveConfigDetail({ bizSn: this.bizSn, configType: 'TIRE_SUBSIDY' }).then(res => {
+        const { bizSn, bizNo, dealerSn, dealerName, tireSubsidyYfFwf, tireSubsidyZl, tireSubsidyGc } = res.data
+        this.dealerData = { dealerName: dealerName }
+        this.form = Object.assign(this.form, {
+          bizNo: bizNo,
+          dealerSn: dealerSn,
+          bizSn: bizSn,
+          tireSubsidyYfFwf: tireSubsidyYfFwf,
+          tireSubsidyZl: tireSubsidyZl,
+          tireSubsidyGc: tireSubsidyGc
+        })
+      })
+    },
+    edit (row) {
+      if (row && row.bizSn) {
+        this.title = '编辑配置'
+        this.bizSn = row.bizSn
+        this.getDetail()
+      } else {
+        this.title = '新增配置'
+        this.bizSn = undefined
+      }
+    }
+  },
+  watch: {
+    show (newValue, oldValue) {
+      this.opened = newValue
+    }
+  }
+}
+</script>

+ 35 - 0
src/views/setting/removeSetting/index.vue

@@ -0,0 +1,35 @@
+<template>
+  <div>
+    <a-card size="small" :bordered="false">
+      <a-tabs default-active-key="1" v-model="tabVal">
+        <a-tab-pane key="1" tab="开单统计剔除" force-render>
+          <list1></list1>
+        </a-tab-pane>
+        <a-tab-pane key="2" tab="每日报表剔除" force-render>
+          <list2></list2>
+        </a-tab-pane>
+        <!-- <a-tab-pane key="3" tab="轮胎补贴剔除" force-render>
+          <list3></list3>
+        </a-tab-pane> -->
+      </a-tabs>
+    </a-card>
+  </div>
+</template>
+<script>
+import { commonMixin } from '@/utils/mixin'
+// 组件
+import list1 from '../salesReturnRemove/list.vue'
+import list2 from '../dailyReportSettings/salesReturnRemove.vue'
+import list3 from './list.vue'
+export default {
+  name: 'DailyReportSettingsIndex',
+  mixins: [commonMixin],
+  components: { list1, list2, list3 },
+  data () {
+    return {
+      tabVal: '1'
+    }
+  }
+}
+
+</script>

+ 291 - 0
src/views/setting/removeSetting/list.vue

@@ -0,0 +1,291 @@
+<template>
+  <div>
+    <a-card size="small" :bordered="false" class="searchBoxNormal">
+      <!-- 搜索条件 -->
+      <div ref="tableSearch" class="table-page-search-wrapper">
+        <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+          <a-row :gutter="15">
+            <a-col :md="6" :sm="24">
+              <a-form-item label="业务时间">
+                <rangeDate ref="rangeCreateDate" id="salesReturnRemove-createDate" :value="createDate" @change="dateCreateChange" />
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
+                <dealerSubareaScopeList ref="dealerSubareaScopeList" id="salesReturnRemove-dealerSn" @change="custChange" />
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="业务单号">
+                <a-input id="salesReturnRemove-bizNo" v-model.trim="queryParam.bizNo" allowClear placeholder="请输入业务单号"/>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="业务类型">
+                <v-select
+                  v-model="queryParam.bizType"
+                  ref="bizType"
+                  id="salesReturnRemove-bizType"
+                  code="REMOVE_BIZ_TYPE"
+                  placeholder="请选择业务类型"
+                  allowClear></v-select>
+              </a-form-item>
+            </a-col>
+            <a-col :md="24" :sm="24" style="text-align: center;margin-bottom: 10px;">
+              <span class="table-page-search-submitButtons">
+                <a-button id="salesReturnRemove-search" type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
+                <a-button id="salesReturnRemove-reset" style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
+                <a-button
+                  style="margin-left: 10px"
+                  type="primary"
+                  class="button-warning"
+                  v-if="$hasPermissions('B_srr_export')"
+                  @click="handleExport"
+                  :disabled="disabled"
+                  :loading="exportLoading"
+                  id="salesReturnRemove-export">导出</a-button>
+              </span>
+            </a-col>
+          </a-row>
+        </a-form>
+      </div>
+      <a-spin :spinning="spinning" tip="Loading...">
+        <div class="table-operator" style="flex-grow: 1;display: flex;justify-content: space-between;align-items: center;">
+          <div style="flex-grow: 1;display: flex;align-items: center;">
+            <!-- 操作按钮 -->
+            <div>
+              <a-button type="primary" v-if="$hasPermissions('B_srr_add')" @click="handleEdit">新增</a-button>
+            </div>
+          </div>
+          <div></div>
+        </div>
+        <!-- 列表 -->
+        <s-table
+          class="sTable fixPagination"
+          ref="table"
+          :style="{ height: tableHeight+75+'px' }"
+          size="small"
+          :rowKey="(record) => record.no"
+          rowKeyName="no"
+          :columns="columns"
+          :data="loadData"
+          :scroll="{ y: tableHeight }"
+          :defaultLoadData="false"
+          bordered>
+          <!-- 操作 -->
+          <template slot="action" slot-scope="text, record, index">
+            <div>
+              <a-button
+                size="small"
+                type="link"
+                class="button-info"
+                v-if="record.show&&$hasPermissions('B_srr_edit')"
+                @click="handleEdit(record)"
+                :id="'salesReturnRemove-edit-btn'+index">编辑</a-button>
+              <a-button
+                size="small"
+                type="link"
+                class="button-error"
+                v-if="record.show&&$hasPermissions('B_srr_del')"
+                @click="handleDel(record)"
+                :id="'salesReturnRemove-del-btn'+index">删除</a-button>
+            </div>
+          </template>
+        </s-table>
+      </a-spin>
+      <!-- 选择客户弹框 -->
+      <baseModal :show="openModal" ref="openModal" @ok="handleOk" @cancel="openModal=false"></baseModal>
+    </a-card>
+  </div>
+</template>
+
+<script>
+import { commonMixin } from '@/utils/mixin'
+import { STable, VSelect } from '@/components'
+import baseModal from './baseModal.vue'
+import { hdExportExcel } from '@/libs/exportExcel'
+import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
+import rangeDate from '@/views/common/rangeDate.vue'
+import { bizRemoveConfigPageList, bizRemoveConfigDelete, bizRemoveConfigReportExport } from '@/api/bizRemove'
+import moment from 'moment'
+import getDate from '@/libs/getDate.js'
+export default {
+  name: 'SalesReturnRemove',
+  mixins: [commonMixin],
+  components: {
+    STable,
+    VSelect,
+    baseModal,
+    dealerSubareaScopeList,
+    rangeDate
+  },
+  data () {
+    return {
+      spinning: false,
+      // 高级搜索 展开/关闭
+      advanced: true,
+      tableHeight: 0,
+      disabled: false, //  查询、重置按钮是否可操作
+      exportLoading: false,
+      createDate: [
+        moment(getDate.getThreeMonthDays().starttime, 'YYYY-MM-DD'),
+        moment(getDate.getCurrMonthDays().endtime, 'YYYY-MM-DD')
+      ], //  创建时间
+      openModal: false, // 选择客户弹框是否显示
+      openDepartUserModal: false,
+      // 查询参数
+      queryParam: {
+        configType: 'TIRE_SUBSIDY',
+        beginDate: getDate.getThreeMonthDays().starttime,
+        endDate: getDate.getCurrMonthDays().endtime,
+        dealerSn: undefined, //  客户名称
+        bizNo: undefined, //  业务单号
+        bizType: undefined
+      },
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        this.disabled = true
+        this.spinning = true
+        const params = Object.assign(parameter, this.queryParam)
+        return bizRemoveConfigPageList(params).then(res => {
+          let data
+          if (res.status == 200) {
+            data = res.data
+            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].show = new Date(data.list[i].bizDate).getMonth() == new Date().getMonth()
+            }
+            this.disabled = false
+          }
+          this.spinning = false
+          return data
+        })
+      },
+      visibleAudit: false
+    }
+  },
+  computed: {
+    columns () {
+      const a = ['', '剔除']
+      const arr = [
+        { title: '编号', dataIndex: 'no', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '业务类型', dataIndex: 'bizTypeDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '业务单号', dataIndex: 'bizNo', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '业务状态', dataIndex: 'billStatusName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '业务时间', dataIndex: 'bizDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '客户名称', dataIndex: 'dealerName', width: '18%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '运费、服务费', dataIndex: 'tireSubsidyYfFwf', width: '10%', align: 'center', customRender: function (text) { return a[text] } },
+        { title: '增量补贴', dataIndex: 'tireSubsidyZl', width: '8%', align: 'center', customRender: function (text) { return a[text] } },
+        { title: '供应商返利', dataIndex: 'tireSubsidyGc', width: '10%', align: 'center', customRender: function (text) { return a[text] } },
+        { title: '创建时间', dataIndex: 'createDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
+      ]
+      return arr
+    }
+  },
+  methods: {
+    //  创建时间  change
+    dateCreateChange (date) {
+      this.queryParam.beginDate = date[0]
+      this.queryParam.endDate = date[1]
+    },
+    // 选择客户
+    custChange (val) {
+      this.queryParam.dealerSn = val.key
+    },
+    // 导出
+    handleExport () {
+      const _this = this
+      const params = JSON.parse(JSON.stringify(_this.queryParam))
+      _this.exportLoading = true
+      _this.spinning = true
+      hdExportExcel(bizRemoveConfigReportExport, params, '轮胎补贴剔除配置-', function () {
+        _this.exportLoading = false
+        _this.spinning = false
+      })
+    },
+    // 编辑
+    handleEdit (row) {
+      this.openModal = true
+      this.$refs.openModal.edit(row)
+    },
+    handleOk (res) {
+      this.$refs.table.refresh()
+    },
+    // 删除
+    handleDel (row) {
+      const _this = this
+      this.$confirm({
+        title: '提示',
+        content: <div>业务单号:{row.bizNo}<div>确认要删除吗?</div></div>,
+        centered: true,
+        onOk () {
+          _this.spinning = true
+          bizRemoveConfigDelete({ bizSn: row.bizSn, configType: 'TIRE_SUBSIDY' }).then(res => {
+            if (res.status == 200) {
+              _this.$message.success(res.message)
+              _this.$refs.table.refresh()
+            }
+            _this.spinning = false
+          })
+        }
+      })
+    },
+    // 重置查询
+    resetSearchForm () {
+      this.$refs.rangeCreateDate.resetDate(this.createDate)
+      this.queryParam.beginDate = getDate.getThreeMonthDays().starttime
+      this.queryParam.endDate = getDate.getCurrMonthDays().endtime
+      this.queryParam.dealerSn = undefined
+      this.$refs.dealerSubareaScopeList.resetForm()
+      this.queryParam.bizNo = ''
+      this.queryParam.bizType = undefined
+
+      this.$refs.table.refresh(true)
+    },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+    },
+    setTableH () {
+      const tableSearchH = this.$refs.tableSearch.offsetHeight
+      this.tableHeight = window.innerHeight - tableSearchH - 295
+    }
+  },
+  watch: {
+    advanced (newValue, oldValue) {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
+    }
+  },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
+  },
+  activated () {
+    // 如果是新页签打开,则重置当前页面
+    if (this.$store.state.app.isNewTab) {
+      this.pageInit()
+      this.resetSearchForm()
+    }
+    // 仅刷新列表,不重置页面
+    if (this.$store.state.app.updateList) {
+      this.pageInit()
+      this.$refs.table.refresh()
+    }
+  },
+  beforeRouteEnter (to, from, next) {
+    next(vm => {})
+  }
+}
+</script>

+ 2 - 5
src/views/setting/salesReturnRemove/list.vue

@@ -49,9 +49,6 @@
           </a-row>
         </a-form>
       </div>
-    </a-card>
-    <!-- 表格 -->
-    <a-card size="small" :bordered="false" class="searchBoxNormal">
       <a-spin :spinning="spinning" tip="Loading...">
         <div class="table-operator" style="flex-grow: 1;display: flex;justify-content: space-between;align-items: center;">
           <div style="flex-grow: 1;display: flex;align-items: center;">
@@ -220,7 +217,7 @@ export default {
       const _this = this
       this.$confirm({
         title: '提示',
-        content: <div>销退单号:{row.bizNo}<div>确认要删除吗?</div></div>,
+        content: <div>业务单号:{row.bizNo}<div>确认要删除吗?</div></div>,
         centered: true,
         onOk () {
           _this.spinning = true
@@ -254,7 +251,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 245
+      this.tableHeight = window.innerHeight - tableSearchH - 295
     }
   },
   watch: {