From 5a9be998d3dc8097d19d6f4833c0538c34bd6dcb Mon Sep 17 00:00:00 2001
From: lkk <364857242@qq.com>
Date: 星期四, 09 一月 2025 10:29:18 +0800
Subject: [PATCH] 111

---
 src/views/system/tijian/index.vue | 2099 +++++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 1,512 insertions(+), 587 deletions(-)

diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue
index 446548c..f164347 100644
--- a/src/views/system/tijian/index.vue
+++ b/src/views/system/tijian/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 :gutter="20">
       <el-col :span="17">
         <div class="grid-content bg-purple">
@@ -44,6 +135,13 @@
                 },
               ]"
             >
+              <span
+                slot="label"
+                style="display: inline-block; border-bottom: 2px solid blue"
+                @click="openname"
+              >
+                濮撳悕
+              </span>
               <el-input
                 v-model="form.cusName"
                 placeholder="璇疯緭鍏ュ鍚�"
@@ -236,7 +334,7 @@
               />
             </el-form-item>
 
-            <el-form-item label="骞撮緞  " prop="age">
+            <el-form-item label="骞撮緞" prop="age">
               <el-input
                 v-model="form.age"
                 :disabled="isDisabled"
@@ -277,15 +375,7 @@
               />
             </el-form-item>
 
-            <el-form-item label="宸ヤ綔鍗曚綅" prop="company">
-              <el-input
-                :disabled="isDisabled"
-                v-model="form.company"
-                placeholder="璇疯緭鍏ュ伐浣滃崟浣�"
-              />
-            </el-form-item>
-
-            <el-form-item label="鏂囧寲绋嬪害" prop="wenHua">
+            <el-form-item label="鏂囧寲绋嬪害" prop="wenHua" label-width="93px">
               <el-input
                 :disabled="isDisabled"
                 v-model="form.wenHua"
@@ -334,7 +424,6 @@
               </el-col>
             </el-row>
           </el-form>
-         
 
           <el-row v-show="top">
             <el-col :span="19">
@@ -415,7 +504,8 @@
             >
             <el-button type="primary" plain size="mini" @click="setImage()"
               >鎷嶇収</el-button
-            ><br />
+            >
+            <br />
           </div>
         </div>
       </el-col>
@@ -424,15 +514,17 @@
     <el-dialog
       title="閫夋嫨濂楅"
       :visible.sync="taocan"
-      width="50%"
+      width="70%"
       height="700px"
+      :close-on-click-modal="false"
     >
       <el-tabs
         type="border-card"
         style="height: 560px; margin: 0 10px; width: 100%"
+        v-model="activeNames"
         @tab-click="handleClick"
       >
-        <el-tab-pane label="濂楅">
+        <el-tab-pane label="濂楅" name="first">
           <el-form
             :model="queryParam"
             ref="queryForm"
@@ -457,7 +549,6 @@
                 @click="handle"
                 >鏌ヨ</el-button
               >
-              <!-- <el-button type="primary"  size="mini" @click="submit">纭</el-button> -->
             </el-form-item>
           </el-form>
           <div class="tab4">
@@ -474,7 +565,6 @@
                 @selection-change="handleSelectionChange"
                 height="450px"
                 ref="tb"
-                style="width: 850px"
               >
                 <el-table-column
                   type="selection"
@@ -510,22 +600,120 @@
 </el-table-column> -->
               </el-table>
             </div>
-            <!-- <el-button
-                style="
-                  width: 20px;
-                  height: 100px;
-                  margin-top: 20%;
-                  font-size: 10px;
-                  padding-right: 20px;
-                "
-                type="primary"
-                size="mini"
-                @click="submit"
-                ><i style="font-size: 18px" class="el-icon-d-arrow-right"></i
-              ></el-button> -->
           </div>
         </el-tab-pane>
-        <el-tab-pane label="鍗曢」">
+        <el-tab-pane label="缁勫悎" name="third">
+          <!-- <div class="tab3"> -->
+          <el-row :gutter="20" style="width: 100%">
+            <el-col :span="6">
+              <div
+                style="
+                  text-align: center;
+                  margin-bottom: 10px;
+                  margin-top: 10px;
+                "
+              >
+                椤圭洰鍒楄〃
+              </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"
+                  :filter-node-method="filterpackage"
+                  @check-change="handlePackageChecked"
+                  :default-checked-keys="checkedListkey1"
+                  :render-content="renderContent"
+                >
+                </el-tree>
+              </div>
+            </el-col>
+            <el-col :span="11">
+              <div class="grid-content bg-purple">
+                <div
+                  style="
+                    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
@@ -550,6 +738,7 @@
                 >
                   椤圭洰鍒楄〃
                 </div>
+                <!-- @input="gaibian" -->
                 <el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="filterText">
                 </el-input>
                 <div class="tab3">
@@ -564,6 +753,7 @@
                     :default-checked-keys="checkedkey"
                     :filter-node-method="filterNode"
                     ref="tree"
+                    :render-content="renderContent"
                   >
                   </el-tree>
                 </div>
@@ -589,6 +779,7 @@
                     show-checkbox
                     @check-change="handleCurrentChecked1"
                     :default-checked-keys="checkedListkey"
+                    :render-content="renderContent"
                   >
                   </el-tree>
                 </div>
@@ -614,12 +805,15 @@
                     <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 prop="proPrice" label="鍘熶环" width="56px">
                     </el-table-column>
 
                     <el-table-column
@@ -640,28 +834,7 @@
                       </template>
                     </el-table-column>
                   </el-table>
-                  <el-collapse v-model="activeName" accordion v-if="list1">
-                    <div>
-                      <el-collapse-item title="璇烽�夋嫨椤圭洰">
-                        <el-table
-                          :data="DataList"
-                          border
-                          style="width: 100%"
-                          height="400"
-                          :span-method="objectSpanMethod"
-                        >
-                          <el-table-column
-                            prop="proName"
-                            label="椤圭洰"
-                            width="180"
-                          >
-                          </el-table-column>
-                          <el-table-column prop="ordPrice" label="鍘熶环">
-                          </el-table-column>
-                        </el-table>
-                      </el-collapse-item>
-                    </div>
-                  </el-collapse>
+                  <h3 style="font-weight: 600">鍚堣锛歿{ marryall }}鍏�</h3>
                 </div>
               </el-col>
             </el-row>
@@ -677,120 +850,88 @@
     <el-row v-if="tcShow">
       <el-col :span="15">
         <div class="grid-content bg-purple">
-          <!-- <el-table :data="fData" border height="220px" style="width: 100%; ">
-            <el-table-column prop="proName" label="缁勫悎椤圭洰" align="center" width="200px">
-            </el-table-column>
-            <el-table-column prop="proPrice" label="閲戦" align="center" width="150px">
-            </el-table-column>
-            <el-table-column prop="allSonProName" label="鍗曚釜椤圭洰" align="center" :show-overflow-tooltip="true">
-            </el-table-column>
-          </el-table>
-
-          <div class="tab">
-            <el-table :data="DataList" border height="220" style="width: 350px; margin-top: 20px">
-              <el-table-column prop="proName" label="鍗曚釜椤圭洰" align="center">
-              </el-table-column>
-              <el-table-column prop="proPrice" label="閲戦" align="center"></el-table-column>
-            </el-table>
-          </div> -->
-
-          <!-- <div style="height:480px;overflow:scroll;background-color: #ffffff;
-          font-size: 12.5px;">
-            <table style="width: 96%; margin: 4px 10px; border: 1px solid white" cellspacing="4" border="2"
-              v-for="(item, index) in tableData1" :key="index">
-              <caption style="background-color: #f8f8f9">
-                {{
-                  item.parentName
-                }}
-              </caption>
-              <tr align="center">
-                <th style="width:200px">椤圭洰</th>
-                <th>鐜颁环</th>
-                <th>鍘熶环</th>
-              </tr>
-              <tr v-for="item1 in item.list" :key="item1.proId">
-                <td>{{ item1.proName }}</td>
-                <td>
-                  {{ item1.nowPrice }}
-                </td>
-                <td>{{ item1.ordPrice }}</td>
-              </tr>
-            </table> 
-           </div> -->
-
           <template>
             <el-form
               :model="form"
               :inline="true"
               label-width="75px"
