From e4e9a44b2e2ba516aa307d8edf91b430cce7e1d6 Mon Sep 17 00:00:00 2001
From: qinxianzhangyao <11053546+qinxianzhangyao@user.noreply.gitee.com>
Date: 星期三, 01 十一月 2023 18:07:04 +0800
Subject: [PATCH] qxtj

---
 vue.config.js                         |    6 
 src/views/system/charge/index.vue     |   93 ++-
 src/views/system/info/index.vue       |   70 +-
 src/views/hosp/about/index.vue        |   48 +
 src/views/hosp/Summary/index.vue      |   52 +
 src/views/system/examcharge/index.vue |   83 ++-
 src/views/hosp/settlement/index.vue   |   12 
 src/views/system/indrefund/index.vue  |   54 +-
 src/views/system/tijian/index.vue     |  268 ++++++----
 src/views/login.vue                   |    4 
 src/views/system/refund/index.vue     |  254 +++-------
 src/views/system/invoice/index.vue    |  341 +++-----------
 src/views/hosp/Sumrecord/index.vue    |   62 +-
 13 files changed, 584 insertions(+), 763 deletions(-)

diff --git a/src/views/hosp/Summary/index.vue b/src/views/hosp/Summary/index.vue
index 09db6ef..9a84739 100644
--- a/src/views/hosp/Summary/index.vue
+++ b/src/views/hosp/Summary/index.vue
@@ -1,25 +1,35 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-      <el-form-item label="姹囨�讳汉鍛�" prop="tollCollectorId">
-        <el-select v-model="queryParams.tollCollectorId" filterable style="width: 130px" placeholder="璇烽�夋嫨浜ゆ鍛�" clearable
-          @clear="getCompanyList">
-          <el-option v-for="dict in CompanyList" :key="dict.userId" :label="dict.nickName" :value="dict.userId" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="璧峰鏃堕棿" prop="accountBeginTime">
-        <el-date-picker v-model="queryParams.accountBeginTime" type="datetime" placeholder="閫夋嫨璧峰鏃堕棿">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="鎴鏃堕棿" prop="accountEndTime">
-        <el-date-picker v-model="queryParams.accountEndTime" type="datetime" placeholder="閫夋嫨鎴鏃堕棿">
-        </el-date-picker>
-      </el-form-item>
-
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
-      </el-form-item>
+      <el-row>
+       
+        <el-col :span="10">
+          <el-form-item label="璧峰鏃堕棿" prop="accountBeginTime" style="display: flex;">
+            <el-date-picker v-model="queryParams.accountBeginTime" type="datetime" placeholder="閫夋嫨璧峰鏃堕棿">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="10">
+          <el-form-item label="鎴鏃堕棿" prop="accountEndTime" style="display: flex;">
+            <el-date-picker v-model="queryParams.accountEndTime" type="datetime" placeholder="閫夋嫨鎴鏃堕棿">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="10">
+          <el-form-item label="姹囨�诲憳" prop="tollCollectorId" style="display: flex;"> 
+            <el-select v-model="queryParams.tollCollectorId" filterable placeholder="璇烽�夋嫨浜ゆ鍛�" clearable
+              @clear="getCompanyList">
+              <el-option v-for="dict in CompanyList" :key="dict.userId" :label="dict.nickName" :value="dict.userId" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
+            <!-- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button> -->
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
 
     <el-row :gutter="10" class="mb8">
@@ -48,7 +58,7 @@
 </template>
 
 <script>
-import { getlistWater, getWater, getdatalist, addTjSummary, getNewDate,getbigntime } from "@/api/hosp/water";
+import { getlistWater, getWater, getdatalist, addTjSummary, getNewDate, getbigntime } from "@/api/hosp/water";
 import { getInfo } from "@/api/login";
 import moment from "moment";
 export default {
@@ -117,7 +127,7 @@
       });
       getNewDate().then((response) => {
         if (response.code === 200) {
-            this.queryParams.accountEndTime = moment(response.data).format("YYYY-MM-DD HH:mm:ss")
+          this.queryParams.accountEndTime = moment(response.data).format("YYYY-MM-DD HH:mm:ss")
         }
       });
       getbigntime().then((response) => {
diff --git a/src/views/hosp/Sumrecord/index.vue b/src/views/hosp/Sumrecord/index.vue
index 9ed1e52..0b63625 100644
--- a/src/views/hosp/Sumrecord/index.vue
+++ b/src/views/hosp/Sumrecord/index.vue
@@ -1,13 +1,17 @@
 <template>
     <div class="app-container">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-            <el-form-item label="姹囨�讳汉鍛�" prop="tollCollectorId">
-                <el-select v-model="queryParams.tollCollectorId" filterable style="width: 200px" placeholder="璇烽�夋嫨姹囨�讳汉鍛�"
-                    clearable @clear="getCompanyList">
-                    <el-option v-for="dict in CompanyList" :key="dict.userId" :label="dict.nickName" :value="dict.userId" />
-                </el-select>
-            </el-form-item>
-            <!-- <el-form-item label="璧峰鏃堕棿" prop="accountBeginTime">
+            <el-row>
+                <el-col :span="7">
+                    <el-form-item label="姹囨�讳汉鍛�" prop="tollCollectorId" style="display: flex;">
+                        <el-select v-model="queryParams.tollCollectorId" filterable 
+                            placeholder="璇烽�夋嫨姹囨�讳汉鍛�" clearable @clear="getCompanyList">
+                            <el-option v-for="dict in CompanyList" :key="dict.userId" :label="dict.nickName"
+                                :value="dict.userId" />
+                        </el-select>
+                    </el-form-item>
+                </el-col>
+                <!-- <el-form-item label="璧峰鏃堕棿" prop="accountBeginTime">
                 <el-date-picker v-model="queryParams.accountBeginTime" type="datetime" placeholder="閫夋嫨璧峰鏃堕棿">
                 </el-date-picker>
             </el-form-item>
@@ -15,20 +19,20 @@
                 <el-date-picker v-model="queryParams.accountEndTime" type="datetime" placeholder="閫夋嫨鎴鏃堕棿">
                 </el-date-picker>
             </el-form-item> -->
-
-            <el-form-item>
-                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
-            </el-form-item>
+                <el-col :span="7">
+                    <el-form-item>
+                        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
+                    </el-form-item>
+                </el-col>
+            </el-row>
         </el-form>
 
         <el-row :gutter="10" class="mb8">
             <el-col :span="1.5">
-                <el-button icon="el-icon-edit" size="mini" @click="handleDelete"
-                    :disabled="single">鎾ら攢</el-button>
+                <el-button icon="el-icon-edit" size="mini" @click="handleDelete" :disabled="single">鎾ら攢</el-button>
             </el-col>
             <el-col :span="1.5">
-                <el-button icon="el-icon-edit" size="mini" @click="handledocument"
-                    :disabled="single">琛ユ墦鍗曟嵁</el-button>
+                <el-button icon="el-icon-edit" size="mini" @click="handledocument" :disabled="single">琛ユ墦鍗曟嵁</el-button>
             </el-col>
         </el-row>
 
@@ -39,8 +43,8 @@
             <el-table-column label="姹囨�讳汉" align="center" prop="hzName" :show-overflow-tooltip="true" />
             <el-table-column label="姹囨�讳簨浠�" align="center" prop="hzSj" :show-overflow-tooltip="true" />
             <el-table-column label="鏀惰垂閲戦" align="center" prop="amountReceived" :show-overflow-tooltip="true" />
-      <el-table-column label="閫�璐归噾棰�" align="center" prop="refundAmount" :show-overflow-tooltip="true" />
-      <el-table-column label="搴斾氦娆�" align="center" prop="payable" :show-overflow-tooltip="true" />
+            <el-table-column label="閫�璐归噾棰�" align="center" prop="refundAmount" :show-overflow-tooltip="true" />
+            <el-table-column label="搴斾氦娆�" align="center" prop="payable" :show-overflow-tooltip="true" />
             <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
                 <template slot-scope="scope">
                     <el-button size="mini" type="text" icon="el-icon-s-order" title="璇︽儏" @click="handleUpdate(scope.row)"
@@ -48,7 +52,7 @@
                 </template>
             </el-table-column>
         </el-table>
-       
+
 
         <div class="pag">
             <div class="pag1">
@@ -66,16 +70,16 @@
 
 
             <div style="margin: 10px 20px;">
-                <el-table  style="width: 94%" :data="collectorList" ref="multipleTable" border max-height="700px">
-                    <el-table-column label="浜ゆ鍛�" align="center" prop="tollCollector"  width="90" />
-                    <el-table-column label="鏀惰垂閲戦" align="center" prop="amountReceived"  width="90" />
-                    <el-table-column label="閫�璐归噾棰�" align="center" prop="refundAmount"  width="90" />
-                    <el-table-column label="搴斾氦娆�" align="center" prop="payable"  width="90"/>
+                <el-table style="width: 94%" :data="collectorList" ref="multipleTable" border max-height="700px">
+                    <el-table-column label="浜ゆ鍛�" align="center" prop="tollCollector" width="90" />
+                    <el-table-column label="鏀惰垂閲戦" align="center" prop="amountReceived" width="90" />
+                    <el-table-column label="閫�璐归噾棰�" align="center" prop="refundAmount" width="90" />
+                    <el-table-column label="搴斾氦娆�" align="center" prop="payable" width="90" />
                     <el-table-column label="浜よ处鏃堕棿" align="center" prop="createTime" />
                     <el-table-column label="璧峰鏃堕棿" align="center" prop="accountBeginTime" />
-                    <el-table-column label="鎴鏃堕棿" align="center" prop="accountEndTime"  />
+                    <el-table-column label="鎴鏃堕棿" align="center" prop="accountEndTime" />
                 </el-table>
-               
+
             </div>
 
         </el-drawer>
@@ -155,7 +159,7 @@
             title: "",
             // 鏄惁鏄剧ず寮瑰嚭灞�
             open: false,
-            accountId:"",
+            accountId: "",
             // 鏌ヨ鍙傛暟
             queryParams: {
                 pageNum: 1,
@@ -193,7 +197,7 @@
 
             });
         },
