From 201e38e8f961269c3961e0709563338536196242 Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期一, 28 七月 2025 17:38:20 +0800
Subject: [PATCH] Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peisweb

---
 src/views/system/tijian/index.vue | 2694 +++++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 1,770 insertions(+), 924 deletions(-)

diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue
index af5f1cd..e9eff5c 100644
--- a/src/views/system/tijian/index.vue
+++ b/src/views/system/tijian/index.vue
@@ -1,721 +1,1464 @@
 <template>
-  <div class="app-container">
-    <el-dialog :title="title" :visible.sync="open1" width="1000px" append-to-body>
-      <el-form ref="form1" :model="form1" :rules="rules1" label-width="100px" :inline="true">
-        <el-form-item label="鍗曚綅鍚嶇О" prop="cnName">
-          <el-input v-model="form1.cnName" placeholder="璇疯緭鍏ヤ腑鏂囧悕绉�" />
-        </el-form-item>
-        <el-form-item label="鑱旂郴浜�" prop="contactPerson">
-          <el-input v-model="form1.contactPerson" placeholder="璇疯緭鍏ヨ仈绯讳汉" />
-        </el-form-item>
-        <el-form-item label="鑱旂郴鐢佃瘽" prop="contactPhone">
-          <el-input v-model="form1.contactPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" />
-        </el-form-item>
-        <el-form-item label="绋庡彿" prop="taxNumber">
-          <el-input v-model="form1.taxNumber" placeholder="璇疯緭鍏ョ◣鍙�" />
-        </el-form-item>
-        <el-form-item label="娉曚汉" prop="legalPerson">
-          <el-input v-model="form1.legalPerson" placeholder="璇疯緭鍏ユ硶浜�" />
-        </el-form-item>
-        <el-form-item label="娉ㄥ唽鍦板潃" prop="registerAddress">
-          <el-input v-model="form1.registerAddress" placeholder="璇疯緭鍏ユ敞鍐屽湴鍧�" />
-        </el-form-item>
-        <el-form-item label="閫氳鍦板潃" prop="mailingAddress">
-          <el-input v-model="form1.mailingAddress" placeholder="璇疯緭鍏ラ�氳鍦板潃" />
-        </el-form-item>
-        <el-form-item label="寮�鎴烽摱琛�" prop="bankAccount">
-          <el-input v-model="form1.bankAccount" placeholder="璇疯緭鍏ュ紑鎴烽摱琛�" />
-        </el-form-item>
-        <el-form-item label="閾惰璐︽埛" prop="countNum">
-          <el-input v-model="form1.countNum" placeholder="璇疯緭鍏ラ摱琛岃处鎴�" />
-        </el-form-item>
-        <el-form-item label="閭" prop="email">
-          <el-input v-model="form1.email" placeholder="璇疯緭鍏ラ偖绠�" />
-        </el-form-item>
-        <el-form-item label="璐熻矗浜�" prop="principal">
-          <el-input v-model="form1.principal" placeholder="璇疯緭鍏ヨ礋璐d汉" />
-        </el-form-item>
-        <el-form-item label="缃戝潃" prop="url">
-          <el-input v-model="form1.url" placeholder="璇疯緭鍏ョ綉鍧�" />
-        </el-form-item>
-        <el-form-item label="浼犵湡" prop="faxNumber">
-          <el-input v-model="form1.faxNumber" placeholder="璇疯緭鍏ヤ紶鐪�" />
-        </el-form-item>
-        <el-form-item label="琛屾斂鍖哄垝鍚嶇О" prop="areaName">
-          <el-input v-model="form1.areaName" placeholder="璇疯緭鍏ヨ鏀垮尯鍒掑悕绉�" />
-        </el-form-item>
-        <el-form-item label="鎺掑簭" prop="orderNum">
-          <el-input v-model="form1.orderNum" placeholder="璇疯緭鍏ユ帓搴�" />
-        </el-form-item>
-        <el-form-item label="鏈夋晥鏃堕棿" prop="validTime">
-          <el-date-picker clearable v-model="form1.validTime" type="date" value-format="yyyy-MM-dd"
-            placeholder="璇烽�夋嫨鏈夋晥鏃堕棿">
-          </el-date-picker> </el-form-item><br />
-        <el-form-item label="澶囨敞" prop="remark">
-          <el-input v-model="form1.remark" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" :rows="2" label-width="400px"
-            style="width: 830px" resize="none"></el-input>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer2">
-        <el-button type="primary" @click="submitFormS">纭� 瀹�</el-button>
-        <el-button @click="cancel1">鍙� 娑�</el-button>
-      </div>
-    </el-dialog>
-    <el-row :gutter="20">
-      <el-col :span="17">
-        <div class="grid-content bg-purple">
-          <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>
+  <div
+    v-loading="isLoading"
+    element-loading-text="璇风◢鍊�..."
+    element-loading-spinner="el-icon-loading"
+    element-loading-background="rgba(255, 255, 255, 0.8)"
+    style="height: 100%; padding: 20px; position: relative"
+  >
+    <div class="app-container">
+      <el-dialog
+        :title="title"
+        :visible.sync="open1"
+        width="1000px"
+        append-to-body
+      >
+        <el-form
+          ref="form1"
+          :model="form1"
+          :rules="rules1"
+          label-width="100px"
+          :inline="true"
+        >
+          <el-form-item label="鍗曚綅鍚嶇О" prop="cnName">
+            <el-input v-model="form1.cnName" placeholder="璇疯緭鍏ヤ腑鏂囧悕绉�" />
+          </el-form-item>
+          <el-form-item label="鑱旂郴浜�" prop="contactPerson">
+            <el-input
+              v-model="form1.contactPerson"
+              placeholder="璇疯緭鍏ヨ仈绯讳汉"
+            />
+          </el-form-item>
+          <el-form-item label="鑱旂郴鐢佃瘽" prop="contactPhone">
+            <el-input
+              v-model="form1.contactPhone"
+              placeholder="璇疯緭鍏ヨ仈绯荤數璇�"
+            />
+          </el-form-item>
+          <el-form-item label="绋庡彿" prop="taxNumber">
+            <el-input v-model="form1.taxNumber" placeholder="璇疯緭鍏ョ◣鍙�" />
+          </el-form-item>
+          <el-form-item label="娉曚汉" prop="legalPerson">
+            <el-input v-model="form1.legalPerson" placeholder="璇疯緭鍏ユ硶浜�" />
+          </el-form-item>
+          <el-form-item label="娉ㄥ唽鍦板潃" prop="registerAddress">
+            <el-input
+              v-model="form1.registerAddress"
+              placeholder="璇疯緭鍏ユ敞鍐屽湴鍧�"
+            />
+          </el-form-item>
+          <el-form-item label="閫氳鍦板潃" prop="mailingAddress">
+            <el-input
+              v-model="form1.mailingAddress"
+              placeholder="璇疯緭鍏ラ�氳鍦板潃"
+            />
+          </el-form-item>
+          <el-form-item label="寮�鎴烽摱琛�" prop="bankAccount">
+            <el-input
+              v-model="form1.bankAccount"
+              placeholder="璇疯緭鍏ュ紑鎴烽摱琛�"
+            />
+          </el-form-item>
+          <el-form-item label="閾惰璐︽埛" prop="countNum">
+            <el-input v-model="form1.countNum" placeholder="璇疯緭鍏ラ摱琛岃处鎴�" />
+          </el-form-item>
+          <el-form-item label="閭" prop="email">
+            <el-input v-model="form1.email" placeholder="璇疯緭鍏ラ偖绠�" />
+          </el-form-item>
+          <el-form-item label="璐熻矗浜�" prop="principal">
+            <el-input v-model="form1.principal" placeholder="璇疯緭鍏ヨ礋璐d汉" />
+          </el-form-item>
+          <el-form-item label="缃戝潃" prop="url">
+            <el-input v-model="form1.url" placeholder="璇疯緭鍏ョ綉鍧�" />
+          </el-form-item>
+          <el-form-item label="浼犵湡" prop="faxNumber">
+            <el-input v-model="form1.faxNumber" placeholder="璇疯緭鍏ヤ紶鐪�" />
+          </el-form-item>
+          <el-form-item label="琛屾斂鍖哄垝鍚嶇О" prop="areaName">
+            <el-input
+              v-model="form1.areaName"
+              placeholder="璇疯緭鍏ヨ鏀垮尯鍒掑悕绉�"
+            />
+          </el-form-item>
+          <el-form-item label="鎺掑簭" prop="orderNum">
+            <el-input v-model="form1.orderNum" placeholder="璇疯緭鍏ユ帓搴�" />
+          </el-form-item>
+          <el-form-item label="鏈夋晥鏃堕棿" prop="validTime">
+            <el-date-picker
+              clearable
+              v-model="form1.validTime"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="璇烽�夋嫨鏈夋晥鏃堕棿"
+            >
+            </el-date-picker> </el-form-item
+          ><br />
+          <el-form-item label="澶囨敞" prop="remark">
+            <el-input
+              v-model="form1.remark"
+              type="textarea"
+              placeholder="璇疯緭鍏ュ唴瀹�"
+              :rows="2"
+              label-width="400px"
+              style="width: 830px"
+              resize="none"
+            ></el-input>
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer2">
+          <el-button type="primary" @click="submitFormS">纭� 瀹�</el-button>
+          <el-button @click="cancel1">鍙� 娑�</el-button>
+        </div>
+      </el-dialog>
+      <el-row :gutter="20">
+        <el-col :span="17">
+          <div class="grid-content bg-purple">
+            <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) => {
-                  if (!form.cusName) {
-                    callback('');
-                  } else if (form.cusName) {
-                    callback();
-                  }
-                },
-                trigger: 'blur',
-              },
-            ]">
-              <span slot="label" style="display: inline-block; border-bottom: 2px solid blue" @click="openname">
-                濮撳悕
-              </span>
-              <el-input v-model="form.cusName" placeholder="璇疯緭鍏ュ鍚�" :disabled="isDisabled" @input="form.cusName = $event.replace(/\s/g, '')" />
-            </el-form-item>
+              <el-form-item
+                label="濮撳悕"
+                prop="cusName"
+                :rules="[
+                  {
+                    required: true,
+                    validator: (rule, value, callback) => {
+                      if (!form.cusName) {
+                        callback('');
+                      } else if (form.cusName) {
+                        callback();
+                      }
+                    },
+                    trigger: 'blur',
+                  },
+                ]"
+              >
+                <span
+                  slot="label"
+                  style="display: inline-block; border-bottom: 2px solid blue"
+                  @click="openname"
+                >
+                  濮撳悕
+                </span>
+                <el-input
+                  v-model="form.cusName"
+                  placeholder="璇疯緭鍏ュ鍚�"
+                  :disabled="isDisabled"
+                  @input="form.cusName = $event.replace(/\s/g, '')"
+                />
+              </el-form-item>
 
