From 772d8df8a3ee02a6fe2dbd6ba7216e3e3ee0ec63 Mon Sep 17 00:00:00 2001
From: qx <2540746708@qq.com>
Date: 星期四, 20 六月 2024 22:18:38 +0800
Subject: [PATCH] qxtj

---
 src/views/system/tijian/index.vue | 2075 ++++++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 1,478 insertions(+), 597 deletions(-)

diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue
index 48b54d6..b693f41 100644
--- a/src/views/system/tijian/index.vue
+++ b/src/views/system/tijian/index.vue
@@ -1,276 +1,505 @@
 <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"
-          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="7">
-              <el-form-item label="濮撳悕" prop="cusName" style="display: flex" :rules="[
+    <el-row :gutter="20">
+      <el-col :span="17">
+        <div class="grid-content bg-purple">
+          <el-form
+            :inline="true"
+            ref="form"
+            :model="form"
+            :rules="rules"
+            :label-position="labelPosition"
+            label-width="106px"
+            v-show="top"
+          >
+            <el-form-item label="鍖垮悕" prop="isNow">
+              <el-select
+                v-model="isNow"
+                placeholder="鏄惁鍖垮悕"
+                @change="freezing(isNow)"
+              >
+                <el-option
+                  v-for="dict in dictType"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+
+            <el-form-item
+              label="濮撳悕"
+              prop="cusName"
+              :rules="[
                 {
-                  required: true, validator: (rule, value, callback) => {
+                  required: true,
+                  validator: (rule, value, callback) => {
                     if (!form.cusName) {
-                      callback('')
+                      callback('');
                     } else if (form.cusName) {
-                      callback()
+                      callback();
                     }
+                  },
+                  trigger: 'blur',
+                },
+              ]"
+            >
+              <el-input
+                v-model="form.cusName"
+                placeholder="璇疯緭鍏ュ鍚�"
+                :disabled="isDisabled"
+              />
+            </el-form-item>
 
-                  }, trigger: 'blur'
-                }]">
-                <el-input v-model="form.cusName" placeholder="璇疯緭鍏ュ鍚�" :disabled="isDisabled" />
-              </el-form-item>
-            </el-col>
-            <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-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="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="7">
-              <el-form-item label="鎬у埆" prop="cusSex" :rules="[
+            <el-form-item label="璇佷欢绫诲瀷" prop="idType">
+              <el-select
+                :disabled="isDisabled"
+                v-model="form.idType"
+                placeholder="璇烽�夋嫨璇佷欢绫诲瀷"
+              >
+                <el-option
+                  v-for="dict in dict.type.dict_user_cardtype"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="姘戞棌" prop="cusNational">
+              <el-select
+                filterable
+                :disabled="isDisabled"
+                v-model="form.cusNational"
+                placeholder="璇烽�夋嫨姘戞棌"
+              >
+                <el-option
+                  v-for="dict in dict.type.dict_user_national"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+
+            <el-form-item
+              label="鎬у埆"
+              prop="cusSex"
+              :rules="[
                 {
-                  required: true, validator: (rule, value, callback) => {
+                  required: true,
+                  validator: (rule, value, callback) => {
                     if (!form.cusSex && showHidden.has_sex === 'Y') {
-                      callback('')
+                      callback('');
                     } else if (showHidden.has_sex === 'N') {
-                      callback()
+                      callback();
                     } else if (form.cusSex && showHidden.has_sex === 'Y') {
-                      callback()
+                      callback();
                     }
+                  },
+                  trigger: 'blur',
+                },
+              ]"
+            >
+              <el-select
+                :disabled="isDisabled"
+                v-model="form.cusSex"
+                placeholder="鎬у埆"
+              >
+                <el-option
+                  v-for="dict in dict.type.sys_user_sex"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="parseInt(dict.value)"
+                ></el-option>
+              </el-select>
+            </el-form-item>
 
-                  }, 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="[
+            <el-form-item
+              label="璇佷欢鍙风爜"
+              prop="cusIdcard"
+              :rules="[
                 {
-                  required: true, validator: (rule, value, callback) => {
+                  required: true,
+                  validator: (rule, value, callback) => {
                     if (!form.cusIdcard && showHidden.has_idcard === 'Y') {
-                      callback('')
+                      callback('');
                     } else if (showHidden.has_idcard === 'N') {
-                      callback()
-                    } else if (form.cusIdcard && showHidden.has_idcard === 'Y') {
-                      callback()
+                      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="
+                  },
+                  trigger: 'blur',
+                },
+              ]"
+            >
+              <span
+                slot="label"
+                style="display: inline-block; border-bottom: 2px solid blue"
+                @click="handleQuery"
+              >
+                璇佷欢鍙风爜
+              </span>
+              <el-input
+                :disabled="isDisabled"
+                v-model="form.cusIdcard"
+                placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�"
+                @input="inputChange"
+              />
+              <!-- <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="7">
-              <el-form-item label="鐢佃瘽" prop="cusPhone" :rules="[
+            </el-form-item>
+
+            <el-form-item label="濠氬Щ" prop="cusMarryStatus">
+              <el-select
+                :disabled="isDisabled"
+                v-model="form.cusMarryStatus"
+                placeholder="濠氬Щ鐘跺喌"
+              >
+                <el-option
+                  v-for="dict in dict.type.dict_user_marry"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+
+            <el-form-item
+              label="鐢佃瘽"
+              prop="cusPhone"
+              :rules="[
                 {
-                  required: true, validator: (rule, value, callback) => {
+                  required: true,
+                  validator: (rule, value, callback) => {
                     if (!form.cusPhone && showHidden.is_phone === 'Y') {
-                      callback('')
+                      callback('');
                     } else if (showHidden.is_phone === 'N') {
-                      callback()
+                      callback();
                     } else if (form.cusPhone && showHidden.is_phone === 'Y') {
-                      callback()
+                      callback();
                     }
+                  },
+                  trigger: 'blur',
+                },
+              ]"
+            >
+              <el-input
+                v-model="form.cusPhone"
+                placeholder="璇疯緭鍏ヨ仈绯荤數璇�"
+                :disabled="isDisabled"
+              />
+            </el-form-item>
 
-                  }, trigger: 'blur'
-                }]" style="display: flex">
-                <el-input v-model="form.cusPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" :disabled="isDisabled" />
-              </el-form-item>
-            </el-col>
+            <el-form-item label="鍑虹敓鏃ユ湡" prop="cusBrithday">
+              <el-date-picker
+                :disabled="isDisabled"
+                clearable
+                v-model="form.cusBrithday"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="璇烽�夋嫨鍑虹敓鏃ユ湡"
+                style="width: 93%"
+              >
+              </el-date-picker>
+            </el-form-item>
 
-            <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="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-form-item label="鑱屼笟" prop="career">
+              <el-select
+                filterable
+                :disabled="isDisabled"
+                v-model="form.career"
+                placeholder="璇疯緭鍏ヨ亴涓�"
+              >
+                <el-option
+                  v-for="dict in dict.type.dict_job"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
 
