From 213293e2e97a82448aae7c207d9cd9bacc465fac Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期四, 14 九月 2023 10:59:57 +0800
Subject: [PATCH] 11

---
 src/views/project/fund/applyDetail/index.vue | 1310 ++++++++++++++++++++++-------------------------------------
 1 files changed, 495 insertions(+), 815 deletions(-)

diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue
index 649ca6f..230d7e4 100644
--- a/src/views/project/fund/applyDetail/index.vue
+++ b/src/views/project/fund/applyDetail/index.vue
@@ -7,53 +7,28 @@
         <el-row>
           <el-col :span="5">
             <el-form-item label="鐢宠鏃ユ湡" prop="createTime">
-              <el-date-picker
-                clearable
-                style="width: 100%"
-                v-model="form.createTime"
-                type="date"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                placeholder="鐢宠鏃ユ湡"
-              >
+              <el-date-picker clearable 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"
-                placeholder="鐢宠浜�"
-                clearable
-                filterable
-                allow-create
-                style="width: 100%"
-                @change="getUserAccount"
-              >
-                <el-option
-                  v-for="dict in userlist"
-                  :key="dict.index"
-                  :label="dict.nickname"
-                  :value="dict.nickname"
-                ></el-option>
+              <el-select v-model="form.username" placeholder="鐢宠浜�" clearable filterable allow-create style="width: 100%"
+                @change="getUserAccount">
+                <el-option v-for="dict in userlist" :key="dict.index" :label="dict.nickname"
+                  :value="dict.nickname"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="5">
             <el-form-item label="鎵�灞炵粍鍒�" prop="deptmentname">
-              <el-input
-                v-model="form.deptmentname"
-                placeholder="璇疯緭鍏ユ墍灞炵粍鍒�"
-                clearable
-              />
+              <el-input v-model="form.deptmentname" placeholder="璇疯緭鍏ユ墍灞炵粍鍒�" clearable />
             </el-form-item>
           </el-col>
           <el-col :span="5">
             <el-form-item label="缁勯暱" prop="managername">
-              <el-input
-                v-model="form.managername"
-                placeholder="璇疯緭鍏ョ粍闀�"
-                clearable
-              />
+              <el-input v-model="form.managername" placeholder="璇疯緭鍏ョ粍闀�" clearable />
             </el-form-item>
           </el-col>
         </el-row>
@@ -91,20 +66,12 @@
           </el-col>
           <el-col :span="5">
             <el-form-item label="鎹愮尞鑰�" prop="name">
-              <el-input
-                :disabled="true"
-                v-model="form.donorname"
-                placeholder="璇疯緭鍏ユ崘鐚�呭鍚�"
-              />
+              <el-input :disabled="true" v-model="form.donorname" placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" />
             </el-form-item>
           </el-col>
           <el-col :span="5">
             <el-form-item label="鐢宠閲戦" prop="pretaxcost">
-              <el-input
-                v-model="form.pretaxcost"
-                placeholder="绋庡墠閲戦鍚堣"
-                :disabled="true"
-              />
+              <el-input v-model="form.pretaxcost" placeholder="绋庡墠閲戦鍚堣" :disabled="true" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -147,16 +114,14 @@
         <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="importFeeItems"
-              type="primary"
-              size="small"
-            >
+            <el-button @click.native.prevent="importFeeItems" type="primary" size="small">
               瀵煎叆鏈嶅姟椤圭洰
             </el-button>
           </el-col>
         </el-row>
         <el-row v-if="jurisdiction">
+          <!-- <el-alert title="褰撳墠涓烘煡鐪嬬姸鎬侊紝涓嶆敮鎸佷慨鏀瑰瓨鍌ㄣ��" type="warning">
+          </el-alert> -->
           <el-alert
             title="褰撳墠涓烘煡鐪嬬姸鎬侊紝涓嶆敮鎸佷慨鏀瑰瓨鍌ㄣ��"
             type="warning"
@@ -164,7 +129,7 @@
           >
           </el-alert>
         </el-row>
-        <el-row>
+        <el-row v-if="businessType == 2">
           <div style="margin-bottom: 15px;">
             <el-button
               type="success"
@@ -175,19 +140,8 @@
           </div>
         </el-row>
         <el-row>
-          <el-table
-            :data="rbDetails"
-            v-loading="loading"
-            max-height="800"
-            border
-            highlight-current-row
-          >
-            <el-table-column
-              prop="orderno"
-              align="center"
-              label="搴忓彿"
-              width="88"
-            >
+          <el-table :data="rbDetails" v-loading="loading" max-height="800" border highlight-current-row>
+            <el-table-column prop="orderno" align="center" label="搴忓彿" width="88">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.orderno" placeholder="搴忓彿" />
               </template>
@@ -196,12 +150,7 @@
             <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"
-            >
+            <el-table-column prop="applytype" align="center" label="鏈嶅姟绫诲瀷" width="200">
               <template slot-scope="scope">
                 <el-select
                   v-model="scope.row.applytype"
@@ -217,103 +166,45 @@
                 </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)"
-                  :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 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="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
-                  @change="verifyFeeRemark(scope.row)"
-                >
-                  <el-option
-                    v-for="dict in scope.row.rowfeeblocks"
-                    :key="dict.servicesscope"
-                    :label="dict.remark"
-                    :value="dict.servicesscope"
-                  ></el-option>
+                <el-select v-model="scope.row.servicesscope" placeholder="鏈嶅姟璇存槑" clearable allow-create
+                  @change="verifyFeeRemark(scope.row)">
+                  <el-option v-for="dict in scope.row.rowfeeblocks" :key="dict.servicesscope" :label="dict.remark"
+                    :value="dict.servicesscope"></el-option>
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column
-              prop="price"
-              align="center"
-              label="鍗曚环"
-              width="120"
-              v-if="businessType == 4"
-            >
+            <el-table-column prop="price" align="center" label="鍗曚环" width="120" v-if="businessType == 4">
               <template slot-scope="scope">
-                <el-input
-                  v-model="scope.row.price"
-                  placeholder="鍗曚环"
-                  @blur="
-                    val => {
-                      sumTotalFee(scope.row);
-                    }
-                  "
-                />
+                <el-input v-model="scope.row.price" placeholder="鍗曚环" @blur="val => {
+                  sumTotalFee(scope.row);
+                }
+                  " />
               </template>
             </el-table-column>
-            <el-table-column
-              prop="quantity"
-              align="center"
-              label="鏁伴噺"
-              width="120"
-              v-if="businessType == 4"
-            >
+            <el-table-column prop="quantity" align="center" label="鏁伴噺" width="120" v-if="businessType == 4">
               <template slot-scope="scope">
-                <el-input
-                  v-model="scope.row.quantity"
-                  placeholder="鏁伴噺"
-                  @blur="
-                    val => {
-                      sumTotalFee(scope.row);
-                    }
-                  "
-                />
+                <el-input v-model="scope.row.quantity" placeholder="鏁伴噺" @blur="val => {
+                  sumTotalFee(scope.row);
+                }
+                  " />
               </template>
             </el-table-column>
-            <el-table-column
-              v-if="
-                businessType == 2 ||
-                  businessType == 3 ||
-                  businessType == 4 ||
-                  ismanager == true
-              "
-              prop="amount"
-              align="center"
-              :label="amountLabel"
-              width="120"
-            >
+            <el-table-column v-if="businessType == 2 ||
+              businessType == 3 ||
+              businessType == 4 ||
+              ismanager == true
+              " prop="amount" align="center" :label="amountLabel" width="120">
               <template slot-scope="scope">
                 <!--
                   <el-select v-model="scope.row.amount" placeholder="绋庡墠閲戦" clearable filterable allow-create
@@ -322,53 +213,27 @@
                     :value="dict.expense"></el-option>
                 </el-select>
               -->
-                <el-input
-                  v-model="scope.row.amount"
-                  placeholder="閲戦"
-                  @blur="
-                    val => {
-                      calculateTax(scope.row, 'A');
-                    }
-                  "
-                />
+                <el-input v-model="scope.row.amount" placeholder="閲戦" @blur="val => {
+                  calculateTax(scope.row, 'A');
+                }
+                  " />
               </template>
             </el-table-column>
