diff --git a/src/utils/dict.js b/src/utils/dict.js
index 4b5929b..108d81e 100644
--- a/src/utils/dict.js
+++ b/src/utils/dict.js
@@ -117,6 +117,8 @@ export const DICT_TYPE = {
   PROJECT_TYPE: "project_type",
   //  供应商等级
   GYS_LEVEL: "gys_level",
+  //  币种类型
+  CURRENCY_TYPE: "currency_type",
 }
 
 /**
diff --git a/src/views/contract/receipts/components/Rules.vue b/src/views/contract/receipts/components/Rules.vue
new file mode 100644
index 0000000..a0f25fd
--- /dev/null
+++ b/src/views/contract/receipts/components/Rules.vue
@@ -0,0 +1,191 @@
+<template>
+  <van-popup v-model="isShow" position="bottom" round safe-area-inset-bottom lock-scroll lazy-render get-container="#app" :close-on-click-overlay="false">
+    <div class="Re-select-header">
+      <div class="Re-select-header-cancel" @click="hanleCancel">取消</div>
+      <div class="Re-select-header-title">报销规则</div>
+      <div class="Re-select-header-confirm" @click="handleConfirm">确认</div>
+    </div>
+    <div class="box-1">
+      <van-field v-model="dataObj.dept" class="actived-disabled" disabled label="费用归属部门" clear-trigger="always" input-align="right" />
+      <van-field v-model="dataObj.area" class="actived-disabled" disabled label="目的地" clear-trigger="always" input-align="right" />
+      <van-field v-model="dataObj.feetypeName" class="actived-disabled" disabled label="费用类型" clear-trigger="always" input-align="right" />
+      <van-field v-model="dataObj.maxMoney" class="actived-disabled" disabled label="限制额度" clear-trigger="always" input-align="right" />
+    </div>
+  </van-popup>
+</template>
+
+<script>
+import dayjs from 'dayjs';
+import { ImagePreview } from 'vant';
+export default {
+  props: {
+    dataObj: Object,
+    isOpen: Boolean,
+    typeStr: String,
+  },
+  components: {
+  },
+  // 计算属性
+  computed: {
+    // tableList() {
+    //   let arr = (this.list || []).map(item => {
+    //     return {
+    //       ...item,
+    //       checked: (this.invoiceIds || []).includes(item.id)
+    //     }
+    //   })
+    //   console.log('arr', arr, this.invoiceIds);
+    //   return arr
+    // },
+    userDeptTree() {
+      return this.$store.getters.userDeptTree
+    },
+    userList() {
+      return this.$store.getters.userList
+    },
+  },
+  data() {
+    return {
+      tableList: [],
+      demo: false,
+      isShow: false,
+    }
+  },
+  watch: {
+    isOpen: {
+      handler(val) {
+        this.isShow = val
+        if (val) {
+          this.handleInitList()
+        }
+      },
+      deep: true,
+      immediate: true
+    },
+  },
+  methods: {
+    handleSetCheck(index) {
+      //  this.tableList
+      this.$set(this.tableList[index], 'checked', !this.tableList[index].checked)
+    },
+    handleShowImg() {
+      ImagePreview(['https://img01.yzcdn.cn/vant/apple-1.jpg']);
+    },
+    dayjs,
+    handleNewDel(index) {
+      this.tableList.splice(index, 1)
+    },
+    handleInitList() {
+
+    },
+
+    handleConfirm() {
+      let arr = (this.tableList.filter(item => item.checked)).map(item => item.id) || []
+      this.$emit('onConfirm', arr)
+    },
+
+    hanleCancel() {
+      this.$emit('onCancel')
+    },
+    handleDel(index) {
+      this.form.tripPartners.splice(index, 1)
+    },
+
+
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+::v-deep .actived-disabled {
+  .van-field__control:disabled {
+    color: #333 !important;
+    -webkit-text-fill-color: #333 !important;
+  }
+  .van-field__label {
+    color: #333 !important;
+    -webkit-text-fill-color: #333 !important;
+  }
+}
+.Re-select-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  .Re-select-header-cancel {
+    color: #f56c6c;
+    padding: 8px 14px;
+    &:active {
+      background: #eeeeee;
+    }
+  }
+  .Re-select-header-title {
+    color: #333333;
+  }
+  .Re-select-header-confirm {
+    color: #409eff;
+    padding: 8px 14px;
+    &:active {
+      background: #eeeeee;
+    }
+  }
+}
+.top-btn {
+  display: flex;
+  justify-content: space-between;
+  font-size: 1rem;
+  position: absolute;
+}
+.box-2 {
+  margin-top: 1rem;
+  box-sizing: border-box;
+  padding: 0.5rem 1rem;
+  padding-top: 0;
+  max-height: 50vh;
+  overflow: auto;
+  .box-top {
+    display: flex;
+    justify-content: space-between;
+    margin: 0.8rem 0;
+    .box-lf {
+      font-size: 1rem;
+    }
+  }
+  .add-box {
+    width: 100%;
+    margin-top: 0.6rem;
+    .van-button {
+      width: 100%;
+      // border-radius: 0.5rem;
+    }
+  }
+}
+.box-1 {
+  @extend .box-2;
+  .new-item-box {
+    width: 100%;
+    display: flex;
+    justify-content: flex-start;
+    box-sizing: border-box;
+    // padding: 0.5rem;
+    margin: 0.5rem 0;
+    border-radius: 0.5rem;
+    box-shadow: 0 0 0.5rem 0.2rem #ccc;
+    align-items: center;
+    padding: 0.5rem;
+    .new-lf {
+      display: flex;
+      margin-right: 0.8rem;
+    }
+    .new-cr {
+      width: 13rem;
+      display: flex;
+      flex-direction: column;
+      // margin-left: ;
+    }
+  }
+}
+::v-deep .van-image__img {
+  border-radius: 100%;
+  margin: 0 0.5rem;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/contract/receipts/index.vue b/src/views/contract/receipts/index.vue
index 542f3d3..423a041 100644
--- a/src/views/contract/receipts/index.vue
+++ b/src/views/contract/receipts/index.vue
@@ -1,38 +1,20 @@
 <template>
   <div class="common-list-contain">
     <div class="common-form">
-      <van-form ref="form" :show-error-message="false" validate-trigger="" :submit-on-enter="false">
-        <div class="section"> <span class="line"> </span> 审批内容</div>
+      <van-form ref="form" :show-error-message="false" validate-trigger="" :submit-on-enter="false" label-width="8rem">
+        <div class="section"> <span class="line"> </span> 基本信息</div>
         <div class="trips-box">
           <div class="item-box">
-            <van-field v-model="form.contractNumber" @blur="handleCtBlur" placeholder="请输入" :disabled="['edit','show'].includes(this.$route.query.type)" :rules="[{ required: true, message: '请输入' }]" required label="合同编号" clear-trigger="always" input-align="right" />
-            <van-field v-model="form.contractName" required placeholder="请输入" :disabled="disabled" :rules="[{ required: true, message: '请输入' }]" label="合同名称" clear-trigger="always" input-align="right" />
-            <van-field right-icon="arrow" :rules="[{ required: true, message: '请选择' }]" :disabled="disabled ||oaListIsDisabled" :class="form.startTime ? 'actived-disabled':''" :name="`time`" placeholder="请选择" v-model="form.startTime1" @click="handleDateShow('startTime')" label="合同开始时间" clear-trigger="always" input-align="right" />
-            <van-field right-icon="arrow" :rules="[{ required: true, message: '请选择' }]" :disabled="disabled ||oaListIsDisabled" :class="form.endTime ? 'actived-disabled':''" :name="`time`" placeholder="请选择" v-model="form.endTime1" @click="handleDateShow('endTime')" label="合同结束时间" clear-trigger="always" input-align="right" />
-            <RePick v-model="form.supplierId" :disabled="disabled ||oaListIsDisabled " titleKey="companyAme" idKey="id" label="供应商名称" name="supplierId" :list="supplierList" isRequrie isCell clearable />
-            <RePick v-model="form.departmentId" :disabled="disabled" label="签约部门" @change="handleChange" :name="`departmentId`" :list="userDeptTree" isRequrie isCascader isShowSearch title="签约部门" titleKey="name" isCell clearable />
-            <RePick v-model="form.signatoryId" :disabled="disabled" titleKey="nickname" idKey="id" label="签约人员" name="signatoryId" :list="signatoryList" isRequrie isCell clearable />
-            <RePick v-model="form.contractType" :disabled="disabled" titleKey="contractName" idKey="id" label="合同类型" name="contractType" :list="typeList" isRequrie isCell clearable />
-            <RePick v-model="form.projectId" :disabled="disabled" titleKey="projectName" idKey="id" label="所属项目" name="contractType" :list="projectList" isRequrie isCell clearable />
-            <van-field v-model="form.amount" :disabled="disabled" type=" number" name="amount" placeholder="请输入" input-align="right" required :rules="[{ required: true, message: '格式错误',validator: VerifyFunc.validatorMoney }]" label="合同总金额" />
-            <van-field label="是否收票" required name="isCollect" :disabled="disabled" input-align="right" :rules="[{ required:true, message: '请选择'  }]" label-width="9em">
-              <template #input>
-                <van-radio-group :disabled="disabled" v-model="form.isCollect" direction="horizontal">
-                  <van-radio :name="1">是</van-radio>
-                  <van-radio :name="0">否</van-radio>
-                </van-radio-group>
-              </template>
-            </van-field>
-            <van-field v-model="form.managerPhone" :disabled="disabled" name="managerPhone" type="number" placeholder="请输入" input-align="right" required :rules="[{ required: true, message: '格式错误',validator: VerifyFunc.rePhone }]" label="经办人电话" />
-            <van-field v-model="form.dealContent" :disabled="disabled" name="reason" autosize rows="2" label="交易内容" required :rules="[{ required: true, message: '请输入' }]" clear-trigger="always" input-align="right" placeholder="请输入" type="textarea" />
-            <RePick v-model="form.capitalSource" :disabled="disabled" titleKey="label" idKey="value" label="资金来源" name="capitalSource" :list="capitalSource" isCell clearable />
-            <van-field v-model="form.proposerPerson" :disabled="disabled" name="proposerPerson" type="number" placeholder="请输入" input-align="right" label="申请人" />
-            <van-field v-model="form.taxAmount" :disabled="disabled" name="taxAmount" type="number" placeholder="请输入" input-align="right" label="合同金额(含税)" />
-            <van-field right-icon="arrow" :rules="[{ required: true, message: '请选择' }]" :disabled="disabled" :class="form.proposerTime ? 'actived-disabled':''" :name="`time`" placeholder="请选择" v-model="form.proposerTime1" @click="handleDateShow('proposerTime')" label="申请时间" clear-trigger="always" input-align="right" />
-            <van-field v-model="form.taxForeheads" :disabled="disabled" name="taxForeheads" type="number" placeholder="请输入" input-align="right" label="税额" />
-            <van-field v-model="form.taxRate" :disabled="disabled" name="taxRate" type="number" placeholder="请输入" input-align="right" label="税率" />
-            <van-field right-icon="arrow" :rules="[{ required: true, message: '请选择' }]" :disabled="disabled" :class="form.dateSigning ? 'actived-disabled':''" :name="`time`" placeholder="请选择" v-model="form.dateSigning1" @click="handleDateShow('dateSigning')" label="签订时间" clear-trigger="always" input-align="right" />
-            <van-field v-model="form.other" :disabled="disabled" name="reason" autosize rows="2" label="合同简述" required :rules="[{ required: true, message: '请输入' }]" clear-trigger="always" input-align="right" placeholder="请输入" type="textarea" />
+            <van-field v-model="form.claimNo" v-if="form.vendorReceiptNo" disabled label="单号" clear-trigger="always" input-align="right" />
+            <van-field v-model="cn" disabled label="公司名称" clear-trigger="always" input-align="right" />
+            <van-field v-model="userInfo.nickname" disabled label="申请人" clear-trigger="always" input-align="right" maxlength="50" placeholder="请输入" />
+            <van-field v-model="userInfo.dept.name" disabled label="申请部门" clear-trigger="always" input-align="right" maxlength="50" placeholder="请输入" />
+            <RePick v-model="form.accountType" :disabled="disabled" label="账户类型" name="accountType" :list="accountList" title="账户类型" titleKey="label" idKey="value" isCell clearable />
+            <RePick v-model="form.currency" :disabled="disabled" label="收取币种" name="currency" :list="moneyList" title="账户类型" titleKey="label" idKey="value" isCell clearable />
+            <van-field v-model="form.amount" type="number" name="amount" placeholder="请输入" input-align="right" required :rules="[{ required: true, message: '格式错误',validator: VerifyFunc.validatorMoney }]" label="收款金额" />
+            <van-field v-model="form.reason" :disabled="disabled" name="reason" autosize rows="2" label="项目负责人" required :rules="[{ required: true, message: '请输入' }]" clear-trigger="always" input-align="right" placeholder="请输入" />
+            <van-field v-model="form.remark" :disabled="disabled" name="remark" autosize rows="2" label="备注信息" clear-trigger="always" input-align="right" placeholder="请输入" type="textarea" />
+            <RePick v-model="form.costDeptId" :disabled="disabled" label="费用归属部门" :name="`costDeptId`" :list="userDeptTree" isRequrie isCascader isShowSearch title="费用归属部门" titleKey="name" isCell clearable />
           </div>
         </div>
         <div class="section mt5"> <span class="line"> </span>附件</div>
@@ -41,404 +23,528 @@
             <UploadFile :typeStr="typeStr" @onConfirm="handleUpload" :fileList="fileList" />
           </div>
         </div>
-        <div class="section mt5"> <span class="line"> </span>
-          <van-button type="info" size="small" :disabled="disabled || oaListIsDisabled" native-type="button" @click="handleAddPay" round>增加付款计划</van-button>
-        </div>
-        <div class="section mt5"> <span class="line"> </span>付款计划</div>
-        <div class="trips-box">
-          <div class="item-box" v-for="(item,index) in oaReimburseFeeitemList" :key="index">
-            <div class="oaList">
-              <div>
-                序号 {{index + 1}}
-              </div>
-              <div @click="handleDelOa(index)">
-                <van-icon name="delete-o" size="20" :color="`${disabled || oaListIsDisabled ? '#c8c9cc' : ''}`" />
-              </div>
-            </div>
-            <van-field v-model="item.planTime" label="计划付款时间" :disabled="disabled || oaListIsDisabled" :class="disabled ? 'actived-disabled':''" placeholder="请选择" @click="handlePDateShow(item.planTime,index)" :right-icon="item.planTime ?  '' :'arrow' " input-align="right" readonly autosize rows="1" type="textarea">
-            </van-field>
-            <van-field v-model="item.planName" label="计划名称" :disabled="disabled || oaListIsDisabled" name="planName" placeholder="请输入" input-align="right">
-            </van-field>
-            <van-field v-model="item.percentage" label="比例(数字)" :disabled="disabled || oaListIsDisabled" @blur="handleBulrPe($event,index)" name="percentage" type="number" placeholder="请输入" input-align="right">
-            </van-field>
-            <van-field v-model="item.actualAmount" name="actualAmount" :disabled="disabled || oaListIsDisabled" type="number" placeholder="请输入" input-align="right" label="实付金额" />
-            <van-field v-model="item.planMemo" label="备注" :disabled="disabled || oaListIsDisabled" name="planMemo" placeholder="请输入" input-align="right">
-            </van-field>
-          </div>
-        </div>
         <div class="section mt5" v-if="['show'].includes(typeStr)"> <span class="line"> </span>审批流程</div>
         <ApprovalProcess v-if="['show'].includes(typeStr)" :processInstanceId="form.processInstanceId" @onSetId="handleSetAccessId" />
+        <!-- 申请单关联 -->
+        <div class="section mt5"> <span class="line"> </span>申请单关联</div>
+        <RePick v-model="form.expenseApplyIds" isShowSearch :disabled="disabled" inputAlign="left" multiple titleKey="title" idKey="id" label="申请单" :name="`expenseApplyIds`" :list="expenseApplyList" isCell clearable />
+        <div class="section mt5" v-if="form.budgetAmountInfo"> <span class="line"> </span>预算信息提示</div>
+        <div style="color:red;font-size:0.8rem;margin-top:0.5rem" v-if="form.budgetAmountInfo">
+          {{form.budgetAmountInfo}}
+        </div>
       </van-form>
     </div>
     <BottomBtn ref="BottomBtn" :isAuthorised="isAuthorised" @onBtConfirm="handleBtConfirm" :accessId="accessId" />
-
     <!--行程时间范围选择 -->
-    <van-calendar ref="vanCalendar" allow-same-day :maxDate="maxDate" v-model="dateShow" :min-date="minDate" :default-date="defaultDate" color="#0088FE" @confirm="handleDateSelect" />
-    <!--预计付款时间选择 -->
-    <van-calendar ref="pVanCalendar" allow-same-day :maxDate="maxDate" v-model="palnTimeShow" :min-date="minDate" :default-date="pDefaultDate" color="#0088FE" @confirm="handlePlanDateSelect" />
-
+    <van-calendar ref="vanCalendar" allow-same-day :maxDate="maxDate" v-model="dateShow" :min-date="minDate" :default-date="defaultDate" type="range" color="#0088FE" @confirm="handleDateSelect" />
+    <!-- 报销规则 -->
+    <Rules :dataObj="dialogObj" :typeStr="typeStr" @onCancel="isShow = false" :isOpen="isShow" @onConfirm="(arr)=>{isShow = false}" />
   </div>
 </template>
 
 <script>
 import dayjs from 'dayjs';
-import { createSupplierContract, getSupplierContract } from '@/api/bs/supplierContract'
-import { getSupplierCompanyPage } from "@/api/bs/quotationSheet";
+import { createExpenseClaim, findClaimRules, getExpenseClaim, getMyExpenseClaim } from "@/api/bs/expenseClaim";
+import { getInvoicePage } from "@/api/bs/invoice";
 import { listData } from "@/api/system/dict/data";
 import VerifyFunc from '@/utils/verify'
-import { getPaymentPlanPage } from "@/api/bs/paymentPlan";
+import { getTreeIds, findAreaIdName } from '@/utils'
+import { getExpenseApplyMyPage } from "@/api/bs/expenseApply";
 import { Dialog } from 'vant'
-import {
-  listUser,
-} from "@/api/system/user";
-import { getCustomerContractTypeListAll } from '@/api/bs/contractType'
-import { getProjectPage } from "@/api/bs/project";
+import { getDictDatas, DICT_TYPE } from "@/utils/dict";
 export default {
   //import引入组件才能使用
-  name: 'contract-supplier',
   props: {},
+  name: 'company-claim',
   components: {
-    UploadFile: () => import('@/components/UploadFile'),
-    RePick: () => import('@/components/ReComponents/RePick'),
-    ApprovalProcess: () => import('@/components/ApprovalProcess'),
     BottomBtn: () => import('@/components/BottomBtn'),
-  },
-  // 计算属性
-  computed: {
-    areaTree() {
-      return this.$store.getters.areaTree
-    },
-    userDeptTree() {
-      return this.$store.getters.userDeptTree
-    },
-    cn() {
-      return window.localStorage.getItem('cn')
-    },
-    userInfo() {
-      return JSON.parse(window.localStorage.getItem('userInfo') || { dept: {} })
-    },
-    disabled() {
-      return ['show'].includes(this.$route.query.type)
-    },
+    ApprovalProcess: () => import('@/components/ApprovalProcess'),
+    RePick: () => import('@/components/ReComponents/RePick'),
+    FollowPeoPle: () => import('@/components/FollowPeoPle'),
+    ConnectInvoice: () => import('@/components/ConnectInvoice'),
+    UploadFile: () => import('@/components/UploadFile'),
+    Rules: () => import('./components/Rules'),
   },
   // 生命周期，创建完成时（可以访问当前this实例）
   created() {
-    this.$loading(true)
     this.handleInitList().then(() => {
-      this.$loading(false)
       this.handleInitForm()
     })
   },
   // 生命周期：挂载完成时（可以访问DOM元素）
   mounted() {
-
   },
   data() {
     return {
-      pIndex: 0,
-      pDefaultDate: new Date(),
-      palnTimeShow: false,
-      oaListIsDisabled: false,
-      isSave: false,
-      isRereset: false,
-      VerifyFunc,
-      typeList: [],
-      capitalSource: [],
-      projectList: [],
-      signatoryList: [],
-      departmentList: [],
-      dayjs,
-      supplierList: [],
-      accessId: null,
+      indexOne: 1,
+      indexTwo: 1,
+      claimType: '',
+      expenseApplyList: [],
+      isShow: false,
+      dialogObj: {},
       isAuthorised: false,
+      accessId: null,
+      ieList: [], // 发票列表
+      VerifyFunc,
+      isAuthority: 0,
       typeStr: null, // show: 查看 edit: 编辑: 其他新增
       fileList: [],
-      btnList: [],
+      btnList: [
+        { title: '暂存', icon: 'star-o', color: "#909399", key: 0 },
+        { title: '提交', icon: 'edit', color: "#ff9900", key: 1 },
+        { title: '同意', icon: 'certificate', color: "#19be6b", key: 2 },
+        { title: '驳回', icon: 'exchange', color: "#fa3534", key: 3 },
+      ],
+      tripTypeList: [], //  出差类型
+      feeTypeList: [], // 费用类型
       index: 0,
       minDate: new Date('2000/01/01'),
       maxDate: new Date('2030/01/01'),
       defaultDate: new Date(),
       dateShow: false,
       form: {
-        time: null,
-        supplierId: null,
-        contractNumber: null,
-        contractName: null,
-        contractType: null,
-        amount: null,
-        isCollect: null,
-        managerPhone: null,
-        receivedAmount: null,
-        dealContent: null,
-        other: null,
+        applyNo: null,
+        projectName: null,
+        reason: null,
+        remark: null,
+        costDeptId: null,
+        expenseApplyIds: [],
+        expenseClaimTrips: [
+          {
+            time: '',
+            startTime: null,
+            endTime: null,
+            departureLocation: null,
+            destinationLocation: null,
+            tripDay: undefined,
+            tripType: null,
+            tripPartners: [], // 出差同行人
+            amount: undefined,
+            expenseClaimDetails: [
+              {
+                show: false,
+                invoiceName: '',
+                ieList: this.ieList,
+                invoiceIds: {},
+                feeType: null,
+                amount: undefined,
+                invoiceCount: undefined,
+                remark: null,
+              }
+            ]
+          }
+        ],
+        // 日常申请的
+        expenseClaimDetails: [
+          {
+            show: false,
+            invoiceName: '',
+            ieList: this.ieList,
+            invoiceIds: {},
+            feeType: null,
+            amount: undefined,
+            invoiceCount: undefined,
+            remark: null,
+          }
+        ]
       },
-      oaReimburseFeeitemList: [],
-      dateType: ''
     };
   },
-
+  // 计算属性
+  // bs_fee_type
+  computed: {
+    accountList() {
+      return getDictDatas(DICT_TYPE.BS_BANK_TYPE) || []
+    },
+    moneyList() {
+      return getDictDatas(DICT_TYPE.CURRENCY_TYPE) || []
+    },
+    allTripPartners() {
+      let arr = []
+      this.form.expenseClaimTrips.forEach(v => {
+        v.tripPartners.forEach(z => {
+          arr.push(z)
+        })
+      })
+      return arr
+    },
+    areaTree() {
+      return this.$store.getters.areaTree
+    },
+    userDeptTree() {
+      return this.$store.getters.userDeptTree
+    },
+    cn() {
+      return window.localStorage.getItem('cn')
+    },
+    userInfo() {
+      return JSON.parse(window.localStorage.getItem('userInfo') || { dept: {} })
+    },
+    userList() {
+      return this.$store.getters.userList
+    },
+    disabled() {
+      return ['show'].includes(this.$route.query.type)
+    },
+    CLBX() {
+      return ['CLBX'].includes(this.$route.query.billType)
+    },
+    RCBX() {
+      return ['RCBX'].includes(this.$route.query.billType)
+    },
+  },
   // 监听data中的数据变化
   watch: {},
   // 方法集合
   methods: {
-    handleDelOa(index) {
-      if (this.disabled || this.oaListIsDisabled) {
-        return
-      }
-      Dialog.confirm({
-        title: '提示',
-        message: '你确定要删除吗?',
-      }).then(() => {
-        this.oaReimburseFeeitemList.splice(index, 1)
-      })
-    },
-    handleBulrPe(e, index) {
-      let list = this.oaReimburseFeeitemList
-      if (this.form.amount) {
-        this.$set(list[index], 'actualAmount', (this.form.amount * (Number(e.target.value) / 100)).toFixed(2))
+    handleCountAmount(list) {
+      // 判断是否有成功
+      let res = (list || []).filter(item => item.feeManageAmount)
+      if (res.length) {
+        let arr = list.map(item => item.feeManageAmount || 0)
+        return arr.reduce((total, num) => Number(total) + Number(num), 0);
       } else {
-        this.$fm('输入合同金额,自动计算实付金额!')
+        return 999999999999999999
       }
     },
-    handleAddPay() {
-      this.oaReimburseFeeitemList.push({
-        planTime: null,
-        percentage: undefined,
-        actualAmount: undefined
-      })
-    },
-    handleResetForm() {
-      // this.form = {
-      //   time: null,
-      //   supplierId: null,
-      //   contractNumber: this.form.contractNumber,
-      //   contractName: null,
-      //   contractType: null,
-      //   amount: null,
-      //   isCollect: null,
-      //   managerPhone: null,
-      //   receivedAmount: null,
-      //   dealContent: null,
-      //   other: null,
-      // }
-      this.oaReimburseFeeitemList = []
-    },
-    handleInitOaReimburseFeeitemList(e) {
-      getPaymentPlanPage({
-        pageNo: 1,
-        pageSize: 10,
-        contractNumber: e
-      }).then((res) => {
-        if (res.data && res.data.list.length) {
-          const { paymentPlanDetailDOList } = res.data.list[0]
-          this.oaReimburseFeeitemList = (paymentPlanDetailDOList || []).map(item => {
-            return {
-              ...item,
-              actualAmount: Math.floor(Number(item.actualAmount) * 100) / 100,
-              planTime: dayjs(item.planTime).format('YYYY-MM-DD')
-            }
-          })
-        } else {
-          this.oaReimburseFeeitemList = []
+    unique(arr) {
+      let newArr = [arr[0]]
+
+      for (let i = 1; i < arr.length; i++) {
+
+        if (arr[i] !== newArr[newArr.length - 1]) {
+
+          newArr.push(arr[i])
+
         }
-      })
+
+      }
+      return newArr
     },
-    handleCtBlur(e) {
-      return new Promise(resolve => {
-        if (e.target.value) {
-          this.$loading(false)
-          getPaymentPlanPage({
-            pageNo: 1,
-            pageSize: 10,
-            contractNumber: e.target.value,
-            type: 1
-          }).then((res) => {
-            if (res.data && res.data.list.length) {
-              const { paymentPlanDetailDOList } = res.data.list[0]
-              this.oaReimburseFeeitemList = (paymentPlanDetailDOList || []).map(item => {
-                return {
-                  ...item,
-                  actualAmount: Math.floor(Number(item.actualAmount) * 100) / 100,
-                  planTime: dayjs(item.planTime).format('YYYY/MM/DD')
-                }
-              })
-              if (this.oaReimburseFeeitemList.length) {
-                this.oaListIsDisabled = true
-              }
-              let obj = res.data && res.data.list.length ? res.data.list[0] : null
-              if (obj) {
-                const { startTime, endTime, supplierId, actualAmount, managerPhone } = obj
-                this.form = {
-                  contractNumber: this.form.contractNumber,
-                  contractName: null,
-                  contractType: null,
-                  isCollect: null,
-                  receivedAmount: null,
-                  dealContent: null,
-                  other: null,
-                  time: `${dayjs(startTime).format('YYYY-MM-DD')} ~ ${dayjs(endTime).format('YYYY-MM-DD')}`,
-                  date: [startTime, endTime],
-                  supplierId: Number(supplierId),
-                  amount: actualAmount,
-                  startTime,
-                  endTime,
-                  managerPhone
-                }
-              }
-              this.$loading(false)
-            } else {
-              // this.handleResetForm()
-              this.$loading(false)
-              this.oaListIsDisabled = false
-            }
-            resolve()
-          }).catch(() => {
-            this.$loading(false)
-            this.oaListIsDisabled = false
-            // this.handleResetForm()
-            resolve()
-          })
-        } else {
-          this.oaReimburseFeeitemList = []
-          this.oaListIsDisabled = false
-          // this.handleResetForm()
-          resolve()
+    showRules(obj, index, nIndex) {
+      let msgObj = this.form.expenseClaimTrips[index] || {}
+      let msgObj2 = this.form.expenseClaimTrips[index].expenseClaimDetails[nIndex] || {}
+      const { destinationLocation } = msgObj
+      const { feeType } = msgObj2
+      if (!destinationLocation || !feeType || !this.form.costDeptId) {
+        return this.$fm('请选择行程目的地，费用类型，费用归属部门！')
+      }
+      findClaimRules({
+        destinationLocation: Array.isArray(destinationLocation) ? destinationLocation[destinationLocation.length - 1] : destinationLocation,
+        feeType,
+        costDeptId: this.form.costDeptId
+      }).then((res) => {
+        this.dialogObj = {
+          dept: getTreeIds(this.userDeptTree, this.form.costDeptId).join('-'),
+          area: getTreeIds(this.areaTree, Array.isArray(destinationLocation) ? destinationLocation[destinationLocation.length - 1] : destinationLocation).join('-'),
+          feetypeName: this.feeTypeList.find(item => item.value == feeType).label,
+          maxMoney: res.data === 0 || res.data ? res.data : '未设置'
         }
+        this.isShow = true
       })
     },
-    handleChange(val, type) {
-      if (val) {
-        listUser({
-          pageNo: 1,
-          pageSize: 100,
-          deptId: val,
-        }).then((ns) => {
-          this.signatoryList = ns.data && ns.data.list || []
-          this.signatoryList = this.signatoryList.map((item) => {
-            return {
-              ...item,
-              nickname: `${item.nickname} ${item.userNumber ? `(${item.userNumber})` : ''}`
-            }
-          })
-          if (!type) {
-            this.$set(this.form, 'signatoryId', null)
-          }
-        })
+    // showRules1(obj, index, nIndex) {
+    //   let msgObj = this.form.expenseClaimTrips[index] || {}
+    //   let msgObj2 = this.form.expenseClaimTrips[index].expenseClaimDetails[nIndex] || {}
+    //   const { destinationLocation } = msgObj
+    //   const { feeType } = msgObj2
+    //   if (!destinationLocation || !feeType || !this.form.costDeptId) {
+    //     return this.$fm('请选择行程目的地，费用类型，费用归属部门！')
+    //   }
+    //   findClaimRules({
+    //     destinationLocation: Array.isArray(destinationLocation) ? destinationLocation[destinationLocation.length - 1] : destinationLocation,
+    //     feeType,
+    //     costDeptId: this.form.costDeptId
+    //   }).then((res) => {
+    //     this.dialogObj = {
+    //       dept: getTreeIds(this.userDeptTree, this.form.costDeptId).join('-'),
+    //       area: getTreeIds(this.areaTree, Array.isArray(destinationLocation) ? destinationLocation[destinationLocation.length - 1] : destinationLocation).join('-'),
+    //       feetypeName: this.feeTypeList.find(item => item.value == feeType).label,
+    //       maxMoney: res.data === 0 || res.data ? res.data : '未设置'
+    //     }
+    //     this.isShow = true
+    //   })
+    // },
+    handleClear(index, type) {
+      if (type === 1) {
+        this.$set(this.form.expenseClaimTrips[index], 'time', null)
       } else {
-        this.signatoryList = []
-        this.$set(this.form, 'signatoryId', null)
+        this.$set(this.form.expenseClaimTrips[index], 'tripPartners', [])
+        this.$set(this.form.expenseClaimTrips[index], 'tripPartnersName', null)
       }
     },
-    handleClear() {
-      this.$set(this.form, 'time', null)
-    },
-    handleSetAccessId(id) {
-      this.accessId = id
+    handleShowRules() {
+
     },
-    handleBtConfirm(key) {
+    handleBtConfirm(key, ignoreFeeTip) {
       if (key == 2 || key == 3) {
         return
       }
       this.$nextTick(() => {
         this.$refs.form.validate().then(() => {
-          if (this.oaReimburseFeeitemList.length) {
-            let list = this.oaReimburseFeeitemList
-            for (let i = 0; i < list.length; i++) {
-              if (!(list[i].planTime && list[i].percentage && list[i].actualAmount)) {
-                // this.$modal.msgWarning(`该合同暂无付款输入有误！`)
-                if (!list[i].planTime) {
-                  return this.$fm('请选择预计付款时间!')
-                }
-                let numreg = /^[1-9]\d*$/
-                if (!list[i].percentage || (!(list[i].percentage && (numreg.test(list[i].percentage))))) {
-                  return this.$fm('比例仅支持整数!')
-                }
-                if (!list[i].actualAmount || (!(Number(list[i].actualAmount) > 0))) {
-                  return this.$fm('实付金额输入有误!')
-                }
-              }
-            }
-          }
           // 添加/修改的提交
           let newForm = {
-            // approvalBiddingIdList: this.form.supplierList.filter(item => item.isWin == 1).map(n => n.id),
             ...this.form,
-            id: this.form.id,
-            status: key,
             files: this.fileList,
-            oaReimburseFeeitemList: (this.oaReimburseFeeitemList).map(item => {
-              return {
-                ...item,
-                planTime: dayjs(item.planTime).valueOf()
+            billType: this.$route.query.billType,
+            ignoreFeeTip,
+            status: key
+          }
+          if (this.$route.query.billType === 'RCBX') {
+            delete newForm.expenseClaimTrips
+          } else {
+            delete newForm.expenseClaimDetails
+          }
+          if (ignoreFeeTip) {
+            this.$loading(true, 'form')
+            createExpenseClaim(newForm).then(() => {
+              this.$loading(false, 'form')
+              this.$sm(`${this.form.id ? '修改成功!' : '新增成功!'}`)
+              // 清楚缓存
+              if (!newForm.id) {
+                this.$EventBus.$emit('handleResetLive', 'company-myClaim')
+                this.$EventBus.$emit('handleResetLive', 'company-myNewClaim')
               }
+              history.back()
+            }).catch(() => {
+              this.$loading(false, 'form')
             })
-          }
-          this.$loading(true, 'form')
-          createSupplierContract(newForm).then((res) => {
+          } else {
             this.$loading(false, 'form')
-            this.$sm(`${this.form.id ? '修改成功!' : '新增成功!'}`)
-            if (['add'].includes(this.$route.query.type)) {
-              this.$EventBus.$emit('handleResetLive', 'contract-mySupplier')
-            }
-            history.back()
-          }).catch(() => {
-            this.$loading(false, 'form')
-          })
-          // })
-          if (!this.oaReimburseFeeitemList.length) {
-            this.$loading(false, 'form')
-            return this.$fm('暂无付款计划,无法提交!')
+            createExpenseClaim(newForm).then((response) => {
+              if (response.msg) {
+                if (!response.data) {
+                  Dialog.confirm({
+                    title: '提示',
+                    message: `${response.msg} 您确认要提交吗?`,
+                  }).then(() => {
+                    this.handleBtConfirm(key, 1)
+                  })
+                }
+              } else {
+                this.$loading(false, 'form')
+                this.$sm(`${this.form.id ? '修改成功!' : '新增成功!'}`)
+                // 清楚缓存
+                if (!newForm.id) {
+                  this.$EventBus.$emit('handleResetLive', 'company-myClaim')
+                  this.$EventBus.$emit('handleResetLive', 'company-myNewClaim')
+                }
+                history.back()
+              }
+            }).catch(() => {
+              this.$loading(false, 'form')
+            })
           }
+          // createExpenseClaim(newForm).then(() => {
+          //   this.$loading(false, 'form')
+          //   this.$sm(`${this.form.id ? '修改成功!' : '新增成功!'}`)
+          //   // 清楚缓存
+          //   if (!newForm.id) {
+          //     this.$EventBus.$emit('handleResetLive', 'company-myClaim')
+          //   }
+          //   history.back()
+          // });
         }).catch((err) => {
+          console.log('err..', err);
           this.$loading(false, 'form')
           if (err && err.length > 0 && err[0].name) {
             const fieldElement = this.$refs.form.$el.querySelector(`[name="${err[0].name}"]`);
-            const fieldHeight = fieldElement && fieldElement.offsetHeight;
+            const fieldHeight = fieldElement.offsetHeight;
             const scrollHeight = fieldHeight + 50; // 假设添加了 50px 的额外高度
             this.$refs.form.scrollToField(err[0].name, scrollHeight);
           }
-          if (err && err.length) {
-            if (err[0].name === "managerPhone") {
-              return this.$fm('经办人手机号码错误!')
-            }
-          }
         })
       })
     },
+    handleSetAccessId(id) {
+      this.accessId = id
+    },
+    handleNitemAmount(e, index) {
+      this.VerifyFunc.validatorMoney(e.target.value, { required: true }).then((res) => {
+        if (!res) {
+          this.$fm('金额格式错误！')
+        } else {
+          let arr = this.form.expenseClaimTrips[index].expenseClaimDetails.map(item => item.amount)
+          let total = arr.reduce((pre, cur) => {
+            return parseFloat(pre) + parseFloat(cur)
+          }, 0)
+          this.$set(this.form.expenseClaimTrips[index], 'amount', total.toFixed(2))
+        }
+      })
+    },
+    handleNitemAmount1(e, index) {
+      this.VerifyFunc.validatorMoney(e.target.value, { required: true }).then((res) => {
+        if (!res) {
+          this.$fm('金额格式错误！')
+        } else {
+          let arr = this.form.expenseClaimDetails.map(item => item.amount)
+          let total = arr.reduce((pre, cur) => {
+            return parseFloat(pre) + parseFloat(cur)
+          }, 0)
+          this.$set(this.form.expenseClaimDetails[index], 'amount', total.toFixed(2))
+        }
+      })
+    },
+    handleAcDel(index, nIndex) {
+      this.form.expenseClaimTrips[index].expenseClaimDetails.splice(nIndex, 1)
+    },
+    handleAcDel1(nIndex) {
+      this.form.expenseClaimDetails.splice(nIndex, 1)
+    },
+    handleFilterList(ids, type) {
+      return new Promise((resolve) => {
+        let arr = []
+        // if (!type) {
+        //   this.form.expenseClaimTrips.forEach(item => {
+        //     item.expenseClaimDetails.forEach(n => {
+        //       n.invoiceIds.forEach(z => {
+        //         arr.push(z)
+        //       })
+        //
+        //     })
+        //   })
+        // } else {
+        //   this.form.expenseClaimDetails.forEach(n => {
+        //     n.invoiceIds.forEach(z => {
+        //       arr.push(z)
+        //     })
+        //
+        //   })
+        // }
+        let beforeIds = this.ieList.filter(item => !arr.includes(item.id)) || []
+        let noewIds = this.ieList.filter(item => ids.includes(item.id)) || []
+        resolve(beforeIds.concat(noewIds))
+      })
+    },
+    handleShowIe(type, index, nIndex) {
+      if (this.disabled) return
+      // this.indexOne = index
+      // this.indexTwo = nIndex
+      // this.claimType = type
+      // let obj = this.form.expenseClaimTrips[index].expenseClaimDetails[nIndex]
+      // this.$set(this.form.expenseClaimTrips[index].expenseClaimDetails[nIndex], 'ieList', arr)
+      this.$set(this.form.expenseClaimTrips[index].expenseClaimDetails[nIndex], 'show', true)
+      console.log('form......', this.form);
+      // this.handleFilterList(obj.invoiceIds || {}).then((arr) => {
+      //
+      // })
+    },
+    handleShowIe1(nIndex) {
+      if (this.disabled) return
+      // let obj = this.form.expenseClaimDetails[nIndex]
+
+      // this.$set(this.form.expenseClaimDetails[nIndex], 'ieList', arr)
+      this.$set(this.form.expenseClaimDetails[nIndex], 'show', true)
+      // this.handleFilterList(obj.invoiceIds || {}, 1).then((arr) => {
+      //
+      // })
+    },
+    handleConfirmIe(arr, index, nIndex) {
+      // let nameArr = ((this.ieList.filter(item => arr.includes(item.id)) || []).map(item => item.invoiceCode)).join('、')
+      this.$set(this.form.expenseClaimTrips[index].expenseClaimDetails[nIndex], 'invoiceIds', arr)
+      this.$set(this.form.expenseClaimTrips[index].expenseClaimDetails[nIndex], 'show', false)
+      this.$set(this.form.expenseClaimTrips[index].expenseClaimDetails[nIndex], 'invoiceCount', this.totalCount(arr))
+      this.$set(this.form.expenseClaimTrips[index].expenseClaimDetails[nIndex], 'invoiceName', '已关联发票')
+    },
+    handleConfirmIe1(arr, nIndex) {
+      // let nameArr = ((this.ieList.filter(item => arr.includes(item.id)) || []).map(item => item.invoiceCode)).join('、')
+      this.$set(this.form.expenseClaimDetails[nIndex], 'invoiceIds', arr)
+      this.$set(this.form.expenseClaimDetails[nIndex], 'show', false)
+      this.$set(this.form.expenseClaimDetails[nIndex], 'invoiceCount', this.totalCount(arr))
+      this.$set(this.form.expenseClaimDetails[nIndex], 'invoiceName', '已关联发票')
+    },
+
+    totalCount(obj) {
+      let count = 0;
+
+      for (let key in obj) {
+        if (Array.isArray(obj[key])) {
+          count += obj[key].length;
+        }
+      }
+      return count;
+    },
+    totalName(obj) {
+      let count = '';
+      for (let key in obj) {
+        if (Array.isArray(obj[key])) {
+          obj[key].forEach(function (item) {
+            count = !count ? item : count + `、${item}`
+          })
+        }
+      }
+      return count;
+    },
+
+    handleAddAccount(pIndex, index) {
+      this.form.expenseClaimTrips[pIndex].expenseClaimDetails.push({
+        invoiceIds: {},
+        feeType: null,
+        amount: undefined,
+        invoiceCount: undefined,
+        remark: null,
+      })
+    },
+
+    handleAddAccount1() {
+      this.form.expenseClaimDetails.push({
+        invoiceIds: {},
+        feeType: null,
+        amount: undefined,
+        invoiceCount: undefined,
+        remark: null,
+      })
+    },
     handleInitForm() {
-      const { id, type } = this.$route.query || {}
+      const { id, type, listType } = this.$route.query || {}
       this.typeStr = type
+      // 注入缓存
+      this.$EventBus.$emit('handleAddLive', 'company-claim')
       if (id) {
         this.$loading(true, 'loadingSb')
-        getSupplierContract(id).then((res) => {
-          this.form = res.data || {};
+        let api = listType === 'myNewClaim' ? getMyExpenseClaim : getExpenseClaim
+        api(id).then((res) => {
+
           this.form = {
-            ...this.form,
-            time: `${dayjs(this.form.startTime).format('YYYY-MM-DD')} ~ ${dayjs(this.form.endTime).format('YYYY-MM-DD')}`,
-            departmentId: Number(this.form.departmentId),
-            signatoryId: Number(this.form.signatoryId),
-            isCollect: Number(this.form.isCollect),
+            ...(res.data || {}),
+            expenseClaimTrips: (res.data.expenseClaimTrips || []).map(item => {
+              let nameArr = []
+              this.userList.forEach(element => {
+                if (item.tripPartners.includes(element.id)) {
+                  nameArr.push(element.nickname)
+                }
+              });
+              return {
+                ...item,
+                tripType: Number(item.tripType),
+                time: `${dayjs(item.startTime).format('YY/MM/DD')}~${dayjs(item.endTime).format('YY/MM/DD')}`,
+                tripPartnersName: nameArr.join('、'),
+                departureLocation: Number(item.departureLocation),
+                destinationLocation: Number(item.destinationLocation)
+              }
+            })
+          }
+          if (Array.isArray(this.form.expenseClaimTrips)) {
+            this.form.expenseClaimTrips.forEach(n => {
+              n.expenseClaimDetails.forEach(z => {
+                // let nameArr = ((this.ieList.filter(item => (z.invoiceIds || []).includes(item.id)) || []).map(item => item.invoiceCode)).join('、')
+                this.$set(z, 'show', false)
+                // this.$set(z, 'invoiceName', nameArr)
+              })
+            })
+          }
+          if (Array.isArray(this.form.expenseClaimDetails)) {
+            this.form.expenseClaimDetails.forEach(z => {
+              // let nameArr = ((this.ieList.filter(item => (z.invoiceIds || []).includes(item.id)) || []).map(item => item.invoiceCode)).join('、')
+              this.$set(z, 'show', false)
+              // this.$set(z, 'invoiceName', nameArr)
+            })
           }
-          this.handleChange(this.form.departmentId, 1)
-          // this.handleCtBlur({
-          //   target: {
-          //     value: res.data.contractNumber
-          //   }
-          // })
-          // this.handleInitOaReimburseFeeitemList(res.data.contractNumber)
-          this.oaReimburseFeeitemList = this.form.oaReimburseFeeitemList || []
-          this.oaReimburseFeeitemList = this.oaReimburseFeeitemList.map((item) => {
-            return {
-              ...item,
-              planTime: dayjs(item.planTime).format('YYYY/MM/DD')
-            }
-          })
           this.fileList = res.data.files || []
           this.isAuthorised = res.data.isAuthorised
           this.$nextTick(() => {
             this.$refs.BottomBtn.handleFilterBtnList()
           })
-          console.log('this.form..', this.form);
         }).finally(() => {
           this.$loading(false, 'loadingSb')
         })
@@ -454,45 +560,46 @@ export default {
           nameArr.push(element.nickname)
         }
       });
-      this.$set(this.form.expenseApplyTrips[index], 'tripPartners', arr)
-      this.$set(this.form.expenseApplyTrips[index], 'tripPartnersName', nameArr.join('、'))
-      this.$set(this.form.expenseApplyTrips[index], 'isOpen', false)
+      this.$set(this.form.expenseClaimTrips[index], 'tripPartners', arr)
+      this.$set(this.form.expenseClaimTrips[index], 'tripPartnersName', nameArr.join('、'))
+      this.$set(this.form.expenseClaimTrips[index], 'isOpen', false)
     },
     handleConfirmPo(arr, index) {
-      let nameArr = this.form.expenseApplyTrips[index].tripPartnersName && this.form.expenseApplyTrips[index].tripPartnersName.split('、') || []
-      let newArr = this.form.expenseApplyTrips[index].tripPartners || []
+      let nameArr = this.form.expenseClaimTrips[index].tripPartnersName && this.form.expenseClaimTrips[index].tripPartnersName.split('、') || []
+      let newArr = this.form.expenseClaimTrips[index].tripPartners || []
       this.userList.forEach(element => {
         if (arr.includes(element.id)) {
           nameArr.push(element.nickname)
           newArr.push(element.id)
         }
       });
-      this.$set(this.form.expenseApplyTrips[index], 'tripPartners', newArr)
-      this.$set(this.form.expenseApplyTrips[index], 'tripPartnersName', nameArr.join('、'))
-      this.$set(this.form.expenseApplyTrips[index], 'isOpen', false)
+      this.$set(this.form.expenseClaimTrips[index], 'tripPartners', newArr)
+      this.$set(this.form.expenseClaimTrips[index], 'tripPartnersName', nameArr.join('、'))
+      this.$set(this.form.expenseClaimTrips[index], 'isOpen', false)
     },
     handlePoShow(index) {
-      if (this.disabled) return
-      if (this.form.expenseApplyTrips[index].tripPartners.length) {
-        this.$set(this.form.expenseApplyTrips[index], 'type', 0)
-        this.$set(this.form.expenseApplyTrips[index], 'isOpen', true)
+      // if (this.disabled) return
+      if (this.form.expenseClaimTrips[index].tripPartners.length) {
+        this.$set(this.form.expenseClaimTrips[index], 'type', 0)
+        this.$set(this.form.expenseClaimTrips[index], 'isOpen', true)
       } else {
+
         this.$fm('请先添加同行人！')
       }
 
     },
     handlePoCancel(index) {
-      this.$set(this.form.expenseApplyTrips[index], 'isOpen', false)
+      this.$set(this.form.expenseClaimTrips[index], 'isOpen', false)
     },
     handleAddPeo(index) {
-      this.$set(this.form.expenseApplyTrips[index], 'isOpen', true)
-      this.$set(this.form.expenseApplyTrips[index], 'type', 1)
+      this.$set(this.form.expenseClaimTrips[index], 'isOpen', true)
+      this.$set(this.form.expenseClaimTrips[index], 'type', 1)
     },
     handleDel(index) {
-      this.form.expenseApplyTrips.splice(index, 1)
+      this.form.expenseClaimTrips.splice(index, 1)
     },
     handleAdd() {
-      this.form.expenseApplyTrips.push({
+      this.form.expenseClaimTrips.push({
         time: null,
         startTime: null,
         endTime: null,
@@ -507,118 +614,134 @@ export default {
         amount: undefined,
         isOpen: false,
         type: 0,
+        expenseClaimDetails: [
+          {
+            invoiceIds: {},
+            feeType: null,
+            amount: undefined,
+            invoiceCount: undefined,
+            remark: null,
+          }
+        ]
       })
     },
     handleInitList() {
+      console.log('......');
+      this.$loading(true)
       return new Promise((resolve) => {
-        getSupplierCompanyPage({
+        listData({
           pageNo: 1,
-          pageSize: 1000,
+          pageSize: this.$store.getters.requestPageSize,
+          dictType: 'bs_trip_type',
         }).then((res) => {
-          this.supplierList = res.data.list || []
-          resolve()
+          // 出差类型
+          this.tripTypeList = res.data.list || []
+          console.log('tripTypeList..', this.tripTypeList);
         })
-        getCustomerContractTypeListAll({
-          type: 2
+        listData({
+          pageNo: 1,
+          pageSize: this.$store.getters.requestPageSize,
+          dictType: 'bs_fee_type',
         }).then((res) => {
-          this.typeList = res.data || []
-        })
-        getProjectPage({
-          type: 2, pageNo: 1,
-          pageSize: 500
-        }).then(res => {
-          this.projectList = res.data.list || []
+          // 出差类型
+          this.feeTypeList = res.data.list || []
         })
-        listData({
+        getInvoicePage({
           pageNo: 1,
-          pageSize: 50,
-          dictType: "capital_source",
+          pageSize: this.$store.getters.requestPageSize,
         }).then((res) => {
-          this.capitalSource = res.data.list || [];
-        });
+          this.ieList = res.data && res.data.list || []
+          getExpenseApplyMyPage({
+            pageNo: 1,
+            pageSize: 1000,
+            billType: 'CLSQ',
+            expenseFlag: 0,
+            ids: [],
+            sortingFieldStr: encodeURIComponent(JSON.stringify([{ field: 'id', order: "desc" }]))
+          }).then((res) => {
+
+            let list = (res.data.list || []).map((item) => {
+              return {
+                ...item,
+                amount: (item.expenseApplyTrips || []).reduce((acc, cur) => {
+                  return Number(acc) + Number(cur.amount)
+                }, 0),
+                tripDay: (item.expenseApplyTrips || []).reduce((acc, cur) => {
+                  return Number(acc) + Number(cur.tripDay)
+                }, 0),
+                rodeArr: ((item.expenseApplyTrips || []).map(item => {
+                  return [(findAreaIdName(this.areaTree, item.departureLocation) || {}).name, (findAreaIdName(this.areaTree, item.destinationLocation) || {}).name]
+                })),
+                time: Array.isArray(item.expenseApplyTrips) && item.expenseApplyTrips.length ? `${dayjs(item.expenseApplyTrips[0].startTime).format('YYYY/MM/DD')}~${dayjs(item.expenseApplyTrips[item.expenseApplyTrips.length - 1].endTime).format('YYYY/MM/DD')}` : '-'
+              }
+            })
+            list.forEach(element => {
+              let arr = []
+              element.rodeArr.forEach(v => {
+                v.forEach(n => {
+                  arr.push(n && n)
+                })
+              })
+              element.rodeArr = arr
+            });
+
+            //去重
+            list.forEach(n => {
+              n.rode = this.unique(n.rodeArr).join('-')
+            })
+            this.expenseApplyList = (list || []).map((item, index) => {
+              return {
+                id: item.id,
+                title: `序号:${index + 1} 编号:${item.applyNo}申请人:${item.nickname}行程路线:${item.rode}出差天数:${item.tripDay || 0}天`,
+                disabled: item.status != 2 ? true : false
+              }
+            })
+            resolve()
+            this.$loading(false)
+          })
+        })
+
       })
+
     },
-    handleDateShow(dateType) {
-      if (this.disabled) return
-      this.dateType = dateType
+    handleDateShow(index, obj) {
+      if (this.disabled) {
+        return
+      }
+      const { startTime, endTime } = obj
       this.$nextTick(() => {
-        let date = dateType == 'dateSigning' ? this.form.dateSigning : dateType == 'proposerTime' ? this.form.proposerTime : dateType == 'startTime' ? this.form.startTime : dateType == 'endTime' ? this.form.endTime : ''
         this.$refs.vanCalendar && this.$refs.vanCalendar.reset()
         this.dateShow = true
-        if (date) {
-          let time = dayjs(Number(date)).format('YYYY/MM/DD');
-          this.defaultDate = new Date(time)
-        }
-      })
-    },
-    handlePDateShow(time, index) {
-      if (this.disabled) return
-      this.$nextTick(() => {
-        this.$refs.pVanCalendar && this.$refs.pVanCalendar.reset()
-        this.palnTimeShow = true
-        this.pIndex = index
-        if (time) {
-          this.pDefaultDate = dayjs(time).toDate()
+        this.index = index
+        if (startTime && endTime) {
+          this.defaultDate = [dayjs(startTime).toDate(), dayjs(endTime).toDate()]
         }
       })
     },
-    handleDateSelect(val) {
-      if (this.dateType == 'dateSigning') {
-        this.$set(this.form, 'dateSigning1', `${dayjs(val).format('YYYY/MM/DD')}`)
-        this.$set(this.form, 'dateSigning', `${dayjs(val).valueOf()}`)
-      }
-      if (this.dateType == 'proposerTime') {
-        this.$set(this.form, 'proposerTime1', `${dayjs(val).format('YYYY/MM/DD')}`)
-        this.$set(this.form, 'proposerTime', `${dayjs(val).valueOf()}`)
-      }
-      if (this.dateType == 'startTime') {
-        this.$set(this.form, 'startTime1', `${dayjs(val).format('YYYY/MM/DD')}`)
-        this.$set(this.form, 'startTime', `${dayjs(val).valueOf()}`)
-      }
-      if (this.dateType == 'endTime') {
-        this.$set(this.form, 'endTime1', `${dayjs(val).format('YYYY/MM/DD')}`)
-        this.$set(this.form, 'endTime', `${dayjs(val).valueOf()}`)
-      }
-
-      // if (list && list.length) {
-      //   this.$set(this.form, 'time', `${dayjs(list[0]).format('YY/MM/DD')}~${dayjs(list[1]).format('YY/MM/DD')}`)
-      //   this.$set(this.form, 'startTime', dayjs(list[0]).valueOf())
-      //   this.$set(this.form, 'endTime', dayjs(list[1]).valueOf())
-      // } else {
-      //   this.$set(this.form, 'time', null)
-      //   this.$set(this.form, 'startTime', null)
-      //   this.$set(this.form, 'endTime', null)
-      // }
-      this.dateShow = false
-    },
-    handlePlanDateSelect(date) {
-      if (date) {
-        let num = this.oaReimburseFeeitemList.length - 1
-        let nextTime = (this.oaReimburseFeeitemList[this.pIndex + 1] || {}).planTime
-        let beforeTime = (this.oaReimburseFeeitemList[this.pIndex - 1] || {}).planTime
-        if (this.pIndex == 0 && nextTime) {
-          if (!(dayjs(nextTime).isAfter(date))) {
-            this.$set(this.oaReimburseFeeitemList[this.pIndex], 'planTime', null)
-            return this.$fm('当前预计付款时间必须在下一笔付款时间之前！')
-          }
-        } else if (num == this.pIndex && beforeTime || beforeTime) {
-          if (!(dayjs(date).isAfter(beforeTime))) {
-            this.$set(this.oaReimburseFeeitemList[this.pIndex], 'planTime', null)
-            return this.$fm('当前预计付款时间必须在上一笔付款时间之后！')
-          }
-        } else {
-          if (beforeTime && nextTime) {
-            if (!((dayjs(date).isAfter(beforeTime)) && (dayjs(nextTime).isAfter(date)))) {
-              this.$set(this.oaReimburseFeeitemList[this.pIndex], 'planTime', null)
-              return this.$fm('当前预计付款时间必须在上一笔和下一笔付款时间之间！')
-            }
+    handleDateSelect(list) {
+      let trips = this.form.expenseClaimTrips
+      if (trips.length && list && list.length) {
+        // 判断行程时间是否在已经有的时间范围内
+        let start1 = dayjs(list[0]);
+        let end1 = dayjs(list[1]);
+        let range1 = { start: start1, end: end1 };
+        for (let i = 0; i < trips.length; i++) {
+          let start2 = dayjs(trips[i].startTime);
+          let end2 = dayjs(trips[i].endTime);
+          let range2 = { start: start2, end: end2 };
+          if (this.index !== i && range1.start.isBefore(range2.end) && range2.start.isBefore(range1.end)
+          ) {
+            this.$set(this.form.expenseClaimTrips[this.index], 'time', null)
+            return this.$fm(`行程时间范围与行程${i + 1}时间范围冲突！`)
           }
         }
-        this.$set(this.oaReimburseFeeitemList[this.pIndex], 'planTime', dayjs(date).format('YYYY/MM/DD'))
-      } else {
-        this.$set(this.oaReimburseFeeitemList[this.pIndex], 'planTime', null)
       }
-      this.palnTimeShow = false
+      this.$set(this.form.expenseClaimTrips[this.index], 'time', `${dayjs(list[0]).format('YY/MM/DD')}~${dayjs(list[1]).format('YY/MM/DD')}`)
+      this.$set(this.form.expenseClaimTrips[this.index], 'startTime', dayjs(list[0]).valueOf())
+      this.$set(this.form.expenseClaimTrips[this.index], 'endTime', dayjs(list[1]).valueOf())
+      let day = list && list.length && Number(dayjs(list[1]).diff(dayjs(list[0]), 'day')) + 1
+      this.$set(this.form.expenseClaimTrips[this.index], 'tripDay', day)
+      this.dateShow = false
     },
   },
 }