From 4a3c87ca56507f4950035a0ca43bc7b078804996 Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期二, 08 七月 2025 13:55:20 +0800
Subject: [PATCH] qx

---
 src/views/system/bill/index.vue     |  347 +----
 src/views/system/tijian/index.vue   | 1389 ++++++++++++------------
 src/views/doctor/checkAll/index.vue | 1660 ++++++----------------------
 vue.config.js                       |    2 
 4 files changed, 1,152 insertions(+), 2,246 deletions(-)

diff --git a/src/views/doctor/checkAll/index.vue b/src/views/doctor/checkAll/index.vue
index 1365eaa..1570009 100644
--- a/src/views/doctor/checkAll/index.vue
+++ b/src/views/doctor/checkAll/index.vue
@@ -1,237 +1,100 @@
 <template>
   <div class="mainbox">
-    <el-form
-      :model="queryParams"
-      ref="tableList"
-      :inline="true"
-      label-width="76px"
-      style="margin-top: 10px"
-      v-if="tjStatus == 1"
-    >
+    <el-form :model="queryParams" ref="tableList" :inline="true" label-width="76px" style="margin-top: 10px">
       <el-form-item label="濮撳悕" prop="name">
-        <el-input
-          v-model="queryParams.name"
-          style="width: 120px"
-          placeholder="璇疯緭鍏ュ鍚�"
-          clearable
-          @keyup.enter.native="submitForm"
-        ></el-input>
+        <el-input v-model="queryParams.name" style="width: 120px" placeholder="璇疯緭鍏ュ鍚�" clearable
+          @keyup.enter.native="submitForm"></el-input>
       </el-form-item>
       <el-form-item label="浣撴鍙�" prop="tjNumber">
-        <el-input
-          ref="inputName"
-          v-model="queryParams.tjNumber"
-          style="width: 180px"
-          placeholder="璇疯緭鍏ヤ綋妫�鍙�"
-          clearable
-          @keyup.enter.native="submitForm"
-          @blur="hb"
-        ></el-input>
+        <el-input ref="inputName" v-model="queryParams.tjNumber" style="width: 180px" placeholder="璇疯緭鍏ヤ綋妫�鍙�" clearable
+          @keyup.enter.native="submitForm" @blur="hb"></el-input>
       </el-form-item>
-
-      <el-form-item
-        label="鍗曚綅鍚嶇О"
-        prop="tjCompName"
-        style="margin-left: 20px"
-      >
-        <el-select
-          :remote-method="getRemoteData"
-          v-model="queryParams.tjCompName"
-          value-key="drugManufacturerId"
-          style="width: 180px"
-          remote
-          filterable
-          placeholder="璇烽�夋嫨鍗曚綅鍚嶇О"
-          clearable
-          @change="searchSelect"
-        >
-          <el-option
-            v-for="dict in CompanyList"
-            :key="dict.drugManufacturerId"
-            :label="dict.cnName"
-            :value="dict"
-          />
+       <el-form-item label="浣撴绫诲埆">
+                <el-select style="width: 200px" v-model="queryParams.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-form-item>
+      <el-form-item label="濂楅鍚嶇О" prop="tcm">
+        <el-input v-model="queryParams.tcm" style="width: 120px" placeholder="璇疯緭鍏ュ椁愬悕绉�" clearable
+          @keyup.enter.native="submitForm"></el-input>
+      </el-form-item>
+      <el-form-item label="鍗曚綅鍚嶇О" prop="tjCompName" style="margin-left: 20px">
+        <el-select :remote-method="getRemoteData" v-model="queryParams.tjCompName" value-key="drugManufacturerId"
+          style="width: 180px" remote filterable placeholder="璇烽�夋嫨鍗曚綅鍚嶇О" clearable @change="searchSelect">
+          <el-option v-for="dict in CompanyList" :key="dict.drugManufacturerId" :label="dict.cnName" :value="dict" />
         </el-select>
       </el-form-item>
-      <el-form-item label="瀹℃牳鍖诲笀" prop="shys">
-        <el-input
-          ref="inputName"
-          v-model="queryParams.shys"
-          style="width: 180px"
-          placeholder="璇疯緭鍏ュ鏍稿尰甯�"
-          clearable
-          @keyup.enter.native="submitForm"
-        ></el-input>
-      </el-form-item>
+
       <el-form-item>
-        <el-button
-          type="primary"
-          size="mini"
-          @click="submitForm"
-          style="margin-right: 15px"
-          >鎼滅储</el-button
-        >
+        <el-button type="primary" size="mini" @click="submitForm" style="margin-right: 15px">鎼滅储</el-button>
         <el-button size="mini" @click="resetQuery">閲嶇疆</el-button>
-        <el-button
-          type="primary"
-          size="mini"
-          @click="toggleCollapse"
-          style="margin-right: 15px"
-          v-show="isCollapsed == 0"
-          >楂樼骇鎼滅储</el-button
-        >
-        <el-button
-          type="primary"
-          size="mini"
-          @click="toggleCollapse3"
-          style="margin-right: 15px"
-          v-show="isCollapsed == 1"
-          >楂樼骇鎼滅储</el-button
-        >
+        <el-button type="primary" size="mini" @click="toggleCollapse" style="margin-right: 15px"
+          v-show="isCollapsed == 0">楂樼骇鎼滅储</el-button>
+        <el-button type="primary" size="mini" @click="toggleCollapse3" style="margin-right: 15px"
+          v-show="isCollapsed == 1">楂樼骇鎼滅储</el-button>
       </el-form-item>
       <el-row v-show="isCollapsed == 1" :gutter="20">
+         <el-col :span="4">
+        <el-form-item label="瀹℃牳鍖诲笀" prop="shys">
+          <el-input ref="inputName" v-model="queryParams.shys" style="width: 120px" placeholder="璇疯緭鍏ュ鏍稿尰甯�" clearable
+            @keyup.enter.native="submitForm"></el-input>
+        </el-form-item>
+        </el-col>
         <el-col :span="8">
           <el-form-item label="浣撴鏃堕棿" prop="tjTime">
-            <el-date-picker
-              v-model="startTime"
-              type="datetimerange"
-              align="right"
-              :picker-options="pickerOptions"
-              style="width: 310px"
-              start-placeholder="寮�濮嬫棩鏈�"
-              end-placeholder="缁撴潫鏃ユ湡"
-              :default-time="['00:00:00', '23:00:00']"
-              format="yyyy-MM-dd HH:mm"
-              value-format="yyyy-MM-dd HH:mm"
-              @change="dateChangebirthday1"
-            >
+            <el-date-picker v-model="startTime" type="datetimerange" align="right" :picker-options="pickerOptions"
+              style="width: 310px" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡"
+              :default-time="['00:00:00', '23:00:00']" format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm"
+              @change="dateChangebirthday1">
             </el-date-picker>
           </el-form-item>
         </el-col>
+
       </el-row>
     </el-form>
 
-    <el-form
-      :model="queryParams"
-      ref="tableList"
-      :inline="true"
-      label-width="76px"
-      style="margin-top: 10px"
-      v-else
-    >
+    <!-- <el-form :model="queryParams" ref="tableList" :inline="true" label-width="76px" style="margin-top: 10px" >
       <el-form-item label="濮撳悕" prop="name">
-        <el-input
-          v-model="queryParams.name"
-          style="width: 120px"
-          placeholder="璇疯緭鍏ュ鍚�"
-          clearable
-          @keyup.enter.native="submitForm"
-        ></el-input>
+        <el-input v-model="queryParams.name" style="width: 120px" placeholder="璇疯緭鍏ュ鍚�" clearable
+          @keyup.enter.native="submitForm"></el-input>
       </el-form-item>
       <el-form-item label="浣撴鍙�" prop="tjNumber">
-        <el-input
-          ref="inputName"
-          v-model="queryParams.tjNumber"
-          style="width: 180px"
-          placeholder="璇疯緭鍏ヤ綋妫�鍙�"
-          clearable
-          @keyup.enter.native="submitForm"
-          @blur="hb"
-        ></el-input>
+        <el-input ref="inputName" v-model="queryParams.tjNumber" style="width: 180px" placeholder="璇疯緭鍏ヤ綋妫�鍙�" clearable
+          @keyup.enter.native="submitForm" @blur="hb"></el-input>
       </el-form-item>
+      
       <el-form-item label="浣撴鏃堕棿" prop="tjTime">
-        <el-date-picker
-          v-model="startTime"
-          type="datetimerange"
-          align="right"
-          :picker-options="pickerOptions"
-          style="width: 310px"
-          start-placeholder="寮�濮嬫棩鏈�"
-          end-placeholder="缁撴潫鏃ユ湡"
-          :default-time="['00:00:00', '23:00:00']"
-          format="yyyy-MM-dd HH:mm"
-          value-format="yyyy-MM-dd HH:mm"
-          @change="dateChangebirthday1"
-        >
+        <el-date-picker v-model="startTime" type="datetimerange" align="right" :picker-options="pickerOptions"
+          style="width: 310px" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡" :default-time="['00:00:00', '23:00:00']"
+          format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm" @change="dateChangebirthday1">
         </el-date-picker>
       </el-form-item>
-      <el-form-item
-        label="鍗曚綅鍚嶇О"
-        prop="tjCompName"
-        style="margin-left: 20px"
-      >
-        <el-select
-          :remote-method="getRemoteData"
-          v-model="queryParams.tjCompName"
-          value-key="drugManufacturerId"
-          style="width: 180px"
-          remote
-          filterable
-          placeholder="璇烽�夋嫨鍗曚綅鍚嶇О"
-          clearable
-          @change="searchSelect"
-        >
-          <el-option
-            v-for="dict in CompanyList"
-            :key="dict.drugManufacturerId"
-            :label="dict.cnName"
-            :value="dict"
-          />
+      <el-form-item label="鍗曚綅鍚嶇О" prop="tjCompName" style="margin-left: 20px">
+        <el-select :remote-method="getRemoteData" v-model="queryParams.tjCompName" value-key="drugManufacturerId"
+          style="width: 180px" remote filterable placeholder="璇烽�夋嫨鍗曚綅鍚嶇О" clearable @change="searchSelect">
+          <el-option v-for="dict in CompanyList" :key="dict.drugManufacturerId" :label="dict.cnName" :value="dict" />
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button
-          type="primary"
-          size="mini"
-          @click="submitForm"
-          style="margin-right: 15px"
-          >鎼滅储</el-button
-        >
+        <el-button type="primary" size="mini" @click="submitForm" style="margin-right: 15px">鎼滅储</el-button>
         <el-button size="mini" @click="resetQuery">閲嶇疆</el-button>
       </el-form-item>
-    </el-form>
+    </el-form> -->
 
-    <el-radio-group
-      v-model="tjStatus"
-      @input="radioChange"
-      style="margin-left: 20px"
-    >
+    <el-radio-group v-model="tjStatus" @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>
 
     <template>
-      <el-table
-        v-loading="loading"
-        :data="checkList"
-        ref="table"
-        border
-        style="margin: 20px; width: 98%"
-        @current-change="handleCurrentChange"
-      >
-        <el-table-column
-          label="浣撴鍙�"
-          align="center"
-          prop="tjNumber"
-          :show-overflow-tooltip="true"
-          width="160px"
-          fixed="left"
-        />
-        <el-table-column
-          label="濮撳悕"
-          align="center"
-          prop="cusName"
-          :show-overflow-tooltip="true"
-          width="100px"
-          fixed="left"
-        />
-        <el-table-column
-          label="鎬у埆"
-          align="center"
-          prop="cusSex"
-          :show-overflow-tooltip="true"
-          width="55px"
-        >
+      <el-table v-loading="loading" :data="checkList" ref="table" border style="margin: 20px; width: 98%"
+        @current-change="handleCurrentChange">
+        <el-table-column label="浣撴鍙�" align="center" prop="tjNumber" :show-overflow-tooltip="true" width="160px"
+          fixed="left" />
+        <el-table-column label="濮撳悕" align="center" prop="cusName" :show-overflow-tooltip="true" width="100px"
+          fixed="left" />
+        <el-table-column label="鎬у埆" align="center" prop="cusSex" :show-overflow-tooltip="true" width="55px">
           <template slot-scope="scope">
             <span v-if="scope.row.cusSex == '0'">鐢�</span>
             <span v-if="scope.row.cusSex == '1'">濂�</span>
@@ -239,171 +102,71 @@
             <span v-if="scope.row.cusSex == '9'">鏈鏄庢�у埆</span>
           </template>
         </el-table-column>
-        <el-table-column
-          label="鍑虹敓鏃ユ湡"
-          align="center"
-          prop="cusBrithday"
-          :show-overflow-tooltip="true"
-          width="110px"
-        />
-        <el-table-column
-          label="鐢佃瘽"
-          align="center"
-          prop="cusPhone"
-          :show-overflow-tooltip="true"
-          width="130px"
-        />
-        <el-table-column
-          label="瀹℃牳鏃堕棿"
-          align="center"
-          prop="shsj"
-          :show-overflow-tooltip="true"
-          width="180px"
-          v-if="tjStatus == 1"
-        />
-        <el-table-column
-          label="浣撴鏃堕棿"
-          align="center"
-          prop="tjTime"
-          :show-overflow-tooltip="true"
-          width="180px"
-          v-if="tjStatus == 0"
-        />
+        <el-table-column label="鍑虹敓鏃ユ湡" align="center" prop="cusBrithday" :show-overflow-tooltip="true" width="110px" />
+        <el-table-column label="鐢佃瘽" align="center" prop="cusPhone" :show-overflow-tooltip="true" width="130px" />
+        <el-table-column label="瀹℃牳鏃堕棿" align="center" prop="shsj" :show-overflow-tooltip="true" width="180px"
+          v-if="tjStatus == 1" />
+        <el-table-column label="浣撴鏃堕棿" align="center" prop="tjTime" :show-overflow-tooltip="true" width="180px"
+          v-if="tjStatus == 0" />
         <!-- <el-table-column label="瀹屾垚鏃堕棿" align="center" prop="finishTime" :show-overflow-tooltip="true" width="160px" /> -->
-        <el-table-column
-          label="濂楅鍚嶇О"
-          align="center"
-          prop="pacName"
-          :show-overflow-tooltip="true"
-          width="160px"
-        />
-        <el-table-column
-          label="鐘舵��"
-          align="center"
-          prop="tjStatus"
-          :show-overflow-tooltip="true"
-          width="120px"
-          v-if="tjStatus == 0"
-        >
+        <el-table-column label="濂楅鍚嶇О" align="center" prop="pacName" :show-overflow-tooltip="true" width="160px" />
+        <el-table-column label="鐘舵��" align="center" prop="tjStatus" :show-overflow-tooltip="true" width="120px"
+          v-if="tjStatus == 0">
           <template slot-scope="scope" v-if="tjStatus == 0">
             <span>{{ scope.row.tjStatus == "1" ? "宸插鏍�" : "鏈鏍�" }}</span>
           </template>
         </el-table-column>
-        <el-table-column
-          label="瀹℃牳鍖诲笀"
-          align="center"
-          prop="shys"
-          width="120px"
-          v-if="tjStatus == 1"
-        />
-        <el-table-column
-          label="鍗曚綅鍚嶇О"
-          align="center"
-          prop="tjCompName"
-          :show-overflow-tooltip="true"
-        />
+        <el-table-column label="瀹℃牳鍖诲笀" align="center" prop="shys" width="120px" v-if="tjStatus == 1" />
+        <el-table-column label="鍗曚綅鍚嶇О" align="center" prop="tjCompName" :show-overflow-tooltip="true" />
         <el-table-column label="浣撴绫诲埆" align="center" prop="tjCategory">
           <template slot-scope="scope">
-            <dict-tag
-              :options="dict.type.dict_tjtype"
-              :value="scope.row.tjCategory"
-            />
+            <dict-tag :options="dict.type.dict_tjtype" :value="scope.row.tjCategory" />
           </template>
         </el-table-column>
-        <el-table-column
-          label="鎿嶄綔"
-          align="center"
-          width="120px"
-          fixed="right"
-        >
+        <el-table-column label="鎿嶄綔" align="center" width="120px" fixed="right">
           <template slot-scope="scope">
-            <el-button
-              fixed="right"
-              title="澶勬柟"
-              type="text"
-              size="mini"
-              @click.stop="rowClick(scope.row)"
-              icon="el-icon-edit-outline"
-            ></el-button>
-            <el-button
-              fixed="right"
-              title="璇︽儏"
-              type="text"
-              size="mini"
-              @click.stop="handleClick(scope.row)"
-              icon="el-icon-document-copy"
-            ></el-button>
-            <el-button
-              type="text"
-              size="mini"
-              @click.stop="viewReport(scope.row)"
-              v-if="scope.row.tjStatus == '1'"
-              title="棰勮"
-              icon="el-icon-view"
-            ></el-button>
-            <el-button
-              type="text"
-              size="mini"
-              v-if="scope.row.tjStatus == '1'"
-              title="鎾ら攢"
-              @click.stop="getRevoke(scope.row)"
-              icon="el-icon-refresh-left"
-            ></el-button>
+            <el-button fixed="right" title="澶勬柟" type="text" size="mini" @click.stop="rowClick(scope.row)"
+              icon="el-icon-edit-outline"></el-button>
+            <el-button fixed="right" title="璇︽儏" type="text" size="mini" @click.stop="handleClick(scope.row)"
+              icon="el-icon-document-copy"></el-button>
+            <el-button type="text" size="mini" @click.stop="viewReport(scope.row)" v-if="scope.row.tjStatus == '1'"
+              title="棰勮" icon="el-icon-view"></el-button>
+            <el-button type="text" size="mini" v-if="scope.row.tjStatus == '1'" title="鎾ら攢"
+              @click.stop="getRevoke(scope.row)" icon="el-icon-refresh-left"></el-button>
           </template>
         </el-table-column>
       </el-table>
 
       <div class="pag">
         <div class="pag1">
-          <pagination
-            v-show="total > 0"
-            :total="total"
-            :page.sync="queryParams.page"
-            :limit.sync="queryParams.pageSize"
-            @pagination="submitForm"
-          />
+          <pagination v-show="total > 0" :total="total" :page.sync="queryParams.page" :limit.sync="queryParams.pageSize"
+            @pagination="submitForm" />
         </div>
       </div>
     </template>
 
     <!-- 鐐瑰嚮寮瑰嚭妗� -->
-    <el-drawer
-      custom-class="tanchu"
-      :visible.sync="drawer"
-      :before-close="handleClose"
-      :with-header="false"
-      size="100%"
-      :show-close="true"
-    >
-      <div
-        v-loading="isLoading"
-        element-loading-text="姝e湪鍔犺浇鏁版嵁锛岃绋嶅��..."
-        element-loading-spinner="el-icon-loading"
-        element-loading-background="rgba(255, 255, 255, 0.8)"
-        style="height: 100%; padding: 20px; position: relative"
-      >
+    <el-drawer custom-class="tanchu" :visible.sync="drawer" :before-close="handleClose" :with-header="false" size="100%"
+      :show-close="true">
+      <div v-loading="isLoading" element-loading-text="姝e湪鍔犺浇鏁版嵁锛岃绋嶅��..." element-loading-spinner="el-icon-loading"
+        element-loading-background="rgba(255, 255, 255, 0.8)" style="height: 100%; padding: 20px; position: relative">
         <div class="top">
-          <table
-            style="
+          <table style="
               width: 100%;
               margin: 10px 10px;
               border: 1px solid #dfe6ec;
               border-collapse: collapse;
-            "
-            cellspacing="4"
-          >
+            " cellspacing="4">
             <caption style="background-color: #f8f8f9; font-size: 18px">
               {{
                 tableAll.cusName
               }}鐨勪綋妫�璧勬枡
             </caption>
-            <tr
-              style="
+            <tr style="
                 border: 1px solid #dfe6ec;
                 border-collapse: collapse;
                 height: 36px;
-              "
-            >
+              ">
               <td style="border: 1px solid #dfe6ec; border-collapse: collapse">
                 濮撳悕锛�
               </td>
@@ -416,21 +179,19 @@
                   tableAll.cusSex == 0
                     ? "鐢�"
                     : tableAll.cusSex == 1
-                    ? "濂�"
-                    : "鏈煡"
+                      ? "濂�"
+                      : "鏈煡"
                 }}
               </td>
               <td style="border: 1px solid #dfe6ec; border-collapse: collapse">
                 骞撮緞锛歿{ tableAll.age }}
               </td>
             </tr>
-            <tr
-              style="
+            <tr style="
                 border: 1px solid #dfe6ec;
                 border-collapse: collapse;
                 height: 36px;
-              "
-            >
+              ">
               <td style="border: 1px solid #dfe6ec; border-collapse: collapse">
                 浣撴鍗曞彿锛�
               </td>
@@ -455,77 +216,47 @@
             </el-button>
           </div>
           <div class="btn1">
-            <el-button @click="historicalreport()" type="primary"
-              ><span class="vertical-text">鍘嗗彶鎶ュ憡</span></el-button
-            >
+            <el-button @click="historicalreport()" type="primary"><span class="vertical-text">鍘嗗彶鎶ュ憡</span></el-button>
           </div>
           <div v-if="tableAll.tjCategory == '02'" class="btn1">
-            <el-button @click="medicalhistory()" type="primary"
-              ><span class="vertical-text">鑱屼笟鐥呭彶</span></el-button
-            >
+            <el-button @click="medicalhistory()" type="primary"><span class="vertical-text">鑱屼笟鐥呭彶</span></el-button>
           </div>
           <div class="btn1" v-if="msgjianqian == 'y' || msgjianqian == 'Y'">
-            <el-button @click="jianqian()" type="primary"
-              ><span class="vertical-text">妫�鍓嶉棶璇�</span></el-button
-            >
+            <el-button @click="jianqian()" type="primary"><span class="vertical-text">妫�鍓嶉棶璇�</span></el-button>
           </div>
           <div class="btn1">
-            <el-button @click="xiangmuqingkuang()" type="primary"
-              ><span class="vertical-text">椤圭洰鎯呭喌</span></el-button
-            >
+            <el-button @click="xiangmuqingkuang()" type="primary"><span class="vertical-text">椤圭洰鎯呭喌</span></el-button>
           </div>
           <div class="btn1">