-              style="margin-left: 20px"
+              style="margin-left: 20px; width: 900px"
             >
-              <el-form-item label="浣撴绫诲瀷">
+              <el-form-item label="濮撳悕" prop="cusName">
+                <span slot="label"> 濮撳悕 </span>
+                <el-input
+                  v-model="form.cusName"
+                  placeholder="璇疯緭鍏ュ鍚�"
+                  :disabled="isDisabled"
+                />
+              </el-form-item>
+              <el-form-item label="鎬у埆" prop="cusSex">
                 <el-select
+                  :disabled="isDisabled"
+                  v-model="form.cusSex"
+                  placeholder="鎬у埆"
                   style="width: 150px"
-                  v-model="form.tjType"
-                  placeholder="璇烽�夋嫨浣撴绫诲瀷"
                 >
+                  <el-option
+                    v-for="dict in dict.type.sys_user_sex"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="parseInt(dict.value)"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="璇佷欢鍙风爜" prop="cusIdcard">
+                <span slot="label"> 璇佷欢鍙风爜 </span>
+                <el-input
+                  :disabled="isDisabled"
+                  v-model="form.cusIdcard"
+                  placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�"
+                  @input="inputChange"
+                />
+              </el-form-item>
+              <el-form-item label="鍗曚綅鍚嶇О" prop="firmName">
+                <el-select
+                  v-model="form.firmName"
+                  remote
+                  default-first-option
+                  allow-create
+                  filterable
+                  style="width: 200px"
+                  placeholder="璇烽�夋嫨鍗曚綅鍚嶇О"
+                  clearable
+                  @change="idFn1"
+                  @clear="clear"
+                >
+                  <el-option
+                    v-for="dict in CompanyList"
+                    :key="dict.cnName"
+                    :label="dict.cnName"
+                    :value="dict.cnName"
+                  />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="鍗曚綅閮ㄩ棬" prop="firmDeptName">
+                <el-input
+                  v-model="form.firmDeptName"
+                  style="width: 150px"
+                  placeholder="璇疯緭鍏ュ崟浣嶉儴闂�"
+                  @input="inputChange"
+                />
+              </el-form-item>
+              <el-form-item label="浣撴绫诲瀷">
+                <el-select v-model="form.tjType" placeholder="璇烽�夋嫨浣撴绫诲瀷">
                   <el-option
                     v-for="dict in dict.type.dict_team"
                     :key="dict.value"
                     :label="dict.label"
                     :value="dict.value"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
-
-              <!-- <div class="tab1"> -->
-              <!-- <el-form :inline="true" class="tab1"> -->
-              <el-form-item label="搴旀敹閲戦">
-                <el-input
-                  placeholder="搴旀敹閲戦"
-                  v-model="TotalPrice1"
-                  disabled
-                  style="width: 150px"
-                ></el-input>
-              </el-form-item>
-              <el-form-item label="浼樻儬">
-                <!-- <el-input style="width: 100px" type="number" v-model="discount" :value="discount"></el-input> -->
-                <el-input-number
-                  ref="inputNumber"
-                  style="width: 150px"
-                  v-model="discount"
-                  :precision="2"
-                  :step="0.1"
-                  :max="10"
-                  :min="1"
-                  @change="numberChange"
-                  :disabled="isfalse"
-                ></el-input-number>
-              </el-form-item>
-              <el-form-item label="瀹炴敹閲戦">
-                <el-input
-                  placeholder="瀹炴敹閲戦"
-                  v-model="TotalPrice"
-                  style="width: 150px"
-                ></el-input>
-              </el-form-item>
-              <br />
-              <!-- 140828199805050012 -->
-              <el-form-item label="棰嗗彇鏂瑰紡">
-                <!-- <el-input style="width: 100%;"  v-model="form.getType" placeholder="璇烽�夋嫨棰嗗彇鏂瑰紡" /> -->
-                <el-select
-                  v-model="getType"
-                  style="width: 150px"
-                  @change="getmailType"
-                >
-                  <el-option
-                    v-for="dict in dict.type.report_get_type"
-                    :key="dict.value"
-                    :label="dict.label"
-                    :value="dict.value"
+                    :disabled="!form.firmId && dict.value === '1'"
                   ></el-option>
                 </el-select>
               </el-form-item>
               <el-form-item label="浣撴绫诲埆">
                 <el-select
-                  style="width: 150px"
+                  style="width: 200px"
                   v-model="tjCategory"
                   placeholder="璇烽�夋嫨浣撴绫诲埆"
                 >
@@ -803,6 +944,37 @@
                 </el-select>
                 <!-- <el-input v-model="form.category" placeholder="璇疯緭鍏ヤ綋妫�绫诲埆" /> -->
               </el-form-item>
+
+              <el-form-item label="搴旀敹閲戦">
+                <el-input
+                  placeholder="搴旀敹閲戦"
+                  v-model="TotalPrice1"
+                  disabled
+                  style="width: 150px"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="浼樻儬">
+                <!-- {{ discount }} -->
+                <el-input-number
+                  ref="inputNumber"
+                  style="width: 150px"
+                  v-model="discount"
+                  :precision="2"
+                  :step="0.1"
+                  :max="10"
+                  :min="0"
+                  @change="numberChange"
+                  :disabled="isfalse"
+                ></el-input-number>
+              </el-form-item>
+              <el-form-item label="瀹炴敹閲戦">
+                <el-input
+                  placeholder="瀹炴敹閲戦"
+                  v-model="TotalPrice"
+                  style="width: 206px"
+                ></el-input>
+              </el-form-item>
+              <br />
 
               <el-form-item style="margin-left: 149px">
                 <el-button
@@ -822,7 +994,8 @@
                 <el-button
                   type="primary"
                   @click="submitPrice"
-                  :disabled="confirm"
+                  :loading="loadingSubmit"
+                  :disabled="confirm || loadingSubmit"
                   v-if="showHidden.has_charge == 'N'"
                   size="mini"
                   >绛惧埌鐧昏</el-button
@@ -877,148 +1050,107 @@
             </div>
           </el-dialog>
 
-          <div style="text-align: center; margin-bottom: 10px">
+          <div
+            style="
+              display: flex;
+              align-items: center;
+              justify-content: flex-start;
+              width: 100%;
+            "
+          >
+            <div
+              style="
+                white-space: nowrap;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                margin-left: 46px;
+                font-size: 16px;
+                margin-right: 20px;
+              "
+            >
+              <span v-if="this.tableData1[0]">{{
+                this.tableData1[0].pacName || ""
+              }}</span>
+              宸查�夐」鐩潯鏁帮細<span
+                style="font-weight: 700; color: red; margin-right: 5px"
+                >{{ this.tableData1.length || 0 }}</span
+              >鏉�
+            </div>
             宸查�夐」鐩垪琛�
           </div>
           <div
             style="
               padding: 0px 6px;
               border: 1px solid #e6ebf5;
-              max-height: 420px;
+              max-height: 650%;
               overflow: auto;
               width: 916px;
               margin-left: 35px;
             "
           >
