From 58d1ae47dea17cb10699185066b748766f9ea261 Mon Sep 17 00:00:00 2001
From: qinxianzhangyao <11053546+qinxianzhangyao@user.noreply.gitee.com>
Date: 星期二, 16 七月 2024 17:58:30 +0800
Subject: [PATCH] qxtj
---
src/views/reservation/reservations/index.vue | 1465 ++++++++++++++++++++++-------
src/api/system/interface.js | 23
src/views/hosp/order/index.vue | 1204 ++++++++++++++++-------
src/views/system/interface/index.vue | 84 +
src/views/system/packages/index.vue | 38
vue.config.js | 2
src/views/system/biol/index.vue | 6
src/api/system/tijian.js | 14
src/views/system/interfaces/index.vue | 96 +
src/views/hosp/project/index.vue | 1
10 files changed, 2,148 insertions(+), 785 deletions(-)
diff --git a/src/api/system/interface.js b/src/api/system/interface.js
new file mode 100644
index 0000000..38539a3
--- /dev/null
+++ b/src/api/system/interface.js
@@ -0,0 +1,23 @@
+import request1 from "@/utils/request1";
+
+export function histongbulist() {
+ return request1({
+ url: "/list",
+ method: "get",
+ });
+}
+
+export function histongbuexec() {
+ return request1({
+ url: "/exec",
+ method: "get",
+ });
+}
+
+export function hisexec(data) {
+ return request1({
+ url: "/exec",
+ method: "post",
+ data:data
+ });
+}
\ No newline at end of file
diff --git a/src/api/system/tijian.js b/src/api/system/tijian.js
index db75ad4..3469c29 100644
--- a/src/api/system/tijian.js
+++ b/src/api/system/tijian.js
@@ -1,5 +1,5 @@
import request from "@/utils/request";
-import request1 from "@/utils/request1";
+// import request1 from "@/utils/request1";
// 鏌ヨ浣撴濂楅鍒楄〃
export function deptTreeSelect(cusSex) {
@@ -191,9 +191,9 @@
}
-export function readCertCardInfos() {
- return request1({
- url: "/readCertCardInfos",
- method: "get",
- });
-}
\ No newline at end of file
+// export function readCertCardInfos() {
+// return request1({
+// url: "/readCertCardInfos",
+// method: "get",
+// });
+// }
\ No newline at end of file
diff --git a/src/views/hosp/order/index.vue b/src/views/hosp/order/index.vue
index cf5ca05..bfc6de6 100644
--- a/src/views/hosp/order/index.vue
+++ b/src/views/hosp/order/index.vue
@@ -453,94 +453,224 @@
style="height: 860px"
append-to-body
>
- <el-row type="flex" class="row-bg" justify="space-around">
- <el-col :span="6">
- <div
- style="text-align: center; margin-bottom: 10px; margin-top: 10px"
- >
- 椤圭洰鍒楄〃
- </div>
- <el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="filterText">
- </el-input>
- <div class="tab3">
- <el-tree
- class="filter-tree"
- v-loading="loading"
- :data="Treedata"
- :props="defaultProps"
- show-checkbox
- node-key="proId"
- @check="handleCurrentChecked"
- :default-checked-keys="checkedkey"
- :filter-node-method="filterNode"
- ref="tree"
- :render-content="renderContent"
- >
- </el-tree>
- </div>
- </el-col>
- <el-col :span="5">
- <div
- style="text-align: center; margin-bottom: 10px; margin-top: 10px"
- >
- 鏄庣粏椤圭洰鍒楄〃
- </div>
- <div class="tab3">
- <el-tree
- class="filter-tree"
- v-loading="loading"
- :data="TreedataList"
- node-key="proId"
- :props="defaultProps"
- :filter-node-method="filterNode"
- show-checkbox
- @check-change="handleCurrentChecked1"
- :default-checked-keys="checkedListkey"
- :render-content="renderContent"
- >
- </el-tree>
- </div>
- </el-col>
- <el-col :span="11">
- <div class="grid-content bg-purple">
- <div
- style="text-align: center; margin-bottom: 10px; margin-top: 10px"
- >
- 宸查�夐」鐩垪琛�
- </div>
- <el-table
- :data="DataList"
- border
- style="width: 100%"
- height="400"
- :span-method="objectSpanMethod"
- >
- <el-table-column prop="propinName" label="妫�鏌ラ」鐩�">
- </el-table-column>
- <el-table-column prop="proPrice" label="鍘熶环" width="56px">
- </el-table-column>
- <el-table-column prop="proName" label="鏄庣粏椤圭洰" width="260px">
- </el-table-column>
+ <el-tabs
+ type="border-card"
+ style="height: 640px; margin: 0 10px; width: 100%"
+ @tab-click="handleClick"
+ v-model="activeNames"
+ >
+ <el-tab-pane label="缁勫悎" name="first">
+ <div class="tab8">
+ <el-row :gutter="20" style="width: 100%">
+ <el-col :span="6">
+ <div
+ style="
+ text-align: center;
+ margin-bottom: 10px;
+ margin-top: 10px;
+ "
+ >
+ 椤圭洰鍒楄〃
+ </div>
+ <el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="filterage">
+ </el-input>
+ <div class="tab3">
+ <el-tree
+ class="filter-tree"
+ v-loading="loading"
+ :data="packageList"
+ :props="defaultProp"
+ show-checkbox
+ node-key="id"
+ @check="handlepackage"
+ :default-checked-keys="checkedkeys"
+ :filter-node-method="filterpackage"
+ ref="treas"
+ :render-content="renderContents"
+ >
+ </el-tree>
+ </div>
+ </el-col>
+ <el-col :span="6">
+ <div
+ style="
+ text-align: center;
+ margin-bottom: 10px;
+ margin-top: 10px;
+ "
+ >
+ 鏄庣粏椤圭洰鍒楄〃
+ </div>
+ <div class="tab3">
+ <el-tree
+ class="filter-tree"
+ v-loading="loading"
+ :data="packagedataList"
+ node-key="proId"
+ :props="defaultpackProps"
+ :render-content="renderContent"
+ >
+ </el-tree>
+ </div>
+ </el-col>
+ <el-col :span="11">
+ <div class="grid-content bg-purple">
+ <div
+ style="
+ text-align: center;
+ margin-bottom: 10px;
+ margin-top: 10px;
+ "
+ >
+ 宸查�夐」鐩垪琛�
+ </div>
+ <el-table
+ :data="Datalists"
+ border
+ style="width: 100%"
+ height="400"
+ :span-method="objectspanmethod"
+ >
+ <el-table-column prop="propinName" label="妫�鏌ラ」鐩�">
+ </el-table-column>
+ <el-table-column
+ prop="proName"
+ label="鏄庣粏椤圭洰"
+ width="260px"
+ >
+ </el-table-column>
+ <el-table-column prop="proPrice" label="鍘熶环" width="56px">
+ </el-table-column>
- <el-table-column
- label="鎿嶄綔"
- align="center"
- fixed="right"
- class-name="small-padding fixed-width"
- width="50px"
+ <el-table-column
+ label="鎿嶄綔"
+ align="center"
+ class-name="small-padding fixed-width"
+ width="50px"
+ >
+ <template slot-scope="scope">
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-delete"
+ @click="handleDel(scope.row)"
+ title="鍒犻櫎"
+ ></el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+
+ <h3 style="font-weight: 600">鍚堣锛歿{ marryalls }}鍏�</h3>
+ </div>
+ </el-col>
+ </el-row>
+ </div>
+ </el-tab-pane>
+ <el-tab-pane label="鍗曢」" name="third">
+ <el-row type="flex" class="row-bg" justify="space-around">
+ <el-col :span="6">
+ <div
+ style="
+ text-align: center;
+ margin-bottom: 10px;
+ margin-top: 10px;
+ "
>
- <template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- title="鍒犻櫎"
- ></el-button>
- </template>
- </el-table-column>
- </el-table>
- <el-collapse v-model="activeName" accordion v-if="list1">
+ 椤圭洰鍒楄〃
+ </div>
+ <el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="filterText">
+ </el-input>
+ <div class="tab3">
+ <el-tree
+ class="filter-tree"
+ v-loading="loading"
+ :data="Treedata"
+ :props="defaultProps"
+ show-checkbox
+ node-key="proId"
+ @check="handleCurrentChecked"
+ :default-checked-keys="checkedkey"
+ :filter-node-method="filterNode"
+ ref="tree"
+ :render-content="renderContent"
+ >
+ </el-tree>
+ </div>
+ </el-col>
+ <el-col :span="5">
+ <div
+ style="
+ text-align: center;
+ margin-bottom: 10px;
+ margin-top: 10px;
+ "
+ >
+ 鏄庣粏椤圭洰鍒楄〃
+ </div>
+ <div class="tab3">
+ <el-tree
+ class="filter-tree"
+ v-loading="loading"
+ :data="TreedataList"
+ node-key="proId"
+ :props="defaultProps"
+ :filter-node-method="filterNode"
+ show-checkbox
+ @check-change="handleCurrentChecked1"
+ :default-checked-keys="checkedListkey"
+ :render-content="renderContent"
+ >
+ </el-tree>
+ </div>
+ </el-col>
+ <el-col :span="11">
+ <div class="grid-content bg-purple">
+ <div
+ style="
+ text-align: center;
+ margin-bottom: 10px;
+ margin-top: 10px;
+ "
+ >
+ 宸查�夐」鐩垪琛�
+ </div>
+ <el-table
+ :data="DataList"
+ border
+ style="width: 100%"
+ height="400"
+ :span-method="objectSpanMethod"
+ >
+ <el-table-column prop="propinName" label="妫�鏌ラ」鐩�">
+ </el-table-column>
+ <el-table-column prop="proPrice" label="鍘熶环" width="56px">
+ </el-table-column>
+ <el-table-column
+ prop="proName"
+ label="鏄庣粏椤圭洰"
+ width="260px"
+ >
+ </el-table-column>
+
+ <el-table-column
+ label="鎿嶄綔"
+ align="center"
+ fixed="right"
+ class-name="small-padding fixed-width"
+ width="50px"
+ >
+ <template slot-scope="scope">
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-delete"
+ @click="handleDelete(scope.row)"
+ title="鍒犻櫎"
+ ></el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <!-- <el-collapse v-model="activeName" accordion v-if="list1">
<div>
<el-collapse-item title="璇烽�夋嫨椤圭洰">
<el-table :data="DataList" border style="width: 100%">
@@ -551,71 +681,73 @@
</el-table>
</el-collapse-item>
</div>
- </el-collapse>
- <template>
- <el-form :model="form">
- <el-form-item label="浣撴绫诲瀷" prop="tjType">
- <el-radio-group v-model="form.tjType">
- <el-radio :label="1">鍥㈤槦</el-radio>
- <el-radio :label="2">涓汉</el-radio>
- </el-radio-group>
- </el-form-item>
- </el-form>
- </template>
+ </el-collapse> -->
+ <template>
+ <el-form :model="form">
+ <el-form-item label="浣撴绫诲瀷" prop="tjType">
+ <el-radio-group v-model="form.tjType">
+ <el-radio :label="1">鍥㈤槦</el-radio>
+ <el-radio :label="2">涓汉</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ </el-form>
+ </template>
- <div class="outside">
- <el-form :inline="true" class="outside1">
- <el-form-item label="鍘熶环">
- <el-input
- placeholder="鍘熶环"
- :value="TotalPrice1"
- disabled
- style="width: 90px"
- ></el-input>
- </el-form-item>
- <el-form-item label="鎶樻墸璁惧畾">
- <el-input
- style="width: 90px"
- type="number"
- v-model="discount"
- :value="discount"
- ></el-input>
- </el-form-item>
- <el-form-item label="搴斾粯閲戦">
- <el-input
- placeholder="搴斾粯閲戦"
- :value="TotalPrice1 * (discount / 10)"
- style="width: 90px"
- ></el-input>
- </el-form-item>
- <el-form-item label="浠樻绫诲瀷" prop="payType">
- <el-select
- style="width: 120px"
- v-model="payType"
- placeholder="璇烽�夋嫨浠樻绫诲瀷"
- >
- <el-option
- v-for="dict in dict.type.dict_pay_type"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
- </el-select>
- </el-form-item>
- <el-form-item>
- <el-button
- type="primary"
- @click="submitPrice"
- :disabled="confirm"
- style="margin-top: 34px"
- >鎻愪氦</el-button
- >
- </el-form-item>
- </el-form>
- </div>
- </div>
- </el-col>
- </el-row>
+ <div class="outside">
+ <el-form :inline="true" class="outside1">
+ <el-form-item label="鍘熶环">
+ <el-input
+ placeholder="鍘熶环"
+ :value="TotalPrice1"
+ disabled
+ style="width: 90px"
+ ></el-input>
+ </el-form-item>
+ <el-form-item label="鎶樻墸璁惧畾">
+ <el-input
+ style="width: 90px"
+ type="number"
+ v-model="discount"
+ :value="discount"
+ ></el-input>
+ </el-form-item>
+ <el-form-item label="搴斾粯閲戦">
+ <el-input
+ placeholder="搴斾粯閲戦"
+ :value="TotalPrice1 * (discount / 10)"
+ style="width: 90px"
+ ></el-input>
+ </el-form-item>
+ <el-form-item label="浠樻绫诲瀷" prop="payType">
+ <el-select
+ style="width: 120px"
+ v-model="payType"
+ placeholder="璇烽�夋嫨浠樻绫诲瀷"
+ >
+ <el-option
+ v-for="dict in dict.type.dict_pay_type"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item>
+ <el-button
+ type="primary"
+ @click="submitPrice"
+ :disabled="confirm"
+ style="margin-top: 34px"
+ >鎻愪氦</el-button
+ >
+ </el-form-item>
+ </el-form>
+ </div>
+ </div>
+ </el-col>
+ </el-row>
+ </el-tab-pane>
+ </el-tabs>
</el-dialog>
<!-- 娣诲姞琛ュ綍椤圭洰 -->
@@ -626,183 +758,319 @@
style="height: 860px"
append-to-body
>
- <el-row type="flex" class="row-bg" justify="space-around">
- <el-col :span="6">
- <div
- style="text-align: center; margin-bottom: 10px; margin-top: 10px"
- >
- 椤圭洰鍒楄〃
- </div>
- <el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="filterText">
- </el-input>
- <div class="tab3">
- <el-tree
- class="filter-tree"
- v-loading="loading"
- :data="Treedata"
- :props="defaultProps"
- show-checkbox
- node-key="proId"
- @check="handleCurrentChecked"
- :default-checked-keys="checkedkey"
- :filter-node-method="filterNode"
- ref="tree"
- :render-content="renderContent"
- >
- </el-tree>
- </div>
- </el-col>
- <el-col :span="5">
- <div
- style="text-align: center; margin-bottom: 10px; margin-top: 10px"
- >
- 鏄庣粏椤圭洰鍒楄〃
- </div>
- <div class="tab3">
- <div class="outside1">
- <el-tree
- class="filter-tree"
- v-loading="loading"
- :data="TreedataList"
- node-key="proId"
- :props="defaultProps"
- :filter-node-method="filterNode"
- show-checkbox
- @check-change="handleCurrentChecked1"
- :default-checked-keys="checkedListkey"
- :render-content="renderContent"
- >
- </el-tree>
- </div>
- </div>
- </el-col>
- <el-col :span="11">
- <div class="grid-content bg-purple">
- <div
- style="text-align: center; margin-bottom: 10px; margin-top: 10px"
- >
- 宸查�夐」鐩垪琛�
- </div>
-
- <el-table
- :data="DataList"
- border
- style="width: 100%"
- height="400"
- :span-method="objectSpanMethod"
- >
- <el-table-column prop="propinName" label="妫�鏌ラ」鐩�">
- </el-table-column>
- <el-table-column prop="proPrice" label="鍘熶环" width="56px">
- </el-table-column>
- <el-table-column prop="proName" label="鏄庣粏椤圭洰" width="260px">
- </el-table-column>
-
- <el-table-column
- label="鎿嶄綔"
- align="center"
- fixed="right"
- class-name="small-padding fixed-width"
- width="50px"
- >
- <template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- title="鍒犻櫎"
- ></el-button>
- </template>
- </el-table-column>
- </el-table>
- <el-collapse v-model="activeName" accordion v-if="list1">
- <div>
- <el-collapse-item title="璇烽�夋嫨椤圭洰">
+ <el-tabs
+ type="border-card"
+ style="height: 640px; margin: 0 10px; width: 100%"
+ @tab-click="handleClick"
+ v-model="activeNames"
+ >
+ <el-tab-pane label="缁勫悎" name="first">
+ <div class="tab8">
+ <el-row :gutter="20" style="width: 100%">
+ <el-col :span="6">
+ <div
+ style="
+ text-align: center;
+ margin-bottom: 10px;
+ margin-top: 10px;
+ "
+ >
+ 椤圭洰鍒楄〃
+ </div>
+ <el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="filterage">
+ </el-input>
+ <div class="tab3">
+ <el-tree
+ class="filter-tree"
+ v-loading="loading"
+ :data="packageList"
+ :props="defaultProp"
+ show-checkbox
+ node-key="id"
+ @check="handlepackage"
+ :default-checked-keys="checkedkeys"
+ :filter-node-method="filterpackage"
+ ref="treas"
+ :render-content="renderContents"
+ >
+ </el-tree>
+ </div>
+ </el-col>
+ <el-col :span="6">
+ <div
+ style="
+ text-align: center;
+ margin-bottom: 10px;
+ margin-top: 10px;
+ "
+ >
+ 鏄庣粏椤圭洰鍒楄〃
+ </div>
+ <div class="tab3">
+ <el-tree
+ class="filter-tree"
+ v-loading="loading"
+ :data="packagedataList"
+ node-key="proId"
+ :props="defaultpackProps"
+ :render-content="renderContent"
+ >
+ </el-tree>
+ </div>
+ </el-col>
+ <el-col :span="11">
+ <div class="grid-content bg-purple">
+ <div
+ style="
+ text-align: center;
+ margin-bottom: 10px;
+ margin-top: 10px;
+ "
+ >
+ 宸查�夐」鐩垪琛�
+ </div>
<el-table
- :data="DataList"
+ :data="Datalists"
border
style="width: 100%"
height="400"
- :span-method="objectSpanMethod"
+ :span-method="objectspanmethod"
>
- <el-table-column prop="proName" label="椤圭洰" width="180">
+ <el-table-column prop="propinName" label="妫�鏌ラ」鐩�">
</el-table-column>
- <el-table-column prop="ordPrice" label="鍘熶环">
+ <el-table-column
+ prop="proName"
+ label="鏄庣粏椤圭洰"
+ width="260px"
+ >
+ </el-table-column>
+ <el-table-column prop="proPrice" label="鍘熶环" width="56px">
+ </el-table-column>
+
+ <el-table-column
+ label="鎿嶄綔"
+ align="center"
+ class-name="small-padding fixed-width"
+ width="50px"
+ >
+ <template slot-scope="scope">
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-delete"
+ @click="handleDel(scope.row)"
+ title="鍒犻櫎"
+ ></el-button>
+ </template>
</el-table-column>
</el-table>
- </el-collapse-item>
- </div>
- </el-collapse>
- <template>
- <el-form :model="form">
- <el-form-item label="浣撴绫诲瀷" prop="tjType">
- <el-radio-group v-model="form.tjType">
- <el-radio :label="1">鍥㈤槦</el-radio>
- <el-radio :label="2">涓汉</el-radio>
- </el-radio-group>
- </el-form-item>
- </el-form>
- </template>
-
- <div class="outside">
- <el-form :inline="true" class="outside1">
- <el-form-item label="鍘熶环">
- <el-input
- placeholder="鍘熶环"
- :value="TotalPrice1"
- disabled
- style="width: 90px"
- ></el-input>
- </el-form-item>
- <el-form-item label="鎶樻墸璁惧畾">
- <el-input
- style="width: 90px"
- type="number"
- v-model="discount"
- :value="discount"
- ></el-input>
- </el-form-item>
- <el-form-item label="搴斾粯閲戦">
- <el-input
- placeholder="搴斾粯閲戦"
- :value="TotalPrice1 * (discount / 10)"
- style="width: 90px"
- ></el-input>
- </el-form-item>
- <el-form-item label="浠樻绫诲瀷" prop="payType">
- <el-select
- style="width: 120px"
- v-model="payType"
- placeholder="璇烽�夋嫨浠樻绫诲瀷"
- >
- <el-option
- v-for="dict in dict.type.dict_pay_type"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
- </el-select>
- </el-form-item>
- <el-form-item>
- <el-button
- type="primary"
- @click="submitPrice1"
- :disabled="confirm"
- style="margin-top: 34px"
- >鎻愪氦</el-button
- >
- </el-form-item>
- </el-form>
- </div>
+ <h3 style="font-weight: 600">鍚堣锛歿{ marryalls }}鍏�</h3>
+ </div>
+ </el-col>
+ </el-row>
</div>
- </el-col>
- </el-row>
+ </el-tab-pane>
+ <el-tab-pane label="鍗曢」" name="third">
+ <el-row type="flex" class="row-bg" justify="space-around">
+ <el-col :span="6">
+ <div
+ style="
+ text-align: center;
+ margin-bottom: 10px;
+ margin-top: 10px;
+ "
+ >
+ 椤圭洰鍒楄〃
+ </div>
+ <el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="filterText">
+ </el-input>
+ <div class="tab3">
+ <el-tree
+ class="filter-tree"
+ v-loading="loading"
+ :data="Treedata"
+ :props="defaultProps"
+ show-checkbox
+ node-key="proId"
+ @check="handleCurrentChecked"
+ :default-checked-keys="checkedkey"
+ :filter-node-method="filterNode"
+ ref="tree"
+ :render-content="renderContent"
+ >
+ </el-tree>
+ </div>
+ </el-col>
+ <el-col :span="5">
+ <div
+ style="
+ text-align: center;
+ margin-bottom: 10px;
+ margin-top: 10px;
+ "
+ >
+ 鏄庣粏椤圭洰鍒楄〃
+ </div>
+ <div class="tab3">
+ <div class="outside1">
+ <el-tree
+ class="filter-tree"
+ v-loading="loading"
+ :data="TreedataList"
+ node-key="proId"
+ :props="defaultProps"
+ :filter-node-method="filterNode"
+ show-checkbox
+ @check-change="handleCurrentChecked1"
+ :default-checked-keys="checkedListkey"
+ :render-content="renderContent"
+ >
+ </el-tree>
+ </div>
+ </div>
+ </el-col>
+ <el-col :span="11">
+ <div class="grid-content bg-purple">
+ <div
+ style="
+ text-align: center;
+ margin-bottom: 10px;
+ margin-top: 10px;
+ "
+ >
+ 宸查�夐」鐩垪琛�
+ </div>
+
+ <el-table
+ :data="DataList"
+ border
+ style="width: 100%"
+ height="400"
+ :span-method="objectSpanMethod"
+ >
+ <el-table-column prop="propinName" label="妫�鏌ラ」鐩�">
+ </el-table-column>
+ <el-table-column prop="proPrice" label="鍘熶环" width="56px">
+ </el-table-column>
+ <el-table-column
+ prop="proName"
+ label="鏄庣粏椤圭洰"
+ width="260px"
+ >
+ </el-table-column>
+
+ <el-table-column
+ label="鎿嶄綔"
+ align="center"
+ fixed="right"
+ class-name="small-padding fixed-width"
+ width="50px"
+ >
+ <template slot-scope="scope">
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-delete"
+ @click="handleDelete(scope.row)"
+ title="鍒犻櫎"
+ ></el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <!-- <el-collapse v-model="activeName" accordion v-if="list1">
+ <div>
+ <el-collapse-item title="璇烽�夋嫨椤圭洰">
+ <el-table
+ :data="DataList"
+ border
+ style="width: 100%"
+ height="400"
+ :span-method="objectSpanMethod"
+ >
+ <el-table-column
+ prop="proName"
+ label="椤圭洰"
+ width="180"
+ >
+ </el-table-column>
+ <el-table-column prop="ordPrice" label="鍘熶环">
+ </el-table-column>
+ </el-table>
+ </el-collapse-item>
+ </div>
+ </el-collapse> -->
+
+ <template>
+ <el-form :model="form">
+ <el-form-item label="浣撴绫诲瀷" prop="tjType">
+ <el-radio-group v-model="form.tjType">
+ <el-radio :label="1">鍥㈤槦</el-radio>
+ <el-radio :label="2">涓汉</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ </el-form>
+ </template>
+
+ <div class="outside">
+ <el-form :inline="true" class="outside1">
+ <el-form-item label="鍘熶环">
+ <el-input
+ placeholder="鍘熶环"
+ :value="TotalPrice1"
+ disabled
+ style="width: 90px"
+ ></el-input>
+ </el-form-item>
+ <el-form-item label="鎶樻墸璁惧畾">
+ <el-input
+ style="width: 90px"
+ type="number"
+ v-model="discount"
+ :value="discount"
+ ></el-input>
+ </el-form-item>
+ <el-form-item label="搴斾粯閲戦">
+ <el-input
+ placeholder="搴斾粯閲戦"
+ :value="TotalPrice1 * (discount / 10)"
+ style="width: 90px"
+ ></el-input>
+ </el-form-item>
+ <el-form-item label="浠樻绫诲瀷" prop="payType">
+ <el-select
+ style="width: 120px"
+ v-model="payType"
+ placeholder="璇烽�夋嫨浠樻绫诲瀷"
+ >
+ <el-option
+ v-for="dict in dict.type.dict_pay_type"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item>
+ <el-button
+ type="primary"
+ @click="submitPrice1"
+ :disabled="confirm"
+ style="margin-top: 34px"
+ >鎻愪氦</el-button
+ >
+ </el-form-item>
+ </el-form>
+ </div>
+ </div>
+ </el-col>
+ </el-row>
+ </el-tab-pane>
+ </el-tabs>
</el-dialog>
<!-- 娣诲姞鎴栦慨鏀逛綋妫�璁板綍瀵硅瘽妗� -->
- <el-dialog :title="title" :visible.sync="open" width="950px" append-to-body >
+ <el-dialog :title="title" :visible.sync="open" width="950px" append-to-body>
<el-tabs v-model="activeName1" type="card">
<!-- <el-tab-pane label="璁㈠崟娴佹按" name="first">
<el-table :data="numberList" style="width: 100%">
@@ -839,7 +1107,7 @@
</el-table-column>
</el-table>
</el-tab-pane> -->
- <el-tab-pane label="椤圭洰姹囨��" name="second" style="height: 400px;">
+ <el-tab-pane label="椤圭洰姹囨��" name="second" style="height: 400px">
<el-table :data="huizongList" style="width: 100%" max-height="200">
<el-table-column
align="center"
@@ -865,7 +1133,7 @@
</el-table-column>
</el-table>
</el-tab-pane>
- <el-tab-pane label="鏄庣粏椤圭洰" name="third" style="height: 350px;">
+ <el-tab-pane label="鏄庣粏椤圭洰" name="third" style="height: 350px">
<el-table
:data="infoList"
style="width: 100%"
@@ -920,7 +1188,13 @@
</div>
<div class="tab3">
- <el-table :data="DataLists" border style="width: 100%" height="400" @selection-change="handleProjectssChange" >
+ <el-table
+ :data="DataLists"
+ border
+ style="width: 100%"
+ height="400"
+ @selection-change="handleProjectssChange"
+ >
<el-table-column type="selection" width="40" align="center" />
<el-table-column
type="index"
@@ -957,7 +1231,6 @@
width="96px"
>
</el-table-column>
-
</el-table>
</div>
</el-col>
@@ -1003,9 +1276,11 @@
getNewDateList,
revokeTjOrderByTjNum,
getTransitionInfo,
- getBlproByTjh,revokeBlProByBldhAndTjh
+ getBlproByTjh,
+ revokeBlProByBldhAndTjh,
} from "@/api/hosp/order";
import moment from "moment";
+import { getZhList, getlistByZhId } from "@/api/system/package";
import { getwater } from "@/api/hosp/customer";
import ViewPdf from "@/components/ViewPdf";
import {
@@ -1023,9 +1298,10 @@
data() {
return {
huizongList: [],
- DataLists:[],
+ DataLists: [],
infoList: [],
- bldhs:[],
+ bldhs: [],
+ filterage: "",
activeName1: "second",
filterText: "",
orderIds: "",
@@ -1035,13 +1311,20 @@
cusIds: "",
userIds: "",
cusIdcard: "",
+ defaultpackProps: {
+ children: [],
+ label: "proName",
+ },
cusName: "",
cusPhone: "",
cusSex: "",
reportTimeList: "",
createTimeList: "",
+ packagedataList: [],
cusId: "",
payType: "0",
+ packageList: [],
+ checkedkeys: [],
dialogVisible: false,
daoZhenDan: false,
Projectopen: false,
@@ -1051,12 +1334,16 @@
flag: true,
bill: [],
Treedata: [],
- DataListss:[],
+ DataListss: [],
checkedkey: [],
checkedListkey: [],
defaultProps: {
children: [],
label: "proName",
+ },
+ defaultProp: {
+ children: [],
+ label: "zhmc",
},
TreedataList: [],
discount: 10,
@@ -1076,6 +1363,7 @@
dataObj: {},
// 闈炲崟涓鐢�
single: true,
+ activeNames: "first",
// 闈炲涓鐢�
multiple: true,
// 鏄剧ず鎼滅储鏉′欢
@@ -1090,8 +1378,10 @@
orderId: "",
// 鏄惁鏄剧ず寮瑰嚭灞�
open: false,
+ Datalists: [],
// 鏃ユ湡鑼冨洿
datetimerange: [],
+ marryalls: 0,
// 鏌ヨ鍙傛暟
queryParams: {
pageNum: 1,
@@ -1146,6 +1436,9 @@
watch: {
filterText(val) {
this.$refs.tree.filter(val);
+ },
+ filterage(val) {
+ this.$refs.treas.filter(val);
},
},
created() {
@@ -1393,6 +1686,53 @@
this.queryParams.pageNum = 1;
this.getList();
},
+ renderContents(h, { node, data, store }) {
+ return (
+ <span class="custom-tree-node">
+ <span>{node.label}</span>
+ <span>({data.price}鍏�)</span>
+ </span>
+ );
+ },
+
+ objectspanmethod({ row, column, rowIndex, columnIndex }) {
+ let fields = ["propinName"];
+ let cellValue = row[column.property];
+ if (cellValue && fields.includes(column.property)) {
+ let prevRow = this.Datalists[rowIndex - 1];
+ let nextRow = this.Datalists[rowIndex + 1];
+ if (prevRow && prevRow[column.property] === cellValue) {
+ return { rowspan: 0, colspan: 0 };
+ } else {
+ let countRowspan = 1;
+ while (nextRow && nextRow[column.property] === cellValue) {
+ nextRow = this.Datalists[++countRowspan + rowIndex];
+ }
+
+ if (countRowspan > 1) {
+ return { rowspan: countRowspan, colspan: 1 };
+ }
+ }
+ }
+
+ // if (columnIndex == 3) {
+ // let rowspan = 0;
+ // this.DataLists.forEach((element) => {
+ // if (element.propinName === row.propinName) {
+ // rowspan++;
+ // }
+ // });
+ // return [rowspan, 1];
+ // }
+ },
+ filterpackage(value, data) {
+ if (!value) return true;
+ if (data.zhmc.indexOf(value) !== -1) {
+ return data.zhmc.indexOf(value) !== -1;
+ } else {
+ return data.pym.indexOf(value) !== -1;
+ }
+ },
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
this.startTime = [];
@@ -1412,6 +1752,7 @@
this.cusName = item.tjCustomerName;
this.cusPhone = item.tjCustomerPhone;
this.cusSex = item.tjCustomerSex;
+ this.form.tjType = parseInt(item.tjType);
});
this.ids = selection.map((item) => item.orderId);
// this.tjNumbers = selection.map((item) => item.tjNumber);
@@ -1432,16 +1773,20 @@
getNumber(tjNumber).then((response) => {
// this.form = response.data;
this.numberList = response.data.charging;
- this.bill =[]
+ this.bill = [];
var copeWith = 0;
var paidIn = 0;
- var discount = ""
- response.data.water.forEach(item => {
+ var discount = "";
+ response.data.water.forEach((item) => {
copeWith += item.copeWith;
- paidIn+= item.copeWith;
- discount= item.discount
- })
- this.bill.push({copeWith:copeWith,paidIn:paidIn,discount:discount});
+ paidIn += item.copeWith;
+ discount = item.discount;
+ });
+ this.bill.push({
+ copeWith: copeWith,
+ paidIn: paidIn,
+ discount: discount,
+ });
this.title = "璁㈠崟娴佹按";
});
@@ -1469,18 +1814,22 @@
getNumber(tjNumber).then((response) => {
// this.form = response.data;
this.numberList = response.data.charging;
- this.bill =[]
+ this.bill = [];
var copeWith = 0;
var paidIn = 0;
- var discount = ""
- response.data.water.forEach(item => {
+ var discount = "";
+ response.data.water.forEach((item) => {
copeWith += item.copeWith;
- paidIn+= item.copeWith;
- discount= item.discount
- })
- this.bill.push({copeWith:copeWith,paidIn:paidIn,discount:discount});
+ paidIn += item.copeWith;
+ discount = item.discount;
+ });
+ this.bill.push({
+ copeWith: copeWith,
+ paidIn: paidIn,
+ discount: discount,
+ });
- console.log(this.bill)
+ console.log(this.bill);
this.title = "璁㈠崟娴佹按";
});
getTransitionInfo(tjNumber).then((res) => {
@@ -1499,6 +1848,62 @@
1;
});
});
+ },
+
+ handleClick(tab, event) {
+ if (this.activeNames == "first") {
+ this.marryalls = 0;
+ this.Datalists = [];
+ this.checkedkeys = [];
+ getZhList().then((response) => {
+ if (response.data) {
+ this.packageList = response.data;
+ }
+ this.loading = false;
+ });
+ } else {
+ console.log(111)
+ this.TotalPrice1 = 0;
+ this.checkedkey =[]
+ this.DataList = []
+ this.getDataList();
+ if (this.marryalls != 0) {
+ this.TotalPrice1 += this.marryalls;
+ }
+ }
+ },
+
+ handlepackage(data, checked, checkedNodes) {
+ if (checked.checkedNodes.length != 0) {
+ this.$refs.treas.setCheckedKeys([data.id]);
+ let datas = {
+ zhId: data.id,
+ };
+ getlistByZhId(datas).then((res) => {
+ this.packagedataList = res.data.tjProjectList;
+ for (var i = 0; i < this.packagedataList.length; i++) {
+ let proId = this.packagedataList[i].proId;
+ getProSonDxList(proId).then((res) => {
+ this.TreedataList = res.data.list;
+ this.TreedataList.forEach((item) => {
+ this.Datalists.push(item);
+ if (this.Datalists.length >= 1) {
+ this.marryalls = 0;
+ this.Datalists.forEach((item1) => {
+ this.marryalls += item1.proPrice;
+ this.packagedataList.forEach((item3) => {
+ if (item1.proParentId == item3.proId) {
+ item1.propinName = item3.proName;
+ }
+ });
+ });
+ }
+ });
+ });
+ }
+ });
+ } else if (checked.checkedNodes.length == 0) {
+ }
},
renderContent(h, { node, data, store }) {
@@ -1526,10 +1931,12 @@
if (row.tjType) {
this.form.tjType = parseInt(row.tjType);
} else {
- this.form.tjType = 0;
+ this.form.tjType = 2;
}
+ this.activeNames = "first";
/** 鏌ヨ閮ㄩ棬涓嬫媺鏍戠粨鏋� */
- this.getDataList();
+ this.handleClick();
+
this.Projectopen = true;
this.title = "琛ュ綍椤圭洰";
},
@@ -1537,33 +1944,33 @@
getDataList() {
getProParentIdDxList().then((response) => {
this.Treedata = response.data.list;
- this.checkedkey.push(this.Treedata[0].proId);
- let proId = this.Treedata[0].proId;
- getProSonDxList(proId).then((res) => {
- this.TreedataList = res.data.list;
- this.TreedataList.forEach((item) => {
- this.checkedListkey.push(item.proId);
- this.DataList.push(item);
- this.DataList.forEach((item) => {
- item.propinName = this.Treedata[0].proName;
- });
- });
- this.TotalPrice1 = 0;
+ // this.checkedkey.push(this.Treedata[0].proId);
+ // let proId = this.Treedata[0].proId;
+ // getProSonDxList(proId).then((res) => {
+ // this.TreedataList = res.data.list;
+ // this.TreedataList.forEach((item) => {
+ // this.checkedListkey.push(item.proId);
+ // this.DataList.push(item);
+ // this.DataList.forEach((item) => {
+ // item.propinName = this.Treedata[0].proName;
+ // });
+ // });
+ // this.TotalPrice1 = 0;
- if (this.DataList.length != 0) {
- this.list1 = false;
- this.DataList.forEach((item) => {
- this.TotalPrice1 = item.proPrice + this.TotalPrice1;
- });
- }
- });
+ // if (this.DataList.length != 0) {
+ // this.list1 = false;
+ // this.DataList.forEach((item) => {
+ // this.TotalPrice1 = item.proPrice + this.TotalPrice1;
+ // });
+ // }
+ // });
this.loading = false;
});
},
revokeProject() {
getBlproByTjh(this.tjnumbers).then((res) => {
if (res.data) {
- this.DataLists = res.data
+ this.DataLists = res.data;
this.Projectssopen = true;
this.title1 = "鎾ら攢琛ュ綍";
} else {
@@ -1587,8 +1994,10 @@
cusPhone: this.cusPhone,
cusSex: this.cusSex,
};
+ this.activeNames = "first";
/** 鏌ヨ閮ㄩ棬涓嬫媺鏍戠粨鏋� */
- this.getDataList();
+ this.handleClick();
+
this.Projectopen1 = true;
this.title = "琛ュ綍椤圭洰";
},
@@ -1617,6 +2026,9 @@
this.DataList.forEach((item) => {
this.TotalPrice1 = item.proPrice + this.TotalPrice1;
});
+ if (this.marryalls != 0) {
+ this.TotalPrice1 += this.marryalls;
+ }
}
});
} else if (checked.checkedNodes.length == 0) {
@@ -1651,6 +2063,9 @@
this.DataList.forEach((item1) => {
this.TotalPrice1 = item1.proPrice + this.TotalPrice1;
});
+ if (this.marryalls != 0) {
+ this.TotalPrice1 += this.marryalls;
+ }
}
});
} else if (checked == true) {
@@ -1665,9 +2080,22 @@
this.DataList.forEach((item1) => {
this.TotalPrice1 = item1.proPrice + this.TotalPrice1;
});
+ if (this.marryalls != 0) {
+ this.TotalPrice1 += this.marryalls;
+ }
}
},
-
+ handleDel(row) {
+ this.Datalists.forEach((item, index) => {
+ if (item.proId == row.proId) {
+ this.Datalists.splice(index, 1);
+ this.marryalls = 0;
+ this.Datalists.forEach((item1) => {
+ this.marryalls += item1.proPrice;
+ });
+ }
+ });
+ },
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
this.DataList.forEach((item, index) => {
@@ -1677,6 +2105,9 @@
this.DataList.forEach((item1) => {
this.TotalPrice1 = item1.proPrice + this.TotalPrice1;
});
+ if (this.marryalls != 0) {
+ this.TotalPrice1 += this.marryalls;
+ }
}
});
},
@@ -1753,6 +2184,11 @@
this.proIds.push(item.proId);
});
}
+ if (this.Datalists.length != 0) {
+ this.Datalists.forEach((item) => {
+ this.proIds.push(item.proId);
+ });
+ }
let data = {
cusId: this.cusId,
proIds: this.proIds,
@@ -1794,6 +2230,11 @@
this.proIds.push(item.proId);
});
}
+ if (this.Datalists.length != 0) {
+ this.Datalists.forEach((item) => {
+ this.proIds.push(item.proId);
+ });
+ }
let data = {
cusId: this.cusIds,
proIds: this.proIds,
@@ -1828,23 +2269,22 @@
});
},
- handleProjectssChange(selection){
- this.DataListss =[]
+ handleProjectssChange(selection) {
+ this.DataListss = [];
this.bldhs = selection.map((item) => item.bldh);
- selection.forEach(item => {
- item.projectList.forEach(item1 => {
- item1.children.forEach(item2 => {
- this.DataListss.push(item2)
- if(this.DataListss.length != 0){
- this.DataListss.forEach(item => {
- if(item.proParentId ==item1.proId )
- item.propinName= item1.proName
- })
+ selection.forEach((item) => {
+ item.projectList.forEach((item1) => {
+ item1.children.forEach((item2) => {
+ this.DataListss.push(item2);
+ if (this.DataListss.length != 0) {
+ this.DataListss.forEach((item) => {
+ if (item.proParentId == item1.proId)
+ item.propinName = item1.proName;
+ });
}
- })
- })
-
- })
+ });
+ });
+ });
},
/** 鎻愪氦鎸夐挳 */
@@ -1857,18 +2297,18 @@
.then(() => {
let data = {
tjh: this.tjnumbers,
- bldhs:this.bldhs
- }
- revokeBlProByBldhAndTjh(data).then(res => {
- this.Projectssopen =false
- })
+ bldhs: this.bldhs,
+ };
+ revokeBlProByBldhAndTjh(data).then((res) => {
+ this.Projectssopen = false;
+ });
})
.catch(() => {
this.$message({
type: "info",
message: "宸插彇娑堟挙閿�",
});
- this.Projectssopen =false
+ this.Projectssopen = false;
});
},
diff --git a/src/views/hosp/project/index.vue b/src/views/hosp/project/index.vue
index 7e73761..445e921 100644
--- a/src/views/hosp/project/index.vue
+++ b/src/views/hosp/project/index.vue
@@ -1567,6 +1567,7 @@
handleUpdate1() {
this.open = true;
this.form = this.xiugaiList;
+ console.log(this.form)
this.proParent = true;
// if(){
// this.proParent = true
diff --git a/src/views/reservation/reservations/index.vue b/src/views/reservation/reservations/index.vue
index c1c568f..ff98041 100644
--- a/src/views/reservation/reservations/index.vue
+++ b/src/views/reservation/reservations/index.vue
@@ -1,105 +1,294 @@
<template>
<div class="app-container">
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+ <el-form
+ :model="queryParams"
+ ref="queryForm"
+ size="small"
+ :inline="true"
+ v-show="showSearch"
+ label-width="68px"
+ >
<el-form-item label="濮撳悕" prop="name">
- <el-input style="width: 120px" v-model="queryParams.name" placeholder="璇疯緭鍏ュ鍚�" clearable
- @keyup.enter.native="handleQuery" />
+ <el-input
+ style="width: 120px"
+ v-model="queryParams.name"
+ placeholder="璇疯緭鍏ュ鍚�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
</el-form-item>
<el-form-item label="韬唤璇佸彿" prop="idCard">
- <el-input v-model="queryParams.idCard" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" clearable @keyup.enter.native="handleQuery" />
+ <el-input
+ v-model="queryParams.idCard"
+ placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
</el-form-item>
<el-form-item label="鑱旂郴鐢佃瘽" prop="phoe">
- <el-input v-model="queryParams.phoe" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" clearable @keyup.enter.native="handleQuery"
- style="width: 140px" />
+ <el-input
+ v-model="queryParams.phoe"
+ placeholder="璇疯緭鍏ヨ仈绯荤數璇�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ style="width: 140px"
+ />
</el-form-item>
<el-form-item label="鍗曚綅鍚嶇О" prop="company">
- <el-select :remote-method="getRemoteData" v-model="queryParams.company" value-key="drugManufacturerId" remote
- filterable placeholder="璇烽�夋嫨鍗曚綅鍚嶇О" clearable @change="searchSelect">
- <el-option v-for="dict in CompanyList" :key="dict.drugManufacturerId" :label="dict.cnName"
- :value="dict.cnName" />
+ <el-select
+ :remote-method="getRemoteData"
+ v-model="queryParams.company"
+ value-key="drugManufacturerId"
+ remote
+ filterable
+ placeholder="璇烽�夋嫨鍗曚綅鍚嶇О"
+ clearable
+ @change="searchSelect"
+ >
+ <el-option
+ v-for="dict in CompanyList"
+ :key="dict.drugManufacturerId"
+ :label="dict.cnName"
+ :value="dict.cnName"
+ />
</el-select>
</el-form-item>
<el-form-item label="棰勭害瓒呮湡" prop="isExpire">
- <el-select v-model="queryParams.isExpire" placeholder="璇烽�夋嫨鏄惁瓒呮湡" clearable style="width: 140px">
- <el-option v-for="dict in options" :key="dict.value" :label="dict.label" :value="dict.value" />
+ <el-select
+ v-model="queryParams.isExpire"
+ placeholder="璇烽�夋嫨鏄惁瓒呮湡"
+ clearable
+ style="width: 140px"
+ >
+ <el-option
+ v-for="dict in options"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
</el-select>
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-search"
+ size="mini"
+ @click="handleQuery"
+ >鎼滅储</el-button
+ >
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+ >閲嶇疆</el-button
+ >
</el-form-item>
</el-form>
- <el-row :gutter="10" style="margin: 10px 15px;">
+ <el-row :gutter="10" style="margin: 10px 15px">
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="multiple" @click="batch"
- v-hasPermi="['reservation:reservation:remove']">鎾ら攢棰勭害</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-delete"
+ size="mini"
+ :disabled="multiple"
+ @click="batch"
+ v-hasPermi="['reservation:reservation:remove']"
+ >鎾ら攢棰勭害</el-button
+ >
</el-col>
<el-col :span="1.5">
- <el-button type="primary" size="mini" :disabled="single" @click="receipt"
- v-hasPermi="['reservation:reservation:remove']">琛ユ墦灏忕エ</el-button>
+ <el-button
+ type="primary"
+ size="mini"
+ :disabled="single"
+ @click="receipt"
+ v-hasPermi="['reservation:reservation:remove']"
+ >琛ユ墦灏忕エ</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="reservationList" @selection-change="handleSelectionChange"
- :default-sort="{ prop: 'reservationTime', order: 'descending' }" highlight-current-row style="margin-left: 15px;">
- <el-table-column type="selection" width="40px" align="center" fixed="left" :selectable="selectHandle" />
- <el-table-column label="濮撳悕" align="center" prop="name" width="90px" :show-overflow-tooltip="true" fixed="left" />
- <el-table-column label="鎬у埆" align="center" prop="sex" width="60px" :show-overflow-tooltip="true">
+ <el-table
+ border
+ v-loading="loading"
+ :data="reservationList"
+ @selection-change="handleSelectionChange"
+ :default-sort="{ prop: 'reservationTime', order: 'descending' }"
+ highlight-current-row
+ style="margin-left: 15px"
+ >
+ <el-table-column
+ type="selection"
+ width="40px"
+ align="center"
+ fixed="left"
+ :selectable="selectHandle"
+ />
+ <el-table-column
+ label="濮撳悕"
+ align="center"
+ prop="name"
+ width="90px"
+ :show-overflow-tooltip="true"
+ fixed="left"
+ />
+ <el-table-column
+ label="鎬у埆"
+ align="center"
+ prop="sex"
+ width="60px"
+ :show-overflow-tooltip="true"
+ >
<template slot-scope="scope">
<span v-if="scope.row.sex == '0'">鐢�</span>
<span v-if="scope.row.sex == '1'">濂�</span>
<span v-if="scope.row.sex == '2'">鏈煡</span>
</template>
</el-table-column>
- <el-table-column label="骞撮緞" align="center" prop="age" width="60px" :show-overflow-tooltip="true" />
- <el-table-column label="韬唤璇佸彿" align="center" prop="idCard" width="170px" :show-overflow-tooltip="true" />
- <el-table-column label="鍑虹敓鏃ユ湡" align="center" prop="birthday" width="100px" :show-overflow-tooltip="true">
+ <el-table-column
+ label="骞撮緞"
+ align="center"
+ prop="age"
+ width="60px"
+ :show-overflow-tooltip="true"
+ />
+ <el-table-column
+ label="韬唤璇佸彿"
+ align="center"
+ prop="idCard"
+ width="170px"
+ :show-overflow-tooltip="true"
+ />
+ <el-table-column
+ label="鍑虹敓鏃ユ湡"
+ align="center"
+ prop="birthday"
+ width="100px"
+ :show-overflow-tooltip="true"
+ >
<template slot-scope="scope">
<span>{{ parseTime(scope.row.birthday, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column>
- <el-table-column label="鑱旂郴鐢佃瘽" align="center" prop="phoe" width="110px" :show-overflow-tooltip="true" />
-
- <el-table-column label="棰勭害鏃堕棿" align="center" prop="reservationTime" width="100px" :show-overflow-tooltip="true"
- sortable>
+ <el-table-column
+ label="鑱旂郴鐢佃瘽"
+ align="center"
+ prop="phoe"
+ width="110px"
+ :show-overflow-tooltip="true"
+ />
+
+ <el-table-column
+ label="棰勭害鏃堕棿"
+ align="center"
+ prop="reservationTime"
+ width="100px"
+ :show-overflow-tooltip="true"
+ sortable
+ >
<template slot-scope="scope">
<span>{{ parseTime(scope.row.reservationTime, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column>
- <el-table-column label="浣撴绫诲瀷" align="center" prop="tjType" width="80px" :show-overflow-tooltip="true">
+ <el-table-column
+ label="浣撴绫诲瀷"
+ align="center"
+ prop="tjType"
+ width="80px"
+ :show-overflow-tooltip="true"
+ >
<template slot-scope="scope">
<dict-tag :options="dict.type.dict_team" :value="scope.row.tjType" />
</template>
</el-table-column>
- <el-table-column label="濠氬Щ" align="center" prop="marriage" width="60px" :show-overflow-tooltip="true">
+ <el-table-column
+ label="濠氬Щ"
+ align="center"
+ prop="marriage"
+ width="60px"
+ :show-overflow-tooltip="true"
+ >
<template slot-scope="scope">
- <dict-tag :options="dict.type.dict_user_marry" :value="scope.row.marriage" />
+ <dict-tag
+ :options="dict.type.dict_user_marry"
+ :value="scope.row.marriage"
+ />
</template>
</el-table-column>
- <el-table-column label="姘戞棌" align="center" prop="nation" width="60px" :show-overflow-tooltip="true">
+ <el-table-column
+ label="姘戞棌"
+ align="center"
+ prop="nation"
+ width="60px"
+ :show-overflow-tooltip="true"
+ >
<template slot-scope="scope">
- <dict-tag :options="dict.type.dict_user_national" :value="scope.row.nation" />
+ <dict-tag
+ :options="dict.type.dict_user_national"
+ :value="scope.row.nation"
+ />
</template>
</el-table-column>
<!-- <el-table-column label="浣撴绫诲埆" align="center" prop="tjCategory" width="100px" :show-overflow-tooltip="true" /> -->
<!-- <el-table-column label="閮ㄩ棬" align="center" prop="department" width="90px" :show-overflow-tooltip="true" /> -->
- <el-table-column label="棰勭害瓒呮湡" align="center" prop="isExpire" width="80px" :show-overflow-tooltip="true">
+ <el-table-column
+ label="棰勭害瓒呮湡"
+ align="center"
+ prop="isExpire"
+ width="80px"
+ :show-overflow-tooltip="true"
+ >
<template slot-scope="scope">
<span v-if="scope.row.isExpire == '1'">宸茶繃鏈�</span>
<span v-if="scope.row.isExpire == '2'">鏈繃鏈�</span>
</template>
</el-table-column>
- <el-table-column label="鍗曚綅鍚嶇О" align="center" prop="company" :show-overflow-tooltip="true" />
- <el-table-column label="閭" align="center" prop="email" :show-overflow-tooltip="true" width="160px" />
- <el-table-column label="鍦板潃" align="center" prop="address" :show-overflow-tooltip="true" width="160px" />
+ <el-table-column
+ label="鍗曚綅鍚嶇О"
+ align="center"
+ prop="company"
+ :show-overflow-tooltip="true"
+ />
+ <el-table-column
+ label="閭"
+ align="center"
+ prop="email"
+ :show-overflow-tooltip="true"
+ width="160px"
+ />
+ <el-table-column
+ label="鍦板潃"
+ align="center"
+ prop="address"
+ :show-overflow-tooltip="true"
+ width="160px"
+ />
<el-table-column label="鎿嶄綔" align="center" width="90px" fixed="right">
<template slot-scope="scope">
- <el-button size="mini" type="text" icon="el-icon-s-order" @click="handleUpdate1(scope.row)"
- v-hasPermi="['reservation:reservation:edit']" title="棰勭害璇︾粏"></el-button>
- <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
- v-hasPermi="['reservation:reservation:edit']" title="淇敼"></el-button>
- <el-button size="mini" type="text" title="鎾ら攢棰勭害" icon="el-icon-delete" @click="handleDelete(scope.row)">
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-s-order"
+ @click="handleUpdate1(scope.row)"
+ v-hasPermi="['reservation:reservation:edit']"
+ title="棰勭害璇︾粏"
+ ></el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-edit"
+ @click="handleUpdate(scope.row)"
+ v-hasPermi="['reservation:reservation:edit']"
+ title="淇敼"
+ ></el-button>
+ <el-button
+ size="mini"
+ type="text"
+ title="鎾ら攢棰勭害"
+ icon="el-icon-delete"
+ @click="handleDelete(scope.row)"
+ >
</el-button>
</template>
</el-table-column>
@@ -107,8 +296,13 @@
<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>
<!-- 棰勭害鐧昏璇︽儏瀵硅瘽妗� -->
@@ -116,114 +310,284 @@
<template>
<div>
<div style="width: 1000px">
- <el-form style="margin: 0px 8px" :inline="true" ref="formIn" :model="formIn" :rules="rules"
- :label-position="labelPosition" class="demo-form-inline" label-width="78px">
+ <el-form
+ style="margin: 0px 8px"
+ :inline="true"
+ ref="formIn"
+ :model="formIn"
+ :rules="rules"
+ :label-position="labelPosition"
+ class="demo-form-inline"
+ label-width="78px"
+ >
<el-form-item label="濮撳悕" prop="name">
- <el-input v-model="formIn.name" placeholder="璇疯緭鍏ュ鍚�" style="width: 160px" />
+ <el-input
+ v-model="formIn.name"
+ placeholder="璇疯緭鍏ュ鍚�"
+ style="width: 160px"
+ />
</el-form-item>
<el-form-item label="璇佷欢绫诲瀷" prop="idType">
- <el-select style="width: 160px" v-model="formIn.idType" placeholder="璇烽�夋嫨璇佷欢绫诲瀷">
- <el-option v-for="dict in dict.type.dict_user_cardtype" :key="dict.value" :label="dict.label"
- :value="dict.value"></el-option>
+ <el-select
+ style="width: 160px"
+ v-model="formIn.idType"
+ placeholder="璇烽�夋嫨璇佷欢绫诲瀷"
+ >
+ <el-option
+ v-for="dict in dict.type.dict_user_cardtype"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ ></el-option>
</el-select>
</el-form-item>
<el-form-item label="璇佷欢鍙�" prop="idCard">
- <el-input style="width: 186px" v-model="formIn.idCard" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" />
+ <el-input
+ style="width: 186px"
+ v-model="formIn.idCard"
+ placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�"
+ />
</el-form-item>
<el-form-item label="骞撮緞" prop="age">
<el-input style="width: 55px" v-model="formIn.age" />
</el-form-item>
<el-form-item prop="ageUnit">
- <el-select style="width: 60px" v-model="formIn.ageUnit" @change="formchang">
- <el-option v-for="dict in dict.type.dict_ageunit" :key="dict.value" :label="dict.label"
- :value="dict.value"></el-option>
+ <el-select
+ style="width: 60px"
+ v-model="formIn.ageUnit"
+ @change="formchang"
+ >
+ <el-option
+ v-for="dict in dict.type.dict_ageunit"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ ></el-option>
</el-select>
</el-form-item>
<el-form-item label="鎬у埆" prop="sex">
- <el-select style="width: 160px" v-model="formIn.sex" placeholder="璇烽�夋嫨鎬у埆" @change="formchang">
- <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label"
- :value="parseInt(dict.value)"></el-option>
+ <el-select
+ style="width: 160px"
+ v-model="formIn.sex"
+ placeholder="璇烽�夋嫨鎬у埆"
+ @change="formchang"
+ >
+ <el-option
+ v-for="dict in dict.type.sys_user_sex"
+ :key="dict.value"
+ :label="dict.label"
+ :value="parseInt(dict.value)"
+ ></el-option>
</el-select>
</el-form-item>
<el-form-item label="鑱旂郴鐢佃瘽" prop="phoe">
- <el-input v-model="formIn.phoe" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" style="width: 160px" />
+ <el-input
+ v-model="formIn.phoe"
+ placeholder="璇疯緭鍏ヨ仈绯荤數璇�"
+ style="width: 160px"
+ />
</el-form-item>
<el-form-item label="姘戞棌" prop="nation">
- <el-select v-model="formIn.nation" placeholder="璇烽�夋嫨姘戞棌" style="width: 160px">
- <el-option v-for="dict in dict.type.dict_user_national" :key="dict.value" :label="dict.label"
- :value="parseInt(dict.value)"></el-option>
+ <el-select
+ v-model="formIn.nation"
+ placeholder="璇烽�夋嫨姘戞棌"
+ style="width: 160px"
+ >
+ <el-option
+ v-for="dict in dict.type.dict_user_national"
+ :key="dict.value"
+ :label="dict.label"
+ :value="parseInt(dict.value)"
+ ></el-option>
</el-select>
</el-form-item>
<el-form-item label="閭" prop="email">
- <el-input v-model="formIn.email" placeholder="璇疯緭鍏ラ偖绠�" style="width: 150px" />
+ <el-input
+ v-model="formIn.email"
+ placeholder="璇疯緭鍏ラ偖绠�"
+ style="width: 150px"
+ />
</el-form-item>
<el-form-item label="濠氬Щ" prop="marriage">
- <el-select style="width: 160px" v-model="formIn.marriage" placeholder="璇烽�夋嫨濠氬Щ鐘跺喌">
- <el-option v-for="dict in dict.type.dict_user_marry" :key="dict.value" :label="dict.label"
- :value="parseInt(dict.value)"></el-option>
+ <el-select
+ style="width: 160px"
+ v-model="formIn.marriage"
+ placeholder="璇烽�夋嫨濠氬Щ鐘跺喌"
+ >
+ <el-option
+ v-for="dict in dict.type.dict_user_marry"
+ :key="dict.value"
+ :label="dict.label"
+ :value="parseInt(dict.value)"
+ ></el-option>
</el-select>
</el-form-item>
<el-form-item label="鐜颁綇鍧�" prop="address">
- <el-input v-model="formIn.address" placeholder="璇疯緭鍏ョ幇灞呬綇鍦板潃" style="width: 410px" />
+ <el-input
+ v-model="formIn.address"
+ placeholder="璇疯緭鍏ョ幇灞呬綇鍦板潃"
+ style="width: 410px"
+ />
</el-form-item>
<el-form-item label="浣撴绫诲埆" prop="tjCategory">
- <el-select style="width: 140px" v-model="formIn.tjCategory" placeholder="璇烽�夋嫨浣撴绫诲埆">
- <el-option v-for="dict in dict.type.dict_tjtype" :key="dict.value" :label="dict.label"
- :value="dict.value"></el-option>
- </el-select>
+ <el-select
+ style="width: 140px"
+ v-model="formIn.tjCategory"
+ placeholder="璇烽�夋嫨浣撴绫诲埆"
+ >
+ <el-option
+ v-for="dict in dict.type.dict_tjtype"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ ></el-option>
+ </el-select>
</el-form-item>
<el-form-item label="閮ㄩ棬" prop="department">
- <el-input v-model="formIn.department" placeholder="璇疯緭鍏ラ儴闂�" style="width: 160px" />
+ <el-input
+ v-model="formIn.department"
+ placeholder="璇疯緭鍏ラ儴闂�"
+ style="width: 160px"
+ />
</el-form-item>
<el-form-item label="宸ヤ綔鍗曚綅" prop="company">
- <el-input v-model="formIn.company" placeholder="璇疯緭鍏ュ伐浣滃崟浣�" style="width: 410px" />
+ <el-input
+ v-model="formIn.company"
+ placeholder="璇疯緭鍏ュ伐浣滃崟浣�"
+ style="width: 410px"
+ />
</el-form-item>
<el-form-item label="鑱屼笟" prop="career">
- <el-select filterable :disabled="isDisabled" v-model="formIn.career" placeholder="璇疯緭鍏ヨ亴涓�"
- style="width: 150px">
- <el-option v-for="dict in dict.type.dict_job" :key="dict.value" :label="dict.label"
- :value="dict.value"></el-option>
+ <el-select
+ filterable
+ :disabled="isDisabled"
+ v-model="formIn.career"
+ placeholder="璇疯緭鍏ヨ亴涓�"
+ style="width: 150px"
+ >
+ <el-option
+ v-for="dict in dict.type.dict_job"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ ></el-option>
</el-select>
</el-form-item>
<el-form-item label="棰勭害鏃ユ湡" prop="reservationTime">
- <el-date-picker v-model="formIn.reservationTime" type="date" value-format="yyyy-MM-dd" placeholder="閫夋嫨鏃ユ湡"
- :picker-options="setDisabled" style="width: 160px">
+ <el-date-picker
+ v-model="formIn.reservationTime"
+ type="date"
+ value-format="yyyy-MM-dd"
+ placeholder="閫夋嫨鏃ユ湡"
+ :picker-options="setDisabled"
+ style="width: 160px"
+ >
</el-date-picker>
</el-form-item>
<el-form-item label="鏃堕棿" prop="timeRegion">
- <el-select style="width: 130px" v-model="formIn.timeRegion" placeholder="璇烽�夋嫨棰勭害鏃堕棿">
- <el-option v-for="dict in dict.type.tj_time_region" :key="dict.value" :label="dict.label"
- :value="dict.value"></el-option>
+ <el-select
+ style="width: 130px"
+ v-model="formIn.timeRegion"
+ placeholder="璇烽�夋嫨棰勭害鏃堕棿"
+ >
+ <el-option
+ v-for="dict in dict.type.tj_time_region"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ ></el-option>
</el-select>
</el-form-item>
<el-form-item label="鍗″彿" prop="indexCard">
- <el-input v-model="formIn.indexCard" placeholder="璇疯緭鍏ュ崱鍙�" style="width: 190px" />
+ <el-input
+ v-model="formIn.indexCard"
+ placeholder="璇疯緭鍏ュ崱鍙�"
+ style="width: 190px"
+ />
</el-form-item>
- <el-button type="primary" @click="taocan = true" size="mini" v-show="tijiao1">閫夋嫨濂楅</el-button>
+ <el-button
+ type="primary"
+ @click="taocan = true"
+ size="mini"
+ v-show="tijiao1"
+ >閫夋嫨濂楅</el-button
+ >
</el-form>
</div>
- <el-dialog title="閫夋嫨濂楅" :visible.sync="taocan" width="35%" append-to-body>
- <el-tabs type="border-card" style="height: 538px; margin-left: 10px; width: 600px">
+ <el-dialog
+ title="閫夋嫨濂楅"
+ :visible.sync="taocan"
+ width="35%"
+ append-to-body
+ >
+ <el-tabs
+ type="border-card"
+ style="height: 538px; margin-left: 10px; width: 600px"
+ >
<el-tab-pane label="濂楅">
- <el-form :model="queryParam" ref="queryForm" size="small" :inline="true" v-show="showSearch"
- label-width="auto" @submit.native.prevent>
+ <el-form
+ :model="queryParam"
+ ref="queryForm"
+ size="small"
+ :inline="true"
+ v-show="showSearch"
+ label-width="auto"
+ @submit.native.prevent
+ >
<el-form-item label="濂楅鍚嶇О" prop="pacName">
- <el-input v-model="queryParam.pacName" placeholder="璇疯緭鍏ュ椁愬悕绉�" clearable @keyup.enter.native="handle" />
+ <el-input
+ v-model="queryParam.pacName"
+ placeholder="璇疯緭鍏ュ椁愬悕绉�"
+ clearable
+ @keyup.enter.native="handle"
+ />
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handle">鏌ヨ</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-search"
+ size="mini"
+ @click="handle"
+ >鏌ヨ</el-button
+ >
</el-form-item>
</el-form>
<div class="tab4">
- <div class="grid-content bg-purple" style="margin-left: 5px; width: 100%">
- <el-table v-loading="loading" element-loading-text="姝ｅ湪鍔犺浇涓�..." border
- element-loading-spinner="el-icon-loading" :data="newpacName" @select="handleSelectionChange1"
- height="430" ref="tb" style="width: 900px">
+ <div
+ class="grid-content bg-purple"
+ style="margin-left: 5px; width: 100%"
+ >
+ <el-table
+ v-loading="loading"
+ element-loading-text="姝ｅ湪鍔犺浇涓�..."
+ border
+ element-loading-spinner="el-icon-loading"
+ :data="newpacName"
+ @select="handleSelectionChange1"
+ height="430"
+ ref="tb"
+ style="width: 900px"
+ >
<template slot="empty">鏁版嵁姝ｅ湪鍔犺浇涓�</template>
- <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="allProName" :show-overflow-tooltip="true" />
+ <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="allProName"
+ :show-overflow-tooltip="true"
+ />
</el-table>
</div>
<!-- <el-button
@@ -247,9 +611,16 @@
<el-tab-pane label="鍗曢」">
<div class="tab3">
<div class="tab2">
- <v-tree-transfer :treeData="treedataList"
- :defaultProps="{ children: 'tjProjectList', label: 'proName' }" :defaultKeys="defaultKeys"
- @changeKeys="changeCategoryKeys" :key="datekey"></v-tree-transfer>
+ <v-tree-transfer
+ :treeData="treedataList"
+ :defaultProps="{
+ children: 'tjProjectList',
+ label: 'proName',
+ }"
+ :defaultKeys="defaultKeys"
+ @changeKeys="changeCategoryKeys"
+ :key="datekey"
+ ></v-tree-transfer>
<!-- <el-tree :data="data" show-checkbox node-key="proId" :props="defaultProps"
@check-change="handleCurrentChecked">
</el-tree>-->
@@ -269,29 +640,62 @@
<template>
<el-form :model="form" :inline="true" label-width="68px">
<el-form-item label="浣撴绫诲瀷">
- <el-select style="width: 160px" v-model="form.tjType" placeholder="璇烽�夋嫨浣撴绫诲瀷">
- <el-option v-for="dict in dict.type.dict_team" :key="dict.value" :label="dict.label"
- :value="dict.value"></el-option>
+ <el-select
+ style="width: 160px"
+ v-model="form.tjType"
+ placeholder="璇烽�夋嫨浣撴绫诲瀷"
+ >
+ <el-option
+ v-for="dict in dict.type.dict_team"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ ></el-option>
</el-select>
</el-form-item>
<!-- <div class="tab1"> -->
<!-- <el-form :inline="true" class="tab1"> -->
<el-form-item label="搴旀敹閲戦">
- <el-input placeholder="搴旀敹閲戦" :value="TotalPrice1 " disabled style="width: 160px"></el-input>
+ <el-input
+ placeholder="搴旀敹閲戦"
+ :value="TotalPrice1"
+ disabled
+ style="width: 160px"
+ ></el-input>
</el-form-item>
<el-form-item label="浼樻儬鎶樻墸">
<!-- <el-input style="width: 100px" type="number" v-model="discount" :value="discount"></el-input> -->
- <el-input-number ref="inputNumber" style="width: 130px" v-model="discount" :precision="2"
- :step="0.1" :max="10" :min="1" @change="numberChange" :disabled="isfalse"></el-input-number>
+ <el-input-number
+ ref="inputNumber"
+ style="width: 130px"
+ v-model="discount"
+ :precision="2"
+ :step="0.1"
+ :max="10"
+ :min="1"
+ @change="numberChange"
+ :disabled="isfalse"
+ ></el-input-number>
</el-form-item>
<el-form-item label="瀹炴敹閲戦">
- <el-input placeholder="瀹炴敹閲戦" v-model="TotalPrice" style="width: 120px" disabled></el-input>
+ <el-input
+ placeholder="瀹炴敹閲戦"
+ v-model="TotalPrice"
+ style="width: 120px"
+ disabled
+ ></el-input>
</el-form-item>
<el-form-item>
- <el-button type="primary" @click="submitPrice" :disabled="confirm" size="mini"
- v-show="tijiao1">绛惧埌鐧昏</el-button>
+ <el-button
+ type="primary"
+ @click="submitPrice"
+ :disabled="confirm"
+ size="mini"
+ v-show="tijiao1"
+ >绛惧埌鐧昏</el-button
+ >
</el-form-item>
<!-- </el-form> -->
<!-- </div> -->
@@ -301,14 +705,20 @@
<div style="text-align: center; margin-bottom: 10px">
宸查�夐」鐩垪琛�
</div>
- <div style="
+ <div
+ style="
padding: 0px 6px;
border: 1px solid #e6ebf5;
max-height: 420px;
overflow: auto;
- ">
+ "
+ >
<el-collapse v-model="index" accordion v-if="list3">
- <div class="info1" v-for="(item, index) in tableData1" :key="'info1-' + index">
+ <div
+ class="info1"
+ v-for="(item, index) in tableData1"
+ :key="'info1-' + index"
+ >
<el-collapse-item :name="index">
<template slot="title">
{{
@@ -322,29 +732,54 @@
"鍏�)"
}}
</template>
- <el-table :data="item.list" border style="width: 100%" height="270">
- <el-table-column prop="proName" label="椤圭洰" width="180">
+ <el-table
+ :data="item.list"
+ border
+ style="width: 100%"
+ height="270"
+ >
+ <el-table-column
+ prop="proName"
+ label="椤圭洰"
+ width="180"
+ >
</el-table-column>
<el-table-column prop="ordPrice" label="搴旀敹閲戦">
</el-table-column>
<el-table-column prop="nowPrice" label="瀹炴敹閲戦">
</el-table-column>
-
</el-table>
</el-collapse-item>
</div>
</el-collapse>
<el-collapse v-model="activeName" accordion v-if="list2">
- <div class="info" v-for="(item, index) in tableData1" :key="'info-' + index">
+ <div
+ class="info"
+ v-for="(item, index) in tableData1"
+ :key="'info-' + index"
+ >
<el-collapse-item>
<template slot="title">
{{ item.pacName }}
</template>
- <el-table :data="item.tjProjectList" border style="width: 100%" height="250">
- <el-table-column prop="proName" label="椤圭洰" width="180">
+ <el-table
+ :data="item.tjProjectList"
+ border
+ style="width: 100%"
+ height="250"
+ >
+ <el-table-column
+ prop="proName"
+ label="椤圭洰"
+ width="180"
+ >
</el-table-column>
- <el-table-column prop="proSex" label="鎬у埆" width="180">
+ <el-table-column
+ prop="proSex"
+ label="鎬у埆"
+ width="180"
+ >
</el-table-column>
<el-table-column prop="ordPrice" label="搴旀敹閲戦">
</el-table-column>
@@ -352,7 +787,6 @@
</el-table-column>
<el-table-column prop="proCheckMethod" label="绌鸿吂">
</el-table-column>
-
</el-table>
</el-collapse-item>
</div>
@@ -362,9 +796,17 @@
<div>
<el-collapse-item title="璇烽�夋嫨椤圭洰">
<el-table :data="list" border style="width: 100%">
- <el-table-column prop="proName" label="椤圭洰" width="180">
+ <el-table-column
+ prop="proName"
+ label="椤圭洰"
+ width="180"
+ >
</el-table-column>
- <el-table-column prop="proSex" label="鎬у埆" width="180">
+ <el-table-column
+ prop="proSex"
+ label="鎬у埆"
+ width="180"
+ >
</el-table-column>
<el-table-column prop="ordPrice" label="搴旀敹閲戦">
</el-table-column>
@@ -372,7 +814,6 @@
</el-table-column>
<el-table-column prop="proCheckMethod" label="绌鸿吂">
</el-table-column>
-
</el-table>
</el-collapse-item>
</div>
@@ -382,39 +823,44 @@
</el-col>
</el-row>
- <el-dialog title="瀵兼鍗曢瑙�" :visible.sync="dialogVisibles" :close-on-click-modal="false">
+ <el-dialog
+ title="瀵兼鍗曢瑙�"
+ :visible.sync="dialogVisibles"
+ :close-on-click-modal="false"
+ >
<div class="main">
- <iframe id="printIframe" :src="url" frameborder="0" style="width: 100%; height: 100%"></iframe>
+ <iframe
+ id="printIframe"
+ :src="url"
+ frameborder="0"
+ style="width: 100%; height: 100%"
+ ></iframe>
</div>
</el-dialog>
</div>
</template>
</el-drawer>
- <div style="
- position: absolute;
- bottom: 100px;
- left: 500px;
- width: 700px;
- display: none;
- ">
+ <div
+ style="
+ position: absolute;
+ bottom: 100px;
+ left: 500px;
+ width: 700px;
+ display: none;
+ "
+ >
<div id="printBill">
<div style="font-size: 13px; color: #000000">
- <div style="width: 48%; margin-top: 10px">
- 濮撳悕锛歿{ fmobj.name }}
- </div>
+ <div style="width: 48%; margin-top: 10px">濮撳悕锛歿{ fmobj.name }}</div>
<div style="width: 48%; margin-top: 10px">
鎬у埆锛歿{ fmobj.sex === 0 ? "鐢�" : "濂�" }}
</div>
- <div style="width: 48%; margin-top: 10px">
- 鐢佃瘽:{{ fmobj.phoe }}
- </div>
+ <div style="width: 48%; margin-top: 10px">鐢佃瘽:{{ fmobj.phoe }}</div>
<div style="width: 48%; margin-top: 10px">
鏃ユ湡:{{ fmobj.reservationTime }}
</div>
- <div style="width: 58%; margin-top: 10px">
- 濂楅锛歿{ pacName }}
- </div>
+ <div style="width: 58%; margin-top: 10px">濂楅锛歿{ pacName }}</div>
<div style="width: 100%; margin-top: 10px">娓╅Θ鎻愮ず锛�</div>
<div style="width: 100%">1銆侀噰琛�锛岃吂閮ㄥ僵瓒呮鏌ュ悗鏂瑰彲鐢ㄩ銆�</div>
<div style="width: 100%">
@@ -423,15 +869,11 @@
<div style="width: 100%">
3銆佹��瀛曟垨鍙兘宸插彈瀛曠殑濂冲＋锛岃繕搴旈伩鍏嶅绉戙�佹斁灏勭鍙婇槾寮忚秴澹版鏌ャ��
</div>
- <div style="width: 100%">
- 4銆佺粡鏈熷コ鎬т笉瀹滆繘琛屽绉戝強灏垮父瑙勬鏌ャ��
- </div>
+ <div style="width: 100%">4銆佺粡鏈熷コ鎬т笉瀹滆繘琛屽绉戝強灏垮父瑙勬鏌ャ��</div>
<div style="width: 100%">
5銆佽嫢鎮ㄥ湪绛夊緟妫�鏌ヨ繃绋嬩腑鏈夌枒闂紝璇峰強鏃惰仈绯诲妫�鎶ゅ＋銆�
</div>
- <div style="width: 100%">
- 6銆佷綋妫�缁撴潫鍚庤灏嗗妫�鍗曚氦杩樿嚦鍓嶅彴銆�
- </div>
+ <div style="width: 100%">6銆佷綋妫�缁撴潫鍚庤灏嗗妫�鍗曚氦杩樿嚦鍓嶅彴銆�</div>
</div>
</div>
</div>
@@ -441,115 +883,284 @@
<template>
<div>
<div style="width: 1000px">
- <el-form style="margin: 0px 8px" :inline="true" ref="formIn" :model="formIn" :rules="rules"
- :label-position="labelPosition" class="demo-form-inline" label-width="78px">
+ <el-form
+ style="margin: 0px 8px"
+ :inline="true"
+ ref="formIn"
+ :model="formIn"
+ :rules="rules"
+ :label-position="labelPosition"
+ class="demo-form-inline"
+ label-width="78px"
+ >
<el-form-item label="濮撳悕" prop="name">
- <el-input v-model="formIn.name" placeholder="璇疯緭鍏ュ鍚�" style="width: 160px" />
+ <el-input
+ v-model="formIn.name"
+ placeholder="璇疯緭鍏ュ鍚�"
+ style="width: 160px"
+ />
</el-form-item>
<el-form-item label="璇佷欢绫诲瀷" prop="idType">
- <el-select style="width: 160px" v-model="formIn.idType" placeholder="璇烽�夋嫨璇佷欢绫诲瀷">
- <el-option v-for="dict in dict.type.dict_user_cardtype" :key="dict.value" :label="dict.label"
- :value="dict.value"></el-option>
+ <el-select
+ style="width: 160px"
+ v-model="formIn.idType"
+ placeholder="璇烽�夋嫨璇佷欢绫诲瀷"
+ >
+ <el-option
+ v-for="dict in dict.type.dict_user_cardtype"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ ></el-option>
</el-select>
</el-form-item>
<el-form-item label="璇佷欢鍙�" prop="idCard">
- <el-input style="width: 186px" v-model="formIn.idCard" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" />
+ <el-input
+ style="width: 186px"
+ v-model="formIn.idCard"
+ placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�"
+ />
</el-form-item>
<el-form-item label="骞撮緞" prop="age">
<el-input style="width: 55px" v-model="formIn.age" />
</el-form-item>
<el-form-item prop="ageUnit">
- <el-select style="width: 60px" v-model="formIn.ageUnit" @change="formchang">
- <el-option v-for="dict in dict.type.dict_ageunit" :key="dict.value" :label="dict.label"
- :value="dict.value"></el-option>
+ <el-select
+ style="width: 60px"
+ v-model="formIn.ageUnit"
+ @change="formchang"
+ >
+ <el-option
+ v-for="dict in dict.type.dict_ageunit"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ ></el-option>
</el-select>
</el-form-item>
<el-form-item label="鎬у埆" prop="sex">
- <el-select style="width: 160px" v-model="formIn.sex" placeholder="璇烽�夋嫨鎬у埆" @change="formchang">
- <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label"
- :value="parseInt(dict.value)"></el-option>
+ <el-select
+ style="width: 160px"
+ v-model="formIn.sex"
+ placeholder="璇烽�夋嫨鎬у埆"
+ @change="formchang"
+ >
+ <el-option
+ v-for="dict in dict.type.sys_user_sex"
+ :key="dict.value"
+ :label="dict.label"
+ :value="parseInt(dict.value)"
+ ></el-option>
</el-select>
</el-form-item>
<el-form-item label="鑱旂郴鐢佃瘽" prop="phoe">
- <el-input v-model="formIn.phoe" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" style="width: 160px" />
+ <el-input
+ v-model="formIn.phoe"
+ placeholder="璇疯緭鍏ヨ仈绯荤數璇�"
+ style="width: 160px"
+ />
</el-form-item>
<el-form-item label="姘戞棌" prop="nation">
- <el-select v-model="formIn.nation" placeholder="璇烽�夋嫨姘戞棌" style="width: 160px">
- <el-option v-for="dict in dict.type.dict_user_national" :key="dict.value" :label="dict.label"
- :value="parseInt(dict.value)"></el-option>
+ <el-select
+ v-model="formIn.nation"
+ placeholder="璇烽�夋嫨姘戞棌"
+ style="width: 160px"
+ >
+ <el-option
+ v-for="dict in dict.type.dict_user_national"
+ :key="dict.value"
+ :label="dict.label"
+ :value="parseInt(dict.value)"
+ ></el-option>
</el-select>
</el-form-item>
<el-form-item label="閭" prop="email">
- <el-input v-model="formIn.email" placeholder="璇疯緭鍏ラ偖绠�" style="width: 150px" />
+ <el-input
+ v-model="formIn.email"
+ placeholder="璇疯緭鍏ラ偖绠�"
+ style="width: 150px"
+ />
</el-form-item>
<el-form-item label="濠氬Щ" prop="marriage">
- <el-select style="width: 160px" v-model="formIn.marriage" placeholder="璇烽�夋嫨濠氬Щ鐘跺喌">
- <el-option v-for="dict in dict.type.dict_user_marry" :key="dict.value" :label="dict.label"
- :value="parseInt(dict.value)"></el-option>
+ <el-select
+ style="width: 160px"
+ v-model="formIn.marriage"
+ placeholder="璇烽�夋嫨濠氬Щ鐘跺喌"
+ >
+ <el-option
+ v-for="dict in dict.type.dict_user_marry"
+ :key="dict.value"
+ :label="dict.label"
+ :value="parseInt(dict.value)"
+ ></el-option>
</el-select>
</el-form-item>
<el-form-item label="鐜颁綇鍧�" prop="address">
- <el-input v-model="formIn.address" placeholder="璇疯緭鍏ョ幇灞呬綇鍦板潃" style="width: 410px" />
+ <el-input
+ v-model="formIn.address"
+ placeholder="璇疯緭鍏ョ幇灞呬綇鍦板潃"
+ style="width: 410px"
+ />
</el-form-item>
<el-form-item label="浣撴绫诲埆" prop="tjCategory">
- <el-select style="width: 150px" v-model="formIn.tjCategory" placeholder="璇烽�夋嫨浣撴绫诲埆">
- <el-option v-for="dict in dict.type.dict_tjtype" :key="dict.value" :label="dict.label"
- :value="dict.value"></el-option>
+ <el-select
+ style="width: 150px"
+ v-model="formIn.tjCategory"
+ placeholder="璇烽�夋嫨浣撴绫诲埆"
+ >
+ <el-option
+ v-for="dict in dict.type.dict_tjtype"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ ></el-option>
</el-select>
</el-form-item>
<el-form-item label="閮ㄩ棬" prop="department">
- <el-input v-model="formIn.department" placeholder="璇疯緭鍏ラ儴闂�" style="width: 160px" />
+ <el-input
+ v-model="formIn.department"
+ placeholder="璇疯緭鍏ラ儴闂�"
+ style="width: 160px"
+ />
</el-form-item>
<el-form-item label="宸ヤ綔鍗曚綅" prop="company">
- <el-input v-model="formIn.company" placeholder="璇疯緭鍏ュ伐浣滃崟浣�" style="width: 410px" />
+ <el-input
+ v-model="formIn.company"
+ placeholder="璇疯緭鍏ュ伐浣滃崟浣�"
+ style="width: 410px"
+ />
</el-form-item>
<el-form-item label="鑱屼笟" prop="career">
- <el-select filterable :disabled="isDisabled" v-model="formIn.career" placeholder="璇疯緭鍏ヨ亴涓�"
- style="width: 150px">
- <el-option v-for="dict in dict.type.dict_job" :key="dict.value" :label="dict.label"
- :value="dict.value"></el-option>
+ <el-select
+ filterable
+ :disabled="isDisabled"
+ v-model="formIn.career"
+ placeholder="璇疯緭鍏ヨ亴涓�"
+ style="width: 150px"
+ >
+ <el-option
+ v-for="dict in dict.type.dict_job"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ ></el-option>
</el-select>
</el-form-item>
<el-form-item label="棰勭害鏃ユ湡" prop="reservationTime">
- <el-date-picker v-model="formIn.reservationTime" type="date" value-format="yyyy-MM-dd" placeholder="閫夋嫨鏃ユ湡"
- :picker-options="setDisabled" style="width: 160px">
+ <el-date-picker
+ v-model="formIn.reservationTime"
+ type="date"
+ value-format="yyyy-MM-dd"
+ placeholder="閫夋嫨鏃ユ湡"
+ :picker-options="setDisabled"
+ style="width: 160px"
+ >
</el-date-picker>
</el-form-item>
<el-form-item label="鏃堕棿" prop="timeRegion">
- <el-select style="width: 130px" v-model="formIn.timeRegion" placeholder="璇烽�夋嫨棰勭害鏃堕棿">
- <el-option v-for="dict in dict.type.tj_time_region" :key="dict.value" :label="dict.label"
- :value="dict.value"></el-option>
+ <el-select
+ style="width: 130px"
+ v-model="formIn.timeRegion"
+ placeholder="璇烽�夋嫨棰勭害鏃堕棿"
+ >
+ <el-option
+ v-for="dict in dict.type.tj_time_region"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ ></el-option>
</el-select>
</el-form-item>
<el-form-item label="鍗″彿" prop="indexCard">
- <el-input v-model="formIn.indexCard" placeholder="璇疯緭鍏ュ崱鍙�" style="width: 190px" />
+ <el-input
+ v-model="formIn.indexCard"
+ placeholder="璇疯緭鍏ュ崱鍙�"
+ style="width: 190px"
+ />
</el-form-item>
<!-- <el-button type="primary" @click="Package" size="mini">閫夋嫨濂楅</el-button> -->
</el-form>
</div>
- <el-dialog title="閫夋嫨濂楅" :visible.sync="taocan" width="35%" append-to-body>
- <el-tabs type="border-card" style="height: 538px; margin-left: 10px; width: 600px">
+ <el-dialog
+ title="閫夋嫨濂楅"
+ :visible.sync="taocan"
+ width="35%"
+ append-to-body
+ >
+ <el-tabs
+ type="border-card"
+ style="height: 538px; margin-left: 10px; width: 600px"
+ >
<el-tab-pane label="濂楅">
- <el-form :model="queryParam" ref="queryForm" size="small" :inline="true" v-show="showSearch"
- label-width="auto" @submit.native.prevent>
+ <el-form
+ :model="queryParam"
+ ref="queryForm"
+ size="small"
+ :inline="true"
+ v-show="showSearch"
+ label-width="auto"
+ @submit.native.prevent
+ >
<el-form-item label="濂楅鍚嶇О" prop="pacName">
- <el-input v-model="queryParam.pacName" placeholder="璇疯緭鍏ュ椁愬悕绉�" clearable @keyup.enter.native="handle" />
+ <el-input
+ v-model="queryParam.pacName"
+ placeholder="璇疯緭鍏ュ椁愬悕绉�"
+ clearable
+ @keyup.enter.native="handle"
+ />
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handle">鏌ヨ</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-search"
+ size="mini"
+ @click="handle"
+ >鏌ヨ</el-button
+ >
</el-form-item>
</el-form>
<div class="tab4">
- <div class="grid-content bg-purple" style="margin-left: 5px; width: 100%">
- <el-table v-loading="loading" element-loading-text="姝ｅ湪鍔犺浇涓�..." border
- element-loading-spinner="el-icon-loading" :data="newpacName" @select="handleSelectionChange1"
- height="430" ref="tb" style="width: 900px">
+ <div
+ class="grid-content bg-purple"
+ style="margin-left: 5px; width: 100%"
+ >
+ <el-table
+ v-loading="loading"
+ element-loading-text="姝ｅ湪鍔犺浇涓�..."
+ border
+ element-loading-spinner="el-icon-loading"
+ :data="newpacName"
+ @select="handleSelectionChange1"
+ height="430"
+ ref="tb"
+ style="width: 900px"
+ >
<template slot="empty">鏁版嵁姝ｅ湪鍔犺浇涓�</template>
- <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-column
+ type="selection"
+ width="40px"
+ align="center"
+ label="閫夋嫨"
+ />
+ <el-table-column
+ label="濂楅鍚嶇О"
+ align="center"
+ prop="pacName"
+ width="120px"
+ />
+ <el-table-column
+ label="濂楅浠锋牸"
+ align="center"
+ prop="price"
+ width="120px"
+ />
+ <el-table-column
+ label="濂楅鏄庣粏"
+ align="center"
+ prop="allProName"
+ :show-overflow-tooltip="true"
+ />
</el-table>
</div>
<!-- <el-button
@@ -573,8 +1184,13 @@
<el-tab-pane label="鍗曢」">
<div class="tab3">
<div class="tab2">
- <el-tree :data="data" show-checkbox node-key="proId" :props="defaultProps"
- @check-change="handleCurrentChecked">
+ <el-tree
+ :data="data"
+ show-checkbox
+ node-key="proId"
+ :props="defaultProps"
+ @check-change="handleCurrentChecked"
+ >
</el-tree>
</div>
<!-- <el-button
@@ -608,28 +1224,60 @@
<template>
<el-form :model="form" :inline="true" label-width="68px">
<el-form-item label="浣撴绫诲瀷">
- <el-select style="width: 160px" v-model="form.tjType" placeholder="璇烽�夋嫨浣撴绫诲瀷">
- <el-option v-for="dict in dict.type.dict_team" :key="dict.value" :label="dict.label"
- :value="dict.value"></el-option>
+ <el-select
+ style="width: 160px"
+ v-model="form.tjType"
+ placeholder="璇烽�夋嫨浣撴绫诲瀷"
+ >
+ <el-option
+ v-for="dict in dict.type.dict_team"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ ></el-option>
</el-select>
</el-form-item>
<!-- <div class="tab1"> -->
<!-- <el-form :inline="true" class="tab1"> -->
<el-form-item label="搴旀敹閲戦">
- <el-input placeholder="搴旀敹閲戦" :value="TotalPrice1" disabled style="width: 160px"></el-input>
+ <el-input
+ placeholder="搴旀敹閲戦"
+ :value="TotalPrice1"
+ disabled
+ style="width: 160px"
+ ></el-input>
</el-form-item>
<el-form-item label="浼樻儬鎶樻墸">
<!-- <el-input style="width: 100px" type="number" v-model="discount" :value="discount"></el-input> -->
- <el-input-number ref="inputNumber" style="width: 130px" v-model="discount" :precision="2"
- :step="0.1" :max="10" :min="1" @change="numberChange" :disabled="isfalse"></el-input-number>
+ <el-input-number
+ ref="inputNumber"
+ style="width: 130px"
+ v-model="discount"
+ :precision="2"
+ :step="0.1"
+ :max="10"
+ :min="1"
+ @change="numberChange"
+ :disabled="isfalse"
+ ></el-input-number>
</el-form-item>
<el-form-item label="瀹炴敹閲戦">
- <el-input placeholder="瀹炴敹閲戦" v-model="TotalPrice" style="width: 120px"></el-input>
+ <el-input
+ placeholder="瀹炴敹閲戦"
+ v-model="TotalPrice"
+ style="width: 120px"
+ ></el-input>
</el-form-item>
<el-form-item>
- <el-button type="primary" @click="submitPrice" :disabled="confirm" size="mini">棰勭害淇敼</el-button>
+ <el-button
+ type="primary"
+ @click="submitPrice"
+ :disabled="confirm"
+ size="mini"
+ >棰勭害淇敼</el-button
+ >
</el-form-item>
<!-- </el-form> -->
<!-- </div> -->
@@ -639,14 +1287,20 @@
<div style="text-align: center; margin-bottom: 10px">
宸查�夐」鐩垪琛�
</div>
- <div style="
+ <div
+ style="
padding: 0px 6px;
border: 1px solid #e6ebf5;
max-height: 420px;
overflow: auto;
- ">
+ "
+ >
<el-collapse v-model="index" accordion v-if="list3">
- <div class="info1" v-for="(item, index) in tableData1" :key="'info1-' + index">
+ <div
+ class="info1"
+ v-for="(item, index) in tableData1"
+ :key="'info1-' + index"
+ >
<el-collapse-item :name="index">
<template slot="title">
{{
@@ -660,10 +1314,23 @@
".00鍏�)"
}}
</template>
- <el-table :data="item.list" border style="width: 100%" height="270">
- <el-table-column prop="proName" label="椤圭洰" width="180">
+ <el-table
+ :data="item.list"
+ border
+ style="width: 100%"
+ height="270"
+ >
+ <el-table-column
+ prop="proName"
+ label="椤圭洰"
+ width="180"
+ >
</el-table-column>
- <el-table-column prop="proSex" label="鎬у埆" width="180">
+ <el-table-column
+ prop="proSex"
+ label="鎬у埆"
+ width="180"
+ >
</el-table-column>
<el-table-column prop="ordPrice" label="搴旀敹閲戦">
</el-table-column>
@@ -671,22 +1338,38 @@
</el-table-column>
<el-table-column prop="proCheckMethod" label="绌鸿吂">
</el-table-column>
-
</el-table>
</el-collapse-item>
</div>
</el-collapse>
<el-collapse v-model="activeName" accordion v-if="list2">
- <div class="info" v-for="(item, index) in tableData1" :key="'info-' + index">
+ <div
+ class="info"
+ v-for="(item, index) in tableData1"
+ :key="'info-' + index"
+ >
<el-collapse-item>
<template slot="title">
{{ item.pacName }}
</template>
- <el-table :data="item.tjProjectList" border style="width: 100%" height="250">
- <el-table-column prop="proName" label="椤圭洰" width="180">
+ <el-table
+ :data="item.tjProjectList"
+ border
+ style="width: 100%"
+ height="250"
+ >
+ <el-table-column
+ prop="proName"
+ label="椤圭洰"
+ width="180"
+ >
</el-table-column>
- <el-table-column prop="proSex" label="鎬у埆" width="180">
+ <el-table-column
+ prop="proSex"
+ label="鎬у埆"
+ width="180"
+ >
</el-table-column>
<el-table-column prop="ordPrice" label="搴旀敹閲戦">
</el-table-column>
@@ -694,7 +1377,6 @@
</el-table-column>
<el-table-column prop="proCheckMethod" label="绌鸿吂">
</el-table-column>
-
</el-table>
</el-collapse-item>
</div>
@@ -704,9 +1386,17 @@
<div>
<el-collapse-item title="璇烽�夋嫨椤圭洰">
<el-table :data="list" border style="width: 100%">
- <el-table-column prop="proName" label="椤圭洰" width="180">
+ <el-table-column
+ prop="proName"
+ label="椤圭洰"
+ width="180"
+ >
</el-table-column>
- <el-table-column prop="proSex" label="鎬у埆" width="180">
+ <el-table-column
+ prop="proSex"
+ label="鎬у埆"
+ width="180"
+ >
</el-table-column>
<el-table-column prop="ordPrice" label="搴旀敹閲戦">
</el-table-column>
@@ -714,7 +1404,6 @@
</el-table-column>
<el-table-column prop="proCheckMethod" label="绌鸿吂">
</el-table-column>
-
</el-table>
</el-collapse-item>
</div>
@@ -724,9 +1413,18 @@
</el-col>
</el-row>
- <el-dialog title="瀵兼鍗曢瑙�" :visible.sync="dialogVisibles" :close-on-click-modal="false">
+ <el-dialog
+ title="瀵兼鍗曢瑙�"
+ :visible.sync="dialogVisibles"
+ :close-on-click-modal="false"
+ >
<div class="main">
- <iframe id="printIframe" :src="url" frameborder="0" style="width: 100%; height: 100%"></iframe>
+ <iframe
+ id="printIframe"
+ :src="url"
+ frameborder="0"
+ style="width: 100%; height: 100%"
+ ></iframe>
</div>
</el-dialog>
</div>
@@ -736,30 +1434,52 @@
</template>
<script>
-import { listReservation, gettjCancel, tjReappoint, tjCancelTj, getReservation } from "@/api/reservation/reservation";
+import {
+ listReservation,
+ gettjCancel,
+ tjReappoint,
+ tjCancelTj,
+ getReservation,
+} from "@/api/reservation/reservation";
import printJS from "print-js";
-import { deptTreeSelect, projectGetList, getPackageListName, getaddtTransition, getTransitionList, } from "@/api/system/tijian";
+import {
+ deptTreeSelect,
+ projectGetList,
+ getPackageListName,
+ getaddtTransition,
+ getTransitionList,
+} from "@/api/system/tijian";
import { getCompany, queryCompany } from "@/api/team/tuanti";
import user from "@/store/modules/user";
-import VTreeTransfer from '../../system/tijian/TreeTransfer.vue'
+import VTreeTransfer from "../../system/tijian/TreeTransfer.vue";
export default {
components: {
- VTreeTransfer
+ VTreeTransfer,
},
name: "Reservation",
- dicts: ["dict_user_national", "dict_user_national", "dict_user_marry", "sys_yes_no",
- "sys_user_sex", "dict_team", "tj_time_region", "dict_tjtype", "dict_job",
- "dict_user_cardtype", "dict_ageunit",],
+ dicts: [
+ "dict_user_national",
+ "dict_user_national",
+ "dict_user_marry",
+ "sys_yes_no",
+ "sys_user_sex",
+ "dict_team",
+ "tj_time_region",
+ "dict_tjtype",
+ "dict_job",
+ "dict_user_cardtype",
+ "dict_ageunit",
+ ],
data() {
let checkPhoneNum = (rule, value, callback) => {
- console.log( value)
+ 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 (value != undefined && value != "") {
return callback();
- }else if (!patter.test(value)) {
- return callback('');
+ } else if (!patter.test(value)) {
+ return callback("");
}
};
return {
@@ -889,24 +1609,26 @@
fmobj: {},
// 琛ㄥ崟鏍￠獙
rules: {
- cusName: [{ required: true, validator: checkPhoneNum, trigger: "blur" }],
+ cusName: [
+ { required: true, validator: checkPhoneNum, trigger: "blur" },
+ ],
cusSex: [
- { required: true, validator: checkPhoneNum, trigger: "change" },
+ { required: true, validator: checkPhoneNum, trigger: "change" },
],
cusBrithday: [
- { required: true, validator: checkPhoneNum, trigger: "blur" },
+ { required: true, validator: checkPhoneNum, trigger: "blur" },
],
// cusAddr: [
// { required: true, message: "鐜板眳浣忓湴鍧�涓嶈兘涓虹┖", trigger: "blur" },
// ],
cusPhone: [
- { required: true, validator: checkPhoneNum, trigger: "blur" },
+ { required: true, validator: checkPhoneNum, trigger: "blur" },
],
reservationTime: [
- { required: true, validator: checkPhoneNum, trigger: "change" },
+ { required: true, validator: checkPhoneNum, trigger: "change" },
],
timeRegion: [
- { required: true, validator: checkPhoneNum, trigger: "blur" },
+ { required: true, validator: checkPhoneNum, trigger: "blur" },
],
},
options: [
@@ -960,21 +1682,21 @@
name: [
{
required: true,
- validator: checkPhoneNum,
+ validator: checkPhoneNum,
trigger: "blur",
},
],
idCard: [
{
required: true,
- validator: checkPhoneNum,
+ validator: checkPhoneNum,
trigger: "blur",
},
],
phoe: [
{
required: true,
- validator: checkPhoneNum,
+ validator: checkPhoneNum,
trigger: "blur",
},
],
@@ -1074,10 +1796,10 @@
},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
- selection.forEach(item => {
- this.fmobj = item
- })
- console.log(this.fmobj)
+ selection.forEach((item) => {
+ this.fmobj = item;
+ });
+ console.log(this.fmobj);
this.ids = selection.map((item) => item.id);
this.single = selection.length !== 1;
this.multiple = !selection.length;
@@ -1092,10 +1814,10 @@
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
- console.log(row)
+ console.log(row);
this.title = "淇敼浣撴棰勭害";
this.formIn = row;
- this.form.tjType = this.formIn.tjType
+ this.form.tjType = this.formIn.tjType;
if (this.formIn.timeRegion === 0) {
this.formIn.timeRegion = "8:00-9:00";
}
@@ -1110,10 +1832,10 @@
}
if (this.formIn.isExpire === 2) {
this.drawer = true;
- if( this.formIn.discount!= null){
+ if (this.formIn.discount != null) {
this.discount = this.formIn.discount;
}
-
+
//鍏ㄩ儴濂楅
if (this.formIn.sex != null) {
let cusSex = this.formIn.sex;
@@ -1163,7 +1885,7 @@
this.TotalPrice1 = 0;
this.tableData1.forEach((item) => {
this.TotalPrice1 += item.nowPrice;
- console.log(this.discount)
+ console.log(this.discount);
this.TotalPrice = (
this.TotalPrice1 *
(this.discount / 10)
@@ -1178,8 +1900,7 @@
this.list1 = true;
}
}
- })
-
+ });
} else {
this.tableData1 = [];
this.list3 = false;
@@ -1199,7 +1920,7 @@
},
changeCategoryKeys(val) {
this.proIds = [];
- this.proIds = val
+ this.proIds = val;
},
/** 淇敼璇︾粏鎸夐挳鎿嶄綔 */
handleUpdate1(row) {
@@ -1221,9 +1942,8 @@
this.tijiao1 = false;
}
this.drawer1 = true;
- if( this.formIn.discount != null){
+ if (this.formIn.discount != null) {
this.discount = this.formIn.discount;
-
}
//鍏ㄩ儴濂楅
if (this.formIn.sex != null) {
@@ -1267,36 +1987,36 @@
(this.tableData1 = []),
(this.newpacName = []),
getReservation(id).then((response) => {
- if (response.data) {
- let cusId = response.data.idCard;
- getTransitionList(cusId).then((response) => {
if (response.data) {
- this.tableData1 = response.data;
- if (this.tableData1.length != 0) {
- this.TotalPrice1 = 0;
- this.tableData1.forEach((item) => {
- this.TotalPrice1 += item.nowPrice;
- this.TotalPrice = (
- this.TotalPrice1 *
- (this.discount / 10)
- ).toFixed(2);
- if (item.pacName === null) {
- item.pacName = "鍗曢」";
+ let cusId = response.data.idCard;
+ getTransitionList(cusId).then((response) => {
+ if (response.data) {
+ this.tableData1 = response.data;
+ if (this.tableData1.length != 0) {
+ this.TotalPrice1 = 0;
+ this.tableData1.forEach((item) => {
+ this.TotalPrice1 += item.nowPrice;
+ this.TotalPrice = (
+ this.TotalPrice1 *
+ (this.discount / 10)
+ ).toFixed(2);
+ if (item.pacName === null) {
+ item.pacName = "鍗曢」";
+ }
+ });
+ this.list1 = false;
+ this.list3 = true;
+ } else {
+ this.list1 = true;
}
- });
- this.list1 = false;
- this.list3 = true;
- } else {
- this.list1 = true;
- }
- } else {
- this.tableData1 = [];
- this.list3 = false;
- this.list1 = true;
+ } else {
+ this.tableData1 = [];
+ this.list3 = false;
+ this.list1 = true;
+ }
+ });
}
});
- }
- })
/** 鏌ヨ閮ㄩ棬涓嬫媺鏍戠粨鏋� */
projectGetList().then((response) => {
@@ -1314,7 +2034,7 @@
Package() {
this.taocan = true;
- this.datekey = Date.now()
+ this.datekey = Date.now();
},
/** 鎼滅储鎿嶄綔 */
@@ -1395,8 +2115,7 @@
receipt() {
setTimeout(function () {
- const style =
- "@media print { @page{margin:0 10mm,size:4mm 6mm;}};"; //鎵撳嵃鏃跺幓鎺夌湁椤电湁灏�
+ const style = "@media print { @page{margin:0 10mm,size:4mm 6mm;}};"; //鎵撳嵃鏃跺幓鎺夌湁椤电湁灏�
printJS({
printable: "printBill", // 鏍囩鍏冪礌id
type: "html",
@@ -1470,87 +2189,87 @@
submitPrice() {
let _this = this;
// if (_this.tableData1.length > 0) {
- if (this.tableData[0]) {
- var pacId = this.tableData[0].pacId;
+ if (this.tableData[0]) {
+ var pacId = this.tableData[0].pacId;
+ }
+ // let copeWith = this.TotalPrice1;
+ // let paidIn = this.TotalPrice;
+ // let discount = this.discount;
+ // this.tjFlowingWater = { copeWith, paidIn, discount };
+ if (this.formIn.timeRegion === "8:00-9:00") {
+ this.formIn.timeRegion = 0;
+ }
+ if (this.formIn.timeRegion === "9:00-10:00") {
+ this.formIn.timeRegion = 1;
+ }
+ if (this.formIn.timeRegion === "10:00-11:00") {
+ this.formIn.timeRegion = 2;
+ }
+ if (this.formIn.timeRegion === "11:00-12:00") {
+ this.formIn.timeRegion = 3;
+ }
+ let data;
+ if (pacId) {
+ data = {
+ id: this.formIn.id,
+ isExpire: this.formIn.isExpire,
+ address: this.formIn.address,
+ company: this.formIn.company,
+ department: this.formIn.department,
+ discount: this.discount,
+ email: this.formIn.email,
+ idCard: this.formIn.idCard,
+ marriage: this.formIn.marriage,
+ name: this.formIn.name,
+ nation: this.formIn.nation,
+ pacId,
+ phoe: this.formIn.cusPhone,
+ reservationTime: this.formIn.reservationTime,
+ sex: this.formIn.sex,
+ timeRegion: this.formIn.timeRegion,
+ tjCategory: this.formIn.tjCategory,
+ // tjFlowingWater: this.tjFlowingWater,
+ tjType: this.formIn.tjType,
+ idType: this.formIn.idType,
+ age: this.formIn.age,
+ ageUnit: this.formIn.ageUnit,
+ career: this.formIn.career,
+ };
+ } else {
+ data = {
+ id: this.formIn.id,
+ isExpire: this.formIn.isExpire,
+ address: this.formIn.address,
+ company: this.formIn.company,
+ department: this.formIn.department,
+ discount: this.discount,
+ email: this.formIn.email,
+ idCard: this.formIn.idCard,
+ marriage: this.formIn.marriage,
+ name: this.formIn.name,
+ nation: this.formIn.nation,
+ pacId,
+ phoe: this.formIn.phoe,
+ reservationTime: this.formIn.reservationTime,
+ sex: this.formIn.sex,
+ timeRegion: this.formIn.timeRegion,
+ tjCategory: this.formIn.tjCategory,
+ // tjFlowingWater: this.tjFlowingWater,
+ tjType: this.formIn.tjType,
+ idType: this.formIn.idType,
+ age: this.formIn.age,
+ ageUnit: this.formIn.ageUnit,
+ career: this.formIn.career,
+ };
+ }
+ tjReappoint(data).then((res) => {
+ if (res.code === 200) {
+ this.$modal.msgSuccess("鐧昏鎴愬姛");
}
- // let copeWith = this.TotalPrice1;
- // let paidIn = this.TotalPrice;
- // let discount = this.discount;
- // this.tjFlowingWater = { copeWith, paidIn, discount };
- if (this.formIn.timeRegion === "8:00-9:00") {
- this.formIn.timeRegion = 0;
- }
- if (this.formIn.timeRegion === "9:00-10:00") {
- this.formIn.timeRegion = 1;
- }
- if (this.formIn.timeRegion === "10:00-11:00") {
- this.formIn.timeRegion = 2;
- }
- if (this.formIn.timeRegion === "11:00-12:00") {
- this.formIn.timeRegion = 3;
- }
- let data;
- if (pacId) {
- data = {
- id: this.formIn.id,
- isExpire: this.formIn.isExpire,
- address: this.formIn.address,
- company: this.formIn.company,
- department: this.formIn.department,
- discount: this.discount,
- email: this.formIn.email,
- idCard: this.formIn.idCard,
- marriage: this.formIn.marriage,
- name: this.formIn.name,
- nation: this.formIn.nation,
- pacId,
- phoe: this.formIn.cusPhone,
- reservationTime: this.formIn.reservationTime,
- sex: this.formIn.sex,
- timeRegion: this.formIn.timeRegion,
- tjCategory: this.formIn.tjCategory,
- // tjFlowingWater: this.tjFlowingWater,
- tjType: this.formIn.tjType,
- idType: this.formIn.idType,
- age: this.formIn.age,
- ageUnit: this.formIn.ageUnit,
- career: this.formIn.career,
- };
- } else {
- data = {
- id: this.formIn.id,
- isExpire: this.formIn.isExpire,
- address: this.formIn.address,
- company: this.formIn.company,
- department: this.formIn.department,
- discount: this.discount,
- email: this.formIn.email,
- idCard: this.formIn.idCard,
- marriage: this.formIn.marriage,
- name: this.formIn.name,
- nation: this.formIn.nation,
- pacId,
- phoe: this.formIn.phoe,
- reservationTime: this.formIn.reservationTime,
- sex: this.formIn.sex,
- timeRegion: this.formIn.timeRegion,
- tjCategory: this.formIn.tjCategory,
- // tjFlowingWater: this.tjFlowingWater,
- tjType: this.formIn.tjType,
- idType: this.formIn.idType,
- age: this.formIn.age,
- ageUnit: this.formIn.ageUnit,
- career: this.formIn.career,
- };
- }
- tjReappoint(data).then((res) => {
- if (res.code === 200) {
- this.$modal.msgSuccess("鐧昏鎴愬姛");
- }
- _this.drawer = false;
- });
- this.getList();
- this.$tab.refreshPage();
+ _this.drawer = false;
+ });
+ this.getList();
+ this.$tab.refreshPage();
// } else {
// this.$message.warning("璇烽�夋嫨鎮ㄨ浣撴鐨勫唴瀹�");
// }
@@ -1658,7 +2377,7 @@
this.$modal.msgSuccess("鎾ら攢鎴愬姛");
this.getList();
})
- .catch(() => { });
+ .catch(() => {});
},
//鎵归噺鎾ら攢
diff --git a/src/views/system/biol/index.vue b/src/views/system/biol/index.vue
index 7193bc7..10ee5ba 100644
--- a/src/views/system/biol/index.vue
+++ b/src/views/system/biol/index.vue
@@ -472,10 +472,10 @@
</el-dialog>
<!--:before-close="handleClose" -->
<el-dialog title="鎻愮ず" :visible.sync="dialogVisiblese" width="30%">
- <el-radio v-model="radios" label="1">椋熷搧浠庝笟浜哄憳鍋ュ悍妫�鏌ヨ〃</el-radio>
- <el-radio v-model="radios" label="2">鍏叡鍦烘墍浠庝笟浜哄憳妫�鏌ヨ〃</el-radio>
+ <el-radio v-model="radios" label="1">浠庝笟浜哄憳妫�鏌ヨ〃</el-radio>
+ <el-radio v-model="radios" label="2">鍏叡鍦烘墍妫�鏌ヨ〃</el-radio>
<span slot="footer" class="dialog-footer">
- <el-button @click="dialogVisible = false">鍙� 娑�</el-button>
+ <el-button @click="dialogVisiblese = false">鍙� 娑�</el-button>
<el-button type="primary" @click="timjiao">纭� 瀹�</el-button>
</span>
</el-dialog>
diff --git a/src/views/system/interface/index.vue b/src/views/system/interface/index.vue
new file mode 100644
index 0000000..0e2dee5
--- /dev/null
+++ b/src/views/system/interface/index.vue
@@ -0,0 +1,84 @@
+<template>
+ <div class="app-container">
+ <el-row :gutter="10" class="mb8">
+ <el-col :span="1.5">
+ <el-button type="primary" size="mini" @click="handleExport"
+ >鍚屾</el-button
+ >
+ </el-col>
+ </el-row>
+
+ <template>
+ <el-table
+ border
+ v-loading="loading"
+ :data="orderList"
+ @selection-change="handleSelectionChange"
+ height="560"
+ >
+ <el-table-column type="selection" width="40px" align="center" />
+ <el-table-column label="鎺ュ彛鍚嶇О" align="center" prop="dictName" />
+ <el-table-column
+ label="澶囨敞"
+ align="center"
+ prop="remark"
+ :show-overflow-tooltip="true"
+ />
+ </el-table>
+ </template>
+ </div>
+</template>
+
+<script>
+import { histongbulist, histongbuexec, hisexec } from "@/api/system/interface";
+export default {
+ name: "Interface",
+ data() {
+ return {
+ orderList: [],
+ selectionList: [],
+ loading: false,
+ methods: [],
+ };
+ },
+ created() {
+ this.getList();
+ },
+ methods: {
+ getList() {
+ (this.loading = true),
+ histongbulist().then((res) => {
+ if (res.data) {
+ this.orderList = res.data;
+ }
+ this.loading = false;
+ });
+ },
+ handleSelectionChange(selection) {
+ this.selectionList = selection;
+ },
+ handleExport() {
+ if (this.selectionList.length != 0) {
+ if (this.selectionList.length == this.orderList.length) {
+ histongbuexec().then((res) => {
+ this.$modal.msgSuccess("鍚屾鎴愬姛");
+ this.getList()
+ });
+ } else {
+ this.methods = this.selectionList.map((item) => item.dictName);
+ let data = {
+ methods: this.methods,
+ type: false,
+ };
+ hisexec(data).then((res) => {
+ this.$modal.msgSuccess("鍚屾鎴愬姛");
+ this.getList()
+ });
+ }
+ } else {
+ this.$modal.msgError("璇烽�夋嫨鍚屾鏁版嵁");
+ }
+ },
+ },
+};
+</script>
\ No newline at end of file
diff --git a/src/views/system/interfaces/index.vue b/src/views/system/interfaces/index.vue
new file mode 100644
index 0000000..a293571
--- /dev/null
+++ b/src/views/system/interfaces/index.vue
@@ -0,0 +1,96 @@
+<template>
+ <div class="app-container">
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
+ <el-form-item label="鍦板潃" prop="menuName">
+ <el-input
+ v-model="queryParams.menuName"
+ placeholder="璇疯緭鍏ュ湴鍧�"
+ clearable
+ />
+ </el-form-item>
+ </el-form>
+ <el-row :gutter="10" class="mb8">
+ <el-col :span="1.5">
+ <el-button type="primary" size="mini" @click="handleExport"
+ >璋冪敤</el-button
+ >
+ </el-col>
+ </el-row>
+
+ <template>
+ <el-table
+ border
+ v-loading="loading"
+ :data="orderList"
+ @selection-change="handleSelectionChange"
+ height="560"
+ >
+ <el-table-column type="selection" width="40px" align="center" />
+ <el-table-column label="鎺ュ彛鍚嶇О" align="center" prop="dictName" />
+ <el-table-column
+ label="澶囨敞"
+ align="center"
+ prop="remark"
+ :show-overflow-tooltip="true"
+ />
+ </el-table>
+ </template>
+ </div>
+</template>
+
+<script>
+import { histongbulist, histongbuexec, hisexec } from "@/api/system/interface";
+export default {
+ name: "Interface",
+ data() {
+ return {
+ orderList: [],
+ selectionList: [],
+ loading: false,
+ methods: [],
+ queryParams:{
+ menuName:""
+ }
+ };
+ },
+ created() {
+ this.getList();
+ },
+ methods: {
+ getList() {
+ (this.loading = true),
+ histongbulist().then((res) => {
+ if (res.data) {
+ this.orderList = res.data;
+ }
+ this.loading = false;
+ });
+ },
+ handleSelectionChange(selection) {
+ this.selectionList = selection;
+ },
+ handleExport() {
+ if (this.selectionList.length != 0) {
+ if (this.selectionList.length == this.orderList.length) {
+ histongbuexec().then((res) => {
+ this.$modal.msgSuccess("鍚屾鎴愬姛");
+ this.getList()
+ });
+ } else {
+ this.methods = this.selectionList.map((item) => item.dictName);
+ let data = {
+ methods: this.methods,
+ type: false,
+ };
+ hisexec(data).then((res) => {
+ this.$modal.msgSuccess("鍚屾鎴愬姛");
+ this.getList()
+ });
+ }
+ } else {
+ this.$modal.msgError("璇烽�夋嫨鍚屾鏁版嵁");
+ }
+ },
+ },
+};
+</script>
\ No newline at end of file
diff --git a/src/views/system/packages/index.vue b/src/views/system/packages/index.vue
index 4f1f125..838fbe1 100644
--- a/src/views/system/packages/index.vue
+++ b/src/views/system/packages/index.vue
@@ -8,10 +8,10 @@
v-show="showSearch"
label-width="68px"
>
- <el-form-item label="濂楅鍚嶇О" prop="zhmc">
+ <el-form-item label="缁勫悎鍚嶇О" prop="zhmc">
<el-input
v-model="queryParams.zhmc"
- placeholder="璇疯緭鍏ュ椁愬悕绉�"
+ placeholder="璇疯緭鍏ョ粍鍚堝悕绉�"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -94,7 +94,7 @@
>
<el-table-column type="selection" width="40" align="center" />
<el-table-column
- label="濂楅鍚嶇О"
+ label="缁勫悎鍚嶇О"
align="center"
prop="zhmc"
width="150px"
@@ -150,7 +150,7 @@
</div>
</template>
- <!-- 淇敼浣撴濂楅瀵硅瘽妗� -->
+ <!-- 淇敼浣撴缁勫悎瀵硅瘽妗� -->
<el-dialog
:title="title"
:visible.sync="open"
@@ -167,17 +167,17 @@
>
<!-- <div class="dialo">
<div class="dialo1"> -->
- <el-form-item label="濂楅鍚嶇О" prop="zhmc">
+ <el-form-item label="缁勫悎鍚嶇О" prop="zhmc">
<span
slot="label"
style="display: inline-block; border-bottom: 2px solid blue"
@click="handlePackage"
>
- 濂楅鍚嶇О
+ 缁勫悎鍚嶇О
</span>
<el-input
v-model="form.zhmc"
- placeholder="璇疯緭鍏ュ椁愬悕绉�"
+ placeholder="璇疯緭鍏ョ粍鍚堝悕绉�"
style="width: 150px"
/>
</el-form-item>
@@ -346,16 +346,16 @@
showSearch: true,
// 鎬绘潯鏁�
total: 0,
- // 浣撴濂楅琛ㄦ牸鏁版嵁
+ // 浣撴缁勫悎琛ㄦ牸鏁版嵁
packageList: [],
- // 濂楅閫変腑鐨勭埗椤�
+ // 缁勫悎閫変腑鐨勭埗椤�
allpackageList: [],
// 宸查��
newproName: [],
// 鎵�鏈変綋妫�椤圭洰路
allList: [],
treeList: [],
- // 鎵�鏈夊椁愭暟鎹�
+ // 鎵�鏈夌粍鍚堟暟鎹�
// allpackage:[],
// 寮瑰嚭灞傛爣棰�
title: "",
@@ -420,7 +420,7 @@
return data.proEngName.indexOf(value) !== -1;
}
},
- /** 鏌ヨ浣撴濂楅鍒楄〃 */
+ /** 鏌ヨ浣撴缁勫悎鍒楄〃 */
getList() {
this.loading = true;
getZhList(this.queryParams).then((response) => {
@@ -470,7 +470,7 @@
handlePackage() {
this.$refs.aaa.open = true;
this.$refs.aaa.getList();
- this.$refs.aaa.title = "濂楅瀛楀吀";
+ this.$refs.aaa.title = "缁勫悎瀛楀吀";
},
handleChanges(param1) {
this.form.pacName = param1[0].pacName;
@@ -499,7 +499,7 @@
handleAdd() {
this.reset();
this.open = true;
- this.title = "浣撴濂楅淇℃伅缁存姢";
+ this.title = "浣撴缁勫悎淇℃伅缁存姢";
this.DataList = [];
this.checkedkey = [];
this.checkedListkey = [];
@@ -507,7 +507,7 @@
},
handleUp() {
- this.title = "浣撴濂楅淇℃伅缁存姢";
+ this.title = "浣撴缁勫悎淇℃伅缁存姢";
this.open = true;
// getPacTjProjectList().then((response) => {
// this.allList = response.data;
@@ -523,7 +523,7 @@
},
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
- this.title = "浣撴濂楅淇℃伅缁存姢";
+ this.title = "浣撴缁勫悎淇℃伅缁存姢";
this.open = true;
this.form = row;
this.DataList = [];
@@ -780,14 +780,14 @@
}
});
} else {
- Message.warning("璇峰厛濉啓濂楅鍚嶇О");
+ Message.warning("璇峰厛濉啓缁勫悎鍚嶇О");
}
},
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const pacIds = row.id || this.ids;
this.$modal
- .confirm('鏄惁纭鍒犻櫎浣撴濂楅缂栧彿涓�"' + pacIds + '"鐨勬暟鎹」锛�')
+ .confirm('鏄惁纭鍒犻櫎浣撴缁勫悎缂栧彿涓�"' + pacIds + '"鐨勬暟鎹」锛�')
.then(function () {
return delzhxm(pacIds);
})
@@ -798,7 +798,7 @@
.catch(() => {});
},
- /** 鍒嗛厤濂楅鍐呴」鐩搷浣� */
+ /** 鍒嗛厤缁勫悎鍐呴」鐩搷浣� */
handleProject: function (row) {
const pacId = row.pacId;
this.$router.push("/system/user-auth/role/" + pacId);
@@ -814,7 +814,7 @@
`package_${new Date().getTime()}.xlsx`
);
},
- // 濂楅璇︽儏
+ // 缁勫悎璇︽儏
// handleSeach(row) {
// this.Seachopen = true;
// this.loading = true;
diff --git a/vue.config.js b/vue.config.js
index 77960d7..0bcde09 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -63,7 +63,7 @@
},
},
'/douban':{
- target:'http://192.168.1.3:6789',
+ target:'http://192.168.1.3:14765',
changeOrigin:true,
ws: true,
pathRewrite: {
--
Gitblit v1.8.0