From 681bd876235ddb2a73fc218c64d0cf174b38d666 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期一, 31 七月 2023 13:24:45 +0800
Subject: [PATCH] yxh

---
 src/views/project/fund/expertFeeFundApply/index.vue |  922 ++++++++++++++++++++++++++++----------------------------
 1 files changed, 462 insertions(+), 460 deletions(-)

diff --git a/src/views/project/fund/expertFeeFundApply/index.vue b/src/views/project/fund/expertFeeFundApply/index.vue
index c99482d..d92089c 100644
--- a/src/views/project/fund/expertFeeFundApply/index.vue
+++ b/src/views/project/fund/expertFeeFundApply/index.vue
@@ -96,10 +96,10 @@
                   <template slot-scope="scope">
                     <el-button v-if="scope.row.recordstatus == -1 ||
                       scope.row.recordstatus == 1
-                      " size="mini" type="text" icon="el-icon-edit" @click="handleup(scope.row)">涓婃姤</el-button>
+                      " size="mini" type="text" icon="el-icon-edit" @click="(scope.row)">涓婃姤</el-button>
                     <el-button v-if="scope.row.recordstatus == -1 ||
                       scope.row.recordstatus == 1
-                      " size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">淇敼</el-button>
+                      " size="mini" type="text" icon="el-icon-edit" @click="date(scope.row)">淇敼</el-button>
                     <el-button size="mini" type="text" icon="el-icon-edit" @click="handleDetail(scope.row)">鏌ョ湅</el-button>
                     <!-- v-hasPermi="['project:expretfund:edit']" -->
                     <el-button v-if="scope.row.recordstatus == -1 ||
@@ -402,20 +402,20 @@
             </el-form-item>
           </el-col>
         </el-row>
-                  -->
+                 
         <el-row>
           <el-col :span="12">
             <el-form-item label="璐圭敤鐢宠闄勪欢" align="left" prop="annexbankcard">
               <el-upload size="mini" class="upload-demo" :action="uploadFileUrl" :file-list="fileList" multiple
                 :limit="20" :headers="headers" :on-success="(response, file, fileList) =>
                   uploadSccess(response, file, fileList)
-                  " :on-preview="downFile" :disabled='dialogType == "detail"' :on-error="handleUploadError"
+                  " :on-preview="downFile" :disabled='dialogType == "detail"' :on-error="loadError"
                 :on-exceed="handleExceed" :on-remove="remove" accept="image/*,.pdf">
                 <el-button :disabled='dialogType == "detail"' size="small" type="primary">涓婁紶</el-button>
               </el-upload>
             </el-form-item>
           </el-col>
-        </el-row>
+        </el-row> -->
         <el-row v-if="dialogType == 'detail'">
           <el-table :data="fundflowList" border>
             <el-table-column label="瀹℃牳浜�" align="center" width="120" prop="checkusername" />