-            <el-collapse v-model="index" accordion v-if="list3">
-              <div
-                class="info1"
-                v-for="(item, index) in tableData1"
-                :key="'info1-' + index"
-              >
-                <el-collapse-item :name="index">
-                  <template slot="title">
-                    {{
-                      item.pacName +
-                      ":" +
-                      item.parentName +
-                      " (搴旀敹閲戦:" +
-                      item.ordPrice +
-                      "鍏� / 瀹炴敹閲戦:" +
-                      item.nowPrice +
-                      "鍏�)"
-                    }}
-                  </template>
-                  <el-table
-                    :data="item.list"
-                    border
-                    style="width: 100%"
-                    height="270"
-                  >
-                    <el-table-column prop="proName" label="椤圭洰" width="180">
-                    </el-table-column>
-                    <el-table-column prop="proType" label="鎬у埆" width="180">
-                      <template
-                        slot-scope="scope"
-                        v-if="scope.row.proType == ''"
-                      >
-                        {{ scope.row.proType == "" ? "鍏ㄩ儴" : "" }}
-                      </template>
-                      <template slot-scope="scope" v-else>
-                        <dict-tag
-                          :options="dict.type.sys_user_sex"
-                          :value="scope.row.proType"
-                        />
-                      </template>
-                    </el-table-column>
-                    <el-table-column prop="ordPrice" label="搴旀敹閲戦">
-                    </el-table-column>
-                    <el-table-column prop="nowPrice" label="瀹炴敹閲戦">
-                    </el-table-column>
-                    <el-table-column prop="proCheckMethod" label="鏄惁绌鸿吂">
-                      <template slot-scope="scope">
-                        <dict-tag
-                          :options="dict.type.sys_yes_no"
-                          :value="scope.row.proCheckMethod"
-                        />
-                      </template>
-                    </el-table-column>
-                  </el-table>
-                </el-collapse-item>
-              </div>
-            </el-collapse>
-
-            <div v-if="list2 == true">
-              <el-table
-                :data="tableData1"
-                border
-                style="width: 100%"
-                height="250"
-              >
-                <el-table-column prop="proName" label="椤圭洰" width="180">
-                </el-table-column>
-                <el-table-column prop="proType" label="鎬у埆" width="180">
-                  <template slot-scope="scope" v-if="scope.row.proType == ''">
-                    {{ scope.row.proType == "" ? "鍏ㄩ儴" : "" }}
-                  </template>
-                  <template slot-scope="scope" v-else>
+            <el-table :data="tableData1" border style="width: 100%">
+              <el-table-column prop="proName" label="椤圭洰" width="180">
+              </el-table-column>
+              <el-table-column prop="proType" label="鎬у埆" width="50">
+                <template slot-scope="scope">
+                  <template v-if="isAll(scope.row.proType)"> 鍏ㄩ儴 </template>
+                  <template v-else>
                     <dict-tag
                       :options="dict.type.sys_user_sex"
                       :value="scope.row.proType"
                     />
                   </template>
-                </el-table-column>
-                <el-table-column prop="ysPrice" label="搴旀敹閲戦">
-                </el-table-column>
-                <el-table-column prop="proPrice" label="瀹炴敹閲戦">
-                </el-table-column>
-                <el-table-column prop="proCheckMethod" label="鏄惁绌鸿吂">
-                  <template slot-scope="scope">
-                    <dict-tag
-                      :options="dict.type.sys_yes_no"
-                      :value="scope.row.proCheckMethod"
-                    />
-                  </template>
-                </el-table-column>
-              </el-table>
-            </div>
+                </template>
+              </el-table-column>
 
-            <el-collapse v-model="activeName" accordion v-if="list1">
-              <div>
-                <el-collapse-item title="璇烽�夋嫨椤圭洰">
-                  <el-table :data="list" border style="width: 100%">
-                    <el-table-column prop="proName" label="椤圭洰" width="180">
-                    </el-table-column>
-                    <el-table-column prop="proType" label="鎬у埆" width="180">
-                      <template
-                        slot-scope="scope"
-                        v-if="scope.row.proType == ''"
-                      >
-                        {{ scope.row.proType == "" ? "鍏ㄩ儴" : "" }}
-                      </template>
-                      <template slot-scope="scope" v-else>
-                        <dict-tag
-                          :options="dict.type.sys_user_sex"
-                          :value="scope.row.proType"
-                        />
-                      </template>
-                    </el-table-column>
-                    <el-table-column prop="ordPrice" label="搴旀敹閲戦">
-                    </el-table-column>
-                    <el-table-column prop="nowPrice" label="瀹炴敹閲戦">
-                    </el-table-column>
-                    <el-table-column prop="proCheckMethod" label="鏄惁绌鸿吂">
-                      <template slot-scope="scope">
-                        <dict-tag
-                          :options="dict.type.sys_yes_no"
-                          :value="scope.row.proCheckMethod"
-                        />
-                      </template>
-                    </el-table-column>
-                  </el-table>
-                </el-collapse-item>
-              </div>
-            </el-collapse>
+              <el-table-column prop="ordPrice" label="搴旀敹閲戦">
+              </el-table-column>
+              <el-table-column label="鎶樻墸">
+                <template slot-scope="scope">
+                  <!-- 鍙緭鍏ョ函鏁板瓧鎶樻墸 -->
+                  <el-input
+                    v-model.number="scope.row.discount"
+                    @input="validateDiscount(scope.row)"
+                    placeholder="杈撳叆鎶樻墸"
+                    size="small"
+                    type="number"
+                    min="0"
+                    step="1"
+                    max="10"
+                  >
+                  </el-input>
+                </template>
+              </el-table-column>
+              <el-table-column prop="nowPrice" label="瀹炴敹閲戦">
+              </el-table-column>
+              <el-table-column prop="proCheckMethod" label="鏄惁绌鸿吂">
+                <template slot-scope="scope">
+                  <dict-tag
+                    :options="dict.type.sys_yes_no"
+                    :value="scope.row.proCheckMethod"
+                  />
+                </template>
+              </el-table-column>
+              <!-- <el-table-column prop="proCheckMethod" label="鍏垂">
+                <template #default="scope">
+                  <el-checkbox v-model="scope.row.free" :disabled="true">
+                    {{ scope.row.free ? "鍏嶈垂" : "鏀惰垂" }}
+                  </el-checkbox>
+                </template>
+              </el-table-column> -->
+              <el-table-column label="鎿嶄綔" align="center" width="80px">
+                <template slot-scope="scope">
+                  <el-button
+                    size="mini"
+                    type="text"
+                    icon="el-icon-delete"
+                    @click="handleDelete1(scope.row)"
+                    title="鍒犻櫎"
+                  >
+                  </el-button>
+                </template>
+              </el-table-column>
+            </el-table>
           </div>
         </div>
       </el-col>
@@ -1146,7 +1278,7 @@
                   :precision="2"
                   :step="0.1"
                   :max="10"
-                  :min="1"
+                  :min="0"
                   @change="numberChange"
                   :disabled="isfalse"
                 ></el-input-number>
@@ -1194,6 +1326,31 @@
         </el-table>
       </div>
     </el-dialog>
+    <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>
     <div style="position: absolute; bottom: 100px; width: 360px; display: none">
       <div
         id="printBill"
@@ -1229,12 +1386,7 @@
       </span> -->
     <!-- </el-dialog> -->
     <historyTj :cusIdCard="form.cusIdcard" ref="historyTj"></historyTj>
-    <el-dialog
-      title="鎻愮ず"
-      :visible.sync="dialogVisiblese"
-      width="30%"
-      :before-close="handleClose"
-    >
+    <el-dialog title="鎻愮ず" :visible.sync="dialogVisiblese" width="30%">
       <span>鏄惁澶嶅埗鏈�杩戜竴娆$殑浣撴椤圭洰锛�</span>
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisiblese = false">鍙� 娑�</el-button>
@@ -1242,10 +1394,13 @@
       </span>
     </el-dialog>
     <Packages ref="aaa" @add="handleChanges" />
+    <selectName ref="bbb" @add="handleChangesName" />
   </div>
 </template>
 
 <script>
