From 126d60e2b14c47d390ec05b584b3504465a293d3 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期六, 12 八月 2023 23:30:13 +0800
Subject: [PATCH] yxh

---
 src/views/project/fund/applyDetail/index.vue                       |  379 +++----
 src/views/project/fund/expertFeeApply/index.vue                    |   75 +
 src/views/project/fund/ethicalExpertFeeApply/index.vue             |  713 +++++++------
 src/views/project/fundcheck/medicalCostCheck/index.vue             |   18 
 src/views/project/fund/medicalCostApply/index.vue                  |   38 
 src/views/project/travelexpenseapply/travelexpensedetail/index.vue |  788 +++------------
 src/views/project/fund/officeExpenseApply/index.vue                |   18 
 src/views/project/travelexpenseapply/index.vue                     |  970 +++---------------
 8 files changed, 1,040 insertions(+), 1,959 deletions(-)

diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue
index f640a34..98fa41d 100644
--- a/src/views/project/fund/applyDetail/index.vue
+++ b/src/views/project/fund/applyDetail/index.vue
@@ -99,7 +99,7 @@
         <el-row style="margin-top: 5px; margin-bottom: 5px" />
         <el-row style="margin-bottom: 10px" v-if="businessType == '1'">
           <el-col :span="4">
-            <el-button @click.native.prevent="addAllItems" type="primary" size="small">
+            <el-button @click.native.prevent="importFeeItems" type="primary" size="small">
               瀵煎叆鏈嶅姟椤圭洰
             </el-button>
           </el-col>
@@ -111,29 +111,30 @@
                 <el-input v-model="scope.row.orderno" placeholder="搴忓彿" />
               </template>
             </el-table-column>
-            <el-table-column prop="applytype" align="center" label="璐圭敤绫诲瀷" width="200">
+            <!--
+            <el-table-column prop="itemcode" align="center" label="椤圭洰缂栧彿" show-overflow-tooltip=""
+              v-if="form.applytype == '1'">
+            </el-table-column>-->
+            <el-table-column prop="applytype" align="center" label="鏈嶅姟绫诲瀷" width="200">
               <template slot-scope="scope">
-                <el-select v-model="scope.row.applytype" placeholder="璐圭敤绫诲瀷" @change="loadItemType(scope.row)">
+                <el-select v-model="scope.row.applytype" placeholder="鏈嶅姟绫诲瀷" @change="loadFeeItems(scope.row)">
                   <el-option v-for="dict in rowfeeItemTypes" :key="dict.index" :label="dict.label"
                     :value="dict.value"></el-option>
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column prop="itemid" align="center" label="璐圭敤椤圭洰" width="260">
+            <el-table-column prop="itemid" align="center" label="鏈嶅姟椤圭洰" width="260">
               <template slot-scope="scope">
-                <el-select v-model="scope.row.itemid" placeholder="璐圭敤椤圭洰" filterable @change="verifyFeeItem(scope.row)"
+                <el-select v-model="scope.row.itemid" placeholder="鏈嶅姟椤圭洰" filterable @change="verifyFeeItem(scope.row)"
                   :filter-method="val => searchItemType(val, scope)">
                   <el-option v-for="dict in scope.row.itemlist" :key="dict.index" :label="dict.itemName"
                     :value="dict.id"></el-option>
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column prop="itemcode" align="center" label="椤圭洰缂栧彿" show-overflow-tooltip=""
-              v-if="form.applytype == '1'">
-            </el-table-column>
-            <el-table-column prop="servicesscope" align="center" label="璐圭敤璇存槑" v-if="form.applytype == '1'" width="180">
+            <el-table-column prop="servicesscope" align="center" label="鏈嶅姟璇存槑" v-if="form.applytype == '1'" width="180">
               <template slot-scope="scope">
-                <el-select v-model="scope.row.servicesscope" placeholder="璐圭敤璇存槑" clearable allow-create filterable
+                <el-select v-model="scope.row.servicesscope" placeholder="鏈嶅姟璇存槑" clearable allow-create filterable
                   @change="selectedRemark(scope.row)">
                   <el-option v-for="dict in scope.row.rowfeeblocks" :key="dict.servicesscope" :label="dict.remark"
                     :value="dict.servicesscope"></el-option>
@@ -176,17 +177,17 @@
                 <el-input v-model="scope.row.taxedamount" placeholder="绋庡悗閲戦" />
               </template>
             </el-table-column>
-            <el-table-column prop="beneficiaryname" align="center" label="濮撳悕" width="100"
+            <el-table-column prop="beneficiaryname" align="center" label="濮撳悕" width="120"
               v-if="form.applytype == '1' || form.applytype == '2'">
               <template slot-scope="scope">
