From 4a3a070d46e3a26cf3e053a2f0a007a4bef8fd99 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期四, 14 九月 2023 12:05:20 +0800
Subject: [PATCH] qq

---
 src/views/project/fund/applyDetail/index.vue |  282 ++++++++++----------------------------------------------
 1 files changed, 51 insertions(+), 231 deletions(-)

diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue
index 230d7e4..c000504 100644
--- a/src/views/project/fund/applyDetail/index.vue
+++ b/src/views/project/fund/applyDetail/index.vue
@@ -122,21 +122,12 @@
         <el-row v-if="jurisdiction">
           <!-- <el-alert title="褰撳墠涓烘煡鐪嬬姸鎬侊紝涓嶆敮鎸佷慨鏀瑰瓨鍌ㄣ��" type="warning">
           </el-alert> -->
-          <el-alert
-            title="褰撳墠涓烘煡鐪嬬姸鎬侊紝涓嶆敮鎸佷慨鏀瑰瓨鍌ㄣ��"
-            type="warning"
-            show-icon
-          >
+          <el-alert title="褰撳墠涓烘煡鐪嬬姸鎬侊紝涓嶆敮鎸佷慨鏀瑰瓨鍌ㄣ��" type="warning" show-icon>
           </el-alert>
         </el-row>
         <el-row v-if="businessType == 2">
           <div style="margin-bottom: 15px;">
-            <el-button
-              type="success"
-              icon="el-icon-download"
-              @click="Batchentry"
-              >鎵归噺褰曞叆</el-button
-            >
+            <el-button type="success" icon="el-icon-download" @click="Batchentry">鎵归噺褰曞叆</el-button>
           </div>
         </el-row>
         <el-row>
@@ -152,17 +143,9 @@
             </el-table-column>-->
             <el-table-column prop="applytype" align="center" label="鏈嶅姟绫诲瀷" width="200">
               <template slot-scope="scope">
-                <el-select
-                  v-model="scope.row.applytype"
-                  placeholder="鏈嶅姟绫诲瀷"
-                  @change="verifyFeeItemType(scope.row)"
-                >
-                  <el-option
-                    v-for="dict in rowfeeItemTypes"
-                    :key="dict.index"
-                    :label="dict.label"
-                    :value="dict.value"
-                  ></el-option>
+                <el-select v-model="scope.row.applytype" placeholder="鏈嶅姟绫诲瀷" @change="verifyFeeItemType(scope.row)">
+                  <el-option v-for="dict in rowfeeItemTypes" :key="dict.index" :label="dict.label"
+                    :value="dict.value"></el-option>
                 </el-select>
               </template>
             </el-table-column>
@@ -255,12 +238,8 @@
             </el-table-column>
             <el-table-column prop="unitno" align="center" label="鍗曚綅鍚嶇О" width="250" v-if="form.applytype != '4'">
               <template slot-scope="scope">
-                <el-button
-                  type="primary"
-                  plain
-                  @click="ShowDetailDialog(scope, 'unit')"
-                  >{{ scope.row.unitname }}</el-button
-                >
+                <el-button type="primary" plain @click="ShowDetailDialog(scope, 'unit')">{{ scope.row.unitname
+                }}</el-button>
                 <!-- <el-select
                   v-model="scope.row.unitno"
                   placeholder="鍗曚綅"
@@ -279,16 +258,11 @@
             </el-table-column>
             <el-table-column prop="unitno" align="center" label="鍗曚綅/涓汉" width="250" v-if="form.applytype == '4'">
               <template slot-scope="scope">
-                <el-button
-                  type="primary"
-                  plain
-                  @click="ShowDetailDialog(scope, 'expert')"
-                  >{{
-                    experthear == "expert"
-                      ? scope.row.unitname
-                      : scope.row.beneficiaryname
-                  }}</el-button
-                >
+                <el-button type="primary" plain @click="ShowDetailDialog(scope, 'expert')">{{
+                  experthear == "expert"
+                  ? scope.row.unitname
+                  : scope.row.beneficiaryname
+                }}</el-button>
                 <!-- <el-select
                   v-model="scope.row.unitno"
                   placeholder="鍗曚綅"
