From d747406e0eb22d47726916be55e85376c4aa2729 Mon Sep 17 00:00:00 2001 From: lkk <364857242@qq.com> Date: 星期三, 04 十二月 2024 18:23:14 +0800 Subject: [PATCH] 12.04 --- src/views/reservation/resercopy/index.vue | 41 +++++++++++++++++++++++++++++------------ 1 files changed, 29 insertions(+), 12 deletions(-) diff --git a/src/views/reservation/resercopy/index.vue b/src/views/reservation/resercopy/index.vue index eedffce..fcb7661 100644 --- a/src/views/reservation/resercopy/index.vue +++ b/src/views/reservation/resercopy/index.vue @@ -67,7 +67,7 @@ </el-form-item> <el-form-item label="鏈夋晥澶╂暟" prop="yxts"> <el-input - style="width:100px" + style="width: 100px" v-model="objs.yxts" placeholder="鏈夋晥澶╂暟" />澶�(鍙嚜瀹氫箟) @@ -90,7 +90,6 @@ icon="el-icon-upload2" size="mini" @click="handleImport" - >瀵煎叆</el-button > </el-col> @@ -100,7 +99,6 @@ icon="el-icon-upload2" size="mini" @click="importTemplate" - >涓嬭浇妯℃澘</el-button > </el-col> @@ -231,7 +229,7 @@ </div> </el-upload> <div slot="footer" class="dialog-footer"> - <el-button type="primary" @click="submitFileForm">纭� 瀹�</el-button> + <el-button type="primary" @click="submitFileForm">淇濆瓨淇℃伅</el-button> <el-button @click="upload.open = false">鍙� 娑�</el-button> </div> </el-dialog> @@ -399,9 +397,13 @@ getDwAndDwDept, newExcelImport, } from "@/api/system/comp"; -import { newConfirm, getCompany, queryCompany } from "@/api/team/tuanti"; +import { + newConfirm, + getCompany, + queryCompany, + getconfigKey, +} from "@/api/team/tuanti"; import { getToken } from "@/utils/auth"; -import { read, utils } from "xlsx"; export default { dicts: [ @@ -475,7 +477,7 @@ objs: { drugManufacturerId: "", reservationTime: "", - yxts: "30", + yxts: "", }, DataList: [], tjOrderList: [], //鍗曚釜椤圭洰闆嗗悎 @@ -769,6 +771,7 @@ }, // 鎼滅储 getRemoteData(query) { + if (query) { let compName = query; queryCompany(compName).then((response) => { @@ -783,6 +786,10 @@ // 鑾峰彇鍗曚綅淇℃伅闆嗗悎 getCompanyList() { this.loading = true; + getconfigKey('team_reservation_default_day').then((res) => { + console.log(res, 1111); + this.objs.yxts = res.msg; + }); getCompany(this.queryParam).then((response) => { this.CompanyList = response.data; this.total = response.total; @@ -844,6 +851,7 @@ this.TotalPrice = ""; this.tableData[0] = []; this.TotalPrice1 = ""; + this.userList = [] // this.resetForm("form"); this.form = {}; }, @@ -852,7 +860,6 @@ selectTime(val) { this.objs.reservationTime = val; }, - /** 瀵煎叆鎸夐挳鎿嶄綔 */ handleImport() { if (this.objs.drugManufacturerId && this.objs.reservationTime) { @@ -876,14 +883,24 @@ }, // 鏂囦欢涓婁紶鎴愬姛澶勭悊 handleFileSuccess(response, file, fileList) { - console.log(response,666666); - if (response.code == 500) { + console.log(response, 666666); + if (response.code == 500) { console.log(22222222222); // Message.warning(response.msg); - this.$modal.msgError(response.msg); + // this.$modal.msgError(response.msg); + // this.$modal.msgError("浜哄憳"+ response.data.list + "淇℃伅閿欒"); + const errorList = response.data.list.join(", "); + this.$confirm(`${errorList}`, "浠ヤ笅浜哄憳淇℃伅鏈夎锛岃鏍稿鍚庡鍏ワ細", { + confirmButtonText: "纭畾", + cancelButtonText: "鍙栨秷", + type: "error", + center: true, + dangerouslyUseHTMLString: true, + }); } this.ListObj = response.data; this.userList = response.data.list; + this.userList.forEach((item) => { this.CompanyList.forEach((item1) => { if (item1.drugManufacturerId == this.objs.drugManufacturerId) { @@ -896,7 +913,7 @@ this.$refs.upload.clearFiles(); this.leftList = response.msg; console.log(response.code); - + if (this.leftList == "鎿嶄綔澶辫触") { this.isdisabled = true; this.$alert( -- Gitblit v1.8.0