From 9807702944b412384ba022b14b669f56df8cb4d7 Mon Sep 17 00:00:00 2001
From: qinxianzhangyao <11053546+qinxianzhangyao@user.noreply.gitee.com>
Date: 星期三, 13 十二月 2023 15:23:16 +0800
Subject: [PATCH] qxtj
---
src/views/doctor/check/index.vue | 8 +-
src/views/doctor/examination/index.vue | 37 +++++++-----
src/views/system/hosp/index.vue | 22 +++---
src/api/doctor/examination.js | 10 +++
src/views/hosp/project/index.vue | 83 ++++++++++++++++++++-------
5 files changed, 108 insertions(+), 52 deletions(-)
diff --git a/src/api/doctor/examination.js b/src/api/doctor/examination.js
index 66a180c..42b9ce8 100644
--- a/src/api/doctor/examination.js
+++ b/src/api/doctor/examination.js
@@ -25,4 +25,14 @@
method: 'get',
params: {tjNumber:tjNumber}
})
+}
+
+
+// 鐐瑰嚮浣撴浜哄憳鍚屾
+export function dataSynchronization(tjNumber) {
+ return request({
+ url: '/check/dataSynchronization',
+ method: 'get',
+ params: {tjNumber:tjNumber}
+ })
}
\ No newline at end of file
diff --git a/src/views/doctor/check/index.vue b/src/views/doctor/check/index.vue
index 57f55a2..c525895 100644
--- a/src/views/doctor/check/index.vue
+++ b/src/views/doctor/check/index.vue
@@ -831,6 +831,7 @@
},
cancell() {
this.checkval = false;
+
},
Hzlog(val) {
@@ -937,6 +938,7 @@
cancel() {
this.open = false;
this.foropen = false;
+
},
Changeapply() {
@@ -973,9 +975,9 @@
}, 3000);
// this.$message.msgSuccess("鎶ュ憡姝ｅ湪鐢熸垚锛岃涓ゅ垎閽熷悗棰勮锛�");
this.$message({
- type: "warning ",
- message: "鎶ュ憡姝ｅ湪鐢熸垚锛岃涓ゅ垎閽熷悗棰勮锛�!",
- });
+ type: "warning ",
+ message: "鎶ュ憡姝ｅ湪鐢熸垚锛岃涓ゅ垎閽熷悗棰勮锛�!",
+ });
} else {
this.dialogVisible = true;
diff --git a/src/views/doctor/examination/index.vue b/src/views/doctor/examination/index.vue
index 104e652..8136e85 100644
--- a/src/views/doctor/examination/index.vue
+++ b/src/views/doctor/examination/index.vue
@@ -110,7 +110,7 @@
label="鐧昏鏃堕棿"
align="center"
prop="tjTime"
- width="120px"
+ width="180px"
/>
<el-table-column
v-if="checkStatus == '1'"
@@ -138,8 +138,15 @@
>
</template>
</el-table-column>
- <el-table-column label="鎿嶄綔" align="center">
+ <el-table-column label="鎿嶄綔" align="center" width="120px">
<template slot-scope="scope">
+ <el-button
+ size="mini"
+ type="text"
+ v-hasPermi="['reservation:reservation:edit']"
+ @click="tongbu(scope.row)"
+ >鍚屾</el-button
+ >
<el-button
size="mini"
type="text"
@@ -162,17 +169,7 @@
@click="bohui(scope.row)"
>椹冲洖</el-button
>
- <el-button
- size="mini"
- type="text"
- v-hasPermi="['reservation:reservation:edit']"
- v-show="
- scope.row.confirmStatus == '299' ||
- scope.row.confirmStatus == 288
- "
- @click="tongbu(scope.row)"
- >鍚屾</el-button
- >
+
</template>
</el-table-column>
</el-table>
@@ -275,7 +272,7 @@
</template>
<script>
-import { getCsList, confirmOrder, cSWebGetPro } from "@/api/doctor/examination";
+import { getCsList, confirmOrder, cSWebGetPro,dataSynchronization } from "@/api/doctor/examination";
export default {
dicts: ["dict_tj_status"],
data() {
@@ -483,7 +480,17 @@
});
});
},
- tongbu() {},
+ tongbu(row) {
+ let tjNumber = row.tjNumber;
+ dataSynchronization(tjNumber).then((res) => {
+ if (res.code == 200) {
+ // this.$forceUpdate();
+ this.getList();
+ this.$modal.msgSuccess("鍚屾鎴愬姛锛�");
+ }
+ });
+
+ },
// 椹冲洖鎸夐挳
bohui(row) {
this.tjNumbers = row.tjNumber;
diff --git a/src/views/hosp/project/index.vue b/src/views/hosp/project/index.vue
index 64535ad..9e59571 100644
--- a/src/views/hosp/project/index.vue
+++ b/src/views/hosp/project/index.vue
@@ -50,7 +50,8 @@
<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" />
@@ -58,12 +59,11 @@
<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>
<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">
@@ -287,19 +287,18 @@
</el-form>
<el-table v-loading="loading" ref="tb" :data="sfxmList" @selection-change="handleSelectionChange" border
- 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"/>
+ 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="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-column label="鐗瑰畾鏈�楂橀檺浠�" align="center" prop="tdzgxj" />
</el-table>
<div class="pag" v-if="List == true">
@@ -357,13 +356,13 @@
components: { Treeselect, IconSelect },
data() {
let checkPhoneNum = (rule, value, callback) => {
- console.log( value)
+ console.log(value)
let patter = new RegExp(/^1\s*[3456789]\s*(\d\s*){9}$/);
if (value == "" && value == undefined && !value) {
return callback('');
- } else if(value != undefined && value != ""){
+ } else if (value != undefined && value != "") {
return callback();
- }else if (!patter.test(value)) {
+ } else if (!patter.test(value)) {
return callback('');
}
};
@@ -450,22 +449,22 @@
// 琛ㄥ崟鏍￠獙
rules: {
createTime: [
- { required: true, validator: checkPhoneNum, trigger: "blur" },
+ { required: true, validator: checkPhoneNum, trigger: "blur" },
],
updateTime: [
- { required: true, validator: checkPhoneNum, trigger: "blur" },
+ { required: true, validator: checkPhoneNum, trigger: "blur" },
],
deleted: [
- { required: true, validator: checkPhoneNum, trigger: "blur" },
+ { required: true, validator: checkPhoneNum, trigger: "blur" },
],
proName: [
- { required: true, validator: checkPhoneNum, trigger: "blur" },
+ { required: true, validator: checkPhoneNum, trigger: "blur" },
],
proPrice: [
- { required: true, validator: checkPhoneNum, trigger: "blur" },
+ { required: true, validator: checkPhoneNum, trigger: "blur" },
],
deptId: [
- { required: true, validator: checkPhoneNum, trigger: "blur" },
+ { required: true, validator: checkPhoneNum, trigger: "blur" },
],
// proStandard: [
// { required: true, message: "椤圭洰鏍囧噯鍊间笉鑳戒负绌�", trigger: "blur" },
@@ -571,7 +570,7 @@
this.dialogTableVisible = true;
this.getlistSfxm()
}
- }else{
+ } else {
this.$message.error("璇烽�夋嫨涓婚」鍚嶇О");
}
@@ -772,6 +771,44 @@
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') {
+ console.log(22222)
+ //涓枃鏂囧瓧 15 鍍忕礌
+ flexWidth += 15;
+ } else {
+ //鍏朵粬瀛楃 10 鍍忕礌
+ flexWidth += 10;
+ }
+ }
+ if (flexWidth > maxlength) {
+ maxlength = flexWidth;
+ }
+ }
+ }
+ //el-table涓� cell 鏈夊乏鍙崇殑 padding 涓� 10 鍍忕礌
+ return maxlength + 20 + 'px';
+ },
+
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
this.ChangeList = selection
diff --git a/src/views/system/hosp/index.vue b/src/views/system/hosp/index.vue
index 1be68ca..88eafef 100644
--- a/src/views/system/hosp/index.vue
+++ b/src/views/system/hosp/index.vue
@@ -822,37 +822,37 @@
{ required: true, validator: checkPhoneNum, trigger: "blur" },
],
jgMultiArea: [
- { required: true, validator: checkPhoneNum, trigger: "change" },
+ { required: true, validator: checkPhoneNum, trigger: "blur" },
],
orgCode: [
- { required: true, validator: checkPhoneNum, trigger: "change" },
+ { required: true, validator: checkPhoneNum, trigger: "blur" },
],
orgCnName: [
- { required: true, validator: checkPhoneNum, trigger: "change" },
+ { required: true, validator: checkPhoneNum, trigger: "blur" },
],
principal: [
- { required: true, validator: checkPhoneNum, trigger: "change" },
+ { required: true, validator: checkPhoneNum, trigger: "blur" },
],
phone: [
- { required: true, validator: checkPhoneNum, trigger: "change" },
+ { required: true, validator: checkPhoneNum, trigger: "blur" },
],
buildDate: [
- { required: true, validator: checkPhoneNum, trigger: "change" },
+ { required: true, validator: checkPhoneNum, trigger: "blur" },
],
legalPerson: [
- { required: true, validator: checkPhoneNum, trigger: "change" },
+ { required: true, validator: checkPhoneNum, trigger: "blur" },
],
issueAuth: [
- { required: true, validator: checkPhoneNum, trigger: "change" },
+ { required: true, validator: checkPhoneNum, trigger: "blur" },
],
issueDate: [
- { required: true, validator: checkPhoneNum, trigger: "change" },
+ { required: true, validator: checkPhoneNum, trigger: "blur" },
],
address: [
- { required: true, validator: checkPhoneNum, trigger: "change" },
+ { required: true, validator: checkPhoneNum, trigger: "blur" },
],
level: [
- { required: true, validator: checkPhoneNum, trigger: "change" },
+ { required: true, validator: checkPhoneNum, trigger: "blur" },
],
// jgDeptArea: [
// { required: true, message: "鐥呭尯绠＄悊涓嶈兘涓虹┖", trigger: "change" }
--
Gitblit v1.8.0