From 47a7c6d2458ebd3c4722cbd1938d3f28a99e78ad Mon Sep 17 00:00:00 2001
From: qinxianzhangyao <11053546+qinxianzhangyao@user.noreply.gitee.com>
Date: 星期五, 26 四月 2024 15:03:42 +0800
Subject: [PATCH] qxtj

---
 src/views/system/tijianall/index.vue | 1020 +++++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 708 insertions(+), 312 deletions(-)

diff --git a/src/views/system/tijianall/index.vue b/src/views/system/tijianall/index.vue
index df77394..adf5451 100644
--- a/src/views/system/tijianall/index.vue
+++ b/src/views/system/tijianall/index.vue
@@ -11,74 +11,145 @@
             :rules="rules"
             :label-position="labelPosition"
             class="demo-form-inline"
-            label-width="78px"
+            label-width="84px"
           >
-            <el-form-item label="濮撳悕" prop="cusName">
-              <el-input
-                v-model="form.cusName"
-                placeholder="璇疯緭鍏ュ鍚�"
-                style="width: 160px"
-              />
-            </el-form-item>
-            <el-form-item label="璇佷欢绫诲瀷" prop="idType">
-              <el-select
-                style="width: 160px"
-                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="cusIdcard">
-              <el-input
-                style="width: 186px"
-                v-model="form.cusIdcard"
-                placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�"
-                @input="inputChange"
-              />
-              <i
+            <el-row>
+              <el-col :span="5">
+                <el-form-item
+                  style="display: flex"
+                  label="濮撳悕"
+                  prop="cusName"
+                  :rules="[
+                    {
+                      required: true,
+                      validator: (rule, value, callback) => {
+                        if (!form.cusName) {
+                          callback('');
+                        } else if (form.cusName) {
+                          callback();
+                        }
+                      },
+                      trigger: 'blur',
+                    },
+                  ]"
+                >
+                  <el-input v-model="form.cusName" placeholder="璇疯緭鍏ュ鍚�" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item
+                  label="璇佷欢绫诲瀷"
+                  prop="idType"
+                  style="display: flex"
+                >
+                  <el-select v-model="form.idType" placeholder="璇烽�夋嫨璇佷欢绫诲瀷">
+                    <el-option
+                      v-for="dict in dict.type.dict_user_cardtype"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="7">
+                <el-form-item
+                  style="display: flex"
+                  label="璇佷欢鍙�"
+                  prop="cusIdcard"
+                  :rules="[
+                    {
+                      required: true,
+                      validator: (rule, value, callback) => {
+                        if (!form.cusIdcard) {
+                          callback('');
+                        } else if (form.cusIdcard) {
+                          callback();
+                        }
+                      },
+                      trigger: 'blur',
+                    },
+                  ]"
+                >
+                  <span
+                    slot="label"
+                    style="display: inline-block; border-bottom: 2px solid blue"
+                    @click="handleQuery"
+                  >
+                    璇佷欢鍙�
+                  </span>
+                  <el-input
+                    v-model="form.cusIdcard"
+                    placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�"
+                    @input="inputChange"
+                  />
+                  <!-- <i
                 style="font-size: 17px; margin-left: 3px"
                 class="el-icon-search"
                 @click="handleQuery"
