From c140987b3ef6fd47e3b795fc3a2c6f880f49f9c2 Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期三, 12 三月 2025 13:41:28 +0800
Subject: [PATCH] qx

---
 src/views/system/tijianall/index.vue | 1233 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 1,133 insertions(+), 100 deletions(-)

diff --git a/src/views/system/tijianall/index.vue b/src/views/system/tijianall/index.vue
index bee40f1..bbbb03a 100644
--- a/src/views/system/tijianall/index.vue
+++ b/src/views/system/tijianall/index.vue
@@ -1,5 +1,96 @@
 <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-form-item label="鍗曚綅鍚嶇О" prop="cnName">
+          <el-input v-model="form1.cnName" placeholder="璇疯緭鍏ヤ腑鏂囧悕绉�" />
+        </el-form-item>
+        <el-form-item label="鑱旂郴浜�" prop="contactPerson">
+          <el-input v-model="form1.contactPerson" placeholder="璇疯緭鍏ヨ仈绯讳汉" />
+        </el-form-item>
+        <el-form-item label="鑱旂郴鐢佃瘽" prop="contactPhone">
+          <el-input v-model="form1.contactPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" />
+        </el-form-item>
+        <el-form-item label="绋庡彿" prop="taxNumber">
+          <el-input v-model="form1.taxNumber" placeholder="璇疯緭鍏ョ◣鍙�" />
+        </el-form-item>
+        <el-form-item label="娉曚汉" prop="legalPerson">
+          <el-input v-model="form1.legalPerson" placeholder="璇疯緭鍏ユ硶浜�" />
+        </el-form-item>
+        <el-form-item label="娉ㄥ唽鍦板潃" prop="registerAddress">
+          <el-input
+            v-model="form1.registerAddress"
+            placeholder="璇疯緭鍏ユ敞鍐屽湴鍧�"
+          />
+        </el-form-item>
+        <el-form-item label="閫氳鍦板潃" prop="mailingAddress">
+          <el-input
+            v-model="form1.mailingAddress"
+            placeholder="璇疯緭鍏ラ�氳鍦板潃"
+          />
+        </el-form-item>
+        <el-form-item label="寮�鎴烽摱琛�" prop="bankAccount">
+          <el-input v-model="form1.bankAccount" placeholder="璇疯緭鍏ュ紑鎴烽摱琛�" />
+        </el-form-item>
+        <el-form-item label="閾惰璐︽埛" prop="countNum">
+          <el-input v-model="form1.countNum" placeholder="璇疯緭鍏ラ摱琛岃处鎴�" />
+        </el-form-item>
+        <el-form-item label="閭" prop="email">
+          <el-input v-model="form1.email" placeholder="璇疯緭鍏ラ偖绠�" />
+        </el-form-item>
+        <el-form-item label="璐熻矗浜�" prop="principal">
+          <el-input v-model="form1.principal" placeholder="璇疯緭鍏ヨ礋璐d汉" />
+        </el-form-item>
+        <el-form-item label="缃戝潃" prop="url">
+          <el-input v-model="form1.url" placeholder="璇疯緭鍏ョ綉鍧�" />
+        </el-form-item>
+        <el-form-item label="浼犵湡" prop="faxNumber">
+          <el-input v-model="form1.faxNumber" placeholder="璇疯緭鍏ヤ紶鐪�" />
+        </el-form-item>
+        <el-form-item label="琛屾斂鍖哄垝鍚嶇О" prop="areaName">
+          <el-input v-model="form1.areaName" placeholder="璇疯緭鍏ヨ鏀垮尯鍒掑悕绉�" />
+        </el-form-item>
+        <el-form-item label="鎺掑簭" prop="orderNum">
+          <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-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-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer2">
+        <el-button type="primary" @click="submitFormS">纭� 瀹�</el-button>
+        <el-button @click="cancel1">鍙� 娑�</el-button>
+      </div>
+    </el-dialog>
     <el-row>
       <el-col :span="18">
         <div>
@@ -28,7 +119,12 @@
                 },
               ]"
             >
-              <el-input v-model="form.cusName" placeholder="璇疯緭鍏ュ鍚�" style="width: 99%;"/>
+              <el-input
+              @input="form.cusName = $event.replace(/\s/g, '')"
+                v-model="form.cusName"
+                placeholder="璇疯緭鍏ュ鍚�"
+                style="width: 99%"
+              />
             </el-form-item>
             <el-form-item label="鎬у埆" prop="cusSex">
               <el-select
@@ -46,7 +142,11 @@
               </el-select>
             </el-form-item>
             <el-form-item label="璇佷欢绫诲瀷" prop="idType">
-              <el-select v-model="form.idType" placeholder="璇烽�夋嫨璇佷欢绫诲瀷" style="width: 93%;">
+              <el-select
+                v-model="form.idType"
+                placeholder="璇烽�夋嫨璇佷欢绫诲瀷"
+                style="width: 93%"
+              >
                 <el-option
                   v-for="dict in dict.type.dict_user_cardtype"
                   :key="dict.value"
@@ -64,7 +164,7 @@
             :rules="rules"
             label-width="106px"
           >
-          <el-form-item
+            <el-form-item
               label="鐢佃瘽"
               prop="cusPhone"
               :rules="[
@@ -80,11 +180,12 @@
                   trigger: 'blur',
                 },
               ]"
-            >
-              <el-input v-model="form.cusPhone" placeholder="璇疯緭鍏ョ數璇�" />
+            > 
+              
+              <el-input v-model="form.cusPhone" placeholder="璇疯緭鍏ョ數璇�"   @input="form.cusPhone = $event.replace(/\s/g, '')"/>
             </el-form-item>
-        
-            <el-form-item label="濠氬Щ" prop="cusMarryStatus" >
+
+            <el-form-item label="濠氬Щ" prop="cusMarryStatus">
               <el-select
                 v-model="form.cusMarryStatus"
                 placeholder="璇烽�夋嫨濠氬Щ鐘跺喌"