@@ -524,48 +498,21 @@
             </el-form-item>
           </el-col>
           <el-col :span="24" v-if="experthear == 'unit'">
-            <el-form-item
-              label="浜哄憳濮撳悕"
-              prop="beneficiaryname"
-              label-width="80px"
-            >
-              <el-select
-                filterable
-                allow-create
-                ref="beneficiaryname"
-                default-first-option
-                @change="bbaaccss"
-                v-model="funddetailForm.beneficiaryname"
-                placeholder="璇烽�夋嫨"
-                style="width: 100%"
-              >
-                <el-option
-                  v-for="item in expertlist"
-                  :key="item.expertNo"
-                  :label="item.exportName"
-                  :value="item.exportName"
-                >
+            <el-form-item label="浜哄憳濮撳悕" prop="beneficiaryname" label-width="80px">
+              <el-select filterable allow-create ref="beneficiaryname" default-first-option @change="bbaaccss"
+                v-model="funddetailForm.beneficiaryname" placeholder="璇烽�夋嫨" style="width: 100%">
+                <el-option v-for="item in expertlist" :key="item.expertNo" :label="item.exportName"
+                  :value="item.exportName">
                 </el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="24" v-if="experthear == 'expert'">
             <el-form-item label="鍗曚綅鍚嶇О" prop="unitno" label-width="120px">
-              <el-select
-                v-model="funddetailForm.unitname"
-                placeholder="鍗曚綅鍚嶇О"
-                @change="bbaaccss"
-                clearable
-                filterable
-                allow-create
-                style="width: 100%"
-              >
-                <el-option
-                  v-for="(spec, index) in unitList"
-                  :key="index"
-                  :label="spec.organizationname"
-                  :value="spec.organizationname"
-                ></el-option>
+              <el-select v-model="funddetailForm.unitname" placeholder="鍗曚綅鍚嶇О" @change="bbaaccss" clearable filterable
+                allow-create style="width: 100%">
+                <el-option v-for="(spec, index) in unitList" :key="index" :label="spec.organizationname"
+                  :value="spec.organizationname"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -632,90 +579,37 @@
         <el-button type="primary" @click="ConfirmDetailDialog()">纭� 瀹�</el-button>
       </span>
     </el-dialog>
-    <el-dialog
-      v-dialogDrags
-      :modal="false"
-      :close-on-click-modal="false"
-      :title="pdftitle"
-      :visible.sync="pdfVisible"
-      width="60%"
-    >
+    <el-dialog v-dialogDrags :modal="false" :close-on-click-modal="false" :title="pdftitle" :visible.sync="pdfVisible"
+      width="60%">
       <div>
         <el-table :data="tableDatatop" style="width: 100%">
-          <el-table-column
-            v-if="businessType == 4"
-            prop="price"
-            align="center"
-            label="鍗曚环"
-          >
+          <el-table-column v-if="businessType == 4" prop="price" align="center" label="鍗曚环">
           </el-table-column>
-          <el-table-column
-            prop="quantity"
-            align="center"
-            label="鏁伴噺"
-            v-if="businessType == 4"
-          >
+          <el-table-column prop="quantity" align="center" label="鏁伴噺" v-if="businessType == 4">
           </el-table-column>
           <el-table-column prop="amount" align="center" :label="amountLabel">
           </el-table-column>
-          <el-table-column
-            prop="taxedamount"
-            align="center"
-            label="绋庡悗閲戦"
-            v-if="
-              (this.ismanager == true) &
-                (form.applytype == '1' || form.applytype == '2')
-            "
-          >
+          <el-table-column prop="taxedamount" align="center" label="绋庡悗閲戦" v-if="(this.ismanager == true) &
+            (form.applytype == '1' || form.applytype == '2')
+            ">
           </el-table-column>
-          <el-table-column
-            prop="beneficiaryname"
-            align="center"
-            label="濮撳悕"
-            v-if="form.applytype == '1' || form.applytype == '2'"
-          >
+          <el-table-column prop="beneficiaryname" align="center" label="濮撳悕"
+            v-if="form.applytype == '1' || form.applytype == '2'">
           </el-table-column>
 