-            <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="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) => {
-                  if (!form.cusSex && showHidden.has_sex === 'Y') {
-                    callback('');
-                  } else if (showHidden.has_sex === 'N') {
-                    callback();
-                  } else if (form.cusSex && showHidden.has_sex === 'Y') {
-                    callback();
-                  }
-                },
-                trigger: 'blur',
-              },
-            ]">
-              <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-form-item
+                label="鎬у埆"
+                prop="cusSex"
+                :rules="[
+                  {
+                    required: true,
+                    validator: (rule, value, callback) => {
+                      if (!form.cusSex && showHidden.has_sex === 'Y') {
+                        callback('');
+                      } else if (showHidden.has_sex === 'N') {
+                        callback();
+                      } else if (form.cusSex && showHidden.has_sex === 'Y') {
+                        callback();
+                      }
+                    },
+                    trigger: 'blur',
+                  },
+                ]"
+              >
+                <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-form-item label="璇佷欢鍙风爜" prop="cusIdcard" :rules="[
-              {
-                required: true,
-                validator: (rule, value, callback) => {
-                  if (!form.cusIdcard && showHidden.has_idcard === 'Y') {
-                    callback('');
-                  } else if (showHidden.has_idcard === 'N') {
-                    callback();
-                  } else if (
-                    form.cusIdcard &&
-                    showHidden.has_idcard === 'Y'
-                  ) {
-                    callback();
-                  }
-                },
-                trigger: 'blur',
-              },
-            ]">
-              <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="handleIdCardInput"/>
-              <!-- <i style="
+              <el-form-item
+                label="璇佷欢鍙风爜"
+                prop="cusIdcard"
+                :rules="[
+                  {
+                    required: true,
+                    validator: (rule, value, callback) => {
+                      if (!form.cusIdcard && showHidden.has_idcard === 'Y') {
+                        callback('');
+                      } else if (showHidden.has_idcard === 'N') {
+                        callback();
+                      } else if (
+                        form.cusIdcard &&
+                        showHidden.has_idcard === 'Y'
+                      ) {
+                        callback();
+                      }
+                    },
+                    trigger: 'blur',
+                  },
+                ]"
+              >
+                <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="handleIdCardInput"
+                  maxlength="18"
+                />
+                <!-- <i style="
                     font-size: 1rem;
                     position: absolute;
                     right: -20px;
                     top: 10px;
                     cursor: pointer;
                   " class="el-icon-search" @click="handleQuery"></i> -->
-            </el-form-item>
+              </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="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) => {
-                  if (!form.cusPhone && showHidden.is_phone === 'Y') {
-                    callback('');
-                  } else if (showHidden.is_phone === 'N') {
-                    callback();
-                  } else if (form.cusPhone && showHidden.is_phone === 'Y') {
-                    callback();
-                  }
-                },
-                trigger: 'blur',
-              },
-            ]">
-              <el-input v-model="form.cusPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" :disabled="isDisabled" @input="form.cusPhone = $event.replace(/\s/g, '')"/>
-            </el-form-item>
+              <el-form-item
+                label="鐢佃瘽"
+                prop="cusPhone"
+                :rules="[
+                  {
+                    required: true,
+                    validator: (rule, value, callback) => {
+                      if (!form.cusPhone && showHidden.is_phone === 'Y') {
+                        callback('');
+                      } else if (showHidden.is_phone === 'N') {
+                        callback();
+                      } else if (form.cusPhone && showHidden.is_phone === 'Y') {
+                        callback();
+                      }
+                    },
+                    trigger: 'blur',
+                  },
+                ]"
+              >
+                <el-input
+                  v-model="form.cusPhone"
+                  placeholder="璇疯緭鍏ヨ仈绯荤數璇�"
+                  maxlength="11"
+                  :disabled="isDisabled"
+                  @input="form.cusPhone = $event.replace(/\s/g, '')"
+                />
+              </el-form-item>
 
-            <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-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-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-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-form-item label="閭" prop="cusEmail">
-              <el-input v-model="form.cusEmail" placeholder="璇疯緭鍏ラ偖绠�" :disabled="isDisabled" />
-            </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>
-          <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="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>
+            <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="wenHua" label-width="93px">
-              <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-form-item label="鏂囧寲绋嬪害" prop="wenHua" label-width="93px">
+                <el-input
+                  :disabled="isDisabled"
+                  v-model="form.wenHua"
+                  placeholder="璇疯緭鍏ユ枃鍖栫▼搴�"
+                />
+              </el-form-item>
+              <el-form-item label="宸ラ緞" prop="gl">
+                <div>
+                  <el-input v-model="form.gl" style="width: 50%">
+                    <template slot="append">骞�</template>
+                  </el-input>
+                </div>
+              </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">
-                <el-form-item label="鎴峰彛鍦板潃" prop="addr">
-                  <el-input v-model="form.addr" placeholder="璇疯緭鍏ユ埛鍙e湴鍧�" :disabled="isDisabled" />
-                </el-form-item>
+                <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="butopen"
+                    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-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>
-        </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">
-            <img v-if="imageUrl" :src="imageUrl" class="avatar" />
           </div>
-          <div v-if="imgSrc" class="img_bg_camera">
-            <img style="
-                width: 200px;
-                height: 200px;
-                margin-left: -20px;
-                margin-top: 90px;
-                padding-top: 1px;
-              " :src="imgSrc" alt="" class="tx_img" />
-          </div>
-          <video v-show="hides" id="videoCamera" :width="videoWidth" :height="videoHeight" autoplay
-            style="margin-top: 1px"></video>
-          <canvas style="display: none" id="canvasCamera" :width="videoWidth" :height="videoHeight"></canvas>
-          <div class="camera_outer" style="margin-top: 10px">
-            <el-button type="primary" plain size="mini" @click="getCompetence()">鎵撳紑鎽勫儚澶�</el-button>
-            <el-button type="primary" plain size="mini" @click="setImage()">鎷嶇収</el-button>
-            <br />
-          </div>
-        </div>
-      </el-col>
-    </el-row>
-
-    <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-form-item>
-            <el-form-item>
-              <el-button type="primary" icon="el-icon-search" size="mini" @click="handle">鏌ヨ</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">
-                <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" />
-              </el-table>
+        </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"
+            >
+              <img v-if="imageUrl" :src="imageUrl" class="avatar" />
+            </div>
+            <div v-if="imgSrc" class="img_bg_camera">
+              <img
+                style="
+                  width: 200px;
+                  height: 200px;
+                  margin-left: -20px;
+                  margin-top: 90px;
+                  padding-top: 1px;
+                "
+                :src="imgSrc"
+                alt=""
+                class="tx_img"
+              />
+            </div>
+            <video
+              v-show="hides"
+              id="videoCamera"
+              :width="videoWidth"
+              :height="videoHeight"
+              autoplay
+              style="margin-top: 1px"
+            ></video>
+            <canvas
+              style="display: none"
+              id="canvasCamera"
+              :width="videoWidth"
+              :height="videoHeight"
+            ></canvas>
+            <div class="camera_outer" style="margin-top: 10px">
+              <el-button
+                type="primary"
+                plain
+                size="mini"
+                @click="getCompetence()"
+                >鎵撳紑鎽勫儚澶�</el-button
+              >
+              <el-button type="primary" plain size="mini" @click="setImage()"
+                >鎷嶇収</el-button
+              >
+              <br />
             </div>
           </div>
-        </el-tab-pane>
-        <el-tab-pane label="缁勫悎" name="third">
-          <el-row :gutter="20" style="width: 100%">
-            <el-col :span="6" style="min-width: 200px">
-              <div style="text-align: center; margin-bottom: 10px; margin-top: 10px;">
-                椤圭洰鍒楄〃
+        </el-col>
+      </el-row>
+
+      <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"
+              @submit.native.prevent="handle"
+            >
+              <el-form-item label="濂楅鍚嶇О" prop="pacName">
+                <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-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"
+                >
+                  <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"
+                  />
+                </el-table>
               </div>
-              <el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="filterage">
-              </el-input>
-              <div class="tab3">
-                <el-tree class="filter-tree" v-loading="loading" :data="packageList" :props="defaultProp" show-checkbox
-                  node-key="id" @check="handlepackage" :default-checked-keys="checkedkeys"
-                  :filter-node-method="filterpackage" ref="treas" :render-content="renderContents">
-                </el-tree>
-              </div>
-            </el-col>
-            <el-col :span="6" style="min-width: 200px">
-              <div style="text-align: center; margin-bottom: 10px; margin-top: 10px;">
-                鏄庣粏椤圭洰鍒楄〃
-              </div>
-              <div class="tab3">
-                <el-tree class="filter-tree" v-loading="loading" :data="packagedataList" node-key="proId"
-                  :props="defaultpackProps" :filter-node-method="filterpackage" @check-change="handlePackageChecked"
-                  :default-checked-keys="checkedListkey1" :render-content="renderContent">
-                </el-tree>
-              </div>
-            </el-col>
-            <el-col :span="11">
-              <div class="grid-content bg-purple">
-                <div style="
+            </div>
+          </el-tab-pane>
+          <el-tab-pane label="缁勫悎" name="third">
+            <el-row :gutter="20" style="width: 100%">
+              <el-col :span="6" style="min-width: 200px">
+                <div
+                  style="
                     text-align: center;
                     margin-bottom: 10px;
                     margin-top: 10px;
-                  ">
-                  宸查�夐」鐩垪琛�
-                  
+                  "
+                >
+                  椤圭洰鍒楄〃
                 </div>
