From b0d733958a618b9fc5ce0ee2fee5d2b146a7a748 Mon Sep 17 00:00:00 2001
From: su1124 <1583764726@qq.com>
Date: 星期二, 30 一月 2024 17:52:49 +0800
Subject: [PATCH] su

---
 src/views/system/tijian/index.vue | 1008 ++++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 655 insertions(+), 353 deletions(-)

diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue
index fef5401..18e79dd 100644
--- a/src/views/system/tijian/index.vue
+++ b/src/views/system/tijian/index.vue
@@ -1,166 +1,262 @@
 <template>
   <div class="app-container">
-    <div style="display: flex;">
-      <div style="width:76%;">
-        <el-form  :inline="true" ref="form" :model="form" :rules="rules"
-          :label-position="labelPosition" class="demo-form-inline" label-width="auto" v-show="top">
-          <el-row type="flex">
-            <el-col :span="6">
-              <el-form-item label="鏄惁鍖垮悕" prop="isNow">
-                <el-select style="width: 11rem" v-model="isNow" placeholder="鏄惁鍖垮悕" @change="freezing(isNow)">
+    <div style="display: flex">
+      <div style="width: 76%">
+        <el-form :inline="true" ref="form" :model="form" :rules="rules" :label-position="labelPosition"
+          label-width="106px" v-show="top">
+          <el-row>
+            <el-col :span="5">
+              <el-form-item label="鍖垮悕" prop="isNow" style="display: flex">
+                <el-select v-model="isNow" placeholder="鏄惁鍖垮悕" @change="freezing(isNow)">
                   <el-option v-for="dict in dictType" :key="dict.value" :label="dict.label"
                     :value="dict.value"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
-              <el-form-item label="濮撳悕" prop="cusName">
-                <el-input v-model="form.cusName" placeholder="璇疯緭鍏ュ鍚�" :disabled="isDisabled" style="width: 13rem" />
+            <el-col :span="7">
+              <el-form-item label="濮撳悕" prop="cusName" style="display: flex" :rules="[
+                {
+                  required: true, validator: (rule, value, callback) => {
+                    if (!form.cusName) {
+                      callback('')
+                    } else if (form.cusName) {
+                      callback()
+                    }
+
+                  }, trigger: 'blur'
+                }]">
+                <el-input v-model="form.cusName" placeholder="璇疯緭鍏ュ鍚�" :disabled="isDisabled" />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
-              <el-form-item label="璇佷欢绫诲瀷" prop="idType">
-                <el-select :disabled="isDisabled" style="width: 13rem" v-model="form.idType" placeholder="璇烽�夋嫨璇佷欢绫诲瀷">
+            <el-col :span="9">
+              <el-form-item label="璇佷欢绫诲瀷" prop="idType" style="display: flex">
+                <el-select :disabled="isDisabled" v-model="form.idType" placeholder="璇烽�夋嫨璇佷欢绫诲瀷">
                   <el-option v-for="dict in dict.type.dict_user_cardtype" :key="dict.value" :label="dict.label"
                     :value="dict.value"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
-              <el-form-item label="璇佷欢鍙�" prop="cusIdcard" :rules="showHidden.has_idcard === 'Y' ? rules.cusIdcard : []"
-                :required="showHidden.has_idcard === 'Y'">
-                <el-input :disabled="isDisabled" style="width: 16rem" v-model="form.cusIdcard" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�"
-                  @input="inputChange" />
-                <i style="font-size: 1rem; margin-left: 3px" class="el-icon-search" @click="handleQuery"></i>
-              </el-form-item>
-            </el-col>
           </el-row>
+        </el-form>
+        <el-form :inline="true" ref="form" :model="form" :rules="rules" :label-position="labelPosition"
+          label-width="106px" v-show="top">
           <el-row>
-            <el-col :span="6">
-              <el-form-item label="骞撮緞" prop="age">
-            <el-input style="width: 5rem" v-model="form.age" :disabled="isDisabled" />
-          </el-form-item>
-          <el-form-item prop="ageUnit">
-            <el-select :disabled="isDisabled" style="width: 5rem" v-model="form.ageUnit">
-              <el-option v-for="dict in dict.type.dict_ageunit" :key="dict.value" :label="dict.label"
-                :value="dict.value"></el-option>
-            </el-select> </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="鎬у埆" prop="cusSex" :rules="showHidden.has_sex === 'Y' ? rules.cusSex : []"
-                :required="showHidden.has_sex === 'Y'">
-                <el-select :disabled="isDisabled" style="width: 13rem" v-model="form.cusSex" placeholder="鎬у埆">
-                  <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label"
-                    :value="parseInt(dict.value)"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="鍑虹敓鏃ユ湡" prop="cusBrithday">
-                <el-date-picker :disabled="isDisabled" style="width: 13.4rem" clearable v-model="form.cusBrithday"
-                  type="date" value-format="yyyy-MM-dd" placeholder="璇烽�夋嫨鍑虹敓鏃ユ湡">
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="鑱旂郴鐢佃瘽" prop="cusPhone" :rules="showHidden.is_phone === 'Y' ? rules.cusPhone : []"
-                :required="showHidden.is_phone === 'Y'">
-                <el-input v-model="form.cusPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" :disabled="isDisabled" style="width: 16rem" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="鎴峰彛鍦板潃" prop="addr">
-                <el-input v-model="form.addr" placeholder="璇疯緭鍏ユ埛鍙e湴鍧�" :disabled="isDisabled" style="width: 31.5rem" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="鐜颁綇鍧�" prop="cusAddr">
-                <el-input v-model="form.cusAddr" placeholder="璇疯緭鍏ョ幇灞呬綇鍦板潃" :disabled="isDisabled" style="width: 36.5rem" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="6">
-              <el-form-item label="鑱屼笟" prop="career">
-                <el-select filterable :disabled="isDisabled" v-model="form.career" placeholder="璇疯緭鍏ヨ亴涓�"
-                  style="width: 11rem">
-                  <el-option v-for="dict in dict.type.dict_job" :key="dict.value" :label="dict.label"
-                    :value="dict.value"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="姘戞棌" prop="cusNational">
-                <el-select filterable :disabled="isDisabled" v-model="form.cusNational" placeholder="璇烽�夋嫨姘戞棌"
-                  style="width: 13rem">
+            <el-col :span="5">
+              <el-form-item label="姘戞棌" prop="cusNational" style="display: flex">
+                <el-select filterable :disabled="isDisabled" v-model="form.cusNational" placeholder="璇烽�夋嫨姘戞棌">
                   <el-option v-for="dict in dict.type.dict_user_national" :key="dict.value" :label="dict.label"
                     :value="dict.value"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
