From 8c7d6925222fd6f81a9a5869426086635e0c08df Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期日, 17 十二月 2023 15:40:27 +0800
Subject: [PATCH] 11

---
 src/views/project/fund/applyDetail/index.vue | 1031 ++++++++++++++++++++++++++++-----------------------------
 1 files changed, 505 insertions(+), 526 deletions(-)

diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue
index 5bbcfa4..b5bcedd 100644
--- a/src/views/project/fund/applyDetail/index.vue
+++ b/src/views/project/fund/applyDetail/index.vue
@@ -9,11 +9,12 @@
             <el-form-item label="鐢宠鏃ユ湡" prop="createTime">
               <el-date-picker
                 clearable
+                :disabled="true"
                 style="width: 100%"
                 v-model="form.createTime"
                 type="date"
                 value-format="yyyy-MM-dd HH:mm:ss"
-                placeholder="鐢宠鏃ユ湡"
+                placeholder="鏃�   鏈�"
               >
               </el-date-picker>
             </el-form-item>
@@ -135,8 +136,8 @@
               瀵煎叆鏈嶅姟椤圭洰
             </el-button>
           </el-col>
-          <el-col :span="3"
-            ><div style="margin-bottom: 15px;" v-if="businessType == 2">
+          <el-col :span="3">
+            <div style="margin-bottom: 15px;" v-if="businessType == 2">
               <el-button
                 type="success"
                 icon="el-icon-download"
@@ -150,7 +151,8 @@
             <div
               style="margin-bottom: 15px;"
               v-if="
-                userprofile.nickName == '闄堟厱鍗�'&&(businessType=='1'||businessType=='2')
+                userprofile.nickName == '闄堟厱鍗�' &&
+                  (businessType == '1' || businessType == '2')
               "
             >
               <el-button
@@ -291,7 +293,7 @@
               </template>
             </el-table-column>
             <el-table-column
-              v-if="
+              v-show="
                 businessType == 2 ||
                   businessType == 3 ||
                   businessType == 4 ||
@@ -303,13 +305,6 @@
               width="120"
             >
               <template slot-scope="scope">
-                <!--
-                  <el-select v-model="scope.row.amount" placeholder="绋庡墠閲戦" clearable filterable allow-create
-                  @change="selectamount(scope.row)">
-                  <el-option v-for="dict in scope.row.rowfeeblocks" :key="dict.expensedescribe" :label="dict.expense"
-                    :value="dict.expense"></el-option>
-                </el-select>
-              -->
                 <el-input
                   v-model="scope.row.amount"
                   placeholder="閲戦"
@@ -322,11 +317,28 @@
               </template>
             </el-table-column>
             <el-table-column
+              prop="taxamount"
+              align="center"
+              label="鎵g◣閲戦"
+              width="120"
+              v-show="
+                (this.ismanager == true) &
+                  (form.applytype == '1' || form.applytype == '2')
+              "
+            >
+              <template slot-scope="scope">
+                <el-input
+                  v-model="scope.row.taxamount"
+                  placeholder="鎵g◣閲戦"
+                />
+              </template>
+            </el-table-column>
+            <el-table-column
               prop="taxedamount"
               align="center"
               label="绋庡悗閲戦"
               width="120"
-              v-if="
+              v-show="
                 (this.ismanager == true) &
                   (form.applytype == '1' || form.applytype == '2')
               "
@@ -345,16 +357,16 @@
             </el-table-column>
             <el-table-column
               prop="beneficiaryname"
+              column-key="sdad"
               align="center"
-              label="濮撳悕"
-              width="120"
-              v-if="form.applytype == '1' || form.applytype == '2'"
+              :label="beneficiarylabel"
+              width="200"
             >
               <template slot-scope="scope">
                 <el-button
                   type="primary"
                   plain
