From c1b92c8821e62bbf151d747a0ec630e18677438b Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期二, 15 七月 2025 09:21:39 +0800
Subject: [PATCH] qx
---
src/views/system/tijian/index.vue | 47 ++++++++++++++++++++---
src/views/doctor/checkAll/index.vue | 54 ++++++++++++++++++--------
src/views/login.vue | 12 ++++++
src/views/hosp/project/index.vue | 4 +-
4 files changed, 91 insertions(+), 26 deletions(-)
diff --git a/src/views/doctor/checkAll/index.vue b/src/views/doctor/checkAll/index.vue
index 38b200a..1030587 100644
--- a/src/views/doctor/checkAll/index.vue
+++ b/src/views/doctor/checkAll/index.vue
@@ -1,7 +1,6 @@
<template>
<div class="mainbox">
- <el-form :model="queryParams" ref="tableList" :inline="true" label-width="76px" style="margin-top: 10px"
- v-if="tjStatus == 0">
+ <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: 120px" placeholder="璇疯緭鍏ュ鍚�" clearable
@keyup.enter.native="submitForm"></el-input>
@@ -10,11 +9,15 @@
<el-input ref="inputName" v-model="queryParams.tjNumber" style="width: 180px" placeholder="璇疯緭鍏ヤ綋妫�鍙�" clearable
@keyup.enter.native="submitForm" @blur="hb"></el-input>
</el-form-item>
- <el-form-item label="浣撴鏃堕棿" prop="tjTime">
- <el-date-picker v-model="startTime" 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 label="浣撴绫诲埆">
+ <el-select style="width: 200px" v-model="queryParams.tjCategory" placeholder="璇烽�夋嫨浣撴绫诲埆">
+ <el-option v-for="dict in dict.type.dict_tjtype" :key="dict.value" :label="dict.label"
+ :value="dict.value"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="濂楅鍚嶇О" prop="tcm">
+ <el-input v-model="queryParams.tcm" style="width: 120px" placeholder="璇疯緭鍏ュ椁愬悕绉�" clearable
+ @keyup.enter.native="submitForm"></el-input>
</el-form-item>
<el-form-item label="鍗曚綅鍚嶇О" prop="tjCompName" style="margin-left: 20px">
<el-select :remote-method="getRemoteData" v-model="queryParams.tjCompName" value-key="drugManufacturerId"
@@ -22,21 +25,37 @@
<el-option v-for="dict in CompanyList" :key="dict.drugManufacturerId" :label="dict.cnName" :value="dict" />
</el-select>
</el-form-item>
- <el-form-item label="浣撴绫诲埆">
- <el-select style="width: 200px" v-model="queryParams.tjCategory" placeholder="璇烽�夋嫨浣撴绫诲埆" @change="searchCategory">
- <el-option v-for="dict in dict.type.dict_tjtype" :key="dict.value" :label="dict.label"
- :value="dict.value"></el-option>
- </el-select>
- <!-- <el-input v-model="form.category" placeholder="璇疯緭鍏ヤ綋妫�绫诲埆" /> -->
- </el-form-item>
+
<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>
+ <el-button type="primary" size="mini" @click="toggleCollapse" style="margin-right: 15px"
+ v-show="isCollapsed == 0">楂樼骇鎼滅储</el-button>
+ <el-button type="primary" size="mini" @click="toggleCollapse3" style="margin-right: 15px"
+ v-show="isCollapsed == 1">楂樼骇鎼滅储</el-button>
</el-form-item>
+ <el-row v-show="isCollapsed == 1" :gutter="20">
+ <el-col :span="4">
+ <el-form-item label="瀹℃牳鍖诲笀" prop="shys">
+ <el-input ref="inputName" v-model="queryParams.shys" style="width: 120px" placeholder="璇疯緭鍏ュ鏍稿尰甯�" clearable
+ @keyup.enter.native="submitForm"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="浣撴鏃堕棿" prop="tjTime">
+ <el-date-picker v-model="startTime" 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-col>
+
+ </el-row>
</el-form>
- <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"
v-if="tjStatus == 1">
<el-form-item label="濮撳悕" prop="name">
<el-input v-model="queryParams.name" style="width: 120px" placeholder="璇疯緭鍏ュ鍚�" clearable
@@ -62,7 +81,7 @@
<el-option v-for="dict in dict.type.dict_tjtype" :key="dict.value" :label="dict.label"
:value="dict.value"></el-option>
</el-select>
- <!-- <el-input v-model="form.category" placeholder="璇疯緭鍏ヤ綋妫�绫诲埆" /> -->
+ <el-input v-model="form.category" placeholder="璇疯緭鍏ヤ綋妫�绫诲埆" />
</el-form-item>
<el-form-item>
<el-button type="primary" size="mini" @click="submitForm" style="margin-right: 15px">鎼滅储</el-button>
@@ -84,7 +103,7 @@
</el-col>
</el-row>
- </el-form>
+ </el-form> -->
<el-radio-group v-model="tjStatus" @input="radioChange" style="margin-left: 20px">
<el-radio-button label="0">鏈鏍�</el-radio-button>
@@ -1050,6 +1069,7 @@
name: null,
checkStatus: null,
shys: null,
+ tcm: null,
tjCategory: null
},
formobj: {},
diff --git a/src/views/hosp/project/index.vue b/src/views/hosp/project/index.vue
index 7e0036e..ca33717 100644
--- a/src/views/hosp/project/index.vue
+++ b/src/views/hosp/project/index.vue
@@ -470,11 +470,11 @@
],
wsTypesy: [
{
- value:"0",
+ value:"1",
label:"鏄�"
},
{
- value:"1",
+ value:"0",
label:"鍚�"
}
],
diff --git a/src/views/login.vue b/src/views/login.vue
index a4e01dc..6373287 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -182,6 +182,12 @@
case '8099':
this.loginForm.hospId = "bjfhyy";
break;
+ case '8100':
+ this.loginForm.hospId = "ssyjyy";
+ break;
+ case '8101':
+ this.loginForm.hospId = "bjsqyy";
+ break;
}
Cookies.set("hospId", this.loginForm.hospId);
} else if (env === 'staging') {
@@ -205,6 +211,12 @@
case '9017':
this.loginForm.hospId = "bjxjyy";
break;
+ case '9018':
+ this.loginForm.hospId = "ssyjyy";
+ break;
+ case '9019':
+ this.loginForm.hospId = "bjsqyy";
+ break;
}
Cookies.set("hospId", this.loginForm.hospId);
}
diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue
index f175afb..51025ed 100644
--- a/src/views/system/tijian/index.vue
+++ b/src/views/system/tijian/index.vue
@@ -421,6 +421,31 @@
</el-col>
</el-row>
</el-tab-pane>
+ <el-tab-pane label="浜插睘濂楅" name="four">
+ <el-form :model="queryParam" ref="queryForm" size="small" :inline="true" v-if="showSearch" label-width="auto"
+ @submit.native.prevent="handle">
+ <el-form-item label="濮撳悕" prop="pacName">
+ <el-input v-model="queryParam.pacName" placeholder="璇疯緭鍏ュ鍚�" clearable @keyup.enter.native="handle" />
+ </el-form-item>
+ <el-form-item label="韬唤璇�" prop="pacName">
+ <el-input v-model="queryParam.pacName" placeholder="璇疯緭鍏ヨ韩浠借瘉" clearable @keyup.enter.native="handle" />
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handle">鏌ヨ</el-button>
+ </el-form-item>
+ </el-form>
+ <div class="tab4">
+ <div class="grid-content bg-purple" style="margin-left: 5px; width: 98%">
+ <el-table v-loading="loading" element-loading-text="姝ｅ湪鍔犺浇涓�..." element-loading-spinner="el-icon-loading"
+ border :data="newpacName" @selection-change="handleSelectionChange" height="450px" ref="tb">
+ <el-table-column type="selection" width="40px" align="center" label="閫夋嫨" />
+ <el-table-column label="濂楅鍚嶇О" align="center" prop="pacName" width="120px" />
+ <el-table-column label="濂楅浠锋牸" align="center" prop="price" width="120px" />
+ <el-table-column label="濂楅鏄庣粏" align="center" prop="allProName" :show-overflow-tooltip="true" />
+ </el-table>
+ </div>
+ </div>
+ </el-tab-pane>
</el-tabs>
<span slot="footer" class="dialog-footer">
<el-button @click="cancel">鍙� 娑�</el-button>
@@ -479,8 +504,11 @@
:max="10" :min="0" @change="debounceNumberChange" :disabled="isfalse"></el-input-number>
</el-form-item>
<el-form-item label="瀹炴敹閲戦">
- <el-input placeholder="瀹炴敹閲戦" v-model="TotalPrice" style="width: 206px" @input="changeXianjia"
+ <el-input placeholder="瀹炴敹閲戦" v-model="TotalPrice" style="width: 205px" @input="changeXianjia"
@blur="numberChangeXianPrice(discount, discount)" />
+ </el-form-item>
+ <el-form-item label="鏄惁鏇挎" v-if="tjtype">
+ <el-input placeholder="鏄惁鏇挎" v-model="sftj" style="width: 150px"></el-input>
</el-form-item>
<br />
@@ -923,6 +951,8 @@
proIds: [],
// 鏄剧ず鎼滅储鏉′欢
showSearch: true,
+ tjtype: false,
+ sftj:null,
activeNames: "first",
// 鏍戠姸褰㈢姸
Treedata: [],
@@ -1231,6 +1261,7 @@
this.title = "娣诲姞浣撴鍗曚綅淇℃伅缁存姢";
},
idFn1() {
+ this.tjtype = true
if (this.form.firmName) {
const originalCompId = this.form.firmId;
this.CompanyList.forEach((item) => {
@@ -1743,10 +1774,10 @@
}
// 鍙�夛細妫�鏌� sfzImg 鏄惁瀛樺湪
- if (!formData.sfzImg) {
- this.$message.warning("璇峰厛鑾峰彇韬唤璇佸ご鍍�");
- return;
- }
+ // if (!formData.sfzImg) {
+ // this.$message.warning("璇峰厛鑾峰彇韬唤璇佸ご鍍�");
+ // return;
+ // }
addCustomer(formData).then((response) => {
this.responseList = response.data;
@@ -2946,9 +2977,11 @@
// 澶勭悊璁㈠崟椤圭洰
processOrderItems(cusId) {
- console.log(11222)
getTransitionList1(cusId).then((response) => {
- this.tableData1 = response.data;
+ this.tableData1 = response.data;
+ // if (response.data.tjCategory != null) {
+ // this.tjCategory = response.data.tjCategory;
+ // }
let Price = 0;
if (this.tableData1) {
this.tableData1.forEach((item) => {
--
Gitblit v1.8.0