-              ></i>
-            </el-form-item>
-            <el-form-item label="骞撮緞" prop="age">
-              <el-input style="width: 55px" v-model="form.age" />
-            </el-form-item>
-            <el-form-item prop="ageUnit">
-              <el-select
-                style="width: 60px"
-                v-model="form.ageUnit"
-                @change="formchang"
-              >
-                <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="cusSex">
-              <el-select
-                style="width: 160px"
-                v-model="form.cusSex"
-                placeholder="璇烽�夋嫨鎬у埆"
-                @change="formchang"
-              >
-                <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>
+              ></i> -->
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="5">
+                <el-form-item
+                  label="姘戞棌"
+                  prop="cusNational"
+                  style="display: flex"
+                >
+                  <el-select
+                    filterable
+                    v-model="form.cusNational"
+                    placeholder="璇烽�夋嫨姘戞棌"
+                  >
+                    <el-option
+                      v-for="dict in dict.type.dict_user_national"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="鎬у埆" prop="cusSex" style="display: flex">
+                  <el-select
+                    v-model="form.cusSex"
+                    placeholder="璇烽�夋嫨鎬у埆"
+                    @change="formchang"
+                  >
+                    <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="5">
+                <el-form-item label="骞撮緞" prop="age" style="display: flex">
+                  <el-input v-model="form.age" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="2">
+                <el-form-item prop="ageUnit">
+                  <el-select
+                    v-model="form.ageUnit"
+                    @change="formchang"
+                    style="width: 80%"
+                  >
+                    <el-option
+                      v-for="dict in dict.type.dict_ageunit"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
 
             <!-- <input name="ReadBlockBtn" type="button" size="5px"  @click="readblock" value="璇诲崱" /> -->
             <!-- <el-form-item label="鍑虹敓鏃ユ湡" prop="cusBrithday">
@@ -86,56 +157,149 @@
                 value-format="yyyy-MM-dd" placeholder="璇烽�夋嫨鍑虹敓鏃ユ湡">
               </el-date-picker>
             </el-form-item> -->
-            <el-form-item label="鑱旂郴鐢佃瘽" prop="cusPhone">
-              <el-input
-                v-model="form.cusPhone"
-                placeholder="璇疯緭鍏ヨ仈绯荤數璇�"
-                style="width: 160px"
-              />
-            </el-form-item>
-            <el-form-item label="姘戞棌" prop="cusNational">
-              <el-select
-                filterable
-                v-model="form.cusNational"
-                placeholder="璇烽�夋嫨姘戞棌"
-                style="width: 130px"
-              >
-                <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="cusEmail">
-              <el-input
-                v-model="form.cusEmail"
-                placeholder="璇疯緭鍏ラ偖绠�"
-                style="width: 200px"
-              />
-            </el-form-item>
-            <el-form-item label="濠氬Щ" prop="cusMarryStatus">
-              <el-select
-                style="width: 160px"
-                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="cusAddr">
-              <el-input
-                v-model="form.cusAddr"
-                placeholder="璇疯緭鍏ョ幇灞呬綇鍦板潃"
-                style="width: 440px"
-              />
-            </el-form-item>
+
+            <el-row>
+              <el-col :span="5">
+                <el-form-item
+                  label="濠氬Щ"
+                  prop="cusMarryStatus"
+                  style="display: flex"
+                >
+                  <el-select
+                    v-model="form.cusMarryStatus"
+                    placeholder="璇烽�夋嫨濠氬Щ鐘跺喌"
+                  >
+                    <el-option
+                      v-for="dict in dict.type.dict_user_marry"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="6">
+                <el-form-item
+                  label="浣撴绫诲埆"
+                  prop="category"
+                  style="display: flex"
+                >
+                  <el-select
+                    v-model="form.category"
+                    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-col>
+              <el-col :span="7">
+                <el-form-item
+                  style="display: flex"
+                  label="鑱旂郴鐢佃瘽"
+                  prop="cusPhone"
+                  :rules="[
+                    {
+                      required: true,
+                      validator: (rule, value, callback) => {
+                        if (!form.cusPhone) {
+                          callback('');
+                        } else if (form.cusPhone) {
+                          callback();
+                        }
+                      },
+                      trigger: 'blur',
+                    },
+                  ]"
+                >
+                  <el-input
+                    v-model="form.cusPhone"
+                    placeholder="璇疯緭鍏ヨ仈绯荤數璇�"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="5">
+                <el-form-item
+                  label="浣撴绫诲瀷"
+                  prop="tjType"
+                  style="display: flex"
+                >
+                  <el-select v-model="form.tjType" placeholder="璇烽�夋嫨浣撴绫诲瀷">
+                    <el-option
+                      v-for="dict in dict.type.dict_team"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="parseInt(dict.value)"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="鑱屼笟" prop="career" style="display: flex">
+                  <el-select
+                    filterable
+                    :disabled="isDisabled"
+                    v-model="form.career"
+                    placeholder="璇疯緭鍏ヨ亴涓�"
+                  >
+                    <el-option
+                      v-for="dict in dict.type.dict_job"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="7">
+                <el-form-item
+                  label="閭"
+                  prop="cusEmail"
+                  style="display: flex"
+                >
+                  <el-input v-model="form.cusEmail" placeholder="璇疯緭鍏ラ偖绠�" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="5">
+                <el-form-item
+                  label="鐜颁綇鍧�"
+                  prop="cusAddr"
+                  style="display: flex"
+                >
+                  <el-input
+                    v-model="form.cusAddr"
+                    placeholder="璇疯緭鍏ョ幇灞呬綇鍦板潃"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item
+                  label="宸ヤ綔鍗曚綅"
+                  prop="company"
+                  style="display: flex"
+                >
+                  <el-input
+                    v-model="form.company"
+                    placeholder="璇疯緭鍏ュ伐浣滃崟浣�"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="7">
+                <el-form-item label="鍗″彿" prop="indexCard">
+                  <el-input v-model="form.indexCard" placeholder="璇疯緭鍏ュ崱鍙�" />
+                </el-form-item>
+              </el-col>
+            </el-row>
             <!-- <el-form-item label="鎴峰彛鍦板潃" prop="cusAddr">
               <el-input v-model="form.cusAddr" placeholder="璇疯緭鍏ユ埛鍙e湴鍧�" />
             </el-form-item> -->
