diff --git a/src/api/modular/main/mailSetting.js b/src/api/modular/main/mailSetting.js
index b60e7ce..8e11114 100644
--- a/src/api/modular/main/mailSetting.js
+++ b/src/api/modular/main/mailSetting.js
@@ -198,3 +198,140 @@ export function FeeCustTemplateDelete(parameter) {
         data: parameter
     })
 }
+
+export function GetFeeCustomerList(parameter) {
+    return axios({
+        url: '/FeeRecord/GetFeeCustomerList',
+        method: 'get',
+        params: parameter
+    })
+}
+
+export function FeeCodePage(parameter) {
+    return axios({
+        url: '/FeeCode/Page',
+        method: 'post',
+        data: parameter
+    })
+}
+
+export function FeeCodeSave(parameter) {
+    return axios({
+        url: '/FeeCode/Save',
+        method: 'post',
+        data: parameter
+    })
+}
+
+export function FeeCodeDelete(parameter) {
+    return axios({
+        url: '/FeeCode/Delete',
+        method: 'post',
+        data: parameter
+    })
+}
+
+export function FeeCurrencySave(parameter) {
+    return axios({
+        url: '/FeeCurrency/Save',
+        method: 'post',
+        data: parameter
+    })
+}
+
+export function FeeCurrencyPage(parameter) {
+    return axios({
+        url: '/FeeCurrency/Page',
+        method: 'post',
+        data: parameter
+    })
+}
+
+export function FeeCurrencyDelete(parameter) {
+    return axios({
+        url: '/FeeCurrency/Delete',
+        method: 'post',
+        data: parameter
+    })
+}
+
+export function FeeCurrencyList(parameter) {
+    return axios({
+        url: '/FeeCurrency/List',
+        method: 'get',
+        data: parameter
+    })
+}
+
+export function FeeCurrencyExchangePage(parameter) {
+    return axios({
+        url: '/FeeCurrencyExchange/Page',
+        method: 'post',
+        data: parameter
+    })
+}
+
+
+export function FeeCurrencyExchangeSave(parameter) {
+    return axios({
+        url: '/FeeCurrencyExchange/Save',
+        method: 'post',
+        data: parameter
+    })
+}
+
+export function FeeCurrencyExchangeDelete(parameter) {
+    return axios({
+        url: '/FeeCurrencyExchange/Delete',
+        method: 'post',
+        data: parameter
+    })
+}
+
+export function FeeTemplateSave(parameter) {
+    return axios({
+        url: '/FeeTemplate/Save',
+        method: 'post',
+        data: parameter
+    })
+}
+
+export function FeeTemplateDelete(parameter) {
+    return axios({
+        url: '/FeeTemplate/Delete',
+        method: 'post',
+        data: parameter
+    })
+}
+
+export function FeeTemplatePage(parameter) {
+    return axios({
+        url: '/FeeTemplate/Page',
+        method: 'post',
+        data: parameter
+    })
+}
+
+export function FeeTemplateDetail(parameter) {
+    return axios({
+        url: '/FeeTemplate/Detail',
+        method: 'get',
+        params: parameter
+    })
+}
+
+export function FeeCodeList(parameter) {
+    return axios({
+        url: '/FeeCode/List',
+        method: 'get',
+        params: parameter
+    })
+}
+
+export function GetFeeUnitList(parameter) {
+    return axios({
+        url: '/FeeRecord/GetFeeUnitList',
+        method: 'get',
+        params: parameter
+    })
+}
diff --git a/src/views/main/fee/feeCode.vue b/src/views/main/fee/feeCode.vue
new file mode 100644
index 0000000..b103bb8
--- /dev/null
+++ b/src/views/main/fee/feeCode.vue
@@ -0,0 +1,489 @@
+<template>
+  <div>
+    <!-- <a-card :bordered="false" :bodyStyle="tstyle">
+        <div class="table-page-search-wrapper" :class="advanced ? 'Open' : 'Close'">
+          <a-form :model="form" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }">
+            <a-row>
+              <a-col :span="6">
+                <a-form-item label="邮箱主题">
+                  <a-input v-model="form.mailSubject" allow-clear placeholder="请输入邮箱主题" />
+                </a-form-item>
+              </a-col>
+            </a-row>
+          </a-form>
+        </div>
+      </a-card> -->
+    <a-card :bordered="false">
+      <div style="margin-bottom: 10px;display: flex;justify-content: space-between;">
+        <div>
+          <a-button type="primary" @click="handleAdd">新建</a-button>
+        </div>
+        <div>
+          <a-button type="primary" @click="FnGetData">查询</a-button>
+          <a-button style="margin-left: 8px" @click="init">重置</a-button>
+        </div>
+      </div>
+      <vxe-table
+        :data="loadData"
+        stripe
+        resizable
+        round
+        :loading="loading"
+        ref="xTable1"
+        empty-text="没有更多数据了！">
+        <vxe-column type="checkbox" width="60"></vxe-column>
+        <vxe-column
+          v-for="item in columns"
+          :key="`${item.dataIndex}3`"
+          :field="item.dataIndex"
+          :min-width="item.width"
+          :title="item.title"
+          :fixed="item.fixed"
+          :align="item.align">
+          <template #default="{ row }">
+            <div v-if="item.dataIndex == 'isSea'">
+              <span v-if="row.isSea">是</span>
+              <span v-else>否</span>
+            </div>
+            <div v-else-if="item.dataIndex == 'isAir'">
+              <span v-if="row.isAir">是</span>
+              <span v-else>否</span>
+            </div>
+            <div v-else-if="item.dataIndex == 'isTrucking'">
+              <span v-if="row.isTrucking">是</span>
+              <span v-else>否</span>
+            </div>
+            <div v-else-if="item.dataIndex == 'isWMS'">
+              <span v-if="row.isWMS">是</span>
+              <span v-else>否</span>
+            </div>
+            <span v-else>{{ row[item.dataIndex] }}</span>
+          </template>
+        </vxe-column>
+        <vxe-column title="操作" fixed="right" width="120" align="center">
+          <template #default="{ row }">
+            <a-icon style="margin:0 12px" @click="handleEdit(row)" type="form" :style="{ color: '#13c2c2' }" />
+            <a-popconfirm
+              title="请确认删除?"
+              ok-text="是"
+              cancel-text="否"
+              @confirm="e => {
+                confirm(e, row.id)
+              }
+              ">
+              <a-icon type="delete" :style="{ color: '#13c2c2' }" />
+            </a-popconfirm>
+          </template>
+        </vxe-column>
+      </vxe-table>
+      <vxe-pager
+        :loading="loading"
+        :current-page="queryParam.pageNo"
+        :page-size="queryParam.pageSize"
+        :total="queryParam.totalResult"
+        :layouts="['PrevPage', 'JumpNumber', 'NextPage', 'FullJump', 'Sizes', 'Total']"
+        @page-change="handlePageChange">
+      </vxe-pager>
+    </a-card>
+    <a-modal :title="title" @ok="handleSave" width="1200px" @cancel="visible = false" :visible="visible">
+      <a-spin :spinning="formLoad">
+        <a-form-model :rules="rules" ref="addForm" :model="addForm" :label-col="labelCol" :wrapper-col="wrapperCol">
+          <a-row>
+            <a-col :span="8">
+              <a-form-model-item label="费用代码">
+                <a-input v-model="addForm.code" />
+              </a-form-model-item>
+            </a-col>
+            <a-col :span="8">
+              <a-form-model-item label="费用名称">
+                <a-input v-model="addForm.name" />
+              </a-form-model-item>
+            </a-col>
+            <a-col :span="8">
+              <a-form-model-item label="费用英文名称">
+                <a-input v-model="addForm.description" />
+              </a-form-model-item>
+            </a-col>
+          </a-row>
+          <a-row>
+            <a-col :span="8">
+              <a-form-model-item label="默认计费标准">
+                <a-input v-model="addForm.defaultUnit" />
+              </a-form-model-item>
+            </a-col>
+            <a-col :span="8">
+              <a-form-model-item label="默认收费客户类型">
+                <a-select v-model="addForm.defaultDebit" style="width: 100%" >
+                  <a-select-option v-for="(item,index) in customerTypeList" :key="index" :value="item.code">{{ item.name }}</a-select-option>
+                </a-select>
+              </a-form-model-item>
+            </a-col>
+            <a-col :span="8">
+              <a-form-model-item label="默认付费客户类型">
+                <a-select v-model="addForm.defaultCredit" style="width: 100%" >
+                  <a-select-option v-for="(item,index) in customerTypeList" :key="index" :value="item.code">{{ item.name }}</a-select-option>
+                </a-select>
+              </a-form-model-item>
+            </a-col>
+          </a-row>
+          <a-row>
+            <a-col :span="8">
+              <a-form-model-item label="默认币别">
+                <a-select v-model="addForm.defaultCurr" style="width: 100%" >
+                  <a-select-option v-for="(item,index) in currencyList" :key="index" :value="item.codeName">{{ item.codeName }}</a-select-option>
+                </a-select>
+              </a-form-model-item>
+            </a-col>
+            <a-col :span="8">
+              <a-form-model-item label="默认FRT">
+                <a-select v-model="addForm.feeFrt" style="width: 100%" >
+                  <a-select-option v-for="(item,index) in customerTypeList" :key="index" :value="item.code">{{ item.name }}</a-select-option>
+                </a-select>
+              </a-form-model-item>
+            </a-col>
+            <a-col :span="8">
+              <a-form-model-item label="默认税率">
+                <a-input-number style="width: 100%;" v-model="addForm.taxRate" :precision="2" :min="0" :step="0.1" />
+              </a-form-model-item>
+            </a-col>
+          </a-row>
+          <a-row>
+            <a-col :span="8">
+              <a-form-model-item label="费用分组">
+                <a-input v-model="addForm.feeGroup" />
+              </a-form-model-item>
+            </a-col>
+            <a-col :span="8">
+              <a-form-model-item label="对账类别">
+                <a-input v-model="addForm.duiType" />
+              </a-form-model-item>
+            </a-col>
+            <a-col :span="8">
+              <a-form-model-item label="发票商品名称">
+                <a-input v-model="addForm.goodName" />
+              </a-form-model-item>
+            </a-col>
+          </a-row>
+          <div style="padding-left: 50px;">
+            <a-checkbox v-model="addForm.isSea">是否海运</a-checkbox>
+            <a-checkbox v-model="addForm.isAir">是否空运</a-checkbox>
+            <a-checkbox v-model="addForm.isTrucking">是否陆运</a-checkbox>
+            <a-checkbox>是否陆运固定费用</a-checkbox>
+            <a-checkbox v-model="addForm.isWMS">是否仓储费用</a-checkbox>
+            <a-checkbox >是否垫付费用</a-checkbox>
+            <a-checkbox v-model="addForm.isOpen">机密费用</a-checkbox>
+            <a-checkbox v-model="addForm.isInvoice">禁开发票</a-checkbox>
+          </div>
+
+        </a-form-model>
+      </a-spin>
+    </a-modal>
+  </div>
+</template>
+  <script>
+  import {
+    FeeCodePage,
+    FeeCodeSave,
+    FeeCodeDelete,
+    GetFeeCustomerList,
+    FeeCurrencyList
+  } from '@/api/modular/main/mailSetting'
+  import columnSetting from '@/components/tableColumnSetting'
+  export default {
+    components: {
+      columnSetting
+    },
+    data() {
+      return {
+        TypeData: [],
+        // 高级搜索 展开/关闭
+        advanced: false,
+        visible: false,
+        loading: false,
+        selectedRowKeys: [],
+        title: '',
+        againVisible: false,
+        fileList: [],
+        setVisible: false,
+        setVisible1: false,
+        customerList: [],
+        addSettingFlag: false,
+        customerTypeList: [],
+        formLoad: false,
+        againLoad: false,
+        labelCol: { span: 8 },
+        wrapperCol: { span: 14 },
+        addForm: {
+        },
+        queryParam: {
+          pageNo: 1,
+          pageSize: 10,
+          totalResult: 1
+        },
+        parserList: [],
+        form: {},
+        mailHtml: '',
+        ColumnsQuery: [],
+        currencyList: [],
+        columns: [
+          {
+            title: '费用代码',
+            align: 'center',
+            width: '100',
+            dataIndex: 'code'
+          },
+          {
+            title: '费用名称',
+            align: 'center',
+            width: '100',
+            dataIndex: 'name'
+          },
+          {
+            title: '费用英文名称',
+            align: 'center',
+            width: '110',
+            dataIndex: 'description'
+          },
+          {
+            title: '默认币别',
+            align: 'center',
+            width: '80',
+            dataIndex: 'defaultCurr'
+          },
+          {
+            title: '是否海运',
+            align: 'center',
+            width: '80',
+            dataIndex: 'isSea'
+          },
+          {
+            title: '是否空运',
+            align: 'center',
+            width: '80',
+            dataIndex: 'isAir'
+          },
+          {
+            title: '是否陆运',
+            align: 'center',
+            width: '80',
+            dataIndex: 'isTrucking'
+          },
+          {
+            title: '是否陆运固定费用',
+            align: 'center',
+            width: '150',
+            dataIndex: 'accTaxRate'
+          },
+          {
+            title: '是否仓储费用',
+            align: 'center',
+            width: '150',
+            dataIndex: 'isWMS'
+          },
+          {
+            title: '是否垫付费用',
+            align: 'center',
+            width: '150',
+            dataIndex: 'isAdvancedPay'
+          },
+          {
+            title: '默认计费标准',
+            align: 'center',
+            width: '110',
+            dataIndex: 'defaultUnit'
+          },
+          {
+            title: '默认收费客户类型',
+            align: 'center',
+            width: '140',
+            dataIndex: 'defaultDebit'
+          },
+          {
+            title: '默认付费客户类型',
+            align: 'center',
+            width: '140',
+            dataIndex: 'defaultCredit'
+          },
+          {
+            title: '默认FRT',
+            align: 'center',
+            width: '80',
+            dataIndex: 'feeFrt'
+          },
+          {
+            title: '默认税率',
+            align: 'center',
+            width: '80',
+            dataIndex: 'taxRate'
+          },
+          {
+            title: '创建人',
+            align: 'center',
+            width: '80',
+            dataIndex: 'remark1'
+          },
+          {
+            title: '创建时间',
+            align: 'center',
+            width: '150',
+            dataIndex: 'remark2'
+          },
+          {
+            title: '费用分组',
+            align: 'center',
+            width: '80',
+            dataIndex: 'feeGroup'
+          }
+        ],
+        rules: {
+          emailAccount: [{ required: true, message: '请输入邮箱账号', trigger: 'blur' }],
+          password: [{ required: true, message: '请输入邮箱密码', trigger: 'blur' }],
+          useIMAP: [{ required: true, message: '请选择接收服务器类型', trigger: 'change' }],
+          smtpServer: [{ required: true, message: '请输入发件服务器', trigger: 'change' }],
+          receiveServer: [{ required: true, message: '请输入收件服务器', trigger: 'change' }]
+        },
+        tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' },
+        loadData: []
+      }
+    },
+    created() { },
+    mounted() {
+      this.FnGetData()
+      this.customerTypeList = this.$options.filters['dictData']('djy_cust_prop')
+      this.getCurrency()
+    },
+    methods: {
+      toggleAdvanced() {
+        this.advanced = !this.advanced
+      },
+      getCurrency() {
+        FeeCurrencyList().then(res => {
+            this.currencyList = res.data
+        })
+      },
+      onSelectChange(selectedRowKeys) {
+        this.selectedRowKeys = selectedRowKeys;
+      },
+      handleChange(val) {
+        GetFeeCustomerList({ code: val }).then(res => {
+          this.customerList = res.data
+        })
+      },
+      handleEdit(row) {
+        this.title = '费用代码编辑'
+        this.addForm = JSON.parse(JSON.stringify(row))
+        this.visible = true
+      },
+      handleSave() {
+        this.$refs.addForm.validate(valid => {
+          if (valid) {
+            this.formLoad = true
+            this.customerList.forEach(item => {
+              if (item.code === this.addForm.customerCode) {
+                this.addForm.customerName = item.name
+              }
+            })
+            FeeCodeSave(this.addForm).then(res => {
+              if (res.success) {
+                this.$message.success('保存成功')
+                this.FnGetData()
+                this.visible = false
+              } else {
+                this.$message.error(res.message)
+              }
+              this.formLoad = false
+            })
+          } else {
+            return false;
+          }
+        });
+      },
+      init() {
+        this.form = {}
+      },
+      handlePageChange({ currentPage, pageSize }) {
+        this.queryParam.pageNo = currentPage
+        this.queryParam.pageSize = pageSize
+        this.FnGetData()
+      },
+      FnGetData() {
+        this.loading = true
+        this.form.pageNo = this.queryParam.pageNo
+        this.form.pageSize = this.queryParam.pageSize
+        FeeCodePage(this.form).then(res => {
+          if (res.success) {
+            this.loadData = res.data.rows
+            this.queryParam.totalResult = res.data.totalRows
+          }
+          this.loading = false
+        })
+      },
+      confirm(e, data) {
+        this.handleDelete(data)
+      },
+      handleDelete(record) {
+        FeeCodeDelete([record]).then(res => {
+          if (res.success) {
+            this.$message.success('删除成功')
+            this.FnGetData()
+          } else {
+            this.$message.error(`删除失败,${res.message}`)
+          }
+        })
+      },
+      handleAdd() {
+        this.title = '费用代码新增'
+        this.visible = true
+        this.addForm = {
+        }
+      }
+    }
+  }
+  </script>
+  <style lang="less" scoped>
+  /deep/ .ant-descriptions-item-label {
+    font-weight: bold;
+  }
+
+  .table-operator {
+    margin-bottom: 18px;
+  }
+
+  .Close {
+    height: 45px;
+    overflow: hidden;
+  }
+
+  .vxe-table--render-default .vxe-body--row.row--stripe {
+    background: #f5f9fe;
+  }
+
+  .ant-card-body {
+    padding-top: 10px;
+  }
+
+  .inline {
+    position: relative;
+  }
+
+  .inline-right {
+    position: absolute;
+    top: 6px;
+    right: 25px;
+  }
+
+  .look-item {
+    display: flex;
+    align-items: center;
+    margin-bottom: 5px;
+
+    .look-left {
+      font-weight: bold;
+      display: inline-block;
+      margin-right: 10px;
+      width: 80px;
+      color: black;
+      text-align: right;
+    }
+  }
+  </style>
diff --git a/src/views/main/fee/feeCurrency.vue b/src/views/main/fee/feeCurrency.vue
new file mode 100644
index 0000000..e27c7cb
--- /dev/null
+++ b/src/views/main/fee/feeCurrency.vue
@@ -0,0 +1,344 @@
+<template>
+  <div>
+    <!-- <a-card :bordered="false" :bodyStyle="tstyle">
+          <div class="table-page-search-wrapper" :class="advanced ? 'Open' : 'Close'">
+            <a-form :model="form" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }">
+              <a-row>
+                <a-col :span="6">
+                  <a-form-item label="邮箱主题">
+                    <a-input v-model="form.mailSubject" allow-clear placeholder="请输入邮箱主题" />
+                  </a-form-item>
+                </a-col>
+              </a-row>
+            </a-form>
+          </div>
+        </a-card> -->
+    <a-card :bordered="false">
+      <div style="margin-bottom: 10px;display: flex;justify-content: space-between;">
+        <div>
+          <a-button type="primary" @click="handleAdd">新建</a-button>
+        </div>
+        <div>
+          <a-button type="primary" @click="FnGetData">查询</a-button>
+          <a-button style="margin-left: 8px" @click="init">重置</a-button>
+        </div>
+      </div>
+      <vxe-table
+        :data="loadData"
+        stripe
+        resizable
+        round
+        :loading="loading"
+        ref="xTable1"
+        empty-text="没有更多数据了！">
+        <vxe-column type="checkbox" width="60"></vxe-column>
+        <vxe-column
+          v-for="item in columns"
+          :key="`${item.dataIndex}3`"
+          :field="item.dataIndex"
+          :min-width="item.width"
+          :title="item.title"
+          :fixed="item.fixed"
+          :align="item.align">
+          <template #default="{ row }">
+            <div v-if="item.dataIndex == 'isSea'">
+              <span v-if="row.isSea">是</span>
+              <span v-else>否</span>
+            </div>
+            <span v-else>{{ row[item.dataIndex] }}</span>
+          </template>
+        </vxe-column>
+        <vxe-column title="操作" fixed="right" width="120" align="center">
+          <template #default="{ row }">
+            <a-icon style="margin:0 12px" @click="handleEdit(row)" type="form" :style="{ color: '#13c2c2' }" />
+            <a-popconfirm
+              title="请确认删除?"
+              ok-text="是"
+              cancel-text="否"
+              @confirm="e => {
+                confirm(e, row.id)
+              }
+              ">
+              <a-icon type="delete" :style="{ color: '#13c2c2' }" />
+            </a-popconfirm>
+          </template>
+        </vxe-column>
+      </vxe-table>
+      <vxe-pager
+        :loading="loading"
+        :current-page="queryParam.pageNo"
+        :page-size="queryParam.pageSize"
+        :total="queryParam.totalResult"
+        :layouts="['PrevPage', 'JumpNumber', 'NextPage', 'FullJump', 'Sizes', 'Total']"
+        @page-change="handlePageChange">
+      </vxe-pager>
+    </a-card>
+    <a-modal :title="title" @ok="handleSave" width="1200px" @cancel="visible = false" :visible="visible">
+      <a-spin :spinning="formLoad">
+        <a-form-model :rules="rules" ref="addForm" :model="addForm" :label-col="labelCol" :wrapper-col="wrapperCol">
+          <a-row>
+            <a-col :span="8">
+              <a-form-model-item label="币别代码">
+                <a-input v-model="addForm.codeName" />
+              </a-form-model-item>
+            </a-col>
+            <a-col :span="8">
+              <a-form-model-item label="英文名称">
+                <a-input v-model="addForm.name" />
+              </a-form-model-item>
+            </a-col>
+            <a-col :span="8">
+              <a-form-model-item label="中文描述名称">
+                <a-input v-model="addForm.description" />
+              </a-form-model-item>
+            </a-col>
+          </a-row>
+          <a-row>
+            <a-col :span="8">
+              <a-form-model-item label="对人民币汇率">
+                <a-input v-model="addForm.defaultRate" />
+              </a-form-model-item>
+            </a-col>
+            <a-col :span="8">
+              <a-form-model-item label="财务软件代码">
+                <a-input v-model="addForm.financeSoftCode" />
+              </a-form-model-item>
+            </a-col>
+          </a-row>
+
+        </a-form-model>
+      </a-spin>
+    </a-modal>
+  </div>
+</template>
+<script>
+import {
+    FeeCurrencyPage,
+    FeeCurrencySave,
+    FeeCurrencyDelete,
+    GetFeeCustomerList
+} from '@/api/modular/main/mailSetting'
+import columnSetting from '@/components/tableColumnSetting'
+export default {
+    components: {
+        columnSetting
+    },
+    data() {
+        return {
+            TypeData: [],
+            // 高级搜索 展开/关闭
+            advanced: false,
+            visible: false,
+            loading: false,
+            selectedRowKeys: [],
+            againVisible: false,
+            fileList: [],
+            setVisible: false,
+            title:'',
+            setVisible1: false,
+            customerList: [],
+            addSettingFlag: false,
+            customerTypeList: [],
+            formLoad: false,
+            againLoad: false,
+            labelCol: { span: 8 },
+            wrapperCol: { span: 14 },
+            addForm: {
+            },
+            queryParam: {
+                pageNo: 1,
+                pageSize: 10,
+                totalResult: 1
+            },
+            parserList: [],
+            form: {},
+            mailHtml: '',
+            ColumnsQuery: [],
+            columns: [
+                {
+                    title: '币别代码',
+                    align: 'center',
+                    width: '100',
+                    dataIndex: 'codeName'
+                },
+                {
+                    title: '英文名称',
+                    align: 'center',
+                    width: '100',
+                    dataIndex: 'name'
+                },
+                {
+                    title: '中文描述名称',
+                    align: 'center',
+                    width: '110',
+                    dataIndex: 'description'
+                },
+                {
+                    title: '对人民币汇率',
+                    align: 'center',
+                    width: '80',
+                    dataIndex: 'defaultRate'
+                },
+                {
+                    title: '财务软件代码',
+                    align: 'center',
+                    width: '80',
+                    dataIndex: 'financeSoftCode'
+                }
+            ],
+            rules: {
+                emailAccount: [{ required: true, message: '请输入邮箱账号', trigger: 'blur' }],
+                password: [{ required: true, message: '请输入邮箱密码', trigger: 'blur' }],
+                useIMAP: [{ required: true, message: '请选择接收服务器类型', trigger: 'change' }],
+                smtpServer: [{ required: true, message: '请输入发件服务器', trigger: 'change' }],
+                receiveServer: [{ required: true, message: '请输入收件服务器', trigger: 'change' }]
+            },
+            tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' },
+            loadData: []
+        }
+    },
+    created() { },
+    mounted() {
+        this.FnGetData()
+        this.customerTypeList = this.$options.filters['dictData']('djy_cust_prop')
+    },
+    methods: {
+        toggleAdvanced() {
+            this.advanced = !this.advanced
+        },
+        onSelectChange(selectedRowKeys) {
+            this.selectedRowKeys = selectedRowKeys;
+        },
+        handleChange(val) {
+            GetFeeCustomerList({ code: val }).then(res => {
+                this.customerList = res.data
+            })
+        },
+        handleEdit(row) {
+          this.title = '币别编辑'
+            if (row.isAdvancedPay) {
+                row.isAdvancedPay = 'true'
+            } else {
+                row.isAdvancedPay = 'false'
+            }
+            if (row.isInvoice) {
+                row.isInvoice = 'true'
+            } else {
+                row.isInvoice = 'false'
+            }
+            this.addForm = JSON.parse(JSON.stringify(row))
+            this.visible = true
+        },
+        handleSave() {
+            this.$refs.addForm.validate(valid => {
+                if (valid) {
+                    this.formLoad = true
+                    this.customerList.forEach(item => {
+                        if (item.code === this.addForm.customerCode) {
+                            this.addForm.customerName = item.name
+                        }
+                    })
+                    FeeCurrencySave(this.addForm).then(res => {
+                        if (res.success) {
+                            this.$message.success('保存成功')
+                            this.FnGetData()
+                            this.visible = false
+                        } else {
+                            this.$message.error(res.message)
+                        }
+                        this.formLoad = false
+                    })
+                } else {
+                    return false;
+                }
+            });
+        },
+        init() {
+            this.form = {}
+        },
+        handlePageChange({ currentPage, pageSize }) {
+            this.queryParam.pageNo = currentPage
+            this.queryParam.pageSize = pageSize
+            this.FnGetData()
+        },
+        FnGetData() {
+            this.loading = true
+            this.form.pageNo = this.queryParam.pageNo
+            this.form.pageSize = this.queryParam.pageSize
+            FeeCurrencyPage(this.form).then(res => {
+                if (res.success) {
+                    this.loadData = res.data.rows
+                    this.queryParam.totalResult = res.data.totalRows
+                }
+                this.loading = false
+            })
+        },
+        confirm(e, data) {
+            this.handleDelete(data)
+        },
+        handleDelete(record) {
+            FeeCurrencyDelete([record]).then(res => {
+                if (res.success) {
+                    this.$message.success('删除成功')
+                    this.FnGetData()
+                } else {
+                    this.$message.error(`删除失败,${res.message}`)
+                }
+            })
+        },
+        handleAdd() {
+          this.title = '币别新增'
+            this.visible = true
+            this.addForm = {
+            }
+        }
+    }
+}
+</script>
+<style lang="less" scoped>
+/deep/ .ant-descriptions-item-label {
+    font-weight: bold;
+}
+
+.table-operator {
+    margin-bottom: 18px;
+}
+
+.Close {
+    height: 45px;
+    overflow: hidden;
+}
+
+.vxe-table--render-default .vxe-body--row.row--stripe {
+    background: #f5f9fe;
+}
+
+.ant-card-body {
+    padding-top: 10px;
+}
+
+.inline {
+    position: relative;
+}
+
+.inline-right {
+    position: absolute;
+    top: 6px;
+    right: 25px;
+}
+
+.look-item {
+    display: flex;
+    align-items: center;
+    margin-bottom: 5px;
+
+    .look-left {
+        font-weight: bold;
+        display: inline-block;
+        margin-right: 10px;
+        width: 80px;
+        color: black;
+        text-align: right;
+    }
+}
+</style>
diff --git a/src/views/main/fee/feeExchange.vue b/src/views/main/fee/feeExchange.vue
new file mode 100644
index 0000000..7430803
--- /dev/null
+++ b/src/views/main/fee/feeExchange.vue
@@ -0,0 +1,411 @@
+<template>
+  <div>
+    <a-card :bordered="false" :bodyStyle="tstyle">
+      <div class="table-page-search-wrapper" :class="advanced ? 'Open' : 'Close'">
+        <a-form :model="form" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }">
+          <a-row>
+            <a-col :span="6">
+              <a-form-item label="币别">
+                <a-select v-model="form.currency" style="width: 100%">
+                  <a-select-option
+                    v-for="(item, index) in currencyList"
+                    :key="index"
+                    :value="item.codeName">{{ item.codeName }}</a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+          </a-row>
+        </a-form>
+      </div>
+    </a-card>
+    <a-card :bordered="false">
+      <div style="margin-bottom: 10px;display: flex;justify-content: space-between;">
+        <div>
+          <a-button type="primary" @click="handleAdd">新建</a-button>
+        </div>
+        <div>
+          <a-button type="primary" @click="FnGetData">查询</a-button>
+          <a-button style="margin-left: 8px" @click="init">重置</a-button>
+        </div>
+      </div>
+      <vxe-table
+        :data="loadData"
+        stripe
+        resizable
+        round
+        :loading="loading"
+        ref="xTable1"
+        empty-text="没有更多数据了！">
+        <vxe-column type="checkbox" width="60"></vxe-column>
+        <vxe-column
+          v-for="item in columns"
+          :key="`${item.dataIndex}3`"
+          :field="item.dataIndex"
+          :min-width="item.width"
+          :title="item.title"
+          :fixed="item.fixed"
+          :align="item.align">
+          <template #default="{ row }">
+            <div v-if="item.dataIndex == 'startTime'">
+              {{ row.startTime.substring(0,11) }}
+            </div>
+            <div v-else-if="item.dataIndex == 'endTime'">
+              {{ row.endTime.substring(0,11) }}
+            </div>
+            <span v-else>{{ row[item.dataIndex] }}</span>
+          </template>
+        </vxe-column>
+        <vxe-column title="操作" fixed="right" width="120" align="center">
+          <template #default="{ row }">
+            <a-icon style="margin:0 12px" @click="handleEdit(row)" type="form" :style="{ color: '#13c2c2' }" />
+            <a-popconfirm
+              title="请确认删除?"
+              ok-text="是"
+              cancel-text="否"
+              @confirm="e => {
+                confirm(e, row.id)
+              }
+              ">
+              <a-icon type="delete" :style="{ color: '#13c2c2' }" />
+            </a-popconfirm>
+          </template>
+        </vxe-column>
+      </vxe-table>
+      <vxe-pager
+        :loading="loading"
+        :current-page="queryParam.pageNo"
+        :page-size="queryParam.pageSize"
+        :total="queryParam.totalResult"
+        :layouts="['PrevPage', 'JumpNumber', 'NextPage', 'FullJump', 'Sizes', 'Total']"
+        @page-change="handlePageChange">
+      </vxe-pager>
+    </a-card>
+    <a-modal :title="title" @ok="handleSave" width="1200px" @cancel="visible = false" :visible="visible">
+      <a-spin :spinning="formLoad">
+        <a-form-model :rules="rules" ref="addForm" :model="addForm" :label-col="labelCol" :wrapper-col="wrapperCol">
+          <a-row>
+            <a-col :span="8">
+              <a-form-model-item label="币别代码">
+                <a-select v-model="addForm.currency" style="width: 100%">
+                  <a-select-option
+                    v-for="(item, index) in currencyList"
+                    :key="index"
+                    :value="item.codeName">{{ item.codeName }}</a-select-option>
+                </a-select>
+              </a-form-model-item>
+            </a-col>
+            <a-col :span="8">
+              <a-form-model-item label="开始日期">
+                <a-date-picker style="width: 100%;" v-model="addForm.startTime" />
+              </a-form-model-item>
+            </a-col>
+            <a-col :span="8">
+              <a-form-model-item label="结束日期">
+                <a-date-picker style="width: 100%;" v-model="addForm.endTime" />
+              </a-form-model-item>
+            </a-col>
+          </a-row>
+          <a-row>
+            <a-col :span="8">
+              <a-form-model-item label="应收汇率">
+                <a-input-number
+                  style="width: 100%;"
+                  v-model="addForm.drValue"
+                  :precision="6"
+                  :min="0"
+                  :step="0.1" />
+              </a-form-model-item>
+            </a-col>
+            <a-col :span="8">
+              <a-form-model-item label="应付汇率">
+                <a-input-number
+                  style="width: 100%;"
+                  v-model="addForm.crValue"
+                  :precision="6"
+                  :min="0"
+                  :step="0.1" />
+              </a-form-model-item>
+            </a-col>
+            <a-col :span="8">
+              <a-form-model-item label="海关汇率">
+                <a-input-number style="width: 100%;" :precision="6" :min="0" :step="0.1" />
+              </a-form-model-item>
+            </a-col>
+          </a-row>
+          <a-row>
+            <a-col :span="8">
+              <a-form-model-item label="本位币">
+                <a-input v-model="addForm.localCurr" />
+              </a-form-model-item>
+            </a-col>
+            <a-col :span="8">
+              <a-form-model-item label="备注">
+                <a-input v-model="addForm.remark" />
+              </a-form-model-item>
+            </a-col>
+          </a-row>
+
+        </a-form-model>
+      </a-spin>
+    </a-modal>
+  </div>
+</template>
+<script>
+import {
+    FeeCurrencyExchangePage,
+    FeeCurrencyExchangeSave,
+    FeeCurrencyExchangeDelete,
+    GetFeeCustomerList,
+    FeeCurrencyList
+} from '@/api/modular/main/mailSetting'
+import columnSetting from '@/components/tableColumnSetting'
+export default {
+    components: {
+        columnSetting
+    },
+    data() {
+        return {
+            TypeData: [],
+            // 高级搜索 展开/关闭
+            advanced: false,
+            visible: false,
+            loading: false,
+            selectedRowKeys: [],
+            againVisible: false,
+            fileList: [],
+            title:'',
+            currencyList: [],
+            setVisible: false,
+            setVisible1: false,
+            customerList: [],
+            addSettingFlag: false,
+            customerTypeList: [],
+            formLoad: false,
+            againLoad: false,
+            labelCol: { span: 8 },
+            wrapperCol: { span: 14 },
+            addForm: {
+            },
+            queryParam: {
+                pageNo: 1,
+                pageSize: 10,
+                totalResult: 1
+            },
+            parserList: [],
+            form: {},
+            mailHtml: '',
+            ColumnsQuery: [],
+            columns: [
+                {
+                    title: '币别',
+                    align: 'center',
+                    width: '100',
+                    dataIndex: 'currency'
+                },
+                {
+                    title: '开始日期',
+                    align: 'center',
+                    width: '100',
+                    dataIndex: 'startTime'
+                },
+                {
+                    title: '结束日期',
+                    align: 'center',
+                    width: '110',
+                    dataIndex: 'endTime'
+                },
+                {
+                    title: '应收汇率',
+                    align: 'center',
+                    width: '80',
+                    dataIndex: 'drValue'
+                },
+                {
+                    title: '应付汇率',
+                    align: 'center',
+                    width: '80',
+                    dataIndex: 'crValue'
+                },
+                {
+                    title: '海关汇率',
+                    align: 'center',
+                    width: '80',
+                    dataIndex: 'localCurr1'
+                },
+                {
+                    title: '本位币',
+                    align: 'center',
+                    width: '80',
+                    dataIndex: 'localCurr'
+                },
+                {
+                    title: '录入人',
+                    align: 'center',
+                    width: '80',
+                    dataIndex: 'financeSoftCode1'
+                },
+                {
+                    title: '录入时间',
+                    align: 'center',
+                    width: '80',
+                    dataIndex: 'financeSoftCode2'
+                },
+                {
+                    title: '备注',
+                    align: 'center',
+                    width: '80',
+                    dataIndex: 'remark'
+                }
+            ],
+            rules: {
+                emailAccount: [{ required: true, message: '请输入邮箱账号', trigger: 'blur' }],
+                password: [{ required: true, message: '请输入邮箱密码', trigger: 'blur' }],
+                useIMAP: [{ required: true, message: '请选择接收服务器类型', trigger: 'change' }],
+                smtpServer: [{ required: true, message: '请输入发件服务器', trigger: 'change' }],
+                receiveServer: [{ required: true, message: '请输入收件服务器', trigger: 'change' }]
+            },
+            tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' },
+            loadData: []
+        }
+    },
+    created() { },
+    mounted() {
+        this.FnGetData()
+        this.customerTypeList = this.$options.filters['dictData']('djy_cust_prop')
+        this.getCurrency()
+    },
+    methods: {
+        toggleAdvanced() {
+            this.advanced = !this.advanced
+        },
+        getCurrency() {
+            FeeCurrencyList().then(res => {
+                this.currencyList = res.data
+            })
+        },
+        onSelectChange(selectedRowKeys) {
+            this.selectedRowKeys = selectedRowKeys;
+        },
+        handleChange(val) {
+            GetFeeCustomerList({ code: val }).then(res => {
+                this.customerList = res.data
+            })
+        },
+        handleEdit(row) {
+            this.title = '汇率编辑'
+            this.addForm = JSON.parse(JSON.stringify(row))
+            this.visible = true
+        },
+        handleSave() {
+            this.$refs.addForm.validate(valid => {
+                if (valid) {
+                    this.formLoad = true
+                    this.customerList.forEach(item => {
+                        if (item.code === this.addForm.customerCode) {
+                            this.addForm.customerName = item.name
+                        }
+                    })
+                    FeeCurrencyExchangeSave(this.addForm).then(res => {
+                        if (res.success) {
+                            this.$message.success('保存成功')
+                            this.FnGetData()
+                            this.visible = false
+                        } else {
+                            this.$message.error(res.message)
+                        }
+                        this.formLoad = false
+                    })
+                } else {
+                    return false;
+                }
+            });
+        },
+        init() {
+            this.form = {}
+        },
+        handlePageChange({ currentPage, pageSize }) {
+            this.queryParam.pageNo = currentPage
+            this.queryParam.pageSize = pageSize
+            this.FnGetData()
+        },
+        FnGetData() {
+            this.loading = true
+            this.form.pageNo = this.queryParam.pageNo
+            this.form.pageSize = this.queryParam.pageSize
+            FeeCurrencyExchangePage(this.form).then(res => {
+                if (res.success) {
+                    this.loadData = res.data.rows
+                    this.queryParam.totalResult = res.data.totalRows
+                }
+                this.loading = false
+            })
+        },
+        confirm(e, data) {
+            this.handleDelete(data)
+        },
+        handleDelete(record) {
+            FeeCurrencyExchangeDelete([record]).then(res => {
+                if (res.success) {
+                    this.$message.success('删除成功')
+                    this.FnGetData()
+                } else {
+                    this.$message.error(`删除失败,${res.message}`)
+                }
+            })
+        },
+        handleAdd() {
+            this.visible = true
+            this.title = '汇率新增'
+            this.addForm = {
+            }
+        }
+    }
+}
+</script>
+<style lang="less" scoped>
+/deep/ .ant-descriptions-item-label {
+    font-weight: bold;
+}
+
+.table-operator {
+    margin-bottom: 18px;
+}
+
+.Close {
+    height: 45px;
+    overflow: hidden;
+}
+
+.vxe-table--render-default .vxe-body--row.row--stripe {
+    background: #f5f9fe;
+}
+
+.ant-card-body {
+    padding-top: 10px;
+}
+
+.inline {
+    position: relative;
+}
+
+.inline-right {
+    position: absolute;
+    top: 6px;
+    right: 25px;
+}
+
+.look-item {
+    display: flex;
+    align-items: center;
+    margin-bottom: 5px;
+
+    .look-left {
+        font-weight: bold;
+        display: inline-block;
+        margin-right: 10px;
+        width: 80px;
+        color: black;
+        text-align: right;
+    }
+}
+</style>
diff --git a/src/views/main/fee/feeTemplate.vue b/src/views/main/fee/feeTemplate.vue
new file mode 100644
index 0000000..5d725ee
--- /dev/null
+++ b/src/views/main/fee/feeTemplate.vue
@@ -0,0 +1,1052 @@
+<template>
+  <div>
+    <a-card :bordered="false" :bodyStyle="tstyle">
+      <div class="table-page-search-wrapper" :class="advanced ? 'Open' : 'Close'">
+        <a-form :model="form" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }">
+          <a-row>
+            <a-col :span="6">
+              <a-form-item label="费用类型">
+                <a-select v-model="form.defaultDebit" placeholder="请选择费用类型" style="width: 100%">
+                  <a-select-option value="应收">应收</a-select-option>
+                  <a-select-option value="应付">应付</a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+            <a-col :span="6">
+              <a-form-item label="模板名称">
+                <a-input v-model="form.name" allow-clear placeholder="请输入模板名称" />
+              </a-form-item>
+            </a-col>
+          </a-row>
+        </a-form>
+      </div>
+    </a-card>
+    <a-card :bordered="false">
+      <div style="margin-bottom: 10px;display: flex;justify-content: space-between;">
+        <div>
+          <a-button type="primary" @click="handleAdd">新建</a-button>
+        </div>
+        <div>
+          <a-button type="primary" @click="FnGetData">查询</a-button>
+          <a-button style="margin-left: 8px" @click="init">重置</a-button>
+        </div>
+      </div>
+      <vxe-table
+        :data="loadData"
+        stripe
+        resizable
+        round
+        :loading="loading"
+        ref="xTable1"
+        empty-text="没有更多数据了！">
+        <vxe-column type="checkbox" width="60"></vxe-column>
+        <vxe-column
+          v-for="item in columns"
+          :key="`${item.dataIndex}3`"
+          :field="item.dataIndex"
+          :min-width="item.width"
+          :title="item.title"
+          :fixed="item.fixed"
+          :align="item.align">
+          <template #default="{ row }">
+            <div v-if="item.dataIndex == 'isSea'">
+              <span v-if="row.isSea">是</span>
+              <span v-else>否</span>
+            </div>
+            <span v-else>{{ row[item.dataIndex] }}</span>
+          </template>
+        </vxe-column>
+        <vxe-column title="操作" fixed="right" width="120" align="center">
+          <template #default="{ row }">
+            <a-icon style="margin:0 12px" @click="handleEdit(row)" type="form" :style="{ color: '#13c2c2' }" />
+            <a-popconfirm
+              title="请确认删除?"
+              ok-text="是"
+              cancel-text="否"
+              @confirm="e => {
+                confirm(e, row.id)
+              }
+              ">
+              <a-icon type="delete" :style="{ color: '#13c2c2' }" />
+            </a-popconfirm>
+          </template>
+        </vxe-column>
+      </vxe-table>
+      <vxe-pager
+        :loading="loading"
+        :current-page="queryParam.pageNo"
+        :page-size="queryParam.pageSize"
+        :total="queryParam.totalResult"
+        :layouts="['PrevPage', 'JumpNumber', 'NextPage', 'FullJump', 'Sizes', 'Total']"
+        @page-change="handlePageChange">
+      </vxe-pager>
+    </a-card>
+    <a-modal :title="title" @ok="handleSave" width="1200px" @cancel="visible = false" :visible="visible">
+      <a-spin :spinning="formLoad">
+        <a-form-model :rules="rules" ref="addForm" :model="addForm" :label-col="labelCol" :wrapper-col="wrapperCol">
+          <a-row>
+            <a-col :span="8">
+              <a-form-model-item label="业务类别">
+                <a-input v-model="addForm.opType" disabled />
+              </a-form-model-item>
+            </a-col>
+            <a-col :span="8">
+              <a-form-model-item label="费用类型">
+                <a-select v-model="addForm.feeType" style="width: 100%">
+                  <a-select-option value="应收">应收</a-select-option>
+                  <a-select-option value="应付">应付</a-select-option>
+                </a-select>
+              </a-form-model-item>
+            </a-col>
+            <a-col :span="8">
+              <a-form-model-item label="模板名称">
+                <a-input v-model="addForm.name" />
+              </a-form-model-item>
+            </a-col>
+          </a-row>
+          <a-row>
+            <a-col :span="8">
+              <a-form-model-item label="是否公共">
+                <a-select v-model="addForm.isPublic" style="width: 100%">
+                  <a-select-option value="true">是</a-select-option>
+                  <a-select-option value="false">否</a-select-option>
+                </a-select>
+              </a-form-model-item>
+            </a-col>
+            <a-col :span="8">
+              <a-form-model-item label="模板说明">
+                <a-input v-model="addForm.description" />
+              </a-form-model-item>
+            </a-col>
+            <a-col :span="8">
+              <a-form-model-item label="备注">
+                <a-input v-model="addForm.remark" />
+              </a-form-model-item>
+            </a-col>
+          </a-row>
+        </a-form-model>
+        <div style="font-size: 16px;font-weight: bold;margin-bottom: 20px;color: black;">
+          <span>费用字段</span>
+          <a-button type="primary" style="margin: 0 10px;" @click="handlePush">新增</a-button>
+          <a-button type="danger" @click="handleDeleteTable">删除</a-button>
+        </div>
+        <ve-table
+          style="height: 400px;"
+          :max-height="400"
+          class="tableRef"
+          rowKeyFieldName="rowKey"
+          ref="tableRef"
+          :scroll-width="0"
+          :border-x="true"
+          :fixed-header="true"
+          :checkbox-option="checkboxOption"
+          :columns="columnsTable"
+          :table-data="tableData"
+          :cellSelectionOption="cellSelectionOption"
+          :editOption="editOption"
+          :rowStyleOption="rowStyleOption"
+          border-y />
+      </a-spin>
+    </a-modal>
+  </div>
+</template>
+<script>
+import {
+    FeeTemplatePage,
+    FeeTemplateSave,
+    FeeTemplateDelete,
+    GetFeeCustomerList,
+    FeeCodeList,
+    GetFeeUnitList,
+    FeeCurrencyList,
+    FeeTemplateDetail
+} from '@/api/modular/main/mailSetting'
+import columnSetting from '@/components/tableColumnSetting'
+export default {
+    components: {
+        columnSetting
+    },
+    data() {
+        return {
+            TypeData: [],
+            // 高级搜索 展开/关闭
+            advanced: false,
+            title: '',
+            checkboxOption: {
+                selectedRowKeys: [],
+                selectedRowChange: ({ row, isSelected, selectedRowKeys }) => {
+                    this.checkboxOption.selectedRowKeys = selectedRowKeys
+                },
+                selectedAllChange: ({ isSelected, selectedRowKeys }) => {
+                    this.checkboxOption.selectedRowKeys = selectedRowKeys
+                }
+            },
+            columnsTable: [
+                {
+                    field: '',
+                    key: 'b',
+                    type: 'checkbox',
+                    title: '',
+                    width: 50,
+                    align: 'center',
+                    edit: false
+                },
+                {
+                    field: 'feeName',
+                    key: 'feeName',
+                    title: '费用名称',
+                    align: 'center',
+                    width: '150px',
+                    edit: false,
+                    renderBodyCell: ({ row, column, rowIndex }, h) => {
+                        return (
+                            <a-select
+                                size="small"
+                                value={row['feeName']}
+                                showSearch
+                                ref="feeName"
+                                class="feeName"
+                                allow-clear={true}
+                                style="width: 100%"
+                                filter-option={this.filterOption}
+                                on-change={(val) => {
+                                    if (val !== undefined) {
+                                        const data = this.feeCodeList[val]
+                                        row['feeName'] = data.name
+                                        row['feeDescription'] = data.description
+                                        this.$forceUpdate()
+                                    } else {
+                                        row['feeName'] = ''
+                                    }
+                                }}
+                                on-focus={(val) => {
+                                    this.ctnallViewIndex = rowIndex
+                                    this.cellSelectionOption.enable = false
+                                }}
+                                on-blur={(val) => {
+                                    this.cellSelectionOption.enable = true
+                                    this.ctnallViewIndex = null
+                                    this.$refs['tableRef'].setCellSelection({ rowKey: rowIndex + 1, colKey: 'feeName' });
+                                }}
+                                on-select={(val) => {
+                                    this.cellSelectionOption.enable = true
+                                }}
+                            >
+                                {this.feeCodeList.map((item, index) => {
+                                    return <a-select-option value={index}>{item.name}</a-select-option>
+                                })}
+                            </a-select>
+                        )
+                    }
+                },
+                {
+                    field: 'feeDescription',
+                    key: 'feeDescription',
+                    title: '费用英文名称',
+                    align: 'center',
+                    width: '130px',
+                    edit: true
+                },
+                {
+                    field: 'custType',
+                    key: 'custType',
+                    title: '结算对象类型',
+                    align: 'center',
+                    width: '130px',
+                    edit: false,
+                    renderBodyCell: ({ row, column, rowIndex }, h) => {
+                        return (
+                            <a-select
+                                size="small"
+                                value={row['custType']}
+                                showSearch
+                                ref="custType"
+                                class="custType"
+                                allow-clear={true}
+                                style="width: 100%"
+                                filter-option={this.filterOption}
+                                on-change={(val) => {
+                                    if (val !== undefined) {
+                                        const data = this.customerTypeList[val]
+                                        row['custType'] = data.name
+                                        row['customerName'] = ''
+                                        this.handleChange(data.code)
+                                        this.$forceUpdate()
+                                    } else {
+                                        row['custType'] = ''
+                                    }
+                                }}
+                                on-focus={(val) => {
+                                    this.ctnallViewIndex = rowIndex
+                                    this.cellSelectionOption.enable = false
+                                }}
+                                on-blur={(val) => {
+                                    this.cellSelectionOption.enable = true
+                                    this.ctnallViewIndex = null
+                                    this.$refs['tableRef'].setCellSelection({ rowKey: rowIndex + 1, colKey: 'custType' });
+                                }}
+                                on-select={(val) => {
+                                    this.cellSelectionOption.enable = true
+                                }}
+                            >
+                                {this.customerTypeList.map((item, index) => {
+                                    return <a-select-option value={index}>{item.name}</a-select-option>
+                                })}
+                            </a-select>
+                        )
+                    }
+                },
+                {
+                    field: 'customerName',
+                    key: 'customerName',
+                    title: '结算对象',
+                    align: 'center',
+                    width: '150px',
+                    edit: false,
+                    renderBodyCell: ({ row, column, rowIndex }, h) => {
+                        return (
+                            <a-select
+                                size="small"
+                                value={row['customerName']}
+                                showSearch
+                                ref="customerName"
+                                class="customerName"
+                                allow-clear={true}
+                                style="width: 100%"
+                                filter-option={this.filterOption}
+                                on-change={(val) => {
+                                    if (val !== undefined) {
+                                        const data = this.customerList[val]
+                                        row['customerName'] = data.name
+                                        this.$forceUpdate()
+                                    } else {
+                                        row['customerName'] = ''
+                                    }
+                                }}
+                                on-focus={(val) => {
+                                    this.ctnallViewIndex = rowIndex
+                                    this.cellSelectionOption.enable = false
+                                }}
+                                on-blur={(val) => {
+                                    this.ctnallViewIndex = null
+                                    setTimeout(() => {
+                                        this.$refs['tableRef'].setCellSelection({ rowKey: rowIndex + 1, colKey: 'customerName' });
+                                    }, 100)
+                                    this.cellSelectionOption.enable = true
+                                }}
+                                on-select={(val) => {
+                                    this.cellSelectionOption.enable = true
+                                }}
+                            >
+                                <a-spin v-show={this.fetching} slot="notFoundContent" size="small" > </a-spin>
+                                {this.customerList.map((item, index) => {
+                                    return <a-select-option value={index}>{item.name}</a-select-option>
+                                })}
+                            </a-select>
+                        )
+                    }
+                },
+                {
+                    field: 'unit',
+                    key: 'unit',
+                    title: '标准',
+                    align: 'center',
+                    width: '100px',
+                    edit: false,
+                    renderBodyCell: ({ row, column, rowIndex }, h) => {
+                        return (
+                            <a-select
+                                size="small"
+                                value={row['unit']}
+                                showSearch
+                                ref="unit"
+                                class="unit"
+                                allow-clear={true}
+                                style="width: 100%"
+                                filter-option={this.filterOption}
+                                on-change={(val) => {
+                                    if (val !== undefined) {
+                                        const data = this.unitList[val]
+                                        row['unit'] = data.name
+                                        this.$forceUpdate()
+                                    } else {
+                                        row['unit'] = ''
+                                    }
+                                }}
+                                on-focus={(val) => {
+                                    this.ctnallViewIndex = rowIndex
+                                    this.cellSelectionOption.enable = false
+                                }}
+                                on-blur={(val) => {
+                                    this.ctnallViewIndex = null
+                                    setTimeout(() => {
+                                        this.$refs['tableRef'].setCellSelection({ rowKey: rowIndex + 1, colKey: 'unit' });
+                                    }, 100)
+                                    this.cellSelectionOption.enable = true
+                                }}
+                                on-select={(val) => {
+                                    this.cellSelectionOption.enable = true
+                                }}
+                            >
+                                {this.unitList.map((item, index) => {
+                                    return <a-select-option value={index}>{item.name}</a-select-option>
+                                })}
+                            </a-select>
+                        )
+                    }
+                },
+                {
+                    field: 'isCtn',
+                    key: 'isCtn',
+                    title: '是否箱型',
+                    align: 'center',
+                    width: '100px',
+                    edit: false,
+                    renderBodyCell: ({ row, column, rowIndex }, h) => {
+                        return (
+                            <a-select
+                                size="small"
+                                value={row['isCtn']}
+                                ref="isCtn"
+                                class="isCtn"
+                                allow-clear={true}
+                                style="width: 100%"
+                                on-change={(val) => {
+                                    row['isCtn'] = val
+                                    this.$forceUpdate()
+                                }}
+                                on-focus={(val) => {
+                                    this.ctnallViewIndex = rowIndex
+                                    this.cellSelectionOption.enable = false
+                                }}
+                                on-blur={(val) => {
+                                    this.ctnallViewIndex = null
+                                    this.$refs['tableRef'].setCellSelection({ rowKey: rowIndex + 1, colKey: 'isCtn' });
+                                    this.cellSelectionOption.enable = true
+                                }}
+                                on-select={(val) => {
+                                    this.cellSelectionOption.enable = true
+                                }}
+                            >
+                                <a-select-option value='true'>是</a-select-option>
+                                <a-select-option value='false'>否</a-select-option>
+                            </a-select>
+                        )
+                    }
+                },
+                {
+                    field: 'currency',
+                    key: 'currency',
+                    title: '币别',
+                    align: 'center',
+                    width: '100px',
+                    edit: false,
+                    renderBodyCell: ({ row, column, rowIndex }, h) => {
+                        return (
+                            <a-select
+                                size="small"
+                                value={row['currency']}
+                                showSearch
+                                ref="currency"
+                                class="currency"
+                                allow-clear={true}
+                                style="width: 100%"
+                                filter-option={this.filterOption}
+                                on-change={(val) => {
+                                    if (val !== undefined) {
+                                        const data = this.currencyList[val]
+                                        row['currency'] = data.codeName
+                                        this.$forceUpdate()
+                                    } else {
+                                        row['currency'] = ''
+                                    }
+                                }}
+                                on-focus={(val) => {
+                                    this.ctnallViewIndex = rowIndex
+                                    this.cellSelectionOption.enable = false
+                                }}
+                                on-blur={(val) => {
+                                    this.ctnallViewIndex = null
+                                    setTimeout(() => {
+                                        this.$refs['tableRef'].setCellSelection({ rowKey: rowIndex + 1, colKey: 'currency' });
+                                    }, 100)
+                                    this.cellSelectionOption.enable = true
+                                }}
+                                on-select={(val) => {
+                                    this.cellSelectionOption.enable = true
+                                }}
+                            >
+                                {this.currencyList.map((item, index) => {
+                                    return <a-select-option value={index}>{item.codeName}</a-select-option>
+                                })}
+                            </a-select>
+                        )
+                    }
+                },
+                {
+                    field: 'unitPrice',
+                    key: 'unitPrice',
+                    title: '单价',
+                    align: 'center',
+                    width: '80px',
+                    edit: true
+                },
+                {
+                    field: 'exchangeRate',
+                    key: 'exchangeRate',
+                    title: '汇率',
+                    align: 'center',
+                    width: '80px',
+                    edit: true
+                },
+                {
+                    field: 'taxRate',
+                    key: 'taxRate',
+                    title: '税率',
+                    align: 'center',
+                    width: '80px',
+                    edit: true
+                },
+                {
+                    field: 'taxUnitPrice',
+                    key: 'taxUnitPrice',
+                    title: '含税单价',
+                    align: 'center',
+                    width: '100px',
+                    edit: true
+                },
+                {
+                    field: 'accTaxRate',
+                    key: 'accTaxRate',
+                    title: '财务税率',
+                    align: 'center',
+                    width: '100px',
+                    edit: true
+                },
+                {
+                    field: 'feeFrt',
+                    key: 'feeFrt',
+                    title: 'FRT',
+                    align: 'center',
+                    width: '100px',
+                    edit: false,
+                    renderBodyCell: ({ row, column, rowIndex }, h) => {
+                        return (
+                            <a-select
+                                size="small"
+                                value={row['feeFrt']}
+                                ref="feeFrt"
+                                class="feeFrt"
+                                allow-clear={true}
+                                style="width: 100%"
+                                on-change={(val) => {
+                                    row['feeFrt'] = val
+                                    this.$forceUpdate()
+                                }}
+                                on-focus={(val) => {
+                                    this.ctnallViewIndex = rowIndex
+                                    this.cellSelectionOption.enable = false
+                                }}
+                                on-blur={(val) => {
+                                    this.ctnallViewIndex = null
+                                    this.$refs['tableRef'].setCellSelection({ rowKey: rowIndex + 1, colKey: 'feeFrt' });
+                                    this.cellSelectionOption.enable = true
+                                }}
+                                on-select={(val) => {
+                                    this.cellSelectionOption.enable = true
+                                }}
+                            >
+                                <a-select-option value='PP'>PP</a-select-option>
+                                <a-select-option value='CC'>CC</a-select-option>
+                            </a-select>
+                        )
+                    }
+                },
+                {
+                    field: 'isInvoice',
+                    key: 'isInvoice',
+                    title: '是否开发票',
+                    align: 'center',
+                    width: '100px',
+                    edit: false,
+                    renderBodyCell: ({ row, column, rowIndex }, h) => {
+                        return (
+                            <a-select
+                                size="small"
+                                value={row['isInvoice']}
+                                ref="isInvoice"
+                                class="isInvoice"
+                                allow-clear={true}
+                                style="width: 100%"
+                                on-change={(val) => {
+                                    row['isInvoice'] = val
+                                    this.$forceUpdate()
+                                }}
+                                on-focus={(val) => {
+                                    this.ctnallViewIndex = rowIndex
+                                    this.cellSelectionOption.enable = false
+                                }}
+                                on-blur={(val) => {
+                                    this.ctnallViewIndex = null
+                                    this.$refs['tableRef'].setCellSelection({ rowKey: rowIndex + 1, colKey: 'isInvoice' });
+                                    this.cellSelectionOption.enable = true
+                                }}
+                                on-select={(val) => {
+                                    this.cellSelectionOption.enable = true
+                                }}
+                            >
+                                <a-select-option value='true'>是</a-select-option>
+                                <a-select-option value='false'>否</a-select-option>
+                            </a-select>
+                        )
+                    }
+                },
+                {
+                    field: 'sort',
+                    key: 'sort',
+                    title: '排序',
+                    align: 'center',
+                    width: '80px',
+                    edit: true
+                },
+                {
+                    field: 'saleCorp',
+                    key: 'saleCorp',
+                    title: '核算单位',
+                    align: 'center',
+                    width: '100px',
+                    edit: true
+                },
+                {
+                    field: 'remark',
+                    key: 'remark',
+                    title: '备注',
+                    align: 'center',
+                    width: '100px',
+                    edit: true
+                },
+                {
+                    field: 'feeGroup',
+                    key: 'feeGroup',
+                    title: '费用分组',
+                    align: 'center',
+                    width: '100px',
+                    edit: true
+                }
+
+            ],
+            tableData: [],
+            rowStyleOption: {
+                clickHighlight: false,
+                hoverHighlight: false
+            },
+            visible: false,
+            loading: false,
+            cellSelectionOption: {
+                enable: true
+            },
+            feeCodeList: [],
+            selectedRowKeys: [],
+            ctnallViewIndex: null,
+            againVisible: false,
+            fileList: [],
+            setVisible: false,
+            setVisible1: false,
+            customerList: [],
+            fetching: false,
+            addSettingFlag: false,
+            customerTypeList: [],
+            formLoad: false,
+            againLoad: false,
+            labelCol: { span: 8 },
+            wrapperCol: { span: 14 },
+            addForm: {
+            },
+            editOption: {
+                beforeStartCellEditing: ({ row, column, cellValue }) => {
+                },
+                beforeCellValueChange: ({ row, column, changeValue }) => {
+
+                },
+                afterCellValueChange: ({ row, column, changeValue }) => {
+                    if (column.key === 'unitPrice') {
+                        changeValue = changeValue.toString()
+                        row['unitPrice'] = changeValue.replace(/[^\d.]/g, '').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3')
+                    }
+                    if (column.key === 'accTaxRate') {
+                        changeValue = changeValue.toString()
+                        row['accTaxRate'] = changeValue.replace(/[^\d.]/g, '').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3')
+                    }
+                    if (column.key === 'taxRate') {
+                        changeValue = changeValue.toString()
+                        row['taxRate'] = changeValue.replace(/[^\d.]/g, '').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3')
+                    }
+                    if (column.key === 'exchangeRate') {
+                        changeValue = changeValue.toString()
+                        row['exchangeRate'] = changeValue.replace(/[^\d.]/g, '').replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/, '$1$2.$3')
+                    }
+                    if (column.key === 'taxUnitPrice') {
+                        changeValue = changeValue.toString()
+                        row['taxUnitPrice'] = changeValue.replace(/[^\d.]/g, '').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3')
+                    }
+                }
+            },
+            queryParam: {
+                pageNo: 1,
+                pageSize: 10,
+                totalResult: 1
+            },
+            parserList: [],
+            saveIndex: 0,
+            form: {},
+            mailHtml: '',
+            ColumnsQuery: [],
+            currencyList: [],
+            unitList: [],
+            columns: [
+                {
+                    title: '模板名称',
+                    align: 'center',
+                    width: '100',
+                    dataIndex: 'name'
+                },
+                {
+                    title: '业务种类',
+                    align: 'center',
+                    width: '100',
+                    dataIndex: 'opType'
+                },
+                {
+                    title: '费用类别',
+                    align: 'center',
+                    width: '110',
+                    dataIndex: 'feeType'
+                },
+                {
+                    title: '是否公共',
+                    align: 'center',
+                    width: '80',
+                    dataIndex: 'isPublic'
+                },
+                {
+                    title: '录入人',
+                    align: 'center',
+                    width: '80',
+                    dataIndex: 'isSea1'
+                },
+                {
+                    title: '录入日期',
+                    align: 'center',
+                    width: '80',
+                    dataIndex: 'isAir2'
+                },
+                {
+                    title: '备注',
+                    align: 'center',
+                    width: '80',
+                    dataIndex: 'remark'
+                }
+            ],
+            rules: {
+                emailAccount: [{ required: true, message: '请输入邮箱账号', trigger: 'blur' }],
+                password: [{ required: true, message: '请输入邮箱密码', trigger: 'blur' }],
+                useIMAP: [{ required: true, message: '请选择接收服务器类型', trigger: 'change' }],
+                smtpServer: [{ required: true, message: '请输入发件服务器', trigger: 'change' }],
+                receiveServer: [{ required: true, message: '请输入收件服务器', trigger: 'change' }]
+            },
+            tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' },
+            loadData: []
+        }
+    },
+    created() { },
+    mounted() {
+        this.FnGetData()
+        this.customerTypeList = this.$options.filters['dictData']('djy_cust_prop')
+        this.getFeeCode()
+        this.GetFeeUnit()
+        this.getFeeCurrencyList()
+        document.onkeydown = (event) => {
+            if (event.key === 'Backspace') {
+                const index = this.$refs['tableRef'].getRangeCellSelection().selectionRangeKeys.startRowKey
+                const val = document
+                    .getElementsByClassName('feeName')
+                [index - 1].getElementsByTagName('input')[0].value
+                document
+                    .getElementsByClassName('feeName')
+                [index - 1].getElementsByTagName('input')[0].value = val.substr(0, val.length - 1)
+                var evt = document.createEvent('HTMLEvents');
+                evt.initEvent('input', true, false);
+                document.getElementsByClassName('feeName')[index - 1].getElementsByTagName('input')[0].dispatchEvent(evt);
+            }
+            if (event.key === 'Enter') {
+                const arr = []
+                if (document.getElementsByClassName('ant-select-dropdown').length > 0) {
+                    document.getElementsByClassName('ant-select-dropdown').forEach((item) => {
+                        const style = item.style
+                        if (style.display !== 'none') {
+                            arr.push(1)
+                        }
+                    })
+                }
+                let index = null
+                let startColKey = null
+                if (this.$refs['tableRef'].getRangeCellSelection()) {
+                    index = this.$refs['tableRef'].getRangeCellSelection().selectionRangeKeys.startRowKey
+                    startColKey = this.$refs['tableRef'].getRangeCellSelection().selectionRangeKeys.startColKey
+                }
+                setTimeout(() => {
+                    if (arr.length === 0) {
+                        this.cellSelectionOption.enable = true
+                        if (arr.length === 0) {
+                            this.saveIndex = index
+                            if (index) {
+                                this.$refs['tableRef'].setCellSelection({ rowKey: index, colKey: startColKey });
+                            }
+                            console.log(111111)
+                            setTimeout(() => {
+                                if (document.getElementsByClassName('ve-table-cell-selection')) {
+                                    const activeDom = document.getElementsByClassName('ve-table-cell-selection')[0].firstChild
+                                    if (this.isDOM(activeDom)) {
+                                        activeDom.click()
+                                    }
+                                }
+                            }, 200)
+                        }
+                    } else {
+                        if (index) {
+                            this.cellSelectionOption.enable = false
+                        }
+                    }
+                }, 100);
+                // if (arr.length > 0) {
+                //         setTimeout(() => {
+                //             console.log(index, this.saveIndex)
+                //     console.log(222222)
+                //             this.$refs['tableRef'].setCellSelection({ rowKey: 1, colKey: startColKey });
+                //         }, 200)
+                // }
+            }
+        }
+    },
+    methods: {
+        toggleAdvanced() {
+            this.advanced = !this.advanced
+        },
+        handleDeleteTable() {
+            this.checkboxOption.selectedRowKeys.forEach(item => {
+                this.tableData.forEach((ite, index) => {
+                    if (ite.rowKey == item) {
+                        this.tableData.splice(index, 1)
+                    }
+                })
+            })
+            this.tableData.forEach((ite, index) => {
+                ite.rowKey = index + 1
+            })
+            this.checkboxOption.selectedRowKeys = []
+        },
+        getFeeCurrencyList() {
+            FeeCurrencyList().then(res => {
+                this.currencyList = res.data
+            })
+        },
+        GetFeeUnit() {
+            GetFeeUnitList().then(res => {
+                res.data.forEach((item, index) => {
+                    if (!item.name) {
+                        res.data.splice(index, 1)
+                    }
+                })
+                this.unitList = res.data
+            })
+        },
+        filterOption(input, option) {
+            return (
+                option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+            );
+        },
+        getFeeCode() {
+            FeeCodeList().then(res => {
+                this.feeCodeList = res.data
+            })
+        },
+        onSelectChange(selectedRowKeys) {
+            this.selectedRowKeys = selectedRowKeys;
+        },
+        handleChange(val) {
+            this.fetching = true
+            this.customerList = []
+            GetFeeCustomerList({ code: val }).then(res => {
+                this.customerList = res.data
+                this.fetching = false
+            })
+        },
+        handleEdit(row) {
+            this.visible = true
+            this.formLoad = true
+            this.title = '费用模板编辑'
+            FeeTemplateDetail({ id: row.id }).then(res => {
+                this.addForm = res.data
+                if (this.addForm.isPublic) {
+                    this.addForm.isPublic = 'true'
+                } else {
+                    this.addForm.isPublic = 'false'
+                }
+                this.tableData = res.data.detail
+                this.tableData.forEach((item, index) => {
+                    item.rowKey = index + 1
+                    if (item.isCtn) {
+                        item.isCtn = 'true'
+                    } else {
+                        item.isCtn = 'false'
+                    }
+                    if (item.isInvoice) {
+                        item.isInvoice = 'true'
+                    } else {
+                        item.isInvoice = 'false'
+                    }
+                })
+                this.formLoad = false
+            })
+        },
+        handleSave() {
+            this.$refs.addForm.validate(valid => {
+                if (valid) {
+                    this.formLoad = true
+                    this.addForm.opType = '海运出口'
+                    this.addForm.detail = this.tableData
+                    FeeTemplateSave(this.addForm).then(res => {
+                        if (res.success) {
+                            this.$message.success('保存成功')
+                            this.FnGetData()
+                            this.visible = false
+                        } else {
+                            this.$message.error(res.message)
+                        }
+                        this.formLoad = false
+                    })
+                } else {
+                    return false;
+                }
+            });
+        },
+        init() {
+            this.form = {}
+        },
+        handlePageChange({ currentPage, pageSize }) {
+            this.queryParam.pageNo = currentPage
+            this.queryParam.pageSize = pageSize
+            this.FnGetData()
+        },
+        FnGetData() {
+            this.loading = true
+            this.form.pageNo = this.queryParam.pageNo
+            this.form.pageSize = this.queryParam.pageSize
+            FeeTemplatePage(this.form).then(res => {
+                if (res.success) {
+                    this.loadData = res.data.rows
+                    this.queryParam.totalResult = res.data.totalRows
+                }
+                this.loading = false
+            })
+        },
+        confirm(e, data) {
+            this.handleDelete(data)
+        },
+        handlePush() {
+            const data = {
+                feeName: '',
+                feeGroup: '',
+                remark: '',
+                saleCorp: '',
+                sort: '',
+                isInvoice: '',
+                feeFrt: '',
+                accTaxRate: 0,
+                taxRate: 0,
+                exchangeRate: 1,
+                taxUnitPrice: 0,
+                unitPrice: 0,
+                currency: '',
+                isCtn: '',
+                unit: '',
+                customerName: '',
+                custType: '',
+                feeDescription: '',
+                rowKey: this.tableData.length + 1
+            }
+            this.tableData.push(data)
+        },
+        handleDelete(record) {
+            FeeTemplateDelete([record]).then(res => {
+                if (res.success) {
+                    this.$message.success('删除成功')
+                    this.FnGetData()
+                } else {
+                    this.$message.error(`删除失败,${res.message}`)
+                }
+            })
+        },
+        handleAdd() {
+            this.visible = true
+            this.tableData = []
+            this.title = '费用模板新增'
+            this.addForm = {
+            }
+        },
+        isDOM(item) {
+            // 首先判断是否支持HTMLELement，如果支持，使用HTMLElement，如果不支持，通过判断DOM的特征，如果拥有这些特征说明就是ODM节点，特征使用的越多越准确
+            return typeof HTMLElement === 'function'
+                ? item instanceof HTMLElement
+                : item && typeof item === 'object' && item.nodeType === 1 && typeof item.nodeName === 'string'
+        }
+    }
+}
+</script>
+<style lang="less" scoped>
+/deep/ .ant-descriptions-item-label {
+    font-weight: bold;
+}
+
+.table-operator {
+    margin-bottom: 18px;
+}
+
+.Close {
+    height: 45px;
+    overflow: hidden;
+}
+
+.vxe-table--render-default .vxe-body--row.row--stripe {
+    background: #f5f9fe;
+}
+
+.ant-card-body {
+    padding-top: 10px;
+}
+
+.inline {
+    position: relative;
+}
+
+.inline-right {
+    position: absolute;
+    top: 6px;
+    right: 25px;
+}
+
+.look-item {
+    display: flex;
+    align-items: center;
+    margin-bottom: 5px;
+
+    .look-left {
+        font-weight: bold;
+        display: inline-block;
+        margin-right: 10px;
+        width: 80px;
+        color: black;
+        text-align: right;
+    }
+}
+</style>
diff --git a/src/views/main/fee/feeUnits.vue b/src/views/main/fee/feeUnits.vue
index 1ee23a3..d915401 100644
--- a/src/views/main/fee/feeUnits.vue
+++ b/src/views/main/fee/feeUnits.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-card :bordered="false" :bodyStyle="tstyle">
+    <!-- <a-card :bordered="false" :bodyStyle="tstyle">
       <div class="table-page-search-wrapper" :class="advanced ? 'Open' : 'Close'">
         <a-form :model="form" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }">
           <a-row>