-            <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="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-form-item label="閭" prop="cusEmail">
+              <el-input
+                v-model="form.cusEmail"
+                placeholder="璇疯緭鍏ラ偖绠�"
+                :disabled="isDisabled"
+              />
+            </el-form-item>
+
+            <el-form-item label="骞撮緞  " prop="age">
+              <el-input
+                v-model="form.age"
+                :disabled="isDisabled"
+                style="width: 30%"
+              />
+              <el-select
+                :disabled="isDisabled"
+                v-model="form.ageUnit"
+                style="width: 20%"
+              >
+                <el-option
+                  v-for="dict in dict.type.dict_ageunit"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+
+            <!-- <el-form-item prop="ageUnit">
+              
+              </el-form-item> -->
+          </el-form>
+          <el-form
+            :inline="true"
+            ref="form"
+            :model="form"
+            :rules="rules"
+            :label-position="labelPosition"
+            label-width="106px"
+            v-show="top"
+          >
+            <el-form-item label="浠嬬粛浜�" prop="cusIntroduce">
+              <el-input
+                :disabled="isDisabled"
+                v-model="form.cusIntroduce"
+                placeholder="璇疯緭鍏ヤ粙缁嶄汉"
+              />
+            </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-input
+                :disabled="isDisabled"
+                v-model="form.wenHua"
+                placeholder="璇疯緭鍏ユ枃鍖栫▼搴�"
+              />
+            </el-form-item>
+          </el-form>
+          <el-form
+            ref="form"
+            :model="form"
+            :rules="rules"
+            :label-position="labelPosition"
+            label-width="106px"
+            v-show="top"
+          >
+            <el-row :gutter="21">
+              <el-col :span="19">
+                <el-form-item label="鎴峰彛鍦板潃" prop="addr">
+                  <el-input
+                    v-model="form.addr"
+                    placeholder="璇疯緭鍏ユ埛鍙e湴鍧�"
+                    :disabled="isDisabled"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+
+          <el-form
+            ref="form"
+            :model="form"
+            :rules="rules"
+            :label-position="labelPosition"
+            label-width="106px"
+            v-show="top"
+          >
+            <el-row :gutter="21">
+              <el-col :span="19">
+                <el-form-item label="鐜颁綇鍦板潃" prop="cusAddr">
+                  <el-input
+                    v-model="form.cusAddr"
+                    placeholder="璇疯緭鍏ョ幇灞呬綇鍦板潃"
+                    :disabled="isDisabled"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+
+          <el-row v-show="top">
+            <el-col :span="19">
+              <div style="float: right; margin-bottom: 10px">
+                <el-button
+                  v-show="lishi"
+                  type="primary"
+                  @click="cope"
+                  size="mini"
+                  >涓�閿鍒�</el-button
+                >
+                <el-button
+                  type="primary"
+                  @click="inputChanges"
+                  v-show="lishi"
+                  size="mini"
+                  :disabled="confirm"
+                  >鍘嗗彶浣撴璁板綍</el-button
+                >
+                <el-button
+                  :disabled="isDisabled"
+                  type="primary"
+                  size="mini"
+                  @click="submitForm"
+                  >鐧昏</el-button
+                >
+                <el-button
+                  icon="el-icon-refresh"
+                  size="mini"
+                  @click="resetQuery"
+                  @queryTable="getList"
+                  >閲嶇疆</el-button
+                >
+              </div>
             </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-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 v-show="top">
+        </div>
+      </el-col>
+      <el-col :span="7" v-show="top">
         <div class="content" v-show="showHidden.mall_hasPhoto == 'Y'">
-          <div v-show="hide" style="
-              border: 1px dashed #dcdfe6;
-              width: 180px;
-              height: 180px;
-              margin-left: 5%;
-            ">
+          <div
+            v-show="hide"
+            style="border: 1px dashed #dcdfe6; width: 180px; height: 180px"
+          >
             <img v-if="imageUrl" :src="imageUrl" class="avatar" />
           </div>
           <div v-if="imgSrc" class="img_bg_camera">
-            <img style="
+            <img
+              style="
                 width: 200px;
                 height: 200px;
                 margin-left: -20px;
                 margin-top: 90px;
                 padding-top: 1px;
-              " :src="imgSrc" alt="" class="tx_img" />
+              "
+              :src="imgSrc"
+              alt=""
+              class="tx_img"
+            />
           </div>
-          <video v-show="hides" id="videoCamera" :width="videoWidth" :height="videoHeight" autoplay
-            style="margin-top: 1px"></video>
-          <canvas style="display: none" id="canvasCamera" :width="videoWidth" :height="videoHeight"></canvas>
+          <video
+            v-show="hides"
+            id="videoCamera"
+            :width="videoWidth"
+            :height="videoHeight"
+            autoplay
+            style="margin-top: 1px"
+          ></video>
+          <canvas
+            style="display: none"
+            id="canvasCamera"
+            :width="videoWidth"
+            :height="videoHeight"
+          ></canvas>
           <div class="camera_outer" style="margin-top: 10px">
-            <el-button type="primary" plain size="mini" @click="getCompetence()">鎵撳紑鎽勫儚澶�</el-button>
-            <el-button type="primary" plain size="mini" @click="setImage()">鎷嶇収</el-button><br />
+            <el-button type="primary" plain size="mini" @click="getCompetence()"
+              >鎵撳紑鎽勫儚澶�</el-button
+            >
+            <el-button type="primary" plain size="mini" @click="setImage()"
+              >鎷嶇収</el-button
+            ><br />
           </div>
         </div>
-      </div>
-    </div>
+      </el-col>
+    </el-row>
 
-    <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-dialog
+      title="閫夋嫨濂楅"
+      :visible.sync="taocan"
+      width="70%"
+      height="700px"
+      :close-on-click-modal="false"
+    >
+      <el-tabs
+        type="border-card"
+        style="height: 560px; margin: 0 10px; width: 100%"
+        v-model="activeNames"
+        @tab-click="handleClick"
+      >
+        <el-tab-pane label="濂楅" name="first">
+          <el-form
+            :model="queryParam"
+            ref="queryForm"
+            size="small"
+            :inline="true"
+            v-if="showSearch"
+            label-width="auto"
+          >
             <el-form-item label="濂楅鍚嶇О" prop="pacName">
-              <el-input v-model="queryParam.pacName" placeholder="璇疯緭鍏ュ椁愬悕绉�" clearable @keyup.enter.native="handle" />
+              <el-input
+                v-model="queryParam.pacName"
+                placeholder="璇疯緭鍏ュ椁愬悕绉�"
+                clearable
+                @keyup.enter.native="handle"
+              />
             </el-form-item>
             <el-form-item>
-              <el-button type="primary" icon="el-icon-search" size="mini" @click="handle">鏌ヨ</el-button>
+              <el-button
+                type="primary"
+                icon="el-icon-search"
+                size="mini"
+                @click="handle"
+                >鏌ヨ</el-button
+              >
               <!-- <el-button type="primary"  size="mini" @click="submit">纭</el-button> -->
             </el-form-item>
           </el-form>
           <div class="tab4">
-            <div class="grid-content bg-purple" style="margin-left: 5px; width: 98%">
-              <el-table v-loading="loading" element-loading-text="姝e湪鍔犺浇涓�..." element-loading-spinner="el-icon-loading"
-                border :data="newpacName" @selection-change="handleSelectionChange" height="450px" ref="tb"
-                style="width: 850px">
-                <el-table-column type="selection" width="40px" align="center" label="閫夋嫨" />
-                <el-table-column label="濂楅鍚嶇О" align="center" prop="pacName" width="120px" />
-                <el-table-column label="濂楅浠锋牸" align="center" prop="price" width="120px" />
-                <el-table-column label="濂楅鏄庣粏" align="center" prop="allProName" :show-overflow-tooltip="true" />
+            <div
+              class="grid-content bg-purple"
+              style="margin-left: 5px; width: 98%"
+            >
+              <el-table
+                v-loading="loading"
+                element-loading-text="姝e湪鍔犺浇涓�..."
+                element-loading-spinner="el-icon-loading"
+                border
+                :data="newpacName"
+                @selection-change="handleSelectionChange"
+                height="450px"
+                ref="tb"
+              >
+                <el-table-column
+                  type="selection"
+                  width="40px"
+                  align="center"
+                  label="閫夋嫨"
+                />
+                <el-table-column
+                  label="濂楅鍚嶇О"
+                  align="center"
+                  prop="pacName"
+                  width="120px"
+                />
+                <el-table-column
+                  label="濂楅浠锋牸"
+                  align="center"
+                  prop="price"
+                  width="120px"
+                />
+                <el-table-column
+                  label="濂楅鏄庣粏"
+                  align="center"
+                  prop="allProName"
+                  :show-overflow-tooltip="true"
+                />
                 <!-- :selectable="checkSelectable" -->
                 <!-- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
                 <template slot-scope="scope">
@@ -278,7 +507,7 @@
                     v-hasPermi="['system:package:Seach']">濂楅璇︽儏
                   </el-button>
                 </template>
-              </el-table-column> -->
+</el-table-column> -->
               </el-table>
             </div>
             <!-- <el-button
@@ -296,28 +525,152 @@
               ></el-button> -->
           </div>
         </el-tab-pane>
