From ac6766c11f8a2b8de903b58c13a8f206fa01dccd Mon Sep 17 00:00:00 2001
From: qinxianzhangyao <11053546+qinxianzhangyao@user.noreply.gitee.com>
Date: 星期五, 15 三月 2024 17:56:32 +0800
Subject: [PATCH] qxtj

---
 src/views/system/tijian/index.vue |  698 ++++++++++++++++++++++++++++++----------------------------
 1 files changed, 360 insertions(+), 338 deletions(-)

diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue
index ce4ede2..c50bc9c 100644
--- a/src/views/system/tijian/index.vue
+++ b/src/views/system/tijian/index.vue
@@ -1,232 +1,199 @@
 <template>
   <div class="app-container">
-    <div style="display: flex">
-      <div style="width: 76%">
-        <el-form :inline="true" ref="form" :model="form" :rules="rules" :label-position="labelPosition"
-          label-width="106px" v-show="top">
-          <el-row>
-            <el-col :span="5">
-              <el-form-item label="鍖垮悕" prop="isNow" style="display: flex">
-                <el-select v-model="isNow" placeholder="鏄惁鍖垮悕" @change="freezing(isNow)">
-                  <el-option v-for="dict in dictType" :key="dict.value" :label="dict.label"
-                    :value="dict.value"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="7">
-              <el-form-item label="濮撳悕" prop="cusName" style="display: flex" :rules="[
-                {
-                  required: true, validator: (rule, value, callback) => {
-                    if (!form.cusName) {
-                      callback('')
-                    } else if (form.cusName) {
-                      callback()
-                    }
+    <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">
 
-                  }, trigger: 'blur'
-                }]">
-                <el-input v-model="form.cusName" placeholder="璇疯緭鍏ュ鍚�" :disabled="isDisabled" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="9">
-              <el-form-item label="璇佷欢绫诲瀷" prop="idType" style="display: flex">
-                <el-select :disabled="isDisabled" v-model="form.idType" placeholder="璇烽�夋嫨璇佷欢绫诲瀷">
-                  <el-option v-for="dict in dict.type.dict_user_cardtype" :key="dict.value" :label="dict.label"
-                    :value="dict.value"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-        <el-form :inline="true" ref="form" :model="form" :rules="rules" :label-position="labelPosition"
-          label-width="106px" v-show="top">
-          <el-row>
-            <el-col :span="5">
-              <el-form-item label="姘戞棌" prop="cusNational" style="display: flex">
-                <el-select filterable :disabled="isDisabled" v-model="form.cusNational" placeholder="璇烽�夋嫨姘戞棌">
-                  <el-option v-for="dict in dict.type.dict_user_national" :key="dict.value" :label="dict.label"
-                    :value="dict.value"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="7">
-              <el-form-item label="鎬у埆" prop="cusSex" :rules="[
-                {
-                  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()
-                    }
+            <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>
 