-            <el-button @click="yichangjieguo()" type="primary"
-              ><span class="vertical-text">寮傚父缁撴灉</span></el-button
-            >
+            <el-button @click="yichangjieguo()" type="primary"><span class="vertical-text">寮傚父缁撴灉</span></el-button>
           </div>
           <div class="btn1">
-            <el-button @click="fuchaxiangmu()" type="primary"
-              ><span class="vertical-text">澶嶆煡椤圭洰</span></el-button
-            >
+            <el-button @click="fuchaxiangmu()" type="primary"><span class="vertical-text">澶嶆煡椤圭洰</span></el-button>
           </div>
           <div class="btn1">
-            <el-button @click="yichanghuifu()" type="primary"
-              ><span class="vertical-text">寮傚父鎭㈠</span></el-button
-            >
+            <el-button @click="yichanghuifu()" type="primary"><span class="vertical-text">寮傚父鎭㈠</span></el-button>
           </div>
         </div>
         <div class="box">
           <div class="left-container">
             <div class="left">
               <div v-for="(item, index) in changedate" :key="index">
-                <div
-                  style="
+                <div style="
                     text-align: center;
                     background-color: #aad8df;
                     margin-top: 10px;
-                  "
-                >
+                  ">
                   {{ item.parent || "" }}
                 </div>
                 <div v-if="item.xmlb == '0'">
-                  <el-table
-                    :data="item.sons"
-                    border
-                    style="width: 100%"
-                    :row-style="changRed"
-                    :header-cell-style="{ background: '#aad8df' }"
-                  >
-                    <el-table-column
-                      align="center"
-                      label="妫�娴嬮」鐩�"
-                      width="464"
-                    >
+                  <el-table :data="item.sons" border style="width: 100%" :row-style="changRed"
+                    :header-cell-style="{ background: '#aad8df' }">
+                    <el-table-column align="center" label="妫�娴嬮」鐩�" width="464">
                       <template slot-scope="scope">
                         <div>{{ scope.row.proName }}</div>
                       </template>
                     </el-table-column>
-                    <el-table-column
-                      align="center"
-                      prop="proResult"
-                      label="妫�娴嬬粨鏋�"
-                      width="180"
-                    ></el-table-column>
+                    <el-table-column align="center" prop="proResult" label="妫�娴嬬粨鏋�" width="180"></el-table-column>
                     <el-table-column align="center" prop="" label="鍗曚綅">
                       <template slot-scope="scope">
                         <div v-if="scope.row.project != null">
@@ -534,12 +265,7 @@
                         <div v-else>{{ scope.row.proAdvice }}</div>
                       </template>
                     </el-table-column>
-                    <el-table-column
-                      align="center"
-                      prop="conclusion"
-                      label="寮傚父"
-                      width="180"
-                    ></el-table-column>
+                    <el-table-column align="center" prop="conclusion" label="寮傚父" width="180"></el-table-column>
                     <el-table-column align="center" prop="" label=" 鍙傝�冭寖鍥�">
                       <template slot-scope="scope">
                         <div v-if="scope.row.project != null">
@@ -554,74 +280,52 @@
                     </el-table-column>
                   </el-table>
                   <table style="width: 100%" v-if="tjproject != '1'">
-                    <tr
-                      style="
+                    <tr style="
                         border: 1px solid #dfe6ec;
                         border-collapse: collapse;
-                      "
-                    >
-                      <td
-                        style="
+                      ">
+                      <td style="
                           border: 1px solid #dfe6ec;
                           border-collapse: collapse;
                           width: 7%;
-                        "
-                      >
+                        ">
                         灏忕粨锛�
                       </td>
                       <td style="border: 1px solid #dfe6ec; width: 45%">
                         <el-input v-model="item.remark" disabled></el-input>
                       </td>
-                      <td
-                        style="
+                      <td style="
                           border: 1px solid #dfe6ec;
                           border-collapse: collapse;
                           width: 15%;
-                        "
-                      >
+                        ">
                         涓绘鍖诲笀锛�
                       </td>
-                      <td
-                        style="
+                      <td style="
                           border: 1px solid #dfe6ec;
                           border-collapse: collapse;
-                        "
-                        colspan="2"
-                      >
+                        " colspan="2">
                         {{ item.doctorName }}
                       </td>
                     </tr>
-                    <tr
-                      style="
+                    <tr style="
                         border: 1px solid #dfe6ec;
                         border-collapse: collapse;
                         width: 200px;
-                      "
-                    >
-                      <td
-                        style="
+                      ">
+                      <td style="
                           border: 1px solid #dfe6ec;
                           border-collapse: collapse;
                           width: 240px;
-                        "
-                      >
+                        ">
                         澶囨敞锛�
                       </td>
-                      <td
-                        style="
+                      <td style="
                           border: 1px solid #dfe6ec;
                           border-collapse: collapse;
-                        "
-                        colspan="3"
-                      >
-                        <el-input
-                          type="textarea"
-                          autosize
-                          placeholder="璇疯緭鍏ュ唴瀹�"
-                          v-model="changedate[index].remark"
-                          v-on:input="change"
-                          style="width: 100%"
-                        ></el-input>
+                        " colspan="3">
+                        <el-input type="textarea" autosize placeholder="璇疯緭鍏ュ唴瀹�" v-model="changedate[index].remark"
+                          v-on:input="change" style="width: 100%"></el-input>
                       </td>
                     </tr>
                   </table>
@@ -629,161 +333,91 @@
                 <div v-else>
                   <table style="width: 100%" v-if="tjproject != '1'">
                     <tr style="border: 1px solid #dfe6ec">
-                      <td
-                        style="
+                      <td style="
                           border: 1px solid #dfe6ec;
                           border-collapse: collapse;
                           width: 15%;
                           height: auto;
-                        "
-                      >
+                        ">
                         妫�鏌ユ墍瑙侊細
                       </td>
-                      <td
-                        style="border: 1px solid #dfe6ec; height: auto"
-                        colspan="2"
-                      >
-                        <el-input
-                          type="textarea"
-                          autosize
-                          placeholder="璇疯緭鍏ュ唴瀹�"
-                          v-model="item.jgbx"
-                          style="width: 100%"
-                        ></el-input>
+                      <td style="border: 1px solid #dfe6ec; height: auto" colspan="2">
+                        <el-input type="textarea" autosize placeholder="璇疯緭鍏ュ唴瀹�" v-model="item.jgbx"
+                          style="width: 100%"></el-input>
                       </td>
                     </tr>
-                    <tr
-                      style="
+                    <tr style="
                         border: 1px solid #dfe6ec;
                         border-collapse: collapse;
-                      "
-                    >
-                      <td
-                        style="
+                      ">
+                      <td style="
                           border: 1px solid #dfe6ec;
                           border-collapse: collapse;
                           width: 15%;
-                        "
-                      >
+                        ">
                         妫�鏌ユ彁绀猴細
                       </td>
-                      <td
-                        style="
+                      <td style="
                           border: 1px solid #dfe6ec;
                           border-collapse: collapse;
-                        "
-                        colspan="2"
-                      >
-                        <el-input
-                          type="textarea"
-                          autosize
-                          placeholder="璇疯緭鍏ュ唴瀹�"
-                          v-model="item.remark"
-                          style="width: 100%"
-                        ></el-input>
+                        " colspan="2">
+                        <el-input type="textarea" autosize placeholder="璇疯緭鍏ュ唴瀹�" v-model="item.remark"
+                          style="width: 100%"></el-input>
                       </td>
                     </tr>
-                    <tr
-                      style="
+                    <tr style="
                         border: 1px solid #dfe6ec;
                         border-collapse: collapse;
                         width: 200px;
-                      "
-                    >
-                      <td
-                        style="
+                      ">
+                      <td style="
                           border: 1px solid #dfe6ec;
                           border-collapse: collapse;
                           width: 15%;
-                        "
-                      >
+                        ">
                         涓绘鍖诲笀锛�
                       </td>
-                      <td
-                        style="
+                      <td style="
                           border: 1px solid #dfe6ec;
                           border-collapse: collapse;
-                        "
-                        colspan="2"
-                      >
+                        " colspan="2">
                         {{ item.doctorName }}
                       </td>
                     </tr>
                   </table>
                 </div>
               </div>
-              <div
-                v-if="tableAll && tableAll.tjCategory === '02'"
-                class="section-title"
-              >
+              <div v-if="tableAll && tableAll.tjCategory === '02'" class="section-title">
                 鑱屼笟鐥呮�绘
               </div>
-              <el-form
-                v-if="tableAll && tableAll.tjCategory === '02'"
-                ref="numberValidateForm"
-                label-width="80px"
-                class="demo-ruleForm"
-              >
+              <el-form v-if="tableAll && tableAll.tjCategory === '02'" ref="numberValidateForm" label-width="80px"
+                class="demo-ruleForm">
                 <el-form-item label="妫�鏌ョ粨璁�">
-                  <el-input
-                    type="textarea"
-                    placeholder="璇疯緭鍏ュ唴瀹�"
-                    v-model="zhiyeJl"
-                    :rows="3"
-                    style="width: 96%"
-                  ></el-input>
+                  <el-input type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" v-model="zhiyeJl" :rows="3"
+                    style="width: 96%"></el-input>
                 </el-form-item>
                 <el-form-item label="浣撴缁撴灉">
-                  <el-input
-                    type="textarea"
-                    placeholder="璇疯緭鍏ュ唴瀹�"
-                    v-model="zhiyeJg"
-                    :rows="3"
-                    style="width: 96%"
-                  ></el-input>
+                  <el-input type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" v-model="zhiyeJg" :rows="3"
+                    style="width: 96%"></el-input>
                 </el-form-item>
               </el-form>
               <div style="margin: 0 0px 10px 15px" v-if="tjproject != '1'">
-                <el-button type="primary" @click="propoChange"
-                  >蹇嵎寤鸿</el-button
-                >
-                <el-button type="primary" @click="proposalChange"
-                  >鐢熸垚寤鸿</el-button
-                >
+                <el-button type="primary" @click="propoChange">蹇嵎寤鸿</el-button>
+                <el-button type="primary" @click="proposalChange">鐢熸垚寤鸿</el-button>
               </div>
 
-              <el-form
-                ref="numberValidateForm"
-                label-width="80px"
-                class="demo-ruleForm"
-                v-if="tjproject != '1'"
-              >
+              <el-form ref="numberValidateForm" label-width="80px" class="demo-ruleForm" v-if="tjproject != '1'">
                 <el-form-item label="鎬绘寤鸿">
-                  <el-input
-                    type="textarea"
-                    placeholder="璇疯緭鍏ュ唴瀹�"
-                    v-model="textarea1"
-                    :rows="3"
-                    style="width: 96%"
-                  ></el-input>
+                  <el-input type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" v-model="textarea1" :rows="3"
+                    style="width: 96%"></el-input>
                 </el-form-item>
               </el-form>
               <div slot="footer" class="dialog-footers">
                 <el-button type="primary" @click.stop="guanbi">鍙栨秷</el-button>
-                <el-button
-                  v-if="tjproject == '0' && (msgkcf == 'y' || msgkcf == 'Y')"
-                  type="primary"
-                  @click.stop="rowClick"
-                  icon="el-icon-edit-outline"
-                  >寮�澶勬柟</el-button
-                >
+                <el-button v-if="tjproject == '0' && (msgkcf == 'y' || msgkcf == 'Y')" type="primary"
+                  @click.stop="rowClick" icon="el-icon-edit-outline">寮�澶勬柟</el-button>
                 <div v-if="tjproject == '0'">
-                  <el-button
-                    type="primary"
-                    @click="determine"
-                    :disabled="isdisabled"
-                    >鎻愪氦骞剁敓鎴愭姤鍛�</el-button
-                  >
+                  <el-button type="primary" @click="determine" :disabled="isdisabled">鎻愪氦骞剁敓鎴愭姤鍛�</el-button>
                 </div>
               </div>
             </div>
@@ -792,61 +426,36 @@
             <div class="right">
               <template v-if="status1 == 0">
                 <div v-for="(item, index) in yichangList" :key="index">
-                  <div
-                    style="
+                  <div style="
                       text-align: center;
                       background-color: #67c23a;
                       margin-top: 10px;
-                    "
-                  >
+                    ">
                     {{ item.proName || "" }}
                   </div>
                   <template v-if="item.jyjc == '0'">
-                    <el-table
-                      :stripe="true"
-                      :row-style="red"
-                      :data="item.sone"
-                      border
-                      style="width: 100%"
-                      :header-cell-style="{ background: '#67C23A' }"
-                     
-                      :row-key="getRowKeys"
-                    >
-                    <!--  :expand-row-keys="expends" -->
+                    <el-table :stripe="true" :row-style="red" :data="item.sone" border style="width: 100%"
+                      :header-cell-style="{ background: '#67C23A' }" :row-key="getRowKeys">
+                      <!--  :expand-row-keys="expends" -->
                       <el-table-column type="expand">
                         <template slot-scope="props">
                           <div style="padding: 10px">
                             <!-- 鍐呭鍖哄煙 -->
-                            <div
-                              v-if="
-                                props.row.advices &&
-                                props.row.advices.length > 0
-                              "
-                            >
-                              <div
-                                v-for="(jianyi, index1) in props.row.advices"
-                                :key="index1"
-                                style="margin-bottom: 10px"
-                              >
+                            <div v-if="
+                              props.row.advices &&
+                              props.row.advices.length > 0
+                            ">
+                              <div v-for="(jianyi, index1) in props.row.advices" :key="index1"
+                                style="margin-bottom: 10px">
                                 <div>
                                   鏍囬锛�
-                                  <el-input
-                                    v-model="jianyi.bt"
-                                    size="small"
-                                    type="textarea"
-                                    autosize
-                                    @blur="handleAdviceBlur(props.row, index1)"
-                                  ></el-input>
+                                  <el-input v-model="jianyi.bt" size="small" type="textarea" autosize
+                                    @blur="handleAdviceBlur(props.row, index1)"></el-input>
                                 </div>
                                 <div>
                                   鍐呭锛�
-                                  <el-input
-                                    v-model="jianyi.nr"
-                                    size="small"
-                                    type="textarea"
-                                    autosize
-                                    @blur="handleAdviceBlur(props.row, index1)"
-                                  ></el-input>
+                                  <el-input v-model="jianyi.nr" size="small" type="textarea" autosize
+                                    @blur="handleAdviceBlur(props.row, index1)"></el-input>
                                 </div>
                               </div>
                             </div>
@@ -854,128 +463,61 @@
                             <div v-else>
                               <div>
                                 鏍囬锛�
-                                <el-input
-                                  v-model="emptyAdvice.bt"
-                                  size="small"
-                                  type="textarea"
-                                  autosize
-                                  @blur="handleAdviceBlur(props.row, -1)"
-                                ></el-input>
+                                <el-input v-model="emptyAdvice.bt" size="small" type="textarea" autosize
+                                  @blur="handleAdviceBlur(props.row, -1)"></el-input>
                               </div>
                               <div>
                                 鍐呭锛�
-                                <el-input
-                                  v-model="emptyAdvice.nr"
-                                  size="small"
-                                  type="textarea"
-                                  autosize
-                                  @blur="handleAdviceBlur(props.row, -1)"
-                                ></el-input>
+                                <el-input v-model="emptyAdvice.nr" size="small" type="textarea" autosize
+                                  @blur="handleAdviceBlur(props.row, -1)"></el-input>
                               </div>
                             </div>
                             <div style="margin-top: 10px">
-                              <el-button
-                                @click="shanchu(props.row)"
-                                type="danger"
-                                size="small"
-                                >鍒犻櫎</el-button
-                              >
+                              <el-button @click="shanchu(props.row)" type="danger" size="small">鍒犻櫎</el-button>
                             </div>
                           </div>
                         </template>
                       </el-table-column>
-                      <el-table-column
-                        align="center"
-                        label="妫�娴嬮」鐩�"
-                        :show-overflow-tooltip="true"
-                        width="353"
-                      >
+                      <el-table-column align="center" label="妫�娴嬮」鐩�" :show-overflow-tooltip="true" width="353">
                         <template slot-scope="scope">
                           <div>{{ scope.row.proName }}</div>
                         </template>
                       </el-table-column>
-                      <el-table-column
-                        align="center"
-                        prop="proResult"
-                        label="妫�娴嬬粨鏋�"
-                        width="85"
-                      ></el-table-column>
-                      <el-table-column
-                        align="center"
-                        prop="stanId"
-                        label=" 鍙傝�冭寖鍥�"
-                        width="117"
-                      ></el-table-column>
-                      <el-table-column
-                        align="center"
-                        prop="proAdvice"
-                        label="鍗曚綅"
-                        width="78"
-                      ></el-table-column>
-                      <el-table-column
-                        label="鎿嶄綔"
-                        align="center"
-                        class-name="small-padding fixed-width"
-                        width="60"
-                        fixed="right"
-                      >
+                      <el-table-column align="center" prop="proResult" label="妫�娴嬬粨鏋�" width="85"></el-table-column>
+                      <el-table-column align="center" prop="stanId" label=" 鍙傝�冭寖鍥�" width="117"></el-table-column>
+                      <el-table-column align="center" prop="proAdvice" label="鍗曚綅" width="78"></el-table-column>
+                      <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width" width="60"
+                        fixed="right">
                         <template slot-scope="props">
-                          <el-button
-                            size="mini"
-                            type="text"
-                            icon="el-icon-delete"
-                            @click="shanchu(props.row)"
-                          >
+                          <el-button size="mini" type="text" icon="el-icon-delete" @click="shanchu(props.row)">
                           </el-button>
                         </template>
                       </el-table-column>
                     </el-table>
                   </template>
                   <template v-if="item.jyjc == '1'">
-                    <el-table
-                      :stripe="true"
-                      :row-style="red"
-                      :data="item.sone"
-                      border
-                      style="width: 100%"
-                      :header-cell-style="{ background: '#67C23A' }"
-                      :row-key="getRowKeys"
-                    >
-                    <!--   :expand-row-keys="expends" -->
+                    <el-table :stripe="true" :row-style="red" :data="item.sone" border style="width: 100%"
+                      :header-cell-style="{ background: '#67C23A' }" :row-key="getRowKeys">
+                      <!--   :expand-row-keys="expends" -->
                       <el-table-column type="expand">
                         <template slot-scope="props">
                           <div style="padding: 10px">
                             <!-- 鍐呭鍖哄煙 -->
-                            <div
-                              v-if="
-                                props.row.advices &&
-                                props.row.advices.length > 0
-                              "
-                            >
-                              <div
-                                v-for="(jianyi, index1) in props.row.advices"
-                                :key="index1"
-                                style="margin-bottom: 10px"
-                              >
+                            <div v-if="
+                              props.row.advices &&
+                              props.row.advices.length > 0
+                            ">
+                              <div v-for="(jianyi, index1) in props.row.advices" :key="index1"
+                                style="margin-bottom: 10px">
                                 <div>
                                   鏍囬锛�
-                                  <el-input
-                                    v-model="jianyi.bt"
-                                    size="small"
-                                    type="textarea"
-                                    autosize
-                                    @blur="handleAdviceBlur(props.row, index1)"
-                                  ></el-input>
+                                  <el-input v-model="jianyi.bt" size="small" type="textarea" autosize
+                                    @blur="handleAdviceBlur(props.row, index1)"></el-input>
                                 </div>
                                 <div>
                                   鍐呭锛�
-                                  <el-input
-                                    v-model="jianyi.nr"
-                                    size="small"
-                                    type="textarea"
-                                    autosize
-                                    @blur="handleAdviceBlur(props.row, index1)"
-                                  ></el-input>
+                                  <el-input v-model="jianyi.nr" size="small" type="textarea" autosize
+                                    @blur="handleAdviceBlur(props.row, index1)"></el-input>
                                 </div>
                               </div>
                             </div>
@@ -983,42 +525,22 @@
                             <div v-else>
                               <div>
                                 鏍囬锛�
-                                <el-input
-                                  v-model="emptyAdvice.bt"
-                                  size="small"
-                                  type="textarea"
-                                  autosize
-                                  @blur="handleAdviceBlur(props.row, -1)"
-                                ></el-input>
+                                <el-input v-model="emptyAdvice.bt" size="small" type="textarea" autosize
+                                  @blur="handleAdviceBlur(props.row, -1)"></el-input>
                               </div>
                               <div>
                                 鍐呭锛�
-                                <el-input
-                                  v-model="emptyAdvice.nr"
-                                  size="small"
-                                  type="textarea"
-                                  autosize
-                                  @blur="handleAdviceBlur(props.row, -1)"
-                                ></el-input>
+                                <el-input v-model="emptyAdvice.nr" size="small" type="textarea" autosize
+                                  @blur="handleAdviceBlur(props.row, -1)"></el-input>
                               </div>
                             </div>
                             <div style="margin-top: 10px">
-                              <el-button
-                                @click="shanchu(props.row)"
-                                type="danger"
-                                size="small"
-                                >鍒犻櫎</el-button
-                              >
+                              <el-button @click="shanchu(props.row)" type="danger" size="small">鍒犻櫎</el-button>
                             </div>
                           </div>
                         </template>
                       </el-table-column>
-                      <el-table-column
-                        align="center"
-                        label="妫�娴嬮」鐩�"
-                        width="232"
-                        :show-overflow-tooltip="true"
-                      >
+                      <el-table-column align="center" label="妫�娴嬮」鐩�" width="232" :show-overflow-tooltip="true">
                         <template slot-scope="scope">
                           <span v-if="scope.row.type == '0'">鏈鏍�</span>
                           <span v-if="scope.row.type == '1'">宸插鏍�</span>
@@ -1026,26 +548,11 @@
                           <span v-if="scope.row.type == '3'">寤舵湡</span>
                         </template>
                       </el-table-column>
-                      <el-table-column
-                        align="center"
-                        prop="proResult"
-                        label="妫�娴嬬粨鏋�"
-                        width="403"
-                      ></el-table-column>
-                      <el-table-column
-                        label="鎿嶄綔"
-                        align="center"
-                        class-name="small-padding fixed-width"
-                        width="60"
-                        fixed="right"
-                      >
+                      <el-table-column align="center" prop="proResult" label="妫�娴嬬粨鏋�" width="403"></el-table-column>
+                      <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width" width="60"
+                        fixed="right">
                         <template slot-scope="props">