-              <el-form-item label="濠氬Щ" prop="cusMarryStatus">
-                <el-select :disabled="isDisabled" style="width: 11rem" v-model="form.cusMarryStatus" placeholder="濠氬Щ鐘跺喌">
+            <el-col :span="7">
+              <el-form-item label="鎬у埆" prop="cusSex" :rules="[
+                {
+                  required: true, validator: (rule, value, callback) => {
+                    if (!form.cusSex && showHidden.has_sex === 'Y') {
+                      callback('')
+                    } else if (showHidden.has_sex === 'N') {
+                      callback()
+                    } else if (form.cusSex && showHidden.has_sex === 'Y') {
+                      callback()
+                    }
+
+                  }, trigger: 'blur'
+                }]" style="display: flex">
+                <el-select :disabled="isDisabled" v-model="form.cusSex" placeholder="鎬у埆">
+                  <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label"
+                    :value="parseInt(dict.value)"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="9">
+              <el-form-item label="璇佷欢鍙�" prop="cusIdcard" :rules="[
+                {
+                  required: true, validator: (rule, value, callback) => {
+                    if (!form.cusIdcard && showHidden.has_idcard === 'Y') {
+                      callback('')
+                    } else if (showHidden.has_idcard === 'N') {
+                      callback()
+                    } else if (form.cusIdcard && showHidden.has_idcard === 'Y') {
+                      callback()
+                    }
+
+                  }, trigger: 'blur'
+                }]" style="display: flex">
+                <span slot="label" style="display:inline-block;border-bottom: 2px solid blue;" @click="handleQuery">
+                  璇佷欢鍙�
+                </span>
+                <el-input :disabled="isDisabled" v-model="form.cusIdcard" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" @input="inputChange" />
+                <!-- <i style="
+                    font-size: 1rem;
+                    position: absolute;
+                    right: -20px;
+                    top: 10px;
+                    cursor: pointer;
+                  " class="el-icon-search" @click="handleQuery"></i> -->
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <el-form :inline="true" ref="form" :model="form" :rules="rules" :label-position="labelPosition"
+          label-width="106px" v-show="top">
+          <el-row>
+            <el-col :span="5">
+              <el-form-item label="濠氬Щ" prop="cusMarryStatus" style="display: flex">
+                <el-select :disabled="isDisabled" v-model="form.cusMarryStatus" placeholder="濠氬Щ鐘跺喌">
                   <el-option v-for="dict in dict.type.dict_user_marry" :key="dict.value" :label="dict.label"
                     :value="dict.value"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
-              <el-form-item label="宸ヤ綔鍗曚綅" prop="company">
-                <el-input :disabled="isDisabled" v-model="form.company" placeholder="璇疯緭鍏ュ伐浣滃崟浣�" style="width: 18rem" />
+            <el-col :span="7">
+              <el-form-item label="鐢佃瘽" prop="cusPhone" :rules="[
+                {
+                  required: true, validator: (rule, value, callback) => {
+                    if (!form.cusPhone && showHidden.is_phone === 'Y') {
+                      callback('')
+                    } else if (showHidden.is_phone === 'N') {
+                      callback()
+                    } else if (form.cusPhone && showHidden.is_phone === 'Y') {
+                      callback()
+                    }
+
+                  }, trigger: 'blur'
+                }]" style="display: flex">
+                <el-input v-model="form.cusPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" :disabled="isDisabled" />
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="9">
+              <el-form-item label="鍑虹敓鏃ユ湡" prop="cusBrithday" style="display: flex">
+                <el-date-picker :disabled="isDisabled" clearable v-model="form.cusBrithday" type="date"
+                  value-format="yyyy-MM-dd" placeholder="璇烽�夋嫨鍑虹敓鏃ユ湡">
+                </el-date-picker>
               </el-form-item>
             </el-col>
           </el-row>
+        </el-form>
+        <el-form :inline="true" ref="form" :model="form" :rules="rules" :label-position="labelPosition"
+          label-width="106px" v-show="top">
           <el-row>
-            <el-col :span="6">
-              <el-form-item label="浠嬬粛浜�" prop="cusIntroduce">
-                <el-input :disabled="isDisabled" v-model="form.cusIntroduce" placeholder="璇疯緭鍏ヤ粙缁嶄汉" style="width: 11rem" />
+            <el-col :span="5">
+              <el-form-item label="鑱屼笟" prop="career" style="display: flex">
+                <el-select filterable :disabled="isDisabled" v-model="form.career" placeholder="璇疯緭鍏ヨ亴涓�">
+                  <el-option v-for="dict in dict.type.dict_job" :key="dict.value" :label="dict.label"
+                    :value="dict.value"></el-option>
+                </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
-              <el-form-item label="閭" prop="cusEmail">
-                <el-input v-model="form.cusEmail" placeholder="璇疯緭鍏ラ偖绠�" :disabled="isDisabled" style="width: 13rem" />
+
+            <el-col :span="7">
+              <el-form-item label="閭" prop="cusEmail" style="display: flex">
+                <el-input v-model="form.cusEmail" placeholder="璇疯緭鍏ラ偖绠�" :disabled="isDisabled" />
               </el-form-item>
             </el-col>