-            <el-table-column
-              prop="taxedamount"
-              align="center"
-              label="绋庡悗閲戦"
-              width="120"
-              v-if="
-                (this.ismanager == true) &
-                  (form.applytype == '1' || form.applytype == '2')
-              "
-            >
+            <el-table-column prop="taxedamount" align="center" label="绋庡悗閲戦" width="120" v-if="(this.ismanager == true) &
+              (form.applytype == '1' || form.applytype == '2')
+              ">
               <template slot-scope="scope">
-                <el-input
-                  v-model="scope.row.taxedamount"
-                  placeholder="绋庡悗閲戦"
-                  @blur="
-                    val => {
-                      calculateTax(scope.row, 'B');
-                    }
-                  "
-                />
+                <el-input v-model="scope.row.taxedamount" placeholder="绋庡悗閲戦" @blur="val => {
+                  calculateTax(scope.row, 'B');
+                }
+                  " />
               </template>
             </el-table-column>
-            <el-table-column
-              prop="beneficiaryname"
-              align="center"
-              label="濮撳悕"
-              width="120"
-              v-if="form.applytype == '1' || form.applytype == '2'"
-            >
+            <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, 'expert')"
-                  >{{ scope.row.beneficiaryname }}</el-button
-                >
+                <el-button type="primary" plain @click="ShowDetailDialog(scope, 'expert')">{{ scope.row.beneficiaryname
+                }}</el-button>
                 <!-- <el-select
                   filterable
                   allow-create
@@ -388,13 +253,7 @@
                                       </el-select> -->
               </template>
             </el-table-column>
-            <el-table-column
-              prop="unitno"
-              align="center"
-              label="鍗曚綅鍚嶇О"
-              width="250"
-              v-if="form.applytype != '4'"
-            >
+            <el-table-column prop="unitno" align="center" label="鍗曚綅鍚嶇О" width="250" v-if="form.applytype != '4'">
               <template slot-scope="scope">
                 <el-button
                   type="primary"
@@ -418,13 +277,7 @@
                                       </el-select> -->
               </template>
             </el-table-column>
-            <el-table-column
-              prop="unitno"
-              align="center"
-              label="鍗曚綅/涓汉"
-              width="250"
-              v-if="form.applytype == '4'"
-            >
+            <el-table-column prop="unitno" align="center" label="鍗曚綅/涓汉" width="250" v-if="form.applytype == '4'">
               <template slot-scope="scope">
                 <el-button
                   type="primary"
@@ -452,111 +305,51 @@
                                       </el-select> -->
               </template>
             </el-table-column>
-            <el-table-column
-              prop="title"
-              align="center"
-              label="鑱岀О"
-              width="120"
-              v-if="form.applytype == '1' || form.applytype == '2'"
-            >
+            <el-table-column prop="title" align="center" label="鑱岀О" width="120"
+              v-if="form.applytype == '1' || form.applytype == '2'">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.title" placeholder="鑱岀О" />
               </template>
             </el-table-column>
-            <el-table-column
-              prop="idcardno"
-              align="center"
-              label="韬唤璇佸彿"
-              width="200"
-              v-if="form.applytype == '1' || form.applytype == '2'"
-            >
+            <el-table-column prop="idcardno" align="center" label="韬唤璇佸彿" width="200"
+              v-if="form.applytype == '1' || form.applytype == '2'">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.idcardno" placeholder="韬唤璇佸彿" />
               </template>
             </el-table-column>
-            <el-table-column
-              prop="depositbank"
-              align="center"
-              label="寮�鎴烽摱琛�"
-              width="200"
-            >
+            <el-table-column prop="depositbank" align="center" label="寮�鎴烽摱琛�" width="200">
               <!-- v-if="form.applytype != '4'" -->
               <template slot-scope="scope">
-                <el-input
-                  v-model="scope.row.depositbank"
-                  placeholder="寮�鎴烽摱琛�"
-                />
+                <el-input v-model="scope.row.depositbank" placeholder="寮�鎴烽摱琛�" />
               </template>
             </el-table-column>
-            <el-table-column
-              prop="bankcardno"
-              align="center"
-              label="閾惰甯愬彿"
-              width="210"
-            >
+            <el-table-column prop="bankcardno" align="center" label="閾惰甯愬彿" width="210">
               <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="remark"
-              align="center"
-              width="330"
-              label="澶囨敞"
-            >
+            <el-table-column prop="remark" align="center" width="330" label="澶囨敞">
               <template slot-scope="scope">
-                <el-input
-                  type="textarea"
-                  :rows="2"
-                  v-model="scope.row.remark"
-                  placeholder="澶囨敞"
-                />
+                <el-input type="textarea" :rows="2" v-model="scope.row.remark" placeholder="澶囨敞" />
               </template>
             </el-table-column>
-            <el-table-column
-              fixed="right"
-              align="center"
-              label="鎿嶄綔"
-              width="180"
-            >
+            <el-table-column fixed="right" align="center" label="鎿嶄綔" width="180">
               <template slot-scope="scope">
-                <el-button
-                  type="text"
-                  size="mini"
-                  @click="addRow(scope.$index)"
-                  v-if="
-                    operationType == 'add' ||
-                      operationType == 'update' ||
-                      operationType == 'check'
-                  "
-                  >鏂板</el-button
-                >
-                <el-button
-                  @click.native.prevent="
-                    deleteRows(scope.row, scope.$index, rbDetails)
-                  "
-                  type="text"
-                  size="small"
-                  v-if="
-                    operationType == 'add' ||
-                      operationType == 'update' ||
-                      operationType == 'check'
-                  "
-                >
+                <el-button type="text" size="mini" @click="addRow(scope.$index)" v-if="operationType == 'add' ||
+                  operationType == 'update' ||
+                  operationType == 'check'
+                  ">鏂板</el-button>
+                <el-button @click.native.prevent="
+                  deleteRows(scope.row, scope.$index, rbDetails)
+                  " type="text" size="small" v-if="operationType == 'add' ||
+    operationType == 'update' ||
+    operationType == 'check'
+    ">
                   鍒犻櫎
                 </el-button>
-                <el-button
-                  @click.native.prevent="
-                    Filepopup(scope.$index, rbDetails, scope.row)
-                  "
-                  type="text"
-                  size="small"
-                  v-if="businessType == 3 || businessType == 4"
-                  >绁ㄦ嵁</el-button
-                >
+                <el-button @click.native.prevent="
+                  Filepopup(scope.$index, rbDetails, scope.row)
+                  " type="text" size="small" v-if="businessType == 3 || businessType == 4">绁ㄦ嵁</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -604,55 +397,20 @@
               -->
         <el-row>
           <el-col :span="12">
-            <el-form-item
-              label="璐圭敤鐢宠闄勪欢"
-              align="left"
-              prop="annexbankcard"
-              v-if="businessType == 0"
-            >
-              <el-upload
-                size="mini"
-                class="upload-demo"
-                :action="uploadFileUrl"
-                :file-list="fileListto"
-                :show-file-list="false"
-                multiple
-                drag
-                :headers="headers"
-                :on-success="
-                  (response, file, fileList) =>
-                    uploadSccess(response, file, fileList)
-                "
-                :on-preview="downFile"
-                :disabled="operationType == 'detail'"
-                :on-error="handleUploadError"
-                :on-remove="remove"
-                accept="image/*,.pdf"
-              >
+            <el-form-item label="璐圭敤鐢宠闄勪欢" align="left" prop="annexbankcard" v-if="businessType == 0">
+              <el-upload size="mini" class="upload-demo" :action="uploadFileUrl" :file-list="fileListto"
+                :show-file-list="false" multiple drag :headers="headers" :on-success="(response, file, fileList) =>
+                  uploadSccess(response, file, fileList)
+                  " :on-preview="downFile" :disabled="operationType == 'detail'" :on-error="handleUploadError"
+                :on-remove="remove" accept="image/*,.pdf">
                 <i class="el-icon-upload"></i>
                 <div class="el-upload__text">
                   灏嗙エ鎹嫋鍒版澶勶紝鎴�
-                  <em
-                    ><el-button
-                      :disabled="operationType == 'detail'"
-                      size="small"
-                      type="primary"
-                      >鐐瑰嚮涓婁紶</el-button
-                    ></em
-                  >
+                  <em><el-button :disabled="operationType == 'detail'" size="small" type="primary">鐐瑰嚮涓婁紶</el-button></em>
                 </div>
               </el-upload>
-              <el-table
-                :data="fileListto"
-                @row-click="downFile"
-                style="width: 100%"
-                height="400"
-              >
-                <el-table-column
-                  prop="name"
-                  :show-overflow-tooltip="true"
-                  label="鍚嶇О"
-                >
+              <el-table :data="fileListto" @row-click="downFile" style="width: 100%" height="400">
+                <el-table-column prop="name" :show-overflow-tooltip="true" label="鍚嶇О">
                   <template slot-scope="scope">
                     <i style="color:#409EFF" class=" el-icon-s-order" />{{
                       scope.row.name
@@ -660,73 +418,35 @@
                   </template>
                 </el-table-column>
 
-                <el-table-column
-                  prop="name"
-                  width="180"
-                  :show-overflow-tooltip="true"
-                  label="鍔熻兘"
-                >
+                <el-table-column prop="name" width="180" :show-overflow-tooltip="true" label="鍔熻兘">
                   <template slot-scope="scope">
-                    <el-button
-                      type="primary"
-                      size="mini"
-                      @click.native.prevent.stop="deletedowfile(scope.row)"
-                      >鍒犻櫎</el-button
-                    >
-                    <el-button
-                      type="primary"
-                      size="mini"
-                      @click.native.prevent.stop="moveupdowfile(scope.row)"
-                      >涓婄Щ</el-button
-                    >
+                    <el-button type="primary" size="mini"
+                      @click.native.prevent.stop="deletedowfile(scope.row)">鍒犻櫎</el-button>
+                    <el-button type="primary" size="mini"
+                      @click.native.prevent.stop="moveupdowfile(scope.row)">涓婄Щ</el-button>
                   </template>
                 </el-table-column>
               </el-table>
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row
-          v-if="
-            operationType == 'detail' ||
-              operationType == 'check' ||
-              operationType == 'update'
-          "
-        >
+        <el-row v-if="operationType == 'detail' ||
+          operationType == 'check' ||
+          operationType == 'update'
+          ">
           <el-table :data="fundflowList" border>
-            <el-table-column
-              label="瀹℃牳鏃ユ湡"
-              align="center"
-              width="160"
-              prop="createTime"
-            />
-            <el-table-column
-              label="瀹℃牳浜�"
-              align="center"
-              width="120"
-              prop="checkusername"
-            />
-            <el-table-column
-              label="瀹℃牳缁撴灉"
-              align="center"
-              width="200"
-              prop="flowconclusion"
-            >
+            <el-table-column label="瀹℃牳鏃ユ湡" align="center" width="160" prop="createTime" />
+            <el-table-column label="瀹℃牳浜�" align="center" width="120" prop="checkusername" />
+            <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="operationType == '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">
@@ -745,40 +465,20 @@
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button
-          type="primary"
-          @click="submitForm"
-          v-if="
-            operationType == 'add' ||
-              operationType == 'update' ||
-              ismanager == true
-          "
-          >鎻愪氦淇濆瓨</el-button
-        >
-        <el-button
-          type="primary"
-          @click="checksubmit"
-          v-if="operationType == 'check'"
-          >鎻愪氦瀹℃牳</el-button
-        >
+        <el-button type="primary" @click="submitForm" v-if="operationType == 'add' ||
+          operationType == 'update' ||
+          ismanager == true
+          ">鎻愪氦淇濆瓨</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="showSelectionDialog"
-      :close-on-click-modal="false"
-      :title="'鍗曚綅/涓汉淇℃伅閫夋嫨'"
-      width="500px"
-      style="text-align: center"
-      v-loading="loading"
-    >
+    <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 v-if="businessType != 4">
-          <el-col
-            :span="24"
-            v-if="selectionType == 'expert' && businessType != 4"
-          >
+          <el-col :span="24" v-if="selectionType == 'expert' && businessType != 4">
             <el-form-item label="璇烽�夋嫨涓撳淇℃伅锛�" prop="expertfrom">
               <el-radio-group v-model="expertfrom" style="margin-bottom: 0">
                 <el-radio label="1">涓撳搴�</el-radio>
@@ -786,77 +486,29 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <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.expertNo"
-                  :label="item.exportName"
-                  :value="item.exportName"
-                >
+          <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.expertNo" :label="item.exportName"
+                  :value="item.exportName">
                 </el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <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%"
-              >
-                <el-option
-                  v-for="(spec, index) in unitList"
-                  :key="index"
-                  :label="spec.organizationname"
-                  :value="spec.organizationid"
-                ></el-option>
+            <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%">
+                <el-option v-for="(spec, index) in unitList" :key="index" :label="spec.organizationname"
+                  :value="spec.organizationid"></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item
-              label="鍙戠エ鍗曚綅鍚嶇О"
-              prop="unitno"
-              label-width="120px"
-              v-if="businessType == 3"
-            >
-              <el-select
-                v-model="funddetailForm.unitno"
-                placeholder="鍗曚綅鍚嶇О"
-                clearable
-                filterable
-                allow-create
-                style="width: 100%"
-              >
-                <el-option
-                  v-for="(item, index) in feeUnitList"
-                  :key="index"
-                  :label="item.reportName"
-                  :value="item.reportNo"
-                ></el-option>
+            <el-form-item label="鍙戠エ鍗曚綅鍚嶇О" prop="unitno" label-width="120px" v-if="businessType == 3">
+              <el-select v-model="funddetailForm.unitno" placeholder="鍗曚綅鍚嶇О" clearable filterable allow-create
+                style="width: 100%">
+                <el-option v-for="(item, index) in feeUnitList" :key="index" :label="item.reportName"
+                  :value="item.reportNo"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -865,11 +517,7 @@
         <el-row v-if="businessType == 4">
           <el-col :span="24">
             <el-form-item label="璇烽�夋嫨涓撳淇℃伅锛�" prop="experthear">
-              <el-radio-group
-                @change="ShowDetailDialog(spocewl)"
-                v-model="experthear"
-                style="margin-bottom: 0"
-              >
+              <el-radio-group @change="ShowDetailDialog(spocewl)" v-model="experthear" style="margin-bottom: 0">
                 <el-radio label="unit">浜哄憳閫夐」</el-radio>
                 <el-radio label="expert">鍗曚綅閫夐」</el-radio>
               </el-radio-group>
@@ -926,43 +574,22 @@
         <el-row v-if="businessType != 4">
           <el-col :span="12" v-if="expertfrom == '2'">
             <el-form-item label="涓撳濮撳悕" prop="expertname" label-width="80px">
-              <el-input
-                v-model="funddetailForm.expertname"
-                placeholder="蹇呭～椤�"
-              />
+              <el-input v-model="funddetailForm.expertname" placeholder="蹇呭～椤�" />
             </el-form-item>
           </el-col>
           <el-col :span="12" v-if="expertfrom == '2'">
-            <el-form-item
-              label="鑱�    绉�"
-              prop="experttitle"
-              label-width="80px"
-            >
-              <el-select
-                v-model="funddetailForm.experttitle"
-                placeholder="蹇呭～椤�"
-              >
-                <el-option
-                  v-for="dict in dict.type.sys_professionaltitle"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.label"
-                ></el-option>
+            <el-form-item label="鑱�    绉�" prop="experttitle" label-width="80px">
+              <el-select v-model="funddetailForm.experttitle" placeholder="蹇呭～椤�">
+                <el-option v-for="dict in dict.type.sys_professionaltitle" :key="dict.value" :label="dict.label"
+                  :value="dict.label"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row v-if="businessType != 4">
           <el-col :span="24" v-if="expertfrom == '2'">
-            <el-form-item
-              label="韬唤璇佸彿"
-              prop="expertidcardno"
-              label-width="80px"
-            >
-              <el-input
-                v-model="funddetailForm.expertidcardno"
-                placeholder="蹇呭～椤�"
-              />
+            <el-form-item label="韬唤璇佸彿" prop="expertidcardno" label-width="80px">
+              <el-input v-model="funddetailForm.expertidcardno" placeholder="蹇呭～椤�" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -980,60 +607,29 @@
       -->
         <el-row v-if="businessType != 4">
           <el-col :span="24" v-if="expertfrom == '2'">
-            <el-form-item
-              label="鍗曚綅鍚嶇О"
-              prop="expertunitno"
-              label-width="80px"
-            >
-              <el-select
-                v-model="funddetailForm.expertunitno"
-                placeholder="鍗曚綅鍚嶇О"
-                clearable
-                filterable
-                allow-create
-                style="width: 100%"
-              >
-                <el-option
-                  v-for="(spec, index) in unitList"
-                  :key="index"
-                  :label="spec.organizationname"
-                  :value="spec.organizationid"
-                ></el-option>
-              </el-select> </el-form-item
-          ></el-col>
+            <el-form-item label="鍗曚綅鍚嶇О" prop="expertunitno" label-width="80px">
+              <el-select v-model="funddetailForm.expertunitno" placeholder="鍗曚綅鍚嶇О" clearable filterable allow-create
+                style="width: 100%">
+                <el-option v-for="(spec, index) in unitList" :key="index" :label="spec.organizationname"
+                  :value="spec.organizationid"></el-option>
+              </el-select> </el-form-item></el-col>
         </el-row>
         <el-row v-if="businessType != 4">
           <el-col :span="24" v-if="expertfrom == '2'">
-            <el-form-item
-              label="寮�鎴烽摱琛�"
-              prop="expertdepositbank"
-              label-width="80px"
-            >
-              <el-input
-                v-model="funddetailForm.expertdepositbank"
-                placeholder="蹇呭～椤�"
-              />
+            <el-form-item label="寮�鎴烽摱琛�" prop="expertdepositbank" label-width="80px">
+              <el-input v-model="funddetailForm.expertdepositbank" placeholder="蹇呭～椤�" />
             </el-form-item>
           </el-col>
           <el-col :span="24" v-if="expertfrom == '2'">
-            <el-form-item
-              label="閾惰鍗″彿"
-              prop="expertbankcardno"
-              label-width="80px"
-            >
-              <el-input
-                v-model="funddetailForm.expertbankcardno"
-                placeholder="蹇呭～椤�"
-              />
+            <el-form-item label="閾惰鍗″彿" prop="expertbankcardno" label-width="80px">
+              <el-input v-model="funddetailForm.expertbankcardno" placeholder="蹇呭～椤�" />
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button @click="showSelectionDialog = false">鍙� 娑�</el-button>
-        <el-button type="primary" @click="ConfirmDetailDialog()"
-          >纭� 瀹�</el-button
-        >
+        <el-button type="primary" @click="ConfirmDetailDialog()">纭� 瀹�</el-button>
       </span>
     </el-dialog>
     <el-dialog
@@ -1044,55 +640,104 @@
       :visible.sync="pdfVisible"
       width="60%"
     >
+      <div>
+        <el-table :data="tableDatatop" style="width: 100%">
+          <el-table-column
+            v-if="businessType == 4"
+            prop="price"
+            align="center"
+            label="鍗曚环"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="quantity"
+            align="center"
+            label="鏁伴噺"
+            v-if="businessType == 4"
+          >
+          </el-table-column>
+          <el-table-column prop="amount" align="center" :label="amountLabel">
+          </el-table-column>
+          <el-table-column
+            prop="taxedamount"
+            align="center"
+            label="绋庡悗閲戦"
+            v-if="
+              (this.ismanager == true) &
+                (form.applytype == '1' || form.applytype == '2')
+            "
+          >
+          </el-table-column>
+          <el-table-column
+            prop="beneficiaryname"
+            align="center"
+            label="濮撳悕"
+            v-if="form.applytype == '1' || form.applytype == '2'"
+          >
+          </el-table-column>
+
+          <el-table-column
+            prop="unitno"
+            align="center"
+            label="鍗曚綅鍚嶇О"
+            width="250"
+            v-if="form.applytype != '4'"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="beneficiaryname"
+            align="center"
+            label="鍗曚綅/涓汉"
+            width="250"
+            v-if="form.applytype == '4'"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="title"
+            align="center"
+            label="鑱岀О"
+            width="120"
+            v-if="form.applytype == '1' || form.applytype == '2'"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="idcardno"
+            align="center"
+            label="韬唤璇佸彿"
+            width="200"
+            v-if="form.applytype == '1' || form.applytype == '2'"
+          >
+          </el-table-column>
+          <el-table-column prop="depositbank" align="center" label="寮�鎴烽摱琛�">
+          </el-table-column>
+          <el-table-column
+            prop="bankcardno"
+            align="center"
+            label="閾惰甯愬彿"
+            width="210"
+          >
+          </el-table-column>
+        </el-table>
+      </div>
       <div class="pdfimg">
         <div class="box-pdf">
           <div>
-            <el-upload
-              size="mini"
-              class="upload-demo"
-              :action="uploadFileUrl"
-              :file-list="fileListto"
-              :show-file-list="false"
-              multiple
-              drag
-              :headers="headers"
-              :on-success="
-                (response, file, fileList) =>
-                  uploadSccess(response, file, fileList)
-              "
-              :on-preview="downFile"
-              :disabled="operationType == 'detail'"
-              :on-error="handleUploadError"
-              :on-remove="remove"
-              accept="image/*,.pdf"
-            >
+            <el-upload size="mini" class="upload-demo" :action="uploadFileUrl" :file-list="fileListto"
+              :show-file-list="false" multiple drag :headers="headers" :on-success="(response, file, fileList) =>
+                uploadSccess(response, file, fileList)
+                " :on-preview="downFile" :disabled="operationType == 'detail'" :on-error="handleUploadError"
+              :on-remove="remove" accept="image/*,.pdf">
               <i class="el-icon-upload"></i>
               <div class="el-upload__text">
                 灏嗙エ鎹嫋鍒版澶勶紝鎴�
-                <em
-                  ><el-button
-                    :disabled="operationType == 'detail'"
-                    size="small"
-                    type="primary"
-                    >鐐瑰嚮涓婁紶</el-button
-                  ></em
-                >
+                <em><el-button :disabled="operationType == 'detail'" size="small" type="primary">鐐瑰嚮涓婁紶</el-button></em>
               </div>
               <!-- <div class="el-upload__tip" slot="tip">
                 鍙兘涓婁紶jpg/png鏂囦欢锛屼笖涓嶈秴杩�500kb
               </div> -->
             </el-upload>
-            <el-table
-              :data="fileListto"
-              @row-click="downFile"
-              style="width: 100%"
-              height="400"
-            >
-              <el-table-column
-                prop="name"
-                :show-overflow-tooltip="true"
-                label="鍚嶇О"
-              >
+            <el-table :data="fileListto" @row-click="downFile" style="width: 100%" height="400">
+              <el-table-column prop="name" :show-overflow-tooltip="true" label="鍚嶇О">
                 <template slot-scope="scope">
                   <i style="color:#409EFF" class=" el-icon-s-order" />{{
                     scope.row.name
@@ -1100,25 +745,12 @@
                 </template>
               </el-table-column>
 
-              <el-table-column
-                prop="name"
-                width="180"
-                :show-overflow-tooltip="true"
-                label="鍔熻兘"
-              >
+              <el-table-column prop="name" width="180" :show-overflow-tooltip="true" label="鍔熻兘">
                 <template slot-scope="scope">
-                  <el-button
-                    type="primary"
-                    size="mini"
-                    @click.native.prevent.stop="deletedowfile(scope.row)"
-                    >鍒犻櫎</el-button
-                  >
-                  <el-button
-                    type="primary"
-                    size="mini"
-                    @click.native.prevent.stop="moveupdowfile(scope.row)"
-                    >涓婄Щ</el-button
-                  >
+                  <el-button type="primary" size="mini"
+                    @click.native.prevent.stop="deletedowfile(scope.row)">鍒犻櫎</el-button>
+                  <el-button type="primary" size="mini"
+                    @click.native.prevent.stop="moveupdowfile(scope.row)">涓婄Щ</el-button>
                 </template>
               </el-table-column>
             </el-table>
@@ -1133,27 +765,19 @@
           </div> -->
         </div>
 
-        <div v-if="this.previewpdf" class="pdfimgmin">
+        <div v-if="this.previewpdf && pdfimgsrcList.length" class="pdfimgmin">
           <!-- <img :src="pdfimg" /> -->
-          <el-image
-            style="width: 95%; height: 90%"
-            :src="pdfimg"
-            :preview-src-list="pdfimgsrcList"
-          >
+          <el-image style="width: 95%; height: 90%" :src="pdfimg" :preview-src-list="pdfimgsrcList">
           </el-image>
         </div>
         <div v-else class="pdfimgmins">{{ hintitle }}</div>
       </div>
     </el-dialog>
     <el-dialog title="鎻愮ず" :visible.sync="Savereminder" width="30%">
-      <el-alert
-        :title="
-          '鎮ㄥ凡娣诲姞' +
-            totalquantity +
-            '鏉℃暟鎹紝涓洪槻姝㈡暟鎹涪澶辨槸鍚︽彁浜や繚瀛樺啀缁х画娣诲姞銆�'
-        "
-        type="warning"
-      >
+      <el-alert :title="'鎮ㄥ凡娣诲姞' +
+        totalquantity +
+        '鏉℃暟鎹紝涓洪槻姝㈡暟鎹涪澶辨槸鍚︽彁浜や繚瀛樺啀缁х画娣诲姞銆�'
+        " type="warning">
       </el-alert>
       <span slot="footer" class="dialog-footer">
         <el-button @click="unsave">鍙� 娑�</el-button>
@@ -1162,7 +786,11 @@
     </el-dialog>
 
     <!-- 鎵归噺閫夊彇 -->
-    <el-dialog title="鎵归噺鐢熸垚鏄庣粏淇℃伅" :visible.sync="batchdialogVisible" width="30%">
+    <el-dialog
+      title="鎵归噺鐢熸垚鏄庣粏淇℃伅"
+      :visible.sync="batchdialogVisible"
+      width="30%"
+    >
       <div style="max-height: 300px; overflow-y: auto">
         <el-checkbox
           :indeterminate="isIndeterminate"
@@ -1179,17 +807,15 @@
             border
             v-for="city in cityOptions"
             :label="city"
-            :key="city"
-            >{{ city }}</el-checkbox
+            :key="city.reportNo"
+            >{{ city.reportName }}</el-checkbox
           >
         </el-checkbox-group>
       </div>
 
       <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisible = false">鍙� 娑�</el-button>
-        <el-button type="primary" @click="dialogVisible = false"
-          >纭� 瀹�</el-button
-        >
+        <el-button @click="batchdialogVisible = false">鍙� 娑�</el-button>
+        <el-button type="primary" @click="BatchentryFn">纭� 瀹�</el-button>
       </span>
     </el-dialog>
   </div>
@@ -1261,6 +887,8 @@
   updateExternalperson,
   exportExternalperson
 } from "@/api/project/externalperson";
+
+import { listItemexpense } from "@/api/project/itemexpense";
 
 import { getUserProfile } from "@/api/system/user";
 import Li_area_select from "@/components/Address";
@@ -1336,50 +964,11 @@
       Networkheader: null,
       batchdialogVisible: false,
       itemlist: [],
-      cityOptions: [
-        "涓婃捣",
-        "鍖椾含",
-        "骞垮窞",
-        "娣卞湷",
-        "鏉窞",
-        "娓╁窞",
-        "娌冲崡",
-        "鑾嗙敯",
-        "骞垮窞",
-        "娣卞湷",
-        "鏉窞",
-        "娓╁窞",
-        "娌冲崡",
-        "鑾嗙敯",
-        "骞垮窞",
-        "娣卞湷",
-        "鏉窞",
-        "娓╁窞",
-        "娌冲崡",
-        "鑾嗙敯",
-        "骞垮窞",
-        "娣卞湷",
-        "鏉窞",
-        "娓╁窞",
-        "娌冲崡",
-        "鑾嗙敯",
-        "骞垮窞",
-        "娣卞湷",
-        "鏉窞",
-        "娓╁窞",
-        "娌冲崡",
-        "鑾嗙敯",
-        "骞垮窞",
-        "娣卞湷",
-        "鏉窞",
-        "娓╁窞",
-        "娌冲崡",
-        "鑾嗙敯",
-        "绂忓窞"
-      ],
+      cityOptions: [],
       checkAll: false,
-      checkedCities: ["涓婃捣", "鍖椾含"],
-
+      checkedCities: [],
+      Personnelforname: "璇烽�夋嫨",
+      unitforname: "璇烽�夋嫨",
       isIndeterminate: true,
 
       //鏄惁鏄笓瀹惰垂鐨凮PO瀹℃壒浜哄憳
@@ -1397,6 +986,7 @@
       totalPreTaxAmount: 0.0,
       totalAfterTaxAmount: 0.0,
       totalAmount: 0.0,
+      tableDatatop: [],
 
       //璐圭敤绫诲瀷鏁扮粍
       feeItemTypes: [],
@@ -1405,7 +995,11 @@
       rowfeeItemTypes: [],
 
       //璐圭敤璇存槑
-      rowfeeblocks: [],
+<<<<<<< Updated upstream
+      feeBlocks: [],
+=======
+      feeBlockList: [],
+>>>>>>> Stashed changes
 
       fundflowList: [],
       // 闅忔満鏁�
@@ -1520,6 +1114,16 @@
         startTime: ""
       },
 
+      //鏈嶅姟璐圭敤鍙傛暟
+      expenseQueryParams: {
+        pageNum: 1,
+        pageSize: 10000,
+        itemid: null,
+        expense: null,
+        expensedescribe: null,
+        usestate: null,
+      },
+
       //闄勪欢鍒楄〃
       fileList: [],
       fileListto: [],
@@ -1535,7 +1139,7 @@
       pdfimgsrcList: [],
       pdfVisible: false,
       previewpdf: false,
-      hintitle: "閫変腑宸︿晶宸蹭笂浼犳枃浠堕瑙堟煡鐪�",
+      hintitle: "璇蜂笂浼犳枃浠跺悗鏌ョ湅",
       atpresent: "",
       Savereminder: false, //鎻愰啋淇濆瓨寮规
       Reminderquantity: 0, //鎻愰啋鏁伴噺
@@ -1559,7 +1163,7 @@
       if (
         (JSON.stringify(this.form) == sessionStorage.getItem("apiform") &&
           JSON.stringify(this.rbDetails) ==
-            sessionStorage.getItem("apifunddetail")) ||
+          sessionStorage.getItem("apifunddetail")) ||
         !sessionStorage.getItem("apifunddetail")
       ) {
         console.log(cg);
@@ -1734,29 +1338,12 @@
           if (this.rbDetails.length > 0) {
             for (let m = 0; m < this.rbDetails.length; m++) {
               this.rbDetails[m].itemlist = [];
-              this.getFeeItems(m, this.rbDetails[m]);
+              this.getRowFeeItems(m, this.rbDetails[m]);
 
               //鑾峰彇璐圭敤椤圭洰鐨勮缁嗕俊鎭�
-              this.rbDetails[m].rowfeeblocks = [];
-              this.rbDetails[m].rowfeeblocks.push({
-                servicesscope: this.rbDetails[m].servicesscope,
-                expensedescribe: this.rbDetails[m].servicesscopename,
-                expense: this.rbDetails[m].expense,
-                remark: this.rbDetails[m].servicesscopename
-              });
-              // getdetailsByItemId(this.rbDetails[m].itemid).then((res) => {
-              //   let fundmsg = res.data;
-              //   fundmsg.forEach((item) => {
-              //     this.rbDetails[m].rowfeeblocks.push({
-              //       servicesscope: item.id,
-              //       expensedescribe: item.expensedescribe,
-              //       expense: item.expense,
-              //       remark: item.expensedescribe,
-              //     });
-              //   });
-              // });
+              this.rbDetails[m].rowfeeblocks = this.feeBlocks.filter(r => r.itemid == this.rbDetails[m].itemid);
             }
-            console.log("yeil");
+
             sessionStorage.removeItem("apifunddetail");
             sessionStorage.setItem(
               "apifunddetail",
@@ -1797,15 +1384,10 @@
           this.rbDetails = res.data;
           for (let m = 0; m < this.rbDetails.length; m++) {
             this.rbDetails[m].itemlist = [];
-            this.getFeeItems(m, this.rbDetails[m]);
+            this.getRowFeeItems(m, this.rbDetails[m]);
 
-            this.rbDetails[m].rowfeeblocks = [];
-            this.rbDetails[m].rowfeeblocks.push({
-              servicesscope: this.rbDetails[m].servicesscope,
-              expensedescribe: this.rbDetails[m].servicesscopename,
-              expense: this.rbDetails[m].expense,
-              remark: this.rbDetails[m].servicesscopename
-            });
+            //鑾峰彇璐圭敤椤圭洰鐨勮缁嗕俊鎭�
+            this.rbDetails[m].rowfeeblocks = this.feeBlocks.filter(r => r.itemid == this.rbDetails[m].itemid);
           }
 
           if (this.rbDetails.length == 0) {
@@ -1843,15 +1425,10 @@
           this.rbDetails = res.data;
           for (let m = 0; m < this.rbDetails.length; m++) {
             this.rbDetails[m].itemlist = [];
-            this.getFeeItems(m, this.rbDetails[m]);
+            this.getRowFeeItems(m, this.rbDetails[m]);
 
-            this.rbDetails[m].rowfeeblocks = [];
-            this.rbDetails[m].rowfeeblocks.push({
-              servicesscope: this.rbDetails[m].servicesscope,
-              expensedescribe: this.rbDetails[m].servicesscopename,
-              expense: this.rbDetails[m].expense,
-              remark: this.rbDetails[m].servicesscopename
-            });
+            //鑾峰彇璐圭敤椤圭洰鐨勮缁嗕俊鎭�
+            this.rbDetails[m].rowfeeblocks = this.feeBlocks.filter(r => r.itemid == this.rbDetails[m].itemid);
           }
 
           if (this.rbDetails.length == 0) {
@@ -1874,7 +1451,7 @@
     handleDelete() {
       this.$modal
         .confirm("鏄惁纭鍒犻櫎璇ヨ褰曪紵")
-        .then(function() {
+        .then(function () {
           return delFund(this.curId);
         })
         .then(() => {
@@ -1889,7 +1466,7 @@
           this.getfundList();
           this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
 
     /** 涓婃姤鎸夐挳鎿嶄綔 */
@@ -1939,6 +1516,7 @@
     },
     /** 鎻愪氦鎸夐挳 */
     submitForm: debounce(function() {
+      console.log("debounce");
       if (!this.randomnumber) {
         this.randomnumber = this.generateRandomString(9);
         this.form.randomnumber = this.randomnumber;
@@ -1957,8 +1535,8 @@
             if (tempDetail.itemid == null) {
               this.$modal.msgWarning(
                 "鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
-                  (k + 1).toString() +
-                  "琛岀殑鏈嶅姟椤圭洰鏈�夋嫨锛岃鍏堥�夋嫨鏈嶅姟椤圭洰鍚庡啀鎻愪氦淇濆瓨锛�"
+                (k + 1).toString() +
+                "琛岀殑鏈嶅姟椤圭洰鏈�夋嫨锛岃鍏堥�夋嫨鏈嶅姟椤圭洰鍚庡啀鎻愪氦淇濆瓨锛�"
               );
               return;
             }
@@ -1967,8 +1545,8 @@
               if (tempDetail.servicesscope == null) {
                 this.$modal.msgWarning(
                   "鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
-                    (k + 1).toString() +
-                    "琛岀殑璐圭敤璇存槑鏈�夋嫨,璇烽�夋嫨璐圭敤璇存槑鍚庡啀鎻愪氦淇濆瓨锛�"
+                  (k + 1).toString() +
+                  "琛岀殑璐圭敤璇存槑鏈�夋嫨,璇烽�夋嫨璐圭敤璇存槑鍚庡啀鎻愪氦淇濆瓨锛�"
                 );
                 return;
               }
@@ -1979,8 +1557,8 @@
               ) {
                 this.$modal.msgWarning(
                   "鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
-                    (k + 1).toString() +
-                    "琛岀殑鏈嶅姟浜哄憳濮撳悕涓洪�夋嫨,璇烽�夋嫨浜哄憳鍚庡啀鎻愪氦淇濆瓨锛�"
+                  (k + 1).toString() +
+                  "琛岀殑鏈嶅姟浜哄憳濮撳悕涓洪�夋嫨,璇烽�夋嫨浜哄憳鍚庡啀鎻愪氦淇濆瓨锛�"
                 );
                 return;
               }
@@ -2085,8 +1663,8 @@
               ) {
                 this.$modal.msgWarning(
                   "鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
-                    (j + 1).toString() +
-                    "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�"
+                  (j + 1).toString() +
+                  "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�"
                 );
                 return;
               }
@@ -2100,8 +1678,8 @@
               ) {
                 this.$modal.msgWarning(
                   "鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
-                    (j + 1).toString() +
-                    "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�"
+                  (j + 1).toString() +
+                  "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�"
                 );
                 return;
               }
@@ -2267,6 +1845,7 @@
               expertNo: this.personlist[j].id,
               exportName: this.personlist[j].username
             });
+            console.log(this.expertlist);
           }
         }
       });
@@ -2320,7 +1899,6 @@
             organizationid: response.rows[i].id,
             organizationname: response.rows[i].organizationname
           });
-          console.log(this.unitList);
         }
       });
     },