-        <el-tab-pane label="鍗曢」">
-          <div class="tab3">
-            <!-- <div class="tab2"> -->
-            <v-tree-transfer :treeData="treedataList" :defaultProps="{ children: 'tjProjectList', label: 'proName' }"
-              :defaultKeys="defaultKeys" @changeKeys="changeCategoryKeys" :key="datekey"></v-tree-transfer>
-            <!-- <el-tree ref="tree" :data="treedataList" show-checkbox node-key="proId" :props="defaultProps"
-                :default-expanded-keys="treeId" :default-checked-keys="treeList" @check-change="handleCurrentChecked">
+        <el-tab-pane label="鍗曢」" name="second">
+          <div class="tab8">
+            <!-- <div class="tab7">
+              <v-tree-transfer
+                :treeData="treedataList"
+                :defaultProps="{ children: 'tjProjectList', label: 'proName' }"
+                :defaultKeys="defaultKeys"
+                @changeKeys="changeCategoryKeys"
+                :key="datekey"
+              ></v-tree-transfer> -->
+            <!-- <el-tree :data="data" show-checkbox node-key="proId" :props="defaultProps" :default-checked-keys="treeList"
+                @check-change="handleCurrentChecked">
               </el-tree> -->
             <!-- </div> -->
-            <!-- <el-button
-                style="
-                  width: 20px;
-                  height: 100px;
-                  margin-left: 10px;
-                  margin-top: 20%;
-                  font-size: 10px;
-                "
-                type="primary"
-                size="mini"
-                @click="submit"
-                ><i style="font-size: 18px" class="el-icon-d-arrow-right"></i
-              ></el-button> -->
+            <el-row :gutter="20">
+              <el-col :span="6">
+                <div
+                  style="
+                    text-align: center;
+                    margin-bottom: 10px;
+                    margin-top: 10px;
+                  "
+                >
+                  椤圭洰鍒楄〃
+                </div>
+                <el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="filterText">
+                </el-input>
+                <div class="tab3">
+                  <el-tree
+                    class="filter-tree"
+                    v-loading="loading"
+                    :data="Treedata"
+                    :props="defaultProps"
+                    show-checkbox
+                    node-key="proId"
+                    @check="handleCurrentChecked"
+                    :default-checked-keys="checkedkey"
+                    :filter-node-method="filterNode"
+                    ref="tree"
+                    :render-content="renderContent"
+                  >
+                  </el-tree>
+                </div>
+              </el-col>
+              <el-col :span="6">
+                <div
+                  style="
+                    text-align: center;
+                    margin-bottom: 10px;
+                    margin-top: 10px;
+                  "
+                >
+                  鏄庣粏椤圭洰鍒楄〃
+                </div>
+                <div class="tab3">
+                  <el-tree
+                    class="filter-tree"
+                    v-loading="loading"
+                    :data="TreedataList"
+                    node-key="proId"
+                    :props="defaultProps"
+                    :filter-node-method="filterNode"
+                    show-checkbox
+                    @check-change="handleCurrentChecked1"
+                    :default-checked-keys="checkedListkey"
+                    :render-content="renderContent"
+                  >
+                  </el-tree>
+                </div>
+              </el-col>
+              <el-col :span="11">
+                <div class="grid-content bg-purple">
+                  <div
+                    style="
+                      text-align: center;
+                      margin-bottom: 10px;
+                      margin-top: 10px;
+                    "
+                  >
+                    宸查�夐」鐩垪琛�
+                  </div>
+                  <el-table
+                    :data="DataList"
+                    border
+                    style="width: 100%"
+                    height="400"
+                    :span-method="objectSpanMethod"
+                  >
+                    <el-table-column prop="propinName" label="妫�鏌ラ」鐩�">
+                    </el-table-column>
+                    <el-table-column
+                      prop="proPrice"
+                      label="鍘熶环"
+                      width="56px"
+                    ></el-table-column>
+                    <el-table-column
+                      prop="proName"
+                      label="鏄庣粏椤圭洰"
+                      width="260px"
+                    >
+                    </el-table-column>
+
+                    <el-table-column
+                      label="鎿嶄綔"
+                      align="center"
+                      fixed="right"
+                      class-name="small-padding fixed-width"
+                      width="50px"
+                    >
+                      <template slot-scope="scope">
+                        <el-button
+                          size="mini"
+                          type="text"
+                          icon="el-icon-delete"
+                          @click="handleDelete(scope.row)"
+                          title="鍒犻櫎"
+                        ></el-button>
+                      </template>
+                    </el-table-column>
+                  </el-table>
+                  <div>鍚堣锛歿{ marryall }}鍏�</div>
+                  <!-- <el-collapse v-model="activeName" accordion v-if="list1">
+                    <div>
+                      <el-collapse-item title="璇烽�夋嫨椤圭洰">
+                        <el-table
+                          :data="DataList"
+                          border
+                          style="width: 100%"
+                          height="400"
+                          :span-method="objectSpanMethod"
+                        >
+                          <el-table-column
+                            prop="proName"
+                            label="椤圭洰"
+                            width="180"
+                          >
+                          </el-table-column>
+                          <el-table-column prop="ordPrice" label="鍘熶环">
+                          </el-table-column>
+                        </el-table>
+                      </el-collapse-item>
+                    </div>
+                  </el-collapse> -->
+                </div>
+              </el-col>
+            </el-row>
           </div>
         </el-tab-pane>
       </el-tabs>
@@ -326,9 +679,9 @@
         <el-button type="primary" @click="submit">纭� 瀹�</el-button>
       </span>
     </el-dialog>
-
-    <el-row type="flex" class="row-bg" justify="space-around" v-if="tcShow">
-      <el-col>
+    <!-- -->
+    <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">
@@ -372,64 +725,156 @@
            </div> -->
 
           <template>
-            <el-form :model="form" :inline="true" label-width="75px" style="margin-left: 7px">
+            <el-form
+              :model="form"
+              :inline="true"
+              label-width="75px"
+              style="margin-left: 20px"
+            >
               <el-form-item label="浣撴绫诲瀷">
-                <el-select style="width: 100px" 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
+                  style="width: 150px"
+                  v-model="form.tjType"
+                  placeholder="璇烽�夋嫨浣撴绫诲瀷"
+                >
+                  <el-option
+                    v-for="dict in dict.type.dict_team"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  ></el-option>
                 </el-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: 126px"></el-input>
+                <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: 126px" v-model="discount" :precision="2" :step="0.1"
-                  :max="10" :min="1" @change="numberChange" :disabled="isfalse"></el-input-number>
+                <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: 126px"></el-input>
+                <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: 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
+                  v-model="getType"
+                  style="width: 150px"
+                  @change="getmailType"
+                >
+                  <el-option
+                    v-for="dict in dict.type.report_get_type"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  ></el-option>
                 </el-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
+                  style="width: 150px"
+                  v-model="tjCategory"
+                  placeholder="璇烽�夋嫨浣撴绫诲埆"
+                >
+                  <el-option
+                    v-for="dict in dict.type.dict_tjtype"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  ></el-option>
                 </el-select>
                 <!-- <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'"
-                  size="mini">绛惧埌鐧昏</el-button>
-                <el-button type="primary" @click="submitCheckinfee" :disabled="confirm"
-                  v-if="showHidden.has_charge == 'Y'" size="mini">鐧昏鏀惰垂</el-button>
+
+              <el-form-item style="margin-left: 149px">
+                <el-button
+                  type="primary"
+                  @click="Package"
+                  size="mini"
+                  style="margin-right: 20px"
+                  >閫夋嫨濂楅</el-button
+                >
+                <el-button
+                  type="primary"
+                  @click="resetpackage"
+                  size="mini"
+                  style="margin-right: 20px"
+                  >閲嶇疆濂楅</el-button
+                >
+                <el-button
+                  type="primary"
+                  @click="submitPrice"
+                  :disabled="confirm"
+                  v-if="showHidden.has_charge == 'N'"
+                  size="mini"
+                  >绛惧埌鐧昏</el-button
+                >
+                <el-button
+                  type="primary"
+                  @click="submitCheckinfee"
+                  :disabled="confirm"
+                  v-if="showHidden.has_charge == 'Y'"
+                  size="mini"
+                  >鐧昏鏀惰垂</el-button
+                >
               </el-form-item>
               <!-- </el-form> -->
               <!-- </div> -->
             </el-form>
           </template>
 
