From 563230f7ebcfe6b2d07d147f8b0f29e681bb68fb Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期二, 05 三月 2024 11:05:07 +0800
Subject: [PATCH] 11

---
 src/api/project/donorcharge.js                                     |    8 
 src/views/project/donationdetails/index.vue                        |  139 +++-
 src/views/project/fund/performancedetails/index.vue                |   10 
 src/views/project/fund/applyDetail/index.vue                       |   20 
 src/views/project/travelexpenseapply/travelexpensedetail/index.vue |    9 
 src/views/project/donorcharge/donorchargedetail/index.vue          |    2 
 src/views/project/fundflowrule/index.vue                           |  413 +++++++++++--
 src/views/project/unitCost/index.vue                               | 1133 +++++++++++++++++++++++---------------
 8 files changed, 1,160 insertions(+), 574 deletions(-)

diff --git a/src/api/project/donorcharge.js b/src/api/project/donorcharge.js
index 7807379..ebb45c3 100644
--- a/src/api/project/donorcharge.js
+++ b/src/api/project/donorcharge.js
@@ -61,6 +61,14 @@
     params: query
   })
 }
+// 鏌ヨ鏈烘瀯璐圭敤鍒楄〃
+export function listDonorpayment(query) {
+  return request({
+    url: '/project/donorpayment/list',
+    method: 'get',
+    params: query
+  })
+}
 
 // 鏌ヨ鎹愮尞妗堜緥鍣ㄥ畼璇︾粏
 export function getDonorchargeorgan(id) {
diff --git a/src/views/project/donationdetails/index.vue b/src/views/project/donationdetails/index.vue
index 215c8b6..7ac3238 100644
--- a/src/views/project/donationdetails/index.vue
+++ b/src/views/project/donationdetails/index.vue
@@ -11,14 +11,20 @@
                 v-if="Processdata.donatebaseinfo.createtime"
               >
                 <p>
-                  鎻愪氦鏃堕棿锛�<span>{{
-                    parseTime(Processdata.donatebaseinfo.createtime)
-                  }}</span>
+                  鎻愪氦锛�<span
+                    >{{ Processdata.donatebaseinfo.createperson
+                    }} {{
+                      parseTime(Processdata.donatebaseinfo.createtime)
+                    }}</span
+                  >
                 </p>
                 <p>
-                  鏇存柊鏃堕棿锛�<span>{{
-                    parseTime(Processdata.donatebaseinfo.updatetime)
-                  }}</span>
+                  鏇存柊锛�<span
+                    >{{ Processdata.donatebaseinfo.updateperson
+                    }} {{
+                      parseTime(Processdata.donatebaseinfo.updatetime)
+                    }}</span
+                  >
                 </p>
               </template>
             </el-step>
@@ -32,14 +38,20 @@
                 v-if="Processdata.medicalevaluation.createtime"
               >
                 <p>
-                  鎻愪氦鏃堕棿锛�<span>{{
-                    parseTime(Processdata.medicalevaluation.createtime)
-                  }}</span>
+                  鎻愪氦锛�<span>
+                    {{ Processdata.medicalevaluation.createperson
+                    }} {{
+                      parseTime(Processdata.medicalevaluation.createtime)
+                    }}</span
+                  >
                 </p>
                 <p>
-                  鏇存柊鏃堕棿锛�<span>{{
-                    parseTime(Processdata.medicalevaluation.updatetime)
-                  }}</span>
+                  鏇存柊锛�<span>
+                    {{ Processdata.medicalevaluation.updateperson
+                    }} {{
+                      parseTime(Processdata.medicalevaluation.updatetime)
+                    }}</span
+                  >
                 </p>
               </template>
             </el-step>
@@ -53,14 +65,20 @@
                 v-if="Processdata.relativesconfirmation.createtime"
               >
                 <p>
-                  鎻愪氦鏃堕棿锛�<span>{{
-                    parseTime(Processdata.relativesconfirmation.createtime)
-                  }}</span>
+                  鎻愪氦锛�<span>
+                    {{ Processdata.relativesconfirmation.createperson
+                    }} {{
+                      parseTime(Processdata.relativesconfirmation.createtime)
+                    }}</span
+                  >
                 </p>
                 <p>
-                  鏇存柊鏃堕棿锛�<span>{{
-                    parseTime(Processdata.relativesconfirmation.updatetime)
-                  }}</span>
+                  鏇存柊锛�<span>
+                    {{ Processdata.relativesconfirmation.updateperson
+                    }} {{
+                      parseTime(Processdata.relativesconfirmation.updatetime)
+                    }}</span
+                  >
                 </p>
               </template>
             </el-step>
@@ -74,14 +92,20 @@
                 v-if="Processdata.donateflowcharts.createtime"
               >
                 <p>
-                  鎻愪氦鏃堕棿锛�<span>{{
-                    parseTime(Processdata.donateflowcharts.createtime)
-                  }}</span>
+                  鎻愪氦锛�<span>
+                    {{ Processdata.donateflowcharts.createperson
+                    }} {{
+                      parseTime(Processdata.donateflowcharts.createtime)
+                    }}</span
+                  >
                 </p>
                 <p>
-                  鏇存柊鏃堕棿锛�<span>{{
-                    parseTime(Processdata.donateflowcharts.updatetime)
-                  }}</span>
+                  鏇存柊锛�<span>
+                    {{ Processdata.donateflowcharts.updateperson
+                    }} {{
+                      parseTime(Processdata.donateflowcharts.updatetime)
+                    }}</span
+                  >
                 </p>
               </template>
             </el-step>
@@ -95,14 +119,20 @@
                 v-if="Processdata.donateorgansService.createtime"
               >
                 <p>
-                  鎻愪氦鏃堕棿锛�<span>{{
-                    parseTime(Processdata.donateorgansService.createtime)
-                  }}</span>
+                  鎻愪氦锛�<span>
+                    {{ Processdata.donateorgansService.createperson
+                    }} {{
+                      parseTime(Processdata.donateorgansService.createtime)
+                    }}</span
+                  >
                 </p>
                 <p>
-                  鏇存柊鏃堕棿锛�<span>{{
-                    parseTime(Processdata.donateorgansService.updatetime)
-                  }}</span>
+                  鏇存柊锛�<span>
+                    {{ Processdata.donateorgansService.updateperson
+                    }} {{
+                      parseTime(Processdata.donateorgansService.updatetime)
+                    }}</span
+                  >
                 </p>
               </template>
             </el-step>
@@ -116,14 +146,20 @@
                 v-if="Processdata.donationwitness.createtime"
               >
                 <p>
-                  鎻愪氦鏃堕棿锛�<span>{{
-                    parseTime(Processdata.donationwitness.createtime)
-                  }}</span>
+                  鎻愪氦锛�<span>
+                    {{ Processdata.donationwitness.createperson
+                    }} {{
+                      parseTime(Processdata.donationwitness.createtime)
+                    }}</span
+                  >
                 </p>
                 <p>
-                  鏇存柊鏃堕棿锛�<span>{{
-                    parseTime(Processdata.donationwitness.updatetime)
-                  }}</span>
+                  鏇存柊锛�<span>
+                    {{ Processdata.donationwitness.updateperson
+                    }} {{
+                      parseTime(Processdata.donationwitness.updatetime)
+                    }}</span
+                  >
                 </p>
               </template>
             </el-step>
@@ -137,14 +173,20 @@
                 v-if="Processdata.donatecompletioninfo.createtime"
               >
                 <p>
-                  鎻愪氦鏃堕棿锛�<span>{{
-                    parseTime(Processdata.donatecompletioninfo.createtime)
-                  }}</span>
+                  鎻愪氦锛�<span>
+                    {{ Processdata.donatecompletioninfo.createperson
+                    }} {{
+                      parseTime(Processdata.donatecompletioninfo.createtime)
+                    }}</span
+                  >
                 </p>
                 <p>
-                  鏇存柊鏃堕棿锛�<span>{{
-                    parseTime(Processdata.donatecompletioninfo.updatetime)
-                  }}</span>
+                  鏇存柊锛�<span>
+                    {{ Processdata.donatecompletioninfo.updateperson
+                    }} {{
+                      parseTime(Processdata.donatecompletioninfo.updatetime)
+                    }}</span
+                  >
                 </p>
               </template>
             </el-step>
@@ -2871,7 +2913,6 @@
             } else {
               this.procureddata = this.allocateddata;
               this.procureddata.infoid = this.infoid;
-
             }
             this.organList.organprocured = [];
             for (let i = 0; i < this.procureddata.length; i++) {
@@ -3030,6 +3071,7 @@
     // 淇濆瓨浜岀骇琛ㄦ寜閽�
     Savethedetails() {
       console.log(this.actives);
+      this.$modal.loading("姝e湪鎻愪氦锛岃绋嶅�欙紒");
       if (this.actives == 1) {
         this.medicineform.infoid = this.infoid;
         this.$refs["medicineform"].validate(valid => {
@@ -3037,10 +3079,12 @@
             if (this.medicineform.id != null) {
               updateMedicalevaluation(this.medicineform).then(response => {
                 this.$modal.msgSuccess("鍖诲璇勪及淇℃伅淇敼鎴愬姛");
+                this.$modal.closeLoading();
               });
             } else {
               addMedicalevaluation(this.medicineform).then(response => {
                 this.$modal.msgSuccess("鍖诲璇勪及淇℃伅鏂板鎴愬姛");
+                this.$modal.closeLoading();
               });
             }
             this.Processvalidation();
@@ -3057,10 +3101,12 @@
               this.affirmform.residencetownname = this.defultAddresss.qu;
               updateRelativesconfirmation(this.affirmform).then(response => {
                 this.$modal.msgSuccess("鎹愮尞纭淇℃伅淇敼鎴愬姛");
+                this.$modal.closeLoading();
               });
             } else {
               addRelativesconfirmation(this.affirmform).then(response => {
                 this.$modal.msgSuccess("鎹愮尞纭淇℃伅鏂板鎴愬姛");
+                this.$modal.closeLoading();
               });
             }
             this.Processvalidation();
@@ -3074,11 +3120,13 @@
               // updateDonateflowchart(this.ethicform).then(response => {
               updateEthicalreviewopinions(this.ethicform).then(res => {
                 this.$modal.msgSuccess("浼︾悊瀹℃煡淇℃伅淇敼鎴愬姛");
+                this.$modal.closeLoading();
               });
             } else {
               //addDonateflowchart(this.ethicform).then(response => {
               addEthicalreviewopinions(this.ethicform).then(res => {
                 this.$modal.msgSuccess("浼︾悊瀹℃煡淇℃伅鏂板鎴愬姛");
+                this.$modal.closeLoading();
               });
             }
             this.Processvalidation();
@@ -3110,6 +3158,7 @@
           saveDonateorgan(this.allocateddata).then(res => {
             if (res.code == 200) {
               this.$modal.msgSuccess("鍣ㄥ畼鎹愮尞鍒嗛厤淇℃伅淇濆瓨鎴愬姛锛�");
+              this.$modal.closeLoading();
             }
           });
           this.Processvalidation();
@@ -3139,10 +3188,12 @@
             if (this.witnessform.id != null) {
               updateDonationwitness(this.witnessform).then(response => {
                 this.$modal.msgSuccess("鑾峰彇瑙佽瘉淇℃伅淇敼鎴愬姛");
+                this.$modal.closeLoading();
               });
             } else {
               addDonationwitness(this.witnessform).then(response => {
                 this.$modal.msgSuccess("鑾峰彇瑙佽瘉淇℃伅鏂板鎴愬姛");
+                this.$modal.closeLoading();
               });
             }
 
@@ -3174,10 +3225,12 @@
             if (this.accomplishform.id) {
               updateDonatecompletioninfo(this.accomplishform).then(response => {
                 this.$modal.msgSuccess("瀹屾垚鐧昏淇℃伅淇敼鎴愬姛");
+                this.$modal.closeLoading();
               });
             } else {
               addDonatecompletioninfo(this.accomplishform).then(response => {
                 this.$modal.msgSuccess("瀹屾垚鐧昏鎴愬姛");
+                this.$modal.closeLoading();
               });
             }
 
diff --git a/src/views/project/donorcharge/donorchargedetail/index.vue b/src/views/project/donorcharge/donorchargedetail/index.vue
index 6f51a7d..6071dd0 100644
--- a/src/views/project/donorcharge/donorchargedetail/index.vue
+++ b/src/views/project/donorcharge/donorchargedetail/index.vue
@@ -750,7 +750,7 @@
       var columnnames = [
         "organno",
         "organname",
-        "amount",
+        "caseno",
         "amounttime",
         "organcharge",
         "hospitalname",
diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue
index 769f250..a5186fc 100644
--- a/src/views/project/fund/applyDetail/index.vue
+++ b/src/views/project/fund/applyDetail/index.vue
@@ -382,7 +382,7 @@
                 >
               </template>
             </el-table-column>
-           
+
             <el-table-column
               prop="title"
               align="center"
@@ -924,7 +924,7 @@
       :visible.sync="pdfVisible"
       width="60%"
     >
-      <div>
+      <div style="margin-bottom: 10px;">
         <el-table :data="tableDatatop" style="width: 100%">
           <el-table-column
             v-if="businessType == 4"
@@ -997,7 +997,13 @@
           </el-table-column>
         </el-table>
       </div>
-
+      <el-alert
+        title="鏂颁笂浼犳枃浠堕渶鍦ㄦ彁浜や繚瀛樺悗鎵嶅彲杩涜妗堜緥鍏宠仈锛屽惁鍒欒涓烘斁寮�"
+        type="error"
+        show-icon
+        close-text="鐭ラ亾浜�"
+      >
+      </el-alert>
       <el-tabs
         style="margin-top: 20px;"
         v-model="activeName"
@@ -3307,10 +3313,14 @@
         );
 
         Promise.all(fetchPromises).then(invoicefileListto => {
-          this.invoicefileListto = invoicefileListto.filter(item => item !== null);
+          this.invoicefileListto = invoicefileListto.filter(
+            item => item !== null
+          );
           this.invoicepdfimg = this.invoicefileListto[0].url;
           console.log(this.invoicepdfimg, "invoicepdfimg");
-          this.invoicepdfimgsrcList = this.invoicefileListto.map(item => item.url);
+          this.invoicepdfimgsrcList = this.invoicefileListto.map(
+            item => item.url
+          );
         });
 
         this.previewpdf = true;
diff --git a/src/views/project/fund/performancedetails/index.vue b/src/views/project/fund/performancedetails/index.vue
index 1a26ee2..eb1b9c3 100644
--- a/src/views/project/fund/performancedetails/index.vue
+++ b/src/views/project/fund/performancedetails/index.vue
@@ -514,7 +514,7 @@
       :visible.sync="pdfVisible"
       width="60%"
     >
-      <div>
+      <div style="margin-bottom: 10px;">
         <el-table :data="tableDatatop" style="width: 100%">
           <el-table-column
             prop="beneficiaryname"
@@ -542,7 +542,13 @@
           </el-table-column>
         </el-table>
       </div>
-
+      <el-alert
+        title="鏂颁笂浼犳枃浠堕渶鍦ㄦ彁浜や繚瀛樺悗鎵嶅彲杩涜妗堜緥鍏宠仈锛屽惁鍒欒涓烘斁寮�"
+        type="error"
+        show-icon
+        close-text="鐭ラ亾浜�"
+      >
+      </el-alert>
       <el-tabs
         style="margin-top: 20px;"
         v-model="activeName"
diff --git a/src/views/project/fundflowrule/index.vue b/src/views/project/fundflowrule/index.vue
index a09db95..402cf69 100644
--- a/src/views/project/fundflowrule/index.vue
+++ b/src/views/project/fundflowrule/index.vue
@@ -1,59 +1,158 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      :inline="true"
+      v-show="showSearch"
+      label-width="100px"
+    >
       <el-form-item label="璐圭敤绫诲埆" prop="applytype">
-        <el-select v-model="queryParams.applytype" placeholder="璇烽�夋嫨璐圭敤绫诲埆" clearable size="small">
-          <el-option v-for="dict in dict.type.sys_ConsolationType" :key="dict.value" :label="dict.label"
-            :value="dict.value" />
+        <el-select
+          v-model="queryParams.applytype"
+          placeholder="璇烽�夋嫨璐圭敤绫诲埆"
+          clearable
+          size="small"
+        >
+          <el-option
+            v-for="dict in dict.type.sys_ConsolationType"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
         </el-select>
       </el-form-item>
       <el-form-item label="瀹℃牳浜虹紪鍙�" prop="checkuserno">
-        <el-input v-model="queryParams.checkuserno" placeholder="璇疯緭鍏ュ鏍镐汉缂栧彿" clearable size="small"
-          @keyup.enter.native="handleQuery" />
+        <el-input
+          v-model="queryParams.checkuserno"
+          placeholder="璇疯緭鍏ュ鏍镐汉缂栧彿"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="瀹℃牳浜哄鍚�" prop="checkusername">
-        <el-input v-model="queryParams.checkusername" placeholder="璇疯緭鍏ュ鏍镐汉濮撳悕" clearable size="small"
-          @keyup.enter.native="handleQuery" />
+        <el-input
+          v-model="queryParams.checkusername"
+          placeholder="璇疯緭鍏ュ鏍镐汉濮撳悕"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
-      <el-form-item label="鏄惁鍙鏍稿悓閮ㄩ棬" prop="verificationdept" label-width="140px">
-        <el-select v-model="queryParams.verificationdept" placeholder="鏄惁鍙鏍稿悓閮ㄩ棬" clearable size="small">
-          <el-option v-for="dict in yesnoArr" :key="dict.value" :label="dict.label" :value="dict.value" />
+      <el-form-item
+        label="鏄惁鍙鏍稿悓閮ㄩ棬"
+        prop="verificationdept"
+        label-width="140px"
+      >
+        <el-select
+          v-model="queryParams.verificationdept"
+          placeholder="鏄惁鍙鏍稿悓閮ㄩ棬"
+          clearable
+          size="small"
+        >
+          <el-option
+            v-for="dict in yesnoArr"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
         </el-select>
       </el-form-item>
       <el-form-item label="褰撳墠瀹℃牳绾у埆" prop="flowlevel">
-        <el-select v-model="queryParams.flowlevel" placeholder="璇烽�夋嫨褰撳墠瀹℃牳绾у埆" clearable size="small">
-          <el-option v-for="dict in dict.type.sys_consolationfundlevel" :key="dict.value" :label="dict.label"
-            :value="dict.value" />
+        <el-select
+          v-model="queryParams.flowlevel"
+          placeholder="璇烽�夋嫨褰撳墠瀹℃牳绾у埆"
+          clearable
+          size="small"
+        >
+          <el-option
+            v-for="dict in dict.type.sys_consolationfundlevel"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
         </el-select>
       </el-form-item>
       <el-form-item label="鎬诲鏍哥骇鍒�" prop="totallevel">
-        <el-select v-model="queryParams.totallevel" placeholder="鏄惁鍙鏍稿悓閮ㄩ棬" clearable size="small">
-          <el-option v-for="dict in checkLevelArr" :key="dict.value" :label="dict.label" :value="dict.value" />
+        <el-select
+          v-model="queryParams.totallevel"
+          placeholder="鏄惁鍙鏍稿悓閮ㄩ棬"
+          clearable
+          size="small"
+        >
+          <el-option
+            v-for="dict in checkLevelArr"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
         </el-select>
       </el-form-item>
       <el-form-item label="璐圭敤绫诲埆" prop="fundtype">
-        <el-select v-model="queryParams.fundtype" placeholder="璇烽�夋嫨璐圭敤绫诲埆" clearable size="small">
-          <el-option v-for="dict in dict.type.sys_fundtypes" :key="dict.value" :label="dict.label" :value="dict.value" />
+        <el-select
+          v-model="queryParams.fundtype"
+          placeholder="璇烽�夋嫨璐圭敤绫诲埆"
+          clearable
+          size="small"
+        >
+          <el-option
+            v-for="dict in dict.type.sys_fundtypes"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >鎼滅储</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >閲嶇疆</el-button
+        >
       </el-form-item>
     </el-form>
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-          v-hasPermi="['project:fundflowrule:add']">鏂板</el-button>
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['project:fundflowrule:add']"
+          >鏂板</el-button
+        >
       </el-col>
       <el-col :span="1.5">
-        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
-          v-hasPermi="['project:fundflowrule:edit']">淇敼</el-button>
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['project:fundflowrule:edit']"
+          >淇敼</el-button
+        >
       </el-col>
       <el-col :span="1.5">
-        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
-          v-hasPermi="['project:fundflowrule:remove']">鍒犻櫎</el-button>
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['project:fundflowrule:remove']"
+          >鍒犻櫎</el-button
+        >
       </el-col>
       <!-- <el-col :span="1.5">
         <el-button
@@ -66,56 +165,137 @@
           v-hasPermi="['project:fundflowrule:export']"
         >瀵煎嚭</el-button>
       </el-col> -->
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="fundflowruleList" @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="fundflowruleList"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="璐圭敤绫诲埆" align="center" prop="applytype">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_ConsolationType" :value="scope.row.applytype" />
+          <dict-tag
+            :options="dict.type.sys_ConsolationType"
+            :value="scope.row.applytype"
+          />
         </template>
       </el-table-column>
       <el-table-column label="瀹℃牳浜虹紪鍙�" align="center" prop="checkuserno" />
       <el-table-column label="瀹℃牳浜哄鍚�" align="center" prop="checkusername" />
-      <el-table-column label="鏄惁鍙鏍稿悓閮ㄩ棬" align="center" prop="verificationdept">
+      <el-table-column
+        label="鏄惁鍙鏍稿悓閮ㄩ棬"
+        align="center"
+        prop="verificationdept"
+      >
         <template slot-scope="scope">
-          <el-button type="primary" plain v-if="scope.row.verificationdept == '0'" size="mini">
-            鍚�</el-button>
-          <el-button type="primary" plain v-if="scope.row.verificationdept == '1'" size="mini">鏄�</el-button>
+          <el-button
+            type="primary"
+            plain
+            v-if="scope.row.verificationdept == '0'"
+            size="mini"
+          >
+            鍚�</el-button
+          >
+          <el-button
+            type="primary"
+            plain
+            v-if="scope.row.verificationdept == '1'"
+            size="mini"
+            >鏄�</el-button
+          >
         </template>
       </el-table-column>
       <el-table-column label="褰撳墠瀹℃牳绾у埆" align="center" prop="flowlevel">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_consolationfundlevel" :value="scope.row.flowlevel" />
+          <dict-tag
+            :options="dict.type.sys_consolationfundlevel"
+            :value="scope.row.flowlevel"
+          />
         </template>
       </el-table-column>
       <el-table-column label="鎬诲鏍哥骇鍒�" align="center" prop="totallevel">
         <template slot-scope="scope">
-          <el-button type="primary" plain v-if="scope.row.totallevel == '1'" size="mini">涓�绾�</el-button>
-          <el-button type="primary" plain v-if="scope.row.totallevel == '2'" size="mini">浜岀骇</el-button>
-          <el-button type="primary" plain v-if="scope.row.totallevel == '3'" size="mini">涓夌骇</el-button><el-button
-            type="primary" plain v-if="scope.row.totallevel == '4'" size="mini">鍥涚骇</el-button><el-button type="primary"
-            plain v-if="scope.row.totallevel == '5'" size="mini">浜旂骇</el-button>
+          <el-button
+            type="primary"
+            plain
+            v-if="scope.row.totallevel == '1'"
+            size="mini"
+            >涓�绾�</el-button
+          >
+          <el-button
+            type="primary"
+            plain
+            v-if="scope.row.totallevel == '2'"
+            size="mini"
+            >浜岀骇</el-button
+          >
+          <el-button
+            type="primary"
+            plain
+            v-if="scope.row.totallevel == '3'"
+            size="mini"
+            >涓夌骇</el-button
+          ><el-button
+            type="primary"
+            plain
+            v-if="scope.row.totallevel == '4'"
+            size="mini"
+            >鍥涚骇</el-button
+          ><el-button
+            type="primary"
+            plain
+            v-if="scope.row.totallevel == '5'"
+            size="mini"
+            >浜旂骇</el-button
+          >
         </template>
       </el-table-column>
       <el-table-column label="璐圭敤绫诲埆" align="center" prop="fundtype">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_fundtypes" :value="scope.row.fundtype" />
+          <dict-tag
+            :options="dict.type.sys_fundtypes"
+            :value="scope.row.fundtype"
+          />
         </template>
       </el-table-column>
-      <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="鎿嶄綔"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-            v-hasPermi="['project:fundflowrule:edit']">淇敼</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-            v-hasPermi="['project:fundflowrule:remove']">鍒犻櫎</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['project:fundflowrule:edit']"
+            >淇敼</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['project:fundflowrule:remove']"
+            >鍒犻櫎</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-      @pagination="getList" />
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
 
     <!-- 娣诲姞鎴栦慨鏀硅垂鐢ㄥ鎵硅鍒欏璇濇 -->
     <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
@@ -123,17 +303,33 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="璐圭敤绫诲埆" prop="fundtype">
-              <el-select v-model="form.fundtype" placeholder="璇烽�夋嫨璐圭敤绫诲埆" style="width:100%">
-                <el-option v-for="dict in dict.type.sys_fundtypes" :key="dict.value" :label="dict.label"
-                  :value="parseInt(dict.value)"></el-option>
+              <el-select
+                v-model="form.fundtype"
+                placeholder="璇烽�夋嫨璐圭敤绫诲埆"
+                style="width:100%"
+              >
+                <el-option
+                  v-for="dict in dict.type.sys_fundtypes"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="parseInt(dict.value)"
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="璐圭敤鍚嶇О" prop="applytype">
-              <el-select v-model="form.applytype" placeholder="璇烽�夋嫨璐圭敤鍚嶇О" style="width:100%">
-                <el-option v-for="dict in dict.type.sys_ConsolationType" :key="dict.value" :label="dict.label"
-                  :value="dict.value" />
+              <el-select
+                v-model="form.applytype"
+                placeholder="璇烽�夋嫨璐圭敤鍚嶇О"
+                style="width:100%"
+              >
+                <el-option
+                  v-for="dict in dict.type.sys_ConsolationType"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
               </el-select>
             </el-form-item>
           </el-col>
@@ -141,12 +337,18 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="瀹℃牳浜虹紪鍙�" prop="checkuserno">
-              <el-input v-model="form.checkuserno" placeholder="璇疯緭鍏ュ鏍镐汉缂栧彿" />
+              <el-input
+                v-model="form.checkuserno"
+                placeholder="璇疯緭鍏ュ鏍镐汉缂栧彿"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="瀹℃牳浜哄鍚�" prop="checkusername">
-              <el-input v-model="form.checkusername" placeholder="璇疯緭鍏ュ鏍镐汉濮撳悕" />
+              <el-input
+                v-model="form.checkusername"
+                placeholder="璇疯緭鍏ュ鏍镐汉濮撳悕"
+              />
             </el-form-item>
           </el-col>
         </el-row>
@@ -154,28 +356,73 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="褰撳墠瀹℃牳绾у埆" prop="flowlevel">
-              <el-select v-model="form.flowlevel" placeholder="璇烽�夋嫨褰撳墠瀹℃牳绾у埆" clearable size="small" style="width:100%">
-                <el-option v-for="dict in dict.type.sys_consolationfundlevel" :key="dict.value" :label="dict.label"
-                  :value="dict.value" />
+              <el-select
+                v-model="form.flowlevel"
+                placeholder="璇烽�夋嫨褰撳墠瀹℃牳绾у埆"
+                clearable
+                size="small"
+                style="width:100%"
+              >
+                <el-option
+                  v-for="dict in dict.type.sys_consolationfundlevel"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
               </el-select>
             </el-form-item>
           </el-col>
 
           <el-col :span="12">
             <el-form-item label="鎬诲鏍哥骇鍒�" prop="totallevel">
-              <el-select v-model="form.totallevel" placeholder="璇烽�夋嫨鎬诲鏍哥骇鍒�" clearable size="small" style="width:100%">
-                <el-option v-for="dict in checkLevelArr" :key="dict.value" :label="dict.label" :value="dict.value" />
+              <el-select
+                v-model="form.totallevel"
+                placeholder="璇烽�夋嫨鎬诲鏍哥骇鍒�"
+                clearable
+                size="small"
+                style="width:100%"
+              >
+                <el-option
+                  v-for="dict in checkLevelArr"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
               </el-select>
             </el-form-item>
           </el-col>
         </el-row>
 
         <el-row>
-          <el-col>
-            <el-form-item label="鏄惁鍙鏍稿悓閮ㄩ棬" prop="verificationdept" label-width="140px">
+          <el-col :span="12">
+            <el-form-item
+              label="鏄惁鍙鏍稿悓閮ㄩ棬"
+              prop="verificationdept"
+              label-width="140px"
+            >
               <el-radio-group v-model="form.verificationdept">
-                <el-radio v-for="dict in yesnoArr" :key="dict.value" :label="parseInt(dict.value)">{{ dict.label
-                }}</el-radio>
+                <el-radio
+                  v-for="dict in yesnoArr"
+                  :key="dict.value"
+                  :label="parseInt(dict.value)"
+                  >{{ dict.label }}</el-radio
+                >
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item
+              label="鏄惁鏄繀瀹′汉"
+              prop="mustAudite"
+              label-width="140px"
+            >
+              <el-radio-group v-model="form.mustAudite">
+                <el-radio
+                  v-for="dict in yesnoArr"
+                  :key="dict.value"
+                  :label="parseInt(dict.value)"
+                  >{{ dict.label }}</el-radio
+                >
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -196,7 +443,7 @@
   delFundflowrule,
   addFundflowrule,
   updateFundflowrule,
-  exportFundflowrule,
+  exportFundflowrule
 } from "@/api/project/fundflowrule";
 
 export default {
@@ -205,7 +452,7 @@
     "sys_expensetype",
     "sys_consolationfundlevel",
     "sys_fundtypes",
-    "sys_ConsolationType",
+    "sys_ConsolationType"
   ],
   data() {
     return {
@@ -239,7 +486,7 @@
         verificationdept: null,
         flowlevel: null,
         totallevel: null,
-        fundtype: null,
+        fundtype: null
       },
       // 琛ㄥ崟鍙傛暟
       form: {},
@@ -247,15 +494,15 @@
       rules: {},
       yesnoArr: [
         { label: "鍚�", value: 0 },
-        { label: "鏄�", value: 1 },
+        { label: "鏄�", value: 1 }
       ],
       checkLevelArr: [
         { label: "涓�绾�", value: "1" },
         { label: "浜岀骇", value: "2" },
         { label: "涓夌骇", value: "3" },
         { label: "鍥涚骇", value: "4" },
-        { label: "浜旂骇", value: "5" },
-      ],
+        { label: "浜旂骇", value: "5" }
+      ]
     };
   },
   created() {
@@ -265,7 +512,7 @@
     /** 鏌ヨ璐圭敤瀹℃壒瑙勫垯鍒楄〃 */
     getList() {
       this.loading = true;
-      listFundflowrule(this.queryParams).then((response) => {
+      listFundflowrule(this.queryParams).then(response => {
         this.fundflowruleList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -286,7 +533,7 @@
         verificationdept: null,
         flowlevel: null,
         totallevel: null,
-        fundtype: null,
+        fundtype: null
       };
       this.resetForm("form");
     },
@@ -302,7 +549,7 @@
     },
     // 澶氶�夋閫変腑鏁版嵁
     handleSelectionChange(selection) {
-      this.ids = selection.map((item) => item.id);
+      this.ids = selection.map(item => item.id);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
@@ -316,7 +563,7 @@
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids;
-      getFundflowrule(id).then((response) => {
+      getFundflowrule(id).then(response => {
         this.form = response.data;
         this.form.flowlevel = this.form.flowlevel.toString();
         this.form.totallevel = this.form.totallevel.toString();
@@ -326,16 +573,16 @@
     },
     /** 鎻愪氦鎸夐挳 */
     submitForm() {
-      this.$refs["form"].validate((valid) => {
+      this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
-            updateFundflowrule(this.form).then((response) => {
+            updateFundflowrule(this.form).then(response => {
               this.$modal.msgSuccess("淇敼鎴愬姛");
               this.open = false;
               this.getList();
             });
           } else {
-            addFundflowrule(this.form).then((response) => {
+            addFundflowrule(this.form).then(response => {
               this.$modal.msgSuccess("鏂板鎴愬姛");
               this.open = false;
               this.getList();
@@ -349,14 +596,14 @@
       const ids = row.id || this.ids;
       this.$modal
         .confirm('鏄惁纭鍒犻櫎璐圭敤瀹℃壒瑙勫垯缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�')
-        .then(function () {
+        .then(function() {
           return delFundflowrule(ids);
         })
         .then(() => {
           this.getList();
           this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
         })
-        .catch(() => { });
+        .catch(() => {});
     },
     /** 瀵煎嚭鎸夐挳鎿嶄綔 */
     handleExport() {
@@ -367,12 +614,12 @@
           this.exportLoading = true;
           return exportFundflowrule(queryParams);
         })
-        .then((response) => {
+        .then(response => {
           this.$download.name(response.msg);
           this.exportLoading = false;
         })
-        .catch(() => { });
-    },
-  },
+        .catch(() => {});
+    }
+  }
 };
 </script>
diff --git a/src/views/project/travelexpenseapply/travelexpensedetail/index.vue b/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
index f1e7bbd..88a857f 100644
--- a/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
+++ b/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
@@ -957,7 +957,7 @@
       :visible.sync="pdfVisible"
       width="60%"
     >
-      <div>
+      <div style="margin-bottom: 10px;">
         <el-table :data="tableDatatop" style="width: 100%">
           <el-table-column prop="orderno" label="搴忓彿"> </el-table-column>
           <el-table-column prop="personname" label="璐圭敤浜哄憳">
@@ -986,6 +986,13 @@
           </el-table-column>
         </el-table>
       </div>
+      <el-alert
+        title="鏂颁笂浼犳枃浠堕渶鍦ㄦ彁浜や繚瀛樺悗鎵嶅彲杩涜妗堜緥鍏宠仈锛屽惁鍒欒涓烘斁寮�"
+        type="error"
+        show-icon
+        close-text="鐭ラ亾浜�"
+      >
+      </el-alert>
       <el-tabs
         style="margin-top: 20px;"
         v-model="activeName"
diff --git a/src/views/project/unitCost/index.vue b/src/views/project/unitCost/index.vue
index 4483273..33cfcc3 100644
--- a/src/views/project/unitCost/index.vue
+++ b/src/views/project/unitCost/index.vue
@@ -1,463 +1,718 @@
 <template>
-    <div class="app-container">
-      <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="120px">
-        <el-form-item label="浠樻鍖婚櫌" prop="name">
-          <el-input v-model="queryParams.name" placeholder="璇疯緭鍏ュ鍚�" clearable size="small"
-            @keyup.enter.native="handleQuery" />
-        </el-form-item>
-        <el-form-item label="鏀舵骞村害" prop="donationcategory">
-          <el-input v-model="queryParams.donationcategory" placeholder="璇疯緭鍏ユ崘鐚被鍒�" clearable size="small"
-            @keyup.enter.native="handleQuery" />
-        </el-form-item>
-        <el-form-item label="鏀舵鐘舵��" prop="chargeamount">
-          <el-input v-model="queryParams.chargeamount" placeholder="璇疯緭鍏ヨ垂鐢ㄩ噾棰�" clearable size="small"
-            @keyup.enter.native="handleQuery" />
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
-          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
-        </el-form-item>
-      </el-form>
-  
-      <el-row :gutter="10" class="mb8">
-        <el-col :span="1.5">
-          <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-            v-hasPermi="['system:donorcharge:add']">鏂板</el-button>
-        </el-col>
-        <el-col :span="1.5">
-          <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
-            v-hasPermi="['system:donorcharge:edit']">淇敼</el-button>
-        </el-col>
-        <el-col :span="1.5">
-          <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
-            v-hasPermi="['system:donorcharge:remove']">鍒犻櫎</el-button>
-        </el-col>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      :inline="true"
+      v-show="showSearch"
+      label-width="120px"
+    >
+      <el-form-item label="浠樻鍖婚櫌" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="璇疯緭鍏ュ鍚�"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="鏀舵骞村害" prop="donationcategory">
+        <el-input
+          v-model="queryParams.donationcategory"
+          placeholder="璇疯緭鍏ユ崘鐚被鍒�"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="鏀舵鐘舵��" prop="chargeamount">
+        <el-input
+          v-model="queryParams.chargeamount"
+          placeholder="璇疯緭鍏ヨ垂鐢ㄩ噾棰�"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >鎼滅储</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >閲嶇疆</el-button
+        >
+      </el-form-item>
+    </el-form>
 
-        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-      </el-row>
-  
-      <el-table v-loading="loading" :data="donorchargeList" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="鐢宠鏃堕棿" align="center" prop="donatetime" width="180">
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.donatetime, '{y}-{m}-{d}') }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="鏀舵鍗曞彿" align="center" prop="donateno" />
-        <el-table-column label="浠樻鍖婚櫌" align="center" prop="name" />
-        <el-table-column label="鏀舵鐘舵��" align="center" prop="donationcategory" />
-        <el-table-column label="搴旀敹閲戦" align="center" prop="donateorgan" />
-        <el-table-column label="宸叉敹閲戦" align="center" prop="chargeamounted" />
-        <el-table-column label="鏀舵鏃ユ湡" align="center" prop="chargeamount" />
-        <el-table-column label="缁忓姙浜�" align="center" prop="agent" />
-        <el-table-column label="鎿嶄綔" align="center">
-          <template slot-scope="scope">
-            <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-              v-hasPermi="['system:donorcharge:edit']">淇敼</el-button>
-            <el-button size="mini" type="text" icon="el-icon-edit" @click="handleDetail(scope.row)"
-              v-hasPermi="['system:donorcharge:edit']">璇︽儏</el-button>
-            <el-button size="mini" type="text" @click="handleDelete(scope.row)"
-              v-hasPermi="['system:donorcharge:remove']"><span class="button-delete"
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:donorcharge:add']"
+          >鏂板</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['system:donorcharge:edit']"
+          >淇敼</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['system:donorcharge:remove']"
+          >鍒犻櫎</el-button
+        >
+      </el-col>
+
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="donorchargeList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column
+        label="鐢宠鏃堕棿"
+        align="center"
+        prop="createTime"
+        width="180"
+      >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="鏀舵鍗曞彿" align="center" prop="paymentno" />
+      <el-table-column
+        label="浠樻鍖婚櫌"
+        width="180"
+        align="center"
+        prop="hospitalname"
+      />
+
+      <el-table-column label="鐘舵��" align="center" prop="paystatus">
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.sys_gathering"
+            :value="scope.row.paystatus"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="搴旀敹閲戦"
+        align="center"
+        prop="receivableamount"
+      />
+      <el-table-column label="宸叉敹閲戦" align="center" prop="receivedamount" />
+      <el-table-column label="鏀舵鏃ユ湡" align="center" prop="receivedtime" />
+      <el-table-column label="缁忓姙浜�" align="center" prop="updateBy" />
+      <el-table-column label="鎿嶄綔" width="280" align="center">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:donorcharge:edit']"
+            >淇敼</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleDetail(scope.row)"
+            v-hasPermi="['system:donorcharge:edit']"
+            >璇︽儏</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:donorcharge:remove']"
+            ><span class="button-delete"
               ><i class="el-icon-delete"></i>鍒犻櫎</span
-            ></el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-  
-      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-        @pagination="getList" />
-  
-      <!-- 娣诲姞鎴栦慨鏀规崘鐚渚嬪櫒瀹樺垪瀵硅瘽妗� -->
-      <el-dialog :title="title" :visible.sync="open" append-to-body align="center" :close-on-click-modal="false"
-        width="1200px">
-        <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-          <el-row>
-            <el-col :span="12"><el-form-item label="OPO缂栧彿" prop="donateno">
-                <el-input v-model="form.donateno" placeholder="璇疯緭鍏PO缂栧彿" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="濮撳悕" prop="name">
-                <el-input v-model="form.name" placeholder="璇疯緭鍏ュ鍚�" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="鎹愮尞鏃堕棿" prop="donatetime">
-                <el-date-picker clearable size="small" v-model="form.donatetime" type="date" value-format="yyyy-MM-dd"
-                  style="width: 174px" placeholder="閫夋嫨鎹愮尞鏃堕棿">
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="6"><el-form-item label="鍑虹敓骞存湀" prop="borthdate">
-                <el-date-picker clearable size="small" v-model="form.borthdate" type="date" value-format="yyyy-MM-dd"
-                  style="width: 174px" placeholder="閫夋嫨鍑虹敓骞存湀">
-                </el-date-picker>
-              </el-form-item></el-col>
-            <el-col :span="6"><el-form-item label="骞撮緞" prop="age">
-                <el-input v-model="form.age" placeholder="璇疯緭鍏ュ勾榫�" />
-              </el-form-item></el-col>
-            <el-col :span="6"> <el-form-item label="鎬у埆" prop="sex">
-                <el-select v-model="form.sex" placeholder="璇烽�夋嫨鎬у埆">
-                  <el-option label="璇烽�夋嫨瀛楀吀鐢熸垚" value="" />
-                </el-select>
-              </el-form-item></el-col>
-            <el-col :span="6"><el-form-item label="鎹愮尞绫诲埆" prop="donationcategory">
-                <el-input v-model="form.donationcategory" placeholder="璇疯緭鍏ユ崘鐚被鍒�" />
-              </el-form-item></el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="6"><el-form-item label="鎹愮尞妗堜緥ID" prop="infoid">
-                <el-input v-model="form.infoid" placeholder="璇疯緭鍏ユ崘鐚渚婭D" />
-              </el-form-item></el-col>
-            <el-col :span="6"><el-form-item label="鎹愮尞鍣ㄥ畼" prop="donateorgan">
-                <el-input v-model="form.donateorgan" placeholder="璇疯緭鍏ユ崘鐚殑鍣ㄥ畼" />
-              </el-form-item></el-col>
-            <el-col :span="6"><el-form-item label="搴旀敹璐圭敤" prop="chargeamount">
-                <el-input v-model="form.chargeamount" placeholder="璇疯緭鍏ュ簲鏀惰垂鐢�" />
-              </el-form-item></el-col>
-            <el-col :span="6"><el-form-item label="宸叉敹璐圭敤" prop="chargeamounted">
-                <el-input v-model="form.chargeamounted" placeholder="璇疯緭鍏ュ凡鏀惰垂鐢�" />
-              </el-form-item></el-col>
-          </el-row><el-row>
-            <el-col :span="24"><el-form-item label="澶囨敞" prop="remark">
-                <el-input v-model="form.remark" placeholder="璇疯緭鍏ュ娉�" />
-              </el-form-item></el-col>
-          </el-row>
-          <el-row>
-            <el-table :data="donorchargerogans" v-loading="loading" max-height="1200" border highlight-current-row>
-              <el-table-column prop="orderno" align="center" label="搴忓彿" width="80">
-                <template slot-scope="scope">
-                  <el-input v-model="scope.row.orderno" placeholder="搴忓彿" />
-                </template>
-              </el-table-column>
-              <el-table-column prop="organno" align="center" label="鍣ㄥ畼缂栧彿" width="90">
-                <template slot-scope="scope">
-                  <el-input v-model="scope.row.organno" placeholder="鍣ㄥ畼缂栧彿" />
-                </template>
-              </el-table-column>
-              <el-table-column prop="organname" align="center" label="鍣ㄥ畼鍚嶇О" width="100">
-                <template slot-scope="scope">
-                  <el-input v-model="scope.row.organname" placeholder="鍣ㄥ畼鍚嶇О" />
-                </template>
-              </el-table-column>
-              <el-table-column prop="hospitalname" align="center" label="鎺ユ敹鍖婚櫌" width="200">
-                <template slot-scope="scope">
-                  <el-input v-model="scope.row.hospitalname" placeholder="鎺ユ敹鍖婚櫌" />
-                </template>
-              </el-table-column>
-              <el-table-column prop="amounttime" align="center" label="鎺ユ敹鏃堕棿" width="120">
-                <template slot-scope="scope">
-                  <el-date-picker clearable size="small" style="width: 100%" v-model="scope.row.amounttime" type="date"
-                    value-format="yyyy-MM-dd HH:mm:ss" placeholder="鎺ユ敹鏃堕棿">
-                  </el-date-picker> </template>
-              </el-table-column>
-              <el-table-column prop="amount" align="center" label="宸叉敹璐圭敤" width="120">
-                <template slot-scope="scope">
-                  <el-input v-model="scope.row.amount" placeholder="宸叉敹璐圭敤" />
-                </template>
-              </el-table-column>
-              <el-table-column prop="amounttime" align="center" label="鏀舵鏃堕棿" width="120">
-                <template slot-scope="scope">
-                  <el-date-picker clearable size="small" style="width: 100%" v-model="scope.row.amounttime" type="date"
-                    value-format="yyyy-MM-dd HH:mm:ss" placeholder="鏀舵鏃堕棿" @blur="getdays(scope.row)">
-                  </el-date-picker> </template>
-              </el-table-column>
-              <el-table-column prop="organcharge" align="center" label="鏍囧噯璐圭敤" width="120">
-                <template slot-scope="scope">
-                  <el-input v-model="scope.row.organcharge" placeholder="宸叉敹璐圭敤" />
-                </template>
-              </el-table-column>
-              <el-table-column prop="remark" align="center" label="澶囨敞">
-                <template slot-scope="scope">
-                  <el-input v-model="scope.row.remark" placeholder="澶囨敞" />
-                </template>
-              </el-table-column>
-            </el-table>
-          </el-row>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
-          <el-button @click="cancel">鍙� 娑�</el-button>
-        </div>
-      </el-dialog>
-  
-      <el-dialog :visible.sync="showSelectionDialog" :close-on-click-modal="false" :title="'璇烽�夋嫨鎹愮尞妗堜緥'" width="500px"
-        style="text-align: center" v-loading="loading">
-        <el-form ref="selectionForm" :model="selectionForm">
-          <el-row>
-            <el-form-item label="鎹愮尞鑰呭悕瀛楋細" prop="donorname" label-width="120px">
-              <el-select v-model="selectionForm.donorid" filterable reserve-keyword default-first-option
-                placeholder="璇疯緭鍏ユ崘鐚�呯殑濮撳悕" style="width: 100%">
-                <el-option v-for="item in donorlist" :key="item.donorid" :label="item.donorname" :value="item.donorid">
-                </el-option>
-              </el-select>
+            ></el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 娣诲姞鎴栦慨鏀规崘鐚渚嬪櫒瀹樺垪瀵硅瘽妗� -->
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      append-to-body
+      align="center"
+      :close-on-click-modal="false"
+      width="1200px"
+    >
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-row>
+          <el-col :span="12"
+            ><el-form-item label="OPO缂栧彿" prop="donateno">
+              <el-input v-model="form.donateno" placeholder="璇疯緭鍏PO缂栧彿" />
             </el-form-item>
-          </el-row>
-        </el-form>
-        <span slot="footer" class="dialog-footer">
-          <el-button @click="showSelectionDialog = false">鍙� 娑�</el-button>
-          <el-button type="primary" @click="confirmSelection()">纭� 瀹�</el-button>
-        </span>
-      </el-dialog>
-    </div>
-  </template>
-  
-  <script>
-  import { listDonatebaseinfo } from "@/api/project/donatebaseinfo";
-  import { listDonorcharge, getDonorcharge, delDonorcharge, addDonorcharge, updateDonorcharge, exportDonorcharge, listDonorchargeorgan, delDonorchargeorgan, addDonorchargeorgan, updateDonorchargeorgan, exportDonorchargeorgan } from "@/api/project/donorcharge";
-  export default {
-    name: "Donorcharge",
-    data() {
-      return {
-        // 閬僵灞�
-        loading: true,
-        // 瀵煎嚭閬僵灞�
-        exportLoading: false,
-        // 閫変腑鏁扮粍
-        ids: [],
-        // 闈炲崟涓鐢�
-        single: true,
-        // 闈炲涓鐢�
-        multiple: true,
-        // 鏄剧ず鎼滅储鏉′欢
-        showSearch: true,
-        // 鎬绘潯鏁�
-        total: 0,
-        //褰撳墠妗堜緥id
-        curInfoId: 0,
-        // 鎹愮尞妗堜緥鍣ㄥ畼鍒楄〃鏍兼暟鎹�
-        donorchargeList: [],
-        donorchargerogans: [],
-        //鎹愮尞妗堜緥閫夋嫨
-        showSelectionDialog: false,
-        donorlist: [],
-        donorinfolist: [],
-        selectionForm: {
-          index: null,
-          donorid: null,
-          donorname: null
-        },
-        loadingdonorlist: false,
-  
-        // 寮瑰嚭灞傛爣棰�
-        title: "",
-        // 鏄惁鏄剧ず寮瑰嚭灞�
-        open: false,
-        // 鏌ヨ璐圭敤琛ㄥ弬鏁�
-        queryParams: {
-          pageNum: 1,
-          pageSize: 10,
-          infoid: null,
-          name: null,
-          donationcategory: null,
-          donateorgan: null,
-          chargeamounted: null,
-        },
-        //鏌ヨ妗堜緥鍙傛暟
-        donorParams: {
-          pageNum: 1,
-          pageSize: 1000,
-        },
-        // 鏌ヨ璐圭敤鍣ㄥ畼琛ㄥ弬鏁�
-        organParams: {
-          pageNum: 1,
-          pageSize: 10,
-          donorchargeid: null,
-        },
-        // 琛ㄥ崟鍙傛暟
-        form: {},
-        // 琛ㄥ崟鏍¢獙
-        rules: {
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="濮撳悕" prop="name">
+              <el-input v-model="form.name" placeholder="璇疯緭鍏ュ鍚�" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="鎹愮尞鏃堕棿" prop="donatetime">
+              <el-date-picker
+                clearable
+                size="small"
+                v-model="form.donatetime"
+                type="date"
+                value-format="yyyy-MM-dd"
+                style="width: 174px"
+                placeholder="閫夋嫨鎹愮尞鏃堕棿"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="6"
+            ><el-form-item label="鍑虹敓骞存湀" prop="borthdate">
+              <el-date-picker
+                clearable
+                size="small"
+                v-model="form.borthdate"
+                type="date"
+                value-format="yyyy-MM-dd"
+                style="width: 174px"
+                placeholder="閫夋嫨鍑虹敓骞存湀"
+              >
+              </el-date-picker> </el-form-item
+          ></el-col>
+          <el-col :span="6"
+            ><el-form-item label="骞撮緞" prop="age">
+              <el-input
+                v-model="form.age"
+                placeholder="璇疯緭鍏ュ勾榫�"
+              /> </el-form-item
+          ></el-col>
+          <el-col :span="6">
+            <el-form-item label="鎬у埆" prop="sex">
+              <el-select v-model="form.sex" placeholder="璇烽�夋嫨鎬у埆">
+                <el-option label="璇烽�夋嫨瀛楀吀鐢熸垚" value="" />
+              </el-select> </el-form-item
+          ></el-col>
+          <el-col :span="6"
+            ><el-form-item label="鎹愮尞绫诲埆" prop="donationcategory">
+              <el-input
+                v-model="form.donationcategory"
+                placeholder="璇疯緭鍏ユ崘鐚被鍒�"
+              /> </el-form-item
+          ></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="6"
+            ><el-form-item label="鎹愮尞妗堜緥ID" prop="infoid">
+              <el-input
+                v-model="form.infoid"
+                placeholder="璇疯緭鍏ユ崘鐚渚婭D"
+              /> </el-form-item
+          ></el-col>
+          <el-col :span="6"
+            ><el-form-item label="鎹愮尞鍣ㄥ畼" prop="donateorgan">
+              <el-input
+                v-model="form.donateorgan"
+                placeholder="璇疯緭鍏ユ崘鐚殑鍣ㄥ畼"
+              /> </el-form-item
+          ></el-col>
+          <el-col :span="6"
+            ><el-form-item label="搴旀敹璐圭敤" prop="chargeamount">
+              <el-input
+                v-model="form.chargeamount"
+                placeholder="璇疯緭鍏ュ簲鏀惰垂鐢�"
+              /> </el-form-item
+          ></el-col>
+          <el-col :span="6"
+            ><el-form-item label="宸叉敹璐圭敤" prop="chargeamounted">
+              <el-input
+                v-model="form.chargeamounted"
+                placeholder="璇疯緭鍏ュ凡鏀惰垂鐢�"
+              /> </el-form-item
+          ></el-col> </el-row
+        ><el-row>
+          <el-col :span="24"
+            ><el-form-item label="澶囨敞" prop="remark">
+              <el-input
+                v-model="form.remark"
+                placeholder="璇疯緭鍏ュ娉�"
+              /> </el-form-item
+          ></el-col>
+        </el-row>
+        <el-row>
+          <el-table
+            :data="donorchargerogans"
+            v-loading="loading"
+            max-height="1200"
+            border
+            highlight-current-row
+          >
+            <el-table-column
+              prop="orderno"
+              align="center"
+              label="搴忓彿"
+              width="80"
+            >
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.orderno" placeholder="搴忓彿" />
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="organno"
+              align="center"
+              label="鍣ㄥ畼缂栧彿"
+              width="90"
+            >
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.organno" placeholder="鍣ㄥ畼缂栧彿" />
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="organname"
+              align="center"
+              label="鍣ㄥ畼鍚嶇О"
+              width="100"
+            >
+              <template slot-scope="scope">
+                <el-input
+                  v-model="scope.row.organname"
+                  placeholder="鍣ㄥ畼鍚嶇О"
+                />
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="hospitalname"
+              align="center"
+              label="鎺ユ敹鍖婚櫌"
+              width="200"
+            >
+              <template slot-scope="scope">
+                <el-input
+                  v-model="scope.row.hospitalname"
+                  placeholder="鎺ユ敹鍖婚櫌"
+                />
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="amounttime"
+              align="center"
+              label="鎺ユ敹鏃堕棿"
+              width="120"
+            >
+              <template slot-scope="scope">
+                <el-date-picker
+                  clearable
+                  size="small"
+                  style="width: 100%"
+                  v-model="scope.row.amounttime"
+                  type="date"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  placeholder="鎺ユ敹鏃堕棿"
+                >
+                </el-date-picker>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="amount"
+              align="center"
+              label="宸叉敹璐圭敤"
+              width="120"
+            >
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.amount" placeholder="宸叉敹璐圭敤" />
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="amounttime"
+              align="center"
+              label="鏀舵鏃堕棿"
+              width="120"
+            >
+              <template slot-scope="scope">
+                <el-date-picker
+                  clearable
+                  size="small"
+                  style="width: 100%"
+                  v-model="scope.row.amounttime"
+                  type="date"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  placeholder="鏀舵鏃堕棿"
+                  @blur="getdays(scope.row)"
+                >
+                </el-date-picker>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="organcharge"
+              align="center"
+              label="鏍囧噯璐圭敤"
+              width="120"
+            >
+              <template slot-scope="scope">
+                <el-input
+                  v-model="scope.row.organcharge"
+                  placeholder="宸叉敹璐圭敤"
+                />
+              </template>
+            </el-table-column>
+            <el-table-column prop="remark" align="center" label="澶囨敞">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.remark" placeholder="澶囨敞" />
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
+        <el-button @click="cancel">鍙� 娑�</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog
+      :visible.sync="showSelectionDialog"
+      :close-on-click-modal="false"
+      :title="'璇烽�夋嫨鎹愮尞妗堜緥'"
+      width="500px"
+      style="text-align: center"
+      v-loading="loading"
+    >
+      <el-form ref="selectionForm" :model="selectionForm">
+        <el-row>
+          <el-form-item
+            align="left"
+            label="鍖荤枟鏈烘瀯"
+            prop="treatmenthospitalno"
+          >
+            <org-selecter
+              ref="addOrgSelect"
+              :org-type="'3'"
+              v-model="selectionForm.donorid"
+            />
+          </el-form-item>
+        </el-row>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="showSelectionDialog = false">鍙� 娑�</el-button>
+        <el-button type="primary" @click="confirmSelection()">纭� 瀹�</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listDonatebaseinfo } from "@/api/project/donatebaseinfo";
+import {
+  listDonorcharge,
+  getDonorcharge,
+  delDonorcharge,
+  addDonorcharge,
+  updateDonorcharge,
+  exportDonorcharge,
+  listDonorpayment
+} from "@/api/project/donorcharge";
+import OrgSelecter from "@/views/project/components/orgselect";
+
+export default {
+  name: "Donorcharge",
+  dicts: ["sys_gathering"],
+  components: {
+    OrgSelecter
+  },
+  data() {
+    return {
+      // 閬僵灞�
+      loading: true,
+      // 瀵煎嚭閬僵灞�
+      exportLoading: false,
+      // 閫変腑鏁扮粍
+      ids: [],
+      // 闈炲崟涓鐢�
+      single: true,
+      // 闈炲涓鐢�
+      multiple: true,
+      // 鏄剧ず鎼滅储鏉′欢
+      showSearch: true,
+      // 鎬绘潯鏁�
+      total: 0,
+      //褰撳墠妗堜緥id
+      curInfoId: 0,
+      // 鎹愮尞妗堜緥鍣ㄥ畼鍒楄〃鏍兼暟鎹�
+      donorchargeList: [],
+      donorchargerogans: [],
+      //鎹愮尞妗堜緥閫夋嫨
+      showSelectionDialog: false,
+      donorlist: [],
+      donorinfolist: [],
+      selectionForm: {
+        index: null,
+        donorid: null,
+        donorname: null
+      },
+      loadingdonorlist: false,
+
+      // 寮瑰嚭灞傛爣棰�
+      title: "",
+      // 鏄惁鏄剧ず寮瑰嚭灞�
+      open: false,
+      // 鏌ヨ璐圭敤琛ㄥ弬鏁�
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        infoid: null,
+        name: null,
+        donationcategory: null,
+        donateorgan: null,
+        chargeamounted: null
+      },
+      //鏌ヨ妗堜緥鍙傛暟
+      donorParams: {
+        pageNum: 1,
+        pageSize: 1000
+      },
+      // 鏌ヨ璐圭敤鍣ㄥ畼琛ㄥ弬鏁�
+      organParams: {
+        pageNum: 1,
+        pageSize: 10,
+        donorchargeid: null
+      },
+      // 琛ㄥ崟鍙傛暟
+      form: {},
+      // 琛ㄥ崟鏍¢獙
+      rules: {}
+    };
+  },
+  created() {
+    this.getList();
+  },
+
+  methods: {
+    //涓撳/鍖荤枟鏈烘瀯/璐圭敤鎶ラ攢鏈烘瀯閫夋嫨
+    confirmSelection() {
+      var curdonorinfo = null;
+      //浠庢渚嬪垪琛ㄨ幏鍙栦俊鎭�
+      this.donorinfolist.map(item => {
+        if (this.selectionForm.donorid == item.id) {
+          curdonorinfo = item;
         }
-      };
+      });
+      this.showSelectionDialog = false;
+      this.$router.push({
+        path: "/cost/particulars",
+        query: { id: 0, operation: "add", data: curdonorinfo }
+      });
     },
-    created() {
+
+    /** 鏌ヨ鎹愮尞妗堜緥鍣ㄥ畼鍒楀垪琛� */
+    getList() {
+      this.loading = true;
+      listDonorpayment(this.queryParams).then(response => {
+        this.donorchargeList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+
+    // 鍙栨秷鎸夐挳
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 琛ㄥ崟閲嶇疆
+    reset() {
+      this.form = {
+        id: null,
+        infoid: null,
+        donateno: null,
+        donatetime: null,
+        name: null,
+        borthdate: null,
+        sex: null,
+        age: null,
+        donationcategory: null,
+        donateorgan: null,
+        chargeamount: null,
+        chargeamounted: null,
+        remark: null,
+        delFlag: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 鎼滅储鎸夐挳鎿嶄綔 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
       this.getList();
     },
-  
-    methods: {
-      //涓撳/鍖荤枟鏈烘瀯/璐圭敤鎶ラ攢鏈烘瀯閫夋嫨
-      confirmSelection() {
-        var curdonorinfo = null;
-        //浠庢渚嬪垪琛ㄨ幏鍙栦俊鎭�
-        this.donorinfolist.map(item => {
-          if (this.selectionForm.donorid == item.id) {
-            curdonorinfo = item;
-          }
-        });
-        this.showSelectionDialog = false;
-        this.$router.push({
-            path: "/cost/particulars",
-          query: { id: 0, operation: "add", data: curdonorinfo }
-        });
-      },
-  
-      /** 鏌ヨ鎹愮尞妗堜緥鍣ㄥ畼鍒楀垪琛� */
-      getList() {
-        this.loading = true;
-        listDonorcharge(this.queryParams).then(response => {
-          this.donorchargeList = response.rows;
-          this.total = response.total;
-          this.loading = false;
-        });
-      },
-  
-      // 鍙栨秷鎸夐挳
-      cancel() {
-        this.open = false;
-        this.reset();
-      },
-      // 琛ㄥ崟閲嶇疆
-      reset() {
-        this.form = {
-          id: null,
-          infoid: null,
-          donateno: null,
-          donatetime: null,
-          name: null,
-          borthdate: null,
-          sex: null,
-          age: null,
-          donationcategory: null,
-          donateorgan: null,
-          chargeamount: null,
-          chargeamounted: null,
-          remark: null,
-          delFlag: null,
-          createBy: null,
-          createTime: null,
-          updateBy: null,
-          updateTime: null
-        };
-        this.resetForm("form");
-      },
-      /** 鎼滅储鎸夐挳鎿嶄綔 */
-      handleQuery() {
-        this.queryParams.pageNum = 1;
-        this.getList();
-      },
-      /** 閲嶇疆鎸夐挳鎿嶄綔 */
-      resetQuery() {
-        this.resetForm("queryForm");
-        this.handleQuery();
-      },
-      // 澶氶�夋閫変腑鏁版嵁
-      handleSelectionChange(selection) {
-        this.ids = selection.map(item => item.id)
-        this.single = selection.length !== 1
-        this.multiple = !selection.length
-      },
-      /** 鏂板鎸夐挳鎿嶄綔 */
-      handleAdd() {
-        this.selectionForm.index = null;
-        this.selectionForm.donorid = null;
-        this.selectionForm.donorname = null;
-  
-        if (this.donorlist[0]) {
-          this.showSelectionDialog = true;
-        }
-        else {
-          //鑾峰彇鎹愮尞妗堜緥鍒楄〃
-          if (this.donorlist.length > 0) { }
-          else {
-            this.loading = true;
-            listDonatebaseinfo(this.donorParams).then(res => {
-              // this.donorinfolist = res.rows;
-              res.rows.forEach(item => {
-                if (item.workflow >= 6) {
-                  this.donorinfolist.push(item);
-                }
-              });
-  
-              this.donorinfolist.forEach(item1 => {
-                this.donorlist.push({
-                  donorid: item1.id,
-                  donorname: item1.name
-                });
-              });
-              console.log(this.donorinfolist,' this.donorinfolist');
-              this.loading = false;
+    /** 閲嶇疆鎸夐挳鎿嶄綔 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 澶氶�夋閫変腑鏁版嵁
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 鏂板鎸夐挳鎿嶄綔 */
+    handleAdd() {
+      this.selectionForm.index = null;
+      this.selectionForm.donorid = null;
+      this.selectionForm.donorname = null;
+
+      if (this.donorlist[0]) {
+        this.showSelectionDialog = true;
+      } else {
+        //鑾峰彇鎹愮尞妗堜緥鍒楄〃
+        if (this.donorlist.length > 0) {
+        } else {
+          this.loading = true;
+          listDonatebaseinfo(this.donorParams).then(res => {
+            // this.donorinfolist = res.rows;
+            res.rows.forEach(item => {
+              if (item.workflow >= 6) {
+                this.donorinfolist.push(item);
+              }
             });
-          }
-  
-          this.showSelectionDialog = true;
-        };
-  
-        /** 
+
+            this.donorinfolist.forEach(item1 => {
+              this.donorlist.push({
+                donorid: item1.id,
+                donorname: item1.name
+              });
+            });
+            console.log(this.donorinfolist, " this.donorinfolist");
+            this.loading = false;
+          });
+        }
+
+        this.showSelectionDialog = true;
+      }
+
+      /** 
         this.reset();
         this.open = true;
         this.title = "鎹愮尞妗堜緥鍣ㄥ畼璐圭敤鎯呭喌";
         this.donorchargerogans = [];
         */
-      },
-  
-      /** 淇敼鎸夐挳鎿嶄綔 */
-      handleUpdate(row) {
-        this.$router.push({
-          path: "/cost/particulars",
-          query: { id: row.id, operation: "update", data: row }
-        });
-      },
-  
-      /** 璇︽儏鏌ョ湅鎸夐挳鎿嶄綔 */
-      handleDetail(row) {
-        this.$router.push({
-          path: "/cost/particulars",
-          query: { id: row.id, operation: "detail", data: row }
-        });
-      },
-  
-      /** 鍒犻櫎鎸夐挳鎿嶄綔 */
-      handleDelete(row) {
-        const ids = row.id || this.ids;
-        this.$modal.confirm('鏄惁纭鍒犻櫎鎹愮尞妗堜緥鍣ㄥ畼鍒楃紪鍙蜂负"' + ids + '"鐨勬暟鎹」锛�').then(function () {
+    },
+
+    /** 淇敼鎸夐挳鎿嶄綔 */
+    handleUpdate(row) {
+      this.$router.push({
+        path: "/cost/particulars",
+        query: { id: row.id, operation: "update", data: row }
+      });
+    },
+
+    /** 璇︽儏鏌ョ湅鎸夐挳鎿嶄綔 */
+    handleDetail(row) {
+      this.$router.push({
+        path: "/cost/particulars",
+        query: { id: row.id, operation: "detail", data: row }
+      });
+    },
+
+    /** 鍒犻櫎鎸夐挳鎿嶄綔 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal
+        .confirm('鏄惁纭鍒犻櫎鎹愮尞妗堜緥鍣ㄥ畼鍒楃紪鍙蜂负"' + ids + '"鐨勬暟鎹」锛�')
+        .then(function() {
           return delDonorcharge(ids);
-        }).then(() => {
+        })
+        .then(() => {
           this.getList();
           this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
-        }).catch(() => { });
-      },
-  
-      /** 瀵煎嚭鎸夐挳鎿嶄綔 */
-      handleExport() {
-        const queryParams = this.queryParams;
-        this.$modal.confirm('鏄惁纭瀵煎嚭鎵�鏈夋崘鐚渚嬪櫒瀹樺垪鏁版嵁椤癸紵').then(() => {
+        })
+        .catch(() => {});
+    },
+
+    /** 瀵煎嚭鎸夐挳鎿嶄綔 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$modal
+        .confirm("鏄惁纭瀵煎嚭鎵�鏈夋崘鐚渚嬪櫒瀹樺垪鏁版嵁椤癸紵")
+        .then(() => {
           this.exportLoading = true;
           return exportDonorcharge(queryParams);
-        }).then(response => {
+        })
+        .then(response => {
           this.$download.name(response.msg);
           this.exportLoading = false;
-        }).catch(() => { });
-      },
-  
-      /** 鎻愪氦鎸夐挳 */
-      submitForm() {
-        this.$refs["form"].validate(valid => {
-          if (valid) {
-            if (this.form.id != null) {
-              updateDonorcharge(this.form).then(response => {
-                this.$modal.msgSuccess("淇敼鎴愬姛");
-                this.open = false;
-                this.getList();
-              });
-            } else {
-              addDonorcharge(this.form).then(response => {
-                this.$modal.msgSuccess("鏂板鎴愬姛");
-                this.open = false;
-                this.getList();
-              });
-            }
+        })
+        .catch(() => {});
+    },
+
+    /** 鎻愪氦鎸夐挳 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateDonorcharge(this.form).then(response => {
+              this.$modal.msgSuccess("淇敼鎴愬姛");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addDonorcharge(this.form).then(response => {
+              this.$modal.msgSuccess("鏂板鎴愬姛");
+              this.open = false;
+              this.getList();
+            });
           }
-        });
-      },
+        }
+      });
     }
-  };
-  </script>
-  <style scoped>
-  /* @import url(); 寮曞叆鍏叡css绫� */
-  .button-delete{
-    color: rgb(236, 69, 69);
   }
-  </style>
\ No newline at end of file
+};
+</script>
+<style scoped>
+/* @import url(); 寮曞叆鍏叡css绫� */
+.button-delete {
+  color: rgb(236, 69, 69);
+}
+</style>

--
Gitblit v1.9.3