-                          <el-button
-                            size="mini"
-                            type="text"
-                            icon="el-icon-delete"
-                            @click="shanchu(props.row)"
-                          >
+                          <el-button size="mini" type="text" icon="el-icon-delete" @click="shanchu(props.row)">
                           </el-button>
                         </template>
                       </el-table-column>
@@ -1055,40 +562,18 @@
               </template>
               <template v-if="status1 == 1">
                 <div>
-                  <div
-                    style="
+                  <div style="
                       text-align: center;
                       background-color: #e6a23c;
                       margin-top: 10px;
-                    "
-                  >
+                    ">
                     椤圭洰妫�鏌ユ儏鍐�
                   </div>
-                  <el-table
-                    :row-style="redxiangmu"
-                    :data="statusList"
-                    style="width: 100%"
-                    :header-cell-style="{ background: '#e6a23c' }"
-                  >
-                    <el-table-column
-                      align="center"
-                      label="閮ㄩ棬"
-                      width="144"
-                      prop="deptName"
-                    ></el-table-column>
-                    <el-table-column
-                      align="center"
-                      prop="proName"
-                      label="椤圭洰"
-                      width="260"
-                    ></el-table-column>
-                    <el-table-column
-                      label="鐘舵��"
-                      align="center"
-                      prop="type"
-                      :show-overflow-tooltip="true"
-                      width="120"
-                    >
+                  <el-table :row-style="redxiangmu" :data="statusList" style="width: 100%"
+                    :header-cell-style="{ background: '#e6a23c' }">
+                    <el-table-column align="center" label="閮ㄩ棬" width="144" prop="deptName"></el-table-column>
+                    <el-table-column align="center" prop="proName" label="椤圭洰" width="260"></el-table-column>
+                    <el-table-column label="鐘舵��" align="center" prop="type" :show-overflow-tooltip="true" width="120">
                       <template slot-scope="scope">
                         <span v-if="scope.row.type == '0'">鏈鏍�</span>
                         <span v-if="scope.row.type == '1'">宸插鏍�</span>
@@ -1096,21 +581,10 @@
                         <span v-if="scope.row.type == '3'">寤舵湡</span>
                       </template>
                     </el-table-column>
-                    <el-table-column
-                      label="妫�鏌ユ椂闂�"
-                      align="center"
-                      prop="bcupdateTime"
-                      width="160"
-                    />
+                    <el-table-column label="妫�鏌ユ椂闂�" align="center" prop="bcupdateTime" width="160" />
                     <el-table-column label="鎿嶄綔" align="center" width="130px">
                       <template slot-scope="scope">
-                        <el-button
-                          type="primary"
-                          size="mini"
-                          @click="huifu"
-                          v-if="scope.row.type == '2'"
-                          >鎭㈠</el-button
-                        >
+                        <el-button type="primary" size="mini" @click="huifu" v-if="scope.row.type == '2'">鎭㈠</el-button>
                       </template>
                     </el-table-column>
                   </el-table>
@@ -1123,15 +597,11 @@
                     澶嶆煡椤圭洰
                   </div>
                   <div style="display: flex; margin: 15px">
-                    <span
-                      slot="label"
-                      style="
+                    <span slot="label" style="
                         display: inline-block;
                         border-bottom: 2px solid blue;
                         font-size: 0.8vw;
-                      "
-                      @click="handleQuery"
-                    >
+                      " @click="handleQuery">
                       椤圭洰閫夋嫨
                     </span>
                     <div v-if="xmChange.length > 0" style="display: flex">
@@ -1150,46 +620,18 @@
                         浠锋牸锛歿{}}
                       </div>
                     </div>
-                    <el-button
-                      type="primary"
-                      size="mini"
-                      @click="handleaddClick()"
-                      >娣诲姞</el-button
-                    >
+                    <el-button type="primary" size="mini" @click="handleaddClick()">娣诲姞</el-button>
                   </div>
 
-                  <el-table
-                    :row-style="redxiangmu"
-                    :data="fcList"
-                    style="width: 100%"
-                    border
-                  >
-                    <el-table-column
-                      type="selection"
-                      width="40"
-                      align="center"
-                    />
+                  <el-table :row-style="redxiangmu" :data="fcList" style="width: 100%" border>
+                    <el-table-column type="selection" width="40" align="center" />
                     <el-table-column label="搴忓彿" align="center" prop="newID" />
-                    <el-table-column
-                      label="鍚嶇О"
-                      align="center"
-                      prop="proName"
-                      width="100px"
-                    />
+                    <el-table-column label="鍚嶇О" align="center" prop="proName" width="100px" />
                     <el-table-column label="浠锋牸" align="center" prop="price" />
-                    <el-table-column
-                      label="绉戝"
-                      align="center"
-                      prop="deptName"
-                    />
+                    <el-table-column label="绉戝" align="center" prop="deptName" />
                     <el-table-column label="鎿嶄綔" align="center" width="130px">
                       <template slot-scope="scope">
-                        <el-button
-                          type="primary"
-                          size="mini"
-                          @click="handledeleteClick(scope.row)"
-                          >鍒犻櫎</el-button
-                        >
+                        <el-button type="primary" size="mini" @click="handledeleteClick(scope.row)">鍒犻櫎</el-button>
                       </template>
                     </el-table-column>
                   </el-table>
@@ -1198,315 +640,140 @@
               <template v-if="status1 == 3">
                 <div class="hist3">
                   <span class="txt">闂瘖淇℃伅</span>
-                  <el-form
-                    ref="form"
-                    :model="formobj"
-                    label-width="100px"
-                    :inline="true"
-                    size="mini"
-                  >
+                  <el-form ref="form" :model="formobj" label-width="100px" :inline="true" size="mini">
                     <el-collapse class="coll" v-model="activeName" accordion>
-                      <el-collapse-item
-                        class="coll"
-                        title="鍩烘湰淇℃伅"
-                        name="1"
-                        style="width: 100%; font-weight: 600"
-                      >
+                      <el-collapse-item class="coll" title="鍩烘湰淇℃伅" name="1" style="width: 100%; font-weight: 600">
                         <div style="width: 100%">
                           <el-form-item label="濮撳悕" prop="cusName">
-                            <el-input
-                              disabled
-                              v-model="formobj.cusName"
-                              placeholder="璇疯緭鍏ュ鍚�"
-                            />
+                            <el-input disabled v-model="formobj.cusName" placeholder="璇疯緭鍏ュ鍚�" />
                           </el-form-item>
                           <el-form-item label="鑱屼笟" prop="work">
-                            <el-select
-                              filterable
-                              v-model="formobj.work"
-                              placeholder="璇烽�夋嫨鑱屼笟"
-                              clearable
-                              style="width: 150px"
-                              disabled
-                            >
-                              <el-option
-                                v-for="dict in dict.type.tj_work"
-                                :key="dict.value"
-                                :label="dict.label"
-                                :value="dict.value"
-                              />
+                            <el-select filterable v-model="formobj.work" placeholder="璇烽�夋嫨鑱屼笟" clearable
+                              style="width: 150px" disabled>
+                              <el-option v-for="dict in dict.type.tj_work" :key="dict.value" :label="dict.label"
+                                :value="dict.value" />
                             </el-select>
                           </el-form-item>
                           <el-form-item label="宸ヤ綔鐘舵��" prop="workStatus">
-                            <el-select
-                              disabled
-                              filterable
-                              v-model="formobj.workStatus"
-                              placeholder="璇烽�夋嫨宸ヤ綔鐘舵��"
-                              clearable
-                              style="width: 150px"
-                            >
-                              <el-option
-                                v-for="dict in dict.type.tj_work_status"
-                                :key="dict.value"
-                                :label="dict.label"
-                                :value="dict.value"
-                              />
+                            <el-select disabled filterable v-model="formobj.workStatus" placeholder="璇烽�夋嫨宸ヤ綔鐘舵��" clearable
+                              style="width: 150px">
+                              <el-option v-for="dict in dict.type.tj_work_status" :key="dict.value" :label="dict.label"
+                                :value="dict.value" />
                             </el-select>
                           </el-form-item>
                           <el-form-item label="鎺ヨЕ姣掔墿" prop="contactPoison">
-                            <el-input
-                              disabled
-                              type="textarea"
-                              rows="4"
-                              v-model="formobj.contactPoison"
-                              placeholder="璇疯緭鍏ユ帴瑙︽瘨鐗�"
-                              style="width: 700px"
-                            />
+                            <el-input disabled type="textarea" rows="4" v-model="formobj.contactPoison"
+                              placeholder="璇疯緭鍏ユ帴瑙︽瘨鐗�" style="width: 700px" />
                           </el-form-item>
                           <el-form-item label="鏃㈠線鐥呭彶" prop="medicalHistory">
-                            <el-input
-                              disabled
-                              type="textarea"
-                              rows="4"
-                              v-model="formobj.medicalHistory"
-                              placeholder="璇疯緭鍏ユ棦寰�鐥呭彶"
-                              style="width: 700px"
-                            />
+                            <el-input disabled type="textarea" rows="4" v-model="formobj.medicalHistory"
+                              placeholder="璇疯緭鍏ユ棦寰�鐥呭彶" style="width: 700px" />
                           </el-form-item>
                         </div>
                       </el-collapse-item>
                       <el-collapse-item title="鏈堢粡鍙�" name="2" v-show="sex">
                         <div style="width: 100%">
                           <el-form-item label="鍒濇疆(宀�)" prop="chuchao">
-                            <el-input
-                              v-model="formobj.chuchao"
-                              style="width: 70px"
-                              disabled
-                            />
+                            <el-input v-model="formobj.chuchao" style="width: 70px" disabled />
                           </el-form-item>
                           <el-form-item label="缁忔湡" prop="jingqi">
-                            <el-input
-                              v-model="formobj.jingqi"
-                              disabled
-                              style="width: 70px"
-                            />澶�
+                            <el-input v-model="formobj.jingqi" disabled style="width: 70px" />澶�
                           </el-form-item>
                           <el-form-item label="鍛ㄦ湡" prop="zhouqi">
-                            <el-input
-                              v-model="formobj.zhouqi"
-                              disabled
-                              style="width: 70px"
-                            />澶�
+                            <el-input v-model="formobj.zhouqi" disabled style="width: 70px" />澶�
                           </el-form-item>
                           <el-form-item label="鏈鏈堢粡" prop="mociage">
-                            <el-input
-                              v-model="formobj.mociage"
-                              disabled
-                              style="width: 100px"
-                            />
+                            <el-input v-model="formobj.mociage" disabled style="width: 100px" />
                           </el-form-item>
                         </div>
                       </el-collapse-item>
                       <el-collapse-item title="鐢熻偛鍙�" name="3" v-show="sex">
                         <div style="width: 100%">
                           <el-form-item label="鐜版湁瀛愬コ(浜�)" prop="zinv">
-                            <el-input
-                              v-model="formobj.zinv"
-                              style="width: 70px"
-                              disabled
-                            />
+                            <el-input v-model="formobj.zinv" style="width: 70px" disabled />
                           </el-form-item>
                           <el-form-item label="娴佷骇(娆�)" prop="liuchan">
-                            <el-input
-                              v-model="formobj.liuchan"
-                              style="width: 70px"
-                              disabled
-                            />
+                            <el-input v-model="formobj.liuchan" style="width: 70px" disabled />
                           </el-form-item>
                           <el-form-item label="鏃╀骇(娆�)" prop="zaochan">
-                            <el-input
-                              v-model="formobj.zaochan"
-                              style="width: 70px"
-                              disabled
-                            />
+                            <el-input v-model="formobj.zaochan" style="width: 70px" disabled />
                           </el-form-item>
                           <el-form-item label="姝讳骇(娆�)" prop="sichan">
-                            <el-input
-                              v-model="formobj.sichan"
-                              style="width: 70px"
-                              disabled
-                            />
+                            <el-input v-model="formobj.sichan" style="width: 70px" disabled />
                           </el-form-item>
                           <el-form-item label="寮傚父鑳�(娆�)" prop="yichangtai">
-                            <el-input
-                              v-model="formobj.yichangtai"
-                              style="width: 70px"
-                              disabled
-                            />
+                            <el-input v-model="formobj.yichangtai" style="width: 70px" disabled />
                           </el-form-item>
                         </div>
                       </el-collapse-item>
                       <el-collapse-item title="鐑熼厭鍙�" name="4">
                         <div style="width: 100%">
                           <el-form-item label="鏄惁鍚哥儫" prop="xiyan">
-                            <el-select
-                              disabled
-                              filterable
-                              v-model="formobj.xiyan"
-                              placeholder="璇烽�夋嫨鏄惁鍚哥儫"
-                              clearable
-                              style="width: 150px"
-                            >
-                              <el-option
-                                v-for="dict in dict.type.tj_smoking_pinlv"
-                                :key="dict.value"
-                                :label="dict.label"
-                                :value="dict.value"
-                              />
+                            <el-select disabled filterable v-model="formobj.xiyan" placeholder="璇烽�夋嫨鏄惁鍚哥儫" clearable
+                              style="width: 150px">
+                              <el-option v-for="dict in dict.type.tj_smoking_pinlv" :key="dict.value"
+                                :label="dict.label" :value="dict.value" />
                             </el-select>
                           </el-form-item>
                           <el-form-item label="鍚哥儫棰戠巼" prop="xiyanpinlv">
-                            <el-input
-                              v-model="formobj.xiyanpinlv"
-                              disabled
-                              style="width: 70px"
-                            />鏀�/澶�
+                            <el-input v-model="formobj.xiyanpinlv" disabled style="width: 70px" />鏀�/澶�
                           </el-form-item>
                           <el-form-item label="鍚哥儫鏃堕棿" prop="xiyanyear">
-                            <el-input
-                              v-model="formobj.xiyanyear"
-                              disabled
-                              style="width: 70px"
-                            />骞� </el-form-item
-                          ><br />
+                            <el-input v-model="formobj.xiyanyear" disabled style="width: 70px" />骞� </el-form-item><br />
                           <el-form-item label="鏄惁楗厭" prop="yinjiu">
-                            <el-select
-                              filterable
-                              v-model="formobj.yinjiu"
-                              disabled
-                              placeholder="璇烽�夋嫨鏄惁楗厭"
-                              clearable
-                              style="width: 150px"
-                            >
-                              <el-option
-                                v-for="dict in dict.type.tj_smoking_pinlv"
-                                :key="dict.value"
-                                :label="dict.label"
-                                :value="dict.value"
-                              />
+                            <el-select filterable v-model="formobj.yinjiu" disabled placeholder="璇烽�夋嫨鏄惁楗厭" clearable
+                              style="width: 150px">
+                              <el-option v-for="dict in dict.type.tj_smoking_pinlv" :key="dict.value"
+                                :label="dict.label" :value="dict.value" />
                             </el-select>
                           </el-form-item>
                           <el-form-item label="楗厭棰戠巼" prop="yinjiupinlv">
-                            <el-input
-                              v-model="formobj.yinjiupinlv"
-                              disabled
-                              style="width: 70px"
-                            />ml/澶�
+                            <el-input v-model="formobj.yinjiupinlv" disabled style="width: 70px" />ml/澶�
                           </el-form-item>
                           <el-form-item label="楗厭鏃堕棿" prop="yinjiuyear">
-                            <el-input
-                              v-model="formobj.yinjiuyear"
-                              disabled
-                              style="width: 70px"
-                            />骞�
+                            <el-input v-model="formobj.yinjiuyear" disabled style="width: 70px" />骞�
                           </el-form-item>
                           <el-form-item label="鍏朵粬" prop="qita">
-                            <el-input
-                              v-model="formobj.qita"
-                              placeholder="璇疯緭鍏ュ叾浠�"
-                              disabled
-                              type="textarea"
-                              style="width: 600px"
-                              rows="2"
-                            />
+                            <el-input v-model="formobj.qita" placeholder="璇疯緭鍏ュ叾浠�" disabled type="textarea"
+                              style="width: 600px" rows="2" />
                           </el-form-item>
                         </div>
                       </el-collapse-item>
                       <el-collapse-item title="鎬ユ參鎬ц亴涓氱梾鍙蹭俊鎭�" name="5">
                         <div style="width: 100%">
-                          <el-table
-                            border
-                            :data="formobj.tjAskHistorysList"
-                            ref="tjAskHistorys"
-                            style="width: 98%"
-                          >
-                            <el-table-column
-                              type="selection"
-                              width="40"
-                              align="center"
-                            />
-                            <el-table-column
-                              label="鐤剧梾鍚嶇О"
-                              prop="diseaseName"
-                            >
+                          <el-table border :data="formobj.tjAskHistorysList" ref="tjAskHistorys" style="width: 98%">
+                            <el-table-column type="selection" width="40" align="center" />
+                            <el-table-column label="鐤剧梾鍚嶇О" prop="diseaseName">
                               <template slot-scope="scope">
-                                <el-input
-                                  size="mini"
-                                  disabled
-                                  v-model="scope.row.diseaseName"
-                                  placeholder="璇疯緭鍏ョ柧鐥呭悕绉�"
-                                />
+                                <el-input size="mini" disabled v-model="scope.row.diseaseName" placeholder="璇疯緭鍏ョ柧鐥呭悕绉�" />
                               </template>
                             </el-table-column>
-                            <el-table-column
-                              label="璇婃柇鏃ユ湡"
-                              prop="diseaseData"
-                            >
+                            <el-table-column label="璇婃柇鏃ユ湡" prop="diseaseData">
                               <template slot-scope="scope">
-                                <el-date-picker
-                                  size="mini"
-                                  v-model="scope.row.diseaseData"
-                                  align="right"
-                                  type="date"
-                                  placeholder="閫夋嫨鏃ユ湡"
-                                  :picker-options="pickerOptions"
-                                  style="width: 130px"
-                                  value-format="yyyy-MM-dd"
-                                >
+                                <el-date-picker size="mini" v-model="scope.row.diseaseData" align="right" type="date"
+                                  placeholder="閫夋嫨鏃ユ湡" :picker-options="pickerOptions" style="width: 130px"
+                                  value-format="yyyy-MM-dd">
                                 </el-date-picker>
                               </template>
                             </el-table-column>
-                            <el-table-column
-                              label="璇婃柇鍗曚綅"
-                              prop="diseaseCompany"
-                            >
+                            <el-table-column label="璇婃柇鍗曚綅" prop="diseaseCompany">
                               <template slot-scope="scope">
-                                <el-input
-                                  size="mini"
-                                  disabled
-                                  v-model="scope.row.diseaseCompany"
-                                  placeholder="璇疯緭鍏ヨ瘖鏂崟浣�"
-                                />
+                                <el-input size="mini" disabled v-model="scope.row.diseaseCompany"
+                                  placeholder="璇疯緭鍏ヨ瘖鏂崟浣�" />
                               </template>
                             </el-table-column>
                             <el-table-column label="鏄惁鐥婃剤" prop="isOk">
                               <template slot-scope="scope">
-                                <el-select
-                                  disabled
-                                  filterable
-                                  size="mini"
-                                  v-model="scope.row.isOk"
-                                  placeholder="璇烽�夋嫨鏄惁鐥婃剤"
-                                  clearable
-                                >
-                                  <el-option
-                                    v-for="dict in dict.type.sys_yes_no"
-                                    :key="dict.value"
-                                    :label="dict.label"
-                                    :value="dict.value"
-                                  />
+                                <el-select disabled filterable size="mini" v-model="scope.row.isOk"
+                                  placeholder="璇烽�夋嫨鏄惁鐥婃剤" clearable>
+                                  <el-option v-for="dict in dict.type.sys_yes_no" :key="dict.value" :label="dict.label"
+                                    :value="dict.value" />
                                 </el-select>
                               </template>
                             </el-table-column>
                             <el-table-column label="澶囨敞" prop="remark">
                               <template slot-scope="scope">
-                                <el-input
-                                  disabled
-                                  size="mini"
-                                  v-model="scope.row.remark"
-                                  placeholder="璇疯緭鍏ュ娉�"
-                                />
+                                <el-input disabled size="mini" v-model="scope.row.remark" placeholder="璇疯緭鍏ュ娉�" />
                               </template>
                             </el-table-column>
                           </el-table>
@@ -1514,111 +781,51 @@
                       </el-collapse-item>
                       <el-collapse-item title="鑱屼笟鍙�" name="7">
                         <div style="width: 100%">
-                          <el-table
-                            border
-                            :data="formobj.workLogs"
-                            style="width: 98%"
-                          >
-                            <el-table-column
-                              type="selection"
-                              width="40"
-                              align="center"
-                            />
+                          <el-table border :data="formobj.workLogs" style="width: 98%">
+                            <el-table-column type="selection" width="40" align="center" />
                             <el-table-column label="寮�濮嬫椂闂�" prop="beginTime">
                               <template slot-scope="scope">
-                                <el-date-picker
-                                  size="mini"
-                                  v-model="scope.row.beginTime"
-                                  align="right"
-                                  type="date"
-                                  placeholder="閫夋嫨鏃ユ湡"
-                                  :picker-options="pickerOptions"
-                                  style="width: 130px"
-                                  value-format="yyyy-MM-dd"
-                                >
+                                <el-date-picker size="mini" v-model="scope.row.beginTime" align="right" type="date"
+                                  placeholder="閫夋嫨鏃ユ湡" :picker-options="pickerOptions" style="width: 130px"
+                                  value-format="yyyy-MM-dd">
                                 </el-date-picker>
                               </template>
                             </el-table-column>
                             <el-table-column label="缁撴潫鏃堕棿" prop="endTime">
                               <template slot-scope="scope">
