From c699c544034a0e57e9881fc99930eddfa75c9f8c Mon Sep 17 00:00:00 2001
From: wwl <xchao828@163.com>
Date: 星期四, 13 二月 2025 16:43:18 +0800
Subject: [PATCH] 1

---
 src/views/system/tijian/index.vue | 2624 +++++++++++++++++++++++------------------------------------
 1 files changed, 1,025 insertions(+), 1,599 deletions(-)

diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue
index 7dcebe1..5faa56e 100644
--- a/src/views/system/tijian/index.vue
+++ b/src/views/system/tijian/index.vue
@@ -1,18 +1,7 @@
 <template>
   <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 +18,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 +48,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,152 +64,90 @@
     <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();
+                  }
                 },
-              ]"
-            >
-              <el-input
-                v-model="form.cusName"
-                placeholder="璇疯緭鍏ュ鍚�"
-                :disabled="isDisabled"
-              />
+                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-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="inputChange" />
               <!-- <i style="
                     font-size: 1rem;
                     position: absolute;
@@ -250,190 +158,82 @@
             </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="璇疯緭鍏ヨ仈绯荤數璇�" :disabled="isDisabled" />
             </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-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-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="dictCompId">
-              <el-select
-                :remote-method="getRemoteData"
-                v-model="form.compName"
-                remote
-                filterable
-                style="width: 300px"
-                placeholder="璇烽�夋嫨鍗曚綅鍚嶇О"
-                clearable
-                @change="idFn1"
-              >
-                <el-option
-                  v-for="dict in CompanyList"
-                  :key="dict.cnName"
-                  :label="dict.cnName"
-                  :value="dict.drugManufacturerId"
-                />
-              </el-select>
-              <i class="el-icon-circle-plus-outline" @click="handleAdd1"></i>
-            </el-form-item>
-
-            <el-form-item label="鏂囧寲绋嬪害" prop="wenHua">
-              <el-input
-                :disabled="isDisabled"
-                v-model="form.wenHua"
-                placeholder="璇疯緭鍏ユ枃鍖栫▼搴�"
-              />
+            <el-form-item label="鏂囧寲绋嬪害" prop="wenHua" label-width="93px">
+              <el-input :disabled="isDisabled" v-model="form.wenHua" placeholder="璇疯緭鍏ユ枃鍖栫▼搴�" />
             </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="璇疯緭鍏ユ埛鍙e湴鍧�"
-                    :disabled="isDisabled"
-                  />
+                  <el-input v-model="form.addr" placeholder="璇疯緭鍏ユ埛鍙e湴鍧�" :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>
@@ -442,35 +242,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>
@@ -478,258 +254,106 @@
       </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
-            ><br />
+            <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">
             <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"  size="mini" @click="submit">纭</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="姝e湪鍔犺浇涓�..."
-                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="姝e湪鍔犺浇涓�..." 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>
-            <!-- <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">
-          <!-- <div class="tab3"> -->
           <el-row :gutter="20" style="width: 100%">
-            <el-col :span="6">
-              <div
-                style="
-                  text-align: center;
-                  margin-bottom: 10px;
-                  margin-top: 10px;
-                "
-              >
+            <el-col :span="6" style="min-width: 200px">
+              <div style="text-align: center; margin-bottom: 10px; margin-top: 10px;">
                 椤圭洰鍒楄〃
               </div>
               <el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="filterage">
               </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="
-                  text-align: center;
-                  margin-bottom: 10px;
-                  margin-top: 10px;
-                "
-              >
+            <el-col :span="6" style="min-width: 200px">
+              <div style="text-align: center; margin-bottom: 10px; margin-top: 10px;">
                 鏄庣粏椤圭洰鍒楄〃
               </div>
               <div class="tab3">
-                <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>
@@ -738,156 +362,60 @@
               </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="
-                    text-align: center;
-                    margin-bottom: 10px;
-                    margin-top: 10px;
-                  "
-                >
-                  椤圭洰鍒楄〃
+          <el-row :gutter="20" style="width: 100%">
+            <el-col :span="6" style="min-width: 200px">
+              <div style="text-align: center; margin-bottom: 10px; margin-top: 10px;">
+                椤圭洰鍒楄〃
+              </div>
+              <el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="filterText" style="margin-bottom: 10px;">
+              </el-input>
+              <div class="tab3">
+                <el-tree class="filter-tree" v-loading="loading" :data="Treedata" :props="defaultProps" show-checkbox
+                  node-key="proId" @check="handleCurrentChecked" :default-checked-keys="checkedkey"
+                  :filter-node-method="filterNode" ref="tree" :render-content="renderContent">
+                </el-tree>
+              </div>
+            </el-col>
+            <el-col :span="6" style="min-width: 200px">
+              <div style="text-align: center; margin-bottom: 10px; margin-top: 10px;">
+                鏄庣粏椤圭洰鍒楄〃
+              </div>
+              <div class="tab3">
+                <el-tree class="filter-tree" v-loading="loading" :data="TreedataList" node-key="proId"
+                  :props="defaultProps" :filter-node-method="filterNode" show-checkbox
+                  @check-change="handleCurrentChecked1" :default-checked-keys="checkedListkey"
+                  :render-content="renderContent">
+                </el-tree>
+              </div>
+            </el-col>
+            <el-col :span="11">
+              <div class="grid-content bg-purple">
+                <div style="text-align: center; margin-bottom: 10px; margin-top: 10px;">
+                  宸查�夐」鐩垪琛�
                 </div>
