浏览代码

对账单

lilei 1 月之前
父节点
当前提交
b0f20fa042

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

@@ -33,15 +33,13 @@
 
 
 <script>
 <script>
 import { commonMixin } from '@/utils/mixin'
 import { commonMixin } from '@/utils/mixin'
-import { VSelect, Upload } from '@/components'
-import employee from '../../expenseManagement/expenseReimbursement/employee.js'
+import { VSelect } from '@/components'
 import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
 import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
-import bookReason from '@/views/common/bookReason'
 import { financeBookSave, financeBookFindBySn } from '@/api/financeBook.js'
 import { financeBookSave, financeBookFindBySn } from '@/api/financeBook.js'
 export default {
 export default {
   name: 'ASBaseModal',
   name: 'ASBaseModal',
   mixins: [commonMixin],
   mixins: [commonMixin],
-  components: { VSelect, Upload, employee, dealerSubareaScopeList, bookReason },
+  components: { VSelect, dealerSubareaScopeList },
   props: {
   props: {
     show: [Boolean],
     show: [Boolean],
     bookSn: {
     bookSn: {

+ 191 - 0
src/views/financialManagement/accountStatement/confrontModal.vue

@@ -0,0 +1,191 @@
+<template>
+  <a-modal
+    v-model="opened"
+    :title="title"
+    centered
+    :maskClosable="false"
+    width="80%"
+    :footer="null"
+    @cancel="cancel"
+  >
+    <a-spin :spinning="spinning" tip="Loading...">
+      <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 id="conFrontModal-rangeDate" ref="rangeDate" :value="creatDate" @change="dateChange" />
+                </a-form-item>
+              </a-col>
+              <a-col :md="4" :sm="24">
+                <a-form-item label="订单号">
+                  <a-input id="conFrontModal-bookNo" v-model.trim="queryParam.bookNo" allowClear placeholder="请输入收款单号"/>
+                </a-form-item>
+              </a-col>
+              <a-col :md="4" :sm="24">
+                <a-form-item label="借贷类型">
+                  <v-select
+                    v-model="queryParam.status"
+                    ref="status"
+                    id="conFrontModal-status"
+                    code="FINANCE_BOOK_STATE"
+                    placeholder="请选择状态"
+                    allowClear></v-select>
+                </a-form-item>
+              </a-col>
+              <a-col :md="4" :sm="24">
+                <a-form-item label="单据类型">
+                  <v-select
+                    v-model="queryParam.status"
+                    ref="status"
+                    id="conFrontModal-status"
+                    code="FINANCE_BOOK_STATE"
+                    placeholder="请选择状态"
+                    allowClear></v-select>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <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="conFrontModal-reset">重置</a-button>
+                <a-button
+                  style="margin-left: 10px"
+                  type="primary"
+                  class="button-warning"
+                  @click="handleExport"
+                  :disabled="disabled"
+                  :loading="exportLoading"
+                >导出</a-button>
+              </a-col>
+            </a-row>
+          </a-form>
+        </div>
+      </a-card>
+      <a-card size="small" :bordered="false" class="accountStatement-wrap">
+        <!-- 列表 -->
+        <s-table
+          class="sTable fixPagination"
+          ref="table"
+          :style="{ height: tableHeight+80+'px' }"
+          size="small"
+          :rowKey="(record) => record.id"
+          :columns="columns"
+          :data="loadData"
+          :scroll="{ y: tableHeight }"
+          :pageSize="30"
+          :defaultLoadData="false"
+          bordered>
+          <!-- 单号 -->
+          <template slot="bookNo" slot-scope="text, record">
+            <span v-if="$hasPermissions('B_fc_detail')" class="link-bule" @click="handleDetail(record)">{{ record.bookNo }}</span>
+            <span v-else>{{ record.bookNo }}</span>
+          </template>
+        </s-table>
+      </a-card>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+import { commonMixin } from '@/utils/mixin'
+import { VSelect } from '@/components'
+import rangeDate from '@/views/common/rangeDate.vue'
+import { financeBookFindBySn } from '@/api/financeBook.js'
+export default {
+  name: 'ConFrontModal',
+  mixins: [commonMixin],
+  components: { VSelect, rangeDate },
+  props: {
+    show: [Boolean],
+    bookSn: {
+      type: String,
+      default: ''
+    }
+  },
+  data () {
+    return {
+      opened: this.show,
+      spinning: false,
+      disabled: false,
+      title: '应收账款明细表',
+      confirmLoading: false,
+      queryParam: {
+        dealerSn: undefined,
+        dealerName: undefined,
+        remarks: ''
+      }
+    }
+  },
+  methods: {
+    //  创建时间  change
+    dateChange (date) {
+      this.queryParam.beginDate = date[0] ? date[0] : ''
+      this.queryParam.endDate = date[1] ? date[1] : ''
+    },
+    //  重置
+    resetSearchForm () {
+      this.creatDate = []
+      this.$refs.rangeDate.resetDate(this.creatDate)
+      this.queryParam.beginDate = ''
+      this.queryParam.endDate = ''
+      this.queryParam.dealerName = ''
+      this.queryParam.bookNo = ''
+      this.queryParam.status = undefined
+      this.$refs.table.refresh(true)
+    },
+    //  详情
+    getDetail () {
+      this.title = '编辑对账单'
+      this.spinning = true
+      this.confirmLoading = true
+      financeBookFindBySn({ bookSn: this.bookSn }).then(res => {
+        if (res.status == 200) {
+          const data = res.data
+          this.form = Object.assign(this.form, data)
+          // 回显客户
+          if (this.form.dealerSn) {
+            this.$nextTick(() => {
+              this.$refs.settleClientName.getDetail(this.form.dealerSn)
+            })
+          }
+        } else {
+          this.$refs.ruleForm.resetFields()
+        }
+        this.spinning = false
+        this.confirmLoading = false
+      })
+    },
+    cancel () {
+      this.opened = false
+      this.$emit('cancel')
+      this.$refs.ruleForm.resetFields()
+    },
+    async pageInit () {
+      this.$nextTick(() => {
+        this.$refs.ruleForm.resetFields()
+        if (this.$refs.settleClientName) {
+          this.$refs.settleClientName.resetForm()
+        }
+      })
+      this.form = {
+        dealerSn: undefined,
+        dealerName: undefined,
+        remarks: ''
+      }
+      //  编辑页
+      if (this.bookSn) {
+        this.getDetail()
+      }
+    }
+  },
+  watch: {
+    show (newValue, oldValue) {
+      this.opened = newValue
+      if (newValue) {
+        this.pageInit()
+      }
+    }
+  }
+}
+</script>

+ 69 - 97
src/views/financialManagement/accountStatement/edit.vue

@@ -9,7 +9,7 @@
             返回列表
             返回列表
           </a>
           </a>
           <span style="margin: 0 15px;color: #666;font-weight: bold;">单号:{{ detailsData&&detailsData.sparePartsReturnNo }}</span>
           <span style="margin: 0 15px;color: #666;font-weight: bold;">单号:{{ detailsData&&detailsData.sparePartsReturnNo }}</span>
-          <span style="margin: 0 10px;color: #666;">供应商:{{ detailsData && detailsData.supplier && detailsData.supplier.supplierName }}</span>
+          <span style="margin: 0 10px;color: #666;">客户名称:{{ detailsData && detailsData.supplier && detailsData.supplier.supplierName }}</span>
           <a-button type="link" size="small" class="button-default" @click.stop="handleEditBase" >
           <a-button type="link" size="small" class="button-default" @click.stop="handleEditBase" >
             <a-icon type="edit" /> 编辑备注
             <a-icon type="edit" /> 编辑备注
           </a-button>
           </a-button>
@@ -26,9 +26,10 @@
       <a-card size="small" :bordered="false" class="salesReturnEdit-cont">
       <a-card size="small" :bordered="false" class="salesReturnEdit-cont">
         <a-alert style="margin-bottom: 10px;" type="info">
         <a-alert style="margin-bottom: 10px;" type="info">
           <div slot="message" class="total-bar">
           <div slot="message" class="total-bar">
-            <div v-if="statisticsObj">
-              <span>申请退货数量:{{ statisticsObj && (statisticsObj.qty || statisticsObj.qty == 0) ? statisticsObj.qty : '--' }};</span>
-              <span v-if="$hasPermissions('B_purchaseReturnEdit_costPrice')">退货金额:{{ statisticsObj && statisticsObj.totalCost || statisticsObj.totalCost == 0 ? statisticsObj.totalCost : '--' }};</span>
+            <div v-if="detailData">
+              <span>余额:{{ detailData && (detailData.qty || detailData.qty == 0) ? detailData.qty : '--' }};</span>
+              <span>借方:{{ detailData && (detailData.qty || detailData.qty == 0) ? detailData.qty : '--' }};</span>
+              <span>贷方:{{ detailData && (detailData.qty || detailData.qty == 0) ? detailData.qty : '--' }};</span>
             </div>
             </div>
           </div>
           </div>
         </a-alert>
         </a-alert>
@@ -37,15 +38,36 @@
             <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
             <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
               <a-row :gutter="15">
               <a-row :gutter="15">
                 <a-col :md="6" :sm="24">
                 <a-col :md="6" :sm="24">
-                  <a-form-item label="入库单号"><a-input v-model.trim="productForm.sparePartsNo" allowClear placeholder="请输入入库单号" /></a-form-item>
+                  <a-form-item label="时间">
+                    <rangeDate id="accountStatement-rangeDate" ref="rangeDate" :value="creatDate" @change="dateChange" />
+                  </a-form-item>
                 </a-col>
                 </a-col>
-                <a-col :md="6" :sm="24">
-                  <a-form-item label="产品编码"><a-input v-model.trim="productForm.productCode" allowClear placeholder="请输入产品编码" /></a-form-item>
+                <a-col :md="4" :sm="24">
+                  <a-form-item label="订单单号"><a-input id="accountStatement-orderNO" v-model.trim="productForm.sparePartsNo" allowClear placeholder="请输入入库单号" /></a-form-item>
                 </a-col>
                 </a-col>
-                <a-col :md="6" :sm="24">
-                  <a-form-item label="产品名称"><a-input v-model.trim="productForm.productName" allowClear placeholder="请输入产品名称" /></a-form-item>
+                <a-col :md="4" :sm="24">
+                  <a-form-item label="借贷类型">
+                    <v-select
+                      v-model="productForm.status"
+                      ref="status"
+                      id="accountStatement-status"
+                      code="FINANCE_BOOK_STATE"
+                      placeholder="请选择借贷类型"
+                      allowClear></v-select>
+                  </a-form-item>
                 </a-col>
                 </a-col>
-                <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+                <a-col :md="4" :sm="24">
+                  <a-form-item label="单据类型">
+                    <v-select
+                      v-model="productForm.status"
+                      ref="status"
+                      id="accountStatement-status"
+                      code="FINANCE_BOOK_STATE"
+                      placeholder="请选择单据类型"
+                      allowClear></v-select>
+                  </a-form-item>
+                </a-col>
+                <a-col :md="4" :sm="24" style="margin-bottom: 10px;">
                   <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
                   <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
                   <a-button style="margin-left: 5px" @click="resetSearchForm">重置</a-button>
                   <a-button style="margin-left: 5px" @click="resetSearchForm">重置</a-button>
                 </a-col>
                 </a-col>
@@ -64,21 +86,16 @@
           :defaultLoadData="false"
           :defaultLoadData="false"
           :scroll="{ y: 300 }"
           :scroll="{ y: 300 }"
           bordered>
           bordered>
-          <!--申请退货数量 -->
-          <template slot="qty" slot-scope="text, record">
-            <a-input-number
-              id="salesReturn-qty"
-              size="small"
-              v-model="record.qty"
-              :precision="0"
-              :min="1"
-              :max="record.qty"
-              placeholder="请输入"
-              style="width: 100%;"
-              @blur="e => onCellBlur(e.target.value, record)"
-            />
+          <!-- 备注 -->
+          <template slot="remark" slot-scope="text, record">
+            <div @dblclick.stop>
+              <a-input
+                size="small"
+                v-model="record.remarks"
+                style="width: 100%;"
+                placeholder="请输入备注"/>
+            </div>
           </template>
           </template>
-
           <!-- 操作 -->
           <!-- 操作 -->
           <template slot="action" slot-scope="text, record">
           <template slot="action" slot-scope="text, record">
             <a-button
             <a-button
@@ -121,6 +138,7 @@ import {
   sparePartsReturnInfo,
   sparePartsReturnInfo,
   sparePartsReturnDetailSaveBatch
   sparePartsReturnDetailSaveBatch
 } from '@/api/sparePartsReturn'
 } from '@/api/sparePartsReturn'
+import rangeDate from '@/views/common/rangeDate.vue'
 export default {
 export default {
   name: 'AccountStatementEdit',
   name: 'AccountStatementEdit',
   mixins: [commonMixin],
   mixins: [commonMixin],
@@ -128,7 +146,8 @@ export default {
     STable,
     STable,
     VSelect,
     VSelect,
     queryPart,
     queryPart,
-    baseModal
+    baseModal,
+    rangeDate
   },
   },
   data () {
   data () {
     return {
     return {
@@ -141,6 +160,7 @@ export default {
         sparePartsNo: '',
         sparePartsNo: '',
         orderBy: 'sprd.CREATE_DATE DESC'
         orderBy: 'sprd.CREATE_DATE DESC'
       },
       },
+      creatDate: [],
       bookSn: null,
       bookSn: null,
       sparePartsReturnNo: null,
       sparePartsReturnNo: null,
       chooseList: [],
       chooseList: [],
@@ -161,7 +181,7 @@ export default {
         })
         })
       },
       },
       openModal: false, // 修改信息弹窗
       openModal: false, // 修改信息弹窗
-      statisticsObj: null, // 统计明细
+      detailData: null, // 统计明细
       detailsData: null, // 基础信息数据
       detailsData: null, // 基础信息数据
       addMoreLoading: false, // 批量添加动画
       addMoreLoading: false, // 批量添加动画
       grabFlag: undefined
       grabFlag: undefined
@@ -171,76 +191,21 @@ export default {
     columns () {
     columns () {
       const _this = this
       const _this = this
       const arr = [
       const arr = [
-        { title: '序号', dataIndex: 'no', align: 'center', width: '4%' },
-        {
-          title: '入库单号',
-          dataIndex: 'sparePartsNo',
-          width: '18%',
-          align: 'center',
-          customRender: function (text) {
-            return text || '--'
-          }
-        },
-        {
-          title: '产品编码',
-          dataIndex: 'product.code',
-          width: '18%',
-          align: 'center',
-          customRender: function (text) {
-            return text || '--'
-          }
-        },
-        {
-          title: '产品名称',
-          dataIndex: 'product.name',
-          width: '25%',
-          align: 'left',
-          customRender: function (text) {
-            return text || '--'
-          },
-          ellipsis: true
-        },
-        {
-          title: '单位',
-          dataIndex: 'product.unit',
-          align: 'center',
-          width: '6%',
-          customRender: function (text) {
-            return text || '--'
-          }
-        },
-        {
-          title: '批次号',
-          dataIndex: 'stockBatchNo',
-          align: 'center',
-          width: '10%',
-          customRender: function (text) {
-            return text || '--'
-          }
-        },
-        { title: '申请退货数量', align: 'center', width: '13%', scopedSlots: { customRender: 'qty' } },
+        { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
+        { title: '年', dataIndex: 'sparePartsNo', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '月', dataIndex: 'sparePartsNo', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '日', dataIndex: 'sparePartsNo', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '业务单号', dataIndex: 'sparePartsNo', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '单据类型', dataIndex: 'product.code', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '单据状态', dataIndex: 'product.name', width: '8%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '费用/调拨类型', dataIndex: 'product.unit', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '摘要', dataIndex: 'sparePartsBatchNo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '客诉索赔编码', dataIndex: 'currentStockQty', width: '8%', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
+        { title: '借方', dataIndex: 'productCost', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? toThousands(text, 2) : '--') } },
+        { title: '贷方', dataIndex: 'productCost', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? toThousands(text, 2) : '--') } },
+        { title: '备注', scopedSlots: { customRender: 'remark' }, width: '15%', align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ]
       ]
-      if (this.$hasPermissions('B_purchaseReturnEdit_costPrice')) {
-        arr.splice(6, 0, {
-          title: '退货单价',
-          dataIndex: 'cost',
-          width: '8%',
-          align: 'right',
-          customRender: function (text) {
-            return text || text == 0 ? _this.toThousands(text, 2) : '--'
-          }
-        })
-        arr.splice(8, 0, {
-          title: '退款金额',
-          dataIndex: 'totalCost',
-          width: '8%',
-          align: 'right',
-          customRender: function (text) {
-            return text || text == 0 ? _this.toThousands(text, 2) : '--'
-          }
-        })
-      }
       return arr
       return arr
     }
     }
   },
   },
@@ -253,6 +218,11 @@ export default {
     handleBack () {
     handleBack () {
       this.$router.push({ name: `accountStatementList` })
       this.$router.push({ name: `accountStatementList` })
     },
     },
+    //  创建时间  change
+    dateChange (date) {
+      this.queryParam.beginDate = date[0] ? date[0] : ''
+      this.queryParam.endDate = date[1] ? date[1] : ''
+    },
     // 删除所选产品
     // 删除所选产品
     handleDel (row) {
     handleDel (row) {
       const _this = this
       const _this = this
@@ -291,6 +261,8 @@ export default {
       this.productForm.productName = ''
       this.productForm.productName = ''
       this.productForm.productCode = ''
       this.productForm.productCode = ''
       this.productForm.sparePartsNo = ''
       this.productForm.sparePartsNo = ''
+      this.creatDate = []
+      this.$refs.rangeDate.resetDate(this.creatDate)
       this.$refs.table.refresh(!!flag)
       this.$refs.table.refresh(!!flag)
     },
     },
     // 已选产品  blur
     // 已选产品  blur
@@ -437,12 +409,12 @@ export default {
         if (res.status == 200) {
         if (res.status == 200) {
           if (res.data) {
           if (res.data) {
             res.data.totalCost = res.data && (res.data.totalCost || res.data.totalCost == 0) ? this.toThousands(res.data.totalCost, 2) : '--'
             res.data.totalCost = res.data && (res.data.totalCost || res.data.totalCost == 0) ? this.toThousands(res.data.totalCost, 2) : '--'
-            this.statisticsObj = res.data
+            this.detailData = res.data
           } else {
           } else {
-            this.statisticsObj = null
+            this.detailData = null
           }
           }
         } else {
         } else {
-          this.statisticsObj = null
+          this.detailData = null
         }
         }
       })
       })
     },
     },