-          <el-dialog title="閭瘎" :visible.sync="malldisble" :close-on-click-modal="false">
-            <el-form :model="addAddress" :rules="rules" label-width="78px" style="margin-left: 7px">
+          <el-dialog
+            title="閭瘎"
+            :visible.sync="malldisble"
+            :close-on-click-modal="false"
+          >
+            <el-form
+              :model="addAddress"
+              :rules="rules"
+              label-width="78px"
+              style="margin-left: 7px"
+            >
               <el-form-item label="濮撳悕">
-                <el-input placeholder="濮撳悕" v-model="addAddress.getUser"></el-input>
+                <el-input
+                  placeholder="濮撳悕"
+                  v-model="addAddress.getUser"
+                ></el-input>
               </el-form-item>
               <el-form-item label="鐢佃瘽">
-                <el-input placeholder="鐢佃瘽" v-model="addAddress.phone"></el-input>
+                <el-input
+                  placeholder="鐢佃瘽"
+                  v-model="addAddress.phone"
+                ></el-input>
               </el-form-item>
               <el-form-item label="鍦板潃">
-                <el-input placeholder="鍦板潃" v-model="addAddress.address"></el-input>
+                <el-input
+                  placeholder="鍦板潃"
+                  v-model="addAddress.address"
+                ></el-input>
               </el-form-item>
             </el-form>
             <div slot="footer" class="dialog-footer">
@@ -441,16 +886,22 @@
           <div style="text-align: center; margin-bottom: 10px">
             宸查�夐」鐩垪琛�
           </div>
-          <div style="
+          <div
+            style="
               padding: 0px 6px;
               border: 1px solid #e6ebf5;
               max-height: 420px;
               overflow: auto;
-              width: 980px;
+              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">
+              <div
+                class="info1"
+                v-for="(item, index) in tableData1"
+                :key="'info1-' + index"
+              >
                 <el-collapse-item :name="index">
                   <template slot="title">
                     {{
@@ -464,15 +915,32 @@
                       "鍏�)"
                     }}
                   </template>
-                  <el-table :data="item.list" border style="width: 100%" height="270">
+                  <el-button
+                    type="primary"
+                    @click="candelete(item)"
+                    style="margin: 5px"
+                    >鍒� 闄�</el-button
+                  >
+                  <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 == ''">
+                      <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" />
+                        <dict-tag
+                          :options="dict.type.sys_user_sex"
+                          :value="scope.row.proType"
+                        />
                       </template>
                     </el-table-column>
                     <el-table-column prop="ordPrice" label="搴旀敹閲戦">
@@ -481,7 +949,10 @@
                     </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" />
+                        <dict-tag
+                          :options="dict.type.sys_yes_no"
+                          :value="scope.row.proCheckMethod"
+                        />
                       </template>
                     </el-table-column>
                   </el-table>
@@ -490,7 +961,12 @@
             </el-collapse>
 
             <div v-if="list2 == true">
-              <el-table :data="tableData1" border style="width: 100%" height="250">
+              <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">
@@ -498,7 +974,10 @@
                     {{ scope.row.proType == "" ? "鍏ㄩ儴" : "" }}
                   </template>
                   <template slot-scope="scope" v-else>
-                    <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.proType" />
+                    <dict-tag
+                      :options="dict.type.sys_user_sex"
+                      :value="scope.row.proType"
+                    />
                   </template>
                 </el-table-column>
                 <el-table-column prop="ysPrice" label="搴旀敹閲戦">
@@ -507,7 +986,10 @@
                 </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" />
+                    <dict-tag
+                      :options="dict.type.sys_yes_no"
+                      :value="scope.row.proCheckMethod"
+                    />
                   </template>
                 </el-table-column>
               </el-table>
@@ -520,11 +1002,17 @@
                     <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 == ''">
+                      <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" />
+                        <dict-tag
+                          :options="dict.type.sys_user_sex"
+                          :value="scope.row.proType"
+                        />
                       </template>
                     </el-table-column>
                     <el-table-column prop="ordPrice" label="搴旀敹閲戦">
@@ -533,7 +1021,10 @@
                     </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" />
+                        <dict-tag
+                          :options="dict.type.sys_yes_no"
+                          :value="scope.row.proCheckMethod"
+                        />
                       </template>
                     </el-table-column>
                   </el-table>
@@ -545,63 +1036,163 @@
       </el-col>
     </el-row>
 
-    <el-dialog title="瀵兼鍗曢瑙�" :visible.sync="dialogVisibles" :close-on-click-modal="false">
+    <el-dialog
+      title="瀵兼鍗曢瑙�"
+      :visible.sync="dialogVisibles"
+      :close-on-click-modal="false"
+    >
       <div class="main">
-        <iframe id="printIframe" :src="url" frameborder="0" style="width: 100%; height: 100%"></iframe>
+        <iframe
+          id="printIframe"
+          :src="url"
+          frameborder="0"
+          style="width: 100%; height: 100%"
+        ></iframe>
       </div>
     </el-dialog>
 
     <el-dialog title="鏀惰垂" :visible.sync="charge" width="59%" height="700px">
       <div>
-        <el-table id="sig" v-loading="loading" :data="feeitems" @selection-change="handleSelect" tooltip-effect="dark"
-          ref="multipleTable" border>
+        <el-table
+          id="sig"
+          v-loading="loading"
+          :data="feeitems"
+          @selection-change="handleSelect"
+          tooltip-effect="dark"
+          ref="multipleTable"
+          border
+        >
           <el-table-column type="selection" width="55" align="center" />
-          <el-table-column label="濮撳悕" align="center" prop="tjName" width="100px" />
+          <el-table-column
+            label="濮撳悕"
+            align="center"
+            prop="tjName"
+            width="100px"
+          />
           <el-table-column label="鎬у埆" align="center" prop="sex" width="90px">
             <template slot-scope="scope">
-              <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex" />
+              <dict-tag
+                :options="dict.type.sys_user_sex"
+                :value="scope.row.sex"
+              />
             </template>
           </el-table-column>
-          <el-table-column label="韬唤璇�" align="center" prop="idCard" width="150px"
-            :show-overflow-tooltip="true"></el-table-column>
-          <el-table-column label="鎵嬫満鍙�" align="center" prop="tjPhone" width="120px"
-            :show-overflow-tooltip="true"></el-table-column>
-          <el-table-column label="浣撴鍙�" align="center" prop="tjNumber" width="160px" />
-          <el-table-column label="鐧昏鏃堕棿" align="center" prop="tjFlowingWater.createTime"
-            :show-overflow-tooltip="true"></el-table-column>
-          <el-table-column label="鍗曚綅鍚嶇О" align="center" prop="tjComp"></el-table-column>
-          <el-table-column label="浣撴绫诲瀷" align="center" prop="tjType" width="80px">
+          <el-table-column
+            label="韬唤璇�"
+            align="center"
+            prop="idCard"
+            width="150px"
+            :show-overflow-tooltip="true"
+          ></el-table-column>
+          <el-table-column
+            label="鎵嬫満鍙�"
+            align="center"
+            prop="tjPhone"
+            width="120px"
+            :show-overflow-tooltip="true"
+          ></el-table-column>
+          <el-table-column
+            label="浣撴鍙�"
+            align="center"
+            prop="tjNumber"
+            width="160px"
+          />
+          <el-table-column
+            label="鐧昏鏃堕棿"
+            align="center"
+            prop="tjFlowingWater.createTime"
+            :show-overflow-tooltip="true"
+          ></el-table-column>
+          <el-table-column
+            label="鍗曚綅鍚嶇О"
+            align="center"
+            prop="tjComp"
+          ></el-table-column>
+          <el-table-column
+            label="浣撴绫诲瀷"
+            align="center"
+            prop="tjType"
+            width="80px"
+          >
             <template slot-scope="scope">
-              <dict-tag :options="dict.type.dict_team" :value="scope.row.tjType" />
+              <dict-tag
+                :options="dict.type.dict_team"
+                :value="scope.row.tjType"
+              />
             </template>
           </el-table-column>
