From 2ee7a81c2eb0df1fc473da6dbbaa13df662967c5 Mon Sep 17 00:00:00 2001
From: wwl <xchao828@163.com>
Date: 星期三, 02 七月 2025 15:43:59 +0800
Subject: [PATCH] 1

---
 src/views/system/tijian/index.vue | 1244 +++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 753 insertions(+), 491 deletions(-)

diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue
index ec6cc61..fc937f1 100644
--- a/src/views/system/tijian/index.vue
+++ b/src/views/system/tijian/index.vue
@@ -1,4 +1,6 @@
 <template>
+   <div v-loading="isLoading" element-loading-text="璇风◢鍊�..." element-loading-spinner="el-icon-loading"
+    element-loading-background="rgba(255, 255, 255, 0.8)" style="height: 100%; padding: 20px; position: relative;">
   <div class="app-container">
     <el-dialog :title="title" :visible.sync="open1" width="1000px" append-to-body>
       <el-form ref="form1" :model="form1" :rules="rules1" label-width="100px" :inline="true">
@@ -86,11 +88,11 @@
                 trigger: 'blur',
               },
             ]">
-
               <span slot="label" style="display: inline-block; border-bottom: 2px solid blue" @click="openname">
                 濮撳悕
               </span>
-              <el-input v-model="form.cusName" placeholder="璇疯緭鍏ュ鍚�" :disabled="isDisabled" />
+              <el-input v-model="form.cusName" placeholder="璇疯緭鍏ュ鍚�" :disabled="isDisabled"
+                @input="form.cusName = $event.replace(/\s/g, '')" />
             </el-form-item>
 
             <el-form-item label="璇佷欢绫诲瀷" prop="idType">
@@ -148,7 +150,8 @@
               <span slot="label" style="display: inline-block; border-bottom: 2px solid blue" @click="handleQuery">
                 璇佷欢鍙风爜
               </span>
-              <el-input :disabled="isDisabled" v-model="form.cusIdcard" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" @input="inputChange" />
+              <el-input :disabled="isDisabled" v-model="form.cusIdcard" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�"
+                @input="handleIdCardInput" />
               <!-- <i style="
                     font-size: 1rem;
                     position: absolute;
@@ -180,7 +183,8 @@
                 trigger: 'blur',
               },
             ]">
-              <el-input v-model="form.cusPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" :disabled="isDisabled" />
+              <el-input v-model="form.cusPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�"  maxlength="11" :disabled="isDisabled"
+                @input="form.cusPhone = $event.replace(/\s/g, '')" />
             </el-form-item>
 
             <el-form-item label="鍑虹敓鏃ユ湡" prop="cusBrithday">
@@ -207,10 +211,6 @@
                   :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">
@@ -218,10 +218,15 @@
               <el-input :disabled="isDisabled" v-model="form.cusIntroduce" placeholder="璇疯緭鍏ヤ粙缁嶄汉" />
             </el-form-item>
 
-
-
             <el-form-item label="鏂囧寲绋嬪害" prop="wenHua" label-width="93px">
               <el-input :disabled="isDisabled" v-model="form.wenHua" placeholder="璇疯緭鍏ユ枃鍖栫▼搴�" />
+            </el-form-item>
+            <el-form-item label="宸ラ緞" prop="gl">
+              <div>
+                <el-input v-model="form.gl" style="width: 50%">
+                  <template slot="append">骞�</template>
+                </el-input>
+              </div>
             </el-form-item>
           </el-form>
           <el-form ref="form" :model="form" :rules="rules" :label-position="labelPosition" label-width="106px"
@@ -289,13 +294,12 @@
       <el-tabs type="border-card" style="height: 560px; margin: 0 10px; width: 100%" v-model="activeNames"
         @tab-click="handleClick">
         <el-tab-pane label="濂楅" name="first">
-          <el-form :model="queryParam" ref="queryForm" size="small" :inline="true" v-if="showSearch" label-width="auto">
+          <el-form :model="queryParam" ref="queryForm" size="small" :inline="true" v-if="showSearch" label-width="auto" @submit.native.prevent="handle">
             <el-form-item label="濂楅鍚嶇О" prop="pacName">
               <el-input v-model="queryParam.pacName" placeholder="璇疯緭鍏ュ椁愬悕绉�" clearable @keyup.enter.native="handle" />
             </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" size="mini" @click="handle">鏌ヨ</el-button>
-
             </el-form-item>
           </el-form>
           <div class="tab4">
@@ -306,23 +310,13 @@
                 <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> -->
               </el-table>
             </div>
-
           </div>
         </el-tab-pane>
         <el-tab-pane label="缁勫悎" name="third">
-          <!-- <div class="tab3"> -->
           <el-row :gutter="20" style="width: 100%">
-            <el-col :span="6">
+            <el-col :span="6" style="min-width: 200px">
               <div style="
                   text-align: center;
                   margin-bottom: 10px;
@@ -339,7 +333,7 @@
                 </el-tree>
               </div>
             </el-col>
-            <el-col :span="6">
+            <el-col :span="6" style="min-width: 200px">
               <div style="
                   text-align: center;
                   margin-bottom: 10px;
@@ -368,6 +362,9 @@
                   </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>
 
@@ -384,86 +381,72 @@
               </div>
             </el-col>
           </el-row>
-          <!-- </div> -->
         </el-tab-pane>
         <el-tab-pane label="鍗曢」" name="second">
-          <div class="tab8">
-            <!-- <div class="tab7">
-              <v-tree-transfer
-                :treeData="treedataList"
-                :defaultProps="{ children: 'tjProjectList', label: 'proName' }"
-                :defaultKeys="defaultKeys"
-                @changeKeys="changeCategoryKeys"
-                :key="datekey"
-              ></v-tree-transfer> -->
-            <!-- <el-tree :data="data" show-checkbox node-key="proId" :props="defaultProps" :default-checked-keys="treeList"
-                @check-change="handleCurrentChecked">
-              </el-tree> -->
-            <!-- </div> -->
-            <el-row :gutter="20">
-              <el-col :span="6">
+          <el-row :gutter="20" style="width: 100%">
+            <el-col :span="6" style="min-width: 200px">
+              <div style="
+                  text-align: center;
+                  margin-bottom: 10px;
+                  margin-top: 10px;
+                ">
+                椤圭洰鍒楄〃
+              </div>
+              <el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="filterText" style="margin-bottom: 10px">
+              </el-input>
+              <div class="tab3">
+                <el-tree class="filter-tree" v-loading="loading" :data="Treedata" :props="defaultProps" show-checkbox
+                  node-key="proId" @check="handleCurrentChecked" :default-checked-keys="checkedkey"
+                  :filter-node-method="filterNode" ref="tree" :render-content="renderContent">
+                </el-tree>
+              </div>
+            </el-col>
+            <el-col :span="6" style="min-width: 200px">
+              <div style="
+                  text-align: center;
+                  margin-bottom: 10px;
+                  margin-top: 10px;
+                ">
+                鏄庣粏椤圭洰鍒楄〃
+              </div>
+              <div class="tab3">
+                <el-tree class="filter-tree" v-loading="loading" :data="TreedataList" node-key="proId"
+                  :props="defaultProps" :filter-node-method="filterNode" show-checkbox
+                  @check-change="handleCurrentChecked1" :default-checked-keys="checkedListkey"
+                  :render-content="renderContent">
+                </el-tree>
+              </div>
+            </el-col>
+            <el-col :span="11">
+              <div class="grid-content bg-purple">
                 <div style="
                     text-align: center;
                     margin-bottom: 10px;
                     margin-top: 10px;
                   ">
-                  椤圭洰鍒楄〃
+                  宸查�夐」鐩垪琛�
                 </div>
