From caef1ff213da160e818342eceb3d77fac0db280d Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期五, 30 五月 2025 16:41:29 +0800
Subject: [PATCH] qx

---
 src/views/system/tijian/index.vue         |   10 
 src/views/doctor/examination/index.vue    |    6 
 src/views/system/comp/index.vue           | 1232 +++++----------------------
 src/views/reservation/resercopy/index.vue |   40 
 src/views/reservation/career/index.vue    | 1029 +++++++++++++++++++++++
 src/views/hosp/diseasetypes/index.vue     |  320 +++++++
 6 files changed, 1,615 insertions(+), 1,022 deletions(-)

diff --git a/src/views/doctor/examination/index.vue b/src/views/doctor/examination/index.vue
index 74dac45..f4d1a3b 100644
--- a/src/views/doctor/examination/index.vue
+++ b/src/views/doctor/examination/index.vue
@@ -338,6 +338,7 @@
                 @click="queryResultone(scope.row)"
                 >缁撴灉</el-button
               >
+              <!--  -->
               <!--  @click="chaxun(scope.row) " -->
             </template>
           </el-table-column>
@@ -363,6 +364,7 @@
             <el-table-column label="妫�娴嬬粨鏋�" prop="pro_result">
             </el-table-column>
             <el-table-column label="鍙傝�冭寖鍥�" prop="ckfw"> </el-table-column>
+             <el-table-column label="寮傚父鏍囧織" prop="ycbz"> </el-table-column>
           </el-table>
         </div>
 