-                <el-table :data="DataLists" border style="width: 100%" height="400" :span-method="objectspanmethod">
-                  <el-table-column prop="propinName" label="妫�鏌ラ」鐩�">
-                  </el-table-column>
-                  <el-table-column prop="proName" label="鏄庣粏椤圭洰" width="260px">
-                  </el-table-column>
-                  <el-table-column prop="sl" label="鏁伴噺" width="56px">
-                  </el-table-column>
+                <el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="filterage">
+                </el-input>
+                <div class="tab3">
+                  <el-tree
+                    class="filter-tree"
+                    v-loading="loading"
+                    :data="packageList"
+                    :props="defaultProp"
+                    show-checkbox
+                    node-key="id"
+                    @check="handlepackage"
+                    :default-checked-keys="checkedkeys"
+                    :filter-node-method="filterpackage"
+                    ref="treas"
+                    :render-content="renderContents"
+                  >
+                  </el-tree>
+                </div>
+              </el-col>
+              <el-col :span="6" style="min-width: 200px">
+                <div
+                  style="
+                    text-align: center;
+                    margin-bottom: 10px;
+                    margin-top: 10px;
+                  "
+                >
+                  鏄庣粏椤圭洰鍒楄〃
+                </div>
+                <div class="tab3">
+                  <el-tree
+                    class="filter-tree"
+                    v-loading="loading"
+                    :data="packagedataList"
+                    node-key="proId"
+                    :props="defaultpackProps"
+                    :filter-node-method="filterpackage"
+                    @check-change="handlePackageChecked"
+                    :default-checked-keys="checkedListkey1"
+                    :render-content="renderContent"
+                  >
+                  </el-tree>
+                </div>
+              </el-col>
+              <el-col :span="11">
+                <div class="grid-content bg-purple">
+                  <div
+                    style="
+                      text-align: center;
+                      margin-bottom: 10px;
+                      margin-top: 10px;
+                    "
+                  >
+                    宸查�夐」鐩垪琛�
+                  </div>
+                  <el-table
+                    :data="DataLists"
+                    border
+                    style="width: 100%"
+                    height="400"
+                    :span-method="objectspanmethod"
+                  >
+                    <el-table-column prop="propinName" label="妫�鏌ラ」鐩�">
+                    </el-table-column>
+                    <el-table-column
+                      prop="proName"
+                      label="鏄庣粏椤圭洰"
+                      width="260px"
+                    >
+                    </el-table-column>
+                    <el-table-column prop="sl" label="鏁伴噺" width="56px">
+                    </el-table-column>
 
-                  <el-table-column prop="proPrice" label="鍘熶环" width="56px">
-                  </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">
+                    <el-table-column
+                      label="鎿嶄綔"
+                      align="center"
+                      fixed="right"
+                      class-name="small-padding fixed-width"
+                      width="50px"
+                    >
+                      <template slot-scope="scope">
+                        <el-button
+                          size="mini"
+                          type="text"
+                          icon="el-icon-delete"
+                          @click="handleDel(scope.row)"
+                          title="鍒犻櫎"
+                        ></el-button>
+                      </template>
+                    </el-table-column>
+                  </el-table>
+
+                  <h3 style="font-weight: 600">鍚堣锛歿{ marryalls }}鍏�</h3>
+                </div>
+              </el-col>
+            </el-row>
+          </el-tab-pane>
+          <el-tab-pane label="鍗曢」" name="second">
+            <el-row :gutter="20" style="width: 100%">
+              <el-col :span="6" style="min-width: 200px">
+                <div
+                  style="
+                    text-align: center;
+                    margin-bottom: 10px;
+                    margin-top: 10px;
+                  "
+                >
+                  椤圭洰鍒楄〃
+                </div>
+                <el-input
+                  placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�"
+                  v-model="filterText"
+                  style="margin-bottom: 10px"
+                >
+                </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" style="min-width: 200px">
+                <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="proName"
+                      label="鏄庣粏椤圭洰"
+                      width="260px"
+                    >
+                    </el-table-column>
+                    <el-table-column prop="sl" label="鏁伴噺" width="56px">
+                    </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>
+                  <h3 style="font-weight: 600">鍚堣锛歿{ marryall }}鍏�</h3>
+                </div>
+              </el-col>
+            </el-row>
+          </el-tab-pane>
+        </el-tabs>
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="cancel">鍙� 娑�</el-button>
+          <el-button type="primary" @click="submit">纭� 瀹�</el-button>
+        </span>
+      </el-dialog>
+      <!-- -->
+      <el-row v-if="tcShow">
+        <el-col :span="15">
+          <div class="grid-content bg-purple">
+            <template>
+              <el-form
+                :model="form"
+                :inline="true"
+                label-width="75px"
+                style="margin-left: 20px; width: 900px"
+              >
+                <el-form-item label="濮撳悕" prop="cusName">
+                  <span slot="label"> 濮撳悕 </span>
+                  <el-input
+                    v-model="form.cusName"
+                    placeholder="璇疯緭鍏ュ鍚�"
+                    :disabled="isDisabled"
+                  />
+                </el-form-item>
+                <el-form-item label="鎬у埆" prop="cusSex">
+                  <el-select
+                    :disabled="isDisabled"
+                    v-model="form.cusSex"
+                    placeholder="鎬у埆"
+                    style="width: 200px"
+                  >
+                    <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="age">
+                  <el-input
+                    v-model="form.age"
+                    :disabled="isDisabled"
+                    style="width: 142px"
+                  />
+                  <!-- <el-select :disabled="isDisabled" v-model="form.ageUnit" style="width: 15%">
+                    <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="cusIdcard">
+                  <span slot="label"> 璇佷欢鍙风爜 </span>
+                  <el-input
+                    :disabled="isDisabled"
+                    v-model="form.cusIdcard"
+                    placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�"
+                    @input="inputChange"
+                  />
+                </el-form-item>
+                <el-form-item label="鍗曚綅鍚嶇О" prop="firmName">
+                  <el-select
+                    v-model="form.firmName"
+                    remote
+                    default-first-option
+                    allow-create
+                    filterable
+                    style="width: 200px"
+                    placeholder="璇烽�夋嫨鍗曚綅鍚嶇О"
+                    clearable
+                    @change="idFn1"
+                    @clear="clear"
+                  >
+                    <el-option
+                      v-for="dict in CompanyList"
+                      :key="dict.cnName"
+                      :label="dict.cnName"
+                      :value="dict.cnName"
+                    />
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="鍗曚綅閮ㄩ棬" prop="firmDeptName">
+                  <el-input
+                    v-model="form.firmDeptName"
+                    style="width: 150px"
+                    placeholder="璇疯緭鍏ュ崟浣嶉儴闂�"
+                    @input="inputChange"
+                  />
+                </el-form-item>
+                <el-form-item label="浣撴绫诲瀷">
+                  <el-select v-model="form.tjType" placeholder="璇烽�夋嫨浣撴绫诲瀷">
+                    <el-option
+                      v-for="dict in dict.type.dict_team"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="浣撴绫诲埆">
+                  <el-select
+                    style="width: 200px"
+                    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 label="搴旀敹閲戦">
+                  <el-input
+                    placeholder="搴旀敹閲戦"
+                    v-model="TotalPrice1"
+                    disabled
+                    style="width: 150px"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="鎶樻墸">
+                  <!-- {{ discount }} -->
+                  <el-input-number
+                    ref="inputNumber"
+                    style="width: 150px"
+                    v-model="discount"
+                    :precision="1"
+                    :step="0.1"
+                    :max="10"
+                    :min="0"
+                    @change="debounceNumberChange"
+                    :disabled="isfalse"
+                  ></el-input-number>
+                </el-form-item>
+                <el-form-item label="瀹炴敹閲戦">
+                  <el-input
+                    placeholder="瀹炴敹閲戦"
+                    v-model="TotalPrice"
+                    style="width: 206px"
+                    @input="changeXianjia"
+                    @blur="numberChangeXianPrice(discount, discount)"
+                  />
+                </el-form-item>
+                <br />
+
+                <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"
+                    :loading="loadingSubmit"
+                    :disabled="loadingSubmit"
+                    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-form-item label="濮撳悕">
+                  <el-input
+                    placeholder="濮撳悕"
+                    v-model="addAddress.getUser"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="鐢佃瘽">
+                  <el-input
+                    placeholder="鐢佃瘽"
+                    v-model="addAddress.phone"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="鍦板潃">
+                  <el-input
+                    placeholder="鍦板潃"
+                    v-model="addAddress.address"
+                  ></el-input>
+                </el-form-item>
+              </el-form>
+              <div slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="cancell">纭� 瀹�</el-button>
+                <el-button @click="cancel">鍙� 娑�</el-button>
+              </div>
+            </el-dialog>
+
+            <div
+              style="
+                display: flex;
+                align-items: center;
+                justify-content: flex-start;
+                width: 100%;
+              "
+            >
+              <div
+                style="
+                  white-space: nowrap;
+                  overflow: hidden;
+                  text-overflow: ellipsis;
+                  margin-left: 46px;
+                  font-size: 16px;
+                  margin-right: 20px;
+                "
+              >
+                <span v-if="this.tableData1[0]">{{
+                  this.tableData1[0].pacName || ""
+                }}</span>
+                宸查�夐」鐩潯鏁帮細<span
+                  style="font-weight: 700; color: red; margin-right: 5px"
+                  >{{ this.tableData1.length || 0 }}</span
+                >鏉�
+              </div>
+              宸查�夐」鐩垪琛�
+            </div>
+
+            <div
+              v-loading="contentLoading"
+              element-loading-text="鍔犺浇涓�..."
+              element-loading-spinner="el-icon-loading"
+              element-loading-background="rgba(255, 255, 255, 0.7)"
+              style="
+                padding: 0px 6px;
+                border: 1px solid #e6ebf5;
+                max-height: 650%;
+                overflow: auto;
+                width: 916px;
+                margin-left: 35px;
+              "
+            >
+              <div
+                style="
+                  padding: 0px 6px;
+                  border: 1px solid #e6ebf5;
+                  max-height: 650%;
+                  overflow: auto;
+                  width: 916px;
+                  margin-left: 35px;
+                "
+              >
+                <el-table :data="tableData1" border style="width: 100%">
+                  <el-table-column prop="proName" label="椤圭洰" width="180">
+                  </el-table-column>
+                  <el-table-column prop="proType" label="鎬у埆" width="50">
                     <template slot-scope="scope">
-                      <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDel(scope.row)"
-                        title="鍒犻櫎"></el-button>
+                      <template v-if="isAll(scope.row.proType)">
+                        鍏ㄩ儴
+                      </template>
+                      <template v-else>
+                        <dict-tag
+                          :options="dict.type.sys_user_sex"
+                          :value="scope.row.proType"
+                        />
+                      </template>
                     </template>
                   </el-table-column>
-                </el-table>
 
-                <h3 style="font-weight: 600">鍚堣锛歿{ marryalls }}鍏�</h3>
-              </div>
-            </el-col>
-          </el-row>
-        </el-tab-pane>
-        <el-tab-pane label="鍗曢」" name="second">
-          <el-row :gutter="20" style="width: 100%">
-            <el-col :span="6" style="min-width: 200px">
-              <div style="text-align: center; margin-bottom: 10px; margin-top: 10px;">
-                椤圭洰鍒楄〃
-              </div>
-              <el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="filterText" style="margin-bottom: 10px;">
-              </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" style="min-width: 200px">
-              <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 prop="ordPrice" label="搴旀敹閲戦">
                   </el-table-column>
-                  <el-table-column prop="proName" label="鏄庣粏椤圭洰" width="260px">
-                  </el-table-column>
-                  <el-table-column prop="sl" label="鏁伴噺" width="56px">
-                  </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">
+                  <el-table-column label="鎶樻墸">
                     <template slot-scope="scope">