@@ -2335,11 +1913,15 @@
       });
     },
 
-    //鑾峰彇璐圭敤绫诲瀷
+    //鑾峰彇鏈嶅姟璐圭敤绫诲瀷銆佹湇鍔￠」鐩�佹湇鍔¤鏄�
     getFeeTypes() {
+      //鑾峰彇鏈嶅姟璐圭敤绫诲瀷銆佹湇鍔￠」鐩�
       getFundTypeAll(this.businessType).then(res => {
         let dataList = res.data;
+        //鑾峰彇鏈嶅姟璐圭敤鏈嶅姟椤圭洰
         this.feeItemTypes = dataList;
+
+        //鑾峰彇鏈嶅姟璐圭敤绫诲瀷
         this.rowfeeItemTypes = [];
         for (let m = 0; m < dataList.length; m++) {
           this.rowfeeItemTypes.push({
@@ -2348,20 +1930,33 @@
             subjecttype: dataList[m].subjecttype,
             subjecttypename: dataList[m].subjecttypename
           });
+          console.log("璐圭敤绫诲瀷", this.rowfeeItemTypes);
         }
       });
+
+      //鑾峰彇鏈嶅姟璐圭敤璇存槑鍒楄〃
+      if (this.businessType == '1' || this.businessType == '2') {
+        this.loading = true;
+        listItemexpense(this.expenseQueryParams).then(response => {
+          response.rows.forEach(item => {
+            this.feeBlocks.push({
+              servicesscope: JSON.stringify(item.id),
+              itemid: item.itemid,
+              expense: item.expense,
+              expensedescribe: item.expensedescribe,
+              remark: item.expensedescribe
+            });
+          });
+          this.loading = false;
+        });
+      }
     },
 