-                <!-- @input="gaibian" -->
-                <el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="filterText">
-                </el-input>
-                <div class="tab3">
-                  <el-tree class="filter-tree" v-loading="loading" :data="Treedata" :props="defaultProps" show-checkbox
-                    node-key="proId" @check="handleCurrentChecked" :default-checked-keys="checkedkey"
-                    :filter-node-method="filterNode" ref="tree" :render-content="renderContent">
-                  </el-tree>
-                </div>
-              </el-col>
-              <el-col :span="6">
-                <div style="
-                    text-align: center;
-                    margin-bottom: 10px;
-                    margin-top: 10px;
-                  ">
-                  鏄庣粏椤圭洰鍒楄〃
-                </div>
-                <div class="tab3">
-                  <el-tree class="filter-tree" v-loading="loading" :data="TreedataList" node-key="proId"
-                    :props="defaultProps" :filter-node-method="filterNode" show-checkbox
-                    @check-change="handleCurrentChecked1" :default-checked-keys="checkedListkey"
-                    :render-content="renderContent">
-                  </el-tree>
-                </div>
-              </el-col>
-              <el-col :span="11">
-                <div class="grid-content bg-purple">
-                  <div style="
-                      text-align: center;
-                      margin-bottom: 10px;
-                      margin-top: 10px;
-                    ">
-                    宸查�夐」鐩垪琛�
-                  </div>
-                  <el-table :data="DataList" border style="width: 100%" height="400" :span-method="objectSpanMethod">
-                    <el-table-column prop="propinName" label="妫�鏌ラ」鐩�">
-                    </el-table-column>
-                    <el-table-column prop="proPrice" label="鍘熶环" width="56px"></el-table-column>
-                    <el-table-column prop="proName" label="鏄庣粏椤圭洰" width="260px">
-                    </el-table-column>
-
-                    <el-table-column label="鎿嶄綔" align="center" fixed="right" class-name="small-padding fixed-width"
-                      width="50px">
-                      <template slot-scope="scope">
-                        <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                          title="鍒犻櫎"></el-button>
-                      </template>
-                    </el-table-column>
-                  </el-table>
-                  <h3 style="font-weight: 600">鍚堣锛歿{ marryall }}鍏�</h3>
-                </div>
-              </el-col>
-            </el-row>
-          </div>
+                <el-table :data="DataList" border style="width: 100%" height="400" :span-method="objectSpanMethod">
+                  <el-table-column prop="propinName" label="妫�鏌ラ」鐩�">
+                  </el-table-column>
+                  <el-table-column prop="proName" label="鏄庣粏椤圭洰" width="260px">
+                  </el-table-column>
+                  <el-table-column prop="sl" label="鏁伴噺" width="56px">
+                  </el-table-column>
+                  <el-table-column prop="proPrice" label="鍘熶环" width="56px">
+                  </el-table-column>
+                  <el-table-column label="鎿嶄綔" align="center" fixed="right" class-name="small-padding fixed-width"
+                    width="50px">
+                    <template slot-scope="scope">
+                      <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                        title="鍒犻櫎"></el-button>
+                    </template>
+                  </el-table-column>
+                </el-table>
+                <h3 style="font-weight: 600">鍚堣锛歿{ marryall }}鍏�</h3>
+              </div>
+            </el-col>
+          </el-row>
         </el-tab-pane>
       </el-tabs>
       <span slot="footer" class="dialog-footer">
@@ -476,11 +459,9 @@
       <el-col :span="15">
         <div class="grid-content bg-purple">
           <template>
-            <el-form :model="form" :inline="true" label-width="75px" style="margin-left: 20px;width: 900px;">
+            <el-form :model="form" :inline="true" label-width="75px" style="margin-left: 20px; width: 900px">
               <el-form-item label="濮撳悕" prop="cusName">
-                <span slot="label">
-                  濮撳悕
-                </span>
+                <span slot="label"> 濮撳悕 </span>
                 <el-input v-model="form.cusName" placeholder="璇疯緭鍏ュ鍚�" :disabled="isDisabled" />
               </el-form-item>
               <el-form-item label="鎬у埆" prop="cusSex">
@@ -490,9 +471,7 @@
                 </el-select>
               </el-form-item>
               <el-form-item label="璇佷欢鍙风爜" prop="cusIdcard">
-                <span slot="label">
-                  璇佷欢鍙风爜
-                </span>
+                <span slot="label"> 璇佷欢鍙风爜 </span>
                 <el-input :disabled="isDisabled" v-model="form.cusIdcard" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" @input="inputChange" />
               </el-form-item>
               <el-form-item label="鍗曚綅鍚嶇О" prop="firmName">
@@ -501,13 +480,15 @@
                   <el-option v-for="dict in CompanyList" :key="dict.cnName" :label="dict.cnName" :value="dict.cnName" />
                 </el-select>
               </el-form-item>
+              <el-form-item label="鍗曚綅閮ㄩ棬" prop="firmDeptName">
+                <el-input v-model="form.firmDeptName" style="width: 150px" placeholder="璇疯緭鍏ュ崟浣嶉儴闂�" @input="inputChange" />
+              </el-form-item>
               <el-form-item label="浣撴绫诲瀷">
-                <el-select style="width: 150px" v-model="form.tjType" placeholder="璇烽�夋嫨浣撴绫诲瀷">
+                <el-select v-model="form.tjType" placeholder="璇烽�夋嫨浣撴绫诲瀷">
                   <el-option v-for="dict in dict.type.dict_team" :key="dict.value" :label="dict.label"
-                    :value="dict.value" :disabled="!form.firmId && dict.value === '1'"></el-option>
+                    :value="dict.value"></el-option>
                 </el-select>
               </el-form-item>
-
               <el-form-item label="浣撴绫诲埆">
                 <el-select style="width: 200px" v-model="tjCategory" placeholder="璇烽�夋嫨浣撴绫诲埆">
                   <el-option v-for="dict in dict.type.dict_tjtype" :key="dict.value" :label="dict.label"
@@ -515,26 +496,26 @@
                 </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: 200px"></el-input>
+                <el-input placeholder="搴旀敹閲戦" v-model="TotalPrice1" disabled style="width: 150px"></el-input>
               </el-form-item>
-              <el-form-item label="浼樻儬">
+              <el-form-item label="鎶樻墸">
                 <!-- {{ discount }} -->
-                <el-input-number ref="inputNumber" style="width: 150px" v-model="discount" :precision="2" :step="0.1"
-                  :max="10" :min="0" @change="numberChange" :disabled="isfalse"></el-input-number>
+                <el-input-number ref="inputNumber" style="width: 150px" v-model="discount" :precision="1" :step="0.1"
+                  :max="10" :min="0" @change="debounceNumberChange" :disabled="isfalse"></el-input-number>
               </el-form-item>
               <el-form-item label="瀹炴敹閲戦">
-                <el-input placeholder="瀹炴敹閲戦" v-model="TotalPrice" style="width: 206px"></el-input>
+                <el-input placeholder="瀹炴敹閲戦" v-model="TotalPrice" style="width: 206px" @input="changeXianjia"
+                  @blur="numberChangeXianPrice(discount, discount)" />
               </el-form-item>
               <br />
-
-
 
               <el-form-item style="margin-left: 149px">
                 <el-button type="primary" @click="Package" size="mini" style="margin-right: 20px">閫夋嫨濂楅</el-button>
                 <el-button type="primary" @click="resetpackage" size="mini" style="margin-right: 20px">閲嶇疆濂楅</el-button>
-                <el-button type="primary" @click="submitPrice" :disabled="confirm" v-if="showHidden.has_charge == 'N'"
-                  size="mini">绛惧埌鐧昏</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>
@@ -571,15 +552,27 @@
                 white-space: nowrap;
                 overflow: hidden;
                 text-overflow: ellipsis;
-              margin-left: 46px;
+                margin-left: 46px;
                 font-size: 16px;
                 margin-right: 20px;
               ">
-              <span v-if="this.tableData1[0]">{{ this.tableData1[0].pacName || "" }}</span> 宸查�夐」鐩潯鏁帮細<span
-                style="font-weight: 700; color: red; margin-right: 5px">{{ this.tableData1.length || 0 }}</span>鏉�
+              <span 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 v-loading="contentLoading" element-loading-text="鍔犺浇涓�..." element-loading-spinner="el-icon-loading" element-loading-background="rgba(255, 255, 255, 0.7)" style=" padding: 0px 6px;
+    border: 1px solid #e6ebf5;
+    max-height: 650%;
+    overflow: auto;
+    width: 916px;
+    margin-left: 35px;" >
+
+          
           <div style="
               padding: 0px 6px;
               border: 1px solid #e6ebf5;