@@ -622,7 +622,6 @@
   data() {
     //杩欓噷瀛樻斁鏁版嵁
     return {
-
       // 閬僵灞�
       loading: true,
       // 瀵煎嚭閬僵灞�
@@ -662,6 +661,10 @@
         username: null,
         usertype: null,
       },
+
+      //
+      amount: 0.00,
+
       //鐢宠鍗曠被鍨�
       currentApplyType: "1",
       //涓撳鍒楄〃
@@ -705,6 +708,10 @@
       donateconsolationfundList: [],
       //璐圭敤鏄庣粏鍒楄〃
       fundDetails: [],
+      formData: {},
+      totalPreTaxAmount: 0.0,
+      totalAfterTaxAmount: 0.0,
+      totalAmount: 0.0,
 
       // 寮瑰嚭灞傛爣棰�
       title: "",
@@ -793,6 +800,446 @@
   // },
   //鏂规硶闆嗗悎
   methods: {
+    //鐢熷懡鍛ㄦ湡 - 鍒涘缓瀹屾垚锛堝彲浠ヨ闂綋鍓峵his瀹炰緥锛�
+    created() {      
+      console.log("getUnitList", 1);
+      this.getUnitList();
+      console.log("getBaseInfoList", 2);
+      this.getBaseInfoList();
+      console.log("getlistUser", 3);
+      this.getlistUser();
+      console.log("getCurFundType", 4);
+      this.getCurFundType();
+      console.log("getList", 5);
+      this.getList();
+      console.log("last", 6);
+    },
+    //鐢熷懡鍛ㄦ湡 - 鎸傝浇瀹屾垚锛堝彲浠ヨ闂瓺OM鍏冪礌锛�
+    mounted() {
+      this.selectReporters();
+      this.getUsermsg();
+      this.getlistExternalperson();
+    },
+    beforeCreate() { }, //鐢熷懡鍛ㄦ湡 - 鍒涘缓涔嬪墠
+    beforeMount() { }, //鐢熷懡鍛ㄦ湡 - 鎸傝浇涔嬪墠
+    beforeUpdate() { }, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪墠
+    updated() { }, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪悗
+    beforeDestroy() { }, //鐢熷懡鍛ㄦ湡 - 閿�姣佷箣鍓�
+    destroyed() { }, //鐢熷懡鍛ㄦ湡 - 閿�姣佸畬鎴�
+    activated() { }, //濡傛灉椤甸潰鏈塳eep-alive缂撳瓨鍔熻兘锛岃繖涓嚱鏁颁細瑙﹀彂
+
+    /** 鎼滅储鎸夐挳鎿嶄綔 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+
+    /** 閲嶇疆鎸夐挳鎿嶄綔 */
+    resetQuery() {
+      this.daterangeReporttime = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+
+    /** 涓嬭浇鏂囦欢鎸夐挳鎿嶄綔 */
+    downFile(item) {
+      const url = process.env.VUE_APP_BASE_API + item.url
+      var a = document.createElement('a');
+      var event = new MouseEvent('click');
+      a.download = item.name;
+      a.href = url;
+      a.dispatchEvent(event);
+    },
+
+    /** 鏂板鎸夐挳鎿嶄綔 */
+    handleAdd() {
+      if (this.curCase.id) {
+        this.istrue += 2;
+        this.reset();
+        this.queryParams.params = {};
+        this.form.donorno = this.curCase.donorno;
+        this.form.name = this.curCase.name;
+        this.form.infoid = this.curCase.id;
+        this.form.username = this.defaultperson.nickName;
+        this.form.userno = this.defaultperson.userName;
+        // this.form.phone = this.defaultperson.phone;
+
+        this.form.deptmentname = this.defaultperson.dept.deptName;
+        this.form.deptmentno = this.defaultperson.dept.deptId;
+        this.form.managername = this.defaultperson.dept.leader;
+        // this.form.createTime = nowdate;
+        //this.open = true;
+        //this.initFundApplyForm();
+        this.fundDetails = [];
+        this.addRow();
+        this.dialogOpen = true;
+        this.dialogType = "edit";
+        this.title = "璐圭敤鐢宠";
+      } else {
+        const h = this.$createElement;
+        this.$message({
+          message: h("p", null, [h("span", null, "璇峰厛閫夋嫨宸︽柟鎹愮尞妗堜緥 ")]),
+        });
+      }
+    },
+
+    /** 淇敼鎸夐挳鎿嶄綔 */
+    handleUpdate(row) {
+      this.isopen = 0;
+      this.reset();
+      this.queryParams.params = {};
+      this.form.donorno = this.curCase.donorno;
+      this.form.infoid = this.curCase.id;
+      this.dialogOpen = true;
+      this.title = "淇敼璐圭敤鐢宠";
+      this.dialogType = "edit";
+
+      const id = row.id || this.ids;
+      getFund(id).then((response) => {
+        this.form = response.data;
+        // this.form.recordstate =-1;
+        // this.form.recordstatus = response.data.recordstatus + "";
+        this.form.name = this.curCase.name;
+        //闄勪欢澶勭悊
+        this.fileList = this.form.annexbankcard ? this.form.annexbankcard.split(",").map(item => ({ url: item, name: item })) : []
+        getownFundDetail(id).then((res) => {
+          this.fundDetails = res.data;
+          for (let m = 0; m < this.fundDetails.length; m++) {
+            this.fundDetails[m].itemArr = [];
+            this.getItemArr(m, this.fundDetails[m]);
+
+            //鑾峰彇璐圭敤椤圭洰鐨勮缁嗕俊鎭�
+            this.fundDetails[m].rowfeeblocks = [];
+
+            this.fundDetails[m].rowfeeblocks.push({
+              servicesscope: this.fundDetails[m].servicesscope,
+              expensedescribe: this.fundDetails[m].servicesscopename,
+              expense: this.fundDetails[m].expense,
+              remark: this.fundDetails[m].servicesscopename,
+            });
+            // getdetailsByItemId(this.fundDetails[m].itemid).then((res) => {
+            //   let fundmsg = res.data;
+            //   fundmsg.forEach((item) => {
+            //     this.fundDetails[m].rowfeeblocks.push({
+            //       servicesscope: item.id,
+            //       expensedescribe: item.expensedescribe,
+            //       expense: item.expense,
+            //       remark: item.expensedescribe,
+            //     });
+            //   });
+            // });
+          }
+
+          if (this.fundDetails.length == 0) {
+            this.addRow();
+          }
+        });
+      });
+    },
+
+    /** 鏌ョ湅鎸夐挳鎿嶄綔 */
+    handleDetail(row) {
+      this.isopen = 0;
+      this.reset();
+      this.queryParams.params = {};
+      this.form.donorno = this.curCase.donorno;
+      this.form.infoid = this.curCase.id;
+      this.dialogOpen = true;
+      this.title = "鏌ョ湅璐圭敤鐢宠";
+      this.dialogType = "detail";
+      const id = row.id || this.ids;
+
+      getFund(id).then((response) => {
+        this.form = response.data;
+        this.form.name = this.curCase.name;
+        let listFundflowparams = {
+          fundid: row.id,
+          fundtype: 2,
+        };
+        //闄勪欢澶勭悊
+        this.fileList = this.form.annexbankcard ? this.form.annexbankcard.split(",").map(item => ({ url: item, name: item })) : []
+
+        listFundflow(listFundflowparams).then((res) => {
+          this.fundflowList = res.rows;
+        });
+        getownFundDetail(id).then((res) => {
+          this.fundDetails = res.data;
+          for (let m = 0; m < this.fundDetails.length; m++) {
+            this.fundDetails[m].itemArr = [];
+            this.getItemArr(m, this.fundDetails[m]);
+            this.fundDetails[m].rowfeeblocks = [];
+            this.fundDetails[m].rowfeeblocks.push({
+              expense: this.fundDetails[m].expense,
+              expensedescribe: this.fundDetails[m].servicesscopename,
+              remark: this.fundDetails[m].servicesscope,
+              servicesscope: this.fundDetails[m].servicesscope,
+            });
+          }
+
+          if (this.fundDetails.length == 0) {
+            this.addRow();
+          }
+        });
+      });
+    },
+
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal
+        .confirm("鏄惁纭鍒犻櫎璇ヨ褰曪紵")
+        .then(function () {
+          return delFund(ids);
+        })
+        .then(() => {
+          getownFundDetail(ids).then((res) => {
+            let listdetails = res.data;
+            for (let i = 0; i < listdetails.length; i++) {
+              delFunddetail(listdetails[i].id);
+            }
+          });
+          // this.getList();
+          this.getfundList();
+          this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+        })
+        .catch(() => { });
+    },
+
+    /** 涓婃姤鎸夐挳鎿嶄綔 */
+    handleup(row) {
+      this.$confirm("鏄惁纭灏嗙櫥璁拌褰曚笂鎶ワ紵", "鎻愮ず", {
+        confirmButtonText: "纭畾",
+        cancelButtonText: "鍙栨秷",
+        type: "warning",
+      })
+        .then(() => {
+          //鏌ユ壘鏄惁瀛樺湪鐧昏瀹屾垚璁板綍
+          //鍒ゆ柇鏄惁瀛樺湪涓婃姤璁板綍
+          row.recordstatus = 0;
+
+          updateFund(row).then((response) => {
+            if (response.code == 200) {
+              this.$message({
+                type: "success",
+                message: "鐢宠鎴愬姛",
+              });
+            } else {
+              this.$message({
+                type: "error",
+                message: "鐢宠澶辫触",
+              });
+            }
+            this.loading = false;
+          });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "宸插彇娑堢敵璇�",
+          });
+        });
+    },
+
+    /** 鎻愪氦鎸夐挳 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          this.formData = this.form;
+          // let totalPreTaxAmount = 0.0;
+          // let totalAfterTaxAmount = 0.0;
+          // let totalAmount = 0.0;
+
+          //淇濆瓨鍓嶆牎楠屾暟鎹�
+          for (let k = 0; k < this.fundDetails.length; k++) {
+            let tempDetail = this.fundDetails[k];
+            if (tempDetail.itemid == null) {
+              this.$modal.msgWarning("鏈嶅姟椤圭洰琛ㄤ腑锛岀" + (k + 1).toString() + "琛岀殑鏈嶅姟椤圭洰鏈�夋嫨锛岃鍏堥�夋嫨鏈嶅姟椤圭洰鍚庡啀鎻愪氦淇濆瓨锛�");
+              return;
+            }
+
+            if (tempDetail.servicesscope == null) {
+              this.$modal.msgWarning("鏈嶅姟椤圭洰琛ㄤ腑锛岀" + (k + 1).toString() + "琛岀殑璐圭敤璇存槑鏈�夋嫨,璇烽�夋嫨璐圭敤璇存槑鍚庡啀鎻愪氦淇濆瓨锛�");
+              return;
+            }
+
+            if (tempDetail.beneficiaryno == null) {
+              this.$modal.msgWarning("鏈嶅姟椤圭洰琛ㄤ腑锛岀" + (k + 1).toString() + "琛岀殑鏈嶅姟浜哄憳濮撳悕涓洪�夋嫨,璇烽�夋嫨浜哄憳鍚庡啀鎻愪氦淇濆瓨锛�");
+              return;
+            }
+
+            // //鍒ゆ柇鍗曚綅 unitSel
+            // try {
+            //   let unitIndex = this.unitList.findIndex(
+            //     (item) => tempDetail.unitno == item.organizationid
+            //   );
+            //   if (unitIndex > -1) {
+            //     tempDetail.unitname = this.unitList[unitIndex].organizationname;
+            //   } else {
+            //     tempDetail.unitname = tempDetail.unitno;
+            //   }
+            // } catch {
+            //   tempDetail.unitname = tempDetail.unitno;
+            // }
+          }
+
+          //闄勪欢澶勭悊
+          let list = this.fileList;
+          if (list.length > 0) {
+            this.form.annexfiles = list.map(item => item.url).join(",");
+          }
+
+          //澶勭悊鏄庣粏
+          for (let i = 0; i < this.fundDetails.length; i++) {
+            let tempDetail = this.fundDetails[i];
+            //鑾峰彇鏈嶅姟椤圭洰鏄庣粏
+            let tempItemArr = tempDetail.itemArr;
+            let itemIndex = tempItemArr.findIndex(
+              (item) => tempDetail.itemid == item.id
+            );
+            if (itemIndex > -1) {
+              tempDetail.itemname = tempItemArr[itemIndex].itemName;
+              tempDetail.itemid = tempItemArr[itemIndex].id;
+            }
+
+            //鑾峰彇applytypename銆佹湇鍔¤垂鐢ㄥぇ绫�
+            let applytypeIndex = this.rowfeeItemTypes.findIndex(
+              (item) => tempDetail.applytype == item.value
+            );
+            if (applytypeIndex > -1) {
+              tempDetail.applytypename = this.rowfeeItemTypes[applytypeIndex].label;
+              tempDetail.subjecttype = this.rowfeeItemTypes[applytypeIndex].subjecttype;
+              tempDetail.subjecttypename = this.rowfeeItemTypes[applytypeIndex].subjecttypename;
+            }
+            this.fundDetails[i] = tempDetail;
+            /*
+            //璁$畻涓◣            
+            //if (isNaN(parseFloat(tempDetail.taxedamount)))
+            //鑾峰彇鍙傛暟
+            this.taxParam.beneficiaryNo = tempDetail.beneficiaryno;
+            this.taxParam.startTime = this.form.createTime.substring(0, 10);
+            // 璁$畻绋庡悗閲戦
+            if (tempDetail.taxedamount == undefined || tempDetail.taxedamount == null || tempDetail.taxedamount == 0 || tempDetail.taxedamount == '') {
+              //鑾峰彇鍙傛暟
+              this.taxParam.money = tempDetail.amount.toString();
+              getTaxByBeneFiciaryNo(this.taxParam).then((res) => {
+                if (res.code == 200) {
+                  tempDetail.taxamount = res.data;
+                  tempDetail.taxedamount = tempDetail.amount - tempDetail.taxamount;
+                  this.fundDetails[k] = tempDetail;
+
+                  this.totalAfterTaxAmount += parseFloat(tempDetail.taxedamount);
+                  this.totalAmount += parseFloat(tempDetail.amount);
+                }
+              });
+            }
+
+            // 璁$畻绋庡墠閲戦
+            if (tempDetail.amount == undefined || tempDetail.amount == null || tempDetail.amount == 0 || tempDetail.amount == '') {
+              //鑾峰彇鍙傛暟
+              this.taxParam.money = tempDetail.taxedamount.toString();
+              getTaxBeforeByAfterMoney(this.taxParam).then((res) => {
+                if (res.code == 200) {
+                  tempDetail.taxamount = res.data.nowTax;
+                  tempDetail.amount = parseFloat(res.data.nowTaxBeforeMoney);
+                  this.fundDetails[k] = tempDetail;
+
+                  this.totalAfterTaxAmount += parseFloat(tempDetail.taxedamount);
+                  this.totalAmount += parseFloat(tempDetail.amount);
+                  console.log("1", this.amount);
+                }
+              });
+            }
+            */
+          }
+          //璐圭敤鍚堣
+          // this.form.pretaxcost = parseFloat(this.totalPreTaxAmount).toFixed(2);
+          // this.form.taxedcost = parseFloat(this.totalAfterTaxAmount).toFixed(2);
+          // this.form.amountrequested = this.totalAmount.toFixed(2);
+
+          //淇濆瓨鏁版嵁
+          this.loading = true;
+          this.form.serviceFunddetails = 0;
+          this.fundDetails.map((item) => {
+            this.form.serviceFunddetails += item.amount;
+          });
+          this.form.serviceFunddetails = this.fundDetails;
+
+          if (this.form.id != null) {
+            //鎹愮尞鑰�
+            this.form.donorname = this.curCase.name;
+          }
+          else {
+            this.form.recordstatus = -1;
+          }
+
+          batchUploadFund(this.form).then((response) => {
+            if (response.code === 200) {
+              this.$modal.msgSuccess("涓撳鍔冲姟璐逛繚瀛樻垚鍔燂紒");
+              this.selectDonotor(this.curCase);
+            } else {
+              this.$modal.msgError("涓撳鍔冲姟璐逛繚瀛樺け璐ワ細" + response.msg);
+            }
+          });
+
+          //鍏抽棴绐楀彛
+          this.loading = false;
+          this.dialogOpen = false;
+        }
+      });
+    },
+
+    // 鍙栨秷鎸夐挳
+    cancel() {
+      this.dialogOpen = false;
+      this.reset();
+    },
+
+    // 琛ㄥ崟閲嶇疆
+    reset() {
+      this.form = {
+        recordstate: -1,
+        userno: null,
+        username: null,
+        id: null,
+        infoid: null,
+        donorno: null,
+        delFlag: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        familyrelations: null,
+        name: null,
+        remark: null,
+        doname: null,
+        unitname: null,
+        unitno: null,
+        sex: null,
+        idcardtype: null,
+        idcardno: null,
+        phone: null,
+        donorname: null,
+        depositbank: null,
+        bankprovince: null,
+        bankprovincename: null,
+        bankcity: null,
+        bankcityname: null,
+        banktown: null,
+        banktownname: null,
+        branchbankname: null,
+        bankcardno: null,
+        annexbankcard: null,
+        annexregistform: null,
+        consolationmoney: null,
+        applytype: "1",
+        servicetypename: null,
+        servicesscope: null,
+        servicesscopename: null,
+      };
+      this.resetForm("form");
+      //娓呯┖闄勪欢
+      this.fileList = []
+    },
+
     ShowDetailDialog(spoce, showType) {
       this.expertfrom = "1";
       this.funddetailForm.index = spoce.$index;
@@ -875,7 +1322,7 @@
           addExternalperson(this.expertform).then((response) => {
             if (response.code == 200) {
               this.$modal.msgSuccess("鏂板涓撳淇℃伅鎴愬姛锛�");
-              
+
               listExternalperson().then((res) => {
                 this.personlist = res.rows;
                 console.log("new personlist", this.personlist);
@@ -920,44 +1367,11 @@
       this.showDetailInfoDialog = false;
     },
 
-    handleup(row) {
-      this.$confirm("鏄惁纭灏嗙櫥璁拌褰曚笂鎶ワ紵", "鎻愮ず", {
-        confirmButtonText: "纭畾",
-        cancelButtonText: "鍙栨秷",
-        type: "warning",
-      })
-        .then(() => {
-          //鏌ユ壘鏄惁瀛樺湪鐧昏瀹屾垚璁板綍
-          //鍒ゆ柇鏄惁瀛樺湪涓婃姤璁板綍
-          row.recordstatus = 0;
-
-          updateFund(row).then((response) => {
-            if (response.code == 200) {
-              this.$message({
-                type: "success",
-                message: "鐢宠鎴愬姛",
-              });
-            } else {
-              this.$message({
-                type: "error",
-                message: "鐢宠澶辫触",
-              });
-            }
-            this.loading = false;
-          });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "宸插彇娑堢敵璇�",
-          });
-        });
-    },
-
     //鑾峰彇褰撳墠鐢ㄦ埛淇℃伅
     getUsermsg() {
       getUserProfile().then((response) => {
         this.defaultperson = response.data;
+        console.log("this.defaultperson", this.defaultperson);
         this.standardlevel = response.data.standardlevel;
         if (this.defaultperson.createBy == "admin" || this.defaultperson.createBy == "001" || this.defaultperson.createBy == "002") {
           this.ismanager = true;
@@ -1035,17 +1449,6 @@
       });
     },
 
-    /** 鎼滅储鎸夐挳鎿嶄綔 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 閲嶇疆鎸夐挳鎿嶄綔 */
-    resetQuery() {
-      this.daterangeReporttime = [];
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
     /** 鏌ヨ鎹愮尞浜洪亾鎱伴棶閲戝垪琛� */
     getList() {
       this.loading = true;
@@ -1058,6 +1461,8 @@
       // this.queryParams.residencetown = this.$refs.areaSelect.getQu();
       listDonatebaseinfo(this.queryParams).then((response) => {
         this.donatebaseinfoList = response.rows;
+        console.log("this.queryParams", this.queryParams)
+        console.log("this.donatebaseinfoList", this.donatebaseinfoList)
         this.total = response.total;
         this.loading = false;
       });
@@ -1082,36 +1487,6 @@
       });
     },
 
-    /** 鏂板鎸夐挳鎿嶄綔 */
-    handleAdd() {
-      if (this.curCase.id) {
-        this.istrue += 2;
-        this.reset();
-        this.queryParams.params = {};
-        this.form.donorno = this.curCase.donorno;
-        this.form.name = this.curCase.name;
-        this.form.infoid = this.curCase.id;
-        this.form.username = this.defaultperson.nickName;
-        this.form.userno = this.defaultperson.userName;
-
-        this.form.deptmentname = this.defaultperson.dept.deptName;
-        this.form.deptmentno = this.defaultperson.dept.deptId;
-        this.form.managername = this.defaultperson.dept.leader;
-        // this.form.createTime = nowdate;
-        //this.open = true;
-        //this.initFundApplyForm();
-        this.fundDetails = [];
-        this.addRow();
-        this.dialogOpen = true;
-        this.dialogType = "edit";
-        this.title = "璐圭敤鐢宠";
-      } else {
-        const h = this.$createElement;
-        this.$message({
-          message: h("p", null, [h("span", null, "璇峰厛閫夋嫨宸︽柟鎹愮尞妗堜緥 ")]),
-        });
-      }
-    },
     //鐐瑰嚮鎹愮尞妗堜緥鍒楄〃瑙﹀彂鏂规硶
     selectDonotor(row, column, event) {
       this.curCase = row;
@@ -1125,59 +1500,6 @@
         this.loading = false;
         this.donateconsolationfundList = response.rows;
       });
-    },
-
-    // 鍙栨秷鎸夐挳
-    cancel() {
-      this.dialogOpen = false;
-      this.reset();
-    },
-
-    // 琛ㄥ崟閲嶇疆
-    reset() {
-      this.form = {
-        recordstate: -1,
-        userno: null,
-        username: null,
-        id: null,
-        infoid: null,
-        donorno: null,
-        delFlag: null,
-        createBy: null,
-        createTime: null,
-        updateBy: null,
-        updateTime: null,
-        familyrelations: null,
-        name: null,
-        remark: null,
-        doname: null,
-        unitname: null,
-        unitno: null,
-        sex: null,
-        idcardtype: null,
-        idcardno: null,
-        phone: null,
-        donorname: null,
-        depositbank: null,
-        bankprovince: null,
-        bankprovincename: null,
-        bankcity: null,
-        bankcityname: null,
-        banktown: null,
-        banktownname: null,
-        branchbankname: null,
-        bankcardno: null,
-        annexbankcard: null,
-        annexregistform: null,
-        consolationmoney: null,
-        applytype: "1",
-        servicetypename: null,
-        servicesscope: null,
-        servicesscopename: null,
-      };
-      this.resetForm("form");
-      //娓呯┖闄勪欢
-      this.fileList = []
     },
 
     //瀵煎叆鎵�鏈夐」鐩�
@@ -1344,178 +1666,6 @@
       // });
     },
 