-          <el-table-column label="璁㈠崟娴佹按鍙�" align="center" prop="tjFlowingWater.waterId" width="200px" />
-          <el-table-column label="鏀惰垂鍛�" align="center" prop="tjFlowingWater.updateBy" width="100px" />
+          <el-table-column
+            label="璁㈠崟娴佹按鍙�"
+            align="center"
+            prop="tjFlowingWater.waterId"
+            width="200px"
+          />
+          <el-table-column
+            label="鏀惰垂鍛�"
+            align="center"
+            prop="tjFlowingWater.updateBy"
+            width="100px"
+          />
         </el-table>
 
         <el-row :gutter="10" class="mb8">
           <el-col :span="20">
-            <el-form :inline="true" :model="formInline" class="demo-form-inline" style="margin: 12px 6px">
+            <el-form
+              :inline="true"
+              :model="formInline"
+              class="demo-form-inline"
+              style="margin: 12px 6px"
+            >
               <el-form-item label="搴旀敹閲戦">
-                <el-input style="width: 86px" :value="formInline.price + '.00'" placeholder="閲戦"
-                  :disabled="true"></el-input>
+                <el-input
+                  style="width: 86px"
+                  :value="formInline.price + '.00'"
+                  placeholder="閲戦"
+                  :disabled="true"
+                ></el-input>
               </el-form-item>
               <el-form-item label="浼樻儬">
-                <el-input-number style="width: 140px" v-model="discount" :precision="2" :step="0.1" :max="10" :min="1"
-                  @change="numberChange" :disabled="isfalse"></el-input-number>
+                <el-input-number
+                  style="width: 140px"
+                  v-model="discount"
+                  :precision="2"
+                  :step="0.1"
+                  :max="10"
+                  :min="1"
+                  @change="numberChange"
+                  :disabled="isfalse"
+                ></el-input-number>
               </el-form-item>
               <el-form-item label="瀹炴敹閲戦">
-                <el-input v-model="formInline.paidIn" placeholder="瀹炰粯" style="width: 94px">
+                <el-input
+                  v-model="formInline.paidIn"
+                  placeholder="瀹炰粯"
+                  style="width: 94px"
+                >
                 </el-input>
               </el-form-item>
               <el-form-item label="浠樻绫诲瀷" prop="payType">
-                <el-select style="width: 120px" v-model="formInline.payType" placeholder="璇烽�夋嫨浠樻绫诲瀷">
-                  <el-option v-for="dict in dict.type.dict_pay_type" :key="dict.value" :label="dict.label"
-                    :value="dict.value"></el-option>
+                <el-select
+                  style="width: 120px"
+                  v-model="formInline.payType"
+                  placeholder="璇烽�夋嫨浠樻绫诲瀷"
+                >
+                  <el-option
+                    v-for="dict in dict.type.dict_pay_type"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  ></el-option>
                 </el-select>
               </el-form-item>
               <el-form-item>
-                <el-button style="margin-left: 15px" type="primary" size="mini" @click="SubmitEvent">鏀惰垂</el-button>
+                <el-button
+                  style="margin-left: 15px"
+                  type="primary"
+                  size="mini"
+                  @click="SubmitEvent"
+                  >鏀惰垂</el-button
+                >
               </el-form-item>
             </el-form>
           </el-col>
@@ -616,7 +1207,11 @@
       </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
+        id="printBill"
+        style="width: 280px; font-size: 1px"
+        ref="printContent"
+      >
         <div style="font-size: 1px">
           <div style="text-align: center">
             <h3>{{ hospName }}灏忕エ</h3>
@@ -646,7 +1241,12 @@
       </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%"
+      :before-close="handleClose"
+    >
       <span>鏄惁澶嶅埗鏈�杩戜竴娆$殑浣撴椤圭洰锛�</span>
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisiblese = false">鍙� 娑�</el-button>
@@ -672,13 +1272,17 @@
   deptTreeSelect,
   projectGetList,
   getOrder,
+  getProParentIdDxList,
+  getProSonDxList,
   getCusIdcard,
   getPackageListName,
   getaddtTransition,
   getTransitionList,
   getByTeamNo,
+  delTbBycusCardIdAndProId,
   getLoadFile,
-  getIsRequired, getconfigKey,
+  getIsRequired,
+  getconfigKey,
   getHistryTjOrderProByCusIdCard,
 } from "@/api/system/tijian";
 import Packages from "@/components/Packages";
@@ -703,10 +1307,11 @@
   components: {
     VTreeTransfer,
     historyTj,
-    Packages
+    Packages,
   },
   data() {
     return {
+      filterText: "",
       proIdList: [],
       tableDatas: [],
       dialogVisiblese: false,
@@ -725,6 +1330,7 @@
         },
       ],
       isNow: 1,
+      marryall: 0,
       treeId: [],
       treeList: [],
       defaultKeys: [],
@@ -829,10 +1435,15 @@
       proIds: [],
       // 鏄剧ず鎼滅储鏉′欢
       showSearch: true,
+      activeNames: "first",
       // 鏍戠姸褰㈢姸
+      Treedata: [],
+      TreedataList: [],
       treedataList: [],
+      checkedkey: [],
+      checkedListkey: [],
       defaultProps: {
-        children: "tjProjectList",
+        children: [],
         label: "proName",
       },
       formPacId: "",
@@ -888,32 +1499,29 @@
       // 琛ㄥ崟鏍¢獙
       rules: {
         cusName: [{ required: true, message: "", trigger: "blur" }],
-        cusSex: [
-          { required: true, message: "", trigger: "change" },
-        ],
+        cusSex: [{ required: true, message: "", trigger: "change" }],
         address: [{ required: true, message: "", trigger: "blur" }],
         phone: [{ required: true, message: "", trigger: "blur" }],
-        cusPhone: [
-          { required: true, message: "", trigger: "change" },
-        ],
-         cusBrithday: [
-          { required: true, message: "", trigger: "change" },
-        ],
+        cusPhone: [{ required: true, message: "", trigger: "change" }],
+        cusBrithday: [{ required: true, message: "", trigger: "change" }],
         // cusNational: [
         //   { required: true, message: "姘戞棌涓嶈兘涓虹┖", trigger: "change" },
         // ],
-        cusIdcard: [
-          { required: true, message: "", trigger: "change" },
-        ],
+        cusIdcard: [{ required: true, message: "", trigger: "change" }],
       },
     };
+  },
+  watch: {
+    filterText(val) {
+      this.$refs.tree.filter(val);
+    },
   },
   created() {
     this.getCurrentDateTime();
 
     this.startTimer();
     this.getList1();
-    this.getData();
+    // this.getData();
   },
   methods: {
     getCurrentDateTime() {
@@ -945,7 +1553,10 @@
         this.getCurrentDateTime();
       }, 1000); //姣忕閽熸洿鏂颁竴娆�
     },
-
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.proName.indexOf(value) !== -1;
+    },
     beforeDestroy() {
       clearInterval(this.timer);
     }, //娓呴櫎瀹氭椂鍣紝浠ラ伩鍏嶅唴瀛樻硠闇层��
@@ -988,8 +1599,8 @@
             d.getFullYear() -
             birthdays.getFullYear() -
             (d.getMonth() < birthdays.getMonth() ||
-              (d.getMonth() == birthdays.getMonth() &&
-                d.getDate() < birthdays.getDate())
+            (d.getMonth() == birthdays.getMonth() &&
+              d.getDate() < birthdays.getDate())
               ? 1
               : 0);
           this.form.cusSex = sex;
@@ -1010,6 +1621,47 @@
     },
     inputChanges() {
       this.$refs.historyTj.getlist();
+    },
+
+    candelete(item) {
+      let data = {
+        cusCardId: this.form.cusIdcard,
+        proId: item.proPrantId,
+      };
+      delTbBycusCardIdAndProId(data).then((res) => {});
+      getTransitionList(this.form.cusIdcard).then((response) => {
+        this.tableData1 = response.data;
+        this.TotalPrice1 = 0;
+        if (this.tableData1) {
+          this.tableData1.forEach((item) => {
+            this.TotalPrice1 += item.nowPrice;
+            if (item.pacName === null) {
+              item.pacName = "鍗曢」";
+            }
+            if (item.pacName == "鍗曢」") {
+              item.list.forEach((item9) => {
+                this.treeList.push(item9.proId);
+              });
+            }
+            this.pacName = item.pacName;
+          });
+
+          const r = /^\+?[0-9][0-9]*$/; //姝f暣鏁帮紙鍙互0鎵撳ご锛�
+          let TotalPrice = this.TotalPrice1 * (this.discount / 10);
+          if (r.test(TotalPrice)) {
+            this.TotalPrice = TotalPrice + ".00";
+          } else {
+            this.TotalPrice = TotalPrice;
+          }
+
+          this.list1 = false;
+          this.list3 = true;
+        } else {
+          this.list1 = true;
+
+          this.TotalPrice = "0.00";
+        }
+      });
     },
     cope() {
       this.tcShow = true;
@@ -1041,7 +1693,6 @@
             } else {
               item.list.forEach((items) => {
                 _this.proIdList.push(items.proId);
-                console.log(_this.pacId, 888);
               });
             }
           });