-                <!-- @input="gaibian" -->
-                <el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="filterText">
-                </el-input>
-                <div class="tab3">
-                  <el-tree
-                    class="filter-tree"
-                    v-loading="loading"
-                    :data="Treedata"
-                    :props="defaultProps"
-                    show-checkbox
-                    node-key="proId"
-                    @check="handleCurrentChecked"
-                    :default-checked-keys="checkedkey"
-                    :filter-node-method="filterNode"
-                    ref="tree"
-                    :render-content="renderContent"
-                  >
-                  </el-tree>
-                </div>
-              </el-col>
-              <el-col :span="6">
-                <div
-                  style="
-                    text-align: center;
-                    margin-bottom: 10px;
-                    margin-top: 10px;
-                  "
-                >
-                  鏄庣粏椤圭洰鍒楄〃
-                </div>
-                <div class="tab3">
-                  <el-tree
-                    class="filter-tree"
-                    v-loading="loading"
-                    :data="TreedataList"
-                    node-key="proId"
-                    :props="defaultProps"
-                    :filter-node-method="filterNode"
-                    show-checkbox
-                    @check-change="handleCurrentChecked1"
-                    :default-checked-keys="checkedListkey"
-                    :render-content="renderContent"
-                  >
-                  </el-tree>
-                </div>
-              </el-col>
-              <el-col :span="11">
-                <div class="grid-content bg-purple">
-                  <div
-                    style="
-                      text-align: center;
-                      margin-bottom: 10px;
-                      margin-top: 10px;
-                    "
-                  >
-                    宸查�夐」鐩垪琛�
-                  </div>
-                  <el-table
-                    :data="DataList"
-                    border
-                    style="width: 100%"
-                    height="400"
-                    :span-method="objectSpanMethod"
-                  >
-                    <el-table-column prop="propinName" label="妫�鏌ラ」鐩�">
-                    </el-table-column>
-                    <el-table-column
-                      prop="proPrice"
-                      label="鍘熶环"
-                      width="56px"
-                    ></el-table-column>
-                    <el-table-column
-                      prop="proName"
-                      label="鏄庣粏椤圭洰"
-                      width="260px"
-                    >
-                    </el-table-column>
-
-                    <el-table-column
-                      label="鎿嶄綔"
-                      align="center"
-                      fixed="right"
-                      class-name="small-padding fixed-width"
-                      width="50px"
-                    >
-                      <template slot-scope="scope">
-                        <el-button
-                          size="mini"
-                          type="text"
-                          icon="el-icon-delete"
-                          @click="handleDelete(scope.row)"
-                          title="鍒犻櫎"
-                        ></el-button>
-                      </template>
-                    </el-table-column>
-                  </el-table>
-                  <h3 style="font-weight: 600">鍚堣锛歿{ marryall }}鍏�</h3>
-                  <!-- <el-collapse v-model="activeName" accordion v-if="list1">
-                    <div>
-                      <el-collapse-item title="璇烽�夋嫨椤圭洰">
-                        <el-table
-                          :data="DataList"
-                          border
-                          style="width: 100%"
-                          height="400"
-                          :span-method="objectSpanMethod"
-                        >
-                          <el-table-column
-                            prop="proName"
-                            label="椤圭洰"
-                            width="180"
-                          >
-                          </el-table-column>
-                          <el-table-column prop="ordPrice" label="鍘熶环">
-                          </el-table-column>
-                        </el-table>
-                      </el-collapse-item>
-                    </div>
-                  </el-collapse> -->
-                </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">
@@ -899,198 +427,82 @@
     <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"
-            >
-              <el-form-item label="浣撴绫诲瀷">
-                <el-select
-                  style="width: 150px"
-                  v-model="form.tjType"
-                  placeholder="璇烽�夋嫨浣撴绫诲瀷"
-                >
-                  <el-option
-                    v-for="dict in dict.type.dict_team"
-                    :key="dict.value"
-                    :label="dict.label"
-                    :value="dict.value"
-                  ></el-option>
+            <el-form :model="form" :inline="true" label-width="75px" style="margin-left: 20px; width: 900px">
+              <el-form-item label="濮撳悕" prop="cusName">
+                <span slot="label"> 濮撳悕 </span>
+                <el-input v-model="form.cusName" placeholder="璇疯緭鍏ュ鍚�" :disabled="isDisabled" />
+              </el-form-item>
+              <el-form-item label="鎬у埆" prop="cusSex">
+                <el-select :disabled="isDisabled" v-model="form.cusSex" placeholder="鎬у埆" style="width: 150px">
+                  <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label"
+                    :value="parseInt(dict.value)"></el-option>
                 </el-select>
               </el-form-item>
