From d23ab1d66456d5dd8aa8645bb262deef4e70a9eb Mon Sep 17 00:00:00 2001
From: lkk <364857242@qq.com>
Date: 星期五, 17 一月 2025 19:02:01 +0800
Subject: [PATCH] 2
---
src/views/system/tijian/index.vue | 1312 ++++++++++++++++++++++++++++++-----------------------------
1 files changed, 662 insertions(+), 650 deletions(-)
diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue
index 2b6af1b..5fac4af 100644
--- a/src/views/system/tijian/index.vue
+++ b/src/views/system/tijian/index.vue
@@ -135,11 +135,10 @@
},
]"
>
- <!-- style="display: inline-block; border-bottom: 2px solid blue"
- @click="openname" -->
<span
slot="label"
-
+ style="display: inline-block; border-bottom: 2px solid blue"
+ @click="openname"
>
濮撳悕
</span>
@@ -354,10 +353,6 @@
></el-option>
</el-select>
</el-form-item>
-
- <!-- <el-form-item prop="ageUnit">
-
- </el-form-item> -->
</el-form>
<el-form
:inline="true"
@@ -374,29 +369,6 @@
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">
@@ -573,7 +545,6 @@
@click="handle"
>鏌ヨ</el-button
>
- <!-- <el-button type="primary" size="mini" @click="submit">纭</el-button> -->
</el-form-item>
</el-form>
<div class="tab4">
@@ -615,29 +586,8 @@
prop="allProName"
:show-overflow-tooltip="true"
/>
- <!-- :selectable="checkSelectable" -->
- <!-- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
- <template slot-scope="scope">
- <el-button size="mini" type="text" icon="el-icon-circle-check" @click="handleSeach(scope.row)"
- v-hasPermi="['system:package:Seach']">濂楅璇︽儏
- </el-button>
- </template>
-</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">
@@ -723,6 +673,7 @@
width="260px"
>
</el-table-column>
+
<el-table-column prop="proPrice" label="鍘熶环" width="56px">
</el-table-column>
@@ -753,18 +704,6 @@
</el-tab-pane>
<el-tab-pane label="鍗曢」" name="second">
<div class="tab8">
- <!-- <div class="tab7">
- <v-tree-transfer
- :treeData="treedataList"
- :defaultProps="{ children: 'tjProjectList', label: 'proName' }"
- :defaultKeys="defaultKeys"
- @changeKeys="changeCategoryKeys"
- :key="datekey"
- ></v-tree-transfer> -->
- <!-- <el-tree :data="data" show-checkbox node-key="proId" :props="defaultProps" :default-checked-keys="treeList"
- @check-change="handleCurrentChecked">
- </el-tree> -->
- <!-- </div> -->
<el-row :gutter="20">
<el-col :span="6">
<div
@@ -842,6 +781,8 @@
>
<el-table-column prop="propinName" label="妫�鏌ラ」鐩�">
</el-table-column>
+ <el-table-column prop="sl" label="鏁伴噺" width="56px">
+ </el-table-column>
<el-table-column
prop="proPrice"
label="鍘熶环"
@@ -888,120 +829,88 @@
<el-row v-if="tcShow">
<el-col :span="15">
<div class="grid-content bg-purple">
- <!-- <el-table :data="fData" border height="220px" style="width: 100%; ">
- <el-table-column prop="proName" label="缁勫悎椤圭洰" align="center" width="200px">
- </el-table-column>
- <el-table-column prop="proPrice" label="閲戦" align="center" width="150px">
- </el-table-column>
- <el-table-column prop="allSonProName" label="鍗曚釜椤圭洰" align="center" :show-overflow-tooltip="true">
- </el-table-column>
- </el-table>
-
- <div class="tab">
- <el-table :data="DataList" border height="220" style="width: 350px; margin-top: 20px">
- <el-table-column prop="proName" label="鍗曚釜椤圭洰" align="center">
- </el-table-column>
- <el-table-column prop="proPrice" label="閲戦" align="center"></el-table-column>
- </el-table>
- </div> -->
-
- <!-- <div style="height:480px;overflow:scroll;background-color: #ffffff;
- font-size: 12.5px;">
- <table style="width: 96%; margin: 4px 10px; border: 1px solid white" cellspacing="4" border="2"
- v-for="(item, index) in tableData1" :key="index">
- <caption style="background-color: #f8f8f9">
- {{
- item.parentName
- }}
- </caption>
- <tr align="center">
- <th style="width:200px">椤圭洰</th>
- <th>鐜颁环</th>
- <th>鍘熶环</th>
- </tr>
- <tr v-for="item1 in item.list" :key="item1.proId">
- <td>{{ item1.proName }}</td>
- <td>
- {{ item1.nowPrice }}
- </td>
- <td>{{ item1.ordPrice }}</td>
- </tr>
- </table>
- </div> -->
-
<template>
<el-form
:model="form"
:inline="true"
label-width="75px"
- style="margin-left: 20px"
+ style="margin-left: 20px; width: 900px"
>
- <el-form-item label="浣撴绫诲瀷">
+ <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"
- v-model="form.tjType"
- placeholder="璇烽�夋嫨浣撴绫诲瀷"
>
+ <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="鍗曚綅閮ㄩ棬" prop="firmDeptName">
+ <el-input
+ v-model="form.firmDeptName"
+ style="width: 150px"
+ placeholder="璇疯緭鍏ュ崟浣嶉儴闂�"
+ @input="inputChange"
+ />
+ </el-form-item>
+ <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"
- ></el-option>
- </el-select>
- </el-form-item>
-
- <!-- <div class="tab1"> -->
- <!-- <el-form :inline="true" class="tab1"> -->
- <el-form-item label="搴旀敹閲戦">
- <el-input
- placeholder="搴旀敹閲戦"
- v-model="TotalPrice1"
- disabled
- style="width: 150px"
- ></el-input>
- </el-form-item>
- <el-form-item label="浼樻儬">
- <!-- <el-input style="width: 100px" type="number" v-model="discount" :value="discount"></el-input> -->
- <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>
- </el-form-item>
- <el-form-item label="瀹炴敹閲戦">
- <el-input
- placeholder="瀹炴敹閲戦"
- v-model="TotalPrice"
- style="width: 150px"
- ></el-input>
- </el-form-item>
- <br />
- <!-- 140828199805050012 -->
- <el-form-item label="棰嗗彇鏂瑰紡">
- <!-- <el-input style="width: 100%;" v-model="form.getType" placeholder="璇烽�夋嫨棰嗗彇鏂瑰紡" /> -->
- <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"
+ :disabled="!form.firmId && dict.value === '1'"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="浣撴绫诲埆">
<el-select
- style="width: 150px"
+ style="width: 200px"
v-model="tjCategory"
placeholder="璇烽�夋嫨浣撴绫诲埆"
>
@@ -1014,6 +923,39 @@
</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-form-item>
+ <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="debounceNumberChange"
+ :disabled="isfalse"
+ ></el-input-number>
+ </el-form-item>
+ <el-form-item label="瀹炴敹閲戦">
+ <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
@@ -1033,7 +975,8 @@
<el-button
type="primary"
@click="submitPrice"
- :disabled="confirm"
+ :loading="loadingSubmit"
+ :disabled="confirm || loadingSubmit"
v-if="showHidden.has_charge == 'N'"
size="mini"
>绛惧埌鐧昏</el-button
@@ -1101,12 +1044,15 @@
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
- margin-left: 46px
+ margin-left: 46px;
font-size: 16px;
margin-right: 20px;
"
>
- {{ this.tableData1[0].pacName || "" }} 宸查�夐」鐩潯鏁帮細<span
+ <span v-if="this.tableData1[0]">{{
+ this.tableData1[0].pacName || ""
+ }}</span>
+ 宸查�夐」鐩潯鏁帮細<span
style="font-weight: 700; color: red; margin-right: 5px"
>{{ this.tableData1.length || 0 }}</span
>鏉�
@@ -1117,150 +1063,76 @@
style="
padding: 0px 6px;
border: 1px solid #e6ebf5;
- max-height: 420px;
+ max-height: 650%;
overflow: auto;
width: 916px;
margin-left: 35px;
"
>
- <el-collapse v-model="index" accordion v-if="list3">
- <div
- class="info1"
- v-for="(item, index) in tableData1"
- :key="'info1-' + index"
- >
- <el-collapse-item :name="index">
- <template slot="title">
- <div style="width: 70%">
- {{
- item.parentName +
- " (搴旀敹閲戦:" +
- item.ordPrice +
- "鍏� / 瀹炴敹閲戦:" +
- item.nowPrice +
- "鍏�)"
- }}
- </div>
-
- <div style="width: 20%">
- <el-button
- type="primary"
- @click.stop="candelete(item)"
- style="float: right"
- >鍒� 闄�</el-button
- >
- </div>
- </template>
- <el-table
- :data="item.list"
- border
- style="width: 100%"
- height="270"
- >
- <el-table-column prop="proName" label="椤圭洰" width="180">
- </el-table-column>
- <el-table-column prop="proType" label="鎬у埆" width="180">
- <template
- slot-scope="scope"
- v-if="scope.row.proType == ''"
- >
- {{ scope.row.proType == "" ? "鍏ㄩ儴" : "" }}
- </template>
- <template slot-scope="scope" v-else>
- <dict-tag
- :options="dict.type.sys_user_sex"
- :value="scope.row.proType"
- />
- </template>
- </el-table-column>
- <el-table-column prop="ordPrice" label="搴旀敹閲戦">
- </el-table-column>
- <el-table-column prop="nowPrice" label="瀹炴敹閲戦">
- </el-table-column>
- <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>
- </el-collapse-item>
- </div>
- </el-collapse>
-
- <div v-if="list2 == true">
- <el-table
- :data="tableData1"
- border
- style="width: 100%"
- height="250"
- >
- <el-table-column prop="proName" label="椤圭洰" width="180">
- </el-table-column>
- <el-table-column prop="proType" label="鎬у埆" width="180">
- <template slot-scope="scope" v-if="scope.row.proType == ''">
- {{ scope.row.proType == "" ? "鍏ㄩ儴" : "" }}
- </template>
- <template slot-scope="scope" v-else>
+ <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">
+ <template slot-scope="scope">
+ <template v-if="isAll(scope.row.proType)"> 鍏ㄩ儴 </template>
+ <template v-else>
<dict-tag
:options="dict.type.sys_user_sex"
:value="scope.row.proType"
/>
</template>
- </el-table-column>
- <el-table-column prop="ysPrice" label="搴旀敹閲戦">
- </el-table-column>
- <el-table-column prop="proPrice" label="瀹炴敹閲戦">
- </el-table-column>
- <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>
- </div>
+ </template>
+ </el-table-column>
- <el-collapse v-model="activeName" accordion v-if="list1">
- <div>
- <el-collapse-item title="璇烽�夋嫨椤圭洰">
- <el-table :data="list" border style="width: 100%">
- <el-table-column prop="proName" label="椤圭洰" width="180">
- </el-table-column>
- <el-table-column prop="proType" label="鎬у埆" width="180">
- <template
- slot-scope="scope"
- v-if="scope.row.proType == ''"
- >
- {{ scope.row.proType == "" ? "鍏ㄩ儴" : "" }}
- </template>
- <template slot-scope="scope" v-else>
- <dict-tag
- :options="dict.type.sys_user_sex"
- :value="scope.row.proType"
- />
- </template>
- </el-table-column>
- <el-table-column prop="ordPrice" label="搴旀敹閲戦">
- </el-table-column>
- <el-table-column prop="nowPrice" label="瀹炴敹閲戦">
- </el-table-column>
- <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>
- </el-collapse-item>
- </div>
- </el-collapse>
+ <el-table-column prop="ordPrice" label="搴旀敹閲戦">
+ </el-table-column>
+ <el-table-column label="鎶樻墸">
+ <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"
+ >
+ </el-input-number>
+ </template>
+ </el-table-column>
+ <el-table-column prop="nowPrice" label="瀹炴敹閲戦">
+ </el-table-column>
+ <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 prop="proCheckMethod" label="鍏垂">
+ <template #default="scope">
+ <el-checkbox v-model="scope.row.free" :disabled="true">
+ {{ scope.row.free ? "鍏嶈垂" : "鏀惰垂" }}
+ </el-checkbox>
+ </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>
</div>
</div>
</el-col>
@@ -1385,11 +1257,11 @@
<el-input-number
style="width: 140px"
v-model="discount"
- :precision="2"
+ :precision="1"
:step="0.1"
:max="10"
- :min="1"
- @change="numberChange"
+ :min="0"
+ @change="debounceNumberChange"
:disabled="isfalse"
></el-input-number>
</el-form-item>
@@ -1504,11 +1376,12 @@
</span>
</el-dialog>
<Packages ref="aaa" @add="handleChanges" />
- <selectName ref="bbb" />
+ <selectName ref="bbb" @add="handleChangesName" />
</div>
</template>
<script>
+import Big from "big.js";
import selectName from "@/components/selectName";
import { dataURLtoFile, random } from "./file";
import { getInfo } from "@/api/login";
@@ -1520,6 +1393,7 @@
} from "@/api/hosp/customer";
import { getPrintSetUp } from "@/api/system/examcharge";
import {
+ tuantiSelect,
deptTreeSelect,
projectGetList,
getOrder,
@@ -1528,7 +1402,9 @@
getCusIdcard,
getPackageListName,
getaddtTransition,
+ tuantiqueren,
getTransitionList,
+ getTransitionList1,
getByTeamNo,
delTbBycusCardIdAndProId,
getLoadFile,
@@ -1536,6 +1412,7 @@
getconfigKey,
getHistryTjOrderProByCusIdCard,
readCertCardInfos,
+ gaibianzhekou,
} from "@/api/system/tijian";
import { addComp } from "@/api/system/comp";
import { getCompany, queryCompany } from "@/api/team/tuanti";
@@ -1567,6 +1444,7 @@
},
data() {
return {
+ isSubmitting: false,
open1: false,
filterage: "",
checkedkeys: [],
@@ -1628,12 +1506,12 @@
taocan: false,
top: true,
value: "2",
- getInfodis: "",
srcUrl: "",
hides: false,
hide: true,
beat: false,
dialogVisibles: false,
+ loadingSubmit: false,
charge: false,
src: "",
url: "",
@@ -1660,10 +1538,9 @@
isDisabled: false,
size: "",
tcShow: false,
- tcShows: false,
// 濂楅鎻愪氦鎸夐挳
confirm: false,
- TotalPrice: "0.00",
+ TotalPrice: 0,
TotalPrice1: 0,
discount: 10,
newpacName: [],
@@ -1768,7 +1645,7 @@
cusIsvip: null,
},
// 娣诲姞
-
+ lastXianPrice: 0,
// 琛ㄥ崟鍙傛暟
// 琛ㄥ崟鍙傛暟
obj: {},
@@ -1781,8 +1658,30 @@
cusMarryStatus: "5",
idType: "1",
ageUnit: "0",
+ 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: {
@@ -1827,15 +1726,119 @@
this.getCurrentDateTime();
this.startTimer();
this.getList1();
-
+
// this.getData();
},
mounted() {},
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 = "";
+ },
+ /** 鍒犻櫎鎸夐挳鎿嶄綔 */
+ 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(() => {});
+ },
+ handleManualChange(row) {
+ console.log("杩欐槸涓诲姩鍑哄彂鐨�");
+ this.updateProPrice(row);
+ },
+ validateDiscount(row) {
+ console.log("杞簡")
+ if (this.TotalPrice !== undefined && !isNaN(this.TotalPrice) && this.TotalPrice !== this.lastXianPrice) {
+ console.log("杩涘叆浜�")
+ this.updateProPrice1(row);
+ this.lastXianPrice = this.TotalPrice;
+ }
+ },
+ isAll(value) {
+ return value === "" || value === null;
+ },
+ updateProPrice(row) {
+ 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;
+ },
+ 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 = "123";
+ this.$refs.bbb.title = "鎼滅储濮撳悕";
+ this.$refs.bbb.getList();
},
getCompanyList() {
this.loading = true;
@@ -1880,16 +1883,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";
}
}
},
@@ -1951,11 +1958,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;
@@ -2005,47 +2010,6 @@
this.$refs.historyTj.getlist();
},
- candelete(item) {
- let data = {
- cusCardId: this.form.cusIdcard,
- proId: item.proPrantId,
- };
- delTbBycusCardIdAndProId(data).then((res) => {
- getTransitionList(this.form.cusIdcard).then((response) => {
- this.tableData1 = response.data;
- this.TotalPrice1 = 0;
- if (this.tableData1) {
- this.tableData1.forEach((item) => {
- this.TotalPrice1 += item.nowPrice;
- if (item.pacName === null) {
- item.pacName = "鍗曢」";
- }
- if (item.pacName == "鍗曢」") {
- item.list.forEach((item9) => {
- this.treeList.push(item9.proId);
- });
- }
- this.pacName = item.pacName;
- });
-
- const r = /^\+?[0-9][0-9]*$/; //姝ｆ暣鏁帮紙鍙互0鎵撳ご锛�
- let TotalPrice = this.TotalPrice1 * (this.discount / 10);
- if (r.test(TotalPrice)) {
- this.TotalPrice = TotalPrice + ".00";
- } else {
- this.TotalPrice = TotalPrice;
- }
-
- this.list1 = false;
- this.list3 = true;
- } else {
- this.list1 = true;
-
- this.TotalPrice = "0.00";
- }
- });
- });
- },
cope() {
this.tcShow = true;
let cusIdCard = this.form.cusIdcard;
@@ -2091,12 +2055,13 @@
if (response.code === 200) {
let cusId = this.form.cusIdcard;
this.proIds = [];
- getTransitionList(cusId).then((response) => {
+ getTransitionList1(cusId).then((response) => {
this.tableData1 = response.data;
this.TotalPrice1 = 0;
if (this.tableData1) {
this.tableData1.forEach((item) => {
- this.TotalPrice1 += item.nowPrice;
+ this.TotalPrice1 += item.ordPrice;
+ this.TotalPrice += item.nowPrice;
if (item.pacName === null) {
item.pacName = "鍗曢」";
}
@@ -2108,20 +2073,12 @@
this.pacName = item.pacName;
});
- const r = /^\+?[0-9][0-9]*$/; //姝ｆ暣鏁帮紙鍙互0鎵撳ご锛�
- let TotalPrice = this.TotalPrice1 * (this.discount / 10);
- if (r.test(TotalPrice)) {
- this.TotalPrice = TotalPrice + ".00";
- } else {
- this.TotalPrice = TotalPrice;
- }
-
this.list1 = false;
this.list3 = true;
} else {
this.list1 = true;
- this.TotalPrice = "0.00";
+ this.TotalPrice = 0;
}
});
}
@@ -2216,25 +2173,6 @@
this.srcUrl = response.url;
});
},
- // base64杞枃浠�
- // dataURLtoFile(image, filename) {
- // var arr = image.split(",");
- // var mime = arr[0].match(/:(.*?);/)[1];
- // var bstr = atob(arr[1]);
- // var n = bstr.length;
- // var u8arr = new Uint8Array(n);
- // while (n--) {
- // u8arr[n] = bstr.charCodeAt(n);
- // }
- // return new File([u8arr], filename, { type: mime });
- // },
-
- // 鍏抽棴鎽勫儚澶�
-
- // stopNavigator() {
- // this.thisVideo.srcObject.getTracks()[0].stop();
- // this.beat = false;
- // },
handleClose(done) {
this.$confirm("纭鍏抽棴锛�")
@@ -2246,16 +2184,9 @@
/** 鏌ヨ淇℃伅鍒楄〃 */
getList() {
- // listCustomer(this.queryParams).then((response) => {
- // this.customerList = response.rows;
- // this.total = response.total;
- // this.loading = false;
- // });
getInfo().then((response) => {
- this.getInfodis = response.user.discount;
- if (this.getInfodis === null) {
- this.isfalse = true;
- }
+
+
});
let cusSex = this.form.cusSex;
//鍏ㄩ儴濂楅
@@ -2300,13 +2231,13 @@
updateBy: null,
updateTime: null,
deleted: null,
+ firmid: "",
+ firmDeptName: "",
};
this.resetForm("form");
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
- // this.resetForm("form");
- // this.form = {};
if (this.confirm === true) {
this.$tab.refreshPage();
} else {
@@ -2332,13 +2263,73 @@
// 鎶樻墸
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;
+ 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();
+ this.TotalPrice = this.tableData1.reduce((sum, item) => {
+ return sum.plus(new Big(item.nowPrice || "0"));
+ }, new Big(0));
+ });
+ })
+ .catch(() => {
+ this.discount = oldValue;
+ });
+ },
+ numberChangeXianPrice(currentValue, oldValue) {
+ 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
+ );
+ }
+ }
+ })
+ .catch(() => {
+ this.discount = oldValue;
+ });
+ },
/** 鐧昏鎻愪氦鎸夐挳 */
submitForm() {
let _this = this;
@@ -2354,23 +2345,16 @@
if (this.form.cusSex === "鏈煡") {
this.form.cusSex = 2;
}
- if (this.form.tjType === '') {
+ if (this.form.tjType === "") {
this.form.tjType = this.dict.type.dict_team[0].value;
}
-
+
addCustomer(this.form).then((response) => {
this.responseList = response.data;
-
+
this.$modal.msgSuccess("鏂板鎴愬姛");
- // let cusSex = this.form.cusSex;
- // //鍏ㄩ儴濂楅
- // deptTreeSelect(cusSex).then((response) => {
- // this.newpacName = response.rows;
- // this.loading = false;
- // });
- // this.handleQuery();
+
_this.tcShow = true;
- _this.tcShows = true;
_this.isDisabled = true;
_this.top = false;
});
@@ -2394,6 +2378,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) {
@@ -2412,21 +2397,21 @@
}
if (this.form.reservationId != null) {
if (this.form.groupingId) {
+ this.form.firmName = this.form.compName;
+ this.form.tjType = "1";
+ this.CompanyList.forEach((item) => {
+ if (item.cnName == this.form.firmName) {
+ this.form.firmId = item.drugManufacturerId;
+ }
+ });
_this.tcShow = true;
- _this.tcShows = false;
- let data = {
- // teamNo: this.form.teamNo,
- groupingId: this.form.groupingId,
- };
- getByTeamNo(data).then((res) => {
+
+ getTransitionList1(this.form.cusIdcard).then((res) => {
this.tableData1 = res.data;
if (this.tableData1) {
this.tableData1.forEach((item) => {
- this.TotalPrice1 += item.ysPrice;
- this.TotalPrice = (
- this.TotalPrice1 *
- (this.discount / 10)
- ).toFixed(2);
+ this.TotalPrice1 += item.ordPrice;
+ this.TotalPrice += item.nowPrice;
if (item.pacName === null) {
item.pacName = "鍗曢」";
}
@@ -2434,29 +2419,25 @@
this.list1 = false;
this.list2 = true;
this.list3 = false;
- this.top = false;
+ _this.top = false;
} else {
this.list1 = true;
- this.TotalPrice = "0.00";
- this.top = false;
+ this.TotalPrice = 0;
+ _this.top = false;
}
});
} else {
if (this.form) {
_this.tcShow = true;
- _this.tcShows = true;
_this.formPacId = this.form.pacId;
let cusId = this.form.cusIdcard;
- getTransitionList(cusId).then((response) => {
+ getTransitionList1(cusId).then((response) => {
this.tableData1 = response.data;
if (this.tableData1) {
this.TotalPrice1 = 0;
this.tableData1.forEach((item) => {
- this.TotalPrice1 += item.nowPrice;
- this.TotalPrice = (
- this.TotalPrice1 *
- (this.discount / 10)
- ).toFixed(2);
+ this.TotalPrice1 += item.ordPrice;
+ this.TotalPrice += item.nowPrice;
if (item.pacName === null) {
item.pacName = "鍗曢」";
}
@@ -2482,6 +2463,7 @@
this.$message.warning("鏆傛棤棰勭害淇℃伅");
_this.resetpackage();
}
+ this.top = false;
_this.isDisabled = true;
} else {
this.$message.warning("鏈煡鍒扮敤鎴蜂俊鎭�");
@@ -2553,6 +2535,7 @@
// 鏈�鏂颁娇鐢╳ebSocket閫氫俊
readCardWebSocket(resultObj) {
let _this = this;
+
if (resultObj.code === 200 && resultObj.data.name != null) {
//鍥炴樉鐩稿叧鏁版嵁
_this.form.cusName = resultObj.data.name;
@@ -2564,6 +2547,29 @@
/^(\d{4})(\d{2})(\d{2})$/,
"$1-$2-$3"
);
+ } else if (_this.form.cusIdcard) {
+ // 浠庤韩浠借瘉鍙风爜鎻愬彇鍑虹敓鏃ユ湡
+ var org_birthday = _this.form.cusIdcard.substring(6, 14);
+ _this.form.cusBrithday =
+ org_birthday.substring(0, 4) +
+ "-" +
+ org_birthday.substring(4, 6) +
+ "-" +
+ org_birthday.substring(6, 8);
+ }
+ // 濡傛灉鍑虹敓鏃ユ湡瀛樺湪锛岃绠楀勾榫�
+ if (_this.form.cusBrithday) {
+ var birthdays = new Date(_this.form.cusBrithday);
+ let d = new Date();
+ let age =
+ d.getFullYear() -
+ birthdays.getFullYear() -
+ (d.getMonth() < birthdays.getMonth() ||
+ (d.getMonth() == birthdays.getMonth() &&
+ d.getDate() < birthdays.getDate())
+ ? 1
+ : 0);
+ _this.form.age = age; // 璧嬪�艰绠楃殑骞撮緞
}
_this.form.cusAddr = resultObj.data.addres;
_this.form.cusIdcard = resultObj.data.card;
@@ -2573,15 +2579,7 @@
}
} else {
this.$message.warning("璇锋斁缃韩浠借瘉鍚庡啀鐐瑰嚮璇诲彇");
- } /* if (resultObj.resultFlag == "-1") {
- if (resultObj.errorMsg == "绔彛鎵撳紑澶辫触") {
- //alert("璇诲崱鍣ㄦ湭杩炴帴");
- } else {
- //alert(resultObj.errorMsg);
- }
- } else if (resultObj.resultFlag == "-2") {
- //alert(resultObj.errorMsg);
- } */
+ }
},
// TODO 浠ヤ笅浠ｇ爜鍙兘鏄尘宸濅娇鐢ㄧ殑
jingChuanHandlerWebSocketResult(resultObj) {
@@ -2733,23 +2731,9 @@
alert("璇锋鏌ヨ鍗″櫒杩炴帴鏄惁姝ｅ父");
};
} else {
- // if (_this.inputSSS.indexOf(":1") != -1) {
-
- // var str1 = _this.inputSSS.indexOf(":1");
- // var result1 = _this.inputSSS.substring(0, str1);
-
- // var str2 = _this.inputSSS.indexOf(":1");
- // var result2 = _this.inputSSS.substring(
- // str2 + 2,
- // _this.inputSSS.length
- // );
-
- // _this.inputSSS = result1 + result2;
- // }
_this.inputSSS = _this.inputSSS.replace(":1", "");
var websocket = null;
var url = this.valueUrls;
- // var url = 'ws://'+ getIp() +':6789/websocket'
if ("WebSocket" in window) {
websocket = new WebSocket(url);
} else if ("MozWebSocket" in window) {
@@ -2855,27 +2839,11 @@
} else {
this.form.cusIdcard = param1[0].pacCode;
}
-
- // this.form.cusName = param1[0].pacName;
- // this.form.cusPhone = param1[0].pacRemark;
},
-
- // selected(row, index) {
- // if (this.formPacId !== null) {
- // if (row.pacId == this.formPacId) {
- // setTimeout(() => {
- // if (this.$refs.tb) {
- // this.$refs.tb.toggleRowSelection(row, true);
- // }
- // }, 10);
- // return true;
- // } else {
- // return false;
- // }
- // } else {
- // return this.newpacName;
- // }
- // },
+ handleChangesName(params) {
+ this.form.cusIdcard = params[0].sfzh;
+ this.handleQuery();
+ },
// 涓婁紶澶村儚
handleAvatarSuccess(res, file) {
@@ -2914,67 +2882,32 @@
handle() {
this.loading = true;
this.name = this.queryParam.pacName;
+ let param = {
+ sex: this.form.cusSex,
+ dwId: this.form.firmId,
+ };
if (this.name) {
getPackageListName(this.name).then((response) => {
this.newpacName = response.data;
this.loading = false;
});
} else {
- deptTreeSelect().then((response) => {
- this.newpacName = response.rows;
- this.loading = false;
- });
+ if (this.form.tjType == 1) {
+ tuantiSelect(param).then((response) => {
+ this.newpacName = response.data;
+ this.loading = false;
+ });
+ } else {
+ deptTreeSelect().then((response) => {
+ this.newpacName = response.rows;
+ this.loading = false;
+ });
+ }
}
},
- // 鐐瑰嚮澶氶�夋鑾峰彇閫変腑鏁版嵁
- // handleSelectionChange(selection, row) {
- // this.tableData = selection;
- // if (selection.length > 1) {
- // let del_row = selection.shift();
- // this.$refs.tb.toggleRowSelection(del_row, false); //璁剧疆杩欎竴琛屽彇娑堥�変腑
- // }
- // this.single = selection.length !== 1;
- // this.multiple = !selection.length;
- // this.tableData.forEach((item) => {
- // this.fData = item.tjProjectList;
- // });
- // if (selection[0]) {
- // this.DataList = [];
- // this.data = JSON.parse(JSON.stringify(this.dXData));
- // if (selection[0].tjProjectList) {
- // selection[0].tjProjectList.forEach((selectionitem) => {
- // this.treedataList.forEach((item) => {
- // if (selectionitem.proName == item.proName) {
- // item.disabled = true;
- // item.tjProjectList = [];
- // }
- // if (item.tjProjectList) {
- // item.tjProjectList.forEach((item1) => {
- // if (selectionitem.proName == item1.proName) {
- // item1.disabled = true;
- // item1.tjProjectList = [];
- // }
- // if (item1.tjProjectList) {
- // item1.tjProjectList.forEach((item2) => {
- // if (selectionitem.proName == item2.proName) {
- // item2.disabled = true;
- // item2.tjProjectList = [];
- // }
- // });
- // }
- // });
- // }
- // });
- // });
- // }
- // } else {
- // this.treedataList = JSON.parse(JSON.stringify(this.dXData));
- // return;
- // }
- // },
-
resetpackage() {
+ this.discount = 10;
if (this.form.cusIdcard) {
var cusId = this.form.cusIdcard;
} else {
@@ -2984,6 +2917,13 @@
_this.pacId = "";
this.proIds = [];
this.tjCategory = "12";
+
+ this.DataList = []; // 娓呯┖宸查�夐」鐩垪琛�
+ this.checkedkey = []; // 娓呯┖鏍戠殑閫変腑鐘舵��
+ this.checkedListkey = [];
+ this.TreedataList = [];
+ this.$refs.tree.setCheckedKeys([]); // 閲嶇疆鏍戦�変腑鐘舵��
+
let data = {
cusId,
pacId: _this.pacId,
@@ -2993,7 +2933,7 @@
if (response.code === 200) {
let cusId = this.form.cusIdcard;
this.proIds = [];
- getTransitionList(cusId).then((response) => {
+ getTransitionList1(cusId).then((response) => {
this.tableData1 = response.data;
this.TotalPrice1 = 0;
if (this.tableData1.length >= 1) {
@@ -3002,7 +2942,7 @@
} else {
this.list1 = true;
- this.TotalPrice = "0.00";
+ this.TotalPrice = 0;
}
});
}
@@ -3010,33 +2950,69 @@
},
Package() {
- this.taocan = true;
this.activeNames = "first";
let cusSex = this.form.cusSex;
this.datekey = Date.now();
//鍏ㄩ儴濂楅
- 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);
+
+ let param = {
+ sex: cusSex,
+ dwId: this.form.firmId || "",
+ };
+ if (this.form.tjType == 1) {
+ if (!this.form.firmId) {
+ this.$message({
+ type: "warning",
+ message: "璇峰厛缁存姢鍗曚綅锛�",
+ });
+ } else {
+ this.taocan = true;
+ this.loading = true;
+ tuantiSelect(param).then((res) => {
+ this.newpacName = res.data;
+ 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();
+ }
});
- throw Error();
- }
+ });
+ });
+ }
+ } catch (error) {}
+ this.loading = false;
+ });
+ }
+ } else {
+ 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;
- });
- // this.getData();
+ }
+ } catch (error) {}
+ this.loading = false;
+ });
+ }
},
// 鐐瑰嚮澶氶�夋鑾峰彇閫変腑鏁版嵁
@@ -3287,8 +3263,7 @@
if (this.DataList.length != 0) {
this.list1 = false;
this.DataList.forEach((item) => {
- // this.TotalPrice1 = item.proPrice + this.TotalPrice1;
- this.marryall += item.proPrice;
+ this.marryall = item.proPrice * item.sl;
});
}
});
@@ -3317,7 +3292,7 @@
renderContent(h, { node, data, store }) {
return (
<span class="custom-tree-node">
- 聽 <span>{node.label}</span>
+ <span>{node.label}</span>
<span>({data.proPrice}鍏�)</span>
</span>
);
@@ -3406,87 +3381,100 @@
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,
};
- getaddtTransition(data).then((response) => {
- if (response.code == 200) {
- let cusId = this.form.cusIdcard;
- this.proIds = [];
- getTransitionList(cusId).then((response) => {
- this.tableData1 = response.data;
- this.TotalPrice1 = 0;
- if (this.tableData1) {
- this.tableData1.forEach((item) => {
- this.TotalPrice1 += item.nowPrice;
- if (item.tjCategory != null) {
- this.tjCategory = item.tjCategory;
- }
- if (item.pacName == "鍗曢」") {
- item.list.forEach((item9) => {
- this.treeList.push(item9.proId);
- });
- }
- this.pacName = item.pacName;
- });
- const r = /^\+?[0-9][0-9]*$/; //姝ｆ暣鏁帮紙鍙互0鎵撳ご锛�
- let TotalPrice = this.TotalPrice1 * (this.discount / 10);
- if (r.test(TotalPrice)) {
- this.TotalPrice = TotalPrice + ".00";
- } else {
- this.TotalPrice = TotalPrice;
- }
- this.list1 = false;
- this.list3 = true;
- this.list2 = false;
- } else {
- this.list1 = true;
- this.TotalPrice = "0.00";
- }
- });
- } else {
- console.log(澶辫触浜�);
- }
- });
+ // 鏍规嵁浣撴绫诲瀷閫夋嫨涓嶅悓鐨勫鐞嗘柟娉�
+ if (this.form.tjType == 1) {
+ tuantiqueren(data).then((response) => {
+ if (response.code == 200) {
+ this.processOrderItems(cusId);
+ }
+ this.isSubmitting = false; // 鎻愪氦瀹屾垚鍚庨噸缃爣蹇�
+ }).catch(() => {
+ this.isSubmitting = false; // 纭繚鍦ㄩ敊璇儏鍐典笅涔熼噸缃爣蹇�
+ });
+ } else {
+ getaddtTransition(data).then((response) => {
+ if (response.code == 200) {
+ this.processOrderItems(cusId);
+ }
+ this.isSubmitting = false; // 鎻愪氦瀹屾垚鍚庨噸缃爣蹇�
+ }).catch(() => {
+ this.isSubmitting = false; // 纭繚鍦ㄩ敊璇儏鍐典笅涔熼噸缃爣蹇�
+ });
+ }
+
this.taocan = false;
this.defaultKeys = [];
this.DataLists = [];
},
- // changeCategoryKeys(val) {
- // this.proIds = [];
- // this.proIds = val;
- // if (this.DataList.length != 0) {
- // this.DataList.forEach((item) => {
- // this.proIds.push(item.proId);
- // });
- // } else {
- // this.proIds = [];
- // }
- // },
+
+ // 澶勭悊璁㈠崟椤圭洰
+ 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 !== "") {
@@ -3651,9 +3639,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";
@@ -3734,8 +3720,6 @@
listgetOrder(data) {
getOrder(data).then((res) => {
this.$modal.msgSuccess("鎻愪氦鎴愬姛");
- // this.dialogVisibles = true;
- // this.url = window.webkitURL.createObjectURL(res); //灏嗗悗绔繑鍥炵殑blob鏂囦欢璇诲彇鍑簎rl
//璋冩帴鍙ｆ樉绀哄妫�鍗�
const tjNumber = res.msg;
const viewNum = "792931586196398080";
@@ -3750,6 +3734,7 @@
submitPrice() {
let _this = this;
if (_this.tjCategory !== "") {
+ this.loadingSubmit = true;
let List = _this.tableData1; //鍗曚釜椤圭洰淇℃伅
if (this.responseList.cusId) {
var userId = this.responseList.cusId;
@@ -3791,36 +3776,59 @@
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) {
+ this.loadingSubmit = false;
+ 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,
+ firmId: this.form.firmId,
+ firmName: this.form.firmName,
+ firmDeptName: this.form.firmDeptName,
+ };
+
+ 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,
+ firmId: this.form.firmId,
+ firmName: this.form.firmName,
+ firmDeptName: this.form.firmDeptName,
+ };
+ this.listgetOrder(data);
+ } else {
+ this.$message({
+ type: "warning ",
+ message: "璇烽�夋嫨濂楅!",
+ });
+ }
+ } else {
+ this.loadingSubmit = false;
+ this.$modal.msgError("鏀瑰彉鎶樻墸閿欒");
+ }
+ });
} else {
+ this.loadingSubmit = false;
this.$modal.msgError("璇烽�夋嫨浣撴绫诲埆");
}
},
@@ -3872,6 +3880,7 @@
width: 100%;
display: flex;
}
+
.tab3 {
border: 1px solid #dcdfe6;
}
@@ -3949,12 +3958,14 @@
width: 300px;
height: 300px;
}
+
.dialog-footer2 {
width: 960px;
height: 36px;
display: flex;
justify-content: center;
}
+
.el-input--suffix .el-input__inner {
padding-right: 15px;
}
@@ -3985,6 +3996,7 @@
.content {
margin-bottom: 25px;
}
+
.tab8 {
width: 100%;
display: flex;
--
Gitblit v1.8.0