From 8022f7036945b75f82f2dfc43055623f81ed98f6 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期五, 23 五月 2025 22:42:56 +0800
Subject: [PATCH] yxh
---
src/views/project/tallage/computingBill/index.vue | 298 +++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 229 insertions(+), 69 deletions(-)
diff --git a/src/views/project/tallage/computingBill/index.vue b/src/views/project/tallage/computingBill/index.vue
index 584b962..50bcbba 100644
--- a/src/views/project/tallage/computingBill/index.vue
+++ b/src/views/project/tallage/computingBill/index.vue
@@ -8,8 +8,8 @@
<el-form-item label="鐢宠鏃ユ湡" prop="createTime">
<el-date-picker
v-model="form.createTime"
- value-format="yyyy-MM-dd HH:mm:ss"
- type="datetime"
+ value-format="yyyy-MM-dd "
+ type="date"
:disabled="true"
placeholder="閫夋嫨鍑虹敓骞存湀"
>
@@ -115,6 +115,14 @@
show-summary
>
<el-table-column
+ prop="index"
+ align="center"
+ fixed
+ label="搴忓彿"
+ width="120"
+ >
+ </el-table-column>
+ <el-table-column
prop="donorname"
align="center"
fixed
@@ -172,8 +180,8 @@
v-model="scope.row.applyTime"
:disabled="true"
type="date"
- value-format="yyyy-MM-dd HH:mm:ss"
placeholder="鐢宠鏃ユ湡"
+ value-format="yyyy-MM-dd"
>
</el-date-picker>
</template>
@@ -268,6 +276,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">
<!--鐢ㄦ埛鏁版嵁-->
@@ -280,19 +306,43 @@
>
<el-form-item label="鎹愮尞妗堜緥" prop="status">
<el-select
- v-model="patientqueryParams.donorno"
+ v-model="patientqueryParams.donorname"
filterable
+ allow-create
+ default-first-option
placeholder="璇烽�夋嫨"
>
<el-option
v-for="item in donorchargeanlList"
:key="item.id"
:label="item.name"
- :value="item.id"
+ :value="item.name"
>
</el-option>
</el-select>
</el-form-item>
+ <el-form-item label="鐢宠浜�" prop="name">
+ <el-input
+ v-model="patientqueryParams.pausername"
+ placeholder="璇疯緭鍏ョ敵璇蜂汉濮撳悕"
+ @keyup.enter.native="handleAddpatient"
+ />
+ </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>
+ </el-form-item> -->
<el-form-item>
<el-button
@@ -347,7 +397,7 @@
</el-table-column>
<el-table-column
prop="taXmoney"
- label="鎵ｇ◣閲戦(缂�)"
+ label="鎵ｇ◣閲戦"
show-overflow-tooltip
>
</el-table-column>
@@ -536,23 +586,27 @@
Li_area_select,
pdf
},
- dicts: ["sys_gathering", "sys_0_1"],
+ dicts: ["Collection_status", "sys_0_1"],
name: "Donorchargemanager",
data() {
return {
swgatheringlist: [
- { label: "鏈畻绋�", value: 0 },
- { label: "宸茬畻绋�", value: 1 }
+ { label: "宸茬畻绋�", value: 1 },
+ { label: "鏈畻绋�", value: 0 }
],
gatheringlist: [
{ label: "鏈粯娆�", value: "0" },
{ label: "宸蹭粯娆�", value: "1" }
],
+ // 褰撳墠椤甸�変腑鏁版嵁
multipleSelection: [],
+ // 鎬婚�変腑鏁版嵁
+ overallCase: [],
patientqueryParams: {
paApplyType: 1,
- pacheckno: "047",
- checkstatus: 0,
+ // pacheckno: "047",
+ // checkstatus: 0,
+ pfundtaxid: 0,
pageNum: 1,
pageSize: 10
},
@@ -614,11 +668,13 @@
organParams: {
pageNum: 1,
pageSize: 10,
- paymentid: null
+ paymentid: null,
+ istax: 0
},
// 褰撳墠鐢ㄦ埛淇℃伅
userprofile: {},
+ decision: false,
// 琛ㄥ崟鍙傛暟
form: {
istax: 0,
@@ -655,6 +711,10 @@
baselist: [],
donorList: [],
+ istaxlist: [
+ { value: 0, label: "鏈畻绋�" },
+ { value: 2, label: "寰呯畻绋�" }
+ ],
organchargelist: [],
standardlevel: 0,
defaultperson: {},
@@ -733,26 +793,38 @@
},
handleQuery() {},
resetQuery() {
+ this.patientqueryParams.pausername = null;
this.patientqueryParams.donorname = null;
- this.patientqueryParams.donorchargeid = null;
this.handleAddpatient();
},
handleUploadError() {},
// 寮规娣诲姞
AddDispatchpatients() {
- this.donorchargeorgans = this.donorchargeorgans.concat(
- this.multipleSelection
- );
- console.log(this.donorchargeorgans, "donorchargeorgans");
- this.donorchargeorgans.forEach(item => {
- CalculationDetail({ id: item.id, fundTaxId: this.form.id });
+ let newArr = this.donorchargeorgans.concat(this.overallCase);
+ this.donorchargeorgans = newArr.filter((item, index, self) => {
+ return !self.slice(index + 1).some(other => other.id === item.id);
});
+
+ console.log(this.donorchargeorgans, "donorchargeorgans");
+ if (this.form.id) {
+ this.donorchargeorgans.forEach(item => {
+ CalculationDetail({ id: item.id, fundTaxId: this.form.id });
+ });
+ }
this.donorchargeorgans.forEach(item => {
item.taXmoney = item.pretaxcost - item.taxedcost;
item.taXmoney = item.taXmoney.toFixed(2);
this.accumulation();
});
- this.$modal.msgSuccess("娣诲姞鎴愬姛锛�");
+ if (this.form.id) {
+ this.form.istax = 0;
+ this.form.taxedtime = "";
+ this.$modal.confirm("娣诲姞鎴愬姛锛�,闇�瑕侀噸鏂颁繚瀛樺苟璁＄畻鍗曟嵁锛�").then(() => {
+ this.submitForm();
+ });
+ } else {
+ this.$modal.msgSuccess("娣诲姞鎴愬姛锛�");
+ }
this.dialogVisiblepatient = false;
},
@@ -770,19 +842,11 @@
if (res1.code == 200) {
this.$modal.msgSuccess("璁＄畻鎴愬姛");
this.$modal.closeLoading();
- getFundtax(this.form.id).then(response => {
- this.form = response.data;
- if (this.form.serviceFunds[0]) {
- this.donorchargeorgans = this.form.serviceFunds;
- this.donorchargeorgans.forEach(item => {
- item.taXmoney = item.pretaxcost - item.taxedcost;
- item.taXmoney = item.taXmoney.toFixed(2);
- this.accumulation(); //璁＄畻
- this.form.istax = 1;
- this.submitForm();
- });
- }
- });
+ this.form.istax = 1;
+ this.form.taxedtime = this.$moment().format(
+ "YYYY-MM-DD HH:mm:ss"
+ );
+ this.submitForm();
} else {
this.$modal.closeLoading();
this.$modal.msgError(res1.msg);
@@ -797,22 +861,87 @@
},
// 閲戦鍚堣
accumulation() {
- this.form.pretaxamount = this.donorchargeorgans.reduce(
- (acc, obj) => acc + Number(obj.pretaxcost),
- 0
- );
- this.form.taxMoney = this.donorchargeorgans.reduce(
- (acc, obj) => acc + Number(obj.taXmoney),
- 0
- );
- this.form.taxedamount = this.donorchargeorgans.reduce(
- (acc, obj) => acc + Number(obj.taxedcost),
- 0
- );
+ this.form.pretaxamount = this.donorchargeorgans
+ .reduce((acc, obj) => acc + Number(obj.pretaxcost), 0)
+ .toFixed(2);
+ this.form.taxMoney = this.donorchargeorgans
+ .reduce((acc, obj) => acc + Number(obj.taXmoney), 0)
+ .toFixed(2);
+ this.form.taxedamount = this.donorchargeorgans
+ .reduce((acc, obj) => acc + Number(obj.taxedcost), 0)
+ .toFixed(2);
},
// 澶氶�夋閫変腑鏁版嵁
- handleSelectionChange(val) {
- this.multipleSelection = val;
+ handleSelectionChange(selection) {
+ if (this.decision) return;
+ // 鍒ゆ柇鏄惁鏈夊垹闄�
+ if (this.multipleSelection.length <= selection.length) {
+ this.multipleSelection = selection;
+ } else {
+ 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 +950,7 @@
ExpertfeeListnb(this.patientqueryParams).then(res => {
this.donorchargeList = res.rows;
this.patienttotal = res.total;
- console.log(this.donorchargeList);
+ this.Restorecheck();
});
},
// 鑾峰彇鏈�澶axid
@@ -856,11 +985,11 @@
});
},
- /** 閲嶇疆鎸夐挳鎿嶄綔 */
- resetQuery() {
- this.resetForm("queryForm");
- this.handleQuery();
- },
+ // /** 閲嶇疆鎸夐挳鎿嶄綔 */
+ // resetQuery() {
+ // this.resetForm("queryForm");
+ // this.handleQuery();
+ // },
// 鍙栨秷鎸夐挳
cancel() {
@@ -873,7 +1002,7 @@
this.title = "鏂板涓撳璐规眹鎬诲崟";
//鑾峰彇鐧诲綍鑰呬俊鎭�
getUserProfile().then(res => {
- this.form.username = res.createBy;
+ this.form.username = res.data.createBy;
});
},
@@ -884,9 +1013,10 @@
this.form = response.data;
if (this.form.serviceFunds[0]) {
this.donorchargeorgans = this.form.serviceFunds;
- this.donorchargeorgans.forEach(item => {
+ this.donorchargeorgans.forEach((item, index) => {
item.taXmoney = item.pretaxcost - item.taxedcost;
item.taXmoney = item.taXmoney.toFixed(2);
+ item.index = index + 1;
this.accumulation();
});
}
@@ -900,9 +1030,10 @@
this.form = response.data;
if (this.form.serviceFunds[0]) {
this.donorchargeorgans = this.form.serviceFunds;
- this.donorchargeorgans.forEach(item => {
+ this.donorchargeorgans.forEach((item, index) => {
item.taXmoney = item.pretaxcost - item.taxedcost;
item.taXmoney = item.taXmoney.toFixed(2);
+ item.index = index + 1;
this.accumulation();
});
}
@@ -916,11 +1047,26 @@
if (valid) {
this.$modal.loading("姝ｅ湪鎻愪氦锛岃绋嶅�欙紒");
//淇濆瓨
+ console.log(1);
this.form.serviceFunds = this.donorchargeorgans;
+ console.log(2);
if (this.form.id != null) {
updateFundtax(this.form).then(res1 => {
if (res1.code == 200) {
+ console.log(3);
this.$modal.msgSuccess("淇濆瓨鎴愬姛锛�");
+ getFundtax(this.form.id).then(response => {
+ this.form = response.data;
+ if (this.form.serviceFunds[0]) {
+ this.donorchargeorgans = this.form.serviceFunds;
+ this.donorchargeorgans.forEach((item, index) => {
+ item.taXmoney = item.pretaxcost - item.taxedcost;
+ item.taXmoney = item.taXmoney.toFixed(2);
+ item.index = index + 1;
+ this.accumulation();
+ });
+ }
+ });
this.$modal.closeLoading();
} else {
this.$modal.closeLoading();
@@ -930,8 +1076,20 @@
} else {
addFundtax(this.form).then(response => {
if (response.code == 200) {
- this.form.id = response.data.fundTaxId;
this.$modal.msgSuccess("鏂板鎴愬姛锛�");
+ getFundtax(response.data.fundTaxId).then(res => {
+ this.form = res.data;
+ if (this.form.serviceFunds[0]) {
+ this.donorchargeorgans = this.form.serviceFunds;
+ this.donorchargeorgans.forEach((item, index) => {
+ item.taXmoney = item.pretaxcost - item.taxedcost;
+ item.taXmoney = item.taXmoney.toFixed(2);
+ item.index = index + 1;
+
+ this.accumulation();
+ });
+ }
+ });
this.$modal.closeLoading();
} else {
this.$modal.msgError(response.msg);
@@ -978,18 +1136,13 @@
.then(() => {
CalculationDetail({ id: row.id }).then(res2 => {
if (res2.code == 200) {
- this.$modal.msgSuccess("鍒犻櫎鎴愬姛锛�");
- getFundtax(this.curId).then(response => {
- this.form = response.data;
- if (this.form.serviceFunds[0]) {
- this.donorchargeorgans = this.form.serviceFunds;
- this.donorchargeorgans.forEach(item => {
- item.taXmoney = item.pretaxcost - item.taxedcost;
- item.taXmoney = item.taXmoney.toFixed(2);
- this.accumulation();
- });
- }
- });
+ this.form.istax = 0;
+ this.form.taxedtime = "";
+ this.$modal
+ .confirm("鍒犻櫎鎴愬姛,闇�瑕侀噸鏂颁繚瀛樺苟璁＄畻鍗曟嵁锛�")
+ .then(() => {
+ this.submitForm();
+ });
}
});
})
@@ -1358,6 +1511,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;
--
Gitblit v1.9.3