-   
+
 
         // 鎼滅储
         handleQuery() {
@@ -216,14 +220,14 @@
 
         // 琛ㄦ牸鍗曢��
         handleSelect(selection, val) {
-            this.single = selection.length!==1
+            this.single = selection.length !== 1
             selection.forEach(element => {
                 this.accountId = element.hzCard
                 this.id = element.id
                 this.tollCollectorId = element.hzUserId
             });
         },
-       
+
         handleDelete() {
             let data = {
                 id: this.id,
diff --git a/src/views/hosp/about/index.vue b/src/views/hosp/about/index.vue
index 261476c..deaa623 100644
--- a/src/views/hosp/about/index.vue
+++ b/src/views/hosp/about/index.vue
@@ -1,20 +1,32 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-      <el-form-item label="浜ゆ鍛�" prop="tollCollectorName">
-        <el-select v-model="queryParams.tollCollectorName" filterable style="width: 128px" placeholder="璇烽�夋嫨浜ゆ鍛�" clearable
-          @clear="getCompanyList" @change="idFn">
-          <el-option v-for="dict in CompanyList" :key="dict.userId" :label="dict.nickName" :value="dict.userId" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="浜よ处鏃堕棿" prop="tollCollectorName">
-        <el-date-picker v-model="value1" type="datetimerange" :picker-options="pickerOptions"
-          value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="璧锋鏃ユ湡" end-placeholder="缁堟鏃ユ湡" :default-time="['12:00:00']">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
-      </el-form-item>
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="110px">
+      <el-row>
+        <el-col :span="6">
+          <el-form-item label="浜ゆ鍛�" prop="tollCollectorName" style="display: flex;">
+            <el-select v-model="queryParams.tollCollectorName" filterable placeholder="璇烽�夋嫨浜ゆ鍛�" clearable
+              @clear="getCompanyList" @change="idFn">
+              <el-option v-for="dict in CompanyList" :key="dict.userId" :label="dict.nickName" :value="dict.userId" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="14">
+          <el-form-item label="浜よ处鏃堕棿" prop="tollCollectorName" style="display: flex;">
+            <el-date-picker v-model="value1" type="datetimerange" :picker-options="pickerOptions"
+              value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="璧锋鏃ユ湡" end-placeholder="缁堟鏃ユ湡"
+              :default-time="['12:00:00']">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="3">
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+
+
     </el-form>
 
     <el-row :gutter="10" class="mb8">
@@ -219,7 +231,7 @@
       let data = {
         tollCollectorId: this.tollCollectorId,
         accountBeginTime: this.value1[0],
-        accountEndTime:this.value1[1],
+        accountEndTime: this.value1[1],
         pageNum: this.queryParams.pageNum,
         pageSize: this.queryParams.pageSize,
       };
@@ -297,6 +309,10 @@
   display: none;
 }
 
+.el-date-editor--datetimerange.el-input, .el-date-editor--datetimerange.el-input__inner {
+    width: 100%;
+}
+
 .pag {
   width: 100%;
   display: flex;
diff --git a/src/views/hosp/settlement/index.vue b/src/views/hosp/settlement/index.vue
index f917347..8b8f58e 100644
--- a/src/views/hosp/settlement/index.vue
+++ b/src/views/hosp/settlement/index.vue
@@ -1,17 +1,23 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-      <el-form-item label="鏀惰垂鍛�" prop="tollCollectorName">
+      <el-row>
+        <el-col :span="6">
+      <el-form-item label="鏀惰垂鍛�" prop="tollCollectorName" style="display: flex;">
         <el-input v-model="queryParams.tollCollectorName" placeholder="璇疯緭鍏ユ敹璐瑰憳" clearable @keyup.enter.native="handleQuery"
-          style="width: 120px;" />
+          />
       </el-form-item>
-      <el-form-item label="缁撹处鏃堕棿" prop="tollCollectorName">
+      </el-col>
+      <el-col :span="14">
+      <el-form-item label="缁撹处鏃堕棿" prop="tollCollectorName" style="display: flex;">
         <el-date-picker v-model="value1" type="datetimerange" start-placeholder="璧锋鏃ユ湡" end-placeholder="缁堟鏃ユ湡"  :default-time="['00:00:00', '23:00:00']"
           format="yyyy-MM-dd HH:mm:ss"
           value-format="yyyy-MM-dd HH:mm:ss"
           @change="dateChangebirthday1">
         </el-date-picker>
       </el-form-item>
+      </el-col>
+    </el-row>
     </el-form>
 
     <el-row :gutter="10" class="mb8">
diff --git a/src/views/login.vue b/src/views/login.vue
index a7a4958..05e30c4 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -59,8 +59,8 @@
 
     <!--  搴曢儴  -->
     <div class="el-login-footer">
-      <span>Copyright 漏 2022-2023璺嘲绉戞妧 All Rights Reserved.</span>
-      <!-- <span>Copyright 漏 2022-2023榫欑編缃戠粶 All Rights Reserved.</span> -->
+      <!-- <span>Copyright 漏 2022-2023璺嘲绉戞妧 All Rights Reserved.</span> -->
+      <span>Copyright 漏 2022-2023榫欑編缃戠粶 All Rights Reserved.</span>
     </div>
   </div>
 </template>
diff --git a/src/views/system/charge/index.vue b/src/views/system/charge/index.vue
index b7376fb..97ccaa8 100644
--- a/src/views/system/charge/index.vue
+++ b/src/views/system/charge/index.vue
@@ -1,20 +1,31 @@
 <template>
   <div class="app-container">
     <div class="grid-content bg-purple">
-      <el-form :inline="true" ref="form" :model="form" class="demo-form-inline">
-        <el-form-item label="浣撴鍙�" prop="tjNum">
-          <el-input ref="inputName" v-model="form.tjNum" placeholder="璇疯緭鍏ヤ綋妫�鍙�" />
-        </el-form-item>
-        <el-form-item label="濮撳悕" prop="tjName">
-          <el-input v-model="form.tjName" placeholder="璇疯緭鍏ュ鍚�" style="width: 100px" />
-        </el-form-item>
-        <el-form-item label="鑱旂郴鐢佃瘽" prop="tjPhone">
-          <el-input v-model="form.tjPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" style="width: 130px" />
-        </el-form-item>
-        <el-form-item>
-          <el-button style="margin-left: 40px" type="primary" size="mini" @click="submitFormchanck">鎼滅储</el-button>
-          <el-button style="margin-left: 10px" type="primary" size="mini" @click="resetQuery">閲嶇疆</el-button>
-        </el-form-item>
+      <el-form :inline="true" ref="form" :model="form" class="demo-form-inline" label-width="110px">
+        <el-row>
+          <el-col :span="5">
+            <el-form-item label="濮撳悕" prop="tjName" style="display: flex;">
+              <el-input v-model="form.tjName" placeholder="璇疯緭鍏ュ鍚�" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="浣撴鍙�" prop="tjNum" style="display: flex;">
+              <el-input ref="inputName" v-model="form.tjNum" placeholder="璇疯緭鍏ヤ綋妫�鍙�" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="鑱旂郴鐢佃瘽" prop="tjPhone" style="display: flex;">
+              <el-input v-model="form.tjPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item>
+              <el-button style="margin-left: 40px" type="primary" size="mini" @click="submitFormchanck">鎼滅储</el-button>
+              <el-button style="margin-left: 10px" type="primary" size="mini" @click="resetQuery">閲嶇疆</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </div>
 
@@ -36,44 +47,54 @@
       <el-table-column label="鏀惰垂鍛�" align="center" prop="tjFlowingWater.updateBy" width="100px" />
     </el-table>
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-radio-group v-model="tjStatus" @input="radioChange" style="margin: 12px 6px">
-          <el-radio-button label="0">鏈即璐�</el-radio-button>
-          <el-radio-button label="1">宸茬即璐�</el-radio-button>
-        </el-radio-group>
-      </el-col>
-      <el-col :span="16">
-        <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-radio-group v-model="tjStatus" @input="radioChange" style="margin: 12px 6px">
+      <el-radio-button label="0">鏈即璐�</el-radio-button>
+      <el-radio-button label="1">宸茬即璐�</el-radio-button>
+    </el-radio-group>
+
+    <el-form :inline="true" :model="formInline" class="demo-form-inline" style="margin: 12px 6px" label-width="100px">
+      <el-row>
+        <el-col :span="7">
+          <el-form-item label="搴旀敹閲戦" style="display: flex;">
+            <el-input :value="formInline.price + '.00'" placeholder="閲戦" :disabled="true"></el-input>
           </el-form-item>
-          <el-form-item label="浼樻儬鎶樻墸">
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="浼樻儬" style="display: flex;" >
             <!-- <el-input style="width: 90px" type="number" v-model="discount" :value="discount"></el-input> -->
-            <el-input-number style="width: 140px" v-model="discount" :precision="2" :step="0.1" :max="10" :min="1"
+            <el-input-number style="width: 100%" v-model="discount" :precision="2" :step="0.1" :max="10" :min="1"
               @change="numberChange" :disabled="isfalse"></el-input-number>
           </el-form-item>
+        </el-col>
 
-          <!-- <el-form-item label="鎶樻墸">
+
+        <!-- <el-form-item label="鎶樻墸">
                         <el-input style="width:100px" type="number"  v-model="formInline.discount" placeholder="璇疯緭鍏ユ姌鎵�"></el-input>
                     </el-form-item> -->
-          <el-form-item label="瀹炴敹閲戦">
-            <el-input v-model="formInline.paidIn" placeholder="瀹炰粯" style="width: 94px">
+        <el-col :span="7">
+          <el-form-item label="瀹炴敹閲戦" style="display: flex;">
+            <el-input v-model="formInline.paidIn" placeholder="瀹炰粯">
             </el-input>
           </el-form-item>
-          <el-form-item label="浠樻绫诲瀷" prop="payType">
-            <el-select style="width: 120px" v-model="formInline.payType" placeholder="璇烽�夋嫨浠樻绫诲瀷">
+        </el-col>
+        <el-col :span="7">
+          <el-form-item label="浠樻绫诲瀷" prop="payType" style="display: flex;">
+            <el-select 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-col>
+        <el-col :span="3">
           <el-form-item>
-            <el-button style="margin-left: 15px" type="primary" size="mini" :disabled="disabled == 1 ? true : false"
+            <el-button type="primary" size="mini" :disabled="disabled == 1 ? true : false"
               @click="SubmitEvent">鏀惰垂</el-button>
           </el-form-item>
-        </el-form>
-      </el-col>
-    </el-row>
+        </el-col>
+      </el-row>
+    </el-form>
+
 
     <el-table v-loading="loading" :data="tableList" border>
       <el-table-column type="index" width="50"> </el-table-column>
diff --git a/src/views/system/examcharge/index.vue b/src/views/system/examcharge/index.vue
index 16bfeb9..54b8294 100644
--- a/src/views/system/examcharge/index.vue
+++ b/src/views/system/examcharge/index.vue
@@ -82,34 +82,35 @@
     <div class="app-container">
         <el-row :gutter="20">
             <!--閮ㄩ棬鏁版嵁-->
-            <el-col :span="5" :xs="24">
-                <el-form :inline="true" ref="form" :model="form" class="demo-form-inline" label-width="78px" :rules="rules">
-                    <el-form-item label="濮撳悕" prop="name">
+            <el-col :span="8" :xs="24">
+                <el-form :inline="true" ref="form" :model="form" class="demo-form-inline" label-width="86px" :rules="rules">
+                    <el-form-item label="濮撳悕" prop="name" style="display: flex;">
                         <el-input v-model="form.name" placeholder="璇疯緭鍏ュ鍚�" />
                     </el-form-item>
-                    <el-form-item label="鑱旂郴鐢佃瘽" prop="phone">
+                    <el-form-item label="鑱旂郴鐢佃瘽" prop="phone" style="display: flex;">
                         <el-input v-model="form.phone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" />
                     </el-form-item>
                     <!-- @focus="hadeltjpro" -->
-                    <el-form-item label="浣撴椤圭洰" prop="tjProName">
+                    <el-form-item label="浣撴椤圭洰" prop="tjProName" style="display: flex;">
                         <el-input ref="inputName" v-model="form.tjProName" placeholder="璇疯緭鍏ヤ綋妫�椤圭洰" />
                     </el-form-item>
-                    <el-form-item label="鏁伴噺" prop="number">
+                    <el-form-item label="鏁伴噺" prop="number" style="display: flex;">
                         <el-input ref="inputName" v-model="form.number" placeholder="璇疯緭鍏ユ暟閲�" />
                     </el-form-item>
-                    <el-form-item label="搴旀敹閲戦" prop="ys">
+                    <el-form-item label="搴旀敹閲戦" prop="ys" style="display: flex;">
                         <el-input v-model="form.ys" placeholder="閲戦"></el-input>
                     </el-form-item>
-                    <el-form-item label="浼樻儬" prop="zk">
-                        <el-input-number v-model="form.zk" :precision="2" :step="0.1" :max="10" :min="1"
+                    <el-form-item label="浼樻儬" prop="zk" style="display: flex;" label-width="103px
+                    ">
+                        <el-input-number v-model="form.zk" style="width:98%" :precision="2" :step="0.1" :max="10" :min="1"
                             disabled></el-input-number>
                     </el-form-item>
-                    <el-form-item label="瀹炴敹閲戦" prop="ss">
+                    <el-form-item label="瀹炴敹閲戦" prop="ss" style="display: flex;">
                         <el-input v-model="form.ss" placeholder="瀹炰粯" @input="numberChange">
                         </el-input>
                     </el-form-item>
-                    <el-form-item label="浠樻绫诲瀷" prop="type">
-                        <el-select style="width: 198px" v-model="form.type" placeholder="璇烽�夋嫨浠樻绫诲瀷">
+                    <el-form-item label="浠樻绫诲瀷" prop="type" style="display: flex;" label-width="102px">
+                        <el-select v-model="form.type" 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>
@@ -123,22 +124,32 @@
             </el-col>
 
             <!--鐢ㄦ埛鏁版嵁-->
-            <el-col :span="17" :xs="24" style="padding: 0 10px;">
-                <el-row :gutter="10" class="mb8">
-                    <el-col :span="1.5">
-                        <el-form :inline="true" ref="form" :model="queryParams" class="demo-form-inline" label-width="80px">
-                            <el-form-item label="濮撳悕" prop="name">
+            <el-col :span="15" :xs="24">
+
+                <el-form :inline="true" ref="form" :model="queryParams" class="demo-form-inline" label-width="90px">
+                    <el-row>
+                        <el-col :span="7">
+                            <el-form-item label="濮撳悕" prop="name" style="display: flex;">
                                 <el-input v-model="queryParams.name" placeholder="璇疯緭鍏ュ鍚�" />
                             </el-form-item>
-                            <el-form-item label="鑱旂郴鐢佃瘽" prop="phone">
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="鑱旂郴鐢佃瘽" prop="phone" style="display: flex;">
                                 <el-input v-model="queryParams.phone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" />
                             </el-form-item>
-                        </el-form>
-                    </el-col>
-                    <el-col :span="1.5">
-                        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleUpdate">鏌ヨ</el-button>
-                    </el-col>
-                </el-row>
+                        </el-col>
+                        <el-col :span="3">
+                            <el-form-item>
+                                <el-button type="primary" icon="el-icon-search" size="mini"
+                                    @click="handleUpdate">鏌ヨ</el-button>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+
+                </el-form>
+
+
+
                 <div style="margin-bottom: 10px;">
                     <el-radio-group v-model="queryParams.type" @input="handleUpdate" style="margin-left: 30px">
                         <el-radio-button label="1">鏀惰垂璁板綍</el-radio-button>
@@ -152,9 +163,9 @@
                     <el-table-column type="selection" width="55" align="center" />
                     <el-table-column label="濮撳悕" align="center" prop="customer.cusName" width="90px" />
                     <el-table-column label="鎵嬫満鍙�" align="center" prop="customer.cusPhone" width="110px"
-                        :show-overflow-tooltip="true"></el-table-column>
-                    <el-table-column label="璁㈠崟娴佹按鍙�" align="center" prop="waterId" width="180px" />
-                    <el-table-column label="浣撴椤圭洰" align="center" prop="tjProName" width="120px" />
+                       ></el-table-column>
+                    <el-table-column label="璁㈠崟娴佹按鍙�" align="center" prop="waterId" width="194px" />
+                    <el-table-column label="浣撴椤圭洰" align="center" prop="tjProName" width="120px"  :show-overflow-tooltip="true"/>
                     <el-table-column label="搴旀敹閲戦" align="center" prop="copeWith" width="90px" />
                     <el-table-column label="瀹炴敹閲戦" align="center" prop="paidIn" width="80px" />
                     <el-table-column label="浠樻绫诲瀷" align="center" prop="payType" width="80px">
@@ -163,7 +174,7 @@
                         </template>
                     </el-table-column>
                     <el-table-column label="鏀惰垂鍛�" align="center" prop="updateBy" width="100px" />
-                    <el-table-column label="鏀堕��鏃堕棿" align="center" prop="updateTime"  width="160px" />
+                    <el-table-column label="鏀堕��鏃堕棿" align="center" prop="updateTime" width="160px" />
                     <el-table-column fixed="right" label="鎿嶄綔" align="center" class-name="small-padding " width="80px"
                         v-if="queryParams.type == '1'">
                         <template slot-scope="scope">
@@ -274,14 +285,14 @@
             waterId: "",
             toggleSearchStatus: "0",
             queryParams: {
-                name: "",
-                phone: "",
+                name: null,
+                phone: null,
                 type: "1"
             },
             formIn: {
-                name: "",
-                tjPro: "",
-                phone: "",
+                name: null,
+                tjPro: null,
+                phone: null,
                 number: 1,
                 ys: "0",
                 ss: "0",
@@ -294,10 +305,10 @@
             currentTime: "",
             // 琛ㄥ崟鍙傛暟
             form: {
-                name: "",
-                tjPro: "",
+                name: null,
+                tjPro: null,
                 tjProName: "浣撴璐�",
-                phone: "",
+                phone: null,
                 number: 1,
                 ys: 0,
                 ss: 0,
diff --git a/src/views/system/indrefund/index.vue b/src/views/system/indrefund/index.vue
index 27cf5b2..6640299 100644
--- a/src/views/system/indrefund/index.vue
+++ b/src/views/system/indrefund/index.vue
@@ -1,20 +1,26 @@
 <template>
     <div class="app-container">
-        <el-row :gutter="10" class="mb8">
-            <el-col :span="1.5">
-                <el-form :inline="true" ref="form" :model="queryParams" class="demo-form-inline" label-width="80px">
-                    <el-form-item label="濮撳悕" prop="name">
+
+        <el-form :inline="true" ref="form" :model="queryParams" class="demo-form-inline" label-width="80px">
+            <el-row>
+                <el-col :span="7">
+                    <el-form-item label="濮撳悕" prop="name" style="display: flex;">
                         <el-input v-model="queryParams.name" placeholder="璇疯緭鍏ュ鍚�" />
                     </el-form-item>
-                    <el-form-item label="鑱旂郴鐢佃瘽" prop="phone">
+                </el-col>
+                <el-col :span="12">
+                    <el-form-item label="鑱旂郴鐢佃瘽" prop="phone" style="display: flex;">
                         <el-input v-model="queryParams.phone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" />
                     </el-form-item>
-                </el-form>
-            </el-col>
-            <el-col :span="1.5">
-                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleUpdate">鏌ヨ</el-button>
-            </el-col>
-        </el-row>
+                </el-col>
+                <el-col :span="3">
+                    <el-form-item>
+                        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleUpdate">鏌ヨ</el-button>
+                    </el-form-item>
+                </el-col>
+            </el-row>
+        </el-form>
+
         <div style="margin-bottom: 10px;">
             <el-radio-group v-model="type" @input="handleUpdate">
                 <el-radio-button label="1">鏀惰垂璁板綍</el-radio-button>
@@ -29,8 +35,8 @@
                 <el-table-column label="濮撳悕" align="center" prop="customer.cusName" width="90px" />
                 <el-table-column label="鎵嬫満鍙�" align="center" prop="customer.cusPhone" width="110px"
                     :show-overflow-tooltip="true"></el-table-column>
-                <el-table-column label="璁㈠崟娴佹按鍙�" align="center" prop="waterId" width="180px" />
-                <el-table-column label="浣撴椤圭洰" align="center" prop="tjProName" width="120px" />
+                <el-table-column label="璁㈠崟娴佹按鍙�" align="center" prop="waterId" width="194px" />
+                <el-table-column label="浣撴椤圭洰" align="center" prop="tjProName" width="120px" :show-overflow-tooltip="true" />
                 <el-table-column label="搴旀敹閲戦" align="center" prop="copeWith" width="90px" />
                 <el-table-column label="瀹炴敹閲戦" align="center" prop="paidIn" width="80px" />
                 <el-table-column label="浠樻绫诲瀷" align="center" prop="payType" width="80px">
@@ -39,7 +45,7 @@
                     </template>
                 </el-table-column>
                 <el-table-column label="鏀惰垂鍛�" align="center" prop="updateBy" width="100px" />
-                <el-table-column label="鏀堕��鏃堕棿" align="center" prop="updateTime" />
+                <el-table-column label="鏀堕��鏃堕棿" align="center" prop="updateTime" width="160px" />
                 <el-table-column fixed="right" label="鎿嶄綔" align="center" class-name="small-padding " width="100px"
                     v-if="queryParams.type == '4'">
                     <template slot-scope="scope">
@@ -135,14 +141,14 @@
             type: "1",
             toggleSearchStatus: "0",
             queryParams: {
-                name: "",
-                phone: "",
-                type: ""
+                name: null,
+                phone: null,
+                type: null
             },
             formIn: {
-                name: "",
-                tjPro: "",
-                phone: "",
+                name: null,
+                tjPro: null,
+                phone: null,
                 number: 1,
                 ys: "0",
                 ss: "0",
@@ -155,10 +161,10 @@
             currentTime: "",
             // 琛ㄥ崟鍙傛暟
             form: {
-                name: "",
-                tjPro: "",
+                name: null,
+                tjPro: null,
                 tjProName: "浣撴璐�",
-                phone: "",
+                phone: null,
                 number: 1,
                 ys: 0,
                 ss: 0,
@@ -290,7 +296,7 @@
                     this.tableList = res.data
 
                 })
-            }else{
+            } else {
                 this.queryParams.type = this.type
                 getFlowingWaterList(this.queryParams).then(res => {
                     this.tableList = res.data
diff --git a/src/views/system/info/index.vue b/src/views/system/info/index.vue
index da79021..d7a1525 100644
--- a/src/views/system/info/index.vue
+++ b/src/views/system/info/index.vue
@@ -1,13 +1,26 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="鍗曚綅鍚嶇О" prop="company">
-        <el-select :remote-method="getRemoteData" v-model="queryParams.company" value-key="drugManufacturerId" remote
-          filterable placeholder="璇烽�夋嫨鍗曚綅鍚嶇О" clearable @change="searchSelect">
-          <el-option v-for="dict in CompanyList" :key="dict.drugManufacturerId" :label="dict.cnName"
-            :value="dict.drugManufacturerId" />
-        </el-select>
-      </el-form-item>
+      <el-row>
+        <el-col :span="11">
+          <el-form-item label="鍗曚綅鍚嶇О" prop="company" style="display: flex;">
+            <el-select :remote-method="getRemoteData" v-model="queryParams.company" value-key="drugManufacturerId" remote
+              filterable placeholder="璇烽�夋嫨鍗曚綅鍚嶇О" clearable @change="searchSelect">
+              <el-option v-for="dict in CompanyList" :key="dict.drugManufacturerId" :label="dict.cnName"
+                :value="dict.drugManufacturerId" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+          </el-form-item>
+        </el-col>
+
+      </el-row>
+
+
       <!-- <el-form-item label="浜ゆ槗閲戦" prop="transactionAmount">
                 <el-input v-model="queryParams.transactionAmount" placeholder="璇疯緭鍏ヤ氦鏄撻噾棰�" clearable
                     @keyup.enter.native="handleQuery" />
@@ -28,10 +41,7 @@
             <el-form-item label="鏀舵浜�" prop="payee">
                 <el-input v-model="queryParams.payee" placeholder="璇疯緭鍏ユ敹娆句汉" clearable @keyup.enter.native="handleQuery" />
             </el-form-item> -->
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
-      </el-form-item>
+
     </el-form>
 
     <!-- <el-row :gutter="10" class="mb8">
@@ -73,30 +83,36 @@
       <el-table-column label="棰勭害鏃堕棿" align="center" prop="createTime" />
     </el-table>
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="16" :xs="24">
-        <el-form :inline="true" :model="formInline" class="demo-form-inline" style="margin: 12px 6px">
-          <el-form-item label="鍗曚綅璐熻矗浜�">
-            <el-input style="width: 120px" v-model="formInline.payer" placeholder="鍗曚綅璐熻矗浜�"></el-input>
+
+    <el-form :inline="true" :model="formInline" class="demo-form-inline" style="margin: 12px 6px" label-width="100px">
+      <el-row>
+        <el-col :span="6">
+          <el-form-item label="璐熻矗浜�" style="display: flex;">
+            <el-input v-model="formInline.payer" placeholder="鍗曚綅璐熻矗浜�"></el-input>
           </el-form-item>
-          <el-form-item label="浜ゆ槗閲戦">
-            <el-input style="width: 90px" v-model="formInline.price" placeholder="閲戦"></el-input>
+        </el-col>
+        <el-col :span="7">
+          <el-form-item label="浜ゆ槗閲戦" style="display: flex;">
+            <el-input v-model="formInline.price" placeholder="閲戦"></el-input>
           </el-form-item>
-          <el-form-item label="浜ゆ槗绫诲瀷" prop="payType">
-            <el-select style="width: 160px" v-model="formInline.payType" placeholder="璇烽�夋嫨浜ゆ槗绫诲瀷">
+        </el-col>
+        <el-col :span="7">
+          <el-form-item label="浜ゆ槗绫诲瀷" prop="payType" style="display: flex;">
+            <el-select 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-col>
+        <el-col :span="7">
           <el-form-item>
-            <el-button style="margin-left: 15px" type="primary" size="mini" @click="SubmitEvent">鏀惰垂</el-button>
+            <el-button type="primary" size="mini" @click="SubmitEvent">鏀惰垂</el-button>
+            <el-button type="primary" size="mini" @click="handleDelete">閫�璐�</el-button>
           </el-form-item>
-          <el-form-item>
-            <el-button style="margin-left: 15px" type="primary" size="mini" @click="handleDelete">閫�璐�</el-button>
-          </el-form-item>
-        </el-form>
-      </el-col>
-    </el-row>
+        </el-col>
+      </el-row>
+    </el-form>
+
     <el-row :gutter="20">
       <el-col :span="12" :xs="24">
         <div class="tj">
diff --git a/src/views/system/invoice/index.vue b/src/views/system/invoice/index.vue
index c4063ae..8df4abc 100644
--- a/src/views/system/invoice/index.vue
+++ b/src/views/system/invoice/index.vue
@@ -1,71 +1,43 @@
 <template>
   <div class="app-container">
-    <el-form
-      :model="queryParams"
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      v-show="showSearch"
-      label-width="68px"
-    >
-      <el-form-item label="濮撳悕" prop="name">
-        <el-input
-          style="width: 116px"
-          ref="inputName"
-          v-model="queryParams.name"
-          placeholder="璇疯緭鍏ュ鍚�"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="浣撴鍙�" prop="tjNum">
-        <el-input
-          ref="inputName"
-          v-model="queryParams.tjNum"
-          placeholder="璇疯緭鍏ヤ綋妫�鍙�"
-          @keyup.enter.native="handleQuery"
-          style="width: 170px"
-          clearable
-        />
-      </el-form-item>
-      <el-form-item label="鐧昏鏃堕棿" prop="createTimeList">
-        <el-date-picker
-          clearable
-          v-model="createTimeList"
-          @change="dateChangebirthday1"
-          style="width: 240px"
-          value-format="yyyy-MM-dd"
-          type="daterange"
-          range-separator="-"
-          start-placeholder="寮�濮嬫棩鏈�"
-          end-placeholder="缁撴潫鏃ユ湡"
-          :picker-options="pickerOptions"
-        ></el-date-picker>
-      </el-form-item>
+   
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="86px">
+      <el-row>
+        <el-col :span="5">
+          <el-form-item label="濮撳悕" prop="name" style="display: flex;">
+            <el-input ref="inputName" clearable v-model="queryParams.name" placeholder="璇疯緭鍏ュ鍚�" @keyup.enter.native="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="浣撴鍙�" prop="tjNum" style="display: flex;">
+            <el-input ref="inputName"  v-model="queryParams.tjNum" placeholder="璇疯緭鍏ヤ綋妫�鍙�" @keyup.enter.native="handleQuery"
+              clearable />
+          </el-form-item>
+        </el-col>
+        <el-col :span="10">
+          <el-form-item label="鐧昏鏃堕棿" prop="createTimeList" style="display: flex;" label-width="116px">
+            <el-date-picker clearable style="width:100%" v-model="createTimeList" @change="dateChangebirthday1"
+              value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="寮�濮嬫棩鏈�"
+              end-placeholder="缁撴潫鏃ユ湡" :picker-options="pickerOptions"></el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="3">
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
+            <!-- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button> -->
+          </el-form-item>
+        </el-col>
+      </el-row>
       <!-- <el-form-item label="鎶ュ憡鏃堕棿" prop="reportTimeList">
         <el-date-picker clearable v-model="queryParams.reportTimeList" type="daterange" range-separator="-" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡" :picker-options="pickerOptions" value-format="yyyy-MM-dd" placeholder="璇烽�夋嫨鍑烘姤鍛婃椂闂�" style="width: 240px">
         </el-date-picker>
       </el-form-item> -->
-      <el-form-item>
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          size="mini"
-          @click="handleQuery"
-          >鎼滅储</el-button
-        >
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-          >閲嶇疆</el-button
-        >
-      </el-form-item>
+
     </el-form>
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-radio-group
-          v-model="intype"
-          @input="radioChange"
-          style="margin-left: 20px"
-        >
+        <el-radio-group v-model="intype" @input="radioChange" style="margin-left: 20px">
           <el-radio-button label="0">鏈墦鍗�</el-radio-button>
           <el-radio-button label="1">宸叉墦鍗�</el-radio-button>
         </el-radio-group>
@@ -83,36 +55,15 @@
         >
       </el-col> -->
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          size="mini"
-          :disabled="multiple"
-          @click="print"
-          >鎵撳嵃鍙戠エ</el-button
-        >
+        <el-button type="primary" size="mini" :disabled="multiple" @click="print">鎵撳嵃鍙戠エ</el-button>
       </el-col>
-      <right-toolbar
-        :showSearch.sync="showSearch"
-        @queryTable="getList"
-        style="margin-right: 40px"
-      ></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" style="margin-right: 40px"></right-toolbar>
     </el-row>
 
     <template>
-      <el-table
-        ref="tb"
-        border
-        style="margin: 14px; width: 98%"
-        v-loading="loading"
-        :data="orderList"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column
-          type="selection"
-          width="40"
-          align="center"
-          fixed="left"
-        />
+      <el-table ref="tb" border style="margin: 14px; width: 98%" v-loading="loading" :data="orderList"
+        @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="40" align="center" fixed="left" />
         <!-- <el-table-column
           label="搴忓彿"
           align="center"
@@ -120,78 +71,30 @@
           width="50px"
           fixed="left"
         /> -->
-        <el-table-column
-          label="濮撳悕"
-          align="center"
-          prop="tjCustomerName"
-          width="100px"
-          :show-overflow-tooltip="true"
-          fixed="left"
-        />
-        <el-table-column
-          label="鎬у埆"
-          align="center"
-          prop="tjCustomerSex"
-          width="55px"
-          :show-overflow-tooltip="true"
-        >
+        <el-table-column label="濮撳悕" align="center" prop="tjCustomerName" width="100px" :show-overflow-tooltip="true"
+          fixed="left" />
+        <el-table-column label="鎬у埆" align="center" prop="tjCustomerSex" width="55px" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             <span v-if="scope.row.tjCustomerSex == '0'">鐢�</span>
             <span v-if="scope.row.tjCustomerSex == '1'">濂�</span>
           </template>
         </el-table-column>
-        <el-table-column
-          label="骞撮緞"
-          align="center"
-          prop="tjCustomerAge"
-          width="55px"
-          :show-overflow-tooltip="true"
-        />
-        <el-table-column
-          label="鐢佃瘽"
-          align="center"
-          prop="tjCustomerPhone"
-          width="120px"
-          :show-overflow-tooltip="true"
-        />
-        <el-table-column
-          label="浣撴绫诲瀷"
-          align="center"
-          prop="tjType"
-          width="80px"
-          :show-overflow-tooltip="true"
-        >
+        <el-table-column label="骞撮緞" align="center" prop="tjCustomerAge" width="55px" :show-overflow-tooltip="true" />
+        <el-table-column label="鐢佃瘽" align="center" prop="tjCustomerPhone" width="120px" :show-overflow-tooltip="true" />
+        <el-table-column label="浣撴绫诲瀷" align="center" prop="tjType" width="80px" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             <span v-if="scope.row.tjType == '2'">涓汉</span>
             <span v-if="scope.row.tjType == '1'">鍥㈤槦</span>
           </template>
         </el-table-column>
-        <el-table-column
-          label="浣撴鍙�"
-          align="center"
-          prop="tjNumber"
-          width="160px"
-          :show-overflow-tooltip="true"
-        />
+        <el-table-column label="浣撴鍙�" align="center" prop="tjNumber" width="160px" :show-overflow-tooltip="true" />
 
-        <el-table-column
-          label="鐧昏鏃堕棿"
-          align="center"
-          prop="createTime"
-          width="155px"
-          :show-overflow-tooltip="true"
-        >
+        <el-table-column label="鐧昏鏃堕棿" align="center" prop="createTime" width="155px" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.createTime) }}</span>
           </template>
         </el-table-column>
-        <el-table-column
-          label="瀹屾垚鏃堕棿"
-          align="center"
-          prop="finishTime"
-          width="155px"
-          :show-overflow-tooltip="true"
-        >
+        <el-table-column label="瀹屾垚鏃堕棿" align="center" prop="finishTime" width="155px" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.finishTime) }}</span>
           </template>
@@ -201,145 +104,56 @@
             <span>{{ parseTime(scope.row.reportTime) }}</span>
           </template>
         </el-table-column> -->
-        <el-table-column
-          label="鎵�閫夊椁�"
-          align="center"
-          prop="pacName"
-          width="120px"
-          :show-overflow-tooltip="true"
-        />
-        <el-table-column
-          label="鍗曚綅宸ュ彿"
-          align="center"
-          prop="firmWorkId"
-          width="100px"
-          :show-overflow-tooltip="true"
-        />
-        <el-table-column
-          label="鍗曚綅鍚嶇О"
-          align="center"
-          prop="dictCompName"
-          :show-overflow-tooltip="true"
-          height="10px"
-        />
-        <el-table-column
-          label="鎵撳嵃鏃堕棿"
-          align="center"
-          prop="printTime"
-          :show-overflow-tooltip="true"
-          height="10px"
-        />
-        <el-table-column
-          label="鎵撳嵃浜哄憳"
-          align="center"
-          prop="printName"
-          :show-overflow-tooltip="true"
-          height="10px"
-          width="110px"
-        />
+        <el-table-column label="鎵�閫夊椁�" align="center" prop="pacName" width="120px" :show-overflow-tooltip="true" />
+        <el-table-column label="鍗曚綅宸ュ彿" align="center" prop="firmWorkId" width="100px" :show-overflow-tooltip="true" />
+        <el-table-column label="鍗曚綅鍚嶇О" align="center" prop="dictCompName" :show-overflow-tooltip="true" height="10px" />
+        <el-table-column label="鎵撳嵃鏃堕棿" align="center" prop="printTime" :show-overflow-tooltip="true" height="10px" />
+        <el-table-column label="鎵撳嵃浜哄憳" align="center" prop="printName" :show-overflow-tooltip="true" height="10px"
+          width="110px" />
       </el-table>
     </template>
 
     <div class="pag">
       <div class="pag1">
-        <el-pagination
-          background
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :current-page="queryParams.pageNum"
-          :page-sizes="[10, 20, 30, 40]"
-          :page-size="queryParams.pageSize"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="total"
-        >
+        <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange"
+          :current-page="queryParams.pageNum" :page-sizes="[10, 20, 30, 40]" :page-size="queryParams.pageSize"
+          layout="total, sizes, prev, pager, next, jumper" :total="total">
         </el-pagination>
       </div>
     </div>
 
-    <el-dialog
-      title="PDF 棰勮"
-      :visible.sync="dialogVisible"
-      :close-on-click-modal="false"
-    >
+    <el-dialog title="PDF 棰勮" :visible.sync="dialogVisible" :close-on-click-modal="false">
       <div class="main">
-        <iframe
-          id="printIframe"
-          :src="url"
-          frameborder="0"
-          style="width: 100%; height: 100%"
-        ></iframe>
+        <iframe id="printIframe" :src="url" frameborder="0" style="width: 100%; height: 100%"></iframe>
       </div>
     </el-dialog>
 
-    <el-dialog
-      title="瀵艰瘖鍗�"
-      :visible.sync="daoZhenDan"
-      :close-on-click-modal="false"
-    >
+    <el-dialog title="瀵艰瘖鍗�" :visible.sync="daoZhenDan" :close-on-click-modal="false">
       <div class="main">
-        <iframe
-          id="printIframe"
-          :src="url"
-          frameborder="0"
-          style="width: 100%; height: 100%"
-        ></iframe>
+        <iframe id="printIframe" :src="url" frameborder="0" style="width: 100%; height: 100%"></iframe>
       </div>
     </el-dialog>
 
     <!-- 娣诲姞鎴栦慨鏀逛綋妫�璁板綍瀵硅瘽妗� -->
     <el-dialog :title="title" :visible.sync="open" width="660px">
-      <el-form
-        :model="formIn"
-        ref="queryForm"
-        size="small"
-        :inline="true"
-        label-width="68px"
-      >
+      <el-form :model="formIn" ref="queryForm" size="small" :inline="true" label-width="68px">
         <el-form-item label="浣撴鍙�" prop="tjNumber">
-          <el-input
-            ref="inputName"
-            v-model="formIn.tjNumber"
-            style="width: 170px"
-            clearable
-          />
+          <el-input ref="inputName" v-model="formIn.tjNumber" style="width: 170px" clearable />
         </el-form-item>
         <br />
         <el-form-item label="濮撳悕" prop="tjCustomerName">
-          <el-input
-            style="width: 116px"
-            ref="inputName"
-            v-model="formIn.tjCustomerName"
-          />
+          <el-input style="width: 116px" ref="inputName" v-model="formIn.tjCustomerName" />
         </el-form-item>
         <el-form-item label="鎬у埆" prop="tjCustomerSex">
-          <el-input
-            style="width: 116px"
-            ref="inputName"
-            v-model="formIn.tjCustomerSex"
-          />
+          <el-input style="width: 116px" ref="inputName" v-model="formIn.tjCustomerSex" />
         </el-form-item>
         <el-form-item label="骞撮緞" prop="tjCustomerAge">
-          <el-input
-            style="width: 116px"
-            ref="inputName"
-            v-model="formIn.tjCustomerAge"
-            placeholder="璇疯緭鍏ュ鍚�"
-          />
+          <el-input style="width: 116px" ref="inputName" v-model="formIn.tjCustomerAge" placeholder="璇疯緭鍏ュ鍚�" />
         </el-form-item>
       </el-form>
 
-      <el-table
-        :data="numberList"
-        style="width: 100%; margin-bottom: 10px"
-        height="400px"
-        border
-      >
-        <el-table-column
-          prop="proCheckType"
-          label="妫�鏌ョ被鍨�"
-          width="180"
-          align="center"
-        >
+      <el-table :data="numberList" style="width: 100%; margin-bottom: 10px" height="400px" border>
+        <el-table-column prop="proCheckType" label="妫�鏌ョ被鍨�" width="180" align="center">
         </el-table-column>
         <el-table-column prop="proName" label="椤圭洰" width="180" align="center">
         </el-table-column>
@@ -364,30 +178,13 @@
       </el-table>
 
       <div v-show="tcShow">
-        <el-form
-          :model="postpone"
-          ref="queryForm"
-          v-show="postpone"
-          size="small"
-          label-width="68px"
-        >
+        <el-form :model="postpone" ref="queryForm" v-show="postpone" size="small" label-width="68px">
           <el-form-item label="寤舵湡澶╂暟" prop="day">
-            <el-input
-              ref="inputName"
-              v-model="postpone.day"
-              style="width: 170px"
-              clearable
-            />
+            <el-input ref="inputName" v-model="postpone.day" style="width: 170px" clearable />
           </el-form-item>
           <br />
           <el-form-item label="寤舵湡鍘熷洜" prop="cause">
-            <el-input
-              style="width: 100%"
-              ref="inputName"
-              v-model="postpone.cause"
-              maxlength="10"
-              show-word-limit
-            />
+            <el-input style="width: 100%" ref="inputName" v-model="postpone.cause" maxlength="10" show-word-limit />
           </el-form-item>
         </el-form>
       </div>
@@ -530,7 +327,7 @@
     };
   },
   created() {
-    this.queryParams.name=this.$route.query.paramName
+    this.queryParams.name = this.$route.query.paramName
     this.getNowTime();
     this.getList();
   },
