From af81e50b4d103d2c2b372d4837bd738bc67110f5 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 02 十二月 2024 08:06:46 +0800
Subject: [PATCH] zjh20241202
---
src/views/reservation/resercopy/index.vue | 29 +++++++++++++++++++----------
1 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/src/views/reservation/resercopy/index.vue b/src/views/reservation/resercopy/index.vue
index 418d563..eedffce 100644
--- a/src/views/reservation/resercopy/index.vue
+++ b/src/views/reservation/resercopy/index.vue
@@ -29,7 +29,7 @@
</el-select>
<i class="el-icon-circle-plus-outline" @click="handleAdd"></i>
</el-form-item>
- <el-form-item label="閮ㄩ棬" prop="dwDeptName">
+ <!-- <el-form-item label="閮ㄩ棬" prop="dwDeptName">
<el-select
v-model="objs.dwDeptName"
placeholder="璇烽�夋嫨閮ㄩ棬"
@@ -45,7 +45,7 @@
/>
</el-select>
<i class="el-icon-circle-plus-outline" @click="handleAddbumen"></i>
- </el-form-item>
+ </el-form-item> -->
<!-- <el-form-item label="鍒嗙粍" prop="payType">
<el-select v-model="objs.payType" placeholder="璇烽�夋嫨缁撶畻鏂瑰紡" style="width: 200px" clearable>
<el-option v-for="dict in groupingList" :key="dict.id" :label="dict.groupingName" :value="dict.id" />
@@ -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,7 @@
icon="el-icon-upload2"
size="mini"
@click="handleImport"
- v-hasPermi="['system:user:import']"
+
>瀵煎叆</el-button
>
</el-col>
@@ -100,7 +100,7 @@
icon="el-icon-upload2"
size="mini"
@click="importTemplate"
- v-hasPermi="['system:user:import']"
+
>涓嬭浇妯℃澘</el-button
>
</el-col>
@@ -474,9 +474,8 @@
objs: {
drugManufacturerId: "",
- dwDeptName: "",
reservationTime: "",
- yxts:"30",
+ yxts: "30",
},
DataList: [],
tjOrderList: [], //鍗曚釜椤圭洰闆嗗悎
@@ -507,7 +506,7 @@
// 涓婁紶鐨勫湴鍧�
url:
process.env.VUE_APP_BASE_API +
- "/reservation/reservation/newExcelImport",
+ "/reservation/reservation/newExcelImportNotDwDeptId",
},
// 鏌ヨ鍙傛暟
queryParam: {
@@ -877,6 +876,12 @@
},
// 鏂囦欢涓婁紶鎴愬姛澶勭悊
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.ListObj = response.data;
this.userList = response.data.list;
this.userList.forEach((item) => {
@@ -890,6 +895,8 @@
this.upload.isUploading = false;
this.$refs.upload.clearFiles();
this.leftList = response.msg;
+ console.log(response.code);
+
if (this.leftList == "鎿嶄綔澶辫触") {
this.isdisabled = true;
this.$alert(
@@ -971,13 +978,15 @@
/** 纭鎸夐挳 */
submitForm() {
- if (this.objs.reservationTime && this.data.dwDeptId) {
+ // if (this.objs.reservationTime && this.data.dwDeptId) {
+ if (this.objs.reservationTime) {
let data = {
copeWith: this.ListObj.hjMoney,
reservations: this.userList,
reservationTime: this.objs.reservationTime,
dwDeptId: this.data.dwDeptId,
- yxts:this.objs.yxts,
+ yxts: this.objs.yxts,
+ dwId: this.data.dwId,
};
newConfirm(data).then((res) => {
this.$modal.msgSuccess("鎻愪氦鎴愬姛");
--
Gitblit v1.8.0