-            <el-col :span="12">
-              <el-form-item style="margin-left: 24rem">
-                <el-button :disabled="isDisabled" style="margin-left: 5rem" type="primary" size="mini"
-                  @click="submitForm">鐧昏</el-button>
+            <el-col :span="4">
+              <el-form-item label="骞撮緞  " prop="age" style="display: flex" label-width="150px
+              ">
+                <el-input v-model="form.age" :disabled="isDisabled" style="padding-left: 10%" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="3">
+              <el-form-item prop="ageUnit">
+                <el-select :disabled="isDisabled" v-model="form.ageUnit" style="width: 94%">
+                  <el-option v-for="dict in dict.type.dict_ageunit" :key="dict.value" :label="dict.label"
+                    :value="dict.value"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <el-form ref="form" :model="form" :rules="rules" label-width="80px" :label-position="labelPosition" v-show="top">
+          <el-row>
+            <el-col :span="20">
+              <el-form-item label="鎴峰彛鍦板潃" prop="addr">
+                <el-input v-model="form.addr" placeholder="璇疯緭鍏ユ埛鍙e湴鍧�" :disabled="isDisabled" style="width: 103%" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <el-form ref="form" :model="form" :rules="rules" label-width="80px" :label-position="labelPosition" v-show="top">
+          <el-row>
+            <el-col :span="20">
+              <el-form-item label="鐜颁綇鍧�" prop="cusAddr">
+                <el-input v-model="form.cusAddr" style="width: 103%" placeholder="璇疯緭鍏ョ幇灞呬綇鍦板潃" :disabled="isDisabled" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <el-form :inline="true" ref="form" :model="form" :rules="rules" :label-position="labelPosition" label-width="98px"
+          v-show="top">
+          <el-row>
+            <el-col :span="7">
+              <el-form-item label="浠嬬粛浜�" prop="cusIntroduce" style="display: flex">
+                <el-input :disabled="isDisabled" v-model="form.cusIntroduce" placeholder="璇疯緭鍏ヤ粙缁嶄汉" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="7">
+              <el-form-item label="宸ヤ綔鍗曚綅" prop="company" style="display: flex">
+                <el-input style="width: 100%" :disabled="isDisabled" v-model="form.company" placeholder="璇疯緭鍏ュ伐浣滃崟浣�" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="7">
+              <el-form-item label="鏂囧寲绋嬪害" prop="wenHua" style="display: flex">
+                <el-input style="width: 100%" :disabled="isDisabled" v-model="form.wenHua" placeholder="璇疯緭鍏ユ枃鍖栫▼搴�" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="7">
+              <el-button v-show="lishi" type="primary" @click="cope" size="mini">涓�閿鍒�</el-button>
+              <el-button type="primary" @click="inputChanges" v-show="lishi" size="mini"
+                :disabled="confirm">鍘嗗彶浣撴璁板綍</el-button>
+            </el-col>
+          </el-row>
+        </el-form>
+        <el-form :inline="true" ref="form" :model="form" :rules="rules" :label-position="labelPosition" label-width="80px"
+          v-show="top">
+          <el-row>
+            <el-col :span="24">
+              <el-form-item>
+                <el-button :disabled="isDisabled" type="primary" size="mini" @click="submitForm">鐧昏</el-button>
                 <el-button icon="el-icon-refresh" size="mini" @click="resetQuery" @queryTable="getList">閲嶇疆</el-button>
               </el-form-item>
             </el-col>
           </el-row>
         </el-form>
       </div>
-      <div class="content" v-show="showHidden.mall_hasPhoto == 'Y'">
-        <div v-show="hide" style="border: 1px dashed #dcdfe6; width: 180px; height: 180px">
-          <img v-if="imageUrl" :src="imageUrl" class="avatar" />
-        </div>
-        <div v-if="imgSrc" class="img_bg_camera">
-          <img style="
+      <div v-show="top">
+        <div class="content" v-show="showHidden.mall_hasPhoto == 'Y'">
+          <div v-show="hide" style="
+              border: 1px dashed #dcdfe6;
+              width: 180px;
+              height: 180px;
+              margin-left: 5%;
+            ">
+            <img v-if="imageUrl" :src="imageUrl" class="avatar" />
+          </div>
+          <div v-if="imgSrc" class="img_bg_camera">
+            <img style="
                 width: 200px;
                 height: 200px;
                 margin-left: -20px;
                 margin-top: 90px;
                 padding-top: 1px;
               " :src="imgSrc" alt="" class="tx_img" />
-        </div>
-        <video v-show="hides" id="videoCamera" :width="videoWidth" :height="videoHeight" autoplay
-          style="margin-top: 1px"></video>
-        <canvas style="display: none" id="canvasCamera" :width="videoWidth" :height="videoHeight"></canvas>
-        <div class="camera_outer" style="margin-top: 10px">
-          <el-button type="primary" plain size="mini" @click="getCompetence()">鎵撳紑鎽勫儚澶�</el-button>
-          <el-button type="primary" plain size="mini" @click="setImage()">鎷嶇収</el-button><br />
+          </div>
+          <video v-show="hides" id="videoCamera" :width="videoWidth" :height="videoHeight" autoplay
+            style="margin-top: 1px"></video>
+          <canvas style="display: none" id="canvasCamera" :width="videoWidth" :height="videoHeight"></canvas>
+          <div class="camera_outer" style="margin-top: 10px">
+            <el-button type="primary" plain size="mini" @click="getCompetence()">鎵撳紑鎽勫儚澶�</el-button>
+            <el-button type="primary" plain size="mini" @click="setImage()">鎷嶇収</el-button><br />
+          </div>
         </div>
       </div>
     </div>
 
-
-    <el-dialog title="閫夋嫨濂楅" :visible.sync="taocan" width="42%" height="700px">
-      <el-tabs type="border-card" style="height: 560px; margin:0 10px; width: 100%">
+    <el-dialog title="閫夋嫨濂楅" :visible.sync="taocan" width="50%" height="700px">
+      <el-tabs type="border-card" style="height: 560px; margin: 0 10px; width: 100%">
         <el-tab-pane label="濂楅">
           <el-form :model="queryParam" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="auto">
             <el-form-item label="濂楅鍚嶇О" prop="pacName">
@@ -302,7 +398,21 @@
               <el-form-item label="瀹炴敹閲戦">
                 <el-input placeholder="瀹炴敹閲戦" v-model="TotalPrice" style="width: 126px"></el-input>
               </el-form-item>
-
+              <!-- 140828199805050012 -->
+              <el-form-item label="棰嗗彇鏂瑰紡">
+                <!-- <el-input style="width: 100%;"  v-model="form.getType" placeholder="璇烽�夋嫨棰嗗彇鏂瑰紡" /> -->
+                <el-select v-model="getType" style="width: 94%" @change="getmailType">
+                  <el-option v-for="dict in dict.type.report_get_type" :key="dict.value" :label="dict.label"
+                    :value="dict.value"></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="浣撴绫诲埆">
+                <el-select style="width: 140px" v-model="tjCategory" placeholder="璇烽�夋嫨浣撴绫诲埆">
+                  <el-option v-for="dict in dict.type.dict_tjtype" :key="dict.value" :label="dict.label"
+                    :value="dict.value"></el-option>
+                </el-select>
+                <!-- <el-input v-model="form.category" placeholder="璇疯緭鍏ヤ綋妫�绫诲埆" /> -->
+              </el-form-item>
               <el-form-item>
                 <el-button type="primary" @click="Package" size="mini">閫夋嫨濂楅</el-button>
                 <el-button type="primary" @click="submitPrice" :disabled="confirm" v-if="showHidden.has_charge == 'N'"
