From 015aeab7a6a99afd0b24ee6ea7b5e4a9c950c3b5 Mon Sep 17 00:00:00 2001
From: qinxianzhangyao <11053546+qinxianzhangyao@user.noreply.gitee.com>
Date: 星期一, 27 五月 2024 18:05:52 +0800
Subject: [PATCH] qxtj
---
src/views/system/bill/index.vue | 2
src/views/doctor/test/index.vue | 2
src/views/doctor/examination/index.vue | 2
src/views/reservation/grouprecords/index.vue | 81 ++++++---
src/views/system/charge/index.vue | 26 +--
src/views/system/info/index.vue | 4
src/views/reservation/groupcheck/index.vue | 48 +++++
src/views/hosp/Summary/index.vue | 27 +--
src/views/hosp/extension/index.vue | 1
src/views/picture/picture/index.vue | 2
src/views/system/positive/index.vue | 4
src/api/system/comp.js | 6
src/views/doctor/checkAll/index.vue | 4
src/views/system/comp/index.vue | 2
src/views/system/biol/index.vue | 2
src/views/team/reportresults/index.vue | 3
src/views/doctor/bgsh/index.vue | 2
src/views/team/disease/index.vue | 3
src/views/doctor/check/index.vue | 2
src/views/reservation/reservations/index.vue | 4
src/views/picture/other/index.vue | 2
src/views/hosp/about/index.vue | 18 -
src/views/system/tijianall/index.vue | 145 +++++++++---------
src/views/system/examcharge/index.vue | 12
src/views/system/indrefund/index.vue | 24 +-
src/views/picture/music/index.vue | 2
src/views/doctor/imaging/index.vue | 2
src/views/hosp/restore/index.vue | 2
src/views/system/register/index.vue | 2
src/views/system/invoice/index.vue | 25 +-
src/views/team/reporting/index.vue | 1
src/views/hosp/customer/index.vue | 2
src/views/sampling/sampling/index.vue | 2
src/views/team/teams/index.vue | 2
34 files changed, 261 insertions(+), 207 deletions(-)
diff --git a/src/api/system/comp.js b/src/api/system/comp.js
index 5372b5f..236ecb7 100644
--- a/src/api/system/comp.js
+++ b/src/api/system/comp.js
@@ -179,10 +179,10 @@
}
// 鏌ヨ浣撴鍗曚綅淇℃伅缁存姢鍒楄〃
-export function makeTjPDF(query) {
+export function makeTjPDF(data) {
return request({
url: '/hosp/order/makeTjPDF',
- method: 'get',
- params: query
+ method: 'post',
+ data: data
})
}
\ No newline at end of file
diff --git a/src/views/doctor/bgsh/index.vue b/src/views/doctor/bgsh/index.vue
index 520fcb6..1a3692f 100644
--- a/src/views/doctor/bgsh/index.vue
+++ b/src/views/doctor/bgsh/index.vue
@@ -21,7 +21,7 @@
</el-select>
</el-form-item>
<el-form-item>
- <el-button type="primary" size="mini" @click="submitForm">鎼滅储</el-button>
+ <el-button type="primary" size="mini" @click="submitForm" style="margin-right:15px;">鎼滅储</el-button>
<el-button size="mini" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
</el-form>
diff --git a/src/views/doctor/check/index.vue b/src/views/doctor/check/index.vue
index 2d726cb..b27449e 100644
--- a/src/views/doctor/check/index.vue
+++ b/src/views/doctor/check/index.vue
@@ -10,7 +10,7 @@
@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" style="margin-right:15px;">鎼滅储</el-button>
<el-button size="mini" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
</el-form>
diff --git a/src/views/doctor/checkAll/index.vue b/src/views/doctor/checkAll/index.vue
index ec7cccd..6f0c246 100644
--- a/src/views/doctor/checkAll/index.vue
+++ b/src/views/doctor/checkAll/index.vue
@@ -67,8 +67,8 @@
/>
</el-select>
</el-form-item>
- <el-form-item>
- <el-button type="primary" size="mini" @click="submitForm"
+ <el-form-item>
+ <el-button type="primary" size="mini" @click="submitForm" style="margin-right:15px;"
>鎼滅储</el-button
>
<el-button size="mini" @click="resetQuery">閲嶇疆</el-button>
diff --git a/src/views/doctor/examination/index.vue b/src/views/doctor/examination/index.vue
index fa8c815..a44b27d 100644
--- a/src/views/doctor/examination/index.vue
+++ b/src/views/doctor/examination/index.vue
@@ -16,7 +16,7 @@
</el-date-picker>
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鏌ヨ</el-button>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery" style="margin-right:15px;">鏌ヨ</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
</el-form>
diff --git a/src/views/doctor/imaging/index.vue b/src/views/doctor/imaging/index.vue
index e28d91c..bba2f3d 100644
--- a/src/views/doctor/imaging/index.vue
+++ b/src/views/doctor/imaging/index.vue
@@ -10,7 +10,7 @@
@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" style="margin-right:15px;">鎼滅储</el-button>
<el-button size="mini" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
</el-form>
diff --git a/src/views/doctor/test/index.vue b/src/views/doctor/test/index.vue
index f348c76..0bb8aec 100644
--- a/src/views/doctor/test/index.vue
+++ b/src/views/doctor/test/index.vue
@@ -9,7 +9,7 @@
<el-input ref="inputName" v-model="queryParams.tjNumber" style="width: 240px" placeholder="璇疯緭鍏ヤ綋妫�鍙�" @keyup.enter.native="submitForm" @blur="hb"></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" style="margin-right:15px;">鎼滅储</el-button>
<el-button size="mini" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
</el-form>
diff --git a/src/views/hosp/Summary/index.vue b/src/views/hosp/Summary/index.vue
index 99cc69b..165bd9b 100644
--- a/src/views/hosp/Summary/index.vue
+++ b/src/views/hosp/Summary/index.vue
@@ -1,35 +1,29 @@
<template>
<div class="app-container">
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
- <el-row>
-
- <el-col :span="10">
- <el-form-item label="璧峰鏃堕棿" prop="accountBeginTime" style="display: flex;">
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="100px">
+
+ <el-form-item label="璧峰鏃堕棿" prop="accountBeginTime">
<el-date-picker v-model="queryParams.accountBeginTime" type="datetime" placeholder="閫夋嫨璧峰鏃堕棿">
</el-date-picker>
</el-form-item>
- </el-col>
- <el-col :span="10">
- <el-form-item label="鎴鏃堕棿" prop="accountEndTime" style="display: flex;">
+
+ <el-form-item label="鎴鏃堕棿" prop="accountEndTime" >
<el-date-picker v-model="queryParams.accountEndTime" type="datetime" placeholder="閫夋嫨鎴鏃堕棿">
</el-date-picker>
</el-form-item>
- </el-col>
- <el-col :span="10">
- <el-form-item label="姹囨�诲憳" prop="tollCollectorId" style="display: flex;">
+
+ <el-form-item label="姹囨�诲憳" prop="tollCollectorId" >
<el-select v-model="queryParams.tollCollectorId" filterable placeholder="璇烽�夋嫨浜ゆ鍛�" clearable
@clear="getCompanyList">
<el-option v-for="dict in CompanyList" :key="dict.userId" :label="dict.nickName" :value="dict.userId" />
</el-select>
</el-form-item>
- </el-col>
- <el-col :span="4">
+
<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-form-item>
- </el-col>
- </el-row>
+
</el-form>
<el-row :gutter="10" class="mb8">
@@ -86,8 +80,7 @@
CompanyList: [],
// 闈炲涓鐢�
multiple: true,
- // 鏄剧ず鎼滅储鏉′欢
- showSearch: true,
+
// 鎬绘潯鏁�
total: 0,
// 浣撴娴佹按琛ㄦ牸鏁版嵁
diff --git a/src/views/hosp/about/index.vue b/src/views/hosp/about/index.vue
index 2218f17..e7e2494 100644
--- a/src/views/hosp/about/index.vue
+++ b/src/views/hosp/about/index.vue
@@ -1,29 +1,25 @@
<template>
<div class="app-container">
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="110px">
- <el-row>
- <el-col :span="6">
- <el-form-item label="浜ゆ鍛�" prop="tollCollectorName" style="display: flex;">
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="78px">
+
+ <el-form-item label="浜ゆ鍛�" prop="tollCollectorName" >
<el-select v-model="queryParams.tollCollectorName" filterable placeholder="璇烽�夋嫨浜ゆ鍛�" clearable
@clear="getCompanyList" @change="idFn">
<el-option v-for="dict in CompanyList" :key="dict.userId" :label="dict.nickName" :value="dict.userId" />
</el-select>
</el-form-item>
- </el-col>
- <el-col :span="14">
- <el-form-item label="浜よ处鏃堕棿" prop="tollCollectorName" style="display: flex;">
+
+ <el-form-item label="浜よ处鏃堕棿" prop="tollCollectorName" >
<el-date-picker v-model="value1" type="datetimerange" :picker-options="pickerOptions"
value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="璧锋鏃ユ湡" end-placeholder="缁堟鏃ユ湡"
:default-time="['12:00:00']">
</el-date-picker>
</el-form-item>
- </el-col>
- <el-col :span="3">
+
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
</el-form-item>
- </el-col>
- </el-row>
+
diff --git a/src/views/hosp/customer/index.vue b/src/views/hosp/customer/index.vue
index 52f5760..6f45569 100644
--- a/src/views/hosp/customer/index.vue
+++ b/src/views/hosp/customer/index.vue
@@ -80,7 +80,7 @@
</el-select>
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery" style="margin: 0 15px;">鎼滅储</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
</el-form>
diff --git a/src/views/hosp/extension/index.vue b/src/views/hosp/extension/index.vue
index 13dc8a7..ba40f72 100644
--- a/src/views/hosp/extension/index.vue
+++ b/src/views/hosp/extension/index.vue
@@ -77,6 +77,7 @@
size="mini"
@click="transmittext"
:disabled="multiple"
+ style="margin: 0 15px;"
>鎵归噺鍙戦�佺煭淇�</el-button
>
<el-button
diff --git a/src/views/hosp/restore/index.vue b/src/views/hosp/restore/index.vue
index 30ec38f..1cd47cf 100644
--- a/src/views/hosp/restore/index.vue
+++ b/src/views/hosp/restore/index.vue
@@ -20,7 +20,7 @@
type="primary"
icon="el-icon-search"
size="mini"
- @click="handleQuery"
+ @click="handleQuery" style="margin: 0 15px;"
>鎼滅储</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
diff --git a/src/views/picture/music/index.vue b/src/views/picture/music/index.vue
index a72021d..ad4ca02 100644
--- a/src/views/picture/music/index.vue
+++ b/src/views/picture/music/index.vue
@@ -40,7 +40,7 @@
<el-button
type="primary"
icon="el-icon-search"
- size="mini"
+ size="mini" style="margin-right:15px;"
@click="handleQuery"
>鎼滅储</el-button
>
diff --git a/src/views/picture/other/index.vue b/src/views/picture/other/index.vue
index 22376cd..172fa30 100644
--- a/src/views/picture/other/index.vue
+++ b/src/views/picture/other/index.vue
@@ -66,7 +66,7 @@
type="primary"
icon="el-icon-search"
size="mini"
- @click="handleQuery"
+ @click="handleQuery" style="margin-right:15px;"
>鎼滅储</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
diff --git a/src/views/picture/picture/index.vue b/src/views/picture/picture/index.vue
index 8d272e4..5f34f8e 100644
--- a/src/views/picture/picture/index.vue
+++ b/src/views/picture/picture/index.vue
@@ -33,7 +33,7 @@
type="primary"
icon="el-icon-search"
size="mini"
- @click="handleQuery"
+ @click="handleQuery" style="margin-right:15px;"
>鎼滅储</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
diff --git a/src/views/reservation/groupcheck/index.vue b/src/views/reservation/groupcheck/index.vue
index ab5ff8c..8ee5333 100644
--- a/src/views/reservation/groupcheck/index.vue
+++ b/src/views/reservation/groupcheck/index.vue
@@ -65,7 +65,7 @@
</el-form>
<el-row :gutter="20" style="margin: 5px 20px">
- <el-col :span="12" style="margin-left: 50%;">
+ <el-col :span="12" style="margin-left: 50%">
<el-button
type="primary"
class="btn"
@@ -730,6 +730,37 @@
submitforms() {
this.open2 = true;
},
+
+ 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));
+ }
+ // 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);
+ });
+ },
submitType() {
let cusIds = [];
this.selectList.forEach((item) => {
@@ -742,6 +773,21 @@
addPlOrderAndDetail(data).then((res) => {
this.open2 = false;
this.$modal.msgSuccess("绛惧埌鎴愬姛");
+ let base64 = res.file;
+ this.base64ToBlob({
+ b64data: base64,
+ contentType: "application/pdf",
+ }).then((res) => {
+ this.dialogVisible = true;
+ // 杞悗鍚庣殑blob瀵硅薄
+ console.log("blob", res.preview);
+ try {
+ this.url =res.preview;
+ } catch (error) {
+ this.url = window.webkitURL.createObjectURL(res.preview);
+ }
+ });
+
this.handleQuery();
this.selectList = [];
});
diff --git a/src/views/reservation/grouprecords/index.vue b/src/views/reservation/grouprecords/index.vue
index 2360633..6bfe0c7 100644
--- a/src/views/reservation/grouprecords/index.vue
+++ b/src/views/reservation/grouprecords/index.vue
@@ -281,7 +281,6 @@
</el-dialog>
</div>
-
<el-dialog
title="PDF 棰勮"
:visible.sync="dialogVisible"
@@ -303,7 +302,8 @@
import {
addComp,
plRevokeTjOrderByTjNum,
- getListByCompId, makeTjPDF,
+ getListByCompId,
+ makeTjPDF,
} from "@/api/system/comp";
import { getCompany, queryCompany } from "@/api/team/tuanti";
@@ -466,7 +466,7 @@
single: true,
// 闈炲涓鐢�
multiple: true,
- ids:[],
+ ids: [],
// 鎬绘潯鏁�
total: 0,
// 寮瑰嚭灞傛爣棰�
@@ -591,32 +591,61 @@
this.objs.reservationTime = val;
},
- /** 纭鎸夐挳 */
- submitForm() {
- makeTjPDF().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({
- message: "鎶ュ憡姝ｅ湪鐢熸垚锛岃涓ゅ垎閽熷悗棰勮锛�",
- type: "warning",
- });
- } else {
- this.dialogVisible = true;
- const newBlob = [];
- newBlob.push(response);
- const blob = new Blob(newBlob, { type: "application/pdf" });
- this.url = window.webkitURL.createObjectURL(blob); //灏嗗悗绔繑鍥炵殑blob鏂囦欢璇诲彇鍑簎rl
+ 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));
+ }
+ // 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);
});
},
+
+ /** 纭鎸夐挳 */
+ submitForm() {
+ if (this.ids.length != 0) {
+ makeTjPDF(this.ids).then((response) => {
+ let base64 = response.file;
+ this.base64ToBlob({
+ b64data: base64,
+ contentType: "application/pdf",
+ }).then((res) => {
+ this.dialogVisible = true;
+ // 杞悗鍚庣殑blob瀵硅薄
+ console.log("blob", res.preview);
+ try {
+ this.url =res.preview;
+ } catch (error) {
+ this.url = window.webkitURL.createObjectURL(res.preview);
+ }
+ })
+ });
+ } else {
+ this.$modal.msgError("璇烽�夋嫨鎾ら攢浜哄憳");
+ }
+
+ },
},
};
</script>
diff --git a/src/views/reservation/reservations/index.vue b/src/views/reservation/reservations/index.vue
index 19811da..5007044 100644
--- a/src/views/reservation/reservations/index.vue
+++ b/src/views/reservation/reservations/index.vue
@@ -29,7 +29,7 @@
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
</el-form>
- <el-row :gutter="10" class="mb8">
+ <el-row :gutter="10" style="margin: 10px 15px;">
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-delete" size="mini" :disabled="multiple" @click="batch"
v-hasPermi="['reservation:reservation:remove']">鎾ら攢棰勭害</el-button>
@@ -42,7 +42,7 @@
</el-row>
<el-table border v-loading="loading" :data="reservationList" @selection-change="handleSelectionChange"
- :default-sort="{ prop: 'reservationTime', order: 'descending' }" highlight-current-row>
+ :default-sort="{ prop: 'reservationTime', order: 'descending' }" highlight-current-row style="margin-left: 15px;">
<el-table-column type="selection" width="40px" align="center" fixed="left" :selectable="selectHandle" />
<el-table-column label="濮撳悕" align="center" prop="name" width="90px" :show-overflow-tooltip="true" fixed="left" />
<el-table-column label="鎬у埆" align="center" prop="sex" width="60px" :show-overflow-tooltip="true">
diff --git a/src/views/sampling/sampling/index.vue b/src/views/sampling/sampling/index.vue
index db6e314..29cedaf 100644
--- a/src/views/sampling/sampling/index.vue
+++ b/src/views/sampling/sampling/index.vue
@@ -70,7 +70,7 @@
<el-button
type="primary"
icon="el-icon-thumb"
- size="mini"
+ size="mini" style="margin:0 15px;"
@click="Confirmreceipt"
>纭閲囨牱</el-button
>
diff --git a/src/views/system/bill/index.vue b/src/views/system/bill/index.vue
index 0863b96..f8b8163 100644
--- a/src/views/system/bill/index.vue
+++ b/src/views/system/bill/index.vue
@@ -73,7 +73,7 @@
<el-button
type="primary"
icon="el-icon-search"
- size="mini"
+ size="mini" style="margin-right:15px;"
@click="handleQuery"
>鎼滅储</el-button
>
diff --git a/src/views/system/biol/index.vue b/src/views/system/biol/index.vue
index 265edb9..ef8d40d 100644
--- a/src/views/system/biol/index.vue
+++ b/src/views/system/biol/index.vue
@@ -627,6 +627,7 @@
} 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;
@@ -689,6 +690,7 @@
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";
diff --git a/src/views/system/charge/index.vue b/src/views/system/charge/index.vue
index e699930..05fad38 100644
--- a/src/views/system/charge/index.vue
+++ b/src/views/system/charge/index.vue
@@ -1,31 +1,25 @@
<template>
<div class="app-container">
<div class="grid-content bg-purple">
- <el-form :inline="true" ref="form" :model="form" class="demo-form-inline" label-width="110px">
- <el-row>
- <el-col :span="5">
- <el-form-item label="濮撳悕" prop="tjName" style="display: flex;">
+ <el-form :inline="true" ref="form" :model="form" class="demo-form-inline" label-width="78px">
+
+ <el-form-item label="濮撳悕" prop="tjName" >
<el-input v-model="form.tjName" placeholder="璇疯緭鍏ュ鍚�" />
</el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="浣撴鍙�" prop="tjNum" style="display: flex;">
+
+ <el-form-item label="浣撴鍙�" prop="tjNum" >
<el-input ref="inputName" v-model="form.tjNum" placeholder="璇疯緭鍏ヤ綋妫�鍙�" @keyup.enter.native="submitFormchanck" @blur="hb" />
</el-form-item>
- </el-col>
-
- <el-col :span="6">
- <el-form-item label="鑱旂郴鐢佃瘽" prop="tjPhone" style="display: flex;">
+
+ <el-form-item label="鑱旂郴鐢佃瘽" prop="tjPhone" >
<el-input v-model="form.tjPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" />
</el-form-item>
- </el-col>
- <el-col :span="6">
+
<el-form-item>
<el-button style="margin-left: 40px" type="primary" size="mini" @click="submitFormchanck">鎼滅储</el-button>
<el-button style="margin-left: 10px" type="primary" size="mini" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
- </el-col>
- </el-row>
+
</el-form>
</div>
@@ -53,7 +47,7 @@
<el-radio-button label="1">宸茬即璐�</el-radio-button>
</el-radio-group>
- <el-form :inline="true" :model="formInline" class="demo-form-inline" style="margin: 12px 6px" label-width="100px">
+ <el-form :inline="true" :model="formInline" class="demo-form-inline" label-width="96px">
<el-row>
<el-col :span="7">
<el-form-item label="搴旀敹閲戦" style="display: flex;">
diff --git a/src/views/system/comp/index.vue b/src/views/system/comp/index.vue
index 9441f2f..9e48f64 100644
--- a/src/views/system/comp/index.vue
+++ b/src/views/system/comp/index.vue
@@ -6,7 +6,7 @@
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery" style="margin:0 15px;">鎼滅储</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
</el-form>
diff --git a/src/views/system/examcharge/index.vue b/src/views/system/examcharge/index.vue
index e7d5afb..7c59e1c 100644
--- a/src/views/system/examcharge/index.vue
+++ b/src/views/system/examcharge/index.vue
@@ -119,12 +119,12 @@
label="浼樻儬"
prop="zk"
style="display: flex"
- label-width="103px
+ label-width="84px
"
>
<el-input-number
v-model="form.zk"
- style="width: 98%"
+ style="width: 80%"
:precision="2"
:step="0.1"
:max="10"
@@ -144,14 +144,14 @@
label="浠樻绫诲瀷"
prop="type"
style="display: flex"
- label-width="102px"
+ label-width="86px"
>
- <el-select v-model="form.type" placeholder="璇烽�夋嫨浠樻绫诲瀷">
+ <el-select v-model="form.type" placeholder="璇烽�夋嫨浠樻绫诲瀷" style="width: 94%;">
<el-option
v-for="dict in dict.type.dict_pay_type"
:key="dict.value"
:label="dict.label"
- :value="dict.value"
+ :value="dict.value"
></el-option>
</el-select>
</el-form-item>
@@ -212,7 +212,7 @@
</el-row>
</el-form>
- <div style="margin-bottom: 10px;margin-left: 25px;">
+ <div style="margin-bottom: 10px;margin-left: 27px;">
<h3>鏀惰垂璁板綍</h3>
<!-- <el-radio-group
diff --git a/src/views/system/indrefund/index.vue b/src/views/system/indrefund/index.vue
index 307ccea..8d7abf1 100644
--- a/src/views/system/indrefund/index.vue
+++ b/src/views/system/indrefund/index.vue
@@ -1,36 +1,32 @@
<template>
<div class="app-container">
- <el-form :inline="true" ref="form" :model="queryParams" class="demo-form-inline" label-width="80px">
- <el-row>
- <el-col :span="7">
- <el-form-item label="濮撳悕" prop="name" style="display: flex;">
+ <el-form :inline="true" ref="form" :model="queryParams" class="demo-form-inline" label-width="78px">
+
+ <el-form-item label="濮撳悕" prop="name" >
<el-input v-model="queryParams.name" placeholder="璇疯緭鍏ュ鍚�" />
</el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="鑱旂郴鐢佃瘽" prop="phone" style="display: flex;">
+
+ <el-form-item label="鑱旂郴鐢佃瘽" prop="phone" >
<el-input v-model="queryParams.phone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" />
</el-form-item>
- </el-col>
- <el-col :span="3">
+
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleUpdate">鏌ヨ</el-button>
</el-form-item>
- </el-col>
- </el-row>
+
</el-form>
- <div style="margin-bottom: 10px;">
+ <div style="margin: 10px 25px;">
<el-radio-group v-model="type" @input="handleUpdate">
<el-radio-button label="1">鏀惰垂璁板綍</el-radio-button>
<el-radio-button label="2">閫�璐硅褰�</el-radio-button>
</el-radio-group>
</div>
- <template>
+ <template >
<el-table v-loading="loading" :data="tableList" @selection-change="handleSelect" border max-height="720px"
- :row-style="changRed">
+ :row-style="changRed" style="margin-left: 20px; width: 99%">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="濮撳悕" align="center" prop="customer.cusName" />
<el-table-column label="鎵嬫満鍙�" align="center" prop="customer.cusPhone"
diff --git a/src/views/system/info/index.vue b/src/views/system/info/index.vue
index 81b68b8..844d82b 100644
--- a/src/views/system/info/index.vue
+++ b/src/views/system/info/index.vue
@@ -36,7 +36,7 @@
type="primary"
icon="el-icon-search"
size="mini"
- @click="handleQuery"
+ @click="handleQuery" style="margin:0 15px;"
>鎼滅储</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
@@ -156,7 +156,7 @@
</el-col>
<el-col :span="7">
<el-form-item>
- <el-button type="primary" size="mini" @click="SubmitEvent"
+ <el-button type="primary" size="mini" @click="SubmitEvent" style="margin:0 15px;"
>鏀惰垂</el-button
>
<el-button type="primary" size="mini" @click="handleDelete"
diff --git a/src/views/system/invoice/index.vue b/src/views/system/invoice/index.vue
index 3a925c8..d996033 100644
--- a/src/views/system/invoice/index.vue
+++ b/src/views/system/invoice/index.vue
@@ -2,34 +2,29 @@
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="86px">
- <el-row>
- <el-col :span="5">
- <el-form-item label="濮撳悕" prop="name" style="display: flex;">
+
+ <el-form-item label="濮撳悕" prop="name" >
<el-input ref="inputName" clearable v-model="queryParams.name" placeholder="璇疯緭鍏ュ鍚�" @keyup.enter.native="handleQuery" />
</el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="浣撴鍙�" prop="tjNum" style="display: flex;">
+
+ <el-form-item label="浣撴鍙�" prop="tjNum" >
<el-input ref="inputName" v-model="queryParams.tjNum" placeholder="璇疯緭鍏ヤ綋妫�鍙�" @keyup.enter.native="handleQuery" @blur="hb"
clearable />
</el-form-item>
- </el-col>
- <el-col :span="10">
- <el-form-item label="鐧昏鏃堕棿" prop="createTimeList" style="display: flex;" label-width="116px">
+
+ <el-form-item label="鐧昏鏃堕棿" prop="createTimeList" label-width="116px">
<el-date-picker clearable style="width:100%" v-model="createTimeList" @change="dateChangebirthday1"
:default-time="['00:00:00', '23:00:00']"
format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss" type="daterange" range-separator="-" start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡" :picker-options="pickerOptions"></el-date-picker>
</el-form-item>
- </el-col>
- <el-col :span="3">
+
<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-form-item>
- </el-col>
- </el-row>
+
<!-- <el-form-item label="鎶ュ憡鏃堕棿" prop="reportTimeList">
<el-date-picker clearable v-model="queryParams.reportTimeList" type="daterange" range-separator="-" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡" :picker-options="pickerOptions" value-format="yyyy-MM-dd" placeholder="璇烽�夋嫨鍑烘姤鍛婃椂闂�" style="width: 240px">
</el-date-picker>
@@ -57,9 +52,9 @@
>
</el-col> -->
<el-col :span="1.5">
- <el-button type="primary" size="mini" :disabled="multiple" @click="print">鎵撳嵃鍙戠エ</el-button>
+ <el-button type="primary" size="small" :disabled="multiple" @click="print" style="margin-top: 3px">鎵撳嵃鍙戠エ</el-button>
</el-col>
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" style="margin-right: 40px"></right-toolbar>
+ <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" style="margin-right: 50px"></right-toolbar>
</el-row>
<template>
diff --git a/src/views/system/positive/index.vue b/src/views/system/positive/index.vue
index 7e09717..549f031 100644
--- a/src/views/system/positive/index.vue
+++ b/src/views/system/positive/index.vue
@@ -39,7 +39,7 @@
</el-date-picker>
</el-form-item> -->
<el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery" style="margin: 0 15px;">鎼滅储</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
</el-form>
@@ -48,7 +48,7 @@
<el-col :span="1.5">
<!-- <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport"
v-hasPermi="['hosp:order:export']" :disabled="multiple">瀵煎嚭</el-button> -->
- <el-button type="primary" size="mini" @click="transmittext" :disabled="multiple">鎵归噺鍙戦�佺煭淇�</el-button>
+ <el-button type="primary" size="mini" @click="transmittext" :disabled="multiple" style="margin: 0 15px;">鎵归噺鍙戦�佺煭淇�</el-button>
<el-button type="primary" size="mini" @click="transmit" :disabled="multiple">鎵归噺鍙戦�侀偖浠�</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
diff --git a/src/views/system/register/index.vue b/src/views/system/register/index.vue
index da7ec29..fa0a83f 100644
--- a/src/views/system/register/index.vue
+++ b/src/views/system/register/index.vue
@@ -76,7 +76,7 @@
<!-- <el-button type="warning" plain icon="el-icon-refresh-left" size="mini" @click="handleDelete"
v-hasPermi="['hosp:order:export']">鎾ら攢棰勭害</el-button> -->
</el-col>
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" style="margin-right:20px"></right-toolbar>
+ <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" style="margin-right:20px"></right-toolbar> -->
</el-row>
<template>
diff --git a/src/views/system/tijianall/index.vue b/src/views/system/tijianall/index.vue
index 40989a3..ab2dcc4 100644
--- a/src/views/system/tijianall/index.vue
+++ b/src/views/system/tijianall/index.vue
@@ -9,7 +9,7 @@
ref="form"
:model="form"
:rules="rules"
- label-width="84px"
+ label-width="106px"
>
<el-form-item
label="濮撳悕"
@@ -28,7 +28,7 @@
},
]"
>
- <el-input v-model="form.cusName" placeholder="璇疯緭鍏ュ鍚�" />
+ <el-input v-model="form.cusName" placeholder="璇疯緭鍏ュ鍚�" style="width: 99%;"/>
</el-form-item>
<el-form-item label="鎬у埆" prop="cusSex">
<el-select
@@ -46,7 +46,7 @@
</el-select>
</el-form-item>
<el-form-item label="璇佷欢绫诲瀷" prop="idType">
- <el-select v-model="form.idType" placeholder="璇烽�夋嫨璇佷欢绫诲瀷">
+ <el-select v-model="form.idType" placeholder="璇烽�夋嫨璇佷欢绫诲瀷" style="width: 93%;">
<el-option
v-for="dict in dict.type.dict_user_cardtype"
:key="dict.value"
@@ -62,24 +62,29 @@
ref="form"
:model="form"
:rules="rules"
- label-width="84px"
+ label-width="106px"
>
- <el-form-item label="姘戞棌" prop="cusNational">
- <el-select
- filterable
- v-model="form.cusNational"
- placeholder="璇烽�夋嫨姘戞棌"
- style="width: 96%"
- >
- <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
+ label="鐢佃瘽"
+ prop="cusPhone"
+ :rules="[
+ {
+ required: true,
+ validator: (rule, value, callback) => {
+ if (!form.cusPhone) {
+ callback('');
+ } else if (form.cusPhone) {
+ callback();
+ }
+ },
+ trigger: 'blur',
+ },
+ ]"
+ >
+ <el-input v-model="form.cusPhone" placeholder="璇疯緭鍏ョ數璇�" />
</el-form-item>
- <el-form-item label="濠氬Щ" prop="cusMarryStatus">
+
+ <el-form-item label="濠氬Щ" prop="cusMarryStatus" >
<el-select
v-model="form.cusMarryStatus"
placeholder="璇烽�夋嫨濠氬Щ鐘跺喌"
@@ -135,38 +140,35 @@
ref="form"
:model="form"
:rules="rules"
- label-width="84px"
+ label-width="106px"
>
-
- <el-form-item
- label="鐢佃瘽"
- prop="cusPhone"
- :rules="[
- {
- required: true,
- validator: (rule, value, callback) => {
- if (!form.cusPhone) {
- callback('');
- } else if (form.cusPhone) {
- callback();
- }
- },
- trigger: 'blur',
- },
- ]"
- >
- <el-input v-model="form.cusPhone" placeholder="璇疯緭鍏ョ數璇�" />
- </el-form-item>
-
- <el-form-item label="閭" prop="cusEmail">
+ <el-form-item label="閭" prop="cusEmail">
<el-input v-model="form.cusEmail" placeholder="璇疯緭鍏ラ偖绠�" />
</el-form-item>
+ <el-form-item label="姘戞棌" prop="cusNational">
+ <el-select
+ filterable
+ v-model="form.cusNational"
+ placeholder="璇烽�夋嫨姘戞棌"
+ style="width: 93%;"
+ >
+ <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="age">
<el-input
v-model="form.age"
:disabled="isDisabled"
- style="width: 30%"
+ style="width: 28%"
/>
<el-select
:disabled="isDisabled"
@@ -188,7 +190,7 @@
ref="form"
:model="form"
:rules="rules"
- label-width="84px"
+ label-width="106px"
>
<el-form-item label="鍗″彿" prop="indexCard">
<el-input v-model="form.indexCard" placeholder="璇疯緭鍏ュ崱鍙�" />
@@ -213,8 +215,7 @@
<el-form-item label="浣撴绫诲瀷" prop="tjType">
<el-select
v-model="form.tjType"
- placeholder="璇烽�夋嫨浣撴绫诲瀷"
- style="width: 94%"
+ placeholder="璇烽�夋嫨浣撴绫诲瀷" style="width: 94%;"
>
<el-option
v-for="dict in dict.type.dict_team"
@@ -231,17 +232,13 @@
ref="form"
:model="form"
:rules="rules"
- label-width="84px"
+ label-width="106px"
>
<el-form-item label="鍗曚綅" prop="company">
<el-input v-model="form.company" placeholder="璇疯緭鍏ュ伐浣滃崟浣�" />
</el-form-item>
-
- <el-form-item label="閮ㄩ棬" prop="department">
- <el-input v-model="form.department" placeholder="璇疯緭鍏ラ儴闂�" />
- </el-form-item>
<el-form-item label="浣撴绫诲埆" prop="category">
- <el-select v-model="form.category" placeholder="璇烽�夋嫨浣撴绫诲埆">
+ <el-select v-model="form.category" placeholder="璇烽�夋嫨浣撴绫诲埆" style="width: 95%;">
<el-option
v-for="dict in dict.type.dict_tjtype"
:key="dict.value"
@@ -251,6 +248,10 @@
</el-select>
<!-- <el-input v-model="form.category" placeholder="璇疯緭鍏ヤ綋妫�绫诲埆" /> -->
</el-form-item>
+ <el-form-item label="閮ㄩ棬" prop="department">
+ <el-input v-model="form.department" placeholder="璇疯緭鍏ラ儴闂�" />
+ </el-form-item>
+
</el-form>
<el-form
style="margin: 4px 8px"
@@ -258,27 +259,15 @@
ref="form"
:model="form"
:rules="rules"
- label-width="84px"
+ label-width="106px"
>
<el-form-item label="鐜颁綇鍦板潃" prop="cusAddr">
<el-input v-model="form.cusAddr" placeholder="璇疯緭鍏ョ幇灞呬綇鍦板潃" />
</el-form-item>
- <el-form-item label="棰勭害鏃ユ湡" prop="reservationTime">
- <el-date-picker
- v-model="form.reservationTime"
- type="date"
- value-format="yyyy-MM-dd"
- placeholder="閫夋嫨鏃ユ湡"
- :picker-options="setDisabled"
- style="width: 94%"
- >
- </el-date-picker>
- </el-form-item>
- <el-form-item label="棰勭害鏃堕棿" prop="timeRegion">
+ <el-form-item label="棰勭害鏃堕棿" prop="timeRegion" >
<el-select
v-model="form.timeRegion"
- placeholder="璇烽�夋嫨棰勭害鏃堕棿"
- style="width: 94%"
+ placeholder="璇烽�夋嫨棰勭害鏃堕棿" style="width: 95%;"
>
<el-option
v-for="dict in dict.type.tj_time_region"
@@ -288,6 +277,18 @@
></el-option>
</el-select>
</el-form-item>
+ <el-form-item label="棰勭害鏃ユ湡" prop="reservationTime">
+ <el-date-picker
+ v-model="form.reservationTime"
+ type="date"
+ value-format="yyyy-MM-dd"
+ placeholder="閫夋嫨鏃ユ湡"
+ :picker-options="setDisabled"
+ style="width: 88%"
+ >
+ </el-date-picker>
+ </el-form-item>
+
</el-form>
</div>
</el-col>
@@ -587,7 +588,7 @@
<el-form
:model="form"
:inline="true"
- label-width="75px"
+ label-width="100px"
style="margin-left: 10px"
>
<el-form-item label="搴旀敹閲戦" style="margin-right: 20px">
@@ -595,7 +596,6 @@
placeholder="搴旀敹閲戦"
:value="TotalPrice1 + '.00'"
disabled
- style="width: 150px"
></el-input>
</el-form-item>
<!-- <el-form-item label="浼樻儬鎶樻墸" style="margin-right: 20px">
@@ -603,12 +603,11 @@
<el-input-number style="width: 140px" v-model="discount" :precision="2" :step="0.1" :max="10" :min="1"
@change="numberChange" :disabled="isfalse"></el-input-number>
</el-form-item> -->
- <el-form-item label="瀹炴敹閲戦" style="margin-right: 20px">
+ <el-form-item label="瀹炴敹閲戦" >
<el-input
placeholder="瀹炴敹閲戦"
v-model="TotalPrice"
disabled
- style="width: 190px"
></el-input>
</el-form-item>
<el-form-item>
@@ -651,8 +650,8 @@
border: 1px solid #e6ebf5;
max-height: 420px;
overflow: auto;
- width: 1020px;
- margin-left: 20px;
+ width: 950px;
+ margin-left: 25px;
"
>
<el-collapse v-model="index" accordion>
diff --git a/src/views/team/disease/index.vue b/src/views/team/disease/index.vue
index 0df0442..de24260 100644
--- a/src/views/team/disease/index.vue
+++ b/src/views/team/disease/index.vue
@@ -97,6 +97,7 @@
icon="el-icon-search"
size="mini"
@click="handleQuery"
+ style="margin: 0 15px;"
>鏌ヨ</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
@@ -105,7 +106,7 @@
</el-form-item>
</el-form>
- <el-row :gutter="10" class="mb8">
+ <el-row :gutter="10" class="mb8" style="margin-left: 8px;">
<el-col :span="1.5">
<el-button type="primary" size="mini" @click="tongji"
>缁熻鐥呯</el-button
diff --git a/src/views/team/reporting/index.vue b/src/views/team/reporting/index.vue
index dec29f9..6139a26 100644
--- a/src/views/team/reporting/index.vue
+++ b/src/views/team/reporting/index.vue
@@ -74,6 +74,7 @@
icon="el-icon-search"
size="mini"
@click="handleQuery"
+ style="margin: 0 15px;"
>鏌ヨ</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
diff --git a/src/views/team/reportresults/index.vue b/src/views/team/reportresults/index.vue
index 4fc2186..c01ecfb 100644
--- a/src/views/team/reportresults/index.vue
+++ b/src/views/team/reportresults/index.vue
@@ -97,6 +97,7 @@
icon="el-icon-search"
size="mini"
@click="handleQuery"
+ style="margin: 0 15px;"
>鏌ヨ</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
@@ -107,7 +108,7 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
- <el-button type="primary" size="mini" @click="tongji"
+ <el-button type="primary" size="mini" @click="tongji" style="margin: 0 15px;"
>缁熻缁撴灉</el-button
>
</el-col>
diff --git a/src/views/team/teams/index.vue b/src/views/team/teams/index.vue
index d2da4c5..1a399ad 100644
--- a/src/views/team/teams/index.vue
+++ b/src/views/team/teams/index.vue
@@ -8,7 +8,7 @@
ref="form"
size="small"
:inline="true"
- label-width="80px"
+ label-width="86px"
>
<el-form-item label="鍗曚綅鍚嶇О" prop="firmId">
<el-select
--
Gitblit v1.8.0