@@ -1059,7 +1710,6 @@
             this.proIds = [];
             getTransitionList(cusId).then((response) => {
               this.tableData1 = response.data;
-              console.log(this.tableData1);
               this.TotalPrice1 = 0;
               if (this.tableData1) {
                 this.tableData1.forEach((item) => {
@@ -1154,7 +1804,7 @@
             _this.thisVideo.play();
           };
         })
-        .catch((err) => { });
+        .catch((err) => {});
     },
     //  缁樺埗鍥剧墖锛堟媿鐓у姛鑳斤級
 
@@ -1208,12 +1858,11 @@
         .then((_) => {
           done();
         })
-        .catch((_) => { });
+        .catch((_) => {});
     },
 
     /** 鏌ヨ淇℃伅鍒楄〃 */
     getList() {
-      this.loading = true;
       // listCustomer(this.queryParams).then((response) => {
       //   this.customerList = response.rows;
       //   this.total = response.total;
@@ -1289,7 +1938,7 @@
               pacId: "",
               proIds: [],
             };
-            getaddtTransition(data).then((response) => { });
+            getaddtTransition(data).then((response) => {});
             this.$tab.refreshPage();
           });
         } else {
@@ -1380,6 +2029,7 @@
                   if (this.tableData1) {
                     this.tableData1.forEach((item) => {
                       this.TotalPrice1 += item.ysPrice;
+                      console.log(this.TotalPrice1);
                       this.TotalPrice = (
                         this.TotalPrice1 *
                         (this.discount / 10)
@@ -1445,8 +2095,8 @@
         //   this.$message.error("姝ょ敤鎴蜂笉瀛樺湪");
         // });
       } else {
-        let configKey = "getInfoFromSqlData"
-        getconfigKey(configKey).then(res => {
+        let configKey = "getInfoFromSqlData";
+        getconfigKey(configKey).then((res) => {
           if (res.code == 200) {
             if (res.msg == "N") {
               var websocket = null;
@@ -1512,7 +2162,8 @@
                     _this.form.cusAddr = resultObj.resultContent.certAddress;
                     _this.form.cusIdcard = resultObj.resultContent.certNumber;
                     _this.imageUrl =
-                      "data:image/jpeg;base64," + resultObj.resultContent.identityPic;
+                      "data:image/jpeg;base64," +
+                      resultObj.resultContent.identityPic;
                     if (
                       resultObj.name == "readCert" ||
                       resultObj.name == "PushWithImg"
@@ -1544,27 +2195,25 @@
               websocket.onclose = function () {
                 alert("璇诲崱鍣ㄨ繛鎺ュ叧闂�");
               };
-            } else  if (res.msg == "Y"){
+            } else if (res.msg == "Y") {
               this.$refs.aaa.open = true;
               this.$refs.aaa.getAllList();
               this.$refs.aaa.title = "璇佷欢瀛楀吀";
             }
           }
-        })
-
+        });
       }
     },
 
     handleChanges(param1) {
-      if(this.form.pacCode == "涓嶈"){
+      if (this.form.pacCode == "涓嶈") {
         this.form.cusIdcard = param1[0].xh;
-      }else{
+      } else {
         this.form.cusIdcard = param1[0].pacCode;
       }
-      
+
       // this.form.cusName = param1[0].pacName;
       // this.form.cusPhone = param1[0].pacRemark;
-     
     },
 
     // selected(row, index) {
@@ -1609,7 +2258,6 @@
     },
 
     cancell() {
-      console.log(this.addAddress.address);
       if (this.addAddress.address) {
         this.malldisble = false;
       } else {
@@ -1635,63 +2283,95 @@
     },
 
     // 鐐瑰嚮澶氶�夋鑾峰彇閫変腑鏁版嵁
-    handleSelectionChange(selection, row) {
-      this.tableData = selection;
-      if (selection.length > 1) {
-        let del_row = selection.shift();
-        this.$refs.tb.toggleRowSelection(del_row, false); //璁剧疆杩欎竴琛屽彇娑堥�変腑
+    // handleSelectionChange(selection, row) {
+    //   this.tableData = selection;
+    //   if (selection.length > 1) {
+    //     let del_row = selection.shift();
+    //     this.$refs.tb.toggleRowSelection(del_row, false); //璁剧疆杩欎竴琛屽彇娑堥�変腑
+    //   }
+    // this.single = selection.length !== 1;
+    // this.multiple = !selection.length;
+    // this.tableData.forEach((item) => {
+    //   this.fData = item.tjProjectList;
+    // });
+    // if (selection[0]) {
+    //   this.DataList = [];
+    // this.data = JSON.parse(JSON.stringify(this.dXData));
+    //     if (selection[0].tjProjectList) {
+    //       selection[0].tjProjectList.forEach((selectionitem) => {
+    //         this.treedataList.forEach((item) => {
+    //           if (selectionitem.proName == item.proName) {
+    //             item.disabled = true;
+    //             item.tjProjectList = [];
+    //           }
+    //           if (item.tjProjectList) {
+    //             item.tjProjectList.forEach((item1) => {
+    //               if (selectionitem.proName == item1.proName) {
+    //                 item1.disabled = true;
+    //                 item1.tjProjectList = [];
+    //               }
+    //               if (item1.tjProjectList) {
+    //                 item1.tjProjectList.forEach((item2) => {
+    //                   if (selectionitem.proName == item2.proName) {
+    //                     item2.disabled = true;
+    //                     item2.tjProjectList = [];
+    //                   }
+    //                 });
+    //               }
+    //             });
+    //           }
+    //         });
+    //       });
+    //     }
+    //   } else {
+    //     this.treedataList = JSON.parse(JSON.stringify(this.dXData));
+    //     return;
+    //   }
+    // },
+
+    resetpackage() {
+      if (this.form.cusIdcard) {
+        var cusId = this.form.cusIdcard;
+      } else {
+        this.$message.warning("璇峰厛濉啓淇℃伅锛屽啀閫変綋妫�鍐呭");
       }
-      // this.single = selection.length !== 1;
-      // this.multiple = !selection.length;
-      // 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));
-        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 = [];
-                      }
-                    });
-                  }
-                });
-              }
-            });
+      let _this = this;
+      _this.pacId = "";
+      this.proIds = [];
+      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.length >= 1) {
+              this.list1 = false;
+              this.list3 = true;
+            } else {
+              this.list1 = true;
+
+              this.TotalPrice = "0.00";
+            }
           });
         }
-      } else {
-        this.treedataList = JSON.parse(JSON.stringify(this.dXData));
-        return;
-      }
+      });
     },
 
     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;
-        console.log(this.newpacName)
-        console.log(this.tableData1)
         try {
           if (this.tableData1.length >= 1) {
             this.newpacName.forEach((item3) => {
@@ -1707,48 +2387,219 @@
               });
             });
           }
-
-        } catch (error) { }
+        } catch (error) {}
         this.loading = false;
       });
-      this.getData();
+      // this.getData();
     },
 