@@ -669,7 +466,7 @@
         tjNum: this.tjNumbers,
         moBanId: this.mobanId,
       };
-      addOrder(data).then((response) => {});
+      addOrder(data).then((response) => { });
       this.$tab.refreshPage();
     },
 
diff --git a/src/views/system/refund/index.vue b/src/views/system/refund/index.vue
index 760a006..eb99686 100644
--- a/src/views/system/refund/index.vue
+++ b/src/views/system/refund/index.vue
@@ -1,111 +1,56 @@
 <template>
   <div class="app-container">
     <div class="grid-content bg-purple">
-      <el-form
-        :inline="true"
-        ref="form"
-        :model="form"
-        :label-position="labelPosition"
-        class="demo-form-inline"
-      >
-        <el-form-item label="浣撴鍙�" prop="tjNum">
-          <el-input
-            ref="inputName"
-            v-model="form.tjNum"
-            placeholder="璇疯緭鍏ヤ綋妫�鍙�"
-          />
-        </el-form-item>
-        <el-form-item label="濮撳悕" prop="tjName">
-          <el-input v-model="form.tjName" placeholder="璇疯緭鍏ュ鍚�" />
-        </el-form-item>
-        <el-form-item label="鑱旂郴鐢佃瘽" prop="tjPhone">
-          <el-input v-model="form.tjPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" />
-        </el-form-item>
-        <el-form-item>
-          <el-button
-            style="margin-left: 50px"
-            type="primary"
-            size="mini"
-            @click="handle"
-            >鎼滅储</el-button
-          >
-          <el-button
-            style="margin-left: 10px"
-            type="primary"
-            size="mini"
-            @click="resetQuery"
-            >閲嶇疆</el-button
-          >
-        </el-form-item>
+      <el-form :inline="true" ref="form" :model="form" :label-position="labelPosition" class="demo-form-inline"
+        label-width="100px">
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="浣撴鍙�" prop="tjNum" style="display: flex;">
+              <el-input ref="inputName" v-model="form.tjNum" placeholder="璇疯緭鍏ヤ綋妫�鍙�" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label="濮撳悕" prop="tjName" style="display: flex;">
+              <el-input v-model="form.tjName" placeholder="璇疯緭鍏ュ鍚�" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="7">
+            <el-form-item label="鑱旂郴鐢佃瘽" prop="tjPhone" style="display: flex;">
+              <el-input v-model="form.tjPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item>
+              <el-button style="margin-left: 50px" type="primary" size="mini" @click="handle">鎼滅储</el-button>
+              <el-button style="margin-left: 10px" type="primary" size="mini" @click="resetQuery">閲嶇疆</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+
+
+
       </el-form>
     </div>
 
     <template>