@@ -588,15 +581,12 @@
               width: 916px;
               margin-left: 35px;
             ">
-
-            <el-table :data="tableData1" border style="width: 100%;">
+            <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-if="isAll(scope.row.proType)"> 鍏ㄩ儴 </template>
                   <template v-else>
                     <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.proType" />
                   </template>
@@ -608,18 +598,29 @@
               <el-table-column label="鎶樻墸">
                 <template slot-scope="scope">
                   <!-- 鍙緭鍏ョ函鏁板瓧鎶樻墸 -->
-                  <el-input v-model.number="scope.row.discount" @input="validateDiscount(scope.row)" placeholder="杈撳叆鎶樻墸"
-                    size="small" type="number" min="0" step="1" max="10">
-                  </el-input>
+                  <el-input-number v-model.number="scope.row.discount" @input="validateDiscount(scope.row)"
+                    @change="handleManualChange(scope.row)" placeholder="杈撳叆鎶樻墸" size="small" type="number" :precision="1"
+                    :step="0.1" :max="10" :min="0">
+                  </el-input-number>
                 </template>
               </el-table-column>
               <el-table-column prop="nowPrice" label="瀹炴敹閲戦">
+                <template slot-scope="scope">
+                  {{ scope.row.nowPrice.toFixed(2) }}
+                </template>
               </el-table-column>
               <el-table-column prop="proCheckMethod" label="鏄惁绌鸿吂">
                 <template slot-scope="scope">
                   <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.proCheckMethod" />
                 </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="鍒犻櫎">
@@ -627,7 +628,7 @@
                 </template>
               </el-table-column>
             </el-table>
-
+          </div>
           </div>
         </div>
       </el-col>
@@ -675,8 +676,8 @@
                   :disabled="true"></el-input>
               </el-form-item>
               <el-form-item label="浼樻儬">
-                <el-input-number style="width: 140px" v-model="discount" :precision="2" :step="0.1" :max="10" :min="0"
-                  @change="numberChange" :disabled="isfalse"></el-input-number>
+                <el-input-number style="width: 140px" v-model="discount" :precision="1" :step="0.1" :max="10" :min="0"
+                  @change="debounceNumberChange" :disabled="isfalse"></el-input-number>
               </el-form-item>
               <el-form-item label="瀹炴敹閲戦">
                 <el-input v-model="formInline.paidIn" placeholder="瀹炰粯" style="width: 94px">
@@ -760,10 +761,11 @@
     <Packages ref="aaa" @add="handleChanges" />
     <selectName ref="bbb" @add="handleChangesName" />
   </div>
+</div>
 </template>
 
 <script>
-import Big from 'big.js';
+import Big from "big.js";
 import selectName from "@/components/selectName";
 import { dataURLtoFile, random } from "./file";
 import { getInfo } from "@/api/login";
@@ -774,6 +776,7 @@
   getByTjNum,
 } from "@/api/hosp/customer";
 import { getPrintSetUp } from "@/api/system/examcharge";
+import cnchar from "cnchar";
 import {
   tuantiSelect,
   deptTreeSelect,
@@ -785,16 +788,13 @@
   getPackageListName,
   getaddtTransition,
   tuantiqueren,
-  getTransitionList,
   getTransitionList1,
-  getByTeamNo,
   delTbBycusCardIdAndProId,
   getLoadFile,
   getIsRequired,
   getconfigKey,
   getHistryTjOrderProByCusIdCard,
-  readCertCardInfos,
-  gaibianzhekou
+  gaibianzhekou,
 } from "@/api/system/tijian";
 import { addComp } from "@/api/system/comp";
 import { getCompany, queryCompany } from "@/api/team/tuanti";
@@ -816,6 +816,7 @@
     "dict_job",
     "dict_user_cardtype",
     "dict_ageunit",
+    "gz",
   ],
   name: "Tijian",
   components: {
@@ -826,6 +827,9 @@
   },
   data() {
     return {
+      isSubmitting: false,
+      contentLoading: false,
+      isLoading: false,
       open1: false,
       filterage: "",
       checkedkeys: [],
@@ -887,12 +891,12 @@
       taocan: false,
       top: true,
       value: "2",
-      getInfodis: "",
       srcUrl: "",
       hides: false,
       hide: true,
       beat: false,
       dialogVisibles: false,
+      loadingSubmit: false,
       charge: false,
       src: "",
       url: "",
@@ -1026,7 +1030,7 @@
         cusIsvip: null,
       },
       // 娣诲姞
-
+      lastXianPrice: 0,
       // 琛ㄥ崟鍙傛暟
       // 琛ㄥ崟鍙傛暟
       obj: {},
@@ -1039,10 +1043,30 @@
         cusMarryStatus: "5",
         idType: "1",
         ageUnit: "0",
-        firmId: '',
-
+        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: {
@@ -1063,6 +1087,7 @@
         contactPhone: [
           {
             required: true,
+            message: "",
             trigger: "blur",
           },
           {
@@ -1090,64 +1115,125 @@
 
     // this.getData();
   },
-  mounted() { },
-
+  mounted() {
+    this.TreedataList = [];
+    this.DataList = [];
+    this.marryall = 0;
+  },
   methods: {
+    handleIdCardInput(value) {
+      this.form.cusIdcard = value.replace(/\s/g, "");
+      this.inputChange(); // 淇濈暀鍘熸湁鐨勮韩浠借瘉杈撳叆澶勭悊閫昏緫
+    },
+    debounceNumberChange(currentValue, oldValue) {
+      clearTimeout(this.debounceTimer);
+      this.debounceTimer = setTimeout(() => {
+        this.numberChange(currentValue, oldValue);
+      }, 300);
+    },
+    changeXianjia() {
+      // 鍘熷鎶樻墸鐜囪绠�
+      if (this.TotalPrice1 !== 0) {
+        this.discount =
+          (Math.floor((this.TotalPrice / this.TotalPrice1) * 100) / 100) * 10;
+      }
+    },
     clear() {
-      this.form.firmId = ""
+      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.$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.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(() => { });
+          this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+        })
+        .catch(() => { });
+    },
+    handleManualChange(row) {
+      this.updateProPrice(row);
     },
     validateDiscount(row) {
-      if (row.discount > 10) {
-        row.discount = 10; // 寮哄埗灏嗗�艰缃负鏈�澶у��
-      } else if (row.discount < 0) {
-        row.discount = 0; // 寮哄埗灏嗗�艰缃负鏈�灏忓��
+      if (
+        this.TotalPrice !== undefined &&
+        !isNaN(this.TotalPrice) &&
+        this.TotalPrice !== this.lastXianPrice
+      ) {
+        this.updateProPrice1(row);
+        this.lastXianPrice = this.TotalPrice;
       }
-      this.updateProPrice(row); // 鏇存柊浠锋牸鎴栧叾浠栭�昏緫
     },
+
     isAll(value) {
-      return value === '' || value === null;
+      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)
+      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'));
+        return sum.plus(new Big(item.nowPrice || "0"));
       }, new Big(0));
 
-      this.discount = (Math.floor((this.TotalPrice / this.TotalPrice1) * 100) / 100) * 10
+      this.discount =
+        (Math.floor((this.TotalPrice / this.TotalPrice1) * 100) / 100) * 10;
     },