@@ -315,8 +425,25 @@
             </el-form>
           </template>
 
-          <div style="text-align: center; margin-bottom: 10px; margin-right: 800px">
+          <el-dialog title="閭瘎" :visible.sync="malldisble" :close-on-click-modal="false">
+            <el-form :model="addAddress" :rules="rules" label-width="78px" style="margin-left: 7px">
+              <el-form-item label="濮撳悕">
+                <el-input placeholder="濮撳悕" v-model="addAddress.getUser"></el-input>
+              </el-form-item>
+              <el-form-item label="鐢佃瘽">
+                <el-input placeholder="鐢佃瘽" v-model="addAddress.phone"></el-input>
+              </el-form-item>
+              <el-form-item label="鍦板潃">
+                <el-input placeholder="鍦板潃" v-model="addAddress.address"></el-input>
+              </el-form-item>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+              <el-button type="primary" @click="cancell">纭� 瀹�</el-button>
+              <el-button @click="cancel">鍙� 娑�</el-button>
+            </div>
+          </el-dialog>
 
+          <div style="text-align: center; margin-bottom: 10px">
             宸查�夐」鐩垪琛�
           </div>
           <div style="
@@ -347,7 +474,7 @@
                     </el-table-column>
                     <el-table-column prop="proType" label="鎬у埆" width="180">
                       <template slot-scope="scope" v-if="scope.row.proType == ''">