-      <el-table
-        id="sig"
-        :data="customerList"
-        height="240"
-        style="width: 100%; margin-bottom: 20px"
-        border
-        @selection-change="handleSelection"
-        tooltip-effect="dark"
-        ref="multipleTable"
-      >
+      <el-table id="sig" :data="customerList" height="240" style="width: 100%; margin-bottom: 20px" border
+        @selection-change="handleSelection" tooltip-effect="dark" ref="multipleTable">
         <el-table-column type="selection" width="55"> </el-table-column>
-        <el-table-column
-          prop="tjName"
-          label="濮撳悕"
-          width="100px"
-          align="center"
-          :show-overflow-tooltip="true"
-        >
+        <el-table-column prop="tjName" label="濮撳悕" width="100px" align="center" :show-overflow-tooltip="true">
         </el-table-column>
-        <el-table-column
-          prop="tjPhone"
-          label="鑱旂郴鐢佃瘽"
-          align="center"
-          width="150px"
-          :show-overflow-tooltip="true"
-        >
+        <el-table-column prop="tjPhone" label="鑱旂郴鐢佃瘽" align="center" width="150px" :show-overflow-tooltip="true">
         </el-table-column>
-        <el-table-column
-          prop="tjComp"
-          label="鍗曚綅"
-          align="center"
-          width="250px"
-          :show-overflow-tooltip="true"
-        >
+        <el-table-column prop="tjComp" label="鍗曚綅" align="center" width="250px" :show-overflow-tooltip="true">
         </el-table-column>