-                      <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                        title="鍒犻櫎"></el-button>
+                      <!-- 鍙緭鍏ョ函鏁板瓧鎶樻墸 -->
+                      <el-input-number
+                        v-model.number="scope.row.discount"
+                        @input="validateDiscount(scope.row)"
+                        @change="handleManualChange(scope.row)"
+                        placeholder="杈撳叆鎶樻墸"
+                        size="small"
+                        type="number"
+                        :precision="1"
+                        :step="0.1"
+                        :max="10"
+                        :min="0"
+                      >
+                      </el-input-number>
                     </template>
                   </el-table-column>
-                </el-table>
-                <h3 style="font-weight: 600">鍚堣锛歿{ marryall }}鍏�</h3>
-              </div>
-            </el-col>
-          </el-row>
-        </el-tab-pane>
-      </el-tabs>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="cancel">鍙� 娑�</el-button>
-        <el-button type="primary" @click="submit">纭� 瀹�</el-button>
-      </span>
-    </el-dialog>
-    <!-- -->
-    <el-row v-if="tcShow">
-      <el-col :span="15">
-        <div class="grid-content bg-purple">
-          <template>
-            <el-form :model="form" :inline="true" label-width="75px" style="margin-left: 20px; width: 900px">
-              <el-form-item label="濮撳悕" prop="cusName">
-                <span slot="label"> 濮撳悕 </span>
-                <el-input v-model="form.cusName" placeholder="璇疯緭鍏ュ鍚�" :disabled="isDisabled" />
-              </el-form-item>
-              <el-form-item label="鎬у埆" prop="cusSex">
-                <el-select :disabled="isDisabled" v-model="form.cusSex" placeholder="鎬у埆" style="width: 150px">
-                  <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label"
-                    :value="parseInt(dict.value)"></el-option>
-                </el-select>
-              </el-form-item>
-              <el-form-item label="璇佷欢鍙风爜" prop="cusIdcard">
-                <span slot="label"> 璇佷欢鍙风爜 </span>
-                <el-input :disabled="isDisabled" v-model="form.cusIdcard" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" @input="inputChange" />
-              </el-form-item>
-              <el-form-item label="鍗曚綅鍚嶇О" prop="firmName">
-                <el-select v-model="form.firmName" remote default-first-option allow-create filterable
-                  style="width: 200px" placeholder="璇烽�夋嫨鍗曚綅鍚嶇О" clearable @change="idFn1" @clear="clear">
-                  <el-option v-for="dict in CompanyList" :key="dict.cnName" :label="dict.cnName" :value="dict.cnName" />
-                </el-select>
-              </el-form-item>
-              <el-form-item label="鍗曚綅閮ㄩ棬" prop="firmDeptName">
-                <el-input v-model="form.firmDeptName" style="width: 150px" placeholder="璇疯緭鍏ュ崟浣嶉儴闂�" @input="inputChange" />
-              </el-form-item>
-              <el-form-item label="浣撴绫诲瀷">
-                <el-select v-model="form.tjType" placeholder="璇烽�夋嫨浣撴绫诲瀷">
-                  <el-option v-for="dict in dict.type.dict_team" :key="dict.value" :label="dict.label"
-                    :value="dict.value"></el-option>
-                </el-select>
-              </el-form-item>
-              <el-form-item label="浣撴绫诲埆">
-                <el-select style="width: 200px" 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 label="搴旀敹閲戦">
-                <el-input placeholder="搴旀敹閲戦" v-model="TotalPrice1" disabled style="width: 150px"></el-input>
-              </el-form-item>
-              <el-form-item label="鎶樻墸">
-                <!-- {{ discount }} -->
-                <el-input-number ref="inputNumber" style="width: 150px" v-model="discount" :precision="1" :step="0.1"
-                  :max="10" :min="0" @change="debounceNumberChange" :disabled="isfalse"></el-input-number>
-              </el-form-item>
-              <el-form-item label="瀹炴敹閲戦">
-                <el-input placeholder="瀹炴敹閲戦" v-model="TotalPrice" style="width: 206px" @input="changeXianjia"
-                  @blur="numberChangeXianPrice(discount, discount)" />
-              </el-form-item>
-              <br />
-
-              <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" :loading="loadingSubmit" :disabled="loadingSubmit"
-                  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-form-item label="濮撳悕">
-                <el-input placeholder="濮撳悕" v-model="addAddress.getUser"></el-input>
-              </el-form-item>
-              <el-form-item label="鐢佃瘽">
-                <el-input placeholder="鐢佃瘽" v-model="addAddress.phone"></el-input>
-              </el-form-item>
-              <el-form-item label="鍦板潃">
-                <el-input placeholder="鍦板潃" v-model="addAddress.address"></el-input>
-              </el-form-item>
-            </el-form>
-            <div slot="footer" class="dialog-footer">
-              <el-button type="primary" @click="cancell">纭� 瀹�</el-button>
-              <el-button @click="cancel">鍙� 娑�</el-button>
-            </div>
-          </el-dialog>
-
-          <div style="
-              display: flex;
-              align-items: center;
-              justify-content: flex-start;
-              width: 100%;
-            ">
-            <div style="
-                white-space: nowrap;
-                overflow: hidden;
-                text-overflow: ellipsis;
-                margin-left: 46px;
-                font-size: 16px;
-                margin-right: 20px;
-              ">
-              <span v-if="this.tableData1[0]">{{
-                this.tableData1[0].pacName || ""
-              }}</span>
-              宸查�夐」鐩潯鏁帮細<span style="font-weight: 700; color: red; margin-right: 5px">{{ this.tableData1.length || 0
-                }}</span>鏉�
-            </div>
-            宸查�夐」鐩垪琛�
-          </div>
-          <div style="
-              padding: 0px 6px;
-              border: 1px solid #e6ebf5;
-              max-height: 650%;
-              overflow: auto;
-              width: 916px;
-              margin-left: 35px;
-            ">
-            <el-table :data="tableData1" border style="width: 100%">
-              <el-table-column prop="proName" label="椤圭洰" width="180">
-              </el-table-column>
-              <el-table-column prop="proType" label="鎬у埆" width="50">
-                <template slot-scope="scope">
-                  <template v-if="isAll(scope.row.proType)"> 鍏ㄩ儴 </template>
-                  <template v-else>
-                    <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.proType" />
-                  </template>
-                </template>
-              </el-table-column>
-
-              <el-table-column prop="ordPrice" label="搴旀敹閲戦">
-              </el-table-column>
-              <el-table-column label="鎶樻墸">
-                <template slot-scope="scope">
-                  <!-- 鍙緭鍏ョ函鏁板瓧鎶樻墸 -->
-                  <el-input-number v-model.number="scope.row.discount" @input="validateDiscount(scope.row)"
-                    @change="handleManualChange(scope.row)" placeholder="杈撳叆鎶樻墸" size="small" type="number" :precision="1"
-                    :step="0.1" :max="10" :min="0">
-                  </el-input-number>
-                </template>
-              </el-table-column>
-              <el-table-column prop="nowPrice" label="瀹炴敹閲戦">
-              </el-table-column>
-              <el-table-column prop="proCheckMethod" label="鏄惁绌鸿吂">
-                <template slot-scope="scope">
-                  <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.proCheckMethod" />
-                </template>
-              </el-table-column>
-              <!-- <el-table-column prop="proCheckMethod" label="鍏垂">
+                  <el-table-column prop="nowPrice" label="瀹炴敹閲戦">
+                    <template slot-scope="scope">
+                      {{ scope.row.nowPrice.toFixed(2) }}
+                    </template>
+                  </el-table-column>
+                  <el-table-column prop="proCheckMethod" label="鏄惁绌鸿吂">
+                    <template slot-scope="scope">
+                      <dict-tag
+                        :options="dict.type.sys_yes_no"
+                        :value="scope.row.proCheckMethod"
+                      />
+                    </template>
+                  </el-table-column>
+                  <!-- <el-table-column prop="proCheckMethod" label="鍏垂">
                 <template #default="scope">
                   <el-checkbox v-model="scope.row.free" :disabled="true">
                     {{ scope.row.free ? "鍏嶈垂" : "鏀惰垂" }}
                   </el-checkbox>
                 </template>
               </el-table-column> -->
-              <el-table-column label="鎿嶄綔" align="center" width="80px">
-                <template slot-scope="scope">
-                  <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete1(scope.row)" title="鍒犻櫎">
-                  </el-button>
-                </template>
-              </el-table-column>
-            </el-table>
+                  <el-table-column label="鎿嶄綔" align="center" width="80px">
+                    <template slot-scope="scope">
+                      <el-button
+                        size="mini"
+                        type="text"
+                        icon="el-icon-delete"
+                        @click="handleDelete1(scope.row)"
+                        title="鍒犻櫎"
+                      >
+                      </el-button>
+                    </template>
+                  </el-table-column>
+                </el-table>
+              </div>
+            </div>
           </div>
+        </el-col>
+      </el-row>
+
+      <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>
         </div>
-      </el-col>
-    </el-row>
+      </el-dialog>
 
-    <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>
-      </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-column type="selection" width="55" align="center" />
+            <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"
+                />
+              </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"
+            >
+              <template slot-scope="scope">
+                <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>
 
-    <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-column type="selection" width="55" align="center" />
-          <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" />
-            </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">
-            <template slot-scope="scope">
-              <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>
+          <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-item label="搴旀敹閲戦">
+                  <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="1"
+                    :step="0.1"
+                    :max="10"
+                    :min="0"
+                    @change="debounceNumberChange"
+                    :disabled="isfalse"
+                  ></el-input-number>
+                </el-form-item>
+                <el-form-item label="瀹炴敹閲戦">
+                  <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>
+                </el-form-item>
+                <el-form-item>
+                  <el-button
+                    style="margin-left: 15px"
+                    type="primary"
+                    size="mini"
+                    @click="SubmitEvent"
+                    >鏀惰垂</el-button
+                  >
+                </el-form-item>
+              </el-form>
+            </el-col>
+          </el-row>
 