-    getFeeItems(rowindex, row) {
+    //鑾峰彇鏈嶅姟椤圭洰
+    getRowFeeItems(rowindex, row) {
       let list = this.feeItemTypes.filter(r => r.itemType == row.applytype);
       row.itemlist = list[0].itemDetails;
       this.$set(this.rbDetails, rowindex, row);
-      //this.loading = true;
-      // getItemNames(row.applytype).then((res) => {
-      //   this.loading = false;
-      //   row.itemlist = res.data;
-      //   this.$set(this.rbDetails, rowindex, row);
-      // });
     },
 
     //鍔犺浇鏈嶅姟椤圭洰
@@ -2370,13 +1965,6 @@
       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();
-      // });
     },
 
     //鑾峰彇璐圭敤椤圭洰鐨勫娉ㄤ俊鎭�
@@ -2390,20 +1978,20 @@
             row.taxedamount = item.expense;
 
             //璁＄畻绋庡墠閲戦
-            this.calculateTax(row, "B");
+            // this.calculateTax(row, "B");
           } else {
             row.amount = item.expense;
             row.taxamount = 0.0;
             row.taxedamount = 0.0;
 
             //璁＄畻绋庡悗閲戦
-            this.calculateTax(row, "A");
+            // this.calculateTax(row, "A");
           }
 