-        <el-table-column
-          prop="tjType"
-          label="浣撴绫诲瀷"
-          align="center"
-          :show-overflow-tooltip="true"
-        >
+        <el-table-column prop="tjType" label="浣撴绫诲瀷" align="center" :show-overflow-tooltip="true">
         </el-table-column>
-        <el-table-column
-          prop="tjNumber"
-          label="浣撴鍙�"
-          align="center"
-          width="250px"
-          :show-overflow-tooltip="true"
-        >
+        <el-table-column prop="tjNumber" label="浣撴鍙�" align="center" width="250px" :show-overflow-tooltip="true">
         </el-table-column>
-        <el-table-column
-          prop="totalAmount"
-          label="鎬昏垂鐢�"
-          align="center"
-          :show-overflow-tooltip="true"
-        >
+        <el-table-column prop="totalAmount" label="鎬昏垂鐢�" align="center" :show-overflow-tooltip="true">
         </el-table-column>
-        <el-table-column
-          label="鐧昏鏃堕棿"
-          align="center"
-          prop="registerTime"
-          width="155px"
-          height="10px"
-          :show-overflow-tooltip="true"
-        >
+        <el-table-column label="鐧昏鏃堕棿" align="center" prop="registerTime" width="155px" height="10px"
+          :show-overflow-tooltip="true">
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.registerTime) }}</span>
           </template>
