From 59c2e6665e5d2dcfe3516af2373f1c8a7c9e2bc2 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期六, 07 十月 2023 14:06:52 +0800
Subject: [PATCH] 1
---
src/views/project/fund/applyDetail/index.vue | 141 +++++++++++++++++-----------------------------
1 files changed, 52 insertions(+), 89 deletions(-)
diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue
index 943e623..f1bebe6 100644
--- a/src/views/project/fund/applyDetail/index.vue
+++ b/src/views/project/fund/applyDetail/index.vue
@@ -72,18 +72,7 @@
}}</el-radio>
</el-form-item>
</el-col>
- <!-- <el-col :span="5">
- <el-form-item label="閾惰鍚嶇О" prop="bankname">
- <el-input v-model="form.bankname" placeholder="璇疯緭鍏ラ摱琛屽悕绉�" />
- </el-form-item> </el-col
- ><el-col :span="5">
- <el-form-item label="閾惰璐﹀彿" prop="bankcardno">
- <el-input
- v-model="form.bankcardno"
- placeholder="璇疯緭鍏ラ摱琛岃处鍙�"
- />
- </el-form-item>
- </el-col> -->
+
<el-col :span="5">
<el-form-item label="鑱旂郴鐢佃瘽" prop="phone">
<el-input v-model="form.phone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" />
@@ -109,42 +98,6 @@
</el-col>
</el-row>
<el-row style="text-align: left">
- <!--
- <el-col :span="5">
- <el-form-item label="鍚堣閲戦" prop="amountrequested">
- <el-input v-model="form.amountrequested" placeholder="鐢宠閲戦" :disabled="true" />
- </el-form-item>
- </el-col>
- -->
-
- <!--
- <el-col :span="5">
- <el-form-item label="搴旂即绋�" prop="taxcost" v-if="businessType == '1' || businessType == '2'">
- <el-input v-model="form.taxcost" placeholder="搴旂即绋庨噾棰濆悎璁�" :disabled="true" />
- </el-form-item>
- </el-col>
- <el-col :span="5">
- <el-form-item label="绋庡悗閲戦" prop="pretaxcost">
- <el-input v-model="form.taxedcost" placeholder="绋庡悗閲戦鍚堣" :disabled="true" />
- </el-form-item>
- </el-col>-->
- <el-col :span="5">
- <el-form-item label="棰勫鐘舵��" prop="infoid">
- <el-select
- v-model="form.checkstatus"
- filterable
- placeholder="璇烽�夋嫨棰勫鐘舵��"
- >
- <el-option
- v-for="item in baselisttages"
- :key="item.id"
- :label="item.name"
- :value="item.id"
- >
- </el-option>
- </el-select>
- </el-form-item>
- </el-col>
<el-col :span="8">
<el-form-item label="鐢宠璇存槑" prop="remark">
<el-input v-model="form.remark" placeholder="鐢宠璇存槑" />
@@ -541,6 +494,21 @@
</template>
</el-table-column>
<el-table-column
+ prop="itemdescribe"
+ align="center"
+ width="330"
+ label="椤圭洰璇存槑"
+ >
+ <template slot-scope="scope">
+ <el-input
+ type="textarea"
+ :rows="2"
+ v-model="scope.row.itemdescribe"
+ placeholder="椤圭洰璇存槑"
+ />
+ </template>
+ </el-table-column>
+ <el-table-column
prop="remark"
align="center"
width="330"
@@ -762,8 +730,27 @@
/>
</el-table>
</el-row>
+
<el-row
style="margin-top: 25px; margin-bottom: 5px"
+ v-if="operationType == 'check'"
+ >
+ <el-col :span="7">
+ <el-form-item label="棰勫鐘舵��" prop="infoid">
+ <el-radio-group
+ v-model="form.checkstatus"
+ align="left"
+ :disabled="userprofile.nickName != '闄堟厱鍗�'"
+ >
+ <el-radio label="1">寰呴瀹�</el-radio>
+ <el-radio label="2">棰勫閫氳繃绛夊緟鏉愭枡</el-radio>
+ <el-radio label="3">宸叉敹鍒版姤閿�鏉愭枡</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row
+ style="margin-top: 5px; margin-bottom: 5px"
v-if="operationType == 'check'"
>
<el-col :span="7">
@@ -775,6 +762,7 @@
</el-form-item>
</el-col>
</el-row>
+
<el-row v-if="operationType == 'check'">
<el-col :span="17">
<el-form-item label="瀹℃牳澶囨敞" align="left">
@@ -1828,6 +1816,8 @@
this.reset();
getFund(this.curId).then(response => {
+ console.log(response.data, "鍒濆");
+
this.form = response.data;
sessionStorage.removeItem("apiform");
@@ -1878,6 +1868,8 @@
this.reset();
getFund(this.curId).then(response => {
+ console.log(response.data, "鍒濆");
+
this.form = response.data;
sessionStorage.removeItem("apiform");
sessionStorage.setItem("apiform", JSON.stringify(this.form));
@@ -1924,6 +1916,7 @@
this.reset();
getFund(this.curId).then(response => {
+ console.log(response.data, "鍒濆");
this.form = response.data;
sessionStorage.removeItem("apiform");
@@ -2003,9 +1996,9 @@
//鍒ゆ柇鏄惁瀛樺湪涓婃姤璁板綍
this.form.recordstatus = 0;
if (!this.form.id) {
- this.form.id = this.$route.query.id
+ this.form.id = this.$route.query.id;
}
-
+
updateFund(this.form).then(response => {
if (response.code == 200) {
this.$message({
@@ -2136,44 +2129,6 @@
].subjecttypename;
}
this.rbDetails[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.rbDetails[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.rbDetails[k] = tempDetail;
-
- this.totalAfterTaxAmount += parseFloat(tempDetail.taxedamount);
- this.totalAmount += parseFloat(tempDetail.amount);
- }
- });
- }
- */
}
//璁＄畻褰撳墠琛屾姤閿�鍐呭璐圭敤鍚堣锛岀◣鍓嶉噾棰濓紙amount锛夈�佹墸绋庨噾棰濓紙taxamount锛夈�佺◣鍚庨噾棰濓紙taxedamount锛�
if (this.businessType == "2") {
@@ -2265,6 +2220,7 @@
);
sessionStorage.setItem("apiform", JSON.stringify(this.form));
addorupdateFund(this.form).then(response => {
+ console.log(this.form);
console.log(response, "淇濆瓨杩斿弬");
if (response.code === 200) {
this.$modal.msgSuccess("鐢宠鍗曚繚瀛樻垚鍔燂紒");
@@ -2292,6 +2248,10 @@
//瀹℃壒鎻愪氦
checksubmit() {
+ if (this.form.checkstatus != 3 && this.userprofile.nickName == "闄堟厱鍗�") {
+ this.$modal.msgError("璇风‘璁ゆ敹鍒版潗鏂欏悗鍐嶆彁浜ゅ鏍革紒");
+ return;
+ }
let checkFundObj = {
// fundid: this.checkObj.fundid,
fundid: this.curId,
@@ -2319,6 +2279,7 @@
getUserProfile() {
getUserProfile().then(res => {
this.userprofile = res.data;
+ console.log(this.userprofile);
this.standardlevel = res.data.standardlevel;
if (
this.userprofile.userName == "admin" ||
@@ -2482,6 +2443,7 @@
//鑾峰彇鏈嶅姟椤圭洰
getRowFeeItems(rowindex, row) {
let list = this.feeItemTypes.filter(r => r.itemType == row.applytype);
+ console.log(list[0]);
row.itemlist = list[0].itemDetails;
this.$set(this.rbDetails, rowindex, row);
},
@@ -2637,7 +2599,6 @@
//鑾峰彇鍙傛暟
// this.taxParam.beneficiaryNo = row.beneficiaryno;
// this.taxParam.startTime = this.form.createTime.substring(0, 10);
-
// if (type == "A") {
// // 璁＄畻涓◣銆佺◣鍚庨噾棰�
// this.taxParam.money = row.amount.toString();
@@ -3049,6 +3010,7 @@
updateBy: null,
updateTime: null,
uploadflag: null,
+ itemdescribe: null,
uploadtime: null,
itemlist: [{ id: "27", itemName: "鍣ㄥ畼鎹愮尞浼︾悊瀹℃牳涓撳璐�" }],
servicesscope: null,
@@ -3073,6 +3035,7 @@
beneficiaryname: null,
beneficiaryno: null,
unitname: null,
+ itemdescribe:null,
unitno: null,
uintuserno: null,
title: null,
--
Gitblit v1.9.3