+ 18 - 5
src/views/financialManagement/accountStatement/list.vue

@@ -6,7 +6,7 @@
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
           <a-row :gutter="15">
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
             <a-col :md="6" :sm="24">
-              <a-form-item label="创建时间">
+              <a-form-item label="时间">
                 <rangeDate id="accountStatement-rangeDate" ref="rangeDate" :value="creatDate" @change="dateChange" />
                 <rangeDate id="accountStatement-rangeDate" ref="rangeDate" :value="creatDate" @change="dateChange" />
               </a-form-item>
               </a-form-item>
             </a-col>
             </a-col>
@@ -110,6 +110,8 @@
       </a-spin>
       </a-spin>
       <!-- 基础信息 -->
       <!-- 基础信息 -->
       <baseModal v-drag :show="baseModal" :bookSn="itemSn" @cancel="baseModal=false"></baseModal>
       <baseModal v-drag :show="baseModal" :bookSn="itemSn" @cancel="baseModal=false"></baseModal>
+      <!-- 对单 -->
+      <confrontModal v-drag :show="openModal" :bookSn="itemSn" @cancel="openModal=false"></confrontModal>
     </a-card>
     </a-card>
   </div>
   </div>
 </template>
 </template>
@@ -119,11 +121,12 @@ import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import rangeDate from '@/views/common/rangeDate.vue'
 import baseModal from './baseModal.vue'
 import baseModal from './baseModal.vue'