-        <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-item label="搴旀敹閲戦">
-                <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="1" :step="0.1" :max="10" :min="0"
-                  @change="debounceNumberChange" :disabled="isfalse"></el-input-number>
-              </el-form-item>
-              <el-form-item label="瀹炴敹閲戦">
-                <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>
-              </el-form-item>
-              <el-form-item>
-                <el-button style="margin-left: 15px" type="primary" size="mini" @click="SubmitEvent">鏀惰垂</el-button>
-              </el-form-item>
-            </el-form>
-          </el-col>
-        </el-row>
-
-        <el-table v-loading="loading" :data="Chargesubitem" border height="240">
-          <el-table-column type="index" width="50"> </el-table-column>
-          <el-table-column label="椤圭洰鍚嶇О" align="center" prop="proName" />
-          <el-table-column label="搴旀敹閲戦" align="center" prop="proOrdPrice" />
-          <el-table-column label="瀹炴敹閲戦" align="center" prop="proPrice" />
-        </el-table>
-      </div>
-    </el-dialog>
-    <el-dialog title="鎻愮ず" :visible.sync="cardreader" width="30%" :close-on-press-escape="false"
-      :close-on-click-modal="false">
-      <template>
-        <el-radio-group v-model="cardreaderradio" @input="changeradio">
-          <el-radio :label="3">韬唤璇�</el-radio>
-          <el-radio :label="6">鍋ュ悍鐮�</el-radio>
-        </el-radio-group>
-        <div style="margin-top: 10px" v-show="cardreaderradio == 6">
-          <el-input v-model="inputSSS" ref="tableHeadFilterInp" placeholder="璇疯緭鍏ュ唴瀹�"></el-input>
+          <el-table
+            v-loading="loading"
+            :data="Chargesubitem"
+            border
+            height="240"
+          >
+            <el-table-column type="index" width="50"> </el-table-column>
+            <el-table-column label="椤圭洰鍚嶇О" align="center" prop="proName" />
+            <el-table-column
+              label="搴旀敹閲戦"
+              align="center"
+              prop="proOrdPrice"
+            />
+            <el-table-column label="瀹炴敹閲戦" align="center" prop="proPrice" />
+          </el-table>
         </div>
-      </template>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="cardreader = false">鍙� 娑�</el-button>
-        <el-button type="primary" @click="cardreadercopes">纭� 瀹�</el-button>
-      </span>
-    </el-dialog>
-    <div style="position: absolute; bottom: 100px; width: 360px; display: none">
-      <div id="printBill" style="width: 280px; font-size: 1px" ref="printContent">
-        <div style="font-size: 1px">
-          <div style="text-align: center">
-            <h3>{{ hospName }}灏忕エ</h3>
+      </el-dialog>
+      <el-dialog
+        title="鎻愮ず"
+        :visible.sync="cardreader"
+        width="30%"
+        :close-on-press-escape="false"
+        :close-on-click-modal="false"
+      >
+        <template>
+          <el-radio-group v-model="cardreaderradio" @input="changeradio">
+            <el-radio :label="3">韬唤璇�</el-radio>
+            <el-radio :label="6">鍋ュ悍鐮�</el-radio>
+          </el-radio-group>
+          <div style="margin-top: 10px" v-show="cardreaderradio == 6">
+            <el-input
+              v-model="inputSSS"
+              ref="tableHeadFilterInp"
+              placeholder="璇疯緭鍏ュ唴瀹�"
+            ></el-input>
           </div>
+        </template>
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="cardreader = false">鍙� 娑�</el-button>
+          <el-button type="primary" @click="cardreadercopes">纭� 瀹�</el-button>
+        </span>
+      </el-dialog>
+      <div
+        style="position: absolute; bottom: 100px; width: 360px; display: none"
+      >
+        <div
+          id="printBill"
+          style="width: 280px; font-size: 1px"
+          ref="printContent"
+        >
+          <div style="font-size: 1px">
+            <div style="text-align: center">
+              <h3>{{ hospName }}灏忕エ</h3>
+            </div>
 
-          <div style="margin-top: 4px">
-            <div>濮撳悕:{{ formIn.name }}</div>
-            <div>鐢佃瘽:{{ formIn.phone }}</div>
-            <div>浣撴椤圭洰:{{ formIn.tjPro }}</div>
-            <div>瀹炴敹閲戦:{{ formInline.paidIn }}鍏�</div>
-            <div>鏀惰垂鏃堕棿:{{ currentDate + " " + currentTime }}</div>
+            <div style="margin-top: 4px">
+              <div>濮撳悕:{{ formIn.name }}</div>
+              <div>鐢佃瘽:{{ formIn.phone }}</div>
+              <div>浣撴椤圭洰:{{ formIn.tjPro }}</div>
+              <div>瀹炴敹閲戦:{{ formInline.paidIn }}鍏�</div>
+              <div>鏀惰垂鏃堕棿:{{ currentDate + " " + currentTime }}</div>
+            </div>
           </div>
         </div>
       </div>
-    </div>
 
-    <!-- <el-dialog
+      <!-- <el-dialog
       title="鎷嶇収"
       :visible.sync="beat"
       width="40%"
       :before-close="handleClose"
     > -->
 
-    <!-- <span slot="footer" class="dialog-footer">
+      <!-- <span slot="footer" class="dialog-footer">
         <el-button @click="beat = false">鍙� 娑�</el-button>
         <el-button type="primary" @click="beat = false">纭� 瀹�</el-button>
       </span> -->
-    <!-- </el-dialog> -->
-    <historyTj :cusIdCard="form.cusIdcard" ref="historyTj"></historyTj>
-    <el-dialog title="鎻愮ず" :visible.sync="dialogVisiblese" width="30%">
-      <span>鏄惁澶嶅埗鏈�杩戜竴娆$殑浣撴椤圭洰锛�</span>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisiblese = false">鍙� 娑�</el-button>
-        <el-button type="primary" @click="copes">纭� 瀹�</el-button>
-      </span>
-    </el-dialog>
-    <Packages ref="aaa" @add="handleChanges" />
-    <selectName ref="bbb" @add="handleChangesName" />
+      <!-- </el-dialog> -->
+      <historyTj :cusIdCard="form.cusIdcard" ref="historyTj"></historyTj>
+      <el-dialog title="鎻愮ず" :visible.sync="dialogVisiblese" width="30%">
+        <span>鏄惁澶嶅埗鏈�杩戜竴娆$殑浣撴椤圭洰锛�</span>
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="dialogVisiblese = false">鍙� 娑�</el-button>
+          <el-button type="primary" @click="copes">纭� 瀹�</el-button>
+        </span>
+      </el-dialog>
+      <Packages ref="aaa" @add="handleChanges" />
+      <selectName ref="bbb" @add="handleChangesName" />
+    </div>
   </div>
 </template>
 
@@ -731,7 +1474,7 @@
   getByTjNum,
 } from "@/api/hosp/customer";
 import { getPrintSetUp } from "@/api/system/examcharge";