-          this.form.serviceFunddetails = 0;
-          this.rbDetails.map(item => {
-            this.form.serviceFunddetails += item.amount;
-          });
+          // this.form.serviceFunddetails = 0;
+          // this.rbDetails.map(item => {
+          //   this.form.serviceFunddetails += item.amount;
+          // });
         }
       });
     },
@@ -2431,22 +2019,28 @@
       }
 
       //鑾峰彇璐圭敤椤圭洰鐨勮缁嗕俊鎭�
-      getdetailsByItemId(row.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;
+      if (this.businessType == "1") {
         row.servicesscope = null;
         row.servicesscopename = "";
-      });
+        row.amount = 0.0;
+        row.taxamount = 0.0;
+        row.taxedamount = 0.0;
+
+        row.rowfeeblocks = this.feeBlocks.filter(r => r.itemid == row.itemid);
+        if (row.rowfeeblocks.length == 1) {
+          row.servicesscope = row.rowfeeblocks[0].servicesscope;
+          row.servicesscopename = row.rowfeeblocks[0].expensedescribe;
+          if (row.servicesscopename.includes("绋庡悗")) {
+            row.amount = 0.0;
+            row.taxamount = 0.0;
+            row.taxedamount = row.rowfeeblocks[0].expense;
+          } else {
+            row.amount = row.rowfeeblocks[0].expense;
+            row.taxamount = 0.0;
+            row.taxedamount = 0.0;
+          }
+        }
+      }
     },
 
     //绛涙煡鍑哄搴旂殑璐圭敤椤圭洰
