From 2ee7a81c2eb0df1fc473da6dbbaa13df662967c5 Mon Sep 17 00:00:00 2001
From: wwl <xchao828@163.com>
Date: 星期三, 02 七月 2025 15:43:59 +0800
Subject: [PATCH] 1
---
src/views/system/tijian/index.vue | 2150 ++++++++++++++++++++++++-----------------------------------
1 files changed, 866 insertions(+), 1,284 deletions(-)
diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue
index f164347..fc937f1 100644
--- a/src/views/system/tijian/index.vue
+++ b/src/views/system/tijian/index.vue
@@ -1,18 +1,9 @@
<template>
+ <div v-loading="isLoading" element-loading-text="璇风◢鍊�..." element-loading-spinner="el-icon-loading"
+ element-loading-background="rgba(255, 255, 255, 0.8)" style="height: 100%; padding: 20px; position: relative;">
<div class="app-container">
- <el-dialog
- :title="title"
- :visible.sync="open1"
- width="1000px"
- append-to-body
- >
- <el-form
- ref="form1"
- :model="form1"
- :rules="rules1"
- label-width="100px"
- :inline="true"
- >
+ <el-dialog :title="title" :visible.sync="open1" width="1000px" append-to-body>
+ <el-form ref="form1" :model="form1" :rules="rules1" label-width="100px" :inline="true">
<el-form-item label="鍗曚綅鍚嶇О" prop="cnName">
<el-input v-model="form1.cnName" placeholder="璇疯緭鍏ヤ腑鏂囧悕绉�" />
</el-form-item>
@@ -29,16 +20,10 @@
<el-input v-model="form1.legalPerson" placeholder="璇疯緭鍏ユ硶浜�" />
</el-form-item>
<el-form-item label="娉ㄥ唽鍦板潃" prop="registerAddress">
- <el-input
- v-model="form1.registerAddress"
- placeholder="璇疯緭鍏ユ敞鍐屽湴鍧�"
- />
+ <el-input v-model="form1.registerAddress" placeholder="璇疯緭鍏ユ敞鍐屽湴鍧�" />
</el-form-item>
<el-form-item label="閫氳鍦板潃" prop="mailingAddress">
- <el-input
- v-model="form1.mailingAddress"
- placeholder="璇疯緭鍏ラ�氳鍦板潃"
- />
+ <el-input v-model="form1.mailingAddress" placeholder="璇疯緭鍏ラ�氳鍦板潃" />
</el-form-item>
<el-form-item label="寮�鎴烽摱琛�" prop="bankAccount">
<el-input v-model="form1.bankAccount" placeholder="璇疯緭鍏ュ紑鎴烽摱琛�" />
@@ -65,25 +50,12 @@
<el-input v-model="form1.orderNum" placeholder="璇疯緭鍏ユ帓搴�" />
</el-form-item>
<el-form-item label="鏈夋晥鏃堕棿" prop="validTime">
- <el-date-picker
- clearable
- v-model="form1.validTime"
- type="date"
- value-format="yyyy-MM-dd"
- placeholder="璇烽�夋嫨鏈夋晥鏃堕棿"
- >
- </el-date-picker> </el-form-item
- ><br />
+ <el-date-picker clearable v-model="form1.validTime" type="date" value-format="yyyy-MM-dd"
+ placeholder="璇烽�夋嫨鏈夋晥鏃堕棿">
+ </el-date-picker> </el-form-item><br />
<el-form-item label="澶囨敞" prop="remark">
- <el-input
- v-model="form1.remark"
- type="textarea"
- placeholder="璇疯緭鍏ュ唴瀹�"
- :rows="2"
- label-width="400px"
- style="width: 830px"
- resize="none"
- ></el-input>
+ <el-input v-model="form1.remark" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" :rows="2" label-width="400px"
+ style="width: 830px" resize="none"></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer2">
@@ -94,159 +66,92 @@
<el-row :gutter="20">
<el-col :span="17">
<div class="grid-content bg-purple">
- <el-form
- :inline="true"
- ref="form"
- :model="form"
- :rules="rules"
- :label-position="labelPosition"
- label-width="106px"
- v-show="top"
- >
+ <el-form :inline="true" ref="form" :model="form" :rules="rules" :label-position="labelPosition"
+ label-width="106px" v-show="top">
<el-form-item label="鍖垮悕" prop="isNow">
- <el-select
- v-model="isNow"
- placeholder="鏄惁鍖垮悕"
- @change="freezing(isNow)"
- >
- <el-option
- v-for="dict in dictType"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
+ <el-select v-model="isNow" placeholder="鏄惁鍖垮悕" @change="freezing(isNow)">
+ <el-option v-for="dict in dictType" :key="dict.value" :label="dict.label"
+ :value="dict.value"></el-option>
</el-select>
</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',
+ <el-form-item label="濮撳悕" prop="cusName" :rules="[
+ {
+ required: true,
+ validator: (rule, value, callback) => {
+ if (!form.cusName) {
+ callback('');
+ } else if (form.cusName) {
+ callback();
+ }
},
- ]"
- >
- <span
- slot="label"
- style="display: inline-block; border-bottom: 2px solid blue"
- @click="openname"
- >
+ trigger: 'blur',
+ },
+ ]">
+ <span slot="label" style="display: inline-block; border-bottom: 2px solid blue" @click="openname">
濮撳悕
</span>
- <el-input
- v-model="form.cusName"
- placeholder="璇疯緭鍏ュ鍚�"
- :disabled="isDisabled"
- />
+ <el-input v-model="form.cusName" placeholder="璇疯緭鍏ュ鍚�" :disabled="isDisabled"
+ @input="form.cusName = $event.replace(/\s/g, '')" />
</el-form-item>
<el-form-item label="璇佷欢绫诲瀷" prop="idType">
- <el-select
- :disabled="isDisabled"
- v-model="form.idType"
- placeholder="璇烽�夋嫨璇佷欢绫诲瀷"
- >
- <el-option
- v-for="dict in dict.type.dict_user_cardtype"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
+ <el-select :disabled="isDisabled" v-model="form.idType" placeholder="璇烽�夋嫨璇佷欢绫诲瀷">
+ <el-option v-for="dict in dict.type.dict_user_cardtype" :key="dict.value" :label="dict.label"
+ :value="dict.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="姘戞棌" prop="cusNational">
- <el-select
- filterable
- :disabled="isDisabled"
- v-model="form.cusNational"
- placeholder="璇烽�夋嫨姘戞棌"
- >
- <el-option
- v-for="dict in dict.type.dict_user_national"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
+ <el-select filterable :disabled="isDisabled" v-model="form.cusNational" placeholder="璇烽�夋嫨姘戞棌">
+ <el-option v-for="dict in dict.type.dict_user_national" :key="dict.value" :label="dict.label"
+ :value="dict.value"></el-option>
</el-select>
</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',
+ <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();
+ }
},
- ]"
- >
- <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>
+ 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>
</el-select>
</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',
+ <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();
+ }
},
- ]"
- >
- <span
- slot="label"
- style="display: inline-block; border-bottom: 2px solid blue"
- @click="handleQuery"
- >
+ trigger: 'blur',
+ },
+ ]">
+ <span slot="label" style="display: inline-block; border-bottom: 2px solid blue" @click="handleQuery">
璇佷欢鍙风爜
</span>
- <el-input
- :disabled="isDisabled"
- v-model="form.cusIdcard"
- placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�"
- @input="inputChange"
- />
+ <el-input :disabled="isDisabled" v-model="form.cusIdcard" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�"
+ @input="handleIdCardInput" />
<!-- <i style="
font-size: 1rem;
position: absolute;
@@ -257,169 +162,90 @@
</el-form-item>
<el-form-item label="濠氬Щ" prop="cusMarryStatus">
- <el-select
- :disabled="isDisabled"
- v-model="form.cusMarryStatus"
- placeholder="濠氬Щ鐘跺喌"
- >
- <el-option
- v-for="dict in dict.type.dict_user_marry"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
+ <el-select :disabled="isDisabled" v-model="form.cusMarryStatus" placeholder="濠氬Щ鐘跺喌">
+ <el-option v-for="dict in dict.type.dict_user_marry" :key="dict.value" :label="dict.label"
+ :value="dict.value"></el-option>
</el-select>
</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',
+ <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();
+ }
},
- ]"
- >
- <el-input
- v-model="form.cusPhone"
- placeholder="璇疯緭鍏ヨ仈绯荤數璇�"
- :disabled="isDisabled"
- />
+ trigger: 'blur',
+ },
+ ]">
+ <el-input v-model="form.cusPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" maxlength="11" :disabled="isDisabled"
+ @input="form.cusPhone = $event.replace(/\s/g, '')" />
</el-form-item>
<el-form-item label="鍑虹敓鏃ユ湡" prop="cusBrithday">
- <el-date-picker
- :disabled="isDisabled"
- clearable
- v-model="form.cusBrithday"
- type="date"
- value-format="yyyy-MM-dd"
- placeholder="璇烽�夋嫨鍑虹敓鏃ユ湡"
- style="width: 93%"
- >
+ <el-date-picker :disabled="isDisabled" clearable v-model="form.cusBrithday" type="date"
+ value-format="yyyy-MM-dd" placeholder="璇烽�夋嫨鍑虹敓鏃ユ湡" style="width: 93%">
</el-date-picker>
</el-form-item>
<el-form-item label="鑱屼笟" prop="career">
- <el-select
- filterable
- :disabled="isDisabled"
- v-model="form.career"
- placeholder="璇疯緭鍏ヨ亴涓�"
- >
- <el-option
- v-for="dict in dict.type.dict_job"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
+ <el-select filterable :disabled="isDisabled" v-model="form.career" placeholder="璇疯緭鍏ヨ亴涓�">
+ <el-option v-for="dict in dict.type.dict_job" :key="dict.value" :label="dict.label"
+ :value="dict.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="閭" prop="cusEmail">
- <el-input
- v-model="form.cusEmail"
- placeholder="璇疯緭鍏ラ偖绠�"
- :disabled="isDisabled"
- />
+ <el-input v-model="form.cusEmail" placeholder="璇疯緭鍏ラ偖绠�" :disabled="isDisabled" />
</el-form-item>
<el-form-item label="骞撮緞" prop="age">
- <el-input
- v-model="form.age"
- :disabled="isDisabled"
- style="width: 30%"
- />
- <el-select
- :disabled="isDisabled"
- v-model="form.ageUnit"
- style="width: 20%"
- >
- <el-option
- v-for="dict in dict.type.dict_ageunit"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
+ <el-input v-model="form.age" :disabled="isDisabled" style="width: 30%" />
+ <el-select :disabled="isDisabled" v-model="form.ageUnit" style="width: 20%">
+ <el-option v-for="dict in dict.type.dict_ageunit" :key="dict.value" :label="dict.label"
+ :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"
- >
+ <el-form :inline="true" ref="form" :model="form" :rules="rules" :label-position="labelPosition"
+ label-width="106px" v-show="top">
<el-form-item label="浠嬬粛浜�" prop="cusIntroduce">
- <el-input
- :disabled="isDisabled"
- v-model="form.cusIntroduce"
- placeholder="璇疯緭鍏ヤ粙缁嶄汉"
- />
+ <el-input :disabled="isDisabled" v-model="form.cusIntroduce" placeholder="璇疯緭鍏ヤ粙缁嶄汉" />
</el-form-item>
<el-form-item label="鏂囧寲绋嬪害" prop="wenHua" label-width="93px">
- <el-input
- :disabled="isDisabled"
- v-model="form.wenHua"
- placeholder="璇疯緭鍏ユ枃鍖栫▼搴�"
- />
+ <el-input :disabled="isDisabled" v-model="form.wenHua" placeholder="璇疯緭鍏ユ枃鍖栫▼搴�" />
+ </el-form-item>
+ <el-form-item label="宸ラ緞" prop="gl">
+ <div>
+ <el-input v-model="form.gl" style="width: 50%">
+ <template slot="append">骞�</template>
+ </el-input>
+ </div>
</el-form-item>
</el-form>
- <el-form
- ref="form"
- :model="form"
- :rules="rules"
- :label-position="labelPosition"
- label-width="106px"
- v-show="top"
- >
+ <el-form ref="form" :model="form" :rules="rules" :label-position="labelPosition" label-width="106px"
+ v-show="top">
<el-row :gutter="21">
<el-col :span="19">
<el-form-item label="鎴峰彛鍦板潃" prop="addr">
- <el-input
- v-model="form.addr"
- placeholder="璇疯緭鍏ユ埛鍙ｅ湴鍧�"
- :disabled="isDisabled"
- />
+ <el-input v-model="form.addr" placeholder="璇疯緭鍏ユ埛鍙ｅ湴鍧�" :disabled="isDisabled" />
</el-form-item>
</el-col>
</el-row>
</el-form>
- <el-form
- ref="form"
- :model="form"
- :rules="rules"
- :label-position="labelPosition"
- label-width="106px"
- v-show="top"
- >
+ <el-form ref="form" :model="form" :rules="rules" :label-position="labelPosition" label-width="106px"
+ v-show="top">
<el-row :gutter="21">
<el-col :span="19">
<el-form-item label="鐜颁綇鍦板潃" prop="cusAddr">
- <el-input
- v-model="form.cusAddr"
- placeholder="璇疯緭鍏ョ幇灞呬綇鍦板潃"
- :disabled="isDisabled"
- />
+ <el-input v-model="form.cusAddr" placeholder="璇疯緭鍏ョ幇灞呬綇鍦板潃" :disabled="isDisabled" />
</el-form-item>
</el-col>
</el-row>
@@ -428,35 +254,11 @@
<el-row v-show="top">
<el-col :span="19">
<div style="float: right; margin-bottom: 10px">
- <el-button
- v-show="lishi"
- type="primary"
- @click="cope"
- size="mini"
- >涓�閿鍒�</el-button
- >
- <el-button
- type="primary"
- @click="inputChanges"
- v-show="lishi"
- size="mini"
- :disabled="confirm"
- >鍘嗗彶浣撴璁板綍</el-button
- >
- <el-button
- :disabled="isDisabled"
- type="primary"
- size="mini"
- @click="submitForm"
- >鐧昏</el-button
- >
- <el-button
- icon="el-icon-refresh"
- size="mini"
- @click="resetQuery"
- @queryTable="getList"
- >閲嶇疆</el-button
- >
+ <el-button v-show="lishi" type="primary" @click="cope" size="mini">涓�閿鍒�</el-button>
+ <el-button type="primary" @click="inputChanges" v-show="lishi" size="mini"
+ :disabled="confirm">鍘嗗彶浣撴璁板綍</el-button>
+ <el-button :disabled="isDisabled" type="primary" size="mini" @click="submitForm">鐧昏</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuery" @queryTable="getList">閲嶇疆</el-button>
</div>
</el-col>
</el-row>
@@ -464,245 +266,113 @@
</el-col>
<el-col :span="7" v-show="top">
<div class="content" v-show="showHidden.mall_hasPhoto == 'Y'">
- <div
- v-show="hide"
- style="border: 1px dashed #dcdfe6; width: 180px; height: 180px"
- >
+ <div v-show="hide" style="border: 1px dashed #dcdfe6; width: 180px; height: 180px">
<img v-if="imageUrl" :src="imageUrl" class="avatar" />
</div>
<div v-if="imgSrc" class="img_bg_camera">
- <img
- style="
+ <img style="
width: 200px;
height: 200px;
margin-left: -20px;
margin-top: 90px;
padding-top: 1px;
- "
- :src="imgSrc"
- alt=""
- class="tx_img"
- />
+ " :src="imgSrc" alt="" class="tx_img" />
</div>
- <video
- v-show="hides"
- id="videoCamera"
- :width="videoWidth"
- :height="videoHeight"
- autoplay
- style="margin-top: 1px"
- ></video>
- <canvas
- style="display: none"
- id="canvasCamera"
- :width="videoWidth"
- :height="videoHeight"
- ></canvas>
+ <video v-show="hides" id="videoCamera" :width="videoWidth" :height="videoHeight" autoplay
+ style="margin-top: 1px"></video>
+ <canvas style="display: none" id="canvasCamera" :width="videoWidth" :height="videoHeight"></canvas>
<div class="camera_outer" style="margin-top: 10px">
- <el-button type="primary" plain size="mini" @click="getCompetence()"
- >鎵撳紑鎽勫儚澶�</el-button
- >
- <el-button type="primary" plain size="mini" @click="setImage()"
- >鎷嶇収</el-button
- >
+ <el-button type="primary" plain size="mini" @click="getCompetence()">鎵撳紑鎽勫儚澶�</el-button>
+ <el-button type="primary" plain size="mini" @click="setImage()">鎷嶇収</el-button>
<br />
</div>
</div>
</el-col>
</el-row>
- <el-dialog
- title="閫夋嫨濂楅"
- :visible.sync="taocan"
- width="70%"
- height="700px"
- :close-on-click-modal="false"
- >
- <el-tabs
- type="border-card"
- style="height: 560px; margin: 0 10px; width: 100%"
- v-model="activeNames"
- @tab-click="handleClick"
- >
+ <el-dialog title="閫夋嫨濂楅" :visible.sync="taocan" width="70%" height="700px" :close-on-click-modal="false">
+ <el-tabs type="border-card" style="height: 560px; margin: 0 10px; width: 100%" v-model="activeNames"
+ @tab-click="handleClick">
<el-tab-pane label="濂楅" name="first">
- <el-form
- :model="queryParam"
- ref="queryForm"
- size="small"
- :inline="true"
- v-if="showSearch"
- label-width="auto"
- >
+ <el-form :model="queryParam" ref="queryForm" size="small" :inline="true" v-if="showSearch" label-width="auto" @submit.native.prevent="handle">
<el-form-item label="濂楅鍚嶇О" prop="pacName">
- <el-input
- v-model="queryParam.pacName"
- placeholder="璇疯緭鍏ュ椁愬悕绉�"
- clearable
- @keyup.enter.native="handle"
- />
+ <el-input v-model="queryParam.pacName" placeholder="璇疯緭鍏ュ椁愬悕绉�" clearable @keyup.enter.native="handle" />
</el-form-item>
<el-form-item>
- <el-button
- type="primary"
- icon="el-icon-search"
- size="mini"
- @click="handle"
- >鏌ヨ</el-button
- >
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handle">鏌ヨ</el-button>
</el-form-item>
</el-form>
<div class="tab4">
- <div
- class="grid-content bg-purple"
- style="margin-left: 5px; width: 98%"
- >
- <el-table
- v-loading="loading"
- element-loading-text="姝ｅ湪鍔犺浇涓�..."
- element-loading-spinner="el-icon-loading"
- border
- :data="newpacName"
- @selection-change="handleSelectionChange"
- height="450px"
- ref="tb"
- >
- <el-table-column
- type="selection"
- width="40px"
- align="center"
- label="閫夋嫨"
- />
- <el-table-column
- label="濂楅鍚嶇О"
- align="center"
- prop="pacName"
- width="120px"
- />
- <el-table-column
- label="濂楅浠锋牸"
- align="center"
- prop="price"
- width="120px"
- />
- <el-table-column
- label="濂楅鏄庣粏"
- align="center"
- 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> -->
+ <div class="grid-content bg-purple" style="margin-left: 5px; width: 98%">
+ <el-table v-loading="loading" element-loading-text="姝ｅ湪鍔犺浇涓�..." element-loading-spinner="el-icon-loading"
+ border :data="newpacName" @selection-change="handleSelectionChange" height="450px" ref="tb">
+ <el-table-column type="selection" width="40px" align="center" label="閫夋嫨" />
+ <el-table-column label="濂楅鍚嶇О" align="center" prop="pacName" width="120px" />
+ <el-table-column label="濂楅浠锋牸" align="center" prop="price" width="120px" />
+ <el-table-column label="濂楅鏄庣粏" align="center" prop="allProName" :show-overflow-tooltip="true" />
</el-table>
</div>
</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="
+ <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">
</el-input>
<div class="tab3">
- <el-tree
- class="filter-tree"
- v-loading="loading"
- :data="packageList"
- :props="defaultProp"
- show-checkbox
- node-key="id"
- @check="handlepackage"
- :default-checked-keys="checkedkeys"
- :filter-node-method="filterpackage"
- ref="treas"
- :render-content="renderContents"
- >
+ <el-tree class="filter-tree" v-loading="loading" :data="packageList" :props="defaultProp" show-checkbox
+ node-key="id" @check="handlepackage" :default-checked-keys="checkedkeys"
+ :filter-node-method="filterpackage" ref="treas" :render-content="renderContents">
</el-tree>
</div>
</el-col>
- <el-col :span="6">
- <div
- style="
+ <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="packagedataList"
- node-key="proId"
- :props="defaultpackProps"
- :filter-node-method="filterpackage"
- @check-change="handlePackageChecked"
- :default-checked-keys="checkedListkey1"
- :render-content="renderContent"
- >
+ <el-tree class="filter-tree" v-loading="loading" :data="packagedataList" node-key="proId"
+ :props="defaultpackProps" :filter-node-method="filterpackage" @check-change="handlePackageChecked"
+ :default-checked-keys="checkedListkey1" :render-content="renderContent">
</el-tree>
</div>
</el-col>
<el-col :span="11">
<div class="grid-content bg-purple">
- <div
- style="
+ <div style="
text-align: center;
margin-bottom: 10px;
margin-top: 10px;
- "
- >
+ ">
宸查�夐」鐩垪琛�
</div>
- <el-table
- :data="DataLists"
- border
- style="width: 100%"
- height="400"
- :span-method="objectspanmethod"
- >
+ <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 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"
- >
+ <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="handleDel(scope.row)"
- title="鍒犻櫎"
- ></el-button>
+ <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDel(scope.row)"
+ title="鍒犻櫎"></el-button>
</template>
</el-table-column>
</el-table>
@@ -711,134 +381,72 @@
</div>
</el-col>
</el-row>
- <!-- </div> -->
</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
- style="
+ <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">
@@ -851,197 +459,81 @@
<el-col :span="15">
<div class="grid-content bg-purple">
<template>
- <el-form
- :model="form"
- :inline="true"
- label-width="75px"
- style="margin-left: 20px; width: 900px"
- >
+ <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-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 :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-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 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-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"
- :disabled="!form.firmId && dict.value === '1'"
- ></el-option>
+ <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>
<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 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: 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="2"
- :step="0.1"
- :max="10"
- :min="0"
- @change="numberChange"
- :disabled="isfalse"
- ></el-input-number>
+ <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"
- ></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="submitCheckinfee"
- :disabled="confirm"
- v-if="showHidden.has_charge == 'Y'"
- size="mini"
- >鐧昏鏀惰垂</el-button
- >
+ <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="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>
<!-- </el-form> -->
<!-- </div> -->
</el-form>
</template>
- <el-dialog
- title="閭瘎"
- :visible.sync="malldisble"
- :close-on-click-modal="false"
- >
- <el-form
- :model="addAddress"
- :rules="rules"
- label-width="78px"
- style="margin-left: 7px"
- >
+ <el-dialog title="閭瘎" :visible.sync="malldisble" :close-on-click-modal="false">
+ <el-form :model="addAddress" :rules="rules" label-width="78px" style="margin-left: 7px">
<el-form-item label="濮撳悕">
- <el-input
- placeholder="濮撳悕"
- v-model="addAddress.getUser"
- ></el-input>
+ <el-input placeholder="濮撳悕" v-model="addAddress.getUser"></el-input>
</el-form-item>
<el-form-item label="鐢佃瘽">
- <el-input
- placeholder="鐢佃瘽"
- v-model="addAddress.phone"
- ></el-input>
+ <el-input placeholder="鐢佃瘽" v-model="addAddress.phone"></el-input>
</el-form-item>
<el-form-item label="鍦板潃">
- <el-input
- placeholder="鍦板潃"
- v-model="addAddress.address"
- ></el-input>
+ <el-input placeholder="鍦板潃" v-model="addAddress.address"></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -1050,44 +542,45 @@
</div>
</el-dialog>
- <div
- style="
+ <div style="
display: flex;
align-items: center;
justify-content: flex-start;
width: 100%;
- "
- >
- <div
- style="
+ ">
+ <div style="
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
margin-left: 46px;
font-size: 16px;
margin-right: 20px;
- "
- >
+ ">
<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
- >鏉�
+ 宸查�夐」鐩潯鏁帮細<span style="font-weight: 700; color: red; margin-right: 5px">{{ this.tableData1.length || 0
+ }}</span>鏉�
</div>
宸查�夐」鐩垪琛�
</div>
- <div
- style="
+
+ <div v-loading="contentLoading" element-loading-text="鍔犺浇涓�..." element-loading-spinner="el-icon-loading" element-loading-background="rgba(255, 255, 255, 0.7)" style=" padding: 0px 6px;
+ border: 1px solid #e6ebf5;
+ max-height: 650%;
+ overflow: auto;
+ width: 916px;
+ margin-left: 35px;" >
+
+
+ <div style="
padding: 0px 6px;
border: 1px solid #e6ebf5;
max-height: 650%;
overflow: auto;
width: 916px;
margin-left: 35px;
- "
- >
+ ">
<el-table :data="tableData1" border style="width: 100%">
<el-table-column prop="proName" label="椤圭洰" width="180">
</el-table-column>
@@ -1095,10 +588,7 @@
<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"
- />
+ <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.proType" />
</template>
</template>
</el-table-column>
@@ -1108,27 +598,20 @@
<el-table-column label="鎶樻墸">
<template slot-scope="scope">
<!-- 鍙緭鍏ョ函鏁板瓧鎶樻墸 -->
- <el-input
- v-model.number="scope.row.discount"
- @input="validateDiscount(scope.row)"
- placeholder="杈撳叆鎶樻墸"
- size="small"
- type="number"
- min="0"
- step="1"
- max="10"
- >
- </el-input>
+ <el-input-number v-model.number="scope.row.discount" @input="validateDiscount(scope.row)"
+ @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>
<el-table-column prop="nowPrice" label="瀹炴敹閲戦">
+ <template slot-scope="scope">
+ {{ scope.row.nowPrice.toFixed(2) }}
+ </template>
</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"
- />
+ <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.proCheckMethod" />
</template>
</el-table-column>
<!-- <el-table-column prop="proCheckMethod" label="鍏垂">
@@ -1140,179 +623,74 @@
</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 size="mini" type="text" icon="el-icon-delete" @click="handleDelete1(scope.row)" title="鍒犻櫎">
</el-button>
</template>
</el-table-column>
</el-table>
</div>
+ </div>
</div>
</el-col>
</el-row>
- <el-dialog
- title="瀵兼鍗曢瑙�"
- :visible.sync="dialogVisibles"
- :close-on-click-modal="false"
- >
+ <el-dialog title="瀵兼鍗曢瑙�" :visible.sync="dialogVisibles" :close-on-click-modal="false">
<div class="main">
- <iframe
- id="printIframe"
- :src="url"
- frameborder="0"
- style="width: 100%; height: 100%"
- ></iframe>
+ <iframe id="printIframe" :src="url" frameborder="0" style="width: 100%; height: 100%"></iframe>
</div>
</el-dialog>
<el-dialog title="鏀惰垂" :visible.sync="charge" width="59%" height="700px">
<div>
- <el-table
- id="sig"
- v-loading="loading"
- :data="feeitems"
- @selection-change="handleSelect"
- tooltip-effect="dark"
- ref="multipleTable"
- border
- >
+ <el-table id="sig" v-loading="loading" :data="feeitems" @selection-change="handleSelect" tooltip-effect="dark"
+ ref="multipleTable" border>
<el-table-column type="selection" width="55" align="center" />
- <el-table-column
- label="濮撳悕"
- align="center"
- prop="tjName"
- width="100px"
- />
+ <el-table-column label="濮撳悕" align="center" prop="tjName" width="100px" />
<el-table-column label="鎬у埆" align="center" prop="sex" width="90px">
<template slot-scope="scope">
- <dict-tag
- :options="dict.type.sys_user_sex"
- :value="scope.row.sex"
- />
+ <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex" />
</template>
</el-table-column>
- <el-table-column
- label="韬唤璇�"
- align="center"
- prop="idCard"
- width="150px"
- :show-overflow-tooltip="true"
- ></el-table-column>
- <el-table-column
- label="鎵嬫満鍙�"
- align="center"
- prop="tjPhone"
- width="120px"
- :show-overflow-tooltip="true"
- ></el-table-column>
- <el-table-column
- label="浣撴鍙�"
- align="center"
- prop="tjNumber"
- width="160px"
- />
- <el-table-column
- label="鐧昏鏃堕棿"
- align="center"
- prop="tjFlowingWater.createTime"
- :show-overflow-tooltip="true"
- ></el-table-column>
- <el-table-column
- label="鍗曚綅鍚嶇О"
- align="center"
- prop="tjComp"
- ></el-table-column>
- <el-table-column
- label="浣撴绫诲瀷"
- align="center"
- prop="tjType"
- width="80px"
- >
+ <el-table-column label="韬唤璇�" align="center" prop="idCard" width="150px"
+ :show-overflow-tooltip="true"></el-table-column>
+ <el-table-column label="鎵嬫満鍙�" align="center" prop="tjPhone" width="120px"
+ :show-overflow-tooltip="true"></el-table-column>
+ <el-table-column label="浣撴鍙�" align="center" prop="tjNumber" width="160px" />
+ <el-table-column label="鐧昏鏃堕棿" align="center" prop="tjFlowingWater.createTime"
+ :show-overflow-tooltip="true"></el-table-column>
+ <el-table-column label="鍗曚綅鍚嶇О" align="center" prop="tjComp"></el-table-column>
+ <el-table-column label="浣撴绫诲瀷" align="center" prop="tjType" width="80px">
<template slot-scope="scope">
- <dict-tag
- :options="dict.type.dict_team"
- :value="scope.row.tjType"
- />
+ <dict-tag :options="dict.type.dict_team" :value="scope.row.tjType" />
</template>
</el-table-column>
- <el-table-column
- label="璁㈠崟娴佹按鍙�"
- align="center"
- prop="tjFlowingWater.waterId"
- width="200px"
- />
- <el-table-column
- label="鏀惰垂鍛�"
- align="center"
- prop="tjFlowingWater.updateBy"
- width="100px"
- />
+ <el-table-column label="璁㈠崟娴佹按鍙�" align="center" prop="tjFlowingWater.waterId" width="200px" />
+ <el-table-column label="鏀惰垂鍛�" align="center" prop="tjFlowingWater.updateBy" width="100px" />
</el-table>
<el-row :gutter="10" class="mb8">
<el-col :span="20">
- <el-form
- :inline="true"
- :model="formInline"
- class="demo-form-inline"
- style="margin: 12px 6px"
- >
+ <el-form :inline="true" :model="formInline" class="demo-form-inline" style="margin: 12px 6px">
<el-form-item label="搴旀敹閲戦">
- <el-input
- style="width: 86px"
- :value="formInline.price + '.00'"
- placeholder="閲戦"
- :disabled="true"
- ></el-input>
+ <el-input style="width: 86px" :value="formInline.price + '.00'" placeholder="閲戦"
+ :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="0"
- @change="numberChange"
- :disabled="isfalse"
- ></el-input-number>
+ <el-input-number style="width: 140px" 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
- v-model="formInline.paidIn"
- placeholder="瀹炰粯"
- style="width: 94px"
- >
+ <el-input v-model="formInline.paidIn" placeholder="瀹炰粯" style="width: 94px">
</el-input>
</el-form-item>
<el-form-item label="浠樻绫诲瀷" prop="payType">
- <el-select
- style="width: 120px"
- v-model="formInline.payType"
- placeholder="璇烽�夋嫨浠樻绫诲瀷"
- >
- <el-option
- v-for="dict in dict.type.dict_pay_type"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
+ <el-select style="width: 120px" v-model="formInline.payType" placeholder="璇烽�夋嫨浠樻绫诲瀷">
+ <el-option v-for="dict in dict.type.dict_pay_type" :key="dict.value" :label="dict.label"
+ :value="dict.value"></el-option>
</el-select>
</el-form-item>
<el-form-item>
- <el-button
- style="margin-left: 15px"
- type="primary"
- size="mini"
- @click="SubmitEvent"
- >鏀惰垂</el-button
- >
+ <el-button style="margin-left: 15px" type="primary" size="mini" @click="SubmitEvent">鏀惰垂</el-button>
</el-form-item>
</el-form>
</el-col>
@@ -1326,24 +704,15 @@
</el-table>
</div>
</el-dialog>
- <el-dialog
- title="鎻愮ず"
- :visible.sync="cardreader"
- width="30%"
- :close-on-press-escape="false"
- :close-on-click-modal="false"
- >
+ <el-dialog title="鎻愮ず" :visible.sync="cardreader" width="30%" :close-on-press-escape="false"
+ :close-on-click-modal="false">
<template>
<el-radio-group v-model="cardreaderradio" @input="changeradio">
<el-radio :label="3">韬唤璇�</el-radio>
<el-radio :label="6">鍋ュ悍鐮�</el-radio>
</el-radio-group>
<div style="margin-top: 10px" v-show="cardreaderradio == 6">
- <el-input
- v-model="inputSSS"
- ref="tableHeadFilterInp"
- placeholder="璇疯緭鍏ュ唴瀹�"
- ></el-input>
+ <el-input v-model="inputSSS" ref="tableHeadFilterInp" placeholder="璇疯緭鍏ュ唴瀹�"></el-input>
</div>
</template>
<span slot="footer" class="dialog-footer">
@@ -1352,11 +721,7 @@
</span>
</el-dialog>
<div style="position: absolute; bottom: 100px; width: 360px; display: none">
- <div
- id="printBill"
- style="width: 280px; font-size: 1px"
- ref="printContent"
- >
+ <div id="printBill" style="width: 280px; font-size: 1px" ref="printContent">
<div style="font-size: 1px">
<div style="text-align: center">
<h3>{{ hospName }}灏忕エ</h3>
@@ -1396,6 +761,7 @@
<Packages ref="aaa" @add="handleChanges" />
<selectName ref="bbb" @add="handleChangesName" />
</div>
+</div>
</template>
<script>
@@ -1410,6 +776,7 @@
getByTjNum,
} from "@/api/hosp/customer";
import { getPrintSetUp } from "@/api/system/examcharge";
+import cnchar from "cnchar";
import {
tuantiSelect,
deptTreeSelect,
@@ -1421,15 +788,12 @@
getPackageListName,
getaddtTransition,
tuantiqueren,
- getTransitionList,
getTransitionList1,
- getByTeamNo,
delTbBycusCardIdAndProId,
getLoadFile,
getIsRequired,
getconfigKey,
getHistryTjOrderProByCusIdCard,
- readCertCardInfos,
gaibianzhekou,
} from "@/api/system/tijian";
import { addComp } from "@/api/system/comp";
@@ -1452,6 +816,7 @@
"dict_job",
"dict_user_cardtype",
"dict_ageunit",
+ "gz",
],
name: "Tijian",
components: {
@@ -1462,6 +827,9 @@
},
data() {
return {
+ isSubmitting: false,
+ contentLoading: false,
+ isLoading: false,
open1: false,
filterage: "",
checkedkeys: [],
@@ -1523,7 +891,6 @@
taocan: false,
top: true,
value: "2",
- getInfodis: "",
srcUrl: "",
hides: false,
hide: true,
@@ -1663,7 +1030,7 @@
cusIsvip: null,
},
// 娣诲姞
-
+ lastXianPrice: 0,
// 琛ㄥ崟鍙傛暟
// 琛ㄥ崟鍙傛暟
obj: {},
@@ -1679,7 +1046,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: {
@@ -1700,6 +1087,7 @@
contactPhone: [
{
required: true,
+ message: "",
trigger: "blur",
},
{
@@ -1727,15 +1115,34 @@
// this.getData();
},
- mounted() {},
-
+ mounted() {
+ this.TreedataList = [];
+ this.DataList = [];
+ this.marryall = 0;
+ },
methods: {
+ handleIdCardInput(value) {
+ this.form.cusIdcard = value.replace(/\s/g, "");
+ this.inputChange(); // 淇濈暀鍘熸湁鐨勮韩浠借瘉杈撳叆澶勭悊閫昏緫
+ },
+ 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,
@@ -1763,16 +1170,22 @@
});
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
})
- .catch(() => {});
+ .catch(() => { });
+ },
+ handleManualChange(row) {
+ this.updateProPrice(row);
},
validateDiscount(row) {
- if (row.discount > 10) {
- row.discount = 10; // 寮哄埗灏嗗�艰缃负鏈�澶у��
- } else if (row.discount < 0) {
- row.discount = 0; // 寮哄埗灏嗗�艰缃负鏈�灏忓��
+ if (
+ this.TotalPrice !== undefined &&
+ !isNaN(this.TotalPrice) &&
+ this.TotalPrice !== this.lastXianPrice
+ ) {
+ this.updateProPrice1(row);
+ this.lastXianPrice = this.TotalPrice;
}
- this.updateProPrice(row); // 鏇存柊浠锋牸鎴栧叾浠栭�昏緫
},
+
isAll(value) {
return value === "" || value === null;
},
@@ -1789,7 +1202,37 @@
this.discount =
(Math.floor((this.TotalPrice / this.TotalPrice1) * 100) / 100) * 10;
},
+ updateProPrice1(row) {
+ 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 = "鎼滅储濮撳悕";
@@ -1836,11 +1279,9 @@
this.open1 = true;
this.title = "娣诲姞浣撴鍗曚綅淇℃伅缁存姢";
},
- idFn1(value) {
- if (value) {
- // console.log(value);
+ idFn1() {
+ if (this.form.firmName) {
const originalCompId = this.form.firmId;
- this.form.firmName = value;
this.CompanyList.forEach((item) => {
if (item.cnName == this.form.firmName) {
this.form.firmId = item.drugManufacturerId;
@@ -1850,9 +1291,12 @@
if (this.form.firmId === originalCompId) {
this.form.firmId = "";
}
- if (this.form.firmId) {
- this.form.tjType = "1";
- }
+ }
+
+ if (this.form.firmName) {
+ this.form.tjType = this.dict.type.dict_team[1].value;
+ } else {
+ this.form.tjType = this.dict.type.dict_team[0].value;
}
},
getCurrentDateTime() {
@@ -1885,20 +1329,43 @@
}, 1000); //姣忕閽熸洿鏂颁竴娆�
},
filterNode(value, data) {
- if (!value) return true;
+ // if (!value) return true;
// return data.proName.indexOf(value) !== -1;
- if (data.proName.indexOf(value) !== -1) {
- return data.proName.indexOf(value) !== -1;
- } else {
- return data.proEngName.indexOf(value) !== -1;
+ // if (data.proName.indexOf(value) !== -1) {
+ // return data.proName.indexOf(value) !== -1;
+ // } else {
+ // return data.proEngName.indexOf(value) !== -1;
+ // }
+ if (!value) return true;
+ if (data.proName.indexOf(value) !== -1) return true;
+ let values = value.toLowerCase();
+ if (data.proEngName.indexOf(values) !== -1) return true;
+
+ // 鍖归厤灏忓啓
+ let arr = data.proName.spell("low", "array");
+ let spell = arr.join("");
+ let lengths = [0];
+ for (var i = 0; i < arr.length - 1; i++) {
+ lengths.push(lengths[i] + arr[i].length);
}
+ //鍒ゆ柇label瀹屾暣鎷奸煶 涓� 杈撳叆鍊肩殑 index 鏄笉鏄瓑浜庢煇涓眽瀛楃涓�涓嫾闊冲瓧姣嶇殑index鍊�
+ if (lengths.indexOf(spell.indexOf(value)) !== -1) return true;
+ // 澶у啓
+ let arrUp = data.proName.spell("up", "array");
+ let spellUp = arrUp.join("");
+ let lengthsUp = [0];
+ for (var i = 0; i < arrUp.length - 1; i++) {
+ lengthsUp.push(lengthsUp[i] + arrUp[i].length);
+ }
+ return lengthsUp.indexOf(spellUp.indexOf(value)) !== -1;
},
filterpackage(value, data) {
if (!value) return true;
if (data.zhmc.indexOf(value) !== -1) {
return data.zhmc.indexOf(value) !== -1;
} else {
- return data.pym.indexOf(value) !== -1;
+ let values = value.toLowerCase();
+ return data.pym.indexOf(values) !== -1;
}
},
beforeDestroy() {
@@ -1913,11 +1380,7 @@
},
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;
@@ -1943,8 +1406,8 @@
d.getFullYear() -
birthdays.getFullYear() -
(d.getMonth() < birthdays.getMonth() ||
- (d.getMonth() == birthdays.getMonth() &&
- d.getDate() < birthdays.getDate())
+ (d.getMonth() == birthdays.getMonth() &&
+ d.getDate() < birthdays.getDate())
? 1
: 0);
this.form.cusSex = sex;
@@ -2017,6 +1480,8 @@
this.TotalPrice1 = 0;
if (this.tableData1) {
this.tableData1.forEach((item) => {
+ // parseFloat(item.nowPrice.toFixed(2))
+
this.TotalPrice1 += item.ordPrice;
this.TotalPrice += item.nowPrice;
if (item.pacName === null) {
@@ -2101,7 +1566,7 @@
_this.thisVideo.play();
};
})
- .catch((err) => {});
+ .catch((err) => { });
},
// 缁樺埗鍥剧墖锛堟媿鐓у姛鑳斤級
@@ -2130,47 +1595,18 @@
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("纭鍏抽棴锛�")
.then((_) => {
done();
})
- .catch((_) => {});
+ .catch((_) => { });
},
/** 鏌ヨ淇℃伅鍒楄〃 */
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;
- }
- });
+ getInfo().then((response) => { });
let cusSex = this.form.cusSex;
//鍏ㄩ儴濂楅
if (cusSex) {
@@ -2221,8 +1657,6 @@
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
- // this.resetForm("form");
- // this.form = {};
if (this.confirm === true) {
this.$tab.refreshPage();
} else {
@@ -2237,7 +1671,7 @@
pacId: "",
proIds: [],
};
- getaddtTransition(data).then((response) => {});
+ getaddtTransition(data).then((response) => { });
this.$tab.refreshPage();
});
} else {
@@ -2255,57 +1689,118 @@
})
.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)
+ 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) {
+ // 濡傛灉鐜颁环娌℃湁鍙樺寲锛岀洿鎺ヨ繑鍥�
+ 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;
- this.$refs["form"].validate((valid) => {
- if (valid) {
- // return;
- if (this.form.cusSex === "濂�") {
- this.form.cusSex = 1;
- }
- if (this.form.cusSex === "鐢�") {
- this.form.cusSex = 0;
- }
- if (this.form.cusSex === "鏈煡") {
- this.form.cusSex = 2;
- }
- if (this.form.tjType === "") {
- this.form.tjType = this.dict.type.dict_team[0].value;
- }
+ if (!this.form.cusPhone || !this.form.cusName) {
+ this.$message.warning("璇峰～鍐欏繀濉」");
+ } else {
+ this.$refs["form"].validate((valid) => {
+ if (valid) {
+ // 鍒涘缓琛ㄥ崟鏁版嵁鐨勫壇鏈苟鍘婚櫎绌烘牸
+ const formData = { ...this.form };
+ formData.cusName = formData.cusName
+ ? formData.cusName.replace(/\s/g, "")
+ : "";
+ formData.cusPhone = formData.cusPhone
+ ? formData.cusPhone.replace(/\s/g, "")
+ : "";
+ formData.cusIdcard = formData.cusIdcard
+ ? formData.cusIdcard.replace(/\s/g, "")
+ : "";
- addCustomer(this.form).then((response) => {
- this.responseList = response.data;
+ // 澶勭悊鎬у埆鍊�
+ if (formData.cusSex === "濂�") {
+ formData.cusSex = 1;
+ }
+ if (formData.cusSex === "鐢�") {
+ formData.cusSex = 0;
+ }
+ if (formData.cusSex === "鏈煡") {
+ formData.cusSex = 2;
+ }
+ if (formData.tjType === "") {
+ formData.tjType = this.dict.type.dict_team[0].value;
+ }
- this.$modal.msgSuccess("鏂板鎴愬姛");
+ addCustomer(formData).then((response) => {
+ this.responseList = response.data;
+ this.form.tjType = this.dict.type.dict_team[0].value;
+ this.$modal.msgSuccess("鏂板鎴愬姛");
+ _this.tcShow = true;
+ _this.isDisabled = true;
+ _this.top = false;
+ });
+ }
+ });
+ }
- _this.tcShow = true;
- _this.isDisabled = true;
- _this.top = false;
- });
- }
- });
},
getmailType() {
@@ -2324,6 +1819,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) {
@@ -2343,7 +1839,7 @@
if (this.form.reservationId != null) {
if (this.form.groupingId) {
this.form.firmName = this.form.compName;
- this.form.tjType = "1";
+ this.form.tjType = this.dict.type.dict_team[1].value;
this.CompanyList.forEach((item) => {
if (item.cnName == this.form.firmName) {
this.form.firmId = item.drugManufacturerId;
@@ -2364,11 +1860,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 {
@@ -2460,13 +1956,10 @@
var resultObj = eval("(" + event.data + ")");
this.readCardWebSocket(resultObj);
};
- websocket.onclose = function () {
- 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;
@@ -2480,11 +1973,15 @@
// 鏈�鏂颁娇鐢╳ebSocket閫氫俊
readCardWebSocket(resultObj) {
let _this = this;
-
+ const isChineseChar = (char) => /[\u4E00-\u9FA5]/.test(char)
if (resultObj.code === 200 && resultObj.data.name != null) {
//鍥炴樉鐩稿叧鏁版嵁
_this.form.cusName = resultObj.data.name;
- _this.form.cusSex = resultObj.data.sex == "0" ? "濂�" : "鐢�";
+ if (isChineseChar(resultObj.data.sex)) {
+ _this.form.cusSex = resultObj.data.sex == "濂�" ? 1 : 0
+ } else {
+ _this.form.cusSex = resultObj.data.sex;
+ }
_this.form.cusNational = resultObj.data.mz;
_this.form.cusBrithday = resultObj.data.csrq;
if (_this.form.cusBrithday) {
@@ -2510,8 +2007,8 @@
d.getFullYear() -
birthdays.getFullYear() -
(d.getMonth() < birthdays.getMonth() ||
- (d.getMonth() == birthdays.getMonth() &&
- d.getDate() < birthdays.getDate())
+ (d.getMonth() == birthdays.getMonth() &&
+ d.getDate() < birthdays.getDate())
? 1
: 0);
_this.form.age = age; // 璧嬪�艰绠楃殑骞撮緞
@@ -2524,15 +2021,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) {
@@ -2547,7 +2036,7 @@
//鍥炴樉鐩稿叧鏁版嵁
_this.form.cusName = resultObj.resultContent.partyName;
_this.form.cusSex =
- resultObj.resultContent.gender == "0" ? "濂�" : "鐢�";
+ resultObj.resultContent.gender ;
_this.form.cusNational = resultObj.resultContent.nation;
_this.form.cusBrithday = resultObj.resultContent.bornDay;
if (_this.form.cusBrithday) {
@@ -2666,8 +2155,8 @@
d.getFullYear() -
birthdays.getFullYear() -
(d.getMonth() < birthdays.getMonth() ||
- (d.getMonth() == birthdays.getMonth() &&
- d.getDate() < birthdays.getDate())
+ (d.getMonth() == birthdays.getMonth() &&
+ d.getDate() < birthdays.getDate())
? 1
: 0);
@@ -2684,23 +2173,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) {
@@ -2782,8 +2257,8 @@
d.getFullYear() -
birthdays.getFullYear() -
(d.getMonth() < birthdays.getMonth() ||
- (d.getMonth() == birthdays.getMonth() &&
- d.getDate() < birthdays.getDate())
+ (d.getMonth() == birthdays.getMonth() &&
+ d.getDate() < birthdays.getDate())
? 1
: 0);
@@ -2830,6 +2305,9 @@
// 鍙栨秷鎸夐挳
cancel() {
+ this.TreedataList = [];
+ this.DataList = [];
+ this.marryall = 0; // 閲嶇疆鍚堣
this.Seachopen = false;
this.taocan = false;
this.malldisble = false;
@@ -2854,7 +2332,8 @@
dwId: this.form.firmId,
};
if (this.name) {
- getPackageListName(this.name).then((response) => {
+ let name= this.name.toLowerCase()
+ getPackageListName(name).then((response) => {
this.newpacName = response.data;
this.loading = false;
});
@@ -2873,53 +2352,6 @@
}
},
- // 鐐瑰嚮澶氶�夋鑾峰彇閫変腑鏁版嵁
- // 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) {
@@ -2931,6 +2363,12 @@
_this.pacId = "";
this.proIds = [];
this.tjCategory = "12";
+
+ this.DataList = []; // 娓呯┖宸查�夐」鐩垪琛�
+ this.checkedkey = []; // 娓呯┖鏍戠殑閫変腑鐘舵��
+ this.checkedListkey = [];
+ this.TreedataList = [];
+
let data = {
cusId,
pacId: _this.pacId,
@@ -2958,6 +2396,11 @@
Package() {
this.activeNames = "first";
+ if (this.form.cusSex == "鐢�") {
+ this.form.cusSex = 0;
+ } else if (this.form.cusSex == "濂�") {
+ _this.form.cusSex = 1;
+ }
let cusSex = this.form.cusSex;
this.datekey = Date.now();
//鍏ㄩ儴濂楅
@@ -2967,10 +2410,33 @@
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 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;
@@ -2992,7 +2458,7 @@
});
});
}
- } catch (error) {}
+ } catch (error) { }
this.loading = false;
});
}
@@ -3016,7 +2482,7 @@
});
});
}
- } catch (error) {}
+ } catch (error) { }
this.loading = false;
});
}
@@ -3106,12 +2572,18 @@
},
handleClick(tab, event) {
if (this.activeNames == "second") {
+ console.log(this.form);
+
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;
@@ -3120,16 +2592,25 @@
});
}
},
- // gaibian(val){
- // let pname = val;
- // getProParentIdDxList(pname).then(response=>{
- // this.Treedata = response.data.list;
- // })
- // },
getDataList() {
this.loading = true;
- getProParentIdDxList().then((response) => {
+ console.log(this.form);
+
+ getProParentIdDxList(this.form.cusSex).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) => {
@@ -3140,8 +2621,68 @@
});
});
}
+
+ // 鍥炴樉 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) {
@@ -3171,7 +2712,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) {
@@ -3209,16 +2750,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) {
@@ -3245,32 +2776,40 @@
});
}
},
- // 鐐瑰嚮鑾峰彇姣忎釜鏍戣妭鐐�
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);
});
}
});
@@ -3384,125 +2923,129 @@
// 椤圭洰鎻愪氦
submit() {
+ this.isLoading = true;
if (this.form.cusIdcard) {
var cusId = this.form.cusIdcard;
} else {
this.$message.warning("璇峰厛濉啓淇℃伅锛屽啀閫変綋妫�鍐呭");
+ return; // 濡傛灉娌℃湁韬唤璇佸彿鐮侊紝鍋滄鎵ц
}
+
let _this = this;
+
+ // 鍒濆鍖栧彉閲�
+ this.isSubmitting = true; // 寮�濮嬫彁浜ゆ椂璁剧疆鏍囧織
+ this.TotalPrice1 = 0; // 鍒濆鍖栧簲鏀堕噾棰�
+ this.TotalPrice = 0; // 鍒濆鍖栧疄鏀堕噾棰�
+
+ this.contentLoading = true;
+ 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) {
- 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.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 {
- }
- });
+ // 鏍规嵁浣撴绫诲瀷閫夋嫨涓嶅悓鐨勫鐞嗘柟娉�
+ if (this.form.firmId) {
+ tuantiqueren(data)
+ .then((response) => {
+ if (response.code == 200) {
+ this.processOrderItems(cusId);
+ }
+ this.isSubmitting = false; // 鎻愪氦瀹屾垚鍚庨噸缃爣蹇�
+ this.isLoading = false;
+ })
+ .catch(() => {
+ this.isSubmitting = false; // 纭繚鍦ㄩ敊璇儏鍐典笅涔熼噸缃爣蹇�
+ this.isLoading = 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.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 {
- }
- });
+ getaddtTransition(data)
+ .then((response) => {
+ if (response.code == 200) {
+ this.processOrderItems(cusId);
+ }
+ this.isSubmitting = false; // 鎻愪氦瀹屾垚鍚庨噸缃爣蹇�
+ this.isLoading = false;
+ // this.contentLoading = false;
+ })
+ .catch(() => {
+ this.isSubmitting = false; // 纭繚鍦ㄩ敊璇儏鍐典笅涔熼噸缃爣蹇�
+ this.isLoading = false;
+ // this.contentLoading = false;
+ });
}
+
this.taocan = false;
this.defaultKeys = [];
this.DataLists = [];
},
+
+ // 澶勭悊璁㈠崟椤圭洰
+ processOrderItems(cusId) {
+ getTransitionList1(cusId).then((response) => {
+ this.contentLoading = false;
+ this.tableData1 = response.data;
+ let Price = 0;
+ if (this.tableData1) {
+ this.tableData1.forEach((item) => {
+ if (typeof item.nowPrice === 'number') {
+ item.nowPrice = Number(item.nowPrice.toFixed(2));
+ }
+ 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; // 绱姞搴旀敹閲戦
+ Price += item.nowPrice || 0; // 绱姞瀹炴敹閲戦
+ this.TotalPrice = Price.toFixed(2);
+ });
+ // 璁＄畻鎶樻墸
+ 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 {
@@ -3513,7 +3056,20 @@
var pacId = this.tableData[0].pacId;
}
- //tjOrderList//杩欎釜鏄鐞嗗畬鐨勬瘡涓�椤瑰椁愪俊鎭�
+ // 鍘荤┖鏍煎鐞�
+ const processedForm = {
+ ...this.form,
+ cusName: this.form.cusName
+ ? this.form.cusName.replace(/\s/g, "")
+ : "",
+ cusPhone: this.form.cusPhone
+ ? this.form.cusPhone.replace(/\s/g, "")
+ : "",
+ cusIdcard: this.form.cusIdcard
+ ? this.form.cusIdcard.replace(/\s/g, "")
+ : "",
+ };
+
List.forEach((item) => {
if (item.list) {
item.list.forEach((item1) => {
@@ -3539,6 +3095,7 @@
});
}
});
+
let copeWith = this.TotalPrice1;
let paidIn = this.TotalPrice.toString();
let discount = this.discount;
@@ -3556,6 +3113,10 @@
getType: this.getType,
addAddress: this.addAddress,
tjCategory: this.tjCategory,
+ // 浣跨敤鍘绘帀绌烘牸鍚庣殑鏁版嵁
+ cusName: processedForm.cusName,
+ cusPhone: processedForm.cusPhone,
+ cusIdcard: processedForm.cusIdcard,
};
} else {
data = {
@@ -3566,8 +3127,13 @@
tjType,
getType: this.getType,
tjCategory: this.tjCategory,
+ // 浣跨敤鍘绘帀绌烘牸鍚庣殑鏁版嵁
+ cusName: processedForm.cusName,
+ cusPhone: processedForm.cusPhone,
+ cusIdcard: processedForm.cusIdcard,
};
}
+
getOrder(data).then((res) => {
this.$modal.msgSuccess("鎻愪氦鎴愬姛");
this.tjNumbers = res.msg;
@@ -3663,9 +3229,6 @@
}
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";
@@ -3744,10 +3307,15 @@
},
listgetOrder(data) {
+ const loading = this.$loading({
+ lock: true,
+ text: '姝ｅ湪鍔犺浇涓紝璇风◢绛夛紒',
+ spinner: 'el-icon-loading',
+ background: 'rgba(0, 0, 0, 0.7)'
+ });
getOrder(data).then((res) => {
+ loading.close();
this.$modal.msgSuccess("鎻愪氦鎴愬姛");
- // this.dialogVisibles = true;
- // this.url = window.webkitURL.createObjectURL(res); //灏嗗悗绔繑鍥炵殑blob鏂囦欢璇诲彇鍑簎rl
//璋冩帴鍙ｆ樉绀哄妫�鍗�
const tjNumber = res.msg;
const viewNum = "792931586196398080";
@@ -3761,8 +3329,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;
@@ -3810,10 +3378,11 @@
discount: item.discount,
parentProId: item.parentProId,
cusIdCard: item.cusId,
+ yhj: item.nowPrice,
})); // 鍒涘缓鏂扮殑瀵硅薄锛屽寘鍚� discount 鍜� id
gaibianzhekou(newArray).then((res) => {
+ this.loadingSubmit = false;
if (res.code === 200) {
- this.loadingSubmit = false;
let data;
if (pacId || this.tjOrderList.length > 0) {
@@ -3845,6 +3414,7 @@
};
this.listgetOrder(data);
} else {
+ this.loadingSubmit = false;
this.$message({
type: "warning ",
message: "璇烽�夋嫨濂楅!",
@@ -3914,11 +3484,10 @@
}
.filter-tree {
- /* max-height: 360px;
overflow-y: auto;
- border: 1px solid #d9d9d9; */
- overflow: auto;
- flex: 1;
+ /* 淇濈暀绾靛悜婊氬姩鏉� */
+ overflow-x: hidden;
+ /* 闅愯棌妯悜婊氬姩鏉� */
height: 350px;
}
@@ -4029,4 +3598,17 @@
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