-                  }, trigger: 'blur'
-                }]" style="display: flex">
-                <el-select :disabled="isDisabled" v-model="form.cusSex" placeholder="鎬у埆">
-                  <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label"
-                    :value="parseInt(dict.value)"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
+            <el-form-item label="濮撳悕" prop="cusName" :rules="[
+      {
+        required: true, validator: (rule, value, callback) => {
+          if (!form.cusName) {
+            callback('')
+          } else if (form.cusName) {
+            callback()
+          }
 
-            <el-col :span="9">
-              <el-form-item label="璇佷欢鍙�" prop="cusIdcard" :rules="[
-                {
-                  required: true, validator: (rule, value, callback) => {
-                    if (!form.cusIdcard && showHidden.has_idcard === 'Y') {
-                      callback('')
-                    } else if (showHidden.has_idcard === 'N') {
-                      callback()
-                    } else if (form.cusIdcard && showHidden.has_idcard === 'Y') {
-                      callback()
-                    }
+        }, trigger: 'blur'
+      }]">
+              <el-input v-model="form.cusName" placeholder="璇疯緭鍏ュ鍚�" :disabled="isDisabled" />
+            </el-form-item>
 
-                  }, trigger: 'blur'
-                }]" style="display: flex">
-                <span slot="label" style="display:inline-block;border-bottom: 2px solid blue;" @click="handleQuery">
-                  璇佷欢鍙�
-                </span>
-                <el-input :disabled="isDisabled" v-model="form.cusIdcard" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" @input="inputChange" />
-                <!-- <i style="
+            <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="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="inputChange" />
+              <!-- <i style="
                     font-size: 1rem;
                     position: absolute;
                     right: -20px;
                     top: 10px;
                     cursor: pointer;
                   " class="el-icon-search" @click="handleQuery"></i> -->
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-        <el-form :inline="true" ref="form" :model="form" :rules="rules" :label-position="labelPosition"
-          label-width="106px" v-show="top">
-          <el-row>
-            <el-col :span="5">
-              <el-form-item label="濠氬Щ" prop="cusMarryStatus" style="display: flex">
-                <el-select :disabled="isDisabled" v-model="form.cusMarryStatus" placeholder="濠氬Щ鐘跺喌">
-                  <el-option v-for="dict in dict.type.dict_user_marry" :key="dict.value" :label="dict.label"
-                    :value="dict.value"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="7">
-              <el-form-item label="鐢佃瘽" prop="cusPhone" :rules="[
-                {
-                  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()
-                    }
+            </el-form-item>
 
-                  }, trigger: 'blur'
-                }]" style="display: flex">
-                <el-input v-model="form.cusPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" :disabled="isDisabled" />
-              </el-form-item>
-            </el-col>
 
-            <el-col :span="9">
-              <el-form-item label="鍑虹敓鏃ユ湡" prop="cusBrithday" style="display: flex">
-                <el-date-picker :disabled="isDisabled" clearable v-model="form.cusBrithday" type="date"
-                  value-format="yyyy-MM-dd" placeholder="璇烽�夋嫨鍑虹敓鏃ユ湡">
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-        <el-form :inline="true" ref="form" :model="form" :rules="rules" :label-position="labelPosition"
-          label-width="106px" v-show="top">
-          <el-row>
-            <el-col :span="5">
-              <el-form-item label="鑱屼笟" prop="career" style="display: flex">
-                <el-select filterable :disabled="isDisabled" v-model="form.career" placeholder="璇疯緭鍏ヨ亴涓�">
-                  <el-option v-for="dict in dict.type.dict_job" :key="dict.value" :label="dict.label"
-                    :value="dict.value"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
 