@@ -125,7 +226,9 @@
               <el-input
                 v-model="form.cusIdcard"
                 placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�"
-                @input="inputChange"
+                @input="handleIdCardInput"
+                style="width: 190px"
+                
               />
               <!-- <i
                 style="font-size: 17px; margin-left: 3px"
@@ -142,15 +245,16 @@
             :rules="rules"
             label-width="106px"
           >
-          <el-form-item label="閭" prop="cusEmail">
-              <el-input v-model="form.cusEmail" placeholder="璇疯緭鍏ラ偖绠�" />
+            <el-form-item label="閭" prop="cusEmail">
+          
+              <el-input v-model="form.cusEmail" placeholder="璇疯緭鍏ラ偖绠�"      @input="form.cusEmail = $event.replace(/\s/g, '')"/>
             </el-form-item>
-          <el-form-item label="姘戞棌" prop="cusNational">
+            <el-form-item label="姘戞棌" prop="cusNational">
               <el-select
                 filterable
                 v-model="form.cusNational"
                 placeholder="璇烽�夋嫨姘戞棌"
-                style="width: 93%;"
+                style="width: 94%"
               >
                 <el-option
                   v-for="dict in dict.type.dict_user_national"
@@ -160,9 +264,6 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-           
-
-      
 
             <el-form-item label="骞撮緞" prop="age">
               <el-input
@@ -173,7 +274,7 @@
               <el-select
                 :disabled="isDisabled"
                 v-model="form.ageUnit"
-                style="width: 20%"
+                style="width: 19%"
               >
                 <el-option
                   v-for="dict in dict.type.dict_ageunit"
@@ -193,11 +294,10 @@
             label-width="106px"
           >
             <el-form-item label="鍗″彿" prop="indexCard">
-              <el-input v-model="form.indexCard" placeholder="璇疯緭鍏ュ崱鍙�" />
+              <el-input v-model="form.indexCard" placeholder="璇疯緭鍏ュ崱鍙�"   @input="form.indexCard = $event.replace(/\s/g, '')"/>
             </el-form-item>
             <el-form-item label="鑱屼笟" prop="career">
               <el-select
-                filterable
                 :disabled="isDisabled"
                 v-model="form.career"
                 placeholder="璇疯緭鍏ヨ亴涓�"
@@ -215,13 +315,14 @@
             <el-form-item label="浣撴绫诲瀷" prop="tjType">
               <el-select
                 v-model="form.tjType"
-                placeholder="璇烽�夋嫨浣撴绫诲瀷" style="width: 94%;"
+                placeholder="璇烽�夋嫨浣撴绫诲瀷"
+                style="width: 94%"
               >
                 <el-option
                   v-for="dict in dict.type.dict_team"
                   :key="dict.value"
                   :label="dict.label"
-                  :value="parseInt(dict.value)"
+                  :value="dict.value"
                 ></el-option>
               </el-select>
             </el-form-item>
@@ -234,11 +335,34 @@
             :rules="rules"
             label-width="106px"
           >
-            <el-form-item label="鍗曚綅" prop="company">
-              <el-input v-model="form.company" placeholder="璇疯緭鍏ュ伐浣滃崟浣�" />
+            <el-form-item label="鍗曚綅鍚嶇О" prop="compName">
+              <el-select
+                :disabled="isDisabled"
+                v-model="form.compName"
+                remote
+                default-first-option
+                allow-create
+                filterable
+                style="width: 200px"
+                placeholder="璇烽�夋嫨鍗曚綅鍚嶇О"
+                clearable
+                @change="idFn1"
+              >
+                <el-option
+                  v-for="dict in CompanyList"
+                  :key="dict.cnName"
+                  :label="dict.cnName"
+                  :value="dict.cnName"
+                />
+              </el-select>
+              <!-- <i class="el-icon-circle-plus-outline" @click="handleAdd1"></i> -->
             </el-form-item>
-            <el-form-item label="浣撴绫诲埆" prop="category">
-              <el-select v-model="form.category" placeholder="璇烽�夋嫨浣撴绫诲埆" style="width: 95%;">
+            <el-form-item label="浣撴绫诲埆" prop="category" label-width="95px">
+              <el-select
+                v-model="form.category"
+                placeholder="璇烽�夋嫨浣撴绫诲埆"
+                style="width: 94%"
+              >
                 <el-option
                   v-for="dict in dict.type.dict_tjtype"
                   :key="dict.value"
@@ -249,9 +373,12 @@
               <!-- <el-input v-model="form.category" placeholder="璇疯緭鍏ヤ綋妫�绫诲埆" /> -->
             </el-form-item>
             <el-form-item label="閮ㄩ棬" prop="department">
-              <el-input v-model="form.department" placeholder="璇疯緭鍏ラ儴闂�" />
+              <el-input
+                v-model="form.department"
+                placeholder="璇疯緭鍏ラ儴闂�"
+                style="width: 93%"
+              />
             </el-form-item>
-            
           </el-form>
           <el-form
             style="margin: 4px 8px"
@@ -264,10 +391,11 @@
             <el-form-item label="鐜颁綇鍦板潃" prop="cusAddr">
               <el-input v-model="form.cusAddr" placeholder="璇疯緭鍏ョ幇灞呬綇鍦板潃" />
             </el-form-item>
-            <el-form-item label="棰勭害鏃堕棿" prop="timeRegion" >
+            <el-form-item label="棰勭害鏃堕棿" prop="timeRegion">
               <el-select
                 v-model="form.timeRegion"
-                placeholder="璇烽�夋嫨棰勭害鏃堕棿" style="width: 95%;"
+                placeholder="璇烽�夋嫨棰勭害鏃堕棿"
+                style="width: 95%"
               >
                 <el-option
                   v-for="dict in dict.type.tj_time_region"
@@ -288,7 +416,6 @@
               >
               </el-date-picker>
             </el-form-item>
-           
           </el-form>
         </div>
       </el-col>