-                                <el-date-picker
-                                  size="mini"
-                                  disabled
-                                  v-model="scope.row.endTime"
-                                  align="right"
-                                  type="date"
-                                  placeholder="閫夋嫨鏃ユ湡"
-                                  :picker-options="pickerOptions"
-                                  style="width: 130px"
-                                  value-format="yyyy-MM-dd"
-                                >
+                                <el-date-picker size="mini" disabled v-model="scope.row.endTime" align="right"
+                                  type="date" placeholder="閫夋嫨鏃ユ湡" :picker-options="pickerOptions" style="width: 130px"
+                                  value-format="yyyy-MM-dd">
                                 </el-date-picker>
                               </template>
                             </el-table-column>
-                            <el-table-column
-                              label="宸ヤ綔鍗曚綅"
-                              prop="workCompany"
-                            >
+                            <el-table-column label="宸ヤ綔鍗曚綅" prop="workCompany">
                               <template slot-scope="scope">
-                                <el-input
-                                  size="mini"
-                                  disabled
-                                  v-model="scope.row.workCompany"
-                                  placeholder="璇疯緭鍏ュ伐浣滃崟浣�"
-                                />
+                                <el-input size="mini" disabled v-model="scope.row.workCompany" placeholder="璇疯緭鍏ュ伐浣滃崟浣�" />
                               </template>
                             </el-table-column>
                             <el-table-column label="閮ㄩ棬" prop="workDept">
                               <template slot-scope="scope">
-                                <el-input
-                                  disabled
-                                  size="mini"
-                                  v-model="scope.row.workDept"
-                                  placeholder="璇疯緭鍏ラ儴闂�"
-                                />
+                                <el-input disabled size="mini" v-model="scope.row.workDept" placeholder="璇疯緭鍏ラ儴闂�" />
                               </template>
                             </el-table-column>
                             <el-table-column label="宸ョ" prop="workType">
                               <template slot-scope="scope">
-                                <el-input
-                                  disabled
-                                  size="mini"
-                                  v-model="scope.row.workType"
-                                  placeholder="璇疯緭鍏ュ伐绉�"
-                                />
+                                <el-input disabled size="mini" v-model="scope.row.workType" placeholder="璇疯緭鍏ュ伐绉�" />
                               </template>
                             </el-table-column>
-                            <el-table-column
-                              label="鏈夊鍥犵礌"
-                              prop="harmTypeLogs"
-                            >
+                            <el-table-column label="鏈夊鍥犵礌" prop="harmTypeLogs">
                               <template slot-scope="scope">
-                                <el-select
-                                  filterable
-                                  disabled
-                                  size="mini"
-                                  v-model="scope.row.harmTypeLogs"
-                                  multiple
-                                  placeholder="璇烽�夋嫨鏈夊鍥犵礌"
-                                  clearable
-                                >
-                                  <el-option
-                                    v-for="dict in harmTypeList"
-                                    :key="dict.aid"
-                                    :label="dict.harmtype"
-                                    :value="dict.aid"
-                                  />
+                                <el-select filterable disabled size="mini" v-model="scope.row.harmTypeLogs" multiple
+                                  placeholder="璇烽�夋嫨鏈夊鍥犵礌" clearable>
+                                  <el-option v-for="dict in harmTypeList" :key="dict.aid" :label="dict.harmtype"
+                                    :value="dict.aid" />
                                 </el-select>
                               </template>
                             </el-table-column>
                             <el-table-column label="闃叉姢鎺柦" prop="fangHu">
                               <template slot-scope="scope">
-                                <el-input
-                                  disabled
-                                  size="mini"
-                                  v-model="scope.row.fangHu"
-                                  placeholder="璇疯緭鍏ラ槻鎶ゆ帾鏂�"
-                                />
+                                <el-input disabled size="mini" v-model="scope.row.fangHu" placeholder="璇疯緭鍏ラ槻鎶ゆ帾鏂�" />
                               </template>
                             </el-table-column>
                           </el-table>
@@ -1630,175 +837,70 @@
               </template>
               <template v-if="status1 == 4">
                 <div>
-                  <el-table
-                    :data="ychfList"
-                    style="width: 100%"
-                    :header-cell-style="{ background: '#e6a23c' }"
-                  >
-                    <el-table-column
-                      align="center"
-                      prop="jcxm"
-                      label="椤圭洰鍚�"
-                      width="260"
-                    ></el-table-column>
-                    <el-table-column
-                      label="缁撴灉"
-                      align="center"
-                      prop="jcjg"
-                      width="160"
-                    />
+                  <el-table :data="ychfList" style="width: 100%" :header-cell-style="{ background: '#e6a23c' }">
+                    <el-table-column align="center" prop="jcxm" label="椤圭洰鍚�" width="260"></el-table-column>
+                    <el-table-column label="缁撴灉" align="center" prop="jcjg" width="160" />
                     <el-table-column label="鎿嶄綔" align="center" width="130px">
                       <template v-slot="scope">
-                        <el-button
-                          type="primary"
-                          size="mini"
-                          @click="hfyc(scope.row.id)"
-                          >鎭㈠</el-button
-                        >
+                        <el-button type="primary" size="mini" @click="hfyc(scope.row.id)">鎭㈠</el-button>
                       </template>
                     </el-table-column>
                   </el-table>
                 </div>
               </template>
-              <el-button
-                type="primary"
-                @click="addnew"
-                :disabled="isdisabled"
-                style="margin-top: 20px"
-                >鏂板</el-button
-              >
+              <el-button type="primary" @click="addnew" :disabled="isdisabled" style="margin-top: 20px">鏂板</el-button>
             </div>
           </div>
         </div>
       </div>
     </el-drawer>
 
-    <el-dialog
-      title="PDF 棰勮"
-      :visible.sync="dialogVisible"
-      :close-on-click-modal="false"
-      width="50%"
-    >
+    <el-dialog title="PDF 棰勮" :visible.sync="dialogVisible" :close-on-click-modal="false" width="50%">
       <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="jianqians"
-      width="1000px"
-      :before-close="handleClose1"
-    >
-      <jianqianwenzhen
-        :jianqianwenzhendata="jianqianwenzhendata"
-        v-if="flags"
-      ></jianqianwenzhen>
+    <el-dialog title="鎻愮ず" :visible.sync="jianqians" width="1000px" :before-close="handleClose1">
+      <jianqianwenzhen :jianqianwenzhendata="jianqianwenzhendata" v-if="flags"></jianqianwenzhen>
       <span slot="footer" class="dialog-footer">
         <el-button @click="jianqians = false">鍙� 娑�</el-button>
       </span>
     </el-dialog>
-    <el-dialog
-      title="鏂板寮傚父缁撴灉"
-      :visible.sync="addNewDialogVisible"
-      width="900px"
-      class="custom-dialog"
-    >
-      <el-form
-        :model="newItem"
-        ref="newItemForm"
-        label-width="100px"
-        class="custom-form"
-      >
+    <el-dialog title="鏂板寮傚父缁撴灉" :visible.sync="addNewDialogVisible" width="900px" class="custom-dialog">
+      <el-form :model="newItem" ref="newItemForm" label-width="100px" class="custom-form">
         <el-form-item label="椤圭洰鍒嗙被" prop="parentName">
-          <el-select
-            v-model="newItem.parentName"
-            placeholder="璇烽�夋嫨椤圭洰鍒嗙被"
-            clearable
-            filterable
-            @change="handleCategoryChange"
-          >
-            <el-option
-              v-for="item in projectCategories"
-              :key="item.proId"
-              :label="item.proName"
-              :value="item.proName"
-            />
+          <el-select v-model="newItem.parentName" placeholder="璇烽�夋嫨椤圭洰鍒嗙被" clearable filterable
+            @change="handleCategoryChange">
+            <el-option v-for="item in projectCategories" :key="item.proId" :label="item.proName"
+              :value="item.proName" />
           </el-select>
         </el-form-item>
         <el-form-item label="妫�娴嬮」鐩�" prop="jcxm">
-          <el-input
-            v-model="newItem.jcxm"
-            placeholder="璇疯緭鍏ユ娴嬮」鐩垨浠庡垎绫婚�夋嫨"
-            clearable
-          ></el-input>
+          <el-input v-model="newItem.jcxm" placeholder="璇疯緭鍏ユ娴嬮」鐩垨浠庡垎绫婚�夋嫨" clearable></el-input>
         </el-form-item>
         <el-form-item label="妫�娴嬬粨鏋�" prop="jcjg">
-          <el-input
-            v-model="newItem.jcjg"
-            placeholder="璇疯緭鍏ユ娴嬬粨鏋�"
-            clearable
-          ></el-input>
+          <el-input v-model="newItem.jcjg" placeholder="璇疯緭鍏ユ娴嬬粨鏋�" clearable></el-input>
         </el-form-item>
         <el-form-item label="鍙傝�冭寖鍥�" prop="ckfw">
-          <el-input
-            v-model="newItem.ckfw"
-            placeholder="璇疯緭鍏ュ弬鑰冭寖鍥�"
-            clearable
-          ></el-input>
+          <el-input v-model="newItem.ckfw" placeholder="璇疯緭鍏ュ弬鑰冭寖鍥�" clearable></el-input>
         </el-form-item>
         <el-form-item label="鍗曚綅" prop="dw">
-          <el-input
-            v-model="newItem.dw"
-            placeholder="璇疯緭鍏ュ崟浣�"
-            clearable
-          ></el-input>
+          <el-input v-model="newItem.dw" placeholder="璇疯緭鍏ュ崟浣�" clearable></el-input>
         </el-form-item>
         <!-- 鍔ㄦ�佸缓璁粍 -->
-        <div
-          v-for="(advice, index) in newItem.map"
-          :key="index"
-          class="advice-group"
-        >
+        <div v-for="(advice, index) in newItem.map" :key="index" class="advice-group">
           <el-form-item label="寤鸿鏍囬" :prop="'map.' + index + '.bt'">
-            <el-input
-              v-model="advice.bt"
-              placeholder="璇疯緭鍏ュ缓璁爣棰�"
-              clearable
-              @focus="tan($event)"
-            ></el-input>
+            <el-input v-model="advice.bt" placeholder="璇疯緭鍏ュ缓璁爣棰�" clearable @focus="tan($event)"></el-input>
           </el-form-item>
           <el-form-item label="寤鸿鍐呭" :prop="'map.' + index + '.nr'">
-            <el-input
-              v-model="advice.nr"
-              type="textarea"
-              rows="3"
-              placeholder="璇疯緭鍏ュ缓璁唴瀹�"
-              resize="none"
-              @focus="tan($event)"
-            ></el-input>
+            <el-input v-model="advice.nr" type="textarea" rows="3" placeholder="璇疯緭鍏ュ缓璁唴瀹�" resize="none"
+              @focus="tan($event)"></el-input>
           </el-form-item>
-          <el-button
-            v-if="index > 0"
-            type="danger"
-            size="small"
-            @click="removeAdvice(index)"
-            style="margin-left: 100px; margin-bottom: 10px"
-            >鍒犻櫎</el-button
-          >
+          <el-button v-if="index > 0" type="danger" size="small" @click="removeAdvice(index)"
+            style="margin-left: 100px; margin-bottom: 10px">鍒犻櫎</el-button>
         </div>
         <el-form-item>
-          <el-button
-            type="primary"
-            size="small"
-            @click="addAdvice"
-            style="margin-left: 100px"
-            >娣诲姞寤鸿</el-button
-          >
+          <el-button type="primary" size="small" @click="addAdvice" style="margin-left: 100px">娣诲姞寤鸿</el-button>
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -1806,40 +908,22 @@
         <el-button type="primary" @click="submitNewItem">纭畾</el-button>
       </span>
     </el-dialog>
-    <el-dialog
-      title="蹇嵎寤鸿閫夋嫨"
-      :visible.sync="showjianyi"
-      width="1000px"
-      class="custom-dialog"
-      :before-close="handleCloseAdviceDialog"
-    >
+    <el-dialog title="蹇嵎寤鸿閫夋嫨" :visible.sync="showjianyi" width="1000px" class="custom-dialog"
+      :before-close="handleCloseAdviceDialog">
       <!-- 鎼滅储鍖哄煙 -->
       <div style="margin-bottom: 15px">
         <el-form :inline="true">
           <el-form-item label="寤鸿鍚嶇О">
-            <el-input
-              v-model="queryParams1.zyzd"
-              placeholder="璇疯緭鍏ュ缓璁悕绉拌繘琛岀瓫閫�"
-              clearable
-              style="width: 200px"
-              @input="filterAdvices(true)"
-              @keyup.enter.native="filterAdvices(true)"
-            />
+            <el-input v-model="queryParams1.zyzd" placeholder="璇疯緭鍏ュ缓璁悕绉拌繘琛岀瓫閫�" clearable style="width: 200px"
+              @input="filterAdvices(true)" @keyup.enter.native="filterAdvices(true)" />
           </el-form-item>
         </el-form>
       </div>
 
       <!-- 寤鸿琛ㄦ牸 -->
-      <el-table
-        v-loading="adviceLoading"
-        :data="advicerulesList"
-        ref="adviceTable"
-        border
-        highlight-current-row
-        @current-change="handleCurrentChangeAdvice"
-        style="max-height: 400px; overflow-y: auto"
-        :empty-text="adviceEmptyText"
-      >
+      <el-table v-loading="adviceLoading" :data="advicerulesList" ref="adviceTable" border highlight-current-row
+        @current-change="handleCurrentChangeAdvice" style="max-height: 400px; overflow-y: auto"
+        :empty-text="adviceEmptyText">
         <el-table-column label="绉戝" prop="ks" width="100" align="center" />
         <el-table-column label="寤鸿鍚嶇О" prop="jymc" align="center" />
         <el-table-column label="寤鸿鍐呭" prop="jynr" align="center" />
@@ -1848,45 +932,24 @@
       <!-- 鍒嗛〉 -->
       <div class="pag">
         <div class="pag2">
-          <pagination
-            v-show="total1 > 0"
-            :total="total1"
-            :page.sync="queryParams1.pageNum"
-            :limit.sync="queryParams1.pageSize"
-            @pagination="filterAdvices(false)"
-          />
+          <pagination v-show="total1 > 0" :total="total1" :page.sync="queryParams1.pageNum"
+            :limit.sync="queryParams1.pageSize" @pagination="filterAdvices(false)" />
         </div>
       </div>
 
       <!-- 搴曢儴鎸夐挳 -->
       <span slot="footer" class="dialog-footer">
         <el-button @click="cancelAdviceDialog">鍙栨秷</el-button>
-        <el-button
-          type="primary"
-          @click="applySelectedAdvice"
-          :disabled="!selectedAdvice"
-          >纭畾</el-button
-        >
+        <el-button type="primary" @click="applySelectedAdvice" :disabled="!selectedAdvice">纭畾</el-button>
       </span>
     </el-dialog>
 
     <el-dialog :visible.sync="xmopen" width="800px" append-to-body>
       <div style="margin: 20px">
-        <el-table
-          :data="datasList"
-          ref="elTable"
-          v-loading="loading"
-          @selection-change="handlexmChange"
-          border
-          height="320px"
-        >
+        <el-table :data="datasList" ref="elTable" v-loading="loading" @selection-change="handlexmChange" border
+          height="320px">
           <el-table-column type="selection" width="40" align="center" />
-          <el-table-column
-            label="鍚嶇О"
-            align="center"
-            prop="proName"
-            width="100px"
-          />
+          <el-table-column label="鍚嶇О" align="center" prop="proName" width="100px" />
           <el-table-column label="浠锋牸" align="center" prop="price" />
           <el-table-column label="绉戝" align="center" prop="deptName" />
         </el-table>
@@ -1901,12 +964,7 @@
     <Prescription ref="Pre" :preObj="preObj" />
     <proposal ref="proposal" :cusobj="cusobj" @event1="eventchange($event)" />
     <createproposal ref="createproposal" :creatobj="creatobj" />
-    <el-dialog
-      title="甯哥敤寤鸿缁存姢"
-      :visible.sync="propdialog"
-      width="500px"
-      append-to-body
-    ></el-dialog>
+    <el-dialog title="甯哥敤寤鸿缁存姢" :visible.sync="propdialog" width="500px" append-to-body></el-dialog>
   </div>
 </template>
 <script>
@@ -2124,6 +1182,8 @@
         name: null,
         checkStatus: null,
         shys: null,
+        tcm: null,
+        tjCategory: null,
       },
       formobj: {},
       yichangList: [],
@@ -2178,8 +1238,8 @@
     tan(event) {
       this.activeAdviceIndex = event.target.closest(".advice-group")
         ? Array.from(
-            event.target.closest(".el-form").querySelectorAll(".advice-group")
-          ).indexOf(event.target.closest(".advice-group"))
+          event.target.closest(".el-form").querySelectorAll(".advice-group")
+        ).indexOf(event.target.closest(".advice-group"))
         : 0;
       this.queryParams1.pageNum = 1;
       this.queryParams1.pageSize = 10;
@@ -2198,9 +1258,8 @@
         this.queryParams1.pageNum = 1;
       }
 
-      const cacheKey = `${this.queryParams1.zyzd || ""}_${
-        this.queryParams1.pageNum
-      }_${this.queryParams1.pageSize}`;
+      const cacheKey = `${this.queryParams1.zyzd || ""}_${this.queryParams1.pageNum
+        }_${this.queryParams1.pageSize}`;
 
       if (this.adviceCache.has(cacheKey)) {
         const cachedData = this.adviceCache.get(cacheKey);
@@ -2284,7 +1343,7 @@
             this.cancelAdviceDialog();
             done();
           })
-          .catch(() => {});
+          .catch(() => { });
       } else {
         this.cancelAdviceDialog();
         done();
@@ -2501,11 +1560,11 @@
           },
         ],
       };
-      UpdFcPro(data).then((res) => {});
+      UpdFcPro(data).then((res) => { });
     },
 
     handledeleteClick() {
-      UpdFcPro(data).then((res) => {});
+      UpdFcPro(data).then((res) => { });
     },
 
     handlexmChange(selection) {
@@ -3246,7 +2305,7 @@
               done();
             });
           })