-                        {{ 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" />
@@ -373,7 +500,7 @@
                 </el-table-column>
                 <el-table-column prop="proType" label="鎬у埆" width="180">
                   <template slot-scope="scope" v-if="scope.row.proType == ''">
-                    {{ 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" />
@@ -399,7 +526,7 @@
                     </el-table-column>
                     <el-table-column prop="proType" label="鎬у埆" width="180">
                       <template slot-scope="scope" v-if="scope.row.proType == ''">
-                        {{ 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" />
@@ -428,7 +555,6 @@
         <iframe id="printIframe" :src="url" frameborder="0" style="width: 100%; height: 100%"></iframe>
       </div>
     </el-dialog>
-
 
     <el-dialog title="鏀惰垂" :visible.sync="charge" width="59%" height="700px">
       <div>
@@ -494,34 +620,19 @@
         </el-table>
       </div>
     </el-dialog>
-    <div style="
-              position: absolute;
-              bottom: 100px;
-              width: 360px;
-              display: none;
-            ">
-      <div id="printBill" style="width: 280px;font-size: 1px;" ref="printContent">
-        <div style="font-size: 1px;">
-          <div style="text-align: center;">
+    <div style="position: absolute; bottom: 100px; width: 360px; display: none">
+      <div id="printBill" style="width: 280px; font-size: 1px" ref="printContent">
+        <div style="font-size: 1px">
+          <div style="text-align: center">
             <h3>{{ hospName }}灏忕エ</h3>
           </div>
 
-          <div style="margin-top: 4px;">
-            <div>
-              濮撳悕:{{ formIn.name }}
-            </div>
-            <div>
-              鐢佃瘽:{{ formIn.phone }}
-            </div>
-            <div>
-              浣撴椤圭洰:{{ formIn.tjPro }}
-            </div>
-            <div>
-              瀹炴敹閲戦:{{ formInline.paidIn }}鍏�
-            </div>
-            <div>
-              鏀惰垂鏃堕棿:{{ currentDate + " " + currentTime }}
-            </div>
+          <div style="margin-top: 4px">
+            <div>濮撳悕:{{ formIn.name }}</div>
+            <div>鐢佃瘽:{{ formIn.phone }}</div>
+            <div>浣撴椤圭洰:{{ formIn.tjPro }}</div>
+            <div>瀹炴敹閲戦:{{ formInline.paidIn }}鍏�</div>
+            <div>鏀惰垂鏃堕棿:{{ currentDate + " " + currentTime }}</div>
           </div>
         </div>
       </div>
@@ -539,13 +650,27 @@
         <el-button type="primary" @click="beat = false">纭� 瀹�</el-button>
       </span> -->
     <!-- </el-dialog> -->
+    <historyTj :cusIdCard="form.cusIdcard" ref="historyTj"></historyTj>
+    <el-dialog title="鎻愮ず" :visible.sync="dialogVisiblese" width="30%" :before-close="handleClose">
+      <span>鏄惁澶嶅埗鏈�杩戜竴娆$殑浣撴椤圭洰锛�</span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisiblese = false">鍙� 娑�</el-button>
+        <el-button type="primary" @click="copes">纭� 瀹�</el-button>
+      </span>
+    </el-dialog>
+    <Packages ref="aaa" @add="handleChanges" />
   </div>
 </template>
 
 <script>
 import { dataURLtoFile, random } from "./file";
 import { getInfo } from "@/api/login";
-import { addCustomer, getwater, getfindTj, getByTjNum } from "@/api/hosp/customer";
+import {
+  addCustomer,
+  getwater,
+  getfindTj,
+  getByTjNum,
+} from "@/api/hosp/customer";
 import { getPrintSetUp } from "@/api/system/examcharge";
 
 import {
@@ -558,12 +683,17 @@
   getTransitionList,
   getByTeamNo,
   getLoadFile,
-  getIsRequired
+  getIsRequired, getconfigKey,
+  getHistryTjOrderProByCusIdCard,
 } from "@/api/system/tijian";
+import Packages from "@/components/Packages";
 import { MessageBox } from "element-ui";
-import VTreeTransfer from './TreeTransfer.vue'
+import VTreeTransfer from "./TreeTransfer.vue";
+import historyTj from "@/components/historyTj/index";
 export default {
   dicts: [
+    "dict_tjtype",
+    "report_get_type",
     "dict_user_national",
     "dict_user_marry",
     "sys_yes_no",
@@ -576,21 +706,28 @@
   ],
   name: "Tijian",
   components: {
-    VTreeTransfer
+    VTreeTransfer,
+    historyTj,
+    Packages
   },
   data() {
     return {
+      proIdList: [],
+      tableDatas: [],
+      dialogVisiblese: false,
+      lishi: false,
+      table: false,
+      HistoryList: {},
       index: 0,
       dictType: [
         {
           value: 0,
-          label: "鏄�"
+          label: "鏄�",
         },
         {
           value: 1,
-          label: "鍚�"
+          label: "鍚�",
         },
-
       ],
       isNow: 1,
       treeId: [],
@@ -606,11 +743,13 @@
         payType: "0",
         paidIn: "0.00",
       },
+      getType: "",
       hospName: "",
       currentDate: "",
       currentTime: "",
+      tjCategory: "",
       formIn: {
-        tjPro:"浣撴璐�"
+        tjPro: "浣撴璐�",
       },
       selectionList: [],
       OrderId: "",
@@ -670,11 +809,13 @@
       activeName: "1",
       DataList: [],
       fData: [],
+      addAddress: {},
       tjOrderList: [], //鍗曚釜椤圭洰闆嗗悎
       tjFlowingWater: {},
       // 鎼滅储濂楅鍚嶅瓧
       name: "",
       isfalse: false,
+      malldisble: false,
       responseList: {},
       showHidden: {},
       tjNumbers: "",
@@ -751,82 +892,73 @@
       },
       // 琛ㄥ崟鏍¢獙
       rules: {
-        cusName: [{ required: true, message: "濮撳悕涓嶈兘涓虹┖", trigger: "blur" }],
+        cusName: [{ required: true, message: "", trigger: "blur" }],
         cusSex: [
-          { required: true, message: "鎬у埆涓嶈兘涓虹┖", trigger: "change" },
+          { required: true, message: "", trigger: "change" },
         ],
-        // cusBrithday: [
-        //   { required: true, message: "鍑虹敓鏃ユ湡涓嶈兘涓虹┖", trigger: "blur" },
-        // ],
-        // cusAddr: [
-        //   { required: true, message: "鐜板眳浣忓湴鍧�涓嶈兘涓虹┖", trigger: "blur" },
-        // ],
+        address: [{ required: true, message: "", trigger: "blur" }],
+        phone: [{ required: true, message: "", trigger: "blur" }],
         cusPhone: [
-          { required: true, message: "鑱旂郴鐢佃瘽涓嶈兘涓虹┖", trigger: "blur" },
+          { required: true, message: "", trigger: "change" },
+        ],
+         cusBrithday: [
+          { required: true, message: "", trigger: "change" },
         ],
         // cusNational: [
         //   { required: true, message: "姘戞棌涓嶈兘涓虹┖", trigger: "change" },
         // ],
         cusIdcard: [
-          { required: true, message: "韬唤璇佸彿涓嶈兘涓虹┖", trigger: "blur" },
+          { required: true, message: "", trigger: "change" },
         ],
       },
     };
   },
   created() {
-    this.getCurrentDateTime()
+    this.getCurrentDateTime();
 
-    this.startTimer()
+    this.startTimer();
     this.getList1();
     this.getData();
   },
   methods: {
     getCurrentDateTime() {
-
-      const currentDate = new Date()
+      const currentDate = new Date();
 
       // 鏍煎紡鍖栨棩鏈燂細YYYY-MM-DD
 
-      const year = currentDate.getFullYear()
+      const year = currentDate.getFullYear();
 
-      const month = String(currentDate.getMonth() + 1).padStart(2, '0')
+      const month = String(currentDate.getMonth() + 1).padStart(2, "0");
 
-      const day = String(currentDate.getDate()).padStart(2, '0')
+      const day = String(currentDate.getDate()).padStart(2, "0");
 
-      this.currentDate = `${year}-${month}-${day}`
+      this.currentDate = `${year}-${month}-${day}`;
 
       // 鏍煎紡鍖栨椂闂达細HH:mm:ss
 
-      const hours = String(currentDate.getHours()).padStart(2, '0')
+      const hours = String(currentDate.getHours()).padStart(2, "0");
 
-      const minutes = String(currentDate.getMinutes()).padStart(2, '0')
+      const minutes = String(currentDate.getMinutes()).padStart(2, "0");
 
-      const seconds = String(currentDate.getSeconds()).padStart(2, '0')
+      const seconds = String(currentDate.getSeconds()).padStart(2, "0");
 
-      this.currentTime = `${hours}:${minutes}:${seconds}`
-
+      this.currentTime = `${hours}:${minutes}:${seconds}`;
     },
 
     startTimer() {
-
       this.timer = setInterval(() => {
-
-        this.getCurrentDateTime()
-
-      }, 1000) //姣忕閽熸洿鏂颁竴娆�
-
+        this.getCurrentDateTime();
+      }, 1000); //姣忕閽熸洿鏂颁竴娆�
     },
 
     beforeDestroy() {
-
-      clearInterval(this.timer)
-
-    },//娓呴櫎瀹氭椂鍣紝浠ラ伩鍏嶅唴瀛樻硠闇层��
+      clearInterval(this.timer);
+    }, //娓呴櫎瀹氭椂鍣紝浠ラ伩鍏嶅唴瀛樻硠闇层��
     freezing(val) {
       if (val == 0) {
-        this.form.cusName = random(2)
+        this.form.cusName = random(2);
       } else {
-        this.form.cusName = ""
+        this.form.cusName = "";
       }
     },
     getList1() {
@@ -838,8 +970,8 @@
         }
       });
       getIsRequired().then((response) => {
-        this.showHidden = response.data
-      })
+        this.showHidden = response.data;
+      });
     },
     inputChange() {
       const reg =
@@ -869,9 +1001,107 @@
           this.form.cusBrithday = birthday;
           this.form.age = age;
         }
+        // let cusIdCard = this.form.cusIdcard;
+        // getHistryTjOrderByCusIdCard(cusIdCard).then((res) => {
+        //   if (res.code == 200) {
+        this.table = true;
+        this.lishi = true;
+        //     this.HistoryList = res.data;
+        //   }
+        // });
       } else {
         return false;
       }