-            <el-col :span="7">
-              <el-form-item label="閭" prop="cusEmail" style="display: flex">
-                <el-input v-model="form.cusEmail" placeholder="璇疯緭鍏ラ偖绠�" :disabled="isDisabled" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item label="骞撮緞  " prop="age" style="display: flex" label-width="150px
-              ">
-                <el-input v-model="form.age" :disabled="isDisabled" style="padding-left: 10%" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="3">
-              <el-form-item prop="ageUnit">
-                <el-select :disabled="isDisabled" v-model="form.ageUnit" style="width: 94%">
-                  <el-option v-for="dict in dict.type.dict_ageunit" :key="dict.value" :label="dict.label"
-                    :value="dict.value"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-        <el-form ref="form" :model="form" :rules="rules" label-width="80px" :label-position="labelPosition" v-show="top">
-          <el-row>
-            <el-col :span="20">
-              <el-form-item label="鎴峰彛鍦板潃" prop="addr">
-                <el-input v-model="form.addr" placeholder="璇疯緭鍏ユ埛鍙e湴鍧�" :disabled="isDisabled" style="width: 103%" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-        <el-form ref="form" :model="form" :rules="rules" label-width="80px" :label-position="labelPosition" v-show="top">
-          <el-row>
-            <el-col :span="20">
-              <el-form-item label="鐜颁綇鍧�" prop="cusAddr">
-                <el-input v-model="form.cusAddr" style="width: 103%" placeholder="璇疯緭鍏ョ幇灞呬綇鍦板潃" :disabled="isDisabled" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-        <el-form :inline="true" ref="form" :model="form" :rules="rules" :label-position="labelPosition" label-width="98px"
-          v-show="top">
-          <el-row>
-            <el-col :span="7">
-              <el-form-item label="浠嬬粛浜�" prop="cusIntroduce" style="display: flex">
-                <el-input :disabled="isDisabled" v-model="form.cusIntroduce" placeholder="璇疯緭鍏ヤ粙缁嶄汉" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="7">
-              <el-form-item label="宸ヤ綔鍗曚綅" prop="company" style="display: flex">
-                <el-input style="width: 100%" :disabled="isDisabled" v-model="form.company" placeholder="璇疯緭鍏ュ伐浣滃崟浣�" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="7">
-              <el-button v-show="lishi" type="primary" @click="cope" size="mini">涓�閿鍒�</el-button>
-              <el-button type="primary" @click="inputChanges" v-show="lishi" size="mini"
-                :disabled="confirm">鍘嗗彶浣撴璁板綍</el-button>
-            </el-col>
-          </el-row>
-        </el-form>
-        <el-form :inline="true" ref="form" :model="form" :rules="rules" :label-position="labelPosition" label-width="80px"
-          v-show="top">
-          <el-row>
-            <el-col :span="24">
-              <el-form-item>
+            <el-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" />
+            </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="璇烽�夋嫨鍑虹敓鏃ユ湡">
+              </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="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: 21%">
+                <el-option v-for="dict in dict.type.dict_ageunit" :key="dict.value" :label="dict.label"
+                  :value="dict.value"></el-option>
+              </el-select>
+            </el-form-item>
+
+            <!-- <el-form-item prop="ageUnit">
+              
+              </el-form-item> -->
+          </el-form>
+          <el-form 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-form :inline="true" ref="form" :model="form" :rules="rules" :label-position="labelPosition"
+            label-width="106px" v-show="top">
+            <el-form-item label="浠嬬粛浜�" prop="cusIntroduce">
+              <el-input :disabled="isDisabled" v-model="form.cusIntroduce" placeholder="璇疯緭鍏ヤ粙缁嶄汉" />
+            </el-form-item>
+
+            <el-form-item label="宸ヤ綔鍗曚綅" prop="company">
+              <el-input :disabled="isDisabled" v-model="form.company" placeholder="璇疯緭鍏ュ伐浣滃崟浣�" />
+            </el-form-item>
+
+            <el-form-item label="鏂囧寲绋嬪害" prop="wenHua">
+              <el-input :disabled="isDisabled" v-model="form.wenHua" placeholder="璇疯緭鍏ユ枃鍖栫▼搴�" />
+            </el-form-item>
+          </el-form>
+
+          <el-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>
-              </el-form-item>
+              </div>
             </el-col>
           </el-row>
-        </el-form>
-      </div>
-      <div v-show="top">
+        </div>
+      </el-col>
+      <el-col :span="7" v-show="top">
         <div class="content" v-show="showHidden.mall_hasPhoto == 'Y'">
           <div v-show="hide" style="
               border: 1px dashed #dcdfe6;
               width: 180px;
               height: 180px;
-              margin-left: 5%;
             ">
             <img v-if="imageUrl" :src="imageUrl" class="avatar" />
           </div>
@@ -247,13 +214,15 @@
             <el-button type="primary" plain size="mini" @click="setImage()">鎷嶇収</el-button><br />
           </div>
         </div>
-      </div>
-    </div>
+
+      </el-col>
+    </el-row>
 
     <el-dialog title="閫夋嫨濂楅" :visible.sync="taocan" width="50%" height="700px">
       <el-tabs type="border-card" style="height: 560px; margin: 0 10px; width: 100%">
         <el-tab-pane label="濂楅">
