From 5f5425c1be29b82205f19b7779cda67cfcc3a6e5 Mon Sep 17 00:00:00 2001
From: qinxianzhangyao <11053546+qinxianzhangyao@user.noreply.gitee.com>
Date: 星期三, 19 六月 2024 17:53:26 +0800
Subject: [PATCH] qxtj

---
 src/views/system/tijianall/index.vue |  711 +++++++++++++++++++++++++++++-----------------------------
 1 files changed, 354 insertions(+), 357 deletions(-)

diff --git a/src/views/system/tijianall/index.vue b/src/views/system/tijianall/index.vue
index d273db9..bee40f1 100644
--- a/src/views/system/tijianall/index.vue
+++ b/src/views/system/tijianall/index.vue
@@ -9,356 +9,286 @@
             ref="form"
             :model="form"
             :rules="rules"
-            :label-position="labelPosition"
-            class="demo-form-inline"
-            label-width="84px"
+            label-width="106px"
           >
-            <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
+            <el-form-item
+              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="璇疯緭鍏ュ鍚�" style="width: 99%;"/>
+            </el-form-item>
+            <el-form-item label="鎬у埆" prop="cusSex">
+              <el-select
+                v-model="form.cusSex"
+                placeholder="璇烽�夋嫨鎬у埆"
+                @change="formchang"
+                style="width: 94%"
+              >
+                <el-option
+                  v-for="dict in dict.type.sys_user_sex"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="parseInt(dict.value)"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="璇佷欢绫诲瀷" prop="idType">
+              <el-select v-model="form.idType" placeholder="璇烽�夋嫨璇佷欢绫诲瀷" style="width: 93%;">
+                <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>
+          <el-form
+            style="margin: 4px 8px"
+            :inline="true"
+            ref="form"
+            :model="form"
+            :rules="rules"
+            label-width="106px"
+          >
+          <el-form-item
+              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-form-item label="濠氬Щ" prop="cusMarryStatus" >
+              <el-select
+                v-model="form.cusMarryStatus"
+                placeholder="璇烽�夋嫨濠氬Щ鐘跺喌"
+                style="width: 94%"
+              >
+                <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="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-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>
+            </el-form-item>
+          </el-form>
+          <el-form
+            style="margin: 4px 8px"
+            :inline="true"
+            ref="form"
+            :model="form"
+            :rules="rules"
+            label-width="106px"
+          >
+          <el-form-item label="閭" prop="cusEmail">
+              <el-input v-model="form.cusEmail" placeholder="璇疯緭鍏ラ偖绠�" />
+            </el-form-item>
+          <el-form-item label="姘戞棌" prop="cusNational">
+              <el-select
+                filterable
+                v-model="form.cusNational"
+                placeholder="璇烽�夋嫨姘戞棌"
+                style="width: 93%;"
+              >
+                <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>
+           
 
-            <!-- <input name="ReadBlockBtn" type="button" size="5px"  @click="readblock" value="璇诲崱" /> -->
-            <!-- <el-form-item label="鍑虹敓鏃ユ湡" prop="cusBrithday">
-              <el-date-picker style="width: 200px" clearable v-model="form.cusBrithday" type="date"
-                value-format="yyyy-MM-dd" placeholder="璇烽�夋嫨鍑虹敓鏃ユ湡">
-              </el-date-picker>
-            </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> -->
-
-            <!-- <el-form-item label="閭斂缂栫爜" prop="cusPostcode">
+            <el-form-item label="骞撮緞" prop="age">
               <el-input
-                v-model="form.cusPostcode"
-                placeholder="璇疯緭鍏ラ偖鏀跨紪鐮�"
+                v-model="form.age"
+                :disabled="isDisabled"
+                style="width: 28%"
               />
-            </el-form-item> -->
-            <!-- <el-form-item label="绱㈠紩鍗″彿" prop="indexCard">
-              <el-input v-model="form.indexCard" placeholder="璇疯緭鍏ョ储寮曞崱鍙�" />
-            </el-form-item> -->
+              <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>
+          <el-form
+            style="margin: 4px 8px"
+            :inline="true"
+            ref="form"
+            :model="form"
+            :rules="rules"
+            label-width="106px"
+          >
+            <el-form-item label="鍗″彿" prop="indexCard">
+              <el-input v-model="form.indexCard" placeholder="璇疯緭鍏ュ崱鍙�" />
+            </el-form-item>
+            <el-form-item label="鑱屼笟" prop="career">
+              <el-select
+                filterable
+                :disabled="isDisabled"
+                v-model="form.career"
+                placeholder="璇疯緭鍏ヨ亴涓�"
+                style="width: 94%"
+              >
+                <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-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-item label="浣撴绫诲瀷" prop="tjType">
+              <el-select
+                v-model="form.tjType"
+                placeholder="璇烽�夋嫨浣撴绫诲瀷" style="width: 94%;"
+              >
+                <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-form>
+          <el-form
+            style="margin: 4px 8px"
+            :inline="true"
+            ref="form"
+            :model="form"
+            :rules="rules"
+            label-width="106px"
+          >
+            <el-form-item label="鍗曚綅" prop="company">
+              <el-input v-model="form.company" placeholder="璇疯緭鍏ュ伐浣滃崟浣�" />
+            </el-form-item>
+            <el-form-item label="浣撴绫诲埆" prop="category">
+              <el-select v-model="form.category" placeholder="璇烽�夋嫨浣撴绫诲埆" style="width: 95%;">
+                <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="璇疯緭鍏ラ儴闂�" />
+            </el-form-item>
+            
+          </el-form>
+          <el-form
+            style="margin: 4px 8px"
+            :inline="true"
+            ref="form"
+            :model="form"
+            :rules="rules"
+            label-width="106px"
+          >
+            <el-form-item label="鐜颁綇鍦板潃" prop="cusAddr">
+              <el-input v-model="form.cusAddr" placeholder="璇疯緭鍏ョ幇灞呬綇鍦板潃" />
+            </el-form-item>
+            <el-form-item label="棰勭害鏃堕棿" prop="timeRegion" >
+              <el-select
+                v-model="form.timeRegion"
+                placeholder="璇烽�夋嫨棰勭害鏃堕棿" style="width: 95%;"
+              >
+                <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="reservationTime">
+              <el-date-picker
+                v-model="form.reservationTime"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="閫夋嫨鏃ユ湡"
+                :picker-options="setDisabled"
+                style="width: 88%"
+              >
+              </el-date-picker>
+            </el-form-item>
+           
           </el-form>
         </div>
       </el-col>