-
-              <!-- <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 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="浼樻儬">
-                <!-- <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 label="鍗曚綅鍚嶇О" prop="firmName">
+                <el-select v-model="form.firmName" remote default-first-option allow-create filterable
+                  style="width: 200px" placeholder="璇烽�夋嫨鍗曚綅鍚嶇О" clearable @change="idFn1" @clear="clear">
+                  <el-option v-for="dict in CompanyList" :key="dict.cnName" :label="dict.cnName" :value="dict.cnName" />
+                </el-select>
               </el-form-item>
-              <el-form-item label="瀹炴敹閲戦">
-                <el-input
-                  placeholder="瀹炴敹閲戦"
-                  v-model="TotalPrice"
-                  style="width: 150px"
-                ></el-input>
+              <el-form-item label="鍗曚綅閮ㄩ棬" prop="firmDeptName">
+                <el-input v-model="form.firmDeptName" style="width: 150px" placeholder="璇疯緭鍏ュ崟浣嶉儴闂�" @input="inputChange" />
               </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"
-                  ></el-option>
+              <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>
               <el-form-item label="浣撴绫诲埆">
-                <el-select
-                  style="width: 150px"
-                  v-model="tjCategory"
-                  placeholder="璇烽�夋嫨浣撴绫诲埆"
-                >
-                  <el-option
-                    v-for="dict in dict.type.dict_tjtype"
-                    :key="dict.value"
-                    :label="dict.label"
-                    :value="dict.value"
-                  ></el-option>
+                <el-select 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-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
-                  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"
-                  :disabled="confirm"
-                  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">
@@ -1099,321 +511,142 @@
             </div>
           </el-dialog>
 
-          <div style="text-align: center; margin-bottom: 10px">
+          <div style="
+              display: flex;
+              align-items: center;
+              justify-content: flex-start;
+              width: 100%;
+            ">
+            <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>鏉�
+            </div>
             宸查�夐」鐩垪琛�
           </div>
-          <div
-            style="
+          <div 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.pacName +
-                        ":" +
-                        item.parentName +
-                        " (搴旀敹閲戦:" +
-                        item.ordPrice +
-                        "鍏� / 瀹炴敹閲戦:" +
-                        item.nowPrice +
-                        "鍏�)"
-                      }}
-                    </div>
+            ">
+            <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>
+                </template>
+              </el-table-column>
 
-                    <div style="width: 20%">
-                      <el-button
-                        type="primary"
-                        @click="candelete(item)"
-                        style="float: right"
-                        >鍒� 闄�</el-button
-                      >
-                    </div>
-                  </template>
-                  <el-table
-                    :data="item.list"
-                    border
-                    style="width: 100%"
-                    height="270"
-                  >
-                    <el-table-column prop="s" 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>
-                    <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>
-
-            <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)"
+                    @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="瀹炴敹閲戦">
+              </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>
     </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="1"
-                  @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>
@@ -1427,24 +660,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">
@@ -1453,11 +677,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>
@@ -1495,10 +715,13 @@
       </span>
     </el-dialog>
     <Packages ref="aaa" @add="handleChanges" />
+    <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";
 import {
@@ -1508,9 +731,8 @@
   getByTjNum,
 } from "@/api/hosp/customer";
 import { getPrintSetUp } from "@/api/system/examcharge";
-import axios from "axios";
-import { getIp } from "@/utils/auth";
 import {
+  tuantiSelect,
   deptTreeSelect,
   projectGetList,
   getOrder,
@@ -1519,7 +741,9 @@
   getCusIdcard,
   getPackageListName,
   getaddtTransition,
+  tuantiqueren,
   getTransitionList,
+  getTransitionList1,
   getByTeamNo,
   delTbBycusCardIdAndProId,
   getLoadFile,
@@ -1527,6 +751,7 @@
   getconfigKey,
   getHistryTjOrderProByCusIdCard,
   readCertCardInfos,
+  gaibianzhekou,
 } from "@/api/system/tijian";
 import { addComp } from "@/api/system/comp";
 import { getCompany, queryCompany } from "@/api/team/tuanti";
@@ -1554,9 +779,11 @@
     VTreeTransfer,
     historyTj,
     Packages,
