From 155a30a172e4cf04838dcf7c8bb73ce6b200e574 Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期三, 26 三月 2025 14:52:54 +0800
Subject: [PATCH] Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peisweb_region
---
src/views/reservation/resercopy/index.vue | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/views/reservation/resercopy/index.vue b/src/views/reservation/resercopy/index.vue
index 8d478e9..b7d7fd0 100644
--- a/src/views/reservation/resercopy/index.vue
+++ b/src/views/reservation/resercopy/index.vue
@@ -194,6 +194,7 @@
<!-- <el-table-column label="鑱旂郴閭" align="center" prop="email" /> -->
<!-- <el-table-column label="浣撴绫诲埆" align="center" prop="tjCategory" /> -->
<el-table-column label="鍒嗙粍" align="center" prop="groupingName" />
+ <el-table-column label="鎵�鍦ㄥ湴" align="center" prop="szd" />
<el-table-column label="椤圭洰鏀惰垂" align="center" prop="ysPrice" />
</el-table>
</div>
@@ -397,6 +398,7 @@
</template>
<script>
+import Cookies from "js-cookie"
import {
addDept,
addComp,
@@ -480,6 +482,7 @@
dwId: "",
dwDeptId: "",
dwName: "",
+
},
objs: {
@@ -512,7 +515,7 @@
// 鏄惁鏇存柊宸茬粡瀛樺湪鐨勭敤鎴锋暟鎹�
updateSupport: 0,
// 璁剧疆涓婁紶鐨勮姹傚ご閮�
- headers: { Authorization: "Bearer " + getToken() },
+ headers: { Authorization: "Bearer " + getToken() ,hospId: Cookies.get("hospId")},
// 涓婁紶鐨勫湴鍧�
url:
process.env.VUE_APP_BASE_API +
@@ -694,7 +697,7 @@
});
},
idFn(value) {
- console.log(value);
+ this.userList = []
if (value) {
this.data.dwId = value;
Deptlist(value).then((response) => {
@@ -890,24 +893,24 @@
},
// 鏂囦欢涓婁紶鎴愬姛澶勭悊
handleFileSuccess(response, file, fileList) {
- console.log(response, 666666);
if (response.code == 500) {
console.log(22222222222);
// Message.warning(response.msg);
// this.$modal.msgError(response.msg);
// this.$modal.msgError("浜哄憳"+ response.data.list + "淇℃伅閿欒");
const errorList = response.data.list.join(", ");
- this.$confirm(`${errorList}`, "浠ヤ笅浜哄憳淇℃伅鏈夎锛岃鏍稿鍚庡鍏ワ細", {
+ console.log(errorList)
+ this.$confirm(`${errorList}`, `${response.msg}`, {
confirmButtonText: "纭畾",
cancelButtonText: "鍙栨秷",
type: "error",
center: true,
dangerouslyUseHTMLString: true,
});
- }
- this.ListObj = response.data;
+ }else{
+ this.ListObj = response.data;
this.userList = response.data.list;
-
+
this.userList.forEach((item) => {
this.CompanyList.forEach((item1) => {
if (item1.drugManufacturerId == this.objs.drugManufacturerId) {
@@ -915,11 +918,12 @@
}
});
});
+ }
+
this.upload.open = false;
this.upload.isUploading = false;
this.$refs.upload.clearFiles();
this.leftList = response.msg;
- console.log(response.code);
if (this.leftList == "鎿嶄綔澶辫触") {
this.isdisabled = true;
--
Gitblit v1.8.0