+    },
+    inputChanges() {
+      this.$refs.historyTj.getlist();
+    },
+    cope() {
+      this.tcShow = true;
+      let cusIdCard = this.form.cusIdcard;
+      getHistryTjOrderProByCusIdCard(cusIdCard).then((res) => {
+        this.copeList = res.data;
+        if (res.msg != "鏆傛棤鍘嗗彶璁板綍") {
+          this.dialogVisiblese = true;
+        } else {
+          this.$message.warning("鏆傛棤鍘嗗彶浣撴璁板綍锛�");
+        }
+      });
+    },
+    copes() {
+      let cusIdCard = this.form.cusIdcard;
+      getHistryTjOrderProByCusIdCard(cusIdCard).then((res) => {
+        this.tableDatas = res.data;
+        if (this.form.cusIdcard) {
+          var cusId = this.form.cusIdcard;
+        } else {
+          this.$message.warning("璇峰厛濉啓淇℃伅锛屽啀閫変綋妫�鍐呭");
+        }
+
+        let _this = this;
+        if (this.tableDatas.length != 0) {
+          this.tableDatas.forEach((item) => {
+            if (item.pacId != null) {
+              _this.pacId = item.pacId;
+            } else {
+              item.list.forEach((items) => {
+                _this.proIdList.push(items.proId);
+                console.log(_this.pacId, 888);
+              });
+            }
+          });
+        } else {
+          _this.pacId = "";
+        }
+        let data = {
+          cusId,
+          pacId: _this.pacId,
+          proIds: _this.proIdList,
+        };
+        getaddtTransition(data).then((response) => {
+          if (response.code === 200) {
+            let cusId = this.form.cusIdcard;
+            this.proIds = [];
+            getTransitionList(cusId).then((response) => {
+              this.tableData1 = response.data;
+              console.log(this.tableData1);
+              this.TotalPrice1 = 0;
+              if (this.tableData1) {
+                this.tableData1.forEach((item) => {
+                  this.TotalPrice1 += item.nowPrice;
+                  if (item.pacName === null) {
+                    item.pacName = "鍗曢」";
+                  }
+                  if (item.pacName == "鍗曢」") {
+                    item.list.forEach((item9) => {
+                      this.treeList.push(item9.proId);
+                    });
+                  }
+                  this.pacName = item.pacName;
+                });
+
+                const r = /^\+?[0-9][0-9]*$/; //姝f暣鏁帮紙鍙互0鎵撳ご锛�
+                let TotalPrice = this.TotalPrice1 * (this.discount / 10);
+                if (r.test(TotalPrice)) {
+                  this.TotalPrice = TotalPrice + ".00";
+                } else {
+                  this.TotalPrice = TotalPrice;
+                }
+
+                this.list1 = false;
+                this.list3 = true;
+              } else {
+                this.list1 = true;
+
+                this.TotalPrice = "0.00";
+              }
+            });
+          }
+        });
+        this.taocan = false;
+        this.defaultKeys = [];
+      });
+      this.dialogVisiblese = false;
     },
     getCompetence() {
       var _this = this;
@@ -988,7 +1218,6 @@
 
     /** 鏌ヨ淇℃伅鍒楄〃 */
     getList() {
-      this.loading = true;
       // listCustomer(this.queryParams).then((response) => {
       //   this.customerList = response.rows;
       //   this.total = response.total;
@@ -1116,6 +1345,15 @@
       });
     },
 
+    getmailType() {
+      if (this.getType == "2") {
+        this.addAddress.getUser = this.form.cusName;
+        this.addAddress.phone = this.form.cusPhone;
+        this.addAddress.address = this.form.cusAddr;
+        this.malldisble = true;
+      }
+    },
+
     // 鏍规嵁韬唤璇佹煡璇�
     handleQuery() {
       this.loading = true;
@@ -1182,9 +1420,9 @@
                           item.pacName = "鍗曢」";
                         }
                         if (item.pacName == "鍗曢」") {
-                          item.list.forEach(item9 => {
-                            this.treeList.push(item9.proId)
-                          })
+                          item.list.forEach((item9) => {
+                            this.treeList.push(item9.proId);
+                          });
                         }
                       });
                       this.list1 = false;
@@ -1211,102 +1449,126 @@
         //   this.$message.error("姝ょ敤鎴蜂笉瀛樺湪");
         // });
       } else {
-        var websocket = null;
-        var url = this.valueUrl;
-        if ("WebSocket" in window) {
-          websocket = new WebSocket(url);
-        } else if ("MozWebSocket" in window) {
-          websocket = new MozWebSocket(url);
-        } else {
-          // console.log("SockJS");
-        }
-
-        if (websocket == null) {
-          alert("鍒涘缓WebSocket瀵硅薄澶辫触");
-        }
-
-        //杩炴帴鍙戠敓閿欒鐨勫洖璋冩柟娉�
-        websocket.onerror = function () {
-          alert("璇锋鏌ヨ鍗″櫒杩炴帴鏄惁姝e父");
-        };
-
-        //杩炴帴鎴愬姛寤虹珛鐨勫洖璋冩柟娉�
-        websocket.onopen = function () {
-          this.websocket = websocket;
-          // 杩炴帴璁惧
-          var jsonObj = {
-            name: "connect",
-          };
-          var jStr = JSON.stringify(jsonObj);
-          this.websocket.send(jStr);
-          alert("璇锋斁韬唤璇佸啀鐐圭‘璁�");
-          var jsonObj = {
-            name: "readCert",
-          };
-          var jStr = JSON.stringify(jsonObj);
-          this.websocket.send(jStr);
-          this.dialogVisible = false;
-        };
-
-        //鎺ユ敹鍒版秷鎭殑鍥炶皟鏂规硶
-        websocket.onmessage = function (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("璇诲崱鍣ㄦ湭杩炴帴");
+        let configKey = "getInfoFromSqlData"
+        getconfigKey(configKey).then(res => {
+          if (res.code == 200) {
+            if (res.msg == "N") {
+              var websocket = null;
+              var url = this.valueUrl;
+              if ("WebSocket" in window) {
+                websocket = new WebSocket(url);
+              } else if ("MozWebSocket" in window) {
+                websocket = new MozWebSocket(url);
               } else {
-                //alert(resultObj.errorMsg);
+                // console.log("SockJS");
               }
-            } else if (resultObj.resultFlag == "-2") {
-              //alert(resultObj.errorMsg);
-            }
-          } else if (resultObj.name == "getStatus") {
-            if (resultObj.resultFlag == "0") {
-              if (resultObj.status == "0") {
-              } else {
-                alert("璁惧杩炴帴宸叉柇寮�锛岃妫�鏌ヨ鍗″櫒杩炴帴");
+
+              if (websocket == null) {
+                alert("鍒涘缓WebSocket瀵硅薄澶辫触");
               }
+
+              //杩炴帴鍙戠敓閿欒鐨勫洖璋冩柟娉�
+              websocket.onerror = function () {
+                alert("璇锋鏌ヨ鍗″櫒杩炴帴鏄惁姝e父");
+              };
+
+              //杩炴帴鎴愬姛寤虹珛鐨勫洖璋冩柟娉�
+              websocket.onopen = function () {
+                this.websocket = websocket;
+                // 杩炴帴璁惧
+                var jsonObj = {
+                  name: "connect",
+                };
+                var jStr = JSON.stringify(jsonObj);
+                this.websocket.send(jStr);
+                alert("璇锋斁韬唤璇佸啀鐐圭‘璁�");
+                var jsonObj = {
+                  name: "readCert",
+                };
+                var jStr = JSON.stringify(jsonObj);
+                this.websocket.send(jStr);
+                this.dialogVisible = false;
+              };
+
+              //鎺ユ敹鍒版秷鎭殑鍥炶皟鏂规硶
+              websocket.onmessage = function (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("璁惧杩炴帴宸叉柇寮�锛岃妫�鏌ヨ鍗″櫒杩炴帴");
+                    }
+                  }
+                }
+              };
+
+              //杩炴帴鍏抽棴鐨勫洖璋冩柟娉�
+              websocket.onclose = function () {
+                alert("璇诲崱鍣ㄨ繛鎺ュ叧闂�");
+              };
+            } else  if (res.msg == "Y"){
+              this.$refs.aaa.open = true;
+              this.$refs.aaa.getAllList();
+              this.$refs.aaa.title = "璇佷欢瀛楀吀";
             }
           }
-        };
+        })
 