-    /** 鎻愪氦鎸夐挳 */
-    submitForm() {
-      this.$refs["form"].validate((valid) => {
-        if (valid) {
-          let formData = this.form;
-          let totalPreTaxAmount = 0.0;
-          let totalAfterTaxAmount = 0.0;
-          let totalAmount = 0.0;
-
-          //淇濆瓨鍓嶆牎楠屾暟鎹�
-          for (let k = 0; k < this.fundDetails.length; k++) {
-            let tempDetail = this.fundDetails[k];
-            if (tempDetail.itemid == null) {
-              this.$modal.msgWarning("鏈嶅姟椤圭洰琛ㄤ腑锛岀" + (k + 1).toString() + "琛岀殑鏈嶅姟椤圭洰鏈�夋嫨锛岃鍏堥�夋嫨鏈嶅姟椤圭洰鍚庡啀鎻愪氦淇濆瓨锛�");
-              return;
-            }
-
-            if (tempDetail.servicesscope == null) {
-              this.$modal.msgWarning("鏈嶅姟椤圭洰琛ㄤ腑锛岀" + (k + 1).toString() + "琛岀殑璐圭敤璇存槑鏈�夋嫨,璇烽�夋嫨璐圭敤璇存槑鍚庡啀鎻愪氦淇濆瓨锛�");
-              return;
-            }
-
-            if (tempDetail.beneficiaryno == null) {
-              this.$modal.msgWarning("鏈嶅姟椤圭洰琛ㄤ腑锛岀" + (k + 1).toString() + "琛岀殑鏈嶅姟浜哄憳濮撳悕涓洪�夋嫨,璇烽�夋嫨浜哄憳鍚庡啀鎻愪氦淇濆瓨锛�");
-              return;
-            }
-
-            // //鍒ゆ柇鍗曚綅 unitSel
-            // try {
-            //   let unitIndex = this.unitList.findIndex(
-            //     (item) => tempDetail.unitno == item.organizationid
-            //   );
-            //   if (unitIndex > -1) {
-            //     tempDetail.unitname = this.unitList[unitIndex].organizationname;
-            //   } else {
-            //     tempDetail.unitname = tempDetail.unitno;
-            //   }
-            // } catch {
-            //   tempDetail.unitname = tempDetail.unitno;
-            // }
-
-            //璁$畻涓◣            
-            //if (isNaN(parseFloat(tempDetail.taxedamount)))
-            if (tempDetail.taxedamount == undefined || tempDetail.taxedamount == null || tempDetail.taxedamount == 0 || tempDetail.taxedamount == '') {
-              //鑾峰彇鍙傛暟
-              this.taxParam.beneficiaryNo = tempDetail.beneficiaryno;
-              this.taxParam.money = tempDetail.amount.toString();
-              this.taxParam.startTime = this.form.createTime.substring(0, 10);
-              getTaxByBeneFiciaryNo(this.taxParam).then((res) => {
-                if (res.code == 200) {
-                  tempDetail.taxamount = res.data;
-                  tempDetail.taxedamount = tempDetail.amount - tempDetail.taxamount;
-                }
-              });
-            }
-
-            //if (isNaN(parseFloat(tempDetail.amount)))
-            if (tempDetail.amount == undefined || tempDetail.amount == null || tempDetail.amount == 0 || tempDetail.amount == '') {
-              //鑾峰彇鍙傛暟
-              this.taxParam.beneficiaryNo = tempDetail.beneficiaryno;
-              this.taxParam.money = tempDetail.taxedamount.toString();
-              this.taxParam.startTime = this.form.createTime.substring(0, 10);
-
-              getTaxBeforeByAfterMoney(this.taxParam).then((res) => {
-                if (res.code == 200) {
-                  tempDetail.taxamount = res.data.nowTax;
-                  tempDetail.amount = res.data.nowTaxBeforeMoney;
-                }
-              });
-            }
-
-            totalAfterTaxAmount += parseFloat(tempDetail.taxedamount);
-            totalAmount += parseFloat(tempDetail.amount);
-            this.fundDetails[k] = tempDetail;
-          }
-
-          this.loading = true;
-          //闄勪欢澶勭悊
-          let list = this.fileList;
-          if (list.length > 0) {
-            this.form.annexbankcard = list.map(item => item.url).join(",");
-          }
-
-          this.form.donorname = this.curCase.name;
-          this.form.pretaxcost = parseFloat(totalPreTaxAmount).toFixed(2);
-          this.form.taxedcost = parseFloat(totalAfterTaxAmount).toFixed(2);
-          this.form.amountrequested = totalAmount.toFixed(2);
-          if (this.form.id != null) {
-            this.form.recordstatus = -1;
-            updateFund(this.form).then((response) => {
-              this.getfundList();
-              this.dialogOpen = false;
-              this.getList();
-              this.selectDonotor(this.curCase);
-              this.$modal.msgSuccess("淇敼鎴愬姛");
-              this.loading = false;
-              for (let m = 0; m < this.fundDetails.length; m++) {
-                let tempData = this.fundDetails[m];
-                let tempItemArr = tempData.itemArr;
-                tempData.fundid = formData.id;
-                //鑾峰彇鏈嶅姟椤圭洰鏄庣粏
-                let itemIndex = tempItemArr.findIndex(
-                  (item) => tempData.itemid == item.id
-                );
-                if (itemIndex > -1) {
-                  tempData.itemname = tempItemArr[itemIndex].itemName;
-                  tempData.itemid = tempItemArr[itemIndex].id;
-                }
-
-                //鑾峰彇applytypename
-                let applytypeIndex = this.rowfeeItemTypes.findIndex(
-                  (item) => tempData.applytype == item.value
-                );
-                if (applytypeIndex > -1) {
-                  tempData.applytypename = this.rowfeeItemTypes[applytypeIndex].label;
-                }
-
-                if (tempData.id > 0) {
-                  updateFunddetail(tempData).then((response2) => { });
-                } else {
-                  addFunddetail(tempData).then((response2) => { });
-                }
-              }
-            });
-          } else {
-            //淇濆瓨璐圭敤鐢宠
-            for (let m = 0; m < this.fundDetails.length; m++) {
-              let tempData = this.fundDetails[m];
-              let tempUtemArr = tempData.itemArr;
-
-              //鑾峰彇鏈嶅姟椤圭洰鏄庣粏
-              let itemIndex = tempUtemArr.findIndex(
-                (item) => tempData.itemid == item.id
-              );
-              if (itemIndex > -1) {
-                tempData.itemname = tempUtemArr[itemIndex].itemName;
-                tempData.itemid = tempUtemArr[itemIndex].id;
-              }
-
-              //鑾峰彇applytypename
-              let applytypeIndex = this.rowfeeItemTypes.findIndex(
-                (item) => tempData.applytype == item.value
-              );
-              if (applytypeIndex > -1) {
-                tempData.applytypename = this.rowfeeItemTypes[applytypeIndex].label;
-              }
-              this.fundDetails[m] = tempData;
-            }
-
-            this.form.serviceFunddetails = 0;
-            this.fundDetails.map((item) => {
-              this.form.serviceFunddetails += item.amount;
-            });
-            this.form.serviceFunddetails = this.fundDetails;
-            this.form.recordstatus = -1;
-
-            batchUploadFund(this.form).then((response) => {
-              if (response.code === 200) {
-                this.$modal.msgSuccess("鏂板鎴愬姛");
-                this.loading = false;
-                this.selectDonotor(this.curCase);
-              } else {
-                this.$modal.msgError("鏂板澶辫触锛�" + response.msg);
-                this.loading = false;
-              }
-            });
-            this.dialogOpen = false;
-          }
-        }
-      });
-    },
-
     //鑾峰彇涓撳鍒楄〃
     getlistExternalperson() {
       listExternalperson().then((res) => {
@@ -1551,7 +1701,7 @@
           row.branchbankname = res.branchbankname;
           row.depositbank = res.depositbank;
           row.idcardno = res.idcardno;
-          row.phone = res.telephone;
+          row.phone = res.phonenumber;
           row.title = res.title;
           row.unitname = res.unitname;
           row.unitno = res.unitno;
@@ -1563,129 +1713,9 @@
 
     getlistUser() {
       listUser().then((res) => {
+        console.log("listUser", res);
         this.userlist = res.data;
       });
-    },
-
-    /** 淇敼鎸夐挳鎿嶄綔 */
-    handleUpdate(row) {
-      this.isopen = 0;
-      this.reset();
-      this.queryParams.params = {};
-      this.form.donorno = this.curCase.donorno;
-      this.form.infoid = this.curCase.id;
-      this.dialogOpen = true;
-      this.title = "淇敼璐圭敤鐢宠";
-      this.dialogType = "edit";
-
-      const id = row.id || this.ids;
-      getFund(id).then((response) => {
-        this.form = response.data;
-        // this.form.recordstate =-1;
-        // this.form.recordstatus = response.data.recordstatus + "";
-        this.form.name = this.curCase.name;
-        //闄勪欢澶勭悊
-        this.fileList = this.form.annexbankcard ? this.form.annexbankcard.split(",").map(item => ({ url: item, name: item })) : []
-        getownFundDetail(id).then((res) => {
-          this.fundDetails = res.data;
-          for (let m = 0; m < this.fundDetails.length; m++) {
-            this.fundDetails[m].itemArr = [];
-            this.getItemArr(m, this.fundDetails[m]);
-
-            //鑾峰彇璐圭敤椤圭洰鐨勮缁嗕俊鎭�
-            this.fundDetails[m].rowfeeblocks = [];
-
-            this.fundDetails[m].rowfeeblocks.push({
-              servicesscope: this.fundDetails[m].servicesscope,
-              expensedescribe: this.fundDetails[m].servicesscopename,
-              expense: this.fundDetails[m].expense,
-              remark: this.fundDetails[m].servicesscopename,
-            });
-            // getdetailsByItemId(this.fundDetails[m].itemid).then((res) => {
-            //   let fundmsg = res.data;
-            //   fundmsg.forEach((item) => {
-            //     this.fundDetails[m].rowfeeblocks.push({
-            //       servicesscope: item.id,
-            //       expensedescribe: item.expensedescribe,
-            //       expense: item.expense,
-            //       remark: item.expensedescribe,
-            //     });
-            //   });
-            // });
-          }
-
-          if (this.fundDetails.length == 0) {
-            this.addRow();
-          }
-        });
-      });
-    },
-
-    /** 鏌ョ湅鎸夐挳鎿嶄綔 */
-    handleDetail(row) {
-      this.isopen = 0;
-      this.reset();
-      this.queryParams.params = {};
-      this.form.donorno = this.curCase.donorno;
-      this.form.infoid = this.curCase.id;
-      this.dialogOpen = true;
-      this.title = "鏌ョ湅璐圭敤鐢宠";
-      this.dialogType = "detail";
-      const id = row.id || this.ids;
-
-      getFund(id).then((response) => {
-        this.form = response.data;
-        this.form.name = this.curCase.name;
-        let listFundflowparams = {
-          fundid: row.id,
-          fundtype: 2,
-        };
-        //闄勪欢澶勭悊
-        this.fileList = this.form.annexbankcard ? this.form.annexbankcard.split(",").map(item => ({ url: item, name: item })) : []
-
-        listFundflow(listFundflowparams).then((res) => {
-          this.fundflowList = res.rows;
-        });
-        getownFundDetail(id).then((res) => {
-          this.fundDetails = res.data;
-          for (let m = 0; m < this.fundDetails.length; m++) {
-            this.fundDetails[m].itemArr = [];
-            this.getItemArr(m, this.fundDetails[m]);
-            this.fundDetails[m].rowfeeblocks = [];
-            this.fundDetails[m].rowfeeblocks.push({
-              expense: this.fundDetails[m].expense,
-              expensedescribe: this.fundDetails[m].servicesscopename,
-              remark: this.fundDetails[m].servicesscope,
-              servicesscope: this.fundDetails[m].servicesscope,
-            });
-          }
-
-          if (this.fundDetails.length == 0) {
-            this.addRow();
-          }
-        });
-      });
-    },
-
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal
-        .confirm("鏄惁纭鍒犻櫎璇ヨ褰曪紵")
-        .then(function () {
-          return delFund(ids);
-        })
-        .then(() => {
-          getownFundDetail(ids).then((res) => {
-            let listdetails = res.data;
-            for (let i = 0; i < listdetails.length; i++) {
-              delFunddetail(listdetails[i].id);
-            }
-          });
-          // this.getList();
-          this.getfundList();
-          this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
-        })
-        .catch(() => { });
     },
 
     deleteRows(row, index, rows) {
@@ -1779,6 +1809,8 @@
           this.rowfeeItemTypes.push({
             value: dataList[m].itemType,
             label: dataList[m].itemTypeName,
+            subjecttype: dataList[m].subjecttype,
+            subjecttypename: dataList[m].subjecttypename,
           });
         }
       });