-          <el-form :model="queryParam" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="auto">
+          <el-form :model="queryParam" ref="queryForm" size="small" :inline="true" v-show="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>
@@ -278,7 +247,7 @@
                     v-hasPermi="['system:package:Seach']">濂楅璇︽儏
                   </el-button>
                 </template>
-              </el-table-column> -->
+</el-table-column> -->
               </el-table>
             </div>
             <!-- <el-button
@@ -326,9 +295,9 @@
         <el-button type="primary" @click="submit">纭� 瀹�</el-button>
       </span>
     </el-dialog>
-
-    <el-row type="flex" class="row-bg" justify="space-around" v-if="tcShow">
-      <el-col>
+<!-- -->
+    <el-row  v-if="tcShow">
+      <el-col :span="15">
         <div class="grid-content bg-purple">
           <!-- <el-table :data="fData" border height="220px" style="width: 100%; ">
             <el-table-column prop="proName" label="缁勫悎椤圭洰" align="center" width="200px">
@@ -372,9 +341,10 @@
            </div> -->
 
           <template>
-            <el-form :model="form" :inline="true" label-width="75px" style="margin-left: 7px">
+            
+            <el-form :model="form" :inline="true" label-width="75px" style="margin-left: 20px;">
               <el-form-item label="浣撴绫诲瀷">
-                <el-select style="width: 100px" v-model="form.tjType" placeholder="璇烽�夋嫨浣撴绫诲瀷">
+                <el-select style="width:150px" v-model="form.tjType" placeholder="璇烽�夋嫨浣撴绫诲瀷">
                   <el-option v-for="dict in dict.type.dict_team" :key="dict.value" :label="dict.label"
                     :value="dict.value"></el-option>
                 </el-select>
@@ -383,33 +353,35 @@
               <!-- <div class="tab1"> -->
               <!-- <el-form :inline="true" class="tab1"> -->
               <el-form-item label="搴旀敹閲戦">
-                <el-input placeholder="搴旀敹閲戦" v-model="TotalPrice1" disabled style="width: 126px"></el-input>
+                <el-input placeholder="搴旀敹閲戦" v-model="TotalPrice1" disabled style="width: 150px"></el-input>
               </el-form-item>
               <el-form-item label="浼樻儬">
                 <!-- <el-input style="width: 100px" type="number" v-model="discount" :value="discount"></el-input> -->
-                <el-input-number ref="inputNumber" style="width: 126px" v-model="discount" :precision="2" :step="0.1"
+                <el-input-number ref="inputNumber" style="width: 150px" v-model="discount" :precision="2" :step="0.1"
                   :max="10" :min="1" @change="numberChange" :disabled="isfalse"></el-input-number>
               </el-form-item>
               <el-form-item label="瀹炴敹閲戦">
-                <el-input placeholder="瀹炴敹閲戦" v-model="TotalPrice" style="width: 126px"></el-input>
+                <el-input placeholder="瀹炴敹閲戦" v-model="TotalPrice" style="width: 150px"></el-input>
               </el-form-item>
+            <br/>
               <!-- 140828199805050012 -->
               <el-form-item label="棰嗗彇鏂瑰紡">
                 <!-- <el-input style="width: 100%;"  v-model="form.getType" placeholder="璇烽�夋嫨棰嗗彇鏂瑰紡" /> -->
-                <el-select v-model="getType" style="width: 94%" @change="getmailType">
+                <el-select v-model="getType" style="width: 150px" @change="getmailType">
                   <el-option v-for="dict in dict.type.report_get_type" :key="dict.value" :label="dict.label"
                     :value="dict.value"></el-option>
                 </el-select>
               </el-form-item>
               <el-form-item label="浣撴绫诲埆">
