From f4e73f262cd8fe054b84d5e99f083fba913e7c94 Mon Sep 17 00:00:00 2001
From: qinxianzhangyao <11053546+qinxianzhangyao@user.noreply.gitee.com>
Date: 星期四, 30 五月 2024 18:01:20 +0800
Subject: [PATCH] qxtj
---
src/views/doctor/check/index.vue | 1219 ++++++++++++++++++++++++++---------
src/views/reservation/reservations/index.vue | 8
src/views/system/bill/index.vue | 4
src/views/system/comp/index.vue | 33
src/views/system/biol/index.vue | 649 +++++++++++++-----
src/views/system/circle/index.vue | 4
src/api/team/tuanti.js | 8
src/views/hosp/surveyTemplate/index.vue | 82 +
src/views/system/visit/index.vue | 4
9 files changed, 1,433 insertions(+), 578 deletions(-)
diff --git a/src/api/team/tuanti.js b/src/api/team/tuanti.js
index 3f7a054..a632830 100644
--- a/src/api/team/tuanti.js
+++ b/src/api/team/tuanti.js
@@ -69,4 +69,12 @@
})
}
+export function addbatch(data) {
+ return request({
+ url: '/system/report/preview/batch',
+ method: 'post',
+ data: data
+ })
+}
+
diff --git a/src/views/doctor/check/index.vue b/src/views/doctor/check/index.vue
index b27449e..cca1013 100644
--- a/src/views/doctor/check/index.vue
+++ b/src/views/doctor/check/index.vue
@@ -1,32 +1,77 @@
<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" style="margin-right:15px;">鎼滅储</el-button>
+ <el-button
+ size="mini"
+ type="primary"
+ @click="submitForm"
+ style="margin-right: 15px"
+ >鎼滅储</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>
@@ -35,50 +80,119 @@
<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>
@@ -87,10 +201,18 @@
<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">
@@ -98,15 +220,42 @@
<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>
@@ -123,27 +272,56 @@
</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>
@@ -156,7 +334,12 @@
</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>
@@ -177,8 +360,18 @@
</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>
@@ -192,31 +385,51 @@
</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;
+ height: 70px;
margin: 10px 10px;
- margin-bottom:10px;
+ margin-bottom: 10px;
border: 1px solid #dfe6ec;
border-collapse: collapse;
- font-size:16px
- " cellspacing="4">
+ font-size: 16px;
+ "
+ 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">
@@ -228,21 +441,36 @@
<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">
- {{ tableAll.cusSex == 0? "鐢�" :tableAll.cusSex == 1?"濂�":"鏈煡"}}
+ {{
+ tableAll.cusSex == 0
+ ? "鐢�"
+ : tableAll.cusSex == 1
+ ? "濂�"
+ : "鏈煡"
+ }}
</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">
@@ -253,134 +481,289 @@
</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>
- <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">
+ <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>
- </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>
- </template>
- </el-table-column>
- <el-table-column prop="project.proMetering" label="鍗曚綅">
- <!-- <template slot-scope="scope">
+ </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>
+ </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
+ >
+ </template>
+ </el-table-column>
+ <el-table-column prop="project.proMetering" label="鍗曚綅">
+ <!-- <template slot-scope="scope">
{{ scope.row.standard.company }}
</template> -->
- </el-table-column>
- <el-table-column prop="project.proScope" label="鍙傝�冭寖鍥�">
- </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>
- </template>
- </el-table-column>
- <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">
- <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" />
- </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>
- </template>
- </el-table-column>
- </el-table>
+ </el-table-column>
+ <el-table-column prop="project.proScope" label="鍙傝�冭寖鍥�">
+ </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>
+ </template>
+ </el-table-column>
+ <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"
+ >
+ <template slot-scope="scope">
+ <el-checkbox v-model="scope.row.isReturn"></el-checkbox>
+ </template>
+ </el-table-column>
+ <el-table-column prop="resultType" label="缁撴灉绫诲瀷">
+ <template slot-scope="scope">
+ <dict-tag
+ :options="dict.type.tj_result_type"
+ :value="scope.row.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>
+ </template>
+ </el-table-column>
+ </el-table>
- <div style="font-size: 14px; overflow-y: auto; height: 286px">
- <table style="
- width: 96%;
- margin: 4px 10px;
- border: 1px solid #dfe6ec;
- border-collapse: collapse;
- " cellspacing="4">
- <tr 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">
- </el-option>
- </el-select>
- </td>
- <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">
- </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>
- <td style="border: 1px solid #dfe6ec; border-collapse: collapse" colspan="2">
- <div style="margin: 0 0px 10px 15px">
- <el-button type="primary" @click="propoChange" style="margin-top:10px;height:37px"
- >蹇嵎寤鸿</el-button
+ <div style="font-size: 14px; overflow-y: auto; height: 286px">
+ <table
+ style="
+ width: 96%;
+ margin: 4px 10px;
+ border: 1px solid #dfe6ec;
+ border-collapse: collapse;
+ "
+ cellspacing="4"
+ >
+ <tr
+ style="
+ border: 1px solid #dfe6ec;
+ border-collapse: collapse;
+ "
>
- <el-button type="primary" @click="proposalChange" style="margin-top:10px;height:37px"
- >鐢熸垚寤鸿</el-button
+ <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"
+ >
+ </el-option>
+ </el-select>
+ </td>
+ <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"
+ >
+ </el-option>
+ </el-select>
+ </td>
+ </tr>
+ <tr
+ style="
+ border: 1px solid #dfe6ec;
+ border-collapse: collapse;
+ "
>
- </div>
- <el-input type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" v-model="proParentList.remark" rows="7">
- </el-input>
- </td>
- </tr>
- </table>
+ <td
+ style="
+ border: 1px solid #dfe6ec;
+ border-collapse: collapse;
+ "
+ >
+ 寤鸿锛�
+ </td>
+ <td
+ style="
+ border: 1px solid #dfe6ec;
+ border-collapse: collapse;
+ "
+ colspan="2"
+ >
+ <div style="margin: 0 0px 10px 15px">
+ <el-button
+ type="primary"
+ @click="propoChange"
+ style="margin-top: 10px; height: 37px"
+ >蹇嵎寤鸿</el-button
+ >
+ <el-button
+ type="primary"
+ @click="proposalChange"
+ style="margin-top: 10px; height: 37px"
+ >鐢熸垚寤鸿</el-button
+ >
+ </div>
+ <el-input
+ type="textarea"
+ placeholder="璇疯緭鍏ュ唴瀹�"
+ v-model="proParentList.remark"
+ rows="7"
+ >
+ </el-input>
+ </td>
+ </tr>
+ </table>
- <div slot="footer" class="dialog-footers">
- <!-- <el-button type="primary"
+ <div slot="footer" class="dialog-footers">
+ <!-- <el-button type="primary"
size="mini"
@click="radioChange"
v-hasPermi="['system:notice:add']"
v-show="tjStatus == '1'"
>浼氳瘖鐢宠</el-button> -->
- <el-button type="primary" @click="determine" v-show="tjStatus == '0'">鎻� 浜�</el-button>
- </div>
- </div>
+ <el-button
+ type="primary"
+ @click="determine"
+ v-show="tjStatus == '0'"
+ >鎻� 浜�</el-button
+ >
+ </div>
+ </div>
</el-tab-pane>
</el-tabs>
</template>
@@ -398,125 +781,273 @@
</el-radio-group>
</div>
</template> -->
-
</el-col>
<el-col :span="18" v-show="baogaohou">
<template>
- <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">
+ <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>
- </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>
- </template>
- </el-table-column>
- <el-table-column prop="project.proMetering" label="鍗曚綅">
- <!-- <template slot-scope="scope">
+ </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>
+ </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
+ >
+ </template>
+ </el-table-column>
+ <el-table-column prop="project.proMetering" label="鍗曚綅">
+ <!-- <template slot-scope="scope">
{{ scope.row.standard.company }}
</template> -->
- </el-table-column>
- <el-table-column prop="project.proScope" label="鍙傝�冭寖鍥�">
- </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>
- </template>
- </el-table-column>
- <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">
- <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" />
- </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>
- </template>
- </el-table-column>
- </el-table>
+ </el-table-column>
+ <el-table-column prop="project.proScope" label="鍙傝�冭寖鍥�">
+ </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>
+ </template>
+ </el-table-column>
+ <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"
+ >
+ <template slot-scope="scope">
+ <el-checkbox v-model="scope.row.isReturn"></el-checkbox>
+ </template>
+ </el-table-column>
+ <el-table-column prop="resultType" label="缁撴灉绫诲瀷">
+ <template slot-scope="scope">
+ <dict-tag
+ :options="dict.type.tj_result_type"
+ :value="scope.row.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>
+ </template>
+ </el-table-column>
+ </el-table>
- <div style="font-size: 14px; overflow-y: auto; height: 286px">
- <table style="
- width: 96%;
- margin: 4px 10px;
- border: 1px solid #dfe6ec;
- border-collapse: collapse;
- " cellspacing="4">
- <tr 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">
- </el-option>
- </el-select>
- </td>
- <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">
- </el-option>
- </el-select>
- </td>
- </tr>
- <tr style="border: 1px solid #dfe6ec; border-collapse: collapse">
- <div style="margin: 0 0px 10px 15px">
- <el-button type="primary" @click="propoChange" style="margin-top:10px;height:37px"
- >蹇嵎寤鸿</el-button
+ <div style="font-size: 14px; overflow-y: auto; height: 286px">
+ <table
+ style="
+ width: 96%;
+ margin: 4px 10px;
+ border: 1px solid #dfe6ec;
+ border-collapse: collapse;
+ "
+ cellspacing="4"
+ >
+ <tr
+ style="
+ border: 1px solid #dfe6ec;
+ border-collapse: collapse;
+ "
>
- <el-button type="primary" @click="proposalChange" style="margin-top:10px;height:37px"
- >鐢熸垚寤鸿</el-button
+ <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"
+ >
+ </el-option>
+ </el-select>
+ </td>
+ <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"
+ >
+ </el-option>
+ </el-select>
+ </td>
+ </tr>
+ <tr
+ style="
+ border: 1px solid #dfe6ec;
+ border-collapse: collapse;
+ "
>
- </div>
- <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">
- </el-input>
- </td>
- </tr>
- </table>
+ <div style="margin: 0 0px 10px 15px">
+ <el-button
+ type="primary"
+ @click="propoChange"
+ style="margin-top: 10px; height: 37px"
+ >蹇嵎寤鸿</el-button
+ >
+ <el-button
+ type="primary"
+ @click="proposalChange"
+ style="margin-top: 10px; height: 37px"
+ >鐢熸垚寤鸿</el-button
+ >
+ </div>
+ <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"
+ >
+ </el-input>
+ </td>
+ </tr>
+ </table>
- <div slot="footer" class="dialog-footers">
- <!-- <el-button type="primary"
+ <div slot="footer" class="dialog-footers">
+ <!-- <el-button type="primary"
size="mini"
@click="radioChange"
v-hasPermi="['system:notice:add']"
v-show="tjStatus == '1'"
>浼氳瘖鐢宠</el-button> -->
- <el-button type="primary" @click="determine" v-show="tjStatus == '0'">鎻� 浜�</el-button>
- </div>
- </div>
+ <el-button
+ type="primary"
+ @click="determine"
+ v-show="tjStatus == '0'"
+ >鎻� 浜�</el-button
+ >
+ </div>
+ </div>
</el-tab-pane>
</el-tabs>
</template>
@@ -530,10 +1061,12 @@
</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>
@@ -580,8 +1113,16 @@
</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>
@@ -619,10 +1160,16 @@
export default {
dicts: ["sys_user_sex", "sys_yes_no", "tj_result_type", "lj_positive"],
name: "check",
- components: { Public, Historicalreport, jianqianwenzhen,createproposal,proposal },
+ components: {
+ Public,
+ Historicalreport,
+ jianqianwenzhen,
+ createproposal,
+ proposal,
+ },
data() {
return {
- creatobj:{},
+ creatobj: {},
dataText: [],
propform: {},
cusobj: {},
@@ -722,7 +1269,6 @@
queryParam: {
page: 1,
pageSize: 1000,
-
},
rules: {
hzType: [
@@ -759,17 +1305,15 @@
methods: {
/** 鏌ヨ鐢ㄦ埛鍒楄〃 */
getListUser() {
- listUser().then(
- (response) => {
- this.userList = response.rows;
- this.userList.forEach((element) => {
- const userName = this.$store.state.user.name;
- if (userName == element.userName) {
- this.doctorName = element.nickName;
- }
- });
- }
- );
+ listUser().then((response) => {
+ this.userList = response.rows;
+ this.userList.forEach((element) => {
+ const userName = this.$store.state.user.name;
+ if (userName == element.userName) {
+ this.doctorName = element.nickName;
+ }
+ });
+ });
getInfo().then((response) => {
this.info = response.user;
this.deptId = response.user.deptId;
@@ -946,21 +1490,21 @@
// this.$refs.proposal.getList();
},
eventchange(data) {
- this.dataText = data
+ this.dataText = data;
data.forEach((item) => {
this.proParentList.remark += item.advice;
});
},
proposalChange() {
if (this.proParentList.remark) {
- this.creatobj = {proParentList:this.proParentList.remark, isZj: 1}
+ this.creatobj = { proParentList: this.proParentList.remark, isZj: 1 };
this.$refs.createproposal.open = true;
this.$refs.createproposal.title = "甯哥敤寤鸿缁存姢";
- }else{
+ } else {
this.$message({
- type: "warning ",
- message: "璇峰厛濉啓鎬绘寤鸿",
- });
+ type: "warning ",
+ message: "璇峰厛濉啓鎬绘寤鸿",
+ });
}
},
@@ -975,10 +1519,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 {
@@ -986,7 +1530,6 @@
}
}
});
-
// this.loading = true;
// (this.queryParams = {
@@ -1433,15 +1976,17 @@
item.exceptionDesc = false;
}
});
- if (this.proParentList.xiaoJie.length != 0) {
- this.Parent.forEach((item3) => {
- if (item3.proId === this.nums) {
- this.proParentList.remark = item3.remark;
- }
- });
- } else {
- this.proParentList.remark = "";
- }
+ if (this.proParentList.xiaoJie) {
+ if (this.proParentList.xiaoJie.length != 0) {
+ this.Parent.forEach((item3) => {
+ if (item3.proId === this.nums) {
+ this.proParentList.remark = item3.remark;
+ }
+ });
+ }
+ }else {
+ this.proParentList.remark = "";
+ }
});
},
@@ -1474,11 +2019,11 @@
handleTabClick(tab, event) {
// console.log(tab, event);
// console.log(tab.name);
- this.Parent.forEach(item => {
+ this.Parent.forEach((item) => {
if (tab.name == item.proId) {
this.Parentcheck = item;
}
- })
+ });
this.$confirm(
"妫�娴嬪埌浣撴缁撴灉鏈彁浜わ紝鏄惁鍦ㄧ寮�璇ラ」鐩墠鎻愪氦淇敼锛�",
@@ -1581,15 +2126,17 @@
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 = "";
- }
+ if (this.proParentList.xiaoJie) {
+ 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) => {
@@ -1597,13 +2144,13 @@
});
})
.catch((action) => {
- if(action === "cancel"){
+ if (action === "cancel") {
this.$message({
- type: "warning",
- message: "鏀惧純淇濆瓨骞剁寮�",
- });
+ type: "warning",
+ message: "鏀惧純淇濆瓨骞剁寮�",
+ });
}
-
+
this.proName = this.Parentcheck.proName;
this.nums = tab.name;
this.proId = tab.name;
@@ -1646,12 +2193,14 @@
item.exceptionDesc = false;
}
});
- if (this.proParentList.xiaoJie.length != 0) {
- this.Parent.forEach((item3) => {
- if (item3.proId === tab.name) {
- this.remark = this.Parentcheck.remark;
- }
- });
+ if (this.proParentList.xiaoJie) {
+ if (this.proParentList.xiaoJie.length != 0) {
+ this.Parent.forEach((item3) => {
+ if (item3.proId === tab.name) {
+ this.remark = this.Parentcheck.remark;
+ }
+ });
+ }
} else {
this.remark = "";
}
@@ -1783,11 +2332,11 @@
});
})
.catch((action) => {
- if(action === "cancel"){
+ if (action === "cancel") {
this.$message({
- type: "warning",
- message: "鏀惧純淇濆瓨骞剁寮�",
- });
+ type: "warning",
+ message: "鏀惧純淇濆瓨骞剁寮�",
+ });
}
this.proName = item.proName;
this.nums = proParentId;
diff --git a/src/views/hosp/surveyTemplate/index.vue b/src/views/hosp/surveyTemplate/index.vue
index e0c6917..375582e 100644
--- a/src/views/hosp/surveyTemplate/index.vue
+++ b/src/views/hosp/surveyTemplate/index.vue
@@ -47,9 +47,20 @@
icon="el-icon-edit"
size="mini"
:disabled="single"
+ @click="handleUpdate1"
+ v-hasPermi="['hosp:surveyTemplate:edit']"
+ >鏍囬淇敼
+ </el-button>
+ </el-col>
+ <el-col :span="1.5" v-if="details">
+ <el-button
+ type="primary"
+ icon="el-icon-edit"
+ size="mini"
+ :disabled="single"
@click="handleUpdate"
v-hasPermi="['hosp:surveyTemplate:edit']"
- >淇敼
+ >璇︽儏淇敼
</el-button>
</el-col>
<el-col :span="1.5">
@@ -194,7 +205,7 @@
/>
</el-select>
</el-form-item>
-
+
<el-form-item label="澶囨敞" prop="remark">
<el-input v-model="form.remark" placeholder="璇疯緭鍏ュ娉�" />
</el-form-item>
@@ -204,8 +215,8 @@
<el-button @click="cancel">鍙� 娑�</el-button>
</div>
</el-dialog>
- <!-- 闂嵎璇︽儏鎶藉眽 -->
- <el-drawer
+ <!-- 闂嵎璇︽儏鎶藉眽 -->
+ <el-drawer
title="闂嵎璇︽儏"
:visible.sync="drawer"
:with-header="true"
@@ -308,7 +319,7 @@
getneedDesign,
getcanDelete,
updateQybz,
- getQuesByMid
+ getQuesByMid,
} from "@/api/hosp/surveyTemplate";
import { Message } from "element-ui";
export default {
@@ -332,12 +343,12 @@
}
};
return {
- inpu:"",
+ inpu: "",
num: 0,
myscore: null,
// 閬僵灞�
loading: true,
- drawer:false,
+ drawer: false,
previewKey: +new Date(),
previewDialogVisible: false,
// 閫変腑鏁扮粍
@@ -363,6 +374,7 @@
// 鏄惁鏄剧ず寮瑰嚭灞�
open: false,
DaTianYa: false,
+ details: false,
// 鏌ヨ鍙傛暟
queryParams: {
pageNum: 1,
@@ -437,9 +449,21 @@
},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
+ console.log(selection);
this.ids = selection.map((item) => item.mid);
this.single = selection.length !== 1;
this.multiple = !selection.length;
+ if (selection.length != 0) {
+ selection.forEach((item) => {
+ if (item.designId != null) {
+ this.details = true;
+ } else {
+ this.details = false;
+ }
+ });
+ } else {
+ this.details = false;
+ }
},
handleTjSurveyTempQuesSelectionChange(selection) {
this.selectionList = [];
@@ -449,7 +473,7 @@
handleAdd() {
this.reset();
this.title = "娣诲姞闂嵎妯℃澘";
-
+
getneedDesign().then((res) => {
if (res.msg == "false") {
this.DaTianYa = false;
@@ -504,19 +528,18 @@
if (response.data.designId == null) {
this.drawer = true;
getQuesByMid(mid)
- .then((res) => {
- res.data.sort(
- (a, b) =>
- new Date(a.createTime).getTime() -
- new Date(b.createTime).getTime()
- ); //杩欐槸鍗囧簭锛屽�掑簭鐨勮瘽缈昏繃鏉�
- this.intList = res.data;
-
- })
- .catch((err) => {
- // 閫氳繃catch鎹曡幏閿欒娑堟伅
- return err;
- });
+ .then((res) => {
+ res.data.sort(
+ (a, b) =>
+ new Date(a.createTime).getTime() -
+ new Date(b.createTime).getTime()
+ ); //杩欐槸鍗囧簭锛屽�掑簭鐨勮瘽缈昏繃鏉�
+ this.intList = res.data;
+ })
+ .catch((err) => {
+ // 閫氳繃catch鎹曡幏閿欒娑堟伅
+ return err;
+ });
} else {
this.$router.push({
query: { key: response.data.designId },
@@ -546,7 +569,6 @@
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
this.reset();
-
const mid = row.mid || this.ids;
getSurveyTemplate(mid).then((response) => {
this.form = response.data;
@@ -563,6 +585,21 @@
this.form.type = 1;
this.toProjectHandle(this.form, "editor");
}
+ });
+ },
+
+ /** 淇敼鎸夐挳鎿嶄綔 */
+ handleUpdate1(row) {
+ this.reset();
+ const mid = row.mid || this.ids;
+ getSurveyTemplate(mid).then((response) => {
+ this.form = response.data;
+ if (response.data.tjSurveyTempQuesList.length >= 1) {
+ this.form.tjSurveyTempQuesList = response.data.tjSurveyTempQuesList;
+ }
+ this.DaTianYa = false;
+ this.title = "淇敼闂嵎妯℃澘";
+ this.open = true;
});
},
/** 鎻愪氦鎸夐挳 */
@@ -582,7 +619,6 @@
} else {
this.toProjectHandle(response.data, "editor");
}
-
this.open = false;
this.getList();
});
diff --git a/src/views/reservation/reservations/index.vue b/src/views/reservation/reservations/index.vue
index 5007044..61d3bf0 100644
--- a/src/views/reservation/reservations/index.vue
+++ b/src/views/reservation/reservations/index.vue
@@ -1455,7 +1455,7 @@
// 鏈�鍚庢彁浜ゆ寜閽�
submitPrice() {
let _this = this;
- if (_this.tableData1.length > 0) {
+ // if (_this.tableData1.length > 0) {
if (this.tableData[0]) {
var pacId = this.tableData[0].pacId;
}
@@ -1537,9 +1537,9 @@
});
this.getList();
this.$tab.refreshPage();
- } else {
- this.$message.warning("璇烽�夋嫨鎮ㄨ浣撴鐨勫唴瀹�");
- }
+ // } else {
+ // this.$message.warning("璇烽�夋嫨鎮ㄨ浣撴鐨勫唴瀹�");
+ // }
},
// 鏈�鍚庢彁浜ゆ寜閽�
submitPrice1() {
diff --git a/src/views/system/bill/index.vue b/src/views/system/bill/index.vue
index f8b8163..e59b977 100644
--- a/src/views/system/bill/index.vue
+++ b/src/views/system/bill/index.vue
@@ -198,8 +198,8 @@
:show-overflow-tooltip="true"
>
<template slot-scope="scope">
- <span v-if="scope.row.tjType == '1'">涓汉</span>
- <span v-if="scope.row.tjType == '2'">鍥㈤槦</span>
+ <span v-if="scope.row.tjType == '2'">涓汉</span>
+ <span v-if="scope.row.tjType == '1'">鍥㈤槦</span>
</template>
</el-table-column>
<el-table-column
diff --git a/src/views/system/biol/index.vue b/src/views/system/biol/index.vue
index ef8d40d..7193bc7 100644
--- a/src/views/system/biol/index.vue
+++ b/src/views/system/biol/index.vue
@@ -1,19 +1,47 @@
<template>
<div class="app-container">
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+ <el-form
+ :model="queryParams"
+ ref="queryForm"
+ size="small"
+ :inline="true"
+ v-show="showSearch"
+ label-width="68px"
+ >
<el-form-item label="濮撳悕" prop="name">
- <el-input v-model="queryParams.name" placeholder="璇疯緭鍏ュ鍚�" style="width: 100px"
- @keyup.enter.native="handleQuery" />
+ <el-input
+ v-model="queryParams.name"
+ placeholder="璇疯緭鍏ュ鍚�"
+ style="width: 100px"
+ @keyup.enter.native="handleQuery"
+ />
</el-form-item>
<el-form-item label="浣撴鍙�" prop="tjNum">
- <el-input style="width: 170px" v-model="queryParams.tjNum" placeholder="璇疯緭鍏ヤ綋妫�鍙�" clearable
- @keyup.enter.native="handleQuery" ref="inputName" @blur="hb" />
+ <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="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="璇烽�夋嫨鍑烘姤鍛婃椂闂�"
- @change="dateChangebirthday1">
+ <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="璇烽�夋嫨鍑烘姤鍛婃椂闂�"
+ @change="dateChangebirthday1"
+ >
</el-date-picker>
</el-form-item>
<!-- <el-form-item label="鍗曚綅鍚嶇О" prop="firmId">
@@ -25,8 +53,16 @@
</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>
@@ -36,16 +72,34 @@
v-hasPermi="['hosp:order:export']">瀵煎嚭</el-button>
</el-col> -->
<el-col :span="1.5">
- <el-button type="primary" size="mini" :disabled="multiple" @click="viewReport">鎵归噺浣撴鎶ュ憡鎵撳嵃</el-button>
+ <el-button
+ type="primary"
+ size="mini"
+ :disabled="multiple"
+ @click="viewReport"
+ >鎵归噺浣撴鎶ュ憡鎵撳嵃</el-button
+ >
</el-col>
<el-col :span="1.5">
- <el-button type="primary" size="mini" :disabled="multiple" @click="jiankangReport">鍋ュ悍妫�鏌ヨ〃鎵撳嵃</el-button>
+ <el-button
+ type="primary"
+ size="mini"
+ :disabled="multiple"
+ @click="jiankangReport"
+ >鍋ュ悍妫�鏌ヨ〃鎵撳嵃</el-button
+ >
</el-col>
<!-- <el-col :span="1.5">
<el-button type="primary" size="mini" :disabled="multiple" @click="jiankangReport">鎵归噺浣撴鎶ュ憡瀵煎嚭</el-button>
</el-col> -->
<el-col :span="1.5">
- <el-button type="primary" size="mini" :disabled="single" @click="baogaoyulan">鎶ュ憡棰勮</el-button>
+ <el-button
+ type="primary"
+ size="mini"
+ :disabled="single"
+ @click="baogaoyulan"
+ >鎶ュ憡棰勮</el-button
+ >
</el-col>
<el-col :span="1.5">
<div id="main111">
@@ -65,57 +119,142 @@
</div> -->
<template>
- <el-table border style="margin: 14px; width: 99%" v-loading="loading"
- :default-sort="{ prop: 'reportTime', order: 'descending' }" :data="orderList"
- @selection-change="handleSelectionChange" ref="multipleTable">
- <el-table-column type="selection" width="40px" align="center" height="10px" fixed="left" />
+ <el-table
+ border
+ style="margin: 14px; width: 99%"
+ v-loading="loading"
+ :default-sort="{ prop: 'reportTime', order: 'descending' }"
+ :data="orderList"
+ @selection-change="handleSelectionChange"
+ ref="multipleTable"
+ >
+ <el-table-column
+ type="selection"
+ width="40px"
+ align="center"
+ height="10px"
+ fixed="left"
+ />
<!-- <el-table-column label="搴忓彿" align="center" prop="newID" width="50px" fixed="left" height="10px" /> -->
- <el-table-column label="濮撳悕" align="center" prop="tjCustomerName" height="10px" width="90px"
- :show-overflow-tooltip="true" />
- <el-table-column label="鎬у埆" align="center" prop="tjCustomerSex" width="55px" height="10px"
- :show-overflow-tooltip="true">
+ <el-table-column
+ label="濮撳悕"
+ align="center"
+ prop="tjCustomerName"
+ height="10px"
+ width="90px"
+ :show-overflow-tooltip="true"
+ />
+ <el-table-column
+ label="鎬у埆"
+ align="center"
+ prop="tjCustomerSex"
+ width="55px"
+ height="10px"
+ :show-overflow-tooltip="true"
+ >
<template slot-scope="scope">
<span v-if="scope.row.tjCustomerSex == '0'">鐢�</span>
<span v-if="scope.row.tjCustomerSex == '1'">濂�</span>
<span v-if="scope.row.tjCustomerSex == '2'">鏈煡</span>
</template>
</el-table-column>
- <el-table-column label="骞撮緞" align="center" prop="tjCustomerAge" height="10px" width="60px"
- :show-overflow-tooltip="true" />
- <el-table-column label="鐢佃瘽" align="center" prop="tjCustomerPhone" :show-overflow-tooltip="true" height="10px"
- width="110px" />
- <el-table-column label="浣撴绫诲瀷" align="center" prop="tjType" height="10px" width="80px"
- :show-overflow-tooltip="true">
+ <el-table-column
+ label="骞撮緞"
+ align="center"
+ prop="tjCustomerAge"
+ height="10px"
+ width="60px"
+ :show-overflow-tooltip="true"
+ />
+ <el-table-column
+ label="鐢佃瘽"
+ align="center"
+ prop="tjCustomerPhone"
+ :show-overflow-tooltip="true"
+ height="10px"
+ width="110px"
+ />
+ <el-table-column
+ label="浣撴绫诲瀷"
+ align="center"
+ prop="tjType"
+ height="10px"
+ width="80px"
+ :show-overflow-tooltip="true"
+ >
<template slot-scope="scope">
<span v-if="scope.row.tjType == '1'">鍥㈤槦</span>
<span v-if="scope.row.tjType == '2'">涓汉</span>
</template>
</el-table-column>
- <el-table-column label="浣撴鍙�" align="center" prop="tjNumber" :show-overflow-tooltip="true" width="160px" />
- <el-table-column label="鎵�閫夊椁�" align="center" prop="pacName" height="10px" :show-overflow-tooltip="true"
- width="140px" />
- <el-table-column label="鐧昏浜�" align="center" prop="createBy" height="10px" :show-overflow-tooltip="true"
- width="100px" />
- <el-table-column label="鐧昏鏃堕棿" align="center" prop="createTime" width="155px" height="10px"
- :show-overflow-tooltip="true">
+ <el-table-column
+ label="浣撴鍙�"
+ align="center"
+ prop="tjNumber"
+ :show-overflow-tooltip="true"
+ width="160px"
+ />
+ <el-table-column
+ label="鎵�閫夊椁�"
+ align="center"
+ prop="pacName"
+ height="10px"
+ :show-overflow-tooltip="true"
+ width="140px"
+ />
+ <el-table-column
+ label="鐧昏浜�"
+ align="center"
+ prop="createBy"
+ height="10px"
+ :show-overflow-tooltip="true"
+ width="100px"
+ />
+ <el-table-column
+ label="鐧昏鏃堕棿"
+ align="center"
+ prop="createTime"
+ width="155px"
+ height="10px"
+ :show-overflow-tooltip="true"
+ >
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
- <el-table-column label="鎶ュ憡鏃堕棿" align="center" prop="reportTime" width="155px" height="10px" sortable
- :show-overflow-tooltip="true">
+ <el-table-column
+ label="鎶ュ憡鏃堕棿"
+ align="center"
+ prop="reportTime"
+ width="155px"
+ height="10px"
+ sortable
+ :show-overflow-tooltip="true"
+ >
<template slot-scope="scope">
<span>{{ parseTime(scope.row.reportTime) }}</span>
</template>
</el-table-column>
- <el-table-column label="鎵撳嵃鏃堕棿" align="center" prop="printLastTime" width="155px" height="10px"
- :show-overflow-tooltip="true">
+ <el-table-column
+ label="鎵撳嵃鏃堕棿"
+ align="center"
+ prop="printLastTime"
+ width="155px"
+ height="10px"
+ :show-overflow-tooltip="true"
+ >
<template slot-scope="scope">
<span>{{ parseTime(scope.row.printLastTime) }}</span>
</template>
</el-table-column>
- <el-table-column label="澶囨敞" align="center" prop="remark" height="10px" :show-overflow-tooltip="true" />
+ <el-table-column
+ label="澶囨敞"
+ align="center"
+ prop="remark"
+ height="10px"
+ :show-overflow-tooltip="true"
+ />
<!-- <el-table-column fixed="right" label="鎿嶄綔" align="center" class-name="small-padding fixed-width" height="10px"
width="60px">
@@ -129,15 +268,21 @@
<div class="pag">
<div class="pag1">
- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
- :limit.sync="queryParams.pageSize" @pagination="getList" />
+ <pagination
+ v-show="total > 0"
+ :total="total"
+ :page.sync="queryParams.pageNum"
+ :limit.sync="queryParams.pageSize"
+ @pagination="getList"
+ />
</div>
</div>
<el-drawer title="鎴戞槸鏍囬" :visible.sync="drawer" :with-header="false">
<div class="drawer1">
<div class="drawer2">
- <span>浣撴浜猴細{{ gation.tjCustomerName }}</span><br />
+ <span>浣撴浜猴細{{ gation.tjCustomerName }}</span
+ ><br />
<span>鑱旂郴鐢佃瘽锛歿{ gation.tjCustomerPhone }}</span>
</div>
<span class="drawer6">鍩烘湰淇℃伅</span>
@@ -154,23 +299,46 @@
<span>浣撴鍙凤細{{ gation.tjNumber }}</span>
<span>鎶ュ憡鏃堕棿锛歿{ gation.createTime }}</span>
<span>浣撴鏃堕棿锛歿{ gation.finishTime }}</span>
- <el-button type="primary" plain size="mini" @click="viewReport1">鏈�杩戜竴娆′綋妫�鎶ュ憡</el-button>
+ <el-button type="primary" plain size="mini" @click="viewReport1"
+ >鏈�杩戜竴娆′綋妫�鎶ュ憡</el-button
+ >
</div>
</div>
<span class="drawer6">璋冩煡闂嵎</span>
<div>
- <el-form ref="form" :model="form" label-width="80px" style="margin-top: 20px">
+ <el-form
+ ref="form"
+ :model="form"
+ label-width="80px"
+ style="margin-top: 20px"
+ >
<el-form-item label="璋冩煡缁撴灉:">
<el-select v-model="value" placeholder="璇烽�夋嫨璋冩煡缁撴灉">
- <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
</el-option>
</el-select>
</el-form-item>
<el-form-item label="琛�鍘�:" style="width: 300px" prop="pressure">
- <el-input v-model="form.pressure" placeholder="璇疯緭鍏ヨ鍘�"></el-input>
+ <el-input
+ v-model="form.pressure"
+ placeholder="璇疯緭鍏ヨ鍘�"
+ ></el-input>
</el-form-item>
- <el-form-item label="浣庡帇:" placeholder="璇疯緭鍏ヤ綆鍘�" style="width: 300px" prop="lowPressure">
- <el-input v-model="form.lowPressure" placeholder="璇疯緭鍏ヤ綆鍘�"></el-input>
+ <el-form-item
+ label="浣庡帇:"
+ placeholder="璇疯緭鍏ヤ綆鍘�"
+ style="width: 300px"
+ prop="lowPressure"
+ >
+ <el-input
+ v-model="form.lowPressure"
+ placeholder="璇疯緭鍏ヤ綆鍘�"
+ ></el-input>
</el-form-item>
<div style="margin-left: 20px">
<el-form-item label="1.鏄惁鍚哥儫">
@@ -211,28 +379,54 @@
</div>
</el-drawer>
- <el-dialog title="PDF 棰勮" :visible.sync="dialogVisible" :close-on-click-modal="false">
+ <el-dialog
+ title="PDF 棰勮"
+ :visible.sync="dialogVisible"
+ :close-on-click-modal="false"
+ >
<div class="main">
- <iframe id="printIframe" :src="url" frameborder="0" style="width: 100%; height: 100%"></iframe>
+ <iframe
+ id="printIframe"
+ :src="url"
+ frameborder="0"
+ style="width: 100%; height: 100%"
+ ></iframe>
</div>
</el-dialog>
- <el-dialog title="瀵艰瘖鍗�" :visible.sync="daoZhenDan" :close-on-click-modal="false">
+ <el-dialog
+ title="瀵艰瘖鍗�"
+ :visible.sync="daoZhenDan"
+ :close-on-click-modal="false"
+ >
<div class="main">
- <iframe id="printIframe" :src="url" frameborder="0" style="width: 100%; height: 100%"></iframe>
+ <iframe
+ id="printIframe"
+ :src="url"
+ frameborder="0"
+ style="width: 100%; height: 100%"
+ ></iframe>
</div>
</el-dialog>
- <div style="
+ <div
+ style="
position: absolute;
bottom: 100px;
left: 500px;
width: 700px;
display: none;
- ">
+ "
+ >
<div id="printBill">
- <barcode :value="barcode" :height="40" :width="2" :margin="0">鏉″舰鐮佸姞杞藉け璐�</barcode>
- <div style="font-size: 13px; color: #000000" v-for="(item, index) in DataList1" :key="index">
+ <barcode :value="barcode" :height="40" :width="2" :margin="0"
+ >鏉″舰鐮佸姞杞藉け璐�</barcode
+ >
+ <div
+ style="font-size: 13px; color: #000000"
+ v-for="(item, index) in DataList1"
+ :key="index"
+ >
<div style="width: 48%; margin-top: 10px">
濮撳悕锛歿{ item.tjCustomerName }}
</div>
@@ -261,9 +455,19 @@
</div>
</div>
</div>
- <el-dialog class="dia" title="PDF 棰勮" :visible.sync="dialogVisibles" :close-on-click-modal="false">
+ <el-dialog
+ class="dia"
+ title="PDF 棰勮"
+ :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>
<!--:before-close="handleClose" -->
@@ -281,9 +485,7 @@
<script>
import print from "print-js";
import { getInfo } from "@/api/login";
-import {
- isPdfOrJimu
-} from "@/api/doctor/checkAll";
+import { isPdfOrJimu } from "@/api/doctor/checkAll";
import {
listOrder,
getNumber,
@@ -292,11 +494,16 @@
hasReport,
hasPrintCode,
getOrderListOO,
- getNewDateList
+ getNewDateList,
} from "@/api/hosp/order";
import moment from "moment";
import ViewPdf from "@/components/ViewPdf";
-import { SubmitCompany, getCompany, queryCompany } from "@/api/team/tuanti";
+import {
+ SubmitCompany,
+ getCompany,
+ queryCompany,
+ addbatch,
+} from "@/api/team/tuanti";
import { chownSync } from "fs";
export default {
components: {
@@ -305,7 +512,7 @@
name: "Order",
data() {
return {
- radios: '1',
+ radios: "1",
dialogVisiblese: false,
createTimeList: "",
// printObj: {
@@ -518,23 +725,9 @@
this.add0(mm)
);
},
- /** 鐐瑰嚮鏄剧ず浣撴鎶ュ憡鎶ヨ〃*/
- // viewReport() {
- // const tjNumber = this.report;
- // const viewNum = "792997692059705344";
- // const params = { viewNum, tjNumber };
- // hasReportEnd(tjNumber).then((res) => {
- // if (res == 1) {
- // this.$tab.openPage('浣撴鎶ュ憡', '/report/viewReport', params);
- // } else {
- // this.$message.error("璇ョ敤鎴蜂綋妫�鏆傛湭瀹屾垚锛屾棤娉曟墦鍗颁綋妫�鎶ュ憡锛�");
- // }
- // });
- // },
jiankangReport() {
this.dialogVisiblese = true;
-
},
timjiao() {
if (this.radios == "1") {
@@ -569,19 +762,22 @@
type: "warning",
});
} else {
- console.log(response)
+ console.log(response);
this.dialogVisible = true;
this.url = window.webkitURL.createObjectURL(response); //灏嗗悗绔繑鍥炵殑blob鏂囦欢璇诲彇鍑簎rl
}
});
} else {
- let url = response.data.url
+ let url = response.data.url;
const params = { url };
- this.$tab.openPage("鍋ュ悍璇佹鏌ヨ〃", "/report/zongjianjiankangzheng", params);
+ this.$tab.openPage(
+ "鍋ュ悍璇佹鏌ヨ〃",
+ "/report/zongjianjiankangzheng",
+ params
+ );
}
- })
-
+ });
},
//鎵撳嵃灏忕エ
printHandle() {
@@ -598,116 +794,179 @@
}, 100);
},
- // 浣撴鎶ュ憡
- viewReport() {
- const flag = true;
- this.failList = [];
- this.form.name = "鎶ュ憡鎵撳嵃澶辫触锛�";
-
- if (this.report.length == 1) {
- this.report.forEach((item) => {
- this.tjNumber = item;
- });
- getPdf(this.tjNumber, flag).then((response) => {
- if (response.size == 0) {
- // this.$message.error("璇ョ敤鎴蜂綋妫�鎶ュ憡鏆傛湭瀹屾垚锛�");
- this.dialogVisible = false;
- this.DataList1.forEach((item) => {
- if (item.tjNumber === this.tjNumber) {
- this.userId = item.tjCustomerName;
- this.form.name += item.tjCustomerName;
- }
- });
- this.failList.push({
- tjNumber: this.tjNumber,
- printStatus: 0,
- printBy: this.userId,
- createBy: this.userIds,
- });
- } else {
- this.dialogVisible = true;
- this.url = window.webkitURL.createObjectURL(response); //灏嗗悗绔繑鍥炵殑blob鏂囦欢璇诲彇鍑簎rl
- console.log(this.url)
- this.DataList1.forEach((item) => {
- if (item.tjNumber === this.tjNumber) {
- this.userId = item.tjCustomerName;
- // this.form.name += item.tjCustomerName
- }
- });
- this.failList.push({
- tjNumber: this.tjNumber,
- printStatus: 1,
- printBy: this.userId,
- createBy: this.userIds,
- });
+ base64ToBlob({ b64data = "", contentType = "", sliceSize = 512 } = {}) {
+ return new Promise((resolve, reject) => {
+ // 浣跨敤 atob() 鏂规硶灏嗘暟鎹В鐮�
+ let byteCharacters = atob(b64data);
+ let byteArrays = [];
+ for (
+ let offset = 0;
+ offset < byteCharacters.length;
+ offset += sliceSize
+ ) {
+ let slice = byteCharacters.slice(offset, offset + sliceSize);
+ let byteNumbers = [];
+ for (let i = 0; i < slice.length; i++) {
+ byteNumbers.push(slice.charCodeAt(i));
}
- this.joggle(this.failList);
- this.getList();
- });
- } else {
- for (let i = 0; i < this.report.length; i++) {
- if (i <= this.report.length) {
- this.tjNumber = this.report[i];
- getPdf(this.tjNumber, flag).then((response) => {
- if (response.size == 0) {
- this.failList = [];
- this.DataList1.forEach((item) => {
- if (item.tjNumber === this.report[i]) {
- this.userId = item.tjCustomerName;
- if (this.form.name) {
- this.form.name =
- this.form.name + "," + item.tjCustomerName;
- }
- }
- });
- this.failList.push({
- tjNumber: this.report[i],
- printStatus: 0,
- printBy: this.userId,
- createBy: this.userIds,
- });
- this.joggle(this.failList);
- this.getList();
- // this.$message.error("璇ョ敤鎴蜂綋妫�鎶ュ憡鏆傛湭瀹屾垚锛�");
- this.dialogVisible = false;
- } else {
- this.failList = [];
- this.DataList1.forEach((item) => {
- if (item.tjNumber === this.report[i]) {
- this.userId = item.tjCustomerName;
- }
- });
- this.failList.push({
- tjNumber: this.report[i],
- printStatus: 1,
- printBy: this.userId,
- createBy: this.userIds,
- });
- this.joggle(this.failList);
- this.getList();
- // this.dialogVisible = true;
- // this.url = window.webkitURL.createObjectURL(response); //灏嗗悗绔繑鍥炵殑blob鏂囦欢璇诲彇鍑簎rl
- const newBlob = [];
- newBlob.push(response);
- const blob = new Blob(newBlob, { type: "application/pdf" });
-
- var date = new Date().getTime();
- var ifr = document.createElement("iframe");
- ifr.style.frameborder = "no";
- ifr.style.display = "none";
- ifr.style.pageBreakBefore = "always";
- ifr.setAttribute("id", "printPdf" + date);
- ifr.setAttribute("name", "printPdf" + date);
- ifr.src = window.URL.createObjectURL(blob);
- document.body.appendChild(ifr);
- this.doPrint("printPdf" + date);
- window.URL.revokeObjectURL(ifr.src); // 閲婃斁URL 瀵硅薄
- }
- });
- }
+ // 8 浣嶆棤绗﹀彿鏁存暟鍊肩殑绫诲瀷鍖栨暟缁勩�傚唴瀹瑰皢鍒濆鍖栦负 0銆�
+ // 濡傛灉鏃犳硶鍒嗛厤璇锋眰鏁扮洰鐨勫瓧鑺傦紝鍒欏皢寮曞彂寮傚父銆�
+ byteArrays.push(new Uint8Array(byteNumbers));
}
- }
+ let result = new Blob(byteArrays, {
+ type: contentType,
+ });
+ result = Object.assign(result, {
+ // jartto: 杩欓噷涓�瀹氳澶勭悊涓�涓� URL.createObjectURL
+ preview: URL.createObjectURL(result),
+ // name: `鍥剧墖绀轰緥.png`,
+ });
+ resolve(result);
+ });
},
+
+ /** 鐐瑰嚮鏄剧ず浣撴鎶ュ憡鎶ヨ〃*/
+ viewReport() {
+ let data = this.report.join(",");
+
+ addbatch(data).then((res) => {
+ let base64 = res.file;
+ this.base64ToBlob({
+ b64data: base64,
+ contentType: "application/pdf",
+ }).then((res) => {
+ this.dialogVisible = true;
+ // 杞悗鍚庣殑blob瀵硅薄
+ console.log("blob", res.preview);
+ // var ifr = document.createElement("iframe");
+ // ifr.style.frameborder = "no";
+ // ifr.style.display = "none";
+ // ifr.style.pageBreakBefore = "always";
+ // ifr.setAttribute("id", "printPdf");
+ // ifr.setAttribute("name", "printPdf");
+ // ifr.src =res.preview
+ // document.body.appendChild(ifr);
+ // this.doPrint("printPdf");
+ // window.URL.revokeObjectURL( ifr.src);
+ try {
+ this.url = res.preview;
+ } catch (error) {
+ this.url = window.webkitURL.createObjectURL(res.preview);
+ }
+ });
+ });
+ },
+
+ // 浣撴鎶ュ憡
+ // viewReport() {
+ // const flag = true;
+ // this.failList = [];
+ // this.form.name = "鎶ュ憡鎵撳嵃澶辫触锛�";
+
+ // if (this.report.length == 1) {
+ // this.report.forEach((item) => {
+ // this.tjNumber = item;
+ // });
+ // getPdf(this.tjNumber, flag).then((response) => {
+ // if (response.size == 0) {
+ // // this.$message.error("璇ョ敤鎴蜂綋妫�鎶ュ憡鏆傛湭瀹屾垚锛�");
+ // this.dialogVisible = false;
+ // this.DataList1.forEach((item) => {
+ // if (item.tjNumber === this.tjNumber) {
+ // this.userId = item.tjCustomerName;
+ // this.form.name += item.tjCustomerName;
+ // }
+ // });
+ // this.failList.push({
+ // tjNumber: this.tjNumber,
+ // printStatus: 0,
+ // printBy: this.userId,
+ // createBy: this.userIds,
+ // });
+ // } else {
+ // this.dialogVisible = true;
+ // this.url = window.webkitURL.createObjectURL(response); //灏嗗悗绔繑鍥炵殑blob鏂囦欢璇诲彇鍑簎rl
+ // console.log(this.url)
+ // this.DataList1.forEach((item) => {
+ // if (item.tjNumber === this.tjNumber) {
+ // this.userId = item.tjCustomerName;
+ // // this.form.name += item.tjCustomerName
+ // }
+ // });
+ // this.failList.push({
+ // tjNumber: this.tjNumber,
+ // printStatus: 1,
+ // printBy: this.userId,
+ // createBy: this.userIds,
+ // });
+ // }
+ // this.joggle(this.failList);
+ // this.getList();
+ // });
+ // } else {
+ // for (let i = 0; i < this.report.length; i++) {
+ // if (i <= this.report.length) {
+ // this.tjNumber = this.report[i];
+ // getPdf(this.tjNumber, flag).then((response) => {
+ // if (response.size == 0) {
+ // this.failList = [];
+ // this.DataList1.forEach((item) => {
+ // if (item.tjNumber === this.report[i]) {
+ // this.userId = item.tjCustomerName;
+ // if (this.form.name) {
+ // this.form.name =
+ // this.form.name + "," + item.tjCustomerName;
+ // }
+ // }
+ // });
+ // this.failList.push({
+ // tjNumber: this.report[i],
+ // printStatus: 0,
+ // printBy: this.userId,
+ // createBy: this.userIds,
+ // });
+ // this.joggle(this.failList);
+ // this.getList();
+ // // this.$message.error("璇ョ敤鎴蜂綋妫�鎶ュ憡鏆傛湭瀹屾垚锛�");
+ // this.dialogVisible = false;
+ // } else {
+ // this.failList = [];
+ // this.DataList1.forEach((item) => {
+ // if (item.tjNumber === this.report[i]) {
+ // this.userId = item.tjCustomerName;
+ // }
+ // });
+ // this.failList.push({
+ // tjNumber: this.report[i],
+ // printStatus: 1,
+ // printBy: this.userId,
+ // createBy: this.userIds,
+ // });
+ // this.joggle(this.failList);
+ // this.getList();
+ // // this.dialogVisible = true;
+ // // this.url = window.webkitURL.createObjectURL(response); //灏嗗悗绔繑鍥炵殑blob鏂囦欢璇诲彇鍑簎rl
+ // const newBlob = [];
+ // newBlob.push(response);
+ // const blob = new Blob(newBlob, { type: "application/pdf" });
+
+ // var date = new Date().getTime();
+ // var ifr = document.createElement("iframe");
+ // ifr.style.frameborder = "no";
+ // ifr.style.display = "none";
+ // ifr.style.pageBreakBefore = "always";
+ // ifr.setAttribute("id", "printPdf" + date);
+ // ifr.setAttribute("name", "printPdf" + date);
+ // ifr.src = window.URL.createObjectURL(blob);
+ // document.body.appendChild(ifr);
+ // this.doPrint("printPdf" + date);
+ // window.URL.revokeObjectURL(ifr.src); // 閲婃斁URL 瀵硅薄
+ // }
+ // });
+ // }
+ // }
+ // }
+ // },
doPrint(val) {
var ordonnance = document.getElementById(val).contentWindow;
@@ -717,7 +976,7 @@
},
joggle(failList) {
- getprint(failList).then((res) => { });
+ getprint(failList).then((res) => {});
},
// 鏈�杩戜竴娆′綋妫�鎶ュ憡
@@ -771,9 +1030,9 @@
if (this.createTimeList) {
this.queryParams.djbeginTime = this.createTimeList[0];
this.queryParams.djendTime = this.createTimeList[1];
- }else if(this.createTimeList == null){
+ } else if (this.createTimeList == null) {
this.queryParams.djbeginTime = null;
- this.queryParams.djendTime =null;
+ this.queryParams.djendTime = null;
}
this.loading = true;
@@ -853,7 +1112,7 @@
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
- this.createTimeList = []
+ this.createTimeList = [];
this.resetForm("queryForm");
this.handleQuery();
},
diff --git a/src/views/system/circle/index.vue b/src/views/system/circle/index.vue
index 4242328..7894569 100644
--- a/src/views/system/circle/index.vue
+++ b/src/views/system/circle/index.vue
@@ -166,8 +166,8 @@
:show-overflow-tooltip="true"
>
<template slot-scope="scope">
- <span v-if="scope.row.tjType == '1'">涓汉</span>
- <span v-if="scope.row.tjType == '2'">鍥㈤槦</span>
+ <span v-if="scope.row.tjType == '2'">涓汉</span>
+ <span v-if="scope.row.tjType == '1'">鍥㈤槦</span>
</template>
</el-table-column>
<el-table-column
diff --git a/src/views/system/comp/index.vue b/src/views/system/comp/index.vue
index ab041e2..f1f039a 100644
--- a/src/views/system/comp/index.vue
+++ b/src/views/system/comp/index.vue
@@ -913,7 +913,6 @@
],
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("");
@@ -940,6 +939,7 @@
pacList: [],
dataList: [],
groupList: [],
+ dataLists: [],
// 闈炲崟涓鐢�
single: true,
singleg: true,
@@ -1339,6 +1339,7 @@
// 鍗曢」閫夊畾鎸夐挳
resetright() {
this.queryParams.price = 0;
+ // this.dataLists=JSON.parse(JSON.stringify(this.dataList));
this.dataList.forEach((item) => {
this.$refs.tre.toggleRowSelection(item, false);
this.OnenewpacName.push(item);
@@ -1372,23 +1373,25 @@
// 濂楅鍗曢」鑾峰彇
handleChangeOne(selection) {
this.pacList = selection;
- this.OnenewpacName = [];
+ this.OnenewpacName.forEach((item,index) => {
+ this.dataLists.forEach(item1 => {
+ if(item.proId == item1.proId){
+ this.OnenewpacName.splice(index,1)
+ }
+ })
+ })
+ this.dataLists = [];
this.queryParams.price = 0;
this.pacList.forEach((item) => {
- item.tjProjectList.forEach(item2 => {
- this.OnenewpacName.push(item2)
- })
- this.OnenewpacName.forEach((item) => {
- this.queryParams.price += item.proPrice;
- });
+ this.dataLists = item.tjProjectList;
});
- if(this.dataList.length >= 1){
- console.log(11111)
- this.dataList.forEach(item1 => {
- this.OnenewpacName.push(item1)
- })
-
- }
+ this.dataLists.forEach((item2) => {
+ this.OnenewpacName.push(item2);
+ });
+ this.OnenewpacName.forEach((item) => {
+ this.queryParams.price += item.proPrice;
+ });
+
if (selection.length > 1) {
let del_row = selection.shift();
this.$refs.tbone.toggleRowSelection(del_row, false); //璁剧疆杩欎竴琛屽彇娑堥�変腑
diff --git a/src/views/system/visit/index.vue b/src/views/system/visit/index.vue
index 5e1efb4..a744ded 100644
--- a/src/views/system/visit/index.vue
+++ b/src/views/system/visit/index.vue
@@ -68,8 +68,8 @@
<el-table-column label="浣撴绫诲瀷" align="center" prop="tjType" height="10px" width="80px"
:show-overflow-tooltip="true">
<template slot-scope="scope">
- <span v-if="scope.row.tjType == '1'">涓汉</span>
- <span v-if="scope.row.tjType == '2'">鍥㈤槦</span>
+ <span v-if="scope.row.tjType == '2'">涓汉</span>
+ <span v-if="scope.row.tjType == '1'">鍥㈤槦</span>
</template>
</el-table-column>
<el-table-column label="浣撴鍙�" align="center" prop="tjNumber" :show-overflow-tooltip="true" width="160px" />
--
Gitblit v1.8.0