From c699c544034a0e57e9881fc99930eddfa75c9f8c Mon Sep 17 00:00:00 2001
From: wwl <xchao828@163.com>
Date: 星期四, 13 二月 2025 16:43:18 +0800
Subject: [PATCH] 1
---
src/views/system/tijian/index.vue | 678 +++++++++++++++++++++++++++++++++++---------------------
1 files changed, 425 insertions(+), 253 deletions(-)
diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue
index 7ab21ed..5faa56e 100644
--- a/src/views/system/tijian/index.vue
+++ b/src/views/system/tijian/index.vue
@@ -206,10 +206,6 @@
:value="dict.value"></el-option>
</el-select>
</el-form-item>
-
- <!-- <el-form-item prop="ageUnit">
-
- </el-form-item> -->
</el-form>
<el-form :inline="true" ref="form" :model="form" :rules="rules" :label-position="labelPosition"
label-width="106px" v-show="top">
@@ -307,14 +303,9 @@
</div>
</el-tab-pane>
<el-tab-pane label="缁勫悎" name="third">
- <!-- <div class="tab3"> -->
<el-row :gutter="20" style="width: 100%">
- <el-col :span="6">
- <div style="
- text-align: center;
- margin-bottom: 10px;
- margin-top: 10px;
- ">
+ <el-col :span="6" style="min-width: 200px">
+ <div style="text-align: center; margin-bottom: 10px; margin-top: 10px;">
椤圭洰鍒楄〃
</div>
<el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="filterage">
@@ -326,12 +317,8 @@
</el-tree>
</div>
</el-col>
- <el-col :span="6">
- <div style="
- text-align: center;
- margin-bottom: 10px;
- margin-top: 10px;
- ">
+ <el-col :span="6" style="min-width: 200px">
+ <div style="text-align: center; margin-bottom: 10px; margin-top: 10px;">
鏄庣粏椤圭洰鍒楄〃
</div>
<div class="tab3">
@@ -349,12 +336,16 @@
margin-top: 10px;
">
宸查�夐」鐩垪琛�
+
</div>
<el-table :data="DataLists" border style="width: 100%" height="400" :span-method="objectspanmethod">
<el-table-column prop="propinName" label="妫�鏌ラ」鐩�">
</el-table-column>
<el-table-column prop="proName" label="鏄庣粏椤圭洰" width="260px">
</el-table-column>
+ <el-table-column prop="sl" label="鏁伴噺" width="56px">
+ </el-table-column>
+
<el-table-column prop="proPrice" label="鍘熶环" width="56px">
</el-table-column>
@@ -371,74 +362,60 @@
</div>
</el-col>
</el-row>
- <!-- </div> -->
</el-tab-pane>
<el-tab-pane label="鍗曢」" name="second">
- <div class="tab8">
- <el-row :gutter="20">
- <el-col :span="6">
- <div style="
- text-align: center;
- margin-bottom: 10px;
- margin-top: 10px;
- ">
- 椤圭洰鍒楄〃
+ <el-row :gutter="20" style="width: 100%">
+ <el-col :span="6" style="min-width: 200px">
+ <div style="text-align: center; margin-bottom: 10px; margin-top: 10px;">
+ 椤圭洰鍒楄〃
+ </div>
+ <el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="filterText" style="margin-bottom: 10px;">
+ </el-input>
+ <div class="tab3">
+ <el-tree class="filter-tree" v-loading="loading" :data="Treedata" :props="defaultProps" show-checkbox
+ node-key="proId" @check="handleCurrentChecked" :default-checked-keys="checkedkey"
+ :filter-node-method="filterNode" ref="tree" :render-content="renderContent">
+ </el-tree>
+ </div>
+ </el-col>
+ <el-col :span="6" style="min-width: 200px">
+ <div style="text-align: center; margin-bottom: 10px; margin-top: 10px;">
+ 鏄庣粏椤圭洰鍒楄〃
+ </div>
+ <div class="tab3">
+ <el-tree class="filter-tree" v-loading="loading" :data="TreedataList" node-key="proId"
+ :props="defaultProps" :filter-node-method="filterNode" show-checkbox
+ @check-change="handleCurrentChecked1" :default-checked-keys="checkedListkey"
+ :render-content="renderContent">
+ </el-tree>
+ </div>
+ </el-col>
+ <el-col :span="11">
+ <div class="grid-content bg-purple">
+ <div style="text-align: center; margin-bottom: 10px; margin-top: 10px;">
+ 宸查�夐」鐩垪琛�
</div>
- <!-- @input="gaibian" -->
- <el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="filterText">
- </el-input>
- <div class="tab3">
- <el-tree class="filter-tree" v-loading="loading" :data="Treedata" :props="defaultProps" show-checkbox
- node-key="proId" @check="handleCurrentChecked" :default-checked-keys="checkedkey"
- :filter-node-method="filterNode" ref="tree" :render-content="renderContent">
- </el-tree>
- </div>
- </el-col>
- <el-col :span="6">
- <div style="
- text-align: center;
- margin-bottom: 10px;
- margin-top: 10px;
- ">
- 鏄庣粏椤圭洰鍒楄〃
- </div>
- <div class="tab3">
- <el-tree class="filter-tree" v-loading="loading" :data="TreedataList" node-key="proId"
- :props="defaultProps" :filter-node-method="filterNode" show-checkbox
- @check-change="handleCurrentChecked1" :default-checked-keys="checkedListkey"
- :render-content="renderContent">
- </el-tree>
- </div>
- </el-col>
- <el-col :span="11">
- <div class="grid-content bg-purple">
- <div style="
- text-align: center;
- margin-bottom: 10px;
- margin-top: 10px;
- ">
- 宸查�夐」鐩垪琛�
- </div>
- <el-table :data="DataList" border style="width: 100%" height="400" :span-method="objectSpanMethod">
- <el-table-column prop="propinName" label="妫�鏌ラ」鐩�">
- </el-table-column>
- <el-table-column prop="proPrice" label="鍘熶环" width="56px"></el-table-column>
- <el-table-column prop="proName" label="鏄庣粏椤圭洰" width="260px">
- </el-table-column>
-
- <el-table-column label="鎿嶄綔" align="center" fixed="right" class-name="small-padding fixed-width"
- width="50px">
- <template slot-scope="scope">
- <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
- title="鍒犻櫎"></el-button>
- </template>
- </el-table-column>
- </el-table>
- <h3 style="font-weight: 600">鍚堣锛歿{ marryall }}鍏�</h3>
- </div>
- </el-col>
- </el-row>
- </div>
+ <el-table :data="DataList" border style="width: 100%" height="400" :span-method="objectSpanMethod">
+ <el-table-column prop="propinName" label="妫�鏌ラ」鐩�">
+ </el-table-column>
+ <el-table-column prop="proName" label="鏄庣粏椤圭洰" width="260px">
+ </el-table-column>
+ <el-table-column prop="sl" label="鏁伴噺" width="56px">
+ </el-table-column>
+ <el-table-column prop="proPrice" label="鍘熶环" width="56px">
+ </el-table-column>
+ <el-table-column label="鎿嶄綔" align="center" fixed="right" class-name="small-padding fixed-width"
+ width="50px">
+ <template slot-scope="scope">
+ <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+ title="鍒犻櫎"></el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <h3 style="font-weight: 600">鍚堣锛歿{ marryall }}鍏�</h3>
+ </div>
+ </el-col>
+ </el-row>
</el-tab-pane>
</el-tabs>
<span slot="footer" class="dialog-footer">
@@ -478,7 +455,7 @@
<el-form-item label="浣撴绫诲瀷">
<el-select v-model="form.tjType" placeholder="璇烽�夋嫨浣撴绫诲瀷">
<el-option v-for="dict in dict.type.dict_team" :key="dict.value" :label="dict.label"
- :value="dict.value" :disabled="!form.firmId && dict.value === '1'"></el-option>
+ :value="dict.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="浣撴绫诲埆">
@@ -492,21 +469,22 @@
<el-form-item label="搴旀敹閲戦">
<el-input placeholder="搴旀敹閲戦" v-model="TotalPrice1" disabled style="width: 150px"></el-input>
</el-form-item>
- <el-form-item label="浼樻儬">
+ <el-form-item label="鎶樻墸">
<!-- {{ discount }} -->
<el-input-number ref="inputNumber" style="width: 150px" v-model="discount" :precision="1" :step="0.1"
- :max="10" :min="0" @change="numberChange" :disabled="isfalse"></el-input-number>
+ :max="10" :min="0" @change="debounceNumberChange" :disabled="isfalse"></el-input-number>
</el-form-item>
<el-form-item label="瀹炴敹閲戦">
- <el-input placeholder="瀹炴敹閲戦" v-model="TotalPrice" style="width: 206px"></el-input>
+ <el-input placeholder="瀹炴敹閲戦" v-model="TotalPrice" style="width: 206px" @input="changeXianjia"
+ @blur="numberChangeXianPrice(discount, discount)" />
</el-form-item>
<br />
<el-form-item style="margin-left: 149px">
<el-button type="primary" @click="Package" size="mini" style="margin-right: 20px">閫夋嫨濂楅</el-button>
<el-button type="primary" @click="resetpackage" size="mini" style="margin-right: 20px">閲嶇疆濂楅</el-button>
- <el-button type="primary" @click="submitPrice" :loading="loadingSubmit"
- :disabled="confirm || loadingSubmit" v-if="showHidden.has_charge == 'N'" size="mini">绛惧埌鐧昏</el-button>
+ <el-button type="primary" @click="submitPrice" :loading="loadingSubmit" :disabled="loadingSubmit"
+ v-if="showHidden.has_charge == 'N'" size="mini">绛惧埌鐧昏</el-button>
<el-button type="primary" @click="submitCheckinfee" :disabled="confirm"
v-if="showHidden.has_charge == 'Y'" size="mini">鐧昏鏀惰垂</el-button>
</el-form-item>
@@ -581,7 +559,8 @@
<template slot-scope="scope">
<!-- 鍙緭鍏ョ函鏁板瓧鎶樻墸 -->
<el-input-number v-model.number="scope.row.discount" @input="validateDiscount(scope.row)"
- placeholder="杈撳叆鎶樻墸" size="small" type="number" :precision="1" :step="0.1" :max="10" :min="0">
+ @change="handleManualChange(scope.row)" placeholder="杈撳叆鎶樻墸" size="small" type="number" :precision="1"
+ :step="0.1" :max="10" :min="0">
</el-input-number>
</template>
</el-table-column>
@@ -654,7 +633,7 @@
</el-form-item>
<el-form-item label="浼樻儬">
<el-input-number style="width: 140px" v-model="discount" :precision="1" :step="0.1" :max="10" :min="0"
- @change="numberChange" :disabled="isfalse"></el-input-number>
+ @change="debounceNumberChange" :disabled="isfalse"></el-input-number>
</el-form-item>
<el-form-item label="瀹炴敹閲戦">
<el-input v-model="formInline.paidIn" placeholder="瀹炰粯" style="width: 94px">
@@ -804,6 +783,7 @@
},
data() {
return {
+ isSubmitting: false,
open1: false,
filterage: "",
checkedkeys: [],
@@ -865,7 +845,6 @@
taocan: false,
top: true,
value: "2",
- getInfodis: "",
srcUrl: "",
hides: false,
hide: true,
@@ -1005,7 +984,7 @@
cusIsvip: null,
},
// 娣诲姞
-
+ lastXianPrice: 0,
// 琛ㄥ崟鍙傛暟
// 琛ㄥ崟鍙傛暟
obj: {},
@@ -1021,7 +1000,27 @@
firmId: "",
firmDeptName: "",
},
- form1: {},
+ form1: {
+ cnName: "",
+ contactPerson: "",
+ contactPhone: "",
+ taxNumber: "",
+ legalPerson: "",
+ registerAddress: "",
+ mailingAddress: "",
+ bankAccount: "",
+ mailingAddress: "",
+ countNum: "",
+ bankAccount: "",
+ email: "",
+ principal: "",
+ url: "",
+ faxNumber: "",
+ areaName: "",
+ orderNum: "",
+ remark: "",
+ validTime: "",
+ },
title: "",
// 琛ㄥ崟鏍￠獙
rules: {
@@ -1053,6 +1052,7 @@
};
},
watch: {
+
filterText(val) {
this.$refs.tree.filter(val);
},
@@ -1069,10 +1069,25 @@
// this.getData();
},
- mounted() { },
-
+ mounted() {
+ this.TreedataList = [];
+ this.DataList = [];
+ this.marryall = 0;
+ },
methods: {
-
+ debounceNumberChange(currentValue, oldValue) {
+ clearTimeout(this.debounceTimer);
+ this.debounceTimer = setTimeout(() => {
+ this.numberChange(currentValue, oldValue);
+ }, 300);
+ },
+ changeXianjia() {
+ // 鍘熷鎶樻墸鐜囪绠�
+ if (this.TotalPrice1 !== 0) {
+ this.discount =
+ (Math.floor((this.TotalPrice / this.TotalPrice1) * 100) / 100) * 10;
+ }
+ },
clear() {
this.form.firmId = "";
},
@@ -1108,14 +1123,17 @@
})
.catch(() => { });
},
- validateDiscount(row) {
- if (row.discount > 10) {
- row.discount = 10; // 寮哄埗灏嗗�艰缃负鏈�澶у��
- } else if (row.discount < 0) {
- row.discount = 0; // 寮哄埗灏嗗�艰缃负鏈�灏忓��
- }
- this.updateProPrice(row); // 鏇存柊浠锋牸鎴栧叾浠栭�昏緫
+ handleManualChange(row) {
+ console.log("杩欐槸涓诲姩鍑哄彂鐨�");
+ this.updateProPrice(row);
},
+ validateDiscount(row) {
+ if (this.TotalPrice !== undefined && !isNaN(this.TotalPrice) && this.TotalPrice !== this.lastXianPrice) {
+ this.updateProPrice1(row);
+ this.lastXianPrice = this.TotalPrice;
+ }
+ },
+
isAll(value) {
return value === "" || value === null;
},
@@ -1132,7 +1150,33 @@
this.discount =
(Math.floor((this.TotalPrice / this.TotalPrice1) * 100) / 100) * 10;
},
+ updateProPrice1(row) {
+ console.log("杩涘叆浜�1")
+ const ordPrice = new Big(row.ordPrice);
+ const discount = new Big(row.discount);
+ const result = ordPrice.times(discount.div(10));
+ row.nowPrice = result.toNumber();
+ const totalYsPrice = this.tableData1.reduce((sum, item) => {
+ return sum.plus(new Big(item.nowPrice || '0'));
+ }, new Big(0));
+ const totalYsPriceNum = totalYsPrice.toNumber();
+ if (this.TotalPrice !== undefined && !isNaN(this.TotalPrice)) {
+ const xianPrice = new Big(this.TotalPrice);
+ const diff = xianPrice.minus(totalYsPriceNum);
+ if (!diff.eq(0) && this.tableData1.length > 0) {
+ const lastItem = this.tableData1[this.tableData1.length - 1];
+ const newYsPrice = new Big(lastItem.nowPrice).plus(diff).toNumber();
+ this.$set(this.tableData1[this.tableData1.length - 1], 'nowPrice', newYsPrice);
+ }
+ }
+ // Update youhui calculation
+ if (this.TotalPrice1 !== 0 && this.TotalPrice !== 0) {
+ this.discount = (Math.floor((this.TotalPrice / this.TotalPrice1) * 100) / 100) * 10;
+ } else {
+ this.discount = 0;
+ }
+ },
openname() {
this.$refs.bbb.open = true;
this.$refs.bbb.title = "鎼滅储濮撳悕";
@@ -1256,11 +1300,9 @@
},
getList1() {
getInfo().then((response) => {
- this.getInfodis = response.user.discount;
+
this.hospName = response.hospName;
- if (this.getInfodis === null) {
- this.isfalse = true;
- }
+
});
getIsRequired().then((response) => {
this.showHidden = response.data;
@@ -1474,7 +1516,6 @@
});
},
-
handleClose(done) {
this.$confirm("纭鍏抽棴锛�")
.then((_) => {
@@ -1486,10 +1527,8 @@
/** 鏌ヨ淇℃伅鍒楄〃 */
getList() {
getInfo().then((response) => {
- this.getInfodis = response.user.discount;
- if (this.getInfodis === null) {
- this.isfalse = true;
- }
+
+
});
let cusSex = this.form.cusSex;
//鍏ㄩ儴濂楅
@@ -1573,15 +1612,12 @@
})
.then(() => {
this.discount = currentValue;
- if (this.discount < this.getInfodis) {
- this.discount = this.getInfodis;
- // this.$modal.msgError(`璇ヤ汉鍛樻渶楂樹紭鎯犳潈闄愪负${this.getInfodis}鎶榒);
- }
+
this.tableData1.forEach((item) => {
item.discount = this.discount;
const ordPrice = new Big(item.ordPrice);
const discount = new Big(item.discount);
- const result = ordPrice.times(discount.div(10))
+ const result = ordPrice.times(discount.div(10));
item.nowPrice = result.toNumber();
this.TotalPrice = this.tableData1.reduce((sum, item) => {
return sum.plus(new Big(item.nowPrice || "0"));
@@ -1592,7 +1628,55 @@
this.discount = oldValue;
});
},
-
+ numberChangeXianPrice(currentValue, oldValue) {
+ // 濡傛灉鐜颁环娌℃湁鍙樺寲锛岀洿鎺ヨ繑鍥�
+ if (this.TotalPrice === this.lastXianPrice || !this.TotalPrice) {
+ return;
+ }
+ this.$confirm("纭畾淇敼鎵�鏈夊瓙椤圭殑鎶樻墸鍚楋紵", "鎻愮ず", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ })
+ .then(() => {
+ this.discount = currentValue;
+ if (this.discount < this.getInfodis) {
+ this.discount = this.getInfodis;
+ }
+ let totalYsprice = new Big(0);
+ this.tableData1.forEach((item) => {
+ item.discount = this.discount;
+ const ordPrice = new Big(item.ordPrice);
+ const discount = new Big(item.discount);
+ const result = ordPrice.times(discount.div(10));
+ item.nowPrice = result.toNumber();
+ totalYsprice = totalYsprice.plus(new Big(item.nowPrice));
+ });
+ if (!totalYsprice.eq(this.TotalPrice)) {
+ const diff = new Big(this.TotalPrice).minus(totalYsprice);
+ if (this.tableData1.length > 0) {
+ const lastItem = this.tableData1[this.tableData1.length - 1];
+ const newYsPrice = new Big(lastItem.nowPrice)
+ .plus(diff)
+ .toNumber();
+ console.log(
+ "hhh",
+ this.tableData1[this.tableData1.length - 1].nowPrice,
+ newYsPrice
+ );
+ this.$set(
+ this.tableData1[this.tableData1.length - 1],
+ "nowPrice",
+ newYsPrice
+ );
+ }
+ }
+ this.lastXianPrice = this.TotalPrice;
+ })
+ .catch(() => {
+ this.discount = oldValue;
+ });
+ },
/** 鐧昏鎻愪氦鎸夐挳 */
submitForm() {
let _this = this;
@@ -1641,6 +1725,7 @@
let cusIdcard = this.form.cusIdcard;
if (cusIdcard) {
getCusIdcard(cusIdcard).then((response) => {
+ _this.top = false;
if (response.data) {
this.form = response.data;
if (this.form.discount === null) {
@@ -1681,11 +1766,11 @@
this.list1 = false;
this.list2 = true;
this.list3 = false;
- this.top = false;
+ _this.top = false;
} else {
this.list1 = true;
this.TotalPrice = 0;
- this.top = false;
+ _this.top = false;
}
});
} else {
@@ -1735,6 +1820,7 @@
let configKey = "getInfoFromSqlData";
getconfigKey(configKey).then((res) => {
if (res.code == 200) {
+ console.log(res.msg, 'res.msg');
if (res.msg == "N") {
var websocket = null;
var url = this.valueUrl;
@@ -1774,16 +1860,18 @@
//鎺ユ敹鍒版秷鎭殑鍥炶皟鏂规硶
websocket.onmessage = (event) => {
- var resultObj = eval("(" + event.data + ")");
+ var resultObj = eval("(" + event.data + ")"); // 娉ㄦ剰锛歟val瀛樺湪瀹夊叏闅愭偅锛屽缓璁敤JSON.parse
this.readCardWebSocket(resultObj);
+ websocket.close();
};
- websocket.onclose = function () {
+ websocket.onclose = () => {
alert("璇诲崱鍣ㄨ繛鎺ュ叧闂�");
};
} else if (res.msg == "Y") {
- this.$refs.aaa.open = true;
+ /* this.$refs.aaa.open = true;
this.$refs.aaa.getAllList();
- this.$refs.aaa.title = "璇佷欢瀛楀吀";
+ this.$refs.aaa.title = "璇佷欢瀛楀吀"; */
+
} else if (res.msg == "S") {
this.cardreader = true;
_this.cardreaderradio = 3;
@@ -1797,8 +1885,8 @@
// 鏈�鏂颁娇鐢╳ebSocket閫氫俊
readCardWebSocket(resultObj) {
let _this = this;
-
- if (resultObj.code === 200 && resultObj.data.name != null) {
+ console.log(resultObj, 'resultObj');
+ if (resultObj.code === 200 && resultObj.data.name && resultObj.data.name != null) {
//鍥炴樉鐩稿叧鏁版嵁
_this.form.cusName = resultObj.data.name;
_this.form.cusSex = resultObj.data.sex == "0" ? "濂�" : "鐢�";
@@ -2125,11 +2213,15 @@
// 鍙栨秷鎸夐挳
cancel() {
+ this.TreedataList = [];
+ this.DataList = [];
+ this.marryall = 0; // 閲嶇疆鍚堣
this.Seachopen = false;
this.taocan = false;
this.malldisble = false;
this.defaultKeys = [];
this.DataLists = [];
+
},
cancell() {
@@ -2168,7 +2260,6 @@
}
},
-
resetpackage() {
this.discount = 10;
if (this.form.cusIdcard) {
@@ -2180,6 +2271,12 @@
_this.pacId = "";
this.proIds = [];
this.tjCategory = "12";
+
+ this.DataList = []; // 娓呯┖宸查�夐」鐩垪琛�
+ this.checkedkey = []; // 娓呯┖鏍戠殑閫変腑鐘舵��
+ this.checkedListkey = [];
+ this.TreedataList = []
+
let data = {
cusId,
pacId: _this.pacId,
@@ -2216,12 +2313,37 @@
dwId: this.form.firmId || "",
};
if (this.form.tjType == 1) {
- if (!this.form.firmId) {
+ if (!this.form.firmId && !this.form.firmName) {
this.$message({
type: "warning",
message: "璇峰厛缁存姢鍗曚綅锛�",
});
- } else {
+ } else if (!this.form.firmId && this.form.firmName) {
+ this.taocan = true;
+ this.loading = true;
+ deptTreeSelect(cusSex).then((response) => {
+ this.newpacName = response.rows;
+ try {
+ if (this.tableData1.length >= 1) {
+ this.newpacName.forEach((item3) => {
+ this.tableData1.forEach((item4) => {
+ item4.list.forEach((item6) => {
+ if (item6.pacName === item3.pacName) {
+ this.$nextTick(() => {
+ this.$refs.tb.toggleRowSelection(item3, true);
+ });
+ throw Error();
+ }
+ });
+ });
+ });
+ }
+ } catch (error) { }
+ this.loading = false;
+ });
+ }
+
+ else {
this.taocan = true;
this.loading = true;
tuantiSelect(param).then((res) => {
@@ -2357,10 +2479,14 @@
if (this.activeNames == "second") {
this.DataList = [];
this.checkedkey = [];
+ this.TreedataList = [];
+ this.marryall = 0; // 閲嶇疆鍚堣
this.getDataList();
} else if (this.activeNames == "third") {
this.DataLists = [];
this.checkedkeys = [];
+ this.TreedataList = [];
+ this.marryall = 0; // 閲嶇疆鍚堣
getZhList().then((response) => {
if (response.data) {
this.packageList = response.data;
@@ -2380,6 +2506,16 @@
getProParentIdDxList().then((response) => {
this.Treedata = response.data.list;
+ // 鍥炴樉 TreedataList 鍒� DataList
+ if (this.TreedataList && this.TreedataList.length > 0) {
+ this.DataList = this.TreedataList;
+ this.marryall = this.DataList.reduce((sum, item) => sum + (item.proPrice || 0) * (item.sl || 1), 0);
+ this.checkedListkey = this.DataList.map(item => item.proId);
+ this.$nextTick(() => {
+ this.$refs.tree.setCheckedKeys(this.checkedListkey);
+ });
+ }
+
if (this.tableData[0]) {
this.tableData[0].tjProjectList.forEach((selectionitem) => {
this.Treedata.forEach((item) => {
@@ -2389,8 +2525,63 @@
});
});
}
+
+ // 鍥炴樉 packageList 鐨勯�変腑鎬�
+ this.handlePackageSelection();
+
this.loading = false;
});
+ },
+
+ handlePackageSelection() {
+ // 鍋囪浣犳湁涔嬪墠淇濆瓨鐨勯�変腑鐘舵�佹垨浠庢煇涓湴鏂硅幏鍙栬繖浜涙暟鎹�
+ let selectedPackageIds = this.getPreviouslySelectedPackages(); // 杩欐槸涓�涓亣璁剧殑鍑芥暟锛屽疄闄呬娇鐢ㄦ椂鏇挎崲涓哄疄闄呯殑閫昏緫
+
+ // 璁剧疆 packageList 鐨勯�変腑鐘舵��
+ this.$nextTick(() => {
+ if (this.$refs.treas) { // 纭繚 treas 寮曠敤宸茬粡瀛樺湪
+ this.$refs.treas.setCheckedKeys(selectedPackageIds, true);
+ }
+ // 鏇存柊 checkedkeys 浠ュ弽鏄犲綋鍓嶉�変腑鐨勫寘
+ this.checkedkeys = selectedPackageIds;
+ });
+
+ // 鏍规嵁閫変腑鐘舵�佹洿鏂� DataLists 鎴栧叾浠栭渶瑕佹洿鏂扮殑鍐呭
+ this.updateDataListsBasedOnSelection(selectedPackageIds);
+ },
+
+ getPreviouslySelectedPackages() {
+ // 杩斿洖涔嬪墠淇濆瓨鐨勯�変腑鍖匢D鏁扮粍
+ // 渚嬪锛屼粠 localStorage 鎴栬�� Vuex store 鑾峰彇
+ return []; // 杩欓噷鏄ず渚嬶紝鏇挎崲涓哄疄闄呰幏鍙栨暟鎹殑閫昏緫
+ },
+
+ updateDataListsBasedOnSelection(selectedPackageIds) {
+ // 鏍规嵁閫変腑鐨勫寘ID鏇存柊 DataLists
+ this.DataLists = [];
+ selectedPackageIds.forEach(id => {
+ let packageItem = this.packageList.find(item => item.id === id);
+ if (packageItem) {
+ // 杩欓噷鍋囪姣忎釜鍖呴」鐩兘鏈変竴涓� proId 鏁扮粍鎴栬�呯被浼肩殑缁撴瀯锛岀敤鏉ヨ幏鍙栧寘涓殑椤圭洰
+ if (packageItem.proIds) { // 鍋囪 packageItem 鍖呭惈涓�涓� proId 鏁扮粍
+ packageItem.proIds.forEach(proId => {
+ let project = this.findProjectById(proId); // 鍋囪鏈変竴涓嚱鏁版潵鎵惧埌椤圭洰
+ if (project) {
+ this.DataLists.push(project);
+ }
+ });
+ }
+ }
+ });
+
+ // 璁＄畻鍚堣
+ this.marryalls = this.DataLists.reduce((sum, item) => sum + item.proPrice, 0);
+ },
+
+ findProjectById(proId) {
+ // 姝ゅ嚱鏁板亣璁句綘鏈変竴涓叏灞�鐨勯」鐩垪琛ㄦ垨鑰呭彲浠ヤ粠鏌愪釜API鑾峰彇
+ // 杩欓噷鍙槸涓�涓ず渚嬶紝瀹為檯搴旂敤涓簲璇ユ牴鎹綘鐨勬暟鎹粨鏋勬潵瀹炵幇
+ return this.allpackageList.find(item => item.proId === proId) || null;
},
handlepackage(data, checked, checkedNodes) {
@@ -2420,7 +2611,7 @@
if (this.DataLists.length >= 1) {
this.marryalls = 0;
this.DataLists.forEach((item1) => {
- this.marryalls += item1.proPrice;
+ this.marryalls += item1.proPrice * item1.sl;
this.packagedataList.forEach((item3) => {
if (item1.proParentId == item3.proId) {
@@ -2458,16 +2649,6 @@
}
}
}
-
- // if (columnIndex == 3) {
- // let rowspan = 0;
- // this.DataLists.forEach((element) => {
- // if (element.propinName === row.propinName) {
- // rowspan++;
- // }
- // });
- // return [rowspan, 1];
- // }
},
handlePackageChecked(data, checked, checkedNodes) {
if (checked == false) {
@@ -2494,32 +2675,36 @@
});
}
},
- // 鐐瑰嚮鑾峰彇姣忎釜鏍戣妭鐐�
handleCurrentChecked(data, checked, checkedNodes) {
this.dataObj = data;
- if (checked.checkedNodes.length != 0) {
- this.$refs.tree.setCheckedKeys([data.proId]);
+ if (checked.checkedNodes.length > 0) {
+ const promises = checked.checkedNodes.map(node => getProSonDxList(node.proId));
+ Promise.all(promises).then(results => {
+ this.TreedataList = results.flatMap(res => res.data.list);
+ this.checkedListkey = [];
+ this.DataList = [];
- let proId = data.proId;
- getProSonDxList(proId).then((res) => {
- this.TreedataList = res.data.list;
this.TreedataList.forEach((item) => {
this.checkedListkey.push(item.proId);
-
this.DataList.push(item);
- this.spliceData();
- this.DataList.forEach((item1) => {
- if (item1.proParentId == data.proId) {
- item1.propinName = data.proName;
- }
- });
});
+
+ this.spliceData(); // 鍋囪杩欎釜鏂规硶鏄綘瀹氫箟鐨勫叾浠栧湴鏂瑰鐞嗘暟鎹殑
+
+ // 鏇存柊鍚嶇О鍜岃绠楁�讳环
+ this.DataList.forEach((item1) => {
+ const parent = checked.checkedNodes.find(node => node.proId === item1.proParentId);
+ if (parent) {
+ item1.propinName = parent.proName;
+ }
+ });
+
this.TotalPrice1 = 0;
this.marryall = 0;
if (this.DataList.length != 0) {
this.list1 = false;
this.DataList.forEach((item) => {
- this.marryall += item.proPrice;
+ this.marryall += Number(item.proPrice) * Number(item.sl);
});
}
});
@@ -2637,123 +2822,103 @@
var cusId = this.form.cusIdcard;
} else {
this.$message.warning("璇峰厛濉啓淇℃伅锛屽啀閫変綋妫�鍐呭");
+ return; // 濡傛灉娌℃湁韬唤璇佸彿鐮侊紝鍋滄鎵ц
}
+
let _this = this;
+
+ // 鍒濆鍖栧彉閲�
+ this.isSubmitting = true; // 寮�濮嬫彁浜ゆ椂璁剧疆鏍囧織
+ this.TotalPrice1 = 0; // 鍒濆鍖栧簲鏀堕噾棰�
+ this.TotalPrice = 0; // 鍒濆鍖栧疄鏀堕噾棰�
+ this.discount = 10; // 鍒濆鍖栨姌鎵ｄ负10锛�100%锛�
+
+ // 鍒ゆ柇鏄惁鏈夐�変腑鐨勫椁�
if (this.tableData.length != 0) {
- this.tableData.forEach((item) => {
- _this.pacId = item.pacId;
- });
+ _this.pacId = this.tableData[0].pacId;
} else {
_this.pacId = "";
}
+
this.proIds = [];
- if (this.DataList.length != 0) {
- this.DataList.forEach((item) => {
+
+ // 澶勭悊閫変腑鐨勯」鐩�
+ const newItemsToAdd = [];
+ const allItems = [...this.DataList, ...this.DataLists]; // 鍚堝苟鎵�鏈夐」鐩�
+
+ allItems.forEach((item) => {
+ if (!this.proIds.includes(item.proId)) {
+ newItemsToAdd.push(item);
this.proIds.push(item.proId);
- });
- }
- if (this.DataLists.length != 0) {
- this.DataLists.forEach((item) => {
- this.proIds.push(item.proId);
- });
- }
+ }
+ });
+
+ // 鍑嗗鏁版嵁
let data = {
cusId,
pacId: _this.pacId,
proIds: this.proIds,
};
- if (this.form.tjType == 1) {
+ // 鏍规嵁浣撴绫诲瀷閫夋嫨涓嶅悓鐨勫鐞嗘柟娉�
+ if (this.form.firmId) {
tuantiqueren(data).then((response) => {
if (response.code == 200) {
- let cusId = this.form.cusIdcard;
- this.proIds = [];
- getTransitionList1(cusId).then((response) => {
- this.tableData1 = response.data;
- this.TotalPrice1 = 0;
- if (this.tableData1) {
- this.tableData1.forEach((item) => {
- if (item.tjCategory != null) {
- this.tjCategory = item.tjCategory;
- }
- if (item.pacName == "鍗曢」") {
- item.list.forEach((item9) => {
- this.treeList.push(item9.proId);
- });
- }
- this.TotalPrice = 0;
- this.TotalPrice1 += item.ordPrice;
- this.TotalPrice += item.nowPrice;
-
- this.pacName = item.pacName;
- });
-
- this.TotalPrice = this.tableData1.reduce((sum, item) => {
- return sum.plus(new Big(item.nowPrice || "0"));
- }, new Big(0));
- this.discount =
- (Math.floor((this.TotalPrice / this.TotalPrice1) * 100) /
- 100) *
- 10;
- this.list1 = false;
- this.list3 = true;
- this.list2 = false;
- } else {
- this.list1 = true;
- this.TotalPrice = 0;
- }
- });
- } else {
+ this.processOrderItems(cusId);
}
+ this.isSubmitting = false; // 鎻愪氦瀹屾垚鍚庨噸缃爣蹇�
+ }).catch(() => {
+ this.isSubmitting = false; // 纭繚鍦ㄩ敊璇儏鍐典笅涔熼噸缃爣蹇�
});
} else {
getaddtTransition(data).then((response) => {
if (response.code == 200) {
- let cusId = this.form.cusIdcard;
- this.proIds = [];
- getTransitionList1(cusId).then((response) => {
- this.tableData1 = response.data;
- this.TotalPrice1 = 0;
- if (this.tableData1) {
- this.tableData1.forEach((item) => {
- if (item.tjCategory != null) {
- this.tjCategory = item.tjCategory;
- }
- if (item.pacName == "鍗曢」") {
- item.list.forEach((item9) => {
- this.treeList.push(item9.proId);
- });
- }
- this.TotalPrice = 0;
- this.TotalPrice1 += item.ordPrice;
- this.TotalPrice += item.nowPrice;
-
- this.pacName = item.pacName;
- });
- this.discount =
- (Math.floor((this.TotalPrice / this.TotalPrice1) * 100) /
- 100) *
- 10;
-
- this.list1 = false;
- this.list3 = true;
- this.list2 = false;
- } else {
- this.list1 = true;
- this.TotalPrice = 0;
- }
- });
- } else {
+ this.processOrderItems(cusId);
}
+ this.isSubmitting = false; // 鎻愪氦瀹屾垚鍚庨噸缃爣蹇�
+ }).catch(() => {
+ this.isSubmitting = false; // 纭繚鍦ㄩ敊璇儏鍐典笅涔熼噸缃爣蹇�
});
}
+
this.taocan = false;
this.defaultKeys = [];
this.DataLists = [];
},
+
+ // 澶勭悊璁㈠崟椤圭洰
+ processOrderItems(cusId) {
+ getTransitionList1(cusId).then((response) => {
+ this.tableData1 = response.data;
+ if (this.tableData1) {
+ this.tableData1.forEach((item) => {
+ if (item.tjCategory != null) {
+ this.tjCategory = item.tjCategory;
+ }
+ if (item.pacName == "鍗曢」") {
+ item.list.forEach((item9) => {
+ this.treeList.push(item9.proId);
+ });
+ }
+ this.TotalPrice1 += item.ordPrice || 0; // 绱姞搴旀敹閲戦
+ this.TotalPrice += item.nowPrice || 0; // 绱姞瀹炴敹閲戦
+ });
+ // 璁＄畻鎶樻墸
+ this.discount = this.TotalPrice1 > 0 ?
+ (Math.floor((this.TotalPrice / this.TotalPrice1) * 100) / 100) * 10 : 0;
+
+ this.list1 = false;
+ this.list3 = true;
+ this.list2 = false;
+ } else {
+ this.list1 = true;
+ this.TotalPrice = 0;
+ }
+ });
+ },
submitCheckinfee() {
let _this = this;
if (_this.tjCategory !== "") {
- let List = _this.tableData1; //鍗曚釜椤圭洰淇℃伅
+ let List = _this.tableData1;
if (this.responseList.cusId) {
var userId = this.responseList.cusId;
} else {
@@ -2763,8 +2928,6 @@
if (this.tableData[0]) {
var pacId = this.tableData[0].pacId;
}
-
- //tjOrderList//杩欎釜鏄鐞嗗畬鐨勬瘡涓�椤瑰椁愪俊鎭�
List.forEach((item) => {
if (item.list) {
item.list.forEach((item1) => {
@@ -2914,9 +3077,7 @@
}
this.discount =
(this.formInline.paidIn / this.formInline.price) * 10;
- if (this.discount <= this.getInfodis) {
- this.discount = this.getInfodis;
- }
+
} else {
this.discount = 10;
this.formInline.paidIn = "0.00";
@@ -3010,8 +3171,8 @@
// 鏈�鍚庢彁浜ゆ寜閽�
submitPrice() {
let _this = this;
+ this.loadingSubmit = true;
if (_this.tjCategory !== "") {
- this.loadingSubmit = true;
let List = _this.tableData1; //鍗曚釜椤圭洰淇℃伅
if (this.responseList.cusId) {
var userId = this.responseList.cusId;
@@ -3061,8 +3222,9 @@
cusIdCard: item.cusId,
})); // 鍒涘缓鏂扮殑瀵硅薄锛屽寘鍚� discount 鍜� id
gaibianzhekou(newArray).then((res) => {
+ this.loadingSubmit = false;
if (res.code === 200) {
- this.loadingSubmit = false;
+
let data;
if (pacId || this.tjOrderList.length > 0) {
@@ -3094,6 +3256,7 @@
};
this.listgetOrder(data);
} else {
+ this.loadingSubmit = false;
this.$message({
type: "warning ",
message: "璇烽�夋嫨濂楅!",
@@ -3163,11 +3326,8 @@
}
.filter-tree {
- /* max-height: 360px;
- overflow-y: auto;
- border: 1px solid #d9d9d9; */
- overflow: auto;
- flex: 1;
+ overflow-y: auto; /* 淇濈暀绾靛悜婊氬姩鏉� */
+ overflow-x: hidden; /* 闅愯棌妯悜婊氬姩鏉� */
height: 350px;
}
@@ -3278,4 +3438,16 @@
width: 100%;
display: flex;
}
+/* .tab3 {
+ overflow-y: auto;
+}
+
+.tab3::-webkit-scrollbar {
+ width: 0px;
+ background: transparent;
+}
+
+.tab3::-webkit-scrollbar-thumb {
+ background: transparent;
+} */
</style>
--
Gitblit v1.8.0