@@ -115,13 +60,7 @@
                         <span>{{ parseTime(scope.row.reportTime) }}</span>
                     </template>
                 </el-table-column> -->
-        <el-table-column
-          label="寮�绁ㄦ椂闂�"
-          align="center"
-          prop="drawerTime"
-          width="180"
-          :show-overflow-tooltip="true"
-        >
+        <el-table-column label="寮�绁ㄦ椂闂�" align="center" prop="drawerTime" width="180" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.drawerTime, "{y}-{m}-{d}") }}</span>
           </template>
@@ -129,97 +68,48 @@
       </el-table>
     </template>
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="16">
-        <el-form
-          :inline="true"
-          :model="formInline"
-          class="demo-form-inline"
-          style="margin: 0px 4px"
-        >
-          <el-form-item label="宸查�夋嫨閫�璐瑰叡璁�:">
-            <el-input
-              v-model="formInline.price"
-              placeholder="璇疯緭鍏ラ噾棰�"
-            ></el-input>
+
+    <el-form :inline="true" :model="formInline" class="demo-form-inline" style="margin: 0px 4px">
+      <el-row >
+        <el-col :span="10">
+          <el-form-item label="閫�璐瑰叡璁�:">
+            <el-input v-model="formInline.price" placeholder="璇疯緭鍏ラ噾棰�"></el-input>
           </el-form-item>
