From ba6e43f9c2b2c4724b961e584de89546b4b21f32 Mon Sep 17 00:00:00 2001
From: su1124 <1583764726@qq.com>
Date: 星期三, 13 九月 2023 16:01:20 +0800
Subject: [PATCH] su
---
src/views/hosp/history/index.vue | 18 +
src/views/system/bill/index.vue | 388 ++++++++++++++++++++++-------
src/views/system/user/index.vue | 75 ++++
src/api/system/user.js | 12
vue.config.js | 2
src/components/public/index.vue | 6
src/views/sampling/sampling/index.vue | 221 +++++++++++++---
7 files changed, 554 insertions(+), 168 deletions(-)
diff --git a/src/api/system/user.js b/src/api/system/user.js
index dcce167..41d0b06 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -47,12 +47,12 @@
}
// 鐢ㄦ埛瀵嗙爜閲嶇疆
-export function resetUserPwd(userId, password) {
- password = encrypt(password);
- const data = {
- userId,
- password
- }
+export function resetUserPwd(data) {
+ // password = encrypt(password);
+ // const data = {
+ // userId,
+ // password
+ // }
return request({
url: '/system/user/resetPwd',
method: 'put',
diff --git a/src/components/public/index.vue b/src/components/public/index.vue
index 83d1bf4..897be38 100644
--- a/src/components/public/index.vue
+++ b/src/components/public/index.vue
@@ -1,7 +1,8 @@
<template>
<div>
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
- <h3 v-if="fList.proResult ">妫�娴嬬粨鏋� :{{ fList.proResult }}</h3>
+ <h3 v-if="fList.proResult ">妫�娴嬮」鐩� :{{ fList.project.proName }}</h3>
+ <h3 v-if="fList.proResult ">妫�娴嬬粨鏋� :{{ fList.proResult }}{{fList.project.proMetering}}</h3>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
<el-form-item label="鐥呯鍚嶇О" prop="bingzhong">
<el-input v-model="queryParams.bingzhong" placeholder="璇疯緭鍏ョ畝绉�" clearable
@@ -74,6 +75,7 @@
'row'(val, newVla) {
// console.log(val,newVla)
this.fList = val
+ console.log(this.fList);
// if (this.fList) {
// this.getList()
// }
@@ -93,7 +95,7 @@
// if (this.fList.proResult == "") {
let data = {
proId: fList.proId,
- ruleStr: fList.proResult,
+ // ruleStr: fList.proResult,
}
getlist(data).then(res => {
this.dataList = res.rows
diff --git a/src/views/hosp/history/index.vue b/src/views/hosp/history/index.vue
index d254141..7a54ea5 100644
--- a/src/views/hosp/history/index.vue
+++ b/src/views/hosp/history/index.vue
@@ -559,6 +559,24 @@
let userId = selection.map((item) => item.userId);
getInfoById(userId).then((response) => {
this.form = response.data;
+ if(this.form.xiyan == null){
+ this.form.xiyan ="1"
+ }
+ if(this.form.xiyanpinlv == null){
+ this.form.xiyanpinlv ="0"
+ }
+ if(this.form.xiyanyear == null){
+ this.form.xiyanyear ="0"
+ }
+ if(this.form.yinjiu == null){
+ this.form.yinjiu ="1"
+ }
+ if(this.form.yinjiupinlv == null){
+ this.form.yinjiupinlv ="0"
+ }
+ if(this.form.yinjiuyear == null){
+ this.form.yinjiuyear ="0"
+ }
this.form.tjAskHistorysList = response.data.tjAskHistorysList;
// this.isdisabled= true
});
diff --git a/src/views/sampling/sampling/index.vue b/src/views/sampling/sampling/index.vue
index 7006297..ef9aba1 100644
--- a/src/views/sampling/sampling/index.vue
+++ b/src/views/sampling/sampling/index.vue
@@ -1,18 +1,43 @@
<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="tjNum">
- <el-input v-model="queryParams.tjNum" placeholder="璇疯緭鍏ヤ綋妫�鍙�" clearable @keyup.enter.native="handleQuery"
- style="width: 170px" />
+ <el-input
+ v-model="queryParams.tjNum"
+ placeholder="璇疯緭鍏ヤ綋妫�鍙�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ style="width: 170px"
+ />
</el-form-item>
<el-form-item label="濮撳悕" prop="name">
- <el-input v-model="queryParams.name" placeholder="璇疯緭鍏ュ鍚�" clearable @keyup.enter.native="handleQuery"
- style="width: 110px" />
+ <el-input
+ v-model="queryParams.name"
+ placeholder="璇疯緭鍏ュ鍚�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ style="width: 110px"
+ />
</el-form-item>
<el-form-item label="鐢宠鏃堕棿" prop="applicationTime">
- <el-date-picker clearable v-model="createTimeList" @change="dateChangebirthday1" style="width: 240px"
- value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡"
- :picker-options="pickerOptions"></el-date-picker>
+ <el-date-picker
+ v-model="createTimeList"
+ @change="dateChangebirthday1"
+ style="width: 240px"
+ value-format="yyyy-MM-dd"
+ type="daterange"
+ range-separator="-"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ :picker-options="pickerOptions"
+ ></el-date-picker>
</el-form-item>
<!-- <el-form-item label="鏄惁閲囨牱" prop="isSignFor">
<el-select style="width:100px" v-model="queryParams.isSignFor" placeholder="鏄惁閲囨牱">
@@ -32,33 +57,84 @@
<el-input v-model="queryParams.proName" placeholder="璇疯緭鍏ラ」鐩悕绉�" clearable @keyup.enter.native="handleQuery" style="width: 140px;"/>
</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-thumb" size="mini" @click="Confirmreceipt">纭閲囨牱</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
+ type="primary"
+ icon="el-icon-thumb"
+ size="mini"
+ @click="Confirmreceipt"
+ >纭閲囨牱</el-button
+ >
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+ >閲嶇疆</el-button
+ >
</el-form-item>
</el-form>
- <el-radio-group v-model="tjStatus" @input="radioChange" style="margin: 10px 15px">
+ <el-radio-group
+ v-model="tjStatus"
+ @input="radioChange"
+ style="margin: 10px 15px"
+ >
<el-radio-button label="1">鏈噰鏍�</el-radio-button>
<el-radio-button label="0">宸查噰鏍�</el-radio-button>
</el-radio-group>
<div style="width: 100%; margin-left: 10px; display: flex">
<div style="width: 40%; margin-right: 20px">
- <el-table id="ta" v-loading="loading" ref="tb" :data="samplingList" @selection-change="handleSelectionChange"
- border height="520px" :row-class-name="tableRowClassName">
+ <el-table
+ id="ta"
+ v-loading="loading"
+ ref="tb"
+ :data="samplingList"
+ @selection-change="handleSelectionChange"
+ border
+ height="520px"
+ :row-class-name="tableRowClassName"
+ >
<el-table-column type="selection" width="40" align="center" />
- <el-table-column label="浣撴鍙�" align="center" prop="customer.tjNumber" width="160px" />
- <el-table-column label="濮撳悕" align="center" prop="customer.cusName" width="80px" />
- <el-table-column label="鎬у埆" align="center" prop="customer.cusSex" width="60px">
+ <el-table-column
+ label="浣撴鍙�"
+ align="center"
+ prop="customer.tjNumber"
+ width="160px"
+ />
+ <el-table-column
+ label="濮撳悕"
+ align="center"
+ prop="customer.cusName"
+ width="80px"
+ />
+ <el-table-column
+ label="鎬у埆"
+ align="center"
+ prop="customer.cusSex"
+ width="60px"
+ >
<template slot-scope="scope">
<!-- {{scope.row.customer.cusSex}} -->
{{ scope.row.customer.cusSex === 0 ? "鐢�" : "濂�" }}
<!-- <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.cusSex " /> -->
</template>
</el-table-column>
- <el-table-column label="鎵嬫満鍙�" align="center" prop="customer.cusPhone" width="120px" />
- <el-table-column label="鐢宠鏃堕棿" align="center" prop="customer.applicationTime" width="210">
+ <el-table-column
+ label="鎵嬫満鍙�"
+ align="center"
+ prop="customer.cusPhone"
+ width="120px"
+ />
+ <el-table-column
+ label="鐢宠鏃堕棿"
+ align="center"
+ prop="customer.applicationTime"
+ width="210"
+ >
<template slot-scope="scope">
<span>{{ parseTime(scope.row.customer.applicationTime) }}</span>
</template>
@@ -66,8 +142,16 @@
</el-table>
</div>
<div style="width: 50%">
- <el-table v-loading="loading" :data="tableList" :span-method="objectSpanMethod" @selection-change="handleChange"
- border height="520px" ref="tab1" :row-class-name="tableRowClassName">
+ <el-table
+ v-loading="loading"
+ :data="tableList"
+ :span-method="objectSpanMethod"
+ @selection-change="handleChange"
+ border
+ height="520px"
+ ref="tab1"
+ :row-class-name="tableRowClassName"
+ >
<el-table-column type="selection" width="40" align="center" />
<!-- :selectable="selectEnable" -->
<!-- <el-table-column label="鏄惁绛炬敹" align="center" prop="isSignFor" /> -->
@@ -76,18 +160,29 @@
<span>{{ parseTime(scope.row.tjTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column> -->
- <el-table-column label="鏍囨湰绫诲瀷" align="center" prop="specimenType">
+ <el-table-column label="鏍囨湰绫诲瀷" align="center" prop="specimenType" width="120">
<template slot-scope="scope">
- <dict-tag :options="dict.type.sys_dict_specimen" :value="scope.row.specimenType" />
+ <dict-tag
+ :options="dict.type.sys_dict_specimen"
+ :value="scope.row.specimenType"
+ />
</template>
</el-table-column>
<el-table-column label="椤圭洰鍚嶇О" align="center" prop="proName" />
- <el-table-column label="鎬у埆" align="center" prop="proSex" />
- <el-table-column label="绌鸿吂" align="center" prop="isEat" />
- <el-table-column label="閲囨牱缂栧彿" align="center" prop="samplingNumber" />
- <el-table-column label="閲囨牱鐘舵��" align="center" prop="isSignFor">
+ <el-table-column label="鎬у埆" align="center" prop="proSex" width="90" />
+ <el-table-column label="绌鸿吂" align="center" prop="isEat" width="90" />
+ <el-table-column
+ label="閲囨牱缂栧彿"
+ align="center"
+ prop="samplingNumber"
+ :show-overflow-tooltip="true" width="120"
+ />
+ <el-table-column label="閲囨牱鐘舵��" align="center" prop="isSignFor" width="90">
<template slot-scope="scope">
- <dict-tag :options="dict.type.sampling_type" :value="scope.row.isSignFor" />
+ <dict-tag
+ :options="dict.type.sampling_type"
+ :value="scope.row.isSignFor"
+ />
</template>
</el-table-column>
<!-- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
@@ -113,8 +208,13 @@
<!-- <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :pager-count="5" :current-page.sync="currentPage1" :current-page="page"
:page-sizes="pageSize" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="total">
</el-pagination> -->
- <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>
<!-- 娣诲姞鎴栦慨鏀逛綋妫�閲囨牱绠＄悊瀵硅瘽妗� -->
@@ -285,23 +385,28 @@
this.queryParams.endTime = this.createTimeList[1];
getList(this.queryParams).then((response) => {
if (response.data) {
- this.samplingList = response.data.list;
- if (this.samplingList.length != 0) {
- this.$nextTick(() => {
- this.$refs.tb.toggleRowSelection(this.samplingList[0], true);
- });
+ if (response.data.list == null) {
+ this.samplingList = [];
+ this.tableList = [];
+ this.loading = false;
} else {
- this.$refs.tb.clearSelection();
+ this.samplingList = response.data.list;
+ this.loading = false;
+ if (this.samplingList.length != 0) {
+ this.$nextTick(() => {
+ this.$refs.tb.toggleRowSelection(this.samplingList[0], true);
+ });
+ } else {
+ this.$refs.tb.clearSelection();
+ }
}
this.total = response.data.total;
this.loading = false;
} else {
- this.samplingList = []
- this.tableList = []
+ this.samplingList = [];
+ this.tableList = [];
this.loading = false;
}
-
-
});
},
@@ -384,7 +489,7 @@
// },
// 纭畾鎸夐挳
- submitForm() { },
+ submitForm() {},
// 纭閲囨牱
Confirmreceipt() {
@@ -400,16 +505,30 @@
this.loading = true;
this.queryParams.isSignFor = value;
getList(this.queryParams).then((response) => {
- this.samplingList = response.data.list;
- if (this.samplingList.length != 0) {
- this.$nextTick(() => {
- this.$refs.tb.toggleRowSelection(this.samplingList[0], true);
- });
- } else {
- this.$refs.tb.clearSelection();
+
+ if (response.data) {
+ if (response.data.list == null) {
+ this.samplingList = [];
+ this.tableList = [];
+ this.loading = false;
+ } else {
+ this.samplingList = response.data.list;
+ this.loading = false;
+ if (this.samplingList.length != 0) {
+ this.$nextTick(() => {
+ this.$refs.tb.toggleRowSelection(this.samplingList[0], true);
+ });
+ } else {
+ this.$refs.tb.clearSelection();
+ }
+ }
+ this.total = response.data.total;
+ this.loading = false;
+ }else{
+ this.samplingList= [];
+ this.tableList = [];
+ this.loading = false;
}
- this.total = response.data.total;
- this.loading = false;
});
},
@@ -435,7 +554,7 @@
},
// 瀵煎嚭
- handleExport() { },
+ handleExport() {},
},
};
</script>
diff --git a/src/views/system/bill/index.vue b/src/views/system/bill/index.vue
index af374a5..d16bcbc 100644
--- a/src/views/system/bill/index.vue
+++ b/src/views/system/bill/index.vue
@@ -1,24 +1,64 @@
<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 ref="inputName" v-model="queryParams.name" placeholder="璇疯緭鍏ュ鍚�" style="width:100px"
- @keyup.enter.native="handleQuery" />
+ <el-input
+ ref="inputName"
+ 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" />
+ <el-input
+ style="width: 170px"
+ v-model="queryParams.tjNum"
+ placeholder="璇疯緭鍏ヤ綋妫�鍙�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
</el-form-item>
<el-form-item label="鐧昏鏃堕棿" prop="createTimeList">
- <el-date-picker v-model="createTimeList" type="datetimerange" align="right" :picker-options="pickerOptions"
- style="width: 310px" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡" :default-time="['00:00:00', '23:00:00']"
- format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm" @change="dateChangebirthday1">
- </el-date-picker> </el-form-item>
+ <el-date-picker
+ v-model="createTimeList"
+ type="datetimerange"
+ align="right"
+ :picker-options="pickerOptions"
+ style="width: 310px"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ :default-time="['00:00:00', '23:00:00']"
+ format="yyyy-MM-dd HH:mm"
+ value-format="yyyy-MM-dd HH:mm"
+ @change="dateChangebirthday1"
+ >
+ </el-date-picker>
+ </el-form-item>
<el-form-item label="鍗曚綅鍚嶇О" prop="firmId">
- <el-select :remote-method="getRemoteData" v-model="queryParams.firmId" value-key="drugManufacturerId" remote
- filterable placeholder="璇烽�夋嫨鍗曚綅鍚嶇О" clearable @change="searchSelect">
- <el-option v-for="dict in CompanyList" :key="dict.drugManufacturerId" :label="dict.cnName"
- :value="dict.drugManufacturerId" />
+ <el-select
+ :remote-method="getRemoteData"
+ v-model="queryParams.firmId"
+ value-key="drugManufacturerId"
+ remote
+ filterable
+ placeholder="璇烽�夋嫨鍗曚綅鍚嶇О"
+ clearable
+ @change="searchSelect"
+ >
+ <el-option
+ v-for="dict in CompanyList"
+ :key="dict.drugManufacturerId"
+ :label="dict.cnName"
+ :value="dict.drugManufacturerId"
+ />
</el-select>
</el-form-item>
<!-- <el-form-item label="鎶ュ憡鏃堕棿" prop="reportTimeList">
@@ -29,23 +69,51 @@
</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"
+ >鎼滅储</el-button
+ >
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+ >閲嶇疆</el-button
+ >
</el-form-item>
</el-form>
- <el-row :gutter="10" class="mb8">
- <el-button type="primary" @click="handleReport" :disabled="single" size="mini"
- v-hasPermi="['hosp:order:export']">瀵兼鍗�</el-button>
- <el-button type="primary" size="mini" @click="Collection" :disabled="single">閲囪鍗�</el-button>
+ <el-row :gutter="10" class="mb8" style="margin-left:10px">
+ <el-col :span="1.5">
+ <el-button
+ type="primary"
+ @click="handleReport"
+ :disabled="single"
+ size="mini"
+ v-hasPermi="['hosp:order:export']"
+ >琛ユ墦瀵兼鍗�</el-button
+ >
+ </el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="primary"
+ size="mini"
+ @click="Collection"
+ :disabled="single"
+ >鏉＄爜鐢熸垚</el-button
+ >
+ </el-col>
+
<!-- <el-button type="primary" size="mini" :disabled="multiple" @click="viewReport">浣撴鎶ュ憡</el-button>
<el-button type="primary" size="mini" :disabled="multiple" @click="printHandle">鎵撳嵃灏忕エ</el-button> -->
<!-- <el-col :span="1.5">
<el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport"
v-hasPermi="['hosp:order:export']">瀵煎嚭</el-button>
</el-col> -->
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+ <right-toolbar
+ :showSearch.sync="showSearch"
+ @queryTable="getList"
+ ></right-toolbar>
</el-row>
<!-- <div style="display:none">
<div id="print" style="width:300px;height:54px;border: 1px solid red;">
@@ -57,39 +125,113 @@
娴嬭瘯
</div> -->
- <template>
- <el-table border style="margin: 14px; width: 99%" v-loading="loading"
- :default-sort="{ prop: 'createTime', 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
+ border
+ style="margin: 14px; width: 99%"
+ v-loading="loading"
+ :default-sort="{ prop: 'createTime', 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"
+ >
<template slot-scope="scope">
<span v-if="scope.row.tjCustomerSex == '0'">鐢�</span>
<span v-if="scope.row.tjCustomerSex == '1'">濂�</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" sortable
- :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"
+ sortable
+ :show-overflow-tooltip="true"
+ >
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
@@ -106,7 +248,13 @@
<span>{{ parseTime(scope.row.reportTime) }}</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">
<template slot-scope="scope">
@@ -115,19 +263,24 @@
</template>
</el-table-column> -->
</el-table>
- </template>
<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>
@@ -144,23 +297,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.鏄惁鍚哥儫">
@@ -201,31 +377,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="
- position: absolute;
- bottom: 100px;
- left: 500px;
- width: 700px;
- display: none;
- ">
+ <div
+ style="
+ position: absolute;
+ bottom: 100px;
+ left: 500px;
+ width: 700px;
+ display: none;
+ "
+ >
<div id="printBill">
- <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>
@@ -388,7 +587,7 @@
djbeginTime: undefined,
djendTime: undefined,
name: undefined,
- tjNum:undefined
+ tjNum: undefined,
},
startTime: "",
// 琛ㄥ崟鍙傛暟
@@ -499,7 +698,7 @@
// 浣撴鎶ュ憡
viewReport() {
const flag = true;
- let dataList = []
+ let dataList = [];
if (this.report.length === 1) {
this.tjNumber = this.report;
// this.putAsealOn(tjNumber)
@@ -507,14 +706,14 @@
if (response.size === 0) {
this.$message.error("璇ョ敤鎴蜂綋妫�鎶ュ憡鏆傛湭瀹屾垚锛�");
this.dialogVisible = false;
- dataList.push(this.tjNumber)
+ dataList.push(this.tjNumber);
} else {
this.dialogVisible = true;
this.url = window.webkitURL.createObjectURL(response); //灏嗗悗绔繑鍥炵殑blob鏂囦欢璇诲彇鍑簎rl
}
});
} else {
- let dataList = []
+ let dataList = [];
for (let i = 0; i < this.report.length; i++) {
if (i <= this.report.length) {
this.tjNumber = this.report[i];
@@ -522,40 +721,38 @@
if (response.size === 0) {
this.$message.error("璇ョ敤鎴蜂綋妫�鎶ュ憡鏆傛湭瀹屾垚锛�");
this.dialogVisible = false;
- dataList.push(this.tjNumber)
+ dataList.push(this.tjNumber);
} else {
// 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 瀵硅薄
+ 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 瀵硅薄
}
});
} else {
- return
+ return;
}
-
}
}
},
-
doPrint(val) {
- var ordonnance = document.getElementById(val).contentWindow
+ var ordonnance = document.getElementById(val).contentWindow;
setTimeout(() => {
- ordonnance.print()
- }, 100)
+ ordonnance.print();
+ }, 100);
},
// 鏈�杩戜竴娆′綋妫�鎶ュ憡
@@ -630,9 +827,8 @@
});
},
-
// 閫夋鏁版嵁
- searchSelect(val) { },
+ searchSelect(val) {},
// 鎼滅储
getRemoteData(query) {
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 146e883..c3a6932 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -650,6 +650,27 @@
<el-button @click="upload.open = false">鍙� 娑�</el-button>
</div>
</el-dialog>
+
+ <!-- 閲嶇疆瀵嗙爜瀵硅瘽妗� -->
+ <el-dialog
+ title="鎻愮ず"
+ :visible.sync="dialogVisible1"
+ width="30%"
+ :before-close="handleClose">
+ <el-form>
+ <span>璇疯緭鍏モ�渰{row.userName}}鈥濈殑鏂板瘑鐮�</span>
+ <el-form-item>
+ <el-input v-model="password" :type="type" auto-complete="off" placeholder="瀵嗙爜" ref="barcodeMsg">
+ <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
+ <i slot="suffix" class="icon-style" :class="elIcon" autocomplete="auto" @click="flag = !flag" /></el-input>
+ </el-form-item>
+ </el-form>
+
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="dialogVisible = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="tijiao">纭� 瀹�</el-button>
+ </span>
+ </el-dialog>
</div>
</template>
@@ -694,6 +715,10 @@
components: { Treeselect },
data() {
return {
+ row:[],
+ flag: false,
+ password:"",
+ dialogVisible1:false,
nums: "",
userInfoList: [],
hospList: [],
@@ -840,6 +865,14 @@
deptName(val) {
this.$refs.tree.filter(val);
},
+ },
+ computed: {
+ type() {
+ return this.flag ? "text" : "password";
+ },
+ elIcon() {
+ return this.flag ? "el-icon-minus" : "el-icon-view";
+ }
},
created() {
this.getList();
@@ -1073,19 +1106,37 @@
},
/** 閲嶇疆瀵嗙爜鎸夐挳鎿嶄綔 */
handleResetPwd(row) {
- this.$prompt('璇疯緭鍏�"' + row.userName + '"鐨勬柊瀵嗙爜', "鎻愮ず", {
- confirmButtonText: "纭畾",
- cancelButtonText: "鍙栨秷",
- closeOnClickModal: false,
- inputPattern: /^.{5,20}$/,
- inputErrorMessage: "鐢ㄦ埛瀵嗙爜闀垮害蹇呴』浠嬩簬 5 鍜� 20 涔嬮棿",
+ console.log(row);
+ this.dialogVisible1 = true;
+ this.row = row;
+ // this.$prompt('璇疯緭鍏�"' + row.userName + '"鐨勬柊瀵嗙爜', "鎻愮ず", {
+ // confirmButtonText: "纭畾",
+ // cancelButtonText: "鍙栨秷",
+ // closeOnClickModal: false,
+ // inputPattern: /^.{5,20}$/,
+ // inputErrorMessage: "鐢ㄦ埛瀵嗙爜闀垮害蹇呴』浠嬩簬 5 鍜� 20 涔嬮棿",
+ // inputType:'password'
+ // })
+ // .then(({ value }) => {
+ // resetUserPwd(row.userId, value).then((response) => {
+ // this.$modal.msgSuccess("淇敼鎴愬姛");
+ // // 锛屾柊瀵嗙爜鏄細" + value
+ // });
+ // })
+ // .catch(() => { });
+ },
+ tijiao(){
+ let data = {
+ password:this.password,
+ userId:this.row.userId,
+ }
+ resetUserPwd(data).then(res=>{
+ console.log(res);
+ if(res.code == 200){
+ this.$modal.msgSuccess("淇敼鎴愬姛");
+ this.dialogVisible1 = false;
+ }
})
- .then(({ value }) => {
- resetUserPwd(row.userId, value).then((response) => {
- this.$modal.msgSuccess("淇敼鎴愬姛锛屾柊瀵嗙爜鏄細" + value);
- });
- })
- .catch(() => { });
},
/** 鍒嗛厤瑙掕壊鎿嶄綔 */
handleAuthRole: function (row) {
diff --git a/vue.config.js b/vue.config.js
index d6cf885..332b1ff 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -35,7 +35,7 @@
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
- target: `http://192.168.0.101:5011`,
+ target: `http://192.168.0.100:5011`,
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''
--
Gitblit v1.8.0