@@ -149,101 +313,52 @@
             <!-- <el-form-item label="绱㈠紩鍗″彿" prop="indexCard">
               <el-input v-model="form.indexCard" placeholder="璇疯緭鍏ョ储寮曞崱鍙�" />
             </el-form-item> -->
-            <el-form-item label="浣撴绫诲埆" prop="category">
-              <el-select
-                style="width: 140px"
-                v-model="form.category"
-                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 label="閮ㄩ棬" prop="department">
-              <el-input
-                v-model="form.department"
-                placeholder="璇疯緭鍏ラ儴闂�"
-                style="width: 160px"
-              />
-            </el-form-item>
-            <el-form-item label="宸ヤ綔鍗曚綅" prop="company">
-              <el-input
-                v-model="form.company"
-                placeholder="璇疯緭鍏ュ伐浣滃崟浣�"
-                style="width: 440px"
-              />
-            </el-form-item>
-            <el-form-item label="鑱屼笟" prop="career">
-              <el-select
-                filterable
-                :disabled="isDisabled"
-                v-model="form.career"
-                placeholder="璇疯緭鍏ヨ亴涓�"
-                style="width: 140px"
-              >
-                <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-form-item label="棰勭害鏃ユ湡" prop="reservationTime">
-              <el-date-picker
-                v-model="form.reservationTime"
-                type="date"
-                value-format="yyyy-MM-dd"
-                placeholder="閫夋嫨鏃ユ湡"
-                :picker-options="setDisabled"
-                style="width: 160px"
-              >
-              </el-date-picker>
-            </el-form-item>
-            <el-form-item label="鏃堕棿" prop="timeRegion">
-              <el-select
-                style="width: 160px"
-                v-model="form.timeRegion"
-                placeholder="璇烽�夋嫨棰勭害鏃堕棿"
-              >
-                <el-option
-                  v-for="dict in dict.type.tj_time_region"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="鍗″彿" prop="indexCard">
-              <el-input
-                v-model="form.indexCard"
-                placeholder="璇疯緭鍏ュ崱鍙�"
-                style="width: 190px"
-              />
-            </el-form-item>
-            <el-form-item
-              label="浣撴绫诲瀷"
-              prop="tjType"
-              style="margin-right: 20px"
-            >
-              <el-select
-                style="width: 145px"
-                v-model="form.tjType"
-                placeholder="璇烽�夋嫨浣撴绫诲瀷"
-              >
-                <el-option
-                  v-for="dict in dict.type.dict_team"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="parseInt(dict.value)"
-                ></el-option>
-              </el-select>
-            </el-form-item>
+
+            <el-row>
+              <el-col :span="5">
+                <el-form-item
+                  label="閮ㄩ棬"
+                  prop="department"
+                  style="display: flex"
+                >
+                  <el-input
+                    v-model="form.department"
+                    placeholder="璇疯緭鍏ラ儴闂�"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item
+                  label="鏃堕棿"
+                  prop="timeRegion"
+                  style="display: flex"
+                >
+                  <el-select
+                    v-model="form.timeRegion"
+                    placeholder="璇烽�夋嫨棰勭害鏃堕棿"
+                  >
+                    <el-option
+                      v-for="dict in dict.type.tj_time_region"
+                      :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="reservationTime">
+                  <el-date-picker
+                    v-model="form.reservationTime"
+                    type="date"
+                    value-format="yyyy-MM-dd"
+                    placeholder="閫夋嫨鏃ユ湡"
+                    :picker-options="setDisabled"
+                  >
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+            </el-row>
           </el-form>
         </div>
       </el-col>
