From cee2eca9c3e40b48c40a8fe80f938a777f03d463 Mon Sep 17 00:00:00 2001 From: wwl <xchao828@163.com> Date: 星期二, 10 六月 2025 17:57:11 +0800 Subject: [PATCH] 1 --- src/views/reservation/resercopy/index.vue | 436 +++++++++++++++++++++++++++++++++++------------------ 1 files changed, 286 insertions(+), 150 deletions(-) diff --git a/src/views/reservation/resercopy/index.vue b/src/views/reservation/resercopy/index.vue index 8076b5a..f05c814 100644 --- a/src/views/reservation/resercopy/index.vue +++ b/src/views/reservation/resercopy/index.vue @@ -2,48 +2,69 @@ <div class="app-container"> <el-form :model="objs" :rules="rules" ref="form" size="small" :inline="true" label-width="100px"> <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="idFn"> + <el-select :remote-method="getRemoteData" v-model="objs.drugManufacturerId" remote filterable + style="width: 200px" placeholder="璇烽�夋嫨鍗曚綅鍚嶇О" clearable @clear="getCompanyList" @change="idFn"> <el-option v-for="dict in CompanyList" :key="dict.cnName" :label="dict.cnName" :value="dict.drugManufacturerId" /> </el-select> <i class="el-icon-circle-plus-outline" @click="handleAdd"></i> </el-form-item> - <el-form-item label="閮ㄩ棬" prop="dwDeptName"> - <el-select v-model="objs.dwDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" style="width: 200px" clearable @change="idBm"> - <el-option v-for="dict in deptList" :key="dict.id" :label="dict.dwDeptName" :value="dict.id" /> + <!-- <el-form-item label="閮ㄩ棬" prop="dwDeptName"> + <el-select + v-model="objs.dwDeptName" + placeholder="璇烽�夋嫨閮ㄩ棬" + style="width: 200px" + clearable + @change="idBm" + > + <el-option + v-for="dict in deptList" + :key="dict.id" + :label="dict.dwDeptName" + :value="dict.id" + /> </el-select> - </el-form-item> + <i class="el-icon-circle-plus-outline" @click="handleAddbumen"></i> + </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" /> </el-select> </el-form-item> --> <el-form-item label="棰勭害鏃堕棿" prop="reservationTime"> - <el-date-picker clearable v-model="objs.reservationTime" type="date" format="yyyy-MM-dd" value-format="yyyy-MM-dd" - style="width: 220px" placeholder="璇烽�夋嫨棰勭害鏃ユ湡" @change="selectTime" :picker-options="setDisabled"> + <el-date-picker clearable v-model="objs.reservationTime" type="date" format="yyyy-MM-dd" + value-format="yyyy-MM-dd" 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> - <el-row :gutter="10" class="mb8" style="margin: 5px 20px;"> + <el-row :gutter="10" class="mb8" style="margin: 5px 20px"> <el-col :span="1.5"> <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button> </el-col> <el-col :span="1.5"> - <el-button type="primary" icon="el-icon-upload2" size="mini" @click="handleImport" - v-hasPermi="['system:user:import']">瀵煎叆</el-button> + <el-button type="primary" icon="el-icon-upload2" size="mini" @click="handleImport">瀵煎叆</el-button> </el-col> <el-col :span="1.5"> - <el-button type="primary" class="btn" icon="el-icon-thumb" :disabled="isdisabled" size="mini" @click="submitForm"> + <el-button type="primary" icon="el-icon-upload2" size="mini" @click="importTemplate">涓嬭浇妯℃澘</el-button> + </el-col> + <el-col :span="1.5"> + <el-button type="primary" class="btn" icon="el-icon-thumb" :disabled="isdisabled" size="mini" + @click="submitForm"> 纭</el-button> </el-col> </el-row> - <div style="margin: 5px 20px;width: 94%"> + <div style="margin: 5px 20px; width: 94%"> <el-table v-loading="loading" :data="userList" :summary-method="getSummaries" show-summary border> - - <el-table-column label="鍗曚綅鍚嶇О" align="center" prop="company" width="200" /> - <el-table-column label="宸ュ彿" align="center" prop="jobNo" width="80" /> + <el-table-column label="鍗曚綅鍚嶇О" align="center" prop="company" width="200"> + </el-table-column> + <el-table-column label="鍗曚綅閮ㄩ棬" align="center" prop="department" width="200"> + </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"> @@ -53,51 +74,56 @@ <el-table-column label="韬唤璇佸彿" align="center" prop="idCard" width="200" /> <el-table-column label="骞撮緞" align="center" prop="age" width="75" /> <el-table-column label="鍑虹敓鏃ユ湡" align="center" 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="phoe" width="120" /> + <!-- <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="140" /> <el-table-column label="鍦板潃" align="center" prop="address" /> - <el-table-column label="濠氬Щ鐘跺喌" align="center" prop="marriage" key="marriage" > - <template slot-scope="scope"> - <dict-tag :options="dict.type.dict_user_marry" :value="scope.row.marriage" /> - </template> - </el-table-column> - <el-table-column label="姘戞棌" align="center" prop="nation" key="nation" > - <template slot-scope="scope"> - <dict-tag :options="dict.type.dict_user_national" :value="scope.row.nation" /> - </template> - </el-table-column> - <el-table-column label="鑱旂郴閭" align="center" prop="email" /> + <el-table-column label="濠氬Щ鐘跺喌" align="center" prop="marriage" key="marriage"> + <template slot-scope="scope"> + <dict-tag :options="dict.type.dict_user_marry" :value="scope.row.marriage" /> + </template> + </el-table-column> + <el-table-column label="姘戞棌" align="center" prop="nation" key="nation"> + <template slot-scope="scope"> + <dict-tag :options="dict.type.dict_user_national" :value="scope.row.nation" /> + </template> + </el-table-column> + <!-- <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> <!-- 鐢ㄦ埛瀵煎叆瀵硅瘽妗� --> <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body> - <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers" :data="data" :action="upload.url" - :disabled="upload.isUploading" :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" - :auto-upload="false" drag> + <el-upload ref="upload" :limit="1" :key="uploadKey" accept=".xls" :headers="upload.headers" :data="data" + :action="upload.url" :disabled="upload.isUploading" :on-progress="handleFileUploadProgress" + :on-success="handleFileSuccess" :auto-upload="false" drag> <i class="el-icon-upload"></i> <div class="el-upload__text">灏嗘枃浠舵嫋鍒版澶勶紝鎴�<em>鐐瑰嚮涓婁紶</em></div> <div class="el-upload__tip text-center" slot="tip"> - <div class="el-upload__tip" slot="tip"> + <!-- <div class="el-upload__tip" slot="tip"> <el-checkbox v-model="upload.updateSupport" /> 鏄惁鏇存柊宸茬粡瀛樺湪鐨勭敤鎴锋暟鎹� - </div> - <span>浠呭厑璁稿鍏ls銆亁lsx鏍煎紡鏂囦欢銆�</span> - <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline" - @click="importTemplate">涓嬭浇妯℃澘</el-link> + </div> --> + <span>浠呭厑璁稿鍏ls鏍煎紡鏂囦欢銆�</span> + <!-- <el-link + type="primary" + :underline="false" + style="font-size: 12px; vertical-align: baseline" + @click="importTemplate" + >涓嬭浇妯℃澘</el-link + > --> </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> - <!-- 娣诲姞鎴栦慨鏀逛綋妫�鍗曚綅淇℃伅缁存姢瀵硅瘽妗� --> <div class="dia"> @@ -151,11 +177,10 @@ <el-form-item label="鏈夋晥鏃堕棿" prop="validTime"> <el-date-picker clearable v-model="form.validTime" type="date" value-format="yyyy-MM-dd" placeholder="璇烽�夋嫨鏈夋晥鏃堕棿"> - </el-date-picker> - </el-form-item><br> + </el-date-picker> </el-form-item><br /> <el-form-item label="澶囨敞" prop="remark"> <el-input v-model="form.remark" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" :rows="2" label-width="400px" - style="width: 830px" resize="none"></el-input> + style="width: 770px" resize="none"></el-input> </el-form-item> </el-form> <div slot="footer" class="dialog-footer2"> @@ -164,14 +189,50 @@ </div> </el-dialog> </div> + + <!-- 娣诲姞鎴栦慨鏀归儴闂ㄤ俊鎭淮鎶ゅ璇濇 --> + <div class="dia"> + <el-dialog :title="title" :visible.sync="open1" width="1000px" append-to-body> + <el-form ref="form" :model="form" :rules="rules" 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="dwDeptName"> + <el-input v-model="form.dwDeptName" placeholder="璇疯緭鍏ラ儴闂ㄥ悕绉�" /> + </el-form-item> + <el-form-item label="绛剧害閲戦" prop="signingPrice"> + <el-input v-model="form.signingPrice" placeholder="璇疯緭鍏ョ绾﹂噾棰�" /> + </el-form-item> + </el-form> + <div slot="footer" class="dialog-footer2"> + <el-button type="primary" @click="handleAddDept">纭� 瀹�</el-button> + <el-button @click="cancel">鍙� 娑�</el-button> + </div> + </el-dialog> + </div> </div> </template> <script> -import { addComp, Deptlist, getDwAndDwDept, newExcelImport } from "@/api/system/comp"; -import { newConfirm, getCompany, queryCompany } from "@/api/team/tuanti"; +import Cookies from "js-cookie" +import { + addDept, + addComp, + Deptlist, + getDwAndDwDept, + newExcelImport, +} from "@/api/system/comp"; +import { + newConfirm, + getCompany, + queryCompany, + getconfigKey, +} from "@/api/team/tuanti"; import { getToken } from "@/utils/auth"; -import { read, utils } from "xlsx"; export default { dicts: [ @@ -180,23 +241,24 @@ "sys_yes_no", "sys_user_sex", "reservation_pay_type", - "sys_normal_disable" + "sys_normal_disable", ], name: "Tijian", data() { let checkPhoneNum = (rule, value, callback) => { - console.log( value) + console.log(value); let patter = new RegExp(/^1\s*[3456789]\s*(\d\s*){9}$/); if (value == "" && value == undefined && !value) { - return callback(''); - } else if(value != undefined && value != ""){ + return callback(""); + } else if (value != undefined && value != "") { return callback(); - }else if (!patter.test(value)) { - return callback(''); + } else if (!patter.test(value)) { + return callback(""); } }; return { + leftList: "", isdisabled: true, setDisabled: { @@ -215,14 +277,6 @@ fileList: [], //涓婁紶鏂囦欢鍒楄〃 tableHead: [], //琛ㄥご tableData: [], // 琛ㄦ暟鎹� - form: { - company: "", - payType: "", - name: "", - phoe: "", - signingPic: "", - discount: "", - }, formLabelWidth: "120px", imageUrl: "", size: "", @@ -239,12 +293,12 @@ data: { dwId: "", dwDeptId: "", + dwName: "", }, - objs: { drugManufacturerId: "", - dwDeptName: "", reservationTime: "", + yxts: "", }, DataList: [], tjOrderList: [], //鍗曚釜椤圭洰闆嗗悎 @@ -271,10 +325,11 @@ // 鏄惁鏇存柊宸茬粡瀛樺湪鐨勭敤鎴锋暟鎹� updateSupport: 0, // 璁剧疆涓婁紶鐨勮姹傚ご閮� - headers: { Authorization: "Bearer " + getToken() }, + headers: { Authorization: "Bearer " + getToken(), hospId: Cookies.get("hospId") }, // 涓婁紶鐨勫湴鍧� url: - process.env.VUE_APP_BASE_API + "/reservation/reservation/newExcelImport", + process.env.VUE_APP_BASE_API + + "/reservation/reservation/newExcelImportNotDwDeptId", }, // 鏌ヨ鍙傛暟 queryParam: { @@ -301,103 +356,100 @@ payType: undefined, }, // 琛ㄥ崟鍙傛暟 - form: {}, + form: { + dwlx: 0 + }, // 琛ㄥ崟鏍¢獙 - + rules: { drugManufacturerId: [ - { required: true, validator: checkPhoneNum, trigger: "change" }, + { required: true, validator: checkPhoneNum, trigger: "change" }, ], reservationTime: [ - { required: true, validator: checkPhoneNum, trigger: "blur" }, + { 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" }, + { required: true, validator: checkPhoneNum, trigger: "blur" }, ], contactPerson: [ - { required: true, validator: checkPhoneNum, trigger: "blur" } + { required: true, validator: checkPhoneNum, trigger: "blur" }, ], contactPhone: [ - { required: true, validator: checkPhoneNum, trigger: "blur" } + { required: true, validator: checkPhoneNum, trigger: "blur" }, ], taxNumber: [ - { required: true, validator: checkPhoneNum, trigger: "blur" } + { required: true, validator: checkPhoneNum, trigger: "blur" }, ], legalPerson: [ - { required: true, validator: checkPhoneNum, trigger: "blur" } + { required: true, validator: checkPhoneNum, trigger: "blur" }, ], registerAddress: [ - { required: true, validator: checkPhoneNum, trigger: "blur" } + { required: true, validator: checkPhoneNum, trigger: "blur" }, ], bankAccount: [ - { required: true, validator: checkPhoneNum, trigger: "blur" } + { required: true, validator: checkPhoneNum, trigger: "blur" }, ], countNum: [ - { required: true, validator: checkPhoneNum, trigger: "blur" } + { required: true, validator: checkPhoneNum, trigger: "blur" }, ], principal: [ - { required: true, validator: checkPhoneNum, trigger: "blur" } + { required: true, validator: checkPhoneNum, trigger: "blur" }, ], faxNumber: [ - { required: true, validator: checkPhoneNum, trigger: "blur" } + { required: true, validator: checkPhoneNum, trigger: "blur" }, ], mailingAddress: [ - { required: true, validator: checkPhoneNum, trigger: "blur" } + { required: true, validator: checkPhoneNum, trigger: "blur" }, ], - email: [ - { required: true, validator: checkPhoneNum, trigger: "blur" } - ], + email: [{ required: true, validator: checkPhoneNum, trigger: "blur" }], pacName: [ - { required: true, validator: checkPhoneNum, trigger: "change" }, + { required: true, validator: checkPhoneNum, trigger: "change" }, ], payType: [ - { required: true, validator: checkPhoneNum, trigger: "change" }, + { required: true, validator: checkPhoneNum, trigger: "change" }, ], phoe: [ { required: true, pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, - validator: checkPhoneNum, + validator: checkPhoneNum, trigger: "blur", }, ], proPrice: [ - { required: true, validator: checkPhoneNum, trigger: "blur" }, + { required: true, validator: checkPhoneNum, trigger: "blur" }, ], createTime: [ - { required: true, validator: checkPhoneNum, trigger: "blur" }, + { required: true, validator: checkPhoneNum, trigger: "blur" }, ], - cnName: [ - { required: true, validator: checkPhoneNum, trigger: "blur" }, - ], + cnName: [{ required: true, validator: checkPhoneNum, trigger: "blur" }], businessLicenseNumber: [ - { required: true, validator: checkPhoneNum, trigger: "blur" }, + { required: true, validator: checkPhoneNum, trigger: "blur" }, ], createTime: [ - { required: true, validator: checkPhoneNum, trigger: "blur" }, + { required: true, validator: checkPhoneNum, trigger: "blur" }, ], updateTime: [ - { required: true, validator: checkPhoneNum, trigger: "blur" }, + { required: true, validator: checkPhoneNum, trigger: "blur" }, ], effective: [ { required: true, - validator: checkPhoneNum, + validator: checkPhoneNum, trigger: "change", }, ], - name: [ - { required: true, validator: checkPhoneNum, trigger: "change" }, - ], + name: [{ required: true, validator: checkPhoneNum, trigger: "change" }], contactPhone: [ - { required: true, validator: checkPhoneNum, trigger: "change" }, + { required: true, validator: checkPhoneNum, trigger: "change" }, ], }, ListObj: {}, + uploadKey: 0, // 閬僵灞� loading: true, pacStatus: "鍚敤", @@ -417,6 +469,7 @@ title: "", // 鏄惁鏄剧ず寮瑰嚭灞� open: false, + open1: false, // 鏌ヨ鍙傛暟 queryParams: { pageNum: 1, @@ -441,82 +494,108 @@ }, }, methods: { + // 淇濆瓨閮ㄩ棬 + handleAddDept() { + let data = { + dwName: this.data.dwName, + dwId: this.data.dwId, + dwDeptName: this.form.dwDeptName, + signingPrice: this.form.signingPrice, + }; + addDept(data).then((response) => { + if (response.code == 200) { + this.$modal.msgSuccess("鏂板鎴愬姛"); + this.open1 = false; + } + }); + }, idFn(value) { + this.userList = [] if (value) { - this.data.dwId = value + this.data.dwId = value; Deptlist(value).then((response) => { this.deptList = response.data; }); } - + }, + idFn1(value) { + console.log(value); + if (value) { + this.data.dwId = value; + this.CompanyList.forEach((item) => { + console.log(item); + if (item.drugManufacturerId == this.data.dwId) { + this.data.dwName = item.cnName; + } + }); + } }, idBm(value) { - this.data.dwDeptId = value + this.data.dwDeptId = value; }, getSummaries(param) { const { columns, data } = param; const sums = []; columns.forEach((column, index) => { + // if (index === 0) { + // sums[index] = "鍚堣"; + // return; + // } if (index === 0) { - sums[index] = '鍚堣'; + sums[index] = "鎬昏浜烘暟"; return; } if (index === 1) { - sums[index] = '鎬昏浜烘暟'; - return; - } - if (index === 2) { sums[index] = this.ListObj.count; return; } - if (index === 7) { - sums[index] = '鐢风粍浜烘暟'; + if (index === 2) { + sums[index] = "鐢风粍浜烘暟"; return; } - if (index === 8) { + if (index === 3) { sums[index] = this.ListObj.manCount; return; } - if (index === 9) { - sums[index] = '鐢风粍閲戦'; + if (index === 4) { + sums[index] = "鐢风粍閲戦"; return; } - if (index === 10) { + if (index === 5) { sums[index] = this.ListObj.manMoney; return; } - if (index === 12) { - sums[index] = '濂崇粍浜烘暟'; + if (index === 6) { + sums[index] = "濂崇粍浜烘暟"; return; } - if (index === 13) { + if (index === 7) { sums[index] = this.ListObj.woManCount; return; } - if (index === 14) { - sums[index] = '濂崇粍閲戦'; + if (index === 8) { + sums[index] = "濂崇粍閲戦"; return; } - if (index === 15) { + if (index === 9) { sums[index] = this.ListObj.woManMoney; return; } - if (index === 16) { - sums[index] = '鍚堣閲戦'; + if (index === 10) { + sums[index] = "鍚堣閲戦"; return; } - if (index === 17) { + if (index === 11) { sums[index] = this.ListObj.hjMoney; return; } - - }); - return sums + return sums; }, // 鎼滅储 getRemoteData(query) { + if (query) { let compName = query; queryCompany(compName).then((response) => { @@ -531,6 +610,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; @@ -540,6 +623,7 @@ // 鍙栨秷鎸夐挳 cancel() { this.open = false; + this.open1 = false; this.creaseopen = false; this.reset(); }, @@ -549,12 +633,18 @@ this.open = true; this.title = "娣诲姞浣撴鍗曚綅淇℃伅缁存姢"; }, - + /** 閮ㄩ棬鏂板鎸夐挳鎿嶄綔 */ + handleAddbumen() { + this.reset(); + this.open1 = true; + this.title = "娣诲姞閮ㄩ棬淇℃伅缁存姢"; + }, /** 鎻愪氦鎸夐挳 */ submitFormS() { this.$refs["form"].validate((valid) => { if (valid) { + this.form.dwlx= 0 addComp(this.form).then((response) => { this.$modal.msgSuccess("鏂板鎴愬姛"); this.open = false; @@ -572,7 +662,7 @@ name: null, phoe: null, signingPic: null, - pacStatus: "鍚敤" + pacStatus: "鍚敤", }; this.resetForm("form"); }, @@ -585,6 +675,7 @@ this.TotalPrice = ""; this.tableData[0] = []; this.TotalPrice1 = ""; + this.userList = [] // this.resetForm("form"); this.form = {}; }, @@ -593,23 +684,23 @@ selectTime(val) { this.objs.reservationTime = val; }, - /** 瀵煎叆鎸夐挳鎿嶄綔 */ handleImport() { - if (this.data.dwId || this.data.dwDeptId) { + if (this.objs.drugManufacturerId && this.objs.reservationTime) { + this.$refs.upload?.clearFiles(); + this.uploadKey = Date.now(); // 鏀瑰彉 key 寮哄埗閲嶆柊娓叉煋缁勪欢 this.upload.title = "鐢ㄦ埛瀵煎叆"; this.upload.open = true; } else { - this.$modal.msgError("璇烽�夋嫨鍗曚綅鎴栭儴闂�") + this.$modal.msgError("璇烽�夋嫨鍗曚綅鎴栭绾︽椂闂�"); } - }, /** 涓嬭浇妯℃澘鎿嶄綔 */ importTemplate() { this.download( "/reservation/reservation/importTemplate", {}, - `user_template_${new Date().getTime()}.xlsx` + `鍥綋棰勭害Excel妯$増.xls` ); }, // 鏂囦欢涓婁紶涓鐞� @@ -618,12 +709,54 @@ }, // 鏂囦欢涓婁紶鎴愬姛澶勭悊 handleFileSuccess(response, file, fileList) { - this.ListObj = response.data - this.userList = response.data.list + if (response.code == 500) { + this.isdisabled = true; + // Message.warning(response.msg); + // this.$modal.msgError(response.msg); + // this.$modal.msgError("浜哄憳"+ response.data.list + "淇℃伅閿欒"); + if (response.data) { + if (response.data.list) { + const errorList = ` + <div style="max-height: 300px; overflow-y: auto;"> + ${response.data.list.join(", ")} + </div>` + + this.$confirm(errorList, `${response.msg}`, { + confirmButtonText: "纭畾", + cancelButtonText: "鍙栨秷", + type: "error", + center: true, + dangerouslyUseHTMLString: true, + }); + } + } else { + this.$confirm(`${response.msg}`, { + confirmButtonText: "纭畾", + cancelButtonText: "鍙栨秷", + type: "error", + center: true, + dangerouslyUseHTMLString: true, + }); + } + } 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) { + item.company = item1.cnName; + } + }); + }); + } + this.upload.open = false; this.upload.isUploading = false; this.$refs.upload.clearFiles(); this.leftList = response.msg; + if (this.leftList == "鎿嶄綔澶辫触") { this.isdisabled = true; this.$alert( @@ -636,15 +769,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({ @@ -705,21 +840,24 @@ /** 纭鎸夐挳 */ 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 = []; }); } else { this.$modal.msgError("璇峰~鍐欏甫鏄熷彿鍐呭"); } - }, }, }; @@ -766,6 +904,4 @@ display: flex; justify-content: center; } -</style> - - \ No newline at end of file +</style> \ No newline at end of file -- Gitblit v1.8.0