From 23a9cb837058edd4fd7fd07d74a200845297bca1 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期四, 14 九月 2023 10:56:16 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/opo-web
---
src/views/project/fund/applyDetail/index.vue | 151 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 127 insertions(+), 24 deletions(-)
diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue
index c9a45de..790c8fd 100644
--- a/src/views/project/fund/applyDetail/index.vue
+++ b/src/views/project/fund/applyDetail/index.vue
@@ -164,7 +164,7 @@
>
</el-alert>
</el-row>
- <el-row>
+ <el-row v-if="businessType == 2">
<div style="margin-bottom: 15px;">
<el-button
type="success"
@@ -210,7 +210,7 @@
>
<el-option
v-for="dict in rowfeeItemTypes"
- :key="dict.index"
+ :key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
@@ -416,11 +416,7 @@
type="primary"
plain
@click="ShowDetailDialog(scope, 'expert')"
- >{{
- experthear == "expert"
- ? scope.row.unitname
- : scope.row.beneficiaryname
- }}</el-button
+ >{{ scope.row.beneficiaryname }}</el-button
>
<!-- <el-select
v-model="scope.row.unitno"
@@ -873,7 +869,7 @@
ref="beneficiaryname"
default-first-option
@change="bbaaccss"
- v-model="funddetailForm.beneficiaryname"
+ v-model="Personnelforname"
placeholder="璇烽�夋嫨"
style="width: 100%"
>
@@ -890,7 +886,7 @@
<el-col :span="24" v-if="experthear == 'expert'">
<el-form-item label="鍗曚綅鍚嶇О" prop="unitno" label-width="120px">
<el-select
- v-model="funddetailForm.unitname"
+ v-model="unitforname"
placeholder="鍗曚綅鍚嶇О"
@change="bbaaccss"
clearable
@@ -1030,6 +1026,85 @@
:visible.sync="pdfVisible"
width="60%"
>
+ <div>
+ <el-table :data="tableDatatop" style="width: 100%">
+ <el-table-column
+ v-if="businessType == 4"
+ prop="price"
+ align="center"
+ label="鍗曚环"
+ >
+ </el-table-column>
+ <el-table-column
+ prop="quantity"
+ align="center"
+ label="鏁伴噺"
+ v-if="businessType == 4"
+ >
+ </el-table-column>
+ <el-table-column prop="amount" align="center" :label="amountLabel">
+ </el-table-column>
+ <el-table-column
+ prop="taxedamount"
+ align="center"
+ label="绋庡悗閲戦"
+ v-if="
+ (this.ismanager == true) &
+ (form.applytype == '1' || form.applytype == '2')
+ "
+ >
+ </el-table-column>
+ <el-table-column
+ prop="beneficiaryname"
+ align="center"
+ label="濮撳悕"
+ v-if="form.applytype == '1' || form.applytype == '2'"
+ >
+ </el-table-column>
+
+ <el-table-column
+ prop="unitno"
+ align="center"
+ label="鍗曚綅鍚嶇О"
+ width="250"
+ v-if="form.applytype != '4'"
+ >
+ </el-table-column>
+ <el-table-column
+ prop="beneficiaryname"
+ align="center"
+ label="鍗曚綅/涓汉"
+ width="250"
+ v-if="form.applytype == '4'"
+ >
+ </el-table-column>
+ <el-table-column
+ prop="title"
+ align="center"
+ label="鑱岀О"
+ width="120"
+ v-if="form.applytype == '1' || form.applytype == '2'"
+ >
+ </el-table-column>
+ <el-table-column
+ prop="idcardno"
+ align="center"
+ label="韬唤璇佸彿"
+ width="200"
+ v-if="form.applytype == '1' || form.applytype == '2'"
+ >
+ </el-table-column>
+ <el-table-column prop="depositbank" align="center" label="寮�鎴烽摱琛�">
+ </el-table-column>
+ <el-table-column
+ prop="bankcardno"
+ align="center"
+ label="閾惰甯愬彿"
+ width="210"
+ >
+ </el-table-column>
+ </el-table>
+ </div>
<div class="pdfimg">
<div class="box-pdf">
<div>
@@ -1119,7 +1194,7 @@
</div> -->
</div>
- <div v-if="this.previewpdf" class="pdfimgmin">
+ <div v-if="this.previewpdf && pdfimgsrcList.length" class="pdfimgmin">
<!-- <img :src="pdfimg" /> -->
<el-image
style="width: 95%; height: 90%"
@@ -1176,7 +1251,7 @@
</div>
<span slot="footer" class="dialog-footer">
- <el-button @click="dialogVisible = false">鍙� 娑�</el-button>
+ <el-button @click="batchdialogVisible = false">鍙� 娑�</el-button>
<el-button type="primary" @click="BatchentryFn">纭� 瀹�</el-button>
</span>
</el-dialog>
@@ -1327,7 +1402,8 @@
cityOptions: [],
checkAll: false,
checkedCities: [],
-
+ Personnelforname: "璇烽�夋嫨",
+ unitforname: "璇烽�夋嫨",
isIndeterminate: true,
//鏄惁鏄笓瀹惰垂鐨凮PO瀹℃壒浜哄憳
@@ -1345,6 +1421,7 @@
totalPreTaxAmount: 0.0,
totalAfterTaxAmount: 0.0,
totalAmount: 0.0,
+ tableDatatop: [],
//璐圭敤绫诲瀷鏁扮粍
feeItemTypes: [],
@@ -1483,7 +1560,7 @@
pdfimgsrcList: [],
pdfVisible: false,
previewpdf: false,
- hintitle: "閫変腑宸︿晶宸蹭笂浼犳枃浠堕瑙堟煡鐪�",
+ hintitle: "璇蜂笂浼犳枃浠跺悗鏌ョ湅",
atpresent: "",
Savereminder: false, //鎻愰啋淇濆瓨寮规
Reminderquantity: 0, //鎻愰啋鏁伴噺
@@ -1887,6 +1964,7 @@
},
/** 鎻愪氦鎸夐挳 */
submitForm: debounce(function() {
+ console.log("debounce");
if (!this.randomnumber) {
this.randomnumber = this.generateRandomString(9);
this.form.randomnumber = this.randomnumber;
@@ -2215,6 +2293,7 @@
expertNo: this.personlist[j].id,
exportName: this.personlist[j].username
});
+ console.log(this.expertlist);
}
}
});
@@ -2296,6 +2375,7 @@
subjecttype: dataList[m].subjecttype,
subjecttypename: dataList[m].subjecttypename
});
+ console.log("璐圭敤绫诲瀷", this.rowfeeItemTypes);
}
});
},
@@ -2304,6 +2384,7 @@
let list = this.feeItemTypes.filter(r => r.itemType == row.applytype);
row.itemlist = list[0].itemDetails;
this.$set(this.rbDetails, rowindex, row);
+ console.log(this.rbDetails);
//this.loading = true;
// getItemNames(row.applytype).then((res) => {
// this.loading = false;
@@ -2838,11 +2919,12 @@
branchbankname: item.branchbankname,
annexbankcard: null,
annexregistform: null,
- applytype: "浼︾悊瀹℃牳涓撳璐�",
- itemid: "鍣ㄥ畼鎹愮尞浼︾悊瀹℃牳涓撳璐�",
- itemname: null,
+ applytype: "7",
+ applytypename: "浼︾悊瀹℃牳涓撳璐�",
+ itemid: "27",
+ itemname: "鍣ㄥ畼鎹愮尞浼︾悊瀹℃牳涓撳璐�",
itemtype: null,
- amount: null,
+ amount: 200,
prepaidamount: null,
taxamount: null,
invoicecount: null,
@@ -2857,7 +2939,7 @@
updateTime: null,
uploadflag: null,
uploadtime: null,
- itemlist: [],
+ itemlist: [{ id: "27", itemName: "鍣ㄥ畼鎹愮尞浼︾悊瀹℃牳涓撳璐�" }],
servicesscope: null,
rowfeeblocks: [],
annexfiles: null
@@ -2958,6 +3040,9 @@
console.log(res);
this.$set(this.rbDetails, res.data);
+ for (let i = 0; i < this.rbDetails.length; i++) {
+ this.rbDetails[i].orderno = i + 1;
+ }
this.sumTotalFee();
// this.rbDetails = res.data
});
@@ -3104,6 +3189,8 @@
this.pdfimgsrcList.push(
this.Networkheader + "/prod-api" + response.fileName
);
+ this.pdftitle = "鍏�" + this.pdfimgsrcList.length + "椤�";
+
this.pdfimg = this.Networkheader + "/prod-api" + response.fileName;
this.rbDetails[this.atpresent].annexfilesList = this.fileListto;
@@ -3114,6 +3201,11 @@
// 鐐瑰嚮绁ㄦ嵁
Filepopup(index, rows, row) {
+ console.log(row);
+ this.tableDatatop = [];
+ this.pdfimgsrcList = [];
+ this.tableDatatop.push(row);
+
this.atpresent = index;
this.pdfVisible = true;
if (this.rbDetails[index].annexfilesList) {
@@ -3121,12 +3213,12 @@
this.fileListto = this.rbDetails[index].annexfilesList;
this.pdfimg = this.Networkheader + "/prod-api" + this.fileListto[0].url;
// this.pdfimg = this.fileListto[0].url;
- this.pdfimgsrcList = [];
this.fileListto.forEach(item => {
this.pdfimgsrcList.push(this.Networkheader + "/prod-api" + item.url);
});
console.log(this.pdfimgsrcList);
console.log(this.pdfimg);
+ this.pdftitle = "鍏�" + this.pdfimgsrcList.length + "椤�";
} else {
this.fileListto = [];
this.pdfimg = "";
@@ -3137,7 +3229,8 @@
// 鐐瑰嚮宸蹭笂浼犳枃浠�
downFile(item) {
console.log(item);
- this.pdftitle = item.name;
+ this.pdftitle =
+ "鍏�" + this.pdfimgsrcList.length + "椤癸紝褰撳墠閫変腑" + item.name;
let name = item.name.split(".");
if (name[1] == "pdf") {
this.$modal.msgWarning("褰撳墠鏂囦欢鏆備笉鏀寔棰勮");
@@ -3220,7 +3313,18 @@
//涓撳/鍖荤枟鏈烘瀯/璐圭敤鎶ラ攢鏈烘瀯閫夋嫨
ConfirmDetailDialog() {
- console.log(this.funddetailForm.tempExpertName);
+ console.log(this.unitforname);
+ console.log(this.Personnelforname);
+ if (this.businessType == 4) {
+ if (this.experthear == "expert") {
+ this.funddetailForm.beneficiaryname = this.unitforname;
+ } else {
+ console.log(11);
+ this.funddetailForm.beneficiaryname = this.Personnelforname;
+ console.log(this.funddetailForm.beneficiaryname);
+ }
+ }
+
console.log(this.funddetailForm);
let tempIndex = this.funddetailForm.index;
let tempExpertName = this.funddetailForm.beneficiaryname;
@@ -3328,7 +3432,6 @@
let unitIndex = this.feeUnitList.findIndex(
item => singleDetail.unitno == item.reportNo
);
-
if (unitIndex > -1) {
singleDetail.unitname = this.feeUnitList[unitIndex].reportName;
singleDetail.depositbank = this.feeUnitList[
@@ -3348,8 +3451,9 @@
// singleDetail.unitname = "";
// }
if (this.businessType == 4) {
- singleDetail.unitname = this.funddetailForm.unitname;
+ singleDetail.beneficiaryname = this.funddetailForm.beneficiaryname;
}
+ console.log(singleDetail);
console.log(this.funddetailForm);
this.rbDetails[tempIndex] = singleDetail;
this.showSelectionDialog = false;
@@ -3399,7 +3503,6 @@
.top-text {
text-align: center;
-
font-size: 23px;
font-weight: 600;
margin: 20px 0;
--
Gitblit v1.9.3