+import confrontModal from './confrontModal.vue'
 import { financeBookQueryPage, financeBookDeleteBySn } from '@/api/financeBook.js'
 import { financeBookQueryPage, financeBookDeleteBySn } from '@/api/financeBook.js'
 export default {
 export default {
   name: 'AccountStatementList',
   name: 'AccountStatementList',
   mixins: [commonMixin],
   mixins: [commonMixin],
-  components: { STable, VSelect, rangeDate, baseModal },
+  components: { STable, VSelect, rangeDate, baseModal, confrontModal },
   data () {
   data () {
     return {
     return {
       spinning: false,
       spinning: false,
@@ -213,8 +216,8 @@ export default {
     handleDel (row) {
     handleDel (row) {
       const _this = this
       const _this = this
       this.$confirm({
       this.$confirm({
-        title: '提示',
-        content: '确认要删除吗?',
+        title: '提示(箭冠汽配西安大兴店)',
+        content: <div style="font-size:14px;"><div>对账单号:2234234342</div><div>余额:15654.00,确定删除吗?</div></div>,
         centered: true,
         centered: true,
         closable: true,
         closable: true,
         onOk () {
         onOk () {
@@ -236,9 +239,19 @@ export default {
     },
     },
     // 对账
     // 对账
     checkAcount (row) {
     checkAcount (row) {
+      const _this = this
+      this.$confirm({
+        title: '提示(箭冠汽配西安大兴店)',
+        content: <div style="font-size:14px;"><div>对账单号:2234234342</div><div>余额:15654.00,确定对账吗?</div></div>,
+        centered: true,
+        closable: true,
+        onOk () {
+        }
+      })
     },
     },
-    // 对单
+    // 对单弹框
     confront (row) {
     confront (row) {
+      this.openModal = true
     },
     },
     pageInit () {
     pageInit () {
       const _this = this
       const _this = this

+ 110 - 60
src/views/financialManagement/accountStatement/queryPart.vue

@@ -1,44 +1,106 @@
 <template>
 <template>
-  <div class="salesReturnList-wrap">
+  <div class="accountStatement-wrap">
     <!-- 搜索条件 -->
     <!-- 搜索条件 -->
     <div class="table-page-search-wrapper">
     <div class="table-page-search-wrapper">
       <div style="width:100%">
       <div style="width:100%">
         <a-form layout="inline" @keyup.enter.native="$refs.chooseTable.refresh(true)">
         <a-form layout="inline" @keyup.enter.native="$refs.chooseTable.refresh(true)">
           <a-row :gutter="15">
           <a-row :gutter="15">
-            <a-col :md="5" :sm="24">
-              <a-form-item label="入库单号">
-                <a-input id="salesReturnList-productCode" v-model.trim="queryParam.sparePartsNo" allowClear placeholder="请输入入库单号"/>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="时间">
+                <rangeDate id="accountStatement-rangeDate" ref="rangeDate" :value="creatDate" @change="dateChange" />
               </a-form-item>
               </a-form-item>
             </a-col>
             </a-col>
-            <a-col :md="5" :sm="24">
-              <a-form-item label="财务审核时间">
-                <rangeDate ref="rangeDate" :value="warehousingDate" @change="dateChange" />
+            <a-col :md="6" :sm="24">
+              <a-form-item label="业务单号">
+                <a-input id="accountStatement-productCode" v-model.trim="queryParam.sparePartsNo" allowClear placeholder="请输入业务单号"/>
               </a-form-item>
               </a-form-item>
             </a-col>
             </a-col>
-            <a-col :md="5" :sm="24">
-              <a-form-item label="产品编码">
-                <a-input id="salesReturnList-productCode" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="借贷类型">
+                <v-select
+                  v-model="queryParam.status"
+                  ref="status"
+                  id="accountStatement-status"
+                  code="FINANCE_BOOK_STATE"
+                  placeholder="请选择状态"
+                  allowClear></v-select>
               </a-form-item>
               </a-form-item>
             </a-col>
             </a-col>
-            <a-col :md="5" :sm="24">
-              <a-form-item label="产品名称">
-                <a-input id="salesReturnList-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="借贷类型">
+                <v-select
+                  v-model="queryParam.status"
+                  ref="status"
+                  id="accountStatement-status"
+                  code="FINANCE_BOOK_STATE"
+                  placeholder="请选择借贷类型"
+                  allowClear></v-select>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="单据类型">
+                <v-select
+                  v-model="queryParam.status"
+                  ref="status"
+                  id="accountStatement-status"
+                  code="FINANCE_BOOK_STATE"
+                  placeholder="请选择单据类型"
+                  allowClear></v-select>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="备货单状态">
+                <v-select
+                  v-model="queryParam.status"
+                  ref="status"
+                  id="accountStatement-status"
+                  code="DISPATCH_BILL_STATUS"
+                  placeholder="请选择备货单状态"
+                  allowClear></v-select>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="销售退货单状态">
+                <v-select
+                  v-model="queryParam.status"
+                  ref="status"
+                  id="accountStatement-status"
+                  code="SALES_RETURN_BILL_STATUS"
+                  placeholder="请选择销售退货单状态"
+                  allowClear></v-select>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="调拨单状态">
+                <v-select
+                  v-model="queryParam.status"
+                  ref="status"
+                  id="accountStatement-status"
+                  code="ALLOCATE_STATUS"
+                  placeholder="请选择调拨单状态"
+                  allowClear></v-select>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="费用报销单状态">
+                <v-select
+                  v-model="queryParam.status"
+                  ref="status"
+                  id="accountStatement-status"
+                  code="EXPENSE_STATE"
+                  placeholder="请选择费用报销单状态"
+                  allowClear></v-select>
               </a-form-item>
               </a-form-item>
             </a-col>
             </a-col>
             <a-col :md="4" :sm="24">
             <a-col :md="4" :sm="24">
-              <a-button type="primary" @click="$refs.chooseTable.refresh(true)" id="salesReturnList-refresh">查询</a-button>
-              <a-button style="margin-left: 5px" @click="resetSearchForm" id="salesReturnList-reset">重置</a-button>
+              <a-button type="primary" @click="$refs.chooseTable.refresh(true)" id="accountStatement-refresh">查询</a-button>
+              <a-button style="margin-left: 5px" @click="resetSearchForm" id="accountStatement-reset">重置</a-button>
             </a-col>
             </a-col>
             <a-col :md="24" :sm="24" style="margin-bottom: 10px;display: flex;align-items: center;justify-content: space-between;">
             <a-col :md="24" :sm="24" style="margin-bottom: 10px;display: flex;align-items: center;justify-content: space-between;">
               <div>
               <div>
-                <a-button type="primary" style="margin-right: 5px" @click="handleBatchAdd" :loading="addMoreLoading">批量添加</a-button>
+                <a-button type="primary" style="margin-right: 5px" @click="handleBatchAdd" :loading="addMoreLoading">批量选择</a-button>
                 <span v-if="selNums&&selNums!=0" style="margin:0 10px;">已选中{{ selNums }}项</span>
                 <span v-if="selNums&&selNums!=0" style="margin:0 10px;">已选中{{ selNums }}项</span>
               </div>
               </div>
-              <div v-if="queryParam.grabFlag==1">
-                <a-checkbox @change="onChange" :checked="isChecked">
-                  显示最大可退数量为0的产品
-                </a-checkbox>
-              </div>
             </a-col>
             </a-col>
           </a-row>
           </a-row>
         </a-form>
         </a-form>
@@ -58,18 +120,14 @@
       :defaultLoadData="false"
       :defaultLoadData="false"
       :scroll="{ y: 300 }"
       :scroll="{ y: 300 }"
       bordered>
       bordered>
-      <!-- 申请退货数量 -->
-      <template slot="qty" slot-scope="text, record">
+      <!-- 备注 -->
+      <template slot="remark" slot-scope="text, record">
         <div @dblclick.stop>
         <div @dblclick.stop>
-          <a-input-number
+          <a-input
             size="small"
             size="small"
-            v-model="record.qty"
-            :precision="0"
-            :min="1"
-            :disabled="record.currentStockQty == 0"
-            :max="record.currentStockQty"
+            v-model="record.remarks"
             style="width: 100%;"
             style="width: 100%;"
-            placeholder="请输入"/>
+            placeholder="请输入备注"/>
         </div>
         </div>
       </template>
       </template>
       <!-- 操作 -->
       <!-- 操作 -->
@@ -99,15 +157,6 @@ export default {
   components: { STable, VSelect, rangeDate },
   components: { STable, VSelect, rangeDate },
   props: {
   props: {
     newLoading: Boolean,
     newLoading: Boolean,
-    isShowPrice: {
-      type: Boolean,
-      default: true
-    },
-    // 是否显示仓库实收数量
-    showReceiveQty: {
-      type: Boolean,
-      default: false
-    },
     addMoreLoading: {
     addMoreLoading: {
       type: Boolean,
       type: Boolean,
       default: false
       default: false
@@ -126,7 +175,7 @@ export default {
         createDate: undefined,
         createDate: undefined,
         grabFlag: ''
         grabFlag: ''
       },
       },
-      warehousingDate: [], // 入库时间
+      creatDate: [], //  创建时间
       rowSelectionInfo: null,
       rowSelectionInfo: null,
       isChecked: false,
       isChecked: false,
       repeatList: null,
       repeatList: null,
@@ -155,25 +204,21 @@ export default {
   computed: {
   computed: {
     columns () {
     columns () {
       const arr = [
       const arr = [
-        { title: '序号', dataIndex: 'no', width: '6%', align: 'center' },
-        { title: '入库单号', dataIndex: 'sparePartsNo', width: '24%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品编码', dataIndex: 'product.code', width: '24%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'product.name', width: '24%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '单位', dataIndex: 'product.unit', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '批次号', dataIndex: 'sparePartsBatchNo', width: '13%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '入库数量', dataIndex: 'productQty', width: '9%', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
-        // { title: '已退数量', dataIndex: 'returnedQty', width: '9%', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
-        { title: '最大可退数量', dataIndex: 'currentStockQty', width: '9%', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
-        { title: '申请退货数量', width: '10%', align: 'center', scopedSlots: { customRender: 'qty' } },
+        { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
+        { title: '年', dataIndex: 'sparePartsNo', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '月', dataIndex: 'sparePartsNo', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '日', dataIndex: 'sparePartsNo', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '业务单号', dataIndex: 'sparePartsNo', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '单据类型', dataIndex: 'product.code', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '单据状态', dataIndex: 'product.name', width: '8%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '费用/调拨类型', dataIndex: 'product.unit', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '摘要', dataIndex: 'sparePartsBatchNo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '客诉索赔编码', dataIndex: 'currentStockQty', width: '8%', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
+        { title: '借方', dataIndex: 'productCost', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? toThousands(text, 2) : '--') } },
+        { title: '贷方', dataIndex: 'productCost', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? toThousands(text, 2) : '--') } },
+        { title: '备注', scopedSlots: { customRender: 'remark' }, width: '15%', align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ]
       ]
-      if (this.$hasPermissions('B_purchaseReturnEdit_costPrice')) {
-        arr.splice(6, 0, { title: '入库单价', dataIndex: 'productCost', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? toThousands(text, 2) : '--') } })
-      }
-      if (this.queryParam.grabFlag == 1) { // 抓单
-        const pos = this.$hasPermissions('B_purchaseReturnEdit_costPrice') ? 8 : 7
-        arr.splice(pos, 0, { title: '已退数量', dataIndex: 'returnedQty', width: '9%', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } })
-      }
       return arr
       return arr
     },
     },
     selNums () {
     selNums () {
@@ -181,13 +226,18 @@ export default {
     }
     }
   },
   },
   methods: {
   methods: {
+    //  创建时间  change
+    dateChange (date) {
+      this.queryParam.beginDate = date[0] ? date[0] : ''
+      this.queryParam.endDate = date[1] ? date[1] : ''
+    },
     //  重置
     //  重置
     resetSearchForm () {
     resetSearchForm () {
       this.queryParam.productName = ''
       this.queryParam.productName = ''
       this.queryParam.productCode = ''
       this.queryParam.productCode = ''
       this.queryParam.sparePartsNo = ''
       this.queryParam.sparePartsNo = ''
-      this.warehousingDate = []
-      this.$refs.rangeDate.resetDate(this.warehousingDate)
+      this.creatDate = []
+      this.$refs.rangeDate.resetDate(this.creatDate)
       this.$refs.chooseTable.refresh(true)
       this.$refs.chooseTable.refresh(true)
     },
     },
     onChange (e) {
     onChange (e) {
@@ -251,7 +301,7 @@ export default {
 }
 }
 </script>
 </script>
 <style lang="less" scoped>
 <style lang="less" scoped>
-  .salesReturnList-wrap{
+  .accountStatement-wrap{
     .redBg-row{
     .redBg-row{
       background-color: #f5cdc8;
       background-color: #f5cdc8;
     }
     }