-          .catch(() => {});
+          .catch(() => { });
       } else {
         let data = {
           userId: this.userId,
@@ -3270,6 +2329,7 @@
       let tjNumber = this.tableAll.tjNumber;
       let tjh = this.tableAll.tjNumber;
       let advice = this.textarea1;
+      this.isLoading = true;
       let data = {
         tjNumber,
         advice,
@@ -3297,9 +2357,10 @@
         .then((response) => {
           if (response.code === 200) {
             // this.$modal.msgSuccess("鎻愪氦鎴愬姛");
-             this.$modal.msgSuccess(
-                        response.msg
-                     );
+            this.$modal.msgSuccess(
+              response.msg
+            );
+            this.isLoading = false;
             // 娓呯┖瀛楁
             this.zhiyeJl = "";
             this.zhiyeJg = "";
@@ -3314,7 +2375,7 @@
             addOrder(dataList)
               .then((res) => {
                 if (res.code == 200) {
-                 
+
                   // gettoPdf(tjNumber)
                   //   .then((res) => {
                   //     this.$modal.msgSuccess(
@@ -3450,38 +2511,38 @@
 }
 
 /* 姣忎釜鎸夐挳鐨勪綅缃拰鍔ㄧ敾寤惰繜 */
-.btnbox > div:nth-child(1) {
+.btnbox>div:nth-child(1) {
   top: 20%;
   /* 绗竴涓寜閽殑浣嶇疆 */
   animation-delay: 0s;
   /* 鏃犲欢杩� */
 }
 
-.btnbox > div:nth-child(2) {
+.btnbox>div:nth-child(2) {
   top: 30%;
   /* 绗簩涓寜閽殑浣嶇疆 */
   animation-delay: 0.2s;
 }
 
-.btnbox > div:nth-child(3) {
+.btnbox>div:nth-child(3) {
   top: 40%;
   /* 绗笁涓寜閽殑浣嶇疆 */
   animation-delay: 0.4s;
 }
 
-.btnbox > div:nth-child(4) {
+.btnbox>div:nth-child(4) {
   top: 50%;
   /* 绗洓涓寜閽殑浣嶇疆 */
   animation-delay: 0.6s;
 }
 
-.btnbox > div:nth-child(5) {
+.btnbox>div:nth-child(5) {
   top: 60%;
   /* 绗簲涓寜閽殑浣嶇疆 */
   animation-delay: 0.8s;
 }
 
-.btnbox > div:nth-child(6) {
+.btnbox>div:nth-child(6) {
   top: 70%;
   /* 绗叚涓寜閽殑浣嶇疆 */
   animation-delay: 1s;
@@ -3832,5 +2893,4 @@
 //   width: auto; /* 鑷�傚簲瀹藉害 */
 //   min-width: 300px; /* 璁剧疆鏈�灏忓搴︼紝纭繚鍒嗛〉鍣ㄤ笉浼氬お绐� */
 //   text-align: center; /* 纭繚鍒嗛〉鍣ㄥ唴閮ㄥ厓绱犲眳涓� */
-// }
-</style>
+// }</style>
diff --git a/src/views/system/bill/index.vue b/src/views/system/bill/index.vue
index ed34e17..7b006a0 100644
--- a/src/views/system/bill/index.vue
+++ b/src/views/system/bill/index.vue
@@ -1,65 +1,25 @@
 <template>
   <div class="app-container">
-    <el-form
-      :model="queryParams"
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      v-show="showSearch"
-      label-width="68px"
-    >
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="濮撳悕" prop="name">
-        <el-input
-          v-model="queryParams.name"
-          placeholder="璇疯緭鍏ュ鍚�"
-          style="width: 100px"
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.name" placeholder="璇疯緭鍏ュ鍚�" style="width: 100px"
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="浣撴鍙�" prop="tjNum">
-        <el-input
-          ref="inputName"
-          style="width: 170px"
-          v-model="queryParams.tjNum"
-          placeholder="璇疯緭鍏ヤ綋妫�鍙�"
-          clearable
-          @keyup.enter.native="handleQuery"
-          @blur="hb"
-        />
+        <el-input ref="inputName" style="width: 170px" v-model="queryParams.tjNum" placeholder="璇疯緭鍏ヤ綋妫�鍙�" clearable
+          @keyup.enter.native="handleQuery" @blur="hb" />
       </el-form-item>
       <el-form-item label="鐧昏鏃堕棿" prop="createTimeList">
-        <el-date-picker
-          v-model="createTimeList"
-          type="datetimerange"
-          align="right"
-          :picker-options="pickerOptions"
-          style="width: 310px"
-          start-placeholder="寮�濮嬫棩鏈�"
-          end-placeholder="缁撴潫鏃ユ湡"
-          :default-time="['00:00:00', '23:00:00']"
-          format="yyyy-MM-dd HH:mm"
-          value-format="yyyy-MM-dd HH:mm"
-          @change="dateChangebirthday1"
-        >
+        <el-date-picker v-model="createTimeList" type="datetimerange" align="right" :picker-options="pickerOptions"
+          style="width: 310px" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡" :default-time="['00:00:00', '23:00:00']"
+          format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm" @change="dateChangebirthday1">
         </el-date-picker>
       </el-form-item>
       <el-form-item label="鍗曚綅鍚嶇О" prop="firmId">
-        <el-select
-          :remote-method="getRemoteData"
-          v-model="queryParams.firmId"
-          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 :remote-method="getRemoteData" v-model="queryParams.firmId" 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-form-item label="鎶ュ憡鏃堕棿" prop="reportTimeList">
@@ -70,32 +30,25 @@
           </el-form-item> -->
 
       <el-form-item>
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          size="mini"
-          style="margin-right: 15px"
-          @click="handleQuery"
-          >鎼滅储</el-button
-        >
+        <el-button type="primary" icon="el-icon-search" size="mini" style="margin-right: 15px"
+          @click="handleQuery">鎼滅储</el-button>
 
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-          >閲嶇疆</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" style="margin-left: 10px">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          @click="handleReport"
-          :disabled="single"
-          size="mini"
-          v-hasPermi="['hosp:order:export']"
-          >琛ユ墦瀵兼鍗�</el-button
-        >
+        <el-button type="primary" @click="handleReport" :disabled="single" size="mini"
+          v-hasPermi="['hosp:order:export']">琛ユ墦瀵兼鍗�</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button type="primary" @click="handlejiancha" :disabled="single" size="mini">妫�鏌ョ敵璇峰崟</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="primary" @click="handlejianyan" :disabled="single" size="mini">妫�楠岀敵璇峰崟</el-button>
+      </el-col>
+
       <!-- <el-col :span="1.5">
         <el-button
           type="primary"
@@ -120,10 +73,7 @@
         <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport"
           v-hasPermi="['hosp:order:export']">瀵煎嚭</el-button>
       </el-col> -->
-      <right-toolbar
-        :showSearch.sync="showSearch"
-        @queryTable="getList"
-      ></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
     <!-- <div style="display:none">
       <div id="print" style="width:300px;height:54px;border: 1px solid red;">
@@ -135,113 +85,39 @@
       娴嬭瘯
     </div> -->
 
-    <el-table
-      border
-      style="margin: 14px; width: 99%"
-      v-loading="loading"
-      :default-sort="{ prop: 'createTime', order: 'descending' }"
-      :data="orderList"
-      @selection-change="handleSelectionChange"
-      ref="multipleTable"
-    >
-      <el-table-column
-        type="selection"
-        width="40px"
-        align="center"
-        height="10px"
-        fixed="left"
-      />
-      <el-table-column
-        label="搴忓彿"
-        align="center"
-        prop="newID"
-        width="50px"
-        fixed="left"
-        height="10px"
-      />
-      <el-table-column
-        label="濮撳悕"
-        align="center"
-        prop="tjCustomerName"
-        height="10px"
-        width="90px"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        label="鎬у埆"
-        align="center"
-        prop="tjCustomerSex"
-        width="55px"
-        height="10px"
-        :show-overflow-tooltip="true"
-      >
+    <el-table border style="margin: 14px; width: 99%" v-loading="loading"
+      :default-sort="{ prop: 'createTime', order: 'descending' }" :data="orderList"
+      @selection-change="handleSelectionChange" ref="multipleTable">
+      <el-table-column type="selection" width="40px" align="center" height="10px" fixed="left" />
+      <el-table-column label="搴忓彿" align="center" prop="newID" width="50px" fixed="left" height="10px" />
+      <el-table-column label="濮撳悕" align="center" prop="tjCustomerName" height="10px" width="90px"
+        :show-overflow-tooltip="true" />
+      <el-table-column label="鎬у埆" align="center" prop="tjCustomerSex" width="55px" height="10px"
+        :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <span v-if="scope.row.tjCustomerSex == '0'">鐢�</span>
           <span v-if="scope.row.tjCustomerSex == '1'">濂�</span>
           <span v-if="scope.row.tjCustomerSex == '2'">鏈煡</span>
         </template>
       </el-table-column>
-      <el-table-column
-        label="骞撮緞"
-        align="center"
-        prop="tjCustomerAge"
-        height="10px"
-        width="60px"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        label="鐢佃瘽"
-        align="center"
-        prop="tjCustomerPhone"
-        :show-overflow-tooltip="true"
-        height="10px"
-        width="110px"
-      />
-      <el-table-column
-        label="浣撴绫诲瀷"
-        align="center"
-        prop="tjType"
-        height="10px"
-        width="80px"
-        :show-overflow-tooltip="true"
-      >
+      <el-table-column label="骞撮緞" align="center" prop="tjCustomerAge" height="10px" width="60px"
+        :show-overflow-tooltip="true" />
+      <el-table-column label="鐢佃瘽" align="center" prop="tjCustomerPhone" :show-overflow-tooltip="true" height="10px"
+        width="110px" />
+      <el-table-column label="浣撴绫诲瀷" align="center" prop="tjType" height="10px" 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"
-        :show-overflow-tooltip="true"
-        width="160px"
-      />
-      <el-table-column
-        label="鎵�閫夊椁�"
-        align="center"
-        prop="pacName"
-        height="10px"
-        :show-overflow-tooltip="true"
-        width="140px"
-      />
-      <el-table-column
-        label="鐧昏浜�"
-        align="center"
-        prop="createBy"
-        height="10px"
-        :show-overflow-tooltip="true"
-        width="100px"
-      />
-      <el-table-column
-        label="鐧昏鏃堕棿"
-        align="center"
-        prop="createTime"
-        width="155px"
-        height="10px"
-        sortable
-        :show-overflow-tooltip="true"
-      >
+      <el-table-column label="浣撴鍙�" align="center" prop="tjNumber" :show-overflow-tooltip="true" width="160px" />
+      <el-table-column label="鎵�閫夊椁�" align="center" prop="pacName" height="10px" :show-overflow-tooltip="true"
+        width="140px" />
+      <el-table-column label="鐧昏浜�" align="center" prop="createBy" height="10px" :show-overflow-tooltip="true"
+        width="100px" />
+      <el-table-column label="鐧昏鏃堕棿" align="center" prop="createTime" width="155px" height="10px" sortable
+        :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
@@ -258,13 +134,7 @@
             <span>{{ parseTime(scope.row.reportTime) }}</span>
           </template>
         </el-table-column> -->
-      <el-table-column
-        label="澶囨敞"
-        align="center"
-        prop="remark"
-        height="10px"
-        :show-overflow-tooltip="true"
-      />
+      <el-table-column label="澶囨敞" align="center" prop="remark" height="10px" :show-overflow-tooltip="true" />
       <!-- <el-table-column fixed="right" label="鎿嶄綔" align="center" class-name="small-padding fixed-width" height="10px"
           width="60px">
           <template slot-scope="scope">
@@ -276,21 +146,15 @@
 
     <div class="pag">
       <div class="pag1">
-        <pagination
-          v-show="total > 0"
-          :total="total"
-          :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize"
-          @pagination="getList"
-        />
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize" @pagination="getList" />
       </div>
     </div>
 
     <el-drawer title="鎴戞槸鏍囬" :visible.sync="drawer" :with-header="false">
       <div class="drawer1">
         <div class="drawer2">
-          <span>浣撴浜猴細{{ gation.tjCustomerName }}</span
-          ><br />
+          <span>浣撴浜猴細{{ gation.tjCustomerName }}</span><br />
           <span>鑱旂郴鐢佃瘽锛歿{ gation.tjCustomerPhone }}</span>
         </div>
         <span class="drawer6">鍩烘湰淇℃伅</span>
@@ -307,46 +171,23 @@
             <span>浣撴鍙凤細{{ gation.tjNumber }}</span>
             <span>鎶ュ憡鏃堕棿锛歿{ gation.createTime }}</span>
             <span>浣撴鏃堕棿锛歿{ gation.finishTime }}</span>
-            <el-button type="primary" plain size="mini" @click="viewReport1"
-              >鏈�杩戜竴娆′綋妫�鎶ュ憡</el-button
-            >
+            <el-button type="primary" plain size="mini" @click="viewReport1">鏈�杩戜竴娆′綋妫�鎶ュ憡</el-button>
           </div>
         </div>
         <span class="drawer6">璋冩煡闂嵎</span>
         <div>
-          <el-form
-            ref="form"
-            :model="form"
-            label-width="80px"
-            style="margin-top: 20px"
-          >
+          <el-form ref="form" :model="form" label-width="80px" style="margin-top: 20px">
             <el-form-item label="璋冩煡缁撴灉:">
               <el-select v-model="value" placeholder="璇烽�夋嫨璋冩煡缁撴灉">
-                <el-option
-                  v-for="item in options"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                >
+                <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="琛�鍘�:" style="width: 300px" prop="pressure">
-              <el-input
-                v-model="form.pressure"
-                placeholder="璇疯緭鍏ヨ鍘�"
-              ></el-input>
+              <el-input v-model="form.pressure" placeholder="璇疯緭鍏ヨ鍘�"></el-input>
             </el-form-item>
-            <el-form-item
-              label="浣庡帇:"
-              placeholder="璇疯緭鍏ヤ綆鍘�"
-              style="width: 300px"
-              prop="lowPressure"
-            >
-              <el-input
-                v-model="form.lowPressure"
-                placeholder="璇疯緭鍏ヤ綆鍘�"
-              ></el-input>
+            <el-form-item label="浣庡帇:" placeholder="璇疯緭鍏ヤ綆鍘�" style="width: 300px" prop="lowPressure">
+              <el-input v-model="form.lowPressure" placeholder="璇疯緭鍏ヤ綆鍘�"></el-input>
             </el-form-item>
             <div style="margin-left: 20px">
               <el-form-item label="1.鏄惁鍚哥儫">
@@ -387,54 +228,28 @@
       </div>
     </el-drawer>
 
-    <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>
 
-    <div
-      style="
+    <div style="
         position: absolute;
         bottom: 100px;
         left: 500px;
         width: 700px;
         display: none;
-      "
-    >
+      ">
       <div id="printBill">
-        <barcode :value="barcode" :height="40" :width="2" :margin="0"
-          >鏉″舰鐮佸姞杞藉け璐�</barcode
-        >
-        <div
-          style="font-size: 13px; color: #000000"
-          v-for="(item, index) in DataList1"
-          :key="index"
-        >
+        <barcode :value="barcode" :height="40" :width="2" :margin="0">鏉″舰鐮佸姞杞藉け璐�</barcode>
+        <div style="font-size: 13px; color: #000000" v-for="(item, index) in DataList1" :key="index">
           <div style="width: 48%; margin-top: 10px">
             濮撳悕锛歿{ item.tjCustomerName }}
           </div>
@@ -824,6 +639,24 @@
         }
       });
     },
+    handlejiancha() {
+      const tjNumber = this.report[0];
+      const viewNum = "1102075172694831104";
+      const params = { viewNum, tjNumber };
+
+      this.$tab.openPage("妫�鏌ョ敵璇峰崟", "/report/breDailyReport", params);
+
+    },
+    handlejianyan() {
+      const tjNumber = this.report[0];
+      const viewNum = "1086792376946569216";
+      const params = { viewNum, tjNumber };
+
+      this.$tab.openPage("妫�楠岀敵璇峰崟", "/report/breDailyReport", params);
+
+
+    },
+
     // 閲囪鍗�
     // Collection() {
     //   let tjNumber = this.barcode;
@@ -930,7 +763,7 @@
     },
 
     // 閫夋鏁版嵁
-    searchSelect(val) {},
+    searchSelect(val) { },
 
     // 鎼滅储
     getRemoteData(query) {
@@ -1248,9 +1081,11 @@
 }
 
 .print-container {
-  width: 300px; /* 璁惧畾瀹藉害浠ョ‘淇濇墦鍗版椂甯冨眬鍚堥�� */
+  width: 300px;
+  /* 璁惧畾瀹藉害浠ョ‘淇濇墦鍗版椂甯冨眬鍚堥�� */
   padding: 10px;
-  border: 1px solid #000; /* 鍙�夛細缁欐墦鍗板尯鍩熷姞涓�涓竟妗� */
+  border: 1px solid #000;
+  /* 鍙�夛細缁欐墦鍗板尯鍩熷姞涓�涓竟妗� */
   font-family: Arial, sans-serif;
 }
 
@@ -1265,7 +1100,8 @@
 }
 
 .info-section p {
-  margin: 2px 0; /* 鎺у埗淇℃伅闂寸殑闂磋窛 */
+  margin: 2px 0;
+  /* 鎺у埗淇℃伅闂寸殑闂磋窛 */
 }
 
 #barcode {
@@ -1290,5 +1126,4 @@
 //     align-items: center;
 //     height: 100vh; /* 鐖跺鍣ㄩ珮搴︿负鍏ㄩ〉楂樺害 */
 //   }
-// }
-</style>
+// }</style>
diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue
index 138cbbf..fc87b65 100644
--- a/src/views/system/tijian/index.vue
+++ b/src/views/system/tijian/index.vue
@@ -1,554 +1,559 @@
 <template>
-   <div v-loading="isLoading" element-loading-text="璇风◢鍊�..." element-loading-spinner="el-icon-loading"
+  <div v-loading="isLoading" element-loading-text="璇风◢鍊�..." element-loading-spinner="el-icon-loading"
     element-loading-background="rgba(255, 255, 255, 0.8)" style="height: 100%; padding: 20px; position: relative;">
-  <div class="app-container">
-    <el-dialog :title="title" :visible.sync="open1" width="1000px" append-to-body>
-      <el-form ref="form1" :model="form1" :rules="rules1" label-width="100px" :inline="true">
-        <el-form-item label="鍗曚綅鍚嶇О" prop="cnName">
-          <el-input v-model="form1.cnName" placeholder="璇疯緭鍏ヤ腑鏂囧悕绉�" />
-        </el-form-item>
-        <el-form-item label="鑱旂郴浜�" prop="contactPerson">
-          <el-input v-model="form1.contactPerson" placeholder="璇疯緭鍏ヨ仈绯讳汉" />
-        </el-form-item>
-        <el-form-item label="鑱旂郴鐢佃瘽" prop="contactPhone">
-          <el-input v-model="form1.contactPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" />
-        </el-form-item>
-        <el-form-item label="绋庡彿" prop="taxNumber">
-          <el-input v-model="form1.taxNumber" placeholder="璇疯緭鍏ョ◣鍙�" />
-        </el-form-item>
-        <el-form-item label="娉曚汉" prop="legalPerson">
-          <el-input v-model="form1.legalPerson" placeholder="璇疯緭鍏ユ硶浜�" />
-        </el-form-item>
-        <el-form-item label="娉ㄥ唽鍦板潃" prop="registerAddress">
-          <el-input v-model="form1.registerAddress" placeholder="璇疯緭鍏ユ敞鍐屽湴鍧�" />
-        </el-form-item>
-        <el-form-item label="閫氳鍦板潃" prop="mailingAddress">
-          <el-input v-model="form1.mailingAddress" placeholder="璇疯緭鍏ラ�氳鍦板潃" />
-        </el-form-item>
-        <el-form-item label="寮�鎴烽摱琛�" prop="bankAccount">
-          <el-input v-model="form1.bankAccount" placeholder="璇疯緭鍏ュ紑鎴烽摱琛�" />
-        </el-form-item>
-        <el-form-item label="閾惰璐︽埛" prop="countNum">
-          <el-input v-model="form1.countNum" placeholder="璇疯緭鍏ラ摱琛岃处鎴�" />
-        </el-form-item>
-        <el-form-item label="閭" prop="email">
-          <el-input v-model="form1.email" placeholder="璇疯緭鍏ラ偖绠�" />
-        </el-form-item>
-        <el-form-item label="璐熻矗浜�" prop="principal">
-          <el-input v-model="form1.principal" placeholder="璇疯緭鍏ヨ礋璐d汉" />
-        </el-form-item>
-        <el-form-item label="缃戝潃" prop="url">
-          <el-input v-model="form1.url" placeholder="璇疯緭鍏ョ綉鍧�" />
-        </el-form-item>
-        <el-form-item label="浼犵湡" prop="faxNumber">
-          <el-input v-model="form1.faxNumber" placeholder="璇疯緭鍏ヤ紶鐪�" />
-        </el-form-item>
-        <el-form-item label="琛屾斂鍖哄垝鍚嶇О" prop="areaName">
-          <el-input v-model="form1.areaName" placeholder="璇疯緭鍏ヨ鏀垮尯鍒掑悕绉�" />
-        </el-form-item>
-        <el-form-item label="鎺掑簭" prop="orderNum">
-          <el-input v-model="form1.orderNum" placeholder="璇疯緭鍏ユ帓搴�" />
-        </el-form-item>
-        <el-form-item label="鏈夋晥鏃堕棿" prop="validTime">
-          <el-date-picker clearable v-model="form1.validTime" type="date" value-format="yyyy-MM-dd"
-            placeholder="璇烽�夋嫨鏈夋晥鏃堕棿">
-          </el-date-picker> </el-form-item><br />
-        <el-form-item label="澶囨敞" prop="remark">
-          <el-input v-model="form1.remark" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" :rows="2" label-width="400px"
-            style="width: 830px" resize="none"></el-input>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer2">
-        <el-button type="primary" @click="submitFormS">纭� 瀹�</el-button>
-        <el-button @click="cancel1">鍙� 娑�</el-button>
-      </div>
-    </el-dialog>
-    <el-row :gutter="20">
-      <el-col :span="17">
-        <div class="grid-content bg-purple">
-          <el-form :inline="true" ref="form" :model="form" :rules="rules" :label-position="labelPosition"
-            label-width="106px" v-show="top">
-            <el-form-item label="鍖垮悕" prop="isNow">
-              <el-select v-model="isNow" placeholder="鏄惁鍖垮悕" @change="freezing(isNow)">
-                <el-option v-for="dict in dictType" :key="dict.value" :label="dict.label"
-                  :value="dict.value"></el-option>
-              </el-select>
-            </el-form-item>
+    <div class="app-container">
+      <el-dialog :title="title" :visible.sync="open1" width="1000px" append-to-body>
+        <el-form ref="form1" :model="form1" :rules="rules1" label-width="100px" :inline="true">
+          <el-form-item label="鍗曚綅鍚嶇О" prop="cnName">
+            <el-input v-model="form1.cnName" placeholder="璇疯緭鍏ヤ腑鏂囧悕绉�" />
+          </el-form-item>
+          <el-form-item label="鑱旂郴浜�" prop="contactPerson">
+            <el-input v-model="form1.contactPerson" placeholder="璇疯緭鍏ヨ仈绯讳汉" />
+          </el-form-item>
+          <el-form-item label="鑱旂郴鐢佃瘽" prop="contactPhone">
+            <el-input v-model="form1.contactPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" />
+          </el-form-item>
+          <el-form-item label="绋庡彿" prop="taxNumber">
+            <el-input v-model="form1.taxNumber" placeholder="璇疯緭鍏ョ◣鍙�" />
+          </el-form-item>
+          <el-form-item label="娉曚汉" prop="legalPerson">
+            <el-input v-model="form1.legalPerson" placeholder="璇疯緭鍏ユ硶浜�" />
+          </el-form-item>
+          <el-form-item label="娉ㄥ唽鍦板潃" prop="registerAddress">
+            <el-input v-model="form1.registerAddress" placeholder="璇疯緭鍏ユ敞鍐屽湴鍧�" />
+          </el-form-item>
+          <el-form-item label="閫氳鍦板潃" prop="mailingAddress">
+            <el-input v-model="form1.mailingAddress" placeholder="璇疯緭鍏ラ�氳鍦板潃" />
+          </el-form-item>
+          <el-form-item label="寮�鎴烽摱琛�" prop="bankAccount">
+            <el-input v-model="form1.bankAccount" placeholder="璇疯緭鍏ュ紑鎴烽摱琛�" />
+          </el-form-item>
+          <el-form-item label="閾惰璐︽埛" prop="countNum">
+            <el-input v-model="form1.countNum" placeholder="璇疯緭鍏ラ摱琛岃处鎴�" />
+          </el-form-item>
+          <el-form-item label="閭" prop="email">
+            <el-input v-model="form1.email" placeholder="璇疯緭鍏ラ偖绠�" />
+          </el-form-item>
+          <el-form-item label="璐熻矗浜�" prop="principal">
+            <el-input v-model="form1.principal" placeholder="璇疯緭鍏ヨ礋璐d汉" />
+          </el-form-item>
+          <el-form-item label="缃戝潃" prop="url">
+            <el-input v-model="form1.url" placeholder="璇疯緭鍏ョ綉鍧�" />
+          </el-form-item>
+          <el-form-item label="浼犵湡" prop="faxNumber">
+            <el-input v-model="form1.faxNumber" placeholder="璇疯緭鍏ヤ紶鐪�" />
+          </el-form-item>
+          <el-form-item label="琛屾斂鍖哄垝鍚嶇О" prop="areaName">
+            <el-input v-model="form1.areaName" placeholder="璇疯緭鍏ヨ鏀垮尯鍒掑悕绉�" />
+          </el-form-item>
+          <el-form-item label="鎺掑簭" prop="orderNum">
+            <el-input v-model="form1.orderNum" placeholder="璇疯緭鍏ユ帓搴�" />
+          </el-form-item>
+          <el-form-item label="鏈夋晥鏃堕棿" prop="validTime">
+            <el-date-picker clearable v-model="form1.validTime" type="date" value-format="yyyy-MM-dd"
+              placeholder="璇烽�夋嫨鏈夋晥鏃堕棿">
+            </el-date-picker> </el-form-item><br />
+          <el-form-item label="澶囨敞" prop="remark">
+            <el-input v-model="form1.remark" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" :rows="2" label-width="400px"
+              style="width: 830px" resize="none"></el-input>
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer2">
+          <el-button type="primary" @click="submitFormS">纭� 瀹�</el-button>
+          <el-button @click="cancel1">鍙� 娑�</el-button>
+        </div>
+      </el-dialog>
+      <el-row :gutter="20">
+        <el-col :span="17">
+          <div class="grid-content bg-purple">
+            <el-form :inline="true" ref="form" :model="form" :rules="rules" :label-position="labelPosition"
+              label-width="106px" v-show="top">
+              <el-form-item label="鍖垮悕" prop="isNow">
+                <el-select v-model="isNow" placeholder="鏄惁鍖垮悕" @change="freezing(isNow)">
+                  <el-option v-for="dict in dictType" :key="dict.value" :label="dict.label"
+                    :value="dict.value"></el-option>
+                </el-select>
+              </el-form-item>
 
-            <el-form-item label="濮撳悕" prop="cusName" :rules="[
-              {
-                required: true,
-                validator: (rule, value, callback) => {
-                  if (!form.cusName) {
-                    callback('');
-                  } else if (form.cusName) {
-                    callback();
-                  }
+              <el-form-item label="濮撳悕" prop="cusName" :rules="[
+                {
+                  required: true,
+                  validator: (rule, value, callback) => {
+                    if (!form.cusName) {
+                      callback('');
+                    } else if (form.cusName) {
+                      callback();
+                    }
+                  },
+                  trigger: 'blur',
                 },
-                trigger: 'blur',
-              },
-            ]">
-              <span slot="label" style="display: inline-block; border-bottom: 2px solid blue" @click="openname">
-                濮撳悕
-              </span>
-              <el-input v-model="form.cusName" placeholder="璇疯緭鍏ュ鍚�" :disabled="isDisabled"
-                @input="form.cusName = $event.replace(/\s/g, '')" />
-            </el-form-item>
+              ]">
+                <span slot="label" style="display: inline-block; border-bottom: 2px solid blue" @click="openname">
+                  濮撳悕
+                </span>
+                <el-input v-model="form.cusName" placeholder="璇疯緭鍏ュ鍚�" :disabled="isDisabled"
+                  @input="form.cusName = $event.replace(/\s/g, '')" />
+              </el-form-item>
 
-            <el-form-item label="璇佷欢绫诲瀷" prop="idType">
-              <el-select :disabled="isDisabled" v-model="form.idType" placeholder="璇烽�夋嫨璇佷欢绫诲瀷">
-                <el-option v-for="dict in dict.type.dict_user_cardtype" :key="dict.value" :label="dict.label"
-                  :value="dict.value"></el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="姘戞棌" prop="cusNational">
-              <el-select filterable :disabled="isDisabled" v-model="form.cusNational" placeholder="璇烽�夋嫨姘戞棌">
-                <el-option v-for="dict in dict.type.dict_user_national" :key="dict.value" :label="dict.label"
-                  :value="dict.value"></el-option>
-              </el-select>
-            </el-form-item>
+              <el-form-item label="璇佷欢绫诲瀷" prop="idType">
+                <el-select :disabled="isDisabled" v-model="form.idType" placeholder="璇烽�夋嫨璇佷欢绫诲瀷">
+                  <el-option v-for="dict in dict.type.dict_user_cardtype" :key="dict.value" :label="dict.label"
+                    :value="dict.value"></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="姘戞棌" prop="cusNational">
+                <el-select filterable :disabled="isDisabled" v-model="form.cusNational" placeholder="璇烽�夋嫨姘戞棌">
+                  <el-option v-for="dict in dict.type.dict_user_national" :key="dict.value" :label="dict.label"
+                    :value="dict.value"></el-option>
+                </el-select>
+              </el-form-item>
 
-            <el-form-item label="鎬у埆" prop="cusSex" :rules="[
-              {
-                required: true,
-                validator: (rule, value, callback) => {
-                  if (!form.cusSex && showHidden.has_sex === 'Y') {
-                    callback('');
-                  } else if (showHidden.has_sex === 'N') {
-                    callback();
-                  } else if (form.cusSex && showHidden.has_sex === 'Y') {
-                    callback();
-                  }
+              <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',
                 },
-                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-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();
-                  }
+              <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',
                 },
-                trigger: 'blur',
-              },
-            ]">
-              <span slot="label" style="display: inline-block; border-bottom: 2px solid blue" @click="handleQuery">
-                璇佷欢鍙风爜
-              </span>
-              <el-input :disabled="isDisabled" v-model="form.cusIdcard" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�"
-                @input="handleIdCardInput" />
-              <!-- <i style="
+              ]">
+                <span slot="label" style="display: inline-block; border-bottom: 2px solid blue" @click="handleQuery">
+                  璇佷欢鍙风爜
+                </span>
+                <el-input :disabled="isDisabled" v-model="form.cusIdcard" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�"
+                  @input="handleIdCardInput" />
+                <!-- <i style="
                     font-size: 1rem;
                     position: absolute;
                     right: -20px;
                     top: 10px;
                     cursor: pointer;
                   " class="el-icon-search" @click="handleQuery"></i> -->
