From 133bed33ad18d4c8615fd7a0f288a0f633efab12 Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期一, 31 三月 2025 17:47:55 +0800
Subject: [PATCH] qx
---
src/main.js | 14 +++---
src/views/reservation/resercopy/index.vue | 37 ++++++++++--------
src/views/system/package/index.vue | 19 ++++++++-
src/views/sampling/sampling/index.vue | 2
4 files changed, 45 insertions(+), 27 deletions(-)
diff --git a/src/main.js b/src/main.js
index 81a1d7d..302cecd 100644
--- a/src/main.js
+++ b/src/main.js
@@ -35,13 +35,13 @@
import Pagination from "@/components/Pagination";
// 鍒嗛〉缁勪欢
-import { monitorZoom } from "@/utils/devicePixelRatio.js";
-const m = monitorZoom();
-if (window.screen.width * window.devicePixelRatio >= 3840) {
- document.body.style.zoom = 100 / (Number(m) / 2); // 灞忓箷涓� 4k 鏃�
-} else {
- document.body.style.zoom = 100 / Number(m);
-}
+// import { monitorZoom } from "@/utils/devicePixelRatio.js";
+// const m = monitorZoom();
+// if (window.screen.width * window.devicePixelRatio >= 3840) {
+// document.body.style.zoom = 100 / (Number(m) / 2); // 灞忓箷涓� 4k 鏃�
+// } else {
+// document.body.style.zoom = 100 / Number(m);
+// }
// 鑷畾涔夎〃鏍煎伐鍏风粍浠�
import RightToolbar from "@/components/RightToolbar";
diff --git a/src/views/reservation/resercopy/index.vue b/src/views/reservation/resercopy/index.vue
index c137d33..145681a 100644
--- a/src/views/reservation/resercopy/index.vue
+++ b/src/views/reservation/resercopy/index.vue
@@ -890,25 +890,27 @@
this.upload.isUploading = true;
},
// 鏂囦欢涓婁紶鎴愬姛澶勭悊
+ // 鏂囦欢涓婁紶鎴愬姛澶勭悊
handleFileSuccess(response, file, fileList) {
- console.log(response, 666666);
if (response.code == 500) {
- console.log(22222222222);
+ this.isdisabled = true;
// Message.warning(response.msg);
// this.$modal.msgError(response.msg);
// this.$modal.msgError("浜哄憳"+ response.data.list + "淇℃伅閿欒");
const errorList = response.data.list.join(", ");
- this.$confirm(`${errorList}`,`${response.msg}`, {
+
+ this.$confirm(`${errorList}`, `${response.msg}`, {
confirmButtonText: "纭畾",
cancelButtonText: "鍙栨秷",
type: "error",
center: true,
dangerouslyUseHTMLString: true,
});
- }
- this.ListObj = response.data;
+ }else{
+ this.isdisabled = false;
+ this.ListObj = response.data;
this.userList = response.data.list;
-
+
this.userList.forEach((item) => {
this.CompanyList.forEach((item1) => {
if (item1.drugManufacturerId == this.objs.drugManufacturerId) {
@@ -916,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;
@@ -934,15 +937,17 @@
"瀵煎叆缁撴灉",
{ dangerouslyUseHTMLString: true }
);
- } else {
- this.isdisabled = false;
- this.$alert(
- "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
- response.msg,
- { dangerouslyUseHTMLString: true }
- );
- this.rightList = response;
- }
+ }
+ // else {
+ // console.log(11111)
+ // this.isdisabled = false;
+ // this.$alert(
+ // "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
+ // response.msg,
+ // { dangerouslyUseHTMLString: true }
+ // );
+ // this.rightList = response;
+ // }
for (let i = 0; i < fileList.length; i++) {
if (file.name != fileList[i].name) {
this.fileList.push({
diff --git a/src/views/sampling/sampling/index.vue b/src/views/sampling/sampling/index.vue
index 2c7a66a..a6680b8 100644
--- a/src/views/sampling/sampling/index.vue
+++ b/src/views/sampling/sampling/index.vue
@@ -197,7 +197,7 @@
:limit.sync="queryParams.pageSize" @pagination="getList" />
</div> -->
- <div style="margin-right: 70%">
+ <div style="margin-right: 63%">
<!-- <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :pager-count="5" :current-page.sync="currentPage1" :current-page="page"
:page-sizes="pageSize" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="total">
</el-pagination> -->
diff --git a/src/views/system/package/index.vue b/src/views/system/package/index.vue
index d723b59..4eca4f1 100644
--- a/src/views/system/package/index.vue
+++ b/src/views/system/package/index.vue
@@ -486,6 +486,7 @@
},
forms: {},
youhui: 10,
+ initializing: true, // 鍒濆鍖栨爣蹇�
debounceTimer: null,
rules: {
@@ -497,6 +498,7 @@
this.getKeyword();
this.getCategory();
},
+
methods: {
debounceNumberChange(currentValue, oldValue) {
clearTimeout(this.debounceTimer);
@@ -608,6 +610,7 @@
counterPrice: null,
limits: 10,
};
+ this.initializing = true;
this.resetForm("form");
},
handleQuery() {
@@ -649,6 +652,7 @@
this.checkedListkey = [];
this.checkedNodes = [];
this.getDataList();
+ this.youhui = 10
},
handleStatusChange(row) {
let data = {
@@ -666,6 +670,7 @@
});
},
handleUp() {
+ this.reset();
this.title = "浣撴濂楅淇℃伅缁存姢";
this.open = true;
getPacInFo(this.forms.pacId).then((response) => {
@@ -694,7 +699,7 @@
getPacInFo(row.pacId).then((response) => {
const data = response.data || {};
Object.keys(data).forEach((key) => {
- this.$set(this.form, key, data[key]);
+ this.$set(this.form, key, response.data[key]);
});
this.youhui = data.limits || 10;
this.pics = data.price || 0;
@@ -707,7 +712,9 @@
this.checkedkey = this.DataList.map(item => item.proId || '');
this.checkedListkey = [...this.checkedkey];
this.checkedNodes = [...this.checkedkey];
+
return this.getDataList();
+
}).then(() => {
this.loading = false;
this.$nextTick(() => {
@@ -716,7 +723,6 @@
}).catch((error) => {
this.loading = false;
this.$message.error("鍔犺浇鏁版嵁澶辫触");
- console.error(error);
});
},
addmembers() {
@@ -826,7 +832,9 @@
this.pics = this.DataList.reduce((total, item) => total + item.priceOrd, 0);
this.$nextTick(() => {
this.$refs.tree.setCheckedKeys(this.checkedNodes);
+ this.initializing = false;
});
+
});
this.loading = false;
},
@@ -838,6 +846,9 @@
});
},
handleCurrentChecked(data, checked, indeterminate) {
+ if (this.initializing) {
+ return; // 鍒濆鍖栨椂涓嶅鐞�
+ }
if (checked) {
if (!this.DataList.some((item) => item.proId === data.proId)) {
this.DataList.push({
@@ -851,14 +862,16 @@
if (!this.checkedNodes.includes(data.proId)) {
this.checkedNodes.push(data.proId);
}
+ this.updateTotalPrice();
} else {
this.DataList = this.DataList.filter((item) => item.proId !== data.proId);
const index = this.checkedNodes.indexOf(data.proId);
if (index > -1) {
this.checkedNodes.splice(index, 1);
}
+ this.updateTotalPrice();
}
- this.updateTotalPrice();
+
},
updateTotalPrice() {
this.form.xianprice = this.DataList.reduce((sum, item) => {
--
Gitblit v1.8.0