+    selectName,
   },
   data() {
     return {
+      isSubmitting: false,
       open1: false,
       filterage: "",
       checkedkeys: [],
@@ -1575,7 +802,7 @@
       lishi: false,
       table: false,
       HistoryList: {},
-      index: 0,
+      index: [],
       names: "",
       inputSSS: "",
       dictType: [
@@ -1618,12 +845,12 @@
       taocan: false,
       top: true,
       value: "2",
-      getInfodis: "",
       srcUrl: "",
       hides: false,
       hide: true,
       beat: false,
       dialogVisibles: false,
+      loadingSubmit: false,
       charge: false,
       src: "",
       url: "",
@@ -1650,10 +877,9 @@
       isDisabled: false,
       size: "",
       tcShow: false,
-      tcShows: false,
       // 濂楅鎻愪氦鎸夐挳
       confirm: false,
-      TotalPrice: "0.00",
+      TotalPrice: 0,
       TotalPrice1: 0,
       discount: 10,
       newpacName: [],
@@ -1758,21 +984,43 @@
         cusIsvip: null,
       },
       // 娣诲姞
-
+      lastXianPrice: 0,
       // 琛ㄥ崟鍙傛暟
       // 琛ㄥ崟鍙傛暟
       obj: {},
       CompanyList: [],
       form: {
         cusIdcard: "",
-        tjType: "3",
+        tjType: "",
         cusSex: 1,
         cusNational: "1",
         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: {
@@ -1804,6 +1052,7 @@
     };
   },
   watch: {
+
     filterText(val) {
       this.$refs.tree.filter(val);
     },
@@ -1817,13 +1066,122 @@
     this.getCurrentDateTime();
     this.startTimer();
     this.getList1();
+
     // this.getData();
   },
   mounted() {
-
+    this.TreedataList = [];
+    this.DataList = [];
+    this.marryall = 0;
   },
-
   methods: {
+    debounceNumberChange(currentValue, oldValue) {
+      clearTimeout(this.debounceTimer);
+      this.debounceTimer = setTimeout(() => {
+        this.numberChange(currentValue, oldValue);
+      }, 300);
+    },
+    changeXianjia() {
+      // 鍘熷鎶樻墸鐜囪绠�
+      if (this.TotalPrice1 !== 0) {
+        this.discount =
+          (Math.floor((this.TotalPrice / this.TotalPrice1) * 100) / 100) * 10;
+      }
+    },
+    clear() {
+      this.form.firmId = "";
+    },
+    /** 鍒犻櫎鎸夐挳鎿嶄綔 */
+    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) {
+      if (this.TotalPrice !== undefined && !isNaN(this.TotalPrice) && this.TotalPrice !== this.lastXianPrice) {
+        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 = "鎼滅储濮撳悕";
+      this.$refs.bbb.getList();
+    },
     getCompanyList() {
       this.loading = true;
       getconfigKey("team_reservation_default_day").then((res) => {
@@ -1866,25 +1224,22 @@
       this.title = "娣诲姞浣撴鍗曚綅淇℃伅缁存姢";
     },
     idFn1(value) {
-
       if (value) {
-        this.form.dictCompId = value;
+        // console.log(value);
+        const originalCompId = this.form.firmId;
+        this.form.firmName = value;
         this.CompanyList.forEach((item) => {
-          if (item.drugManufacturerId == this.form.dictCompId) {
-            this.form.compName = item.cnName;
+          if (item.cnName == this.form.firmName) {
+            this.form.firmId = item.drugManufacturerId;
           }
         });
-      }
-    },
-    getRemoteData(query) {
-      if (query) {
-        let compName = query;
-        queryCompany(compName).then((response) => {
-          this.CompanyList = response.data;
-          this.CompanyList.forEach((item) => {
-            this.objs = item;
-          });
-        });
+
+        if (this.form.firmId === originalCompId) {
+          this.form.firmId = "";
+        }
+        if (this.form.firmId) {
+          this.form.tjType = "1";
+        }
       }
     },
     getCurrentDateTime() {
@@ -1945,11 +1300,9 @@
     },
     getList1() {
       getInfo().then((response) => {
-        this.getInfodis = response.user.discount;
+
         this.hospName = response.hospName;
-        if (this.getInfodis === null) {
-          this.isfalse = true;
-        }
+
       });
       getIsRequired().then((response) => {
         this.showHidden = response.data;
@@ -1975,8 +1328,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;
@@ -1999,47 +1352,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]*$/; //姝f暣鏁帮紙鍙互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;
@@ -2085,12 +1397,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 = "鍗曢」";
                   }
@@ -2102,20 +1415,12 @@
                   this.pacName = item.pacName;
                 });
 
-                const r = /^\+?[0-9][0-9]*$/; //姝f暣鏁帮紙鍙互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;
               }
             });
           }
@@ -2181,7 +1486,7 @@
             _this.thisVideo.play();
           };
         })
-        .catch((err) => {});
+        .catch((err) => { });
     },
     //  缁樺埗鍥剧墖锛堟媿鐓у姛鑳斤級
 
@@ -2210,46 +1515,20 @@
         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;
-        }
+
+
       });
       let cusSex = this.form.cusSex;
       //鍏ㄩ儴濂楅
@@ -2294,13 +1573,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 {
@@ -2315,7 +1594,7 @@
               pacId: "",
               proIds: [],
             };
-            getaddtTransition(data).then((response) => {});
+            getaddtTransition(data).then((response) => { });
             this.$tab.refreshPage();
           });
         } else {
@@ -2326,13 +1605,78 @@
 
     // 鎶樻墸
     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) {
+      // 濡傛灉鐜颁环娌℃湁鍙樺寲锛岀洿鎺ヨ繑鍥�
+      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;
@@ -2348,18 +1692,16 @@
           if (this.form.cusSex === "鏈煡") {
             this.form.cusSex = 2;
           }
+          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;
           });