@@ -2470,9 +2064,10 @@
         });
       }
     },
+
     //鍚堣璐圭敤
     selectamount(row) {
-      this.rowfeeblocks.forEach((item, i) => {
+      this.feeBlockList.forEach((item, i) => {
         if (item.expense === row.amount) {
           row.remark = item.expensedescribe;
         }
@@ -2559,23 +2154,27 @@
               servicesscopename: ""
             };
 
-            //鑾峰彇鏀惰垂椤圭洰鐨勮鏄庝俊鎭�
-            getdetailsByItemId(rowData.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
-                });
-              });
+            //鑾峰彇鏈嶅姟璇存槑淇℃伅
+            rowData.servicesscope = null;
+            rowData.servicesscopename = "";
+            rowData.amount = 0.0;
+            rowData.taxamount = 0.0;
+            rowData.taxedamount = 0.0;
 
-              rowData.rowfeeblocks = rowfeeblocks;
-              rowData.servicesscope = null;
-              rowData.servicesscopename = "";
-            });
+            rowData.rowfeeblocks = this.feeBlocks.filter(r => r.itemid == rowData.itemid);
+            if (rowData.rowfeeblocks.length == 1) {
+              rowData.servicesscope = rowData.rowfeeblocks[0].servicesscope;
+              rowData.servicesscopename = rowData.rowfeeblocks[0].expensedescribe;
+              if (rowData.servicesscopename.includes("绋庡悗")) {
+                rowData.amount = 0.0;
+                rowData.taxamount = 0.0;
+                rowData.taxedamount = rowData.rowfeeblocks[0].expense;
+              } else {
+                rowData.amount = rowData.rowfeeblocks[0].expense;
+                rowData.taxamount = 0.0;
+                rowData.taxedamount = 0.0;
+              }
+            }
 
             listAdd.push(rowData);
           }
@@ -2583,16 +2182,6 @@
       }
       this.rbDetails = listAdd;
       this.loading = false;
-      // let Outerarr = this.rbDetails;
-      // Outerarr.map((res) => {
-      //   let onelist = this.rowfeeItemTypes;
-      //   onelist.map((item) => {
-      //     //绗竴灞備笉鐩哥瓑鏃讹紱
-      //     if (res.applytype !== item.itemType) {
-      //       this.addRow();
-      //     }
-      //   });
-      // });
     },
 
     unsave() {
@@ -2621,8 +2210,8 @@
             if (tempDetail.itemid == null) {
               this.$modal.msgWarning(
                 "鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
-                  (k + 1).toString() +
-                  "琛岀殑鏈嶅姟椤圭洰鏈�夋嫨锛岃鍏堥�夋嫨鏈嶅姟椤圭洰鍚庡啀鎻愪氦淇濆瓨锛�"
+                (k + 1).toString() +
+                "琛岀殑鏈嶅姟椤圭洰鏈�夋嫨锛岃鍏堥�夋嫨鏈嶅姟椤圭洰鍚庡啀鎻愪氦淇濆瓨锛�"
               );
               return;
             }
@@ -2631,8 +2220,8 @@
               if (tempDetail.servicesscope == null) {
                 this.$modal.msgWarning(
                   "鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
-                    (k + 1).toString() +
-                    "琛岀殑璐圭敤璇存槑鏈�夋嫨,璇烽�夋嫨璐圭敤璇存槑鍚庡啀鎻愪氦淇濆瓨锛�"
+                  (k + 1).toString() +
+                  "琛岀殑璐圭敤璇存槑鏈�夋嫨,璇烽�夋嫨璐圭敤璇存槑鍚庡啀鎻愪氦淇濆瓨锛�"
                 );
                 return;
               }
@@ -2643,8 +2232,8 @@
               ) {
                 this.$modal.msgWarning(
                   "鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
-                    (k + 1).toString() +
-                    "琛岀殑鏈嶅姟浜哄憳濮撳悕涓洪�夋嫨,璇烽�夋嫨浜哄憳鍚庡啀鎻愪氦淇濆瓨锛�"
+                  (k + 1).toString() +
+                  "琛岀殑鏈嶅姟浜哄憳濮撳悕涓洪�夋嫨,璇烽�夋嫨浜哄憳鍚庡啀鎻愪氦淇濆瓨锛�"
                 );
                 return;
               }
@@ -2721,7 +2310,7 @@
                 }
               });
             }
-
+   
             // 璁＄畻绋庡墠銆佺◣璐广�佺◣鍚庨噾棰�
             if (tempDetail.amount == undefined || tempDetail.amount == null || tempDetail.amount == 0 || tempDetail.amount == '') {
               //鑾峰彇鍙傛暟
@@ -2749,8 +2338,8 @@
               ) {
                 this.$modal.msgWarning(
                   "鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
-                    (j + 1).toString() +
-                    "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�"
+                  (j + 1).toString() +
+                  "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�"
                 );
                 return;
               }
@@ -2764,8 +2353,8 @@
               ) {
                 this.$modal.msgWarning(
                   "鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
-                    (j + 1).toString() +
-                    "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�"
+                  (j + 1).toString() +
+                  "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�"
                 );
                 return;
               }
@@ -2844,21 +2433,86 @@
       });
     },
     handleCheckAllChange(val) {
+      console.log(val);
       this.checkedCities = val ? this.cityOptions : [];
       this.isIndeterminate = false;
     },
     handleCheckedCitiesChange(value) {
+      console.log(value);
+      console.log(this.checkedCities);
       let checkedCount = value.length;
+      console.log(checkedCount);
       this.checkAll = checkedCount === this.cityOptions.length;
       this.isIndeterminate =
         checkedCount > 0 && checkedCount < this.cityOptions.length;
     },
     // 鎵归噺褰曞叆鐐瑰嚮
     Batchentry() {
+      // ethical
+      listReportname("ethical").then(res => {
+        console.log(res);
+        this.cityOptions = res.data;
+      });
       this.batchdialogVisible = true;
     },
     // 纭褰曞叆
