From 8a5a5ff615e1ac7cf65c298b2e641368f7b1e2b3 Mon Sep 17 00:00:00 2001
From: wwl <xchao828@163.com>
Date: 星期五, 06 十二月 2024 14:08:13 +0800
Subject: [PATCH] 修改单位
---
src/views/index.vue | 11 +
src/views/picture/music/index.vue | 8
src/views/reservation/resercopy/index.vue | 1
src/views/system/tijian/index copy.vue | 19 +-
src/views/hosp/customer/index.vue | 315 ++++++++++++++++++++++++++++++++++++++++++++++++++-
5 files changed, 325 insertions(+), 29 deletions(-)
diff --git a/src/views/hosp/customer/index.vue b/src/views/hosp/customer/index.vue
index a67d25d..9a0c37c 100644
--- a/src/views/hosp/customer/index.vue
+++ b/src/views/hosp/customer/index.vue
@@ -1,5 +1,96 @@
<template>
<div class="app-container">
+ <el-dialog
+ :title="title"
+ :visible.sync="open1"
+ width="1000px"
+ append-to-body
+ >
+ <el-form
+ ref="form1"
+ :model="form1"
+ :rules="rules1"
+ label-width="100px"
+ :inline="true"
+ >
+ <el-form-item label="鍗曚綅鍚嶇О" prop="cnName">
+ <el-input v-model="form1.cnName" placeholder="璇疯緭鍏ヤ腑鏂囧悕绉�" />
+ </el-form-item>
+ <el-form-item label="鑱旂郴浜�" prop="contactPerson">
+ <el-input v-model="form1.contactPerson" placeholder="璇疯緭鍏ヨ仈绯讳汉" />
+ </el-form-item>
+ <el-form-item label="鑱旂郴鐢佃瘽" prop="contactPhone">
+ <el-input v-model="form1.contactPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" />
+ </el-form-item>
+ <el-form-item label="绋庡彿" prop="taxNumber">
+ <el-input v-model="form1.taxNumber" placeholder="璇疯緭鍏ョ◣鍙�" />
+ </el-form-item>
+ <el-form-item label="娉曚汉" prop="legalPerson">
+ <el-input v-model="form1.legalPerson" placeholder="璇疯緭鍏ユ硶浜�" />
+ </el-form-item>
+ <el-form-item label="娉ㄥ唽鍦板潃" prop="registerAddress">
+ <el-input
+ v-model="form1.registerAddress"
+ placeholder="璇疯緭鍏ユ敞鍐屽湴鍧�"
+ />
+ </el-form-item>
+ <el-form-item label="閫氳鍦板潃" prop="mailingAddress">
+ <el-input
+ v-model="form1.mailingAddress"
+ placeholder="璇疯緭鍏ラ�氳鍦板潃"
+ />
+ </el-form-item>
+ <el-form-item label="寮�鎴烽摱琛�" prop="bankAccount">
+ <el-input v-model="form1.bankAccount" placeholder="璇疯緭鍏ュ紑鎴烽摱琛�" />
+ </el-form-item>
+ <el-form-item label="閾惰璐︽埛" prop="countNum">
+ <el-input v-model="form1.countNum" placeholder="璇疯緭鍏ラ摱琛岃处鎴�" />
+ </el-form-item>
+ <el-form-item label="閭" prop="email">
+ <el-input v-model="form1.email" placeholder="璇疯緭鍏ラ偖绠�" />
+ </el-form-item>
+ <el-form-item label="璐熻矗浜�" prop="principal">
+ <el-input v-model="form1.principal" placeholder="璇疯緭鍏ヨ礋璐ｄ汉" />
+ </el-form-item>
+ <el-form-item label="缃戝潃" prop="url">
+ <el-input v-model="form1.url" placeholder="璇疯緭鍏ョ綉鍧�" />
+ </el-form-item>
+ <el-form-item label="浼犵湡" prop="faxNumber">
+ <el-input v-model="form1.faxNumber" placeholder="璇疯緭鍏ヤ紶鐪�" />
+ </el-form-item>
+ <el-form-item label="琛屾斂鍖哄垝鍚嶇О" prop="areaName">
+ <el-input v-model="form1.areaName" placeholder="璇疯緭鍏ヨ鏀垮尯鍒掑悕绉�" />
+ </el-form-item>
+ <el-form-item label="鎺掑簭" prop="orderNum">
+ <el-input v-model="form1.orderNum" placeholder="璇疯緭鍏ユ帓搴�" />
+ </el-form-item>
+ <el-form-item label="鏈夋晥鏃堕棿" prop="validTime">
+ <el-date-picker
+ clearable
+ v-model="form1.validTime"
+ type="date"
+ value-format="yyyy-MM-dd"
+ placeholder="璇烽�夋嫨鏈夋晥鏃堕棿"
+ >
+ </el-date-picker> </el-form-item
+ ><br />
+ <el-form-item label="澶囨敞" prop="remark">
+ <el-input
+ v-model="form1.remark"
+ type="textarea"
+ placeholder="璇疯緭鍏ュ唴瀹�"
+ :rows="2"
+ label-width="400px"
+ style="width: 830px"
+ resize="none"
+ ></el-input>
+ </el-form-item>
+ </el-form>
+ <div slot="footer" class="dialog-footer2">
+ <el-button type="primary" @click="submitFormS">纭� 瀹�</el-button>
+ <el-button @click="cancel1">鍙� 娑�</el-button>
+ </div>
+ </el-dialog>
<el-form
:model="queryParams"
ref="queryForm"
@@ -541,13 +632,27 @@
style="width: 200px"
/>
</el-form-item>
- <!-- <el-form-item label="宸ヤ綔鍗曚綅" prop="">
- <el-input
- v-model="form."
- placeholder="璇疯緭鍏ュ伐浣滃崟浣�"
- style="width: 820px"
- />
- </el-form-item> -->
+ <el-form-item label="鍗曚綅鍚嶇О" prop="dictCompId">
+ <el-select
+ :remote-method="getRemoteData"
+ v-model="form.compName"
+ remote
+ filterable
+ style="width: 300px"
+ placeholder="璇烽�夋嫨鍗曚綅鍚嶇О"
+ clearable
+
+ @change="idFn1"
+ >
+ <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="handleAdd1"></i>
+ </el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
@@ -846,7 +951,12 @@
import "quill/dist/quill.core.css";
import "quill/dist/quill.snow.css";
import "quill/dist/quill.bubble.css";
-
+import {
+ newConfirm,
+ getCompany,
+ queryCompany,
+ getconfigKey,
+} from "@/api/team/tuanti";
import {
listCustomer,
getCustomer,
@@ -856,7 +966,13 @@
getHistryTjOrderByCusIdCard,
} from "@/api/hosp/customer";
import { getPdf, addCustomerBlack } from "@/api/hosp/order";
-
+import {
+ addDept,
+ addComp,
+ Deptlist,
+ getDwAndDwDept,
+ newExcelImport,
+} from "@/api/system/comp";
export default {
name: "Customer",
components: { quillEditor },
@@ -941,8 +1057,22 @@
cusNumber: null,
cusIsvip: null,
},
+
+ deptList: [],
+ CompanyList: [],
+ open1: false,
// 琛ㄥ崟鍙傛暟
- form: {},
+ form: {
+ idType: 1
+ },
+ form1: {
+ company: "",
+ payType: "",
+ name: "",
+ phoe: "",
+ signingPic: "",
+ discount: "",
+ },
// 琛ㄥ崟鏍￠獙
rules: {
cusName: [
@@ -973,12 +1103,148 @@
{ required: true, validator: checkPhoneNum, trigger: "blur" },
],
},
+ rules1: {
+ cnName: [
+ { required: true, trigger: 'blur' },
+ ],
+ contactPerson: [
+ { required: true, trigger: 'blur' },
+ ],
+ contactPhone: [
+ {
+ required: true,
+ message: '璇疯緭鍏ヨ仈绯荤數璇�',
+ trigger: 'blur'
+ },
+ {
+ pattern: /^1[3-9]\d{9}$/,
+ message: '璇疯緭鍏ユ湁鏁堢殑鎵嬫満鍙�',
+ trigger: 'blur'
+ }
+ ],
+ // taxNumber: [
+ // { required: true, message: '璇疯緭鍏ョ◣鍙�', trigger: 'blur' },
+ // ],
+ // legalPerson: [
+ // { required: true, message: '璇疯緭鍏ユ硶浜�', trigger: 'blur' },
+ // ],
+ // registerAddress: [
+ // { required: true, message: '璇疯緭鍏ユ敞鍐屽湴鍧�', trigger: 'blur' },
+ // ],
+ // mailingAddress: [
+ // { required: true, message: '璇疯緭鍏ラ�氳鍦板潃', trigger: 'blur' },
+ // ],
+ // bankAccount: [
+ // { required: true, message: '璇疯緭鍏ュ紑鎴烽摱琛�', trigger: 'blur' },
+ // ],
+ // countNum: [
+ // { required: true, message: '璇疯緭鍏ラ摱琛岃处鎴�', trigger: 'blur' },
+ // ],
+ // email: [
+ // {
+ // required: true,
+ // message: '璇疯緭鍏ラ偖绠�',
+ // trigger: 'blur'
+ // },
+ // {
+ // type: 'email',
+ // message: '璇疯緭鍏ユ湁鏁堢殑閭鍦板潃',
+ // trigger: 'blur'
+ // }
+ // ],
+ // principal: [
+ // { required: true, message: '璇疯緭鍏ヨ礋璐ｄ汉', trigger: 'blur' },
+ // ],
+ // url: [
+ // { required: true, message: '璇疯緭鍏ョ綉鍧�', trigger: 'blur' },
+ // {
+ // type: 'url',
+ // message: '璇疯緭鍏ユ湁鏁堢殑缃戝潃',
+ // trigger: 'blur'
+ // }
+ // ],
+ // faxNumber: [
+ // { required: true, message: '璇疯緭鍏ヤ紶鐪�', trigger: 'blur' },
+ // ],
+ // areaName: [
+ // { required: true, message: '璇疯緭鍏ヨ鏀垮尯鍒掑悕绉�', trigger: 'blur' },
+ // ],
+ // orderNum: [
+ // { required: true, message: '璇疯緭鍏ユ帓搴�', trigger: 'blur' },
+ // {
+ // pattern: /^[1-9]\d*$/,
+ // message: '鎺掑簭蹇呴』鏄鏁存暟',
+ // trigger: 'blur'
+ // }
+ // ],
+ // validTime: [
+ // { required: true, message: '璇烽�夋嫨鏈夋晥鏃堕棿', trigger: 'change' },
+ // ],
+ // remark: [
+ // { required: false, message: '璇疯緭鍏ュ娉�', trigger: 'blur' },
+ // ],
+ }
};
},
created() {
+ this.getCompanyList();
this.getList();
},
methods: {
+ // 淇濆瓨閮ㄩ棬
+ /** 鎻愪氦鎸夐挳 */
+ submitFormS() {
+ this.$refs["form1"].validate((valid) => {
+ if (valid) {
+ addComp(this.form1).then((response) => {
+ this.$modal.msgSuccess("鏂板鎴愬姛");
+ this.open1 = false;
+ this.getCompanyList();
+ });
+ }
+ });
+ },
+ idFn1(value) {
+ console.log(value);
+ if (value) {
+ this.form.dictCompId = value;
+ this.CompanyList.forEach((item) => {
+ if (item.drugManufacturerId == this.form.dictCompId) {
+ this.form.compName = item.cnName;
+ }
+ });
+ }
+ },
+ // 鎼滅储
+ getRemoteData(query) {
+ if (query) {
+ let compName = query;
+ queryCompany(compName).then((response) => {
+ this.CompanyList = response.data;
+ this.CompanyList.forEach((item) => {
+ this.objs = item;
+ });
+ });
+ }
+ },
+ /** 鏂板鎸夐挳鎿嶄綔 */
+ handleAdd1() {
+ this.reset1();
+ this.open1 = true;
+ this.title = "娣诲姞浣撴鍗曚綅淇℃伅缁存姢";
+ },
+ // 鑾峰彇鍗曚綅淇℃伅闆嗗悎
+ getCompanyList() {
+ this.loading = true;
+ getconfigKey("team_reservation_default_day").then((res) => {
+ this.queryParams.yxts = res.msg;
+ });
+ getCompany(this.queryParam).then((response) => {
+ this.CompanyList = response.data;
+ this.total = response.total;
+ this.loading = false;
+ });
+ },
/** 鏌ヨ淇℃伅鍒楄〃 */
getList() {
this.loading = true;
@@ -997,11 +1263,29 @@
// 鍙栨秷鎸夐挳
cancel() {
this.open = false;
+ this.open1 = false;
this.reset();
},
+ cancel1() {
+
+ this.open1 = false;
+ this.reset1();
+ },
// 琛ㄥ崟閲嶇疆
+ reset1() {
+ this.form1 = {
+ company: "",
+ payType: "",
+ name: "",
+ phoe: "",
+ signingPic: "",
+ discount: "",
+ }
+ },
reset() {
+
this.form = {
+ dictCompId: null,
cusId: null,
cusName: null,
cusSex: null,
@@ -1152,6 +1436,7 @@
/** 鎻愪氦鎸夐挳 */
submitForm() {
this.$refs["form"].validate((valid) => {
+ this.form.idType = 1
if (valid) {
if (this.form.cusId != null) {
updateCustomer(this.form).then((response) => {
@@ -1211,4 +1496,14 @@
display: flex;
justify-content: center;
}
+.el-icon-circle-plus-outline {
+ line-height: 20px;
+ font-size: 20px;
+}
+.dialog-footer2 {
+ width: 960px;
+ height: 36px;
+ display: flex;
+ justify-content: center;
+}
</style>
diff --git a/src/views/index.vue b/src/views/index.vue
index ce0393f..8ccd4ef 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -183,7 +183,7 @@
]
})
- let sizeFun = function () {
+ let sizeFun = ()=> {
myChart.resize()
}
window.addEventListener("resize", sizeFun)
@@ -326,13 +326,14 @@
}
}]
})
- }
-
-
- window.onresize = function () {
+ window.onresize = () =>{
myChart2.resize()
myChart3.resize()
}
+ }
+
+
+
this.loading = false;
});
diff --git a/src/views/picture/music/index.vue b/src/views/picture/music/index.vue
index ad4ca02..4cf5b0e 100644
--- a/src/views/picture/music/index.vue
+++ b/src/views/picture/music/index.vue
@@ -1120,7 +1120,7 @@
},
],
});
- let sizeFun = function () {
+ let sizeFun = ()=> {
myChart.resize();
};
window.addEventListener("resize", sizeFun);
@@ -1176,7 +1176,7 @@
},
],
});
- let sizeFun = function () {
+ let sizeFun = ()=> {
myChart2.resize();
};
window.addEventListener("resize", sizeFun);
@@ -1232,7 +1232,7 @@
},
],
});
- let sizeFun = function () {
+ let sizeFun = () =>{
myChart2.resize();
};
window.addEventListener("resize", sizeFun);
@@ -1288,7 +1288,7 @@
},
],
});
- let sizeFun = function () {
+ let sizeFun = () =>{
myChart2.resize();
};
window.addEventListener("resize", sizeFun);
diff --git a/src/views/reservation/resercopy/index.vue b/src/views/reservation/resercopy/index.vue
index fcb7661..c4abbc9 100644
--- a/src/views/reservation/resercopy/index.vue
+++ b/src/views/reservation/resercopy/index.vue
@@ -429,6 +429,7 @@
}
};
return {
+
leftList: "",
isdisabled: true,
setDisabled: {
diff --git a/src/views/system/tijian/index copy.vue b/src/views/system/tijian/index copy.vue
index 6ddedf0..7750fb1 100644
--- a/src/views/system/tijian/index copy.vue
+++ b/src/views/system/tijian/index copy.vue
@@ -1046,7 +1046,7 @@
} else {
item.list.forEach((items) => {
_this.proIdList.push(items.proId);
- console.log(_this.pacId, 888);
+
});
}
});
@@ -1064,7 +1064,7 @@
this.proIds = [];
getTransitionList(cusId).then((response) => {
this.tableData1 = response.data;
- console.log(this.tableData1);
+
this.TotalPrice1 = 0;
if (this.tableData1) {
this.tableData1.forEach((item) => {
@@ -1460,7 +1460,7 @@
} else if ("MozWebSocket" in window) {
websocket = new MozWebSocket(url);
} else {
- // console.log("SockJS");
+
}
if (websocket == null) {
@@ -1493,6 +1493,7 @@
//鎺ユ敹鍒版秷鎭殑鍥炶皟鏂规硶
websocket.onmessage = function (event) {
var resultObj = eval("(" + event.data + ")");
+
//resultFlag涓�0浠ｈ〃璇诲崱鎴愬姛
if (
resultObj.name == "readCard" ||
@@ -1613,7 +1614,7 @@
},
cancell() {
- console.log(this.addAddress.address);
+
if (this.addAddress.address) {
this.malldisble = false;
} else {
@@ -1650,8 +1651,7 @@
// this.tableData.forEach((item) => {
// this.fData = item.tjProjectList;
// });
- console.log(this.treedataList)
- console.log(selection)
+
if (selection[0]) {
this.DataList = [];
// this.data = JSON.parse(JSON.stringify(this.dXData));
@@ -1695,8 +1695,7 @@
this.loading = true;
deptTreeSelect(cusSex).then((response) => {
this.newpacName = response.rows;
- console.log(this.newpacName)
- console.log(this.tableData1)
+
try {
if (this.tableData1.length >= 1) {
this.newpacName.forEach((item3) => {
@@ -1784,7 +1783,7 @@
this.proIds = [];
getTransitionList(cusId).then((response) => {
this.tableData1 = response.data;
- console.log(this.tableData1);
+
this.TotalPrice1 = 0;
if (this.tableData1) {
this.tableData1.forEach((item) => {
@@ -1931,7 +1930,7 @@
// 琛ㄦ牸鍗曢��
handleSelect(selection, val) {
- console.log(selection, val);
+
this.selectionList = this.$refs.multipleTable.selection;
this.selectionList.forEach((item) => {
this.formIn.name = item.tjName;
--
Gitblit v1.8.0