@@ -252,12 +367,13 @@
     <el-dialog
       title="閫夋嫨濂楅"
       :visible.sync="taocan"
-      width="42%"
+      width="59%"
       height="700px"
     >
       <el-tabs
         type="border-card"
         style="height: 538px; margin: 0 10px; width: 100%"
+        @tab-click="handleClick"
       >
         <el-tab-pane label="濂楅">
           <el-form
@@ -265,7 +381,7 @@
             ref="queryForm"
             size="small"
             :inline="true"
-            v-show="showSearch"
+            v-if="showSearch"
             @submit.native.prevent
             label-width="auto"
           >
@@ -347,26 +463,131 @@
         </el-tab-pane>
         <el-tab-pane label="鍗曢」">
           <div class="tab8">
-            <div class="tab7">
+            <!-- <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"
+              ></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> -->
+            <!-- </div> -->
+            <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"
+                  >
+                  </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"
+                  >
+                  </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="proName"
+                      label="鏄庣粏椤圭洰"
+                      width="260px"
+                    >
+                    </el-table-column>
+                    <el-table-column prop="proPrice" label="鍘熶环" width="56px">
+                    </el-table-column>
+
+                    <el-table-column
+                      label="鎿嶄綔"
+                      align="center"
+                      fixed="right"
+                      class-name="small-padding fixed-width"
+                      width="50px"
+                    >
+                      <template slot-scope="scope">
+                        <el-button
+                          size="mini"
+                          type="text"
+                          icon="el-icon-delete"
+                          @click="handleDelete(scope.row)"
+                          title="鍒犻櫎"
+                        ></el-button>
+                      </template>
+                    </el-table-column>
+                  </el-table>
+                  <el-collapse v-model="activeName" accordion v-if="list1">
+                    <div>
+                      <el-collapse-item title="璇烽�夋嫨椤圭洰">
+                        <el-table :data="DataList" border style="width: 100%" height="400"  :span-method="objectSpanMethod">
+                          <el-table-column
+                            prop="proName"
+                            label="椤圭洰"
+                            width="180"
+                          >
+                          </el-table-column>
+                          <el-table-column prop="ordPrice" label="鍘熶环">
+                          </el-table-column>
+                        </el-table>
+                      </el-collapse-item>
+                    </div>
+                  </el-collapse>
+                </div>
+              </el-col>
+            </el-row>
           </div>
         </el-tab-pane>
       </el-tabs>
@@ -469,7 +690,7 @@
                 >
                 <el-button
                   type="primary"
-                  @click="inputChange"
+                  @click="inputChanges"
                   v-show="lishi"
                   size="mini"
                   :disabled="confirm"
@@ -557,7 +778,7 @@
                     </el-table-column>
                     <el-table-column prop="nowPrice" label="瀹炴敹閲戦">
                     </el-table-column>
-                    <el-table-column prop="isEat" label="绌鸿吂">
+                    <el-table-column prop="proCheckMethod" label="绌鸿吂">
                     </el-table-column>
                   </el-table>
                 </el-collapse-item>
@@ -639,39 +860,6 @@
         ></iframe>
       </div>
     </el-dialog>