-            </el-form-item>
+              </el-form-item>
 
-            <el-form-item label="濠氬Щ" prop="cusMarryStatus">
-              <el-select :disabled="isDisabled" v-model="form.cusMarryStatus" placeholder="濠氬Щ鐘跺喌">
-                <el-option v-for="dict in dict.type.dict_user_marry" :key="dict.value" :label="dict.label"
-                  :value="dict.value"></el-option>
-              </el-select>
-            </el-form-item>
+              <el-form-item label="濠氬Щ" prop="cusMarryStatus">
+                <el-select :disabled="isDisabled" v-model="form.cusMarryStatus" placeholder="濠氬Щ鐘跺喌">
+                  <el-option v-for="dict in dict.type.dict_user_marry" :key="dict.value" :label="dict.label"
+                    :value="dict.value"></el-option>
+                </el-select>
+              </el-form-item>
 
-            <el-form-item label="鐢佃瘽" prop="cusPhone" :rules="[
-              {
-                required: true,
-                validator: (rule, value, callback) => {
-                  if (!form.cusPhone && showHidden.is_phone === 'Y') {
-                    callback('');
-                  } else if (showHidden.is_phone === 'N') {
-                    callback();
-                  } else if (form.cusPhone && showHidden.is_phone === 'Y') {
-                    callback();
-                  }
+              <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',
                 },
-                trigger: 'blur',
-              },
-            ]">
-              <el-input v-model="form.cusPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�"  maxlength="11" :disabled="isDisabled"
-                @input="form.cusPhone = $event.replace(/\s/g, '')" />
-            </el-form-item>
+              ]">
+                <el-input v-model="form.cusPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" maxlength="11" :disabled="isDisabled"
+                  @input="form.cusPhone = $event.replace(/\s/g, '')" />
+              </el-form-item>
 
-            <el-form-item label="鍑虹敓鏃ユ湡" prop="cusBrithday">
-              <el-date-picker :disabled="isDisabled" clearable v-model="form.cusBrithday" type="date"
-                value-format="yyyy-MM-dd" placeholder="璇烽�夋嫨鍑虹敓鏃ユ湡" style="width: 93%">
-              </el-date-picker>
-            </el-form-item>
+              <el-form-item label="鍑虹敓鏃ユ湡" prop="cusBrithday">
+                <el-date-picker :disabled="isDisabled" clearable v-model="form.cusBrithday" type="date"
+                  value-format="yyyy-MM-dd" placeholder="璇烽�夋嫨鍑虹敓鏃ユ湡" style="width: 93%">
+                </el-date-picker>
+              </el-form-item>
 
-            <el-form-item label="鑱屼笟" prop="career">
-              <el-select filterable :disabled="isDisabled" v-model="form.career" placeholder="璇疯緭鍏ヨ亴涓�">
-                <el-option v-for="dict in dict.type.dict_job" :key="dict.value" :label="dict.label"
-                  :value="dict.value"></el-option>
-              </el-select>
-            </el-form-item>
+              <el-form-item label="鑱屼笟" prop="career">
+                <el-select filterable :disabled="isDisabled" v-model="form.career" placeholder="璇疯緭鍏ヨ亴涓�">
+                  <el-option v-for="dict in dict.type.dict_job" :key="dict.value" :label="dict.label"
+                    :value="dict.value"></el-option>
+                </el-select>
+              </el-form-item>
 
-            <el-form-item label="閭" prop="cusEmail">
-              <el-input v-model="form.cusEmail" placeholder="璇疯緭鍏ラ偖绠�" :disabled="isDisabled" />
-            </el-form-item>
+              <el-form-item label="閭" prop="cusEmail">
+                <el-input v-model="form.cusEmail" placeholder="璇疯緭鍏ラ偖绠�" :disabled="isDisabled" />
+              </el-form-item>
 
-            <el-form-item label="骞撮緞" prop="age">
-              <el-input v-model="form.age" :disabled="isDisabled" style="width: 30%" />
-              <el-select :disabled="isDisabled" v-model="form.ageUnit" style="width: 20%">
-                <el-option v-for="dict in dict.type.dict_ageunit" :key="dict.value" :label="dict.label"
-                  :value="dict.value"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-form>
-          <el-form :inline="true" ref="form" :model="form" :rules="rules" :label-position="labelPosition"
-            label-width="106px" v-show="top">
-            <el-form-item label="浠嬬粛浜�" prop="cusIntroduce">
-              <el-input :disabled="isDisabled" v-model="form.cusIntroduce" placeholder="璇疯緭鍏ヤ粙缁嶄汉" />
-            </el-form-item>
+              <el-form-item label="骞撮緞" prop="age">
+                <el-input v-model="form.age" :disabled="isDisabled" style="width: 30%" />
+                <el-select :disabled="isDisabled" v-model="form.ageUnit" style="width: 20%">
+                  <el-option v-for="dict in dict.type.dict_ageunit" :key="dict.value" :label="dict.label"
+                    :value="dict.value"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-form>
+            <el-form :inline="true" ref="form" :model="form" :rules="rules" :label-position="labelPosition"
+              label-width="106px" v-show="top">
+              <el-form-item label="浠嬬粛浜�" prop="cusIntroduce">
+                <el-input :disabled="isDisabled" v-model="form.cusIntroduce" placeholder="璇疯緭鍏ヤ粙缁嶄汉" />
+              </el-form-item>
 
-            <el-form-item label="鏂囧寲绋嬪害" prop="wenHua" label-width="93px">
-              <el-input :disabled="isDisabled" v-model="form.wenHua" placeholder="璇疯緭鍏ユ枃鍖栫▼搴�" />
-            </el-form-item>
-            <el-form-item label="宸ラ緞" prop="gl">
-              <div>
-                <el-input v-model="form.gl" style="width: 50%">
-                  <template slot="append">骞�</template>
-                </el-input>
-              </div>
-            </el-form-item>
-          </el-form>
-          <el-form ref="form" :model="form" :rules="rules" :label-position="labelPosition" label-width="106px"
-            v-show="top">
-            <el-row :gutter="21">
+              <el-form-item label="鏂囧寲绋嬪害" prop="wenHua" label-width="93px">
+                <el-input :disabled="isDisabled" v-model="form.wenHua" placeholder="璇疯緭鍏ユ枃鍖栫▼搴�" />
+              </el-form-item>
+              <el-form-item label="宸ラ緞" prop="gl">
+                <div>
+                  <el-input v-model="form.gl" style="width: 50%">
+                    <template slot="append">骞�</template>
+                  </el-input>
+                </div>
+              </el-form-item>
+            </el-form>
+            <el-form ref="form" :model="form" :rules="rules" :label-position="labelPosition" label-width="106px"
+              v-show="top">
+              <el-row :gutter="21">
+                <el-col :span="19">
+                  <el-form-item label="鎴峰彛鍦板潃" prop="addr">
+                    <el-input v-model="form.addr" placeholder="璇疯緭鍏ユ埛鍙e湴鍧�" :disabled="isDisabled" />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+
+            <el-form ref="form" :model="form" :rules="rules" :label-position="labelPosition" label-width="106px"
+              v-show="top">
+              <el-row :gutter="21">
+                <el-col :span="19">
+                  <el-form-item label="鐜颁綇鍦板潃" prop="cusAddr">
+                    <el-input v-model="form.cusAddr" placeholder="璇疯緭鍏ョ幇灞呬綇鍦板潃" :disabled="isDisabled" />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+
+            <el-row v-show="top">
               <el-col :span="19">
-                <el-form-item label="鎴峰彛鍦板潃" prop="addr">
-                  <el-input v-model="form.addr" placeholder="璇疯緭鍏ユ埛鍙e湴鍧�" :disabled="isDisabled" />
-                </el-form-item>
+                <div style="float: right; margin-bottom: 10px">
+                  <el-button v-show="lishi" type="primary" @click="cope" size="mini">涓�閿鍒�</el-button>
+                  <el-button type="primary" @click="inputChanges" v-show="lishi" size="mini"
+                    :disabled="confirm">鍘嗗彶浣撴璁板綍</el-button>
+                  <el-button :disabled="isDisabled" type="primary" size="mini" @click="submitForm">鐧昏</el-button>
+                  <el-button icon="el-icon-refresh" size="mini" @click="resetQuery" @queryTable="getList">閲嶇疆</el-button>
+                </div>
               </el-col>
             </el-row>
-          </el-form>
-
-          <el-form ref="form" :model="form" :rules="rules" :label-position="labelPosition" label-width="106px"
-            v-show="top">
-            <el-row :gutter="21">
-              <el-col :span="19">
-                <el-form-item label="鐜颁綇鍦板潃" prop="cusAddr">
-                  <el-input v-model="form.cusAddr" placeholder="璇疯緭鍏ョ幇灞呬綇鍦板潃" :disabled="isDisabled" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </el-form>
-
-          <el-row v-show="top">
-            <el-col :span="19">
-              <div style="float: right; margin-bottom: 10px">
-                <el-button v-show="lishi" type="primary" @click="cope" size="mini">涓�閿鍒�</el-button>
-                <el-button type="primary" @click="inputChanges" v-show="lishi" size="mini"
-                  :disabled="confirm">鍘嗗彶浣撴璁板綍</el-button>
-                <el-button :disabled="isDisabled" type="primary" size="mini" @click="submitForm">鐧昏</el-button>
-                <el-button icon="el-icon-refresh" size="mini" @click="resetQuery" @queryTable="getList">閲嶇疆</el-button>
-              </div>
-            </el-col>
-          </el-row>
-        </div>
-      </el-col>
-      <el-col :span="7" v-show="top">
-        <div class="content" v-show="showHidden.mall_hasPhoto == 'Y'">
-          <div v-show="hide" style="border: 1px dashed #dcdfe6; width: 180px; height: 180px">
-            <img v-if="imageUrl" :src="imageUrl" class="avatar" />
           </div>
-          <div v-if="imgSrc" class="img_bg_camera">
-            <img style="
+        </el-col>
+        <el-col :span="7" v-show="top">
+          <div class="content" v-show="showHidden.mall_hasPhoto == 'Y'">
+            <div v-show="hide" style="border: 1px dashed #dcdfe6; width: 180px; height: 180px">
+              <img v-if="imageUrl" :src="imageUrl" class="avatar" />
+            </div>
+            <div v-if="imgSrc" class="img_bg_camera">
+              <img style="
                 width: 200px;
                 height: 200px;
                 margin-left: -20px;
                 margin-top: 90px;
                 padding-top: 1px;
               " :src="imgSrc" alt="" class="tx_img" />
-          </div>
-          <video v-show="hides" id="videoCamera" :width="videoWidth" :height="videoHeight" autoplay
-            style="margin-top: 1px"></video>
-          <canvas style="display: none" id="canvasCamera" :width="videoWidth" :height="videoHeight"></canvas>
-          <div class="camera_outer" style="margin-top: 10px">
-            <el-button type="primary" plain size="mini" @click="getCompetence()">鎵撳紑鎽勫儚澶�</el-button>
-            <el-button type="primary" plain size="mini" @click="setImage()">鎷嶇収</el-button>
-            <br />
-          </div>
-        </div>
-      </el-col>
-    </el-row>
-
-    <el-dialog title="閫夋嫨濂楅" :visible.sync="taocan" width="70%" height="700px" :close-on-click-modal="false">
-      <el-tabs type="border-card" style="height: 560px; margin: 0 10px; width: 100%" v-model="activeNames"
-        @tab-click="handleClick">
-        <el-tab-pane label="濂楅" name="first">
-          <el-form :model="queryParam" ref="queryForm" size="small" :inline="true" v-if="showSearch" label-width="auto" @submit.native.prevent="handle">
-            <el-form-item label="濂楅鍚嶇О" prop="pacName">
-              <el-input v-model="queryParam.pacName" placeholder="璇疯緭鍏ュ椁愬悕绉�" clearable @keyup.enter.native="handle" />
-            </el-form-item>
-            <el-form-item>
-              <el-button type="primary" icon="el-icon-search" size="mini" @click="handle">鏌ヨ</el-button>
-            </el-form-item>
-          </el-form>
-          <div class="tab4">
-            <div class="grid-content bg-purple" style="margin-left: 5px; width: 98%">
-              <el-table v-loading="loading" element-loading-text="姝e湪鍔犺浇涓�..." element-loading-spinner="el-icon-loading"
-                border :data="newpacName" @selection-change="handleSelectionChange" height="450px" ref="tb">
-                <el-table-column type="selection" width="40px" align="center" label="閫夋嫨" />
-                <el-table-column label="濂楅鍚嶇О" align="center" prop="pacName" width="120px" />
-                <el-table-column label="濂楅浠锋牸" align="center" prop="price" width="120px" />
-                <el-table-column label="濂楅鏄庣粏" align="center" prop="allProName" :show-overflow-tooltip="true" />
-              </el-table>
             </div>