@@ -12,7 +12,7 @@
           </a-row>
         </a-form>
       </div>
-    </a-card>
+    </a-card> -->
     <a-card :bordered="false">
       <div style="margin-bottom: 10px;display: flex;justify-content: space-between;">
         <div>
@@ -77,13 +77,22 @@
         @page-change="handlePageChange">
       </vxe-pager>
     </a-card>
-    <a-modal @ok="handleSave" width="1000px" @cancel="visible = false" :visible="visible">
+    <a-modal :title="title" @ok="handleSave" width="1000px" @cancel="visible = false" :visible="visible">
       <a-spin :spinning="formLoad">
         <a-form-model :rules="rules" ref="addForm" :model="addForm" :label-col="labelCol" :wrapper-col="wrapperCol">
           <a-row>
+            <a-col :span="12">
+              <a-form-model-item label="客户类别">
+                <a-select @change="handleChange" v-model="addForm.customerTypeCode" style="width: 100%" >
+                  <a-select-option v-for="(item,index) in customerTypeList" :key="index" :value="item.code">{{ item.name }}</a-select-option>
+                </a-select>
+              </a-form-model-item>
+            </a-col>
             <a-col :span="12">
               <a-form-model-item label="往来单位">
-                <a-input v-model="addForm.feeName" />
+                <a-select v-model="addForm.customerCode" style="width: 100%" >
+                  <a-select-option v-for="(item,index) in customerList" :key="index" :value="item.code">{{ item.name }}</a-select-option>
+                </a-select>
               </a-form-model-item>
             </a-col>
           </a-row>