-    <el-drawer
-      title="鍘嗗彶浣撴璁板綍"
-      :visible.sync="table"
-      direction="rtl"
-      size="50%"
-    >
-      <el-table :data="HistoryList" style="width: 95%; margin-left: 20px">
-        <el-table-column
-          property="tjNum"
-          label="浣撴鍙�"
-          align="center"
-          :show-overflow-tooltip="true"
-        ></el-table-column>
-        <el-table-column
-          property="userName"
-          label="濮撳悕"
-          align="center"
-          :show-overflow-tooltip="true"
-        ></el-table-column>
-        <el-table-column
-          property="tjTime"
-          label="浣撴鏃堕棿"
-          align="center"
-          :show-overflow-tooltip="true"
-        ></el-table-column>
-        <el-table-column
-          property="tjProName"
-          label="浣撴椤圭洰"
-          align="center"
-          :show-overflow-tooltip="true"
-        ></el-table-column>
-      </el-table>
-    </el-drawer>
     <el-dialog
       title="鎻愮ず"
       :visible.sync="dialogVisiblese"
@@ -684,6 +872,7 @@
         <el-button type="primary" @click="copes">纭� 瀹�</el-button>
       </span>
     </el-dialog>
+    <historyTj :cusIdCard="form.cusIdcard" ref="historyTj"></historyTj>
   </div>
 </template>
   
@@ -697,16 +886,19 @@
   getPackageListName,
   getaddtTransition,
   getTransitionList,
-  getGuide,
+  getProParentIdDxList,
+  getProSonDxList,
   getaddTj,
   getHistryTjOrderByCusIdCard,
   getHistryTjOrderProByCusIdCard,
 } from "@/api/system/tijian";
 import { MessageBox } from "element-ui";
 import VTreeTransfer from "../tijian/TreeTransfer.vue";
