From b2cc0b207328ab1058f955b2e61789ba821b1704 Mon Sep 17 00:00:00 2001
From: lkk <364857242@qq.com>
Date: 星期六, 04 一月 2025 18:09:01 +0800
Subject: [PATCH] Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peisweb
---
src/views/system/tijian/index.vue | 310 ++++++++++++++++++++++++++-------------------------
1 files changed, 158 insertions(+), 152 deletions(-)
diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue
index a9fa3d6..7c1f5d9 100644
--- a/src/views/system/tijian/index.vue
+++ b/src/views/system/tijian/index.vue
@@ -74,18 +74,18 @@
</el-form-item>
<el-form-item label="濮撳悕" prop="cusName" :rules="[
- {
- required: true,
- validator: (rule, value, callback) => {
- if (!form.cusName) {
- callback('');
- } else if (form.cusName) {
- callback();
- }
- },
- trigger: 'blur',
- },
- ]">
+ {
+ required: true,
+ validator: (rule, value, callback) => {
+ if (!form.cusName) {
+ callback('');
+ } else if (form.cusName) {
+ callback();
+ }
+ },
+ trigger: 'blur',
+ },
+ ]">
<span slot="label" style="display: inline-block; border-bottom: 2px solid blue" @click="openname">
濮撳悕
@@ -107,20 +107,20 @@
</el-form-item>
<el-form-item label="鎬у埆" prop="cusSex" :rules="[
- {
- required: true,
- validator: (rule, value, callback) => {
- if (!form.cusSex && showHidden.has_sex === 'Y') {
- callback('');
- } else if (showHidden.has_sex === 'N') {
- callback();
- } else if (form.cusSex && showHidden.has_sex === 'Y') {
- callback();
- }
- },
- trigger: 'blur',
- },
- ]">
+ {
+ required: true,
+ validator: (rule, value, callback) => {
+ if (!form.cusSex && showHidden.has_sex === 'Y') {
+ callback('');
+ } else if (showHidden.has_sex === 'N') {
+ callback();
+ } else if (form.cusSex && showHidden.has_sex === 'Y') {
+ callback();
+ }
+ },
+ trigger: 'blur',
+ },
+ ]">
<el-select :disabled="isDisabled" v-model="form.cusSex" placeholder="鎬у埆">
<el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label"
:value="parseInt(dict.value)"></el-option>
@@ -128,23 +128,23 @@
</el-form-item>
<el-form-item label="璇佷欢鍙风爜" prop="cusIdcard" :rules="[
- {
- required: true,
- validator: (rule, value, callback) => {
- if (!form.cusIdcard && showHidden.has_idcard === 'Y') {
- callback('');
- } else if (showHidden.has_idcard === 'N') {
- callback();
- } else if (
- form.cusIdcard &&
- showHidden.has_idcard === 'Y'
- ) {
- callback();
- }
- },
- trigger: 'blur',
- },
- ]">
+ {
+ required: true,
+ validator: (rule, value, callback) => {
+ if (!form.cusIdcard && showHidden.has_idcard === 'Y') {
+ callback('');
+ } else if (showHidden.has_idcard === 'N') {
+ callback();
+ } else if (
+ form.cusIdcard &&
+ showHidden.has_idcard === 'Y'
+ ) {
+ callback();
+ }
+ },
+ trigger: 'blur',
+ },
+ ]">
<span slot="label" style="display: inline-block; border-bottom: 2px solid blue" @click="handleQuery">
璇佷欢鍙风爜
</span>
@@ -166,20 +166,20 @@
</el-form-item>
<el-form-item label="鐢佃瘽" prop="cusPhone" :rules="[
- {
- required: true,
- validator: (rule, value, callback) => {
- if (!form.cusPhone && showHidden.is_phone === 'Y') {
- callback('');
- } else if (showHidden.is_phone === 'N') {
- callback();
- } else if (form.cusPhone && showHidden.is_phone === 'Y') {
- callback();
- }
- },
- trigger: 'blur',
- },
- ]">
+ {
+ required: true,
+ validator: (rule, value, callback) => {
+ if (!form.cusPhone && showHidden.is_phone === 'Y') {
+ callback('');
+ } else if (showHidden.is_phone === 'N') {
+ callback();
+ } else if (form.cusPhone && showHidden.is_phone === 'Y') {
+ callback();
+ }
+ },
+ trigger: 'blur',
+ },
+ ]">
<el-input v-model="form.cusPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" :disabled="isDisabled" />
</el-form-item>
@@ -301,7 +301,7 @@
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handle">鏌ヨ</el-button>
- <!-- <el-button type="primary" size="mini" @click="submit">纭</el-button> -->
+
</el-form-item>
</el-form>
<div class="tab4">
@@ -322,19 +322,7 @@
</el-table-column> -->
</el-table>
</div>
- <!-- <el-button
- style="
- width: 20px;
- height: 100px;
- margin-top: 20%;
- font-size: 10px;
- padding-right: 20px;
- "
- type="primary"
- size="mini"
- @click="submit"
- ><i style="font-size: 18px" class="el-icon-d-arrow-right"></i
- ></el-button> -->
+
</div>
</el-tab-pane>
<el-tab-pane label="缁勫悎" name="third">
@@ -505,9 +493,9 @@
<el-input placeholder="搴旀敹閲戦" v-model="TotalPrice1" disabled style="width: 150px"></el-input>
</el-form-item>
<el-form-item label="浼樻儬">
-
+ <!-- {{ discount }} -->
<el-input-number ref="inputNumber" style="width: 150px" v-model="discount" :precision="2" :step="0.1"
- :max="10" :min="1" @change="numberChange" :disabled="isfalse"></el-input-number>
+ :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>
@@ -582,13 +570,13 @@
<div style="
padding: 0px 6px;
border: 1px solid #e6ebf5;
- max-height: 420px;
+ max-height: 650%;
overflow: auto;
width: 916px;
margin-left: 35px;
">
- <el-table :data="tableData1" border style="width: 100%" height="250">
+ <el-table :data="tableData1" border style="width: 100%;">
<el-table-column prop="proName" label="椤圭洰" width="180">
</el-table-column>
<el-table-column prop="proType" label="鎬у埆" width="50">
@@ -617,6 +605,12 @@
<el-table-column prop="proCheckMethod" label="鏄惁绌鸿吂">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.proCheckMethod" />
+ </template>
+ </el-table-column>
+ <el-table-column label="鎿嶄綔" align="center" width="80px">
+ <template slot-scope="scope">
+ <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete1(scope.row)" title="鍒犻櫎">
+ </el-button>
</template>
</el-table-column>
</el-table>
@@ -668,7 +662,7 @@
:disabled="true"></el-input>
</el-form-item>
<el-form-item label="浼樻儬">
- <el-input-number style="width: 140px" v-model="discount" :precision="2" :step="0.1" :max="10" :min="1"
+ <el-input-number style="width: 140px" v-model="discount" :precision="2" :step="0.1" :max="10" :min="0"
@change="numberChange" :disabled="isfalse"></el-input-number>
</el-form-item>
<el-form-item label="瀹炴敹閲戦">
@@ -756,6 +750,7 @@
</template>
<script>
+import Big from 'big.js';
import selectName from "@/components/selectName";
import { dataURLtoFile, random } from "./file";
import { getInfo } from "@/api/login";
@@ -786,6 +781,7 @@
getconfigKey,
getHistryTjOrderProByCusIdCard,
readCertCardInfos,
+ gaibianzhekou
} from "@/api/system/tijian";
import { addComp } from "@/api/system/comp";
import { getCompany, queryCompany } from "@/api/team/tuanti";
@@ -1082,6 +1078,31 @@
mounted() { },
methods: {
+ /** 鍒犻櫎鎸夐挳鎿嶄綔 */
+ handleDelete1(row) {
+ console.log(row);
+ let data = {
+ cusCardId: row.cusId,
+ proId: row.parentProId,
+ };
+ this.$modal.confirm('鏄惁纭鍒犻櫎锛�').then(() => {
+ return delTbBycusCardIdAndProId(data);
+ }).then(() => {
+ this.TotalPrice1 = 0
+ getTransitionList1(row.cusId).then((response) => {
+ this.tableData1 = response.data;
+ this.tableData1.forEach((item) => {
+ this.TotalPrice1 += item.ordPrice;
+ this.TotalPrice += item.nowPrice;
+ });
+ 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.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ }).catch(() => { });
+ },
validateDiscount(row) {
if (row.discount > 10) {
row.discount = 10; // 寮哄埗灏嗗�艰缃负鏈�澶у��
@@ -1093,10 +1114,20 @@
isAll(value) {
return value === '' || value === null;
},
- // 鏇存柊瀹炴敹閲戦
updateProPrice(row) {
- row.nowPrice = Number(row.ordPrice) * (Number(row.discount) / 10);
+ const ordPrice = new Big(row.ordPrice);
+
+ const discount = new Big(row.discount);
+ const result = ordPrice.times(discount.div(10)); // ordPrice * (discount / 10)
+ row.nowPrice = result.toNumber();
+ 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
},
+
+
openname() {
this.$refs.bbb.open = true;
@@ -1271,42 +1302,6 @@
this.$refs.historyTj.getlist();
},
- candelete(item) {
- let data = {
- cusCardId: this.form.cusIdcard,
- proId: item.proPrantId,
- };
- delTbBycusCardIdAndProId(data).then((res) => {
- getTransitionList1(this.form.cusIdcard).then((response) => {
- this.tableData1 = response.data;
- this.TotalPrice1 = 0;
- if (this.tableData1) {
- this.tableData1.forEach((item) => {
- this.TotalPrice1 += item.ordPrice;
- this.TotalPrice += item.nowPrice;
- if (item.pacName === null) {
- item.pacName = "鍗曢」";
- }
- if (item.pacName == "鍗曢」") {
- item.list.forEach((item9) => {
- this.treeList.push(item9.proId);
- });
- }
- this.pacName = item.pacName;
- });
-
-
-
- this.list1 = false;
- this.list3 = true;
- } else {
- this.list1 = true;
-
- this.TotalPrice = 0;
- }
- });
- });
- },
cope() {
this.tcShow = true;
let cusIdCard = this.form.cusIdcard;
@@ -1370,7 +1365,7 @@
this.pacName = item.pacName;
});
-
+
this.list1 = false;
this.list3 = true;
@@ -1592,7 +1587,7 @@
if (this.discount <= this.getInfodis) {
this.discount = this.getInfodis;
}
- this.TotalPrice = (this.TotalPrice1 * (this.discount / 10)).toFixed(2);
+ // this.TotalPrice = (this.TotalPrice1 * (this.discount / 10)).toFixed(2);
},
/** 鐧昏鎻愪氦鎸夐挳 */
@@ -1679,7 +1674,7 @@
this.top = false;
} else {
this.list1 = true;
- this.TotalPrice =0;
+ this.TotalPrice = 0;
this.top = false;
}
});
@@ -2210,6 +2205,7 @@
// },
resetpackage() {
+ this.discount = 10
if (this.form.cusIdcard) {
var cusId = this.form.cusIdcard;
} else {
@@ -2562,7 +2558,7 @@
if (this.DataList.length != 0) {
this.list1 = false;
this.DataList.forEach((item) => {
-
+
this.marryall += item.proPrice;
});
}
@@ -2682,7 +2678,6 @@
} else {
this.$message.warning("璇峰厛濉啓淇℃伅锛屽啀閫変綋妫�鍐呭");
}
-
let _this = this;
if (this.tableData.length != 0) {
this.tableData.forEach((item) => {
@@ -2730,7 +2725,7 @@
this.pacName = item.pacName;
});
-
+
this.list1 = false;
this.list3 = true;
this.list2 = false;
@@ -2740,7 +2735,7 @@
}
});
} else {
- console.log(澶辫触浜�);
+
}
});
} else {
@@ -2766,8 +2761,8 @@
this.pacName = item.pacName;
});
-
-
+
+
this.list1 = false;
this.list3 = true;
this.list2 = false;
@@ -2777,7 +2772,7 @@
}
});
} else {
- console.log(澶辫触浜�);
+
}
});
}
@@ -3091,35 +3086,46 @@
let paidIn = this.TotalPrice.toString();
let discount = this.discount;
this.tjFlowingWater = { copeWith, paidIn, discount };
+ const newArray = this.tableData1
+ .filter(item => item.discount < 10) // 杩囨护鍑� discount < 10 鐨勯」
+ .map(item => ({ discount: item.discount, parentProId: item.parentProId, cusIdCard: item.cusId })); // 鍒涘缓鏂扮殑瀵硅薄锛屽寘鍚� discount 鍜� id
+ gaibianzhekou(newArray).then((res) => {
+ if (res.code === 200) {
+ let data;
- let data;
- if (pacId || this.tjOrderList.length > 0) {
- data = {
- photo: this.srcUrl,
- pacId,
- tjOrderList: this.tjOrderList,
- tjFlowingWater: this.tjFlowingWater,
- userId,
- tjType,
- tjCategory: this.tjCategory,
- };
- this.listgetOrder(data);
- } else if (pacId || this.tjOrderList.length > 0) {
- data = {
- photo: this.srcUrl,
- tjOrderList: this.tjOrderList,
- tjFlowingWater: this.tjFlowingWater,
- userId,
- tjType,
- tjCategory: this.tjCategory,
- };
- this.listgetOrder(data);
- } else {
- this.$message({
- type: "warning ",
- message: "璇烽�夋嫨濂楅!",
- });
- }
+ if (pacId || this.tjOrderList.length > 0) {
+ data = {
+ photo: this.srcUrl,
+ pacId,
+ tjOrderList: this.tjOrderList,
+ tjFlowingWater: this.tjFlowingWater,
+ userId,
+ tjType,
+ tjCategory: this.tjCategory,
+ };
+
+ this.listgetOrder(data);
+ } else if (pacId || this.tjOrderList.length > 0) {
+ data = {
+ photo: this.srcUrl,
+ tjOrderList: this.tjOrderList,
+ tjFlowingWater: this.tjFlowingWater,
+ userId,
+ tjType,
+ tjCategory: this.tjCategory,
+ };
+ this.listgetOrder(data);
+ } else {
+ this.$message({
+ type: "warning ",
+ message: "璇烽�夋嫨濂楅!",
+ });
+ }
+ } else {
+ this.$modal.msgError("鏀瑰彉鎶樻墸閿欒");
+ }
+ })
+
} else {
this.$modal.msgError("璇烽�夋嫨浣撴绫诲埆");
}
--
Gitblit v1.8.0