-                <el-select style="width: 140px" v-model="tjCategory" placeholder="璇烽�夋嫨浣撴绫诲埆">
+                <el-select style="width: 150px" v-model="tjCategory" placeholder="璇烽�夋嫨浣撴绫诲埆">
                   <el-option v-for="dict in dict.type.dict_tjtype" :key="dict.value" :label="dict.label"
                     :value="dict.value"></el-option>
                 </el-select>
                 <!-- <el-input v-model="form.category" placeholder="璇疯緭鍏ヤ綋妫�绫诲埆" /> -->
               </el-form-item>
-              <el-form-item>
-                <el-button type="primary" @click="Package" size="mini">閫夋嫨濂楅</el-button>
+              
+              <el-form-item style="margin-left:269px ;">
+                <el-button type="primary" @click="Package" size="mini"  style="margin-right:20px ;">閫夋嫨濂楅</el-button>
                 <el-button type="primary" @click="submitPrice" :disabled="confirm" v-if="showHidden.has_charge == 'N'"
                   size="mini">绛惧埌鐧昏</el-button>
                 <el-button type="primary" @click="submitCheckinfee" :disabled="confirm"
@@ -446,7 +418,7 @@
               border: 1px solid #e6ebf5;
               max-height: 420px;
               overflow: auto;
-              width: 980px;
+              width: 916px;
               margin-left: 35px;
             ">
             <el-collapse v-model="index" accordion v-if="list3">
@@ -454,15 +426,15 @@
                 <el-collapse-item :name="index">
                   <template slot="title">
                     {{
-                      item.pacName +
-                      ":" +
-                      item.parentName +
-                      " (搴旀敹閲戦:" +
-                      item.ordPrice +
-                      "鍏� / 瀹炴敹閲戦:" +
-                      item.nowPrice +
-                      "鍏�)"
-                    }}
+      item.pacName +
+      ":" +
+      item.parentName +
+      " (搴旀敹閲戦:" +
+      item.ordPrice +
+      "鍏� / 瀹炴敹閲戦:" +
+      item.nowPrice +
+      "鍏�)"
+    }}
                   </template>
                   <el-table :data="item.list" border style="width: 100%" height="270">
                     <el-table-column prop="proName" label="椤圭洰" width="180">
@@ -653,6 +625,7 @@
         <el-button type="primary" @click="copes">纭� 瀹�</el-button>
       </span>
     </el-dialog>
+    <Packages ref="aaa" @add="handleChanges" />
   </div>
 </template>
 
@@ -677,9 +650,10 @@
   getTransitionList,
   getByTeamNo,
   getLoadFile,
-  getIsRequired,
+  getIsRequired, getconfigKey,
   getHistryTjOrderProByCusIdCard,
 } from "@/api/system/tijian";
+import Packages from "@/components/Packages";
 import { MessageBox } from "element-ui";
 import VTreeTransfer from "./TreeTransfer.vue";
 import historyTj from "@/components/historyTj/index";
