From 7db11f1ecbe7df37eb1a8adfdfadc8b654d46522 Mon Sep 17 00:00:00 2001
From: lkk <364857242@qq.com>
Date: 星期三, 09 四月 2025 17:30:31 +0800
Subject: [PATCH] 2
---
src/views/doctor/check/index.vue | 5 +
src/views/hosp/rules/index.vue | 28 +++---
src/components/proposal/index.vue | 10 --
src/components/public/index.vue | 120 ++++++++++++++++++-----------
src/views/picture/picture/index.vue | 20 ++++-
5 files changed, 109 insertions(+), 74 deletions(-)
diff --git a/src/components/proposal/index.vue b/src/components/proposal/index.vue
index 4042982..6bb92ae 100644
--- a/src/components/proposal/index.vue
+++ b/src/components/proposal/index.vue
@@ -145,7 +145,7 @@
sex: "",
isZj: "",
userId: "",
- pageNum: 1,
+ page: 1,
pageSize: 10,
},
queryParams1: {
@@ -170,15 +170,7 @@
this.getList();
},
},
- mounted() {
- // this.getList()
- },
- created() {
- // if( this.queryParams){
- // this.getList()
- // }
- },
methods: {
getAllList() {
this.loading = true;
diff --git a/src/components/public/index.vue b/src/components/public/index.vue
index 8c9a710..98c8513 100644
--- a/src/components/public/index.vue
+++ b/src/components/public/index.vue
@@ -3,21 +3,21 @@
<el-dialog
:title="title"
:visible.sync="open"
- width="1000px"
+ width="1080px"
append-to-body
>
<h3 v-if="fList.proResult">妫�娴嬮」鐩� :{{ fList.project.proName }}</h3>
<h3 v-if="fList.proResult">
妫�娴嬬粨鏋� :{{ fList.proResult }}{{ fList.project.proMetering }}
</h3>
- <el-form
+ <!-- <el-form
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
label-width="68px"
- >
- <el-form-item label="鐥呯鍚嶇О" prop="bingzhong">
+ > -->
+ <!-- <el-form-item label="鐥呯鍚嶇О" prop="bingzhong">
<el-input
v-model="queryParams.bingzhong"
placeholder="璇疯緭鍏ョ畝绉�"
@@ -43,14 +43,17 @@
@click="handleQuery"
>鎼滅储</el-button
>
- </el-form-item>
- <el-form-item>
- <h3 style="margin-left: 160px;">宸查�夐」鐩�</h3>
- </el-form-item>
-
- </el-form>
+ </el-form-item> -->
+ <!-- <el-form-item>
+ <h3 >{{ queryParams.proName || '鏆傛棤椤圭洰鍚嶇О' }}</h3>
+ </el-form-item> -->
+ <!-- <el-form-item>
+ <h3 style="margin-left: 160px">宸查�夐」鐩�</h3>
+ </el-form-item> -->
+ <!-- </el-form> -->
+ <h2 style="text-align: center;margin-top: -30px;">{{ queryParams.proName || '鏆傛棤椤圭洰鍚嶇О' }}</h2>
<div style="display: flex; width: 100%">
- <div style="width: 50%; margin-right: 30px">
+ <div style="width: 50%; margin-right: 40px">
<el-table
:data="dataList"
ref="multipleTable"
@@ -67,11 +70,11 @@
width="50px"
/>
<!-- <el-table-column label="瑙勫垯" align="center" prop="ruleStr" /> -->
- <el-table-column label="妫�鏌ョ粨璁�" align="center" prop="ruleStr" />
<el-table-column label="妫�鏌ユ墍瑙�" align="center" prop="yxbx" />
+ <el-table-column label="妫�鏌ョ粨璁�" align="center" prop="ruleStr" />
</el-table>
<div class="pag">
- <div class="pag1" style="margin-left: 600px">
+ <div class="pag1" style="margin-left: 630px">
<pagination
small
v-show="total > 0"
@@ -84,16 +87,16 @@
</div>
</div>
- <div style="width: 100%; height: 610px">
+ <div style="width: 100%; height: 600px">
<!-- <h3 style="margin-top: -30px;">宸查�夐」鐩�</h3> -->
<el-form
:model="form"
ref="queryForm"
size="small"
-
label-width="68px"
+ :inline="true"
>
- <!-- :inline="true" -->
+ <!-- :inline="true" -->
<!-- <el-form-item>
<el-input
type="textarea"
@@ -106,7 +109,7 @@
v-model="form.jcsj"
clearable
type="textarea"
- :autosize="{ minRows: 8}"
+ :autosize="{ minRows: 8 }"
style="width: 380px"
/>
</el-form-item>
@@ -115,7 +118,7 @@
v-model="form.desc"
clearable
type="textarea"
- :autosize="{ minRows: 8 }"
+ :autosize="{ minRows: 8 }"
style="width: 380px"
/>
</el-form-item>
@@ -140,16 +143,20 @@
checkStatus: {
type: String,
default: "0",
- validator: value => ["0", "1"].includes(value)
+ validator: (value) => ["0", "1"].includes(value),
},
proResult: {
type: String,
- default: ''
+ default: "",
},
conclusion: {
type: String,
- default: ''
- }
+ default: "",
+ },
+ projectList: {
+ type: Array,
+ default: () => [],
+ },
},
data() {
return {
@@ -157,6 +164,7 @@
// 寮瑰嚭灞傛爣棰�
title: "",
yxbx: "",
+ proName:'',
// lastDesc: "",
total: 0,
dataList: [],
@@ -169,6 +177,8 @@
queryParams: {
bingzhong: "",
bzPinyin: "",
+ proId:"",
+ proName:"",
pageNum: 1,
pageSize: 10,
},
@@ -180,10 +190,23 @@
},
watch: {
checkStatus(newValue) {
- console.log( newValue,9988);
if (newValue === "1") {
this.updateData(this.proResult, this.conclusion);
}
+ },
+ projectList: {
+ immediate: true,
+ deep: true,
+ handler(newVal) {
+ console.log("鏀跺埌鐨勯」鐩暟鎹�:", newVal);
+ // 浣犲彲浠ュ湪杩欓噷澶勭悊鏁版嵁锛屾瘮濡備繚瀛樺埌 data 鎴栧仛閫昏緫鍒ゆ柇
+ if (newVal && newVal.length > 0) {
+ const firstProject = newVal[0]; // 浣犱篃鍙互閬嶅巻鎵�鏈夐」鐩紝鐪嬩綘涓氬姟闇�姹�
+ this.queryParams.proId = firstProject.proId; // 鍋囪椤圭洰涓彨 id
+ this.queryParams.proName = firstProject.proName; // 鍋囪鍙� proName
+ this.proName = firstProject.proName
+ }
+ },
},
},
mounted() {},
@@ -193,15 +216,16 @@
async getList() {
try {
this.loading = true; // 娣诲姞鍔犺浇鐘舵��
+
const res = await getlist(this.queryParams);
this.dataList = res.rows;
this.total = res.total;
-
+
// 濡傛灉闇�瑕侀�変腑鎿嶄綔锛屽皢鍏跺皝瑁呬负鐙珛鏂规硶
await this.handleAutoSelection();
} catch (error) {
- console.error('鑾峰彇鏁版嵁澶辫触:', error);
- this.$message.error('鑾峰彇鏁版嵁澶辫触');
+ console.error("鑾峰彇鏁版嵁澶辫触:", error);
+ this.$message.error("鑾峰彇鏁版嵁澶辫触");
} finally {
this.loading = false;
}
@@ -210,10 +234,12 @@
// 灏佽閫変腑閫昏緫
async handleAutoSelection() {
if (!this.fList?.rulesList?.length) return;
-
+
await this.$nextTick();
- this.dataList.forEach(item => {
- const shouldSelect = this.fList.rulesList.some(rule => rule.aid === item.aid);
+ this.dataList.forEach((item) => {
+ const shouldSelect = this.fList.rulesList.some(
+ (rule) => rule.aid === item.aid
+ );
if (shouldSelect) {
this.$refs.multipleTable?.toggleRowSelection(item, true);
}
@@ -222,7 +248,7 @@
handleQuery() {
if (this.searchDebounce) clearTimeout(this.searchDebounce);
-
+
this.searchDebounce = setTimeout(() => {
this.queryParams.pageNum = 1; // 閲嶇疆椤电爜
this.getList();
@@ -244,7 +270,7 @@
updateFormContent(selection) {
if (!selection.length) return;
-
+
// 濡傛灉澶勪簬妫�鏌ョ姸鎬侊紝浣跨敤浼犲叆鐨勫��
if (this.checkStatus === "1") {
this.updateData(this.proResult, this.conclusion);
@@ -252,24 +278,24 @@
}
// 閲嶇疆琛ㄥ崟鍐呭
- this.form.desc = '';
- this.form.jcsj = '';
+ this.form.desc = "";
+ this.form.jcsj = "";
// 浣跨敤map鍜宩oin鏇夸唬forEach鍜屽瓧绗︿覆鎷兼帴
this.form.desc = selection
- .map(item => item.bingzhong || item.ruleStr)
+ .map((item) => item.bingzhong || item.ruleStr)
.filter(Boolean)
- .join(',');
-
+ .join(",");
+
this.form.jcsj = selection
- .map(item => item.yxbx)
+ .map((item) => item.yxbx)
.filter(Boolean)
- .join(',');
+ .join(",");
},
handleOk() {
if (!this.form.desc && !this.form.jcsj) {
- this.$message.warning('璇烽�夋嫨鏁版嵁');
+ this.$message.warning("璇烽�夋嫨鏁版嵁");
return;
}
@@ -278,14 +304,14 @@
this.resetForm();
this.open = false;
} catch (error) {
- console.error('澶勭悊鏁版嵁澶辫触:', error);
- this.$message.error('鎿嶄綔澶辫触');
+ console.error("澶勭悊鏁版嵁澶辫触:", error);
+ this.$message.error("鎿嶄綔澶辫触");
}
},
resetForm() {
- this.form.desc = '';
- this.form.jcsj = '';
+ this.form.desc = "";
+ this.form.jcsj = "";
this.list = [];
if (this.$refs.multipleTable) {
this.$refs.multipleTable.clearSelection();
@@ -296,16 +322,16 @@
isCheckMode() {
return this.checkStatus === "1";
},
-
+
hasSelectedItems() {
return this.list.length > 0;
- }
- }
+ },
+ },
};
</script>
<style scoped>
-.el-dialog__body{
+.el-dialog__body {
padding: 10px 20px;
}
::v-deep .el-dialog__footer {
diff --git a/src/views/doctor/check/index.vue b/src/views/doctor/check/index.vue
index b0026bd..10465d0 100644
--- a/src/views/doctor/check/index.vue
+++ b/src/views/doctor/check/index.vue
@@ -2316,7 +2316,10 @@
// 鐐瑰嚮纭
determine() {
- // 浣撴鍙�
+ // 娓呯┖鏁扮粍
+ this.tjOrderDetail = [];
+
+ // 鍘熸湁浠ｇ爜
let tjNumber = this.tableAll.tjNumber;
this.userList.forEach((item) => {
if (this.doctorName == item.nickName) {
diff --git a/src/views/hosp/rules/index.vue b/src/views/hosp/rules/index.vue
index 682585d..e15b183 100644
--- a/src/views/hosp/rules/index.vue
+++ b/src/views/hosp/rules/index.vue
@@ -180,11 +180,15 @@
:value="dict.value"></el-option>
</el-select>
</el-form-item>
- <el-form-item label="瑙勫垯" prop="ruleStr">
- <el-input v-model="form.ruleStr" placeholder="璇疯緭鍏ヨ鍒�" style="width: 200px" />
+ <el-form-item label="鎬у埆" prop="sex">
+ <el-select v-model="form.sex" placeholder="璇烽�夋嫨鎬у埆" style="width: 200px">
+ <el-option v-for="dict in dict.type.tj_rule_sex" :key="dict.value" :label="dict.label"
+ :value="dict.value"></el-option>
+ </el-select>
</el-form-item>
+
<el-form-item label="鐥呯" prop="bingzhong">
- <el-select :remote-method="getRemoteData1" v-model="form.bingzhong" remote filterable style="width: 200px"
+ <el-select :remote-method="getRemoteData1" v-model="form.bingzhong" remote filterable style="width: 490px"
placeholder="璇烽�夋嫨鐥呯" clearable @change="idFn1">
<el-option v-for="dict in bingzhongList" :key="dict.id" :label="dict.icdname" :value="dict.icdname" />
</el-select>
@@ -197,12 +201,7 @@
<el-form-item label="鐤剧梾缂栫爜 " prop="icdCode">
<el-input v-model="form.icdCode" placeholder="璇疯緭鍏ョ柧鐥呯紪鐮�" style="width: 200px" disabled />
</el-form-item>
- <el-form-item label="鎬у埆" prop="sex">
- <el-select v-model="form.sex" placeholder="璇烽�夋嫨鎬у埆" style="width: 200px">
- <el-option v-for="dict in dict.type.tj_rule_sex" :key="dict.value" :label="dict.label"
- :value="dict.value"></el-option>
- </el-select>
- </el-form-item>
+
<el-form-item label="骞撮緞-" prop="ageLt">
<el-input v-model="form.ageLt" placeholder="璇疯緭鍏ュ勾榫�-" style="width: 200px" />
</el-form-item>
@@ -234,10 +233,13 @@
<el-form-item label="澶т簬鏍囪瘑" prop="heighSymbol">
<el-input v-model="form.heighSymbol" placeholder="璇疯緭鍏ュぇ浜庢爣璇�" style="width: 200px" />
</el-form-item>
- <el-form-item label="褰卞儚琛ㄧ幇 " prop="yxbx">
- <el-input type="textarea" :rows="3" v-model="form.yxbx" placeholder="璇疯緭鍏ュ奖鍍忚〃鐜�" style="width: 782px" />
+ <el-form-item label="瑙勫垯琛ㄧ幇" prop="ruleStr">
+ <el-input type="textarea" :rows="3" v-model="form.ruleStr" placeholder="璇疯緭鍏ヨ鍒欒〃鐜�" style="width: 782px" />
</el-form-item>
- <el-form-item label="褰卞儚琛ㄧ幇 " prop="yxbx">
+ <el-form-item label="瑙勫垯缁撹 " prop="yxbx">
+ <el-input type="textarea" :rows="3" v-model="form.yxbx" placeholder="璇疯緭鍏ヨ鍒欑粨璁�" style="width: 782px" />
+ </el-form-item>
+ <!-- <el-form-item label="褰卞儚琛ㄧ幇 " prop="yxbx">
<el-input
v-model="form.yxbx"
placeholder="璇疯緭鍏ュ奖鍍忚〃鐜�"
@@ -245,7 +247,7 @@
type="textarea"
:rows="3"
/>
- </el-form-item>
+ </el-form-item> -->
<el-form-item label="寤鸿鍚嶇О" prop="adviceBt">
<el-input v-model="form.adviceBt" style="width: 782px" placeholder="璇疯緭鍏ュ缓璁唴瀹�" >
</el-input>
diff --git a/src/views/picture/picture/index.vue b/src/views/picture/picture/index.vue
index e24dc28..d49b142 100644
--- a/src/views/picture/picture/index.vue
+++ b/src/views/picture/picture/index.vue
@@ -242,7 +242,7 @@
prop="bcupdateTime"
min-width="160"
/>
- <el-table-column label="鎿嶄綔" align="center" min-width="120px">
+ <!-- <el-table-column label="鎿嶄綔" align="center" min-width="120px">
<template slot-scope="scope">
<el-button
size="mini"
@@ -262,9 +262,8 @@
@click="queryResultone(scope.row)"
>缁撴灉</el-button
>
- <!-- @click="chaxun(scope.row) " -->
</template>
- </el-table-column>
+ </el-table-column> -->
<!-- <el-table-column type="selection" width="40" align="center" />
<el-table-column label="鏀惰垂椤圭洰" align="center" prop="proName" />
@@ -340,7 +339,14 @@
/>
</div>
- <Public ref="aaa" :check-status="checkStatus" :pro-result="form.proResult" :conclusion="form.conclusion" @add="handleChanges" />
+ <Public
+ ref="aaa"
+ :check-status="checkStatus"
+ :pro-result="form.proResult"
+ :conclusion="form.conclusion"
+ @add="handleChanges"
+ :project-list="projectList"
+ />
<!-- :last-desc="form.conclusion" -->
</div>
</template>
@@ -413,6 +419,7 @@
pictureList: [],
tableList: [],
CompanyList: [],
+ projectList: [],
// 寮瑰嚭灞傛爣棰�
title: "",
// 鏄惁鏄剧ず寮瑰嚭灞�
@@ -646,6 +653,7 @@
this.loading = false;
}); */
},
+
// 鍙栨秷鎸夐挳
cancel() {
this.open = false;
@@ -880,6 +888,10 @@
});
},
handleChange(selection) {
+ this.projectList = selection.map((item) => ({
+ proId: item.proId,
+ proName: item.proName,
+ }));
if (selection && selection.length > 0) {
const proId = selection[0].proId;
--
Gitblit v1.8.0