@@ -297,15 +424,17 @@
     <el-dialog
       title="閫夋嫨濂楅"
       :visible.sync="taocan"
-      width="59%"
+      width="80%"
       height="700px"
+      :close-on-click-modal="false"
     >
       <el-tabs
         type="border-card"
         style="height: 538px; margin: 0 10px; width: 100%"
         @tab-click="handleClick"
+        v-model="activeNames"
       >
-        <el-tab-pane label="濂楅">
+        <el-tab-pane label="濂楅" name="first">
           <el-form
             :model="queryParam"
             ref="queryForm"
@@ -391,7 +520,115 @@
                   class="el-icon-d-arrow-right"></i></el-button> -->
           </div>
         </el-tab-pane>
-        <el-tab-pane label="鍗曢」">
+        <el-tab-pane label="缁勫悎" name="third">
+          <div class="tab8">
+            <el-row :gutter="20" style="width: 100%">
+              <el-col :span="6">
+                <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>
+                </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="packagedataList"
+                    node-key="proId"
+                    :props="defaultpackProps"
+                    :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="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>
+                    <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="handleDel(scope.row)"
+                          title="鍒犻櫎"
+                        ></el-button>
+                      </template>
+                    </el-table-column>
+                  </el-table>
+
+                  <h3 style="font-weight: 600">鍚堣锛歿{ marryalls }}鍏�</h3>
+                </div>
+              </el-col>
+            </el-row>
+          </div>
+        </el-tab-pane>
+        <el-tab-pane label="鍗曢」" name="second">
           <div class="tab8">
             <!-- <div class="tab7">
               <v-tree-transfer
@@ -405,7 +642,7 @@
                 @check-change="handleCurrentChecked">
               </el-tree> -->
             <!-- </div> -->
-            <el-row :gutter="20">
+            <el-row :gutter="20" style="width: 100%">
               <el-col :span="6">
                 <div
                   style="
@@ -430,6 +667,7 @@
                     :default-checked-keys="checkedkey"
                     :filter-node-method="filterNode"
                     ref="tree"
+                    :render-content="renderContent"
                   >
                   </el-tree>
                 </div>
@@ -455,6 +693,7 @@
                     show-checkbox
                     @check-change="handleCurrentChecked1"
                     :default-checked-keys="checkedListkey"
+                    :render-content="renderContent"
                   >
                   </el-tree>
                 </div>
@@ -506,7 +745,8 @@
                       </template>
                     </el-table-column>
                   </el-table>
-                  <el-collapse v-model="activeName" accordion v-if="list1">
+
+                  <!-- <el-collapse v-model="activeName" accordion v-if="list1">
                     <div>
                       <el-collapse-item title="璇烽�夋嫨椤圭洰">
                         <el-table
@@ -527,7 +767,8 @@
                         </el-table>
                       </el-collapse-item>
                     </div>
-                  </el-collapse>
+                  </el-collapse> -->
+                  <h3 style="font-weight: 600">鍚堣锛歿{ marryall }}鍏�</h3>
                 </div>
               </el-col>
             </el-row>
@@ -588,7 +829,7 @@
             <el-form
               :model="form"
               :inline="true"
-              label-width="100px"
+              label-width="104px"
               style="margin-left: 10px"
             >
               <el-form-item label="搴旀敹閲戦" style="margin-right: 20px">
@@ -603,21 +844,19 @@
                 <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-form-item> -->
-              <el-form-item label="瀹炴敹閲戦" >
+              <el-form-item label="瀹炴敹閲戦" label-width="96px">
                 <el-input
                   placeholder="瀹炴敹閲戦"
                   v-model="TotalPrice"
                   disabled
+                  style="width: 192px"
                 ></el-input>
               </el-form-item>
-              <el-form-item>
+              <el-form-item style="margin-left: 50px">
                 <el-button type="primary" @click="Package" size="mini"
                   >閫夋嫨濂楅</el-button
                 >
-                <el-button
-                  type="primary"
-                  @click="resetpackage"
-                  size="mini"
+                <el-button type="primary" @click="resetpackage" size="mini"
                   >閲嶇疆濂楅</el-button
                 >
                 <el-button
@@ -674,6 +913,12 @@
                       ".00鍏�)"
                     }}
                   </template>
+                  <el-button
+                    type="primary"
+                    @click="candelete(item)"
+                    style="margin: 5px"
+                    >鍒� 闄�</el-button
+                  >
                   <el-table
                     :data="item.list"
                     border
@@ -793,6 +1038,32 @@
     </el-row>
 
     <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>
+        </div>
+      </template>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="cardreader = false">鍙� 娑�</el-button>
+        <el-button type="primary" @click="cardreadercopes">纭� 瀹�</el-button>
+      </span>
+    </el-dialog>
+
+    <el-dialog
       title="瀵兼鍗曢瑙�"
       :visible.sync="dialogVisibles"
       :close-on-click-modal="false"
@@ -819,12 +1090,15 @@
       </span>
     </el-dialog>
     <historyTj :cusIdCard="form.cusIdcard" ref="historyTj"></historyTj>
+    <Packages ref="aaa" @add="handleChanges" />
   </div>
 </template>
   
 <script>
 import printJS from "print-js";
 import { getInfo } from "@/api/login";
+import Packages from "@/components/Packages";
+import { getZhList, getlistByZhId } from "@/api/system/package";
 import {
   deptTreeSelect,
   projectGetList,
@@ -835,16 +1109,18 @@
   getProParentIdDxList,
   getProSonDxList,
   getaddTj,
-  getHistryTjOrderByCusIdCard,
+  getconfigKey,
   getHistryTjOrderProByCusIdCard,
+  delTbBycusCardIdAndProId,
 } from "@/api/system/tijian";
-import { MessageBox } from "element-ui";
 import VTreeTransfer from "../tijian/TreeTransfer.vue";
 import historyTj from "@/components/historyTj/index";
