From 31badcdb4ce90f9b52c15267500d498da29cda16 Mon Sep 17 00:00:00 2001
From: su1124 <1583764726@qq.com>
Date: 星期四, 08 八月 2024 16:57:26 +0800
Subject: [PATCH] su
---
src/views/reservation/resercopy/index.vue | 141 ++++++++++++++++++++++++++--------------------
1 files changed, 80 insertions(+), 61 deletions(-)
diff --git a/src/views/reservation/resercopy/index.vue b/src/views/reservation/resercopy/index.vue
index 3cbefa5..b82e029 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" />
@@ -58,12 +58,19 @@
type="date"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
- style="width: 220px"
+ style="width: 130px"
placeholder="璇烽�夋嫨棰勭害鏃ユ湡"
@change="selectTime"
:picker-options="setDisabled"
>
</el-date-picker>
+ </el-form-item>
+ <el-form-item label="鏈夋晥澶╂暟" prop="yxts">
+ <el-input
+ style="width:100px"
+ v-model="objs.yxts"
+ placeholder="鏈夋晥澶╂暟"
+ />澶�(鍙嚜瀹氫箟)
</el-form-item>
</el-form>
@@ -92,7 +99,7 @@
type="primary"
icon="el-icon-upload2"
size="mini"
- @click="importTemplate"
+ @click="importTemplate"
v-hasPermi="['system:user:import']"
>涓嬭浇妯℃澘</el-button
>
@@ -123,8 +130,9 @@
align="center"
prop="company"
width="200"
- />
- <el-table-column label="宸ュ彿" align="center" prop="jobNo" width="80" />
+ >
+ </el-table-column>
+ <!-- <el-table-column label="宸ュ彿" align="center" prop="jobNo" width="80" /> -->
<el-table-column label="濮撳悕" align="center" prop="name" width="75" />
<el-table-column label="鎬у埆" align="center" prop="sex" width="75">
<template slot-scope="scope">
@@ -147,14 +155,14 @@
prop="birthday"
width="100"
/>
- <el-table-column label="鑱屼綅" align="center" prop="position" />
- <el-table-column label="閮ㄩ棬" align="center" prop="department" />
- <el-table-column label="閮ㄩ棬缂栧彿" align="center" prop="departmentId" />
+ <!-- <el-table-column label="鑱屼綅" align="center" prop="position" /> -->
+ <!-- <el-table-column label="閮ㄩ棬" align="center" prop="department" /> -->
+ <!-- <el-table-column label="閮ㄩ棬缂栧彿" align="center" prop="departmentId" /> -->
<el-table-column
label="鑱旂郴鐢佃瘽"
align="center"
prop="phoe"
- width="120"
+ width="140"
/>
<el-table-column label="鍦板潃" align="center" prop="address" />
<el-table-column
@@ -178,7 +186,7 @@
/>
</template>
</el-table-column>
- <el-table-column label="鑱旂郴閭" align="center" prop="email" />
+ <!-- <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="ysPrice" />
@@ -344,26 +352,26 @@
label-width="100px"
:inline="true"
>
- <el-form-item label="鍗曚綅鍚嶇О" prop="drugManufacturerId">
- <el-select
- :remote-method="getRemoteData"
- v-model="objs.drugManufacturerId"
- remote
- filterable
- style="width: 200px"
- placeholder="璇烽�夋嫨鍗曚綅鍚嶇О"
- clearable
- @clear="getCompanyList"
- @change="idFn1"
- >
- <el-option
- v-for="dict in CompanyList"
- :key="dict.cnName"
- :label="dict.cnName"
- :value="dict.drugManufacturerId"
- />
- </el-select>
- </el-form-item>
+ <el-form-item label="鍗曚綅鍚嶇О" prop="drugManufacturerId">
+ <el-select
+ :remote-method="getRemoteData"
+ v-model="objs.drugManufacturerId"
+ remote
+ filterable
+ style="width: 200px"
+ placeholder="璇烽�夋嫨鍗曚綅鍚嶇О"
+ clearable
+ @clear="getCompanyList"
+ @change="idFn1"
+ >
+ <el-option
+ v-for="dict in CompanyList"
+ :key="dict.cnName"
+ :label="dict.cnName"
+ :value="dict.drugManufacturerId"
+ />
+ </el-select>
+ </el-form-item>
<el-form-item label="閮ㄩ棬鍚嶇О" prop="dwDeptName">
<el-input v-model="form.dwDeptName" placeholder="璇疯緭鍏ラ儴闂ㄥ悕绉�" />
</el-form-item>
@@ -461,13 +469,13 @@
data: {
dwId: "",
dwDeptId: "",
- dwName:"",
+ dwName: "",
},
objs: {
drugManufacturerId: "",
- dwDeptName: "",
reservationTime: "",
+ yxts:"30",
},
DataList: [],
tjOrderList: [], //鍗曚釜椤圭洰闆嗗悎
@@ -498,7 +506,7 @@
// 涓婁紶鐨勫湴鍧�
url:
process.env.VUE_APP_BASE_API +
- "/reservation/reservation/newExcelImport",
+ "/reservation/reservation/newExcelImportNotDwDeptId",
},
// 鏌ヨ鍙傛暟
queryParam: {
@@ -535,9 +543,9 @@
reservationTime: [
{ required: true, validator: checkPhoneNum, trigger: "blur" },
],
- dwDeptName: [
- { required: true, validator: checkPhoneNum, trigger: "change" },
- ],
+ // dwDeptName: [
+ // { required: true, validator: checkPhoneNum, trigger: "change" },
+ // ],
signingPic: [
{ required: true, validator: checkPhoneNum, trigger: "blur" },
],
@@ -662,7 +670,7 @@
methods: {
// 淇濆瓨閮ㄩ棬
handleAddDept() {
- let data = {
+ let data = {
dwName: this.data.dwName,
dwId: this.data.dwId,
dwDeptName: this.form.dwDeptName,
@@ -688,12 +696,12 @@
console.log(value);
if (value) {
this.data.dwId = value;
- this.CompanyList.forEach(item=>{
+ this.CompanyList.forEach((item) => {
console.log(item);
- if(item.drugManufacturerId == this.data.dwId){
- this.data.dwName = item.cnName
+ if (item.drugManufacturerId == this.data.dwId) {
+ this.data.dwName = item.cnName;
}
- })
+ });
}
},
idBm(value) {
@@ -704,55 +712,55 @@
const { columns, data } = param;
const sums = [];
columns.forEach((column, index) => {
+ // if (index === 0) {
+ // sums[index] = "鍚堣";
+ // return;
+ // }
if (index === 0) {
- sums[index] = "鍚堣";
- return;
- }
- if (index === 1) {
sums[index] = "鎬昏浜烘暟";
return;
}
- if (index === 2) {
+ if (index === 1) {
sums[index] = this.ListObj.count;
return;
}
- if (index === 7) {
+ if (index === 2) {
sums[index] = "鐢风粍浜烘暟";
return;
}
- if (index === 8) {
+ if (index === 3) {
sums[index] = this.ListObj.manCount;
return;
}
- if (index === 9) {
+ if (index === 4) {
sums[index] = "鐢风粍閲戦";
return;
}
- if (index === 10) {
+ if (index === 5) {
sums[index] = this.ListObj.manMoney;
return;
}
- if (index === 12) {
+ if (index === 6) {
sums[index] = "濂崇粍浜烘暟";
return;
}
- if (index === 13) {
+ if (index === 7) {
sums[index] = this.ListObj.woManCount;
return;
}
- if (index === 14) {
+ if (index === 8) {
sums[index] = "濂崇粍閲戦";
return;
}
- if (index === 15) {
+ if (index === 9) {
sums[index] = this.ListObj.woManMoney;
return;
}
- if (index === 16) {
+ if (index === 10) {
sums[index] = "鍚堣閲戦";
return;
}
- if (index === 17) {
+ if (index === 11) {
sums[index] = this.ListObj.hjMoney;
return;
}
@@ -832,6 +840,7 @@
this.objs.drugManufacturerId = "";
this.objs.dwDeptName = "";
this.objs.reservationTime = "";
+ this.objs.yxts = "";
this.TotalPrice = "";
this.tableData[0] = [];
this.TotalPrice1 = "";
@@ -846,11 +855,11 @@
/** 瀵煎叆鎸夐挳鎿嶄綔 */
handleImport() {
- if (this.data.dwId || this.data.dwDeptId) {
+ if (this.objs.drugManufacturerId && this.objs.reservationTime) {
this.upload.title = "鐢ㄦ埛瀵煎叆";
this.upload.open = true;
} else {
- this.$modal.msgError("璇烽�夋嫨鍗曚綅鎴栭儴闂�");
+ this.$modal.msgError("璇烽�夋嫨鍗曚綅鎴栭绾︽椂闂�");
}
},
/** 涓嬭浇妯℃澘鎿嶄綔 */
@@ -869,6 +878,13 @@
handleFileSuccess(response, file, fileList) {
this.ListObj = response.data;
this.userList = response.data.list;
+ this.userList.forEach((item) => {
+ this.CompanyList.forEach((item1) => {
+ if (item1.drugManufacturerId == this.objs.drugManufacturerId) {
+ item.company = item1.cnName;
+ }
+ });
+ });
this.upload.open = false;
this.upload.isUploading = false;
this.$refs.upload.clearFiles();
@@ -954,17 +970,20 @@
/** 纭鎸夐挳 */
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,
+ dwId: this.data.dwId,
};
newConfirm(data).then((res) => {
this.$modal.msgSuccess("鎻愪氦鎴愬姛");
this.confirm = true;
- this.userList = [];
+ this.userList = [];
});
} else {
this.$modal.msgError("璇峰～鍐欏甫鏄熷彿鍐呭");
--
Gitblit v1.8.0