@@ -520,7 +522,7 @@
   },
   methods: {
     changRed({ row }) {
-      if (row.ycbz != "" && row.ycbz != null && row.ycbz === "1") {
+      if (row.ycbz != "" && row.ycbz != null && row.ycbz === 1) {
         // 鍙橀鑹茬殑鏉′欢
         return {
           color: "red", // 杩欎釜return鐨勫氨鏄牱寮� 鍙互鏄痗olor 涔熷彲浠ユ槸backgroundColor
@@ -867,8 +869,6 @@
       const proId = row.proId;
       resultList(tjNum, proId).then((res) => {
         this.jieguoList = res.data;
-        console.log(this.jieguoList, 998877);
-
         this.jyjc = this.jieguoList[0].jyjc;
         const ycbz = this.jieguoList[0].ycbz;
         /* if (ycbz === "" || ycbz === null) {
diff --git a/src/views/hosp/diseasetypes/index.vue b/src/views/hosp/diseasetypes/index.vue
new file mode 100644
index 0000000..76b499b
--- /dev/null
+++ b/src/views/hosp/diseasetypes/index.vue
@@ -0,0 +1,320 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="24">
+      <!-- 绗竴鍒楋細鍗曢�夋爣鏈� -->
+      <el-col :span="8" :xs="24">
+        <el-form
+          :model="queryParams"
+          ref="queryForm"
+          size="small"
+          :inline="true"
+          label-width="68px"
+          style="height: 45px"
+          @submit.native.prevent
+        >
+          <el-form-item label="椤圭洰鍚嶇О" prop="tjh">
+            <el-input
+              v-model="queryParams.tjh"
+              placeholder="璇疯緭鍏ラ」鐩悕绉�"
+              clearable
+              @keyup.enter.native="handleManual"
+            />
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" size="mini" @click="handleManual">鏌ヨ</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+          </el-form-item>
+        </el-form>
+
+        <!-- 鏍囨湰鍗曢�夎〃鏍硷紙甯﹀閫夋鏍峰紡锛� -->
+        <el-table
+          border
+          v-loading="loading"
+          :data="filteredSpecimenData"
+          height="478"
+          style="width: 100%"
+          ref="specimenTable"
+          :row-key="row => row.value"
+          @select="handleSpecimenSelect"
+        >
+          <el-table-column type="selection" width="40px" align="center" />
+          <el-table-column label="搴忓彿" align="center" type="index" width="50px" />
+          <el-table-column label="鏍囨湰鍚嶇О" align="center" prop="label" show-overflow-tooltip />
+        </el-table>
+      </el-col>
+
+      <!-- 绗簩鍒楋細涓棿閫変腑椤圭洰鍒楄〃 -->
+      <el-col :span="8" :xs="24">
+        <el-form :model="form" size="small" :inline="true" label-width="68px" style="height: 45px" @submit.native.prevent />
+        <el-table
+          border
+          v-loading="loading"
+          :data="OnenewpacName"
+          height="478"
+          style="width: 100%"
+        >
+          <el-table-column label="宸查�夐」鐩垪琛�" align="center" prop="proName" />
+          <el-table-column label="鎿嶄綔" align="center" width="85">
+            <template slot-scope="scope">
+              <el-button size="mini" type="text" icon="el-icon-delete" @click="handledbelete(scope.row)">鍒犻櫎</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="dialog-footer1" style="margin-top: 60px; text-align: center;">
+          <el-button type="primary" @click="submitrighr">纭骞朵繚瀛�</el-button>
+          <el-button @click="cancell">鍙� 娑�</el-button>
+        </div>
+      </el-col>
+
+      <!-- 绗笁鍒楋細鎼滅储 + 椤圭洰閫夋嫨 -->
+      <el-col :span="8" :xs="24">
+        <el-form
+          :model="queryParams1"
+          ref="queryForm"
+          size="small"
+          :inline="true"
+          v-show="showSearch"
+          label-width="68px"
+          style="height: 45px"
+          @submit.native.prevent
+        >
+          <el-form-item label="椤圭洰鍚嶇О" prop="proName">
+            <el-input
+              ref="inputName"
+              v-model="queryParams1.proName"
+              placeholder="璇疯緭鍏ラ」鐩悕绉�"
+              clearable
+              @keyup.enter.native="handleSearchFor"
+              style="width: 140px"
+            />
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleSearchFor">鎼滅储</el-button>
+          </el-form-item>
+        </el-form>
+        <el-table
+          border
+          v-loading="loading"
+          ref="tre"
+          :data="Treedata"
+          @selection-change="handleChangesingle"
+          height="478"
+          style="width: 100%"
+        >
+          <el-table-column type="selection" width="40px" align="center" />
+          <el-table-column label="椤圭洰鍚嶇О" align="center" prop="proName" show-overflow-tooltip />
+        </el-table>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+// import { searchBiaoben, delBiaoben, editBiaoben } from "@/api/hosp/biaoben";
+import { debounce } from 'lodash';
+
+export default {
+  name: "Part",
+  data() {
+    return {
+      loading: false,
+      OnenewpacName: [],
+      Treedata: [],
+      originalTreedata: [],
+      queryParams: {
+        tjh: '',
+        tjCategory: null,
+      },
+      queryParams1: {
+        proName: '',
+      },
+      form: {
+        price: '',
+      },
+      showSearch: true,
+      filteredSpecimenData: [],
+      originalSpecimenData: [],
+    };
+  },
+  dicts: ["sys_dict_specimen"],
+  created() {
+    this.fetchInitialBiaobenData();
+    this.initializeSpecimenData();
+    this.debouncedFetchBiaobenData = debounce(this.fetchBiaobenData, 300);
+  },
+  watch: {
+    'dict.type.sys_dict_specimen': {
+      handler(newVal) {
+        if (newVal && newVal.length > 0) {
+          console.log('鏍囨湰瀛楀吀鏁版嵁鍔犺浇:', newVal);
+          this.originalSpecimenData = [...newVal];
+          this.filteredSpecimenData = [...newVal];
+        } else {
+          console.warn('鏍囨湰瀛楀吀鏁版嵁涓虹┖鎴栨湭鍔犺浇');
+        }
+      },
+      deep: true,
+      immediate: true,
+    },
+  },
+  methods: {
+    initializeSpecimenData() {
+      if (this.dict?.type?.sys_dict_specimen) {
+        this.originalSpecimenData = [...this.dict.type.sys_dict_specimen];
+        this.filteredSpecimenData = [...this.originalSpecimenData];
+        console.log('鍒濆鍖栨爣鏈暟鎹�:', this.originalSpecimenData);
+      } else {
+        this.$message.warning('鏍囨湰鏁版嵁鏈姞杞斤紝璇锋鏌ュ瓧鍏搁厤缃�');
+        this.originalSpecimenData = [];
+        this.filteredSpecimenData = [];
+      }
+    },
+    handleSearchFor() {
+      const searchText = this.queryParams1.proName?.trim().toLowerCase() || '';
+      if (searchText) {
+        this.Treedata = this.originalTreedata.filter(item =>
+          item.proName.toLowerCase().includes(searchText)
+        );
+        this.Treedata.length
+          ? this.$message.success('鏌ヨ鎴愬姛')
+          : this.$message.warning('鏈壘鍒板尮閰嶇殑椤圭洰');
+      } else {
+        this.Treedata = [...this.originalTreedata];
+        this.$message.info('宸叉樉绀烘墍鏈夐」鐩�');
+      }
+      this.$refs.tre.clearSelection();
+    },
+    resetQuery() {
+      this.$refs.queryForm.resetFields();
+      this.queryParams.tjh = '';
+      this.queryParams.tjCategory = null;
+      this.OnenewpacName = [];
+      this.filteredSpecimenData = [...this.originalSpecimenData];
+      this.$refs.specimenTable.clearSelection();
+      this.$message.success('宸查噸缃煡璇㈡潯浠跺拰鏍囨湰鏁版嵁');
+    },
+    handleManual() {
+      const searchText = this.queryParams.tjh?.trim().toLowerCase() || '';
+      this.filteredSpecimenData = searchText
+        ? this.originalSpecimenData.filter(item => item.label.toLowerCase().includes(searchText))
+        : [...this.originalSpecimenData];
+
+      this.queryParams.tjCategory = null;
+      this.OnenewpacName = [];
+      this.$refs.specimenTable.clearSelection();
+
+      this.$message[this.filteredSpecimenData.length ? 'success' : 'warning'](
+        this.filteredSpecimenData.length ? '鏌ヨ鎴愬姛' : '鏈壘鍒板尮閰嶇殑鏍囨湰'
+      );
+    },
+    handleSpecimenSelect(selection, row) {
+      console.log('鏍囨湰閫夋嫨瑙﹀彂:', { selection, row });
+      this.$refs.specimenTable.clearSelection();
+      if (selection.includes(row)) {
+        this.$refs.specimenTable.toggleRowSelection(row, true);
+        if (this.queryParams.tjCategory !== row.value) {
+          this.queryParams.tjCategory = row.value;
+          console.log('閫変腑鐨勬爣鏈� value:', this.queryParams.tjCategory);
+          this.debouncedFetchBiaobenData(row.value);
+        }
+      } else {
+        this.queryParams.tjCategory = null;
+        this.OnenewpacName = [];
+        console.log('鏍囨湰閫夋嫨宸叉竻绌�');
+      }
+    },
+    handleChangesingle(selection) {
+      if (selection.length > 0) {
+        selection.forEach(item => {
+          if (!this.OnenewpacName.some(existing => existing.proId === item.proId)) {
+            this.OnenewpacName.push({ ...item });
+          }
+        });
+        this.$refs.tre.clearSelection();
+      }
+    },
+    cancell() {
+      this.openOne = false;
+    },
+    submitrighr() {
+      if (!this.queryParams.tjCategory) {
+        this.$message.error('璇峰厛閫夋嫨涓�涓爣鏈�');
+        return;
+      }
+      if (!this.OnenewpacName.length) {
+        this.$message.error('璇疯嚦灏戦�夋嫨涓�涓」鐩�');
+        return;
+      }
+      const proIds = this.OnenewpacName.map(item => item.proId);
+      const bblx = this.queryParams.tjCategory;
+      this.loading = true;
+      editBiaoben({ proIds, bblx })
+        .then(() => {
+          this.$message.success('淇濆瓨鎴愬姛');
+          this.OnenewpacName = [];
+          this.queryParams.tjCategory = null;
+          this.$refs.specimenTable.clearSelection();
+          this.loading = false;
+        })
+        .catch(error => {
+          this.$message.error('淇濆瓨澶辫触');
+          console.error(error);
+          this.loading = false;
+        });
+    },
+    handledbelete(row) {
+      this.loading = true;
+      delBiaoben({ proId: row.proId })
+        .then(() => {
+          this.OnenewpacName = this.OnenewpacName.filter(item => item.proId !== row.proId);
+          this.$message.success('鍒犻櫎鎴愬姛');
+          this.loading = false;
+        })
+        .catch(error => {
+          this.$message.error('鍒犻櫎澶辫触');
+          console.error(error);
+          this.loading = false;
+        });
+    },
+    fetchBiaobenData(bblx) {
+      console.log('璋冪敤 searchBiaoben锛堜腑闂磋〃鏍硷級锛屽弬鏁�:', { bblx });
+      this.loading = true;
+      searchBiaoben({ bblx })
+        .then(response => {
+          this.OnenewpacName = response.data || [];
+          this.loading = false;
+        })
+        .catch(error => {
+          this.$message.error('鑾峰彇鏍囨湰鏁版嵁澶辫触');
+          console.error(error);
+          this.loading = false;
+        });
+    },
+    fetchInitialBiaobenData() {
+      console.log('璋冪敤 searchBiaoben锛堝垵濮嬪姞杞斤紝鍙充晶琛ㄦ牸锛夛紝鍙傛暟: {}');
+      this.loading = true;
+      searchBiaoben({})
+        .then(response => {
+          this.originalTreedata = response.data || [];
+          this.Treedata = [...this.originalTreedata];
+          this.loading = false;
+        })
+        .catch(error => {
+          this.$message.error('鑾峰彇鍒濆椤圭洰鏁版嵁澶辫触');
+          console.error(error);
+          this.loading = false;
+        });
+    },
+  },
+};
+</script>
+
+<style scoped>
+.app-container {
+  padding: 20px;
+}
+.dialog-footer1 {
+  margin-top: 60px;
+  text-align: center;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/reservation/career/index.vue b/src/views/reservation/career/index.vue
new file mode 100644
index 0000000..70821e2
--- /dev/null
+++ b/src/views/reservation/career/index.vue
@@ -0,0 +1,1029 @@
+<template>
+  <div class="app-container">
+    <el-form :model="objs" :rules="rules" ref="form" size="small" :inline="true" label-width="100px">
+      <el-form-item label="鍗曚綅鍚嶇О" prop="drugManufacturerId">
+        <el-select :remote-method="getRemoteData" v-model="objs.drugManufacturerId" remote filterable
+          style="width: 200px" placeholder="璇烽�夋嫨鍗曚綅鍚嶇О" clearable @clear="getCompanyList" @change="idFn">
+          <el-option v-for="dict in CompanyList" :key="dict.cnName" :label="dict.cnName"
+            :value="dict.drugManufacturerId" />
+        </el-select>
+        <i class="el-icon-circle-plus-outline" @click="handleAdd"></i>
+      </el-form-item>
+      <!-- <el-form-item label="閮ㄩ棬" prop="dwDeptName">
+        <el-select
+          v-model="objs.dwDeptName"
+          placeholder="璇烽�夋嫨閮ㄩ棬"
+          style="width: 200px"
+          clearable
+          @change="idBm"
+        >
+          <el-option
+            v-for="dict in deptList"
+            :key="dict.id"
+            :label="dict.dwDeptName"
+            :value="dict.id"
+          />
+        </el-select>
+        <i class="el-icon-circle-plus-outline" @click="handleAddbumen"></i>
+      </el-form-item> -->
+      <!-- <el-form-item label="鍒嗙粍" prop="payType">
+        <el-select v-model="objs.payType" placeholder="璇烽�夋嫨缁撶畻鏂瑰紡" style="width: 200px" clearable>
+          <el-option v-for="dict in groupingList" :key="dict.id" :label="dict.groupingName" :value="dict.id" />
+        </el-select>
+      </el-form-item> -->
+      <el-form-item label="棰勭害鏃堕棿" prop="reservationTime">
+        <el-date-picker clearable v-model="objs.reservationTime" type="date" format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd" style="width: 130px" placeholder="璇烽�夋嫨棰勭害鏃ユ湡" @change="selectTime"
+          :picker-options="setDisabled">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="鏈夋晥澶╂暟" prop="yxts">
+        <el-input style="width: 100px" v-model="objs.yxts" placeholder="鏈夋晥澶╂暟" />澶�(鍙嚜瀹氫箟)
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8" style="margin: 5px 20px">
+      <el-col :span="1.5">
+        <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="primary" icon="el-icon-upload2" size="mini" @click="handleImport">瀵煎叆</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="primary" icon="el-icon-upload2" size="mini" @click="importTemplate">涓嬭浇妯℃澘</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="primary" class="btn" icon="el-icon-thumb" :disabled="isdisabled" size="mini"
+          @click="submitForm">
+          纭</el-button>
+      </el-col>
+    </el-row>
+    <div style="margin: 5px 20px; width: 94%">
+      <el-table v-loading="loading" :data="userList" :summary-method="getSummaries" show-summary border>
+        <el-table-column label="鍗曚綅鍚嶇О" align="center" prop="company" width="200">
+        </el-table-column>
+        <el-table-column label="鍗曚綅閮ㄩ棬" align="center" prop="department" width="200">
+        </el-table-column>
+        <!-- <el-table-column label="宸ュ彿" align="center" prop="jobNo" width="80" /> -->
+        <el-table-column label="濮撳悕" align="center" prop="name" width="75" />
+        <el-table-column label="鎬у埆" align="center" prop="sex" width="75">
+          <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="200" />
+        <el-table-column label="骞撮緞" align="center" prop="age" width="75" />
+        <el-table-column label="鍑虹敓鏃ユ湡" align="center" prop="birthday" width="100" />
+        <!-- <el-table-column label="鑱屼綅" align="center" prop="position" /> -->
+        <!-- <el-table-column label="閮ㄩ棬" align="center" prop="department" /> -->
+        <!-- <el-table-column label="閮ㄩ棬缂栧彿" align="center" prop="departmentId" /> -->
+        <el-table-column label="鑱旂郴鐢佃瘽" align="center" prop="phoe" width="140" />
+        <el-table-column label="鍦板潃" align="center" prop="address" />
+        <el-table-column label="濠氬Щ鐘跺喌" align="center" prop="marriage" key="marriage">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.dict_user_marry" :value="scope.row.marriage" />
+          </template>
+        </el-table-column>
+        <el-table-column label="姘戞棌" align="center" prop="nation" key="nation">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.dict_user_national" :value="scope.row.nation" />
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="鑱旂郴閭" align="center" prop="email" /> -->
+        <!-- <el-table-column label="浣撴绫诲埆" align="center" prop="tjCategory" /> -->
+        <el-table-column label="鍒嗙粍" align="center" prop="groupingName" />
+        <el-table-column label="鎵�鍦ㄥ湴" align="center" prop="szd" />
+        <el-table-column label="椤圭洰鏀惰垂" align="center" prop="ysPrice" />
+      </el-table>
+    </div>
+
+    <!-- 鐢ㄦ埛瀵煎叆瀵硅瘽妗� -->
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+      <el-upload ref="upload" :limit="1" :key="uploadKey" accept=".xls" :headers="upload.headers" 
+        :action="upload.url" :data="data" :disabled="upload.isUploading" :on-progress="handleFileUploadProgress"
+        :on-success="handleFileSuccess" :auto-upload="false" drag>
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">灏嗘枃浠舵嫋鍒版澶勶紝鎴�<em>鐐瑰嚮涓婁紶</em></div>
+        <div class="el-upload__tip text-center" slot="tip">
+          <!-- <div class="el-upload__tip" slot="tip">
+            <el-checkbox v-model="upload.updateSupport" />
+            鏄惁鏇存柊宸茬粡瀛樺湪鐨勭敤鎴锋暟鎹�
+          </div> -->
+          <span>浠呭厑璁稿鍏ls鏍煎紡鏂囦欢銆�</span>
+          <!-- <el-link
+            type="primary"
+            :underline="false"
+            style="font-size: 12px; vertical-align: baseline"
+            @click="importTemplate"
+            >涓嬭浇妯℃澘</el-link
+          > -->
+        </div>
+      </el-upload>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFileForm">淇濆瓨淇℃伅</el-button>
+        <el-button @click="upload.open = false">鍙� 娑�</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 娣诲姞鎴栦慨鏀逛綋妫�鍗曚綅淇℃伅缁存姢瀵硅瘽妗� -->
+    <div class="dia">
+      <el-dialog :title="title" :visible.sync="open" width="1100px" append-to-body>
+        <el-form ref="form" :model="form" :rules="rules" label-width="106px" :inline="true">
+                <el-form-item
+            label="鍗曚綅鍚嶇О"
+            prop="cnName"
+           
+          >
+            <el-input
+              v-model="form.cnName"
+              placeholder="璇疯緭鍏ヤ腑鏂囧悕绉�"
+            />
+          </el-form-item>
+          <el-form-item label="缁熶竴淇$敤浠g爜" prop="taxNumber">
+            <el-input
+              v-model="form.taxNumber"
+              placeholder="璇疯緭鍏ョ粺涓�淇$敤浠g爜"
+            />
+          </el-form-item>
+          <el-form-item label="娉曚汉浠h〃" prop="legalPerson">
+            <el-input v-model="form.legalPerson" placeholder="璇疯緭鍏ユ硶浜�" />
+          </el-form-item>
+          <el-form-item label="鑱旂郴浜�" prop="contactPerson">
+            <el-input v-model="form.contactPerson" placeholder="璇疯緭鍏ヨ仈绯讳汉" />
+          </el-form-item>
+          <el-form-item label="鑱旂郴鐢佃瘽" prop="contactPhone">
+            <el-input
+              v-model="form.contactPhone"
+              placeholder="璇疯緭鍏ヨ仈绯荤數璇�"
+            />
+          </el-form-item>
+          <el-form-item label="浼犵湡" prop="faxNumber">
+            <el-input v-model="form.faxNumber" placeholder="璇疯緭鍏ヤ紶鐪�" />
+          </el-form-item>
+
+          <!-- <el-form-item label="缂栫爜" prop="code">
+          <el-input v-model="form.code" placeholder="璇疯緭鍏ョ紪鐮�" />
+        </el-form-item> -->
+
+          <el-form-item label="娉ㄥ唽鍦板潃" prop="registerAddress">
+            <el-input
+              v-model="form.registerAddress"
+              placeholder="璇疯緭鍏ユ敞鍐屽湴鍧�"
+            />
+          </el-form-item>
+          <el-form-item label="閫氳鍦板潃" prop="mailingAddress">
+            <el-input
+              v-model="form.mailingAddress"
+              placeholder="璇疯緭鍏ラ�氳鍦板潃"
+            />
+          </el-form-item>
+          <el-form-item label="鎵�灞炲湴鍖�" prop="ssdq" >
+            <el-input v-model="form.ssdq" placeholder="璇疯緭鍏ユ墍灞炲湴鍖�" />
+          </el-form-item>
+          <el-form-item
+            label="闅跺睘鍏崇郴"
+            prop="lsgx"
+           
+          >
+            <!-- <el-input
+              v-model="form.industryType"
+              placeholder="璇疯緭鍏ラ毝灞炲叧绯�"
+            /> -->
+            <el-select
+              filterable
+              v-model="form.lsgx"
+              placeholder="璇烽�夋嫨闅跺睘鍏崇郴"
+              clearable
+              style="width: 202px"
+            >
+              <el-option
+                v-for="dict in dict.type.sys_yes_no"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="缁忔祹绫诲瀷" prop="jjlx" >
+             <el-select
+              filterable
+              v-model="form.jjlx"
+              placeholder="璇烽�夋嫨缁忔祹绫诲瀷"
+              clearable
+              style="width: 202px"
+            >
+              <el-option
+                v-for="dict in dict.type.sys_yes_no"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="浼佷笟瑙勬ā" prop="qygm">
+            <el-input v-model="form.qygm" placeholder="璇疯緭鍏ヤ紒涓氳妯�" />
+          </el-form-item>
+          <el-form-item label="琛屼笟鍒嗙被" prop="hyfl" >
+            <el-select
+              filterable
+              v-model="form.hyfl"
+              placeholder="璇烽�夋嫨琛屼笟鍒嗙被"
+              clearable
+              style="width: 202px"
+            >
+              <el-option
+                v-for="dict in dict.type.sys_yes_no"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="椋庨櫓璇勪及" prop="fxpg">
+             <el-select
+              filterable
+              v-model="form.fxpg"
+              placeholder="璇烽�夋嫨椋庨櫓璇勪及"
+              clearable
+              style="width: 202px"
+            >
+              <el-option
+                v-for="dict in dict.type.sys_yes_no"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="寮�鎴烽摱琛�" prop="bankAccount">
+            <el-input
+              v-model="form.bankAccount"
+              placeholder="璇疯緭鍏ュ紑鎴烽摱琛�"
+            />
+          </el-form-item>
+          <el-form-item label="閾惰璐︽埛" prop="countNum">
+            <el-input
+              v-model="form.countNum"
+              placeholder="璇疯緭鍏ラ摱琛岃处鎴�"
+            />
+          </el-form-item>
+          <el-form-item label="鑱旂郴閭" prop="email">
+            <el-input v-model="form.email" placeholder="璇疯緭鍏ラ偖绠�" />
+          </el-form-item>
+          <el-form-item label="璐熻矗浜�" prop="principal">
+            <el-input v-model="form.principal" placeholder="璇疯緭鍏ヨ礋璐d汉" />
+          </el-form-item>
+          <el-form-item label="缃戝潃" prop="url">
+            <el-input v-model="form.url" placeholder="璇疯緭鍏ョ綉鍧�" />
+          </el-form-item>
+
+          <el-form-item label="琛屾斂鍖哄垝鍚嶇О" prop="areaName">
+            <el-select
+              filterable
+              v-model="form.areaName"
+              placeholder="璇烽�夋嫨琛屾斂鍖哄垝鍚嶇О"
+              clearable
+              style="width: 202px"
+            >
+              <el-option
+                v-for="dict in dict.type.sys_yes_no"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="澶囨敞" prop="remark">
+            <el-input
+              v-model="form.remark"
+              type="textarea"
+              placeholder="璇疯緭鍏ュ唴瀹�"
+              :rows="2"
+              label-width="400px"
+              style="width: 770px"
+              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="cancel">鍙� 娑�</el-button>
+        </div>
+      </el-dialog>
+    </div>
+
+    <!-- 娣诲姞鎴栦慨鏀归儴闂ㄤ俊鎭淮鎶ゅ璇濇 -->
+    <div class="dia">
+      <el-dialog :title="title" :visible.sync="open1" width="1000px" append-to-body>
+        <el-form ref="form" :model="form" :rules="rules" label-width="100px" :inline="true">
+          <el-form-item label="鍗曚綅鍚嶇О" prop="drugManufacturerId">
+            <el-select :remote-method="getRemoteData" v-model="objs.drugManufacturerId" remote filterable
+              style="width: 200px" placeholder="璇烽�夋嫨鍗曚綅鍚嶇О" clearable @clear="getCompanyList" @change="idFn1">
+              <el-option v-for="dict in CompanyList" :key="dict.cnName" :label="dict.cnName"
+                :value="dict.drugManufacturerId" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="閮ㄩ棬鍚嶇О" prop="dwDeptName">
+            <el-input v-model="form.dwDeptName" placeholder="璇疯緭鍏ラ儴闂ㄥ悕绉�" />
+          </el-form-item>
+          <el-form-item label="绛剧害閲戦" prop="signingPrice">
+            <el-input v-model="form.signingPrice" placeholder="璇疯緭鍏ョ绾﹂噾棰�" />
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer2">
+          <el-button type="primary" @click="handleAddDept">纭� 瀹�</el-button>
+          <el-button @click="cancel">鍙� 娑�</el-button>
+        </div>
+      </el-dialog>
+    </div>
+  </div>
+</template>
+
+<script>
+import Cookies from "js-cookie"
+import {
+  addDept,
+  addComp,
+  Deptlist,
+  getDwAndDwDept,
+  newExcelImport,
+} from "@/api/system/comp";
+import {
+  newReservationConfirmxbb,
+  getZybCompList,
+  queryCompany,
+  getconfigKey,
+} from "@/api/team/tuanti";
+import { getToken } from "@/utils/auth";
+
+export default {
+  dicts: [
+    "dict_user_national",
+    "dict_user_marry",
+    "sys_yes_no",
+    "sys_user_sex",
+    "reservation_pay_type",
+    "sys_normal_disable",
+  ],
+
+  name: "Tijian",
+  data() {
+    let checkPhoneNum = (rule, value, callback) => {
+      console.log(value);
+      let patter = new RegExp(/^1\s*[3456789]\s*(\d\s*){9}$/);
+      if (value == "" && value == undefined && !value) {
+        return callback("");
+      } else if (value != undefined && value != "") {
+        return callback();
+      } else if (!patter.test(value)) {
+        return callback("");
+      }
+    };
+    return {
+      leftList: "",
+      isdisabled: true,
+      setDisabled: {
+        // 杩斿洖绂佺敤鏃堕棿
+        disabledDate(time) {
+          // return time.getTime() < Date.now()// 涓嶅彲閫夊巻鍙插ぉ銆佷笉鍙�夊綋鍓嶅ぉ銆佸彲閫夋湭鏉ュぉ
+          return time.getTime() < Date.now() - 8.64e7; // 涓嶅彲閫夊巻鍙插ぉ銆佸彲閫夊綋鍓嶅ぉ銆佸彲閫夋湭鏉ュぉ
+        },
+      },
+      CompanyList: [],
+      reservationList: [],
+      rightList: [],
+      isShow: true,
+      isShows: true,
+      message: "鏄剧ず",
+      fileList: [], //涓婁紶鏂囦欢鍒楄〃
+      tableHead: [], //琛ㄥご
+      tableData: [], // 琛ㄦ暟鎹�
+      formLabelWidth: "120px",
+      imageUrl: "",
+      size: "",
+      tcShow: false,
+      creaseopen: false,
+      // 濂楅鎻愪氦鎸夐挳
+      confirm: false,
+      TotalPrice: 0,
+      TotalPrice1: 0,
+      discount: 100,
+      deptList: [],
+      groupingList: [],
+      tableList: [],
+      data: {
+        dwId: "",
+        dwDeptId: "",
+        dwName: "",
+      },
+      objs: {
+        drugManufacturerId: "",
+        reservationTime: "",
+        yxts: "",
+      },
+      DataList: [],
+      tjOrderList: [], //鍗曚釜椤圭洰闆嗗悎
+      // 閫変腑鏁扮粍
+      ids: [],
+      // 闈炲崟涓鐢�
+      single: true,
+      // 闈炲涓鐢�
+      multiple: true,
+      // 鏄惁鏄剧ず寮瑰嚭灞�
+      Seachopen: false,
+      dialogVisible: false,
+      notification: false,
+      // 鐢ㄦ埛琛ㄦ牸鏁版嵁
+      userList: null,
+      // 鐢ㄦ埛瀵煎叆鍙傛暟
+      upload: {
+        // 鏄惁鏄剧ず寮瑰嚭灞傦紙鐢ㄦ埛瀵煎叆锛�
+        open: false,
+        // 寮瑰嚭灞傛爣棰橈紙鐢ㄦ埛瀵煎叆锛�
+        title: "",
+        // 鏄惁绂佺敤涓婁紶
+        isUploading: false,
+        // 鏄惁鏇存柊宸茬粡瀛樺湪鐨勭敤鎴锋暟鎹�
+        updateSupport: 0,
+        // 璁剧疆涓婁紶鐨勮姹傚ご閮�
+        headers: { Authorization: "Bearer " + getToken(), hospId: Cookies.get("hospId") },
+        // 涓婁紶鐨勫湴鍧�
+        url:
+          process.env.VUE_APP_BASE_API +
+          "/zhiye/order/newExcelImportNotDwDeptId",
+      },
+      // 鏌ヨ鍙傛暟
+      queryParam: {
+        pageNum: 1,
+        pageSize: 10,
+        company: undefined,
+        companyId: undefined,
+        pacName: undefined,
+        jobNo: undefined,
+        name: undefined,
+        sex: undefined,
+        idCard: undefined,
+        age: undefined,
+        birthday: undefined,
+        position: undefined,
+        department: undefined,
+        departmentId: undefined,
+        phoe: undefined,
+        address: undefined,
+        marriage: undefined,
+        nation: undefined,
+        email: undefined,
+        tjCategory: undefined,
+        payType: undefined,
+      },
+      // 琛ㄥ崟鍙傛暟
+      form: {
+         dwlx: 1
+      },
+      // 琛ㄥ崟鏍¢獙
+
+      rules: {
+        drugManufacturerId: [
+          { required: true, validator: checkPhoneNum, trigger: "change" },
+        ],
+        reservationTime: [
+          { required: true, validator: checkPhoneNum, trigger: "blur" },
+        ],
+        // dwDeptName: [
+        //   { required: true, validator: checkPhoneNum, trigger: "change" },
+        // ],
+        signingPic: [
+          { required: true, validator: checkPhoneNum, trigger: "blur" },
+        ],
+        contactPerson: [
+          { required: true, validator: checkPhoneNum, trigger: "blur" },
+        ],
+        contactPhone: [
+          { required: true, validator: checkPhoneNum, trigger: "blur" },
+        ],
+        taxNumber: [
+          { required: true, validator: checkPhoneNum, trigger: "blur" },
+        ],
+        legalPerson: [
+          { required: true, validator: checkPhoneNum, trigger: "blur" },
+        ],
+        registerAddress: [
+          { required: true, validator: checkPhoneNum, trigger: "blur" },
+        ],
+        bankAccount: [
+          { required: true, validator: checkPhoneNum, trigger: "blur" },
+        ],
+        countNum: [
+          { required: true, validator: checkPhoneNum, trigger: "blur" },
+        ],
+        principal: [
+          { required: true, validator: checkPhoneNum, trigger: "blur" },
+        ],
+        faxNumber: [
+          { required: true, validator: checkPhoneNum, trigger: "blur" },
+        ],
+        mailingAddress: [
+          { required: true, validator: checkPhoneNum, trigger: "blur" },
+        ],
+        email: [{ required: true, validator: checkPhoneNum, trigger: "blur" }],
+        pacName: [
+          { required: true, validator: checkPhoneNum, trigger: "change" },
+        ],
+        payType: [
+          { required: true, validator: checkPhoneNum, trigger: "change" },
+        ],
+        phoe: [
+          {
+            required: true,
+            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+            validator: checkPhoneNum,
+            trigger: "blur",
+          },
+        ],
+
+        proPrice: [
+          { required: true, validator: checkPhoneNum, trigger: "blur" },
+        ],
+        createTime: [
+          { required: true, validator: checkPhoneNum, trigger: "blur" },
+        ],
+        cnName: [{ required: true, validator: checkPhoneNum, trigger: "blur" }],
+        businessLicenseNumber: [
+          { required: true, validator: checkPhoneNum, trigger: "blur" },
+        ],
+        createTime: [
+          { required: true, validator: checkPhoneNum, trigger: "blur" },
+        ],
+        updateTime: [
+          { required: true, validator: checkPhoneNum, trigger: "blur" },
+        ],
+        effective: [
+          {
+            required: true,
+            validator: checkPhoneNum,
+            trigger: "change",
+          },
+        ],
+        name: [{ required: true, validator: checkPhoneNum, trigger: "change" }],
+        contactPhone: [
+          { required: true, validator: checkPhoneNum, trigger: "change" },
+        ],
+      },
+      ListObj: {},
+      uploadKey: 0,
+      // 閬僵灞�
+      loading: true,
+      pacStatus: "鍚敤",
+      // 閫変腑鏁扮粍
+      ids: [],
+      // 闈炲崟涓鐢�
+      single: true,
+      // 闈炲涓鐢�
+      multiple: true,
+      // 鏄剧ず鎼滅储鏉′欢
+      showSearch: true,
+      // 鎬绘潯鏁�
+      total: 0,
+      // 浣撴鍗曚綅淇℃伅缁存姢琛ㄦ牸鏁版嵁
+      compList: [],
+      // 寮瑰嚭灞傛爣棰�
+      title: "",
+      // 鏄惁鏄剧ず寮瑰嚭灞�
+      open: false,
+      open1: false,
+      // 鏌ヨ鍙傛暟
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        cnName: null,
+        enName: null,
+        code: null,
+      },
+    };
+  },
+  created() {
+    this.getCompanyList();
+  },
+
+  watch: {
+    inputVal(newValue) {
+      if (newValue) {
+        this.searchData(true);
+      } else {
+        this.searchData(false);
+      }
+    },
+  },
+  methods: {
+    // 淇濆瓨閮ㄩ棬
+    handleAddDept() {
+      let data = {
+        dwName: this.data.dwName,
+        dwId: this.data.dwId,
+        dwDeptName: this.form.dwDeptName,
+        signingPrice: this.form.signingPrice,
+      };
+      addDept(data).then((response) => {
+        if (response.code == 200) {
+          this.$modal.msgSuccess("鏂板鎴愬姛");
+          this.open1 = false;
+        }
+      });
+    },
+    idFn(value) {
+      this.userList = []
+      if (value) {
+        this.data.dwId = value;
+        Deptlist(value).then((response) => {
+          this.deptList = response.data;
+        });
+      }
+    },
+    idFn1(value) {
+      console.log(value);
+      if (value) {
+        this.data.dwId = value;
+        this.CompanyList.forEach((item) => {
+          console.log(item);
+          if (item.drugManufacturerId == this.data.dwId) {
+            this.data.dwName = item.cnName;
+          }
+        });
+      }
+    },
+    idBm(value) {
+      this.data.dwDeptId = value;
+    },
+
+    getSummaries(param) {
+      const { columns, data } = param;
+      const sums = [];
+      columns.forEach((column, index) => {
+        // if (index === 0) {
+        //   sums[index] = "鍚堣";
+        //   return;
+        // }
+        if (index === 0) {
+          sums[index] = "鎬昏浜烘暟";
+          return;
+        }
+        if (index === 1) {
+          sums[index] = this.ListObj.count;
+          return;
+        }
+        if (index === 2) {
+          sums[index] = "鐢风粍浜烘暟";
+          return;
+        }
+        if (index === 3) {
+          sums[index] = this.ListObj.manCount;
+          return;
+        }
+        if (index === 4) {
+          sums[index] = "鐢风粍閲戦";
+          return;
+        }
+        if (index === 5) {
+          sums[index] = this.ListObj.manMoney;
+          return;
+        }
+        if (index === 6) {
+          sums[index] = "濂崇粍浜烘暟";
+          return;
+        }
+        if (index === 7) {
+          sums[index] = this.ListObj.woManCount;
+          return;
+        }
+        if (index === 8) {
+          sums[index] = "濂崇粍閲戦";
+          return;
+        }
+        if (index === 9) {
+          sums[index] = this.ListObj.woManMoney;
+          return;
+        }
+        if (index === 10) {
+          sums[index] = "鍚堣閲戦";
+          return;
+        }
+        if (index === 11) {
+          sums[index] = this.ListObj.hjMoney;
+          return;
+        }
+      });
+      return sums;
+    },
+    // 鎼滅储
+    getRemoteData(query) {
+
+      if (query) {
+        let compName = query;
+        queryCompany(compName).then((response) => {
+          this.CompanyList = response.data;
+          this.CompanyList.forEach((item) => {
+            this.objs = item;
+          });
+        });
+      }
+    },
+
+    // 鑾峰彇鍗曚綅淇℃伅闆嗗悎
+    getCompanyList() {
+      this.loading = true;
+      getconfigKey('team_reservation_default_day').then((res) => {
+        console.log(res, 1111);
+        this.objs.yxts = res.msg;
+      });
+      getZybCompList(this.queryParam).then((response) => {
+        this.CompanyList = response.data;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 鍙栨秷鎸夐挳
+    cancel() {
+      this.open = false;
+      this.open1 = false;
+      this.creaseopen = false;
+      this.reset();
+    },
+    /** 鏂板鎸夐挳鎿嶄綔 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "娣诲姞浣撴鍗曚綅淇℃伅缁存姢";
+    },
+    /** 閮ㄩ棬鏂板鎸夐挳鎿嶄綔 */
+    handleAddbumen() {
+      this.reset();
+      this.open1 = true;
+      this.title = "娣诲姞閮ㄩ棬淇℃伅缁存姢";
+    },
+
+    /** 鎻愪氦鎸夐挳 */
+    submitFormS() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          this.form.dwlx= 1
+          addComp(this.form).then((response) => {
+            this.$modal.msgSuccess("鏂板鎴愬姛");
+            this.open = false;
+            this.getCompanyList();
+          });
+        }
+      });
+    },
+
+    // 琛ㄥ崟閲嶇疆
+    reset() {
+      this.form = {
+        company: null,
+        payType: null,
+        name: null,
+        phoe: null,
+        signingPic: null,
+        pacStatus: "鍚敤",
+      };
+      this.resetForm("form");
+    },
+    /** 閲嶇疆鎸夐挳鎿嶄綔 */
+    resetQuery() {
+      this.date = [];
+      this.objs.drugManufacturerId = "";
+      this.objs.dwDeptName = "";
+      this.objs.reservationTime = "";
+      this.TotalPrice = "";
+      this.tableData[0] = [];
+      this.TotalPrice1 = "";
+      this.userList = []
+      // this.resetForm("form");
+      this.form = {};
+    },
+
+    //鑾峰彇鏃堕棿
+    selectTime(val) {
+      this.objs.reservationTime = val;
+    },
+    /** 瀵煎叆鎸夐挳鎿嶄綔 */
+    handleImport() {
+      if (this.objs.drugManufacturerId && this.objs.reservationTime) {
+        this.$refs.upload?.clearFiles();
+        this.uploadKey = Date.now(); // 鏀瑰彉 key 寮哄埗閲嶆柊娓叉煋缁勪欢
+        this.upload.title = "鐢ㄦ埛瀵煎叆";
+        this.upload.open = true;
+      } else {
+        this.$modal.msgError("璇烽�夋嫨鍗曚綅鎴栭绾︽椂闂�");
+      }
+    },
+    /** 涓嬭浇妯℃澘鎿嶄綔 */
+    importTemplate() {
+      this.download(
+        "/zhiye/order/importTemplate",
+        {},
+        `鑱屼笟鍥綋棰勭害Excel妯$増.xls`
+      );
+    },
+    // 鏂囦欢涓婁紶涓鐞�
+    handleFileUploadProgress(event, file, fileList) {
+      this.upload.isUploading = true;
+    },
+    // 鏂囦欢涓婁紶鎴愬姛澶勭悊
+    handleFileSuccess(response, file, fileList) {
+      if (response.code == 500) {
+        this.isdisabled = true;
+        // Message.warning(response.msg);
+        // this.$modal.msgError(response.msg);
+        // this.$modal.msgError("浜哄憳"+ response.data.list + "淇℃伅閿欒");
+        if (response.data) {
+          if (response.data.list) {
+            const errorList = `
+  <div style="max-height: 300px; overflow-y: auto;">
+    ${response.data.list.join(", ")}
+  </div>`
+
+            this.$confirm(errorList, `${response.msg}`, {
+              confirmButtonText: "纭畾",
+              cancelButtonText: "鍙栨秷",
+              type: "error",
+              center: true,
+              dangerouslyUseHTMLString: true,
+            });
+          }
+        } else {
+          this.$confirm(`${response.msg}`, {
+            confirmButtonText: "纭畾",
+            cancelButtonText: "鍙栨秷",
+            type: "error",
+            center: true,
+            dangerouslyUseHTMLString: true,
+          });
+        }
+      } else {
+        this.isdisabled = false;
+        this.ListObj = response.data;
+        this.userList = response.data.list;
+
+        this.userList.forEach((item) => {
+          this.CompanyList.forEach((item1) => {
+            if (item1.drugManufacturerId == this.objs.drugManufacturerId) {
+              item.company = item1.cnName;
+            }
+          });
+        });
+      }
+
+      this.upload.open = false;
+      this.upload.isUploading = false;
+      this.$refs.upload.clearFiles();
+      this.leftList = response.msg;
+
+      if (this.leftList == "鎿嶄綔澶辫触") {
+        this.isdisabled = true;
+        this.$alert(
+          "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
+          response.msg +
+          "<div style='br;margin:10px'>" +
+          response.data[0] +
+          "韬唤璇佹垨鎵嬫満鍙风爜鏈夎" +
+          "</div>",
+          "瀵煎叆缁撴灉",
+          { dangerouslyUseHTMLString: true }
+        );
+      }
+      // else {
+      //   console.log(11111)
+      //   this.isdisabled = false;
+      //   this.$alert(
+      //     "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
+      //       response.msg,
+      //     { dangerouslyUseHTMLString: true }
+      //   );
+      //   this.rightList = response;
+      // }
+      for (let i = 0; i < fileList.length; i++) {
+        if (file.name != fileList[i].name) {
+          this.fileList.push({
+            name: file.name,
+            url: "",
+            uid: file.uid,
+          });
+        }
+      }
+      //  let data = {
+      //   dwDeptId: this.deptId,
+      //   dwId: this.dwId,
+      //   file:file
+      // }
+      // newExcelImport(data).then(response => {
+      //   console.log(11111)
+      // })
+      const files = { 0: file };
+      // this.readExcel(files);
+    },
+    // 鎻愪氦涓婁紶鏂囦欢
+    submitFileForm() {
+      this.$refs.upload.submit();
+      this.isShow = false;
+    },
+
+    // readExcel(file) {
+    //   const fileReader = new FileReader();
+    //   fileReader.onload = (ev) => {
+    //     try {
+    //       const data = ev.target.result;
+    //       const workbook = read(data, { type: "binary" });
+    //       const params = [];
+    //       // 鍙栧搴旇〃鐢熸垚json琛ㄦ牸鍐呭
+    //       workbook.SheetNames.forEach((item) => {
+    //         params.push({
+    //           name: item,
+    //           dataList: utils.sheet_to_json(workbook.Sheets[item]),
+    //         });
+    //         this.tableData.push(utils.sheet_to_json(workbook.Sheets[item]));
+    //       });
+    //       // 璇ョ畻娉曚粎閽堝琛ㄥご鏃犲悎骞剁殑鎯呭喌
+    //       if (this.tableData.length > 0) {
+    //         // 鑾峰彇excel涓涓�涓〃鏍兼暟鎹畉ableData[0][0]锛屽苟涓斿皢琛ㄥご鎻愬彇鍑烘潵
+    //         for (const key in this.tableData[0][0]) {
+    //           this.tableHead.push(key);
+    //         }
+    //       }
+    //       return params;
+    //       // 閲嶅啓鏁版嵁
+    //     } catch (e) {
+    //       console.log("error:" + e);
+    //       return false;
+    //     }
+    //   };
+    //   fileReader.readAsBinaryString(file[0].raw);
+    // },
+
+    /** 纭鎸夐挳 */
+    submitForm() {
+      // if (this.objs.reservationTime && this.data.dwDeptId) {
+      if (this.objs.reservationTime) {
+        let data = {
+          copeWith: this.ListObj.hjMoney,
+          reservations: this.userList,
+          reservationTime: this.objs.reservationTime,
+          dwDeptId: this.data.dwDeptId,
+          yxts: this.objs.yxts,
+          dwId: this.data.dwId,
+        };
+        newReservationConfirmxbb(data).then((res) => {
+          this.$modal.msgSuccess("鎻愪氦鎴愬姛");
+          this.confirm = true;
+          this.userList = [];
+        });
+      } else {
+        this.$modal.msgError("璇峰~鍐欏甫鏄熷彿鍐呭");
+      }
+    },
+  },
+};
+</script>
+
+
+<style>
+.el-dialog:not(.is-fullscreen) {
+  margin-top: 6vh !important;
+  width: 600px;
+}
+
+/* .el-table td.el-table__cell div {
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+  display: flex;
+  flex-wrap: wrap;
+  font-size: 14px;
+} */
+
+.upload-demo {
+  width: 100%;
+}
+
+.el-icon-circle-plus-outline {
+  line-height: 20px;
+  font-size: 20px;
+}
+
+.dia {
+  display: flex;
+}
+
+.dialog-footer2 {
+  width: 960px;
+  height: 36px;
+  display: flex;
+  justify-content: center;
+}
+
+.dialog-footer1 {
+  width: 860px;
+  height: 36px;
+  display: flex;
+  justify-content: center;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/reservation/resercopy/index.vue b/src/views/reservation/resercopy/index.vue
index 9902a62..f05c814 100644
--- a/src/views/reservation/resercopy/index.vue
+++ b/src/views/reservation/resercopy/index.vue
@@ -92,6 +92,7 @@
         <!-- <el-table-column label="鑱旂郴閭" align="center" prop="email" /> -->
         <!-- <el-table-column label="浣撴绫诲埆" align="center" prop="tjCategory" /> -->
         <el-table-column label="鍒嗙粍" align="center" prop="groupingName" />
+        <el-table-column label="鎵�鍦ㄥ湴" align="center" prop="szd" />
         <el-table-column label="椤圭洰鏀惰垂" align="center" prop="ysPrice" />
       </el-table>
     </div>
@@ -109,8 +110,13 @@
             鏄惁鏇存柊宸茬粡瀛樺湪鐨勭敤鎴锋暟鎹�
           </div> -->
           <span>浠呭厑璁稿鍏ls鏍煎紡鏂囦欢銆�</span>
-          <!-- <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline"
-            @click="importTemplate">涓嬭浇妯℃澘</el-link> -->
+          <!-- <el-link
+            type="primary"
+            :underline="false"
+            style="font-size: 12px; vertical-align: baseline"
+            @click="importTemplate"
+            >涓嬭浇妯℃澘</el-link
+          > -->
         </div>
       </el-upload>
       <div slot="footer" class="dialog-footer">
@@ -174,7 +180,7 @@
             </el-date-picker> </el-form-item><br />
           <el-form-item label="澶囨敞" prop="remark">
             <el-input v-model="form.remark" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" :rows="2" label-width="400px"
-              style="width: 830px" resize="none"></el-input>
+              style="width: 770px" resize="none"></el-input>
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer2">
@@ -252,7 +258,7 @@
       }
     };
     return {
-      uploadKey: 0,
+
       leftList: "",
       isdisabled: true,
       setDisabled: {
@@ -271,14 +277,6 @@
       fileList: [], //涓婁紶鏂囦欢鍒楄〃
       tableHead: [], //琛ㄥご
       tableData: [], // 琛ㄦ暟鎹�
-      form: {
-        company: "",
-        payType: "",
-        name: "",
-        phoe: "",
-        signingPic: "",
-        discount: "",
-      },
       formLabelWidth: "120px",
       imageUrl: "",
       size: "",
@@ -297,7 +295,6 @@
         dwDeptId: "",
         dwName: "",
       },
-
       objs: {
         drugManufacturerId: "",
         reservationTime: "",
@@ -359,7 +356,9 @@
         payType: undefined,
       },
       // 琛ㄥ崟鍙傛暟
-      form: {},
+      form: {
+        dwlx: 0
+      },
       // 琛ㄥ崟鏍¢獙
 
       rules: {
@@ -450,6 +449,7 @@
         ],
       },
       ListObj: {},