-    // checkSelectable(row, index) {
-    //   if (!row) { return }
-    //   if (this.tableData1) {
-    //     if (this.tableData1.length != 0){
-    //       for (let j = 0; j < this.tableData1.length; j++) {
-    //         for (let i = 0; i < row.tjProjectList.length; i++) {
-    //           if (this.tableData1[j].pacName == "鍗曢」") {
-    //             if (row.tjProjectList[i].proName === this.tableData1[j].parentName) {
-    //               return false
-    //             }
-    //           }
-    //         }
-    //         return true
-    //       }
-    //     }
-    //   } else {
-    //     return true
-    //   }
-    // },
+    // 鐐瑰嚮澶氶�夋鑾峰彇閫変腑鏁版嵁
+    handleSelectionChange(selection, row) {
+      this.tableData = selection;
+      if (selection.length > 1) {
+        let del_row = selection.shift();
+        this.$refs.tb.toggleRowSelection(del_row, false); //璁剧疆杩欎竴琛屽彇娑堥�変腑
+      }
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+      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;
+            }
+          });
+        });
+      } else {
+        this.treedataList = JSON.parse(JSON.stringify(this.dXData));
+        return;
+      }
+    },
+    handleClick(tab, event) {
+      console.log(tab, event);
+      if (tab.label == "鍗曢」") {
+        this.DataList = [];
+        this.getDataList();
+      }
+    },
+    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) => {
+              if (selectionitem.proId == item.proId) {
+                item.disabled = true;
+              }
+            });
+          });
+        }
+        this.checkedkey.push(this.Treedata[0].proId);
+        let proId = this.Treedata[0].proId;
+        getProSonDxList(proId).then((res) => {
+          this.TreedataList = res.data.list;
+          this.TreedataList.forEach((item) => {
+            this.checkedListkey.push(item.proId);
+            this.DataList.push(item);
+            this.DataList.forEach((item) => {
+              item.propinName = this.Treedata[0].proName;
+            });
+          });
+          this.TotalPrice1 = 0;
+          this.marryall = 0;
+          if (this.DataList.length != 0) {
+            this.list1 = false;
+            this.DataList.forEach((item) => {
+              this.TotalPrice1 = item.proPrice + this.TotalPrice1;
+              this.marryall += item.proPrice;
+            });
+          }
+        });
+        this.loading = false;
+      });
+    },
 
     // 鐐瑰嚮鑾峰彇姣忎釜鏍戣妭鐐�
     handleCurrentChecked(data, checked, checkedNodes) {
-      if (checked === true) {
-        this.DataList.push(data);
-      } else {
-        this.DataList.pop(data);
-      }
-
-      this.proIds = [];
-      if (this.DataList.length != 0) {
-        this.DataList.forEach((item) => {
-          this.proIds.push(item.proId);
+      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) => {
+              if (item1.proParentId == data.proId) {
+                item1.propinName = data.proName;
+              }
+            });
+          });
+          this.TotalPrice1 = 0;
+          this.marryall = 0;
+          if (this.DataList.length != 0) {
+            this.list1 = false;
+            this.DataList.forEach((item) => {
+              // this.TotalPrice1 = item.proPrice + this.TotalPrice1;
+              this.marryall += item.proPrice;
+            });
+          }
         });
-      } else {
-        this.proIds = [];
+      } else if (checked.checkedNodes.length == 0) {
+        let proId = data.proId;
+        getProSonDxList(proId).then((res) => {
+          this.TreedataList = res.data.list;
+          this.checkedListkey = [];
+        });
+      }
+    },
+
+    spliceData() {
+      for (var i = 0; i < this.DataList.length; i++) {
+        for (var j = i + 1; j < this.DataList.length; j++) {
+          if (this.DataList[i].proId == this.DataList[j].proId) {
+            //濡傛灉绗竴涓瓑浜庣浜屼釜锛宻plice鏂规硶鍒犻櫎绗簩涓�
+            this.DataList.splice(j, 1);
+            j--;
+          }
+        }
+      }
+      return this.DataList;
+    },
+
+    renderContent(h, { node, data, store }) {
+      return (
+        <span class="custom-tree-node">
+          聽 <span>{node.label}</span>
+          <span>({data.proPrice}鍏�)</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.marryall = 0;
+            this.DataList.forEach((item1) => {
+              this.marryall += item1.proPrice;
+            });
+          }
+        });
+      } else if (checked == true) {
+        this.DataList.push(data);
+        this.DataList.forEach((item1) => {
+          if (item1.proParentId == this.dataObj.proId) {
+            item1.propinName = this.dataObj.proName;
+          }
+        });
+        this.spliceData();
+        this.marryall = 0;
+        this.DataList.forEach((item1) => {
+          this.marryall += item1.proPrice;
+        });
+      }
+    },
+
+    /** 鍒犻櫎鎸夐挳鎿嶄綔 */
+    handleDelete(row) {
+      this.DataList.forEach((item, index) => {
+        if (item.proId == row.proId) {
+          this.DataList.splice(index, 1);
+          this.marryall = 0;
+          this.DataList.forEach((item1) => {
+            this.marryall += item1.proPrice;
+          });
+        }
+      });
+    },
+    //  // 榛樿鎺ュ彈鍥涗釜鍊� { 褰撳墠琛岀殑鍊�, 褰撳墠鍒楃殑鍊�, 琛岀殑涓嬫爣, 鍒楃殑涓嬫爣 }
+    objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+      console.log(row, column, rowIndex, columnIndex);
+      let fields = ["propinName"];
+      let cellValue = row[column.property];
+      if (cellValue && fields.includes(column.property)) {
+        let prevRow = this.DataList[rowIndex - 1];
+        let nextRow = this.DataList[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.DataList[++countRowspan + rowIndex];
+          }
+          if (countRowspan > 1) {
+            return { rowspan: countRowspan, colspan: 1 };
+          }
+        }
       }
     },
 
@@ -1768,6 +2619,12 @@
       } else {
         _this.pacId = "";
       }
