From de9ec81f888e006f3168fc8ea439a83696c891f7 Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期四, 15 五月 2025 16:48:46 +0800
Subject: [PATCH] qx
---
src/views/doctor/checkAll/index.vue | 6
vue.config.js | 2
src/views/system/comp/index.vue | 72 ++++++++++++--
src/views/team/reporting/index.vue | 186 ++++++++-----------------------------
src/views/standard/tijianxinxi/index.vue | 4
5 files changed, 108 insertions(+), 162 deletions(-)
diff --git a/src/views/doctor/checkAll/index.vue b/src/views/doctor/checkAll/index.vue
index 9243f19..415bcdc 100644
--- a/src/views/doctor/checkAll/index.vue
+++ b/src/views/doctor/checkAll/index.vue
@@ -536,16 +536,16 @@
</span>
<div v-if="xmChange.length > 0" style="display: flex;">
<div style="margin:0 40px;font-size: 0.8vw;">椤圭洰鍚嶇О锛歿{ xmChange[0].proName || "" }}</div>
- <div style="margin:0 40px ;font-size: 0.8vw;">浠锋牸锛歿{ xmChange[0].price || "" }}</div>
+ <div style="margin:0 80px ;font-size: 0.8vw;">浠锋牸锛歿{ xmChange[0].price || "" }}</div>
</div>
<div v-else style="display: flex;">
<div style="margin:0 40px;font-size: 0.8vw;">椤圭洰鍚嶇О锛歿{ }}</div>
- <div style="margin:0 40px ;font-size: 0.8vw;">浠锋牸锛歿{ }}</div>
+ <div style="margin:0 80px ;font-size: 0.8vw;">浠锋牸锛歿{ }}</div>
</div>
<el-button type="primary" size="mini" @click="handleaddClick()">娣诲姞</el-button>
</div>
- <el-table :row-style="redxiangmu" :data="fcList" style="width: 100%">
+ <el-table :row-style="redxiangmu" :data="fcList" style="width: 90%" border>
<el-table-column type="selection" width="40" align="center" />
<el-table-column label="搴忓彿" align="center" prop="newID" />
<el-table-column label="鍚嶇О" align="center" prop="proName" width="100px" />
diff --git a/src/views/standard/tijianxinxi/index.vue b/src/views/standard/tijianxinxi/index.vue
index c18bba7..c3869ec 100644
--- a/src/views/standard/tijianxinxi/index.vue
+++ b/src/views/standard/tijianxinxi/index.vue
@@ -1,7 +1,9 @@
<template>
<div class="app-container">
<el-row :gutter="18">
- <el-col :span="6" :xs="18">
+ <el-col :span="6" :xs="18" style="max-height: 700px;
+ overflow-y:auto;
+ flex-direction: column;">
<div class="head-container">
<el-input v-model="deptName" placeholder="璇疯緭鍏ラ儴闂ㄥ悕绉�" clearable size="small" prefix-icon="el-icon-search"
style="margin-bottom: 15px" />
diff --git a/src/views/system/comp/index.vue b/src/views/system/comp/index.vue
index ae43de9..fd551f5 100644
--- a/src/views/system/comp/index.vue
+++ b/src/views/system/comp/index.vue
@@ -1230,7 +1230,7 @@
ref="form"
:model="form"
:rules="rules"
- label-width="106px"
+ label-width="98px"
:inline="true"
@submit.native.prevent
>
@@ -1240,10 +1240,11 @@
<el-radio :label="1">鑱屼笟鐥呭崟浣�</el-radio>
</el-radio-group>
</el-form-item>
+ <br/>
<el-form-item
label="鍗曚綅鍚嶇О"
prop="cnName"
- style="display: block; width: 100%"
+
>
<el-input
v-model="form.cnName"
@@ -1282,14 +1283,14 @@
<el-input
v-model="form.registerAddress"
placeholder="璇疯緭鍏ユ敞鍐屽湴鍧�"
- style="width: 1157px"
+ style="width: 1156px"
/>
</el-form-item>
<el-form-item label="閫氳鍦板潃" prop="mailingAddress">
<el-input
v-model="form.mailingAddress"
placeholder="璇疯緭鍏ラ�氳鍦板潃"
- style="width: 1157px"
+ style="width: 1156px"
/>
</el-form-item>
<el-form-item label="鎵�灞炲湴鍖�" prop="zybCode" v-if="form.isZybUnit">
@@ -1309,7 +1310,7 @@
v-model="form.industryType"
placeholder="璇烽�夋嫨闅跺睘鍏崇郴"
clearable
- style="width: 70px"
+ style="width: 208px"
>
<el-option
v-for="dict in dict.type.sys_yes_no"
@@ -1320,16 +1321,55 @@
</el-select>
</el-form-item>
<el-form-item label="缁忔祹绫诲瀷" prop="jjType" v-if="form.isZybUnit">
- <el-input v-model="form.jjType" placeholder="璇疯緭鍏ョ粡娴庣被鍨�" />
+ <el-select
+ filterable
+ v-model="form.jjType"
+ placeholder="璇烽�夋嫨缁忔祹绫诲瀷"
+ clearable
+ style="width: 208px"
+ >
+ <el-option
+ v-for="dict in dict.type.sys_yes_no"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
</el-form-item>
<el-form-item label="浼佷笟瑙勬ā" prop="qygm" v-if="form.isZybUnit">
<el-input v-model="form.qygm" placeholder="璇疯緭鍏ヤ紒涓氳妯�" />
</el-form-item>
<el-form-item label="琛屼笟鍒嗙被" prop="hyfl" v-if="form.isZybUnit">
- <el-input v-model="form.hyfl" placeholder="璇疯緭鍏ヨ涓氬垎绫�" />
+ <el-select
+ filterable
+ v-model="form.hyfl"
+ placeholder="璇烽�夋嫨琛屼笟鍒嗙被"
+ clearable
+ style="width: 208px"
+ >
+ <el-option
+ v-for="dict in dict.type.sys_yes_no"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
</el-form-item>
<el-form-item label="椋庨櫓璇勪及" prop="fxpg" v-if="form.isZybUnit">
- <el-input v-model="form.fxpg" placeholder="璇疯緭鍏ラ闄╄瘎浼�" />
+ <el-select
+ filterable
+ v-model="form.fxpg"
+ placeholder="璇烽�夋嫨椋庨櫓璇勪及"
+ clearable
+ style="width: 208px"
+ >
+ <el-option
+ v-for="dict in dict.type.sys_yes_no"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
</el-form-item>
<el-form-item label="寮�鎴烽摱琛�" prop="bankAccount">
<el-input
@@ -1356,10 +1396,20 @@
</el-form-item>
<el-form-item label="琛屾斂鍖哄垝鍚嶇О" prop="areaName">
- <el-input
+ <el-select
+ filterable
v-model="form.areaName"
- placeholder="璇疯緭鍏ヨ鏀垮尯鍒掑悕绉�"
- />
+ placeholder="璇烽�夋嫨琛屾斂鍖哄垝鍚嶇О"
+ clearable
+ style="width: 208px"
+ >
+ <el-option
+ v-for="dict in dict.type.sys_yes_no"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
</el-form-item>
<el-form-item label="澶囨敞" prop="remark">
diff --git a/src/views/team/reporting/index.vue b/src/views/team/reporting/index.vue
index 6139a26..60803d7 100644
--- a/src/views/team/reporting/index.vue
+++ b/src/views/team/reporting/index.vue
@@ -1,17 +1,15 @@
<template>
<div class="app-container">
<el-row :gutter="20">
- <el-col :span="3" :xs="24" style="margin-top: 30px">
+ <el-col :span="5" :xs="24" style="margin-top: 30px; max-height: 700px;
+ overflow-y:auto;
+ flex-direction: column;">
<!-- <div class="head-container">
<el-input v-model="dwName" placeholder="璇疯緭鍏ラ儴闂ㄥ悕绉�" clearable size="small" prefix-icon="el-icon-search"
style="margin-bottom: 15px" />
</div> -->
<el-collapse v-model="index" accordion>
- <div
- class="info1"
- v-for="(item, index) in deptOptions"
- :key="'info1-' + index"
- >
+ <div class="info1" v-for="(item, index) in deptOptions" :key="'info1-' + index">
<el-collapse-item>
<template #title>
<div class="projectItem">
@@ -21,20 +19,15 @@
</div>
</div>
</template>
- <div
- style="
+ <div style="
display: flex;
flex-direction: column;
align-items: center;
- "
- >
- <span
- class="txt"
- v-for="(items, index) in item.dwDepts"
- :key="index"
- @click="mianban(items.id)"
- >{{ items.dwDeptName }}</span
- >
+
+ ">
+ <span class="txt" v-for="(items, index) in item.dwDepts" :key="index" @click="mianban(items.id)">{{
+ items.dwDeptName
+ }}</span>
</div>
</el-collapse-item>
</div>
@@ -45,154 +38,54 @@
@node-click="handleNodeClick" />
</div> -->
</el-col>
- <el-col :span="20" :xs="24">
- <el-form
- :model="queryParams"
- ref="queryForm"
- size="small"
- :inline="true"
- label-width="68px"
- >
+ <el-col :span="18" :xs="24">
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
<el-form-item label="鏃堕棿" prop="applicationTime">
- <el-date-picker
- clearable
- 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-date-picker clearable 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-form-item>
- <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-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>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
- <el-button type="primary" size="mini" @click="dialogVisible = true"
- >鐢熸垚鎶ュ憡</el-button
- >
+ <el-button type="primary" size="mini" @click="dialogVisible = true">鐢熸垚鎶ュ憡</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" size="mini">鍒犻櫎鎶ュ憡</el-button>
</el-col>
</el-row>
<el-table :data="baogaoList" style="width: 100%" border>
- <el-table-column
- prop="bgType"
- label="鎶ュ憡绫诲瀷"
- width="180"
- :show-overflow-tooltip="true"
- align="center"
- ></el-table-column>
- <el-table-column
- prop="dwName"
- label="鍗曚綅"
- width="180"
- :show-overflow-tooltip="true"
- align="center"
- ></el-table-column>
- <el-table-column
- prop="batch"
- label="鎵规"
- :show-overflow-tooltip="true"
- align="center"
- ></el-table-column>
- <el-table-column
- prop="dept"
- label="閮ㄩ棬"
- :show-overflow-tooltip="true"
- align="center"
- ></el-table-column>
- <el-table-column
- prop="peopleCount"
- label="鎬讳汉鏁�"
- :show-overflow-tooltip="true"
- align="center"
- ></el-table-column>
- <el-table-column
- prop="yjCount"
- label="宸叉"
- :show-overflow-tooltip="true"
- align="center"
- ></el-table-column>
- <el-table-column
- prop="wjCount"
- label="鏈"
- :show-overflow-tooltip="true"
- align="center"
- ></el-table-column>
- <el-table-column
- prop="startTime"
- label="寮�濮嬫椂闂�"
- :show-overflow-tooltip="true"
- align="center"
- ></el-table-column>
- <el-table-column
- prop="enfTime"
- label="缁撴潫鏃堕棿"
- :show-overflow-tooltip="true"
- align="center"
- ></el-table-column>
+ <el-table-column prop="bgType" label="鎶ュ憡绫诲瀷" width="180" :show-overflow-tooltip="true"
+ align="center"></el-table-column>
+ <el-table-column prop="dwName" label="鍗曚綅" width="180" :show-overflow-tooltip="true"
+ align="center"></el-table-column>
+ <el-table-column prop="batch" label="鎵规" :show-overflow-tooltip="true" align="center"></el-table-column>
+ <el-table-column prop="dept" label="閮ㄩ棬" :show-overflow-tooltip="true" align="center"></el-table-column>
+ <el-table-column prop="peopleCount" label="鎬讳汉鏁�" :show-overflow-tooltip="true"
+ align="center"></el-table-column>
+ <el-table-column prop="yjCount" label="宸叉" :show-overflow-tooltip="true" align="center"></el-table-column>
+ <el-table-column prop="wjCount" label="鏈" :show-overflow-tooltip="true" align="center"></el-table-column>
+ <el-table-column prop="startTime" label="寮�濮嬫椂闂�" :show-overflow-tooltip="true" align="center"></el-table-column>
+ <el-table-column prop="enfTime" label="缁撴潫鏃堕棿" :show-overflow-tooltip="true" align="center"></el-table-column>
</el-table>
- <el-dialog
- title="鎻愮ず"
- :visible.sync="dialogVisible"
- width="30%"
- :before-close="handleClose"
- >
- <el-form
- ref="form"
- :model="form"
- :rules="rules"
- label-width="100px"
- :inline="true"
- >
+ <el-dialog title="鎻愮ず" :visible.sync="dialogVisible" width="30%" :before-close="handleClose">
+ <el-form ref="form" :model="form" :rules="rules" label-width="100px" :inline="true">
<el-form-item label="鍗曚綅" prop="compId">
- <el-select
- v-model="compId"
- placeholder="璇烽�夋嫨鍗曚綅"
- clearable
- style="width: 200px"
- @change="cmp"
- >
- <el-option
- v-for="dict in compList"
- :key="dict.drugManufacturerId"
- :label="dict.cnName"
- :value="dict.drugManufacturerId"
- />
+ <el-select v-model="compId" placeholder="璇烽�夋嫨鍗曚綅" clearable style="width: 200px" @change="cmp">
+ <el-option v-for="dict in compList" :key="dict.drugManufacturerId" :label="dict.cnName"
+ :value="dict.drugManufacturerId" />
</el-select>
<!-- <el-input v-model="queryParams.compId" placeholder="璇疯緭鍏ュ崟浣�" clearable @keyup.enter.native="handleQuery" style="width: 170px"/> -->
</el-form-item>
<el-form-item label="鍗曚綅閮ㄩ棬" prop="dwDeptId">
- <el-select
- v-model="dwDeptId"
- placeholder="璇烽�夋嫨鍗曚綅閮ㄩ棬"
- clearable
- style="width: 200px"
- >
- <el-option
- v-for="dict in dwList"
- :key="dict.id"
- :label="dict.dwDeptName"
- :value="dict.id"
- />
+ <el-select v-model="dwDeptId" placeholder="璇烽�夋嫨鍗曚綅閮ㄩ棬" clearable style="width: 200px">
+ <el-option v-for="dict in dwList" :key="dict.id" :label="dict.dwDeptName" :value="dict.id" />
</el-select>
<!-- <el-input v-model="queryParams.dwDeptId" placeholder="璇疯緭鍏ュ崟浣嶉儴闂�" clearable @keyup.enter.native="handleQuery" style="width: 110px"/> -->
</el-form-item>
@@ -415,6 +308,7 @@
.txt {
margin-top: 10px;
}
+
.txt:hover {
cursor: pointer;
}
diff --git a/vue.config.js b/vue.config.js
index ae33049..09ea48f 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -54,7 +54,7 @@
[process.env.VUE_APP_BASE_API]: {
// target: `https://ltpeis.xaltjdkj.cn:5801/`,
// target: `http://192.168.1.99:5012`,
- target: `http://192.168.1.113:5011`,
+ target: `http://192.168.1.2:5011`,
// // target: `http://192.168.0.99:8080/ltkj-admin`,
// target: `https://ltpeis.xaltjdkj.cn:5011/ltkj-admin`,
// target: `http://10.168.0.9:5011`,
--
Gitblit v1.8.0