-          <el-table-column
-            prop="unitno"
-            align="center"
-            label="鍗曚綅鍚嶇О"
-            width="250"
-            v-if="form.applytype != '4'"
-          >
+          <el-table-column prop="unitno" align="center" label="鍗曚綅鍚嶇О" width="250" v-if="form.applytype != '4'">
           </el-table-column>
-          <el-table-column
-            prop="beneficiaryname"
-            align="center"
-            label="鍗曚綅/涓汉"
-            width="250"
-            v-if="form.applytype == '4'"
-          >
+          <el-table-column prop="beneficiaryname" align="center" label="鍗曚綅/涓汉" width="250" v-if="form.applytype == '4'">
           </el-table-column>
-          <el-table-column
-            prop="title"
-            align="center"
-            label="鑱岀О"
-            width="120"
-            v-if="form.applytype == '1' || form.applytype == '2'"
-          >
+          <el-table-column prop="title" align="center" label="鑱岀О" width="120"
+            v-if="form.applytype == '1' || form.applytype == '2'">
           </el-table-column>
-          <el-table-column
-            prop="idcardno"
-            align="center"
-            label="韬唤璇佸彿"
-            width="200"
-            v-if="form.applytype == '1' || form.applytype == '2'"
-          >
+          <el-table-column prop="idcardno" align="center" label="韬唤璇佸彿" width="200"
+            v-if="form.applytype == '1' || form.applytype == '2'">
           </el-table-column>
           <el-table-column prop="depositbank" align="center" label="寮�鎴烽摱琛�">
           </el-table-column>
-          <el-table-column
-            prop="bankcardno"
-            align="center"
-            label="閾惰甯愬彿"
-            width="210"
-          >
+          <el-table-column prop="bankcardno" align="center" label="閾惰甯愬彿" width="210">
           </el-table-column>
         </el-table>
       </div>
@@ -786,30 +680,13 @@
     </el-dialog>
 
     <!-- 鎵归噺閫夊彇 -->
-    <el-dialog
-      title="鎵归噺鐢熸垚鏄庣粏淇℃伅"
-      :visible.sync="batchdialogVisible"
-      width="30%"
-    >
+    <el-dialog title="鎵归噺鐢熸垚鏄庣粏淇℃伅" :visible.sync="batchdialogVisible" width="30%">
       <div style="max-height: 300px; overflow-y: auto">
-        <el-checkbox
-          :indeterminate="isIndeterminate"
-          v-model="checkAll"
-          @change="handleCheckAllChange"
-          >鍏ㄩ��</el-checkbox
-        >
+        <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">鍏ㄩ��</el-checkbox>
         <div style="margin: 15px 0;"></div>
-        <el-checkbox-group
-          v-model="checkedCities"
-          @change="handleCheckedCitiesChange"
-        >
-          <el-checkbox
-            border
-            v-for="city in cityOptions"
-            :label="city"
-            :key="city.reportNo"
-            >{{ city.reportName }}</el-checkbox
-          >
+        <el-checkbox-group v-model="checkedCities" @change="handleCheckedCitiesChange">
+          <el-checkbox border v-for="city in cityOptions" :label="city" :key="city.reportNo">{{ city.reportName
+          }}</el-checkbox>
         </el-checkbox-group>
       </div>
 
@@ -995,11 +872,7 @@
       rowfeeItemTypes: [],
 
       //璐圭敤璇存槑
-<<<<<<< Updated upstream
       feeBlocks: [],
-=======
-      feeBlockList: [],
->>>>>>> Stashed changes
 
       fundflowList: [],
       // 闅忔満鏁�
@@ -1155,8 +1028,6 @@
   //鏂规硶闆嗗悎
   methods: {
     bbaaccss(val) {
-      console.log(val);
-      console.log(this.funddetailForm);
     },
     // 娴忚鍣ㄩ〉闈㈠叧闂垨鍒锋柊鎻愮ず
     beforeunloadHandler(e) {
@@ -1166,7 +1037,6 @@
           sessionStorage.getItem("apifunddetail")) ||
         !sessionStorage.getItem("apifunddetail")
       ) {
-        console.log(cg);
       } else {
         this._beforeUnload_time = new Date().getTime();
         e = e || window.event;
@@ -1232,7 +1102,6 @@
       if (string.includes("9091")) {
         const index = string.indexOf("9091");
         this.Networkheader = string.slice(0, index + 4); // 鎴彇9091鍙婂叾鍓嶉儴瀛楃
-        // console.log(this.Networkheader);
       } else {
         const index = string.indexOf("8032");
         this.Networkheader = string.slice(0, index + 4); // 鎴彇8032鍙婂叾鍓嶉儴瀛楃
@@ -1272,7 +1141,6 @@
         this.title = this.businessName + "鏂板缓";
         if (this.operationType != "4") {
           this.curCase = this.$route.query.curCase;
-          console.log("this.curCase", this.curCase);
         }
         this.handleAdd();
       } else if (this.operationType == "update") {
@@ -1360,7 +1228,6 @@
         listFundflow(listFundflowparams).then(res => {
           this.fundflowList = res.rows;
         });
-        console.log(this.fundflowList);
       });
     },
 