@@ -177,7 +186,8 @@
 import {
   FeeCustTemplatePage,
   FeeCustTemplateSave,
-  FeeCustTemplateDelete
+  FeeCustTemplateDelete,
+  GetFeeCustomerList
 } from '@/api/modular/main/mailSetting'
 import columnSetting from '@/components/tableColumnSetting'
 export default {
@@ -192,11 +202,14 @@ export default {
       visible: false,
       loading: false,
       selectedRowKeys: [],
+      title:'',
       againVisible: false,
       fileList: [],
       setVisible: false,
       setVisible1: false,
+      customerList: [],
       addSettingFlag: false,
+      customerTypeList: [],
       formLoad: false,
       againLoad: false,
       labelCol: { span: 4 },
@@ -216,13 +229,19 @@ export default {
         {
           title: '费用名称',
           align: 'center',
-          width: '200',
+          width: '150',
           dataIndex: 'feeName'
         },
         {
-          title: '标准',
+          title: '往来单位',
           align: 'center',
           width: '150',
+          dataIndex: 'customerName'
+        },
+        {
+          title: '标准',
+          align: 'center',
+          width: '100',
           dataIndex: 'unit'
         },
         {
@@ -294,6 +313,7 @@ export default {
   created() { },
   mounted() {
     this.FnGetData()
+    this.customerTypeList = this.$options.filters['dictData']('djy_cust_prop')
   },
   methods: {
     toggleAdvanced() {
@@ -302,7 +322,13 @@ export default {
     onSelectChange(selectedRowKeys) {
       this.selectedRowKeys = selectedRowKeys;
     },
+    handleChange(val) {
+      GetFeeCustomerList({ code: val }).then(res => {
+        this.customerList = res.data
+      })
+    },
     handleEdit(row) {
+      this.title = '固定费用编辑'
       if (row.isAdvancedPay) {
         row.isAdvancedPay = 'true'
       } else {
@@ -313,13 +339,18 @@ export default {
       } else {
         row.isInvoice = 'false'
       }
-      this.addForm = row
+      this.addForm = JSON.parse(JSON.stringify(row))
       this.visible = true
     },
     handleSave() {
       this.$refs.addForm.validate(valid => {
         if (valid) {
           this.formLoad = true
+          this.customerList.forEach(item => {
+            if (item.code === this.addForm.customerCode) {
+              this.addForm.customerName = item.name
+            }
+          })
           FeeCustTemplateSave(this.addForm).then(res => {
             if (res.success) {
               this.$message.success('保存成功')
@@ -370,6 +401,7 @@ export default {
     },
     handleAdd() {
       this.visible = true
+      this.title = '固定费用新增'
       this.addForm = {
       }
     }