@@ -2383,6 +1725,7 @@
       let cusIdcard = this.form.cusIdcard;
       if (cusIdcard) {
         getCusIdcard(cusIdcard).then((response) => {
+          _this.top = false;
           if (response.data) {
             this.form = response.data;
             if (this.form.discount === null) {
@@ -2391,7 +1734,7 @@
               this.discount = this.form.discount;
             }
             if (this.form.tjType === null) {
-              this.form.tjType = "3";
+              this.form.tjType = this.dict.type.dict_team[0].value;
             }
             if (this.form.cusMarryStatus === "null") {
               this.form.cusMarryStatus = "5";
@@ -2401,21 +1744,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 = "鍗曢」";
                       }
@@ -2423,27 +1766,25 @@
                     this.list1 = false;
                     this.list2 = true;
                     this.list3 = false;
+                    _this.top = false;
                   } else {
                     this.list1 = true;
-                    this.TotalPrice = "0.00";
+                    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 = "鍗曢」";
                         }
@@ -2469,19 +1810,17 @@
               this.$message.warning("鏆傛棤棰勭害淇℃伅");
               _this.resetpackage();
             }
+            this.top = false;
             _this.isDisabled = true;
           } else {
             this.$message.warning("鏈煡鍒扮敤鎴蜂俊鎭�");
           }
         });
-        // .catch((error) => {
-        //   this.$message.error("姝ょ敤鎴蜂笉瀛樺湪");
-        // });
       } else {
         let configKey = "getInfoFromSqlData";
         getconfigKey(configKey).then((res) => {
-      
           if (res.code == 200) {
+            console.log(res.msg, 'res.msg');
             if (res.msg == "N") {
               var websocket = null;
               var url = this.valueUrl;
@@ -2490,7 +1829,6 @@
               } else if ("MozWebSocket" in window) {
                 websocket = new MozWebSocket(url);
               } else {
-              
               }
 
               if (websocket == null) {
@@ -2516,71 +1854,39 @@
                 var jsonObj = {
                   // name: "readCert",
                 };
-                // var jStr = JSON.stringify(jsonObj);
-                // this.websocket.send(jStr);
+
                 this.dialogVisible = false;
               };
 
               //鎺ユ敹鍒版秷鎭殑鍥炶皟鏂规硶
               websocket.onmessage = (event) => {
-
-                var resultObj = eval("(" + event.data + ")");
-                //resultFlag涓�0浠h〃璇诲崱鎴愬姛
-        
-                // TODO 浠ヤ笅浠g爜鍙兘鏄尘宸濅娇鐢ㄧ殑
-                // this.jingChuanHandlerWebSocketResult(resultObj)
+                var resultObj = eval("(" + event.data + ")");  // 娉ㄦ剰锛歟val瀛樺湪瀹夊叏闅愭偅锛屽缓璁敤JSON.parse
                 this.readCardWebSocket(resultObj);
+                websocket.close();
               };
-
-              //杩炴帴鍏抽棴鐨勫洖璋冩柟娉�
-              websocket.onclose = function () {
+              websocket.onclose = () => {
                 alert("璇诲崱鍣ㄨ繛鎺ュ叧闂�");
               };
             } else if (res.msg == "Y") {
-              this.$refs.aaa.open = true;
+              /* this.$refs.aaa.open = true;
               this.$refs.aaa.getAllList();
-              this.$refs.aaa.title = "璇佷欢瀛楀吀";
+              this.$refs.aaa.title = "璇佷欢瀛楀吀"; */
+
             } else if (res.msg == "S") {
               this.cardreader = true;
               _this.cardreaderradio = 3;
               _this.inputSSS = "";
-              // let url = window.location.protocol + "//" + window.location.host;
-    
-              // axios
-              //   .get("http://localhost:81/dev-api/readCertCardInfos")
-              //   .then((res) => {
-        
-              //   })
-              //   .catch((err) => {
-    
-              //   });
-
-              // readCertCardInfos().then((res) => {
-              //   _this.form.cusName = res.data.name;
-              //       _this.form.cusSex =
-              //       res.data.sex;
-              //       _this.form.cusNational = res.data.mz;
-              //       _this.form.cusBrithday = res.data.csrq;
-              //       if (_this.form.cusBrithday) {
-              //         _this.form.cusBrithday = _this.form.cusBrithday.replace(
-              //           /^(\d{4})(\d{2})(\d{2})$/,
-              //           "$1-$2-$3"
-              //         );
-              //       }
-              //       _this.form.cusAddr = res.data.addres;
-              //       _this.form.cusIdcard = res.data.card;
-              // });
             }
           }
         });
       }
     },
+
     // 鏈�鏂颁娇鐢╳ebSocket閫氫俊
     readCardWebSocket(resultObj) {
       let _this = this;
-      if (resultObj.code === 200 && resultObj.data.name != null) {
-
-
+      console.log(resultObj, 'resultObj');
+      if (resultObj.code === 200 && resultObj.data.name && resultObj.data.name != null) {
         //鍥炴樉鐩稿叧鏁版嵁
         _this.form.cusName = resultObj.data.name;
         _this.form.cusSex = resultObj.data.sex == "0" ? "濂�" : "鐢�";
@@ -2591,6 +1897,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;
@@ -2600,15 +1929,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 浠ヤ笅浠g爜鍙兘鏄尘宸濅娇鐢ㄧ殑
     jingChuanHandlerWebSocketResult(resultObj) {
@@ -2678,7 +1999,6 @@
         } else if ("MozWebSocket" in window) {
           websocket = new MozWebSocket(url);
         } else {
-         
         }
         if (websocket == null) {
           alert("11111");
@@ -2743,8 +2063,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);
 
@@ -2761,29 +2081,14 @@
           alert("璇锋鏌ヨ鍗″櫒杩炴帴鏄惁姝e父");
         };
       } 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) {
           websocket = new MozWebSocket(url);
         } else {
-       
         }
         if (websocket == null) {
           alert("11111");
@@ -2860,8 +2165,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);
 