-import cnchar from 'cnchar';
+import cnchar from "cnchar";
 import {
   tuantiSelect,
   deptTreeSelect,
@@ -771,6 +1514,7 @@
     "dict_job",
     "dict_user_cardtype",
     "dict_ageunit",
+    "gz",
   ],
   name: "Tijian",
   components: {
@@ -782,6 +1526,8 @@
   data() {
     return {
       isSubmitting: false,
+      contentLoading: false,
+      isLoading: false,
       open1: false,
       filterage: "",
       checkedkeys: [],
@@ -908,6 +1654,7 @@
       // 闈炲崟涓鐢�
       single: true,
       cardreader: false,
+      butopen: false,
       // 闈炲涓鐢�
       multiple: true,
       nodeobj: {},
@@ -1039,6 +1786,7 @@
         contactPhone: [
           {
             required: true,
+            message: "",
             trigger: "blur",
           },
           {
@@ -1050,7 +1798,6 @@
     };
   },
   watch: {
-
     filterText(val) {
       this.$refs.tree.filter(val);
     },
@@ -1074,9 +1821,9 @@
   },
   methods: {
     handleIdCardInput(value) {
-  this.form.cusIdcard = value.replace(/\s/g, '');
-  this.inputChange(); // 淇濈暀鍘熸湁鐨勮韩浠借瘉杈撳叆澶勭悊閫昏緫
-},
+      this.form.cusIdcard = value.replace(/\s/g, "");
+      this.inputChange(); // 淇濈暀鍘熸湁鐨勮韩浠借瘉杈撳叆澶勭悊閫昏緫
+    },
     debounceNumberChange(currentValue, oldValue) {
       clearTimeout(this.debounceTimer);
       this.debounceTimer = setTimeout(() => {
@@ -1095,7 +1842,6 @@
     },
     /** 鍒犻櫎鎸夐挳鎿嶄綔 */
     handleDelete1(row) {
-      // console.log(row);
       let data = {
         cusCardId: row.cusId,
         proId: row.parentProId,
@@ -1108,7 +1854,10 @@
         .then(() => {
           this.TotalPrice1 = 0;
           getTransitionList1(row.cusId).then((response) => {
-            this.tableData1 = response.data;
+            this.tableData1 = response.data.list;
+            if (response.data.tjCategory != null) {
+              this.tjCategory = response.data.tjCategory;
+            }
 
             this.tableData1.forEach((item) => {
               this.TotalPrice1 += item.ordPrice;
@@ -1123,14 +1872,17 @@
           });
           this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
         })
-        .catch(() => { });
+        .catch(() => {});
     },
     handleManualChange(row) {
-      console.log("杩欐槸涓诲姩鍑哄彂鐨�");
       this.updateProPrice(row);
     },
     validateDiscount(row) {
-      if (this.TotalPrice !== undefined && !isNaN(this.TotalPrice) && this.TotalPrice !== this.lastXianPrice) {
+      if (
+        this.TotalPrice !== undefined &&
+        !isNaN(this.TotalPrice) &&
+        this.TotalPrice !== this.lastXianPrice
+      ) {
         this.updateProPrice1(row);
         this.lastXianPrice = this.TotalPrice;
       }
@@ -1153,13 +1905,12 @@
         (Math.floor((this.TotalPrice / this.TotalPrice1) * 100) / 100) * 10;
     },
     updateProPrice1(row) {
-      console.log("杩涘叆浜�1")
       const ordPrice = new Big(row.ordPrice);
       const discount = new Big(row.discount);
       const result = ordPrice.times(discount.div(10));
       row.nowPrice = result.toNumber();
       const totalYsPrice = this.tableData1.reduce((sum, item) => {
-        return sum.plus(new Big(item.nowPrice || '0'));
+        return sum.plus(new Big(item.nowPrice || "0"));
       }, new Big(0));
       const totalYsPriceNum = totalYsPrice.toNumber();
       if (this.TotalPrice !== undefined && !isNaN(this.TotalPrice)) {
@@ -1168,13 +1919,18 @@
         if (!diff.eq(0) && this.tableData1.length > 0) {
           const lastItem = this.tableData1[this.tableData1.length - 1];
           const newYsPrice = new Big(lastItem.nowPrice).plus(diff).toNumber();
-          this.$set(this.tableData1[this.tableData1.length - 1], 'nowPrice', newYsPrice);
+          this.$set(
+            this.tableData1[this.tableData1.length - 1],
+            "nowPrice",
+            newYsPrice
+          );
         }
       }
 
       // Update youhui calculation
       if (this.TotalPrice1 !== 0 && this.TotalPrice !== 0) {
-        this.discount = (Math.floor((this.TotalPrice / this.TotalPrice1) * 100) / 100) * 10;
+        this.discount =
+          (Math.floor((this.TotalPrice / this.TotalPrice1) * 100) / 100) * 10;
       } else {
         this.discount = 0;
       }
@@ -1225,11 +1981,9 @@
       this.open1 = true;
       this.title = "娣诲姞浣撴鍗曚綅淇℃伅缁存姢";
     },
-    idFn1(value) {
-      if (value) {
-        // console.log(value);
+    idFn1() {
+      if (this.form.firmName) {
         const originalCompId = this.form.firmId;
-        this.form.firmName = value;
         this.CompanyList.forEach((item) => {
           if (item.cnName == this.form.firmName) {
             this.form.firmId = item.drugManufacturerId;
@@ -1239,9 +1993,12 @@
         if (this.form.firmId === originalCompId) {
           this.form.firmId = "";
         }
-        if (this.form.firmId) {
-          this.form.tjType = "1";
-        }
+      }
+
+      if (this.form.firmName) {
+        this.form.tjType = this.dict.type.dict_team[1].value;
+      } else {
+        this.form.tjType = this.dict.type.dict_team[0].value;
       }
     },
     getCurrentDateTime() {
@@ -1282,32 +2039,35 @@
       //   return data.proEngName.indexOf(value) !== -1;
       // }
       if (!value) return true;
-        if (data.proName.indexOf(value) !== -1) return true;
-        if (data.proEngName.indexOf(value) !== -1) return true;
-        // 鍖归厤灏忓啓
-        let arr = data.proName.spell('low', 'array');
-        let spell = arr.join('');
-        let lengths = [0];
-        for (var i = 0; i < arr.length - 1; i++) {
-            lengths.push(lengths[i] + arr[i].length);
-        };
-        //鍒ゆ柇label瀹屾暣鎷奸煶 涓� 杈撳叆鍊肩殑 index 鏄笉鏄瓑浜庢煇涓眽瀛楃涓�涓嫾闊冲瓧姣嶇殑index鍊�
-        if(lengths.indexOf(spell.indexOf(value)) !== -1) return true
-        // 澶у啓
-        let arrUp = data.proName.spell('up', 'array');
-        let spellUp = arrUp.join('');
-        let lengthsUp = [0];
-        for (var i = 0; i < arrUp.length - 1; i++) {
-            lengthsUp.push(lengthsUp[i] + arrUp[i].length);
-        };
-        return lengthsUp.indexOf(spellUp.indexOf(value)) !== -1;  
+      if (data.proName.indexOf(value) !== -1) return true;
+      let values = value.toLowerCase();
+      if (data.proEngName.indexOf(values) !== -1) return true;
+
+      // 鍖归厤灏忓啓
+      let arr = data.proName.spell("low", "array");
+      let spell = arr.join("");
+      let lengths = [0];
+      for (var i = 0; i < arr.length - 1; i++) {
+        lengths.push(lengths[i] + arr[i].length);
+      }
+      //鍒ゆ柇label瀹屾暣鎷奸煶 涓� 杈撳叆鍊肩殑 index 鏄笉鏄瓑浜庢煇涓眽瀛楃涓�涓嫾闊冲瓧姣嶇殑index鍊�
+      if (lengths.indexOf(spell.indexOf(value)) !== -1) return true;
+      // 澶у啓
+      let arrUp = data.proName.spell("up", "array");
+      let spellUp = arrUp.join("");
+      let lengthsUp = [0];
+      for (var i = 0; i < arrUp.length - 1; i++) {
+        lengthsUp.push(lengthsUp[i] + arrUp[i].length);
+      }
+      return lengthsUp.indexOf(spellUp.indexOf(value)) !== -1;
     },
     filterpackage(value, data) {
       if (!value) return true;
       if (data.zhmc.indexOf(value) !== -1) {
         return data.zhmc.indexOf(value) !== -1;
       } else {
-        return data.pym.indexOf(value) !== -1;
+        let values = value.toLowerCase();
+        return data.pym.indexOf(values) !== -1;
       }
     },
     beforeDestroy() {
@@ -1322,9 +2082,7 @@
     },
     getList1() {
       getInfo().then((response) => {
-
         this.hospName = response.hospName;
-
       });
       getIsRequired().then((response) => {
         this.showHidden = response.data;
@@ -1350,8 +2108,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;
@@ -1420,10 +2178,15 @@
             let cusId = this.form.cusIdcard;
             this.proIds = [];
             getTransitionList1(cusId).then((response) => {
-              this.tableData1 = response.data;
+              this.tableData1 = response.data.list;
+              if (response.data.tjCategory != null) {
+                this.tjCategory = response.data.tjCategory;
+              }
               this.TotalPrice1 = 0;
               if (this.tableData1) {
                 this.tableData1.forEach((item) => {
+                  // parseFloat(item.nowPrice.toFixed(2))
+
                   this.TotalPrice1 += item.ordPrice;
                   this.TotalPrice += item.nowPrice;
                   if (item.pacName === null) {
@@ -1508,7 +2271,7 @@
             _this.thisVideo.play();
           };
         })
-        .catch((err) => { });
+        .catch((err) => {});
     },
     //  缁樺埗鍥剧墖锛堟媿鐓у姛鑳斤級
 
@@ -1543,15 +2306,12 @@
         .then((_) => {
           done();
         })
-        .catch((_) => { });
+        .catch((_) => {});
     },
 
     /** 鏌ヨ淇℃伅鍒楄〃 */
     getList() {
-      getInfo().then((response) => {
-
-
-      });
+      getInfo().then((response) => {});
       let cusSex = this.form.cusSex;
       //鍏ㄩ儴濂楅
       if (cusSex) {
@@ -1616,7 +2376,7 @@
               pacId: "",
               proIds: [],
             };
-            getaddtTransition(data).then((response) => { });
+            getaddtTransition(data).then((response) => {});
             this.$tab.refreshPage();
           });
         } else {
@@ -1681,11 +2441,11 @@
               const newYsPrice = new Big(lastItem.nowPrice)
                 .plus(diff)
                 .toNumber();
-              console.log(
-                "hhh",
-                this.tableData1[this.tableData1.length - 1].nowPrice,
-                newYsPrice
-              );
+              // console.log(
+              //   "hhh",
+              //   this.tableData1[this.tableData1.length - 1].nowPrice,
+              //   newYsPrice
+              // );
               this.$set(
                 this.tableData1[this.tableData1.length - 1],
                 "nowPrice",
@@ -1701,41 +2461,58 @@
     },
     /** 鐧昏鎻愪氦鎸夐挳 */
     /** 鐧昏鎻愪氦鎸夐挳 */
-submitForm() {
-  let _this = this;
-  this.$refs["form"].validate((valid) => {
-    if (valid) {
-      // 鍒涘缓琛ㄥ崟鏁版嵁鐨勫壇鏈苟鍘婚櫎绌烘牸
-      const formData = { ...this.form };
-      formData.cusName = formData.cusName ? formData.cusName.replace(/\s/g, '') : '';
-      formData.cusPhone = formData.cusPhone ? formData.cusPhone.replace(/\s/g, '') : '';
-      formData.cusIdcard = formData.cusIdcard ? formData.cusIdcard.replace(/\s/g, '') : '';
+    submitForm() {
+      let _this = this;
+      _this.butopen = true;
+      if (!this.form.cusPhone || !this.form.cusName) {
+        this.$message.warning("璇峰~鍐欏繀濉」");
+      } else {
+        this.$refs["form"].validate((valid) => {
+          if (valid) {
+            // 鍒涘缓琛ㄥ崟鏁版嵁鐨勫壇鏈苟鍘婚櫎绌烘牸
+            const formData = { ...this.form };
+            formData.cusName = formData.cusName
+              ? formData.cusName.replace(/\s/g, "")
+              : "";
+            formData.cusPhone = formData.cusPhone
+              ? formData.cusPhone.replace(/\s/g, "")
+              : "";
+            formData.cusIdcard = formData.cusIdcard
+              ? formData.cusIdcard.replace(/\s/g, "")
+              : "";
 
-      // 澶勭悊鎬у埆鍊�
-      if (formData.cusSex === "濂�") {
-        formData.cusSex = 1;
+            // 澶勭悊鎬у埆鍊�
+            if (formData.cusSex === "濂�") {
+              formData.cusSex = 1;
+            }
+            if (formData.cusSex === "鐢�") {
+              formData.cusSex = 0;
+            }
+            if (formData.cusSex === "鏈煡") {
+              formData.cusSex = 2;
+            }
+            if (formData.tjType === "") {
+              formData.tjType = this.dict.type.dict_team[0].value;
+            }
+            addCustomer(formData)
+              .then((response) => {
+                _this.butopen = false;
+                this.responseList = response.data;
+                this.form.tjType = this.dict.type.dict_team[0].value;
+                this.$modal.msgSuccess("鏂板鎴愬姛");
+                _this.tcShow = true;
+                _this.isDisabled = true;
+                _this.top = false;
+              })
+              .catch((error) => {
+                _this.butopen = false;
+                this.$modal.msgError("鐧昏澶辫触锛岃妫�鏌ユ暟鎹�");
+                console.error("Error in addCustomer:", error);
+              });
+          }
+        });
       }
-      if (formData.cusSex === "鐢�") {
-        formData.cusSex = 0;
-      }
-      if (formData.cusSex === "鏈煡") {
-        formData.cusSex = 2;
-      }
-      if (formData.tjType === "") {
-        formData.tjType = this.dict.type.dict_team[0].value;
-      }
-
-      addCustomer(formData).then((response) => {
-        this.responseList = response.data;
-        this.form.tjType = this.dict.type.dict_team[0].value;
-        this.$modal.msgSuccess("鏂板鎴愬姛");
-        _this.tcShow = true;
-        _this.isDisabled = true;
-        _this.top = false;
-      });
-    }
-  });
-},
+    },
 
     getmailType() {
       if (this.getType == "2") {
@@ -1753,9 +2530,11 @@
       let cusIdcard = this.form.cusIdcard;
       if (cusIdcard) {
         getCusIdcard(cusIdcard).then((response) => {
+          console.log(response, 1111111111);
           _this.top = false;
           if (response.data) {
             this.form = response.data;
+            this.form.firmDeptName = response.data.department;
             if (this.form.discount === null) {
               this.discount = 10;
             } else {
@@ -1773,7 +2552,7 @@
             if (this.form.reservationId != null) {
               if (this.form.groupingId) {
                 this.form.firmName = this.form.compName;
-                this.form.tjType = this.dict.type.dict_team[2].value;
+                this.form.tjType = this.dict.type.dict_team[1].value;
                 this.CompanyList.forEach((item) => {
                   if (item.cnName == this.form.firmName) {
                     this.form.firmId = item.drugManufacturerId;
@@ -1782,7 +2561,10 @@
                 _this.tcShow = true;
 
                 getTransitionList1(this.form.cusIdcard).then((res) => {
-                  this.tableData1 = res.data;
+                  this.tableData1 = res.data.list;
+                  if (res.data.tjCategory != null) {
+                    this.tjCategory = res.data.tjCategory;
+                  }
                   if (this.tableData1) {
                     this.tableData1.forEach((item) => {
                       this.TotalPrice1 += item.ordPrice;
@@ -1807,7 +2589,10 @@
                   _this.formPacId = this.form.pacId;
                   let cusId = this.form.cusIdcard;
                   getTransitionList1(cusId).then((response) => {
-                    this.tableData1 = response.data;
+                    this.tableData1 = response.data.list;
+                    if (response.data.tjCategory != null) {
+                      this.tjCategory = response.data.tjCategory;
+                    }
                     if (this.tableData1) {
                       this.TotalPrice1 = 0;
                       this.tableData1.forEach((item) => {
@@ -1894,7 +2679,6 @@
               /* this.$refs.aaa.open = true;
               this.$refs.aaa.getAllList();
               this.$refs.aaa.title = "璇佷欢瀛楀吀"; */
-
             } else if (res.msg == "S") {
               this.cardreader = true;
               _this.cardreaderradio = 3;
@@ -1908,11 +2692,15 @@
     // 鏈�鏂颁娇鐢╳ebSocket閫氫俊
     readCardWebSocket(resultObj) {
       let _this = this;
-
+      const isChineseChar = (char) => /[\u4E00-\u9FA5]/.test(char);
       if (resultObj.code === 200 && resultObj.data.name != null) {
         //鍥炴樉鐩稿叧鏁版嵁
         _this.form.cusName = resultObj.data.name;
-        _this.form.cusSex = resultObj.data.sex == "0" ? "濂�" : "鐢�";
+        if (isChineseChar(resultObj.data.sex)) {
+          _this.form.cusSex = resultObj.data.sex == "濂�" ? 1 : 0;
+        } else {
+          _this.form.cusSex = resultObj.data.sex == "1" ? 0 : 1;
+        }
         _this.form.cusNational = resultObj.data.mz;
         _this.form.cusBrithday = resultObj.data.csrq;
         if (_this.form.cusBrithday) {
@@ -1938,8 +2726,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.age = age; // 璧嬪�艰绠楃殑骞撮緞
@@ -1966,8 +2754,7 @@
         if (resultObj.resultFlag == "0") {
           //鍥炴樉鐩稿叧鏁版嵁
           _this.form.cusName = resultObj.resultContent.partyName;
-          _this.form.cusSex =
-            resultObj.resultContent.gender == "0" ? "濂�" : "鐢�";
+          _this.form.cusSex = resultObj.resultContent.gender;
           _this.form.cusNational = resultObj.resultContent.nation;
           _this.form.cusBrithday = resultObj.resultContent.bornDay;
           if (_this.form.cusBrithday) {
@@ -2058,8 +2845,14 @@
         };
         websocket.onmessage = function (event) {
           var resultObj = JSON.parse(event.data);
+          const isChineseChar = (char) => /[\u4E00-\u9FA5]/.test(char);
           _this.form.cusName = resultObj.data.name;
-          _this.form.cusSex = resultObj.data.sex;
+          // _this.form.cusSex = resultObj.data.sex;
+          if (isChineseChar(resultObj.data.sex)) {
+            _this.form.cusSex = resultObj.data.sex == "濂�" ? 1 : 0;
+          } else {
+            _this.form.cusSex = resultObj.data.sex == "1" ? 0 : 1;
+          }
           _this.form.cusNational = resultObj.data.mz;
           _this.form.cusBrithday = resultObj.data.csrq;
           if (_this.form.cusBrithday) {
@@ -2086,8 +2879,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);
 
@@ -2188,8 +2981,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);
 
@@ -2244,7 +3037,6 @@
       this.malldisble = false;
       this.defaultKeys = [];
       this.DataLists = [];
-      
     },
 
     cancell() {
@@ -2264,7 +3056,8 @@
         dwId: this.form.firmId,
       };
       if (this.name) {
-        getPackageListName(this.name).then((response) => {
+        let name = this.name.toLowerCase();
+        getPackageListName(name).then((response) => {
           this.newpacName = response.data;
           this.loading = false;
         });
@@ -2298,7 +3091,7 @@
       this.DataList = []; // 娓呯┖宸查�夐」鐩垪琛�
       this.checkedkey = []; // 娓呯┖鏍戠殑閫変腑鐘舵��
       this.checkedListkey = [];
-      this.TreedataList = []
+      this.TreedataList = [];
 
       let data = {
         cusId,
@@ -2310,7 +3103,10 @@
           let cusId = this.form.cusIdcard;
           this.proIds = [];
           getTransitionList1(cusId).then((response) => {
-            this.tableData1 = response.data;
+            this.tableData1 = response.data.list;
+            if (response.data.tjCategory != null) {
+              this.tjCategory = response.data.tjCategory;
+            }
             this.TotalPrice1 = 0;
             if (this.tableData1.length >= 1) {
               this.list1 = false;
@@ -2327,6 +3123,11 @@
 
     Package() {
       this.activeNames = "first";
+      if (this.form.cusSex == "鐢�") {
+        this.form.cusSex = 0;
+      } else if (this.form.cusSex == "濂�") {
+        _this.form.cusSex = 1;
+      }
       let cusSex = this.form.cusSex;
       this.datekey = Date.now();
       //鍏ㄩ儴濂楅
@@ -2361,12 +3162,10 @@
                   });
                 });
               }
-            } catch (error) { }
+            } catch (error) {}
             this.loading = false;
           });
-        }
-
-        else {
+        } else {
           this.taocan = true;
           this.loading = true;
           tuantiSelect(param).then((res) => {
@@ -2386,7 +3185,7 @@
                   });
                 });
               }
-            } catch (error) { }
+            } catch (error) {}
             this.loading = false;
           });
         }
@@ -2410,7 +3209,7 @@
                 });
               });
             }
-          } catch (error) { }
+          } catch (error) {}
           this.loading = false;
         });
       }
@@ -2500,6 +3299,8 @@
     },
     handleClick(tab, event) {
       if (this.activeNames == "second") {
+        console.log(this.form);
+
         this.DataList = [];
         this.checkedkey = [];
         this.TreedataList = [];
@@ -2518,22 +3319,21 @@
         });
       }
     },
-    // gaibian(val){
-    //   let pname = val;
-    //   getProParentIdDxList(pname).then(response=>{
-    //     this.Treedata = response.data.list;
-    //   })
-    // },
     getDataList() {
       this.loading = true;
-      getProParentIdDxList().then((response) => {
+      console.log(this.form);
+
+      getProParentIdDxList(this.form.cusSex).then((response) => {
         this.Treedata = response.data.list;
 
         // 鍥炴樉 TreedataList 鍒� DataList
         if (this.TreedataList && this.TreedataList.length > 0) {
           this.DataList = this.TreedataList;
-          this.marryall = this.DataList.reduce((sum, item) => sum + (item.proPrice || 0) * (item.sl || 1), 0);
-          this.checkedListkey = this.DataList.map(item => item.proId);
+          this.marryall = this.DataList.reduce(
+            (sum, item) => sum + (item.proPrice || 0) * (item.sl || 1),
+            0
+          );
+          this.checkedListkey = this.DataList.map((item) => item.proId);
           this.$nextTick(() => {
             this.$refs.tree.setCheckedKeys(this.checkedListkey);
           });
@@ -2562,7 +3362,8 @@
 
       // 璁剧疆 packageList 鐨勯�変腑鐘舵��
       this.$nextTick(() => {
-        if (this.$refs.treas) { // 纭繚 treas 寮曠敤宸茬粡瀛樺湪
+        if (this.$refs.treas) {
+          // 纭繚 treas 寮曠敤宸茬粡瀛樺湪
           this.$refs.treas.setCheckedKeys(selectedPackageIds, true);
         }
         // 鏇存柊 checkedkeys 浠ュ弽鏄犲綋鍓嶉�変腑鐨勫寘
@@ -2582,12 +3383,13 @@
     updateDataListsBasedOnSelection(selectedPackageIds) {
       // 鏍规嵁閫変腑鐨勫寘ID鏇存柊 DataLists
       this.DataLists = [];
-      selectedPackageIds.forEach(id => {
-        let packageItem = this.packageList.find(item => item.id === id);
+      selectedPackageIds.forEach((id) => {
+        let packageItem = this.packageList.find((item) => item.id === id);
         if (packageItem) {
           // 杩欓噷鍋囪姣忎釜鍖呴」鐩兘鏈変竴涓� proId 鏁扮粍鎴栬�呯被浼肩殑缁撴瀯锛岀敤鏉ヨ幏鍙栧寘涓殑椤圭洰
-          if (packageItem.proIds) { // 鍋囪 packageItem 鍖呭惈涓�涓� proId 鏁扮粍
-            packageItem.proIds.forEach(proId => {
+          if (packageItem.proIds) {
+            // 鍋囪 packageItem 鍖呭惈涓�涓� proId 鏁扮粍
+            packageItem.proIds.forEach((proId) => {
               let project = this.findProjectById(proId); // 鍋囪鏈変竴涓嚱鏁版潵鎵惧埌椤圭洰
               if (project) {
                 this.DataLists.push(project);
@@ -2598,13 +3400,16 @@
       });
 
       // 璁$畻鍚堣
-      this.marryalls = this.DataLists.reduce((sum, item) => sum + item.proPrice, 0);
+      this.marryalls = this.DataLists.reduce(
+        (sum, item) => sum + item.proPrice,
+        0
+      );
     },
 
     findProjectById(proId) {
       // 姝ゅ嚱鏁板亣璁句綘鏈変竴涓叏灞�鐨勯」鐩垪琛ㄦ垨鑰呭彲浠ヤ粠鏌愪釜API鑾峰彇
       // 杩欓噷鍙槸涓�涓ず渚嬶紝瀹為檯搴旂敤涓簲璇ユ牴鎹綘鐨勬暟鎹粨鏋勬潵瀹炵幇
-      return this.allpackageList.find(item => item.proId === proId) || null;
+      return this.allpackageList.find((item) => item.proId === proId) || null;
     },
 
     handlepackage(data, checked, checkedNodes) {
@@ -2701,9 +3506,11 @@
     handleCurrentChecked(data, checked, checkedNodes) {
       this.dataObj = data;
       if (checked.checkedNodes.length > 0) {
-        const promises = checked.checkedNodes.map(node => getProSonDxList(node.proId));
-        Promise.all(promises).then(results => {
-          this.TreedataList = results.flatMap(res => res.data.list);
+        const promises = checked.checkedNodes.map((node) =>
+          getProSonDxList(node.proId)
+        );
+        Promise.all(promises).then((results) => {
+          this.TreedataList = results.flatMap((res) => res.data.list);
           this.checkedListkey = [];
           this.DataList = [];
 
@@ -2716,7 +3523,9 @@
 
           // 鏇存柊鍚嶇О鍜岃绠楁�讳环
           this.DataList.forEach((item1) => {
-            const parent = checked.checkedNodes.find(node => node.proId === item1.proParentId);
+            const parent = checked.checkedNodes.find(
+              (node) => node.proId === item1.proParentId
+            );
             if (parent) {
               item1.propinName = parent.proName;
             }
@@ -2841,6 +3650,7 @@
 
     // 椤圭洰鎻愪氦
     submit() {
+      this.isLoading = true;
       if (this.form.cusIdcard) {
         var cusId = this.form.cusIdcard;
       } else {
@@ -2854,6 +3664,8 @@
       this.isSubmitting = true; // 寮�濮嬫彁浜ゆ椂璁剧疆鏍囧織
       this.TotalPrice1 = 0; // 鍒濆鍖栧簲鏀堕噾棰�
       this.TotalPrice = 0; // 鍒濆鍖栧疄鏀堕噾棰�
+
+      this.contentLoading = true;
       this.discount = 10; // 鍒濆鍖栨姌鎵d负10锛�100%锛�
 
       // 鍒ゆ柇鏄惁鏈夐�変腑鐨勫椁�
@@ -2884,23 +3696,33 @@
       };
       // 鏍规嵁浣撴绫诲瀷閫夋嫨涓嶅悓鐨勫鐞嗘柟娉�
       if (this.form.firmId) {
-        tuantiqueren(data).then((response) => {
-          if (response.code == 200) {
-            this.processOrderItems(cusId);
-          }
-          this.isSubmitting = false; // 鎻愪氦瀹屾垚鍚庨噸缃爣蹇�
-        }).catch(() => {
-          this.isSubmitting = false; // 纭繚鍦ㄩ敊璇儏鍐典笅涔熼噸缃爣蹇�
-        });
+        tuantiqueren(data)
+          .then((response) => {
+            if (response.code == 200) {
+              this.processOrderItems(cusId);
+            }
+            this.isSubmitting = false; // 鎻愪氦瀹屾垚鍚庨噸缃爣蹇�
+            this.isLoading = false;
+          })
+          .catch(() => {
+            this.isSubmitting = false; // 纭繚鍦ㄩ敊璇儏鍐典笅涔熼噸缃爣蹇�
+            this.isLoading = false;
+          });
       } else {
-        getaddtTransition(data).then((response) => {
-          if (response.code == 200) {
-            this.processOrderItems(cusId);
-          }
-          this.isSubmitting = false; // 鎻愪氦瀹屾垚鍚庨噸缃爣蹇�
-        }).catch(() => {
-          this.isSubmitting = false; // 纭繚鍦ㄩ敊璇儏鍐典笅涔熼噸缃爣蹇�
-        });
+        getaddtTransition(data)
+          .then((response) => {
+            if (response.code == 200) {
+              this.processOrderItems(cusId);
+            }
+            this.isSubmitting = false; // 鎻愪氦瀹屾垚鍚庨噸缃爣蹇�
+            this.isLoading = false;
+            // this.contentLoading = false;
+          })
+          .catch(() => {
+            this.isSubmitting = false; // 纭繚鍦ㄩ敊璇儏鍐典笅涔熼噸缃爣蹇�
+            this.isLoading = false;
+            // this.contentLoading = false;
+          });
       }
 
       this.taocan = false;
@@ -2911,23 +3733,33 @@
     // 澶勭悊璁㈠崟椤圭洰
     processOrderItems(cusId) {
       getTransitionList1(cusId).then((response) => {
-        this.tableData1 = response.data;
+        this.contentLoading = false;
+        this.tableData1 = response.data.list;
+        if (response.data.tjCategory != null) {
+          this.tjCategory = response.data.tjCategory;
+        }
+        let Price = 0;
         if (this.tableData1) {
           this.tableData1.forEach((item) => {
-            if (item.tjCategory != null) {
-              this.tjCategory = item.tjCategory;
+            if (typeof item.nowPrice === "number") {
+              item.nowPrice = Number(item.nowPrice.toFixed(2));
             }
+
             if (item.pacName == "鍗曢」") {
               item.list.forEach((item9) => {
                 this.treeList.push(item9.proId);
               });
             }
             this.TotalPrice1 += item.ordPrice || 0; // 绱姞搴旀敹閲戦
-            this.TotalPrice += item.nowPrice || 0; // 绱姞瀹炴敹閲戦
+            Price += item.nowPrice || 0; // 绱姞瀹炴敹閲戦
+            this.TotalPrice = Price.toFixed(2);
           });
           // 璁$畻鎶樻墸
-          this.discount = this.TotalPrice1 > 0 ?
-            (Math.floor((this.TotalPrice / this.TotalPrice1) * 100) / 100) * 10 : 0;
+          this.discount =
+            this.TotalPrice1 > 0
+              ? (Math.floor((this.TotalPrice / this.TotalPrice1) * 100) / 100) *
+                10
+              : 0;
 
           this.list1 = false;
           this.list3 = true;
@@ -2939,122 +3771,128 @@
       });
     },
     submitCheckinfee() {
-  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;
-    }
+      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;
+        }
 
-    // 鍘荤┖鏍煎鐞�
-    const processedForm = {
-      ...this.form,
-      cusName: this.form.cusName ? this.form.cusName.replace(/\s/g, '') : '',
-      cusPhone: this.form.cusPhone ? this.form.cusPhone.replace(/\s/g, '') : '',
-      cusIdcard: this.form.cusIdcard ? this.form.cusIdcard.replace(/\s/g, '') : ''
-    };
+        // 鍘荤┖鏍煎鐞�
+        const processedForm = {
+          ...this.form,
+          cusName: this.form.cusName
+            ? this.form.cusName.replace(/\s/g, "")
+            : "",
+          cusPhone: this.form.cusPhone
+            ? this.form.cusPhone.replace(/\s/g, "")
+            : "",
+          cusIdcard: this.form.cusIdcard
+            ? this.form.cusIdcard.replace(/\s/g, "")
+            : "",
+        };
 
-    List.forEach((item) => {
-      if (item.list) {
-        item.list.forEach((item1) => {
-          this.tjOrderList.push({
-            proName: item1.proName,
-            proPrice: item1.nowPrice,
-            proId: item1.proId,
-          });
+        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,
+            });
+          }
         });
-      } else if (item.tjProjectList) {
-        item.tjProjectList.forEach((item1) => {
-          this.tjOrderList.push({
-            proName: item1.proName,
-            proPrice: item1.priceNow,
-            proId: item1.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,
+            // 浣跨敤鍘绘帀绌烘牸鍚庣殑鏁版嵁
+            cusName: processedForm.cusName,
+            cusPhone: processedForm.cusPhone,
+            cusIdcard: processedForm.cusIdcard,
+          };
+        } else {
+          data = {
+            photo: this.srcUrl,
+            tjOrderList: this.tjOrderList,
+            tjFlowingWater: this.tjFlowingWater,
+            userId,
+            tjType,
+            getType: this.getType,
+            tjCategory: this.tjCategory,
+            // 浣跨敤鍘绘帀绌烘牸鍚庣殑鏁版嵁
+            cusName: processedForm.cusName,
+            cusPhone: processedForm.cusPhone,
+            cusIdcard: processedForm.cusIdcard,
+          };
+        }
+
+        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.tjOrderList.push({
-          proName: item.proName,
-          proPrice: item.ysPrice,
-          proId: item.proId,
-        });
+        this.$modal.msgError("璇烽�夋嫨浣撴绫诲埆");
       }
-    });
-    
-    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,
-        // 浣跨敤鍘绘帀绌烘牸鍚庣殑鏁版嵁
-        cusName: processedForm.cusName,
-        cusPhone: processedForm.cusPhone,
-        cusIdcard: processedForm.cusIdcard
-      };
-    } else {
-      data = {
-        photo: this.srcUrl,
-        tjOrderList: this.tjOrderList,
-        tjFlowingWater: this.tjFlowingWater,
-        userId,
-        tjType,
-        getType: this.getType,
-        tjCategory: this.tjCategory,
-        // 浣跨敤鍘绘帀绌烘牸鍚庣殑鏁版嵁
-        cusName: processedForm.cusName,
-        cusPhone: processedForm.cusPhone,
-        cusIdcard: processedForm.cusIdcard
-      };
-    }
-
-    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) {
@@ -3119,7 +3957,6 @@
             }
             this.discount =
               (this.formInline.paidIn / this.formInline.price) * 10;
-
           } else {
             this.discount = 10;
             this.formInline.paidIn = "0.00";
@@ -3198,7 +4035,14 @@
     },
 
     listgetOrder(data) {
+      const loading = this.$loading({
+        lock: true,
+        text: "姝e湪鍔犺浇涓紝璇风◢绛夛紒",
+        spinner: "el-icon-loading",
+        background: "rgba(0, 0, 0, 0.7)",
+      });
       getOrder(data).then((res) => {
+        loading.close();
         this.$modal.msgSuccess("鎻愪氦鎴愬姛");
         //璋冩帴鍙f樉绀哄妫�鍗�
         const tjNumber = res.msg;
@@ -3262,12 +4106,11 @@
             discount: item.discount,
             parentProId: item.parentProId,
             cusIdCard: item.cusId,
-            yhj: item.nowPrice
+            yhj: item.nowPrice,
           })); // 鍒涘缓鏂扮殑瀵硅薄锛屽寘鍚� discount 鍜� id
         gaibianzhekou(newArray).then((res) => {
           this.loadingSubmit = false;
           if (res.code === 200) {
-
             let data;
 
             if (pacId || this.tjOrderList.length > 0) {
@@ -3369,8 +4212,10 @@
 }
 
 .filter-tree {
-  overflow-y: auto; /* 淇濈暀绾靛悜婊氬姩鏉� */
-  overflow-x: hidden; /* 闅愯棌妯悜婊氬姩鏉� */
+  overflow-y: auto;
+  /* 淇濈暀绾靛悜婊氬姩鏉� */
+  overflow-x: hidden;
+  /* 闅愯棌妯悜婊氬姩鏉� */
   height: 350px;
 }
 
@@ -3481,6 +4326,7 @@
   width: 100%;
   display: flex;
 }
+
 /* .tab3 {
   overflow-y: auto;
 }

--
Gitblit v1.8.0