+      this.proIds = [];
+      if (this.DataList.length != 0) {
+        this.DataList.forEach((item) => {
+          this.proIds.push(item.proId);
+        });
+      }
       let data = {
         cusId,
         pacId: _this.pacId,
@@ -1779,7 +2636,6 @@
           this.proIds = [];
           getTransitionList(cusId).then((response) => {
             this.tableData1 = response.data;
-            console.log(this.tableData1);
             this.TotalPrice1 = 0;
             if (this.tableData1) {
               this.tableData1.forEach((item) => {
@@ -1816,117 +2672,120 @@
       this.taocan = false;
       this.defaultKeys = [];
     },
-    changeCategoryKeys(val) {
-      this.proIds = [];
-      this.proIds = val;
-      // if (this.DataList.length != 0) {
-      //   this.DataList.forEach((item) => {
-      //     this.proIds.push(item.proId);
-      //   });
-      // } else {
-      //   this.proIds = [];
-      // }
-    },
+    // 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;
-      let List = _this.tableData1; //鍗曚釜椤圭洰淇℃伅
-      if (this.responseList.cusId) {
-        var userId = this.responseList.cusId;
-      } else {
-        var userId = _this.form.cusId;
-      }
-      let tjType = _this.form.tjType;
-      if (this.tableData[0]) {
-        var pacId = this.tableData[0].pacId;
-      }
-
-      //tjOrderList//杩欎釜鏄鐞嗗畬鐨勬瘡涓�椤瑰椁愪俊鎭�
-      List.forEach((item) => {
-        if (item.list) {
-          item.list.forEach((item1) => {
-            this.tjOrderList.push({
-              proName: item1.proName,
-              proPrice: item1.nowPrice,
-              proId: item1.proId,
-            });
-          });
-        } else if (item.tjProjectList) {
-          item.tjProjectList.forEach((item1) => {
-            this.tjOrderList.push({
-              proName: item1.proName,
-              proPrice: item1.priceNow,
-              proId: item1.proId,
-            });
-          });
+      if (_this.tjCategory !== "") {
+        let List = _this.tableData1; //鍗曚釜椤圭洰淇℃伅
+        if (this.responseList.cusId) {
+          var userId = this.responseList.cusId;
         } else {
-          this.tjOrderList.push({
-            proName: item.proName,
-            proPrice: item.ysPrice,
-            proId: item.proId,
-          });
+          var userId = _this.form.cusId;
         }
-      });
-      let copeWith = this.TotalPrice1;
-      let paidIn = this.TotalPrice.toString();
-      let discount = this.discount;
-      this.tjFlowingWater = { copeWith, paidIn, discount };
+        let tjType = _this.form.tjType;
+        if (this.tableData[0]) {
+          var pacId = this.tableData[0].pacId;
+        }
 
-      let data;
-      if (pacId || this.getType == "2") {
-        data = {
-          photo: this.srcUrl,
-          pacId,
-          tjOrderList: this.tjOrderList,
-          tjFlowingWater: this.tjFlowingWater,
-          userId,
-          tjType,
-          getType: this.getType,
-          addAddress: this.addAddress,
-          tjCategory: this.tjCategory,
-        };
-      } else {
-        data = {
-          photo: this.srcUrl,
-          tjOrderList: this.tjOrderList,
-          tjFlowingWater: this.tjFlowingWater,
-          userId,
-          tjType,
-          getType: this.getType,
-          tjCategory: this.tjCategory,
-        };
-      }
-      getOrder(data).then((res) => {
-        this.$modal.msgSuccess("鎻愪氦鎴愬姛");
-        this.tjNumbers = res.msg;
-        this.charge = true;
-        let data = {
-          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
-                );
+        //tjOrderList//杩欎釜鏄鐞嗗畬鐨勬瘡涓�椤瑰椁愪俊鎭�
+        List.forEach((item) => {
+          if (item.list) {
+            item.list.forEach((item1) => {
+              this.tjOrderList.push({
+                proName: item1.proName,
+                proPrice: item1.nowPrice,
+                proId: item1.proId,
               });
-            } else {
-              this.$refs.multipleTable.clearSelection();
-            }
-            this.loading = false;
+            });
+          } else if (item.tjProjectList) {
+            item.tjProjectList.forEach((item1) => {
+              this.tjOrderList.push({
+                proName: item1.proName,
+                proPrice: item1.priceNow,
+                proId: item1.proId,
+              });
+            });
           } else {
-            this.feeitems = [];
-            this.loading = false;
+            this.tjOrderList.push({
+              proName: item.proName,
+              proPrice: item.ysPrice,
+              proId: item.proId,
+            });
           }
         });
-      });
+        let copeWith = this.TotalPrice1;
+        let paidIn = this.TotalPrice.toString();
+        let discount = this.discount;
+        this.tjFlowingWater = { copeWith, paidIn, discount };
+
+        let data;
+        if (pacId || this.getType == "2") {
+          data = {
+            photo: this.srcUrl,
+            pacId,
+            tjOrderList: this.tjOrderList,
+            tjFlowingWater: this.tjFlowingWater,
+            userId,
+            tjType,
+            getType: this.getType,
+            addAddress: this.addAddress,
+            tjCategory: this.tjCategory,
+          };
+        } else {
+          data = {
+            photo: this.srcUrl,
+            tjOrderList: this.tjOrderList,
+            tjFlowingWater: this.tjFlowingWater,
+            userId,
+            tjType,
+            getType: this.getType,
+            tjCategory: this.tjCategory,
+          };
+        }
+        getOrder(data).then((res) => {
+          this.$modal.msgSuccess("鎻愪氦鎴愬姛");
+          this.tjNumbers = res.msg;
+          this.charge = true;
+          let data = {
+            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 = [];
+              this.loading = false;
+            }
+          });
+        });
+      } else {
+        this.$modal.msgError("璇烽�夋嫨浣撴绫诲埆");
+      }
     },
 
     // 琛ㄦ牸鍗曢��
     handleSelect(selection, val) {
-      console.log(selection, val);
       this.selectionList = this.$refs.multipleTable.selection;
       this.selectionList.forEach((item) => {
         this.formIn.name = item.tjName;
@@ -2068,72 +2927,7 @@
       }
     },
 
-    // 鏈�鍚庢彁浜ゆ寜閽�
-    submitPrice() {
-      let _this = this;
-      let List = _this.tableData1; //鍗曚釜椤圭洰淇℃伅
-      if (this.responseList.cusId) {
-        var userId = this.responseList.cusId;
-      } else {
-        var userId = _this.form.cusId;
-      }
-      let tjType = _this.form.tjType;
-      if (this.tableData[0]) {
-        var pacId = this.tableData[0].pacId;
-      }
-
-      //tjOrderList//杩欎釜鏄鐞嗗畬鐨勬瘡涓�椤瑰椁愪俊鎭�
-      List.forEach((item) => {
-        if (item.list) {
-          item.list.forEach((item1) => {
-            this.tjOrderList.push({
-              proName: item1.proName,
-              proPrice: item1.nowPrice,
-              proId: item1.proId,
-            });
-          });
-        } else if (item.tjProjectList) {
-          item.tjProjectList.forEach((item1) => {
-            this.tjOrderList.push({
-              proName: item1.proName,
-              proPrice: item1.priceNow,
-              proId: item1.proId,
-            });
-          });
-        } else {
-          this.tjOrderList.push({
-            proName: item.proName,
-            proPrice: item.ysPrice,
-            proId: item.proId,
-          });
-        }
-      });
-      let copeWith = this.TotalPrice1;
-      let paidIn = this.TotalPrice.toString();
-      let discount = this.discount;
-      this.tjFlowingWater = { copeWith, paidIn, discount };
-
-      let data;
-      if (pacId) {
-        data = {
-          photo: this.srcUrl,
-          pacId,
-          tjOrderList: this.tjOrderList,
-          tjFlowingWater: this.tjFlowingWater,
-          userId,
-          tjType,
-          tjCategory:this.tjCategory
-        };
-      } else {
-        data = {
-          photo: this.srcUrl,
-          tjOrderList: this.tjOrderList,
-          tjFlowingWater: this.tjFlowingWater,
-          userId,
-          tjType,
-          tjCategory:this.tjCategory
-        };
-      }
+    listgetOrder(data) {
       getOrder(data).then((res) => {
         this.$modal.msgSuccess("鎻愪氦鎴愬姛");
         // this.dialogVisibles = true;
@@ -2143,16 +2937,103 @@
         const viewNum = "792931586196398080";
         const params = { viewNum, tjNumber };
         this.$tab.openPage("瀵艰瘖鍗�", "/report/breDailyReport", params);
-        _this.confirm = true;
+        this.confirm = true;
       });
       this.$tab.refreshPage();
+    },
+
+    // 鏈�鍚庢彁浜ゆ寜閽�
+    submitPrice() {
+      let _this = this;
+      if (_this.tjCategory !== "") {
+        let List = _this.tableData1; //鍗曚釜椤圭洰淇℃伅
+        if (this.responseList.cusId) {
+          var userId = this.responseList.cusId;
+        } else {
+          var userId = _this.form.cusId;
+        }
+        let tjType = _this.form.tjType;
+        if (this.tableData[0]) {
+          var pacId = this.tableData[0].pacId;
+        }
+
+        //tjOrderList//杩欎釜鏄鐞嗗畬鐨勬瘡涓�椤瑰椁愪俊鎭�
+        List.forEach((item) => {
+          if (item.list) {
+            item.list.forEach((item1) => {
+              this.tjOrderList.push({
+                proName: item1.proName,
+                proPrice: item1.nowPrice,
+                proId: item1.proId,
+              });
+            });
+          } else if (item.tjProjectList) {
+            item.tjProjectList.forEach((item1) => {
+              this.tjOrderList.push({
+                proName: item1.proName,
+                proPrice: item1.priceNow,
+                proId: item1.proId,
+              });
+            });
+          } else {
+            this.tjOrderList.push({
+              proName: item.proName,
+              proPrice: item.ysPrice,
+              proId: item.proId,
+            });
+          }
+        });
+        let copeWith = this.TotalPrice1;
+        let paidIn = this.TotalPrice.toString();
+        let discount = this.discount;
+        this.tjFlowingWater = { copeWith, paidIn, discount };
+
+        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 {
+        this.$modal.msgError("璇烽�夋嫨浣撴绫诲埆");
+      }
     },
   },
 };
 </script>
 
 
-<style >
+<style>
+.el-form-item__error {
+  display: none;
+}
+
+.el-col-19 {
+  width: 80.166667%;
+}
+
 .el-table__header-wrapper .el-checkbox {
   display: none;
 }
@@ -2190,8 +3071,9 @@
 }
 
 .tab3 {
-  width: 100%;
-  display: flex;
+  max-height: 390px;
+  overflow-y: auto;
+  border: 1px solid #d9d9d9;
 }
 
 .tab2 {
@@ -2290,4 +3172,3 @@
   margin-bottom: 25px;
 }
 </style>
-

--
Gitblit v1.8.0