+    updateProPrice1(row) {
+      const ordPrice = new Big(row.ordPrice);
+      const discount = new Big(row.discount);
+      const result = ordPrice.times(discount.div(10));
+      row.nowPrice = result.toNumber();
+      const totalYsPrice = this.tableData1.reduce((sum, item) => {
+        return sum.plus(new Big(item.nowPrice || "0"));
+      }, new Big(0));
+      const totalYsPriceNum = totalYsPrice.toNumber();
+      if (this.TotalPrice !== undefined && !isNaN(this.TotalPrice)) {
+        const xianPrice = new Big(this.TotalPrice);
+        const diff = xianPrice.minus(totalYsPriceNum);
+        if (!diff.eq(0) && this.tableData1.length > 0) {
+          const lastItem = this.tableData1[this.tableData1.length - 1];
+          const newYsPrice = new Big(lastItem.nowPrice).plus(diff).toNumber();
+          this.$set(
+            this.tableData1[this.tableData1.length - 1],
+            "nowPrice",
+            newYsPrice
+          );
+        }
+      }
 
-
+      // Update youhui calculation
+      if (this.TotalPrice1 !== 0 && this.TotalPrice !== 0) {
+        this.discount =
+          (Math.floor((this.TotalPrice / this.TotalPrice1) * 100) / 100) * 10;
+      } else {
+        this.discount = 0;
+      }
+    },
     openname() {
-
       this.$refs.bbb.open = true;
       this.$refs.bbb.title = "鎼滅储濮撳悕";
       this.$refs.bbb.getList();
@@ -1193,11 +1279,9 @@
       this.open1 = true;
       this.title = "娣诲姞浣撴鍗曚綅淇℃伅缁存姢";
     },