+import Big from "big.js";
+import selectName from "@/components/selectName";
 import { dataURLtoFile, random } from "./file";
 import { getInfo } from "@/api/login";
 import {
@@ -1255,8 +1410,8 @@
   getByTjNum,
 } from "@/api/hosp/customer";
 import { getPrintSetUp } from "@/api/system/examcharge";
-
 import {
+  tuantiSelect,
   deptTreeSelect,
   projectGetList,
   getOrder,
@@ -1265,16 +1420,24 @@
   getCusIdcard,
   getPackageListName,
   getaddtTransition,
+  tuantiqueren,
   getTransitionList,
+  getTransitionList1,
   getByTeamNo,
+  delTbBycusCardIdAndProId,
   getLoadFile,
   getIsRequired,
   getconfigKey,
   getHistryTjOrderProByCusIdCard,
+  readCertCardInfos,
+  gaibianzhekou,
 } from "@/api/system/tijian";
+import { addComp } from "@/api/system/comp";
+import { getCompany, queryCompany } from "@/api/team/tuanti";
 import Packages from "@/components/Packages";
 import { MessageBox } from "element-ui";
 import VTreeTransfer from "./TreeTransfer.vue";
+import { getZhList, getlistByZhId } from "@/api/system/package";
 import historyTj from "@/components/historyTj/index";
 export default {
   dicts: [
@@ -1295,17 +1458,31 @@
     VTreeTransfer,
     historyTj,
     Packages,
+    selectName,
   },
   data() {
     return {
+      open1: false,
+      filterage: "",
+      checkedkeys: [],
+      DataLists: [],
+      marryalls: 0,
+      packagedataList: [],
+      packageList: [],
+      zhxqList: [],
+      zhList: [],
+      pname: "",
       filterText: "",
       proIdList: [],
       tableDatas: [],
       dialogVisiblese: false,
+      cardreaderradio: 3,
       lishi: false,
       table: false,
       HistoryList: {},
-      index: 0,
+      index: [],
+      names: "",
+      inputSSS: "",
       dictType: [
         {
           value: 0,
@@ -1317,6 +1494,7 @@
         },
       ],
       isNow: 1,
+      marryall: 0,
       treeId: [],
       treeList: [],
       defaultKeys: [],
@@ -1334,7 +1512,7 @@
       hospName: "",
       currentDate: "",
       currentTime: "",
-      tjCategory: "",
+      tjCategory: "12",
       formIn: {
         tjPro: "浣撴璐�",
       },
@@ -1351,6 +1529,7 @@
       hide: true,
       beat: false,
       dialogVisibles: false,
+      loadingSubmit: false,
       charge: false,
       src: "",
       url: "",
@@ -1377,10 +1556,9 @@
       isDisabled: false,
       size: "",
       tcShow: false,
-      tcShows: false,
       // 濂楅鎻愪氦鎸夐挳
       confirm: false,
-      TotalPrice: "0.00",
+      TotalPrice: 0,
       TotalPrice1: 0,
       discount: 10,
       newpacName: [],
@@ -1410,6 +1588,7 @@
       ids: [],
       // 闈炲崟涓鐢�
       single: true,
+      cardreader: false,
       // 闈炲涓鐢�
       multiple: true,
       nodeobj: {},
@@ -1421,13 +1600,24 @@
       proIds: [],
       // 鏄剧ず鎼滅储鏉′欢
       showSearch: true,
+      activeNames: "first",
       // 鏍戠姸褰㈢姸
       Treedata: [],
       TreedataList: [],
+      TreedataLists: [],
       treedataList: [],
       checkedkey: [],
       checkedListkey: [],
+      checkedListkey1: [],
       defaultProps: {
+        children: [],
+        label: "proName",
+      },
+      defaultProp: {
+        children: [],
+        label: "zhmc",
+      },
+      defaultpackProps: {
         children: [],
         label: "proName",
       },
@@ -1441,8 +1631,12 @@
         pacName: null,
         pacRemark: null,
       },
-      valueUrl: "ws://127.0.0.1:18890",
-      WebSocket: null,
+      // valueUrl: "ws://127.0.0.1:18890",
+      // valueUrl: "ws://192.168.1.3:6789/websocket",
+      valueUrl: "ws://127.0.0.1:6789/websocket",
+      valueUrls: "ws://127.0.0.1:6789/websocket",
+      // valueUrls: "ws://"+getIp() +":6789/websocket",
+      webSocket: null,
       // 韬唤璇侀渶瑕�
       // socket: null,
       // value: 1,
@@ -1472,15 +1666,21 @@
 
       // 琛ㄥ崟鍙傛暟
       // 琛ㄥ崟鍙傛暟
+      obj: {},
+      CompanyList: [],
       form: {
         cusIdcard: "",
-        tjType: "2",
+        tjType: "",
         cusSex: 1,
         cusNational: "1",
-        cusMarryStatus: "1",
+        cusMarryStatus: "5",
         idType: "1",
         ageUnit: "0",
+        firmId: "",
+        firmDeptName: "",
       },
+      form1: {},
+      title: "",
       // 琛ㄥ崟鏍¢獙
       rules: {
         cusName: [{ required: true, message: "", trigger: "blur" }],
@@ -1494,21 +1694,167 @@
         // ],
         cusIdcard: [{ required: true, message: "", trigger: "change" }],
       },
+      rules1: {
+        cnName: [{ required: true, trigger: "blur" }],
+        contactPerson: [{ required: true, trigger: "blur" }],
+        contactPhone: [
+          {
+            required: true,
+            trigger: "blur",
+          },
+          {
+            pattern: /^1[3-9]\d{9}$/,
+            trigger: "blur",
+          },
+        ],
+      },
     };
   },
   watch: {
     filterText(val) {
       this.$refs.tree.filter(val);
     },
+    filterage(val) {
+      this.$refs.treas.filter(val);
+    },
   },
   created() {
-    this.getCurrentDateTime();
+    this.getCompanyList();
 
+    this.getCurrentDateTime();
     this.startTimer();
     this.getList1();
+
     // this.getData();
   },