+      uploadKey: 0,
       // 閬僵灞�
       loading: true,
       pacStatus: "鍚敤",
@@ -510,7 +510,7 @@
       });
     },
     idFn(value) {
-      console.log(value);
+      this.userList = []
       if (value) {
         this.data.dwId = value;
         Deptlist(value).then((response) => {
@@ -644,6 +644,7 @@
     submitFormS() {
       this.$refs["form"].validate((valid) => {
         if (valid) {
+           this.form.dwlx= 0
           addComp(this.form).then((response) => {
             this.$modal.msgSuccess("鏂板鎴愬姛");
             this.open = false;
@@ -686,10 +687,8 @@
     /** 瀵煎叆鎸夐挳鎿嶄綔 */
     handleImport() {
       if (this.objs.drugManufacturerId && this.objs.reservationTime) {
-        // 娓呯┖缁勪欢鍐呴儴鐘舵�侊紙鍚凡涓婁紶鏂囦欢锛�
         this.$refs.upload?.clearFiles();
         this.uploadKey = Date.now(); // 鏀瑰彉 key 寮哄埗閲嶆柊娓叉煋缁勪欢
-        // 鍚屾鏁版嵁婧愶紙Vue2 闇�鐢� $set 纭繚鍝嶅簲寮忥級
         this.upload.title = "鐢ㄦ埛瀵煎叆";
         this.upload.open = true;
       } else {
@@ -709,15 +708,12 @@
       this.upload.isUploading = true;
     },
     // 鏂囦欢涓婁紶鎴愬姛澶勭悊
-    // 鏂囦欢涓婁紶鎴愬姛澶勭悊
     handleFileSuccess(response, file, fileList) {
-      console.log(response, file, fileList)
       if (response.code == 500) {
         this.isdisabled = true;
         // Message.warning(response.msg);
         // this.$modal.msgError(response.msg);
         // this.$modal.msgError("浜哄憳"+ response.data.list + "淇℃伅閿欒");
-
         if (response.data) {
           if (response.data.list) {
             const errorList = `
@@ -733,7 +729,6 @@
               dangerouslyUseHTMLString: true,
             });
           }
-
         } else {
           this.$confirm(`${response.msg}`, {
             confirmButtonText: "纭畾",
@@ -743,8 +738,6 @@
             dangerouslyUseHTMLString: true,
           });
         }
-
-
       } else {
         this.isdisabled = false;
         this.ListObj = response.data;
@@ -809,7 +802,6 @@
     },
     // 鎻愪氦涓婁紶鏂囦欢
     submitFileForm() {
-      console.log(9999)
       this.$refs.upload.submit();
       this.isShow = false;
     },
diff --git a/src/views/system/comp/index.vue b/src/views/system/comp/index.vue
index 2bb7b91..9e064fe 100644
--- a/src/views/system/comp/index.vue
+++ b/src/views/system/comp/index.vue
@@ -1,185 +1,60 @@
 <template>
   <div class="app-container">
-    <el-form
-      :model="queryParams"
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      v-show="showSearch"
-      label-width="68px"
-      @submit.native.prevent
-    >
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"
+      @submit.native.prevent>
       <el-form-item label="鍗曚綅鍚嶇О" prop="cnName">
-        <el-input
-          ref="inputName"
-          v-model="queryParams.cnName"
-          placeholder="璇疯緭鍏ュ崟浣嶅悕绉�"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input ref="inputName" v-model="queryParams.cnName" placeholder="璇疯緭鍏ュ崟浣嶅悕绉�" clearable
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item>
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          size="mini"
-          @click="handleQuery"
-          style="margin: 0 15px"
-          >鎼滅储</el-button
-        >
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-          >閲嶇疆</el-button
-        >
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"
+          style="margin: 0 15px">鎼滅储</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
       </el-form-item>
     </el-form>
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:comp:add']"
-          >鏂板</el-button
-        >
+        <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['system:comp:add']">鏂板</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['system:comp:edit']"
-          >淇敼</el-button
-        >
+        <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['system:comp:edit']">淇敼</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['system:comp:remove']"
-          >鍒犻櫎</el-button
-        >
+        <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['system:comp:remove']">鍒犻櫎</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['system:comp:export']"
-          >瀵煎嚭</el-button
-        >
+        <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['system:comp:export']">瀵煎嚭</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="mainDepartment"
-          v-hasPermi="['system:comp:edit']"
-          >缁存姢濂楅</el-button
-        >
+        <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single" @click="mainDepartment"
+          v-hasPermi="['system:comp:edit']">缁存姢濂楅</el-button>
       </el-col>
-      <right-toolbar
-        :showSearch.sync="showSearch"
-        @queryTable="getList"
-      ></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table
-      border
-      v-loading="loading"
-      :data="compList"
-      @selection-change="handleSelectionChange"
-      ref="tab"
-    >
-      <el-table-column
-        fixed="left"
-        type="selection"
-        width="40px"
-        align="center"
-      />
-      <el-table-column
-        label="搴忓彿"
-        align="center"
-        prop="newID"
-        :show-overflow-tooltip="true"
-        width="50px"
-        fixed="left"
-      />
-      <el-table-column
-        label="鍗曚綅鍚嶇О"
-        align="center"
-        prop="cnName"
-        width="240px"
-      />
-      <el-table-column
-        label="缁熶竴淇$敤浠g爜"
-        align="center"
-        prop="taxNumber"
-        width="180px"
-      />
-      <el-table-column
-        label="鑱旂郴浜�"
-        align="center"
-        prop="contactPerson"
-        :show-overflow-tooltip="true"
-        width="90px"
-      />
-      <el-table-column
-        label="鑱旂郴鐢佃瘽"
-        align="center"
-        prop="contactPhone"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        label="娉ㄥ唽鍦板潃"
-        align="center"
-        prop="registerAddress"
-        :show-overflow-tooltip="true"
-      />
+    <el-table border v-loading="loading" :data="compList" @selection-change="handleSelectionChange" ref="tab">
+      <el-table-column fixed="left" type="selection" width="40px" align="center" />
+      <el-table-column label="搴忓彿" align="center" prop="newID" :show-overflow-tooltip="true" width="50px" fixed="left" />
+      <el-table-column label="鍗曚綅鍚嶇О" align="center" prop="cnName" width="240px" />
+      <el-table-column label="缁熶竴淇$敤浠g爜" align="center" prop="taxNumber" width="180px" />
+      <el-table-column label="鑱旂郴浜�" align="center" prop="contactPerson" :show-overflow-tooltip="true" width="90px" />
+      <el-table-column label="鑱旂郴鐢佃瘽" align="center" prop="contactPhone" :show-overflow-tooltip="true" />
+      <el-table-column label="娉ㄥ唽鍦板潃" align="center" prop="registerAddress" :show-overflow-tooltip="true" />
       <!-- <el-table-column label="浼佷笟绫诲瀷" align="center" prop="typeOfEnterprise" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.dict_comp_type" :value="scope.row.typeOfEnterprise"/>
         </template>
 </el-table-column> -->
-      <el-table-column
-        label="琛屾斂鍖哄垝"
-        align="center"
-        prop="areaName"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        label="閫氳鍦板潃"
-        align="center"
-        prop="mailingAddress"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        label="閭"
-        align="center"
-        prop="email"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        label="寮�鎴烽摱琛�"
-        align="center"
-        prop="bankAccount"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        label="閾惰璐﹀彿"
-        align="center"
-        prop="countNum"
-        :show-overflow-tooltip="true"
-      />
+      <el-table-column label="琛屾斂鍖哄垝" align="center" prop="areaName" :show-overflow-tooltip="true" />
+      <el-table-column label="閫氳鍦板潃" align="center" prop="mailingAddress" :show-overflow-tooltip="true" />
+      <el-table-column label="閭" align="center" prop="email" :show-overflow-tooltip="true" />
+      <el-table-column label="寮�鎴烽摱琛�" align="center" prop="bankAccount" :show-overflow-tooltip="true" />
+      <el-table-column label="閾惰璐﹀彿" align="center" prop="countNum" :show-overflow-tooltip="true" />
       <!-- <el-table-column label="GMP鍙戣瘉鏃ユ湡" align="center" prop="gmpissueDate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.gmpissueDate, '{y}-{m}-{d}') }}</span>
@@ -201,42 +76,19 @@
           <image-preview :src="scope.row.gmpPhoto" :width="50" :height="50"/>
         </template>
       </el-table-column> -->
-      <el-table-column
-        label="澶囨敞"
-        align="center"
-        prop="remark"
-        :show-overflow-tooltip="true"
-      />
+      <el-table-column label="澶囨敞" align="center" prop="remark" :show-overflow-tooltip="true" />
       <!-- <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column> -->
-      <el-table-column
-        label="淇敼浜�"
-        align="center"
-        prop="updateBy"
-        :show-overflow-tooltip="true"
-        width="100px"
-      />
-      <el-table-column
-        label="淇敼鏃堕棿"
-        align="center"
-        prop="updateTime"
-        width="100px"
-        :show-overflow-tooltip="true"
-      >
+      <el-table-column label="淇敼浜�" align="center" prop="updateBy" :show-overflow-tooltip="true" width="100px" />
+      <el-table-column label="淇敼鏃堕棿" align="center" prop="updateTime" width="100px" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.updateTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column
-        label="鎺掑簭"
-        align="center"
-        prop="orderNum"
-        :show-overflow-tooltip="true"
-        width="55px"
-      />
+      <el-table-column label="鎺掑簭" align="center" prop="orderNum" :show-overflow-tooltip="true" width="55px" />
       <!-- <el-table-column label="鏁版嵁鐘舵��(PT10.00.004)" align="center" prop="effective">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.dict_data_status" :value="scope.row.effective"/>
@@ -247,150 +99,70 @@
           <span>{{ parseTime(scope.row.validTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column> -->
-      <el-table-column
-        fixed="right"
-        label="鎿嶄綔"
-        align="center"
-        class-name="small-padding fixed-width"
-        width="70px"
-      >
+      <el-table-column fixed="right" label="鎿嶄綔" align="center" class-name="small-padding fixed-width" width="70px">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:comp:edit']"
-            title="淇敼"
-          ></el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['system:comp:remove']"
-            title="鍒犻櫎"
-          ></el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:comp:edit']" title="淇敼"></el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['system:comp:remove']" title="鍒犻櫎"></el-button>
         </template>
       </el-table-column>
     </el-table>
 
     <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>
 
     <div>
-      <el-dialog
-        :title="title"
-        :visible.sync="opens"
-        width="1350px"
-        append-to-body
-        :close-on-click-modal="true"
-      >
+      <el-dialog :title="title" :visible.sync="opens" width="1350px" append-to-body :close-on-click-modal="true">
         <el-row :gutter="20">
           <el-col :span="7" :xs="24">
             <div style="padding: 0 20px">
-              <el-form
-                ref="form"
-                :model="form"
-                :rules="rules"
-                label-width="80px"
-                :inline="true"
-                @submit.native.prevent
-              >
+              <el-form ref="form" :model="form" :rules="rules" label-width="80px" :inline="true" @submit.native.prevent>
                 <el-form-item label="濂楅鍚嶇О" prop="dwDeptName">
-                  <el-input
-                    v-model="form.dwDeptName"
-                    placeholder="璇疯緭鍏ュ椁愬悕绉�"
-                  />
+                  <el-input v-model="form.dwDeptName" placeholder="璇疯緭鍏ュ椁愬悕绉�" />
                 </el-form-item>
                 <el-form-item label="绛剧害閲戦" prop="signingPrice">
-                  <el-input
-                    v-model="form.signingPrice"
-                    placeholder="璇疯緭鍏ョ绾﹂噾棰�"
-                  />
+                  <el-input v-model="form.signingPrice" placeholder="璇疯緭鍏ョ绾﹂噾棰�" />
                 </el-form-item>
+                 <el-form-item label="鐥呯" prop="bz" v-if="dwlxs == 1">
+                <el-select v-model="form.bz" placeholder="璇烽�夋嫨鐥呯" style="width: 130px" clearable>
+                  <el-option v-for="dict in dict.type.reservation_pay_type" :key="dict.value" :label="dict.label"
+                    :value="dict.value" />
+                </el-select>
+              </el-form-item>
               </el-form>
               <el-row :gutter="10" class="mb8">
                 <el-col :span="1.5">
-                  <el-button
-                    type="primary"
-                    icon="el-icon-plus"
-                    size="mini"
-                    @click="handleAddDept"
-                    v-hasPermi="['system:comp:add']"
-                    >淇濆瓨濂楅</el-button
-                  >
+                  <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAddDept"
+                    v-hasPermi="['system:comp:add']">淇濆瓨濂楅</el-button>
                 </el-col>
                 <el-col :span="1.5">
-                  <el-button
-                    type="primary"
-                    icon="el-icon-edit"
-                    size="mini"
-                    :disabled="singleg"
-                    @click="handledeleDept"
-                    v-hasPermi="['system:comp:edit']"
-                    >鍒犻櫎</el-button
-                  >
+                  <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="singleg" @click="handledeleDept"
+                    v-hasPermi="['system:comp:edit']">鍒犻櫎</el-button>
                 </el-col>
               </el-row>
-              <el-table
-                ref="tb"
-                v-loading="loading"
-                :data="deptList"
-                @selection-change="handleSelection"
-                border
-                style="width: 320px"
-                height="350"
-              >
+              <el-table ref="tb" v-loading="loading" :data="deptList" @selection-change="handleSelection" border
+                style="width: 320px" height="300">
                 <el-table-column type="selection" width="40px" align="center" />
-                <el-table-column
-                  label="濂楅鍚嶇О"
-                  align="center"
-                  prop="dwDeptName"
-                />
+                <el-table-column label="濂楅鍚嶇О" align="center" prop="dwDeptName" />
               </el-table>
             </div>
           </el-col>
           <el-col :span="17" :xs="24">
-            <el-form
-              ref="form"
-              :model="forms"
-              :rules="rules"
-              label-width="78px"
-              :inline="true"
-              @submit.native.prevent
-            >
+            <el-form ref="form" :model="forms" :rules="rules" label-width="78px" :inline="true" @submit.native.prevent>
               <el-form-item label="鍒嗙粍鍚嶇О" prop="groupingName">
-                <el-input
-                  v-model="forms.groupingName"
-                  placeholder="璇疯緭鍏ュ垎缁勫悕绉�"
-                  style="width: 130px"
-                  @focus="changegroupingName"
-                />
+                <el-input v-model="forms.groupingName" placeholder="璇疯緭鍏ュ垎缁勫悕绉�" style="width: 130px"
+                  @focus="changegroupingName" />
               </el-form-item>
               <el-form-item label="鎬у埆" prop="sex">
-                <el-select
-                  v-model="forms.sex"
-                  placeholder="璇烽�夋嫨鎬у埆"
-                  style="width: 120px"
-                  clearable
-                  :disabled="isSexDisabled"
-                >
-                  <el-option
-                    v-for="dict in dict.type.sys_user_sex"
-                    :key="dict.value"
-                    :label="dict.label"
-                    :value="dict.value"
-                  />
+                <el-select v-model="forms.sex" placeholder="璇烽�夋嫨鎬у埆" style="width: 120px" clearable
+                  :disabled="isSexDisabled">
+                  <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label"
+                    :value="dict.value" />
                 </el-select>
               </el-form-item>
               <!-- <el-form-item label="濂楅鍚嶇О" prop="pacName">
@@ -402,34 +174,18 @@
                 />
               </el-form-item> -->
               <el-form-item label="鍘熶环" prop="price">
-                <el-input
-                  v-model="forms.price"
-                  placeholder="璇疯緭鍏ュ師浠�"
-                  style="width: 130px"
-                />
+                <el-input v-model="forms.price" placeholder="璇疯緭鍏ュ師浠�" style="width: 130px" />
               </el-form-item>
               <el-form-item label="浼樻儬浠�" prop="ysPrice">
-                <el-input
-                  v-model="forms.ysPrice"
-                  placeholder="璇疯緭鍏ュ簲鏀�"
-                  style="width: 120px"
-                />
+                <el-input v-model="forms.ysPrice" placeholder="璇疯緭鍏ュ簲鏀�" style="width: 120px" />
               </el-form-item>
               <el-form-item label="缁撶畻鏂瑰紡" prop="payType">
-                <el-select
-                  v-model="forms.payType"
-                  placeholder="璇烽�夋嫨缁撶畻鏂瑰紡"
-                  style="width: 130px"
-                  clearable
-                >
-                  <el-option
-                    v-for="dict in dict.type.reservation_pay_type"
-                    :key="dict.value"
-                    :label="dict.label"
-                    :value="dict.value"
-                  />
+                <el-select v-model="forms.payType" placeholder="璇烽�夋嫨缁撶畻鏂瑰紡" style="width: 130px" clearable>
+                  <el-option v-for="dict in dict.type.reservation_pay_type" :key="dict.value" :label="dict.label"
+                    :value="dict.value" />
                 </el-select>
               </el-form-item>
+             
               <el-form-item label="骞撮緞娈�">
                 <el-col :span="7">
                   <el-input v-model="forms.ltAge" style="width: 53px" />
@@ -443,77 +199,32 @@
 
             <el-row :gutter="10" class="mb8">
               <el-col :span="1.5">
-                <el-button
-                  type="primary"
-                  icon="el-icon-plus"
-                  size="mini"
-                  @click="handleGroup"
-                  >淇濆瓨</el-button
-                >
+                <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleGroup">淇濆瓨</el-button>
               </el-col>
               <el-col :span="1.5">
-                <el-button
-                  type="primary"
-                  icon="el-icon-edit"
-                  size="mini"
-                  @click="xiangmuWh"
-                  >椤圭洰缁存姢</el-button
-                >
+                <el-button type="primary" icon="el-icon-edit" size="mini" @click="xiangmuWh">椤圭洰缁存姢</el-button>
               </el-col>
               <el-col :span="1.5">
-                <el-button
-                  type="primary"
-                  icon="el-icon-edit"
-                  size="mini"
-                  :disabled="singlegg"
-                  @click="GroupUpdate"
-                  >閲嶇疆</el-button
-                >
-                <el-button
-                  type="primary"
-                  icon="el-icon-edit"
-                  size="mini"
-                  :disabled="singlegg"
-                  @click="deleteGroup"
-                  >鍒犻櫎</el-button
-                >
+                <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="singlegg"
+                  @click="GroupUpdate">閲嶇疆</el-button>
+                <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="singlegg"
+                  @click="deleteGroup">鍒犻櫎</el-button>
               </el-col>
             </el-row>
-            <el-table
-              border
-              ref="tbs"
-              v-loading="loading"
-              :data="groupingList"
-              @selection-change="handleChange"
-              height="350"
-            >
+            <el-table border ref="tbs" v-loading="loading" :data="groupingList" @selection-change="handleChange"
+              height="350">
               <el-table-column type="selection" width="40px" align="center" />
-              <el-table-column
-                label="搴忓彿"
-                align="center"
-                prop="newID"
-                width="50px"
-              />
-              <el-table-column
-                label="鍒嗙粍鍚嶇О"
-                align="center"
-                prop="groupingName"
-              />
+              <el-table-column label="搴忓彿" align="center" prop="newID" width="50px" />
+              <el-table-column label="鍒嗙粍鍚嶇О" align="center" prop="groupingName" />
               <el-table-column label="鎬у埆" align="center" prop="sex">
                 <template slot-scope="scope">
-                  <dict-tag
-                    :options="dict.type.sys_user_sex"
-                    :value="scope.row.sex"
-                  />
+                  <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex" />
                 </template>
               </el-table-column>
               <el-table-column label="濂楅鍚嶇О" align="center" prop="pacName" />
               <el-table-column label="缁撶畻鏂瑰紡" align="center" prop="payType">
                 <template slot-scope="scope">
-                  <dict-tag
-                    :options="dict.type.reservation_pay_type"
-                    :value="scope.row.payType"
-                  />
+                  <dict-tag :options="dict.type.reservation_pay_type" :value="scope.row.payType" />
                 </template>
               </el-table-column>
               <el-table-column label="鎶樻墸" align="center" prop="limits" />
@@ -527,64 +238,25 @@
 
     <!-- 濂楅 -->
     <div>
-      <el-dialog
-        :title="title"
-        :visible.sync="openss"
-        width="1400px"
-        :style="{ height: 1400 + 'px' }"
-        append-to-body
-        :close-on-click-modal="false"
-      >
+      <el-dialog :title="title" :visible.sync="openss" width="1400px" :style="{ height: 1400 + 'px' }" append-to-body
+        :close-on-click-modal="false">
         <el-row :gutter="24">
           <el-col :span="8" :xs="24">
-            <el-form
-              :model="queryParams"
-              ref="queryForm"
-              size="small"
-              :inline="true"
-              label-width="68px"
-              @submit.native.prevent
-            >
+            <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px"
+              @submit.native.prevent>
               <el-form-item label="濂楅鍚嶇О" prop="pacName">
-                <el-input
-                  ref="inputName"
-                  v-model="queryParams.pacName"
-                  placeholder="璇疯緭鍏ュ椁愬悕绉�"
-                  clearable
-                  @keyup.enter.native="handleSearch"
-                  style="width: 140px"
-                />
+                <el-input ref="inputName" v-model="queryParams.pacName" placeholder="璇疯緭鍏ュ椁愬悕绉�" clearable
+                  @keyup.enter.native="handleSearch" style="width: 140px" />
               </el-form-item>
               <el-form-item>
-                <el-button
-                  type="primary"
-                  icon="el-icon-search"
-                  size="mini"
-                  @click="handleSearch"
-                  >鎼滅储</el-button
-                >
+                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleSearch">鎼滅储</el-button>
               </el-form-item>
             </el-form>
-            <el-table
-              ref="tbone"
-              border
-              v-loading="loading"
-              :data="newpacName"
-              @selection-change="handleChangeOne"
-              height="478"
-            >
+            <el-table ref="tbone" border v-loading="loading" :data="newpacName" @selection-change="handleChangeOne"
+              height="478">
               <el-table-column type="selection" width="40px" align="center" />
-              <el-table-column
-                label="搴忓彿"
-                align="center"
-                prop="pacId"
-                width="50px"
-              />
-              <el-table-column
-                label="濂楅鍚嶇О/浠锋牸/鍏�"
-                align="center"
-                prop="pacName"
-              >
+              <el-table-column label="搴忓彿" align="center" prop="pacId" width="50px" />
+              <el-table-column label="濂楅鍚嶇О/浠锋牸/鍏�" align="center" prop="pacName">
                 <template slot-scope="scope">
                   {{ scope.row.pacName + "/" + scope.row.price }}
                 </template>
@@ -592,43 +264,20 @@
             </el-table>
           </el-col>
           <el-col :span="6" :xs="24">
-            <el-form
-              :model="queryParams"
-              ref="queryForm"
-              size="small"
-              :inline="true"
-              label-width="46px"
-              @submit.native.prevent
-            >
+            <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="46px"
+              @submit.native.prevent>
               <el-form-item label="鍚堣" prop="price">
-                <el-input
-                  ref="inputName"
-                  v-model="queryParams.price"
-                  placeholder="鍚堣"
-                  clearable
-                  style="width: 140px"
-                />
+                <el-input ref="inputName" v-model="queryParams.price" placeholder="鍚堣" clearable style="width: 140px" />
               </el-form-item>
               <el-form-item>
-                <el-button
-                  icon="el-icon-refresh"
-                  size="mini"
-                  @click="resetQuerys"
-                  >閲嶇疆</el-button
-                >
+                <el-button icon="el-icon-refresh" size="mini" @click="resetQuerys">閲嶇疆</el-button>
               </el-form-item>
             </el-form>
             <!-- <div style="color: red; font-size: 8px">
               娉ㄩ噴锛氶紶鏍囧乏閿弻鍑婚�変腑琛屽彲鍒犻櫎
             </div> -->
             <!--       @row-dblclick="dbclick" -->
-            <el-table
-              border
-              v-loading="loading"
-              :data="OnenewpacName"
-              :row-class-name="tableRowClassName"
-              height="478"
-            >
+            <el-table border v-loading="loading" :data="OnenewpacName" :row-class-name="tableRowClassName" height="478">
               <el-table-column label="椤圭洰鍚嶇О" align="center" prop="proName">
                 <template slot-scope="scope">
                   {{ scope.row.proName }}
@@ -637,79 +286,38 @@
 
               <el-table-column label="鎿嶄綔" align="center" width="68">
                 <template slot-scope="scope">
-                  <el-button
-                    size="mini"
-                    type="text"
-                    icon="el-icon-delete"
-                    @click="handledbelete(scope.row)"
-                    >鍒犻櫎</el-button
-                  >
+                  <el-button size="mini" type="text" icon="el-icon-delete"
+                    @click="handledbelete(scope.row)">鍒犻櫎</el-button>
                 </template>
               </el-table-column>
             </el-table>
             <div style="font-size: 16px; margin-top: 10px">
               褰撳墠椤圭洰鏉℃暟锛�<span style="font-weight: 700">{{
                 OnenewpacName.length
-              }}</span
-              >鏉�
+              }}</span>鏉�
             </div>
           </el-col>
           <el-col :span="2" :xs="24">
             <div style="margin: 240% 16%">
-              <el-button
-                type="primary"
-                size="medium "
-                icon="el-icon-back"
-                @click="resetright"
-                >纭� 璁�</el-button
-              >
+              <el-button type="primary" size="medium " icon="el-icon-back" @click="resetright">纭� 璁�</el-button>
             </div>
           </el-col>
           <el-col :span="8" :xs="24">
-            <el-form
-              :model="queryParams1"
-              ref="queryForm"
-              size="small"
-              :inline="true"
-              v-show="showSearch"
-              label-width="68px"
-              @submit.native.prevent
-            >
+            <el-form :model="queryParams1" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+              label-width="68px" @submit.native.prevent>
               <el-form-item label="椤圭洰鍚嶇О" prop="proName">
-                <el-input
-                  ref="inputName"
-                  v-model="queryParams1.proName"
-                  placeholder="璇疯緭鍏ラ」鐩悕绉�"
-                  clearable
-                  @keyup.enter.native="handleSearchFor"
-                  style="width: 140px"
-                />
+                <el-input ref="inputName" v-model="queryParams1.proName" placeholder="璇疯緭鍏ラ」鐩悕绉�" clearable
+                  @keyup.enter.native="handleSearchFor" style="width: 140px" />
               </el-form-item>
               <el-form-item>
-                <el-button
-                  type="primary"
-                  icon="el-icon-search"
-                  size="mini"
-                  @click="handleSearchFor"
-                  >鎼滅储</el-button
-                >
+                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleSearchFor">鎼滅储</el-button>
               </el-form-item>
             </el-form>
-            <el-table
-              border
-              v-loading="loading"
-              ref="tre"
-              :data="Treedata"
-              @selection-change="handleChangesingle"
-              height="478"
-            >
+            <el-table border v-loading="loading" ref="tre" :data="Treedata" @selection-change="handleChangesingle"
+              height="478">
               <el-table-column type="selection" width="40px" align="center" />
               <el-table-column label="椤圭洰鍚嶇О" align="center" prop="proName" />
-              <el-table-column
-                label="椤圭洰浠锋牸/鍏�"
-                align="center"
-                prop="proPrice"
-              />
+              <el-table-column label="椤圭洰浠锋牸/鍏�" align="center" prop="proPrice" />
             </el-table>
           </el-col>
         </el-row>
@@ -721,32 +329,21 @@
     </div>
 
     <div>
-      <el-dialog
-        :title="title"
-        :visible.sync="openOne"
-        width="1400px"
-        append-to-body
-        :close-on-click-modal="false"
-      >
-        <div
-          class="info-header"
-          style="
+      <el-dialog :title="title" :visible.sync="openOne" width="1400px" append-to-body :close-on-click-modal="false">
+        <div class="info-header" style="
             margin-bottom: 15px;
             padding: 10px;
             background-color: #f5f7fa;
             border-radius: 4px;
-          "
-        >
+          ">
           <el-row :gutter="20">
             <el-col :span="8">
               <span>椤圭洰鍚嶇О锛歿{ forms.groupingName }}</span>
             </el-col>
             <el-col :span="8">
-              <span
-                >鎬у埆锛歿{
-                  forms.sex === "1" ? "濂�" : forms.sex === "0" ? "鐢�" : "鏈煡"
-                }}</span
-              >
+              <span>鎬у埆锛歿{
+                forms.sex === "1" ? "濂�" : forms.sex === "0" ? "鐢�" : "鏈煡"
+              }}</span>
             </el-col>
             <el-col :span="8">
               <span>骞撮緞鑼冨洿锛歿{ forms.ltAge }}-{{ forms.gtAge }}宀�</span>
@@ -755,130 +352,54 @@
         </div>
         <el-row :gutter="24" v-if="!isTableVisible">
           <el-col :span="15" :xs="24">
-            <el-form
-              :model="queryParams"
-              ref="queryForm"
-              size="small"
-              :inline="true"
-              label-width="46px"
-              style="height: 50px"
-              @submit.native.prevent
-            >
+            <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="46px"
+              style="height: 50px" @submit.native.prevent>
               <el-form-item label="鍘熶环">
-                <el-input
-                  ref="inputName"
-                  v-model="queryParams.price"
-                  placeholder="鍚堣"
-                  clearable
-                  style="width: 140px"
-                />
+                <el-input ref="inputName" v-model="queryParams.price" placeholder="鍚堣" clearable style="width: 140px" />
               </el-form-item>
               <el-form-item label="鎶樻墸">
-                <el-input-number
-                  ref="inputNumber"
-                  style="width: 150px"
-                  v-model="youhui"
-                  :precision="1"
-                  :step="0.1"
-                  :min="0"
-                  :max="10"
-                  @change="debounceNumberChange"
-                  :debounce="3000"
-                ></el-input-number>
+                <el-input-number ref="inputNumber" style="width: 150px" v-model="youhui" :precision="1" :step="0.1"
+                  :min="0" :max="10" @change="debounceNumberChange" :debounce="3000"></el-input-number>
               </el-form-item>
               <el-form-item label="鐜颁环">
-                <el-input
-                  ref="inputName"
-                  v-model="queryParams.xianprice"
-                  placeholder="鍚堣"
-                  clearable
-                  style="width: 140px"
-                  @input="changeXianjia"
-                  @blur="numberChangeXianPrice(youhui, youhui)"
-                />
+                <el-input ref="inputName" v-model="queryParams.xianprice" placeholder="鍚堣" clearable
+                  style="width: 140px" @input="changeXianjia" @blur="numberChangeXianPrice(youhui, youhui)" />
               </el-form-item>
               <el-form-item>
-                <el-button
-                  icon="el-icon-refresh"
-                  size="mini"
-                  @click="resetQuerys"
-                  >閲嶇疆</el-button
-                >
+                <el-button icon="el-icon-refresh" size="mini" @click="resetQuerys">閲嶇疆</el-button>
               </el-form-item>
               <el-form-item>
-                <el-button
-                  type="primary"
-                  @click="Package"
-                  size="mini"
-                  style="margin-right: 20px"
-                  >閫夋嫨濂楅</el-button
-                >
+                <el-button type="primary" @click="Package" size="mini" style="margin-right: 20px">閫夋嫨濂楅</el-button>
               </el-form-item>
             </el-form>
-            <el-table
-              border
-              v-loading="loading"
-              :data="OnenewpacName"
-              :row-class-name="tableRowClassName"
-              height="478"
-              :cell-style="{ padding: '5px 0' }"
-            >
-              <el-table-column
-                label="椤圭洰鍚嶇О"
-                align="center"
-                prop="proName"
-                width="410"
-              >
+            <el-table border v-loading="loading" :data="OnenewpacName" :row-class-name="tableRowClassName" height="478"
+              :cell-style="{ padding: '5px 0' }">
+              <el-table-column label="椤圭洰鍚嶇О" align="center" prop="proName" width="410">
                 <template slot-scope="scope">
                   {{ scope.row.proName }}
                 </template>
               </el-table-column>
-              <el-table-column
-                label="鍘熶环"
-                align="center"
-                prop="proPrice"
-                width="85"
-              ></el-table-column>
+              <el-table-column label="鍘熶环" align="center" prop="proPrice" width="85"></el-table-column>
               <el-table-column label="鎶樻墸" width="151">
                 <template slot-scope="scope">
                   <!-- 鍙緭鍏ョ函鏁板瓧鎶樻墸  @input="validateDiscount(scope.row)"-->
-                  <el-input-number
-                    v-model="scope.row.limits"
-                    @change="handleManualChange(scope.row)"
-                    placeholder="杈撳叆鎶樻墸"
-                    size="mini"
-                    type="number"
-                    :min="0"
-                    :step="0.1"
-                    :precision="1"
-                    :max="10"
-                  >
+                  <el-input-number v-model="scope.row.limits" @change="handleManualChange(scope.row)" placeholder="杈撳叆鎶樻墸"
+                    size="mini" type="number" :min="0" :step="0.1" :precision="1" :max="10">
                   </el-input-number>
                 </template>
               </el-table-column>
-              <el-table-column
-                label="鐜颁环"
-                align="center"
-                prop="ysPrice"
-                width="85"
-              ></el-table-column>
+              <el-table-column label="鐜颁环" align="center" prop="ysPrice" width="85"></el-table-column>
               <el-table-column label="鎿嶄綔" align="center" width="85">
                 <template slot-scope="scope">
-                  <el-button
-                    size="mini"
-                    type="text"
-                    icon="el-icon-delete"
-                    @click="handledbelete(scope.row)"
-                    >鍒犻櫎</el-button
-                  >
+                  <el-button size="mini" type="text" icon="el-icon-delete"
+                    @click="handledbelete(scope.row)">鍒犻櫎</el-button>
                 </template>
               </el-table-column>
             </el-table>
             <div style="font-size: 16px; margin-top: 10px">
               褰撳墠椤圭洰鏉℃暟锛�<span style="font-weight: 700">{{
                 OnenewpacName.length
-              }}</span
-              >鏉�
+              }}</span>鏉�
             </div>
           </el-col>
           <!-- <el-col :span="2" :xs="24">
@@ -892,116 +413,47 @@
             </div>
           </el-col> -->
           <el-col :span="7" :xs="24">
-            <el-form
-              :model="queryParams1"
-              ref="queryForm"
-              size="small"
-              :inline="true"
-              v-show="showSearch"
-              label-width="68px"
-              @submit.native.prevent
-            >
+            <el-form :model="queryParams1" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+              label-width="68px" @submit.native.prevent>
               <el-form-item label="椤圭洰鍚嶇О" prop="proName">
-                <el-input
-                  ref="inputName"
-                  v-model="queryParams1.proName"
-                  placeholder="璇疯緭鍏ラ」鐩悕绉�"
-                  clearable
-                  @keyup.enter.native="handleSearchFor"
-                  style="width: 140px"
-                />
+                <el-input ref="inputName" v-model="queryParams1.proName" placeholder="璇疯緭鍏ラ」鐩悕绉�" clearable
+                  @keyup.enter.native="handleSearchFor" style="width: 140px" />
               </el-form-item>
               <el-form-item>
-                <el-button
-                  type="primary"
-                  icon="el-icon-search"
-                  size="mini"
-                  @click="handleSearchFor"
-                  >鎼滅储</el-button
-                >
+                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleSearchFor">鎼滅储</el-button>
               </el-form-item>
             </el-form>
-            <el-table
-              border
-              v-loading="loading"
-              ref="tre"
-              :data="Treedata"
-              @selection-change="handleChangesingle"
-              height="478"
-              style="width: 100%"
-            >
+            <el-table border v-loading="loading" ref="tre" :data="Treedata" @selection-change="handleChangesingle"
+              height="478" style="width: 100%">
               <el-table-column type="selection" width="40px" align="center" />
-              <el-table-column
-                label="椤圭洰鍚嶇О"
-                align="center"
-                prop="proName"
-                width="230px"
-              />
-              <el-table-column
-                label="椤圭洰浠锋牸/鍏�"
-                align="center"
-                prop="proPrice"
-                width="100px"
-              />
+              <el-table-column label="椤圭洰鍚嶇О" align="center" prop="proName" width="230px" />
+              <el-table-column label="椤圭洰浠锋牸/鍏�" align="center" prop="proPrice" width="100px" />
             </el-table>
           </el-col>
         </el-row>
         <el-row :gutter="24" v-else>
           <el-col :span="6" :xs="24">
-            <el-form
-              :model="queryParams"
-              ref="queryForm"
-              size="small"
-              :inline="true"
-              label-width="68px"
-              @submit.native.prevent
-            >
+            <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px"
+              @submit.native.prevent>
               <el-form-item label="濂楅鍚嶇О" prop="pacName">
-                <el-input
-                  ref="inputName"
-                  v-model="queryParams.pacName"
-                  placeholder="璇疯緭鍏ュ椁愬悕绉�"
-                  clearable
-                  @keyup.enter.native="handleSearch"
-                  style="width: 140px"
-                />
+                <el-input ref="inputName" v-model="queryParams.pacName" placeholder="璇疯緭鍏ュ椁愬悕绉�" clearable
+                  @keyup.enter.native="handleSearch" style="width: 140px" />
               </el-form-item>
               <el-form-item>
-                <el-button
-                  type="primary"
-                  icon="el-icon-search"
-                  size="mini"
-                  @click="handleSearch"
-                  >鎼滅储</el-button
-                >
+                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleSearch">鎼滅储</el-button>
               </el-form-item>
             </el-form>
-            <el-table
-              ref="tbone"
-              border
-              v-loading="loading"
-              :data="newpacName"
-              @selection-change="handleChangeOne"
-              height="483"
-            >
+            <el-table ref="tbone" border v-loading="loading" :data="newpacName" @selection-change="handleChangeOne"
+              height="483">
               <!-- <el-table-column type="selection" width="40px" align="center" /> -->
 
-              <el-table-column
-                label="搴忓彿"
-                align="center"
-                prop="newID"
-                width="50px"
-              >
+              <el-table-column label="搴忓彿" align="center" prop="newID" width="50px">
                 <template slot-scope="scope">
                   {{ scope.row.newID }}
                 </template>
               </el-table-column>
 
-              <el-table-column
-                label="濂楅鍚嶇О/浠锋牸/鍏�"
-                align="center"
-                prop="pacName"
-              >
+              <el-table-column label="濂楅鍚嶇О/浠锋牸/鍏�" align="center" prop="pacName">
                 <template slot-scope="scope">
                   {{ scope.row.pacName + "/" + scope.row.price }}
                 </template>
@@ -1010,87 +462,41 @@
             <div style="font-size: 16px; margin-top: 10px">
               椤圭洰鎬绘潯鏁帮細<span style="font-weight: 700; margin-right: 5px">{{
                 newpacName.length
-              }}</span
-              >鏉�
+              }}</span>鏉�
             </div>
           </el-col>
           <el-col :span="8" :xs="24">
-            <el-form
-              :model="queryParams"
-              ref="queryForm"
-              size="small"
-              :inline="true"
-              label-width="46px"
-              style="height: 51px"
-              @submit.native.prevent
-            >
+            <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="46px"
+              style="height: 51px" @submit.native.prevent>
               <el-form-item label="鍚堣" prop="price">
-                <el-input
-                  ref="inputName"
-                  v-model="queryParams.price"
-                  placeholder="鍚堣"
-                  clearable
-                  style="width: 140px"
-                />
+                <el-input ref="inputName" v-model="queryParams.price" placeholder="鍚堣" clearable style="width: 140px" />
               </el-form-item>
               <el-form-item>
-                <el-button
-                  icon="el-icon-refresh"
-                  size="mini"
-                  @click="resetQuerys"
-                  >閲嶇疆</el-button
-                >
+                <el-button icon="el-icon-refresh" size="mini" @click="resetQuerys">閲嶇疆</el-button>
               </el-form-item>
               <el-form-item>
-                <el-button
-                  type="primary"
-                  @click="Package"
-                  size="mini"
-                  style="margin-right: 20px"
-                  >閫夋嫨濂楅</el-button
-                >
+                <el-button type="primary" @click="Package" size="mini" style="margin-right: 20px">閫夋嫨濂楅</el-button>
               </el-form-item>
             </el-form>
-            <el-table
-              border
-              v-loading="loading"
-              :data="OnenewpacName"
-              :row-class-name="tableRowClassName"
-              height="478"
-              :cell-style="{ padding: '5px 0' }"
-            >
-              <el-table-column
-                label="椤圭洰鍚嶇О"
-                align="center"
-                prop="proName"
-                width="170"
-              >
+            <el-table border v-loading="loading" :data="OnenewpacName" :row-class-name="tableRowClassName" height="478"
+              :cell-style="{ padding: '5px 0' }">
+              <el-table-column label="椤圭洰鍚嶇О" align="center" prop="proName" width="170">
                 <template slot-scope="scope">
                   {{ scope.row.proName }}
                 </template>
               </el-table-column>
-              <el-table-column
-                label="鍘熶环"
-                align="center"
-                prop="proPrice"
-              ></el-table-column>
+              <el-table-column label="鍘熶环" align="center" prop="proPrice"></el-table-column>
               <el-table-column label="鎿嶄綔" align="center" width="68">
                 <template slot-scope="scope">
-                  <el-button
-                    size="mini"
-                    type="text"
-                    icon="el-icon-delete"
-                    @click="handledbelete(scope.row)"
-                    >鍒犻櫎</el-button
-                  >
+                  <el-button size="mini" type="text" icon="el-icon-delete"
+                    @click="handledbelete(scope.row)">鍒犻櫎</el-button>
                 </template>
               </el-table-column>
             </el-table>
             <div style="font-size: 16px; margin-top: 10px">
               褰撳墠椤圭洰鏉℃暟锛�<span style="font-weight: 700">{{
                 OnenewpacName.length
-              }}</span
-              >鏉�
+              }}</span>鏉�
             </div>
           </el-col>
           <!-- <el-col :span="2" :xs="24">
@@ -1101,56 +507,21 @@
             </div>
           </el-col> -->
           <el-col :span="8" :xs="24">
-            <el-form
-              :model="queryParams1"
-              ref="queryForm"
-              size="small"
-              :inline="true"
-              v-show="showSearch"
-              label-width="68px"
-              @submit.native.prevent
-            >
+            <el-form :model="queryParams1" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+              label-width="68px" @submit.native.prevent>
               <el-form-item label="椤圭洰鍚嶇О" prop="proName">
-                <el-input
-                  ref="inputName"
-                  v-model="queryParams1.proName"
-                  placeholder="璇疯緭鍏ラ」鐩悕绉�"
-                  clearable
-                  @keyup.enter.native="handleSearchFor"
-                  style="width: 140px"
-                />
+                <el-input ref="inputName" v-model="queryParams1.proName" placeholder="璇疯緭鍏ラ」鐩悕绉�" clearable
+                  @keyup.enter.native="handleSearchFor" style="width: 140px" />
               </el-form-item>
               <el-form-item>
-                <el-button
-                  type="primary"
-                  icon="el-icon-search"
-                  size="mini"
-                  @click="handleSearchFor"
-                  >鎼滅储</el-button
-                >
+                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleSearchFor">鎼滅储</el-button>
               </el-form-item>
             </el-form>
-            <el-table
-              border
-              v-loading="loading"
-              ref="tre"
-              :data="Treedata"
-              @selection-change="handleChangesingle"
-              height="478"
-            >
+            <el-table border v-loading="loading" ref="tre" :data="Treedata" @selection-change="handleChangesingle"
+              height="478">
               <el-table-column type="selection" width="40px" align="center" />
-              <el-table-column
-                label="椤圭洰鍚嶇О"
-                align="center"
-                prop="proName"
-                width="288"
-              />
-              <el-table-column
-                label="椤圭洰浠锋牸/鍏�"
-                align="center"
-                prop="proPrice"
-                width="100"
-              />
+              <el-table-column label="椤圭洰鍚嶇О" align="center" prop="proName" width="288" />
+              <el-table-column label="椤圭洰浠锋牸/鍏�" align="center" prop="proPrice" width="100" />
             </el-table>
           </el-col>
         </el-row>
@@ -1161,13 +532,7 @@
       </el-dialog>
     </div>
 
-    <el-dialog
-      title="閫夋嫨濂楅"
-      :visible.sync="taocan"
-      width="70%"
-      height="700px"
-      :close-on-click-modal="false"
-    >
+    <el-dialog title="閫夋嫨濂楅" :visible.sync="taocan" width="70%" height="700px" :close-on-click-modal="false">
       <!-- <el-form :model="queryParam" ref="queryForm" size="small" :inline="true" label-width="auto">
         <el-form-item label="濂楅鍚嶇О" prop="pacName">
           <el-input v-model="queryParam.pacName" placeholder="璇疯緭鍏ュ椁愬悕绉�" clearable @keyup.enter.native="handle"
@@ -1177,40 +542,12 @@
           <el-button type="primary" icon="el-icon-search" size="mini" @click="handle">鎼滅储</el-button>
         </el-form-item>
       </el-form> -->
-      <el-table
-        v-loading="loading"
-        element-loading-text="姝e湪鍔犺浇涓�..."
-        element-loading-spinner="el-icon-loading"
-        border
-        :data="newpacName1"
-        @selection-change="handleSelectionChange1"
-        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 v-loading="loading" element-loading-text="姝e湪鍔犺浇涓�..." element-loading-spinner="el-icon-loading" border
+        :data="newpacName1" @selection-change="handleSelectionChange1" 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>
       <span slot="footer" class="dialog-footer">
         <el-button @click="cancel1">鍙� 娑�</el-button>
@@ -1220,43 +557,20 @@
 
     <!-- 娣诲姞鎴栦慨鏀逛綋妫�鍗曚綅淇℃伅缁存姢瀵硅瘽妗� -->
     <div class="dia">
-      <el-dialog
-        :title="title"
-        :visible.sync="open"
-        width="1340px"
-        append-to-body
-      >
-        <el-form
-          ref="form"
-          :model="form"
-          :rules="rules"
-          label-width="106px"
-          :inline="true"
-          @submit.native.prevent
-        >
-          <el-form-item label="鍗曚綅绫诲瀷" prop="isZybUnit">
-            <el-radio-group v-model="form.isZybUnit">
+      <el-dialog :title="title" :visible.sync="open" width="1330px" append-to-body>
+        <el-form ref="form" :model="form" :rules="rules" label-width="98px" :inline="true" @submit.native.prevent>
+          <el-form-item label="鍗曚綅绫诲瀷" prop="dwlx">
+            <el-radio-group v-model="form.dwlx" @input="radioChange">
               <el-radio :label="0">鏅�氬崟浣�</el-radio>
               <el-radio :label="1">鑱屼笟鐥呭崟浣�</el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item
-            label="鍗曚綅鍚嶇О"
-            prop="cnName"
-            style="display: block; width: 100%"
-          >
-            <el-input
-              v-model="form.cnName"
-              placeholder="璇疯緭鍏ヤ腑鏂囧悕绉�"
-              style="width: 520px"
-            />
+          <br />
+          <el-form-item label="鍗曚綅鍚嶇О" prop="cnName">
+            <el-input v-model="form.cnName" placeholder="璇疯緭鍏ヤ腑鏂囧悕绉�" style="width:510px" />
           </el-form-item>
           <el-form-item label="缁熶竴淇$敤浠g爜" prop="taxNumber">
-            <el-input
-              v-model="form.taxNumber"
-              placeholder="璇疯緭鍏ョ粺涓�淇$敤浠g爜"
-              style="width: 520px"
-            />
+            <el-input v-model="form.taxNumber" placeholder="璇疯緭鍏ョ粺涓�淇$敤浠g爜" style="width: 510px" />
           </el-form-item>
           <el-form-item label="娉曚汉浠h〃" prop="legalPerson">
             <el-input v-model="form.legalPerson" placeholder="璇疯緭鍏ユ硶浜�" />
@@ -1265,10 +579,7 @@
             <el-input v-model="form.contactPerson" placeholder="璇疯緭鍏ヨ仈绯讳汉" />
           </el-form-item>
           <el-form-item label="鑱旂郴鐢佃瘽" prop="contactPhone">
-            <el-input
-              v-model="form.contactPhone"
-              placeholder="璇疯緭鍏ヨ仈绯荤數璇�"
-            />
+            <el-input v-model="form.contactPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" />
           </el-form-item>
           <el-form-item label="浼犵湡" prop="faxNumber">
             <el-input v-model="form.faxNumber" placeholder="璇疯緭鍏ヤ紶鐪�" />
@@ -1279,109 +590,51 @@
         </el-form-item> -->
 
           <el-form-item label="娉ㄥ唽鍦板潃" prop="registerAddress">
-            <el-input
-              v-model="form.registerAddress"
-              placeholder="璇疯緭鍏ユ敞鍐屽湴鍧�"
-              style="width: 1157px"
-            />
+            <el-input v-model="form.registerAddress" placeholder="璇疯緭鍏ユ敞鍐屽湴鍧�" style="width: 1128px" />
           </el-form-item>
           <el-form-item label="閫氳鍦板潃" prop="mailingAddress">
-            <el-input
-              v-model="form.mailingAddress"
-              placeholder="璇疯緭鍏ラ�氳鍦板潃"
-              style="width: 1157px"
-            />
+            <el-input v-model="form.mailingAddress" placeholder="璇疯緭鍏ラ�氳鍦板潃" style="width: 1128px" />
           </el-form-item>
-          <el-form-item label="鎵�灞炲湴鍖�" prop="zybCode" v-if="form.isZybUnit">
-            <el-input v-model="form.zybCode" placeholder="璇疯緭鍏ユ墍灞炲湴鍖�" />
+          <el-form-item label="鎵�灞炲湴鍖�" prop="ssdq" v-if="form.dwlx == 1">
+            <el-input v-model="form.ssdq" placeholder="璇疯緭鍏ユ墍灞炲湴鍖�" />
           </el-form-item>
-          <el-form-item
-            label="闅跺睘鍏崇郴"
-            prop="industryType"
-            v-if="form.isZybUnit"
-          >
+          <el-form-item label="闅跺睘鍏崇郴" prop="lsgx" v-if="form.dwlx == 1">
             <!-- <el-input
               v-model="form.industryType"
               placeholder="璇疯緭鍏ラ毝灞炲叧绯�"
             /> -->
-            <el-select
-              filterable
-              v-model="form.industryType"
-              placeholder="璇烽�夋嫨闅跺睘鍏崇郴"
-              clearable
-            >
-              <el-option
-                v-for="dict in dict.type.sys_yes_no"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              />
+            <el-select filterable v-model="form.lsgx" placeholder="璇烽�夋嫨闅跺睘鍏崇郴" clearable style="width: 198px">
+              <el-option v-for="dict in dict.type.sys_yes_no" :key="dict.value" :label="dict.label"
+                :value="dict.value" />
             </el-select>
           </el-form-item>
-          <el-form-item label="缁忔祹绫诲瀷" prop="jjType" v-if="form.isZybUnit">
-            <!-- <el-input v-model="form.jjType" placeholder="璇疯緭鍏ョ粡娴庣被鍨�" /> -->
-            <el-select
-              filterable
-              v-model="form.jjType"
-              placeholder="璇烽�夋嫨缁忔祹鍒嗙被"
-              clearable
-            >
-              <el-option
-                v-for="dict in dict.type.sys_yes_no"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              />
+          <el-form-item label="缁忔祹绫诲瀷" prop="jjlx" v-if="form.dwlx == 1">
+            <el-select filterable v-model="form.jjlx" placeholder="璇烽�夋嫨缁忔祹绫诲瀷" clearable style="width: 199px">
+              <el-option v-for="dict in dict.type.sys_yes_no" :key="dict.value" :label="dict.label"
+                :value="dict.value" />
             </el-select>
           </el-form-item>
-          <el-form-item label="浼佷笟瑙勬ā" prop="qygm" v-if="form.isZybUnit">
+          <el-form-item label="浼佷笟瑙勬ā" prop="qygm" v-if="form.dwlx == 1">
             <el-input v-model="form.qygm" placeholder="璇疯緭鍏ヤ紒涓氳妯�" />
           </el-form-item>
-          <el-form-item label="琛屼笟鍒嗙被" prop="hyfl" v-if="form.isZybUnit">
-            <!-- <el-input v-model="form.hyfl" placeholder="璇疯緭鍏ヨ涓氬垎绫�" /> -->
-            <el-select
-              filterable
-              v-model="form.hyfl"
-              placeholder="璇烽�夋嫨琛屼笟鍒嗙被"
-              clearable
-            >
-              <el-option
-                v-for="dict in dict.type.sys_yes_no"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              />
+          <el-form-item label="琛屼笟鍒嗙被" prop="hyfl" v-if="form.dwlx == 1">
+            <el-select filterable v-model="form.hyfl" placeholder="璇烽�夋嫨琛屼笟鍒嗙被" clearable style="width: 199px">
+              <el-option v-for="dict in dict.type.sys_yes_no" :key="dict.value" :label="dict.label"
+                :value="dict.value" />
             </el-select>
           </el-form-item>
-          <el-form-item label="椋庨櫓璇勪及" prop="fxpg" v-if="form.isZybUnit">
-            <!-- <el-input v-model="form.fxpg" placeholder="璇疯緭鍏ラ闄╄瘎浼�" /> -->
-            <el-select
-              filterable
-              v-model="form.fxpg"
-              placeholder="璇烽�夋嫨椋庨櫓璇勪及"
-              clearable
-            >
-              <el-option
-                v-for="dict in dict.type.sys_yes_no"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              />
+          <el-form-item label="椋庨櫓璇勪及" prop="fxpg" v-if="form.dwlx == 1">
+            <el-select filterable v-model="form.fxpg" placeholder="璇烽�夋嫨椋庨櫓璇勪及" clearable style="width: 198px">
+              <el-option v-for="dict in dict.type.sys_yes_no" :key="dict.value" :label="dict.label"
+                :value="dict.value" />
             </el-select>
           </el-form-item>
+          <br />
           <el-form-item label="寮�鎴烽摱琛�" prop="bankAccount">
-            <el-input
-              v-model="form.bankAccount"
-              placeholder="璇疯緭鍏ュ紑鎴烽摱琛�"
-              style="width: 520px"
-            />
+            <el-input v-model="form.bankAccount" placeholder="璇疯緭鍏ュ紑鎴烽摱琛�" style="width: 510px" />
           </el-form-item>
           <el-form-item label="閾惰璐︽埛" prop="countNum">
-            <el-input
-              v-model="form.countNum"
-              placeholder="璇疯緭鍏ラ摱琛岃处鎴�"
-              style="width: 520px"
-            />
+            <el-input v-model="form.countNum" placeholder="璇疯緭鍏ラ摱琛岃处鎴�" style="width: 510px" />
           </el-form-item>
           <el-form-item label="鑱旂郴閭" prop="email">
             <el-input v-model="form.email" placeholder="璇疯緭鍏ラ偖绠�" />
@@ -1394,22 +647,15 @@
           </el-form-item>
 
           <el-form-item label="琛屾斂鍖哄垝鍚嶇О" prop="areaName">
-            <el-input
-              v-model="form.areaName"
-              placeholder="璇疯緭鍏ヨ鏀垮尯鍒掑悕绉�"
-            />
+            <el-select filterable v-model="form.areaName" placeholder="璇烽�夋嫨琛屾斂鍖哄垝鍚嶇О" clearable style="width: 198px">
+              <el-option v-for="dict in dict.type.sys_yes_no" :key="dict.value" :label="dict.label"
+                :value="dict.value" />
+            </el-select>
           </el-form-item>
 
           <el-form-item label="澶囨敞" prop="remark">
-            <el-input
-              v-model="form.remark"
-              type="textarea"
-              placeholder="璇疯緭鍏ュ唴瀹�"
-              :rows="2"
-              label-width="400px"
-              style="width: 830px"
-              resize="none"
-            ></el-input>
+            <el-input v-model="form.remark" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" :rows="2" label-width="400px"
+              style="width: 830px" resize="none"></el-input>
           </el-form-item>
           <!-- <el-form-item label="浜旂瑪绠�鐮�" prop="wbm">
           <el-input v-model="form.wbm" placeholder="璇疯緭鍏ヤ簲绗旂畝鐮�" />
@@ -1498,6 +744,7 @@
       multiple: true,
       // 鏄剧ず鎼滅储鏉′欢
       showSearch: true,
+      dwlxs: null,
       // 鎬绘潯鏁�
       total: 0,
       // 浣撴鍗曚綅淇℃伅缁存姢琛ㄦ牸鏁版嵁
@@ -1772,7 +1019,6 @@
         validTime: null,
         wbm: null,
         deleted: null,
-        isZybUnit: 0,
       };
       this.resetForm("form");
     },
@@ -1859,7 +1105,7 @@
       this.opens = true;
 
       this.groupingList = [];
-
+      this.dwlxs = this.form.dwlx
       if (this.form.drugManufacturerId) {
         this.beCurrentDept();
       }
@@ -2482,16 +1728,18 @@
         });
     },
 
+
+    radioChange(val) {
+      this.reset();
+      this.form.dwlx = val
+    },
+
     /** 鎻愪氦鎸夐挳 */
     submitForm() {
       this.$refs["form"].validate((valid) => {
         if (valid) {
-          const submitData = {
-            ...this.form,
-            isZybUnit: Boolean(this.form.isZybUnit), // 杞崲涓哄竷灏斿��
-          };
           if (this.form.drugManufacturerId != null) {
-            updateComp(submitData).then((response) => {
+            updateComp(this.form).then((response) => {
               this.$modal.msgSuccess("淇敼鎴愬姛");
               this.open = false;
               this.getList();
@@ -2502,7 +1750,7 @@
               this.form.contactPerson &&
               this.form.contactPhone
             ) {
-              addComp(submitData).then((response) => {
+              addComp(this.form).then((response) => {
                 this.$modal.msgSuccess("鏂板鎴愬姛");
                 this.open = false;
                 this.getList();
@@ -2520,8 +1768,8 @@
       this.$modal
         .confirm(
           '鏄惁纭鍒犻櫎浣撴鍗曚綅淇℃伅缁存姢缂栧彿涓�"' +
-            drugManufacturerIds +
-            '"鐨勬暟鎹」锛�'
+          drugManufacturerIds +
+          '"鐨勬暟鎹」锛�'
         )
         .then(function () {
           return delComp(drugManufacturerIds);
@@ -2530,7 +1778,7 @@
           this.getList();
           this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
 
     submit() {
@@ -2567,10 +1815,10 @@
       this.youhui =
         this.queryParams.price > 0
           ? (Math.floor(
-              (this.queryParams.xianprice / this.queryParams.price) * 100
-            ) /
-              100) *
-            10
+            (this.queryParams.xianprice / this.queryParams.price) * 100
+          ) /
+            100) *
+          10
           : 0;
 
       // 鍏抽棴瀵硅瘽妗�
diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue
index 0e82f85..532944b 100644
--- a/src/views/system/tijian/index.vue
+++ b/src/views/system/tijian/index.vue
@@ -1958,11 +1958,15 @@
     // 鏈�鏂颁娇鐢╳ebSocket閫氫俊
     readCardWebSocket(resultObj) {
       let _this = this;
-
+ const isChineseChar = (char) => /[\u4E00-\u9FA5]/.test(char)
       if (resultObj.code === 200 && resultObj.data.name != null) {
         //鍥炴樉鐩稿叧鏁版嵁
         _this.form.cusName = resultObj.data.name;
-        _this.form.cusSex = resultObj.data.sex == "0" ? "濂�" : "鐢�";
+        if (isChineseChar(resultObj.data.sex)) {
+          _this.form.cusSex = resultObj.data.sex == "濂�" ? 1 : 0
+        } else {
+          _this.form.cusSex = resultObj.data.sex;
+        }
         _this.form.cusNational = resultObj.data.mz;
         _this.form.cusBrithday = resultObj.data.csrq;
         if (_this.form.cusBrithday) {
@@ -2017,7 +2021,7 @@
           //鍥炴樉鐩稿叧鏁版嵁
           _this.form.cusName = resultObj.resultContent.partyName;
           _this.form.cusSex =
-            resultObj.resultContent.gender == "0" ? "濂�" : "鐢�";
+            resultObj.resultContent.gender ;
           _this.form.cusNational = resultObj.resultContent.nation;
           _this.form.cusBrithday = resultObj.resultContent.bornDay;
           if (_this.form.cusBrithday) {

--
Gitblit v1.8.0