@@ -475,7 +405,7 @@
                 @check-change="handleCurrentChecked">
               </el-tree> -->
             <!-- </div> -->
-            <el-row  :gutter="20">
+            <el-row :gutter="20">
               <el-col :span="6">
                 <div
                   style="
@@ -531,14 +461,21 @@
               </el-col>
               <el-col :span="11">
                 <div class="grid-content bg-purple">
-                  <div style="text-align: center; margin-bottom: 10px">
+                  <div
+                    style="
+                      text-align: center;
+                      margin-bottom: 10px;
+                      margin-top: 10px;
+                    "
+                  >
                     宸查�夐」鐩垪琛�
                   </div>
                   <el-table
                     :data="DataList"
                     border
                     style="width: 100%"
-                    height="250"
+                    height="400"
+                    :span-method="objectSpanMethod"
                   >
                     <el-table-column prop="propinName" label="妫�鏌ラ」鐩�">
                     </el-table-column>
@@ -572,7 +509,13 @@
                   <el-collapse v-model="activeName" accordion v-if="list1">
                     <div>
                       <el-collapse-item title="璇烽�夋嫨椤圭洰">
-                        <el-table :data="DataList" border style="width: 100%">
+                        <el-table
+                          :data="DataList"
+                          border
+                          style="width: 100%"
+                          height="400"
+                          :span-method="objectSpanMethod"
+                        >
                           <el-table-column
                             prop="proName"
                             label="椤圭洰"
@@ -645,7 +588,7 @@
             <el-form
               :model="form"
               :inline="true"
-              label-width="75px"
+              label-width="100px"
               style="margin-left: 10px"
             >
               <el-form-item label="搴旀敹閲戦" style="margin-right: 20px">
@@ -653,7 +596,6 @@
                   placeholder="搴旀敹閲戦"
                   :value="TotalPrice1 + '.00'"
                   disabled
-                  style="width: 150px"
                 ></el-input>
               </el-form-item>
               <!-- <el-form-item label="浼樻儬鎶樻墸" style="margin-right: 20px">
@@ -661,19 +603,23 @@
                 <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="瀹炴敹閲戦" style="margin-right: 20px">
+              <el-form-item label="瀹炴敹閲戦" >
                 <el-input
                   placeholder="瀹炴敹閲戦"
                   v-model="TotalPrice"
                   disabled
-                  style="width: 190px"
                 ></el-input>
               </el-form-item>
               <el-form-item>
                 <el-button type="primary" @click="Package" size="mini"
                   >閫夋嫨濂楅</el-button
                 >
-
+                <el-button
+                  type="primary"
+                  @click="resetpackage"
+                  size="mini"
+                  >閲嶇疆濂楅</el-button
+                >
                 <el-button
                   type="primary"
                   @click="submitPrice"
@@ -709,8 +655,8 @@
               border: 1px solid #e6ebf5;
               max-height: 420px;
               overflow: auto;
-              width: 1020px;
-              margin-left: 20px;
+              width: 950px;
+              margin-left: 25px;
             "
           >
             <el-collapse v-model="index" accordion>
@@ -1490,6 +1436,39 @@
     //     return true;
     //   }
     // },
+    resetpackage(){
+      if (this.form.cusIdcard) {
+        var cusId = this.form.cusIdcard;
+      } else {
+        this.$message.warning("璇峰厛濉啓淇℃伅锛屽啀閫変綋妫�鍐呭");
+      }
+      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";
+            }
+          });
+        }
+      });
+    },
 
     Package() {
       this.taocan = true;
@@ -1612,12 +1591,12 @@
     },
     handleClick(tab, event) {
       if (tab.label == "鍗曢」") {
-        this.DataList =[]
+        this.DataList = [];
         this.getDataList();
       }
     },
     getDataList() {
-      this.loading = true
+      this.loading = true;
       getProParentIdDxList().then((response) => {
         this.Treedata = response.data.list;
         if (this.tableData[0]) {
@@ -1739,6 +1718,27 @@
           });
         }
       });
+    },
+    //  // 榛樿鎺ュ彈鍥涗釜鍊� { 褰撳墠琛岀殑鍊�, 褰撳墠鍒楃殑鍊�, 琛岀殑涓嬫爣, 鍒楃殑涓嬫爣 }
+    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 };
+          }
+        }
+      }
     },
 
     // 鐐瑰嚮鑾峰彇姣忎釜鏍戣妭鐐�
@@ -1947,14 +1947,11 @@
   display: block;
 }
 
-
-.tab3 { 
+.tab3 {
   max-height: 400px;
   overflow-y: auto;
   border: 1px solid #d9d9d9;
 }
-
-
 
 .el-col-8 {
   width: 330px;

--
Gitblit v1.8.0