@@ -701,6 +675,7 @@
   components: {
     VTreeTransfer,
     historyTj,
+    Packages
   },
   data() {
     return {
@@ -891,6 +866,9 @@
         address: [{ required: true, message: "", trigger: "blur" }],
         phone: [{ required: true, message: "", trigger: "blur" }],
         cusPhone: [
+          { required: true, message: "", trigger: "change" },
+        ],
+        cusBrithday: [
           { required: true, message: "", trigger: "change" },
         ],
         // cusNational: [
@@ -1207,7 +1185,6 @@
 
     /** 鏌ヨ淇℃伅鍒楄〃 */
     getList() {
-      this.loading = true;
       // listCustomer(this.queryParams).then((response) => {
       //   this.customerList = response.rows;
       //   this.total = response.total;
@@ -1439,102 +1416,126 @@
         //   this.$message.error("姝ょ敤鎴蜂笉瀛樺湪");
         // });
       } else {
-        var websocket = null;
-        var url = this.valueUrl;
-        if ("WebSocket" in window) {
-          websocket = new WebSocket(url);
-        } else if ("MozWebSocket" in window) {
-          websocket = new MozWebSocket(url);
-        } else {
-          // console.log("SockJS");
-        }
-
-        if (websocket == null) {
-          alert("鍒涘缓WebSocket瀵硅薄澶辫触");
-        }
-
-        //杩炴帴鍙戠敓閿欒鐨勫洖璋冩柟娉�
-        websocket.onerror = function () {
-          alert("璇锋鏌ヨ鍗″櫒杩炴帴鏄惁姝e父");
-        };
-
-        //杩炴帴鎴愬姛寤虹珛鐨勫洖璋冩柟娉�
-        websocket.onopen = function () {
-          this.websocket = websocket;
-          // 杩炴帴璁惧
-          var jsonObj = {
-            name: "connect",
-          };
-          var jStr = JSON.stringify(jsonObj);
-          this.websocket.send(jStr);
-          alert("璇锋斁韬唤璇佸啀鐐圭‘璁�");
-          var jsonObj = {
-            name: "readCert",
-          };
-          var jStr = JSON.stringify(jsonObj);
-          this.websocket.send(jStr);
-          this.dialogVisible = false;
-        };
-
-        //鎺ユ敹鍒版秷鎭殑鍥炶皟鏂规硶
-        websocket.onmessage = function (event) {
-          var resultObj = eval("(" + event.data + ")");
-          //resultFlag涓�0浠h〃璇诲崱鎴愬姛
-          if (
-            resultObj.name == "readCard" ||
-            resultObj.name == "readCert" ||
-            resultObj.name == "PushWithImg" ||
-            resultObj.name == "PushWithOutImg"
-          ) {
-            if (resultObj.resultFlag == "0") {
-              //鍥炴樉鐩稿叧鏁版嵁
-              _this.form.cusName = resultObj.resultContent.partyName;
-              _this.form.cusSex =
-                resultObj.resultContent.gender == "0" ? "濂�" : "鐢�";
-              _this.form.cusNational = resultObj.resultContent.nation;
-              _this.form.cusBrithday = resultObj.resultContent.bornDay;
-              if (_this.form.cusBrithday) {
-                _this.form.cusBrithday = _this.form.cusBrithday.replace(
-                  /^(\d{4})(\d{2})(\d{2})$/,
-                  "$1-$2-$3"
-                );
-              }
-              _this.form.cusAddr = resultObj.resultContent.certAddress;
-              _this.form.cusIdcard = resultObj.resultContent.certNumber;
-              _this.imageUrl =
-                "data:image/jpeg;base64," + resultObj.resultContent.identityPic;
-              if (
-                resultObj.name == "readCert" ||
-                resultObj.name == "PushWithImg"
-              ) {
-                this.imageUrl =
-                  "data:image/jpeg;base64," +
-                  resultObj.resultContent.identityPrintPic;
-              }
-            } else if (resultObj.resultFlag == "-1") {
-              if (resultObj.errorMsg == "绔彛鎵撳紑澶辫触") {
-                //alert("璇诲崱鍣ㄦ湭杩炴帴");
+        let configKey = "getInfoFromSqlData"
+        getconfigKey(configKey).then(res => {
+          if (res.code == 200) {
+            if (res.msg == "N") {
+              var websocket = null;
+              var url = this.valueUrl;
+              if ("WebSocket" in window) {
+                websocket = new WebSocket(url);
+              } else if ("MozWebSocket" in window) {
+                websocket = new MozWebSocket(url);
               } else {
-                //alert(resultObj.errorMsg);
+                // console.log("SockJS");
               }
-            } else if (resultObj.resultFlag == "-2") {
-              //alert(resultObj.errorMsg);
-            }
-          } else if (resultObj.name == "getStatus") {
-            if (resultObj.resultFlag == "0") {
-              if (resultObj.status == "0") {
-              } else {
-                alert("璁惧杩炴帴宸叉柇寮�锛岃妫�鏌ヨ鍗″櫒杩炴帴");
+
+              if (websocket == null) {
+                alert("鍒涘缓WebSocket瀵硅薄澶辫触");
               }
+
+              //杩炴帴鍙戠敓閿欒鐨勫洖璋冩柟娉�
+              websocket.onerror = function () {
+                alert("璇锋鏌ヨ鍗″櫒杩炴帴鏄惁姝e父");
+              };
+
+              //杩炴帴鎴愬姛寤虹珛鐨勫洖璋冩柟娉�
+              websocket.onopen = function () {
+                this.websocket = websocket;
+                // 杩炴帴璁惧
+                var jsonObj = {
+                  name: "connect",
+                };
+                var jStr = JSON.stringify(jsonObj);
+                this.websocket.send(jStr);
+                alert("璇锋斁韬唤璇佸啀鐐圭‘璁�");
+                var jsonObj = {
+                  name: "readCert",
+                };
+                var jStr = JSON.stringify(jsonObj);
+                this.websocket.send(jStr);
+                this.dialogVisible = false;
+              };
+
+              //鎺ユ敹鍒版秷鎭殑鍥炶皟鏂规硶
+              websocket.onmessage = function (event) {
+                var resultObj = eval("(" + event.data + ")");
+                //resultFlag涓�0浠h〃璇诲崱鎴愬姛
+                if (
+                  resultObj.name == "readCard" ||
+                  resultObj.name == "readCert" ||
+                  resultObj.name == "PushWithImg" ||
+                  resultObj.name == "PushWithOutImg"
+                ) {
+                  if (resultObj.resultFlag == "0") {
+                    //鍥炴樉鐩稿叧鏁版嵁
+                    _this.form.cusName = resultObj.resultContent.partyName;
+                    _this.form.cusSex =
+                      resultObj.resultContent.gender == "0" ? "濂�" : "鐢�";
+                    _this.form.cusNational = resultObj.resultContent.nation;
+                    _this.form.cusBrithday = resultObj.resultContent.bornDay;
+                    if (_this.form.cusBrithday) {
+                      _this.form.cusBrithday = _this.form.cusBrithday.replace(
+                        /^(\d{4})(\d{2})(\d{2})$/,
+                        "$1-$2-$3"
+                      );
+                    }
+                    _this.form.cusAddr = resultObj.resultContent.certAddress;
+                    _this.form.cusIdcard = resultObj.resultContent.certNumber;
+                    _this.imageUrl =
+                      "data:image/jpeg;base64," + resultObj.resultContent.identityPic;
+                    if (
+                      resultObj.name == "readCert" ||
+                      resultObj.name == "PushWithImg"
+                    ) {
+                      this.imageUrl =
+                        "data:image/jpeg;base64," +
+                        resultObj.resultContent.identityPrintPic;
+                    }
+                  } else if (resultObj.resultFlag == "-1") {
+                    if (resultObj.errorMsg == "绔彛鎵撳紑澶辫触") {
+                      //alert("璇诲崱鍣ㄦ湭杩炴帴");
+                    } else {
+                      //alert(resultObj.errorMsg);
+                    }
+                  } else if (resultObj.resultFlag == "-2") {
+                    //alert(resultObj.errorMsg);
+                  }
+                } else if (resultObj.name == "getStatus") {
+                  if (resultObj.resultFlag == "0") {
+                    if (resultObj.status == "0") {
+                    } else {
+                      alert("璁惧杩炴帴宸叉柇寮�锛岃妫�鏌ヨ鍗″櫒杩炴帴");
+                    }
+                  }
+                }
+              };
+
+              //杩炴帴鍏抽棴鐨勫洖璋冩柟娉�
+              websocket.onclose = function () {
+                alert("璇诲崱鍣ㄨ繛鎺ュ叧闂�");
+              };
+            } else if (res.msg == "Y") {
+              this.$refs.aaa.open = true;
+              this.$refs.aaa.getAllList();
+              this.$refs.aaa.title = "璇佷欢瀛楀吀";
             }
           }
-        };
+        })
 
-        //杩炴帴鍏抽棴鐨勫洖璋冩柟娉�
-        websocket.onclose = function () {
-          alert("璇诲崱鍣ㄨ繛鎺ュ叧闂�");
-        };
       }
+    },
+
+    handleChanges(param1) {
+      if (this.form.pacCode == "涓嶈") {
+        this.form.cusIdcard = param1[0].xh;
+      } else {
+        this.form.cusIdcard = param1[0].pacCode;
+      }
+
+      // this.form.cusName = param1[0].pacName;
+      // this.form.cusPhone = param1[0].pacRemark;
+
     },
 
     // selected(row, index) {
@@ -1658,6 +1659,7 @@
       let cusSex = this.form.cusSex;
       this.datekey = Date.now();
       //鍏ㄩ儴濂楅
+      this.loading = true;
       deptTreeSelect(cusSex).then((response) => {
         this.newpacName = response.rows;
         console.log(this.newpacName)
@@ -2038,6 +2040,21 @@
       }
     },
 
+    listgetOrder(data) {
+      getOrder(data).then((res) => {
+        this.$modal.msgSuccess("鎻愪氦鎴愬姛");
+        // this.dialogVisibles = true;
+        // this.url = window.webkitURL.createObjectURL(res); //灏嗗悗绔繑鍥炵殑blob鏂囦欢璇诲彇鍑簎rl
+        //璋冩帴鍙f樉绀哄妫�鍗�
+        const tjNumber = res.msg;
+        const viewNum = "792931586196398080";
+        const params = { viewNum, tjNumber };
+        this.$tab.openPage("瀵艰瘖鍗�", "/report/breDailyReport", params);
+        _this.confirm = true;
+      });
+      this.$tab.refreshPage();
+    },
+
     // 鏈�鍚庢彁浜ゆ寜閽�
     submitPrice() {
       let _this = this;
@@ -2084,7 +2101,7 @@
       this.tjFlowingWater = { copeWith, paidIn, discount };
 
       let data;
-      if (pacId) {
+      if (pacId || this.tjOrderList.length > 0) {
         data = {
           photo: this.srcUrl,
           pacId,
@@ -2092,35 +2109,41 @@
           tjFlowingWater: this.tjFlowingWater,
           userId,
           tjType,
+          tjCategory: this.tjCategory
         };
-      } else {
+        this.listgetOrder(data)
+      } else if (pacId || this.tjOrderList.length > 0) {
         data = {
           photo: this.srcUrl,
           tjOrderList: this.tjOrderList,
           tjFlowingWater: this.tjFlowingWater,
           userId,
           tjType,
+          tjCategory: this.tjCategory
         };
+        this.listgetOrder(data)
+      } else {
+        this.$message({
+          type: "warning ",
+          message: "璇烽�夋嫨濂楅!",
+        });
       }
-      getOrder(data).then((res) => {
-        this.$modal.msgSuccess("鎻愪氦鎴愬姛");
-        // this.dialogVisibles = true;
-        // this.url = window.webkitURL.createObjectURL(res); //灏嗗悗绔繑鍥炵殑blob鏂囦欢璇诲彇鍑簎rl
-        //璋冩帴鍙f樉绀哄妫�鍗�
-        const tjNumber = res.msg;
-        const viewNum = "792931586196398080";
-        const params = { viewNum, tjNumber };
-        this.$tab.openPage("瀵艰瘖鍗�", "/report/breDailyReport", params);
-        _this.confirm = true;
-      });
-      this.$tab.refreshPage();
+
     },
   },
 };
 </script>
 
 
-<style >
+<style>
+.el-form-item__error {
+  display: none;
+}
+
+.el-col-19 {
+  width: 80.166667%;
+}
+
 .el-table__header-wrapper .el-checkbox {
   display: none;
 }
@@ -2258,4 +2281,3 @@
   margin-bottom: 25px;
 }
 </style>
-

--
Gitblit v1.8.0