+import { getCompany, queryCompany } from "@/api/team/tuanti";
 export default {
   components: {
     VTreeTransfer,
     historyTj,
+    Packages,
   },
   dicts: [
     "dict_user_national",
@@ -896,10 +1172,38 @@
     //   }
     // };
     return {
+      rules1: {
+        cnName: [{ required: true, trigger: "blur" }],
+        contactPerson: [{ required: true, trigger: "blur" }],
+        contactPhone: [
+          {
+            required: true,
+            trigger: "blur",
+          },
+          {
+            pattern: /^1[3-9]\d{9}$/,
+            trigger: "blur",
+          },
+        ],
+      },
+      title: "",
+      open1: false,
+      CompanyList: [],
+      marryall: 0,
+      marryalls: 0,
       filterText: "",
+      filterage: "",
       proIdList: [],
       tableDatas: [],
+      packageList: [],
+      checkedkeys: [],
+      // valueUrl: "ws://127.0.0.1:18890",
+      valueUrl: "ws://127.0.0.1:6789/websocket",
+      valueUrls: "ws://127.0.0.1:6789/websocket",
       dialogVisiblese: false,
+      cardreader: false,
+      cardreaderradio: 3,
+      inputSSS: "",
       lishi: false,
       table: false,
       HistoryList: {},
@@ -928,6 +1232,7 @@
       /** 鐓х浉鏈哄脊绐楁ā鍧�-start */
       videoWidth: 200,
       videoHeight: 200,
+      activeNames: "first",
       // canvasWidth:300,
       // canvasHeight:300,
       imgSrc: "",
@@ -989,12 +1294,22 @@
       // 鏍戠姸褰㈢姸
       Treedata: [],
       TreedataList: [],
+      DataLists: [],
       treedataList: [],
       checkedkey: [],
       checkedListkey: [],
       defaultProps: {
         children: [],
         label: "proName",
+      },
+      packagedataList: [],
+      defaultpackProps: {
+        children: [],
+        label: "proName",
+      },
+      defaultProp: {
+        children: [],
+        label: "zhmc",
       },
       formPacId: "",
       dXData: [],
@@ -1033,14 +1348,22 @@
 
       // 琛ㄥ崟鍙傛暟
       // 琛ㄥ崟鍙傛暟
+      form1: {
+        company: "",
+        payType: "",
+        name: "",
+        phoe: "",
+        signingPic: "",
+        discount: "",
+      },
       form: {
         cusIdcard: "",
-        tjType: 2,
+        tjType: "3",
         category: "01",
         cusSex: 1,
         cusNational: "1",
         timeRegion: "1",
-        cusMarryStatus: "1",
+        cusMarryStatus: "5",
         idType: "1",
         ageUnit: "0",
       },
@@ -1094,11 +1417,95 @@
     filterText(val) {
       this.$refs.tree.filter(val);
     },
+    filterage(val) {
+      this.$refs.treas.filter(val);
+    },
   },
   created() {
+    this.getCompanyList();
+
     this.getList1();
+    console.log(this.dict.type.dict_team, 999);
   },
   methods: {
+    getCompanyList() {
+      this.loading = true;
+      getconfigKey("team_reservation_default_day").then((res) => {
+        this.queryParams.yxts = res.msg;
+      });
+      getCompany(this.queryParam).then((response) => {
+        this.CompanyList = response.data;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    cancel1() {
+      this.open1 = false;
+      this.reset1();
+    },
+    submitFormS() {
+      this.$refs["form1"].validate((valid) => {
+        if (valid) {
+          addComp(this.form1).then((response) => {
+            this.$modal.msgSuccess("鏂板鎴愬姛");
+            this.open1 = false;
+            this.getCompanyList();
+          });
+        }
+      });
+    },
+    reset1() {
+      this.form1 = {
+        company: "",
+        payType: "",
+        name: "",
+        phoe: "",
+        signingPic: "",
+        discount: "",
+      };
+    },
+    handleAdd1() {
+      this.reset1();
+      this.open1 = true;
+      this.title = "娣诲姞浣撴鍗曚綅淇℃伅缁存姢";
+    },
+    idFn1(value) {
+      if (value) {
+        // 淇濆瓨淇敼鍓嶇殑 dictCompId
+        const originalCompId = this.form.dictCompId;
+
+        // 鏇存柊鍏徃鍚嶇О
+        this.form.compName = value;
+
+        // 閬嶅巻鍏徃鍒楄〃锛屾牴鎹叕鍙稿悕绉拌缃搴旂殑 drugManufacturerId
+        this.CompanyList.forEach((item) => {
+          if (item.cnName == this.form.compName) {
+            this.form.dictCompId = item.drugManufacturerId;
+          }
+        });
+
+        // 濡傛灉 dictCompId 娌℃湁鍙樺寲锛岄噸缃负绌�
+        if (this.form.dictCompId === originalCompId) {
+          this.form.dictCompId = '';
+        }
+      }
+    },
+
+    getRemoteData(query) {
+      if (query) {
+        let compName = query;
+        queryCompany(compName).then((response) => {
+          this.CompanyList = response.data;
+          this.CompanyList.forEach((item) => {
+            this.objs = item;
+          });
+        });
+      }
+    },
+    handleIdCardInput(value) {
+  this.form.cusIdcard = value.replace(/\s/g, '');
+  this.inputChange(); // 淇濈暀鍘熸湁鐨勮韩浠借瘉杈撳叆澶勭悊閫昏緫
+},
     inputChange() {
       const reg =
         /^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/;
@@ -1149,10 +1556,64 @@
     inputChanges() {
       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";
+          }
+        });
+      });
+    },
     filterNode(value, data) {
       if (!value) return true;
-      return data.proName.indexOf(value) !== -1;
+      // 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;
+      }
+    },
+
+    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;
+      }
     },
     cope() {
       let cusIdCard = this.form.cusIdcard;
@@ -1341,6 +1802,12 @@
               if (this.form.tjType == null) {
                 this.form.tjType = 2;
               }
+              if (this.form.cusMarryStatus === "null") {
+                this.form.cusMarryStatus = "5";
+              }
+              if (this.form.cusNational === "null") {
+                this.form.cusNational = "1";
+              }
               this.loading = false;
               if (this.form) {
                 _this.tcShow = true;
@@ -1390,28 +1857,411 @@
             this.$message.error("姝ょ敤鎴蜂笉瀛樺湪");
           });
       } else {
-        var host = "ws://127.0.0.1:5001/YckjCard";
-        if (this.socket == null) {
-          this.socket = new WebSocket(host);
-          if (this.socket != null) {
-            alert("杩炴帴鎴愬姛.");
+        let configKey = "getInfoFromSqlData";
+        getconfigKey(configKey).then((res) => {
+          if (res.code == 200) {
+            if (res.msg == "N") {
+              var websocket = null;
+              var url = this.valueUrl;
+              if ("WebSocket" in window) {
+                websocket = new WebSocket(url);
+              } else if ("MozWebSocket" in window) {
+                websocket = new MozWebSocket(url);
+              } else {
+                // console.log("SockJS");
+              }
+
+              if (websocket == null) {
+                alert("鍒涘缓WebSocket瀵硅薄澶辫触");
+              }
+
+              //杩炴帴鍙戠敓閿欒鐨勫洖璋冩柟娉�
+              websocket.onerror = function () {
+                alert("璇锋鏌ヨ鍗″櫒杩炴帴鏄惁姝e父");
+              };
+
+              //杩炴帴鎴愬姛寤虹珛鐨勫洖璋冩柟娉�
+              websocket.onopen = function () {
+                this.websocket = websocket;
+                // 杩炴帴璁惧
+                var jsonObj = {
+                  type: "1",
+                };
+                var jStr = JSON.stringify(jsonObj);
+                this.websocket.send(jStr);
+                // alert("璇锋斁韬唤璇佸啀鐐圭‘璁�");
+                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爜鍙兘鏄尘宸濅娇鐢ㄧ殑
+                console.log(resultObj);
+                // this.jingChuanHandlerWebSocketResult(resultObj)
+                this.readCardWebSocket(resultObj);
+              };
+
+              //杩炴帴鍏抽棴鐨勫洖璋冩柟娉�
+              websocket.onclose = function () {
+                alert("璇诲崱鍣ㄨ繛鎺ュ叧闂�");
+              };
+            } else if (res.msg == "Y") {
+              this.$refs.aaa.open = true;
+              this.$refs.aaa.getAllList();
+              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;
+              // console.log(url);
+              // axios
+              //   .get("http://localhost:81/dev-api/readCertCardInfos")
+              //   .then((res) => {
+              //     console.log(res);
+              //   })
+              //   .catch((err) => {
+              //     console.log(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) {
+        //鍥炴樉鐩稿叧鏁版嵁
+        _this.form.cusName = resultObj.data.name;
+        _this.form.cusSex = resultObj.data.sex == "0" ? "濂�" : "鐢�";
+        _this.form.cusNational = resultObj.data.mz;
+        _this.form.cusBrithday = resultObj.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 = resultObj.data.addres;
+        _this.form.cusIdcard = resultObj.data.card;
+        _this.imageUrl = "data:image/jpeg;base64," + resultObj.data.img;
+        if (resultObj.name == "readCert" || resultObj.name == "PushWithImg") {
+          this.imageUrl = "data:image/jpeg;base64," + resultObj.data.img;
+        }
+      } else {
+        this.$message.warning("璇锋斁缃韩浠借瘉鍚庡啀鐐瑰嚮璇诲彇");
+      }
+      /* else if (resultObj.resultFlag == "-1") {
+          if (resultObj.errorMsg == "绔彛鎵撳紑澶辫触") {
+            //alert("璇诲崱鍣ㄦ湭杩炴帴");
+          } else {
+            //alert(resultObj.errorMsg);
+          }
+        } else if (resultObj.resultFlag == "-2") {
+          //alert(resultObj.errorMsg);
+        } */
+    },
+    // TODO 浠ヤ笅浠g爜鍙兘鏄尘宸濅娇鐢ㄧ殑
+    jingChuanHandlerWebSocketResult(resultObj) {
+      let _this = this;
+      if (
+        resultObj.name == "readCard" ||
+        resultObj.name == "readCert" ||
+        resultObj.name == "PushWithImg" ||
+        resultObj.name == "PushWithOutImg"
+      ) {
+        if (resultObj.resultFlag == "0") {
+          //鍥炴樉鐩稿叧鏁版嵁
+          _this.form.cusName = resultObj.resultContent.partyName;
+          _this.form.cusSex =
+            resultObj.resultContent.gender == "0" ? "濂�" : "鐢�";
+          _this.form.cusNational = resultObj.resultContent.nation;
+          _this.form.cusBrithday = resultObj.resultContent.bornDay;
+          if (_this.form.cusBrithday) {
+            _this.form.cusBrithday = _this.form.cusBrithday.replace(
+              /^(\d{4})(\d{2})(\d{2})$/,
+              "$1-$2-$3"
+            );
+          }
+          _this.form.cusAddr = resultObj.resultContent.certAddress;
+          _this.form.cusIdcard = resultObj.resultContent.certNumber;
+          _this.imageUrl =
+            "data:image/jpeg;base64," + resultObj.resultContent.identityPic;
+          if (resultObj.name == "readCert" || resultObj.name == "PushWithImg") {
+            this.imageUrl =
+              "data:image/jpeg;base64," +
+              resultObj.resultContent.identityPrintPic;
+          }
+        } else if (resultObj.resultFlag == "-1") {
+          if (resultObj.errorMsg == "绔彛鎵撳紑澶辫触") {
+            //alert("璇诲崱鍣ㄦ湭杩炴帴");
+          } else {
+            //alert(resultObj.errorMsg);
+          }
+        } else if (resultObj.resultFlag == "-2") {
+          //alert(resultObj.errorMsg);
+        }
+      } else if (resultObj.name == "getStatus") {
+        if (resultObj.resultFlag == "0") {
+          if (resultObj.status == "0") {
+          } else {
+            alert("璁惧杩炴帴宸叉柇寮�锛岃妫�鏌ヨ鍗″櫒杩炴帴");
+          }
+        }
+      }
+    },
+    handleChanges(param1) {
+      if (this.form.pacCode == "涓嶈") {
+        this.form.cusIdcard = param1[0].xh;
+      } else {
+        this.form.cusIdcard = param1[0].pacCode;
+      }
+
+      // this.form.cusName = param1[0].pacName;
+      // this.form.cusPhone = param1[0].pacRemark;
+    },
+
+    changeradio() {
+      if (this.cardreaderradio != 3) {
+        this.$nextTick(() => {
+          this.$refs.tableHeadFilterInp.focus();
+        });
+      }
+    },
+    cardreadercopes() {
+      let _this = this;
+
+      if (this.cardreaderradio == 3) {
+        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 {
-          alert("璁惧宸叉墦寮�.");
+          // console.log("SockJS");
         }
-        try {
-          this.socket.onmessage = function (msg) {
-            // if (typeof msg.data == "string") {
-            //   var msgM = msg.data + "";
-            //   resultMsg("璇诲崱杩斿洖淇℃伅锛�" + msg.data);
-            // }
-            // else {
-            //   alert("杩炴帴寮傚父,璇锋鏌ラ┍鍔�.");
-            // }
-          };
-        } catch (ex) {
-          alert("杩炴帴寮傚父,璇锋鏌ラ┍鍔�.");
+        if (websocket == null) {
+          alert("11111");
         }
+        websocket.onopen = function () {
+          try {
+            // 杩炴帴璁惧
+            var jsonObjs = {
+              type: "1",
+              // data: {},
+            };
+            var jStrs = JSON.stringify(jsonObjs);
+            websocket.send(jStrs);
+          } catch (err) {
+            var tryTime = 0;
+            // 閲嶈瘯10娆★紝姣忔涔嬮棿闂撮殧3绉�
+            if (tryTime < 1) {
+              var t1 = setTimeout(function () {
+                tryTime++;
+                var jsonObjs = {
+                  type: 1,
+                  data: {},
+                };
+                var jStrs = JSON.stringify(jsonObjs);
+                websocket.send(jStrs);
+              }, 1 * 1000);
+            } else {
+              console.error("閲嶈繛澶辫触.");
+            }
+          }
+        };
+        websocket.onclose = function () {
+          alert("璇诲崱鍣ㄨ繛鎺ュ叧闂�");
+        };
+        websocket.onmessage = function (event) {
+          var resultObj = JSON.parse(event.data);
+          _this.form.cusName = resultObj.data.name;
+          _this.form.cusSex = resultObj.data.sex;
+          _this.form.cusNational = resultObj.data.mz;
+          _this.form.cusBrithday = resultObj.data.csrq;
+          if (_this.form.cusBrithday) {
+            _this.form.cusBrithday = _this.form.cusBrithday.replace(
+              /^(\d{4})(\d{2})(\d{2})$/,
+              "$1-$2-$3"
+            );
+          }
+          _this.form.cusIdcard = resultObj.data.card;
+          if (_this.form.cusIdcard) {
+            const reg =
+              /^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/;
+            if (reg.test(_this.form.cusIdcard)) {
+              var org_birthday = _this.form.cusIdcard.substring(6, 14);
+              var birthday =
+                org_birthday.substring(0, 4) +
+                "-" +
+                org_birthday.substring(4, 6) +
+                "-" +
+                org_birthday.substring(6, 8);
+              var birthdays = new Date(birthday.replace(/-/g, "-"));
+              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.cardreader = false;
+        };
+
+        //杩炴帴鍙戠敓閿欒鐨勫洖璋冩柟娉�
+        websocket.onerror = function () {
+          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 {
+          // console.log("SockJS");
+        }
+        if (websocket == null) {
+          alert("11111");
+        }
+        websocket.onopen = function () {
+          try {
+            // 杩炴帴璁惧
+            var jsonObjs = {
+              type: 2,
+              data: {
+                qrcode: _this.inputSSS,
+              },
+            };
+            var jStrs = JSON.stringify(jsonObjs);
+            websocket.send(jStrs);
+          } catch (err) {
+            var tryTime = 0;
+            // 閲嶈瘯10娆★紝姣忔涔嬮棿闂撮殧3绉�
+            if (tryTime < 1) {
+              var t1 = setTimeout(function () {
+                tryTime++;
+                var jsonObjs = {
+                  type: 2,
+                  data: {
+                    qrcode: _this.inputSSS,
+                  },
+                };
+                var jStrs = JSON.stringify(jsonObjs);
+                websocket.send(jStrs);
+              }, 1 * 1000);
+            } else {
+              console.error("閲嶈繛澶辫触.");
+            }
+          }
+        };
+        websocket.onclose = function () {
+          alert("璇诲崱鍣ㄨ繛鎺ュ叧闂�");
+        };
+        websocket.onmessage = function (event) {
+          var resultObj = JSON.parse(event.data);
+          _this.form.cusName = resultObj.data.name;
+
+          if (resultObj.data.nation == "姹夋棌") {
+            _this.form.cusNational = "1";
+          }
+          if (resultObj.data.gender == "鐢�") {
+            _this.form.cusSex = 0;
+          } else {
+            _this.form.cusSex = 1;
+          }
+          _this.form.cusBrithday = resultObj.data.birthday;
+          if (_this.form.cusBrithday) {
+            _this.form.cusBrithday = _this.form.cusBrithday.replace(
+              /^(\d{4})(\d{2})(\d{2})$/,
+              "$1-$2-$3"
+            );
+          }
+          _this.form.cusPhone = resultObj.data.phone;
+          _this.form.cusIdcard = resultObj.data.idenno;
+          if (_this.form.cusIdcard) {
+            const reg =
+              /^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/;
+            if (reg.test(_this.form.cusIdcard)) {
+              var org_birthday = _this.form.cusIdcard.substring(6, 14);
+              var birthday =
+                org_birthday.substring(0, 4) +
+                "-" +
+                org_birthday.substring(4, 6) +
+                "-" +
+                org_birthday.substring(6, 8);
+              var birthdays = new Date(birthday.replace(/-/g, "-"));
+              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.cardreader = false;
+        };
+
+        //杩炴帴鍙戠敓閿欒鐨勫洖璋冩柟娉�
+        websocket.onerror = function () {
+          alert("璇锋鏌ヨ鍗″櫒杩炴帴鏄惁姝e父");
+        };
       }
     },
 
@@ -1436,14 +2286,14 @@
     //     return true;
     //   }
     // },
-    resetpackage(){
+    resetpackage() {
       if (this.form.cusIdcard) {
         var cusId = this.form.cusIdcard;
       } else {
         this.$message.warning("璇峰厛濉啓淇℃伅锛屽啀閫変綋妫�鍐呭");
       }
       let _this = this;
-        _this.pacId = "";
+      _this.pacId = "";
       this.proIds = [];
       let data = {
         cusId,
@@ -1457,7 +2307,7 @@
           getTransitionList(cusId).then((response) => {
             this.tableData1 = response.data;
             this.TotalPrice1 = 0;
-            if (this.tableData1.length>=1) {
+            if (this.tableData1.length >= 1) {
               this.list1 = false;
               this.list3 = true;
             } else {
@@ -1469,9 +2319,9 @@
         }
       });
     },
-
     Package() {
       this.taocan = true;
+      this.activeNames = "first";
       let cusSex = this.form.cusSex;
       this.datekey = Date.now();
       //鍏ㄩ儴濂楅
@@ -1479,22 +2329,24 @@
       deptTreeSelect(cusSex).then((response) => {
         this.newpacName = response.rows;
         try {
-          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();
-                }
+          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.getDataList();
+      // this.getData();
     },
 
     // 鎶樻墸
@@ -1590,10 +2442,63 @@
       }
     },
     handleClick(tab, event) {
-      if (tab.label == "鍗曢」") {
+      if (this.activeNames == "second") {
         this.DataList = [];
+        this.checkedkey = [];
         this.getDataList();
+      } else if (this.activeNames == "third") {
+        this.DataLists = [];
+        this.checkedkeys = [];
+        getZhList().then((response) => {
+          if (response.data) {
+            this.packageList = response.data;
+            // this.checkedkeys.push(this.packageList[0].id);
+            // let datas = {
+            //   zhId: this.packageList[0].id,
+            // };
+            // getlistByZhId(datas).then((res) => {
+            //   this.packagedataList = res.data.tjProjectList;
+            //   for (var i = 0; i < this.packagedataList.length; i++) {
+            //     let proId = this.packagedataList[i].proId;
+            //     getProSonDxList(proId).then((res) => {
+            //       this.TreedataList = res.data.list;
+            //       this.TreedataList.forEach((item) => {
+            //         this.DataLists.push(item);
+            //         if (this.DataLists.length >= 1) {
+            //           this.marryalls = 0;
+            //           this.DataLists.forEach((item1) => {
+            //             this.marryalls += item1.proPrice;
+            //             this.packagedataList.forEach((item3) => {
+            //               if (item1.proParentId == item3.proId) {
+            //                 item1.propinName = item3.proName;
+            //               }
+            //             });
+            //           });
+            //         }
+            //       });
+            //     });
+            //   }
+            // });
+          }
+          this.loading = false;
+        });
       }
+    },
+    renderContent(h, { node, data, store }) {
+      return (
+        <span class="custom-tree-node">
+          <span>{node.label}</span>
+          <span>({data.proPrice}鍏�)</span>
+        </span>
+      );
+    },
+    renderContents(h, { node, data, store }) {
+      return (
+        <span class="custom-tree-node">
+          <span>{node.label}</span>
+          <span>({data.price}鍏�)</span>
+        </span>
+      );
     },
     getDataList() {
       this.loading = true;
@@ -1608,28 +2513,121 @@
             });
           });
         }
-        this.checkedkey.push(this.Treedata[0].proId);
-        let proId = this.Treedata[0].proId;
-        getProSonDxList(proId).then((res) => {
-          this.TreedataList = res.data.list;
-          this.TreedataList.forEach((item) => {
-            this.checkedListkey.push(item.proId);
-            this.DataList.push(item);
-            this.DataList.forEach((item) => {
-              item.propinName = this.Treedata[0].proName;
-            });
-          });
-          this.TotalPrice1 = 0;
+        // if (this.DataLists.length != 0) {
+        //   this.DataLists.forEach((selectionitem) => {
+        //     this.Treedata.forEach((item) => {
+        //       if (selectionitem.propinName == item.proName) {
+        //         item.disabled = true;
+        //       }
+        //     });
+        //   });
+        // }
+        // this.checkedkey.push(this.Treedata[0].proId);
+        // let proId = this.Treedata[0].proId;
+        // getProSonDxList(proId).then((res) => {
+        //   this.TreedataList = res.data.list;
+        //   this.TreedataList.forEach((item) => {
+        //     this.checkedListkey.push(item.proId);
+        //     this.DataList.push(item);
+        //     this.DataList.forEach((item) => {
+        //       item.propinName = this.Treedata[0].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.loading = false;
+      });
+    },
 
-          if (this.DataList.length != 0) {
-            this.list1 = false;
-            this.DataList.forEach((item) => {
-              this.TotalPrice1 = item.proPrice + this.TotalPrice1;
+    handlepackage(data, checked, checkedNodes) {
+      if (checked.checkedNodes.length != 0) {
+        this.$refs.treas.setCheckedKeys([data.id]);
+        let datas = {
+          zhId: data.id,
+        };
+        getlistByZhId(datas).then((res) => {
+          this.packagedataList = res.data.tjProjectList;
+          for (var i = 0; i < this.packagedataList.length; i++) {
+            let proId = this.packagedataList[i].proId;
+            getProSonDxList(proId).then((res) => {
+              this.TreedataList = res.data.list;
+              this.TreedataList.forEach((item) => {
+                this.DataLists.push(item);
+                if (this.DataLists.length >= 1) {
+                  this.marryalls = 0;
+                  this.DataLists.forEach((item1) => {
+                    this.marryalls += item1.proPrice;
+                    this.packagedataList.forEach((item3) => {
+                      if (item1.proParentId == item3.proId) {
+                        item1.propinName = item3.proName;
+                      }
+                    });
+                  });
+                }
+              });
             });
           }
         });
-        this.loading = false;
-      });
+      } else if (checked.checkedNodes.length == 0) {
+        // for (var i = 0; i < data.tjProjectList.length; i++) {
+        //   let proId = data.tjProjectList[i].proId;
+        //   getProSonDxList(proId).then((res) => {
+        //     this.TreedataList = res.data.list;
+        //     this.TreedataList.forEach((item) => {
+        //       this.DataLists.forEach((item1, index) => {
+        //         if (item.proId == item1.proId) {
+        //           this.DataLists.splice(index, 1);
+        //         }
+        //       });
+        //     });
+        //     this.marryalls = 0
+        //     if(this.DataLists.length != 0){
+        //       this.DataLists.forEach((item1, index) => {
+        //       this.marryalls += item1.proPrice;
+        //       })
+        //     }
+        //   });
+        // }
+      }
+    },
+
+    objectspanmethod({ row, column, rowIndex, columnIndex }) {
+      let fields = ["propinName"];
+      let cellValue = row[column.property];
+      if (cellValue && fields.includes(column.property)) {
+        let prevRow = this.DataLists[rowIndex - 1];
+        let nextRow = this.DataLists[rowIndex + 1];
+        if (prevRow && prevRow[column.property] === cellValue) {
+          return { rowspan: 0, colspan: 0 };
+        } else {
+          let countRowspan = 1;
+          while (nextRow && nextRow[column.property] === cellValue) {
+            nextRow = this.DataLists[++countRowspan + rowIndex];
+          }
+
+          if (countRowspan > 1) {
+            return { rowspan: countRowspan, colspan: 1 };
+          }
+        }
+      }
+
+      // if (columnIndex == 3) {
+      //   let rowspan = 0;
+      //   this.DataLists.forEach((element) => {
+      //     if (element.propinName === row.propinName) {
+      //       rowspan++;
+      //     }
+      //   });
+      //   return [rowspan, 1];
+      // }
     },
 
     // 鐐瑰嚮鑾峰彇姣忎釜鏍戣妭鐐�
@@ -1651,10 +2649,12 @@
             });
           });
           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;
             });
           }
         });
@@ -1687,8 +2687,10 @@
           if (item.proId == data.proId) {
             this.DataList.splice(index, 1);
             this.TotalPrice1 = 0;
+            this.marryall = 0;
             this.DataList.forEach((item1) => {
               this.TotalPrice1 = item1.proPrice + this.TotalPrice1;
+              this.marryall += item1.proPrice;
             });
           }
         });
