From 6cbbc9d82214c42996d622f22c8ccab3a8123d60 Mon Sep 17 00:00:00 2001
From: qinxianzhangyao <11053546+qinxianzhangyao@user.noreply.gitee.com>
Date: 星期三, 13 十二月 2023 19:07:21 +0800
Subject: [PATCH] qxtj
---
src/views/doctor/check/index.vue | 6 +++++-
src/views/hosp/harmType/index.vue | 17 +++++++++++------
vue.config.js | 2 +-
src/views/hosp/project/index.vue | 26 +++++++++++++++-----------
4 files changed, 32 insertions(+), 19 deletions(-)
diff --git a/src/views/doctor/check/index.vue b/src/views/doctor/check/index.vue
index c525895..be8be35 100644
--- a/src/views/doctor/check/index.vue
+++ b/src/views/doctor/check/index.vue
@@ -500,6 +500,7 @@
info: {},
allList: [],
autorule: [],
+ vals:{},
form: {
createTime: new Date()
},
@@ -799,6 +800,7 @@
},
checkboxchange(val) {
+ this.vals = val
this.project = val.project
this.formIn.tjNumber = this.tableAll.tjNumber
this.formIn.cusId = this.tableAll.cusId
@@ -814,6 +816,8 @@
})
if (val.isPositive == "1") {
this.checkval = true;
+ this.formIn.flag = "0"
+ this.formIn.level=""
} else {
this.formIn.flag = "0"
addBigPositive(this.formIn).then(res => {
@@ -831,7 +835,7 @@
},
cancell() {
this.checkval = false;
-
+ this.vals.isPositive = "0"
},
Hzlog(val) {
diff --git a/src/views/hosp/harmType/index.vue b/src/views/hosp/harmType/index.vue
index 5b82429..a8217c7 100644
--- a/src/views/hosp/harmType/index.vue
+++ b/src/views/hosp/harmType/index.vue
@@ -50,7 +50,7 @@
<el-table-column label="鑱屼笟鐥呯紪鐮�" align="center" prop="harmCode" />
<el-table-column label="鑱屼笟鐥呭悕绉�" align="center" prop="harmType" />
<el-table-column label="鑱屼笟鐥呮嫾闊崇爜" align="center" prop="harmPinYin" />
- <el-table-column label="淇℃伅" align="center" prop="harmInfo" />
+ <el-table-column label="鎻忚堪" align="center" prop="harmInfo" />
<el-table-column label="闃叉姢鎺柦" align="center" prop="protection" />
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
@@ -85,11 +85,11 @@
<el-input v-model="form.harmPinYin" placeholder="璇疯緭鍏ユ嫾闊崇爜" />
</el-form-item>
<el-form-item label="鍚嶇О" prop="harmType">
- <el-input v-model="form.harmType" placeholder="璇疯緭鍏ユ嫾闊崇爜" />
+ <el-input v-model="form.harmType" placeholder="璇疯緭鍏ュ悕绉�" />
</el-form-item>
- <el-form-item label="淇℃伅" prop="harmInfo">
- <el-input v-model="form.harmInfo" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
+ <el-form-item label="鎻忚堪" prop="harmInfo">
+ <el-input v-model="form.harmInfo" type="textarea" placeholder="璇疯緭鍏ユ弿杩�" />
</el-form-item>
@@ -255,7 +255,7 @@
getHarmType(aid).then(response => {
this.form = response.data;
this.open = true;
- this.title = "淇敼鑱屼笟鐥�";
+ this.title = "鏈夊鍥犵礌";
});
},
/** 鎻愪氦鎸夐挳 */
@@ -269,11 +269,16 @@
this.getList();
});
} else {
- addHarmType(this.form).then((response) => {
+ if(this.form.harmPinYin && this.form.harmType && this.form.harmCode){
+ addHarmType(this.form).then((response) => {
this.$modal.msgSuccess("鏂板鎴愬姛");
this.open = false;
this.getList();
});
+ }else{
+ this.$modal.msgError("璇峰～鍐欏繀濉」淇℃伅");
+ }
+
}
}
});
diff --git a/src/views/hosp/project/index.vue b/src/views/hosp/project/index.vue
index 53b27e3..3749c75 100644
--- a/src/views/hosp/project/index.vue
+++ b/src/views/hosp/project/index.vue
@@ -54,8 +54,9 @@
<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" /> -->
@@ -356,7 +357,6 @@
components: { Treeselect, IconSelect },
data() {
let checkPhoneNum = (rule, value, callback) => {
- console.log(value)
let patter = new RegExp(/^1\s*[3456789]\s*(\d\s*){9}$/);
if (value == "" && value == undefined && !value) {
return callback('');
@@ -563,17 +563,15 @@
// 鎵撳紑input寮规
getDetailed() {
- if (this.form.proParentId) {
- if (this.selectList.proName === "涓荤被鐩�") {
- this.dialogTableVisible = false;
- } else {
- this.dialogTableVisible = true;
- this.getlistSfxm()
- }
+
+ if (this.form.proParentId == 0) {
+ this.dialogTableVisible = false;
+ } else if (this.form.proParentId != 0) {
+ this.dialogTableVisible = true;
+ this.getlistSfxm()
} else {
this.$message.error("璇烽�夋嫨涓婚」鍚嶇О");
}
-
},
@@ -802,7 +800,6 @@
//鑻辨枃瀛楁瘝 8 鍍忕礌
flexWidth += 8;
} else if (char >= '\u4e00' && char <= '\u9fa5') {
- console.log(22222)
//涓枃鏂囧瓧 15 鍍忕礌
flexWidth += 15;
} else {
@@ -909,6 +906,13 @@
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 = "鍚敤";
diff --git a/vue.config.js b/vue.config.js
index 3603595..57f3239 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -36,7 +36,7 @@
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
//target: `https://ltpeis.xaltjdkj.cn:5501/prod-api/getInfo`,
- target: `http://192.168.0.111:5011`,
+ target: `http://192.168.0.104: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