+import historyTj from "@/components/historyTj/index";
 export default {
   components: {
     VTreeTransfer,
+    historyTj,
   },
   dicts: [
     "dict_user_national",
@@ -723,6 +915,16 @@
   name: "Tijian",
 
   data() {
+    let checkPhoneNum = (rule, value, callback) => {
+      let patter = new RegExp(/^1\s*[3456789]\s*(\d\s*){9}$/);
+      if (value == "" && value == undefined && !value) {
+        return callback("");
+      } else if (value != undefined && value != "") {
+        return callback();
+      } else if (!patter.test(value)) {
+        return callback("");
+      }
+    };
     // const isCnNewID = (rule, value, callback) => {
     //   var arrExp = [7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2]; //鍔犳潈鍥犲瓙
     //   var arrValid = [1, 0, "X", 9, 8, 7, 6, 5, 4, 3, 2]; //鏍¢獙鐮�
@@ -748,6 +950,7 @@
     //   }
     // };
     return {
+      filterText: "",
       proIdList: [],
       tableDatas: [],
       dialogVisiblese: false,
@@ -838,9 +1041,13 @@
       // 鏄剧ず鎼滅储鏉′欢
       showSearch: true,
       // 鏍戠姸褰㈢姸
+      Treedata: [],
+      TreedataList: [],
       treedataList: [],
+      checkedkey: [],
+      checkedListkey: [],
       defaultProps: {
-        children: "tjProjectList",
+        children: [],
         label: "proName",
       },
       formPacId: "",
@@ -893,24 +1100,29 @@
       },
       // 琛ㄥ崟鏍¢獙
       rules: {
-        cusName: [{ required: true, message: "濮撳悕涓嶈兘涓虹┖", trigger: "blur" }],
+        cusName: [
+          { required: true, validator: checkPhoneNum, trigger: "blur" },
+        ],
         cusSex: [
-          { required: true, message: "鎬у埆涓嶈兘涓虹┖", trigger: "change" },
+          { required: true, validator: checkPhoneNum, trigger: "change" },
+        ],
+        category: [
+          { required: true, validator: checkPhoneNum, trigger: "change" },
         ],
         cusBrithday: [
-          { required: true, message: "鍑虹敓鏃ユ湡涓嶈兘涓虹┖", trigger: "blur" },
+          { required: true, validator: checkPhoneNum, trigger: "blur" },
         ],
         // cusAddr: [
         //   { required: true, message: "鐜板眳浣忓湴鍧�涓嶈兘涓虹┖", trigger: "blur" },
         // ],
         cusPhone: [
-          { required: true, message: "鑱旂郴鐢佃瘽涓嶈兘涓虹┖", trigger: "blur" },
+          { required: true, validator: checkPhoneNum, trigger: "blur" },
         ],
         reservationTime: [
-          { required: true, message: "棰勭害鏃ユ湡涓嶈兘涓虹┖", trigger: "change" },
+          { required: true, validator: checkPhoneNum, trigger: "change" },
         ],
         timeRegion: [
-          { required: true, message: "鏃堕棿涓嶈兘涓虹┖", trigger: "blur" },
+          { required: true, validator: checkPhoneNum, trigger: "blur" },
         ],
         // cusIdcard: [
         //   { required: true, message: "璇疯緭鍏ヨ韩浠借瘉鍙�", trigger: "blur" },
@@ -921,10 +1133,10 @@
         //   },
         // ],
         cusIdcard: [
-          { required: true, message: "韬唤璇佸彿涓嶈兘涓虹┖", trigger: "blur" },
+          { required: true, validator: checkPhoneNum, trigger: "blur" },
           {
             pattern: /^(\d{15}$|^\d{18}$|^\d{17}(\d|X|x))$/,
-            message: "璇疯緭鍏ユ纭殑韬唤璇佸彿",
+            validator: checkPhoneNum,
             trigger: "blur",
             validator: this.validSjh,
           },
@@ -932,9 +1144,13 @@
       },
     };
   },
+  watch: {
+    filterText(val) {
+      this.$refs.tree.filter(val);
+    },
+  },
   created() {
     this.getList1();
-    this.getData();
   },
   methods: {
     inputChange() {
@@ -971,23 +1187,32 @@
           this.form.cusBrithday = birthday;
           this.form.age = age;
         }
-        let cusIdCard = this.form.cusIdcard;
-        getHistryTjOrderByCusIdCard(cusIdCard).then((res) => {
-          if (res.code == 200) {
-            this.table = true;
-            this.lishi = true;
-            this.HistoryList = res.data;
-          }
-        });
+
+        // let cusIdCard = this.form.cusIdcard;
+        // getHistryTjOrderByCusIdCard(cusIdCard).then((res) => {
+        //   if (res.code == 200) {
+        this.table = true;
+        this.lishi = true;
+        //     this.HistoryList = res.data;
+        //   }
+        // });
       } else {
         // return this.$message.error("璇疯緭鍏ユ纭殑韬唤璇佸彿锛�");;
       }
+    },
+    inputChanges() {
+      this.$refs.historyTj.getlist();
+    },
+
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.proName.indexOf(value) !== -1;
     },
     cope() {
       let cusIdCard = this.form.cusIdcard;
       getHistryTjOrderProByCusIdCard(cusIdCard).then((res) => {
         this.copeList = res.data;
-        if (res.data.length != 0) {
+        if (res.msg != "鏆傛棤鍘嗗彶璁板綍") {
           this.dialogVisiblese = true;
         } else {
           this.$message.warning("鏆傛棤鍘嗗彶浣撴璁板綍锛�");
@@ -1012,7 +1237,6 @@
             } else {
               item.list.forEach((items) => {
                 _this.proIdList.push(items.proId);
-                console.log(_this.pacId, 888);
               });
             }
           });
@@ -1085,7 +1309,7 @@
           this.loading = false;
         });
       }