@@ -1701,10 +2703,24 @@
         });
         this.spliceData();
         this.TotalPrice1 = 0;
+        this.marryall = 0;
         this.DataList.forEach((item1) => {
           this.TotalPrice1 = item1.proPrice + this.TotalPrice1;
+          this.marryall += item1.proPrice;
         });
       }
+    },
+
+    handleDel(row) {
+      this.DataLists.forEach((item, index) => {
+        if (item.proId == row.proId) {
+          this.DataLists.splice(index, 1);
+          this.marryalls = 0;
+          this.DataLists.forEach((item1) => {
+            this.marryalls += item1.proPrice;
+          });
+        }
+      });
     },
 
     /** 鍒犻櫎鎸夐挳鎿嶄綔 */
@@ -1712,16 +2728,17 @@
       this.DataList.forEach((item, index) => {
         if (item.proId == row.proId) {
           this.DataList.splice(index, 1);
+          this.marryall = 0;
           this.TotalPrice1 = 0;
           this.DataList.forEach((item1) => {
             this.TotalPrice1 = item1.proPrice + this.TotalPrice1;
+            this.marryall += item1.proPrice;
           });
         }
       });
     },
     //  // 榛樿鎺ュ彈鍥涗釜鍊� { 褰撳墠琛岀殑鍊�, 褰撳墠鍒楃殑鍊�, 琛岀殑涓嬫爣, 鍒楃殑涓嬫爣 }
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
-      console.log(row, column, rowIndex, columnIndex);
       let fields = ["propinName"];
       let cellValue = row[column.property];
       if (cellValue && fields.includes(column.property)) {
@@ -1784,6 +2801,11 @@
           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,
@@ -1800,6 +2822,9 @@
               this.tableData1.forEach((item) => {
                 this.TotalPrice1 += item.nowPrice;
                 this.TotalPrice = this.TotalPrice1 + ".00";
+                if (item.tjCategory != null) {
+                  this.form.category = item.tjCategory;
+                }
                 if (item.pacName === null) {
                   item.pacName = "鍗曢」";
                 }
@@ -1815,6 +2840,8 @@
         }
       });
       this.taocan = false;
+      this.defaultKeys = [];
+      this.DataLists = [];
     },
 
     // 鏈�鍚庢彁浜ゆ寜閽�
@@ -2052,6 +3079,12 @@
   display: flex;
   flex-direction: column;
 }
+.dialog-footer2 {
+  width: 960px;
+  height: 36px;
+  display: flex;
+  justify-content: center;
+}
 </style>
   
   
\ No newline at end of file

--
Gitblit v1.8.0