@@ -2884,27 +2189,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) {
@@ -2924,11 +2213,15 @@
 
     // 鍙栨秷鎸夐挳
     cancel() {
+      this.TreedataList = [];
+      this.DataList = [];
+      this.marryall = 0; // 閲嶇疆鍚堣
       this.Seachopen = false;
       this.taocan = false;
       this.malldisble = false;
       this.defaultKeys = [];
       this.DataLists = [];
+      
     },
 
     cancell() {
@@ -2943,67 +2236,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 {
@@ -3013,6 +2271,12 @@
       _this.pacId = "";
       this.proIds = [];
       this.tjCategory = "12";
+
+      this.DataList = []; // 娓呯┖宸查�夐」鐩垪琛�
+      this.checkedkey = []; // 娓呯┖鏍戠殑閫変腑鐘舵��
+      this.checkedListkey = [];
+      this.TreedataList = []
+
       let data = {
         cusId,
         pacId: _this.pacId,
@@ -3022,7 +2286,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) {
@@ -3031,7 +2295,7 @@
             } else {
               this.list1 = true;
 
-              this.TotalPrice = "0.00";
+              this.TotalPrice = 0;
             }
           });
         }
@@ -3039,33 +2303,94 @@
     },
 
     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.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();
+                      }
                     });
-                    throw Error();
-                  }
+                  });
+                });
+              }
+            } catch (error) { }
+            this.loading = false;
+          });
+        }
+
+        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();
+                      }
+                    });
+                  });
+                });
+              }
+            } 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;
+        });
+      }
     },
 
     // 鐐瑰嚮澶氶�夋鑾峰彇閫変腑鏁版嵁