-      this.getData();
+      // this.getData();
     },
     getData() {
       /** 鏌ヨ閮ㄩ棬涓嬫媺鏍戠粨鏋� */
@@ -1269,10 +1493,10 @@
 
     Package() {
       this.taocan = true;
-      // this.getData();
       let cusSex = this.form.cusSex;
       this.datekey = Date.now();
       //鍏ㄩ儴濂楅
+      this.loading = true;
       deptTreeSelect(cusSex).then((response) => {
         this.newpacName = response.rows;
         try {
@@ -1291,6 +1515,7 @@
         } catch (error) {}
         this.loading = false;
       });
+      // this.getDataList();
     },
 
     // 鎶樻墸
@@ -1349,29 +1574,34 @@
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
       if (selection[0]) {
-        this.DataList = [];
+        // this.DataList = [];
         // this.data = JSON.parse(JSON.stringify(this.dXData));
         selection[0].tjProjectList.forEach((selectionitem) => {
-          this.treedataList.forEach((item) => {
+          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 = [];
-                    }
-                  });
-                }
-              });
+            // 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;
             }
           });
         });
@@ -1380,27 +1610,178 @@
         return;
       }
     },
+    handleClick(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;
+
+          if (this.DataList.length != 0) {
+            this.list1 = false;
+            this.DataList.forEach((item) => {
+              this.TotalPrice1 = item.proPrice + this.TotalPrice1;
+            });
+          }
+        });
+        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;
+          if (this.DataList.length != 0) {
+            this.list1 = false;
+            this.DataList.forEach((item) => {
+              this.TotalPrice1 = item.proPrice + this.TotalPrice1;
+            });
+          }
         });
-      } else {
-        this.proIds = [];
+      } else if (checked.checkedNodes.length == 0) {
+        let proId = data.proId;
+        getProSonDxList(proId).then((res) => {
+          this.TreedataList = res.data.list;
+          this.checkedListkey = [];
+        });
       }
     },
-    changeCategoryKeys(val) {
-      this.proIds = [];
-      this.proIds = val;
+
+    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;
     },
+
+    // 鐐瑰嚮鑾峰彇姣忎釜鏍戣妭鐐�
+    handleCurrentChecked1(data, checked, checkedNodes) {
+      if (checked == false) {
+        this.DataList.forEach((item, index) => {
+          if (item.proId == data.proId) {
+            this.DataList.splice(index, 1);
+            this.TotalPrice1 = 0;
+            this.DataList.forEach((item1) => {
+              this.TotalPrice1 = item1.proPrice + this.TotalPrice1;
+            });
+          }
+        });
+      } 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.TotalPrice1 = 0;
+        this.DataList.forEach((item1) => {
+          this.TotalPrice1 = item1.proPrice + this.TotalPrice1;
+        });
+      }
+    },
+
+    /** 鍒犻櫎鎸夐挳鎿嶄綔 */
+    handleDelete(row) {
+      this.DataList.forEach((item, index) => {
+        if (item.proId == row.proId) {
+          this.DataList.splice(index, 1);
+          this.TotalPrice1 = 0;
+          this.DataList.forEach((item1) => {
+            this.TotalPrice1 = item1.proPrice + this.TotalPrice1;
+          });
+        }
+      });
+    },
+     //  // 榛樿鎺ュ彈鍥涗釜鍊� { 褰撳墠琛岀殑鍊�, 褰撳墠鍒楃殑鍊�, 琛岀殑涓嬫爣, 鍒楃殑涓嬫爣 }
+     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 };
+          }
+        }
+      }
+    },
+
+    // 鐐瑰嚮鑾峰彇姣忎釜鏍戣妭鐐�
+    // 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);
+    //     });
+    //   } else {
+    //     this.proIds = [];
+    //   }
+    // },
+    // changeCategoryKeys(val) {
+    //   this.proIds = [];
+    //   this.proIds = val;
+    // },
 
     // 椤圭洰鎻愪氦
     submit() {
@@ -1417,6 +1798,12 @@
         });
       } else {
         _this.pacId = "";
+      }
+      this.proIds = [];
+      if (this.DataList.length != 0) {
+        this.DataList.forEach((item) => {
+          this.proIds.push(item.proId);
+        });
       }
       let data = {
         cusId,
@@ -1581,6 +1968,15 @@
   display: block;
 }
 
+
+.tab3 { 
+  max-height: 400px;
+  overflow-y: auto;
+  border: 1px solid #d9d9d9;
+}
+
+
+
 .el-col-8 {
   width: 330px;
 }

--
Gitblit v1.8.0