-                  @click="ShowDetailDialog(scope, 'expert')"
+                  @click="showSelectionDialog(scope, 'account')"
                   >{{
                     scope.row.beneficiaryname
                       ? scope.row.beneficiaryname
@@ -366,54 +378,32 @@
             <el-table-column
               prop="unitno"
               align="center"
-              label="鍗曚綅鍚嶇О"
+              label="涓撳鎵�鍦ㄥ崟浣�"
               width="250"
-              v-if="form.applytype != '4' && form.applytype != '3'"
+              v-if="form.applytype == '1' && form.applytype == '2'"
             >
               <template slot-scope="scope">
                 <el-button
                   type="primary"
                   plain
-                  @click="ShowDetailDialog(scope, 'unit')"
+                  @click="showSelectionDialog(scope, 'workunit')"
                   >{{
                     scope.row.unitname ? scope.row.unitname : "鐐瑰嚮閫夋嫨"
                   }}</el-button
                 >
-                <!-- <el-select
-                  v-model="scope.row.unitno"
-                  placeholder="鍗曚綅"
-                  clearable
-                  filterable
-                  allow-create
-                >
-                  <el-option
-                    v-for="(spec, index) in unitList"
-                    :key="index"
-                    :label="spec.organizationname"
-                    :value="spec.organizationid"
-                  ></el-option>
-                                      </el-select> -->
               </template>
             </el-table-column>
-            <el-table-column
-              prop="beneficiaryname"
-              align="center"
-              label="鍗曚綅/涓汉"
-              width="250"
-              v-if="form.applytype == '4' || form.applytype == '3'"
-            >
+            <!-- 
+            <el-table-column prop="unitname" align="center" label="鍗曚綅锛堜釜浜猴級鍚嶇О" width="300"
+              v-if="form.applytype == '4' || form.applytype == '3'">
               <template slot-scope="scope">
-                <el-button
-                  type="primary"
-                  plain
-                  @click="ShowDetailDialog(scope, 'expert')"
-                  >{{
-                    scope.row.beneficiaryname
-                      ? scope.row.beneficiaryname
-                      : "鐐瑰嚮閫夋嫨"
-                  }}</el-button
-                >
-                <!-- <el-select
+                <el-button type="primary" plain @click="showSelectionDialog(scope, 'account')">{{
+                  scope.row.unitname
+                  ? scope.row.unitname
+                  : "鐐瑰嚮閫夋嫨"
+                }}</el-button>
+
+                <el-select
                   v-model="scope.row.unitno"
                   placeholder="鍗曚綅"
                   clearable
@@ -426,9 +416,10 @@
                     :label="spec.organizationname"
                     :value="spec.organizationid"
                   ></el-option>
-                                      </el-select> -->
+                </el-select>
               </template>
             </el-table-column>
+             -->
             <el-table-column
               prop="title"
               align="center"
@@ -450,8 +441,11 @@
               <template slot-scope="scope">
                 <el-form-item :error="scope.row.error" label-width="0">
                   <el-input
+                    :disabled="
+                      userprofile.nickName != '闄堟厱鍗�' && businessType == 1
+                    "
                     v-model.number="scope.row.idcardno"
-                    @input="tableParValueChange(scope.row)"
+                    @input="tableParValueChange1(scope.row)"
                     placeholder="韬唤璇佸彿"
                   />
                 </el-form-item>
@@ -463,9 +457,11 @@
               label="寮�鎴烽摱琛�"
               width="200"
             >
-              <!-- v-if="form.applytype != '4'" -->
               <template slot-scope="scope">
                 <el-input
+                  :disabled="
+                    userprofile.nickName != '闄堟厱鍗�' && businessType == 1
+                  "
                   v-model="scope.row.depositbank"
                   placeholder="寮�鎴烽摱琛�"
                 />
@@ -479,13 +475,16 @@
             >
               <template slot-scope="scope">
                 <el-input
+                  :disabled="
+                    userprofile.nickName != '闄堟厱鍗�' && businessType == 1
+                  "
                   v-model="scope.row.bankcardno"
                   placeholder="閾惰甯愬彿"
                 />
               </template>
             </el-table-column>
             <el-table-column
-              prop="itemdescribe"
+              prop="itemdescrisca"
               align="center"
               width="330"
               label="椤圭洰璇存槑"
@@ -558,7 +557,9 @@
                   "
                   type="text"
                   size="small"
-                  v-if="businessType == 3 || businessType == 4"
+                  v-if="
+                    businessType == 3 || businessType == 2 || businessType == 4
+                  "
                   >绁ㄦ嵁</el-button
                 >
               </template>
@@ -692,11 +693,11 @@
           style="margin-top: 25px; margin-bottom: 5px"
           v-if="operationType == 'check' && userprofile.nickName == '闄堟厱鍗�'"
         >
-          <el-col :span="7">
+          <el-col :span="20">
             <el-form-item label="鐢宠鏉愭枡鐘舵��" prop="infoid">
               <el-radio-group v-model="form.checkstatus" align="left">
                 <el-radio :label="1">寰呯敵璇锋潗鏂�</el-radio>
-                <el-radio :label="2">鐢宠鏉愭枡閫氳繃绛夊緟鏉愭枡</el-radio>
+                <el-radio :label="2">瀹℃牳閫氳繃绛夊緟閭瘎绾歌川鏉愭枡</el-radio>
                 <el-radio :label="3">宸叉敹鍒版姤閿�鏉愭枡</el-radio>
               </el-radio-group>
             </el-form-item>
@@ -706,7 +707,7 @@
           style="margin-top: 5px; margin-bottom: 5px"
           v-if="operationType == 'check'"
         >
-          <el-col :span="7">
+          <el-col :span="20">
             <el-form-item label="瀹℃牳缁撴灉" align="left">
               <el-radio-group v-model="checkObj.flowlevelone" align="left">
                 <el-radio label="1">閫氳繃</el-radio>
@@ -715,7 +716,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-
         <el-row v-if="operationType == 'check'">
           <el-col :span="17">
             <el-form-item label="瀹℃牳澶囨敞" align="left">
@@ -733,7 +733,7 @@
               operationType == 'update' ||
               ismanager == true
           "
-          >鎻愪氦淇濆瓨</el-button
+          >淇濆瓨</el-button
         >
         <el-button
           type="success"
@@ -752,63 +752,28 @@
     </div>
 
     <el-dialog
-      :visible.sync="showSelectionDialog"
+      :visible.sync="showselectiondialog"
       :close-on-click-modal="false"
-      :title="'鍗曚綅/涓汉淇℃伅閫夋嫨'"
-      width="500px"
+      :title="'璐︽埛淇℃伅/鍗曚綅淇℃伅閫夋嫨'"
+      width="650px"
       style="text-align: center"
       v-loading="loading"
     >
-      <el-form ref="funddetailForm" :rules="funddrules" :model="funddetailForm">
-        <el-row v-if="businessType != 4 && businessType != 3">
-          <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>
-                <el-radio label="2">鏂板涓撳</el-radio>
-              </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-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24" v-if="selectionType == 'unit'">
+      <el-form
+        ref="accountselectform"
+        :rules="dialogrules"
+        :model="accountselectform"
+        label-width="120px"
+      >
+        <el-row v-if="selectionType == 'workunit'">
+          <el-col :span="24">
             <el-form-item
               label="鍗曚綅鍚嶇О"
-              prop="unitno"
+              prop="expertunitno"
               label-width="120px"
-              v-if="businessType == 1 || businessType == 2"
             >
               <el-select
-                v-model="funddetailForm.unitno"
+                v-model="accountselectform.expertunitno"
                 placeholder="鍗曚綅鍚嶇О"
                 clearable
                 filterable
@@ -823,110 +788,84 @@
                 ></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-select>
-            </el-form-item>
           </el-col>
         </el-row>
-
-        <el-row v-if="businessType == 4 || businessType == 3">
-          <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 label="unit">浜哄憳閫夐」</el-radio>
-                <el-radio label="expert">鍗曚綅閫夐」</el-radio>
+        <el-row v-if="selectionType == 'account'">
+          <el-col>
+            <el-form-item
+              label="璐︽埛鏉ユ簮"
+              prop="accountfrom"
+              class="left-align"
+            >
+              <el-radio-group v-model="accountfrom" style="margin-bottom: 0">
+                <el-radio label="1">浠庤处鎴峰簱</el-radio>
+                <el-radio label="2"
+                  >鏂板璐︽埛锛堟柊澧炲悗闇�瑕佸鏍哥‘璁ゆ墠鑳藉惎鐢級</el-radio
+                >
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="24" v-if="experthear == 'unit'">
-            <el-form-item
-              label="浜哄憳濮撳悕"
-              prop="beneficiaryname"
-              label-width="80px"
-            >
+          <el-col :span="24" v-if="accountfrom == '1'">
+            <el-form-item label="璐︽埛鍚嶇О" prop="accountname">
               <el-select
                 filterable
                 allow-create
-                ref="beneficiaryname"
+                ref="accountname"
                 default-first-option
-                @change="bbaaccss"
-                v-model="funddetailForm.beneficiaryname"
+                v-model="accountselectform.accountname"
                 placeholder="璇烽�夋嫨"
                 style="width: 100%"
               >
                 <el-option
-                  v-for="item in expertlist"
-                  :key="item.expertNo"
-                  :label="item.exportName"
-                  :value="item.exportName"
+                  v-for="item in accountlist"
+                  :key="item.id"
+                  :label="item.username"
+                  :value="item.username"
                 >
                 </el-option>
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="24" v-if="experthear == 'expert'">
-            <el-form-item label="鍗曚綅鍚嶇О" prop="unitno" label-width="120px">
-              <el-select
-                v-model="funddetailForm.beneficiaryname"
-                placeholder="鍗曚綅鍚嶇О"
-                @change="bbaaccss"
-                clearable
-                filterable
-                allow-create
-                style="width: 100%"
+        </el-row>
+        <el-row v-if="accountfrom == '2'">
+          <el-col :span="16"
+            ><el-form-item label="鏂板绫诲瀷" prop="usertype">
+              <el-radio-group
+                v-model="accountselectform.usertype"
+                style="margin-bottom: 0"
               >
-                <el-option
-                  v-for="(spec, index) in feeUnitList"
-                  :key="index"
-                  :label="spec.reportName"
-                  :value="spec.reportName"
-                ></el-option>
-              </el-select>
+                <el-radio label="expert">鏂板涓撳璐﹀彿</el-radio>
+                <el-radio label="org">鏂板鍗曚綅璐﹀彿</el-radio>
+              </el-radio-group>
             </el-form-item>
           </el-col>
         </el-row>
-
-        <el-row v-if="businessType != 4 && businessType != 3">
-          <el-col :span="12" v-if="expertfrom == '2'">
-            <el-form-item label="涓撳濮撳悕" prop="expertname" label-width="80px">
+        <el-row v-if="accountfrom == '2'">
+          <el-col :span="24">
+            <el-form-item label="璐﹀彿鍚嶇О" prop="username">
               <el-input
-                v-model="funddetailForm.expertname"
-                placeholder="蹇呭~椤�"
+                v-model="accountselectform.username"
+                placeholder="璇疯緭鍏ュ崟浣嶅悕绉版垨涓撳濮撳悕"
               />
             </el-form-item>
           </el-col>
-          <el-col :span="12" v-if="expertfrom == '2'">
-            <el-form-item
-              label="鑱�    绉�"
-              prop="experttitle"
-              label-width="80px"
-            >
+        </el-row>
+        <el-row
+          v-if="accountfrom == '2' && accountselectform.usertype != 'org'"
+        >
+          <el-col :span="12">
+            <el-form-item label="韬唤璇佸彿" prop="idcardno">
+              <el-input
+                v-model="accountselectform.idcardno"
+                placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="鑱岀О" prop="title">
               <el-select
-                v-model="funddetailForm.experttitle"
-                placeholder="蹇呭~椤�"
+                v-model="accountselectform.title"
+                placeholder="璇烽�夋嫨浜哄憳鑱岀О"
               >
                 <el-option
                   v-for="dict in dict.type.sys_professionaltitle"
@@ -938,30 +877,13 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="businessType != 4 && businessType != 3">
-          <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>
-          </el-col>
-        </el-row>
-
-        <el-row v-if="businessType != 4 && businessType != 3">
-          <el-col :span="24" v-if="expertfrom == '2'">
-            <el-form-item
-              label="鍗曚綅鍚嶇О"
-              prop="expertunitno"
-              label-width="80px"
-            >
+        <el-row
+          v-if="accountfrom == '2' && accountselectform.usertype != 'org'"
+        >
+          <el-col>
+            <el-form-item label="鎵�鍦ㄥ崟浣�" prop="unitno">
               <el-select
-                v-model="funddetailForm.expertunitno"
+                v-model="accountselectform.unitno"
                 placeholder="鍗曚綅鍚嶇О"
                 clearable
                 filterable
@@ -974,41 +896,62 @@
                   :label="spec.organizationname"
                   :value="spec.organizationid"
                 ></el-option>
-              </el-select> </el-form-item
-          ></el-col>
-        </el-row>
-        <el-row v-if="businessType != 4 && businessType != 3">
-          <el-col :span="24" v-if="expertfrom == '2'">
-            <el-form-item
-              label="寮�鎴烽摱琛�"
-              prop="expertdepositbank"
-              label-width="80px"
-            >
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col>
+            <el-form-item label="鍗曚綅宸ュ彿" prop="personnelunitno">
               <el-input
-                v-model="funddetailForm.expertdepositbank"
-                placeholder="蹇呭~椤�"
+                v-model="accountselectform.personnelunitno"
+                placeholder="璇疯緭鍏ユ墍鍦ㄥ崟浣嶇殑宸ュ彿"
               />
             </el-form-item>
           </el-col>
-          <el-col :span="24" v-if="expertfrom == '2'">
-            <el-form-item
-              label="閾惰鍗″彿"
-              prop="expertbankcardno"
-              label-width="80px"
-            >
+        </el-row>
+        <el-row v-if="accountfrom == '2'">
+          <el-col
+            ><el-form-item label="寮�鎴烽摱琛�" prop="depositbank">
               <el-input
-                v-model="funddetailForm.expertbankcardno"
-                placeholder="蹇呭~椤�"
+                v-model="accountselectform.depositbank"
+                placeholder="璇疯緭鍏ュ紑鎴烽摱琛屽悕绉�"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col
+            ><el-form-item label="閾惰鍗″彿" prop="bankcardno">
+              <el-input
+                v-model="accountselectform.bankcardno"
+                placeholder="璇疯緭鍏ラ摱琛屽崱鍙�"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-if="accountfrom == '2'">
+          <el-col>
+            <el-form-item label="鑱旂郴鍦板潃" prop="address">
+              <el-input
+                v-model="accountselectform.address"
+                placeholder="璇疯緭鍏ヨ仈绯诲湴鍧�"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-if="accountfrom == '2'">
+          <el-col>
+            <el-form-item label="鑱旂郴鐢佃瘽" prop="telephone">
+              <el-input
+                v-model="accountselectform.telephone"
+                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 type="primary" @click="confirmSelectionDialog()"
           >纭� 瀹�</el-button
         >
+        <el-button @click="showselectiondialog = false">鍙� 娑�</el-button>
       </span>
     </el-dialog>
     <el-dialog
@@ -1063,12 +1006,7 @@
             v-if="form.applytype != '4'"
           >
           </el-table-column> -->
-          <el-table-column
-            prop="beneficiaryname"
-            align="center"
-            label="鍗曚綅/涓汉"
-            width="250"
-          >
+          <el-table-column prop="" align="center" label="鍗曚綅/涓汉" width="250">
           </el-table-column>
           <el-table-column
             prop="title"
@@ -1152,15 +1090,14 @@
                     label="鍚嶇О"
                   >
                     <template slot-scope="scope">
-                      <i style="color:#409EFF" class=" el-icon-s-order" />{{
-                        scope.row.name
-                      }}
+                      <i style="color:#409EFF" class=" el-icon-s-order" />
+                      <span>{{ scope.row.name }}</span>
                     </template>
                   </el-table-column>
 
                   <el-table-column
                     prop="name"
-                    width="180"
+                    width="190"
                     :show-overflow-tooltip="true"
                     label="鍔熻兘"
                   >
@@ -1177,6 +1114,13 @@
                         @click.native.prevent.stop="moveupdowfile(scope.row)"
                         >涓婄Щ</el-button
                       >
+                      <el-button
+                        type="success"
+                        size="mini"
+                        icon="el-icon-search"
+                        circle
+                        @click.native.prevent.stop="Downloadfile(scope.row)"
+                      ></el-button>
                     </template>
                   </el-table-column>
                 </el-table>
@@ -1249,15 +1193,14 @@
                     label="鍚嶇О"
                   >
                     <template slot-scope="scope">
-                      <i style="color:#409EFF" class=" el-icon-s-order" />{{
-                        scope.row.name
-                      }}
+                      <i style="color:#409EFF" class=" el-icon-s-order" />
+                      <span>{{ scope.row.name }}</span>
                     </template>
                   </el-table-column>
 
                   <el-table-column
                     prop="name"
-                    width="180"
+                    width="190"
                     :show-overflow-tooltip="true"
                     label="鍔熻兘"
                   >
@@ -1274,6 +1217,13 @@
                         @click.native.prevent.stop="moveupdowfile(scope.row)"
                         >涓婄Щ</el-button
                       >
+                      <el-button
+                        type="success"
+                        size="mini"
+                        icon="el-icon-search"
+                        circle
+                        @click.native.prevent.stop="Downloadfile(scope.row)"
+                      ></el-button>
                     </template>
                   </el-table-column>
                 </el-table>
@@ -1296,8 +1246,8 @@
               </el-image>
             </div>
             <div v-else class="pdfimgmins">{{ hintitle }}</div>
-          </div></el-tab-pane
-        >
+          </div>
+        </el-tab-pane>
       </el-tabs>
     </el-dialog>
     <el-dialog title="鎻愮ず" :visible.sync="Savereminder" width="30%">
@@ -1311,8 +1261,8 @@
       >
       </el-alert>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="unsave">鍙� 娑�</el-button>
         <el-button type="primary" @click="Savenow">纭� 瀹�</el-button>
+        <el-button @click="unsave">鍙� 娑�</el-button>
       </span>
     </el-dialog>
 
@@ -1345,8 +1295,8 @@
       </div>
 
       <span slot="footer" class="dialog-footer">
-        <el-button @click="batchdialogVisible = false">鍙� 娑�</el-button>
         <el-button type="primary" @click="BatchentryFn">纭� 瀹�</el-button>
+        <el-button @click="batchdialogVisible = false">鍙� 娑�</el-button>
       </span>
     </el-dialog>
   </div>
@@ -1471,8 +1421,6 @@
       Routinglevel: 1,
       // 琛ㄥ崟鍙傛暟
       form: {},
-      experthear: "",
-      spocewl: "",
       //璐圭敤鐢宠琛ㄥ崟title
       title: "",
       //鐢宠鍗曠被鍨�
@@ -1492,14 +1440,11 @@
       userprofile: {},
       //绯荤粺鐢ㄦ埛鍒楄〃
       userlist: [],
-      //鎵�鏈変汉鍛樿〃
-      personlist: [],
-      //涓撳鍒楄〃
-      expertlist: [],
+      //璐﹀彿鍒楄〃
+      accountlist: [],
       //鍖荤枟鏈烘瀯鍒楄〃
       unitList: [],
-      //璐圭敤鎶ラ攢鏈烘瀯鍒楄〃
-      feeUnitList: [],
+
       // 缃戠粶璇锋眰澶�
       Networkheader: null,
       batchdialogVisible: false,
@@ -1513,8 +1458,6 @@
 
       //鏄惁鏄笓瀹惰垂鐨凮PO瀹℃壒浜哄憳
       ismanager: false,
-      //涓撳璐归�夋嫨锛�1鏄笓瀹跺簱锛�2鏄柊澧�
-      expertfrom: "1",
       baselisttages: [
         {
           id: 1,
@@ -1555,17 +1498,24 @@
       // 闅忔満鏁�
       randomnumber: "",
 
-      //涓撳/鍗曚綅閫夋嫨锛歟xpert/unit
+      //閫夋嫨绐楀彛鏄剧ず鐘舵��
+      showselectiondialog: false,
+      //閫夋嫨鏃跺綋鍓嶈
+      selectionScope: "",
+      //閫夋嫨绫诲瀷锛氫笓瀹讹紙鍗曚綅锛夎处鎴枫�佸伐浣滃崟浣嶏紙account/workunit锛�
       selectionType: "",
-      showSelectionDialog: false,
+      //鍙楃泭浜烘爣绛撅細涓撳璐�-涓撳锛堝崟浣嶏級鍚嶇О锛屽尰瀛︽垚鏈�-鍔炲叕-鍗曚綅锛堜釜浜猴級鍚嶇О
+      beneficiarylabel: "",
+      //璐︽埛閫夋嫨锛�1鏄处鎴峰簱锛�2鏄柊澧�
+      accountfrom: "1",
       //绋庡墠閲戦鏍囬锛氫笓瀹惰垂-绋庡墠閲戦锛涘尰瀛︽垚鏈�佸姙鍏垂鐢�-閲戦
       amountLabel: "绋庡墠閲戦",
 
       // 琛ㄥ崟鏍¢獙
       rules: {
-        createTime: [
-          { required: true, message: "璇疯緭鍏ュ~鎶ユ棩鏈�", trigger: "blur" }
-        ],
+        // createTime: [
+        //   { required: true, message: "璇疯緭鍏ュ~鎶ユ棩鏈�", trigger: "blur" }
+        // ],
         reason: [
           { required: true, message: "璇疯緭鍏ュ嚭宸簨鐢�", trigger: "blur" }
         ],
@@ -1573,60 +1523,65 @@
           { required: true, message: "璇疯緭鍏ユ墍灞炰笟鍔$粍", trigger: "blur" }
         ]
       },
-      funddrules: {
-        expertidcardno: [{ validator: validatePass, trigger: "blur" }],
-        expertdepositbank: [
+      dialogrules: {
+        // expertidcardno: [{ validator: validatePass, trigger: "blur" }],
+        depositbank: [
           { required: true, message: "璇疯緭鍏ュ紑鎴烽摱琛�", trigger: "change" }
         ],
-        expertbankcardno: [
+        bankcardno: [
           { required: true, message: "璇疯緭鍏ラ摱琛屽崱鍙�", trigger: "change" }
         ],
-        expertunitno: [
+        unitno: [
           { required: true, message: "璇烽�夋嫨鍗曚綅鍚嶇О", trigger: "change" }
         ]
       },
 
-      funddetailForm: {
+      accountselectform: {
         index: null,
-        beneficiaryname: null,
-        beneficiaryno: null,
-        unitno: null,
-        unitname: null,
-        expertname: null,
-        expertidcardno: null,
-        expertunitno: null,
+        usertype: "expert",
+        accountname: null,
+        accountno: null,
         expertunitname: null,
-        experttitle: null,
-        expertdepositbank: null,
-        expertbankcardno: null
-      },
-
-      expertform: {
-        id: null,
-        address: null,
-        bankcardno: null,
-        branchbankname: null,
-        createBy: null,
-        createTime: null,
-        del_flag: null,
+        expertunitno: null,
         depositbank: null,
+        bankcardno: null,
         idcardno: null,
-        personnelunitno: null,
-        pym: null,
-        remark: null,
-        searchValue: null,
-        sex: null,
-        telephone: null,
         title: null,
         unitname: null,
         unitno: null,
-        updateBy: null,
-        updateTime: null,
-        username: null,
-        userno: null,
+        personnelunitno: null,
+        address: null,
+        telephone: null
+      },
+
+      accountform: {
+        searchValue: null,
+        id: null,
         userstatus: 1,
         usertype: null,
-        wbm: null
+
+        pym: null,
+        wbm: null,
+        username: null,
+        userno: null,
+        sex: null,
+        idcardno: null,
+        title: null,
+        address: null,
+        telephone: null,
+        depositbank: null,
+        branchbankname: null,
+        bankcardno: null,
+        unitname: null,
+        unitno: null,
+        personnelunitno: null,
+
+        del_flag: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        remark: null
       },
       //瀹℃壒鍙傛暟
       checkObj: {
@@ -1814,18 +1769,22 @@
       if (this.businessType == "1") {
         this.businessName = "涓撳鍔冲姟璐圭敵璇峰崟";
         this.amountLabel = "绋庡墠閲戦";
+        this.beneficiarylabel = "涓撳鎴栧崟浣嶅悕绉�";
         this.getUnitList();
       } else if (this.businessType == "2") {
         this.businessName = "浼︾悊涓撳鍔冲姟璐圭敵璇峰崟";
         this.amountLabel = "绋庡墠閲戦";
+        this.beneficiarylabel = "涓撳鎴栧崟浣嶅悕绉�";
         this.getUnitList();
       } else if (this.businessType == "3") {
         this.businessName = "鍖诲鎴愭湰鎶ラ攢鍗�";
         this.amountLabel = "閲戦";
+        this.beneficiarylabel = "鍗曚綅鍚嶇О鎴栦釜浜�";
         this.getUnitList();
       } else if (this.businessType == "4") {
         this.businessName = "鍔炲叕璐圭敤鎶ラ攢鍗�";
         this.amountLabel = "閲戦";
+        this.beneficiarylabel = "鍗曚綅鍚嶇О鎴栦釜浜�";
         this.getUnitList();
 
         // this.getBaseInfoList();
@@ -2062,6 +2021,20 @@
           //鏌ユ壘鏄惁瀛樺湪鐧昏瀹屾垚璁板綍
           //鍒ゆ柇鏄惁瀛樺湪涓婃姤璁板綍
           this.form.recordstatus = 0;
+          var currenttime = new Date();
+          this.form.createTime =
+            currenttime.getFullYear() +
+            "-" +
+            (currenttime.getMonth() + 1) +
+            "-" +
+            currenttime.getDate() +
+            " " +
+            currenttime.getHours() +
+            ":" +
+            currenttime.getMinutes() +
+            ":" +
+            currenttime.getSeconds();
+
           if (!this.form.id) {
             this.form.id = this.$route.query.id;
           }
@@ -2122,6 +2095,8 @@
               );
               return;
             }
+
+            /*
             if (
               tempDetail.idcardno == null &&
               this.businessType != "3" &&
@@ -2135,6 +2110,7 @@
               );
               return;
             }
+            */
 
             if (this.businessType == "1") {
               if (tempDetail.servicesscope == null) {
@@ -2276,30 +2252,37 @@
             JSON.stringify(this.rbDetails)
           );
           sessionStorage.setItem("apiform", JSON.stringify(this.form));
-          addorupdateFund(this.form).then(response => {
-            console.log(this.form);
-            console.log(response, "淇濆瓨杩斿弬");
-            if (response.code === 200) {
-              if (this.form.id) {
-                this.$modal.msgSuccess("鐢宠鍗曚慨鏀规垚鍔燂紒");
-                this.$router.go(-1);
+          addorupdateFund(this.form)
+            .then(response => {
+              console.log(this.form);
+              console.log(response, "淇濆瓨杩斿弬");
+              if (response.code === 200) {
+                if (this.form.id) {
+                  this.$modal.msgSuccess("鐢宠鍗曚慨鏀规垚鍔燂紒");
+                  this.$router.go(-1);
+                } else {
+                  this.$modal.msgSuccess("鐢宠鍗曚繚瀛樻垚鍔燂紒");
+                  this.$store.dispatch("tagsView/delView", this.$route);
+                  this.$router.push({
+                    path: "/finance/applyDetail/",
+                    query: {
+                      id: response.data,
+                      businessType: "2",
+                      operationType: "update",
+                      curCase: this.curCase
+                    }
+                  });
+                }
+                this.form.id = response.data;
+                this.curId = response.data;
+                this.handleUpdate();
               } else {
-                this.$modal.msgSuccess("鐢宠鍗曚繚瀛樻垚鍔燂紒");
-                this.$store.dispatch("tagsView/delView", this.$route);
-                this.$router.push({
-                  path: "/finance/applyDetail/",
-                  query: {
-                    id: response.data,
-                    businessType: "2",
-                    operationType: "update",
-                    curCase: this.curCase
-                  }
-                });
+                this.$modal.msgError("鐢宠鍗曚繚瀛樺け璐ワ細" + response.msg);
               }
-            } else {
-              this.$modal.msgError("鐢宠鍗曚繚瀛樺け璐ワ細" + response.msg);
-            }
-          });
+            })
+            .catch(res => {
+              this.$modal.msgError("鐢宠鍗曚繚瀛樺け璐ワ細" + res);
+            });
           //鍏抽棴绐楀彛
           this.loading = false;
           // this.getfundList();
@@ -2308,16 +2291,41 @@
     }, 500),
 
     //瀹℃壒鎻愪氦
+    // checksubmit() {
+    //   console.log(this.checkObj.flowlevelone);
+    //   if (
+    //     this.form.checkstatus != 3 &&
+    //     this.userprofile.nickName == "闄堟厱鍗�" &&
+    //     this.checkObj.flowlevelone == 1
+    //   ) {
+    //     this.$modal.msgError("璇烽�夌‘璁ゆ潗鏂欑姸鎬佸凡鏀跺埌锛�");
+    //     return;
+    //   }
+    //   this.Savenow();
+    //   console.log("淇濆瓨骞跺鎵�");
+    // },
     checksubmit() {
       console.log(this.checkObj.flowlevelone);
-      if (
-        this.form.checkstatus != 3 &&
-        this.userprofile.nickName == "闄堟厱鍗�" &&
-        this.checkObj.flowlevelone == 1
-      ) {
-        this.$modal.msgError("璇烽�夌‘璁ゆ潗鏂欑姸鎬佸凡鏀跺埌锛�");
-        return;
+      if (this.userprofile.nickName == "闄堟厱鍗�") {
+        //妫�鏌ユ槸鍚︽敹鍒扮焊璐ㄦ潗鏂�
+        if (this.form.checkstatus != 3 && this.checkObj.flowlevelone == 1) {
+          this.$modal.msgError("璇风‘璁ゆ姤閿�鐨勭焊璐ㄦ潗鏂欏凡缁忔敹鍒帮紒");
+          return;
+        }
+
+        //妫�鏌ヤ釜绋庤绠�
+        // if ( (this.form.applytype == "1" || this.form.applytype == "2") && this.form.fundtaxtime == null ) {
+        //   this.$modal.msgError(
+        //     "鎻愪氦涓撳璐圭敤鐢宠鍗曘�佷鸡鐞嗕笓瀹剁敵璇疯垂鐢ㄧ敵璇峰崟瀹℃牳锛岄渶瑕佸厛瀹屾垚涓◣璁$畻锛�"
+        //   );
+        //   return;
+        // }
+        if (this.form.applytype == "1" && this.form.fundtaxtime == null) {
+          this.$modal.msgError("鎻愪氦涓撳璐圭敤鐢宠鍗曞鏍革紝闇�瑕佸厛瀹屾垚涓◣璁$畻锛�");
+          return;
+        }
       }
+
       this.Savenow();
       console.log("淇濆瓨骞跺鎵�");
     },
@@ -2368,67 +2376,43 @@
       });
     },
 
-    //鑾峰彇鎵�鏈変笓瀹�/鍖荤枟鏈烘瀯/璐圭敤鎶ラ攢鏈烘瀯鍒楄〃
-    getExternalList() {
+    //鑾峰彇涓撳銆佸崟浣嶆満鏋勭殑璐︽埛鍒楄〃
+    getAccountList() {
       listExternalperson().then(res => {
-        this.personlist = res.rows;
-        for (let j = 0; j < this.personlist.length; j++) {
-          //鑾峰彇璐圭敤鎶ラ攢鏈烘瀯鍒楄〃
-          if (this.personlist[j].usertype == "org") {
-            this.feeUnitList.push({
-              id: this.personlist[j].id,
-              reportNo: this.personlist[j].userno,
-              reportName: this.personlist[j].username,
-              depositbank: this.personlist[j].depositbank,
-              branchbankname: this.personlist[j].branchbankname,
-              bankcardno: this.personlist[j].bankcardno
+        this.accountlist = res.rows;
+        /** 
+        for (let j = 0; j < this.accountlist.length; j++) {
+          //鍗曚綅璐﹀彿鍒楄〃
+          if (this.accountlist[j].usertype == "org") {
+            this.feeAccountList.push({
+              id: this.accountlist[j].id,
+              reportNo: this.accountlist[j].userno,
+              reportName: this.accountlist[j].username,
+              depositbank: this.accountlist[j].depositbank,
+              branchbankname: this.accountlist[j].branchbankname,
+              bankcardno: this.accountlist[j].bankcardno
             });
           }
-          //涓撳浜哄憳鍒楄〃
+          //涓撳璐﹀彿鍒楄〃
           else if (res.rows[j].usertype == "expert") {
-            this.expertlist.push({
-              expertNo: this.personlist[j].id,
-              exportName: this.personlist[j].username
+            this.expertAccountList.push({
+              expertNo: this.accountlist[j].id,
+              exportName: this.accountlist[j].username+"("+this.accountlist[j].id+")"
             });
           }
         }
+        */
       });
     },
 
     //鑾峰彇缁忓姙浜鸿处鍙蜂俊鎭�
     getUserAccount() {
-      this.personlist.map(res => {
+      this.accountlist.map(res => {
         if (res.username == this.form.username) {
           this.form.bankname = res.depositbank; //res.branchbankname銆乺es.depositbank;
           this.form.bankcardno = res.bankcardno;
           this.form.phone = res.telephone;
         }
-      });
-    },
-
-    //鑾峰彇涓撳浜哄憳鍒楄〃
-    getExpertList() {
-      let types = ["expert"];
-      let templist = [];
-      for (let i = 0; i < types.length; i++) {
-        templist = [];
-        listReportname(types[i]).then(res => {
-          for (let j = 0; j < res.data.length; j++) {
-            templist.push({
-              reportName: res.data[j].reportName,
-              reportNo: res.data[j].reportNo
-            });
-          }
-          this.expertlist = this.expertlist.concat(templist);
-        });
-      }
-    },
-
-    //鑾峰彇璐圭敤鏈烘瀯鍒楄〃
-    getFeeUnitList() {
-      listReportname("org").then(res => {
-        this.feeUnitList = res.data;
-        console.log(this.feeUnitList);
       });
     },
 
@@ -2850,7 +2834,7 @@
               }
               this.Getnetworkheader();
               this.getroute();
-              this.getExternalList();
+              this.getAccountList();
               this.getUserList();
               this.getUserProfile();
             } else {
@@ -2897,7 +2881,7 @@
           //   }
           // });
           this.$modal.msgSuccess("璁$畻鎴愬姛");
-          this.handleCheck()
+          this.handleCheck();
         } else {
           this.$message({
             type: "error",
@@ -3379,177 +3363,175 @@
         this.invoicefileListto.splice(index - 1, 0, item); // 灏唅tem鎻掑叆鍒扮储寮曚綅缃殑鍓嶄竴浣�
       }
     },
+    Downloadfile(row) {
+      console.log(row);
+      window.location.href = this.Networkheader + "/prod-api" + row.url;
+    },
     //涓撳/鍖荤枟鏈烘瀯/璐圭敤鎶ラ攢鏈烘瀯閫夋嫨
-    ShowDetailDialog(spoce, showType) {
-      this.spocewl = spoce;
-      this.selectionType = showType;
-      if (this.businessType == 4 || this.businessType == 3 || !showType) {
-        this.selectionType = this.experthear;
+    showSelectionDialog(scope, selectiontype) {
+      this.selectionScope = scope;
+      this.selectionType = selectiontype;
+      this.accountselectform.index = scope.$index;
+
+      if (this.selectionType == "account") {
+        //榛樿浠庤处鎴峰簱閫夋嫨锛�1,璐︽埛搴擄紱2锛屾柊寤鸿处鎴�
+        this.accountfrom = "1";
+
+        this.accountselectform.accountno = scope.row.beneficiaryno;
+        this.accountselectform.accountname = scope.row.beneficiaryname;
+        this.accountselectform.expertunitname = "";
+        this.accountselectform.expertunitno = "";
+        this.accountselectform.unitno = "";
+        this.accountselectform.unitname = "";
+        this.accountselectform.telephone = "";
+        this.accountselectform.idcardno = "";
+        this.accountselectform.title = "";
+        this.accountselectform.unitno = "";
+        this.accountselectform.unitname = "";
+        this.accountselectform.depositbank = "";
+        this.accountselectform.bankcardno = "";
+        this.accountselectform.personnelunitno = "";
+        this.accountselectform.address = "";
+        this.accountselectform.telephone = "";
+      } else if (this.selectionType == "workunit") {
+        this.accountselectform.expertunitname = scope.row.unitname;
+        this.accountselectform.expertunitno = scope.row.unitno;
       }
 
-      this.expertfrom = "1";
-      console.log(spoce);
-      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.funddetailForm.expertname = "";
-      this.funddetailForm.expertidcardno = "";
-      this.funddetailForm.expertunitno = "";
-      this.funddetailForm.expertunitname = "";
-      this.funddetailForm.experttitle = "";
-      this.funddetailForm.expertdepositbank = "";
-      this.funddetailForm.expertbankcardno = "";
-
-      this.showSelectionDialog = true;
+      this.showselectiondialog = true;
     },
 
     //涓撳/鍖荤枟鏈烘瀯/璐圭敤鎶ラ攢鏈烘瀯閫夋嫨
-    ConfirmDetailDialog() {
-      this.$refs["funddetailForm"].validate(valid => {
-        let tempIndex = this.funddetailForm.index;
-        let tempExpertName = this.funddetailForm.beneficiaryname;
-        let tempUnitname = this.funddetailForm.unitname;
-        let singleDetail = this.rbDetails[tempIndex];
+    confirmSelectionDialog() {
+      this.$refs["accountselectform"].validate(valid => {
+        let tempIndex = this.accountselectform.index;
+        if (this.selectionType == "account") {
+          if (this.accountfrom == "1") {
+            //璧嬪�间俊鎭�
+            this.accountlist.map(res => {
+              if (res.username == this.accountselectform.accountname) {
+                console.log(res);
+                this.rbDetails[tempIndex].beneficiaryno = res.userno;
+                this.rbDetails[tempIndex].beneficiaryname = res.username;
+                this.rbDetails[tempIndex].depositbank = res.depositbank;
+                this.rbDetails[tempIndex].branchbankname = res.branchbankname;
+                this.rbDetails[tempIndex].bankcardno = res.bankcardno;
+                this.rbDetails[tempIndex].phone = res.telephone;
 
-        if (
-          this.selectionType == "expert" ||
-          this.businessType == 4 ||
-          this.businessType == 3
-        ) {
-          if (this.expertfrom == "1" || this.experthear == "unit") {
-            //浠庝笓瀹跺垪琛ㄨ幏鍙栦俊鎭�
-            this.personlist.map(res => {
-              if (tempExpertName == 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);
+                if (res.usertype == "org") {
+                  this.rbDetails[tempIndex].idcardno = "";
+                  this.rbDetails[tempIndex].title = "";
+                  this.rbDetails[tempIndex].unitno = "";
+                  this.rbDetails[tempIndex].unitname = "";
+                } else {
+                  this.rbDetails[tempIndex].idcardno = res.idcardno;
+                  this.rbDetails[tempIndex].title = res.title;
+                  this.rbDetails[tempIndex].unitno = parseInt(res.unitno);
+                  this.rbDetails[tempIndex].unitname = res.unitname;
+                }
               }
             });
-          } else {
-            //淇濆瓨鏂板涓撳
-            this.expertform.id = null;
-            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;
-            this.expertform.sex = null;
-            this.expertform.telephone = null;
-            this.expertform.address = null;
-            this.expertform.wbm = null;
-            this.expertform.pym = null;
+          } else if (this.accountfrom == "2") {
+            //淇濆瓨鏂板璐﹀彿
+            this.accountform.id = null;
+            this.accountform.userno =
+              this.accountlist[this.accountlist.length - 1].id + 1;
+            this.accountform.usertype = this.accountselectform.usertype;
+            this.accountform.username = this.accountselectform.username;
+            this.accountform.idcardno = this.accountselectform.idcardno;
+            this.accountform.sex = null;
+            this.accountform.title = this.accountselectform.title;
+            this.accountform.telephone = this.accountselectform.telephone;
+            this.accountform.address = this.accountselectform.address;
+            this.accountform.wbm = null;
+            this.accountform.pym = null;
 
-            this.expertform.unitno = this.funddetailForm.expertunitno;
-            try {
-              let unitIndex = this.unitList.findIndex(
-                item => this.expertform.unitno == item.organizationid
-              );
-              if (unitIndex > -1) {
-                this.expertform.unitname = this.unitList[
-                  unitIndex
-                ].organizationname;
-              } else {
-                this.expertform.unitname = this.expertform.unitno;
-              }
-            } catch {
-              this.expertform.unitname = this.expertform.unitno;
+            this.accountform.depositbank = this.accountselectform.depositbank;
+            this.accountform.bankcardno = this.accountselectform.bankcardno;
+            this.accountform.branchbankname = null;
+            this.accountform.remark = null;
+            this.accountform.del_flag = "0";
+            this.accountform.personnelunitno = null;
+
+            if (this.accountselectform.usertype != "org") {
+              this.accountform.unitno = this.accountselectform.unitno;
+              this.unitList.map(res => {
+                if (res.organizationid == this.accountform.unitno) {
+                  this.accountform.unitname = res.organizationname;
+                }
+              });
+              // try {
+              //   let unitIndex = this.unitList.findIndex(
+              //     item => this.accountform.unitno == item.organizationid
+              //   );
+              //   if (unitIndex > -1) {
+              //     this.accountform.unitname = this.unitList[unitIndex].organizationname;
+              //   } else {
+              //     this.accountform.unitname = this.accountform.unitno;
+              //   }
+              // } catch {
+              //   this.accountform.unitname = this.accountform.unitno;
+              // }
             }
-            this.expertform.title = this.funddetailForm.experttitle;
-            this.expertform.personnelunitno = null;
-
-            this.expertform.depositbank = this.funddetailForm.expertdepositbank;
-            this.expertform.bankcardno = this.funddetailForm.expertbankcardno;
-            this.expertform.branchbankname = null;
-            this.expertform.remark = null;
-            this.expertform.del_flag = "0";
-
-            addExternalperson(this.expertform).then(response => {
+            addExternalperson(this.accountform).then(response => {
               if (response.code == 200) {
-                this.$modal.msgSuccess("鏂板涓撳淇℃伅鎴愬姛锛�");
+                //this.$modal.msgSuccess("鏂扮殑涓撳鎴栧崟浣嶈处鎴蜂俊鎭凡娣诲姞鎴愬姛锛�");
+                this.accountselectform.accountno = this.accountselectform.userno;
+                this.accountselectform.accountname = this.accountselectform.username;
 
+                //閲嶆柊鑾峰彇璐︽埛鍒楄〃
                 listExternalperson().then(res => {
-                  this.personlist = res.rows;
-                  //浠庝笓瀹跺垪琛ㄨ幏鍙栦俊鎭�
-                  this.personlist.map(res => {
-                    if (res.username == this.funddetailForm.expertname) {
-                      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);
+                  this.accountlist = res.rows;
+
+                  //璧嬪�间俊鎭�
+                  this.accountlist.map(res => {
+                    if (res.username == this.accountselectform.accountname) {
+                      this.rbDetails[tempIndex].beneficiaryno = res.userno;
+                      this.rbDetails[tempIndex].beneficiaryname = res.username;
+                      this.rbDetails[tempIndex].depositbank = res.depositbank;
+                      this.rbDetails[tempIndex].branchbankname =
+                        res.branchbankname;
+                      this.rbDetails[tempIndex].bankcardno = res.bankcardno;
+                      this.rbDetails[tempIndex].phone = res.telephone;
+
+                      if (res.usertype == "org") {
+                        this.rbDetails[tempIndex].idcardno = "";
+                        this.rbDetails[tempIndex].title = "";
+                        this.rbDetails[tempIndex].unitno = "";
+                        this.rbDetails[tempIndex].unitname = "";
+                      } else {
+                        this.rbDetails[tempIndex].idcardno = res.idcardno;
+                        this.rbDetails[tempIndex].title = res.title;
+                        this.rbDetails[tempIndex].unitno = parseInt(res.unitno);
+                        this.rbDetails[tempIndex].unitname = res.unitname;
+                      }
                     }
                   });
                 });
               }
             });
           }
-        } else if (this.selectionType == "unit") {
-          singleDetail.unitno = this.funddetailForm.unitno;
-          if (this.businessType == 1 || this.businessType == 2) {
-            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 if (this.selectionType == "workunit") {
+        console.log(tempIndex);
+          
+          this.rbDetails[
+            tempIndex
+          ].unitno = this.accountselectform.expertunitno;
+          this.unitList.map(res => {
+            if (res.organizationid == this.accountform.unitno) {
+              this.rbDetails[tempIndex].unitno.unitname = res.organizationname;
             }
-          } else if (this.businessType == 3 || this.businessType == 4) {
-            try {
-              let unitIndex = this.feeUnitList.findIndex(
-                item => singleDetail.unitno == item.reportNo
-              );
-              if (unitIndex > -1) {
-                singleDetail.unitname = this.feeUnitList[unitIndex].reportName;
-                singleDetail.depositbank = this.feeUnitList[
-                  unitIndex
-                ].depositbank;
-                singleDetail.bankcardno = this.feeUnitList[
-                  unitIndex
-                ].bankcardno;
-              } else {
-                singleDetail.unitname = singleDetail.unitno;
-              }
-            } catch {
-              singleDetail.unitname = singleDetail.unitno;
-            }
-          }
+          });
         }
 
-        // if (this.experthear == "unit") {
-        //   singleDetail.unitname = "";
-        // }
-        if (this.businessType == 4 || this.businessType == 3) {
-          singleDetail.beneficiaryname = this.funddetailForm.beneficiaryname;
-        }
-        this.rbDetails[tempIndex] = singleDetail;
-        this.showSelectionDialog = false;
+        //鍏抽棴绐楀彛
+        this.showselectiondialog = false;
       });
     },
     tableParValueChange(row, tto) {
       const regex = /^[1-9]\d{5}(19|20)\d{2}(0[1-9]|1[012])(0[1-9]|[12]\d|3[01])\d{3}([0-9]|X)$/;
       if (tto) {
-        if (regex.test(funddetailForm.expertidcardno)) {
+        if (regex.test(accountselectform.expertidcardno)) {
           row.error = "";
         } else {
           row.error = "韬唤璇佸彿鐮佹牸寮忛敊璇�";
@@ -3570,19 +3552,16 @@
     //鑾峰彇璺敱鍙傛暟
     this.Getnetworkheader();
     this.getroute();
-    this.getExternalList();
-    this.getFeeUnitList();
+    this.getAccountList();
+    this.getUserProfile();
   },
 
   //鐢熷懡鍛ㄦ湡 - 鎸傝浇瀹屾垚锛堝彲浠ヨ闂瓺OM鍏冪礌锛�
   mounted() {
     window.addEventListener("beforeunload", e => this.beforeunloadHandler(e));
     this.getUserList();
-    this.getUserProfile();
-    let apifunddetailForm = this.funddetailForm;
+    let apiaccountselectform = this.accountselectform;
     let apiform = this.form;
-
-    // this.getFeeUnitList();
   },
   beforeRouteLeave(to, from, next) {
     // 鎵ц閿�姣佹搷浣�

--
Gitblit v1.9.3