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 | 22 ++++++++++++++--------
src/views/project/travelexpenseapply/travelexpensedetail/index.vue | 2 ++
2 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue
index 33aa7bd..790c8fd 100644
--- a/src/views/project/fund/applyDetail/index.vue
+++ b/src/views/project/fund/applyDetail/index.vue
@@ -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>
@@ -1251,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>
@@ -1964,6 +1964,7 @@
},
/** 鎻愪氦鎸夐挳 */
submitForm: debounce(function() {
+ console.log("debounce");
if (!this.randomnumber) {
this.randomnumber = this.generateRandomString(9);
this.form.randomnumber = this.randomnumber;
@@ -2292,6 +2293,7 @@
expertNo: this.personlist[j].id,
exportName: this.personlist[j].username
});
+ console.log(this.expertlist);
}
}
});
@@ -2373,6 +2375,7 @@
subjecttype: dataList[m].subjecttype,
subjecttypename: dataList[m].subjecttypename
});
+ console.log("璐圭敤绫诲瀷", this.rowfeeItemTypes);
}
});
},
@@ -2381,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;
@@ -2915,9 +2919,10 @@
branchbankname: item.branchbankname,
annexbankcard: null,
annexregistform: null,
- applytype: "浼︾悊瀹℃牳涓撳璐�",
- itemid: "鍣ㄥ畼鎹愮尞浼︾悊瀹℃牳涓撳璐�",
- itemname: null,
+ applytype: "7",
+ applytypename: "浼︾悊瀹℃牳涓撳璐�",
+ itemid: "27",
+ itemname: "鍣ㄥ畼鎹愮尞浼︾悊瀹℃牳涓撳璐�",
itemtype: null,
amount: 200,
prepaidamount: null,
@@ -2934,7 +2939,7 @@
updateTime: null,
uploadflag: null,
uploadtime: null,
- itemlist: [],
+ itemlist: [{ id: "27", itemName: "鍣ㄥ畼鎹愮尞浼︾悊瀹℃牳涓撳璐�" }],
servicesscope: null,
rowfeeblocks: [],
annexfiles: null
@@ -3035,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
});
@@ -3424,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[
@@ -3496,7 +3503,6 @@
.top-text {
text-align: center;
-
font-size: 23px;
font-weight: 600;
margin: 20px 0;
diff --git a/src/views/project/travelexpenseapply/travelexpensedetail/index.vue b/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
index 9ad5f04..cac3740 100644
--- a/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
+++ b/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
@@ -2428,6 +2428,8 @@
destination: null
};
if (this.rbDetails.length) {
+ console.log(this.rbDetails[rowIndex].persontype);
+ console.log(this.rbDetails[rowIndex].personname);
rowData.persontype = this.rbDetails[rowIndex].persontype;
rowData.personname = this.rbDetails[rowIndex].personname;
}
--
Gitblit v1.9.3