@@ -3154,10 +2479,14 @@
       if (this.activeNames == "second") {
         this.DataList = [];
         this.checkedkey = [];
+        this.TreedataList = [];
+        this.marryall = 0; // 閲嶇疆鍚堣
         this.getDataList();
       } else if (this.activeNames == "third") {
         this.DataLists = [];
         this.checkedkeys = [];
+        this.TreedataList = [];
+        this.marryall = 0; // 閲嶇疆鍚堣
         getZhList().then((response) => {
           if (response.data) {
             this.packageList = response.data;
@@ -3176,7 +2505,16 @@
       this.loading = true;
       getProParentIdDxList().then((response) => {
         this.Treedata = response.data.list;
-      
+
+        // 鍥炴樉 TreedataList 鍒� DataList
+        if (this.TreedataList && this.TreedataList.length > 0) {
+          this.DataList = this.TreedataList;
+          this.marryall = this.DataList.reduce((sum, item) => sum + (item.proPrice || 0) * (item.sl || 1), 0);
+          this.checkedListkey = this.DataList.map(item => item.proId);
+          this.$nextTick(() => {
+            this.$refs.tree.setCheckedKeys(this.checkedListkey);
+          });
+        }
 
         if (this.tableData[0]) {
           this.tableData[0].tjProjectList.forEach((selectionitem) => {
@@ -3187,8 +2525,63 @@
             });
           });
         }
+
+        // 鍥炴樉 packageList 鐨勯�変腑鎬�
+        this.handlePackageSelection();
+
         this.loading = false;
       });
+    },
+
+    handlePackageSelection() {
+      // 鍋囪浣犳湁涔嬪墠淇濆瓨鐨勯�変腑鐘舵�佹垨浠庢煇涓湴鏂硅幏鍙栬繖浜涙暟鎹�
+      let selectedPackageIds = this.getPreviouslySelectedPackages(); // 杩欐槸涓�涓亣璁剧殑鍑芥暟锛屽疄闄呬娇鐢ㄦ椂鏇挎崲涓哄疄闄呯殑閫昏緫
+
+      // 璁剧疆 packageList 鐨勯�変腑鐘舵��
+      this.$nextTick(() => {
+        if (this.$refs.treas) { // 纭繚 treas 寮曠敤宸茬粡瀛樺湪
+          this.$refs.treas.setCheckedKeys(selectedPackageIds, true);
+        }
+        // 鏇存柊 checkedkeys 浠ュ弽鏄犲綋鍓嶉�変腑鐨勫寘
+        this.checkedkeys = selectedPackageIds;
+      });
+
+      // 鏍规嵁閫変腑鐘舵�佹洿鏂� DataLists 鎴栧叾浠栭渶瑕佹洿鏂扮殑鍐呭
+      this.updateDataListsBasedOnSelection(selectedPackageIds);
+    },
+
+    getPreviouslySelectedPackages() {
+      // 杩斿洖涔嬪墠淇濆瓨鐨勯�変腑鍖匢D鏁扮粍
+      // 渚嬪锛屼粠 localStorage 鎴栬�� Vuex store 鑾峰彇
+      return []; // 杩欓噷鏄ず渚嬶紝鏇挎崲涓哄疄闄呰幏鍙栨暟鎹殑閫昏緫
+    },
+
+    updateDataListsBasedOnSelection(selectedPackageIds) {
+      // 鏍规嵁閫変腑鐨勫寘ID鏇存柊 DataLists
+      this.DataLists = [];
+      selectedPackageIds.forEach(id => {
+        let packageItem = this.packageList.find(item => item.id === id);
+        if (packageItem) {
+          // 杩欓噷鍋囪姣忎釜鍖呴」鐩兘鏈変竴涓� proId 鏁扮粍鎴栬�呯被浼肩殑缁撴瀯锛岀敤鏉ヨ幏鍙栧寘涓殑椤圭洰
+          if (packageItem.proIds) { // 鍋囪 packageItem 鍖呭惈涓�涓� proId 鏁扮粍
+            packageItem.proIds.forEach(proId => {
+              let project = this.findProjectById(proId); // 鍋囪鏈変竴涓嚱鏁版潵鎵惧埌椤圭洰
+              if (project) {
+                this.DataLists.push(project);
+              }
+            });
+          }
+        }
+      });
+
+      // 璁$畻鍚堣
+      this.marryalls = this.DataLists.reduce((sum, item) => sum + item.proPrice, 0);
+    },
+
+    findProjectById(proId) {
+      // 姝ゅ嚱鏁板亣璁句綘鏈変竴涓叏灞�鐨勯」鐩垪琛ㄦ垨鑰呭彲浠ヤ粠鏌愪釜API鑾峰彇
+      // 杩欓噷鍙槸涓�涓ず渚嬶紝瀹為檯搴旂敤涓簲璇ユ牴鎹綘鐨勬暟鎹粨鏋勬潵瀹炵幇
+      return this.allpackageList.find(item => item.proId === proId) || null;
     },
 
     handlepackage(data, checked, checkedNodes) {
@@ -3200,7 +2593,7 @@
         };
         getlistByZhId(datas).then((res) => {
           this.packagedataList = res.data.tjProjectList;
-         
+
           this.DataLists = [];
           this.checkedListkey1 = [];
           for (var i = 0; i < this.packagedataList.length; i++) {
@@ -3210,16 +2603,15 @@
             getProSonDxList(proId).then((res) => {
               this.TreedataList = res.data.list;
 
-
               this.TreedataList.forEach((item) => {
                 // this.checkedListkey1.push(item.proId);
 
                 this.DataLists.push(item);
-     
+
                 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) {
@@ -3257,16 +2649,6 @@
           }
         }
       }
-
-      // if (columnIndex == 3) {
-      //   let rowspan = 0;
-      //   this.DataLists.forEach((element) => {
-      //     if (element.propinName === row.propinName) {
-      //       rowspan++;
-      //     }
-      //   });
-      //   return [rowspan, 1];
-      // }
     },
     handlePackageChecked(data, checked, checkedNodes) {
       if (checked == false) {
@@ -3293,33 +2675,36 @@
         });
       }
     },
-    // 鐐瑰嚮鑾峰彇姣忎釜鏍戣妭鐐�
     handleCurrentChecked(data, checked, checkedNodes) {
       this.dataObj = data;
-      if (checked.checkedNodes.length != 0) {
-        this.$refs.tree.setCheckedKeys([data.proId]);
+      if (checked.checkedNodes.length > 0) {
+        const promises = checked.checkedNodes.map(node => getProSonDxList(node.proId));
+        Promise.all(promises).then(results => {
+          this.TreedataList = results.flatMap(res => res.data.list);
+          this.checkedListkey = [];
+          this.DataList = [];
 
-        let proId = data.proId;
-        getProSonDxList(proId).then((res) => {
-          this.TreedataList = res.data.list;
           this.TreedataList.forEach((item) => {
             this.checkedListkey.push(item.proId);
-
             this.DataList.push(item);
-            this.spliceData();
-            this.DataList.forEach((item1) => {
-              if (item1.proParentId == data.proId) {
-                item1.propinName = data.proName;
-              }
-            });
           });
+
+          this.spliceData(); // 鍋囪杩欎釜鏂规硶鏄綘瀹氫箟鐨勫叾浠栧湴鏂瑰鐞嗘暟鎹殑
+
+          // 鏇存柊鍚嶇О鍜岃绠楁�讳环
+          this.DataList.forEach((item1) => {
+            const parent = checked.checkedNodes.find(node => node.proId === item1.proParentId);
+            if (parent) {
+              item1.propinName = parent.proName;
+            }
+          });
+
           this.TotalPrice1 = 0;
           this.marryall = 0;
           if (this.DataList.length != 0) {
             this.list1 = false;
             this.DataList.forEach((item) => {
-              // this.TotalPrice1 = item.proPrice + this.TotalPrice1;
-              this.marryall += item.proPrice;
+              this.marryall += Number(item.proPrice) * Number(item.sl);
             });
           }
         });
@@ -3348,7 +2733,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>
       );
@@ -3411,7 +2796,6 @@
         }
       });
     },
-    //  // 榛樿鎺ュ彈鍥涗釜鍊� { 褰撳墠琛岀殑鍊�, 褰撳墠鍒楃殑鍊�, 琛岀殑涓嬫爣, 鍒楃殑涓嬫爣 }
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
       let fields = ["propinName"];
       let cellValue = row[column.property];
@@ -3438,93 +2822,103 @@
         var cusId = this.form.cusIdcard;
       } else {
         this.$message.warning("璇峰厛濉啓淇℃伅锛屽啀閫変綋妫�鍐呭");
+        return; // 濡傛灉娌℃湁韬唤璇佸彿鐮侊紝鍋滄鎵ц
       }
 
       let _this = this;
+
+      // 鍒濆鍖栧彉閲�
+      this.isSubmitting = true; // 寮�濮嬫彁浜ゆ椂璁剧疆鏍囧織
+      this.TotalPrice1 = 0; // 鍒濆鍖栧簲鏀堕噾棰�
+      this.TotalPrice = 0; // 鍒濆鍖栧疄鏀堕噾棰�
+      this.discount = 10; // 鍒濆鍖栨姌鎵d负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) {
+      // 鏍规嵁浣撴绫诲瀷閫夋嫨涓嶅悓鐨勫鐞嗘柟娉�
+      if (this.form.firmId) {
+        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; // 纭繚鍦ㄩ敊璇儏鍐典笅涔熼噸缃爣蹇�
+        });
+      }
 