-        //杩炴帴鍏抽棴鐨勫洖璋冩柟娉�
-        websocket.onclose = function () {
-          alert("璇诲崱鍣ㄨ繛鎺ュ叧闂�");
-        };
       }
+    },
+
+    handleChanges(param1) {
+      if(this.form.pacCode == "涓嶈"){
+        this.form.cusIdcard = param1[0].xh;
+      }else{
+        this.form.cusIdcard = param1[0].pacCode;
+      }
+      
+      // this.form.cusName = param1[0].pacName;
+      // this.form.cusPhone = param1[0].pacRemark;
+     
     },
 
     // selected(row, index) {
@@ -1345,8 +1607,18 @@
     // 鍙栨秷鎸夐挳
     cancel() {
       this.Seachopen = false;
-      this.taocan = false
-      this.defaultKeys = []
+      this.taocan = false;
+      this.malldisble = false;
+      this.defaultKeys = [];
+    },
+
+    cancell() {
+      console.log(this.addAddress.address);
+      if (this.addAddress.address) {
+        this.malldisble = false;
+      } else {
+        this.$message.error("璇峰~鍐欏湴鍧�");
+      }
     },
 
     /** 鎼滅储鎿嶄綔 */
@@ -1378,33 +1650,37 @@
       // this.tableData.forEach((item) => {
       //   this.fData = item.tjProjectList;
       // });