-          <el-form-item label="閫�璐圭被鍨�">
-            <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-col>
+        <el-col :span="10">
+          <el-form-item label="閫�璐圭被鍨�" style="display: flex;">
+            <el-select  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-button
-            icon="el-icon-document-delete"
-            size="small"
-            v-hasPermi="['hosp:order:export']"
-            @click="handleRefund"
-            style="margin-top: 3px"
-            >閫�璐�</el-button
-          >
-        </el-form>
-      </el-col>
-    </el-row>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item >
+          <el-button icon="el-icon-document-delete" size="small" v-hasPermi="['hosp:order:export']" @click="handleRefund"
+            style="margin-top: 3px">閫�璐�</el-button>
+          </el-form-item>
+
+        </el-col>
+      </el-row>
+    </el-form>
+
 
     <template>
-      <el-table
-        :data="numberList"
-        height="260"
-        v-loading="loading"
-        style="width: 100%; margin-top: 20px"
-        border
-        @selection-change="handleSelectionChange"
-      >
+      <el-table :data="numberList" height="260" v-loading="loading" style="width: 100%; margin-top: 20px" border
+        @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55"> </el-table-column>
-        <el-table-column
-          prop="proName"
-          label="椤圭洰鍚嶇О"
-          align="center"
-          :show-overflow-tooltip="true"
-        >
+        <el-table-column prop="proName" label="椤圭洰鍚嶇О" align="center" :show-overflow-tooltip="true">
         </el-table-column>
-        <el-table-column
-          prop="price"
-          label="鍗曚环"
-          align="center"
-          :show-overflow-tooltip="true"
-        >
+        <el-table-column prop="price" label="鍗曚环" align="center" :show-overflow-tooltip="true">
         </el-table-column>
-        <el-table-column
-          prop="count"
-          label="鏁伴噺"
-          align="center"
-          :show-overflow-tooltip="true"
-        >
+        <el-table-column prop="count" label="鏁伴噺" align="center" :show-overflow-tooltip="true">
         </el-table-column>
-        <el-table-column
-          prop="netReceipts"
-          label="瀹炴敹"
-          align="center"
-          :show-overflow-tooltip="true"
-        >
+        <el-table-column prop="netReceipts" label="瀹炴敹" align="center" :show-overflow-tooltip="true">
         </el-table-column>
-        <el-table-column
-          prop="tollCollector"
-          label="鏀惰垂浜哄憳"
-          align="center"
-          :show-overflow-tooltip="true"
-        >
+        <el-table-column prop="tollCollector" label="鏀惰垂浜哄憳" align="center" :show-overflow-tooltip="true">
         </el-table-column>
-        <el-table-column
-          label="鏀惰垂鏃堕棿"
-          align="center"
-          prop="collectFeesTime"
-          :show-overflow-tooltip="true"
-        >
+        <el-table-column label="鏀惰垂鏃堕棿" align="center" prop="collectFeesTime" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.collectFeesTime) }}</span>
           </template>
@@ -350,7 +240,7 @@
     resetQuery() {
       this.$tab.refreshPage();
     },
