From ac6766c11f8a2b8de903b58c13a8f206fa01dccd Mon Sep 17 00:00:00 2001
From: qinxianzhangyao <11053546+qinxianzhangyao@user.noreply.gitee.com>
Date: 星期五, 15 三月 2024 17:56:32 +0800
Subject: [PATCH] qxtj
---
src/api/hosp/customer.js | 12
src/views/doctor/check/index.vue | 958 ++++++++++++--------------------
src/views/system/bill/index.vue | 13
vue.config.js | 2
src/views/doctor/examination/index.vue | 4
src/views/hosp/extension/index.vue | 4
src/views/hosp/fuzhen/index.vue | 3
src/views/system/Checkout/index.vue | 7
src/views/hosp/history/index.vue | 2
src/views/doctor/checkAll/index.vue | 4
src/views/hosp/order/index.vue | 14
package.json | 1
src/views/system/biol/index.vue | 18
src/views/team/reporting/index.vue | 2
src/views/hosp/customer/index.vue | 622 +++++++++------------
src/views/team/reportresults/index.vue | 6
src/views/sampling/sampling/index.vue | 4
src/views/team/teams/index.vue | 11
src/views/doctor/bgsh/index.vue | 4
src/views/team/disease/index.vue | 4
20 files changed, 731 insertions(+), 964 deletions(-)
diff --git a/package.json b/package.json
index 32b5315..dd75424 100644
--- a/package.json
+++ b/package.json
@@ -64,6 +64,7 @@
"vue-meta": "2.4.0",
"vue-pdf": "^4.3.0",
"vue-print-nb": "^1.7.5",
+ "vue-quill-editor": "^3.0.6",
"vue-router": "3.4.9",
"vuedraggable": "2.24.3",
"vuex": "3.6.0",
diff --git a/src/api/hosp/customer.js b/src/api/hosp/customer.js
index b597837..cfe2772 100644
--- a/src/api/hosp/customer.js
+++ b/src/api/hosp/customer.js
@@ -106,3 +106,15 @@
data: data
})
}
+
+
+export function getHistryTjOrderByCusIdCard(cusId) {
+ return request({
+ url: '/hosp/order/getHistryTjOrderByCusId',
+ method: 'get',
+ params:{
+ cusId:cusId
+
+ }
+ })
+}
diff --git a/src/views/doctor/bgsh/index.vue b/src/views/doctor/bgsh/index.vue
index 5d028f4..520fcb6 100644
--- a/src/views/doctor/bgsh/index.vue
+++ b/src/views/doctor/bgsh/index.vue
@@ -153,7 +153,7 @@
created() {
// this.getNowTime();
- this.getList();
+
this.getdate();
},
@@ -169,6 +169,7 @@
moment(res.data).format("YYYY-MM-DD 00:00:00"),
moment(res.data).format("YYYY-MM-DD 23:59:00"),
];
+ this.getList();
});
},
// / 澶勭悊榛樿閫変腑褰撳墠鏃ユ湡
@@ -309,6 +310,7 @@
},
// 閲嶇疆
resetQuery() {
+ this.startTime=[]
this.resetForm("tableList");
this.submitForm();
},
diff --git a/src/views/doctor/check/index.vue b/src/views/doctor/check/index.vue
index 696ba8a..ce52fdc 100644
--- a/src/views/doctor/check/index.vue
+++ b/src/views/doctor/check/index.vue
@@ -1,73 +1,32 @@
<template>
<div>
- <el-form
- :model="queryParams"
- ref="tableList"
- :inline="true"
- label-width="76px"
- style="margin-top: 10px"
- >
+ <el-form :model="queryParams" ref="tableList" :inline="true" label-width="76px" style="margin-top: 10px">
<el-form-item label="濮撳悕" prop="name">
- <el-input
- v-model="queryParams.name"
- style="width: 116px"
- placeholder="璇疯緭鍏ュ鍚�"
- clearable
- @keyup.enter.native="submitForm"
- ></el-input>
+ <el-input v-model="queryParams.name" style="width: 116px" placeholder="璇疯緭鍏ュ鍚�" clearable
+ @keyup.enter.native="submitForm"></el-input>
</el-form-item>
<el-form-item label="浣撴鍙�" prop="tjNumber">
- <el-input
- ref="inputName"
- v-model="queryParams.tjNumber"
- style="width: 240px"
- placeholder="璇疯緭鍏ヤ綋妫�鍙�"
- clearable
- @blur="hb"
- @keyup.enter.native="submitForm"
- ></el-input>
+ <el-input ref="inputName" v-model="queryParams.tjNumber" style="width: 240px" placeholder="璇疯緭鍏ヤ綋妫�鍙�" clearable
+ @blur="hb" @keyup.enter.native="submitForm"></el-input>
</el-form-item>
<el-form-item>
- <el-button size="mini" type="primary" @click="submitForm"
- >鎼滅储</el-button
- >
+ <el-button size="mini" type="primary" @click="submitForm">鎼滅储</el-button>
<el-button size="mini" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
</el-form>
<div style="display: flex">
- <el-radio-group
- v-model="tjStatus"
- @input="radioChange"
- style="margin-left: 30px"
- >
+ <el-radio-group v-model="tjStatus" @input="radioChange" style="margin-left: 30px">
<el-radio-button label="0">鏈</el-radio-button>
<el-radio-button label="1">宸叉</el-radio-button>
</el-radio-group>
</div>
<template>
- <el-table
- :data="tableList"
- v-loading="loading"
- ref="table"
- height="536px"
- style="margin: 20px; width: 98%"
- border
- :cell-class-name="myclass"
- >
+ <el-table :data="tableList" v-loading="loading" ref="table" height="536px" style="margin: 20px; width: 98%" border
+ :cell-class-name="myclass">
<!-- <template slot="empty">鏁版嵁姝ｅ湪鍔犺浇涓�</template> -->
- <el-table-column
- label="浣撴鍙�"
- align="center"
- prop="tjNumber"
- width="160px"
- />
- <el-table-column
- label="濮撳悕"
- align="center"
- prop="cusName"
- width="90px"
- />
+ <el-table-column label="浣撴鍙�" align="center" prop="tjNumber" width="160px" />
+ <el-table-column label="濮撳悕" align="center" prop="cusName" width="90px" />
<el-table-column label="鎬у埆" align="center" prop="cusSex" width="60px">
<template slot-scope="scope">
<span v-if="scope.row.cusSex == '0'">鐢�</span>
@@ -76,119 +35,50 @@
<span v-if="scope.row.cusSex == '9'">鏈鏄庢�у埆</span>
</template>
</el-table-column>
- <el-table-column
- label="鍑虹敓鏃ユ湡"
- align="center"
- prop="cusBrithday"
- width="100px"
- />
- <el-table-column
- label="鐢佃瘽"
- align="center"
- prop="cusPhone"
- width="100px"
- />
- <el-table-column
- label="浣撴绫诲瀷"
- align="center"
- prop="tjType"
- width="80px"
- />
- <el-table-column
- label="鐧昏鏃堕棿"
- align="center"
- prop="tjTime"
- width="160px"
- >
+ <el-table-column label="鍑虹敓鏃ユ湡" align="center" prop="cusBrithday" width="100px" />
+ <el-table-column label="鐢佃瘽" align="center" prop="cusPhone" width="100px" />
+ <el-table-column label="浣撴绫诲瀷" align="center" prop="tjType" width="80px" />
+ <el-table-column label="鐧昏鏃堕棿" align="center" prop="tjTime" width="160px">
</el-table-column>
- <el-table-column
- label="浣撴鏃堕棿"
- align="center"
- prop="tjTime"
- width="100px"
- >
+ <el-table-column label="浣撴鏃堕棿" align="center" prop="tjTime" width="100px">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.tjTime, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column>
- <el-table-column
- label="鏈椤�"
- prop="notCheckeds"
- :show-overflow-tooltip="true"
- />
+ <el-table-column label="鏈椤�" prop="notCheckeds" :show-overflow-tooltip="true" />
<el-table-column label="鎿嶄綔" align="center" width="130px">
<template slot-scope="scope">
- <el-button
- type="primary"
- icon="el-icon-first-aid-kit"
- size="mini"
- @click="Changeapplyfor(scope.row)"
- title="浼氳瘖鐢宠"
- v-if="tjStatus == '1'"
- ></el-button>
- <el-button
- type="primary"
- icon="el-icon-share"
- size="mini"
- @click="handleClick(scope.row)"
- title="璇︽儏"
- ></el-button>
+ <el-button type="primary" icon="el-icon-first-aid-kit" size="mini" @click="Changeapplyfor(scope.row)"
+ title="浼氳瘖鐢宠" v-if="tjStatus == '1'"></el-button>
+ <el-button type="primary" icon="el-icon-share" size="mini" @click="handleClick(scope.row)"
+ title="璇︽儏"></el-button>
</template>
</el-table-column>
</el-table>
<div class="pag">
<div class="pag1">
- <pagination
- v-show="total > 0"
- :total="total"
- :page.sync="queryParams.page"
- :limit.sync="queryParams.pageSize"
- @pagination="getList"
- />
+ <pagination v-show="total > 0" :total="total" :page.sync="queryParams.page" :limit.sync="queryParams.pageSize"
+ @pagination="getList" />
</div>
</div>
</template>
- <el-dialog
- :title="title"
- :visible.sync="open"
- width="1000px"
- append-to-body
- >
+ <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
<el-row>
<el-col :span="9" v-if="hzlogList.length >= 1">
<h3>浼氳瘖鐢宠璁板綍</h3>
<el-table :data="hzlogList" style="width: 100%" border>
- <el-table-column
- label="鐢宠浜�"
- align="center"
- prop="hzDoctorName"
- width="100px"
- />
+ <el-table-column label="鐢宠浜�" align="center" prop="hzDoctorName" width="100px" />
<el-table-column label="绉戝" align="center" prop="hzDeptName" />
<el-table-column label="鎿嶄綔" align="center" width="150px">
<template slot-scope="scope">
- <el-button
- type="primary"
- size="mini"
- @click="hadleedit(scope.row)"
- v-if="
- scope.row.hzReplyLogsList.length == 0 &&
- scope.row.hzDoctorId == info.userId
- "
- >淇敼</el-button
- >
- <el-button
- type="primary"
- size="mini"
- v-if="
- scope.row.hzReplyLogsList.length == 0 &&
- scope.row.hzDoctorId == info.userId
- "
- @click="handledele(scope.row)"
- >鍒犻櫎</el-button
- >
+ <el-button type="primary" size="mini" @click="hadleedit(scope.row)" v-if="scope.row.hzReplyLogsList.length == 0 &&
+ scope.row.hzDoctorId == info.userId
+ ">淇敼</el-button>
+ <el-button type="primary" size="mini" v-if="scope.row.hzReplyLogsList.length == 0 &&
+ scope.row.hzDoctorId == info.userId
+ " @click="handledele(scope.row)">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
@@ -197,18 +87,10 @@
<h3 style="text-align: center">浼氳瘖璁板綍鐢宠</h3>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="濮撳悕" prop="cusName">
- <el-input
- v-model="form.cusName"
- placeholder="璇疯緭鍏ュ鍚�"
- disabled
- />
+ <el-input v-model="form.cusName" placeholder="璇疯緭鍏ュ鍚�" disabled />
</el-form-item>
<el-form-item label="浣撴鍙�" prop="tjNumber">
- <el-input
- v-model="form.tjNumber"
- placeholder="璇疯緭鍏ヤ綋妫�鍙�"
- disabled
- />
+ <el-input v-model="form.tjNumber" placeholder="璇疯緭鍏ヤ綋妫�鍙�" disabled />
</el-form-item>
<el-form-item label="浼氳瘖绉戝" prop="hzType">
<el-radio-group v-model="form.hzType">
@@ -216,42 +98,15 @@
<el-radio-button label="1">绉戝浼氳瘖</el-radio-button>
</el-radio-group>
</el-form-item>
- <el-form-item
- label="閫夋嫨绉戝"
- v-if="form.hzType == '1'"
- style="margin-top: 22px"
- >
- <el-select
- v-model="form.hzDeptId"
- multiple
- filterable
- style="width: 100%"
- >
- <el-option
- v-for="item in deptList"
- :key="item.deptId"
- :label="item.deptName"
- :value="item.deptId"
- ></el-option>
+ <el-form-item label="閫夋嫨绉戝" v-if="form.hzType == '1'" style="margin-top: 22px">
+ <el-select v-model="form.hzDeptId" multiple filterable style="width: 100%">
+ <el-option v-for="item in deptList" :key="item.deptId" :label="item.deptName"
+ :value="item.deptId"></el-option>
</el-select>
</el-form-item>
- <el-form-item
- label="鐢宠浜�"
- prop="hzDoctorId"
- style="margin-top: 22px"
- >
- <el-select
- v-model="form.hzDoctorId"
- placeholder="璇烽�夋嫨"
- style="width: 100%"
- filterable
- >
- <el-option
- v-for="item in userList"
- :key="item.userId"
- :label="item.nickName"
- :value="item.userId"
- >
+ <el-form-item label="鐢宠浜�" prop="hzDoctorId" style="margin-top: 22px">
+ <el-select v-model="form.hzDoctorId" placeholder="璇烽�夋嫨" style="width: 100%" filterable>
+ <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId">
</el-option>
</el-select>
</el-form-item>
@@ -268,56 +123,27 @@
</div>
</el-dialog>
- <el-dialog
- :title="title"
- :visible.sync="foropen"
- width="1000px"
- append-to-body
- >
+ <el-dialog :title="title" :visible.sync="foropen" width="1000px" append-to-body>
<el-row>
<el-col :span="8" v-if="hasdeptList.length >= 1">
<h3 style="text-align: center">浼氳瘖鐢宠璁板綍</h3>
- <el-table
- :data="hasdeptList"
- style="width: 100%"
- border
- ref="tab"
- @selection-change="handleSelectionChange"
- >
+ <el-table :data="hasdeptList" style="width: 100%" border ref="tab" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="50" align="center" />
- <el-table-column
- label="鐢宠浜�"
- align="center"
- prop="hzDoctorName"
- width="100px"
- />
- <el-table-column
- label="绉戝"
- align="center"
- prop="hzDeptName"
- width="260px"
- />
+ <el-table-column label="鐢宠浜�" align="center" prop="hzDoctorName" width="100px" />
+ <el-table-column label="绉戝" align="center" prop="hzDeptName" width="260px" />
</el-table>
</el-col>
<el-col :span="16" style="padding: 0 10px">
<h3 style="text-align: center">浼氳瘖鎰忚</h3>
<div v-if="hzReplyLogsList.length >= 1" style="margin-bottom: 10px">
- <div
- v-for="(item, index) in hzReplyLogsList"
- :key="index"
- style="padding-bottom: 5px; border-bottom: 1px solid black"
- >
+ <div v-for="(item, index) in hzReplyLogsList" :key="index"
+ style="padding-bottom: 5px; border-bottom: 1px solid black">
<!-- <div>浼氳瘖绉戝锛歿{ item.replyDeptName }}</div> -->
<div>鍖荤敓锛歿{ item.hzDoctorName }}</div>
<div>鍥炲锛歿{ item.replyContent }}</div>
</div>
</div>
- <el-input
- type="textarea"
- :rows="2"
- placeholder="璇疯緭鍏ュ唴瀹�"
- v-model="textarea"
- >
+ <el-input type="textarea" :rows="2" placeholder="璇疯緭鍏ュ唴瀹�" v-model="textarea">
</el-input>
<div style="padding: 10px 10px">
<el-button type="primary" @click="submitFormreply">鍥炲</el-button>
@@ -330,12 +156,7 @@
</div> -->
</el-dialog>
- <el-dialog
- title="濉啓鏄惁閲嶅ぇ闃虫��"
- :visible.sync="checkval"
- width="800px"
- append-to-body
- >
+ <el-dialog title="濉啓鏄惁閲嶅ぇ闃虫��" :visible.sync="checkval" width="800px" append-to-body>
<el-form ref="form" :model="formIn" label-width="100px">
<el-form-item label="濮撳悕">
<el-input v-model="formIn.cusName" disabled></el-input>
@@ -356,18 +177,8 @@
</el-radio-group>
</el-form-item>
<el-form-item label="绛夌骇">
- <el-select
- v-model="formIn.level"
- placeholder="璇烽�夋嫨"
- filterable
- style="width: 100%"
- >
- <el-option
- v-for="item in dict.type.lj_positive"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
+ <el-select v-model="formIn.level" placeholder="璇烽�夋嫨" filterable style="width: 100%">
+ <el-option v-for="item in dict.type.lj_positive" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item>
@@ -381,31 +192,16 @@
</div>
</el-dialog>
- <el-dialog
- title="PDF 棰勮"
- :visible.sync="dialogVisible"
- :close-on-click-modal="false"
- >
+ <el-dialog title="PDF 棰勮" :visible.sync="dialogVisible" :close-on-click-modal="false">
<div class="main">
- <iframe
- id="printIframe"
- :src="url"
- frameborder="0"
- style="width: 100%; height: 100%"
- ></iframe>
+ <iframe id="printIframe" :src="url" frameborder="0" style="width: 100%; height: 100%"></iframe>
</div>
</el-dialog>
<!-- 鐐瑰嚮鍙宠竟寮瑰嚭灞� -->
- <el-drawer
- :visible.sync="drawer"
- :with-header="false"
- size="70%"
- :before-close="handleClose"
- >
+ <el-drawer :visible.sync="drawer" :with-header="false" size="70%" :before-close="handleClose">
<div style="font-size: 14px">
- <table
- style="
+ <table style="
width: 96%;
height:70px;
margin: 10px 10px;
@@ -413,19 +209,14 @@
border: 1px solid #dfe6ec;
border-collapse: collapse;
font-size:16px
- "
- cellspacing="4"
- >
+ " cellspacing="4">
<caption style="background-color: #f8f8f9; font-size: 18px">
濉啓{{
- tableAll.cusName
- }}鐨勪綋妫�璧勬枡
+ tableAll.cusName
+ }}鐨勪綋妫�璧勬枡
</caption>
<tr style="border: 1px solid #dfe6ec; border-collapse: collapse">
- <td
- style="border: 1px solid #dfe6ec; border-collapse: collapse"
- align="right"
- >
+ <td style="border: 1px solid #dfe6ec; border-collapse: collapse" align="right">
濮撳悕锛�
</td>
<td style="border: 1px solid #dfe6ec; border-collapse: collapse">
@@ -437,10 +228,7 @@
<span v-if="scope.row.cusSex == '9'">鏈鏄庢�у埆</span>
</template>
</td>
- <td
- style="border: 1px solid #dfe6ec; border-collapse: collapse"
- align="right"
- >
+ <td style="border: 1px solid #dfe6ec; border-collapse: collapse" align="right">
鎬у埆锛�
</td>
<td style="border: 1px solid #dfe6ec; border-collapse: collapse">
@@ -448,19 +236,13 @@
</td>
</tr>
<tr style="border: 1px solid #dfe6ec; border-collapse: collapse">
- <td
- style="border: 1px solid #dfe6ec; border-collapse: collapse"
- align="right"
- >
+ <td style="border: 1px solid #dfe6ec; border-collapse: collapse" align="right">
浣撴鍗曞彿锛�
</td>
<td style="border: 1px solid #dfe6ec; border-collapse: collapse">
{{ tableAll.tjNumber }}
</td>
- <td
- style="border: 1px solid #dfe6ec; border-collapse: collapse"
- align="right"
- >
+ <td style="border: 1px solid #dfe6ec; border-collapse: collapse" align="right">
浣撴鏃堕棿锛�
</td>
<td style="border: 1px solid #dfe6ec; border-collapse: collapse">
@@ -471,75 +253,38 @@
</div>
<div style="display: flex">
<div style="margin: 10px 10px" v-if="hasdeptList.length >= 1">
- <el-button type="primary" size="mini" @click="Changeapply()"
- >浼氳瘖鐢宠</el-button
- >
+ <el-button type="primary" size="mini" @click="Changeapply()">浼氳瘖鐢宠</el-button>
</div>
<div style="margin: 10px 10px">
- <el-button type="primary" size="mini" @click="historicalreport()"
- >鍘嗗彶鎶ュ憡</el-button
- >
+ <el-button type="primary" size="mini" @click="historicalreport()">鍘嗗彶鎶ュ憡</el-button>
</div>
<div style="margin: 10px 10px">
- <el-button type="primary" size="mini" @click="jianqian"
- >妫�鍓嶉棶璇�</el-button
- >
+ <el-button type="primary" size="mini" @click="jianqian">妫�鍓嶉棶璇�</el-button>
</div>
</div>
<el-row>
<el-col v-show="baogaoqian">
<template>
- <div style="margin-left: 10px">
- <el-radio-group
- v-model="radio"
- v-for="(item, index) in Parent"
- :key="index"
- @input="radioChange1(item.proId, item)"
- >
- <el-radio-button :label="item.proId">{{
- item.proName
- }}</el-radio-button>
- </el-radio-group>
- </div>
- </template>
- <el-table
- v-loading="loading"
- :data="proParentList.sons"
- border
- height="460px"
- style="width: 96%; margin: 10px 10px"
- >
- <el-table-column
- prop="project.proName"
- label="妫�娴嬮」鐩�"
- width="150"
- fixed="left"
- >
+ <el-tabs v-model="radio" type="border-card" @tab-click="handleTabClick" style="margin-left: 10px;">
+ <el-tab-pane :label="item.proName" :name="item.proId" v-for="(item, index) in Parent" :key="index">
+ <el-table v-loading="loading" :data="proParentList.sons" border height="460px"
+ style="width: 96%; margin: 10px 10px">
+ <el-table-column prop="project.proName" label="妫�娴嬮」鐩�" width="150" fixed="left">
<!-- <template slot-scope="scope">
{{ scope.row.project.proName }}
</template> -->
</el-table-column>
<el-table-column prop="proResult" label="妫�娴嬬粨鏋�" width="200">
<template slot-scope="scope">
- <el-input
- type="textarea"
- autosize
- size="mini"
- v-model="scope.row.proResult"
- autocomplete="off"
- placeholder="璇疯緭鍏ユ娴嬬粨鏋�"
- @blur="handleInputConfirm(scope.row)"
- @input="vale"
- @focus="handleInConfirm(scope.row)"
- ></el-input>
+ <el-input type="textarea" autosize size="mini" v-model="scope.row.proResult" autocomplete="off"
+ placeholder="璇疯緭鍏ユ娴嬬粨鏋�" @blur="handleInputConfirm(scope.row)" @input="vale"
+ @focus="handleInConfirm(scope.row)"></el-input>
</template>
</el-table-column>
<el-table-column label="瑙勫垯" width="55">
<template slot-scope="scope">
- <el-button class="blue-button" @click="handleguize(scope.row)"
- >...</el-button
- >
+ <el-button class="blue-button" @click="handleguize(scope.row)">...</el-button>
</template>
</el-table-column>
<el-table-column prop="project.proMetering" label="鍗曚綅">
@@ -551,136 +296,68 @@
</el-table-column>
<el-table-column prop="conclusion" label="缁撴灉缁撹" width="200">
<template slot-scope="scope">
- <el-input
- size="mini"
- type="textarea"
- autosize
- v-model="scope.row.conclusion"
- autocomplete="off"
- placeholder="璇疯緭鍏ユ娴嬬粨鏋�"
- disabled
- ></el-input>
+ <el-input size="mini" type="textarea" autosize v-model="scope.row.conclusion" autocomplete="off"
+ placeholder="璇疯緭鍏ユ娴嬬粨鏋�" disabled></el-input>
</template>
</el-table-column>
- <el-table-column
- prop="exceptionDesc"
- label="鏄惁寮傚父"
- width="80px"
- align="center"
- >
+ <el-table-column prop="exceptionDesc" label="鏄惁寮傚父" width="80px" align="center">
<template slot-scope="scope">
<el-checkbox v-model="scope.row.exceptionDesc"></el-checkbox>
</template>
</el-table-column>
- <el-table-column
- prop="isReturn"
- label="鏄惁澶嶈瘖"
- width="80px"
- align="center"
- >
+ <el-table-column prop="isReturn" label="鏄惁澶嶈瘖" width="80px" align="center">
<template slot-scope="scope">
<el-checkbox v-model="scope.row.isReturn"></el-checkbox>
</template>
</el-table-column>
<el-table-column prop="project.resultType" label="缁撴灉绫诲瀷">
<template slot-scope="scope">
- <dict-tag
- :options="dict.type.tj_result_type"
- :value="scope.row.project.resultType"
- />
+ <dict-tag :options="dict.type.tj_result_type" :value="scope.row.project.resultType" />
</template>
</el-table-column>
<el-table-column prop="isPositive" label="閲嶅ぇ闃虫��">
<template slot-scope="scope">
- <el-switch
- v-model="scope.row.isPositive"
- active-value="1"
- inactive-value="0"
- @change="checkboxchange(scope.row)"
- ></el-switch>
+ <el-switch v-model="scope.row.isPositive" active-value="1" inactive-value="0"
+ @change="checkboxchange(scope.row)"></el-switch>
</template>
</el-table-column>
</el-table>
<div style="font-size: 14px; overflow-y: auto; height: 286px">
- <table
- style="
+ <table style="
width: 96%;
margin: 4px 10px;
border: 1px solid #dfe6ec;
border-collapse: collapse;
- "
- cellspacing="4"
- >
+ " cellspacing="4">
<tr style="border: 1px solid #dfe6ec; border-collapse: collapse">
- <td
- style="border: 1px solid #dfe6ec; border-collapse: collapse"
- >
+ <td style="border: 1px solid #dfe6ec; border-collapse: collapse">
鐥呯閫夋嫨锛�
</td>
- <td
- style="border: 1px solid #dfe6ec; border-collapse: collapse"
- >
- <el-select
- v-model="value"
- multiple
- placeholder="璇烽�夋嫨"
- style="width: 100%; height: 45px"
- v-if="deptAdviceList"
- @change="sel"
- filterable
- >
- <el-option
- v-for="item in deptAdviceList"
- :key="item.id"
- :label="item.title"
- :value="item.id"
- >
+ <td style="border: 1px solid #dfe6ec; border-collapse: collapse">
+ <el-select v-model="value" multiple placeholder="璇烽�夋嫨" style="width: 100%; height: 45px"
+ v-if="deptAdviceList" @change="sel" filterable>
+ <el-option v-for="item in deptAdviceList" :key="item.id" :label="item.title" :value="item.id">
</el-option>
</el-select>
</td>
- <td
- style="border: 1px solid #dfe6ec; border-collapse: collapse"
- >
+ <td style="border: 1px solid #dfe6ec; border-collapse: collapse">
涓绘鍖诲笀锛�
</td>
- <td
- style="border: 1px solid #dfe6ec; border-collapse: collapse"
- >
- <el-select
- v-model="doctorName"
- placeholder="璇烽�夋嫨"
- style="width: 100%"
- v-if="deptAdviceList"
- @change="selName"
- filterable
- >
- <el-option
- v-for="item in userList"
- :key="item.userId"
- :label="item.nickName"
- :value="item.userId"
- >
+ <td style="border: 1px solid #dfe6ec; border-collapse: collapse">
+ <el-select v-model="doctorName" placeholder="璇烽�夋嫨" style="width: 100%" v-if="deptAdviceList"
+ @change="selName" filterable>
+ <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId">
</el-option>
</el-select>
</td>
</tr>
<tr style="border: 1px solid #dfe6ec; border-collapse: collapse">
- <td
- style="border: 1px solid #dfe6ec; border-collapse: collapse"
- >
+ <td style="border: 1px solid #dfe6ec; border-collapse: collapse">
寤鸿锛�
</td>
- <td
- style="border: 1px solid #dfe6ec; border-collapse: collapse"
- colspan="2"
- >
- <el-input
- type="textarea"
- placeholder="璇疯緭鍏ュ唴瀹�"
- v-model="proParentList.remark"
- rows="7"
- >
+ <td style="border: 1px solid #dfe6ec; border-collapse: collapse" colspan="2">
+ <el-input type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" v-model="proParentList.remark" rows="7">
</el-input>
</td>
</tr>
@@ -693,67 +370,49 @@
v-hasPermi="['system:notice:add']"
v-show="tjStatus == '1'"
>浼氳瘖鐢宠</el-button> -->
- <el-button
- type="primary"
- @click="determine"
- v-show="tjStatus == '0'"
- >鎻� 浜�</el-button
- >
+ <el-button type="primary" @click="determine" v-show="tjStatus == '0'">鎻� 浜�</el-button>
</div>
</div>
+ </el-tab-pane>
+ </el-tabs>
+ </template>
+ <!-- <template>
+ <div style="margin-left: 10px">
+ <el-radio-group
+ v-model="radio"
+ v-for="(item, index) in Parent"
+ :key="index"
+ @input="radioChange1(item.proId, item)"
+ >
+ <el-radio-button :label="item.proId">{{
+ item.proName
+ }}</el-radio-button>
+ </el-radio-group>
+ </div>
+ </template> -->
+
</el-col>
<el-col :span="18" v-show="baogaohou">
<template>
- <div style="margin-left: 10px">
- <el-radio-group
- v-model="radio"
- v-for="(item, index) in Parent"
- :key="index"
- @input="radioChange1(item.proId, item)"
- >
- <el-radio-button :label="item.proId">{{
- item.proName
- }}</el-radio-button>
- </el-radio-group>
- </div>
- </template>
- <el-table
- v-loading="loading"
- :data="proParentList.sons"
- border
- height="460px"
- style="width: 96%; margin: 10px 10px"
- >
- <el-table-column
- prop="project.proName"
- label="妫�娴嬮」鐩�"
- width="150"
- fixed="left"
- >
+ <el-tabs v-model="radio" type="border-card" @tab-click="handleTabClick" style="margin-left: 10px;">
+ <el-tab-pane :label="item.proName" :name="item.proId" v-for="(item, index) in Parent" :key="index">
+ <el-table v-loading="loading" :data="proParentList.sons" border height="460px"
+ style="width: 96%; margin: 10px 10px">
+ <el-table-column prop="project.proName" label="妫�娴嬮」鐩�" width="150" fixed="left">
<!-- <template slot-scope="scope">
{{ scope.row.project.proName }}
</template> -->
</el-table-column>
<el-table-column prop="proResult" label="妫�娴嬬粨鏋�" width="200">
<template slot-scope="scope">
- <el-input
- type="textarea"
- autosize
- size="mini"
- v-model="scope.row.proResult"
- autocomplete="off"
- placeholder="璇疯緭鍏ユ娴嬬粨鏋�"
- @blur="handleInputConfirm(scope.row)"
- @input="vale"
- @focus="handleInConfirm(scope.row)"
- ></el-input>
+ <el-input type="textarea" autosize size="mini" v-model="scope.row.proResult" autocomplete="off"
+ placeholder="璇疯緭鍏ユ娴嬬粨鏋�" @blur="handleInputConfirm(scope.row)" @input="vale"
+ @focus="handleInConfirm(scope.row)"></el-input>
</template>
</el-table-column>
<el-table-column label="瑙勫垯" width="55">
<template slot-scope="scope">
- <el-button class="blue-button" @click="handleguize(scope.row)"
- >...</el-button
- >
+ <el-button class="blue-button" @click="handleguize(scope.row)">...</el-button>
</template>
</el-table-column>
<el-table-column prop="project.proMetering" label="鍗曚綅">
@@ -765,136 +424,68 @@
</el-table-column>
<el-table-column prop="conclusion" label="缁撴灉缁撹" width="200">
<template slot-scope="scope">
- <el-input
- size="mini"
- type="textarea"
- autosize
- v-model="scope.row.conclusion"
- autocomplete="off"
- placeholder="璇疯緭鍏ユ娴嬬粨鏋�"
- disabled
- ></el-input>
+ <el-input size="mini" type="textarea" autosize v-model="scope.row.conclusion" autocomplete="off"
+ placeholder="璇疯緭鍏ユ娴嬬粨鏋�" disabled></el-input>
</template>
</el-table-column>
- <el-table-column
- prop="exceptionDesc"
- label="鏄惁寮傚父"
- width="80px"
- align="center"
- >
+ <el-table-column prop="exceptionDesc" label="鏄惁寮傚父" width="80px" align="center">
<template slot-scope="scope">
<el-checkbox v-model="scope.row.exceptionDesc"></el-checkbox>
</template>
</el-table-column>
- <el-table-column
- prop="isReturn"
- label="鏄惁澶嶈瘖"
- width="80px"
- align="center"
- >
+ <el-table-column prop="isReturn" label="鏄惁澶嶈瘖" width="80px" align="center">
<template slot-scope="scope">
<el-checkbox v-model="scope.row.isReturn"></el-checkbox>
</template>
</el-table-column>
<el-table-column prop="project.resultType" label="缁撴灉绫诲瀷">
<template slot-scope="scope">
- <dict-tag
- :options="dict.type.tj_result_type"
- :value="scope.row.project.resultType"
- />
+ <dict-tag :options="dict.type.tj_result_type" :value="scope.row.project.resultType" />
</template>
</el-table-column>
<el-table-column prop="isPositive" label="閲嶅ぇ闃虫��">
<template slot-scope="scope">
- <el-switch
- v-model="scope.row.isPositive"
- active-value="1"
- inactive-value="0"
- @change="checkboxchange(scope.row)"
- ></el-switch>
+ <el-switch v-model="scope.row.isPositive" active-value="1" inactive-value="0"
+ @change="checkboxchange(scope.row)"></el-switch>
</template>
</el-table-column>
</el-table>
<div style="font-size: 14px; overflow-y: auto; height: 286px">
- <table
- style="
+ <table style="
width: 96%;
margin: 4px 10px;
border: 1px solid #dfe6ec;
border-collapse: collapse;
- "
- cellspacing="4"
- >
+ " cellspacing="4">
<tr style="border: 1px solid #dfe6ec; border-collapse: collapse">
- <td
- style="border: 1px solid #dfe6ec; border-collapse: collapse"
- >
+ <td style="border: 1px solid #dfe6ec; border-collapse: collapse">
鐥呯閫夋嫨锛�
</td>
- <td
- style="border: 1px solid #dfe6ec; border-collapse: collapse"
- >
- <el-select
- v-model="value"
- multiple
- placeholder="璇烽�夋嫨"
- style="width: 100%; height: 45px"
- v-if="deptAdviceList"
- @change="sel"
- filterable
- >
- <el-option
- v-for="item in deptAdviceList"
- :key="item.id"
- :label="item.title"
- :value="item.id"
- >
+ <td style="border: 1px solid #dfe6ec; border-collapse: collapse">
+ <el-select v-model="value" multiple placeholder="璇烽�夋嫨" style="width: 100%; height: 45px"
+ v-if="deptAdviceList" @change="sel" filterable>
+ <el-option v-for="item in deptAdviceList" :key="item.id" :label="item.title" :value="item.id">
</el-option>
</el-select>
</td>
- <td
- style="border: 1px solid #dfe6ec; border-collapse: collapse"
- >
+ <td style="border: 1px solid #dfe6ec; border-collapse: collapse">
涓绘鍖诲笀锛�
</td>
- <td
- style="border: 1px solid #dfe6ec; border-collapse: collapse"
- >
- <el-select
- v-model="doctorName"
- placeholder="璇烽�夋嫨"
- style="width: 100%"
- v-if="deptAdviceList"
- @change="selName"
- filterable
- >
- <el-option
- v-for="item in userList"
- :key="item.userId"
- :label="item.nickName"
- :value="item.userId"
- >
+ <td style="border: 1px solid #dfe6ec; border-collapse: collapse">
+ <el-select v-model="doctorName" placeholder="璇烽�夋嫨" style="width: 100%" v-if="deptAdviceList"
+ @change="selName" filterable>
+ <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId">
</el-option>
</el-select>
</td>
</tr>
<tr style="border: 1px solid #dfe6ec; border-collapse: collapse">
- <td
- style="border: 1px solid #dfe6ec; border-collapse: collapse"
- >
+ <td style="border: 1px solid #dfe6ec; border-collapse: collapse">
寤鸿锛�
</td>
- <td
- style="border: 1px solid #dfe6ec; border-collapse: collapse"
- colspan="2"
- >
- <el-input
- type="textarea"
- placeholder="璇疯緭鍏ュ唴瀹�"
- v-model="proParentList.remark"
- rows="7"
- >
+ <td style="border: 1px solid #dfe6ec; border-collapse: collapse" colspan="2">
+ <el-input type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" v-model="proParentList.remark" rows="7">
</el-input>
</td>
</tr>
@@ -907,20 +498,26 @@
v-hasPermi="['system:notice:add']"
v-show="tjStatus == '1'"
>浼氳瘖鐢宠</el-button> -->
- <el-button
- type="primary"
- @click="determine"
- v-show="tjStatus == '0'"
- >鎻� 浜�</el-button
- >
+ <el-button type="primary" @click="determine" v-show="tjStatus == '0'">鎻� 浜�</el-button>
</div>
</div>
+ </el-tab-pane>
+ </el-tabs>
+ </template>
+ <!-- <template>
+ <div style="margin-left: 10px">
+ <el-radio-group v-model="radio" v-for="(item, index) in Parent" :key="index"
+ @input="radioChange1(item.proId, item)">
+ <el-radio-button :label="item.proId">{{
+ item.proName
+ }}</el-radio-button>
+ </el-radio-group>
+ </div>
+ </template> -->
+
</el-col>
<el-col :span="6" style="margin-top: 15px">
- <Historicalreport
- v-show="lishi"
- :reportHistorydata="reportHistorydata"
- ></Historicalreport>
+ <Historicalreport v-show="lishi" :reportHistorydata="reportHistorydata"></Historicalreport>
</el-col>
</el-row>
@@ -967,16 +564,8 @@
</el-drawer>
<Public ref="aaa" :row="row" @add="handleChanges" />
- <el-dialog
- title="鎻愮ず"
- :visible.sync="jianqians"
- width="1000px"
- :before-close="handleClose1"
- >
- <jianqianwenzhen
- :jianqianwenzhendata="jianqianwenzhendata"
- v-if="flags"
- ></jianqianwenzhen>
+ <el-dialog title="鎻愮ず" :visible.sync="jianqians" width="1000px" :before-close="handleClose1">
+ <jianqianwenzhen :jianqianwenzhendata="jianqianwenzhendata" v-if="flags"></jianqianwenzhen>
<span slot="footer" class="dialog-footer">
<el-button @click="jianqians = false">鍙� 娑�</el-button>
</span>
@@ -1109,7 +698,7 @@
queryParam: {
page: 1,
pageSize: 1000,
-
+
},
rules: {
hzType: [
@@ -1146,7 +735,7 @@
methods: {
/** 鏌ヨ鐢ㄦ埛鍒楄〃 */
getListUser() {
- listUser(this.addDateRange(this.queryParam, this.dateRange)).then(
+ listUser().then(
(response) => {
this.userList = response.rows;
this.userList.forEach((element) => {
@@ -1338,10 +927,10 @@
if (response.data) {
if (response.data.date) {
this.tableList = response.data.date;
- this.queryParams.tjNumber =""
+ this.queryParams.tjNumber = ""
} else {
this.tableList = response.data.customers;
- this.queryParams.tjNumber =""
+ this.queryParams.tjNumber = ""
}
this.total = response.data.total;
} else {
@@ -1349,8 +938,8 @@
}
}
});
-
-
+
+
// this.loading = true;
// (this.queryParams = {
// page: 1,
@@ -1383,8 +972,8 @@
this.resetForm("tableList");
this.submitForm();
this.$nextTick(() => {
- this.$refs.inputName.focus();
- });
+ this.$refs.inputName.focus();
+ });
},
Changeapplyfor(row) {
@@ -1760,6 +1349,7 @@
};
getParentId(data).then((response) => {
this.proParentList = response.data;
+
this.loading = false;
this.value = [];
if (this.proParentList.xiaoJieIds != null) {
@@ -1770,7 +1360,6 @@
});
}
}
-
this.proParentList.sons.forEach((item) => {
this.doctorName = item.doctorName;
if (this.doctorName == null) {
@@ -1832,6 +1421,195 @@
});
}
});
+ },
+
+ handleTabClick(tab, event) {
+ // console.log(tab, event);
+ // console.log(tab.name);
+ this.Parent.forEach(item => {
+ if (tab.name == item.proId) {
+ this.Parentcheck = item;
+ }
+ })
+
+ this.$confirm(
+ "妫�娴嬪埌浣撴缁撴灉鏈彁浜わ紝鏄惁鍦ㄧ寮�璇ラ」鐩墠鎻愪氦淇敼锛�",
+ "纭淇℃伅",
+ {
+ distinguishCancelAndClose: true,
+ confirmButtonText: "鎻愪氦",
+ cancelButtonText: "涓嶄繚瀛橈紝绂诲紑",
+ }
+ )
+ .then(() => {
+ // 浣撴鍙�
+ let tjNumber = this.tableAll.tjNumber;
+ this.userList.forEach((item) => {
+ if (this.doctorName == item.nickName) {
+ this.doctorName = item.userId;
+ }
+ });
+ this.proParentList.sons.forEach((item) => {
+ if (this.rows) {
+ this.rows.forEach((item1) => {
+ if (item1 === item) {
+ item = item1;
+ }
+ // if (item.isReturn == true) {
+ // item.isReturn = 1;
+ // }
+ // if (item.isReturn == false) {
+ // item.isReturn = 0;
+ // }
+ });
+ }
+ this.tjOrderDetail.push({
+ proName: item.project.proName,
+ proId: item.project.proId,
+ orderDetailId: item.orderDetailId,
+ flowingWaterId: item.flowingWaterId,
+ proResult: item.proResult,
+ tjStatus: 1,
+ isReturn: item.isReturn === true ? 1 : 0,
+ exceptionDesc: item.exceptionDesc === true ? 1 : 0,
+ conclusion: item.conclusion,
+ rulesList: item.rulesList,
+ });
+ });
+
+ var data = [
+ {
+ tjNumber,
+ proId: this.proId,
+ remark: this.proParentList.remark, // 澶囨敞
+ proName: this.proName, //鐖堕」
+ summaryList: this.value, //灏忕粨
+ doctorName: this.doctorName,
+ tjOrderDetailList: this.tjOrderDetail,
+ },
+ ];
+ getaddRemark(data).then((res) => {
+ this.$modal.msgSuccess("鎻愪氦鎴愬姛");
+ });
+ this.proName = item.proName;
+ this.nums = tab.name;
+ this.proId = tab.name;
+ var data = {
+ tjNumber: this.tjNumber,
+ proParentId: this.nums,
+ };
+ getParentId(data).then((response) => {
+ this.proParentList = response.data;
+ this.value = [];
+ if (this.proParentList.xiaoJieIds != null) {
+ if (this.proParentList.xiaoJieIds.length != 0) {
+ this.proParentList.xiaoJieIds.forEach((item2) => {
+ let item = Number(item2);
+ this.value.push(item);
+ });
+ }
+ }
+ this.proParentList.sons.forEach((item) => {
+ this.doctorName = item.doctorName;
+ if (this.doctorName == null) {
+ this.userList.forEach((element) => {
+ const userName = this.$store.state.user.name;
+ if (userName == element.userName) {
+ this.doctorName = element.nickName;
+ }
+ });
+ }
+ if (item.isReturn == 1) {
+ item.isReturn = true;
+ }
+ if (item.isReturn == 0) {
+ item.isReturn = false;
+ }
+
+ if (item.exceptionDesc == "1") {
+ item.exceptionDesc = true;
+ }
+ if (item.exceptionDesc == "0") {
+ item.exceptionDesc = false;
+ }
+ });
+ if (this.proParentList.xiaoJie.length != 0) {
+ this.Parent.forEach((item3) => {
+ if (item3.proId === tab.name) {
+ this.remark = this.Parentcheck.remark;
+ }
+ });
+ } else {
+ this.remark = "";
+ }
+ });
+
+ getDeptAdvice(this.proId).then((response) => {
+ this.deptAdviceList = response.data;
+ });
+ })
+ .catch((action) => {
+ this.$message({
+ type: "warning",
+ message: action === "cancel" ? "鏀惧純淇濆瓨骞剁寮�" : "鍋滅暀鍦ㄥ綋鍓嶉〉闈�",
+ });
+ this.proName = this.Parentcheck.proName;
+ this.nums = tab.name;
+ this.proId = tab.name;
+ let data = {
+ tjNumber: this.tjNumber,
+ proParentId: this.nums,
+ };
+ getParentId(data).then((response) => {
+ this.proParentList = response.data;
+ this.value = [];
+ if (this.proParentList.xiaoJieIds != null) {
+ if (this.proParentList.xiaoJieIds.length != 0) {
+ this.proParentList.xiaoJieIds.forEach((item2) => {
+ let item = Number(item2);
+ this.value.push(item);
+ });
+ }
+ }
+ this.proParentList.sons.forEach((item) => {
+ this.doctorName = item.doctorName;
+ if (this.doctorName == null) {
+ this.userList.forEach((element) => {
+ const userName = this.$store.state.user.name;
+ if (userName == element.userName) {
+ this.doctorName = element.nickName;
+ }
+ });
+ }
+ if (item.isReturn == 1) {
+ item.isReturn = true;
+ }
+ if (item.isReturn == 0) {
+ item.isReturn = false;
+ }
+
+ if (item.exceptionDesc == "1") {
+ item.exceptionDesc = true;
+ }
+ if (item.exceptionDesc == "0") {
+ item.exceptionDesc = false;
+ }
+ });
+ if (this.proParentList.xiaoJie.length != 0) {
+ this.Parent.forEach((item3) => {
+ if (item3.proId === tab.name) {
+ this.remark = this.Parentcheck.remark;
+ }
+ });
+ } else {
+ this.remark = "";
+ }
+ });
+
+ getDeptAdvice(this.proId).then((response) => {
+ this.deptAdviceList = response.data;
+ });
+ });
},
// 鎸夐挳鐐瑰嚮浜嬩欢
@@ -1955,7 +1733,7 @@
})
.catch((action) => {
this.$message({
- type: "info",
+ type: "warning",
message: action === "cancel" ? "鏀惧純淇濆瓨骞剁寮�" : "鍋滅暀鍦ㄥ綋鍓嶉〉闈�",
});
this.proName = item.proName;
@@ -2080,7 +1858,7 @@
},
};
</script>
-<style >
+<style>
.el-table .cell {
-webkit-box-sizing: border-box;
box-sizing: border-box;
@@ -2126,6 +1904,14 @@
.pag1 {
width: 30%;
}
-</style>
+.el-message {
+ top: 40px !important;
+ border: 1px solid #c1c1c1;
+ background-color: #c1c1c1;
+}
+.el-message * {
+ color: var(--white) !important;
+}
+</style>
diff --git a/src/views/doctor/checkAll/index.vue b/src/views/doctor/checkAll/index.vue
index 8092a2f..745094e 100644
--- a/src/views/doctor/checkAll/index.vue
+++ b/src/views/doctor/checkAll/index.vue
@@ -728,7 +728,7 @@
created() {
// this.getNowTime();
- this.getList();
+
this.getdate();
},
@@ -744,6 +744,7 @@
moment(res.data).format("YYYY-MM-DD 00:00:00"),
moment(res.data).format("YYYY-MM-DD 23:59:00"),
];
+ this.getList();
});
},
// / 澶勭悊榛樿閫変腑褰撳墠鏃ユ湡
@@ -1095,6 +1096,7 @@
},
// 閲嶇疆
resetQuery() {
+ this.startTime=[]
this.resetForm("tableList");
this.submitForm();
},
diff --git a/src/views/doctor/examination/index.vue b/src/views/doctor/examination/index.vue
index 155f69a..4aebd40 100644
--- a/src/views/doctor/examination/index.vue
+++ b/src/views/doctor/examination/index.vue
@@ -353,7 +353,7 @@
};
},
created() {
- this.getList();
+
this.getdate();
// this.getNowTime();
},
@@ -369,6 +369,7 @@
moment(res.data).format("YYYY-MM-DD 00:00:00"),
moment(res.data).format("YYYY-MM-DD 23:59:00"),
];
+ this.getList();
});
},
// / 澶勭悊榛樿閫変腑褰撳墠鏃ユ湡
@@ -466,6 +467,7 @@
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
+ this.createTimeList =[]
this.resetForm("queryForm");
this.handleQuery();
this.loading = true;
diff --git a/src/views/hosp/customer/index.vue b/src/views/hosp/customer/index.vue
index b7a510a..086c560 100644
--- a/src/views/hosp/customer/index.vue
+++ b/src/views/hosp/customer/index.vue
@@ -2,7 +2,8 @@
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="濮撳悕" prop="cusName">
- <el-input v-model="queryParams.cusName" placeholder="璇疯緭鍏ュ鍚�" clearable style="width:120px" @keyup.enter.native="handleQuery"/>
+ <el-input v-model="queryParams.cusName" placeholder="璇疯緭鍏ュ鍚�" clearable style="width:120px"
+ @keyup.enter.native="handleQuery" />
</el-form-item>
<!-- <el-form-item label="鎬у埆" prop="cusSex">
<el-select v-model="queryParams.cusSex" placeholder="璇烽�夋嫨鎬у埆" clearable style="width:120px">
@@ -16,7 +17,8 @@
<el-input v-model="queryParams.cusAddr" placeholder="璇疯緭鍏ョ幇灞呬綇鍦板潃" clearable @keyup.enter.native="handleQuery"/>
</el-form-item> -->
<el-form-item label="鑱旂郴鐢佃瘽" prop="cusPhone">
- <el-input v-model="queryParams.cusPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" style="width:140px" clearable @keyup.enter.native="handleQuery"/>
+ <el-input v-model="queryParams.cusPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" style="width:140px" clearable
+ @keyup.enter.native="handleQuery" />
</el-form-item>
<!-- <el-form-item label="閭斂缂栫爜" prop="cusPostcode">
<el-input v-model="queryParams.cusPostcode" placeholder="璇疯緭鍏ラ偖鏀跨紪鐮�" clearable @keyup.enter.native="handleQuery"/>
@@ -54,21 +56,11 @@
</el-select>
</el-form-item> -->
<el-form-item label="韬唤璇佸彿" prop="cusIdcard">
- <el-input
- v-model="queryParams.cusIdcard"
- placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�"
- clearable
- @keyup.enter.native="handleQuery"
- />
+ <el-input v-model="queryParams.cusIdcard" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="浠嬬粛浜�" prop="cusIntroduce">
- <el-input
- v-model="queryParams.cusIntroduce"
- placeholder="璇疯緭鍏ヤ粙缁嶄汉"
- clearable
- style="width:140px"
- @keyup.enter.native="handleQuery"
- />
+ <el-input v-model="queryParams.cusIntroduce" placeholder="璇疯緭鍏ヤ粙缁嶄汉" clearable style="width:140px"
+ @keyup.enter.native="handleQuery" />
</el-form-item>
<!-- <el-form-item label="浣撴娆℃暟" prop="cusNumber">
<el-input
@@ -79,346 +71,124 @@
/>
</el-form-item> -->
<el-form-item label="浣撴娆℃暟" prop="cusNumber">
- <el-input
- v-model="queryParams.cusNumber"
- placeholder="杈撳叆鏁存暟"
- clearable
- style="width:100px"
- @keyup.enter.native="handleQuery"
- />
+ <el-input v-model="queryParams.cusNumber" placeholder="杈撳叆鏁存暟" clearable style="width:100px"
+ @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="鏄惁VIP" prop="cusIsvip">
- <el-select
- v-model="queryParams.cusIsvip"
- placeholder="閫夋嫨VIP"
- clearable
- style="width:100px"
- >
- <el-option
- v-for="dict in dict.type.sys_yes_no"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
+ <el-select v-model="queryParams.cusIsvip" placeholder="閫夋嫨VIP" clearable style="width:100px">
+ <el-option v-for="dict in dict.type.sys_yes_no" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item>
- <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" class="mb8">
<el-col :span="1.5">
- <el-button
- type="primary"
- icon="el-icon-plus"
- size="mini"
- @click="handleAdd"
- v-hasPermi="['hosp:customer:add']"
- >鏂板</el-button
- >
+ <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd"
+ v-hasPermi="['hosp:customer:add']">鏂板</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="primary"
- icon="el-icon-edit"
- size="mini"
- :disabled="single"
- @click="handleUpdate"
- v-hasPermi="['hosp:customer:edit']"
- >淇敼</el-button
- >
+ <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+ v-hasPermi="['hosp:customer:edit']">淇敼</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="primary"
- icon="el-icon-delete"
- size="mini"
- :disabled="multiple"
- @click="handleDelete"
- v-hasPermi="['hosp:customer:remove']"
- >鍒犻櫎</el-button
- >
+ <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+ v-hasPermi="['hosp:customer:remove']">鍒犻櫎</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="primary"
- icon="el-icon-download"
- size="mini"
- @click="handleExport"
- v-hasPermi="['hosp:customer:export']"
- >瀵煎嚭</el-button
- >
+ <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport"
+ v-hasPermi="['hosp:customer:export']">瀵煎嚭</el-button>
</el-col>
- <right-toolbar
- :showSearch.sync="showSearch"
- @queryTable="getList"
- ></right-toolbar>
+ <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
- <el-table
- border
- v-loading="loading"
- :data="customerList"
- @selection-change="handleSelectionChange"
-
- >
+ <el-table border v-loading="loading" :data="customerList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="40px" align="center" fixed="left" />
- <el-table-column
- label="搴忓彿"
- align="center"
- prop="newID"
- fixed="left"
- :show-overflow-tooltip="true"
- width="50px"
- />
- <el-table-column
- label="濮撳悕"
- align="center"
- prop="cusName"
- width="90px"
- fixed="left"
- :show-overflow-tooltip="true"
- />
- <el-table-column
- label="鎬у埆"
- align="center"
- prop="cusSex"
- :show-overflow-tooltip="true"
- width="60px"
- >
+ <el-table-column label="搴忓彿" align="center" prop="newID" fixed="left" :show-overflow-tooltip="true" width="50px" />
+ <el-table-column label="濮撳悕" align="center" prop="cusName" width="90px" fixed="left"
+ :show-overflow-tooltip="true" />
+ <el-table-column label="鎬у埆" align="center" prop="cusSex" :show-overflow-tooltip="true" width="60px">
<template slot-scope="scope">
- <dict-tag
- :options="dict.type.sys_user_sex"
- :value="scope.row.cusSex"
- />
+ <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.cusSex" />
</template>
</el-table-column>
- <el-table-column
- label="鍑虹敓鏃ユ湡"
- align="center"
- prop="cusBrithday"
- width="100px"
- :show-overflow-tooltip="true"
- >
+ <el-table-column label="鍑虹敓鏃ユ湡" align="center" prop="cusBrithday" width="100px" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.cusBrithday, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column>
- <el-table-column
- label="韬唤璇佸彿"
- align="center"
- prop="cusIdcard"
- width="170px"
- :show-overflow-tooltip="true"
- />
- <el-table-column
- label="鑱旂郴鐢佃瘽"
- align="center"
- prop="cusPhone"
- width="110px"
- :show-overflow-tooltip="true"
- />
- <el-table-column
- label="鐜颁綇鍧�"
- align="center"
- prop="cusAddr"
- width="180px"
- :show-overflow-tooltip="true"
- />
-
- <el-table-column
- label="閭斂缂栫爜"
- align="center"
- prop="cusPostcode"
- width="80px"
- :show-overflow-tooltip="true"
- />
- <el-table-column
- label="閭"
- align="center"
- prop="cusEmail"
- width="170px"
- :show-overflow-tooltip="true"
- />
- <el-table-column
- label="姘戞棌"
- align="center"
- prop="cusNational"
- width="80px"
- :show-overflow-tooltip="true"
- >
+ <el-table-column label="韬唤璇佸彿" align="center" prop="cusIdcard" width="170px" :show-overflow-tooltip="true" />
+ <el-table-column label="鑱旂郴鐢佃瘽" align="center" prop="cusPhone" width="110px" :show-overflow-tooltip="true" />
+ <el-table-column label="鐜颁綇鍧�" align="center" prop="cusAddr" width="180px" :show-overflow-tooltip="true" />
+
+ <el-table-column label="閭斂缂栫爜" align="center" prop="cusPostcode" width="80px" :show-overflow-tooltip="true" />
+ <el-table-column label="閭" align="center" prop="cusEmail" width="170px" :show-overflow-tooltip="true" />
+ <el-table-column label="姘戞棌" align="center" prop="cusNational" width="80px" :show-overflow-tooltip="true">
<template slot-scope="scope">
- <dict-tag
- :options="dict.type.dict_user_national"
- :value="scope.row.cusNational"
- />
+ <dict-tag :options="dict.type.dict_user_national" :value="scope.row.cusNational" />
</template>
</el-table-column>
- <el-table-column
- label="濠氬Щ鐘跺喌"
- align="center"
- prop="cusMarryStatus"
- :show-overflow-tooltip="true"
- width="80px"
- >
+ <el-table-column label="濠氬Щ鐘跺喌" align="center" prop="cusMarryStatus" :show-overflow-tooltip="true" width="80px">
<template slot-scope="scope">
- <dict-tag
- :options="dict.type.dict_user_marry"
- :value="scope.row.cusMarryStatus"
- />
+ <dict-tag :options="dict.type.dict_user_marry" :value="scope.row.cusMarryStatus" />
</template>
</el-table-column>
-
- <el-table-column
- label="浠嬬粛浜�"
- align="center"
- prop="cusIntroduce"
- width="90px"
- :show-overflow-tooltip="true"
- />
- <el-table-column
- label="娆℃暟"
- align="center"
- prop="cusNumber"
- width="55px"
- :show-overflow-tooltip="true"
- />
- <el-table-column
- label="VIP"
- align="center"
- prop="cusIsvip"
- width="55px"
- :show-overflow-tooltip="true"
- >
+
+ <el-table-column label="浠嬬粛浜�" align="center" prop="cusIntroduce" width="90px" :show-overflow-tooltip="true" />
+ <el-table-column label="娆℃暟" align="center" prop="cusNumber" width="55px" :show-overflow-tooltip="true" />
+ <el-table-column label="VIP" align="center" prop="cusIsvip" width="55px" :show-overflow-tooltip="true">
<template slot-scope="scope">
- <dict-tag
- :options="dict.type.sys_yes_no"
- :value="scope.row.cusIsvip"
- />
+ <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.cusIsvip" />
</template>
</el-table-column>
- <el-table-column
- label="绱㈠紩鍗″彿"
- align="center"
- prop="indexCard"
- :show-overflow-tooltip="true"
- />
- <el-table-column
- fixed="right"
- label="鎿嶄綔"
- align="center"
- width="70px"
- class-name="small-padding fixed-width"
- >
+ <el-table-column label="绱㈠紩鍗″彿" align="center" prop="indexCard" :show-overflow-tooltip="true" />
+ <el-table-column fixed="right" label="鎿嶄綔" align="center" width="90px" class-name="small-padding fixed-width">
<template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="handleUpdate(scope.row)"
- v-hasPermi="['hosp:customer:edit']"
- title="淇敼"
- ></el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- v-hasPermi="['hosp:customer:remove']"
- title="鍒犻櫎"
- ></el-button>
+ <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+ v-hasPermi="['hosp:customer:edit']" title="淇敼"></el-button>
+ <el-button size="mini" type="text" icon="el-icon-share" @click="handleDetails(scope.row)"
+ v-hasPermi="['hosp:customer:edit']" title="璇︽儏"></el-button>
+ <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+ v-hasPermi="['hosp:customer:remove']" title="鍒犻櫎"></el-button>
</template>
</el-table-column>
</el-table>
<div class="pag">
<div class="pag1">
- <pagination
- v-show="total > 0"
- :total="total"
- :page.sync="queryParams.pageNum"
- :limit.sync="queryParams.pageSize"
- @pagination="getList"
- />
+ <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+ :limit.sync="queryParams.pageSize" @pagination="getList" />
</div>
</div>
<!-- 娣诲姞鎴栦慨鏀逛俊鎭璇濇 -->
- <el-dialog
- :title="title"
- :visible.sync="open"
- width="1000px"
- append-to-body
- >
- <el-form
- ref="form"
- :model="form"
- :rules="rules"
- label-width="100px"
- :inline="true"
- >
+ <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
+ <el-form ref="form" :model="form" :rules="rules" label-width="100px" :inline="true">
<el-form-item label="濮撳悕" prop="cusName">
- <el-input
- v-model="form.cusName"
- placeholder="璇疯緭鍏ュ鍚�"
- style="width: 200px"
- />
+ <el-input v-model="form.cusName" placeholder="璇疯緭鍏ュ鍚�" style="width: 200px" />
</el-form-item>
<el-form-item label="鎬у埆" prop="cusSex">
- <el-select
- v-model="form.cusSex"
- placeholder="璇烽�夋嫨鎬у埆"
- style="width: 200px"
- >
- <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 v-model="form.cusSex" placeholder="璇烽�夋嫨鎬у埆" style="width: 200px">
+ <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label"
+ :value="parseInt(dict.value)"></el-option>
</el-select>
</el-form-item>
<el-form-item label="韬唤璇佸彿" prop="cusIdcard">
- <el-input
- v-model="form.cusIdcard"
- placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�"
- style="width: 200px"
- />
+ <el-input v-model="form.cusIdcard" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" style="width: 200px" />
</el-form-item>
<el-form-item label="鍑虹敓鏃ユ湡" prop="cusBrithday">
- <el-date-picker
- clearable
- v-model="form.cusBrithday"
- type="date"
- value-format="yyyy-MM-dd"
- placeholder="璇烽�夋嫨鍑虹敓鏃ユ湡"
- style="width: 200px"
- >
+ <el-date-picker clearable v-model="form.cusBrithday" type="date" value-format="yyyy-MM-dd"
+ placeholder="璇烽�夋嫨鍑虹敓鏃ユ湡" style="width: 200px">
</el-date-picker>
</el-form-item>
<el-form-item label="鐜颁綇鍧�" prop="cusAddr">
- <el-input
- v-model="form.cusAddr"
- placeholder="璇疯緭鍏ョ幇灞呬綇鍦板潃"
- style="width: 200px"
- />
+ <el-input v-model="form.cusAddr" placeholder="璇疯緭鍏ョ幇灞呬綇鍦板潃" style="width: 200px" />
</el-form-item>
<el-form-item label="鑱旂郴鐢佃瘽" prop="cusPhone">
- <el-input
- v-model="form.cusPhone"
- placeholder="璇疯緭鍏ヨ仈绯荤數璇�"
- style="width: 200px"
- />
+ <el-input v-model="form.cusPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" style="width: 200px" />
</el-form-item>
<!-- <el-form-item label="璐﹀彿瀵嗙爜" prop="cusPassword">
<el-input v-model="form.cusPassword" placeholder="璇疯緭鍏ヨ处鍙峰瘑鐮�" style="width: 220px" />
@@ -427,64 +197,31 @@
<el-input v-model="form.cusPostcode" placeholder="璇疯緭鍏ラ偖鏀跨紪鐮�" />
</el-form-item> -->
<el-form-item label="閭" prop="cusEmail">
- <el-input
- v-model="form.cusEmail"
- placeholder="璇疯緭鍏ラ偖绠�"
- style="width: 200px"
- />
+ <el-input v-model="form.cusEmail" placeholder="璇疯緭鍏ラ偖绠�" style="width: 200px" />
</el-form-item>
<!-- <el-form-item label="绱㈠紩鍗″彿" prop="indexCard">
<el-input v-model="form.indexCard" placeholder="璇疯緭鍏ョ储寮曞崱鍙�" style="width: 220px" />
</el-form-item> -->
<el-form-item label="姘戞棌" prop="cusNational">
- <el-select
- v-model="form.cusNational"
- placeholder="璇烽�夋嫨姘戞棌"
- style="width: 200px"
- filterable
- >
- <el-option
- v-for="dict in dict.type.dict_user_national"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
+ <el-select v-model="form.cusNational" placeholder="璇烽�夋嫨姘戞棌" style="width: 200px" filterable>
+ <el-option v-for="dict in dict.type.dict_user_national" :key="dict.value" :label="dict.label"
+ :value="dict.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="濠氬Щ鐘跺喌" prop="cusMarryStatus">
- <el-select
- v-model="form.cusMarryStatus"
- placeholder="璇烽�夋嫨濠氬Щ鐘跺喌"
- style="width: 200px"
- >
- <el-option
- v-for="dict in dict.type.dict_user_marry"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
+ <el-select v-model="form.cusMarryStatus" placeholder="璇烽�夋嫨濠氬Щ鐘跺喌" style="width: 200px">
+ <el-option v-for="dict in dict.type.dict_user_marry" :key="dict.value" :label="dict.label"
+ :value="dict.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="浠嬬粛浜�" prop="cusIntroduce">
- <el-input
- v-model="form.cusIntroduce"
- placeholder="璇疯緭鍏ヤ粙缁嶄汉"
- style="width: 200px"
- />
+ <el-input v-model="form.cusIntroduce" placeholder="璇疯緭鍏ヤ粙缁嶄汉" style="width: 200px" />
</el-form-item>
<el-form-item label="鏄惁VIP" prop="cusIsvip">
- <el-select
- v-model="form.cusIsvip"
- placeholder="璇烽�夋嫨鏄惁VIP"
- style="width: 200px"
- >
- <el-option
- v-for="dict in dict.type.sys_yes_no"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
+ <el-select v-model="form.cusIsvip" placeholder="璇烽�夋嫨鏄惁VIP" style="width: 200px">
+ <el-option v-for="dict in dict.type.sys_yes_no" :key="dict.value" :label="dict.label"
+ :value="dict.value"></el-option>
</el-select>
</el-form-item>
</el-form>
@@ -493,20 +230,121 @@
<el-button @click="cancel">鍙� 娑�</el-button>
</div>
</el-dialog>
+
+ <!-- 鐐瑰嚮鍙宠竟寮瑰嚭灞� -->
+ <el-drawer :visible.sync="drawer" :with-header="false" size="70%" :before-close="handleClose">
+ <div style="text-align: center;margin: 10px 0;">
+ <span>鍋ュ悍璁板綍</span>
+ </div>
+ <template>
+ <el-tabs v-model="activeName" type="border-card" @tab-click="handleTabClick" style="margin-left: 10px;">
+ <el-tab-pane label="浣撴璁板綍" name="first">
+ <el-row>
+ <el-col :span="14">
+ <el-table ref="selectChargeRuleRef" v-loading="loading" :data="detailsList" border height="680px"
+ style="width: 96%; margin: 10px 10px" @selection-change="selectChargeRule">
+ <el-table-column type="selection" width="40px" align="center" fixed="left" />
+ <!-- <el-table-column prop="tjNum" label="浣撴鍙�" width="155" align="center"></el-table-column> -->
+ <el-table-column prop="tjTime" label="浣撴鏃堕棿" width="155" align="center"></el-table-column>
+ <el-table-column prop="tjProName" label="浣撴椤圭洰" align="center"></el-table-column>
+ <el-table-column prop="userName" label="鎬绘鍖诲笀" width="75" align="center"></el-table-column>
+ <el-table-column prop="paidIn" label="浣撴璐圭敤" width="75" align="center"></el-table-column>
+ </el-table>
+ </el-col>
+ <el-col :span="10">
+ <div>
+ <iframe id="printIframe" :src="url" frameborder="0" style="width: 100%;height: 680px;"></iframe>
+ </div>
+ </el-col>
+ </el-row>
+ </el-tab-pane>
+ <el-tab-pane label="闂ㄨ瘖璁板綍" name="second">
+ <el-row>
+ <el-col :span="14">
+ <el-table ref="selectChargeRuleRef" v-loading="loading" :data="detailsList" border height="680px"
+ style="width: 96%; margin: 10px 10px" @selection-change="selectChargeRule">
+ <el-table-column type="selection" width="40px" align="center" />
+ <el-table-column prop="project.proScope" label="搴忓彿"></el-table-column>
+ <el-table-column prop="project.proScope" label="灏辫瘖鏃堕棿" align="center"></el-table-column>
+ <el-table-column prop="project.proScope" label="灏辫瘖绉戝" align="center"></el-table-column>
+ <el-table-column prop="project.proScope" label="鎺ヨ瘖鍖诲笀" align="center"></el-table-column>
+ <el-table-column prop="project.proScope" label="灏辫瘖鎬昏垂鐢�" align="center"></el-table-column>
+ </el-table>
+ </el-col>
+ <el-col :span="10">
+ <quill-editor v-model="form.content" :options="editorOption" style="height:680px;width:96%">
+ </quill-editor>
+ </el-col>
+ </el-row>
+ </el-tab-pane>
+ <el-tab-pane label="浣忛櫌璁板綍" name="third">
+ <el-row>
+ <el-col :span="14">
+ <el-table ref="selectChargeRuleRef" v-loading="loading" :data="detailsList" border height="680px"
+ style="width: 96%; margin: 10px 10px" @selection-change="selectChargeRule">
+ <el-table-column type="selection" width="40px" align="center" />
+ <el-table-column prop="project.proScope" label="搴忓彿" align="center"></el-table-column>
+ <el-table-column prop="project.proScope" label="鍏ラ櫌鏃堕棿" align="center"></el-table-column>
+ <el-table-column prop="project.proScope" label="鍑洪櫌鏃堕棿" align="center"></el-table-column>
+ <el-table-column prop="project.proScope" label="浣忛櫌澶╂暟" align="center"></el-table-column>
+ <el-table-column prop="project.proScope" label="浣忛櫌绉戝" align="center"></el-table-column>
+ <el-table-column prop="project.proScope" label="涓绘不鍖诲笀" align="center"></el-table-column>
+ <el-table-column prop="project.proScope" label="涓昏璇婃柇" align="center"></el-table-column>
+ <el-table-column prop="project.proScope" label="鏄惁鎵嬫湳" align="center"></el-table-column>
+ <el-table-column prop="project.proScope" label="绂婚櫌鏂瑰紡" align="center"></el-table-column>
+ <el-table-column prop="project.proScope" label="浣忛櫌鎬昏垂鐢�" align="center"></el-table-column>
+ </el-table>
+ </el-col>
+ <el-col :span="10">
+ <quill-editor v-model="form.content" :options="editorOption" style="height:680px;width:96%">
+ </quill-editor>
+ </el-col>
+ </el-row>
+ </el-tab-pane>
+ <el-tab-pane label="鎵嬫湳璁板綍" name="fourth">
+ <el-table v-loading="loading" :data="detailsList" border height="460px"
+ style="width: 96%; margin: 10px 10px">
+ <el-table-column prop="project.proScope" label="搴忓彿" align="center"></el-table-column>
+ <el-table-column prop="project.proScope" label="寮�濮嬫椂闂�" align="center"></el-table-column>
+ <el-table-column prop="project.proScope" label="缁撴潫鏃堕棿" align="center"></el-table-column>
+ <el-table-column prop="project.proScope" label="鎵嬫湳鍚嶇О" align="center"></el-table-column>
+ <el-table-column prop="project.proScope" label="鎵嬫湳缂栫爜" align="center"></el-table-column>
+ <el-table-column prop="project.proScope" label="鎵嬫湳绾у埆" align="center"></el-table-column>
+ <el-table-column prop="project.proScope" label="鏈��" align="center"></el-table-column>
+ <el-table-column prop="project.proScope" label="涓�鍔�" align="center"></el-table-column>
+ <el-table-column prop="project.proScope" label="浜屽姪" align="center"></el-table-column>
+ <el-table-column prop="project.proScope" label="楹婚唹鏂瑰紡" align="center"></el-table-column>
+ <el-table-column prop="project.proScope" label="楹婚唹寮�濮嬫椂闂�" align="center"></el-table-column>
+ <el-table-column prop="project.proScope" label="楹婚唹缁撴潫鏃堕棿" align="center"></el-table-column>
+ <el-table-column prop="project.proScope" label="楹婚唹鍖诲笀" align="center"></el-table-column>
+ </el-table>
+ </el-tab-pane>
+ </el-tabs>
+ </template>
+
+ </el-drawer>
</div>
</template>
<script>
+import { quillEditor } from 'vue-quill-editor'
+import 'quill/dist/quill.core.css'
+import 'quill/dist/quill.snow.css'
+import 'quill/dist/quill.bubble.css'
+
import {
listCustomer,
getCustomer,
delCustomer,
addCustomer,
updateCustomer,
+ getHistryTjOrderByCusIdCard
} from "@/api/hosp/customer";
+import { getPdf } from "@/api/hosp/order";
export default {
name: "Customer",
+ components: { quillEditor },
dicts: [
"dict_user_national",
"dict_user_marry",
@@ -515,25 +353,50 @@
],
data() {
let checkPhoneNum = (rule, value, callback) => {
- console.log( value)
let patter = new RegExp(/^1\s*[3456789]\s*(\d\s*){9}$/);
if (value == "" && value == undefined && !value) {
return callback('');
- } else if(value != undefined && value != ""){
+ } else if (value != undefined && value != "") {
return callback();
- }else if (!patter.test(value)) {
+ } else if (!patter.test(value)) {
return callback('');
}
};
return {
+ editorOption: {
+ placeholder: '璇峰湪杩欓噷杈撳叆',
+ modules: {
+ toolbar: [
+ ['bold', 'italic', 'underline', 'strike'], //鍔犵矖锛屾枩浣擄紝涓嬪垝绾匡紝鍒犻櫎绾�
+ ['blockquote', 'code-block'], //寮曠敤锛屼唬鐮佸潡
+ [{ header: 1 }, { header: 2 }], // 鏍囬锛岄敭鍊煎鐨勫舰寮忥紱1銆�2琛ㄧず瀛椾綋澶у皬
+ [{ list: 'ordered' }, { list: 'bullet' }], //鍒楄〃
+ [{ script: 'sub' }, { script: 'super' }], // 涓婁笅鏍�
+ [{ indent: '-1' }, { indent: '+1' }], // 缂╄繘
+ [{ direction: 'rtl' }], // 鏂囨湰鏂瑰悜
+ [{ size: ['small', false, 'large', 'huge'] }], // 瀛椾綋澶у皬
+ [{ header: [1, 2, 3, 4, 5, 6, false] }], //鍑犵骇鏍囬
+ [{ color: [] }, { background: [] }], // 瀛椾綋棰滆壊锛屽瓧浣撹儗鏅鑹�
+ [{ font: [] }], //瀛椾綋
+ [{ align: [] }], //瀵归綈鏂瑰紡
+ ['clean'], //娓呴櫎瀛椾綋鏍峰紡
+ ['image', 'video'], //涓婁紶鍥剧墖銆佷笂浼犺棰�
+ ],
+ },
+ },
+
// 閬僵灞�
loading: true,
// 閫変腑鏁扮粍
ids: [],
// 闈炲崟涓鐢�
single: true,
+ drawer: false,
+ detailsList: [],
+ activeName: 'first',
// 闈炲涓鐢�
multiple: true,
+ url: "",
// 鏄剧ず鎼滅储鏉′欢
showSearch: true,
// 鎬绘潯鏁�
@@ -567,30 +430,30 @@
form: {},
// 琛ㄥ崟鏍￠獙
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, validator: checkPhoneNum, trigger: "blur" },
+ { required: true, validator: checkPhoneNum, trigger: "blur" },
],
cusPhone: [
- { required: true, validator: checkPhoneNum, trigger: "blur" },
+ { required: true, validator: checkPhoneNum, trigger: "blur" },
],
cusPassword: [
- { required: true, validator: checkPhoneNum, trigger: "blur" },
+ { required: true, validator: checkPhoneNum, trigger: "blur" },
],
// cusNational: [
// { required: true, message: "姘戞棌涓嶈兘涓虹┖", trigger: "change" }
// ],
cusIdcard: [
- { required: true, validator: checkPhoneNum, trigger: "blur" },
+ { required: true, validator: checkPhoneNum, trigger: "blur" },
],
deleted: [
- { required: true, validator: checkPhoneNum, trigger: "blur" },
+ { required: true, validator: checkPhoneNum, trigger: "blur" },
],
},
};
@@ -678,6 +541,62 @@
this.title = "瀹㈡埛淇℃伅缁存姢";
});
},
+
+ // 璇︽儏
+ handleDetails(row) {
+ this.drawer = true
+ let cusId = row.cusId
+ getHistryTjOrderByCusIdCard(cusId).then(res => {
+ this.detailsList = res.data
+ })
+ },
+
+ selectChargeRule(val) {
+ if (val.length > 1) {
+ this.$refs.selectChargeRuleRef.clearSelection()
+ this.$refs.selectChargeRuleRef.toggleRowSelection(val[val.length - 1])
+ }
+ let selectedRule = val[val.length - 1]
+ if (this.activeName == "first") {
+ const flag = true;
+ let tjNumber = selectedRule.tjNum
+ // let tjNumber = "10001240305100029"
+ getPdf(tjNumber, flag).then((response) => {
+ if (response.size === 0) {
+ const loading = this.$loading({
+ lock: true,
+ text: "Loading",
+ spinner: "el-icon-loading",
+ background: "rgba(0, 0, 0, 0.7)",
+ });
+ setTimeout(() => {
+ loading.close();
+ }, 3000);
+ // this.$message.msgSuccess("鎶ュ憡姝ｅ湪鐢熸垚锛岃涓ゅ垎閽熷悗棰勮锛�");
+ this.$message({
+ message: "鎶ュ憡姝ｅ湪鐢熸垚锛岃涓ゅ垎閽熷悗棰勮锛�",
+ type: "warning",
+ });
+ } else {
+ this.dialogVisible = true;
+ this.url = window.webkitURL.createObjectURL(response); //灏嗗悗绔繑鍥炵殑blob鏂囦欢璇诲彇鍑簎rl
+ }
+ });
+ } else if (this.activeName == "second") {
+
+ } else if (this.activeName == "third") {
+
+ }
+
+ },
+
+
+ handleClose() {
+ this.$tab.refreshPage();
+ },
+ handleTabClick() {
+ console.log(this.activeName)
+ },
/** 鎻愪氦鎸夐挳 */
submitForm() {
this.$refs["form"].validate((valid) => {
@@ -710,7 +629,7 @@
this.getList();
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
})
- .catch(() => {});
+ .catch(() => { });
},
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
@@ -731,6 +650,7 @@
display: flex;
justify-content: center;
}
+
.pag1 {
width: 30%;
}
diff --git a/src/views/hosp/extension/index.vue b/src/views/hosp/extension/index.vue
index 4690df9..13dc8a7 100644
--- a/src/views/hosp/extension/index.vue
+++ b/src/views/hosp/extension/index.vue
@@ -410,7 +410,7 @@
},
created() {
// this.getNowTime();
- this.getList();
+
this.getdate();
},
mounted() {
@@ -425,6 +425,7 @@
moment(res.data).format("YYYY-MM-DD 00:00:00"),
moment(res.data).format("YYYY-MM-DD 23:59:00"),
];
+ this.getList();
});
},
dialogVisibles() {
@@ -540,6 +541,7 @@
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
+ this.finishTimeList=[]
this.resetForm("queryForm");
this.handleQuery();
},
diff --git a/src/views/hosp/fuzhen/index.vue b/src/views/hosp/fuzhen/index.vue
index 7ed034c..b44b2ab 100644
--- a/src/views/hosp/fuzhen/index.vue
+++ b/src/views/hosp/fuzhen/index.vue
@@ -608,6 +608,9 @@
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
+ this.reportTimeList =[]
+ this.startTime =[]
+ this.startTime1 =[]
this.resetForm("queryForm");
this.handleQuery();
},
diff --git a/src/views/hosp/history/index.vue b/src/views/hosp/history/index.vue
index 8c215fb..24f32e0 100644
--- a/src/views/hosp/history/index.vue
+++ b/src/views/hosp/history/index.vue
@@ -293,7 +293,7 @@
this.loading = true;
listHarmType().then((response) => {
this.harmTypeList = response.rows;
- this.loading = false;
+
});
getOrderList(this.queryParams).then((response) => {
this.orderList = response.data.list;
diff --git a/src/views/hosp/order/index.vue b/src/views/hosp/order/index.vue
index 5b5c5c9..8aabe19 100644
--- a/src/views/hosp/order/index.vue
+++ b/src/views/hosp/order/index.vue
@@ -888,7 +888,7 @@
},
created() {
// this.getNowTime();
- this.getList();
+
this.getdate();
},
mounted() {
@@ -899,10 +899,14 @@
methods: {
getdate() {
getNewDateList().then((res) => {
- this.createTimeList = [
+ if(res.data){
+ this.createTimeList = [
moment(res.data).format("YYYY-MM-DD 00:00:00"),
moment(res.data).format("YYYY-MM-DD 23:59:00")
- ];;
+ ];
+ this.getList();
+ }
+
});
},
filterNode(value, data) {
@@ -1060,6 +1064,7 @@
},
// 琛ㄥ崟閲嶇疆
reset() {
+
this.form = {
orderId: null,
userId: null,
@@ -1097,6 +1102,9 @@
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
+ this.startTime = []
+ this.startTime1 = []
+ this.createTimeList = []
this.resetForm("queryForm");
this.handleQuery();
},
diff --git a/src/views/sampling/sampling/index.vue b/src/views/sampling/sampling/index.vue
index 4a27460..babc5a5 100644
--- a/src/views/sampling/sampling/index.vue
+++ b/src/views/sampling/sampling/index.vue
@@ -380,7 +380,7 @@
},
created() {
// this.getNowTime();
- this.getList();
+
this.getdate();
},
mounted() {
@@ -395,6 +395,7 @@
moment(res.data).format("YYYY-MM-DD 00:00:00"),
moment(res.data).format("YYYY-MM-DD 23:59:00"),
];
+ this.getList();
});
},
handleSizeChange(val) {
@@ -499,6 +500,7 @@
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
+ this.createTimeList=[]
this.resetForm("queryForm");
this.handleQuery();
},
diff --git a/src/views/system/Checkout/index.vue b/src/views/system/Checkout/index.vue
index 11d0613..f054490 100644
--- a/src/views/system/Checkout/index.vue
+++ b/src/views/system/Checkout/index.vue
@@ -409,7 +409,7 @@
leave: false,
checked: false,
radioId1: false,
- createTimeList: "",
+ createTimeList: [],
cusId: "",
payType: "0",
dialogVisible: false,
@@ -523,7 +523,7 @@
},
created() {
// this.getNowTime();
- this.getList();
+
this.getdate();
},
mounted() {
@@ -538,6 +538,7 @@
moment(res.data).format("YYYY-MM-DD 00:00:00"),
moment(res.data).format("YYYY-MM-DD 23:59:00"),
];
+ this.getList();
});
},
// / 澶勭悊榛樿閫変腑褰撳墠鏃ユ湡
@@ -667,6 +668,8 @@
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
+ this.createTimeList = []
+ this.startTime= []
this.resetForm("queryForm");
this.handleQuery();
},
diff --git a/src/views/system/bill/index.vue b/src/views/system/bill/index.vue
index a7c2974..59ff0d8 100644
--- a/src/views/system/bill/index.vue
+++ b/src/views/system/bill/index.vue
@@ -635,7 +635,7 @@
},
created() {
// this.getNowTime();
- this.getList();
+
this.Company();
this.getdate();
},
@@ -651,6 +651,7 @@
moment(res.data).format("YYYY-MM-DD 00:00:00"),
moment(res.data).format("YYYY-MM-DD 23:59:00"),
];
+ this.getList();
});
},
// / 澶勭悊榛樿閫変腑褰撳墠鏃ユ湡
@@ -821,8 +822,15 @@
},
/** 鏌ヨ浣撴璁板綍鍒楄〃 */
getList() {
- this.queryParams.djbeginTime = this.startTime[0];
+ if(this.createTimeList){
+ this.queryParams.djbeginTime = this.createTimeList[0];
+ this.queryParams.djendTime = this.createTimeList[1];
+ }else{
+ this.queryParams.djbeginTime = this.startTime[0];
this.queryParams.djendTime = this.startTime[1];
+ }
+
+
this.loading = true;
getOrderList(this.queryParams).then((response) => {
this.orderList = response.data.list;
@@ -902,6 +910,7 @@
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
+ this.createTimeList=[]
this.resetForm("queryForm");
this.handleQuery();
},
diff --git a/src/views/system/biol/index.vue b/src/views/system/biol/index.vue
index 1bed226..064403b 100644
--- a/src/views/system/biol/index.vue
+++ b/src/views/system/biol/index.vue
@@ -8,12 +8,12 @@
<el-input style="width: 170px" v-model="queryParams.tjNum" placeholder="璇疯緭鍏ヤ綋妫�鍙�" clearable
@keyup.enter.native="handleQuery" ref="inputName" @blur="hb" />
</el-form-item>
- <el-form-item label="鎶ュ憡鏃堕棿" prop="reportTimeList">
- <el-date-picker clearable v-model="queryParams.reportTimeList" type="daterange" range-separator="-"
+ <el-form-item label="鎶ュ憡鏃堕棿" prop="createTimeList">
+ <el-date-picker clearable v-model="createTimeList" type="daterange" range-separator="-"
start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡" :picker-options="pickerOptions" :default-time="['00:00:00', '23:00:00']"
format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="璇烽�夋嫨鍑烘姤鍛婃椂闂�" >
+ placeholder="璇烽�夋嫨鍑烘姤鍛婃椂闂�" @change="dateChangebirthday1">
</el-date-picker>
</el-form-item>
<!-- <el-form-item label="鍗曚綅鍚嶇О" prop="firmId">
@@ -465,7 +465,7 @@
},
created() {
// this.getNowTime();
- this.getList();
+
this.Company();
this.getdate();
},
@@ -477,10 +477,11 @@
methods: {
getdate() {
getNewDateList().then((res) => {
- this.queryParams.reportTimeList = [
+ this.createTimeList= [
moment(res.data).format("YYYY-MM-DD 00:00:00"),
moment(res.data).format("YYYY-MM-DD 23:59:00"),
];
+ this.getList();
});
},
// / 澶勭悊榛樿閫変腑褰撳墠鏃ユ湡
@@ -762,8 +763,9 @@
},
/** 鏌ヨ浣撴璁板綍鍒楄〃 */
getList() {
- this.queryParams.djbeginTime = this.startTime[0];
- this.queryParams.djendTime = this.startTime[1];
+ console.log(this.queryParams)
+ this.queryParams.djbeginTime = this.createTimeList[0];
+ this.queryParams.djendTime = this.createTimeList[1];
this.loading = true;
getInfo().then((response) => {
this.userIds = response.user.userId;
@@ -808,6 +810,7 @@
},
// 琛ㄥ崟閲嶇疆
reset() {
+
this.form = {
orderId: null,
tjType: null,
@@ -841,6 +844,7 @@
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
+ this.createTimeList =[]
this.resetForm("queryForm");
this.handleQuery();
},
diff --git a/src/views/team/disease/index.vue b/src/views/team/disease/index.vue
index 4609cd3..6a5466a 100644
--- a/src/views/team/disease/index.vue
+++ b/src/views/team/disease/index.vue
@@ -331,7 +331,7 @@
},
created() {
// this.getNowTime();
- this.getList();
+
this.getcomp();
this.geticd();
this.getdate();
@@ -343,6 +343,7 @@
moment(res.data).format("YYYY-MM-DD 00:00:00"),
moment(res.data).format("YYYY-MM-DD 23:59:00")
];;
+ this.getList();
});
},
// / 澶勭悊榛樿閫変腑褰撳墠鏃ユ湡
@@ -436,6 +437,7 @@
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
+ this.createTimeList=[]
this.resetForm("queryForm");
this.handleQuery();
this.loading = true;
diff --git a/src/views/team/reporting/index.vue b/src/views/team/reporting/index.vue
index 63082c5..dec29f9 100644
--- a/src/views/team/reporting/index.vue
+++ b/src/views/team/reporting/index.vue
@@ -380,7 +380,7 @@
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
this.queryParams.page = 1;
- this.getList();
+ // this.getList();
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
diff --git a/src/views/team/reportresults/index.vue b/src/views/team/reportresults/index.vue
index c95b2f6..030fe30 100644
--- a/src/views/team/reportresults/index.vue
+++ b/src/views/team/reportresults/index.vue
@@ -7,7 +7,7 @@
:inline="true"
label-width="68px"
>
- <el-form-item label="鏃堕棿" prop="applicationTime">
+ <el-form-item label="鏃堕棿" prop="createTimeList">
<el-date-picker
clearable
v-model="createTimeList"
@@ -403,7 +403,7 @@
created() {
this.getdate();
this.getNowTime();
- this.getList();
+
this.getcomp();
this.getData();
this.datekey = Date.now();
@@ -420,6 +420,7 @@
moment(res.data).format("YYYY-MM-DD 00:00:00"),
moment(res.data).format("YYYY-MM-DD 23:59:00"),
];
+ this.getList();
});
},
filterNode(value, data) {
@@ -537,6 +538,7 @@
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
+ this.createTimeList = []
this.resetForm("queryForm");
this.handleQuery();
this.loading = true;
diff --git a/src/views/team/teams/index.vue b/src/views/team/teams/index.vue
index 96e0446..30b6629 100644
--- a/src/views/team/teams/index.vue
+++ b/src/views/team/teams/index.vue
@@ -481,7 +481,7 @@
},
created() {
// this.getNowTime();
- this.getList();
+
this.getdate();
},
@@ -492,11 +492,17 @@
moment(res.data).format("YYYY-MM-DD 00:00:00"),
moment(res.data).format("YYYY-MM-DD 23:59:00"),
];
+ this.getList();
});
},
getList() {
this.loading = true;
- getCompany(this.queryParam).then((response) => {
+ if(this.createTimeList){
+ this.objs.beginTime=this.createTimeList[0],
+ this.objs.endTime=this.createTimeList[1]
+ }
+
+ getCompany(this.objs).then((response) => {
this.CompanyList = response.data;
this.total = response.total;
this.loading = false;
@@ -531,6 +537,7 @@
},
// 琛ㄥ崟閲嶇疆
reset() {
+ this.createTimeList =[]
this.form = {
company: null,
payType: null,
diff --git a/vue.config.js b/vue.config.js
index 697baa5..2c15e68 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -53,7 +53,7 @@
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
//target: `https://ltpeis.xaltjdkj.cn:5501/prod-api/getInfo`,
- target: `http://192.168.0.108:5011`,
+ target: `http://192.168.0.112:5011`,
// // target: `http://192.168.0.99:8080/ltkj-admin`,
// target: `https://ltpeis.xaltjdkj.cn:5011/ltkj-admin`,
// target: `http://10.168.0.9:5011`,
--
Gitblit v1.8.0