From 492a91ada4f0f98d9d800b55f9dddda7b53f7dd8 Mon Sep 17 00:00:00 2001
From: wwl <xchao828@163.com>
Date: 星期六, 04 一月 2025 18:11:59 +0800
Subject: [PATCH] 1
---
src/views/system/tijian/index.vue | 144 ++++++++++++++++++++++++++++++++---------------
1 files changed, 97 insertions(+), 47 deletions(-)
diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue
index 7c1f5d9..ec6cc61 100644
--- a/src/views/system/tijian/index.vue
+++ b/src/views/system/tijian/index.vue
@@ -218,13 +218,7 @@
<el-input :disabled="isDisabled" v-model="form.cusIntroduce" placeholder="璇疯緭鍏ヤ粙缁嶄汉" />
</el-form-item>
- <el-form-item label="鍗曚綅鍚嶇О" prop="compName">
- <el-select :disabled="isDisabled" v-model="form.compName" remote default-first-option allow-create
- filterable style="width: 200px" placeholder="璇烽�夋嫨鍗曚綅鍚嶇О" clearable @change="idFn1">
- <el-option v-for="dict in CompanyList" :key="dict.cnName" :label="dict.cnName" :value="dict.cnName" />
- </el-select>
- <!-- <i class="el-icon-circle-plus-outline" @click="handleAdd1"></i> -->
- </el-form-item>
+
<el-form-item label="鏂囧寲绋嬪害" prop="wenHua" label-width="93px">
<el-input :disabled="isDisabled" v-model="form.wenHua" placeholder="璇疯緭鍏ユ枃鍖栫▼搴�" />
@@ -482,15 +476,47 @@
<el-col :span="15">
<div class="grid-content bg-purple">
<template>
- <el-form :model="form" :inline="true" label-width="75px" style="margin-left: 20px">
+ <el-form :model="form" :inline="true" label-width="75px" style="margin-left: 20px;width: 900px;">
+ <el-form-item label="濮撳悕" prop="cusName">
+ <span slot="label">
+ 濮撳悕
+ </span>
+ <el-input v-model="form.cusName" placeholder="璇疯緭鍏ュ鍚�" :disabled="isDisabled" />
+ </el-form-item>
+ <el-form-item label="鎬у埆" prop="cusSex">
+ <el-select :disabled="isDisabled" v-model="form.cusSex" placeholder="鎬у埆" style="width: 150px">
+ <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label"
+ :value="parseInt(dict.value)"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="璇佷欢鍙风爜" prop="cusIdcard">
+ <span slot="label">
+ 璇佷欢鍙风爜
+ </span>
+ <el-input :disabled="isDisabled" v-model="form.cusIdcard" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" @input="inputChange" />
+ </el-form-item>
+ <el-form-item label="鍗曚綅鍚嶇О" prop="firmName">
+ <el-select v-model="form.firmName" remote default-first-option allow-create filterable
+ style="width: 200px" placeholder="璇烽�夋嫨鍗曚綅鍚嶇О" clearable @change="idFn1" @clear="clear">
+ <el-option v-for="dict in CompanyList" :key="dict.cnName" :label="dict.cnName" :value="dict.cnName" />
+ </el-select>
+ </el-form-item>
<el-form-item label="浣撴绫诲瀷">
<el-select style="width: 150px" v-model="form.tjType" placeholder="璇烽�夋嫨浣撴绫诲瀷">
<el-option v-for="dict in dict.type.dict_team" :key="dict.value" :label="dict.label"
- :value="dict.value"></el-option>
+ :value="dict.value" :disabled="!form.firmId && dict.value === '1'"></el-option>
</el-select>
</el-form-item>
+
+ <el-form-item label="浣撴绫诲埆">
+ <el-select style="width: 200px" v-model="tjCategory" placeholder="璇烽�夋嫨浣撴绫诲埆">
+ <el-option v-for="dict in dict.type.dict_tjtype" :key="dict.value" :label="dict.label"
+ :value="dict.value"></el-option>
+ </el-select>
+ <!-- <el-input v-model="form.category" placeholder="璇疯緭鍏ヤ綋妫�绫诲埆" /> -->
+ </el-form-item>
<el-form-item label="搴旀敹閲戦">
- <el-input placeholder="搴旀敹閲戦" v-model="TotalPrice1" disabled style="width: 150px"></el-input>
+ <el-input placeholder="搴旀敹閲戦" v-model="TotalPrice1" disabled style="width: 200px"></el-input>
</el-form-item>
<el-form-item label="浼樻儬">
<!-- {{ discount }} -->
@@ -498,24 +524,11 @@
:max="10" :min="0" @change="numberChange" :disabled="isfalse"></el-input-number>
</el-form-item>
<el-form-item label="瀹炴敹閲戦">
- <el-input placeholder="瀹炴敹閲戦" v-model="TotalPrice" style="width: 150px"></el-input>
+ <el-input placeholder="瀹炴敹閲戦" v-model="TotalPrice" style="width: 206px"></el-input>
</el-form-item>
<br />
- <el-form-item label="棰嗗彇鏂瑰紡">
- <el-select v-model="getType" style="width: 150px" @change="getmailType">
- <el-option v-for="dict in dict.type.report_get_type" :key="dict.value" :label="dict.label"
- :value="dict.value"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="浣撴绫诲埆">
- <el-select style="width: 150px" v-model="tjCategory" placeholder="璇烽�夋嫨浣撴绫诲埆">
- <el-option v-for="dict in dict.type.dict_tjtype" :key="dict.value" :label="dict.label"
- :value="dict.value"></el-option>
- </el-select>
- <!-- <el-input v-model="form.category" placeholder="璇疯緭鍏ヤ綋妫�绫诲埆" /> -->
- </el-form-item>
<el-form-item style="margin-left: 149px">
<el-button type="primary" @click="Package" size="mini" style="margin-right: 20px">閫夋嫨濂楅</el-button>
@@ -1026,6 +1039,8 @@
cusMarryStatus: "5",
idType: "1",
ageUnit: "0",
+ firmId: '',
+
},
form1: {},
title: "",
@@ -1078,6 +1093,9 @@
mounted() { },
methods: {
+ clear() {
+ this.form.firmId = ""
+ },
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete1(row) {
console.log(row);
@@ -1177,16 +1195,20 @@
},
idFn1(value) {
if (value) {
- const originalCompId = this.form.dictCompId;
- this.form.compName = value;
+ console.log(value)
+ const originalCompId = this.form.firmId;
+ this.form.firmName = value;
this.CompanyList.forEach((item) => {
- if (item.cnName == this.form.compName) {
- this.form.dictCompId = item.drugManufacturerId;
+ if (item.cnName == this.form.firmName) {
+ this.form.firmId = item.drugManufacturerId;
}
});
- if (this.form.dictCompId === originalCompId) {
- this.form.dictCompId = "";
+ if (this.form.firmId === originalCompId) {
+ this.form.firmId = "";
+ }
+ if (this.form.firmId) {
+ this.form.tjType = "1"
}
}
},
@@ -1551,6 +1573,7 @@
updateBy: null,
updateTime: null,
deleted: null,
+ firmid: ''
};
this.resetForm("form");
},
@@ -1583,11 +1606,34 @@
// 鎶樻墸
numberChange(currentValue, oldValue) {
- this.discount = currentValue;
- if (this.discount <= this.getInfodis) {
- this.discount = this.getInfodis;
- }
- // this.TotalPrice = (this.TotalPrice1 * (this.discount / 10)).toFixed(2);
+ this.$confirm("纭畾淇敼鎵�鏈夊瓙椤圭殑鎶樻墸鍚楋紵", "鎻愮ず", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ })
+ .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)); // ordPrice * (discount / 10)
+ item.nowPrice = result.toNumber();
+ this.TotalPrice = this.tableData1.reduce((sum, item) => {
+ return sum.plus(new Big(item.nowPrice || '0'));
+ }, new Big(0));
+ })
+ // ----------------------------------------------------------
+
+ })
+ .catch(() => {
+ this.discount = oldValue;
+ });
+
},
/** 鐧昏鎻愪氦鎸夐挳 */
@@ -2135,7 +2181,7 @@
this.name = this.queryParam.pacName;
let param = {
sex: this.form.cusSex,
- dwId: this.form.dictCompId
+ dwId: this.form.firmId
}
if (this.name) {
getPackageListName(this.name).then((response) => {
@@ -2249,10 +2295,10 @@
let param = {
sex: cusSex,
- dwId: this.form.dictCompId || ''
+ dwId: this.form.firmId || ''
}
if (this.form.tjType == 1) {
- if (!this.form.dictCompId) {
+ if (!this.form.firmId) {
this.$message({
type: "warning",
message: "璇峰厛缁存姢鍗曚綅锛�",
@@ -2712,8 +2758,6 @@
this.TotalPrice1 = 0;
if (this.tableData1) {
this.tableData1.forEach((item) => {
- this.TotalPrice1 += item.ordPrice;
- this.TotalPrice += item.nowPrice;
if (item.tjCategory != null) {
this.tjCategory = item.tjCategory;
}
@@ -2722,10 +2766,16 @@
this.treeList.push(item9.proId);
});
}
+ 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;
@@ -2738,7 +2788,8 @@
}
});
- } else {
+ }
+ else {
getaddtTransition(data).then((response) => {
if (response.code == 200) {
let cusId = this.form.cusIdcard;
@@ -2748,8 +2799,6 @@
this.TotalPrice1 = 0;
if (this.tableData1) {
this.tableData1.forEach((item) => {
- this.TotalPrice1 += item.ordPrice;
- this.TotalPrice += item.nowPrice;
if (item.tjCategory != null) {
this.tjCategory = item.tjCategory;
}
@@ -2758,9 +2807,12 @@
this.treeList.push(item9.proId);
});
}
+ 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;
@@ -2776,8 +2828,6 @@
}
});
}
-
-
this.taocan = false;
this.defaultKeys = [];
this.DataLists = [];
--
Gitblit v1.8.0