-          </div>
-        </el-tab-pane>
-        <el-tab-pane label="缁勫悎" name="third">
-          <el-row :gutter="20" style="width: 100%">
-            <el-col :span="6" style="min-width: 200px">
-              <div style="
-                  text-align: center;
-                  margin-bottom: 10px;
-                  margin-top: 10px;
-                ">
-                椤圭洰鍒楄〃
-              </div>
-              <el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="filterage">
-              </el-input>
-              <div class="tab3">
-                <el-tree class="filter-tree" v-loading="loading" :data="packageList" :props="defaultProp" show-checkbox
-                  node-key="id" @check="handlepackage" :default-checked-keys="checkedkeys"
-                  :filter-node-method="filterpackage" ref="treas" :render-content="renderContents">
-                </el-tree>
-              </div>
-            </el-col>
-            <el-col :span="6" style="min-width: 200px">
-              <div style="
-                  text-align: center;
-                  margin-bottom: 10px;
-                  margin-top: 10px;
-                ">
-                鏄庣粏椤圭洰鍒楄〃
-              </div>
-              <div class="tab3">
-                <el-tree class="filter-tree" v-loading="loading" :data="packagedataList" node-key="proId"
-                  :props="defaultpackProps" :filter-node-method="filterpackage" @check-change="handlePackageChecked"
-                  :default-checked-keys="checkedListkey1" :render-content="renderContent">
-                </el-tree>
-              </div>
-            </el-col>
-            <el-col :span="11">
-              <div class="grid-content bg-purple">
-                <div style="
-                    text-align: center;
-                    margin-bottom: 10px;
-                    margin-top: 10px;
-                  ">
-                  宸查�夐」鐩垪琛�
-                </div>
-                <el-table :data="DataLists" border style="width: 100%" height="400" :span-method="objectspanmethod">
-                  <el-table-column prop="propinName" label="妫�鏌ラ」鐩�">
-                  </el-table-column>
-                  <el-table-column prop="proName" label="鏄庣粏椤圭洰" width="260px">
-                  </el-table-column>
-                  <el-table-column prop="sl" label="鏁伴噺" width="56px">
-                  </el-table-column>
-
-                  <el-table-column prop="proPrice" label="鍘熶环" width="56px">
-                  </el-table-column>
-
-                  <el-table-column label="鎿嶄綔" align="center" fixed="right" class-name="small-padding fixed-width"
-                    width="50px">
-                    <template slot-scope="scope">
-                      <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDel(scope.row)"
-                        title="鍒犻櫎"></el-button>
-                    </template>
-                  </el-table-column>
-                </el-table>
-
-                <h3 style="font-weight: 600">鍚堣锛歿{ marryalls }}鍏�</h3>
-              </div>
-            </el-col>
-          </el-row>
-        </el-tab-pane>
-        <el-tab-pane label="鍗曢」" name="second">
-          <el-row :gutter="20" style="width: 100%">
-            <el-col :span="6" style="min-width: 200px">
-              <div style="
-                  text-align: center;
-                  margin-bottom: 10px;
-                  margin-top: 10px;
-                ">
-                椤圭洰鍒楄〃
-              </div>
-              <el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="filterText" style="margin-bottom: 10px">
-              </el-input>
-              <div class="tab3">
-                <el-tree class="filter-tree" v-loading="loading" :data="Treedata" :props="defaultProps" show-checkbox
-                  node-key="proId" @check="handleCurrentChecked" :default-checked-keys="checkedkey"
-                  :filter-node-method="filterNode" ref="tree" :render-content="renderContent">
-                </el-tree>
-              </div>
-            </el-col>
-            <el-col :span="6" style="min-width: 200px">
-              <div style="
-                  text-align: center;
-                  margin-bottom: 10px;
-                  margin-top: 10px;
-                ">
-                鏄庣粏椤圭洰鍒楄〃
-              </div>
-              <div class="tab3">
-                <el-tree class="filter-tree" v-loading="loading" :data="TreedataList" node-key="proId"
-                  :props="defaultProps" :filter-node-method="filterNode" show-checkbox
-                  @check-change="handleCurrentChecked1" :default-checked-keys="checkedListkey"
-                  :render-content="renderContent">
-                </el-tree>
-              </div>
-            </el-col>
-            <el-col :span="11">
-              <div class="grid-content bg-purple">
-                <div style="
-                    text-align: center;
-                    margin-bottom: 10px;
-                    margin-top: 10px;
-                  ">
-                  宸查�夐」鐩垪琛�
-                </div>
-                <el-table :data="DataList" border style="width: 100%" height="400" :span-method="objectSpanMethod">
-                  <el-table-column prop="propinName" label="妫�鏌ラ」鐩�">
-                  </el-table-column>
-                  <el-table-column prop="proName" label="鏄庣粏椤圭洰" width="260px">
-                  </el-table-column>
-                  <el-table-column prop="sl" label="鏁伴噺" width="56px">
-                  </el-table-column>
-                  <el-table-column prop="proPrice" label="鍘熶环" width="56px">
-                  </el-table-column>
-                  <el-table-column label="鎿嶄綔" align="center" fixed="right" class-name="small-padding fixed-width"
-                    width="50px">
-                    <template slot-scope="scope">
-                      <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                        title="鍒犻櫎"></el-button>
-                    </template>
-                  </el-table-column>
-                </el-table>
-                <h3 style="font-weight: 600">鍚堣锛歿{ marryall }}鍏�</h3>
-              </div>
-            </el-col>
-          </el-row>
-        </el-tab-pane>
-      </el-tabs>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="cancel">鍙� 娑�</el-button>
-        <el-button type="primary" @click="submit">纭� 瀹�</el-button>
-      </span>
-    </el-dialog>
-    <!-- -->
-    <el-row v-if="tcShow">
-      <el-col :span="15">
-        <div class="grid-content bg-purple">
-          <template>
-            <el-form :model="form" :inline="true" label-width="75px" style="margin-left: 20px; width: 900px">
-              <el-form-item label="濮撳悕" prop="cusName">
-                <span slot="label"> 濮撳悕 </span>
-                <el-input v-model="form.cusName" placeholder="璇疯緭鍏ュ鍚�" :disabled="isDisabled" />
-              </el-form-item>
-              <el-form-item label="鎬у埆" prop="cusSex">
-                <el-select :disabled="isDisabled" v-model="form.cusSex" placeholder="鎬у埆" style="width: 150px">
-                  <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label"
-                    :value="parseInt(dict.value)"></el-option>
-                </el-select>
-              </el-form-item>
-              <el-form-item label="璇佷欢鍙风爜" prop="cusIdcard">
-                <span slot="label"> 璇佷欢鍙风爜 </span>
-                <el-input :disabled="isDisabled" v-model="form.cusIdcard" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" @input="inputChange" />
-              </el-form-item>
-              <el-form-item label="鍗曚綅鍚嶇О" prop="firmName">
-                <el-select v-model="form.firmName" remote default-first-option allow-create filterable
-                  style="width: 200px" placeholder="璇烽�夋嫨鍗曚綅鍚嶇О" clearable @change="idFn1" @clear="clear">
-                  <el-option v-for="dict in CompanyList" :key="dict.cnName" :label="dict.cnName" :value="dict.cnName" />
-                </el-select>
-              </el-form-item>
-              <el-form-item label="鍗曚綅閮ㄩ棬" prop="firmDeptName">
-                <el-input v-model="form.firmDeptName" style="width: 150px" placeholder="璇疯緭鍏ュ崟浣嶉儴闂�" @input="inputChange" />
-              </el-form-item>
-              <el-form-item label="浣撴绫诲瀷">
-                <el-select v-model="form.tjType" placeholder="璇烽�夋嫨浣撴绫诲瀷">
-                  <el-option v-for="dict in dict.type.dict_team" :key="dict.value" :label="dict.label"
-                    :value="dict.value"></el-option>
-                </el-select>
-              </el-form-item>
-              <el-form-item label="浣撴绫诲埆">
-                <el-select style="width: 200px" v-model="tjCategory" placeholder="璇烽�夋嫨浣撴绫诲埆">
-                  <el-option v-for="dict in dict.type.dict_tjtype" :key="dict.value" :label="dict.label"
-                    :value="dict.value"></el-option>
-                </el-select>
-                <!-- <el-input v-model="form.category" placeholder="璇疯緭鍏ヤ綋妫�绫诲埆" /> -->
-              </el-form-item>
-
-              <el-form-item label="搴旀敹閲戦">
-                <el-input placeholder="搴旀敹閲戦" v-model="TotalPrice1" disabled style="width: 150px"></el-input>
-              </el-form-item>
-              <el-form-item label="鎶樻墸">
-                <!-- {{ discount }} -->
-                <el-input-number ref="inputNumber" style="width: 150px" v-model="discount" :precision="1" :step="0.1"
-                  :max="10" :min="0" @change="debounceNumberChange" :disabled="isfalse"></el-input-number>
-              </el-form-item>
-              <el-form-item label="瀹炴敹閲戦">
-                <el-input placeholder="瀹炴敹閲戦" v-model="TotalPrice" style="width: 206px" @input="changeXianjia"
-                  @blur="numberChangeXianPrice(discount, discount)" />
-              </el-form-item>
+            <video v-show="hides" id="videoCamera" :width="videoWidth" :height="videoHeight" autoplay
+              style="margin-top: 1px"></video>
+            <canvas style="display: none" id="canvasCamera" :width="videoWidth" :height="videoHeight"></canvas>
+            <div class="camera_outer" style="margin-top: 10px">
+              <el-button type="primary" plain size="mini" @click="getCompetence()">鎵撳紑鎽勫儚澶�</el-button>
+              <el-button type="primary" plain size="mini" @click="setImage()">鎷嶇収</el-button>
               <br />
-
-              <el-form-item style="margin-left: 149px">
-                <el-button type="primary" @click="Package" size="mini" style="margin-right: 20px">閫夋嫨濂楅</el-button>
-                <el-button type="primary" @click="resetpackage" size="mini" style="margin-right: 20px">閲嶇疆濂楅</el-button>
-                <el-button type="primary" @click="submitPrice" :loading="loadingSubmit" :disabled="loadingSubmit"
-                  v-if="showHidden.has_charge == 'N'" size="mini">绛惧埌鐧昏</el-button>
-                <el-button type="primary" @click="submitCheckinfee" :disabled="confirm"
-                  v-if="showHidden.has_charge == 'Y'" size="mini">鐧昏鏀惰垂</el-button>
-              </el-form-item>
-              <!-- </el-form> -->
-              <!-- </div> -->
-            </el-form>
-          </template>
-
-          <el-dialog title="閭瘎" :visible.sync="malldisble" :close-on-click-modal="false">
-            <el-form :model="addAddress" :rules="rules" label-width="78px" style="margin-left: 7px">
-              <el-form-item label="濮撳悕">
-                <el-input placeholder="濮撳悕" v-model="addAddress.getUser"></el-input>
-              </el-form-item>
-              <el-form-item label="鐢佃瘽">
-                <el-input placeholder="鐢佃瘽" v-model="addAddress.phone"></el-input>
-              </el-form-item>
-              <el-form-item label="鍦板潃">
-                <el-input placeholder="鍦板潃" v-model="addAddress.address"></el-input>
-              </el-form-item>
-            </el-form>
-            <div slot="footer" class="dialog-footer">
-              <el-button type="primary" @click="cancell">纭� 瀹�</el-button>
-              <el-button @click="cancel">鍙� 娑�</el-button>
             </div>
-          </el-dialog>
+          </div>
+        </el-col>
+      </el-row>
 
-          <div style="
+      <el-dialog title="閫夋嫨濂楅" :visible.sync="taocan" width="70%" height="700px" :close-on-click-modal="false">
+        <el-tabs type="border-card" style="height: 560px; margin: 0 10px; width: 100%" v-model="activeNames"
+          @tab-click="handleClick">
+          <el-tab-pane label="濂楅" name="first">
+            <el-form :model="queryParam" ref="queryForm" size="small" :inline="true" v-if="showSearch"
+              label-width="auto" @submit.native.prevent="handle">
+              <el-form-item label="濂楅鍚嶇О" prop="pacName">
+                <el-input v-model="queryParam.pacName" placeholder="璇疯緭鍏ュ椁愬悕绉�" clearable @keyup.enter.native="handle" />
+              </el-form-item>
+              <el-form-item>
+                <el-button type="primary" icon="el-icon-search" size="mini" @click="handle">鏌ヨ</el-button>
+              </el-form-item>
+            </el-form>
+            <div class="tab4">
+              <div class="grid-content bg-purple" style="margin-left: 5px; width: 98%">
+                <el-table v-loading="loading" element-loading-text="姝e湪鍔犺浇涓�..." element-loading-spinner="el-icon-loading"
+                  border :data="newpacName" @selection-change="handleSelectionChange" height="450px" ref="tb">
+                  <el-table-column type="selection" width="40px" align="center" label="閫夋嫨" />
+                  <el-table-column label="濂楅鍚嶇О" align="center" prop="pacName" width="120px" />
+                  <el-table-column label="濂楅浠锋牸" align="center" prop="price" width="120px" />
+                  <el-table-column label="濂楅鏄庣粏" align="center" prop="allProName" :show-overflow-tooltip="true" />
+                </el-table>
+              </div>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane label="缁勫悎" name="third">
+            <el-row :gutter="20" style="width: 100%">
+              <el-col :span="6" style="min-width: 200px">
+                <div style="
+                  text-align: center;
+                  margin-bottom: 10px;
+                  margin-top: 10px;
+                ">
+                  椤圭洰鍒楄〃
+                </div>
+                <el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="filterage">
+                </el-input>
+                <div class="tab3">
+                  <el-tree class="filter-tree" v-loading="loading" :data="packageList" :props="defaultProp"
+                    show-checkbox node-key="id" @check="handlepackage" :default-checked-keys="checkedkeys"
+                    :filter-node-method="filterpackage" ref="treas" :render-content="renderContents">
+                  </el-tree>
+                </div>
+              </el-col>
+              <el-col :span="6" style="min-width: 200px">
+                <div style="
+                  text-align: center;
+                  margin-bottom: 10px;
+                  margin-top: 10px;
+                ">
+                  鏄庣粏椤圭洰鍒楄〃
+                </div>
+                <div class="tab3">
+                  <el-tree class="filter-tree" v-loading="loading" :data="packagedataList" node-key="proId"
+                    :props="defaultpackProps" :filter-node-method="filterpackage" @check-change="handlePackageChecked"
+                    :default-checked-keys="checkedListkey1" :render-content="renderContent">
+                  </el-tree>
+                </div>
+              </el-col>
+              <el-col :span="11">
+                <div class="grid-content bg-purple">
+                  <div style="
+                    text-align: center;
+                    margin-bottom: 10px;
+                    margin-top: 10px;
+                  ">
+                    宸查�夐」鐩垪琛�
+                  </div>
+                  <el-table :data="DataLists" border style="width: 100%" height="400" :span-method="objectspanmethod">
+                    <el-table-column prop="propinName" label="妫�鏌ラ」鐩�">
+                    </el-table-column>
+                    <el-table-column prop="proName" label="鏄庣粏椤圭洰" width="260px">
+                    </el-table-column>
+                    <el-table-column prop="sl" label="鏁伴噺" width="56px">
+                    </el-table-column>
+
+                    <el-table-column prop="proPrice" label="鍘熶环" width="56px">
+                    </el-table-column>
+
+                    <el-table-column label="鎿嶄綔" align="center" fixed="right" class-name="small-padding fixed-width"
+                      width="50px">
+                      <template slot-scope="scope">
+                        <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDel(scope.row)"
+                          title="鍒犻櫎"></el-button>
+                      </template>
+                    </el-table-column>
+                  </el-table>
+
+                  <h3 style="font-weight: 600">鍚堣锛歿{ marryalls }}鍏�</h3>
+                </div>
+              </el-col>
+            </el-row>
+          </el-tab-pane>
+          <el-tab-pane label="鍗曢」" name="second">
+            <el-row :gutter="20" style="width: 100%">
+              <el-col :span="6" style="min-width: 200px">
+                <div style="
+                  text-align: center;
+                  margin-bottom: 10px;
+                  margin-top: 10px;
+                ">
+                  椤圭洰鍒楄〃
+                </div>
+                <el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="filterText" style="margin-bottom: 10px">
+                </el-input>
+                <div class="tab3">
+                  <el-tree class="filter-tree" v-loading="loading" :data="Treedata" :props="defaultProps" show-checkbox
+                    node-key="proId" @check="handleCurrentChecked" :default-checked-keys="checkedkey"
+                    :filter-node-method="filterNode" ref="tree" :render-content="renderContent">
+                  </el-tree>
+                </div>
+              </el-col>
+              <el-col :span="6" style="min-width: 200px">
+                <div style="
+                  text-align: center;
+                  margin-bottom: 10px;
+                  margin-top: 10px;
+                ">
+                  鏄庣粏椤圭洰鍒楄〃
+                </div>
+                <div class="tab3">
+                  <el-tree class="filter-tree" v-loading="loading" :data="TreedataList" node-key="proId"
+                    :props="defaultProps" :filter-node-method="filterNode" show-checkbox
+                    @check-change="handleCurrentChecked1" :default-checked-keys="checkedListkey"
+                    :render-content="renderContent">
+                  </el-tree>
+                </div>
+              </el-col>
+              <el-col :span="11">
+                <div class="grid-content bg-purple">
+                  <div style="
+                    text-align: center;
+                    margin-bottom: 10px;
+                    margin-top: 10px;
+                  ">
+                    宸查�夐」鐩垪琛�
+                  </div>
+                  <el-table :data="DataList" border style="width: 100%" height="400" :span-method="objectSpanMethod">
+                    <el-table-column prop="propinName" label="妫�鏌ラ」鐩�">
+                    </el-table-column>
+                    <el-table-column prop="proName" label="鏄庣粏椤圭洰" width="260px">
+                    </el-table-column>
+                    <el-table-column prop="sl" label="鏁伴噺" width="56px">
+                    </el-table-column>
+                    <el-table-column prop="proPrice" label="鍘熶环" width="56px">
+                    </el-table-column>
+                    <el-table-column label="鎿嶄綔" align="center" fixed="right" class-name="small-padding fixed-width"
+                      width="50px">
+                      <template slot-scope="scope">
+                        <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                          title="鍒犻櫎"></el-button>
+                      </template>
+                    </el-table-column>
+                  </el-table>
+                  <h3 style="font-weight: 600">鍚堣锛歿{ marryall }}鍏�</h3>
+                </div>
+              </el-col>
+            </el-row>
+          </el-tab-pane>
+        </el-tabs>
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="cancel">鍙� 娑�</el-button>
+          <el-button type="primary" @click="submit">纭� 瀹�</el-button>
+        </span>
+      </el-dialog>
+      <!-- -->
+      <el-row v-if="tcShow">
+        <el-col :span="15">
+          <div class="grid-content bg-purple">
+            <template>
+              <el-form :model="form" :inline="true" label-width="75px" style="margin-left: 20px; width: 900px">
+                <el-form-item label="濮撳悕" prop="cusName">
+                  <span slot="label"> 濮撳悕 </span>
+                  <el-input v-model="form.cusName" placeholder="璇疯緭鍏ュ鍚�" :disabled="isDisabled" />
+                </el-form-item>
+                <el-form-item label="鎬у埆" prop="cusSex">
+                  <el-select :disabled="isDisabled" v-model="form.cusSex" placeholder="鎬у埆" style="width: 150px">
+                    <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label"
+                      :value="parseInt(dict.value)"></el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="璇佷欢鍙风爜" prop="cusIdcard">
+                  <span slot="label"> 璇佷欢鍙风爜 </span>
+                  <el-input :disabled="isDisabled" v-model="form.cusIdcard" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�"
+                    @input="inputChange" />
+                </el-form-item>
+                <el-form-item label="鍗曚綅鍚嶇О" prop="firmName">
+                  <el-select v-model="form.firmName" remote default-first-option allow-create filterable
+                    style="width: 200px" placeholder="璇烽�夋嫨鍗曚綅鍚嶇О" clearable @change="idFn1" @clear="clear">
+                    <el-option v-for="dict in CompanyList" :key="dict.cnName" :label="dict.cnName"
+                      :value="dict.cnName" />
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="鍗曚綅閮ㄩ棬" prop="firmDeptName">
+                  <el-input v-model="form.firmDeptName" style="width: 150px" placeholder="璇疯緭鍏ュ崟浣嶉儴闂�"
+                    @input="inputChange" />
+                </el-form-item>
+                <el-form-item label="浣撴绫诲瀷">
+                  <el-select v-model="form.tjType" placeholder="璇烽�夋嫨浣撴绫诲瀷">
+                    <el-option v-for="dict in dict.type.dict_team" :key="dict.value" :label="dict.label"
+                      :value="dict.value"></el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="浣撴绫诲埆">
+                  <el-select style="width: 200px" v-model="tjCategory" placeholder="璇烽�夋嫨浣撴绫诲埆">
+                    <el-option v-for="dict in dict.type.dict_tjtype" :key="dict.value" :label="dict.label"
+                      :value="dict.value"></el-option>
+                  </el-select>
+                  <!-- <el-input v-model="form.category" placeholder="璇疯緭鍏ヤ綋妫�绫诲埆" /> -->
+                </el-form-item>
+
+                <el-form-item label="搴旀敹閲戦">
+                  <el-input placeholder="搴旀敹閲戦" v-model="TotalPrice1" disabled style="width: 150px"></el-input>
+                </el-form-item>
+                <el-form-item label="鎶樻墸">
+                  <!-- {{ discount }} -->
+                  <el-input-number ref="inputNumber" style="width: 150px" v-model="discount" :precision="1" :step="0.1"
+                    :max="10" :min="0" @change="debounceNumberChange" :disabled="isfalse"></el-input-number>
+                </el-form-item>
+                <el-form-item label="瀹炴敹閲戦">
+                  <el-input placeholder="瀹炴敹閲戦" v-model="TotalPrice" style="width: 206px" @input="changeXianjia"
+                    @blur="numberChangeXianPrice(discount, discount)" />
+                </el-form-item>
+                <br />
+
+                <el-form-item style="margin-left: 149px">
+                  <el-button type="primary" @click="Package" size="mini" style="margin-right: 20px">閫夋嫨濂楅</el-button>
+                  <el-button type="primary" @click="resetpackage" size="mini"
+                    style="margin-right: 20px">閲嶇疆濂楅</el-button>
+                  <el-button type="primary" @click="submitPrice" :loading="loadingSubmit" :disabled="loadingSubmit"
+                    v-if="showHidden.has_charge == 'N'" size="mini">绛惧埌鐧昏</el-button>
+                  <el-button type="primary" @click="submitCheckinfee" :disabled="confirm"
+                    v-if="showHidden.has_charge == 'Y'" size="mini">鐧昏鏀惰垂</el-button>
+                </el-form-item>
+                <!-- </el-form> -->
+                <!-- </div> -->
+              </el-form>
+            </template>
+
+            <el-dialog title="閭瘎" :visible.sync="malldisble" :close-on-click-modal="false">
+              <el-form :model="addAddress" :rules="rules" label-width="78px" style="margin-left: 7px">
+                <el-form-item label="濮撳悕">
+                  <el-input placeholder="濮撳悕" v-model="addAddress.getUser"></el-input>
+                </el-form-item>
+                <el-form-item label="鐢佃瘽">
+                  <el-input placeholder="鐢佃瘽" v-model="addAddress.phone"></el-input>
+                </el-form-item>
+                <el-form-item label="鍦板潃">
+                  <el-input placeholder="鍦板潃" v-model="addAddress.address"></el-input>
+                </el-form-item>
+              </el-form>
+              <div slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="cancell">纭� 瀹�</el-button>
+                <el-button @click="cancel">鍙� 娑�</el-button>
+              </div>
+            </el-dialog>
+
+            <div style="
               display: flex;
               align-items: center;
               justify-content: flex-start;
               width: 100%;
             ">
-            <div style="
+              <div style="
                 white-space: nowrap;
                 overflow: hidden;
                 text-overflow: ellipsis;
@@ -556,24 +561,25 @@
                 font-size: 16px;
                 margin-right: 20px;
               ">
-              <span v-if="this.tableData1[0]">{{
-                this.tableData1[0].pacName || ""
-              }}</span>
-              宸查�夐」鐩潯鏁帮細<span style="font-weight: 700; color: red; margin-right: 5px">{{ this.tableData1.length || 0
-              }}</span>鏉�
+                <span v-if="this.tableData1[0]">{{
+                  this.tableData1[0].pacName || ""
+                  }}</span>
+                宸查�夐」鐩潯鏁帮細<span style="font-weight: 700; color: red; margin-right: 5px">{{ this.tableData1.length || 0
+                  }}</span>鏉�
+              </div>
+              宸查�夐」鐩垪琛�
             </div>
-            宸查�夐」鐩垪琛�
-          </div>
 
-          <div v-loading="contentLoading" element-loading-text="鍔犺浇涓�..." element-loading-spinner="el-icon-loading" element-loading-background="rgba(255, 255, 255, 0.7)" style=" padding: 0px 6px;
+            <div v-loading="contentLoading" element-loading-text="鍔犺浇涓�..." element-loading-spinner="el-icon-loading"
+              element-loading-background="rgba(255, 255, 255, 0.7)" style=" padding: 0px 6px;
     border: 1px solid #e6ebf5;
     max-height: 650%;
     overflow: auto;
     width: 916px;
-    margin-left: 35px;" >
+    margin-left: 35px;">
 
-          
-          <div style="
+
+              <div style="
               padding: 0px 6px;
               border: 1px solid #e6ebf5;
               max-height: 650%;
@@ -581,187 +587,188 @@
               width: 916px;
               margin-left: 35px;
             ">
-            <el-table :data="tableData1" border style="width: 100%">
-              <el-table-column prop="proName" label="椤圭洰" width="180">
-              </el-table-column>
-              <el-table-column prop="proType" label="鎬у埆" width="50">
-                <template slot-scope="scope">
-                  <template v-if="isAll(scope.row.proType)"> 鍏ㄩ儴 </template>
-                  <template v-else>
-                    <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.proType" />
-                  </template>
-                </template>
-              </el-table-column>
+                <el-table :data="tableData1" border style="width: 100%">
+                  <el-table-column prop="proName" label="椤圭洰" width="180">
+                  </el-table-column>
+                  <el-table-column prop="proType" label="鎬у埆" width="50">
+                    <template slot-scope="scope">
+                      <template v-if="isAll(scope.row.proType)"> 鍏ㄩ儴 </template>
+                      <template v-else>
+                        <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.proType" />
+                      </template>
+                    </template>
+                  </el-table-column>
 