+  mounted() {},
+
   methods: {
+    clear() {
+      this.form.firmId = "";
+    },
+    /** 鍒犻櫎鎸夐挳鎿嶄綔 */
+    handleDelete1(row) {
+      // console.log(row);
+      let data = {
+        cusCardId: row.cusId,
+        proId: row.parentProId,
+      };
+      this.$modal
+        .confirm("鏄惁纭鍒犻櫎锛�")
+        .then(() => {
+          return delTbBycusCardIdAndProId(data);
+        })
+        .then(() => {
+          this.TotalPrice1 = 0;
+          getTransitionList1(row.cusId).then((response) => {
+            this.tableData1 = response.data;
+
+            this.tableData1.forEach((item) => {
+              this.TotalPrice1 += item.ordPrice;
+              this.TotalPrice += item.nowPrice;
+            });
+            this.TotalPrice = this.tableData1.reduce((sum, item) => {
+              return sum.plus(new Big(item.nowPrice || "0"));
+            }, new Big(0));
+            this.discount =
+              (Math.floor((this.TotalPrice / this.TotalPrice1) * 100) / 100) *
+              10;
+          });
+          this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+        })
+        .catch(() => {});
+    },
+    validateDiscount(row) {
+      if (row.discount > 10) {
+        row.discount = 10; // 寮哄埗灏嗗�艰缃负鏈�澶у��
+      } else if (row.discount < 0) {
+        row.discount = 0; // 寮哄埗灏嗗�艰缃负鏈�灏忓��
+      }
+      this.updateProPrice(row); // 鏇存柊浠锋牸鎴栧叾浠栭�昏緫
+    },
+    isAll(value) {
+      return value === "" || value === null;
+    },
+    updateProPrice(row) {
+      const ordPrice = new Big(row.ordPrice);
+
+      const discount = new Big(row.discount);
+      const result = ordPrice.times(discount.div(10)); // ordPrice * (discount / 10)
+      row.nowPrice = result.toNumber();
+      this.TotalPrice = this.tableData1.reduce((sum, item) => {
+        return sum.plus(new Big(item.nowPrice || "0"));
+      }, new Big(0));
+
+      this.discount =
+        (Math.floor((this.TotalPrice / this.TotalPrice1) * 100) / 100) * 10;
+    },
+
+    openname() {
+      this.$refs.bbb.open = true;
+      this.$refs.bbb.title = "鎼滅储濮撳悕";
+      this.$refs.bbb.getList();
+    },
+    getCompanyList() {
+      this.loading = true;
+      getconfigKey("team_reservation_default_day").then((res) => {
+        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) {
+        // console.log(value);
+        const originalCompId = this.form.firmId;
+        this.form.firmName = value;
+        this.CompanyList.forEach((item) => {
+          if (item.cnName == this.form.firmName) {
+            this.form.firmId = item.drugManufacturerId;
+          }
+        });
+
+        if (this.form.firmId === originalCompId) {
+          this.form.firmId = "";
+        }
+        if (this.form.firmId) {
+          this.form.tjType = "1";
+        }
+      }
+    },
     getCurrentDateTime() {
       const currentDate = new Date();
 
@@ -1540,7 +1886,20 @@
     },
     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;
+      }
     },
     beforeDestroy() {
       clearInterval(this.timer);
@@ -1607,6 +1966,7 @@
     inputChanges() {
       this.$refs.historyTj.getlist();
     },
+
     cope() {
       this.tcShow = true;
       let cusIdCard = this.form.cusIdcard;
@@ -1652,12 +2012,13 @@
           if (response.code === 200) {
             let cusId = this.form.cusIdcard;
             this.proIds = [];
-            getTransitionList(cusId).then((response) => {
+            getTransitionList1(cusId).then((response) => {
               this.tableData1 = response.data;
               this.TotalPrice1 = 0;
               if (this.tableData1) {
                 this.tableData1.forEach((item) => {
-                  this.TotalPrice1 += item.nowPrice;
+                  this.TotalPrice1 += item.ordPrice;
+                  this.TotalPrice += item.nowPrice;
                   if (item.pacName === null) {
                     item.pacName = "鍗曢」";
                   }
@@ -1669,20 +2030,12 @@
                   this.pacName = item.pacName;
                 });
 
-                const r = /^\+?[0-9][0-9]*$/; //姝f暣鏁帮紙鍙互0鎵撳ご锛�
-                let TotalPrice = this.TotalPrice1 * (this.discount / 10);
-                if (r.test(TotalPrice)) {
-                  this.TotalPrice = TotalPrice + ".00";
-                } else {
-                  this.TotalPrice = TotalPrice;
-                }
-
                 this.list1 = false;
                 this.list3 = true;
               } else {
                 this.list1 = true;
 
-                this.TotalPrice = "0.00";
+                this.TotalPrice = 0;
               }
             });
           }
@@ -1861,6 +2214,8 @@
         updateBy: null,
         updateTime: null,
         deleted: null,
+        firmid: "",
+        firmDeptName: "",
       };
       this.resetForm("form");
     },
@@ -1893,11 +2248,32 @@
 
     // 鎶樻墸
     numberChange(currentValue, oldValue) {
-      this.discount = currentValue;
-      if (this.discount <= this.getInfodis) {
-        this.discount = this.getInfodis;
-      }
-      this.TotalPrice = (this.TotalPrice1 * (this.discount / 10)).toFixed(2);
+      this.$confirm("纭畾淇敼鎵�鏈夊瓙椤圭殑鎶樻墸鍚楋紵", "鎻愮ず", {
+        confirmButtonText: "纭畾",
+        cancelButtonText: "鍙栨秷",
+        type: "warning",
+      })
+        .then(() => {
+          this.discount = currentValue;
+          if (this.discount < this.getInfodis) {
+            this.discount = this.getInfodis;
+            // this.$modal.msgError(`璇ヤ汉鍛樻渶楂樹紭鎯犳潈闄愪负${this.getInfodis}鎶榒);
+          }
+          this.tableData1.forEach((item) => {
+            item.discount = this.discount;
+            const ordPrice = new Big(item.ordPrice);
+            const discount = new Big(item.discount);
+            const result = ordPrice.times(discount.div(10)); // ordPrice * (discount / 10)
+            item.nowPrice = result.toNumber();
+            this.TotalPrice = this.tableData1.reduce((sum, item) => {
+              return sum.plus(new Big(item.nowPrice || "0"));
+            }, new Big(0));
+          });
+          // ----------------------------------------------------------
+        })
+        .catch(() => {
+          this.discount = oldValue;
+        });
     },
 
     /** 鐧昏鎻愪氦鎸夐挳 */
@@ -1915,18 +2291,16 @@
           if (this.form.cusSex === "鏈煡") {
             this.form.cusSex = 2;
           }
+          if (this.form.tjType === "") {
+            this.form.tjType = this.dict.type.dict_team[0].value;
+          }
+
           addCustomer(this.form).then((response) => {
             this.responseList = response.data;
+
             this.$modal.msgSuccess("鏂板鎴愬姛");
-            // let cusSex = this.form.cusSex;
-            // //鍏ㄩ儴濂楅
-            // deptTreeSelect(cusSex).then((response) => {
-            //   this.newpacName = response.rows;
-            //   this.loading = false;
-            // });
-            // this.handleQuery();
+
             _this.tcShow = true;
-            _this.tcShows = true;
             _this.isDisabled = true;
             _this.top = false;
           });
@@ -1958,26 +2332,31 @@
               this.discount = this.form.discount;
             }
             if (this.form.tjType === null) {
-              this.form.tjType = "2";
+              this.form.tjType = this.dict.type.dict_team[0].value;
+            }
+            if (this.form.cusMarryStatus === "null") {
+              this.form.cusMarryStatus = "5";
+            }
+            if (this.form.cusNational === "null") {
+              this.form.cusNational = "1";
             }
             if (this.form.reservationId != null) {
               if (this.form.groupingId) {
+                this.form.firmName = this.form.compName;
+                this.form.tjType = "1";
+                this.CompanyList.forEach((item) => {
+                  if (item.cnName == this.form.firmName) {
+                    this.form.firmId = item.drugManufacturerId;
+                  }
+                });
                 _this.tcShow = true;
-                _this.tcShows = false;
-                let data = {
-                  // teamNo: this.form.teamNo,
-                  groupingId: this.form.groupingId,
-                };
-                getByTeamNo(data).then((res) => {
+
+                getTransitionList1(this.form.cusIdcard).then((res) => {
                   this.tableData1 = res.data;
                   if (this.tableData1) {
                     this.tableData1.forEach((item) => {
-                      this.TotalPrice1 += item.ysPrice;
-                      console.log(this.TotalPrice1);
-                      this.TotalPrice = (
-                        this.TotalPrice1 *
-                        (this.discount / 10)
-                      ).toFixed(2);
+                      this.TotalPrice1 += item.ordPrice;
+                      this.TotalPrice += item.nowPrice;
                       if (item.pacName === null) {
                         item.pacName = "鍗曢」";
                       }
@@ -1985,28 +2364,25 @@
                     this.list1 = false;
                     this.list2 = true;
                     this.list3 = false;
+                    this.top = false;
                   } else {
                     this.list1 = true;
-                    this.TotalPrice = "0.00";
+                    this.TotalPrice = 0;
+                    this.top = false;
                   }
                 });
               } else {
                 if (this.form) {
                   _this.tcShow = true;
-                  _this.tcShows = true;
                   _this.formPacId = this.form.pacId;
                   let cusId = this.form.cusIdcard;
-                  getTransitionList(cusId).then((response) => {
+                  getTransitionList1(cusId).then((response) => {
                     this.tableData1 = response.data;
                     if (this.tableData1) {
                       this.TotalPrice1 = 0;
                       this.tableData1.forEach((item) => {
-                        this.TotalPrice1 += item.nowPrice;
-                        console.log(this.TotalPrice1);
-                        this.TotalPrice = (
-                          this.TotalPrice1 *
-                          (this.discount / 10)
-                        ).toFixed(2);
+                        this.TotalPrice1 += item.ordPrice;
+                        this.TotalPrice += item.nowPrice;
                         if (item.pacName === null) {
                           item.pacName = "鍗曢」";
                         }
@@ -2030,15 +2406,14 @@
             } else {
               _this.tcShow = true;
               this.$message.warning("鏆傛棤棰勭害淇℃伅");
+              _this.resetpackage();
             }
+            this.top = false;
             _this.isDisabled = true;
           } else {
             this.$message.warning("鏈煡鍒扮敤鎴蜂俊鎭�");
           }
         });
-        // .catch((error) => {
-        //   this.$message.error("姝ょ敤鎴蜂笉瀛樺湪");
-        // });
       } else {
         let configKey = "getInfoFromSqlData";
         getconfigKey(configKey).then((res) => {
@@ -2051,7 +2426,6 @@
               } else if ("MozWebSocket" in window) {
                 websocket = new MozWebSocket(url);
               } else {
-                // console.log("SockJS");
               }
 
               if (websocket == null) {
@@ -2068,75 +2442,24 @@
                 this.websocket = websocket;
                 // 杩炴帴璁惧
                 var jsonObj = {
-                  name: "connect",
+                  // name: "connect",
+                  type: "1",
                 };
                 var jStr = JSON.stringify(jsonObj);
                 this.websocket.send(jStr);
-                alert("璇锋斁韬唤璇佸啀鐐圭‘璁�");
+                // alert("璇锋斁韬唤璇佸啀鐐圭‘璁�");
                 var jsonObj = {
-                  name: "readCert",
+                  // name: "readCert",
                 };
-                var jStr = JSON.stringify(jsonObj);
-                this.websocket.send(jStr);
+
                 this.dialogVisible = false;
               };
 
               //鎺ユ敹鍒版秷鎭殑鍥炶皟鏂规硶
-              websocket.onmessage = function (event) {
+              websocket.onmessage = (event) => {
                 var resultObj = eval("(" + event.data + ")");
-                //resultFlag涓�0浠h〃璇诲崱鎴愬姛
-                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("璁惧杩炴帴宸叉柇寮�锛岃妫�鏌ヨ鍗″櫒杩炴帴");
-                    }
-                  }
-                }
+                this.readCardWebSocket(resultObj);
               };
-
-              //杩炴帴鍏抽棴鐨勫洖璋冩柟娉�
               websocket.onclose = function () {
                 alert("璇诲崱鍣ㄨ繛鎺ュ叧闂�");
               };
@@ -2144,9 +2467,336 @@
               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 = "";
             }
           }
         });
+      }
+    },
+
+    // 鏈�鏂颁娇鐢╳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"
+          );
+        } 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;
+        _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("璇锋斁缃韩浠借瘉鍚庡啀鐐瑰嚮璇诲彇");
+      } /* 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("璁惧杩炴帴宸叉柇寮�锛岃妫�鏌ヨ鍗″櫒杩炴帴");
+          }
+        }
+      }
+    },
+    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 {
+        }
+        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 {
+        }
+        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父");
+        };
       }
     },
 
@@ -2156,27 +2806,11 @@
       } else {
         this.form.cusIdcard = param1[0].pacCode;
       }
-
-      // this.form.cusName = param1[0].pacName;
-      // this.form.cusPhone = param1[0].pacRemark;
     },
-
-    // selected(row, index) {
-    //   if (this.formPacId !== null) {
-    //     if (row.pacId == this.formPacId) {
-    //       setTimeout(() => {
-    //         if (this.$refs.tb) {
-    //           this.$refs.tb.toggleRowSelection(row, true);
-    //         }
-    //       }, 10);
-    //       return true;
-    //     } else {
-    //       return false;
-    //     }
-    //   } else {
-    //     return this.newpacName;
-    //   }
-    // },
+    handleChangesName(params) {
+      this.form.cusIdcard = params[0].sfzh;
+      this.handleQuery();
+    },
 
     // 涓婁紶澶村儚
     handleAvatarSuccess(res, file) {
@@ -2200,6 +2834,7 @@
       this.taocan = false;
       this.malldisble = false;
       this.defaultKeys = [];
+      this.DataLists = [];
     },
 
     cancell() {
@@ -2214,16 +2849,27 @@
     handle() {
       this.loading = true;
       this.name = this.queryParam.pacName;
+      let param = {
+        sex: this.form.cusSex,
+        dwId: this.form.firmId,
+      };
       if (this.name) {
         getPackageListName(this.name).then((response) => {
           this.newpacName = response.data;
           this.loading = false;
         });
       } else {
-        deptTreeSelect().then((response) => {
-          this.newpacName = response.rows;
-          this.loading = false;
-        });
+        if (this.form.tjType == 1) {
+          tuantiSelect(param).then((response) => {
+            this.newpacName = response.data;
+            this.loading = false;
+          });
+        } else {
+          deptTreeSelect().then((response) => {
+            this.newpacName = response.rows;
+            this.loading = false;
+          });
+        }
       }
     },
 
@@ -2274,15 +2920,17 @@
     //   }
     // },
 
-    resetpackage(){
+    resetpackage() {
+      this.discount = 10;
       if (this.form.cusIdcard) {
         var cusId = this.form.cusIdcard;
       } else {
         this.$message.warning("璇峰厛濉啓淇℃伅锛屽啀閫変綋妫�鍐呭");
       }
       let _this = this;
-        _this.pacId = "";
+      _this.pacId = "";
       this.proIds = [];
+      this.tjCategory = "12";
       let data = {
         cusId,
         pacId: _this.pacId,
@@ -2292,16 +2940,16 @@
         if (response.code === 200) {
           let cusId = this.form.cusIdcard;
           this.proIds = [];
-          getTransitionList(cusId).then((response) => {
+          getTransitionList1(cusId).then((response) => {
             this.tableData1 = response.data;
             this.TotalPrice1 = 0;
-            if (this.tableData1.length>=1) {
+            if (this.tableData1.length >= 1) {
               this.list1 = false;
               this.list3 = true;
             } else {
               this.list1 = true;
 
-              this.TotalPrice = "0.00";
+              this.TotalPrice = 0;
             }
           });
         }
@@ -2309,33 +2957,69 @@
     },
 
     Package() {
-      this.taocan = true;
+      this.activeNames = "first";
       let cusSex = this.form.cusSex;
       this.datekey = Date.now();
       //鍏ㄩ儴濂楅
-      this.loading = true;
-      deptTreeSelect(cusSex).then((response) => {
-        this.newpacName = response.rows;
 
-        try {
-          if (this.tableData1.length >= 1) {
-            this.newpacName.forEach((item3) => {
-              this.tableData1.forEach((item4) => {
-                item4.list.forEach((item6) => {
-                  if (item6.pacName === item3.pacName) {
-                    this.$nextTick(() => {
-                      this.$refs.tb.toggleRowSelection(item3, true);
+      let param = {
+        sex: cusSex,
+        dwId: this.form.firmId || "",
+      };
+      if (this.form.tjType == 1) {
+        if (!this.form.firmId) {
+          this.$message({
+            type: "warning",
+            message: "璇峰厛缁存姢鍗曚綅锛�",
+          });
+        } else {
+          this.taocan = true;
+          this.loading = true;
+          tuantiSelect(param).then((res) => {
+            this.newpacName = res.data;
+            try {
+              if (this.tableData1.length >= 1) {
+                this.newpacName.forEach((item3) => {
+                  this.tableData1.forEach((item4) => {
+                    item4.list.forEach((item6) => {
+                      if (item6.pacName === item3.pacName) {
+                        this.$nextTick(() => {
+                          this.$refs.tb.toggleRowSelection(item3, true);
+                        });
+                        throw Error();
+                      }
                     });
-                    throw Error();
-                  }
+                  });
+                });
+              }
+            } catch (error) {}
+            this.loading = false;
+          });
+        }
+      } else {
+        this.taocan = true;
+        this.loading = true;
+        deptTreeSelect(cusSex).then((response) => {
+          this.newpacName = response.rows;
+          try {
+            if (this.tableData1.length >= 1) {
+              this.newpacName.forEach((item3) => {
+                this.tableData1.forEach((item4) => {
+                  item4.list.forEach((item6) => {
+                    if (item6.pacName === item3.pacName) {
+                      this.$nextTick(() => {
+                        this.$refs.tb.toggleRowSelection(item3, true);
+                      });
+                      throw Error();
+                    }
+                  });
                 });
               });
-            });
-          }
-        } catch (error) {}
-        this.loading = false;
-      });
-      // this.getData();
+            }
+          } catch (error) {}
+          this.loading = false;
+        });
+      }
     },
 
     // 鐐瑰嚮澶氶�夋鑾峰彇閫変腑鏁版嵁
@@ -2347,53 +3031,106 @@
       }
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
+      if (this.tableData1.length != 0) {
+        this.tableData.forEach((item) => {
+          this.tableData1.forEach((item1) => {
+            item.tjProjectList.forEach((item2) => {
+              if (item2.proId == item1.proPrantId && item1.pacName == "鍗曢」") {
+                this.$confirm(
+                  "璇ュ椁愬寘鍚簡宸查�夊崟椤癸紝鏄惁纭閫夋嫨璇ュ椁愶紵",
+                  "纭淇℃伅",
+                  {
+                    distinguishCancelAndClose: true,
+                    confirmButtonText: "纭",
+                    cancelButtonText: "鍙栨秷",
+                  }
+                )
+                  .then(() => {
+                    this.$message({
+                      type: "success",
+                      message: "璇锋敞鎰忔煡鐪嬩环鏍�",
+                    });
+                  })
+                  .catch((action) => {
+                    if (action === "cancel") {
+                      let del_row = selection.shift();
+                      this.$refs.tb.toggleRowSelection(del_row, false);
+                      this.$message({
+                        type: "warning",
+                        message: "宸插彇娑�",
+                      });
+                    }
+                  });
+                // this.$message.warning("璇ュ椁愬寘鍚簡宸查�夊崟椤癸紝鑻ラ�夋嫨璇ュ椁愶紝璇峰厛鍒犻櫎鍗曢」");
+              }
+            });
+          });
+        });
+      }
       if (selection[0]) {
         // this.DataList = [];
         // this.data = JSON.parse(JSON.stringify(this.dXData));
-        selection[0].tjProjectList.forEach((selectionitem) => {
-          this.Treedata.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 = [];
-            //         }
-            //       });
-            //     }
-            //   });
-            // }
-          });
-          this.TreedataList.forEach((item3) => {
-            if (item3.proParentId == selectionitem.proId) {
-              item.disabled = true;
-            }
-          });
-        });
+        // selection[0].tjProjectList.forEach((selectionitem) => {
+        //   this.Treedata.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 = [];
+        //         }
+        //       });
+        //     }
+        //   });
+        // }
+        // });
+        //   this.TreedataList.forEach((item3) => {
+        //     if (item3.proParentId == selectionitem.proId) {
+        //       item.disabled = true;
+        //     }
+        //   });
+        // });
       } else {
         this.treedataList = JSON.parse(JSON.stringify(this.dXData));
         return;
       }
     },
     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.loading = false;
+        });
       }
     },
+    // gaibian(val){
+    //   let pname = val;
+    //   getProParentIdDxList(pname).then(response=>{
+    //     this.Treedata = response.data.list;
+    //   })
+    // },
     getDataList() {
       this.loading = true;
       getProParentIdDxList().then((response) => {
         this.Treedata = response.data.list;
+
         if (this.tableData[0]) {
           this.tableData[0].tjProjectList.forEach((selectionitem) => {
             this.Treedata.forEach((item) => {
@@ -2403,40 +3140,123 @@
             });
           });
         }
-        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.DataList.length != 0) {
-            this.list1 = false;
-            this.DataList.forEach((item) => {
-              this.TotalPrice1 = item.proPrice + this.TotalPrice1;
-            });
-          }
-        });
         this.loading = false;
       });
     },
 
+    handlepackage(data, checked, checkedNodes) {
+      this.dataObj = data;
+      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;
+
+          this.DataLists = [];
+          this.checkedListkey1 = [];
+          for (var i = 0; i < this.packagedataList.length; i++) {
+            let proId = this.packagedataList[i].proId;
+            this.checkedListkey1.push(proId);
+            // this.DataLists.push(this.packagedataList[i]);
+            getProSonDxList(proId).then((res) => {
+              this.TreedataList = res.data.list;
+
+              this.TreedataList.forEach((item) => {
+                // this.checkedListkey1.push(item.proId);
+
+                this.DataLists.push(item);
+
+                if (this.DataLists.length >= 1) {
+                  this.marryalls = 0;
+                  this.DataLists.forEach((item1) => {
+                    this.marryalls += item1.proPrice;
+
+                    this.packagedataList.forEach((item3) => {
+                      if (item1.proParentId == item3.proId) {
+                        item1.propinName = item3.proName;
+                      }
+                    });
+                  });
+                }
+              });
+            });
+          }
+        });
+      } else if (checked.checkedNodes.length == 0) {
+        this.DataLists = [];
+        this.marryalls = 0; // 娓呴浂鎬讳环
+        this.checkedListkey1 = [];
+      }
+    },
+    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];
+      // }
+    },
+    handlePackageChecked(data, checked, checkedNodes) {
+      if (checked == false) {
+        this.DataLists.forEach((item, index) => {
+          if (item.proId == data.proId) {
+            this.DataLists.splice(index, 1);
+            this.marryalls = 0; // 閲嶇疆鍚堣閲戦
+            this.DataLists.forEach((item1) => {
+              this.marryalls += item1.proPrice; // 閲嶆柊璁$畻鍚堣閲戦
+            });
+          }
+        });
+      } else if (checked == true) {
+        this.DataLists.push(data); // 娣诲姞鏁版嵁鍒板凡閫夊垪琛�
+        this.DataLists.forEach((item1) => {
+          if (item1.proParentId == this.dataObj.proId) {
+            item1.propinName = this.dataObj.proName; // 璁剧疆鐖剁骇鍚嶇О
+          }
+        });
+        // this.spliceData();
+        this.marryalls = 0; // 閲嶇疆鍚堣閲戦
+        this.DataLists.forEach((item1) => {
+          this.marryalls += item1.proPrice; // 閲嶆柊璁$畻鍚堣閲戦
+        });
+      }
+    },
     // 鐐瑰嚮鑾峰彇姣忎釜鏍戣妭鐐�
     handleCurrentChecked(data, checked, checkedNodes) {
       this.dataObj = data;
       if (checked.checkedNodes.length != 0) {
         this.$refs.tree.setCheckedKeys([data.proId]);
+
         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) => {
@@ -2446,10 +3266,11 @@
             });
           });
           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;
             });
           }
         });
@@ -2475,15 +3296,31 @@
       return this.DataList;
     },
 
+    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>
+      );
+    },
     // 鐐瑰嚮鑾峰彇姣忎釜鏍戣妭鐐�
     handleCurrentChecked1(data, checked, checkedNodes) {
       if (checked == false) {
         this.DataList.forEach((item, index) => {
           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;
             });
           }
         });
@@ -2495,9 +3332,9 @@
           }
         });
         this.spliceData();
-        this.TotalPrice1 = 0;
+        this.marryall = 0;
         this.DataList.forEach((item1) => {
-          this.TotalPrice1 = item1.proPrice + this.TotalPrice1;
+          this.marryall += item1.proPrice;
         });
       }
     },
@@ -2507,16 +3344,25 @@
       this.DataList.forEach((item, index) => {
         if (item.proId == row.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;
           });
         }
       });
     },
-    //  // 榛樿鎺ュ彈鍥涗釜鍊� { 褰撳墠琛岀殑鍊�, 褰撳墠鍒楃殑鍊�, 琛岀殑涓嬫爣, 鍒楃殑涓嬫爣 }
+    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;
+          });
+        }
+      });
+    },
     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)) {
@@ -2543,7 +3389,6 @@
       } else {
         this.$message.warning("璇峰厛濉啓淇℃伅锛屽啀閫変綋妫�鍐呭");
       }
-
       let _this = this;
       if (this.tableData.length != 0) {
         this.tableData.forEach((item) => {
@@ -2558,64 +3403,102 @@
           this.proIds.push(item.proId);
         });
       }
+      if (this.DataLists.length != 0) {
+        this.DataLists.forEach((item) => {
+          this.proIds.push(item.proId);
+        });
+      }
       let data = {
         cusId,
         pacId: _this.pacId,
         proIds: this.proIds,
       };
-      getaddtTransition(data).then((response) => {
-        if (response.code === 200) {
-          let cusId = this.form.cusIdcard;
-          this.proIds = [];
-          getTransitionList(cusId).then((response) => {
-            this.tableData1 = response.data;
-            this.TotalPrice1 = 0;
-            if (this.tableData1) {
-              this.tableData1.forEach((item) => {
-                this.TotalPrice1 += item.nowPrice;
-                if (item.pacName === null) {
-                  item.pacName = "鍗曢」";
-                }
-                if (item.pacName == "鍗曢」") {
-                  item.list.forEach((item9) => {
-                    this.treeList.push(item9.proId);
-                  });
-                }
-                this.pacName = item.pacName;
-              });
+      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;
 
-              const r = /^\+?[0-9][0-9]*$/; //姝f暣鏁帮紙鍙互0鎵撳ご锛�
-              let TotalPrice = this.TotalPrice1 * (this.discount / 10);
-              if (r.test(TotalPrice)) {
-                this.TotalPrice = TotalPrice + ".00";
+                  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.TotalPrice = TotalPrice;
+                this.list1 = true;
+                this.TotalPrice = 0;
               }
+            });
+          } else {
+          }
+        });
+      } 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.list1 = false;
-              this.list3 = true;
-            } else {
-              this.list1 = true;
+                  this.pacName = item.pacName;
+                });
+                this.discount =
+                  (Math.floor((this.TotalPrice / this.TotalPrice1) * 100) /
+                    100) *
+                  10;
 
-              this.TotalPrice = "0.00";
-            }
-          });
-        }
-      });
+                this.list1 = false;
+                this.list3 = true;
+                this.list2 = false;
+              } else {
+                this.list1 = true;
+                this.TotalPrice = 0;
+              }
+            });
+          } else {
+          }
+        });
+      }
       this.taocan = false;
       this.defaultKeys = [];
+      this.DataLists = [];
     },
-    // changeCategoryKeys(val) {
-    //   this.proIds = [];
-    //   this.proIds = val;
-    // if (this.DataList.length != 0) {
-    //   this.DataList.forEach((item) => {
-    //     this.proIds.push(item.proId);
-    //   });
-    // } else {
-    //   this.proIds = [];
-    // }
-    // },
     submitCheckinfee() {
       let _this = this;
       if (_this.tjCategory !== "") {
@@ -2879,6 +3762,7 @@
     submitPrice() {
       let _this = this;
       if (_this.tjCategory !== "") {
+        this.loadingSubmit = true;
         let List = _this.tableData1; //鍗曚釜椤圭洰淇℃伅
         if (this.responseList.cusId) {
           var userId = this.responseList.cusId;
@@ -2920,43 +3804,65 @@
         let paidIn = this.TotalPrice.toString();
         let discount = this.discount;
         this.tjFlowingWater = { copeWith, paidIn, discount };
+        const newArray = this.tableData1
+          .filter((item) => item.discount < 10) // 杩囨护鍑� discount < 10 鐨勯」
+          .map((item) => ({
+            discount: item.discount,
+            parentProId: item.parentProId,
+            cusIdCard: item.cusId,
+          })); // 鍒涘缓鏂扮殑瀵硅薄锛屽寘鍚� discount 鍜� id
+        gaibianzhekou(newArray).then((res) => {
+          if (res.code === 200) {
+            this.loadingSubmit = false;
+            let data;
 
-        let data;
-        if (pacId || this.tjOrderList.length > 0) {
-          data = {
-            photo: this.srcUrl,
-            pacId,
-            tjOrderList: this.tjOrderList,
-            tjFlowingWater: this.tjFlowingWater,
-            userId,
-            tjType,
-            tjCategory: this.tjCategory,
-          };
-          this.listgetOrder(data);
-        } else if (pacId || this.tjOrderList.length > 0) {
-          data = {
-            photo: this.srcUrl,
-            tjOrderList: this.tjOrderList,
-            tjFlowingWater: this.tjFlowingWater,
-            userId,
-            tjType,
-            tjCategory: this.tjCategory,
-          };
-          this.listgetOrder(data);
-        } else {
-          this.$message({
-            type: "warning ",
-            message: "璇烽�夋嫨濂楅!",
-          });
-        }
-      }else {
+            if (pacId || this.tjOrderList.length > 0) {
+              data = {
+                photo: this.srcUrl,
+                pacId,
+                tjOrderList: this.tjOrderList,
+                tjFlowingWater: this.tjFlowingWater,
+                userId,
+                tjType,
+                tjCategory: this.tjCategory,
+                firmId: this.form.firmId,
+                firmName: this.form.firmName,
+                firmDeptName: this.form.firmDeptName,
+              };
+
+              this.listgetOrder(data);
+            } else if (pacId || this.tjOrderList.length > 0) {
+              data = {
+                photo: this.srcUrl,
+                tjOrderList: this.tjOrderList,
+                tjFlowingWater: this.tjFlowingWater,
+                userId,
+                tjType,
+                tjCategory: this.tjCategory,
+                firmId: this.form.firmId,
+                firmName: this.form.firmName,
+                firmDeptName: this.form.firmDeptName,
+              };
+              this.listgetOrder(data);
+            } else {
+              this.$message({
+                type: "warning ",
+                message: "璇烽�夋嫨濂楅!",
+              });
+            }
+          } else {
+            this.loadingSubmit = false;
+            this.$modal.msgError("鏀瑰彉鎶樻墸閿欒");
+          }
+        });
+      } else {
+        this.loadingSubmit = false;
         this.$modal.msgError("璇烽�夋嫨浣撴绫诲埆");
       }
     },
   },
 };
 </script>
-
 
 <style>
 .el-form-item__error {
@@ -3004,9 +3910,16 @@
 }
 
 .tab3 {
-  max-height: 400px;
+  border: 1px solid #dcdfe6;
+}
+
+.filter-tree {
+  /* max-height: 360px;
   overflow-y: auto;
-  border: 1px solid #d9d9d9;
+  border: 1px solid #d9d9d9; */
+  overflow: auto;
+  flex: 1;
+  height: 350px;
 }
 
 .tab2 {
@@ -3074,6 +3987,13 @@
   height: 300px;
 }
 
+.dialog-footer2 {
+  width: 960px;
+  height: 36px;
+  display: flex;
+  justify-content: center;
+}
+
 .el-input--suffix .el-input__inner {
   padding-right: 15px;
 }
@@ -3104,4 +4024,9 @@
 .content {
   margin-bottom: 25px;
 }
+
+.tab8 {
+  width: 100%;
+  display: flex;
+}
 </style>

--
Gitblit v1.8.0