From 68791965d1e15a5d666d1505251dd1f56f58fa33 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期四, 18 四月 2024 15:42:17 +0800
Subject: [PATCH] 11
---
src/views/project/fund/applyDetail/index.vue | 15 ++++
src/views/project/tallage/index.vue | 4
src/views/project/travelexpenseapply/travelexpensedetail/index.vue | 8 ++
src/views/project/tallage/computingBill/index.vue | 132 +++++++++++++++++++++++++++++++++++++++++--
4 files changed, 147 insertions(+), 12 deletions(-)
diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue
index 8b17816..234955f 100644
--- a/src/views/project/fund/applyDetail/index.vue
+++ b/src/views/project/fund/applyDetail/index.vue
@@ -510,7 +510,10 @@
type="text"
size="small"
v-if="
- businessType == 2 || businessType == 3 || businessType == 4||businessType == 1
+ businessType == 2 ||
+ businessType == 3 ||
+ businessType == 4 ||
+ businessType == 1
"
>绁ㄦ嵁</el-button
>
@@ -645,7 +648,7 @@
style="margin-top: 25px; margin-bottom: 5px"
v-if="operationType == 'check' && userprofile.nickName == '闄堟厱鍗�'"
>
- <el-col :span="20">
+ <el-col :span="12">
<el-form-item label="棰勫鏉愭枡" prop="infoid">
<el-radio-group v-model="form.checkstatus" align="left">
<el-radio :label="1">寰呯敵璇锋潗鏂�</el-radio>
@@ -654,6 +657,14 @@
</el-radio-group>
</el-form-item>
</el-col>
+ <el-col :span="12">
+ <el-form-item label="绠楃◣鐘舵��" prop="infoid">
+ <el-radio-group v-model="form.istax" align="left">
+ <el-radio :label="2">寰呯畻绋�</el-radio>
+ <el-radio :label="1">宸茬畻绋�</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ </el-col>
</el-row>
<el-row
style="margin-top: 5px; margin-bottom: 5px"
diff --git a/src/views/project/tallage/computingBill/index.vue b/src/views/project/tallage/computingBill/index.vue
index ae95a33..061e294 100644
--- a/src/views/project/tallage/computingBill/index.vue
+++ b/src/views/project/tallage/computingBill/index.vue
@@ -268,6 +268,24 @@
:before-close="handleClosehz"
>
<div class="examine-jic">
+ <div style="margin: 0 10px 20px 10px;">
+ <el-card class="box-card">
+ <el-tag
+ v-for="item in overallCase"
+ :key="item.id"
+ closable
+ @close="handleClose(item)"
+ >
+ {{ item.donorname }}
+ </el-tag>
+ <div style="margin-top: 20px; text-align: right;">
+ 鍏遍�夋嫨<span
+ style="font-size: 18px; color: #409EFF;margin: 0 10px;"
+ >{{ overallCase.length }}</span
+ >鏉℃暟鎹�
+ </div>
+ </el-card>
+ </div>
<div class="jic-value">
<el-row :gutter="20">
<!--鐢ㄦ埛鏁版嵁-->
@@ -289,6 +307,20 @@
:key="item.id"
:label="item.name"
:value="item.id"
+ >
+ </el-option>
+ </el-select> </el-form-item
+ ><el-form-item label="绠楃◣鐘舵��" prop="status">
+ <el-select
+ v-model="patientqueryParams.istax"
+ filterable
+ placeholder="璇烽�夋嫨"
+ >
+ <el-option
+ v-for="item in istaxlist"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
>
</el-option>
</el-select>
@@ -347,7 +379,7 @@
</el-table-column>
<el-table-column
prop="taXmoney"
- label="鎵ｇ◣閲戦(缂�)"
+ label="鎵ｇ◣閲戦"
show-overflow-tooltip
>
</el-table-column>
@@ -548,11 +580,15 @@
{ label: "鏈粯娆�", value: "0" },
{ label: "宸蹭粯娆�", value: "1" }
],
+ // 褰撳墠椤甸�変腑鏁版嵁
multipleSelection: [],
+ // 鎬婚�変腑鏁版嵁
+ overallCase: [],
patientqueryParams: {
paApplyType: 1,
pacheckno: "047",
checkstatus: 0,
+ istax:0,
pageNum: 1,
pageSize: 10
},
@@ -614,11 +650,13 @@
organParams: {
pageNum: 1,
pageSize: 10,
- paymentid: null
+ paymentid: null,
+ istax: 0
},
// 褰撳墠鐢ㄦ埛淇℃伅
userprofile: {},
+ decision: false,
// 琛ㄥ崟鍙傛暟
form: {
istax: 0,
@@ -655,6 +693,10 @@
baselist: [],
donorList: [],
+ istaxlist: [
+ { value: 0, label: "鏈畻绋�" },
+ { value: 2, label: "寰呯畻绋�" }
+ ],
organchargelist: [],
standardlevel: 0,
defaultperson: {},
@@ -740,9 +782,7 @@
handleUploadError() {},
// 寮规娣诲姞
AddDispatchpatients() {
- this.donorchargeorgans = this.donorchargeorgans.concat(
- this.multipleSelection
- );
+ this.donorchargeorgans = this.donorchargeorgans.concat(this.overallCase);
console.log(this.donorchargeorgans, "donorchargeorgans");
this.donorchargeorgans.forEach(item => {
CalculationDetail({ id: item.id, fundTaxId: this.form.id });
@@ -811,8 +851,77 @@
);
},
// 澶氶�夋閫変腑鏁版嵁
- handleSelectionChange(val) {
- this.multipleSelection = val;
+ handleSelectionChange(selection) {
+ if (this.decision) return;
+ // 鍒ゆ柇鏄惁鏈夊垹闄�
+ if (this.multipleSelection.length <= selection.length) {
+ this.multipleSelection = selection;
+ } else {
+ console.log(11);
+ this.multipleSelection.forEach(item => {
+ if (selection.includes(item)) {
+ } else {
+ if (this.multipleSelection.length == 1) {
+ this.multipleSelection = [];
+ } else {
+ this.multipleSelection.splice(
+ this.multipleSelection.indexOf(item),
+ 1
+ );
+ }
+ if (this.overallCase.length == 1) {
+ this.overallCase = [];
+ } else {
+ this.overallCase.splice(this.overallCase.indexOf(item), 1);
+ }
+ }
+ });
+ }
+ // 璧嬪�肩粰鏁翠綋閫変腑鏁扮粍
+ this.multipleSelection.forEach(item => {
+ if (!this.overallCase.includes(item)) {
+ this.overallCase.push(item);
+ }
+ });
+ console.log(this.multipleSelection, "瑙﹀彂閫夋嫨鍚巑ultipleSelection");
+ },
+ // 鍒囨崲椤靛悗鎭㈠閫変腑
+ Restorecheck() {
+ console.log(this.overallCase, "this.overallCase");
+ const allid = this.overallCase.map(item => item.id);
+ const overlap = this.donorchargeList.filter(value => {
+ return allid.includes(value.id);
+ });
+ // 淇濇寔ids鍜屽綋鍓嶉〉闈㈢殑鍚屾鎬�
+ this.multipleSelection = overlap;
+ console.log(this.multipleSelection, "杩涘叆鍒嗛〉multipleSelection");
+
+ this.toggleSelection(overlap);
+ },
+ // 鎸傝浇閫夋嫨鐘舵��
+ toggleSelection(rows) {
+ if (rows) {
+ this.decision = true;
+ this.$nextTick(() => {
+ rows.forEach(row => {
+ this.$refs.multipleTable.toggleRowSelection(row, true);
+ });
+ this.decision = false;
+ });
+ console.log(123);
+ } else {
+ this.$refs.multipleTable.clearSelection();
+ }
+ },
+ // 閫夋嫨浜哄憳鏍囩鍒犻櫎浜嬩欢
+ handleClose(item) {
+ this.overallCase.splice(this.overallCase.indexOf(item), 1);
+ if (this.multipleSelection.indexOf(item) == -1) {
+ } else {
+ this.multipleSelection.splice(this.multipleSelection.indexOf(item), 1);
+ this.$refs.multipleTable.toggleRowSelection(item, false);
+ // this.toggleSelection(this.multipleSelection);
+ }
},
// 鐐瑰嚮鏂板
handleAddpatient(row) {
@@ -821,7 +930,7 @@
ExpertfeeListnb(this.patientqueryParams).then(res => {
this.donorchargeList = res.rows;
this.patienttotal = res.total;
- console.log(this.donorchargeList);
+ this.Restorecheck();
});
},
// 鑾峰彇鏈�澶axid
@@ -1377,6 +1486,13 @@
color: #000000;
cursor: not-allowed;
}
+::v-deep .el-tag--medium {
+ height: 28px;
+ line-height: 26px;
+ margin-right: 15px;
+ margin-bottom: 15px;
+ font-size: 16px;
+}
::v-deep .el-input--medium .el-input__inner {
height: 36px;
diff --git a/src/views/project/tallage/index.vue b/src/views/project/tallage/index.vue
index 69287b5..6ea4608 100644
--- a/src/views/project/tallage/index.vue
+++ b/src/views/project/tallage/index.vue
@@ -385,7 +385,7 @@
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
this.$router.push({
- path: "/cost/computingBill",
+ path: "/finance/computingBill",
query: { id: row.id, operation: "update", data: row }
});
},
@@ -393,7 +393,7 @@
/** 璇︽儏鏌ョ湅鎸夐挳鎿嶄綔 */
handleDetail(row) {
this.$router.push({
- path: "/cost/computingBill",
+ path: "/finance/computingBill",
query: { id: row.id, operation: "detail", data: row }
});
},
diff --git a/src/views/project/travelexpenseapply/travelexpensedetail/index.vue b/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
index 051a438..61d3741 100644
--- a/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
+++ b/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
@@ -909,6 +909,14 @@
</el-radio-group>
</el-form-item>
</el-col>
+ <el-col :span="12">
+ <el-form-item label="绠楃◣鐘舵��" prop="infoid">
+ <el-radio-group v-model="form.istax" align="left">
+ <el-radio :label="2">寰呯畻绋�</el-radio>
+ <el-radio :label="1">宸茬畻绋�</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ </el-col>
</el-row>
<el-row
--
Gitblit v1.9.3