-              <el-table-column prop="ordPrice" label="搴旀敹閲戦">
-              </el-table-column>
-              <el-table-column label="鎶樻墸">
-                <template slot-scope="scope">
-                  <!-- 鍙緭鍏ョ函鏁板瓧鎶樻墸 -->
-                  <el-input-number v-model.number="scope.row.discount" @input="validateDiscount(scope.row)"
-                    @change="handleManualChange(scope.row)" placeholder="杈撳叆鎶樻墸" size="small" type="number" :precision="1"
-                    :step="0.1" :max="10" :min="0">
-                  </el-input-number>
-                </template>
-              </el-table-column>
-              <el-table-column prop="nowPrice" label="瀹炴敹閲戦">
-                <template slot-scope="scope">
-                  {{ scope.row.nowPrice.toFixed(2) }}
-                </template>
-              </el-table-column>
-              <el-table-column prop="proCheckMethod" label="鏄惁绌鸿吂">
-                <template slot-scope="scope">
-                  <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.proCheckMethod" />
-                </template>
-              </el-table-column>
-              <!-- <el-table-column prop="proCheckMethod" label="鍏垂">
+                  <el-table-column prop="ordPrice" label="搴旀敹閲戦">
+                  </el-table-column>
+                  <el-table-column label="鎶樻墸">
+                    <template slot-scope="scope">
+                      <!-- 鍙緭鍏ョ函鏁板瓧鎶樻墸 -->
+                      <el-input-number v-model.number="scope.row.discount" @input="validateDiscount(scope.row)"
+                        @change="handleManualChange(scope.row)" placeholder="杈撳叆鎶樻墸" size="small" type="number"
+                        :precision="1" :step="0.1" :max="10" :min="0">
+                      </el-input-number>
+                    </template>
+                  </el-table-column>
+                  <el-table-column prop="nowPrice" label="瀹炴敹閲戦">
+                    <template slot-scope="scope">
+                      {{ scope.row.nowPrice.toFixed(2) }}
+                    </template>
+                  </el-table-column>
+                  <el-table-column prop="proCheckMethod" label="鏄惁绌鸿吂">
+                    <template slot-scope="scope">
+                      <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.proCheckMethod" />
+                    </template>
+                  </el-table-column>
+                  <!-- <el-table-column prop="proCheckMethod" label="鍏垂">
                 <template #default="scope">
                   <el-checkbox v-model="scope.row.free" :disabled="true">
                     {{ scope.row.free ? "鍏嶈垂" : "鏀惰垂" }}
                   </el-checkbox>
                 </template>
               </el-table-column> -->
-              <el-table-column label="鎿嶄綔" align="center" width="80px">
-                <template slot-scope="scope">
-                  <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete1(scope.row)" title="鍒犻櫎">
-                  </el-button>
-                </template>
-              </el-table-column>
-            </el-table>
+                  <el-table-column label="鎿嶄綔" align="center" width="80px">
+                    <template slot-scope="scope">
+                      <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete1(scope.row)"
+                        title="鍒犻櫎">
+                      </el-button>
+                    </template>
+                  </el-table-column>
+                </el-table>
+              </div>
+            </div>
           </div>
-          </div>
+        </el-col>
+      </el-row>
+
+      <el-dialog title="瀵兼鍗曢瑙�" :visible.sync="dialogVisibles" :close-on-click-modal="false">
+        <div class="main">
+          <iframe id="printIframe" :src="url" frameborder="0" style="width: 100%; height: 100%"></iframe>
         </div>
-      </el-col>
-    </el-row>
+      </el-dialog>
 
-    <el-dialog title="瀵兼鍗曢瑙�" :visible.sync="dialogVisibles" :close-on-click-modal="false">
-      <div class="main">
-        <iframe id="printIframe" :src="url" frameborder="0" style="width: 100%; height: 100%"></iframe>
-      </div>
-    </el-dialog>
+      <el-dialog title="鏀惰垂" :visible.sync="charge" width="59%" height="700px">
+        <div>
+          <el-table id="sig" v-loading="loading" :data="feeitems" @selection-change="handleSelect" tooltip-effect="dark"
+            ref="multipleTable" border>
+            <el-table-column type="selection" width="55" align="center" />
+            <el-table-column label="濮撳悕" align="center" prop="tjName" width="100px" />
+            <el-table-column label="鎬у埆" align="center" prop="sex" width="90px">
+              <template slot-scope="scope">
+                <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex" />
+              </template>
+            </el-table-column>
+            <el-table-column label="韬唤璇�" align="center" prop="idCard" width="150px"
+              :show-overflow-tooltip="true"></el-table-column>
+            <el-table-column label="鎵嬫満鍙�" align="center" prop="tjPhone" width="120px"
+              :show-overflow-tooltip="true"></el-table-column>
+            <el-table-column label="浣撴鍙�" align="center" prop="tjNumber" width="160px" />
+            <el-table-column label="鐧昏鏃堕棿" align="center" prop="tjFlowingWater.createTime"
+              :show-overflow-tooltip="true"></el-table-column>
+            <el-table-column label="鍗曚綅鍚嶇О" align="center" prop="tjComp"></el-table-column>
+            <el-table-column label="浣撴绫诲瀷" align="center" prop="tjType" width="80px">
+              <template slot-scope="scope">
+                <dict-tag :options="dict.type.dict_team" :value="scope.row.tjType" />
+              </template>
+            </el-table-column>
+            <el-table-column label="璁㈠崟娴佹按鍙�" align="center" prop="tjFlowingWater.waterId" width="200px" />
+            <el-table-column label="鏀惰垂鍛�" align="center" prop="tjFlowingWater.updateBy" width="100px" />
+          </el-table>
 
-    <el-dialog title="鏀惰垂" :visible.sync="charge" width="59%" height="700px">
-      <div>
-        <el-table id="sig" v-loading="loading" :data="feeitems" @selection-change="handleSelect" tooltip-effect="dark"
-          ref="multipleTable" border>
-          <el-table-column type="selection" width="55" align="center" />
-          <el-table-column label="濮撳悕" align="center" prop="tjName" width="100px" />
-          <el-table-column label="鎬у埆" align="center" prop="sex" width="90px">
-            <template slot-scope="scope">
-              <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex" />
-            </template>
-          </el-table-column>
-          <el-table-column label="韬唤璇�" align="center" prop="idCard" width="150px"
-            :show-overflow-tooltip="true"></el-table-column>
-          <el-table-column label="鎵嬫満鍙�" align="center" prop="tjPhone" width="120px"
-            :show-overflow-tooltip="true"></el-table-column>
-          <el-table-column label="浣撴鍙�" align="center" prop="tjNumber" width="160px" />
-          <el-table-column label="鐧昏鏃堕棿" align="center" prop="tjFlowingWater.createTime"
-            :show-overflow-tooltip="true"></el-table-column>
-          <el-table-column label="鍗曚綅鍚嶇О" align="center" prop="tjComp"></el-table-column>
-          <el-table-column label="浣撴绫诲瀷" align="center" prop="tjType" width="80px">
-            <template slot-scope="scope">
-              <dict-tag :options="dict.type.dict_team" :value="scope.row.tjType" />
-            </template>
-          </el-table-column>
-          <el-table-column label="璁㈠崟娴佹按鍙�" align="center" prop="tjFlowingWater.waterId" width="200px" />
-          <el-table-column label="鏀惰垂鍛�" align="center" prop="tjFlowingWater.updateBy" width="100px" />
-        </el-table>
+          <el-row :gutter="10" class="mb8">
+            <el-col :span="20">
+              <el-form :inline="true" :model="formInline" class="demo-form-inline" style="margin: 12px 6px">
+                <el-form-item label="搴旀敹閲戦">
+                  <el-input style="width: 86px" :value="formInline.price + '.00'" placeholder="閲戦"
+                    :disabled="true"></el-input>
+                </el-form-item>
+                <el-form-item label="浼樻儬">
+                  <el-input-number style="width: 140px" v-model="discount" :precision="1" :step="0.1" :max="10" :min="0"
+                    @change="debounceNumberChange" :disabled="isfalse"></el-input-number>
+                </el-form-item>
+                <el-form-item label="瀹炴敹閲戦">
+                  <el-input v-model="formInline.paidIn" placeholder="瀹炰粯" style="width: 94px">
+                  </el-input>
+                </el-form-item>
+                <el-form-item label="浠樻绫诲瀷" prop="payType">
+                  <el-select style="width: 120px" v-model="formInline.payType" placeholder="璇烽�夋嫨浠樻绫诲瀷">
+                    <el-option v-for="dict in dict.type.dict_pay_type" :key="dict.value" :label="dict.label"
+                      :value="dict.value"></el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item>
+                  <el-button style="margin-left: 15px" type="primary" size="mini" @click="SubmitEvent">鏀惰垂</el-button>
+                </el-form-item>
+              </el-form>
+            </el-col>
+          </el-row>
 
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="20">
-            <el-form :inline="true" :model="formInline" class="demo-form-inline" style="margin: 12px 6px">
-              <el-form-item label="搴旀敹閲戦">
-                <el-input style="width: 86px" :value="formInline.price + '.00'" placeholder="閲戦"
-                  :disabled="true"></el-input>
-              </el-form-item>
-              <el-form-item label="浼樻儬">
-                <el-input-number style="width: 140px" v-model="discount" :precision="1" :step="0.1" :max="10" :min="0"
-                  @change="debounceNumberChange" :disabled="isfalse"></el-input-number>
-              </el-form-item>
-              <el-form-item label="瀹炴敹閲戦">
-                <el-input v-model="formInline.paidIn" placeholder="瀹炰粯" style="width: 94px">
-                </el-input>
-              </el-form-item>
-              <el-form-item label="浠樻绫诲瀷" prop="payType">
-                <el-select style="width: 120px" v-model="formInline.payType" placeholder="璇烽�夋嫨浠樻绫诲瀷">
-                  <el-option v-for="dict in dict.type.dict_pay_type" :key="dict.value" :label="dict.label"
-                    :value="dict.value"></el-option>
-                </el-select>
-              </el-form-item>
-              <el-form-item>
-                <el-button style="margin-left: 15px" type="primary" size="mini" @click="SubmitEvent">鏀惰垂</el-button>
-              </el-form-item>
-            </el-form>
-          </el-col>
-        </el-row>
-
-        <el-table v-loading="loading" :data="Chargesubitem" border height="240">
-          <el-table-column type="index" width="50"> </el-table-column>
-          <el-table-column label="椤圭洰鍚嶇О" align="center" prop="proName" />
-          <el-table-column label="搴旀敹閲戦" align="center" prop="proOrdPrice" />
-          <el-table-column label="瀹炴敹閲戦" align="center" prop="proPrice" />
-        </el-table>
-      </div>
-    </el-dialog>
-    <el-dialog title="鎻愮ず" :visible.sync="cardreader" width="30%" :close-on-press-escape="false"
-      :close-on-click-modal="false">
-      <template>
-        <el-radio-group v-model="cardreaderradio" @input="changeradio">
-          <el-radio :label="3">韬唤璇�</el-radio>
-          <el-radio :label="6">鍋ュ悍鐮�</el-radio>
-        </el-radio-group>
-        <div style="margin-top: 10px" v-show="cardreaderradio == 6">
-          <el-input v-model="inputSSS" ref="tableHeadFilterInp" placeholder="璇疯緭鍏ュ唴瀹�"></el-input>
+          <el-table v-loading="loading" :data="Chargesubitem" border height="240">
+            <el-table-column type="index" width="50"> </el-table-column>
+            <el-table-column label="椤圭洰鍚嶇О" align="center" prop="proName" />
+            <el-table-column label="搴旀敹閲戦" align="center" prop="proOrdPrice" />
+            <el-table-column label="瀹炴敹閲戦" align="center" prop="proPrice" />
+          </el-table>
         </div>
-      </template>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="cardreader = false">鍙� 娑�</el-button>
-        <el-button type="primary" @click="cardreadercopes">纭� 瀹�</el-button>
-      </span>
-    </el-dialog>
-    <div style="position: absolute; bottom: 100px; width: 360px; display: none">
-      <div id="printBill" style="width: 280px; font-size: 1px" ref="printContent">
-        <div style="font-size: 1px">
-          <div style="text-align: center">
-            <h3>{{ hospName }}灏忕エ</h3>
+      </el-dialog>
+      <el-dialog title="鎻愮ず" :visible.sync="cardreader" width="30%" :close-on-press-escape="false"
+        :close-on-click-modal="false">
+        <template>
+          <el-radio-group v-model="cardreaderradio" @input="changeradio">
+            <el-radio :label="3">韬唤璇�</el-radio>
+            <el-radio :label="6">鍋ュ悍鐮�</el-radio>
+          </el-radio-group>
+          <div style="margin-top: 10px" v-show="cardreaderradio == 6">
+            <el-input v-model="inputSSS" ref="tableHeadFilterInp" placeholder="璇疯緭鍏ュ唴瀹�"></el-input>
           </div>
+        </template>
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="cardreader = false">鍙� 娑�</el-button>
+          <el-button type="primary" @click="cardreadercopes">纭� 瀹�</el-button>
+        </span>
+      </el-dialog>
+      <div style="position: absolute; bottom: 100px; width: 360px; display: none">
+        <div id="printBill" style="width: 280px; font-size: 1px" ref="printContent">
+          <div style="font-size: 1px">
+            <div style="text-align: center">
+              <h3>{{ hospName }}灏忕エ</h3>
+            </div>
 
-          <div style="margin-top: 4px">
-            <div>濮撳悕:{{ formIn.name }}</div>
-            <div>鐢佃瘽:{{ formIn.phone }}</div>
-            <div>浣撴椤圭洰:{{ formIn.tjPro }}</div>
-            <div>瀹炴敹閲戦:{{ formInline.paidIn }}鍏�</div>
-            <div>鏀惰垂鏃堕棿:{{ currentDate + " " + currentTime }}</div>
+            <div style="margin-top: 4px">
+              <div>濮撳悕:{{ formIn.name }}</div>
+              <div>鐢佃瘽:{{ formIn.phone }}</div>
+              <div>浣撴椤圭洰:{{ formIn.tjPro }}</div>
+              <div>瀹炴敹閲戦:{{ formInline.paidIn }}鍏�</div>
+              <div>鏀惰垂鏃堕棿:{{ currentDate + " " + currentTime }}</div>
+            </div>
           </div>
         </div>
       </div>
-    </div>
 
-    <!-- <el-dialog
+      <!-- <el-dialog
       title="鎷嶇収"
       :visible.sync="beat"
       width="40%"
       :before-close="handleClose"
     > -->
 
-    <!-- <span slot="footer" class="dialog-footer">
+      <!-- <span slot="footer" class="dialog-footer">
         <el-button @click="beat = false">鍙� 娑�</el-button>
         <el-button type="primary" @click="beat = false">纭� 瀹�</el-button>
       </span> -->
-    <!-- </el-dialog> -->
-    <historyTj :cusIdCard="form.cusIdcard" ref="historyTj"></historyTj>
-    <el-dialog title="鎻愮ず" :visible.sync="dialogVisiblese" width="30%">
-      <span>鏄惁澶嶅埗鏈�杩戜竴娆$殑浣撴椤圭洰锛�</span>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisiblese = false">鍙� 娑�</el-button>
-        <el-button type="primary" @click="copes">纭� 瀹�</el-button>
-      </span>
-    </el-dialog>
-    <Packages ref="aaa" @add="handleChanges" />
-    <selectName ref="bbb" @add="handleChangesName" />
+      <!-- </el-dialog> -->
+      <historyTj :cusIdCard="form.cusIdcard" ref="historyTj"></historyTj>
+      <el-dialog title="鎻愮ず" :visible.sync="dialogVisiblese" width="30%">
+        <span>鏄惁澶嶅埗鏈�杩戜竴娆$殑浣撴椤圭洰锛�</span>
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="dialogVisiblese = false">鍙� 娑�</el-button>
+          <el-button type="primary" @click="copes">纭� 瀹�</el-button>
+        </span>
+      </el-dialog>
+      <Packages ref="aaa" @add="handleChanges" />
+      <selectName ref="bbb" @add="handleChangesName" />
+    </div>
   </div>
-</div>
 </template>
 
 <script>
@@ -1340,7 +1347,7 @@
       if (data.proName.indexOf(value) !== -1) return true;
       let values = value.toLowerCase();
       if (data.proEngName.indexOf(values) !== -1) return true;
-     
+
       // 鍖归厤灏忓啓
       let arr = data.proName.spell("low", "array");
       let spell = arr.join("");
@@ -1819,7 +1826,7 @@
       let cusIdcard = this.form.cusIdcard;
       if (cusIdcard) {
         getCusIdcard(cusIdcard).then((response) => {
-          console.log(response,1111111111)
+          console.log(response, 1111111111)
           _this.top = false;
           if (response.data) {
             this.form = response.data;
@@ -1975,7 +1982,7 @@
     // 鏈�鏂颁娇鐢╳ebSocket閫氫俊
     readCardWebSocket(resultObj) {
       let _this = this;
- const isChineseChar = (char) => /[\u4E00-\u9FA5]/.test(char)
+      const isChineseChar = (char) => /[\u4E00-\u9FA5]/.test(char)
       if (resultObj.code === 200 && resultObj.data.name != null) {
         //鍥炴樉鐩稿叧鏁版嵁
         _this.form.cusName = resultObj.data.name;
@@ -2038,7 +2045,7 @@
           //鍥炴樉鐩稿叧鏁版嵁
           _this.form.cusName = resultObj.resultContent.partyName;
           _this.form.cusSex =
-            resultObj.resultContent.gender ;
+            resultObj.resultContent.gender;
           _this.form.cusNational = resultObj.resultContent.nation;
           _this.form.cusBrithday = resultObj.resultContent.bornDay;
           if (_this.form.cusBrithday) {
@@ -2334,7 +2341,7 @@
         dwId: this.form.firmId,
       };
       if (this.name) {
-      let name= this.name.toLowerCase()
+        let name = this.name.toLowerCase()
         getPackageListName(name).then((response) => {
           this.newpacName = response.data;
           this.loading = false;
@@ -2575,7 +2582,7 @@
     handleClick(tab, event) {
       if (this.activeNames == "second") {
         console.log(this.form);
-        
+
         this.DataList = [];
         this.checkedkey = [];
         this.TreedataList = [];
@@ -2597,7 +2604,7 @@
     getDataList() {
       this.loading = true;
       console.log(this.form);
-      
+
       getProParentIdDxList(this.form.cusSex).then((response) => {
         this.Treedata = response.data.list;
 
@@ -2925,7 +2932,7 @@
 
     // 椤圭洰鎻愪氦
     submit() {
-    this.isLoading = true;
+      this.isLoading = true;
       if (this.form.cusIdcard) {
         var cusId = this.form.cusIdcard;
       } else {
@@ -2940,7 +2947,7 @@
       this.TotalPrice1 = 0; // 鍒濆鍖栧簲鏀堕噾棰�
       this.TotalPrice = 0; // 鍒濆鍖栧疄鏀堕噾棰�
 
-      this.contentLoading = true; 
+      this.contentLoading = true;
       this.discount = 10; // 鍒濆鍖栨姌鎵d负10锛�100%锛�
 
       // 鍒ゆ柇鏄惁鏈夐�変腑鐨勫椁�
@@ -2977,11 +2984,11 @@
               this.processOrderItems(cusId);
             }
             this.isSubmitting = false; // 鎻愪氦瀹屾垚鍚庨噸缃爣蹇�
-             this.isLoading = false;
+            this.isLoading = false;
           })
           .catch(() => {
             this.isSubmitting = false; // 纭繚鍦ㄩ敊璇儏鍐典笅涔熼噸缃爣蹇�
-             this.isLoading = false;
+            this.isLoading = false;
           });
       } else {
         getaddtTransition(data)
@@ -2990,12 +2997,12 @@
               this.processOrderItems(cusId);
             }
             this.isSubmitting = false; // 鎻愪氦瀹屾垚鍚庨噸缃爣蹇�
-             this.isLoading = false;
+            this.isLoading = false;
             // this.contentLoading = false;
           })
           .catch(() => {
             this.isSubmitting = false; // 纭繚鍦ㄩ敊璇儏鍐典笅涔熼噸缃爣蹇�
-             this.isLoading = false;
+            this.isLoading = false;
             // this.contentLoading = false;
           });
       }
@@ -3007,18 +3014,22 @@
 
     // 澶勭悊璁㈠崟椤圭洰
     processOrderItems(cusId) {
+      console.log(111112222233333)
       getTransitionList1(cusId).then((response) => {
         this.contentLoading = false;
-        this.tableData1 = response.data;
+        this.tableData1 = response.data.list;
+        if (response.data.tjCategory != null) {
+          this.tjCategory = response.data.tjCategory;
+
+
+        }
         let Price = 0;
         if (this.tableData1) {
           this.tableData1.forEach((item) => {
             if (typeof item.nowPrice === 'number') {
               item.nowPrice = Number(item.nowPrice.toFixed(2));
             }
-            if (item.tjCategory != null) {
-              this.tjCategory = item.tjCategory;
-            }
+
             if (item.pacName == "鍗曢」") {
               item.list.forEach((item9) => {
                 this.treeList.push(item9.proId);
diff --git a/vue.config.js b/vue.config.js
index 65c5b9f..809f8b0 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -55,7 +55,7 @@
         // target: `https://ltpeis.xaltjdkj.cn:5801/`,
         // target: `http://192.168.1.99:5012`,
         // target: `http://192.168.1.113:5011`,
-        target: `http://192.168.1.2:5011`,
+        target: `http://192.168.1.113:5011`,
         // // target: `http://192.168.0.99:8080/ltkj-admin`,
         // target: `https://ltpeis.xaltjdkj.cn:5011/ltkj-admin`,
         // target: `http://10.168.0.9:5011`,

--
Gitblit v1.8.0