-    idFn1(value) {
-      if (value) {
-        console.log(value)
+    idFn1() {
+      if (this.form.firmName) {
         const originalCompId = this.form.firmId;
-        this.form.firmName = value;
         this.CompanyList.forEach((item) => {
           if (item.cnName == this.form.firmName) {
             this.form.firmId = item.drugManufacturerId;
@@ -1207,9 +1291,12 @@
         if (this.form.firmId === originalCompId) {
           this.form.firmId = "";
         }
-        if (this.form.firmId) {
-          this.form.tjType = "1"
-        }
+      }
+
+      if (this.form.firmName) {
+        this.form.tjType = this.dict.type.dict_team[1].value;
+      } else {
+        this.form.tjType = this.dict.type.dict_team[0].value;
       }
     },
     getCurrentDateTime() {
@@ -1242,20 +1329,43 @@
       }, 1000); //姣忕閽熸洿鏂颁竴娆�
     },
     filterNode(value, data) {
-      if (!value) return true;
+      // if (!value) return true;
       // return data.proName.indexOf(value) !== -1;
-      if (data.proName.indexOf(value) !== -1) {
-        return data.proName.indexOf(value) !== -1;
-      } else {
-        return data.proEngName.indexOf(value) !== -1;
+      // if (data.proName.indexOf(value) !== -1) {
+      //   return data.proName.indexOf(value) !== -1;
+      // } else {
+      //   return data.proEngName.indexOf(value) !== -1;
+      // }
+      if (!value) return true;
+      if (data.proName.indexOf(value) !== -1) return true;
+      let values = value.toLowerCase();
+      if (data.proEngName.indexOf(values) !== -1) return true;
+     
+      // 鍖归厤灏忓啓
+      let arr = data.proName.spell("low", "array");
+      let spell = arr.join("");
+      let lengths = [0];
+      for (var i = 0; i < arr.length - 1; i++) {
+        lengths.push(lengths[i] + arr[i].length);
       }
+      //鍒ゆ柇label瀹屾暣鎷奸煶 涓� 杈撳叆鍊肩殑 index 鏄笉鏄瓑浜庢煇涓眽瀛楃涓�涓嫾闊冲瓧姣嶇殑index鍊�
+      if (lengths.indexOf(spell.indexOf(value)) !== -1) return true;
+      // 澶у啓
+      let arrUp = data.proName.spell("up", "array");
+      let spellUp = arrUp.join("");
+      let lengthsUp = [0];
+      for (var i = 0; i < arrUp.length - 1; i++) {
+        lengthsUp.push(lengthsUp[i] + arrUp[i].length);
+      }
+      return lengthsUp.indexOf(spellUp.indexOf(value)) !== -1;
     },
     filterpackage(value, data) {
       if (!value) return true;
       if (data.zhmc.indexOf(value) !== -1) {
         return data.zhmc.indexOf(value) !== -1;
       } else {
-        return data.pym.indexOf(value) !== -1;
+        let values = value.toLowerCase();
+        return data.pym.indexOf(values) !== -1;
       }
     },
     beforeDestroy() {
@@ -1270,11 +1380,7 @@
     },
     getList1() {
       getInfo().then((response) => {
-        this.getInfodis = response.user.discount;
         this.hospName = response.hospName;
-        if (this.getInfodis === null) {
-          this.isfalse = true;
-        }
       });
       getIsRequired().then((response) => {
         this.showHidden = response.data;
@@ -1374,6 +1480,8 @@
               this.TotalPrice1 = 0;
               if (this.tableData1) {
                 this.tableData1.forEach((item) => {
+                  // parseFloat(item.nowPrice.toFixed(2))
+
                   this.TotalPrice1 += item.ordPrice;
                   this.TotalPrice += item.nowPrice;
                   if (item.pacName === null) {
@@ -1386,8 +1494,6 @@
                   }
                   this.pacName = item.pacName;
                 });
-
-
 
                 this.list1 = false;
                 this.list3 = true;
@@ -1489,25 +1595,6 @@
         this.srcUrl = response.url;
       });
     },
-    // base64杞枃浠�
-    // dataURLtoFile(image, filename) {
-    //   var arr = image.split(",");
-    //   var mime = arr[0].match(/:(.*?);/)[1];
-    //   var bstr = atob(arr[1]);
-    //   var n = bstr.length;
-    //   var u8arr = new Uint8Array(n);
-    //   while (n--) {
-    //     u8arr[n] = bstr.charCodeAt(n);
-    //   }
-    //   return new File([u8arr], filename, { type: mime });
-    // },
-
-    // 鍏抽棴鎽勫儚澶�
-
-    // stopNavigator() {
-    //   this.thisVideo.srcObject.getTracks()[0].stop();
-    //   this.beat = false;
-    // },
 
     handleClose(done) {
       this.$confirm("纭鍏抽棴锛�")
@@ -1519,17 +1606,7 @@
 
     /** 鏌ヨ淇℃伅鍒楄〃 */
     getList() {
-      // listCustomer(this.queryParams).then((response) => {
-      //   this.customerList = response.rows;
-      //   this.total = response.total;
-      //   this.loading = false;
-      // });
-      getInfo().then((response) => {
-        this.getInfodis = response.user.discount;
-        if (this.getInfodis === null) {
-          this.isfalse = true;
-        }
-      });
+      getInfo().then((response) => { });
       let cusSex = this.form.cusSex;
       //鍏ㄩ儴濂楅
       if (cusSex) {
@@ -1573,14 +1650,13 @@
         updateBy: null,
         updateTime: null,
         deleted: null,
-        firmid: ''
+        firmid: "",
+        firmDeptName: "",
       };
       this.resetForm("form");
     },
     /** 閲嶇疆鎸夐挳鎿嶄綔 */
     resetQuery() {
-      // this.resetForm("form");
-      // this.form = {};
       if (this.confirm === true) {
         this.$tab.refreshPage();
       } else {
@@ -1613,59 +1689,118 @@
       })
         .then(() => {
           this.discount = currentValue;
-          if (this.discount < this.getInfodis) {
-            this.discount = this.getInfodis;
-            // this.$modal.msgError(`璇ヤ汉鍛樻渶楂樹紭鎯犳潈闄愪负${this.getInfodis}鎶榒);
-          }
+
           this.tableData1.forEach((item) => {
-            item.discount = this.discount
+            item.discount = this.discount;
             const ordPrice = new Big(item.ordPrice);
             const discount = new Big(item.discount);
-            const result = ordPrice.times(discount.div(10));  // ordPrice * (discount / 10)
+            const result = ordPrice.times(discount.div(10));
             item.nowPrice = result.toNumber();
             this.TotalPrice = this.tableData1.reduce((sum, item) => {
-              return sum.plus(new Big(item.nowPrice || '0'));
+              return sum.plus(new Big(item.nowPrice || "0"));
             }, new Big(0));
-          })
-          // ----------------------------------------------------------
-
+          });
         })
         .catch(() => {
           this.discount = oldValue;
         });
-
     },
-
+    numberChangeXianPrice(currentValue, oldValue) {
+      // 濡傛灉鐜颁环娌℃湁鍙樺寲锛岀洿鎺ヨ繑鍥�
+      if (this.TotalPrice === this.lastXianPrice || !this.TotalPrice) {
+        return;
+      }
+      this.$confirm("纭畾淇敼鎵�鏈夊瓙椤圭殑鎶樻墸鍚楋紵", "鎻愮ず", {
+        confirmButtonText: "纭畾",
+        cancelButtonText: "鍙栨秷",
+        type: "warning",
+      })
+        .then(() => {
+          this.discount = currentValue;
+          if (this.discount < this.getInfodis) {
+            this.discount = this.getInfodis;
+          }
+          let totalYsprice = new Big(0);
+          this.tableData1.forEach((item) => {
+            item.discount = this.discount;
+            const ordPrice = new Big(item.ordPrice);
+            const discount = new Big(item.discount);
+            const result = ordPrice.times(discount.div(10));
+            item.nowPrice = result.toNumber();
+            totalYsprice = totalYsprice.plus(new Big(item.nowPrice));
+          });
+          if (!totalYsprice.eq(this.TotalPrice)) {
+            const diff = new Big(this.TotalPrice).minus(totalYsprice);
+            if (this.tableData1.length > 0) {
+              const lastItem = this.tableData1[this.tableData1.length - 1];
+              const newYsPrice = new Big(lastItem.nowPrice)
+                .plus(diff)
+                .toNumber();
+              // console.log(
+              //   "hhh",
+              //   this.tableData1[this.tableData1.length - 1].nowPrice,
+              //   newYsPrice
+              // );
+              this.$set(
+                this.tableData1[this.tableData1.length - 1],
+                "nowPrice",
+                newYsPrice
+              );
+            }
+          }
+          this.lastXianPrice = this.TotalPrice;
+        })
+        .catch(() => {
+          this.discount = oldValue;
+        });
+    },
+    /** 鐧昏鎻愪氦鎸夐挳 */
     /** 鐧昏鎻愪氦鎸夐挳 */
     submitForm() {
       let _this = this;
-      this.$refs["form"].validate((valid) => {
-        if (valid) {
-          // return;
-          if (this.form.cusSex === "濂�") {
-            this.form.cusSex = 1;
-          }
-          if (this.form.cusSex === "鐢�") {
-            this.form.cusSex = 0;
-          }
-          if (this.form.cusSex === "鏈煡") {
-            this.form.cusSex = 2;
-          }
-          if (this.form.tjType === '') {
-            this.form.tjType = this.dict.type.dict_team[0].value;
-          }
+      if (!this.form.cusPhone || !this.form.cusName) {
+        this.$message.warning("璇峰~鍐欏繀濉」");
+      } else {
+        this.$refs["form"].validate((valid) => {
+          if (valid) {
+            // 鍒涘缓琛ㄥ崟鏁版嵁鐨勫壇鏈苟鍘婚櫎绌烘牸
+            const formData = { ...this.form };
+            formData.cusName = formData.cusName
+              ? formData.cusName.replace(/\s/g, "")
+              : "";
+            formData.cusPhone = formData.cusPhone
+              ? formData.cusPhone.replace(/\s/g, "")
+              : "";
+            formData.cusIdcard = formData.cusIdcard
+              ? formData.cusIdcard.replace(/\s/g, "")
+              : "";
 
-          addCustomer(this.form).then((response) => {
-            this.responseList = response.data;
+            // 澶勭悊鎬у埆鍊�
+            if (formData.cusSex === "濂�") {
+              formData.cusSex = 1;
+            }
+            if (formData.cusSex === "鐢�") {
+              formData.cusSex = 0;
+            }
+            if (formData.cusSex === "鏈煡") {
+              formData.cusSex = 2;
+            }
+            if (formData.tjType === "") {
+              formData.tjType = this.dict.type.dict_team[0].value;
+            }
 
-            this.$modal.msgSuccess("鏂板鎴愬姛");
+            addCustomer(formData).then((response) => {
+              this.responseList = response.data;
+              this.form.tjType = this.dict.type.dict_team[0].value;
+              this.$modal.msgSuccess("鏂板鎴愬姛");
+              _this.tcShow = true;
+              _this.isDisabled = true;
+              _this.top = false;
+            });
+          }
+        });
+      }
 
-            _this.tcShow = true;
-            _this.isDisabled = true;
-            _this.top = false;
-          });
-        }
-      });
     },
 
     getmailType() {
@@ -1684,6 +1819,7 @@
       let cusIdcard = this.form.cusIdcard;
       if (cusIdcard) {
         getCusIdcard(cusIdcard).then((response) => {
+          _this.top = false;
           if (response.data) {
             this.form = response.data;
             if (this.form.discount === null) {
@@ -1702,6 +1838,13 @@
             }
             if (this.form.reservationId != null) {
               if (this.form.groupingId) {
+                this.form.firmName = this.form.compName;
+                this.form.tjType = this.dict.type.dict_team[1].value;
+                this.CompanyList.forEach((item) => {
+                  if (item.cnName == this.form.firmName) {
+                    this.form.firmId = item.drugManufacturerId;
+                  }
+                });
                 _this.tcShow = true;
 
                 getTransitionList1(this.form.cusIdcard).then((res) => {
@@ -1717,11 +1860,11 @@
                     this.list1 = false;
                     this.list2 = true;
                     this.list3 = false;
-                    this.top = false;
+                    _this.top = false;
                   } else {
                     this.list1 = true;
                     this.TotalPrice = 0;
-                    this.top = false;
+                    _this.top = false;
                   }
                 });
               } else {
@@ -1813,13 +1956,10 @@
                 var resultObj = eval("(" + event.data + ")");
                 this.readCardWebSocket(resultObj);
               };
-              websocket.onclose = function () {
-                alert("璇诲崱鍣ㄨ繛鎺ュ叧闂�");
-              };
             } else if (res.msg == "Y") {
-              this.$refs.aaa.open = true;
+              /* this.$refs.aaa.open = true;
               this.$refs.aaa.getAllList();
-              this.$refs.aaa.title = "璇佷欢瀛楀吀";
+              this.$refs.aaa.title = "璇佷欢瀛楀吀"; */
             } else if (res.msg == "S") {
               this.cardreader = true;
               _this.cardreaderradio = 3;
@@ -1833,10 +1973,15 @@
     // 鏈�鏂颁娇鐢╳ebSocket閫氫俊
     readCardWebSocket(resultObj) {
       let _this = this;
+ const isChineseChar = (char) => /[\u4E00-\u9FA5]/.test(char)
       if (resultObj.code === 200 && resultObj.data.name != null) {
         //鍥炴樉鐩稿叧鏁版嵁
         _this.form.cusName = resultObj.data.name;
-        _this.form.cusSex = resultObj.data.sex == "0" ? "濂�" : "鐢�";
+        if (isChineseChar(resultObj.data.sex)) {
+          _this.form.cusSex = resultObj.data.sex == "濂�" ? 1 : 0
+        } else {
+          _this.form.cusSex = resultObj.data.sex;
+        }
         _this.form.cusNational = resultObj.data.mz;
         _this.form.cusBrithday = resultObj.data.csrq;
         if (_this.form.cusBrithday) {
@@ -1844,6 +1989,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;
@@ -1853,15 +2021,7 @@
         }
       } else {
         this.$message.warning("璇锋斁缃韩浠借瘉鍚庡啀鐐瑰嚮璇诲彇");
-      } /* if (resultObj.resultFlag == "-1") {
-          if (resultObj.errorMsg == "绔彛鎵撳紑澶辫触") {
-            //alert("璇诲崱鍣ㄦ湭杩炴帴");
-          } else {
-            //alert(resultObj.errorMsg);
-          }
-        } else if (resultObj.resultFlag == "-2") {
-          //alert(resultObj.errorMsg);
-        } */
+      }
     },
     // TODO 浠ヤ笅浠g爜鍙兘鏄尘宸濅娇鐢ㄧ殑
     jingChuanHandlerWebSocketResult(resultObj) {
@@ -1876,7 +2036,7 @@
           //鍥炴樉鐩稿叧鏁版嵁
           _this.form.cusName = resultObj.resultContent.partyName;
           _this.form.cusSex =
-            resultObj.resultContent.gender == "0" ? "濂�" : "鐢�";
+            resultObj.resultContent.gender ;
           _this.form.cusNational = resultObj.resultContent.nation;
           _this.form.cusBrithday = resultObj.resultContent.bornDay;
           if (_this.form.cusBrithday) {
@@ -2013,23 +2173,9 @@
           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) {
@@ -2137,10 +2283,9 @@
       }
     },
     handleChangesName(params) {
-      this.form.cusIdcard = params[0].sfzh
-      this.handleQuery()
+      this.form.cusIdcard = params[0].sfzh;
+      this.handleQuery();
     },
-
 
     // 涓婁紶澶村儚
     handleAvatarSuccess(res, file) {
@@ -2160,6 +2305,9 @@
 
     // 鍙栨秷鎸夐挳
     cancel() {
+      this.TreedataList = [];
+      this.DataList = [];
+      this.marryall = 0; // 閲嶇疆鍚堣
       this.Seachopen = false;
       this.taocan = false;
       this.malldisble = false;
@@ -2181,10 +2329,11 @@
       this.name = this.queryParam.pacName;
       let param = {
         sex: this.form.cusSex,
-        dwId: this.form.firmId
-      }
+        dwId: this.form.firmId,
+      };
       if (this.name) {
-        getPackageListName(this.name).then((response) => {
+      let name= this.name.toLowerCase()
+        getPackageListName(name).then((response) => {
           this.newpacName = response.data;
           this.loading = false;
         });
@@ -2193,7 +2342,7 @@
           tuantiSelect(param).then((response) => {
             this.newpacName = response.data;
             this.loading = false;
-          })
+          });
         } else {
           deptTreeSelect().then((response) => {
             this.newpacName = response.rows;
@@ -2203,55 +2352,8 @@
       }
     },
 
-    // 鐐瑰嚮澶氶�夋鑾峰彇閫変腑鏁版嵁
-    // 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
+      this.discount = 10;
       if (this.form.cusIdcard) {
         var cusId = this.form.cusIdcard;
       } else {
@@ -2261,6 +2363,12 @@
       _this.pacId = "";
       this.proIds = [];
       this.tjCategory = "12";
+
+      this.DataList = []; // 娓呯┖宸查�夐」鐩垪琛�
+      this.checkedkey = []; // 娓呯┖鏍戠殑閫変腑鐘舵��
+      this.checkedListkey = [];
+      this.TreedataList = [];
+
       let data = {
         cusId,
         pacId: _this.pacId,
@@ -2287,23 +2395,49 @@
     },
 
     Package() {
-
       this.activeNames = "first";
+      if (this.form.cusSex == "鐢�") {
+        this.form.cusSex = 0;
+      } else if (this.form.cusSex == "濂�") {
+        _this.form.cusSex = 1;
+      }
       let cusSex = this.form.cusSex;
       this.datekey = Date.now();
       //鍏ㄩ儴濂楅
 
       let param = {
         sex: cusSex,
-        dwId: this.form.firmId || ''
-      }
+        dwId: this.form.firmId || "",
+      };
       if (this.form.tjType == 1) {
-        if (!this.form.firmId) {
+        if (!this.form.firmId && !this.form.firmName) {
           this.$message({
             type: "warning",
             message: "璇峰厛缁存姢鍗曚綅锛�",
           });
-
+        } else if (!this.form.firmId && this.form.firmName) {
+          this.taocan = true;
+          this.loading = true;
+          deptTreeSelect(cusSex).then((response) => {
+            this.newpacName = response.rows;
+            try {
+              if (this.tableData1.length >= 1) {
+                this.newpacName.forEach((item3) => {
+                  this.tableData1.forEach((item4) => {
+                    item4.list.forEach((item6) => {
+                      if (item6.pacName === item3.pacName) {
+                        this.$nextTick(() => {
+                          this.$refs.tb.toggleRowSelection(item3, true);
+                        });
+                        throw Error();
+                      }
+                    });
+                  });
+                });
+              }
+            } catch (error) { }
+            this.loading = false;
+          });
         } else {
           this.taocan = true;
           this.loading = true;
@@ -2326,7 +2460,7 @@
               }
             } catch (error) { }
             this.loading = false;
-          })
+          });
         }
       } else {
         this.taocan = true;
@@ -2352,8 +2486,6 @@
           this.loading = false;
         });
       }
-
-
     },
 
     // 鐐瑰嚮澶氶�夋鑾峰彇閫変腑鏁版嵁
@@ -2440,12 +2572,18 @@
     },
     handleClick(tab, event) {
       if (this.activeNames == "second") {
+        console.log(this.form);
+        
         this.DataList = [];
         this.checkedkey = [];
+        this.TreedataList = [];
+        this.marryall = 0; // 閲嶇疆鍚堣
         this.getDataList();
       } else if (this.activeNames == "third") {
         this.DataLists = [];
         this.checkedkeys = [];
+        this.TreedataList = [];
+        this.marryall = 0; // 閲嶇疆鍚堣
         getZhList().then((response) => {
           if (response.data) {
             this.packageList = response.data;
@@ -2454,16 +2592,25 @@
         });
       }
     },
-    // gaibian(val){
-    //   let pname = val;
-    //   getProParentIdDxList(pname).then(response=>{
-    //     this.Treedata = response.data.list;
-    //   })
-    // },
     getDataList() {
       this.loading = true;
-      getProParentIdDxList().then((response) => {
+      console.log(this.form);
+      
+      getProParentIdDxList(this.form.cusSex).then((response) => {
         this.Treedata = response.data.list;
+
+        // 鍥炴樉 TreedataList 鍒� DataList
+        if (this.TreedataList && this.TreedataList.length > 0) {
+          this.DataList = this.TreedataList;
+          this.marryall = this.DataList.reduce(
+            (sum, item) => sum + (item.proPrice || 0) * (item.sl || 1),
+            0
+          );
+          this.checkedListkey = this.DataList.map((item) => item.proId);
+          this.$nextTick(() => {
+            this.$refs.tree.setCheckedKeys(this.checkedListkey);
+          });
+        }
 
         if (this.tableData[0]) {
           this.tableData[0].tjProjectList.forEach((selectionitem) => {
@@ -2474,8 +2621,68 @@
             });
           });
         }
+
+        // 鍥炴樉 packageList 鐨勯�変腑鎬�
+        this.handlePackageSelection();
+
         this.loading = false;
       });
+    },
+
+    handlePackageSelection() {
+      // 鍋囪浣犳湁涔嬪墠淇濆瓨鐨勯�変腑鐘舵�佹垨浠庢煇涓湴鏂硅幏鍙栬繖浜涙暟鎹�
+      let selectedPackageIds = this.getPreviouslySelectedPackages(); // 杩欐槸涓�涓亣璁剧殑鍑芥暟锛屽疄闄呬娇鐢ㄦ椂鏇挎崲涓哄疄闄呯殑閫昏緫
+
+      // 璁剧疆 packageList 鐨勯�変腑鐘舵��
+      this.$nextTick(() => {
+        if (this.$refs.treas) {
+          // 纭繚 treas 寮曠敤宸茬粡瀛樺湪
+          this.$refs.treas.setCheckedKeys(selectedPackageIds, true);
+        }
+        // 鏇存柊 checkedkeys 浠ュ弽鏄犲綋鍓嶉�変腑鐨勫寘
+        this.checkedkeys = selectedPackageIds;
+      });
+
+      // 鏍规嵁閫変腑鐘舵�佹洿鏂� DataLists 鎴栧叾浠栭渶瑕佹洿鏂扮殑鍐呭
+      this.updateDataListsBasedOnSelection(selectedPackageIds);
+    },
+
+    getPreviouslySelectedPackages() {
+      // 杩斿洖涔嬪墠淇濆瓨鐨勯�変腑鍖匢D鏁扮粍
+      // 渚嬪锛屼粠 localStorage 鎴栬�� Vuex store 鑾峰彇
+      return []; // 杩欓噷鏄ず渚嬶紝鏇挎崲涓哄疄闄呰幏鍙栨暟鎹殑閫昏緫
+    },
+
+    updateDataListsBasedOnSelection(selectedPackageIds) {
+      // 鏍规嵁閫変腑鐨勫寘ID鏇存柊 DataLists
+      this.DataLists = [];
+      selectedPackageIds.forEach((id) => {
+        let packageItem = this.packageList.find((item) => item.id === id);
+        if (packageItem) {
+          // 杩欓噷鍋囪姣忎釜鍖呴」鐩兘鏈変竴涓� proId 鏁扮粍鎴栬�呯被浼肩殑缁撴瀯锛岀敤鏉ヨ幏鍙栧寘涓殑椤圭洰
+          if (packageItem.proIds) {
+            // 鍋囪 packageItem 鍖呭惈涓�涓� proId 鏁扮粍
+            packageItem.proIds.forEach((proId) => {
+              let project = this.findProjectById(proId); // 鍋囪鏈変竴涓嚱鏁版潵鎵惧埌椤圭洰
+              if (project) {
+                this.DataLists.push(project);
+              }
+            });
+          }
+        }
+      });
+
+      // 璁$畻鍚堣
+      this.marryalls = this.DataLists.reduce(
+        (sum, item) => sum + item.proPrice,
+        0
+      );
+    },
+
+    findProjectById(proId) {
+      // 姝ゅ嚱鏁板亣璁句綘鏈変竴涓叏灞�鐨勯」鐩垪琛ㄦ垨鑰呭彲浠ヤ粠鏌愪釜API鑾峰彇
+      // 杩欓噷鍙槸涓�涓ず渚嬶紝瀹為檯搴旂敤涓簲璇ユ牴鎹綘鐨勬暟鎹粨鏋勬潵瀹炵幇
+      return this.allpackageList.find((item) => item.proId === proId) || null;
     },
 
     handlepackage(data, checked, checkedNodes) {
@@ -2505,7 +2712,7 @@
                 if (this.DataLists.length >= 1) {
                   this.marryalls = 0;
                   this.DataLists.forEach((item1) => {
-                    this.marryalls += item1.proPrice;
+                    this.marryalls += item1.proPrice * item1.sl;
 
                     this.packagedataList.forEach((item3) => {
                       if (item1.proParentId == item3.proId) {
@@ -2543,16 +2750,6 @@
           }
         }
       }
-
-      // if (columnIndex == 3) {
-      //   let rowspan = 0;
-      //   this.DataLists.forEach((element) => {
-      //     if (element.propinName === row.propinName) {
-      //       rowspan++;
-      //     }
-      //   });
-      //   return [rowspan, 1];
-      // }
     },
     handlePackageChecked(data, checked, checkedNodes) {
       if (checked == false) {
@@ -2579,33 +2776,40 @@
         });
       }
     },
-    // 鐐瑰嚮鑾峰彇姣忎釜鏍戣妭鐐�
     handleCurrentChecked(data, checked, checkedNodes) {
       this.dataObj = data;
-      if (checked.checkedNodes.length != 0) {
-        this.$refs.tree.setCheckedKeys([data.proId]);
+      if (checked.checkedNodes.length > 0) {
+        const promises = checked.checkedNodes.map((node) =>
+          getProSonDxList(node.proId)
+        );
+        Promise.all(promises).then((results) => {
+          this.TreedataList = results.flatMap((res) => res.data.list);
+          this.checkedListkey = [];
+          this.DataList = [];
 
-        let proId = data.proId;
-        getProSonDxList(proId).then((res) => {
-          this.TreedataList = res.data.list;
           this.TreedataList.forEach((item) => {
             this.checkedListkey.push(item.proId);
-
             this.DataList.push(item);
-            this.spliceData();
-            this.DataList.forEach((item1) => {
-              if (item1.proParentId == data.proId) {
-                item1.propinName = data.proName;
-              }
-            });
           });
+
+          this.spliceData(); // 鍋囪杩欎釜鏂规硶鏄綘瀹氫箟鐨勫叾浠栧湴鏂瑰鐞嗘暟鎹殑
+
+          // 鏇存柊鍚嶇О鍜岃绠楁�讳环
+          this.DataList.forEach((item1) => {
+            const parent = checked.checkedNodes.find(
+              (node) => node.proId === item1.proParentId
+            );
+            if (parent) {
+              item1.propinName = parent.proName;
+            }
+          });
+
           this.TotalPrice1 = 0;
           this.marryall = 0;
           if (this.DataList.length != 0) {
             this.list1 = false;
             this.DataList.forEach((item) => {
-
-              this.marryall += item.proPrice;
+              this.marryall += Number(item.proPrice) * Number(item.sl);
             });
           }
         });
@@ -2719,123 +2923,129 @@
 
     // 椤圭洰鎻愪氦
     submit() {
+    this.isLoading = true;
       if (this.form.cusIdcard) {
         var cusId = this.form.cusIdcard;
       } else {
         this.$message.warning("璇峰厛濉啓淇℃伅锛屽啀閫変綋妫�鍐呭");
+        return; // 濡傛灉娌℃湁韬唤璇佸彿鐮侊紝鍋滄鎵ц
       }
+
       let _this = this;
+
+      // 鍒濆鍖栧彉閲�
+      this.isSubmitting = true; // 寮�濮嬫彁浜ゆ椂璁剧疆鏍囧織
+      this.TotalPrice1 = 0; // 鍒濆鍖栧簲鏀堕噾棰�
+      this.TotalPrice = 0; // 鍒濆鍖栧疄鏀堕噾棰�
+
+      this.contentLoading = true; 
+      this.discount = 10; // 鍒濆鍖栨姌鎵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,
       };
-      if (this.form.tjType == 1) {
-        tuantiqueren(data).then((response) => {
-          if (response.code == 200) {
-            let cusId = this.form.cusIdcard;
-            this.proIds = [];
-            getTransitionList1(cusId).then((response) => {
-              this.tableData1 = response.data;
-              this.TotalPrice1 = 0;
-              if (this.tableData1) {
-                this.tableData1.forEach((item) => {
-                  if (item.tjCategory != null) {
-                    this.tjCategory = item.tjCategory;
-                  }
-                  if (item.pacName == "鍗曢」") {
-                    item.list.forEach((item9) => {
-                      this.treeList.push(item9.proId);
-                    });
-                  }
-                  this.TotalPrice1 += item.ordPrice;
-                  this.TotalPrice += item.nowPrice;
-
-                  this.pacName = item.pacName;
-                });
-
-                this.TotalPrice = this.tableData1.reduce((sum, item) => {
-                  return sum.plus(new Big(item.nowPrice || '0'));
-                }, new Big(0));
-                this.discount = (Math.floor((this.TotalPrice / this.TotalPrice1) * 100) / 100) * 10
-                this.list1 = false;
-                this.list3 = true;
-                this.list2 = false;
-              } else {
-                this.list1 = true;
-                this.TotalPrice = 0;
-              }
-            });
-          } else {
-
-          }
-        });
+      // 鏍规嵁浣撴绫诲瀷閫夋嫨涓嶅悓鐨勫鐞嗘柟娉�
+      if (this.form.firmId) {
+        tuantiqueren(data)
+          .then((response) => {
+            if (response.code == 200) {
+              this.processOrderItems(cusId);
+            }
+            this.isSubmitting = false; // 鎻愪氦瀹屾垚鍚庨噸缃爣蹇�
+             this.isLoading = false;
+          })
+          .catch(() => {
+            this.isSubmitting = false; // 纭繚鍦ㄩ敊璇儏鍐典笅涔熼噸缃爣蹇�
+             this.isLoading = false;
+          });
+      } else {
+        getaddtTransition(data)
+          .then((response) => {
+            if (response.code == 200) {
+              this.processOrderItems(cusId);
+            }
+            this.isSubmitting = false; // 鎻愪氦瀹屾垚鍚庨噸缃爣蹇�
+             this.isLoading = false;
+            // this.contentLoading = false;
+          })
+          .catch(() => {
+            this.isSubmitting = false; // 纭繚鍦ㄩ敊璇儏鍐典笅涔熼噸缃爣蹇�
+             this.isLoading = false;
+            // this.contentLoading = false;
+          });
       }
-       else {
-        getaddtTransition(data).then((response) => {
-          if (response.code == 200) {
-            let cusId = this.form.cusIdcard;
-            this.proIds = [];
-            getTransitionList1(cusId).then((response) => {
-              this.tableData1 = response.data;
-              this.TotalPrice1 = 0;
-              if (this.tableData1) {
-                this.tableData1.forEach((item) => {
-                  if (item.tjCategory != null) {
-                    this.tjCategory = item.tjCategory;
-                  }
-                  if (item.pacName == "鍗曢」") {
-                    item.list.forEach((item9) => {
-                      this.treeList.push(item9.proId);
-                    });
-                  }
-                  this.TotalPrice1 += item.ordPrice;
-                  this.TotalPrice += item.nowPrice;
 
-                  this.pacName = item.pacName;
-                });
-                this.discount = (Math.floor((this.TotalPrice / this.TotalPrice1) * 100) / 100) * 10
-
-
-                this.list1 = false;
-                this.list3 = true;
-                this.list2 = false;
-              } else {
-                this.list1 = true;
-                this.TotalPrice = 0;
-              }
-            });
-          } else {
-
-          }
-        });
-      }
       this.taocan = false;
       this.defaultKeys = [];
       this.DataLists = [];
     },
+
+    // 澶勭悊璁㈠崟椤圭洰
+    processOrderItems(cusId) {
+      getTransitionList1(cusId).then((response) => {
+        this.contentLoading = false;
+        this.tableData1 = response.data;
+        let Price = 0;
+        if (this.tableData1) {
+          this.tableData1.forEach((item) => {
+            if (typeof item.nowPrice === 'number') {
+              item.nowPrice = Number(item.nowPrice.toFixed(2));
+            }
+            if (item.tjCategory != null) {
+              this.tjCategory = item.tjCategory;
+            }
+            if (item.pacName == "鍗曢」") {
+              item.list.forEach((item9) => {
+                this.treeList.push(item9.proId);
+              });
+            }
+            this.TotalPrice1 += item.ordPrice || 0; // 绱姞搴旀敹閲戦
+            Price += item.nowPrice || 0; // 绱姞瀹炴敹閲戦
+            this.TotalPrice = Price.toFixed(2);
+          });
+          // 璁$畻鎶樻墸
+          this.discount =
+            this.TotalPrice1 > 0
+              ? (Math.floor((this.TotalPrice / this.TotalPrice1) * 100) / 100) *
+              10
+              : 0;
+
+          this.list1 = false;
+          this.list3 = true;
+          this.list2 = false;
+        } else {
+          this.list1 = true;
+          this.TotalPrice = 0;
+        }
+      });
+    },
     submitCheckinfee() {
       let _this = this;
       if (_this.tjCategory !== "") {
-        let List = _this.tableData1; //鍗曚釜椤圭洰淇℃伅
+        let List = _this.tableData1;
         if (this.responseList.cusId) {
           var userId = this.responseList.cusId;
         } else {
@@ -2846,7 +3056,20 @@
           var pacId = this.tableData[0].pacId;
         }
 
-        //tjOrderList//杩欎釜鏄鐞嗗畬鐨勬瘡涓�椤瑰椁愪俊鎭�
+        // 鍘荤┖鏍煎鐞�
+        const processedForm = {
+          ...this.form,
+          cusName: this.form.cusName
+            ? this.form.cusName.replace(/\s/g, "")
+            : "",
+          cusPhone: this.form.cusPhone
+            ? this.form.cusPhone.replace(/\s/g, "")
+            : "",
+          cusIdcard: this.form.cusIdcard
+            ? this.form.cusIdcard.replace(/\s/g, "")
+            : "",
+        };
+
         List.forEach((item) => {
           if (item.list) {
             item.list.forEach((item1) => {
@@ -2872,6 +3095,7 @@
             });
           }
         });
+
         let copeWith = this.TotalPrice1;
         let paidIn = this.TotalPrice.toString();
         let discount = this.discount;
@@ -2889,6 +3113,10 @@
             getType: this.getType,
             addAddress: this.addAddress,
             tjCategory: this.tjCategory,
+            // 浣跨敤鍘绘帀绌烘牸鍚庣殑鏁版嵁
+            cusName: processedForm.cusName,
+            cusPhone: processedForm.cusPhone,
+            cusIdcard: processedForm.cusIdcard,
           };
         } else {
           data = {
@@ -2899,8 +3127,13 @@
             tjType,
             getType: this.getType,
             tjCategory: this.tjCategory,
+            // 浣跨敤鍘绘帀绌烘牸鍚庣殑鏁版嵁
+            cusName: processedForm.cusName,
+            cusPhone: processedForm.cusPhone,
+            cusIdcard: processedForm.cusIdcard,
           };
         }
+
         getOrder(data).then((res) => {
           this.$modal.msgSuccess("鎻愪氦鎴愬姛");
           this.tjNumbers = res.msg;
@@ -2996,9 +3229,6 @@
             }
             this.discount =
               (this.formInline.paidIn / this.formInline.price) * 10;
-            if (this.discount <= this.getInfodis) {
-              this.discount = this.getInfodis;
-            }
           } else {
             this.discount = 10;
             this.formInline.paidIn = "0.00";
@@ -3077,10 +3307,15 @@
     },
 
     listgetOrder(data) {
+      const loading = this.$loading({
+        lock: true,
+        text: '姝e湪鍔犺浇涓紝璇风◢绛夛紒',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      });
       getOrder(data).then((res) => {
+        loading.close();
         this.$modal.msgSuccess("鎻愪氦鎴愬姛");
-        // this.dialogVisibles = true;
-        // this.url = window.webkitURL.createObjectURL(res); //灏嗗悗绔繑鍥炵殑blob鏂囦欢璇诲彇鍑簎rl
         //璋冩帴鍙f樉绀哄妫�鍗�
         const tjNumber = res.msg;
         const viewNum = "792931586196398080";
@@ -3094,6 +3329,7 @@
     // 鏈�鍚庢彁浜ゆ寜閽�
     submitPrice() {
       let _this = this;
+      this.loadingSubmit = true;
       if (_this.tjCategory !== "") {
         let List = _this.tableData1; //鍗曚釜椤圭洰淇℃伅
         if (this.responseList.cusId) {
@@ -3137,9 +3373,15 @@
         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
+          .filter((item) => item.discount < 10) // 杩囨护鍑� discount < 10 鐨勯」
+          .map((item) => ({
+            discount: item.discount,
+            parentProId: item.parentProId,
+            cusIdCard: item.cusId,
+            yhj: item.nowPrice,
+          })); // 鍒涘缓鏂扮殑瀵硅薄锛屽寘鍚� discount 鍜� id
         gaibianzhekou(newArray).then((res) => {
+          this.loadingSubmit = false;
           if (res.code === 200) {
             let data;
 
@@ -3152,6 +3394,9 @@
                 userId,
                 tjType,
                 tjCategory: this.tjCategory,
+                firmId: this.form.firmId,
+                firmName: this.form.firmName,
+                firmDeptName: this.form.firmDeptName,
               };
 
               this.listgetOrder(data);
@@ -3163,20 +3408,25 @@
                 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("璇烽�夋嫨浣撴绫诲埆");
       }
     },
@@ -3234,11 +3484,10 @@
 }
 
 .filter-tree {
-  /* max-height: 360px;
   overflow-y: auto;
-  border: 1px solid #d9d9d9; */
-  overflow: auto;
-  flex: 1;
+  /* 淇濈暀绾靛悜婊氬姩鏉� */
+  overflow-x: hidden;
+  /* 闅愯棌妯悜婊氬姩鏉� */
   height: 350px;
 }
 
@@ -3349,4 +3598,17 @@
   width: 100%;
   display: flex;
 }
+
+/* .tab3 {
+  overflow-y: auto;
+}
+
+.tab3::-webkit-scrollbar {
+  width: 0px;
+  background: transparent;
+}
+
+.tab3::-webkit-scrollbar-thumb {
+  background: transparent;
+} */
 </style>

--
Gitblit v1.8.0