-    BatchentryFn() {},
+    BatchentryFn() {
+      this.checkedCities.forEach(item => {
+        console.log(item);
+        let rowData = {
+          orderno: null,
+          id: item.id,
+          fundid: null,
+          beneficiaryname: item.reportName,
+          beneficiaryno: null,
+          unitname: item.unitname,
+          unitno: null,
+          uintuserno: null,
+          title: item.title,
+          idcardtype: null,
+          idcardno: item.idcrad,
+          sex: null,
+          familyrelations: null,
+          phone: null,
+          depositbank: item.depositbank,
+          bankcardno: item.bankcardno,
+          branchbankname: item.branchbankname,
+          annexbankcard: null,
+          annexregistform: null,
+          applytype: "7",
+          applytypename: "浼︾悊瀹℃牳涓撳璐�",
+          itemid: "27",
+          itemname: "鍣ㄥ畼鎹愮尞浼︾悊瀹℃牳涓撳璐�",
+          itemtype: null,
+          amount: 200,
+          prepaidamount: null,
+          taxamount: null,
+          invoicecount: null,
+          taxedamount: null,
+          attachcount: null,
+          remark: null,
+          recordstatus: "-1",
+          delFlag: null,
+          createBy: null,
+          createTime: null,
+          updateBy: null,
+          updateTime: null,
+          uploadflag: null,
+          uploadtime: null,
+          itemlist: [{ id: "27", itemName: "鍣ㄥ畼鎹愮尞浼︾悊瀹℃牳涓撳璐�" }],
+          servicesscope: null,
+          rowfeeblocks: [],
+          annexfiles: null
+        };
+
+        console.log(rowData);
+        this.rbDetails.push(rowData);
+      });
+      for (let i = 0; i < this.checkedCities.length + 1; i++) {
+        this.rbDetails[i].orderno = i + 1;
+      }
+      this.batchdialogVisible = false;
+    },
     //鏂板涓�琛�
     addRow(rowIndex) {
       let rowData = {
@@ -2928,6 +2582,11 @@
         type: "success"
       })
         .then(() => {
+          console.log(this.rbDetails.length);
+          if (this.rbDetails.length == 1) {
+            console.log("鏂板");
+            this.addRow(0);
+          }
           if (row.id !== null) {
             delFunddetail(row.id).then(res => {
               if (res.code === 200) {
@@ -2941,6 +2600,9 @@
                     console.log(res);
 
                     this.$set(this.rbDetails, res.data);
+                    for (let i = 0; i < this.rbDetails.length; i++) {
+                      this.rbDetails[i].orderno = i + 1;
+                    }
                     this.sumTotalFee();
                     // this.rbDetails = res.data
                   });
@@ -2961,9 +2623,6 @@
         });
 
       //鍏ㄩ儴鍒犻櫎鍚庢坊鍔犱竴鏉℃柊琛�
-      if (this.rbDetails.length == 1) {
-        this.addRow(0);
-      }
     },
 
     //璁＄畻鎬婚噾棰�
@@ -3090,6 +2749,8 @@
         this.pdfimgsrcList.push(
           this.Networkheader + "/prod-api" + response.fileName
         );
+        this.pdftitle = "鍏�" + this.pdfimgsrcList.length + "椤�";
+
         this.pdfimg = this.Networkheader + "/prod-api" + response.fileName;
 
         this.rbDetails[this.atpresent].annexfilesList = this.fileListto;
@@ -3100,6 +2761,11 @@
 
     // 鐐瑰嚮绁ㄦ嵁
     Filepopup(index, rows, row) {
+      console.log(row);
+      this.tableDatatop = [];
+      this.pdfimgsrcList = [];
+      this.tableDatatop.push(row);
+
       this.atpresent = index;
       this.pdfVisible = true;
       if (this.rbDetails[index].annexfilesList) {
@@ -3107,12 +2773,12 @@
         this.fileListto = this.rbDetails[index].annexfilesList;
         this.pdfimg = this.Networkheader + "/prod-api" + this.fileListto[0].url;
         // this.pdfimg = this.fileListto[0].url;
-        this.pdfimgsrcList = [];
         this.fileListto.forEach(item => {
           this.pdfimgsrcList.push(this.Networkheader + "/prod-api" + item.url);
         });
         console.log(this.pdfimgsrcList);
         console.log(this.pdfimg);
+        this.pdftitle = "鍏�" + this.pdfimgsrcList.length + "椤�";
       } else {
         this.fileListto = [];
         this.pdfimg = "";
@@ -3123,7 +2789,8 @@
     // 鐐瑰嚮宸蹭笂浼犳枃浠�
     downFile(item) {
       console.log(item);
-      this.pdftitle = item.name;
+      this.pdftitle =
+        "鍏�" + this.pdfimgsrcList.length + "椤癸紝褰撳墠閫変腑" + item.name;
       let name = item.name.split(".");
       if (name[1] == "pdf") {
         this.$modal.msgWarning("褰撳墠鏂囦欢鏆備笉鏀寔棰勮");
@@ -3206,7 +2873,18 @@
 
     //涓撳/鍖荤枟鏈烘瀯/璐圭敤鎶ラ攢鏈烘瀯閫夋嫨
     ConfirmDetailDialog() {
-      console.log(this.funddetailForm.tempExpertName);
+      console.log(this.unitforname);
+      console.log(this.Personnelforname);
+      if (this.businessType == 4) {
+        if (this.experthear == "expert") {
+          this.funddetailForm.beneficiaryname = this.unitforname;
+        } else {
+          console.log(11);
+          this.funddetailForm.beneficiaryname = this.Personnelforname;
+          console.log(this.funddetailForm.beneficiaryname);
+        }
+      }
+
       console.log(this.funddetailForm);
       let tempIndex = this.funddetailForm.index;
       let tempExpertName = this.funddetailForm.beneficiaryname;
@@ -3314,7 +2992,6 @@
             let unitIndex = this.feeUnitList.findIndex(
               item => singleDetail.unitno == item.reportNo
             );
-
             if (unitIndex > -1) {
               singleDetail.unitname = this.feeUnitList[unitIndex].reportName;
               singleDetail.depositbank = this.feeUnitList[
@@ -3333,7 +3010,10 @@
       // if (this.experthear == "unit") {
       //   singleDetail.unitname = "";
       // }
-      singleDetail.unitname = this.funddetailForm.unitname;
+      if (this.businessType == 4) {
+        singleDetail.beneficiaryname = this.funddetailForm.beneficiaryname;
+      }
+      console.log(singleDetail);
       console.log(this.funddetailForm);
       this.rbDetails[tempIndex] = singleDetail;
       this.showSelectionDialog = false;
@@ -3362,13 +3042,13 @@
     // this.getFeeUnitList();
   },
 
-  beforeCreate() {}, //鐢熷懡鍛ㄦ湡 - 鍒涘缓涔嬪墠
-  beforeMount() {}, //鐢熷懡鍛ㄦ湡 - 鎸傝浇涔嬪墠
-  beforeUpdate() {}, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪墠
-  updated() {}, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪悗
-  beforeDestroy() {}, //鐢熷懡鍛ㄦ湡 - 閿�姣佷箣鍓�
-  destroyed() {}, //鐢熷懡鍛ㄦ湡 - 閿�姣佸畬鎴�
-  activated() {} //濡傛灉椤甸潰鏈塳eep-alive缂撳瓨鍔熻兘锛岃繖涓嚱鏁颁細瑙﹀彂
+  beforeCreate() { }, //鐢熷懡鍛ㄦ湡 - 鍒涘缓涔嬪墠
+  beforeMount() { }, //鐢熷懡鍛ㄦ湡 - 鎸傝浇涔嬪墠
+  beforeUpdate() { }, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪墠
+  updated() { }, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪悗
+  beforeDestroy() { }, //鐢熷懡鍛ㄦ湡 - 閿�姣佷箣鍓�
+  destroyed() { }, //鐢熷懡鍛ㄦ湡 - 閿�姣佸畬鎴�
+  activated() { } //濡傛灉椤甸潰鏈塳eep-alive缂撳瓨鍔熻兘锛岃繖涓嚱鏁颁細瑙﹀彂
 };
 </script>
 
@@ -3383,7 +3063,6 @@
 
     .top-text {
       text-align: center;
-
       font-size: 23px;
       font-weight: 600;
       margin: 20px 0;
@@ -3446,6 +3125,7 @@
   line-height: 36px;
   text-align: center;
 }
+
 ::v-deep .el-alert__title {
   font-size: 25px;
   line-height: 25px;

--
Gitblit v1.9.3