-    
+
     // 琛ㄦ牸鍗曢��
     handleSelection(selection, val) {
       if (selection) {
diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue
index fef5401..b4a4c12 100644
--- a/src/views/system/tijian/index.vue
+++ b/src/views/system/tijian/index.vue
@@ -1,134 +1,173 @@
 <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" class="demo-form-inline" label-width="auto" v-show="top">
-          <el-row type="flex">
-            <el-col :span="6">
-              <el-form-item label="鏄惁鍖垮悕" prop="isNow">
-                <el-select style="width: 11rem" v-model="isNow" placeholder="鏄惁鍖垮悕" @change="freezing(isNow)">
+    <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="6">
-              <el-form-item label="濮撳悕" prop="cusName">
-                <el-input v-model="form.cusName" placeholder="璇疯緭鍏ュ鍚�" :disabled="isDisabled" style="width: 13rem" />
+            <el-col :span="7">
+              <el-form-item label="濮撳悕" prop="cusName" style="display: flex;">
+                <el-input v-model="form.cusName" placeholder="璇疯緭鍏ュ鍚�" :disabled="isDisabled" />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
-              <el-form-item label="璇佷欢绫诲瀷" prop="idType">
-                <el-select :disabled="isDisabled" style="width: 13rem" v-model="form.idType" placeholder="璇烽�夋嫨璇佷欢绫诲瀷">
+            <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-col :span="6">
-              <el-form-item label="璇佷欢鍙�" prop="cusIdcard" :rules="showHidden.has_idcard === 'Y' ? rules.cusIdcard : []"
-                :required="showHidden.has_idcard === 'Y'">
-                <el-input :disabled="isDisabled" style="width: 16rem" v-model="form.cusIdcard" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�"
-                  @input="inputChange" />
-                <i style="font-size: 1rem; margin-left: 3px" 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="6">
-              <el-form-item label="骞撮緞" prop="age">
-            <el-input style="width: 5rem" v-model="form.age" :disabled="isDisabled" />
-          </el-form-item>
-          <el-form-item prop="ageUnit">
-            <el-select :disabled="isDisabled" style="width: 5rem" v-model="form.ageUnit">
-              <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-col :span="6">
-              <el-form-item label="鎬у埆" prop="cusSex" :rules="showHidden.has_sex === 'Y' ? rules.cusSex : []"
-                :required="showHidden.has_sex === 'Y'">
-                <el-select :disabled="isDisabled" style="width: 13rem" v-model="form.cusSex" placeholder="鎬у埆">
-                  <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label"
-                    :value="parseInt(dict.value)"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="鍑虹敓鏃ユ湡" prop="cusBrithday">
-                <el-date-picker :disabled="isDisabled" style="width: 13.4rem" clearable v-model="form.cusBrithday"
-                  type="date" value-format="yyyy-MM-dd" placeholder="璇烽�夋嫨鍑虹敓鏃ユ湡">
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="鑱旂郴鐢佃瘽" prop="cusPhone" :rules="showHidden.is_phone === 'Y' ? rules.cusPhone : []"
-                :required="showHidden.is_phone === 'Y'">
-                <el-input v-model="form.cusPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" :disabled="isDisabled" style="width: 16rem" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="鎴峰彛鍦板潃" prop="addr">
-                <el-input v-model="form.addr" placeholder="璇疯緭鍏ユ埛鍙e湴鍧�" :disabled="isDisabled" style="width: 31.5rem" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="鐜颁綇鍧�" prop="cusAddr">
-                <el-input v-model="form.cusAddr" placeholder="璇疯緭鍏ョ幇灞呬綇鍦板潃" :disabled="isDisabled" style="width: 36.5rem" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="6">
-              <el-form-item label="鑱屼笟" prop="career">
-                <el-select filterable :disabled="isDisabled" v-model="form.career" placeholder="璇疯緭鍏ヨ亴涓�"
-                  style="width: 11rem">
-                  <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="6">
-              <el-form-item label="姘戞棌" prop="cusNational">
-                <el-select filterable :disabled="isDisabled" v-model="form.cusNational" placeholder="璇烽�夋嫨姘戞棌"
-                  style="width: 13rem">
+            <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="6">
-              <el-form-item label="濠氬Щ" prop="cusMarryStatus">
-                <el-select :disabled="isDisabled" style="width: 11rem" v-model="form.cusMarryStatus" placeholder="濠氬Щ鐘跺喌">
+            <el-col :span="7">
+              <el-form-item label="鎬у埆" prop="cusSex" :rules="showHidden.has_sex === 'Y' ? rules.cusSex : []"
+                :required="showHidden.has_sex === 'Y'" style="display: flex;">
+                <el-select :disabled="isDisabled" v-model="form.cusSex" placeholder="鎬у埆">
+                  <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label"
+                    :value="parseInt(dict.value)"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+
+
+            <el-col :span="9">
+              <el-form-item label="璇佷欢鍙�" prop="cusIdcard" :rules="showHidden.has_idcard === 'Y' ? rules.cusIdcard : []"
+                :required="showHidden.has_idcard === 'Y'" style="display: flex;">
+                <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="showHidden.is_phone === 'Y' ? rules.cusPhone : []"
+                :required="showHidden.is_phone === 'Y'" 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="6">
-              <el-form-item label="宸ヤ綔鍗曚綅" prop="company">
-                <el-input :disabled="isDisabled" v-model="form.company" placeholder="璇疯緭鍏ュ伐浣滃崟浣�" style="width: 18rem" />
+              <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">
           <el-row>
-            <el-col :span="6">
-              <el-form-item label="浠嬬粛浜�" prop="cusIntroduce">
-                <el-input :disabled="isDisabled" v-model="form.cusIntroduce" placeholder="璇疯緭鍏ヤ粙缁嶄汉" style="width: 11rem" />
+            <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">
+          <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-col :span="6">
-              <el-form-item label="閭" prop="cusEmail">
-                <el-input v-model="form.cusEmail" placeholder="璇疯緭鍏ラ偖绠�" :disabled="isDisabled" style="width: 13rem" />
+          </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="10">
+              <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="12">
-              <el-form-item style="margin-left: 24rem">
-                <el-button :disabled="isDisabled" style="margin-left: 5rem" type="primary" size="mini"
-                  @click="submitForm">鐧昏</el-button>
+            <el-col :span="11">
+              <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-row>
+        </el-form>
+        <el-form :inline="true" ref="form" :model="form" :rules="rules" :label-position="labelPosition" label-width="80px"
+          v-show="top">
+          <el-row>
+            <el-col :span="24">
+              <el-form-item>
+                <el-button :disabled="isDisabled" type="primary" size="mini" @click="submitForm">鐧昏</el-button>
                 <el-button icon="el-icon-refresh" size="mini" @click="resetQuery" @queryTable="getList">閲嶇疆</el-button>
               </el-form-item>
             </el-col>
@@ -136,17 +175,17 @@
         </el-form>
       </div>
       <div class="content" v-show="showHidden.mall_hasPhoto == 'Y'">
-        <div v-show="hide" style="border: 1px dashed #dcdfe6; width: 180px; height: 180px">
+        <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>
         <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" />
+              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>
@@ -610,7 +649,7 @@
       currentDate: "",
       currentTime: "",
       formIn: {
-        tjPro:"浣撴璐�"
+        tjPro: "浣撴璐�"
       },
       selectionList: [],
       OrderId: "",
@@ -646,7 +685,7 @@
       activeName: "1",
       // 閬僵灞�
       loading: false,
-      labelPosition: "right",
+      labelPosition: "left",
       imageUrl: "",
       isDisabled: false,
       size: "",
@@ -1517,7 +1556,7 @@
                 }
                 this.pacName = item.pacName;
               });
-             
+
               const r = /^\+?[0-9][0-9]*$/; //姝f暣鏁帮紙鍙互0鎵撳ご锛�
               let TotalPrice = this.TotalPrice1 * (this.discount / 10);
               if (r.test(TotalPrice)) {
@@ -1527,7 +1566,7 @@
                 this.TotalPrice =
                   TotalPrice
               }
-          
+
               this.list1 = false;
               this.list3 = true;
 
@@ -1627,7 +1666,7 @@
           if (response.data) {
             this.feeitems = response.data;
             this.loading = false;
-          }else{
+          } else {
             this.feeitems = []
             this.loading = false;
           }
@@ -1895,10 +1934,6 @@
   display: block;
 }
 
-.el-col-8 {
-  width: 330px;
-}
-
 .tab4 {
   width: 100%;
   display: flex;
@@ -1974,6 +2009,15 @@
   height: 300px;
 }
 
+.el-input--suffix .el-input__inner {
+  padding-right: 15px;
+}
+
+.el-date-editor.el-input,
+.el-date-editor.el-input__inner {
+  width: 95.9%;
+}
+
 /* .el-dialog {
   width: 1000px;
   min-height: 500px;
diff --git a/vue.config.js b/vue.config.js
index 819023e..6199fc0 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -36,9 +36,9 @@
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         //target: `https://ltpeis.xaltjdkj.cn:5501/prod-api/getInfo`,
-        target: `http://192.168.0.101:5011`,
-        // target: `http://192.168.0.99:8080/ltkj-admin`,
-        // target: `https://ltpeis.xaltjdkj.cn:5011/ltkj-admin `,
+        // target: `http://192.168.0.101:5011`,
+        // // target: `http://192.168.0.99:8080/ltkj-admin`,
+        target: `https://ltpeis.xaltjdkj.cn:5011/ltkj-admin`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''

--
Gitblit v1.8.0