@@ -1372,22 +1239,21 @@
       getFund(this.curId).then(response => {
         this.form = response.data;
         sessionStorage.removeItem("apiform");
-
         sessionStorage.setItem("apiform", JSON.stringify(this.form));
-
-        console.log("response.data", response.data);
         //闄勪欢澶勭悊
         // this.fileList = this.form.annexbankcard ? this.form.annexbankcard.split(",").map(item => ({ url: item, name: item })) : []
 
         //涓氬姟鏄庣粏
         getownFundDetail(this.curId).then(res => {
           this.rbDetails = res.data;
+          console.log("this.feeBlocks",this.feeBlocks);
           for (let m = 0; m < this.rbDetails.length; m++) {
             this.rbDetails[m].itemlist = [];
             this.getRowFeeItems(m, this.rbDetails[m]);
 
             //鑾峰彇璐圭敤椤圭洰鐨勮缁嗕俊鎭�
             this.rbDetails[m].rowfeeblocks = this.feeBlocks.filter(r => r.itemid == this.rbDetails[m].itemid);
+            console.log("this.rbDetails[m].rowfeeblocks",this.rbDetails[m].rowfeeblocks);
           }
 
           if (this.rbDetails.length == 0) {
@@ -1456,8 +1322,6 @@
         })
         .then(() => {
           getownFundDetail(this.curId).then(res => {
-            console.log(res);
-
             let listdetails = res.data;
             for (let i = 0; i < listdetails.length; i++) {
               delFunddetail(listdetails[i].id);
@@ -1515,13 +1379,12 @@
       return randomString;
     },
     /** 鎻愪氦鎸夐挳 */
-    submitForm: debounce(function() {
-      console.log("debounce");
+    submitForm: debounce(function () {
       if (!this.randomnumber) {
         this.randomnumber = this.generateRandomString(9);
         this.form.randomnumber = this.randomnumber;
       }
-      console.log(this.randomnumber);
+
       this.$refs["form"].validate(valid => {
         if (valid) {
           this.formData = this.form;
@@ -1707,7 +1570,6 @@
           this.rbDetails.map(item => {
             this.form.serviceFunddetails += item.amount;
           });
-          console.log(this.rbDetails);
           this.form.serviceFunddetails = this.rbDetails;
 
           if (this.form.id != null) {
@@ -1798,7 +1660,7 @@
         } else {
           this.ismanager = false;
         }
-        console.log(this.userprofile, this.ismanager);
+
         if (this.operationType == "add") {
           this.form.username = this.userprofile.nickName;
           this.form.userno = this.userprofile.userName;
@@ -1845,7 +1707,6 @@
               expertNo: this.personlist[j].id,
               exportName: this.personlist[j].username
             });
-            console.log(this.expertlist);
           }
         }
       });
@@ -1882,16 +1743,13 @@
 
     //鑾峰彇璐圭敤鏈烘瀯鍒楄〃
     getFeeUnitList() {
-      console.log("鍗曚綅");
       listReportname("org").then(res => {
         this.feeUnitList = res.data;
       });
-      console.log(this.feeUnitList);
     },
 
     //鑾峰彇鍖荤枟鏈烘瀯鍒楄〃
     getUnitList() {
-      console.log("鍖荤枟鏈烘瀯");
       listOrganization(3).then(response => {
         for (let i = 0; i < response.rows.length; i++) {
           this.unitList.push({
@@ -1930,7 +1788,6 @@
             subjecttype: dataList[m].subjecttype,
             subjecttypename: dataList[m].subjecttypename
           });
-          console.log("璐圭敤绫诲瀷", this.rowfeeItemTypes);
         }
       });
 
@@ -2382,7 +2239,6 @@
           this.rbDetails.map(item => {
             this.form.serviceFunddetails += item.amount;
           });
-          console.log(this.rbDetails);
           this.form.serviceFunddetails = this.rbDetails;
 
           if (this.form.id != null) {
@@ -2433,15 +2289,11 @@
       });
     },
     handleCheckAllChange(val) {
-      console.log(val);
       this.checkedCities = val ? this.cityOptions : [];
       this.isIndeterminate = false;
     },
     handleCheckedCitiesChange(value) {
-      console.log(value);
-      console.log(this.checkedCities);
       let checkedCount = value.length;
-      console.log(checkedCount);
       this.checkAll = checkedCount === this.cityOptions.length;
       this.isIndeterminate =
         checkedCount > 0 && checkedCount < this.cityOptions.length;
@@ -2450,7 +2302,6 @@
     Batchentry() {
       // ethical
       listReportname("ethical").then(res => {
-        console.log(res);
         this.cityOptions = res.data;
       });
       this.batchdialogVisible = true;
@@ -2458,13 +2309,11 @@
     // 纭褰曞叆
     BatchentryFn() {
       this.checkedCities.forEach(item => {
-        console.log(item);
         let rowData = {
           orderno: null,
-          id: item.id,
           fundid: null,
           beneficiaryname: item.reportName,
-          beneficiaryno: null,
+          beneficiaryno: item.reportNo,
           unitname: item.unitname,
           unitno: null,
           uintuserno: null,
@@ -2505,7 +2354,6 @@
           annexfiles: null
         };
 
-        console.log(rowData);
         this.rbDetails.push(rowData);
       });
       for (let i = 0; i < this.checkedCities.length + 1; i++) {
@@ -2582,9 +2430,7 @@
         type: "success"
       })
         .then(() => {
-          console.log(this.rbDetails.length);
           if (this.rbDetails.length == 1) {
-            console.log("鏂板");
             this.addRow(0);
           }
           if (row.id !== null) {
@@ -2597,7 +2443,6 @@
                 }).then(() => {
                   this.$set(rows, rows.splice(index, 1));
                   getownFundDetail(this.form.id).then(res => {
-                    console.log(res);
 
                     this.$set(this.rbDetails, res.data);
                     for (let i = 0; i < this.rbDetails.length; i++) {
@@ -2718,7 +2563,7 @@
     },
 
     //鏂囦欢涓婁紶
-    handleUploadError() {},
+    handleUploadError() { },
     remove(file, fileList) {
       const rbDetails = [...this.rbDetails];
       this.fileListto.splice(this.fileListto.indexOf(file), 1);
@@ -2733,7 +2578,6 @@
     //     this.$modal.msgSuccess(response.msg);
     //     this.fileList.push({ name: response.fileName, url: response.fileName });
     //   } else {
-    //     console.log(response.msg);
     //   }
     // },
     uploadSccess(response, file, fileList) {
@@ -2755,13 +2599,11 @@
 
         this.rbDetails[this.atpresent].annexfilesList = this.fileListto;
       } else {
-        console.log(response.msg);
       }
     },
 
     // 鐐瑰嚮绁ㄦ嵁
     Filepopup(index, rows, row) {
-      console.log(row);
       this.tableDatatop = [];
       this.pdfimgsrcList = [];
       this.tableDatatop.push(row);
@@ -2776,8 +2618,6 @@
         this.fileListto.forEach(item => {
           this.pdfimgsrcList.push(this.Networkheader + "/prod-api" + item.url);
         });
-        console.log(this.pdfimgsrcList);
-        console.log(this.pdfimg);
         this.pdftitle = "鍏�" + this.pdfimgsrcList.length + "椤�";
       } else {
         this.fileListto = [];
@@ -2788,7 +2628,6 @@
 
     // 鐐瑰嚮宸蹭笂浼犳枃浠�
     downFile(item) {
-      console.log(item);
       this.pdftitle =
         "鍏�" + this.pdfimgsrcList.length + "椤癸紝褰撳墠閫変腑" + item.name;
       let name = item.name.split(".");
@@ -2803,10 +2642,7 @@
 
           // if (!this.pdfimgsrcList.includes(this.pdfimg)) {
           //   this.pdfimgsrcList.push(this.pdfimg);
-          //   console.log("鍔犲叆");
           // }
-          console.log(this.pdfimg);
-          console.log(this.pdfimgsrcList, "imglist");
         } else {
           this.pdfimg = this.Networkheader + "/prod-api" + item.url;
         }
@@ -2821,18 +2657,13 @@
     },
     // 鐐瑰嚮鍒犻櫎
     deletedowfile(row) {
-      console.log(this.fileListto);
-      console.log(row);
       const indexlist = this.getIndexInArray(
         this.pdfimgsrcList,
         this.Networkheader + "/prod-api" + row.url
       );
-      console.log(indexlist);
       this.pdfimgsrcList.splice(indexlist, 1);
       const index = this.getIndexInArray(this.fileListto, row);
       this.fileListto.splice(index, 1);
-      console.log(index);
-      console.log(this.pdfimgsrcList);
     },
     // 鐐瑰嚮涓婄Щ
     moveupdowfile(row) {
@@ -2843,11 +2674,9 @@
     //涓撳/鍖荤枟鏈烘瀯/璐圭敤鎶ラ攢鏈烘瀯閫夋嫨
     ShowDetailDialog(spoce, showType) {
       this.spocewl = spoce;
-      console.log(spoce);
       this.selectionType = showType;
       if (this.businessType == 4 || !showType) {
         this.selectionType = this.experthear;
-        console.log(this.selectionType);
       }
       // if (!showType) {
       //   this.selectionType = this.experthear;
@@ -2873,24 +2702,18 @@
 
     //涓撳/鍖荤枟鏈烘瀯/璐圭敤鎶ラ攢鏈烘瀯閫夋嫨
     ConfirmDetailDialog() {
-      console.log(this.unitforname);
-      console.log(this.Personnelforname);
       if (this.businessType == 4) {
         if (this.experthear == "expert") {
           this.funddetailForm.beneficiaryname = this.unitforname;
         } else {
-          console.log(11);
           this.funddetailForm.beneficiaryname = this.Personnelforname;
-          console.log(this.funddetailForm.beneficiaryname);
         }
       }
 
-      console.log(this.funddetailForm);
       let tempIndex = this.funddetailForm.index;
       let tempExpertName = this.funddetailForm.beneficiaryname;
       let tempUnitname = this.funddetailForm.unitname;
       let singleDetail = this.rbDetails[tempIndex];
-      console.log(tempExpertName);
 
       if (this.selectionType == "expert" || this.businessType == 4) {
         if (this.expertfrom == "1" || this.experthear == "unit") {
@@ -3013,8 +2836,6 @@
       if (this.businessType == 4) {
         singleDetail.beneficiaryname = this.funddetailForm.beneficiaryname;
       }
-      console.log(singleDetail);
-      console.log(this.funddetailForm);
       this.rbDetails[tempIndex] = singleDetail;
       this.showSelectionDialog = false;
     }
@@ -3036,8 +2857,6 @@
     this.getUserProfile();
     let apifunddetailForm = this.funddetailForm;
     let apiform = this.form;
-    console.log(apiform);
-    console.log(apifunddetailForm);
 
     // this.getFeeUnitList();
   },
@@ -3130,7 +2949,8 @@
   font-size: 25px;
   line-height: 25px;
 }
-::v-deep .el-checkbox.is-bordered + .el-checkbox.is-bordered {
+
+::v-deep .el-checkbox.is-bordered+.el-checkbox.is-bordered {
   margin-left: 0 !important;
   margin-bottom: 10px;
 }

--
Gitblit v1.9.3