+      console.log(this.treedataList)
+      console.log(selection)
       if (selection[0]) {
         this.DataList = [];
         // this.data = JSON.parse(JSON.stringify(this.dXData));
-        selection[0].tjProjectList.forEach((selectionitem) => {
-          this.treedataList.forEach((item) => {
-            if (selectionitem.proName == item.proName) {
-              item.disabled = true;
-              item.tjProjectList = [];
-            }
-            if (item.tjProjectList) {
-              item.tjProjectList.forEach((item1) => {
-                if (selectionitem.proName == item1.proName) {
-                  item1.disabled = true;
-                  item1.tjProjectList = [];
-                }
-                if (item1.tjProjectList) {
-                  item1.tjProjectList.forEach((item2) => {
-                    if (selectionitem.proName == item2.proName) {
-                      item2.disabled = true;
-                      item2.tjProjectList = [];
-                    }
-                  });
-                }
-              });
-            }
+        if (selection[0].tjProjectList) {
+          selection[0].tjProjectList.forEach((selectionitem) => {
+            this.treedataList.forEach((item) => {
+              if (selectionitem.proName == item.proName) {
+                item.disabled = true;
+                item.tjProjectList = [];
+              }
+              if (item.tjProjectList) {
+                item.tjProjectList.forEach((item1) => {
+                  if (selectionitem.proName == item1.proName) {
+                    item1.disabled = true;
+                    item1.tjProjectList = [];
+                  }
+                  if (item1.tjProjectList) {
+                    item1.tjProjectList.forEach((item2) => {
+                      if (selectionitem.proName == item2.proName) {
+                        item2.disabled = true;
+                        item2.tjProjectList = [];
+                      }
+                    });
+                  }
+                });
+              }
+            });
           });
-        });
+        }
       } else {
         this.treedataList = JSON.parse(JSON.stringify(this.dXData));
         return;
@@ -1414,23 +1690,29 @@
     Package() {
       this.taocan = true;
       let cusSex = this.form.cusSex;
-      this.datekey = Date.now()
+      this.datekey = Date.now();
       //鍏ㄩ儴濂楅
+      this.loading = true;
       deptTreeSelect(cusSex).then((response) => {
         this.newpacName = response.rows;
+        console.log(this.newpacName)
+        console.log(this.tableData1)
         try {
-          this.newpacName.forEach((item3) => {
-            this.tableData1.forEach((item4) => {
-              item4.list.forEach((item6) => {
-                if (item6.pacName === item3.pacName) {
-                  this.$nextTick(() => {
-                    this.$refs.tb.toggleRowSelection(item3, true);
-                  });
-                  throw Error();
-                }
+          if (this.tableData1.length >= 1) {
+            this.newpacName.forEach((item3) => {
+              this.tableData1.forEach((item4) => {
+                item4.list.forEach((item6) => {
+                  if (item6.pacName === item3.pacName) {
+                    this.$nextTick(() => {
+                      this.$refs.tb.toggleRowSelection(item3, true);
+                    });
+                    throw Error();
+                  }
+                });
               });
             });
-          });
+          }
+
         } catch (error) { }
         this.loading = false;
       });
@@ -1502,7 +1784,7 @@
           this.proIds = [];
           getTransitionList(cusId).then((response) => {
             this.tableData1 = response.data;
-            console.log(this.tableData1)
+            console.log(this.tableData1);
             this.TotalPrice1 = 0;
             if (this.tableData1) {
               this.tableData1.forEach((item) => {
@@ -1511,26 +1793,23 @@
                   item.pacName = "鍗曢」";
                 }
                 if (item.pacName == "鍗曢」") {
-                  item.list.forEach(item9 => {
-                    this.treeList.push(item9.proId)
-                  })
+                  item.list.forEach((item9) => {
+                    this.treeList.push(item9.proId);
+                  });
                 }
                 this.pacName = item.pacName;
               });
-             
+
               const r = /^\+?[0-9][0-9]*$/; //姝f暣鏁帮紙鍙互0鎵撳ご锛�
               let TotalPrice = this.TotalPrice1 * (this.discount / 10);
               if (r.test(TotalPrice)) {
-                this.TotalPrice =
-                  TotalPrice + '.00';
+                this.TotalPrice = TotalPrice + ".00";
               } else {
-                this.TotalPrice =
-                  TotalPrice
+                this.TotalPrice = TotalPrice;
               }
-          
+
               this.list1 = false;
               this.list3 = true;
-
             } else {
               this.list1 = true;
 
@@ -1540,11 +1819,11 @@
         }
       });
       this.taocan = false;
-      this.defaultKeys = []
+      this.defaultKeys = [];
     },
     changeCategoryKeys(val) {
       this.proIds = [];
-      this.proIds = val
+      this.proIds = val;
       // if (this.DataList.length != 0) {
       //   this.DataList.forEach((item) => {
       //     this.proIds.push(item.proId);
@@ -1598,7 +1877,7 @@
       this.tjFlowingWater = { copeWith, paidIn, discount };
 
       let data;
-      if (pacId) {
+      if (pacId || this.getType == "2") {
         data = {
           photo: this.srcUrl,
           pacId,
@@ -1606,6 +1885,9 @@
           tjFlowingWater: this.tjFlowingWater,
           userId,
           tjType,
+          getType: this.getType,
+          addAddress: this.addAddress,
+          tjCategory: this.tjCategory,
         };
       } else {
         data = {
@@ -1614,34 +1896,46 @@
           tjFlowingWater: this.tjFlowingWater,
           userId,
           tjType,
+          getType: this.getType,
+          tjCategory: this.tjCategory,
         };
       }
       getOrder(data).then((res) => {
         this.$modal.msgSuccess("鎻愪氦鎴愬姛");
-        this.tjNumbers = res.msg
+        this.tjNumbers = res.msg;
         this.charge = true;
         let data = {
-          tjNum: res.msg
-        }
+          tjNum: res.msg,
+        };
         getfindTj(data).then((response) => {
           if (response.data) {
             this.feeitems = response.data;
+            if (this.feeitems.length != 0) {
+              this.$nextTick(() => {
+                this.$refs.multipleTable.toggleRowSelection(
+                  this.feeitems[0],
+                  true
+                );
+              });
+            } else {
+              this.$refs.multipleTable.clearSelection();
+            }
             this.loading = false;
-          }else{
-            this.feeitems = []
+          } else {
+            this.feeitems = [];
             this.loading = false;
           }
-        })
+        });
       });
     },
 
     // 琛ㄦ牸鍗曢��
     handleSelect(selection, val) {
-      console.log(selection, val)
+      console.log(selection, val);
       this.selectionList = this.$refs.multipleTable.selection;
       this.selectionList.forEach((item) => {
-        this.formIn.name = item.tjName
-        this.formIn.phone = item.tjPhone
+        this.formIn.name = item.tjName;
+        this.formIn.phone = item.tjPhone;
         this.OrderId = item.tjOrderId;
         if (item.tjFlowingWater != null) {
           this.waterId = item.tjFlowingWater.waterId;
@@ -1737,11 +2031,11 @@
             this.mobanId = res.data.mobanId;
             this.waterId = res.data.waterId;
             this.$modal.msgSuccess("鎿嶄綔鎴愬姛");
-            this.charge = false
+            this.charge = false;
             this.isDisabled = false;
-            this.top = true
-            this.reset()
-            getPrintSetUp().then(res => {
+            this.top = true;
+            this.reset();
+            getPrintSetUp().then((res) => {
               if (res.msg == "0") {
                 this.$nextTick(() => {
                   const style =
@@ -1749,7 +2043,7 @@
                   printJS({
                     printable: "printBill", // 鏍囩鍏冪礌id
                     noPrint: ".noPrint",
-                    type: 'html',
+                    type: "html",
                     header: "",
                     targetStyles: ["*"],
                     maxWidth: "800",
@@ -1757,21 +2051,19 @@
                     style,
                   });
                 });
-
               } else {
                 const tjnumber = this.tjNumbers;
                 const viewNum = "809623418249637888";
                 const params = { viewNum, tjnumber };
                 this.$tab.openPage("涓汉鍙戠エ", "/report/charge", params);
               }
-            })
+            });
           } else {
             this.$message({
               type: "warning ",
               message: "鏌ヨ鍒版偍宸查��娆撅紝璇锋偍閲嶆柊棰勭害!",
             });
           }
-
         });
       } else {
         this.$message({
@@ -1835,6 +2127,7 @@
           tjFlowingWater: this.tjFlowingWater,
           userId,
           tjType,
+          tjCategory:this.tjCategory
         };
       } else {
         data = {
@@ -1843,6 +2136,7 @@
           tjFlowingWater: this.tjFlowingWater,
           userId,
           tjType,
+          tjCategory:this.tjCategory
         };
       }
       getOrder(data).then((res) => {
@@ -1864,6 +2158,9 @@
 
 
 <style >
+.el-form-item__error {
+    	display: none;
+	}
 .el-table__header-wrapper .el-checkbox {
   display: none;
 }
@@ -1893,10 +2190,6 @@
   width: 178px;
   height: 178px;
   display: block;
-}
-
-.el-col-8 {
-  width: 330px;
 }
 
 .tab4 {
@@ -1974,6 +2267,15 @@
   height: 300px;
 }
 
+.el-input--suffix .el-input__inner {
+  padding-right: 15px;
+}
+
+.el-date-editor.el-input,
+.el-date-editor.el-input__inner {
+  width: 95.9%;
+}
+
 /* .el-dialog {
   width: 1000px;
   min-height: 500px;

--
Gitblit v1.8.0