@@ -1888,39 +1920,9 @@
       }
     },
 
-    // 涓嬭浇鏂囦欢
-    downFile(item) {
-      const url = process.env.VUE_APP_BASE_API + item.url
-      var a = document.createElement('a');
-      var event = new MouseEvent('click');
-      a.download = item.name;
-      a.href = url;
-      a.dispatchEvent(event);
-    },
-
   },
 
-  //鐢熷懡鍛ㄦ湡 - 鍒涘缓瀹屾垚锛堝彲浠ヨ闂綋鍓峵his瀹炰緥锛�
-  created() {
-    this.getUnitList();
-    this.getList();
-    this.getBaseInfoList();
-    this.getlistUser();
-    this.getCurFundType();
-  },
-  //鐢熷懡鍛ㄦ湡 - 鎸傝浇瀹屾垚锛堝彲浠ヨ闂瓺OM鍏冪礌锛�
-  mounted() {
-    this.selectReporters();
-    this.getUsermsg();
-    this.getlistExternalperson();
-  },
-  beforeCreate() { }, //鐢熷懡鍛ㄦ湡 - 鍒涘缓涔嬪墠
-  beforeMount() { }, //鐢熷懡鍛ㄦ湡 - 鎸傝浇涔嬪墠
-  beforeUpdate() { }, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪墠
-  updated() { }, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪悗
-  beforeDestroy() { }, //鐢熷懡鍛ㄦ湡 - 閿�姣佷箣鍓�
-  destroyed() { }, //鐢熷懡鍛ㄦ湡 - 閿�姣佸畬鎴�
-  activated() { }, //濡傛灉椤甸潰鏈塳eep-alive缂撳瓨鍔熻兘锛岃繖涓嚱鏁颁細瑙﹀彂
+
 };
 </script>
 <style scoped>

--
Gitblit v1.9.3