-                <el-button type="primary" plain @click="ShowDetailDialog(scope, 'name')">{{ scope.row.beneficiaryname
+                <el-button type="primary" plain @click="ShowDetailDialog(scope, 'expert')">{{ scope.row.beneficiaryname
                 }}</el-button>
                 <!-- <el-select
                   filterable
                   allow-create
                   ref="getReportname"
                   default-first-option
-                  @change="selectpersonmsg(scope.row)"
+                  @change="selectExpert(scope.row)"
                   v-model="scope.row.beneficiaryname"
                   placeholder="璇烽�夋嫨"
                 >
@@ -200,7 +201,7 @@
                                       </el-select> -->
               </template>
             </el-table-column>
-            <el-table-column prop="unitno" align="center" label="鍗曚綅鍚嶇О" v-if="form.applytype != '4'">
+            <el-table-column prop="unitno" align="center" label="鍗曚綅鍚嶇О" width="250">
               <template slot-scope="scope">
                 <el-button type="primary" plain @click="ShowDetailDialog(scope, 'unit')">{{ scope.row.unitname
                 }}</el-button>
@@ -347,18 +348,18 @@
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm" v-if="operationType == 'add' || operationType == 'update'">淇�
-          瀛�</el-button>
-        <el-button type="primary" @click="checksubmit" v-if="operationType == 'check'">淇� 瀛�</el-button>
-        <el-button @click="cancel" v-if="operationType == 'detail'">閫� 鍑�</el-button>
+        <el-button type="primary" @click="submitForm"
+          v-if="operationType == 'add' || operationType == 'update'">鎻愪氦淇濆瓨</el-button>
+        <el-button type="primary" @click="checksubmit" v-if="operationType == 'check'">鎻愪氦瀹℃牳</el-button>
+        <el-button @click="cancel">鍏� 闂�</el-button>
       </div>
     </div>
 
-    <el-dialog :visible.sync="showDetailInfoDialog" :close-on-click-modal="false" :title="'鍗曚綅/涓撳淇℃伅閫夋嫨'" width="500px"
+    <el-dialog :visible.sync="showSelectionDialog" :close-on-click-modal="false" :title="'鍗曚綅/涓撳淇℃伅閫夋嫨'" width="500px"
       style="text-align: center" v-loading="loading">
       <el-form ref="funddetailForm" :model="funddetailForm">
         <el-row>
-          <el-col :span="24" v-if="showDetailInfoType == 'name'">
+          <el-col :span="24" v-if="selectionType == 'expert'">
             <el-form-item label="璇烽�夋嫨涓撳淇℃伅锛�" prop="expertfrom">
               <el-radio-group v-model="expertfrom" style="margin-bottom: 0">
                 <el-radio label="1">涓撳搴�</el-radio>
@@ -366,17 +367,17 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="24" v-if="showDetailInfoType == 'name' && expertfrom == '1'">
+          <el-col :span="24" v-if="selectionType == 'expert' && expertfrom == '1'">
             <el-form-item label="涓撳濮撳悕" prop="beneficiaryname" label-width="80px">
               <el-select filterable allow-create ref="beneficiaryname" default-first-option
                 v-model="funddetailForm.beneficiaryname" placeholder="璇烽�夋嫨" style="width: 100%">
-                <el-option v-for="item in expertlist" :key="item.reportNo" :label="item.reportName"
-                  :value="item.reportName">
+                <el-option v-for="item in expertlist" :key="item.expertNo" :label="item.exportName"
+                  :value="item.exportName">
                 </el-option>
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="24" v-if="showDetailInfoType == 'unit'">
+          <el-col :span="24" v-if="selectionType == 'unit'">
             <el-form-item label="鍗曚綅鍚嶇О" prop="unitno" label-width="120px" v-if="businessType == 1 || businessType == 2">
               <el-select v-model="funddetailForm.unitno" placeholder="鍗曚綅鍚嶇О" clearable filterable allow-create
                 style="width: 100%">
@@ -450,7 +451,7 @@
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="showDetailInfoDialog = false">鍙� 娑�</el-button>
+        <el-button @click="showSelectionDialog = false">鍙� 娑�</el-button>
         <el-button type="primary" @click="ConfirmDetailDialog()">纭� 瀹�</el-button>
       </span>
     </el-dialog>
@@ -627,11 +628,9 @@
       //涓撳璐归�夋嫨锛�1鏄笓瀹跺簱锛�2鏄柊澧�
       expertfrom: "1",
 
-      //鎹愮尞妗堜緥鍒楄〃鏁版嵁
-      donatebaseinfoList: [],
+      //鎹愮尞妗堜緥鍒楄〃
+      donateList: [],
 
-      // 鎹愮尞浜洪亾鎱伴棶閲戣〃鏍兼暟鎹�
-      donateconsolationfundList: [],
       //璐圭敤鏄庣粏鍒楄〃
       rbDetails: [],
       formData: {},
@@ -640,17 +639,21 @@
       totalAfterTaxAmount: 0.0,
       totalAmount: 0.0,
 
-      //琛岃褰曠殑璐圭敤绫诲瀷鏁扮粍
-      rowfeeItemTypes: [],
+
       //璐圭敤绫诲瀷鏁扮粍
       feeItemTypes: [],
+
+      //琛岃褰曠殑璐圭敤绫诲瀷鏁扮粍
+      rowfeeItemTypes: [],
+
       //璐圭敤璇存槑
       rowfeeblocks: [],
 
       fundflowList: [],
 
-      showDetailInfoDialog: false,
-      showDetailInfoType: "",
+      //涓撳/鍗曚綅閫夋嫨锛歟xpert/unit
+      selectionType: "",
+      showSelectionDialog: false,
 
       // 琛ㄥ崟鏍¢獙
       rules: {
@@ -777,30 +780,6 @@
   computed: {},
   //鐩戞帶data涓殑鏁版嵁鍙樺寲
   watch: {},
-  //鐢熷懡鍛ㄦ湡 - 鍒涘缓瀹屾垚锛堝彲浠ヨ闂綋鍓峵his瀹炰緥锛�
-
-  created() {
-    //鑾峰彇璺敱鍙傛暟
-    this.getroute();
-    this.getUserProfile();
-    this.getFeeUnitList();
-  },
-
-  //鐢熷懡鍛ㄦ湡 - 鎸傝浇瀹屾垚锛堝彲浠ヨ闂瓺OM鍏冪礌锛�
-  mounted() {
-    this.getUserList();
-    this.getBaseInfoList();
-    this.getExternalList();
-  },
-
-  beforeCreate() { }, //鐢熷懡鍛ㄦ湡 - 鍒涘缓涔嬪墠
-  beforeMount() { }, //鐢熷懡鍛ㄦ湡 - 鎸傝浇涔嬪墠
-  beforeUpdate() { }, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪墠
-  updated() { }, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪悗
-  beforeDestroy() { }, //鐢熷懡鍛ㄦ湡 - 閿�姣佷箣鍓�
-  destroyed() { }, //鐢熷懡鍛ㄦ湡 - 閿�姣佸畬鎴�
-  activated() { }, //濡傛灉椤甸潰鏈塳eep-alive缂撳瓨鍔熻兘锛岃繖涓嚱鏁颁細瑙﹀彂
-
   //鏂规硶闆嗗悎
   methods: {
     // 琛ㄥ崟閲嶇疆
@@ -858,35 +837,46 @@
       this.curId = this.$route.query.id;
       this.businessType = this.$route.query.businessType;
       this.operationType = this.$route.query.operationType;
-      console.log(this.businessType, this.operationType);
 
       //鑾峰彇璐圭敤椤圭洰绫诲瀷
-      this.getFundType();
+      this.getFeeTypes();
 
       // if (!this.businessType && !this.operationType) {
       if (this.businessType == "1") {
         this.curCase = this.$route.query.curCase;
-        this.businessName = "涓撳鍔冲姟璐圭敵璇峰崟";
-      } else if (this.businessType == "2") {
+        this.businessName = "涓撳鍔冲姟璐圭敵璇峰崟"
+        this.getUnitList();
+      }
+      else if (this.businessType == "2") {
         this.curCase = this.$route.query.curCase;
         this.businessName = "浼︾悊涓撳鍔冲姟璐圭敵璇峰崟";
-      } else if (this.businessType == "3") {
-        if (this.operationType != "check") { this.curCase = this.$route.query.curCase; }
+        this.getUnitList();
+      }
+      else if (this.businessType == "3") {
+        if (this.operationType != "check") {
+          this.curCase = this.$route.query.curCase;
+        }
         this.businessName = "鍖诲鎴愭湰鎶ラ攢鍗�";
-      } else if (this.businessType == "4") {
-        this.businessName = "鏉傞」璐圭敤鎶ラ攢鍗�";
+      }
+      else if (this.businessType == "4") {
+        this.businessName = "鍔炲叕璐圭敤鎶ラ攢鍗�";
+
+        // this.getBaseInfoList();
       }
 
       if (this.operationType == "add") {
         this.title = this.businessName + "鏂板缓";
         this.handleAdd();
-      } else if (this.operationType == "update") {
+      }
+      else if (this.operationType == "update") {
         this.title = this.businessName + "淇敼";
         this.handleUpdate();
-      } else if (this.operationType == "detail") {
+      }
+      else if (this.operationType == "detail") {
         this.title = this.businessName + "鏌ョ湅";
         this.handleDetail();
-      } else if (this.operationType == "check") {
+      }
+      else if (this.operationType == "check") {
         this.title = this.businessName + "瀹℃牳";
         this.handleCheck();
       }
@@ -902,7 +892,7 @@
       this.istrue += 2;
       this.reset();
 
-      /** businessType锛�1锛氫笓瀹惰垂锛�2锛氫鸡鐞嗕笓瀹惰垂锛�3锛氬尰瀛︽垚鏈紱4锛氭潅椤硅垂鐢�*/
+      /** businessType锛�1锛氫笓瀹惰垂锛�2锛氫鸡鐞嗕笓瀹惰垂锛�3锛氬尰瀛︽垚鏈紱4锛氬姙鍏垂鐢�*/
       this.form.applytype = this.businessType;
       if (
         this.businessType == "1" ||
@@ -941,7 +931,7 @@
           if (this.rbDetails.length > 0) {
             for (let m = 0; m < this.rbDetails.length; m++) {
               this.rbDetails[m].itemlist = [];
-              this.getitemlist(m, this.rbDetails[m]);
+              this.getFeeItems(m, this.rbDetails[m]);
 
               //鑾峰彇璐圭敤椤圭洰鐨勮缁嗕俊鎭�
               this.rbDetails[m].rowfeeblocks = [];
@@ -981,11 +971,10 @@
 
         //涓氬姟鏄庣粏
         getownFundDetail(this.curId).then(res => {
-          console.log(res);
           this.rbDetails = res.data;
           for (let m = 0; m < this.rbDetails.length; m++) {
             this.rbDetails[m].itemlist = [];
-            this.getitemlist(m, this.rbDetails[m]);
+            this.getFeeItems(m, this.rbDetails[m]);
             this.rbDetails[m].rowfeeblocks = [];
             this.rbDetails[m].rowfeeblocks.push({
               expense: this.rbDetails[m].expense,
@@ -1024,7 +1013,7 @@
           this.rbDetails = res.data;
           for (let m = 0; m < this.rbDetails.length; m++) {
             this.rbDetails[m].itemlist = [];
-            this.getitemlist(m, this.rbDetails[m]);
+            this.getFeeItems(m, this.rbDetails[m]);
             this.rbDetails[m].rowfeeblocks = [];
             this.rbDetails[m].rowfeeblocks.push({
               expense: this.rbDetails[m].expense,
@@ -1127,7 +1116,7 @@
               return;
             }
 
-            if (this.businessType == "1" || this.businessType == "2") {
+            if (this.businessType == "1") {
               if (tempDetail.servicesscope == null) {
                 this.$modal.msgWarning(
                   "鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
@@ -1137,7 +1126,7 @@
                 return;
               }
 
-              if (tempDetail.beneficiaryno == null) {
+              if (tempDetail.beneficiaryno == null || tempDetail.beneficiaryno == "鐐瑰嚮閫夋嫨") {
                 this.$modal.msgWarning(
                   "鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
                   (k + 1).toString() +
@@ -1146,6 +1135,7 @@
                 return;
               }
             }
+
             // //鍒ゆ柇鍗曚綅 unitSel
             // try {
             //   let unitIndex = this.unitList.findIndex(
@@ -1163,7 +1153,6 @@
 
           //闄勪欢澶勭悊
           let list = this.fileList;
-          console.log(list);
           // if (list.length > 0) {
           //   this.form.annexfiles = list.map(item => item.url).join(",");
           // }
@@ -1280,7 +1269,6 @@
 
           addorupdateFund(this.form).then(response => {
             if (response.code === 200) {
-              this.selectDonotor(this.curCase);
               this.$modal.msgSuccess("鐢宠鍗曚繚瀛樻垚鍔燂紒");
             } else {
               this.$modal.msgError("鐢宠鍗曚繚瀛樺け璐ワ細" + response.msg);
@@ -1290,7 +1278,6 @@
           //鍏抽棴绐楀彛
           // this.loading = false;
           // this.getfundList();
-          // this.selectDonotor(this.curCase);
           this.$router.go(-1);
         }
       });
@@ -1330,23 +1317,18 @@
         } else {
           this.ismanager = false;
         }
-        // this.form.applytype = this.businessType;
-        // this.form.createTime = new Date();
         this.form.username = this.userprofile.nickName;
         this.form.userno = this.userprofile.userName;
         this.form.phone = this.userprofile.phonenumber;
         this.form.deptmentname = this.userprofile.dept.deptName;
         this.form.deptmentno = this.userprofile.dept.deptId;
         this.form.managername = this.userprofile.dept.leader;
+        // this.form.applytype = this.businessType;
+        // this.form.createTime = new Date();
       });
     },
 
     //鑾峰彇绯荤粺鐢ㄦ埛鍒楄〃
-    getUserList() {
-      listUser().then(res => {
-        this.userlist = res.data;
-      });
-    }, //鑾峰彇绯荤粺鐢ㄦ埛鍒楄〃
     getUserList() {
       listUser().then(res => {
         this.userlist = res.data;
@@ -1418,8 +1400,18 @@
       });
     },
 
+    //鑾峰彇鎹愮尞妗堜緥鍒楄〃
+    getBaseInfoList() {
+      this.loading = true;
+      listDonatebaseinfo(this.queryParams).then(response => {
+        this.donateList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+
     //鑾峰彇璐圭敤绫诲瀷
-    getFundType() {
+    getFeeTypes() {
       getFundTypeAll(this.businessType).then(res => {
         let dataList = res.data;
         this.feeItemTypes = dataList;
@@ -1435,7 +1427,7 @@
       });
     },
 
-    getitemlist(rowindex, row) {
+    getFeeItems(rowindex, row) {
       let list = this.feeItemTypes.filter(r => r.itemType == row.applytype);
       row.itemlist = list[0].itemDetails;
       this.$set(this.rbDetails, rowindex, row);
@@ -1447,24 +1439,19 @@
       // });
     },
 
-    //鑾峰彇鎹愮尞妗堜緥鍒楄〃
-    getBaseInfoList() {
-      this.loading = true;
-      listDonatebaseinfo(this.queryParams).then(response => {
-        this.donatebaseinfoList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    //鑾峰彇鐢宠鍗曚俊鎭�
-    getfundList() {
-      this.loading = true;
-      this.reset();
-      this.fundQueryParam.infoid = this.curCase.id;
-      listFund(this.fundQueryParam).then(response => {
-        this.loading = false;
-        this.donateconsolationfundList = response.rows;
-      });
+    //鍔犺浇鏈嶅姟椤圭洰
+    loadFeeItems(row) {
+      let list = this.feeItemTypes.filter(r => r.itemType == row.applytype);
+      row.itemlist = list[0].itemDetails;
+      row.itemid = null;
+      this.$forceUpdate();
+      //this.loading = true;
+      // getItemNames(row.applytype).then((res) => {
+      //   this.loading = false;
+      //   row.itemid = null;
+      //   row.itemlist = res.data;
+      //   this.$forceUpdate();
+      // });
     },
 
     //鑾峰彇璐圭敤椤圭洰鐨勫娉ㄤ俊鎭�
@@ -1527,6 +1514,27 @@
       });
     },
 
+    //绛涙煡鍑哄搴旂殑璐圭敤椤圭洰
+    searchItemType(val, scope) {
+      let result = [];
+      if (val != "") {
+        let tempitemlist = scope.row.itemlist;
+        for (let i = 0; i < tempitemlist.length; i++) {
+          let pym = tempitemlist[i].itempinyin;
+          if (pym != null && pym != undefined && pym != "") {
+            if (pym.indexOf(val) != -1) {
+              result.push(tempitemlist[i]);
+            }
+          }
+        }
+        scope.row.itemlist = result;
+      } else {
+        getItemNames(scope.row.applytype).then(res => {
+          scope.row.itemlist = res.data;
+          //this.$set(this.rbDetails, rowindex, row);
+        });
+      }
+    },
     //鍚堣璐圭敤
     selectamount(row) {
       this.rowfeeblocks.forEach((item, i) => {
@@ -1536,14 +1544,28 @@
       });
     },
 
-    //鐐瑰嚮鎹愮尞妗堜緥鍒楄〃瑙﹀彂鏂规硶
-    selectDonotor(row, column, event) {
-      this.curCase = row;
-      this.getfundList();
+    selectExpert(row) {
+      // if(row.beneficiaryname)
+      this.personlist.map(res => {
+        if (row.beneficiaryname == res.username) {
+          row.beneficiaryno = res.userno;
+          row.beneficiaryname = res.username;
+          row.bankcardno = res.bankcardno;
+          row.branchbankname = res.branchbankname;
+          row.depositbank = res.depositbank;
+          row.idcardno = res.idcardno;
+          row.phone = res.phonenumber;
+          row.title = res.title;
+          row.unitname = res.unitname;
+          row.unitno = res.unitno;
+        } else {
+          row.beneficiaryno = row.beneficiaryname;
+        }
+      });
     },
 
     //瀵煎叆鎵�鏈夐」鐩�
-    addAllItems() {
+    importFeeItems() {
       this.loading = true;
       this.rbDetails = this.rbDetails.filter(
         r => r.applytype != "" && r.applytype != null
@@ -1610,32 +1632,6 @@
       // });
     },
 
-    addAll(row, i, arr) {
-      row.itemlist.map(res => {
-        if (res.id !== row.itemid) {
-          let a = arr.length;
-          this.addRow();
-          arr[a].itemlist = row.itemlist;
-          arr[a].applytype = row.applytype;
-          arr[a].itemid = res.id;
-
-          getdetailsByItemId(arr[a].itemid).then(res => {
-            let fundmsg = res.data;
-            let rowfeeblocks = [];
-            fundmsg.forEach(item => {
-              rowfeeblocks.push({
-                expense: item.expense,
-                expensedescribe: item.expensedescribe,
-                remark: item.expensedescribe,
-                servicesscope: item.id
-              });
-            });
-            row.rowfeeblocks = rowfeeblocks;
-          });
-        }
-      });
-    },
-
     //鏂板涓�琛�
     addRow(rowIndex) {
       let rowData = {
@@ -1689,63 +1685,6 @@
       }
       for (let i = 0; i < this.rbDetails.length; i++) {
         this.rbDetails[i].orderno = i + 1;
-      }
-    },
-
-    //鍔犺浇鏈嶅姟椤圭洰
-    loadItemType(row) {
-      let list = this.feeItemTypes.filter(r => r.itemType == row.applytype);
-      row.itemlist = list[0].itemDetails;
-      row.itemid = null;
-      this.$forceUpdate();
-      //this.loading = true;
-      // getItemNames(row.applytype).then((res) => {
-      //   this.loading = false;
-      //   row.itemid = null;
-      //   row.itemlist = res.data;
-      //   this.$forceUpdate();
-      // });
-    },
-
-    selectpersonmsg(row) {
-      // if(row.beneficiaryname)
-      this.personlist.map(res => {
-        if (row.beneficiaryname == res.username) {
-          row.beneficiaryno = res.userno;
-          row.beneficiaryname = res.username;
-          row.bankcardno = res.bankcardno;
-          row.branchbankname = res.branchbankname;
-          row.depositbank = res.depositbank;
-          row.idcardno = res.idcardno;
-          row.phone = res.phonenumber;
-          row.title = res.title;
-          row.unitname = res.unitname;
-          row.unitno = res.unitno;
-        } else {
-          row.beneficiaryno = row.beneficiaryname;
-        }
-      });
-    },
-
-    //绛涙煡鍑哄搴旂殑璐圭敤椤圭洰
-    searchItemType(val, scope) {
-      let result = [];
-      if (val != "") {
-        let tempitemlist = scope.row.itemlist;
-        for (let i = 0; i < tempitemlist.length; i++) {
-          let pym = tempitemlist[i].itempinyin;
-          if (pym != null && pym != undefined && pym != "") {
-            if (pym.indexOf(val) != -1) {
-              result.push(tempitemlist[i]);
-            }
-          }
-        }
-        scope.row.itemlist = result;
-      } else {
-        getItemNames(scope.row.applytype).then(res => {
-          scope.row.itemlist = res.data;
-          //this.$set(this.rbDetails, rowindex, row);
-        });
       }
     },
 
@@ -1840,12 +1779,12 @@
     },
 
     mixExport(scope) {
-      this.dayin(scope.row.id);
-      //this.totaldayin(id);
+      this.print(scope.row.id);
+      //this.totalprint(id);
     },
 
     //涓撳璐瑰姵鍔℃墦鍗�
-    dayin(id) {
+    print(id) {
       getdownloadLW(id).then(res => {
         if (res.downloadUrl) {
           var fileUrl = res;
@@ -1867,7 +1806,7 @@
     },
 
     //姹囨�绘墦鍗�
-    totaldayin(e) {
+    totalprint(e) {
       // const id =this.row.id
       getdownloadBX(e).then(res => {
         if (res.downloadUrl) {
@@ -1977,10 +1916,12 @@
 
     //涓撳/鍖荤枟鏈烘瀯/璐圭敤鎶ラ攢鏈烘瀯閫夋嫨
     ShowDetailDialog(spoce, showType) {
+      this.selectionType = showType;
       this.expertfrom = "1";
+
       this.funddetailForm.index = spoce.$index;
-      this.funddetailForm.beneficiaryname = spoce.row.beneficiaryname;
       this.funddetailForm.beneficiaryno = spoce.row.beneficiaryno;
+      this.funddetailForm.beneficiaryname = spoce.row.beneficiaryname;
       this.funddetailForm.unitno = spoce.row.unitno;
       this.funddetailForm.unitname = spoce.row.unitname;
       this.funddetailForm.expertname = "";
@@ -1991,22 +1932,21 @@
       this.funddetailForm.expertdepositbank = "";
       this.funddetailForm.expertbankcardno = "";
 
-      this.showDetailInfoDialog = true;
-      this.showDetailInfoType = showType;
+      this.showSelectionDialog = true;
     },
 
     //涓撳/鍖荤枟鏈烘瀯/璐圭敤鎶ラ攢鏈烘瀯閫夋嫨
     ConfirmDetailDialog() {
       let tempIndex = this.funddetailForm.index;
-      let tempName = this.funddetailForm.beneficiaryname;
+      let tempExpertName = this.funddetailForm.beneficiaryname;
       let tempUnitname = this.funddetailForm.unitname;
       let singleDetail = this.rbDetails[tempIndex];
 
-      if (this.showDetailInfoType == "name") {
+      if (this.selectionType == "expert") {
         if (this.expertfrom == "1") {
           //浠庝笓瀹跺垪琛ㄨ幏鍙栦俊鎭�
           this.personlist.map(res => {
-            if (tempName == res.username) {
+            if (tempExpertName == res.username) {
               singleDetail.beneficiaryno = res.userno;
               singleDetail.beneficiaryname = res.username;
               singleDetail.bankcardno = res.bankcardno;
@@ -2022,8 +1962,7 @@
         } else {
           //淇濆瓨鏂板涓撳
           this.expertform.id = null;
-          this.expertform.userno =
-            this.personlist[this.personlist.length - 1].id + 1;
+          this.expertform.userno = this.personlist[this.personlist.length - 1].id + 1;
           this.expertform.usertype = "expert";
           this.expertform.username = this.funddetailForm.expertname;
           this.expertform.idcardno = this.funddetailForm.expertidcardno;
@@ -2082,7 +2021,7 @@
             }
           });
         }
-      } else if (this.showDetailInfoType == "unit") {
+      } else if (this.selectionType == "unit") {
         singleDetail.unitno = this.funddetailForm.unitno;
         if (this.businessType == 1 || this.businessType == 2) {
           try {
@@ -2119,9 +2058,31 @@
       }
 
       this.rbDetails[tempIndex] = singleDetail;
-      this.showDetailInfoDialog = false;
-    }
-  }
+      this.showSelectionDialog = false;
+    },
+  },
+
+  //鐢熷懡鍛ㄦ湡 - 鍒涘缓瀹屾垚锛堝彲浠ヨ闂綋鍓峵his瀹炰緥锛�
+  created() {
+    //鑾峰彇璺敱鍙傛暟
+    this.getroute();
+    this.getUserProfile();
+    this.getUserList();
+  },
+
+  //鐢熷懡鍛ㄦ湡 - 鎸傝浇瀹屾垚锛堝彲浠ヨ闂瓺OM鍏冪礌锛�
+  mounted() {
+    this.getExternalList();
+    // this.getFeeUnitList();
+  },
+
+  beforeCreate() { }, //鐢熷懡鍛ㄦ湡 - 鍒涘缓涔嬪墠
+  beforeMount() { }, //鐢熷懡鍛ㄦ湡 - 鎸傝浇涔嬪墠
+  beforeUpdate() { }, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪墠
+  updated() { }, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪悗
+  beforeDestroy() { }, //鐢熷懡鍛ㄦ湡 - 閿�姣佷箣鍓�
+  destroyed() { }, //鐢熷懡鍛ㄦ湡 - 閿�姣佸畬鎴�
+  activated() { }, //濡傛灉椤甸潰鏈塳eep-alive缂撳瓨鍔熻兘锛岃繖涓嚱鏁颁細瑙﹀彂
 };
 </script>
 
diff --git a/src/views/project/fund/ethicalExpertFeeApply/index.vue b/src/views/project/fund/ethicalExpertFeeApply/index.vue
index c3f7c95..46bcfe8 100644
--- a/src/views/project/fund/ethicalExpertFeeApply/index.vue
+++ b/src/views/project/fund/ethicalExpertFeeApply/index.vue
@@ -51,10 +51,6 @@
         <el-card shadow="naver">
           <el-form ref="infoform" label-width="100px">
             <el-row :gutter="4" align="right" class="mb8">
-              <el-col :span="1.5">
-                <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-                  v-hasPermi="['project:ethicalfund:add']">浼︾悊瀹℃煡涓撳璐圭敵璇�</el-button>
-              </el-col>
               <el-col :span="9">
                 <el-form-item label="鎹愮尞缂栧彿">
                   <el-input v-model="curCase.donorno" :disabled="true"></el-input>
@@ -65,7 +61,12 @@
                   <el-input v-model="curCase.name" :disabled="true"></el-input>
                 </el-form-item>
               </el-col>
-              <el-col> </el-col>
+            </el-row>
+            <el-row :gutter="10" class="mb8">
+              <el-col :span="1.5">
+                <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+                  v-hasPermi="['project:ethicalfund:add']">鏂板鐢宠鍗�</el-button>
+              </el-col>
             </el-row>
             <el-row>
               <el-table v-loading="loading" border :data="donateconsolationfundList">
@@ -373,8 +374,8 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="鐢宠闄勪欢锛�" align="left" prop="annexbankcard">
-              <el-upload size="mini" class="upload-demo" :action="uploadFileUrl" :file-list="fileList" multiple :limit="20"
-                :headers="headers" :on-success="(response, file, fileList) =>
+              <el-upload size="mini" class="upload-demo" :action="uploadFileUrl" :file-list="fileList" multiple
+                :limit="20" :headers="headers" :on-success="(response, file, fileList) =>
                   uploadSccess(response, file, fileList)
                   " :on-preview="downFile" :disabled='dialogType == "detail"' :on-error="handleUploadError"
                 :on-exceed="handleExceed" :on-remove="remove" accept="image/*,.pdf">
@@ -612,62 +613,186 @@
       },
     };
   },
+
   //鐩戝惉灞炴�� 绫讳技浜巇ata姒傚康
   computed: {},
   //鐩戞帶data涓殑鏁版嵁鍙樺寲
   watch: {},
-  //鏂规硶闆嗗悎
+
+  //鏂规硶闆嗗悎  
   methods: {
-    ShowDetailDialog(spoce, showType) {
-      this.funddetailForm.index = spoce.$index;
-      this.funddetailForm.beneficiaryno = spoce.row.beneficiaryno;
-      this.funddetailForm.beneficiaryname = spoce.row.beneficiaryname;
-      this.funddetailForm.unitno = spoce.row.unitno;
-      this.funddetailForm.unitname = spoce.row.unitname;
-      this.detailInfoDialogShow = true;
-      this.detailInfoDialogShowType = showType;
+    /** 鎼滅储鎸夐挳鎿嶄綔 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
     },
-    ConfirmDetailDialog() {
-      let tempIndex = this.funddetailForm.index;
-      let tempName = this.funddetailForm.beneficiaryname;
-      let tempUnitname = this.funddetailForm.unitname;
-      let singleDetail = this.fundDetailArr[tempIndex];
-      if (this.detailInfoDialogShowType == "name") {
-        this.personlist.map((res) => {
-          if (tempName == res.username) {
-            singleDetail.beneficiaryno = res.userno;
-            singleDetail.beneficiaryname = res.username;
-            singleDetail.bankcardno = res.bankcardno;
-            singleDetail.branchbankname = res.branchbankname;
-            singleDetail.depositbank = res.depositbank;
-            singleDetail.idcardno = res.idcardno;
-            singleDetail.phone = res.telephone;
-            singleDetail.title = res.title;
-            singleDetail.unitname = res.unitname;
-            singleDetail.unitno = parseInt(res.unitno);
-          } else {
-            singleDetail.beneficiaryname = tempName;
-            singleDetail.beneficiaryno = tempName;
+
+    /** 閲嶇疆鎸夐挳鎿嶄綔 */
+    resetQuery() {
+      this.daterangeReporttime = [];
+
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 鏂板鎸夐挳鎿嶄綔 */
+    handleAdd() {
+      if (this.curCase.id) {
+        this.$router.push({
+          path: "/finance/applyDetail/",
+          query: {
+            id: 0,
+            businessType: "2",
+            operationType: "add",
+            curCase: this.curCase
           }
         });
-      } else if (this.detailInfoDialogShowType == "unit") {
-        singleDetail.unitno = this.funddetailForm.unitno;
-        try {
-          let unitIndex = this.unitList.findIndex(
-            (item) => singleDetail.unitno == item.organizationid
-          );
-          if (unitIndex > -1) {
-            singleDetail.unitname = this.unitList[unitIndex].organizationname;
-          } else {
-            singleDetail.unitname = singleDetail.unitno;
-          }
-        } catch {
-          singleDetail.unitname = singleDetail.unitno;
-        }
+      } else {
+        const h = this.$createElement;
+        this.$message({
+          message: h("p", null, [h("span", null, "璇峰湪宸﹁竟鐨勬崘鐚渚嬭〃閫夋嫨闇�瑕佹搷浣滅殑妗堜緥锛�")]),
+        });
       }
-      this.fundDetailArr[tempIndex] = singleDetail;
-      this.detailInfoDialogShow = false;
+      return;
+
+
+      if (this.curCase.id) {
+        this.istrue += 2;
+        this.reset();
+        this.dialogOpen = true;
+        this.title = "娣诲姞璐圭敤鐢宠";
+        this.dialogType = "edit";
+        this.queryParams.params = {};
+
+        this.form.infoid = this.curCase.id;
+        this.form.donorno = this.curCase.donorno;
+        this.form.donorname = this.curCase.name;
+        this.form.username = this.defaultperson.nickName;
+        this.form.userno = this.defaultperson.userName;
+
+        this.form.deptmentname = this.defaultperson.dept.deptName;
+        this.form.deptmentno = this.defaultperson.dept.deptId;
+        this.form.managername = this.defaultperson.dept.leader;
+        // this.form.createTime = nowdate;
+        //this.open = true;
+        //this.initFundApplyForm();
+        this.fundDetailArr = [];
+        this.fundflowList = [];
+        this.addRow();
+      } else {
+        const h = this.$createElement;
+        this.$message({
+          message: h("p", null, [h("span", null, "璇峰厛閫夋嫨宸︽柟鎹愮尞妗堜緥 ")]),
+        });
+      }
     },
+    /** 淇敼鎸夐挳鎿嶄綔 */
+    handleUpdate(row) {
+      this.$router.push({
+        path: "/finance/applyDetail/",
+        query: {
+          id: row.id,
+          businessType: "2",
+          operationType: "update",
+          curCase: this.curCase
+        }
+      });
+      return;
+
+      this.isopen = 0;
+      this.reset();
+      this.queryParams.params = {};
+      this.dialogOpen = true;
+      this.title = "淇敼璐圭敤鐢宠";
+      this.dialogType = "edit";
+
+      const id = row.id || this.ids;
+      getFund(id).then((response) => {
+        this.form = response.data;
+        //闄勪欢澶勭悊
+        this.fileList = this.form.annexbankcard ? this.form.annexbankcard.split(",").map(item => ({ url: item, name: item })) : []
+
+        getownFundDetail(id).then(async (res) => {
+          this.fundDetailArr = res.data;
+          for (let m = 0; m < this.fundDetailArr.length; m++) {
+            this.fundDetailArr[m].itemArr = [];
+            this.getItemArr(m, this.fundDetailArr[m]);
+          }
+        });
+      });
+    },
+
+    /** 鏌ョ湅鎸夐挳鎿嶄綔 */
+    handleDetail(row) {
+      this.$router.push({
+        path: "/finance/applyDetail/",
+        query: {
+          id: row.id,
+          businessType: "2",
+          operationType: "detail",
+          curCase: this.curCase
+        }
+      });
+      return;
+
+      this.isopen = 0;
+      this.reset();
+      this.queryParams.params = {};
+      this.dialogOpen = true;
+      this.title = "鏌ョ湅璐圭敤鐢宠";
+      this.dialogType = "detail";
+      const id = row.id || this.ids;
+
+      getFund(id).then((response) => {
+        this.form = response.data;
+        let listFundflowparams = {
+          fundid: row.id,
+          fundtype: 2,
+        };
+        //闄勪欢澶勭悊
+        this.fileList = this.form.annexbankcard ? this.form.annexbankcard.split(",").map(item => ({ url: item, name: item })) : []
+
+        listFundflow(listFundflowparams).then((res) => {
+          this.fundflowList = res.rows;
+        });
+        getownFundDetail(id).then((res) => {
+          this.fundDetailArr = res.data;
+          for (let m = 0; m < this.fundDetailArr.length; m++) {
+            this.fundDetailArr[m].itemArr = [];
+            this.getItemArr(m, this.fundDetailArr[m]);
+            this.fundDetailArr[m].fundblock = [];
+            this.fundDetailArr[m].fundblock.push({
+              expense: this.fundDetailArr[m].expense,
+              expensedescribe: this.fundDetailArr[m].servicesscopename,
+              remark: this.fundDetailArr[m].servicesscope,
+              servicesscope: this.fundDetailArr[m].servicesscope,
+            });
+          }
+        });
+      });
+    },
+
+    /** 鍒犻櫎鎸夐挳鎿嶄綔 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal
+        .confirm("鏄惁纭鍒犻櫎璇ヨ褰曪紵")
+        .then(function () {
+          return delFund(ids);
+        })
+        .then(() => {
+          getownFundDetail(ids).then((res) => {
+            let listdetails = res.data;
+            for (let i = 0; i < listdetails.length; i++) {
+              delFunddetail(listdetails[i].id);
+            }
+          });
+          // this.getList();
+          this.getfundList();
+          this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+        })
+        .catch(() => { });
+    },
+    /** 涓婃姤鎸夐挳鎿嶄綔 */
     handleup(row) {
       this.$confirm("鏄惁纭灏嗙櫥璁拌褰曚笂鎶ワ紵", "鎻愮ず", {
         confirmButtonText: "纭畾",
@@ -701,24 +826,160 @@
           });
         });
     },
+
+    /** 瀵煎嚭鎸夐挳鎿嶄綔 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$modal
+        .confirm("鏄惁纭瀵煎嚭鎵�鏈夋姤閿�鐢宠鏁版嵁椤癸紵")
+        .then(() => {
+          this.exportLoading = true;
+          return exportReimbursement(queryParams);
+        })
+        .then(response => {
+          this.$download.name(response.msg);
+          this.exportLoading = false;
+        })
+        .catch(() => { });
+    },
+
+    /** 鎻愪氦鎸夐挳 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          let formData = this.form;
+          let totalPreTaxAmount = 0.0;
+          let totalAfterTaxAmount = 0.0;
+          let totalAmount = 0.0;
+          for (let k = 0; k < this.fundDetailArr.length; k++) {
+            let tempDetail = this.fundDetailArr[k];
+            if (tempDetail.itemid == null) {
+              this.$modal.msgWarning("璇烽�夋嫨鏈嶅姟椤圭洰");
+              return;
+            }
+            //鍒ゆ柇鍗曚綅 unitSel
+            // try {
+            //   //鑾峰彇鏈嶅姟椤圭洰鏄庣粏
+            //   let unitIndex = this.unitList.findIndex(
+            //     (item) => tempDetail.unitno == item.organizationid
+            //   );
+            //   if (unitIndex > -1) {
+            //     tempDetail.unitname = this.unitList[unitIndex].organizationname;
+            //   }
+            //   else{
+            //     tempDetail.unitname = tempDetail.unitno;
+            //   }
+            // } catch {
+            //   tempDetail.unitname = tempDetail.unitno;
+            // }
+            if (!isNaN(parseFloat(tempDetail.amount))) {
+              totalPreTaxAmount += parseFloat(tempDetail.amount);
+              totalAmount += parseFloat(tempDetail.amount);
+            }
+            if (!isNaN(parseFloat(tempDetail.taxedamount))) {
+              totalAfterTaxAmount += parseFloat(tempDetail.taxedamount);
+              totalAmount += parseFloat(tempDetail.taxedamount);
+            }
+          }
+          try {
+            this.form.unitname = this.$refs.orgSelecter.getOptionByValue(
+              this.form.unitno
+            ).organizationname;
+          } catch {
+            this.form.treatmenthospitalname = this.form.treatmenthospitalno;
+          }
+          this.form.pretaxcost = parseFloat(totalPreTaxAmount).toFixed(2);
+          this.form.taxedcost = parseFloat(totalAfterTaxAmount).toFixed(2);
+          this.form.amountrequested = totalAmount.toFixed(2);
+
+          this.loading = true;
+          //闄勪欢澶勭悊
+          let list = this.fileList;
+          if (list.length > 0) {
+            this.form.annexbankcard = list.map(item => item.url).join(",");
+          }
+
+          if (this.form.id != null) {
+            updateFund(this.form).then((response) => {
+              this.getfundList();
+              this.dialogOpen = false;
+              this.getList();
+              this.selectDonotor(this.curCase);
+              this.$modal.msgSuccess("淇敼鎴愬姛");
+              this.loading = false;
+              for (let m = 0; m < this.fundDetailArr.length; m++) {
+                let tempData = this.fundDetailArr[m];
+                let tempItemArr = tempData.itemArr;
+                tempData.fundid = formData.id;
+                //鑾峰彇鏈嶅姟椤圭洰鏄庣粏
+                let itemIndex = tempItemArr.findIndex(
+                  (item) => tempData.itemid == item.id
+                );
+                if (itemIndex > -1) {
+                  tempData.itemname = tempItemArr[itemIndex].itemName;
+                  tempData.itemid = tempItemArr[itemIndex].id;
+                }
+                if (tempData.id > 0) {
+                  updateFunddetail(tempData).then((response2) => { });
+                } else {
+                  addFunddetail(tempData).then((response2) => { });
+                }
+              }
+            });
+          } else {
+            //淇濆瓨璐圭敤鐢宠
+            for (let m = 0; m < this.fundDetailArr.length; m++) {
+              let tempData = this.fundDetailArr[m];
+              let tempUtemArr = tempData.itemArr;
+              //鑾峰彇鏈嶅姟椤圭洰鏄庣粏
+              let itemIndex = tempUtemArr.findIndex(
+                (item) => tempData.itemid == item.id
+              );
+              if (itemIndex > -1) {
+                tempData.itemname = tempUtemArr[itemIndex].itemName;
+                tempData.itemid = tempUtemArr[itemIndex].id;
+              }
+              //鑾峰彇applytypename
+              let applytypeIndex = this.fundtypeArr.findIndex(
+                (item) => tempData.applytype == item.value
+              );
+              if (applytypeIndex > -1) {
+                tempData.applytypename = this.fundtypeArr[applytypeIndex].label;
+              }
+              this.fundDetailArr[m] = tempData;
+            }
+
+            this.form.serviceFunddetails = this.fundDetailArr;
+            addorupdateFund(this.form).then((response) => {
+              if (response.code === 200) {
+                this.$modal.msgSuccess("鏂板鎴愬姛");
+                this.loading = false;
+                this.selectDonotor(this.curCase);
+              } else {
+                this.$modal.msgError("鏂板澶辫触锛�" + response.msg);
+                this.loading = false;
+              }
+            });
+            this.dialogOpen = false;
+          }
+        }
+      });
+    },
+    /** 鍙栨秷鎸夐挳 */
+    cancel() {
+      this.dialogOpen = false;
+      this.reset();
+    },
+
+
+    //鑾峰彇鎵�鏈夌敤鎴峰垪琛�
     getUsermsg() {
       getUserProfile().then((response) => {
         this.defaultperson = response.data;
         this.standardlevel = response.data.standardlevel;
       });
     },
-    /** 鎼滅储鎸夐挳鎿嶄綔 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 閲嶇疆鎸夐挳鎿嶄綔 */
-    resetQuery() {
-      this.daterangeReporttime = [];
 
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
     /** 鏌ヨ鎹愮尞浜洪亾鎱伴棶閲戝垪琛� */
     getList() {
       this.loading = true;
@@ -736,6 +997,7 @@
       });
     },
 
+    //鑾峰彇鎹愮尞妗堜緥鍒楄〃
     getBaseInfoList() {
       this.loading = true;
       listDonatebaseinfo(this.queryParams).then((response) => {
@@ -745,43 +1007,13 @@
       });
     },
 
-    /** 鏂板鎸夐挳鎿嶄綔 */
-    handleAdd() {
-      if (this.curCase.id) {
-        this.istrue += 2;
-        this.reset();
-        this.dialogOpen = true;
-        this.title = "娣诲姞璐圭敤鐢宠";
-        this.dialogType = "edit";
-        this.queryParams.params = {};
-
-        this.form.infoid = this.curCase.id;
-        this.form.donorno = this.curCase.donorno;
-        this.form.donorname = this.curCase.name;
-        this.form.username = this.defaultperson.nickName;
-        this.form.userno = this.defaultperson.userName;
-
-        this.form.deptmentname = this.defaultperson.dept.deptName;
-        this.form.deptmentno = this.defaultperson.dept.deptId;
-        this.form.managername = this.defaultperson.dept.leader;
-        // this.form.createTime = nowdate;
-        //this.open = true;
-        //this.initFundApplyForm();
-        this.fundDetailArr = [];
-        this.fundflowList = [];
-        this.addRow();
-      } else {
-        const h = this.$createElement;
-        this.$message({
-          message: h("p", null, [h("span", null, "璇峰厛閫夋嫨宸︽柟鎹愮尞妗堜緥 ")]),
-        });
-      }
-    },
     //鐐瑰嚮鎹愮尞妗堜緥鍒楄〃瑙﹀彂鏂规硶
     selectDonotor(row, column, event) {
       this.curCase = row;
       this.getfundList();
     },
+
+    //鑾峰彇妗堜緥涓撳璐圭敤鐢宠鍗�
     getfundList() {
       this.loading = true;
       this.reset();
@@ -825,11 +1057,6 @@
         row.servicesscope = null;
         row.servicesscopename = "";
       });
-    },
-    // 鍙栨秷鎸夐挳
-    cancel() {
-      this.dialogOpen = false;
-      this.reset();
     },
 
     // 琛ㄥ崟閲嶇疆
@@ -947,128 +1174,7 @@
       // });
     },
 
-    /** 鎻愪氦鎸夐挳 */
-    submitForm() {
-      this.$refs["form"].validate((valid) => {
-        if (valid) {
-          let formData = this.form;
-          let totalPreTaxAmount = 0.0;
-          let totalAfterTaxAmount = 0.0;
-          let totalAmount = 0.0;
-          for (let k = 0; k < this.fundDetailArr.length; k++) {
-            let tempDetail = this.fundDetailArr[k];
-            if (tempDetail.itemid == null) {
-              this.$modal.msgWarning("璇烽�夋嫨鏈嶅姟椤圭洰");
-              return;
-            }
-            //鍒ゆ柇鍗曚綅 unitSel
-            // try {
-            //   //鑾峰彇鏈嶅姟椤圭洰鏄庣粏
-            //   let unitIndex = this.unitList.findIndex(
-            //     (item) => tempDetail.unitno == item.organizationid
-            //   );
-            //   if (unitIndex > -1) {
-            //     tempDetail.unitname = this.unitList[unitIndex].organizationname;
-            //   }
-            //   else{
-            //     tempDetail.unitname = tempDetail.unitno;
-            //   }
-            // } catch {
-            //   tempDetail.unitname = tempDetail.unitno;
-            // }
-            if (!isNaN(parseFloat(tempDetail.amount))) {
-              totalPreTaxAmount += parseFloat(tempDetail.amount);
-              totalAmount += parseFloat(tempDetail.amount);
-            }
-            if (!isNaN(parseFloat(tempDetail.taxedamount))) {
-              totalAfterTaxAmount += parseFloat(tempDetail.taxedamount);
-              totalAmount += parseFloat(tempDetail.taxedamount);
-            }
-          }
-          try {
-            this.form.unitname = this.$refs.orgSelecter.getOptionByValue(
-              this.form.unitno
-            ).organizationname;
-          } catch {
-            this.form.treatmenthospitalname = this.form.treatmenthospitalno;
-          }
-          this.form.pretaxcost = parseFloat(totalPreTaxAmount).toFixed(2);
-          this.form.taxedcost = parseFloat(totalAfterTaxAmount).toFixed(2);
-          this.form.amountrequested = totalAmount.toFixed(2);
 
-          this.loading = true;
-          //闄勪欢澶勭悊
-          let list = this.fileList;
-          if (list.length > 0) {
-            this.form.annexbankcard = list.map(item => item.url).join(",");
-          }
-          
-          if (this.form.id != null) {
-            updateFund(this.form).then((response) => {
-              this.getfundList();
-              this.dialogOpen = false;
-              this.getList();
-              this.selectDonotor(this.curCase);
-              this.$modal.msgSuccess("淇敼鎴愬姛");
-              this.loading = false;
-              for (let m = 0; m < this.fundDetailArr.length; m++) {
-                let tempData = this.fundDetailArr[m];
-                let tempItemArr = tempData.itemArr;
-                tempData.fundid = formData.id;
-                //鑾峰彇鏈嶅姟椤圭洰鏄庣粏
-                let itemIndex = tempItemArr.findIndex(
-                  (item) => tempData.itemid == item.id
-                );
-                if (itemIndex > -1) {
-                  tempData.itemname = tempItemArr[itemIndex].itemName;
-                  tempData.itemid = tempItemArr[itemIndex].id;
-                }
-                if (tempData.id > 0) {
-                  updateFunddetail(tempData).then((response2) => { });
-                } else {
-                  addFunddetail(tempData).then((response2) => { });
-                }
-              }
-            });
-          } else {
-            //淇濆瓨璐圭敤鐢宠
-            for (let m = 0; m < this.fundDetailArr.length; m++) {
-              let tempData = this.fundDetailArr[m];
-              let tempUtemArr = tempData.itemArr;
-              //鑾峰彇鏈嶅姟椤圭洰鏄庣粏
-              let itemIndex = tempUtemArr.findIndex(
-                (item) => tempData.itemid == item.id
-              );
-              if (itemIndex > -1) {
-                tempData.itemname = tempUtemArr[itemIndex].itemName;
-                tempData.itemid = tempUtemArr[itemIndex].id;
-              }
-              //鑾峰彇applytypename
-              let applytypeIndex = this.fundtypeArr.findIndex(
-                (item) => tempData.applytype == item.value
-              );
-              if (applytypeIndex > -1) {
-                tempData.applytypename = this.fundtypeArr[applytypeIndex].label;
-              }
-              this.fundDetailArr[m] = tempData;
-            }
-
-            this.form.serviceFunddetails = this.fundDetailArr;
-            addorupdateFund(this.form).then((response) => {
-              if (response.code === 200) {
-                this.$modal.msgSuccess("鏂板鎴愬姛");
-                this.loading = false;
-                this.selectDonotor(this.curCase);
-              } else {
-                this.$modal.msgError("鏂板澶辫触锛�" + response.msg);
-                this.loading = false;
-              }
-            });
-            this.dialogOpen = false;
-          }
-        }
-      });
-    },
     selectremark(row) {
       this.fundblock.forEach((item, i) => {
         if (item.expensedescribe === row.servicesscopename) {
@@ -1105,90 +1211,7 @@
       });
     },
 
-    /** 淇敼鎸夐挳鎿嶄綔 */
-    handleUpdate(row) {
-      this.isopen = 0;
-      this.reset();
-      this.queryParams.params = {};
-      this.dialogOpen = true;
-      this.title = "淇敼璐圭敤鐢宠";
-      this.dialogType = "edit";
 
-      const id = row.id || this.ids;
-      getFund(id).then((response) => {
-        this.form = response.data;
-        //闄勪欢澶勭悊
-        this.fileList = this.form.annexbankcard ? this.form.annexbankcard.split(",").map(item => ({ url: item, name: item })) : []
-
-        getownFundDetail(id).then(async (res) => {
-          this.fundDetailArr = res.data;
-          for (let m = 0; m < this.fundDetailArr.length; m++) {
-            this.fundDetailArr[m].itemArr = [];
-            this.getItemArr(m, this.fundDetailArr[m]);
-          }
-        });
-      });
-    },
-
-    /** 鏌ョ湅鎸夐挳鎿嶄綔 */
-    handleDetail(row) {
-      this.isopen = 0;
-      this.reset();
-      this.queryParams.params = {};
-      this.dialogOpen = true;
-      this.title = "鏌ョ湅璐圭敤鐢宠";
-      this.dialogType = "detail";
-      const id = row.id || this.ids;
-
-      getFund(id).then((response) => {
-        this.form = response.data;
-        let listFundflowparams = {
-          fundid: row.id,
-          fundtype: 2,
-        };
-        //闄勪欢澶勭悊
-        this.fileList = this.form.annexbankcard ? this.form.annexbankcard.split(",").map(item => ({ url: item, name: item })) : []
-
-        listFundflow(listFundflowparams).then((res) => {
-          this.fundflowList = res.rows;
-        });
-        getownFundDetail(id).then((res) => {
-          this.fundDetailArr = res.data;
-          for (let m = 0; m < this.fundDetailArr.length; m++) {
-            this.fundDetailArr[m].itemArr = [];
-            this.getItemArr(m, this.fundDetailArr[m]);
-            this.fundDetailArr[m].fundblock = [];
-            this.fundDetailArr[m].fundblock.push({
-              expense: this.fundDetailArr[m].expense,
-              expensedescribe: this.fundDetailArr[m].servicesscopename,
-              remark: this.fundDetailArr[m].servicesscope,
-              servicesscope: this.fundDetailArr[m].servicesscope,
-            });
-          }
-        });
-      });
-    },
-
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal
-        .confirm("鏄惁纭鍒犻櫎璇ヨ褰曪紵")
-        .then(function () {
-          return delFund(ids);
-        })
-        .then(() => {
-          getownFundDetail(ids).then((res) => {
-            let listdetails = res.data;
-            for (let i = 0; i < listdetails.length; i++) {
-              delFunddetail(listdetails[i].id);
-            }
-          });
-          // this.getList();
-          this.getfundList();
-          this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
-        })
-        .catch(() => { });
-    },
 
     deleteRows(row, index, rows) {
       this.$confirm("鏄惁纭鍒犻櫎?", "鎻愮ず", {
@@ -1327,7 +1350,7 @@
       });
     },
 
-    //姹囨�绘墦鍗�
+    //涓嬭浇鎵撳嵃
     totaldayin(e) {
       // const id =this.row.id
       getdownloadBX(e).then((res) => {
@@ -1349,6 +1372,7 @@
         }
       });
     },
+
     selectReporters() {
       //涓撳浜哄憳鍒楄〃
       let arr = ["zzry"];
@@ -1361,6 +1385,7 @@
         });
       }
     },
+
     getlistExternalperson() {
       listExternalperson().then((res) => {
         this.personlist = res.rows;
@@ -1383,6 +1408,18 @@
         }
       });
     },
+
+    getUnitList() {
+      listOrganization(3).then((response) => {
+        for (let i = 0; i < response.rows.length; i++) {
+          this.unitList.push({
+            organizationid: response.rows[i].organizationid,
+            organizationname: response.rows[i].organizationname,
+          });
+        }
+      });
+    },
+
     SearchItem(val, scope) {
       let result = [];
       if (val != "") {
@@ -1402,17 +1439,6 @@
           //this.$set(this.fundDetailArr, rowindex, row);
         });
       }
-    },
-
-    getUnitList() {
-      listOrganization(3).then((response) => {
-        for (let i = 0; i < response.rows.length; i++) {
-          this.unitList.push({
-            organizationid: response.rows[i].organizationid,
-            organizationname: response.rows[i].organizationname,
-          });
-        }
-      });
     },
 
     addAlls() {
@@ -1478,7 +1504,59 @@
       a.href = url;
       a.dispatchEvent(event);
     },
+
+    ShowDetailDialog(spoce, showType) {
+      this.funddetailForm.index = spoce.$index;
+      this.funddetailForm.beneficiaryno = spoce.row.beneficiaryno;
+      this.funddetailForm.beneficiaryname = spoce.row.beneficiaryname;
+      this.funddetailForm.unitno = spoce.row.unitno;
+      this.funddetailForm.unitname = spoce.row.unitname;
+      this.detailInfoDialogShow = true;
+      this.detailInfoDialogShowType = showType;
+    },
+    ConfirmDetailDialog() {
+      let tempIndex = this.funddetailForm.index;
+      let tempName = this.funddetailForm.beneficiaryname;
+      let tempUnitname = this.funddetailForm.unitname;
+      let singleDetail = this.fundDetailArr[tempIndex];
+      if (this.detailInfoDialogShowType == "name") {
+        this.personlist.map((res) => {
+          if (tempName == res.username) {
+            singleDetail.beneficiaryno = res.userno;
+            singleDetail.beneficiaryname = res.username;
+            singleDetail.bankcardno = res.bankcardno;
+            singleDetail.branchbankname = res.branchbankname;
+            singleDetail.depositbank = res.depositbank;
+            singleDetail.idcardno = res.idcardno;
+            singleDetail.phone = res.telephone;
+            singleDetail.title = res.title;
+            singleDetail.unitname = res.unitname;
+            singleDetail.unitno = parseInt(res.unitno);
+          } else {
+            singleDetail.beneficiaryname = tempName;
+            singleDetail.beneficiaryno = tempName;
+          }
+        });
+      } else if (this.detailInfoDialogShowType == "unit") {
+        singleDetail.unitno = this.funddetailForm.unitno;
+        try {
+          let unitIndex = this.unitList.findIndex(
+            (item) => singleDetail.unitno == item.organizationid
+          );
+          if (unitIndex > -1) {
+            singleDetail.unitname = this.unitList[unitIndex].organizationname;
+          } else {
+            singleDetail.unitname = singleDetail.unitno;
+          }
+        } catch {
+          singleDetail.unitname = singleDetail.unitno;
+        }
+      }
+      this.fundDetailArr[tempIndex] = singleDetail;
+      this.detailInfoDialogShow = false;
+    },
   },
+
   //鐢熷懡鍛ㄦ湡 - 鍒涘缓瀹屾垚锛堝彲浠ヨ闂綋鍓峵his瀹炰緥锛�
   created() {
     this.getUnitList();
@@ -1500,6 +1578,7 @@
   beforeDestroy() { }, //鐢熷懡鍛ㄦ湡 - 閿�姣佷箣鍓�
   destroyed() { }, //鐢熷懡鍛ㄦ湡 - 閿�姣佸畬鎴�
   activated() { }, //濡傛灉椤甸潰鏈塳eep-alive缂撳瓨鍔熻兘锛岃繖涓嚱鏁颁細瑙﹀彂
+
 };
 </script>
 <style scoped>
diff --git a/src/views/project/fund/expertFeeApply/index.vue b/src/views/project/fund/expertFeeApply/index.vue
index a22f99a..8fd5b0e 100644
--- a/src/views/project/fund/expertFeeApply/index.vue
+++ b/src/views/project/fund/expertFeeApply/index.vue
@@ -51,10 +51,6 @@
         <el-card shadow="naver">
           <el-form ref="infoform" label-width="100px">
             <el-row :gutter="4" align="right" class="mb8">
-              <el-col :span="1.5">
-                <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-                  v-hasPermi="['project:expretfund:add']">涓撳璐圭敤鐢宠</el-button>
-              </el-col>
               <el-col :span="9">
                 <el-form-item label="鎹愮尞缂栧彿">
                   <el-input v-model="curCase.donorno" :disabled="true"></el-input>
@@ -66,7 +62,12 @@
                 </el-form-item>
               </el-col>
               <el-col>
-                <!-- <el-button round @click='totaldayin'>涓嬭浇</el-button> -->
+              </el-col>
+            </el-row>
+            <el-row :gutter="10" class="mb8">
+              <el-col :span="1.5">
+                <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+                  v-hasPermi="['project:expretfund:add']">鏂板鐢宠鍗�</el-button>
               </el-col>
             </el-row>
             <el-row>
@@ -860,6 +861,24 @@
     /** 鏂板鎸夐挳鎿嶄綔 */
     handleAdd() {
       if (this.curCase.id) {
+        this.$router.push({
+          path: "/finance/applyDetail/",
+          query: {
+            id: 0,
+            businessType: "1",
+            operationType: "add",
+            curCase: this.curCase
+          }
+        });
+      } else {
+        const h = this.$createElement;
+        this.$message({
+          message: h("p", null, [h("span", null, "璇峰湪宸﹁竟鐨勬崘鐚渚嬭〃閫夋嫨闇�瑕佹搷浣滅殑妗堜緥锛�")]),
+        });
+      }
+      return;
+
+      if (this.curCase.id) {
         this.istrue += 2;
         this.reset();
         this.queryParams.params = {};
@@ -892,6 +911,17 @@
 
     /** 淇敼鎸夐挳鎿嶄綔 */
     handleUpdate(row) {
+      this.$router.push({
+        path: "/finance/applyDetail/",
+        query: {
+          id: row.id,
+          businessType: "1",
+          operationType: "update",
+          curCase: this.curCase
+        }
+      });
+      return;
+      
       this.isopen = 0;
       this.reset();
       this.queryParams.params = {};
@@ -943,6 +973,17 @@
 
     /** 鏌ョ湅鎸夐挳鎿嶄綔 */
     handleDetail(row) {
+      this.$router.push({
+        path: "/finance/applyDetail/",
+        query: {
+          id: row.id,
+          businessType: "1",
+          operationType: "detail",
+          curCase: this.curCase
+        }
+      });
+      return;
+
       this.isopen = 0;
       this.reset();
       this.queryParams.params = {};
@@ -1016,7 +1057,6 @@
           //鏌ユ壘鏄惁瀛樺湪鐧昏瀹屾垚璁板綍
           //鍒ゆ柇鏄惁瀛樺湪涓婃姤璁板綍
           row.recordstatus = 0;
-          console.log("updateFund", row);
           updateFund(row).then((response) => {
             if (response.code == 200) {
               this.$message({
@@ -1145,7 +1185,6 @@
 
                   this.totalAfterTaxAmount += parseFloat(tempDetail.taxedamount);
                   this.totalAmount += parseFloat(tempDetail.amount);
-                  console.log("1", this.amount);
                 }
               });
             }
@@ -1297,7 +1336,6 @@
           //浠庝笓瀹跺垪琛ㄨ幏鍙栦俊鎭�
           this.personlist.map((res) => {
             if (tempName == res.username) {
-              console.log("閫夋嫨涓撳", res);
               singleDetail.beneficiaryno = res.userno;
               singleDetail.beneficiaryname = res.username;
               singleDetail.bankcardno = res.bankcardno;
@@ -1351,11 +1389,9 @@
 
               listExternalperson().then((res) => {
                 this.personlist = res.rows;
-                console.log("new personlist", this.personlist);
                 //浠庝笓瀹跺垪琛ㄨ幏鍙栦俊鎭�
                 this.personlist.map((res) => {
                   if (res.username == this.funddetailForm.expertname) {
-                    console.log("鏂板涓撳", res);
                     singleDetail.beneficiaryno = res.userno;
                     singleDetail.beneficiaryname = res.username;
                     singleDetail.bankcardno = res.bankcardno;
@@ -1396,7 +1432,6 @@
     //鑾峰彇褰撳墠鐢ㄦ埛淇℃伅
     getUsermsg() {
       getUserProfile().then((response) => {
-        console.log("getUserProfile", response);
         this.defaultperson = response.data;
         this.standardlevel = response.data.standardlevel;
         if (this.defaultperson.createBy == "admin" || this.defaultperson.createBy == "001" || this.defaultperson.createBy == "002") {
@@ -1438,14 +1473,16 @@
           row.itemcode = res.itemCode;
         }
       });
-      var repeatNum = 0;
-      this.fundDetails.map((res) => {
-        if (res.applytype === row.applytype && res.itemid == row.itemid) {
-          repeatNum++;
+      if (this.businessType == '1') {
+        var repeatNum = 0;
+        this.fundDetails.map((res) => {
+          if (res.applytype === row.applytype && res.itemid == row.itemid) {
+            repeatNum++;
+          }
+        });
+        if (repeatNum > 1) {
+          this.$modal.msgWarning("鎮ㄥ凡缁忔彁浜よ繃璇ユ湇鍔¢」鐩簡");
         }
-      });
-      if (repeatNum > 1) {
-        this.$modal.msgWarning("鎮ㄥ凡缁忔彁浜よ繃璇ユ湇鍔¢」鐩簡");
       }
 
       //鑾峰彇璐圭敤椤圭洰鐨勮缁嗕俊鎭�
@@ -1488,7 +1525,6 @@
       }
       // this.queryParams.residencetown = this.$refs.areaSelect.getQu();
 
-      console.log("111", this.queryParams);
       listDonatebaseinfo(this.queryParams).then((response) => {
         this.donatebaseinfoList = response.rows;
         this.total = response.total;
@@ -1744,7 +1780,6 @@
 
     getUserList() {
       listUser().then((res) => {
-        console.log("listUser", res);
         this.userlist = res.data;
       });
     },
diff --git a/src/views/project/fund/medicalCostApply/index.vue b/src/views/project/fund/medicalCostApply/index.vue
index bb076d5..50cd556 100644
--- a/src/views/project/fund/medicalCostApply/index.vue
+++ b/src/views/project/fund/medicalCostApply/index.vue
@@ -51,11 +51,6 @@
         <el-card shadow="naver">
           <el-form ref="infoform" label-width="100px">
             <el-row :gutter="4" align="right" class="mb8">
-              <el-col :span="1.5">
-                <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-                  v-hasPermi="['project:medicalfund:add']">鍖诲鎴愭湰鐢宠</el-button>
-              </el-col>
-
               <el-col :span="9">
                 <el-form-item label="鎹愮尞缂栧彿">
                   <el-input v-model="curCase.donorno" :disabled="true"></el-input>
@@ -67,6 +62,12 @@
                 </el-form-item>
               </el-col>
               <el-col> </el-col>
+            </el-row>
+            <el-row :gutter="10" class="mb8">
+              <el-col :span="1.5">
+                <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+                  v-hasPermi="['project:medicalfund:add']">鏂板鐢宠鍗�</el-button>
+              </el-col>
             </el-row>
             <el-row>
               <el-table v-loading="loading" border :data="donateconsolationfundList">
@@ -769,15 +770,22 @@
 
     /** 鏂板鎸夐挳鎿嶄綔 */
     handleAdd() {
-      this.$router.push({
-        path: "/finance/applyDetail/",
-        query: {
-          id: 0,
-          businessType: "3",
-          operationType: "add",
-          curCase: this.curCase
-        }
-      });
+      if (this.curCase.id) {
+        this.$router.push({
+          path: "/finance/applyDetail/",
+          query: {
+            id: 0,
+            businessType: "3",
+            operationType: "add",
+            curCase: this.curCase
+          }
+        });
+      } else {
+        const h = this.$createElement;
+        this.$message({
+          message: h("p", null, [h("span", null, "璇峰湪宸﹁竟鐨勬崘鐚渚嬭〃閫夋嫨闇�瑕佹搷浣滅殑妗堜緥锛�")]),
+        });
+      }
       return;
 
       if (this.curCase.id) {
@@ -1107,7 +1115,7 @@
       listFund(this.fundQueryParam).then(response => {
         this.loading = false;
         this.donateconsolationfundList = response.rows;
-        console.log("donateconsolationfundList",this.donateconsolationfundList);
+        console.log("donateconsolationfundList", this.donateconsolationfundList);
       });
     },
 
diff --git a/src/views/project/fund/officeExpenseApply/index.vue b/src/views/project/fund/officeExpenseApply/index.vue
index 6afd8ef..91215ec 100644
--- a/src/views/project/fund/officeExpenseApply/index.vue
+++ b/src/views/project/fund/officeExpenseApply/index.vue
@@ -33,7 +33,7 @@
           @click="handleExport">瀵煎嚭</el-button>
       </el-col>
       <!-- v-hasPermi="['project:medicalfund:export']" -->
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
     </el-row>
     <el-table v-loading="loading" border :data="donateconsolationfundList">
       <el-table-column label="鐢宠鏃ユ湡" align="center" prop="createTime" width="180px">
@@ -892,6 +892,22 @@
         });
       });
     },
+    
+    /** 瀵煎嚭鎸夐挳鎿嶄綔 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$modal
+        .confirm("鏄惁纭瀵煎嚭鎵�鏈夋姤閿�鐢宠鏁版嵁椤癸紵")
+        .then(() => {
+          this.exportLoading = true;
+          return exportReimbursement(queryParams);
+        })
+        .then(response => {
+          this.$download.name(response.msg);
+          this.exportLoading = false;
+        })
+        .catch(() => {});
+    },
 
     handleDelete(row) {
       const ids = row.id || this.ids;
diff --git a/src/views/project/fundcheck/medicalCostCheck/index.vue b/src/views/project/fundcheck/medicalCostCheck/index.vue
index 97a0d55..aad447f 100644
--- a/src/views/project/fundcheck/medicalCostCheck/index.vue
+++ b/src/views/project/fundcheck/medicalCostCheck/index.vue
@@ -72,9 +72,9 @@
           <el-table-column label="鎿嶄綔" fixed="right" align="center" class-name="small-padding fixed-width" width="260px">
             <template slot-scope="scope">
               <el-button v-if="scope.row.checkFlag == 1" size="mini" type="text" icon="el-icon-edit"
-                @click="handleUpdate(scope.row)">瀹℃牳</el-button>
+                @click="handleCheck(scope.row)">瀹℃牳</el-button>
               <!-- v-hasPermi="['project:donateconsolationfund:edit']" -->
-              <el-button size="mini" type="text" icon="el-icon-edit" @click="handleShow(scope.row)">璇︽儏</el-button>
+              <el-button size="mini" type="text" icon="el-icon-edit" @click="handleDetail(scope.row)">鏌ョ湅</el-button>
               <el-button size="mini" type="text" icon="el-icon-download" @click="totaldayin(scope.row.id)">涓嬭浇</el-button>
               <!-- v-hasPermi="['project:donateconsolationfund:download']" -->
 
@@ -912,7 +912,7 @@
       }
     },
     /** 淇敼鎸夐挳鎿嶄綔 */
-    handleUpdate(row) {
+    handleCheck(row) {
       this.$router.push({
         path: "/finance/applyDetail/",
         query: {
@@ -953,7 +953,17 @@
     },
 
     //鏌ョ湅瀹℃牳璇︽儏
-    handleShow(row) {
+    handleDetail(row) {
+      this.$router.push({
+        path: "/finance/applyDetail/",
+        query: {
+          id: row.id,
+          businessType: "3",
+          operationType: "detail"
+        }
+      });
+      return;
+
       this.isopen = 0;
       this.reset();
       this.queryParams.params = {};
diff --git a/src/views/project/travelexpenseapply/index.vue b/src/views/project/travelexpenseapply/index.vue
index 6342f60..d5a9478 100644
--- a/src/views/project/travelexpenseapply/index.vue
+++ b/src/views/project/travelexpenseapply/index.vue
@@ -1,12 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form
-      :model="queryParams"
-      ref="queryForm"
-      :inline="true"
-      v-show="showSearch"
-      label-width="68px"
-    >
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <el-row>
         <!--
         <el-col :span="6">
@@ -18,68 +12,31 @@
 -->
         <el-col :span="6">
           <el-form-item label="缁忓姙浜�" prop="username">
-            <el-input
-              v-model="queryParams.username"
-              placeholder="璇疯緭鍏ョ粡鍔炰汉"
-              clearable
-              size="small"
-              @keyup.enter.native="handleQuery"
-            />
+            <el-input v-model="queryParams.username" placeholder="璇疯緭鍏ョ粡鍔炰汉" clearable size="small"
+              @keyup.enter.native="handleQuery" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="鎶ラ攢鏃ユ湡" prop="createTime">
-            <el-date-picker
-              format="yyyy-MM-dd"
-              value-format="yyyy-MM-dd"
-              v-model="value1"
-              type="daterange"
-              @blur="onpick"
-              range-separator="鑷�"
-              start-placeholder="鎶ラ攢寮�濮嬫棩鏈�"
-              end-placeholder="鎶ラ攢缁撴潫鏃ユ湡"
-              @keyup.enter.native="handleQuery"
-            >
+            <el-date-picker format="yyyy-MM-dd" value-format="yyyy-MM-dd" v-model="value1" type="daterange" @blur="onpick"
+              range-separator="鑷�" start-placeholder="鎶ラ攢寮�濮嬫棩鏈�" end-placeholder="鎶ラ攢缁撴潫鏃ユ湡" @keyup.enter.native="handleQuery">
             </el-date-picker>
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="瀹℃牳鐘舵��" prop="recordstatus">
-            <el-input
-              v-model="queryParams.recordstatus"
-              placeholder="璇烽�夋嫨瀹℃牳鐘舵��"
-              clearable
-              size="small"
-              v-if="0"
-              @keyup.enter.native="handleQuery"
-            />
-            <el-select
-              v-model="queryParams.recordstatus"
-              placeholder="璇烽�夋嫨瀹℃牳鐘舵��"
-              clearable
-              size="small"
-            >
-              <el-option
-                v-for="dict in dict.type.sys_recordstatus"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              />
+            <el-input v-model="queryParams.recordstatus" placeholder="璇烽�夋嫨瀹℃牳鐘舵��" clearable size="small" v-if="0"
+              @keyup.enter.native="handleQuery" />
+            <el-select v-model="queryParams.recordstatus" placeholder="璇烽�夋嫨瀹℃牳鐘舵��" clearable size="small">
+              <el-option v-for="dict in dict.type.sys_recordstatus" :key="dict.value" :label="dict.label"
+                :value="dict.value" />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="4">
           <el-form-item>
-            <el-button
-              type="primary"
-              icon="el-icon-search"
-              size="mini"
-              @click="handleQuery"
-              >鎼滅储</el-button
-            >
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-              >閲嶇疆</el-button
-            >
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
           </el-form-item>
         </el-col>
       </el-row>
@@ -87,97 +44,42 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          >鏂板</el-button
-        >
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">鏂板</el-button>
         <!-- v-hasPermi="['project:funddetail:add']" -->
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          :loading="exportLoading"
-          @click="handleExport"
-          >瀵煎嚭</el-button
-        >
+        <el-button type="warning" plain icon="el-icon-download" size="mini" :loading="exportLoading"
+          @click="handleExport">瀵煎嚭</el-button>
       </el-col>
       <!-- v-hasPermi="['project:funddetail:export']" -->
-      <right-toolbar
-        :showSearch.sync="showSearch"
-        @queryTable="getList"
-      ></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table
-      border
-      v-loading="loading"
-      :data="reimbursementList"
-      @selection-change="handleSelectionChange"
-    >
+    <el-table border v-loading="loading" :data="reimbursementList" @selection-change="handleSelectionChange">
       <!-- <el-table-column type="selection" width="55" align="center" /> 
       <el-table-column label="鎶ラ攢浜虹被鍒�" width="120" align="center" prop="costtype">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_travelexpensebelong" :value="scope.row.costtype" />
         </template>
       </el-table-column>-->
-      <el-table-column
-        label="鐢宠鏃堕棿"
-        width="150"
-        align="center"
-        prop="createTime"
-      >
+      <el-table-column label="鐢宠鏃堕棿" width="150" align="center" prop="createTime">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column
-        label="瀹℃牳鐘舵��"
-        align="center"
-        prop="recordstatus"
-        width="160"
-      >
+      <el-table-column label="瀹℃牳鐘舵��" align="center" prop="recordstatus" width="160">
         <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.sys_recordstatus"
-            :value="scope.row.recordstatus"
-          />
+          <dict-tag :options="dict.type.sys_recordstatus" :value="scope.row.recordstatus" />
         </template>
       </el-table-column>
-      <el-table-column
-        label="缁忓姙浜�"
-        width="150"
-        align="center"
-        prop="username"
-      />
+      <el-table-column label="缁忓姙浜�" width="150" align="center" prop="username" />
       <!--
       <el-table-column label="鍑哄樊浜�" width="180" align="center" prop="travelers">
       </el-table-column>-->
-      <el-table-column
-        label="鎶ラ攢閲戦"
-        width="150"
-        align="center"
-        prop="amountrequested"
-      >
+      <el-table-column label="鎶ラ攢閲戦" width="150" align="center" prop="amountrequested">
       </el-table-column>
-      <el-table-column
-        label="鎵�灞炵粍鍒�"
-        width="150"
-        align="center"
-        prop="deptmentname"
-      />
-      <el-table-column
-        label="缁勯暱"
-        width="150"
-        align="center"
-        prop="managername"
-      />
+      <el-table-column label="鎵�灞炵粍鍒�" width="150" align="center" prop="deptmentname" />
+      <el-table-column label="缁勯暱" width="150" align="center" prop="managername" />
       <el-table-column label="鍑哄樊浜嬬敱" align="center" prop="reason" />
       <!-- <el-table-column label="鑱旂郴鐢佃瘽" width="120" align="center" prop="phone">
       </el-table-column>
@@ -187,115 +89,47 @@
       </el-table-column>
       <el-table-column label="鎶ラ攢鍚堣" align="center" prop="financechecher"/>-->
       <!-- <el-table-column label="璐㈠姟瀹℃牳" width="120" align="center" prop="financechecher" /> -->
-      <el-table-column
-        label="鎹愮尞鑰�"
-        width="150"
-        align="center"
-        prop="donorname"
-      />
-      <el-table-column
-        label="鎿嶄綔"
-        align="center"
-        fixed="right"
-        class-name="small-padding fixed-width"
-        width="210"
-      >
+      <el-table-column label="鎹愮尞鑰�" width="150" align="center" prop="donorname" />
+      <el-table-column label="鎿嶄綔" align="center" fixed="right" class-name="small-padding fixed-width" width="210">
         <template slot-scope="scope">
-          <el-button
-            v-if="scope.row.recordstatus == -1 || scope.row.recordstatus == 1"
-            size="mini"
-            type="text"
-            icon="el-icon-upload2"
-            @click="handleup(scope.row)"
-            >涓婃姤</el-button
-          >
-          <el-button
-            v-if="scope.row.recordstatus == -1 || scope.row.recordstatus == 1"
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            >淇敼</el-button
-          >
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleDetail(scope.row)"
-            >鏌ョ湅</el-button
-          >
+          <el-button v-if="scope.row.recordstatus == -1 || scope.row.recordstatus == 1" size="mini" type="text"
+            icon="el-icon-upload2" @click="handleup(scope.row)">涓婃姤</el-button>
+          <el-button v-if="scope.row.recordstatus == -1 || scope.row.recordstatus == 1" size="mini" type="text"
+            icon="el-icon-edit" @click="handleUpdate(scope.row)">淇敼</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleDetail(scope.row)">鏌ョ湅</el-button>
           <!-- v-hasPermi="['project:funddetail:edit']" -->
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-download"
-            @click="gettable(scope.row)"
-          >
+          <el-button size="mini" type="text" icon="el-icon-download" @click="gettable(scope.row)">
             涓嬭浇
           </el-button>
           <!-- v-hasPermi="['project:funddetail:edit']" -->
-          <el-button
-            v-if="scope.row.recordstatus == -1 || scope.row.recordstatus == 1"
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            >鍒犻櫎</el-button
-          >
+          <el-button v-if="scope.row.recordstatus == -1 || scope.row.recordstatus == 1" size="mini" type="text"
+            icon="el-icon-delete" @click="handleDelete(scope.row)">鍒犻櫎</el-button>
           <!-- v-hasPermi="['project:funddetail:remove']" -->
         </template>
       </el-table-column>
     </el-table>
     <!-- v-hasPermi="['project:donateconsolationfund:edit']" -->
 
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
     <!-- 娣诲姞鎴栦慨鏀硅垂鐢ㄧ敵璇锋槑缁嗗璇濇 -->
-    <el-dialog
-      :title="title"
-      :visible.sync="open"
-      :close-on-click-modal="false"
-      width="1400px"
-      append-to-body
-      @close="reset"
-    >
+    <el-dialog :title="title" :visible.sync="open" :close-on-click-modal="false" width="1400px" append-to-body
+      @close="reset">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <el-row
-          ><el-col :span="5">
+        <el-row><el-col :span="5">
             <el-form-item label="鐢宠鏃ユ湡" prop="createTime">
-              <el-date-picker
-                style="width: 100%"
-                v-model="form.createTime"
-                type="date"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                placeholder="鐢宠鏃ユ湡"
-              >
+              <el-date-picker style="width: 100%" v-model="form.createTime" type="date" value-format="yyyy-MM-dd HH:mm:ss"
+                placeholder="鐢宠鏃ユ湡">
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="5">
             <el-form-item label="缁忓姙浜�" prop="username">
-              <el-select
-                v-model="form.username"
-                clearable
-                filterable
-                allow-create
-                ref="getReportname"
-                default-first-option
-                placeholder="璇烽�夋嫨"
-              >
-                <el-option
-                  v-for="item in personsList"
-                  :key="item.reportNo"
-                  :label="item.reportName"
-                  :value="item.reportName"
-                >
+              <el-select v-model="form.username" clearable filterable allow-create ref="getReportname"
+                default-first-option placeholder="璇烽�夋嫨">
+                <el-option v-for="item in personsList" :key="item.reportNo" :label="item.reportName"
+                  :value="item.reportName">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -320,18 +154,8 @@
           </el-col>
           <el-col :span="5">
             <el-form-item label="鎹愮尞鑰�" prop="infoid">
-              <el-select
-                v-model="form.infoid"
-                @change="selectbaseinfo"
-                filterable
-                placeholder="璇烽�夋嫨鎹愮尞鑰�"
-              >
-                <el-option
-                  v-for="item in baselist"
-                  :key="item.index"
-                  :label="item.name"
-                  :value="item.infoid"
-                >
+              <el-select v-model="form.infoid" @change="selectbaseinfo" filterable placeholder="璇烽�夋嫨鎹愮尞鑰�">
+                <el-option v-for="item in baselist" :key="item.index" :label="item.name" :value="item.infoid">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -340,36 +164,17 @@
         <el-row style="margin-top: 10px">
           <el-col :span="5">
             <el-form-item label="鎶ラ攢閲戦" prop="amountrequested">
-              <el-input
-                :disabled="true"
-                v-model="form.amountrequested"
-                placeholder="鎶ラ攢鍚堣閲戦"
-              />
+              <el-input :disabled="true" v-model="form.amountrequested" placeholder="鎶ラ攢鍚堣閲戦" />
             </el-form-item>
           </el-col>
           <el-col :span="10">
             <el-form-item label="澶у啓閲戦" prop="bigstrmoney">
-              <el-input
-                :disabled="true"
-                v-model="form.bigstrmoney"
-                placeholder="鎶ラ攢澶у啓閲戦"
-              />
-            </el-form-item> </el-col
-          ><el-col :span="5">
+              <el-input :disabled="true" v-model="form.bigstrmoney" placeholder="鎶ラ攢澶у啓閲戦" />
+            </el-form-item> </el-col><el-col :span="5">
             <el-form-item label="瀹℃牳鐘舵��" prop="flowlevel">
-              <el-select
-                v-model="form.recordstatus"
-                placeholder="璇烽�夋嫨瀹℃牳鐘舵��"
-                clearable
-                :disabled="true"
-                size="small"
-              >
-                <el-option
-                  v-for="dict in dict.type.sys_recordstatus"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                />
+              <el-select v-model="form.recordstatus" placeholder="璇烽�夋嫨瀹℃牳鐘舵��" clearable :disabled="true" size="small">
+                <el-option v-for="dict in dict.type.sys_recordstatus" :key="dict.value" :label="dict.label"
+                  :value="dict.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -476,263 +281,116 @@
         </el-row>
         <el-row>
           <el-table :data="rbDetails" border highlight-current-row>
-            <el-table-column
-              prop="orderno"
-              slot=""
-              label="搴忓彿"
-              align="center"
-              fixed
-              width="65"
-            >
+            <el-table-column prop="orderno" slot="" label="搴忓彿" align="center" fixed width="65">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.orderno" placeholder="搴忓彿" />
               </template>
             </el-table-column>
             <!--涓婚敭銆佸涓嶅睍绀�-->
-            <el-table-column
-              prop="id"
-              slot=""
-              label="涓婚敭"
-              align="center"
-              fixed
-              width="95"
-              v-if="false"
-            >
+            <el-table-column prop="id" slot="" label="涓婚敭" align="center" fixed width="95" v-if="false">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.id" placeholder="id" />
               </template>
             </el-table-column>
-            <el-table-column
-              prop="rbid"
-              slot=""
-              label="澶栭敭"
-              align="center"
-              fixed
-              width="95"
-              v-if="false"
-            >
+            <el-table-column prop="rbid" slot="" label="澶栭敭" align="center" fixed width="95" v-if="false">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.rbid" placeholder="rbid" />
               </template>
             </el-table-column>
 
-            <el-table-column
-              prop="persontype"
-              slot=""
-              label="浜哄憳绫诲埆"
-              align="center"
-              fixed
-              width="130"
-            >
+            <el-table-column prop="persontype" slot="" label="浜哄憳绫诲埆" align="center" fixed width="130">
               <template slot-scope="scope">
-                <el-select
-                  v-model="scope.row.persontype"
-                  value-key="value"
-                  placeholder="浜哄憳绫诲埆"
-                  @change="getPersons(scope.row)"
-                >
-                  <el-option
-                    v-for="dict in dict.type.sys_travelexpensebelong"
-                    :key="dict.value"
-                    :label="dict.label"
-                    :value="dict.label"
-                  ></el-option>
+                <el-select v-model="scope.row.persontype" value-key="value" placeholder="浜哄憳绫诲埆"
+                  @change="getPersons(scope.row)">
+                  <el-option v-for="dict in dict.type.sys_travelexpensebelong" :key="dict.value" :label="dict.label"
+                    :value="dict.label"></el-option>
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column
-              prop="personname"
-              slot=""
-              label="璐圭敤浜哄憳"
-              align="center"
-              fixed
-              width="110"
-            >
+            <el-table-column prop="personname" slot="" label="璐圭敤浜哄憳" align="center" fixed width="110">
               <template slot-scope="scope">
-                <el-select
-                  v-model="scope.row.personname"
-                  clearable
-                  filterable
-                  allow-create
-                  default-first-option
-                  placeholder="璇烽�夋嫨"
-                  @focus1="getPersons(scope.row)"
-                >
-                  <el-option
-                    v-for="item in personsSel"
-                    :key="item.reportNo"
-                    :label="item.reportName"
-                    :value="item.reportName"
-                  >
+                <el-select v-model="scope.row.personname" clearable filterable allow-create default-first-option
+                  placeholder="璇烽�夋嫨" @focus1="getPersons(scope.row)">
+                  <el-option v-for="item in personsSel" :key="item.reportNo" :label="item.reportName"
+                    :value="item.reportName">
                   </el-option>
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column
-              prop="starttime"
-              slot=""
-              label="寮�濮嬫棩鏈�"
-              fixed
-              align="center"
-              width="150"
-            >
+            <el-table-column prop="starttime" slot="" label="寮�濮嬫棩鏈�" fixed align="center" width="150">
               <template slot-scope="scope">
-                <el-date-picker
-                  :picker-options="{
-                    disabledDate: time => {
-                      if (scope.row.endtime) {
-                        return (
-                          time.getTime() >
-                          new Date(scope.row.endtime.replace(/-/g, '/'))
-                        );
-                      }
+                <el-date-picker :picker-options="{
+                  disabledDate: time => {
+                    if (scope.row.endtime) {
+                      return (
+                        time.getTime() >
+                        new Date(scope.row.endtime.replace(/-/g, '/'))
+                      );
                     }
-                  }"
-                  clearable
-                  size="small"
-                  style="width: 100%"
-                  v-model="scope.row.starttime"
-                  type="date"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  placeholder="寮�濮嬫棩鏈�"
-                  @blur="getdays(scope.row)"
-                >
+                  }
+                }" clearable size="small" style="width: 100%" v-model="scope.row.starttime" type="date"
+                  value-format="yyyy-MM-dd HH:mm:ss" placeholder="寮�濮嬫棩鏈�" @blur="getdays(scope.row)">
                 </el-date-picker>
               </template>
             </el-table-column>
-            <el-table-column
-              prop="endtime"
-              slot=""
-              label="缁撴潫鏃ユ湡"
-              align="center"
-              fixed
-              width="150"
-            >
+            <el-table-column prop="endtime" slot="" label="缁撴潫鏃ユ湡" align="center" fixed width="150">
               <template slot-scope="scope">
-                <el-date-picker
-                  :picker-options="{
-                    disabledDate: time => {
-                      if (scope.row.starttime) {
-                        return (
-                          time.getTime() <
-                          new Date(scope.row.starttime.replace(/-/g, '/'))
-                        );
-                      }
+                <el-date-picker :picker-options="{
+                  disabledDate: time => {
+                    if (scope.row.starttime) {
+                      return (
+                        time.getTime() <
+                        new Date(scope.row.starttime.replace(/-/g, '/'))
+                      );
                     }
-                  }"
-                  clearable
-                  size="small"
-                  style="width: 100%"
-                  v-model="scope.row.endtime"
-                  type="date"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  placeholder="缁撴潫鏃ユ湡"
-                  @blur="getdays(scope.row)"
-                >
+                  }
+                }" clearable size="small" style="width: 100%" v-model="scope.row.endtime" type="date"
+                  value-format="yyyy-MM-dd HH:mm:ss" placeholder="缁撴潫鏃ユ湡" @blur="getdays(scope.row)">
                 </el-date-picker>
               </template>
             </el-table-column>
-            <el-table-column
-              prop="departure"
-              slot=""
-              label="鍑哄彂鍦�"
-              align="center"
-              width="100"
-            >
+            <el-table-column prop="departure" slot="" label="鍑哄彂鍦�" align="center" width="100">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.departure" placeholder="鍑哄彂鍦�" />
               </template>
             </el-table-column>
-            <el-table-column
-              label="鍒拌揪鍦�"
-              prop="destination"
-              align="center"
-              width="140"
-            >
+            <el-table-column label="鍒拌揪鍦�" prop="destination" align="center" width="140">
               <template slot-scope="scope">
                 <!--  <el-input v-model="scope.row.destination" placeholder="鍒拌揪鍦�" @blur="getallowance(scope.row)" /> -->
-                <el-select
-                  filterable
-                  allow-create
-                  v-model="scope.row.destination"
-                  value-key="value"
-                  placeholder="鍒拌揪鍦�"
-                  @change="getallowance(scope.row)"
-                >
-                  <el-option
-                    v-for="dict in dict.type.sys_area_name"
-                    :key="dict.value"
-                    :label="dict.label"
-                    :value="dict.label"
-                  ></el-option>
+                <el-select filterable allow-create v-model="scope.row.destination" value-key="value" placeholder="鍒拌揪鍦�"
+                  @change="getallowance(scope.row)">
+                  <el-option v-for="dict in dict.type.sys_area_name" :key="dict.value" :label="dict.label"
+                    :value="dict.label"></el-option>
                 </el-select>
               </template>
             </el-table-column>
             <el-table-column prop="days" label="澶╂暟" width="65" align="center">
               <template slot-scope="scope">
-                <el-input
-                  v-model="scope.row.days"
-                  @blur="getallowance(scope.row)"
-                  placeholder="澶╂暟"
-                />
+                <el-input v-model="scope.row.days" @blur="getallowance(scope.row)" placeholder="澶╂暟" />
               </template>
             </el-table-column>
-            <el-table-column
-              prop="traffictype"
-              label="鍑哄彂浜ら�氬伐鍏�"
-              align="center"
-              width="100"
-            >
+            <el-table-column prop="traffictype" label="鍑哄彂浜ら�氬伐鍏�" align="center" width="100">
               <template slot-scope="scope">
-                <el-select
-                  v-model="scope.row.traffictype"
-                  placeholder="鍑哄彂浜ら�氬伐鍏�"
-                >
-                  <el-option
-                    v-for="dict in dict.type.sys_traffictype"
-                    :key="dict.value"
-                    :label="dict.label"
-                    :value="dict.label"
-                  ></el-option>
+                <el-select v-model="scope.row.traffictype" placeholder="鍑哄彂浜ら�氬伐鍏�">
+                  <el-option v-for="dict in dict.type.sys_traffictype" :key="dict.value" :label="dict.label"
+                    :value="dict.label"></el-option>
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column
-              prop="traffictype2"
-              label="杩斿洖浜ら�氬伐鍏�"
-              align="center"
-              width="100"
-            >
+            <el-table-column prop="traffictype2" label="杩斿洖浜ら�氬伐鍏�" align="center" width="100">
               <template slot-scope="scope">
-                <el-select
-                  v-model="scope.row.traffictype2"
-                  placeholder="杩斿洖浜ら�氬伐鍏�"
-                >
-                  <el-option
-                    v-for="dict in dict.type.sys_traffictype"
-                    :key="dict.value"
-                    :label="dict.label"
-                    :value="dict.label"
-                  ></el-option>
+                <el-select v-model="scope.row.traffictype2" placeholder="杩斿洖浜ら�氬伐鍏�">
+                  <el-option v-for="dict in dict.type.sys_traffictype" :key="dict.value" :label="dict.label"
+                    :value="dict.label"></el-option>
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column
-              prop="trafficexpense"
-              label="浜ら�氳垂"
-              align="center"
-              width="80"
-            >
+            <el-table-column prop="trafficexpense" label="浜ら�氳垂" align="center" width="80">
               <template slot-scope="scope">
-                <el-input
-                  v-model="scope.row.trafficexpense"
-                  placeholder="浜ら�氳垂"
-                  @blur="
-                    val => {
-                      sumRowFee(scope.row);
-                    }
-                  "
-                />
+                <el-input v-model="scope.row.trafficexpense" placeholder="浜ら�氳垂" @blur="val => {
+                    sumRowFee(scope.row);
+                  }
+                  " />
               </template>
             </el-table-column>
             <!--
@@ -747,144 +405,65 @@
               </template>
             </el-table-column>
                                                                                                                                       -->
-            <el-table-column
-              prop="hotelexpense"
-              label="浣忓璐�"
-              align="center"
-              width="80"
-            >
+            <el-table-column prop="hotelexpense" label="浣忓璐�" align="center" width="80">
               <template slot-scope="scope">
-                <el-input
-                  v-model="scope.row.hotelexpense"
-                  placeholder="浣忓璐�"
-                  @blur="
-                    val => {
-                      sumRowFee(scope.row);
-                    }
-                  "
-                />
+                <el-input v-model="scope.row.hotelexpense" placeholder="浣忓璐�" @blur="val => {
+                    sumRowFee(scope.row);
+                  }
+                  " />
               </template>
             </el-table-column>
 
-            <el-table-column
-              prop="foodexpenses"
-              label="椁愯垂鎶ラ攢"
-              align="center"
-              width="80"
-            >
+            <el-table-column prop="foodexpenses" label="椁愯垂鎶ラ攢" align="center" width="80">
               <template slot-scope="scope">
-                <el-input
-                  v-model="scope.row.foodexpenses"
-                  placeholder="浼欓璐规姤閿�"
-                  @blur="
-                    val => {
-                      sumRowFee(scope.row);
-                    }
-                  "
-                />
+                <el-input v-model="scope.row.foodexpenses" placeholder="浼欓璐规姤閿�" @blur="val => {
+                    sumRowFee(scope.row);
+                  }
+                  " />
               </template>
             </el-table-column>
-            <el-table-column
-              prop="foodallowance"
-              label="浼欓琛ュ姪"
-              align="center"
-              width="80"
-            >
+            <el-table-column prop="foodallowance" label="浼欓琛ュ姪" align="center" width="80">
               <template slot-scope="scope">
-                <el-input
-                  v-model="scope.row.foodallowance"
-                  placeholder="浼欓璐硅ˉ鍔�"
-                  @blur="
-                    val => {
-                      sumRowFee(scope.row);
-                    }
-                  "
-                />
+                <el-input v-model="scope.row.foodallowance" placeholder="浼欓璐硅ˉ鍔�" @blur="val => {
+                    sumRowFee(scope.row);
+                  }
+                  " />
               </template>
             </el-table-column>
-            <el-table-column
-              prop="otherexpense"
-              label="鍏潅璐硅ˉ鍔�"
-              align="center"
-              width="80"
-            >
+            <el-table-column prop="otherexpense" label="鍏潅璐硅ˉ鍔�" align="center" width="80">
               <template slot-scope="scope">
-                <el-input
-                  v-model="scope.row.otherexpense"
-                  placeholder="鏉傝垂"
-                  @blur="
-                    val => {
-                      sumRowFee(scope.row);
-                    }
-                  "
-                />
+                <el-input v-model="scope.row.otherexpense" placeholder="鏉傝垂" @blur="val => {
+                    sumRowFee(scope.row);
+                  }
+                  " />
               </template>
             </el-table-column>
 
-            <el-table-column
-              prop="otherfeeamount"
-              label="鍏朵粬璐圭敤"
-              align="center"
-              width="90"
-            >
+            <el-table-column prop="otherfeeamount" label="鍏朵粬璐圭敤" align="center" width="90">
               <template slot-scope="scope">
-                <el-input
-                  v-model="scope.row.otherfeeamount"
-                  placeholder="鍏朵粬璐圭敤"
-                  @blur="
-                    val => {
-                      sumRowFee(scope.row);
-                    }
-                  "
-                />
+                <el-input v-model="scope.row.otherfeeamount" placeholder="鍏朵粬璐圭敤" @blur="val => {
+                    sumRowFee(scope.row);
+                  }
+                  " />
               </template>
             </el-table-column>
-            <el-table-column
-              prop="departure"
-              slot=""
-              label="鍏朵粬璐圭敤璇存槑"
-              align="center"
-              width="120"
-            >
+            <el-table-column prop="departure" slot="" label="鍏朵粬璐圭敤璇存槑" align="center" width="120">
               <template slot-scope="scope">
-                <el-input
-                  v-model="scope.row.otherfeedesc"
-                  placeholder="鍏朵粬璐圭敤璇存槑"
-                />
+                <el-input v-model="scope.row.otherfeedesc" placeholder="鍏朵粬璐圭敤璇存槑" />
               </template>
             </el-table-column>
 
-            <el-table-column
-              prop="total"
-              label="鍚堣"
-              align="center"
-              width="110"
-            >
+            <el-table-column prop="total" label="鍚堣" align="center" width="110">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.total" placeholder="鍚堣" />
               </template>
             </el-table-column>
-            <el-table-column
-              fixed="right"
-              label="鎿嶄綔"
-              align="center"
-              width="120"
-              v-if="dialogType == 'edit'"
-            >
+            <el-table-column fixed="right" label="鎿嶄綔" align="center" width="120" v-if="dialogType == 'edit'">
               <template slot-scope="scope">
-                <el-button
-                  type="text"
-                  size="mini"
-                  @click="addDetailRow(scope.$index)"
-                  >鏂板</el-button
-                >
-                <el-button
-                  @click.native.prevent="
-                    deleteDetailRow(scope.$index, rbDetails, scope.row)
-                  "
-                  type="text"
-                  size="small"
-                >
+                <el-button type="text" size="mini" @click="addDetailRow(scope.$index)">鏂板</el-button>
+                <el-button @click.native.prevent="
+                  deleteDetailRow(scope.$index, rbDetails, scope.row)
+                  " type="text" size="small">
                   鍒犻櫎
                 </el-button>
               </template>
@@ -896,192 +475,75 @@
         </el-row>
         <el-row style="margin-top: 30px">
           <el-table :data="rbPayees" border highlight-current-row>
-            <el-table-column
-              prop="orderno"
-              slot=""
-              label="搴忓彿"
-              align="center"
-              fixed
-              width="65"
-            >
+            <el-table-column prop="orderno" slot="" label="搴忓彿" align="center" fixed width="65">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.orderno" placeholder="搴忓彿" />
               </template>
             </el-table-column>
 
             <!--涓婚敭銆佸閿笉灞曠ず-->
-            <el-table-column
-              prop="id"
-              slot=""
-              label="涓婚敭"
-              align="center"
-              fixed
-              width="95"
-              v-if="false"
-            >
+            <el-table-column prop="id" slot="" label="涓婚敭" align="center" fixed width="95" v-if="false">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.id" placeholder="id" />
               </template>
             </el-table-column>
-            <el-table-column
-              prop="rbid"
-              slot=""
-              label="澶栭敭"
-              align="center"
-              fixed
-              width="95"
-              v-if="false"
-            >
+            <el-table-column prop="rbid" slot="" label="澶栭敭" align="center" fixed width="95" v-if="false">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.rbid" placeholder="rbid" />
               </template>
             </el-table-column>
 
-            <el-table-column
-              prop="persontype"
-              slot=""
-              label="浜哄憳绫诲埆"
-              align="center"
-              fixed
-              width="130"
-            >
+            <el-table-column prop="persontype" slot="" label="浜哄憳绫诲埆" align="center" fixed width="130">
               <template slot-scope="scope">
-                <el-select
-                  v-model="scope.row.persontype"
-                  value-key="value"
-                  placeholder="浜哄憳绫诲埆"
-                  @change="getPersons(scope.row)"
-                >
-                  <el-option
-                    v-for="dict in dict.type.sys_travelexpensebelong"
-                    :key="dict.value"
-                    :label="dict.label"
-                    :value="dict.label"
-                  ></el-option>
+                <el-select v-model="scope.row.persontype" value-key="value" placeholder="浜哄憳绫诲埆"
+                  @change="getPersons(scope.row)">
+                  <el-option v-for="dict in dict.type.sys_travelexpensebelong" :key="dict.value" :label="dict.label"
+                    :value="dict.label"></el-option>
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column
-              prop="personname"
-              slot=""
-              label="鏀舵浜�"
-              align="center"
-              fixed
-              width="110"
-            >
+            <el-table-column prop="personname" slot="" label="鏀舵浜�" align="center" fixed width="110">
               <template slot-scope="scope">
-                <el-select
-                  v-model="scope.row.personname"
-                  clearable
-                  filterable
-                  allow-create
-                  ref="getReportname"
-                  default-first-option
-                  placeholder="璇烽�夋嫨"
-                  @change="getAccountinfo2(scope.row, scope.row.persontype)"
-                >
-                  <el-option
-                    v-for="item in personsSel"
-                    :key="item.reportNo"
-                    :label="item.reportName"
-                    :value="item.reportName"
-                  >
+                <el-select v-model="scope.row.personname" clearable filterable allow-create ref="getReportname"
+                  default-first-option placeholder="璇烽�夋嫨" @change="getAccountinfo2(scope.row, scope.row.persontype)">
+                  <el-option v-for="item in personsSel" :key="item.reportNo" :label="item.reportName"
+                    :value="item.reportName">
                   </el-option>
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column
-              prop="bankname"
-              slot=""
-              label="閾惰鍚嶇О"
-              align="center"
-              fixed
-              width="200"
-            >
+            <el-table-column prop="bankname" slot="" label="閾惰鍚嶇О" align="center" fixed width="200">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.bankname" placeholder="閾惰鍚嶇О" />
               </template>
             </el-table-column>
-            <el-table-column
-              prop="bankcardno"
-              slot=""
-              label="閾惰鍗″彿"
-              align="center"
-              fixed
-              width="200"
-            >
+            <el-table-column prop="bankcardno" slot="" label="閾惰鍗″彿" align="center" fixed width="200">
               <template slot-scope="scope">
-                <el-input
-                  v-model="scope.row.bankcardno"
-                  placeholder="閾惰鍗″彿"
-                />
+                <el-input v-model="scope.row.bankcardno" placeholder="閾惰鍗″彿" />
               </template>
             </el-table-column>
-            <el-table-column
-              prop="amount"
-              slot=""
-              label="鎵撴閲戦"
-              align="center"
-              fixed
-              width="130"
-            >
+            <el-table-column prop="amount" slot="" label="鎵撴閲戦" align="center" fixed width="130">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.amount" placeholder="鎵撴閲戦" />
               </template>
             </el-table-column>
-            <el-table-column
-              prop="remark"
-              slot=""
-              label="璇锋璇存槑"
-              align="center"
-              fixed
-              width="280"
-            >
+            <el-table-column prop="remark" slot="" label="璇锋璇存槑" align="center" fixed width="280">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.remark" placeholder="璇存槑" />
-              </template> </el-table-column
-            ><el-table-column
-              prop="paiddate"
-              slot=""
-              label="鎵撴鏃ユ湡"
-              fixed
-              align="center"
-              width="150"
-            >
+              </template> </el-table-column><el-table-column prop="paiddate" slot="" label="鎵撴鏃ユ湡" fixed align="center"
+              width="150">
               <template slot-scope="scope">
-                <el-date-picker
-                  clearable
-                  size="small"
-                  style="width: 100%"
-                  v-model="scope.row.paiddate"
-                  type="date"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  placeholder="鎵撴鏃ユ湡"
-                  :disabled="true"
-                >
+                <el-date-picker clearable size="small" style="width: 100%" v-model="scope.row.paiddate" type="date"
+                  value-format="yyyy-MM-dd HH:mm:ss" placeholder="鎵撴鏃ユ湡" :disabled="true">
                 </el-date-picker>
               </template>
             </el-table-column>
-            <el-table-column
-              label="鎿嶄綔"
-              align="center"
-              width="100"
-              v-if="dialogType == 'edit'"
-            >
+            <el-table-column label="鎿嶄綔" align="center" width="100" v-if="dialogType == 'edit'">
               <template slot-scope="scope">
-                <el-button
-                  type="text"
-                  size="mini"
-                  @click="addPayeeRow(scope.$index)"
-                  >鏂板</el-button
-                >
-                <el-button
-                  @click.native.prevent="
-                    deletePayeeRow(scope.$index, rbPayees, scope.row)
-                  "
-                  type="text"
-                  size="small"
-                >
+                <el-button type="text" size="mini" @click="addPayeeRow(scope.$index)">鏂板</el-button>
+                <el-button @click.native.prevent="
+                  deletePayeeRow(scope.$index, rbPayees, scope.row)
+                  " type="text" size="small">
                   鍒犻櫎
                 </el-button>
               </template>
@@ -1128,76 +590,30 @@
                                                                                               -->
             <el-form-item label="鏂囦欢涓婁紶" align="left" prop="annexfiles">
               <!-- <file-upload ref="fileUpload" :fileType=fileType :limit="1" :on-success="handleUploadSuccess"></file-upload> -->
-              <el-upload
-                size="mini"
-                class="upload-demo"
-                :action="uploadFileUrl"
-                :file-list="fileList"
-                multiple
-                :limit="20"
-                :headers="headers"
-                :on-success="
-                  (response, file, fileList) =>
+              <el-upload size="mini" class="upload-demo" :action="uploadFileUrl" :file-list="fileList" multiple
+                :limit="20" :headers="headers" :on-success="(response, file, fileList) =>
                     uploadSccess(response, file, fileList)
-                "
-                :on-preview="downFile"
-                :disabled="dialogType == 'detail'"
-                :on-error="handleUploadError"
-                :on-exceed="handleExceed"
-                :on-remove="remove"
-                accept="image/*,.pdf"
-              >
-                <el-button
-                  :disabled="dialogType == 'detail'"
-                  size="small"
-                  type="primary"
-                  >涓婁紶</el-button
-                >
+                  " :on-preview="downFile" :disabled="dialogType == 'detail'" :on-error="handleUploadError"
+                :on-exceed="handleExceed" :on-remove="remove" accept="image/*,.pdf">
+                <el-button :disabled="dialogType == 'detail'" size="small" type="primary">涓婁紶</el-button>
               </el-upload>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row v-if="dialogType == 'detail'">
           <el-table :data="fundflowList" border>
-            <el-table-column
-              label="瀹℃牳浜�"
-              align="center"
-              width="120"
-              prop="checkusername"
-            />
-            <el-table-column
-              label="瀹℃牳鏃ユ湡"
-              align="center"
-              width="160"
-              prop="createTime"
-            />
-            <el-table-column
-              label="瀹℃牳缁撴灉"
-              align="center"
-              width="200"
-              prop="flowconclusion"
-              ><template slot-scope="scope"
-                ><span v-if="scope.row.flowconclusion == 1">閫氳繃</span
-                ><span v-if="scope.row.flowconclusion == 2"
-                  >涓嶉�氳繃</span
-                ></template
-              >
+            <el-table-column label="瀹℃牳浜�" align="center" width="120" prop="checkusername" />
+            <el-table-column label="瀹℃牳鏃ユ湡" align="center" width="160" prop="createTime" />
+            <el-table-column label="瀹℃牳缁撴灉" align="center" width="200" prop="flowconclusion"><template
+                slot-scope="scope"><span v-if="scope.row.flowconclusion == 1">閫氳繃</span><span
+                  v-if="scope.row.flowconclusion == 2">涓嶉�氳繃</span></template>
             </el-table-column>
-            <el-table-column
-              label="瀹℃牳澶囨敞"
-              align="center"
-              prop="flowcontent"
-            />
+            <el-table-column label="瀹℃牳澶囨敞" align="center" prop="flowcontent" />
           </el-table>
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button
-          type="primary"
-          @click="submitForm"
-          v-if="dialogType == 'edit'"
-          >淇� 瀛�</el-button
-        >
+        <el-button type="primary" @click="submitForm" v-if="dialogType == 'edit'">淇� 瀛�</el-button>
         <el-button @click="cancel">鍙� 娑�</el-button>
       </div>
     </el-dialog>
@@ -1420,7 +836,7 @@
   },
 
   methods: {
-    handleUploadError() {},
+    handleUploadError() { },
 
     remove(file) {
       this.fileList.splice(this.fileList.indexOf(file), 1);
@@ -1548,7 +964,7 @@
         row.days = (
           Math.floor(
             Math.abs(Date.parse(row.starttime) - Date.parse(row.endtime)) /
-              (1000 * 3600 * 24)
+            (1000 * 3600 * 24)
           ) + 1
         ).toString();
       } else {
@@ -1845,10 +1261,10 @@
 
     /** 鏂板鎸夐挳鎿嶄綔 */
     handleAdd() {
-      console.log("defaultperson",this.defaultperson);
+      console.log("defaultperson", this.defaultperson);
       this.$router.push({
         path: "/finance/travelexpenseapply/travelexpensedetail/",
-        query: { id: 0, pos: 1,routerparam:this.defaultperson}
+        query: { id: 0, pos: 1, routerparam: this.defaultperson }
       });
 
       this.reset();
@@ -1884,8 +1300,8 @@
         this.form = response.data;
         this.fileList = this.form.annexfiles
           ? this.form.annexfiles
-              .split(",")
-              .map(item => ({ url: item, name: item }))
+            .split(",")
+            .map(item => ({ url: item, name: item }))
           : [];
         this.form.recordstatus = response.data.recordstatus + "";
 
@@ -1930,7 +1346,7 @@
         path: "/finance/travelexpenseapply/travelexpensedetail/",
         query: { id: row.id, pos: 3 }
       });
-      
+
       this.dialogType = "detail";
       this.title = "鏌ョ湅鎶ラ攢鐢宠";
 
@@ -1943,8 +1359,8 @@
         //闄勪欢
         this.fileList = this.form.annexfiles
           ? this.form.annexfiles
-              .split(",")
-              .map(item => ({ url: item, name: item }))
+            .split(",")
+            .map(item => ({ url: item, name: item }))
           : [];
 
         //瀹℃牳鐘舵��
@@ -2138,7 +1554,7 @@
       const ids = row.id || this.ids;
       this.$modal
         .confirm("鏄惁纭鍒犻櫎璇ユ潯璁板綍锛�")
-        .then(function() {
+        .then(function () {
           // 鍒犻櫎details鍐呯殑鏁版嵁
           return delReimbursement(ids);
         })
@@ -2147,7 +1563,7 @@
           this.getList();
           this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
 
     /** 瀵煎嚭鎸夐挳鎿嶄綔 */
@@ -2163,7 +1579,7 @@
           this.$download.name(response.msg);
           this.exportLoading = false;
         })
-        .catch(() => {});
+        .catch(() => { });
     },
 
     //鏂板涓�琛�
@@ -2446,7 +1862,7 @@
 
         this.form.amountrequested = allSum.toFixed(2);
         this.form.bigstrmoney = this.convertCurrency(this.form.amountrequested);
-      } catch {}
+      } catch { }
     },
 
     //閲戦鏁板瓧杞崲鎴愬ぇ鍐�
diff --git a/src/views/project/travelexpenseapply/travelexpensedetail/index.vue b/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
index cd24f2c..15cffd2 100644
--- a/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
+++ b/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
@@ -3,36 +3,19 @@
     <div class="boxdiv">
       <div class="top-text">{{ title }}</div>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <el-row
-          ><el-col :span="5">
+        <el-row><el-col :span="5">
             <el-form-item label="鐢宠鏃ユ湡" prop="createTime">
-              <el-date-picker
-                style="width: 100%"
-                v-model="form.createTime"
-                type="date"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                placeholder="鐢宠鏃ユ湡"
-              >
+              <el-date-picker style="width: 100%" v-model="form.createTime" type="date" value-format="yyyy-MM-dd HH:mm:ss"
+                placeholder="鐢宠鏃ユ湡">
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="5">
             <el-form-item label="缁忓姙浜�" prop="username">
-              <el-select
-                v-model="form.username"
-                clearable
-                filterable
-                allow-create
-                ref="getReportname"
-                default-first-option
-                placeholder="璇烽�夋嫨"
-              >
-                <el-option
-                  v-for="item in personsList"
-                  :key="item.reportNo"
-                  :label="item.reportName"
-                  :value="item.reportName"
-                >
+              <el-select v-model="form.username" clearable filterable allow-create ref="getReportname"
+                default-first-option placeholder="璇烽�夋嫨">
+                <el-option v-for="item in personsList" :key="item.reportNo" :label="item.reportName"
+                  :value="item.reportName">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -57,18 +40,8 @@
           </el-col>
           <el-col :span="5">
             <el-form-item label="鎹愮尞鑰�" prop="infoid">
-              <el-select
-                v-model="form.infoid"
-                @change="selectbaseinfo"
-                filterable
-                placeholder="璇烽�夋嫨鎹愮尞鑰�"
-              >
-                <el-option
-                  v-for="item in baselist"
-                  :key="item.index"
-                  :label="item.name"
-                  :value="item.infoid"
-                >
+              <el-select v-model="form.infoid" @change="selectbaseinfo" filterable placeholder="璇烽�夋嫨鎹愮尞鑰�">
+                <el-option v-for="item in baselist" :key="item.index" :label="item.name" :value="item.infoid">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -77,36 +50,17 @@
         <el-row style="margin-top: 10px">
           <el-col :span="5">
             <el-form-item label="鎶ラ攢閲戦" prop="amountrequested">
-              <el-input
-                :disabled="true"
-                v-model="form.amountrequested"
-                placeholder="鎶ラ攢鍚堣閲戦"
-              />
+              <el-input :disabled="true" v-model="form.amountrequested" placeholder="鎶ラ攢鍚堣閲戦" />
             </el-form-item>
           </el-col>
           <el-col :span="10">
             <el-form-item label="澶у啓閲戦" prop="bigstrmoney">
-              <el-input
-                :disabled="true"
-                v-model="form.bigstrmoney"
-                placeholder="鎶ラ攢澶у啓閲戦"
-              />
-            </el-form-item> </el-col
-          ><el-col :span="5">
+              <el-input :disabled="true" v-model="form.bigstrmoney" placeholder="鎶ラ攢澶у啓閲戦" />
+            </el-form-item> </el-col><el-col :span="5">
             <el-form-item label="瀹℃牳鐘舵��" prop="flowlevel">
-              <el-select
-                v-model="form.recordstatus"
-                placeholder="璇烽�夋嫨瀹℃牳鐘舵��"
-                clearable
-                :disabled="true"
-                size="small"
-              >
-                <el-option
-                  v-for="dict in dict.type.sys_recordstatus"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                />
+              <el-select v-model="form.recordstatus" placeholder="璇烽�夋嫨瀹℃牳鐘舵��" clearable :disabled="true" size="small">
+                <el-option v-for="dict in dict.type.sys_recordstatus" :key="dict.value" :label="dict.label"
+                  :value="dict.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -209,273 +163,120 @@
           </el-row>
           -->
         <el-row style="margin-top: 25px; margin-bottom: 5px">
-          <el-col :span="20">鎶ラ攢鏄庣粏褰曞叆锛�</el-col>
+          <el-col :span="20">鎶ラ攢鏄庣粏</el-col>
         </el-row>
         <el-row>
-          <el-table
-            :data="rbDetails"
-            border
-            highlight-current-row
-            :summary-method="getSummaries"
-            show-summary
-          >
-            <el-table-column
-              prop="orderno"
-              slot=""
-              label="搴忓彿"
-              align="center"
-              fixed
-              width="65"
-            >
+          <el-table :data="rbDetails" border highlight-current-row :summary-method="getSummaries" show-summary>
+            <el-table-column prop="orderno" slot="" label="搴忓彿" align="center" fixed width="65">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.orderno" placeholder="搴忓彿" />
               </template>
             </el-table-column>
             <!--涓婚敭銆佸涓嶅睍绀�-->
-            <el-table-column
-              prop="id"
-              slot=""
-              label="涓婚敭"
-              align="center"
-              fixed
-              width="95"
-              v-if="false"
-            >
+            <el-table-column prop="id" slot="" label="涓婚敭" align="center" fixed width="95" v-if="false">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.id" placeholder="id" />
               </template>
             </el-table-column>
-            <el-table-column
-              prop="rbid"
-              slot=""
-              label="澶栭敭"
-              align="center"
-              fixed
-              width="95"
-              v-if="false"
-            >
+            <el-table-column prop="rbid" slot="" label="澶栭敭" align="center" fixed width="95" v-if="false">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.rbid" placeholder="rbid" />
               </template>
             </el-table-column>
 
-            <el-table-column
-              prop="persontype"
-              slot=""
-              label="浜哄憳绫诲埆"
-              align="center"
-              fixed
-              width="130"
-            >
+            <el-table-column prop="persontype" slot="" label="浜哄憳绫诲埆" align="center" fixed width="130">
               <template slot-scope="scope">
-                <el-select
-                  v-model="scope.row.persontype"
-                  value-key="value"
-                  placeholder="浜哄憳绫诲埆"
-                  @change="getPersons(scope.row)"
-                >
-                  <el-option
-                    v-for="dict in dict.type.sys_travelexpensebelong"
-                    :key="dict.value"
-                    :label="dict.label"
-                    :value="dict.label"
-                  ></el-option>
+                <el-select v-model="scope.row.persontype" value-key="value" placeholder="浜哄憳绫诲埆"
+                  @change="getPersons(scope.row)">
+                  <el-option v-for="dict in dict.type.sys_travelexpensebelong" :key="dict.value" :label="dict.label"
+                    :value="dict.label"></el-option>
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column
-              prop="personname"
-              slot=""
-              label="璐圭敤浜哄憳"
-              align="center"
-              fixed
-              width="110"
-            >
+            <el-table-column prop="personname" slot="" label="璐圭敤浜哄憳" align="center" fixed width="110">
               <template slot-scope="scope">
-                <el-select
-                  v-model="scope.row.personname"
-                  clearable
-                  filterable
-                  allow-create
-                  default-first-option
-                  placeholder="璇烽�夋嫨"
-                  @focus1="getPersons(scope.row)"
-                >
-                  <el-option
-                    v-for="item in personsSel"
-                    :key="item.reportNo"
-                    :label="item.reportName"
-                    :value="item.reportName"
-                  >
+                <el-select v-model="scope.row.personname" clearable filterable allow-create default-first-option
+                  placeholder="璇烽�夋嫨" @focus1="getPersons(scope.row)">
+                  <el-option v-for="item in personsSel" :key="item.reportNo" :label="item.reportName"
+                    :value="item.reportName">
                   </el-option>
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column
-              prop="starttime"
-              slot=""
-              label="寮�濮嬫棩鏈�"
-              fixed
-              align="center"
-              width="150"
-            >
+            <el-table-column prop="starttime" slot="" label="寮�濮嬫棩鏈�" fixed align="center" width="150">
               <template slot-scope="scope">
-                <el-date-picker
-                  :picker-options="{
-                    disabledDate: time => {
-                      if (scope.row.endtime) {
-                        return (
-                          time.getTime() >
-                          new Date(scope.row.endtime.replace(/-/g, '/'))
-                        );
-                      }
+                <el-date-picker :picker-options="{
+                  disabledDate: time => {
+                    if (scope.row.endtime) {
+                      return (
+                        time.getTime() >
+                        new Date(scope.row.endtime.replace(/-/g, '/'))
+                      );
                     }
-                  }"
-                  clearable
-                  size="small"
-                  style="width: 100%"
-                  v-model="scope.row.starttime"
-                  type="date"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  placeholder="寮�濮嬫棩鏈�"
-                  @blur="getdays(scope.row)"
-                >
+                  }
+                }" clearable size="small" style="width: 100%" v-model="scope.row.starttime" type="date"
+                  value-format="yyyy-MM-dd HH:mm:ss" placeholder="寮�濮嬫棩鏈�" @blur="getdays(scope.row)">
                 </el-date-picker>
               </template>
             </el-table-column>
-            <el-table-column
-              prop="endtime"
-              slot=""
-              label="缁撴潫鏃ユ湡"
-              align="center"
-              fixed
-              width="150"
-            >
+            <el-table-column prop="endtime" slot="" label="缁撴潫鏃ユ湡" align="center" fixed width="150">
               <template slot-scope="scope">
-                <el-date-picker
-                  :picker-options="{
-                    disabledDate: time => {
-                      if (scope.row.starttime) {
-                        return (
-                          time.getTime() <
-                          new Date(scope.row.starttime.replace(/-/g, '/'))
-                        );
-                      }
+                <el-date-picker :picker-options="{
+                  disabledDate: time => {
+                    if (scope.row.starttime) {
+                      return (
+                        time.getTime() <
+                        new Date(scope.row.starttime.replace(/-/g, '/'))
+                      );
                     }
-                  }"
-                  clearable
-                  size="small"
-                  style="width: 100%"
-                  v-model="scope.row.endtime"
-                  type="date"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  placeholder="缁撴潫鏃ユ湡"
-                  @blur="getdays(scope.row)"
-                >
+                  }
+                }" clearable size="small" style="width: 100%" v-model="scope.row.endtime" type="date"
+                  value-format="yyyy-MM-dd HH:mm:ss" placeholder="缁撴潫鏃ユ湡" @blur="getdays(scope.row)">
                 </el-date-picker>
               </template>
             </el-table-column>
-            <el-table-column
-              prop="departure"
-              slot=""
-              label="鍑哄彂鍦�"
-              align="center"
-              width="100"
-            >
+            <el-table-column prop="departure" slot="" label="鍑哄彂鍦�" align="center" width="100">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.departure" placeholder="鍑哄彂鍦�" />
               </template>
             </el-table-column>
-            <el-table-column
-              label="鍒拌揪鍦�"
-              prop="destination"
-              align="center"
-              width="140"
-            >
+            <el-table-column label="鍒拌揪鍦�" prop="destination" align="center" width="140">
               <template slot-scope="scope">
                 <!--  <el-input v-model="scope.row.destination" placeholder="鍒拌揪鍦�" @blur="getallowance(scope.row)" /> -->
-                <el-select
-                  filterable
-                  allow-create
-                  v-model="scope.row.destination"
-                  value-key="value"
-                  placeholder="鍒拌揪鍦�"
-                  @change="getallowance(scope.row)"
-                >
-                  <el-option
-                    v-for="dict in dict.type.sys_area_name"
-                    :key="dict.value"
-                    :label="dict.label"
-                    :value="dict.label"
-                  ></el-option>
+                <el-select filterable allow-create v-model="scope.row.destination" value-key="value" placeholder="鍒拌揪鍦�"
+                  @change="getallowance(scope.row)">
+                  <el-option v-for="dict in dict.type.sys_area_name" :key="dict.value" :label="dict.label"
+                    :value="dict.label"></el-option>
                 </el-select>
               </template>
             </el-table-column>
             <el-table-column prop="days" label="澶╂暟" width="65" align="center">
               <template slot-scope="scope">
-                <el-input
-                  v-model="scope.row.days"
-                  @blur="getallowance(scope.row)"
-                  placeholder="澶╂暟"
-                />
+                <el-input v-model="scope.row.days" @blur="getallowance(scope.row)" placeholder="澶╂暟" />
               </template>
             </el-table-column>
-            <el-table-column
-              prop="traffictype"
-              label="鍑哄彂浜ら�氬伐鍏�"
-              align="center"
-              width="100"
-            >
+            <el-table-column prop="traffictype" label="鍑哄彂浜ら�氬伐鍏�" align="center" width="100">
               <template slot-scope="scope">
-                <el-select
-                  v-model="scope.row.traffictype"
-                  placeholder="鍑哄彂浜ら�氬伐鍏�"
-                >
-                  <el-option
-                    v-for="dict in dict.type.sys_traffictype"
-                    :key="dict.value"
-                    :label="dict.label"
-                    :value="dict.label"
-                  ></el-option>
+                <el-select v-model="scope.row.traffictype" placeholder="鍑哄彂浜ら�氬伐鍏�">
+                  <el-option v-for="dict in dict.type.sys_traffictype" :key="dict.value" :label="dict.label"
+                    :value="dict.label"></el-option>
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column
-              prop="traffictype2"
-              label="杩斿洖浜ら�氬伐鍏�"
-              align="center"
-              width="100"
-            >
+            <el-table-column prop="traffictype2" label="杩斿洖浜ら�氬伐鍏�" align="center" width="100">
               <template slot-scope="scope">
-                <el-select
-                  v-model="scope.row.traffictype2"
-                  placeholder="杩斿洖浜ら�氬伐鍏�"
-                >
-                  <el-option
-                    v-for="dict in dict.type.sys_traffictype"
-                    :key="dict.value"
-                    :label="dict.label"
-                    :value="dict.label"
-                  ></el-option>
+                <el-select v-model="scope.row.traffictype2" placeholder="杩斿洖浜ら�氬伐鍏�">
+                  <el-option v-for="dict in dict.type.sys_traffictype" :key="dict.value" :label="dict.label"
+                    :value="dict.label"></el-option>
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column
-              prop="trafficexpense"
-              label="浜ら�氳垂"
-              align="center"
-              width="80"
-            >
+            <el-table-column prop="trafficexpense" label="浜ら�氳垂" align="center" width="80">
               <template slot-scope="scope">
-                <el-input
-                  v-model="scope.row.trafficexpense"
-                  placeholder="浜ら�氳垂"
-                  @blur="
-                    val => {
-                      sumRowFee(scope.row);
-                    }
-                  "
-                />
+                <el-input v-model="scope.row.trafficexpense" placeholder="浜ら�氳垂" @blur="val => {
+                  sumRowFee(scope.row);
+                }
+                  " />
               </template>
             </el-table-column>
             <!--
@@ -490,310 +291,131 @@
               </template>
             </el-table-column>
                                                                                                                                       -->
-            <el-table-column
-              prop="hotelexpense"
-              label="浣忓璐�"
-              align="center"
-              width="80"
-            >
+            <el-table-column prop="hotelexpense" label="浣忓璐�" align="center" width="80">
               <template slot-scope="scope">
-                <el-input
-                  v-model="scope.row.hotelexpense"
-                  placeholder="浣忓璐�"
-                  @blur="
-                    val => {
-                      sumRowFee(scope.row);
-                    }
-                  "
-                />
+                <el-input v-model="scope.row.hotelexpense" placeholder="浣忓璐�" @blur="val => {
+                  sumRowFee(scope.row);
+                }
+                  " />
               </template>
             </el-table-column>
 
-            <el-table-column
-              prop="foodexpenses"
-              label="椁愯垂鎶ラ攢"
-              align="center"
-              width="80"
-            >
+            <el-table-column prop="foodexpenses" label="椁愯垂鎶ラ攢" align="center" width="80">
               <template slot-scope="scope">
-                <el-input
-                  v-model="scope.row.foodexpenses"
-                  placeholder="浼欓璐规姤閿�"
-                  @blur="
-                    val => {
-                      sumRowFee(scope.row);
-                    }
-                  "
-                />
+                <el-input v-model="scope.row.foodexpenses" placeholder="浼欓璐规姤閿�" @blur="val => {
+                  sumRowFee(scope.row);
+                }
+                  " />
               </template>
             </el-table-column>
-            <el-table-column
-              prop="foodallowance"
-              label="浼欓琛ュ姪"
-              align="center"
-              width="80"
-            >
+            <el-table-column prop="foodallowance" label="浼欓琛ュ姪" align="center" width="80">
               <template slot-scope="scope">
-                <el-input
-                  v-model="scope.row.foodallowance"
-                  placeholder="浼欓璐硅ˉ鍔�"
-                  @blur="
-                    val => {
-                      sumRowFee(scope.row);
-                    }
-                  "
-                />
+                <el-input v-model="scope.row.foodallowance" placeholder="浼欓璐硅ˉ鍔�" @blur="val => {
+                  sumRowFee(scope.row);
+                }
+                  " />
               </template>
             </el-table-column>
-            <el-table-column
-              prop="otherexpense"
-              label="鍏潅璐硅ˉ鍔�"
-              align="center"
-              width="80"
-            >
+            <el-table-column prop="otherexpense" label="鍏潅璐硅ˉ鍔�" align="center" width="80">
               <template slot-scope="scope">
-                <el-input
-                  v-model="scope.row.otherexpense"
-                  placeholder="鏉傝垂"
-                  @blur="
-                    val => {
-                      sumRowFee(scope.row);
-                    }
-                  "
-                />
+                <el-input v-model="scope.row.otherexpense" placeholder="鏉傝垂" @blur="val => {
+                  sumRowFee(scope.row);
+                }
+                  " />
               </template>
             </el-table-column>
 
-            <el-table-column
-              prop="otherfeeamount"
-              label="鍏朵粬璐圭敤"
-              align="center"
-              width="90"
-            >
+            <el-table-column prop="otherfeeamount" label="鍏朵粬璐圭敤" align="center" width="90">
               <template slot-scope="scope">
-                <el-input
-                  v-model="scope.row.otherfeeamount"
-                  placeholder="鍏朵粬璐圭敤"
-                  @blur="
-                    val => {
-                      sumRowFee(scope.row);
-                    }
-                  "
-                />
+                <el-input v-model="scope.row.otherfeeamount" placeholder="鍏朵粬璐圭敤" @blur="val => {
+                  sumRowFee(scope.row);
+                }
+                  " />
               </template>
             </el-table-column>
-            <el-table-column
-              prop="departure"
-              slot=""
-              label="鍏朵粬璐圭敤璇存槑"
-              align="center"
-              width="120"
-            >
+            <el-table-column prop="departure" slot="" label="鍏朵粬璐圭敤璇存槑" align="center" width="120">
               <template slot-scope="scope">
-                <el-input
-                  v-model="scope.row.otherfeedesc"
-                  placeholder="鍏朵粬璐圭敤璇存槑"
-                />
+                <el-input v-model="scope.row.otherfeedesc" placeholder="鍏朵粬璐圭敤璇存槑" />
               </template>
             </el-table-column>
 
-            <el-table-column
-              prop="total"
-              label="鍚堣"
-              align="center"
-              width="110"
-              fixed="right"
-            >
+            <el-table-column prop="total" label="鍚堣" align="center" width="110" fixed="right">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.total" placeholder="鍚堣" />
               </template>
             </el-table-column>
-            <el-table-column
-              fixed="right"
-              label="鎿嶄綔"
-              align="center"
-              width="120"
-            >
+            <el-table-column fixed="right" label="鎿嶄綔" align="center" width="120">
               <template slot-scope="scope">
-                <el-button
-                  type="text"
-                  size="mini"
-                  @click="addDetailRow(scope.$index)"
-                  v-if="dialogType == 'edit'"
-                  >鏂板</el-button
-                >
-                <el-button
-                  @click.native.prevent="
-                    deleteDetailRow(scope.$index, rbDetails, scope.row)
-                  "
-                  type="text"
-                  size="small"
-                  v-if="dialogType == 'edit'"
-                  >鍒犻櫎</el-button
-                >
-                <el-button
-                  @click.native.prevent="
-                    Filepopup(scope.$index, rbDetails, scope.row)
-                  "
-                  type="text"
-                  size="small"
-                  >绁ㄦ嵁</el-button
-                >
+                <el-button type="text" size="mini" @click="addDetailRow(scope.$index)"
+                  v-if="operationType == 'edit'">鏂板</el-button>
+                <el-button @click.native.prevent="
+                  deleteDetailRow(scope.$index, rbDetails, scope.row)
+                  " type="text" size="small" v-if="operationType == 'edit'">鍒犻櫎</el-button>
+                <el-button @click.native.prevent="
+                  Filepopup(scope.$index, rbDetails, scope.row)
+                  " type="text" size="small">绁ㄦ嵁</el-button>
               </template>
             </el-table-column>
           </el-table>
         </el-row>
         <el-row style="margin-top: 25px; margin-bottom: 5px">
-          <el-col :span="20">鎶ラ攢璇锋鏄庣粏锛�</el-col>
+          <el-col :span="20">鎵撴鏄庣粏</el-col>
         </el-row>
-        <el-row style="margin-top: 30px">
-          <el-table
-            :data="rbPayees"
-            border
-            highlight-current-row
-            :summary-method="getSummaries"
-            show-summary
-          >
-            <el-table-column
-              prop="orderno"
-              slot=""
-              label="搴忓彿"
-              align="center"
-              fixed
-              width="65"
-            >
+        <el-row style="margin-top: 5px">
+          <el-table :data="rbPayees" border highlight-current-row :summary-method="getSummaries" show-summary>
+            <el-table-column prop="orderno" slot="" label="搴忓彿" align="center" fixed width="65">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.orderno" placeholder="搴忓彿" />
               </template>
             </el-table-column>
 
             <!--涓婚敭銆佸閿笉灞曠ず-->
-            <el-table-column
-              prop="id"
-              slot=""
-              label="涓婚敭"
-              align="center"
-              fixed
-              width="95"
-              v-if="false"
-            >
+            <el-table-column prop="id" slot="" label="涓婚敭" align="center" fixed width="95" v-if="false">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.id" placeholder="id" />
               </template>
             </el-table-column>
-            <el-table-column
-              prop="rbid"
-              slot=""
-              label="澶栭敭"
-              align="center"
-              fixed
-              width="95"
-              v-if="false"
-            >
+            <el-table-column prop="rbid" slot="" label="澶栭敭" align="center" fixed width="95" v-if="false">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.rbid" placeholder="rbid" />
               </template>
             </el-table-column>
 
-            <el-table-column
-              prop="persontype"
-              slot=""
-              label="浜哄憳绫诲埆"
-              align="center"
-              fixed
-              width="130"
-            >
+            <el-table-column prop="persontype" slot="" label="浜哄憳绫诲埆" align="center" fixed width="130">
               <template slot-scope="scope">
-                <el-select
-                  v-model="scope.row.persontype"
-                  value-key="value"
-                  placeholder="浜哄憳绫诲埆"
-                  @change="getPersons(scope.row)"
-                >
-                  <el-option
-                    v-for="dict in dict.type.sys_travelexpensebelong"
-                    :key="dict.value"
-                    :label="dict.label"
-                    :value="dict.label"
-                  ></el-option>
+                <el-select v-model="scope.row.persontype" value-key="value" placeholder="浜哄憳绫诲埆"
+                  @change="getPersons(scope.row)">
+                  <el-option v-for="dict in dict.type.sys_travelexpensebelong" :key="dict.value" :label="dict.label"
+                    :value="dict.label"></el-option>
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column
-              prop="personname"
-              slot=""
-              label="鏀舵浜�"
-              align="center"
-              fixed
-              width="110"
-            >
+            <el-table-column prop="personname" slot="" label="鏀舵浜�" align="center" fixed width="110">
               <template slot-scope="scope">
-                <el-select
-                  v-model="scope.row.personname"
-                  clearable
-                  filterable
-                  allow-create
-                  ref="getReportname"
-                  default-first-option
-                  placeholder="璇烽�夋嫨"
-                  @change="getAccountinfo2(scope.row, scope.row.persontype)"
-                >
-                  <el-option
-                    v-for="item in personsSel"
-                    :key="item.reportNo"
-                    :label="item.reportName"
-                    :value="item.reportName"
-                  >
+                <el-select v-model="scope.row.personname" clearable filterable allow-create ref="getReportname"
+                  default-first-option placeholder="璇烽�夋嫨" @change="getAccountinfo2(scope.row, scope.row.persontype)">
+                  <el-option v-for="item in personsSel" :key="item.reportNo" :label="item.reportName"
+                    :value="item.reportName">
                   </el-option>
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column
-              prop="bankname"
-              slot=""
-              label="閾惰鍚嶇О"
-              align="center"
-              fixed
-              width="200"
-            >
+            <el-table-column prop="bankname" slot="" label="閾惰鍚嶇О" align="center" fixed width="200">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.bankname" placeholder="閾惰鍚嶇О" />
               </template>
             </el-table-column>
-            <el-table-column
-              prop="bankcardno"
-              slot=""
-              label="閾惰鍗″彿"
-              align="center"
-              fixed
-              width="200"
-            >
+            <el-table-column prop="bankcardno" slot="" label="閾惰鍗″彿" align="center" fixed width="200">
               <template slot-scope="scope">
-                <el-input
-                  v-model="scope.row.bankcardno"
-                  placeholder="閾惰鍗″彿"
-                />
+                <el-input v-model="scope.row.bankcardno" placeholder="閾惰鍗″彿" />
               </template>
             </el-table-column>
-            <el-table-column
-              prop="amount"
-              slot=""
-              label="鎵撴閲戦"
-              align="center"
-              fixed
-              width="130"
-            >
+            <el-table-column prop="amount" slot="" label="鎵撴閲戦" align="center" fixed width="130">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.amount" placeholder="鎵撴閲戦" />
               </template>
             </el-table-column>
-            <el-table-column
-              prop="remark"
-              slot=""
-              label="璇锋璇存槑"
-              align="center"
-              fixed
-            >
+            <el-table-column prop="remark" slot="" label="璇锋璇存槑" align="center" fixed>
               <template slot-scope="scope">
                 <el-input v-model="scope.row.remark" placeholder="璇存槑" />
               </template>
@@ -806,70 +428,33 @@
                 </el-date-picker>
               </template>
             </el-table-column>-->
-            <el-table-column
-              label="鎿嶄綔"
-              align="center"
-              width="100"
-              v-if="dialogType == 'edit'"
-            >
+            <el-table-column label="鎿嶄綔" align="center" width="100" v-if="operationType == 'edit'">
               <template slot-scope="scope">
-                <el-button
-                  type="text"
-                  size="mini"
-                  @click="addPayeeRow(scope.$index)"
-                  >鏂板</el-button
-                >
-                <el-button
-                  @click.native.prevent="
-                    deletePayeeRow(scope.$index, rbPayees, scope.row)
-                  "
-                  type="text"
-                  size="small"
-                >
+                <el-button type="text" size="mini" @click="addPayeeRow(scope.$index)">鏂板</el-button>
+                <el-button @click.native.prevent="
+                  deletePayeeRow(scope.$index, rbPayees, scope.row)
+                  " type="text" size="small">
                   鍒犻櫎
                 </el-button>
               </template>
             </el-table-column>
           </el-table>
         </el-row>
-
-        <el-row v-if="dialogType == 'detail' || dialogType == 'check'">
+        <el-row style="margin-top: 25px; margin-bottom: 5px" v-if="operationType != 'edit'">
+          <el-col :span="20">瀹℃牳璁板綍</el-col>
+        </el-row>
+        <el-row v-if="operationType != 'edit'">
           <el-table :data="fundflowList" border>
-            <el-table-column
-              label="瀹℃牳浜�"
-              align="center"
-              width="120"
-              prop="checkusername"
-            />
-            <el-table-column
-              label="瀹℃牳鏃ユ湡"
-              align="center"
-              width="160"
-              prop="createTime"
-            />
-            <el-table-column
-              label="瀹℃牳缁撴灉"
-              align="center"
-              width="200"
-              prop="flowconclusion"
-              ><template slot-scope="scope"
-                ><span v-if="scope.row.flowconclusion == 1">閫氳繃</span
-                ><span v-if="scope.row.flowconclusion == 2"
-                  >涓嶉�氳繃</span
-                ></template
-              >
+            <el-table-column label="瀹℃牳浜�" align="center" width="150" prop="checkusername" />
+            <el-table-column label="瀹℃牳鏃ユ湡" align="center" width="200" prop="createTime" />
+            <el-table-column label="瀹℃牳缁撴灉" align="center" width="200" prop="flowconclusion"><template
+                slot-scope="scope"><span v-if="scope.row.flowconclusion == 1">閫氳繃</span><span
+                  v-if="scope.row.flowconclusion == 2">涓嶉�氳繃</span></template>
             </el-table-column>
-            <el-table-column
-              label="瀹℃牳澶囨敞"
-              align="center"
-              prop="flowcontent"
-            />
+            <el-table-column label="瀹℃牳澶囨敞" align="center" prop="flowcontent" />
           </el-table>
         </el-row>
-        <el-row
-          style="margin-top: 25px; margin-bottom: 5px"
-          v-if="dialogType == 'check'"
-        >
+        <el-row style="margin-top: 25px; margin-bottom: 5px" v-if="operationType == 'check'">
           <el-col :span="7">
             <el-form-item label="瀹℃牳缁撴灉" align="left">
               <el-radio-group v-model="checkObj.flowlevelone" align="left">
@@ -879,7 +464,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="dialogType == 'check'">
+        <el-row v-if="operationType == 'check'">
           <el-col :span="17">
             <el-form-item label="瀹℃牳澶囨敞" align="left">
               <el-input v-model="checkObj.flowconclusion" placeholder="澶囨敞" />
@@ -888,18 +473,8 @@
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button
-          type="primary"
-          @click="submitForm"
-          v-if="dialogType == 'edit'"
-          >淇� 瀛�</el-button
-        >
-        <el-button
-          type="primary"
-          @click="checksubmit"
-          v-if="dialogType == 'check'"
-          >鎻� 浜�</el-button
-        >
+        <el-button type="primary" @click="submitForm" v-if="operationType == 'edit'">淇� 瀛�</el-button>
+        <el-button type="primary" @click="checksubmit" v-if="operationType == 'check'">鎻� 浜�</el-button>
         <!--<el-button @click="cancel">閫� 鍑�</el-button>-->
       </div>
     </div>
@@ -908,31 +483,12 @@
       <div class="pdfimg">
         <div class="box-pdf">
           <div>
-            <el-upload
-              size="mini"
-              class="upload-demo"
-              :action="uploadFileUrl"
-              :file-list="fileListto"
-              multiple
-              :limit="20"
-              :headers="headers"
-              :on-success="
-                (response, file, fileList) =>
-                  uploadSccess(response, file, fileList)
-              "
-              :on-preview="downFile"
-              :disabled="dialogType == 'detail'"
-              :on-error="handleUploadError"
-              :on-exceed="handleExceed"
-              :on-remove="remove"
-              accept="image/*,.pdf"
-            >
-              <el-button
-                :disabled="dialogType == 'detail'"
-                size="small"
-                type="primary"
-                >涓婁紶</el-button
-              >
+            <el-upload size="mini" class="upload-demo" :action="uploadFileUrl" :file-list="fileListto" multiple
+              :limit="20" :headers="headers" :on-success="(response, file, fileList) =>
+                uploadSccess(response, file, fileList)
+                " :on-preview="downFile" :disabled="operationType == 'detail'" :on-error="handleUploadError"
+              :on-exceed="handleExceed" :on-remove="remove" accept="image/*,.pdf">
+              <el-button :disabled="operationType == 'detail'" size="small" type="primary">涓婁紶</el-button>
             </el-upload>
           </div>
           <!-- <div
@@ -1114,7 +670,7 @@
       defaultperson: {},
       fundflowList: [],
       showApproveRecordDialog: false,
-      dialogType: "edit",
+      operationType: "edit",
 
       //涓婁紶鍙戠エ鏂囦欢璺緞
       uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload",
@@ -1194,7 +750,7 @@
   },
 
   methods: {
-    handleUploadError() {},
+    handleUploadError() { },
 
     remove(file, fileList) {
       const rbDetails = [...this.rbDetails];
@@ -1354,7 +910,7 @@
         row.days = (
           Math.floor(
             Math.abs(Date.parse(row.starttime) - Date.parse(row.endtime)) /
-              (1000 * 3600 * 24)
+            (1000 * 3600 * 24)
           ) + 1
         ).toString();
       } else {
@@ -1635,7 +1191,7 @@
       this.reset();
       // this.open = true;
       this.title = "鏂板宸梾鐢宠鍗�";
-      this.dialogType = "edit";
+      this.operationType = "edit";
       this.fundflowList = [];
 
       console.log(this.title, this.defaultperson);
@@ -1657,7 +1213,7 @@
       //   query: { id: ids }
       // });
 
-      this.dialogType = "edit";
+      this.operationType = "edit";
       this.reset();
       // this.open = true;
       this.title = "鎶ラ攢鐢宠淇敼";
@@ -1668,8 +1224,8 @@
         this.form = response.data;
         this.fileListto = this.form.annexfiles
           ? this.form.annexfiles
-              .split(",")
-              .map(item => ({ url: item, name: item }))
+            .split(",")
+            .map(item => ({ url: item, name: item }))
           : [];
         this.form.recordstatus = response.data.recordstatus + "";
 
@@ -1710,7 +1266,7 @@
 
     /** 鏌ョ湅鎸夐挳鎿嶄綔 */
     handleDetail(ids) {
-      this.dialogType = "detail";
+      this.operationType = "detail";
       this.title = "鎶ラ攢鐢宠璇︽儏";
 
       this.reset();
@@ -1722,8 +1278,8 @@
         //绁ㄦ嵁
         this.fileListto = this.form.annexfiles
           ? this.form.annexfiles
-              .split(",")
-              .map(item => ({ url: item, name: item }))
+            .split(",")
+            .map(item => ({ url: item, name: item }))
           : [];
 
         //瀹℃牳鐘舵��
@@ -1770,7 +1326,7 @@
 
     /** 瀹℃牳鎸夐挳鎿嶄綔 */
     handleCheck(ids) {
-      this.dialogType = "check";
+      this.operationType = "check";
       this.title = "鎶ラ攢鐢宠璇︽儏";
 
       this.reset();
@@ -1783,8 +1339,8 @@
         //绁ㄦ嵁
         this.fileListto = this.form.annexfiles
           ? this.form.annexfiles
-              .split(",")
-              .map(item => ({ url: item, name: item }))
+            .split(",")
+            .map(item => ({ url: item, name: item }))
           : [];
 
         //瀹℃牳鐘舵��
@@ -2013,7 +1569,7 @@
       const ids = row.id || this.ids;
       this.$modal
         .confirm("鏄惁纭鍒犻櫎璇ユ潯璁板綍锛�")
-        .then(function() {
+        .then(function () {
           // 鍒犻櫎details鍐呯殑鏁版嵁
           return delReimbursement(ids);
         })
@@ -2022,7 +1578,7 @@
           this.getList();
           this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
 
     /** 瀵煎嚭鎸夐挳鎿嶄綔 */
@@ -2038,7 +1594,7 @@
           this.$download.name(response.msg);
           this.exportLoading = false;
         })
-        .catch(() => {});
+        .catch(() => { });
     },
 
     //鏂板涓�琛�
@@ -2321,7 +1877,7 @@
 
         this.form.amountrequested = allSum.toFixed(2);
         this.form.bigstrmoney = this.convertCurrency(this.form.amountrequested);
-      } catch {}
+      } catch { }
     },
 
     //閲戦鏁板瓧杞崲鎴愬ぇ鍐�

--
Gitblit v1.9.3