From a7c90f4a5ed7619a6682f22665338acfed22564e Mon Sep 17 00:00:00 2001
From: qinxianzhangyao <11053546+qinxianzhangyao@user.noreply.gitee.com>
Date: 星期四, 14 十二月 2023 18:07:52 +0800
Subject: [PATCH] qxtj
---
src/views/hosp/project/index.vue | 183 +++++++++++++++++++++++++++++++++------------
1 files changed, 134 insertions(+), 49 deletions(-)
diff --git a/src/views/hosp/project/index.vue b/src/views/hosp/project/index.vue
index dbf405e..5bdb7ba 100644
--- a/src/views/hosp/project/index.vue
+++ b/src/views/hosp/project/index.vue
@@ -50,14 +50,21 @@
<el-table v-if="refreshTable" v-loading="loading" :data="projectList" ref="tableRef" border row-key="proId"
:expand-row-keys="ListId" :row-class-name="selectSingleRow"
:tree-props="{ children: 'tjProjectList', hasChildren: 'tjProjectList.length>0', }">
- <el-table-column label="椤圭洰鍚嶇О" prop="proName" fixed="left" width="150px" :show-overflow-tooltip="true" />
+ <!-- :show-overflow-tooltip="true" -->
+ <el-table-column label="椤圭洰鍚嶇О" prop="proName" fixed="left" :width="flexColumnWidth('rwdtypeName')" />
<el-table-column label="椤圭洰浠锋牸(鍗曚綅/鍏�)" align="center" prop="proPrice" width="75px"
:show-overflow-tooltip="true"></el-table-column>
- <el-table-column label="绉戝鍚嶇О" align="center" prop="deptName" width="110px" :show-overflow-tooltip="true" />
+ <!-- <el-table-column label="绉戝鍚嶇О" align="center" prop="deptName" width="110px" :show-overflow-tooltip="true" /> -->
<el-table-column label="妫�鏌ョ被鍒�" align="center" prop="proCheckType" width="110px" :show-overflow-tooltip="true" />
+ <el-table-column label="榛樿鍊�" align="center" prop="proDefault" width="110px" :show-overflow-tooltip="true" />
<el-table-column label="涓村簥鎰忎箟" align="center" prop="proMeaning" width="350px" :show-overflow-tooltip="true" />
- <el-table-column label="妫�鏌ユ柟寮�" align="center" prop="proCheckMethod" :show-overflow-tooltip="true"
- width="110px" />
+ <!-- <el-table-column label="妫�鏌ユ柟寮�" align="center" prop="proCheckMethod" :show-overflow-tooltip="true"
+ width="110px" /> -->
+ <el-table-column label="鏄惁绌鸿吂" align="center" prop="proCheckMethod" :show-overflow-tooltip="true" width="110px">
+ <template slot-scope="scope">
+ <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.proCheckMethod" />
+ </template>
+ </el-table-column>
<el-table-column label="椤圭洰鏍囧噯鍊�" align="center" prop="proScope" :show-overflow-tooltip="true" width="90px">
</el-table-column>
<el-table-column label="椤圭洰绫诲瀷" align="center" prop="resultType" width="110px" :show-overflow-tooltip="true">
@@ -91,7 +98,7 @@
<treeselect v-model="form.proParentId" :options="projectOptions" :normalizer="normalizer" :show-count="true"
placeholder="閫夋嫨涓婚」鍚嶇О" style="width: 200px" @select="obtain" />
</el-form-item>
- <el-form-item label="鏄庣粏椤圭洰" prop="proName" v-if="key == 'Y'" >
+ <el-form-item label="鏄庣粏椤圭洰" prop="proName" v-if="key == 'Y'">
<span slot="label" style="display:inline-block;border-bottom: 2px solid blue;" @click="getDetailed">
鏄庣粏椤圭洰
<!-- <el-tooltip effect="dark" content="鏄庣粏椤圭洰" placement="bottom">
@@ -115,15 +122,18 @@
<el-form-item label="涓村簥鎰忎箟" prop="proMeaning">
<el-input v-model="form.proMeaning" placeholder="璇疯緭鍏ヤ复搴婃剰涔�" />
</el-form-item>
- <el-form-item label="妫�鏌ユ柟寮�" prop="proCheckMethod">
- <el-input v-model="form.proCheckMethod" placeholder="璇疯緭鍏ユ鏌ユ柟寮�" />
- </el-form-item>
- <el-form-item label="绌鸿吂" prop="isEat">
- <el-select v-model="form.isEat" placeholder="璇烽�夋嫨鏄惁绌鸿吂" style="width: 200px">
+ <el-form-item label="鏄惁绌鸿吂" prop="proCheckMethod">
+ <el-select v-model="form.proCheckMethod" placeholder="璇烽�夋嫨鏄惁绌鸿吂" style="width: 200px">
<el-option v-for="dict in dict.type.sys_yes_no" :key="dict.value" :label="dict.label"
:value="dict.value"></el-option>
</el-select>
</el-form-item>
+ <!-- <el-form-item label="绌鸿吂" prop="isEat">
+ <el-select v-model="form.isEat" placeholder="璇烽�夋嫨鏄惁绌鸿吂" style="width: 200px">
+ <el-option v-for="dict in dict.type.sys_yes_no" :key="dict.value" :label="dict.label"
+ :value="dict.value"></el-option>
+ </el-select>
+ </el-form-item> -->
<el-form-item label="鎬у埆" prop="proSex">
<el-select v-model="form.proSex" placeholder="璇烽�夋嫨浣撴浜烘�у埆" style="width: 200px">
<el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label"
@@ -244,10 +254,10 @@
</div>
</el-dialog>
- <el-dialog title="鏀惰垂椤圭洰" :visible.sync="dialogTableVisible" width="60%">
+ <el-dialog title="鏀惰垂椤圭洰" :visible.sync="dialogTableVisible" width="80%">
<div class="app-container">
- <el-row :gutter="20">
+ <el-row :gutter="24">
<!--閮ㄩ棬鏁版嵁-->
<el-col :span="6" :xs="24">
<div style="height:560px;overflow-y: scroll;">
@@ -263,7 +273,7 @@
</div>
</el-col>
- <el-col :span="17" :xs="24">
+ <el-col :span="18" :xs="24">
<el-form :model="querycharge" ref="queryForm" size="small" :inline="true" v-show="showSearch"
label-width="68px">
<el-form-item label="椤圭洰鍚嶇О" prop="xmmc">
@@ -278,19 +288,18 @@
</el-form>
<el-table v-loading="loading" ref="tb" :data="sfxmList" @selection-change="handleSelectionChange" border
- height="520px">
- <el-table-column type="selection" width="55" align="center" fixed="left" />
- <el-table-column label="搴忓彿" align="center" prop="newID" :show-overflow-tooltip="true" width="60px"
- fixed="left" />
- <el-table-column label="椤圭洰缂栫爜" align="center" prop="xmbm" :show-overflow-tooltip="true" />
- <el-table-column label="椤圭洰鍚嶇О" align="center" prop="xmmc" :show-overflow-tooltip="true" />
- <el-table-column label="鎷奸煶鐮�" align="center" prop="pym" :show-overflow-tooltip="true" />
- <el-table-column label="浜旂瑪鐮�" align="center" prop="wbm" :show-overflow-tooltip="true" />
- <el-table-column label="鍙傝�冨崟浠�" align="center" prop="ckdj" :show-overflow-tooltip="true" />
- <el-table-column label="涓�绾ф渶楂橀檺浠�" align="center" prop="yjzgxj" :show-overflow-tooltip="true" width="60px" />
- <el-table-column label="浜岀骇鏈�楂橀檺浠�" align="center" prop="ejzgxj" :show-overflow-tooltip="true" width="60px" />
- <el-table-column label="涓夌骇鏈�楂橀檺浠�" align="center" prop="sjzgxj" :show-overflow-tooltip="true" width="60px" />
- <el-table-column label="鐗瑰畾鏈�楂橀檺浠�" align="center" prop="tdzgxj" :show-overflow-tooltip="true" />
+ height="520px" style="width: 100%">
+ <el-table-column type="selection" align="center" />
+ <el-table-column label="搴忓彿" align="center" prop="newID" />
+ <el-table-column label="椤圭洰缂栫爜" align="center" prop="xmbm" />
+ <el-table-column label="椤圭洰鍚嶇О" align="center" prop="xmmc" />
+ <el-table-column label="鎷奸煶鐮�" align="center" prop="pym" />
+ <!-- <el-table-column label="浜旂瑪鐮�" align="center" prop="wbm" /> -->
+ <el-table-column label="鍙傝�冨崟浠�" align="center" prop="ckdj" />
+ <el-table-column label="涓�绾ф渶楂橀檺浠�" align="center" prop="yjzgxj" />
+ <el-table-column label="浜岀骇鏈�楂橀檺浠�" align="center" prop="ejzgxj" />
+ <el-table-column label="涓夌骇鏈�楂橀檺浠�" align="center" prop="sjzgxj" />
+ <el-table-column label="鐗瑰畾鏈�楂橀檺浠�" align="center" prop="tdzgxj" />
</el-table>
<div class="pag" v-if="List == true">
@@ -347,6 +356,16 @@
dicts: ["sys_normal_disable", "dict_personnel_type", "sys_user_sex", "tj_result_type", "dis_sampling_tab", "sys_dict_specimen", "sys_dict_position", "tj_result_type", "sys_yes_no"],
components: { Treeselect, IconSelect },
data() {
+ let checkPhoneNum = (rule, value, callback) => {
+ let patter = new RegExp(/^1\s*[3456789]\s*(\d\s*){9}$/);
+ if (value == "" && value == undefined && !value) {
+ return callback('');
+ } else if (value != undefined && value != "") {
+ return callback();
+ } else if (!patter.test(value)) {
+ return callback('');
+ }
+ };
return {
// 閮ㄩ棬鏍戦�夐」
deptOptions: undefined,
@@ -430,22 +449,22 @@
// 琛ㄥ崟鏍￠獙
rules: {
createTime: [
- { required: true, message: "鍒涘缓鏃堕棿涓嶈兘涓虹┖", trigger: "blur" },
+ { required: true, validator: checkPhoneNum, trigger: "blur" },
],
updateTime: [
- { required: true, message: "淇敼鏃堕棿涓嶈兘涓虹┖", trigger: "blur" },
+ { required: true, validator: checkPhoneNum, trigger: "blur" },
],
deleted: [
- { required: true, message: "鍒犻櫎鏍囪涓嶈兘涓虹┖", trigger: "blur" },
+ { required: true, validator: checkPhoneNum, trigger: "blur" },
],
proName: [
- { required: true, message: "椤圭洰鍚嶇О涓嶈兘涓虹┖", trigger: "blur" },
+ { required: true, validator: checkPhoneNum, trigger: "blur" },
],
proPrice: [
- { required: true, message: "椤圭洰浠锋牸涓嶈兘涓虹┖", trigger: "blur" },
+ { required: true, validator: checkPhoneNum, trigger: "blur" },
],
deptId: [
- { required: true, message: "绉戝鍚嶇О涓嶈兘涓虹┖", trigger: "blur" },
+ { required: true, validator: checkPhoneNum, trigger: "blur" },
],
// proStandard: [
// { required: true, message: "椤圭洰鏍囧噯鍊间笉鑳戒负绌�", trigger: "blur" },
@@ -534,6 +553,7 @@
this.open = true;
this.title = "浣撴椤圭洰淇℃伅缁存姢";
this.form.deptId = this.queryParams.deptId
+ this.form.proCheckMethod = "N"
if (this.key = "Y") {
gettreeList().then((response) => {
this.deptOptionstree = response.data;
@@ -544,18 +564,29 @@
// 鎵撳紑input寮规
getDetailed() {
- if (this.selectList.proName === "涓荤被鐩�") {
- this.dialogTableVisible = false;
+ if (this.selectList) {
+ if (this.selectList.proName === "涓荤被鐩�") {
+ this.dialogTableVisible = false;
+ }else{
+ this.dialogTableVisible = true;
+ this.getlistSfxm()
+ }
+ } else if (this.form.proParentId) {
+ if (this.form.proParentId != 0) {
+ this.dialogTableVisible = true;
+ this.getlistSfxm()
+ } else if (this.form.proParentId == 0) {
+ this.dialogTableVisible = false;
+ }
} else {
- this.dialogTableVisible = true;
- this.getlistSfxm()
+ this.$message.error("璇烽�夋嫨涓婚」鍚嶇О");
}
-
},
obtain(vals) {
if (this.projectOptions) {
this.selectList = vals;
+ console.log(this.selectList)
}
if (this.selectList.proName === "涓荤被鐩�") {
this.showPrise = true;
@@ -632,7 +663,6 @@
/** 鏌ヨ閮ㄩ棬鍒楄〃 */
getDeptList() {
listDept(this.queryParams).then((response) => {
- console.log(response)
this.parentNameList = response.data;
this.deptList = this.handleTree(response.data, "proId");
});
@@ -662,16 +692,26 @@
let data = {
deptId: this.queryParams.deptId,
};
+ this.loading = true
ProjectTree(data).then((response) => {
- this.projectList = this.handleTree(response.data.list, "proId");
- this.ListId.push(this.projectList[0].proId)
- this.key = response.data.key
- // if (this.key == "Y") {
- // this.key = response.data.key
- // } else if (response.data.key == "N") {
- // this.key = response.data.key
- // }
- this.loading = false;
+ if (response.code == 200) {
+ if (response.data.list.length >= 1) {
+ this.projectList = this.handleTree(response.data.list, "proId");
+ this.ListId.push(this.projectList[0].proId)
+ this.key = response.data.key
+ } else {
+ this.projectList = []
+ }
+
+
+ // if (this.key == "Y") {
+ // this.key = response.data.key
+ // } else if (response.data.key == "N") {
+ // this.key = response.data.key
+ // }
+ this.loading = false;
+ }
+
});
},
selectSingleRow({ row, rowIndex }) {
@@ -746,6 +786,43 @@
this.queryParams.deptId = undefined;
this.$refs.tree.setCurrentKey(null);
this.handleQuery();
+ },
+
+
+
+ flexColumnWidth(column) {
+ if (!column) {
+ return;
+ }
+ let maxlength = 160;//鍦ㄦ澶勮缃粯璁ゅ搴�
+ if (column == 'rwdtypeName') {
+ //鍦ㄦ澶勪负浜嗕繚璇佽〃澶翠笉鎹㈣锛屽彲浠ユ牴鎹〃澶村悕绉伴暱搴﹁缃粯璁ゅ搴�
+ // column1 灏辨槸瀵瑰簲琛ㄦ牸涓殑prop灞炴�у�硷紝姣斿涓婇潰鐨� rwdtypeName
+ maxlength = 160;
+ }
+ for (let i = 0; i < this.projectList.length; i++) {
+ if (this.projectList[i][column]) {
+ let now_temp = this.projectList[i][column] + '';
+ let flexWidth = 0;
+ for (const char of now_temp) {
+ if (char >= 'A' && char <= 'Z' || char >= 'a' && char <= 'z') {
+ //鑻辨枃瀛楁瘝 8 鍍忕礌
+ flexWidth += 8;
+ } else if (char >= '\u4e00' && char <= '\u9fa5') {
+ //涓枃鏂囧瓧 15 鍍忕礌
+ flexWidth += 15;
+ } else {
+ //鍏朵粬瀛楃 10 鍍忕礌
+ flexWidth += 10;
+ }
+ }
+ if (flexWidth > maxlength) {
+ maxlength = flexWidth;
+ }
+ }
+ }
+ //el-table涓� cell 鏈夊乏鍙崇殑 padding 涓� 10 鍍忕礌
+ return maxlength + 20 + 'px';
},
// 澶氶�夋閫変腑鏁版嵁
@@ -838,6 +915,14 @@
const proId = row.proId || this.ids;
getProject(proId).then((response) => {
this.form = response.data;
+ if (this.form.proParentId === "0") {
+ this.showPrise = true;
+ this.showRentPrise = false;
+ } else {
+ this.showPrise = false;
+ this.showRentPrise = true;
+ }
+ this.form.deptId = Number(this.form.deptId)
if (this.form.proStatus === 0) {
this.form.proStatus = "鍚敤";
} else {
@@ -972,7 +1057,7 @@
} else {
this.form.consumablesList = null;
}
-
+
if (this.form.deptId === null || this.form.proParentId === null) {
this.$message.error("璇峰～鍐欑埗椤瑰悕绉版垨绉戝鍚嶇О");
this.open = true;
@@ -1042,7 +1127,7 @@
} else {
this.form.consumablesList = null;
}
-
+
if (this.form.deptId === null || this.form.proParentId === null) {
this.$message.error("璇峰～鍐欑埗椤瑰悕绉版垨绉戝鍚嶇О");
this.open = true;
--
Gitblit v1.8.0