-          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]*$/; //姝f暣鏁帮紙鍙互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(澶辫触浜�);
-          
-        }
-      });
       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 !== "") {
-        let List = _this.tableData1; //鍗曚釜椤圭洰淇℃伅
+        let List = _this.tableData1;
         if (this.responseList.cusId) {
           var userId = this.responseList.cusId;
         } else {
@@ -3534,8 +2928,6 @@
         if (this.tableData[0]) {
           var pacId = this.tableData[0].pacId;
         }
-
-        //tjOrderList//杩欎釜鏄鐞嗗畬鐨勬瘡涓�椤瑰椁愪俊鎭�
         List.forEach((item) => {
           if (item.list) {
             item.list.forEach((item1) => {
@@ -3685,9 +3077,7 @@
             }
             this.discount =
               (this.formInline.paidIn / this.formInline.price) * 10;
-            if (this.discount <= this.getInfodis) {
-              this.discount = this.getInfodis;
-            }
+
           } else {
             this.discount = 10;
             this.formInline.paidIn = "0.00";
@@ -3768,8 +3158,6 @@
     listgetOrder(data) {
       getOrder(data).then((res) => {
         this.$modal.msgSuccess("鎻愪氦鎴愬姛");
-        // this.dialogVisibles = true;
-        // this.url = window.webkitURL.createObjectURL(res); //灏嗗悗绔繑鍥炵殑blob鏂囦欢璇诲彇鍑簎rl
         //璋冩帴鍙f樉绀哄妫�鍗�
         const tjNumber = res.msg;
         const viewNum = "792931586196398080";
@@ -3783,6 +3171,7 @@
     // 鏈�鍚庢彁浜ゆ寜閽�
     submitPrice() {
       let _this = this;
+      this.loadingSubmit = true;
       if (_this.tjCategory !== "") {
         let List = _this.tableData1; //鍗曚釜椤圭洰淇℃伅
         if (this.responseList.cusId) {
@@ -3825,43 +3214,67 @@
         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) => {
+          this.loadingSubmit = false;
+          if (res.code === 200) {
 
-        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: "璇烽�夋嫨濂楅!",
-          });
-        }
+            let data;
+
+            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.loadingSubmit = false;
+              this.$message({
+                type: "warning ",
+                message: "璇烽�夋嫨濂楅!",
+              });
+            }
+          } else {
+            this.loadingSubmit = false;
+            this.$modal.msgError("鏀瑰彉鎶樻墸閿欒");
+          }
+        });
       } else {
+        this.loadingSubmit = false;
         this.$modal.msgError("璇烽�夋嫨浣撴绫诲埆");
       }
     },
   },
 };
 </script>
-
 
 <style>
 .el-form-item__error {
@@ -3907,16 +3320,14 @@
   width: 100%;
   display: flex;
 }
+
 .tab3 {
   border: 1px solid #dcdfe6;
 }
 
 .filter-tree {
-  /* max-height: 360px;
-  overflow-y: auto;
-  border: 1px solid #d9d9d9; */
-  overflow: auto;
-  flex: 1;
+  overflow-y: auto; /* 淇濈暀绾靛悜婊氬姩鏉� */
+  overflow-x: hidden; /* 闅愯棌妯悜婊氬姩鏉� */
   height: 350px;
 }
 
@@ -3984,12 +3395,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;
 }
@@ -4020,8 +3433,21 @@
 .content {
   margin-bottom: 25px;
 }
+
 .tab8 {
   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