From d194f4cd74da499f741100e5e3da5bcc3a0dc387 Mon Sep 17 00:00:00 2001
From: wwl <xchao828@163.com>
Date: 星期六, 07 十二月 2024 18:07:44 +0800
Subject: [PATCH] danwei
---
src/views/reservation/reservations/index.vue | 234 +++++++++++++++++++++++++++--
src/views/system/tijian/index.vue | 67 +++-----
src/views/doctor/examination/index.vue | 60 ++++---
src/views/system/tijianall/index.vue | 53 ++++--
src/views/hosp/customer/index.vue | 65 ++++---
5 files changed, 348 insertions(+), 131 deletions(-)
diff --git a/src/views/doctor/examination/index.vue b/src/views/doctor/examination/index.vue
index 5137909..b7d7ee1 100644
--- a/src/views/doctor/examination/index.vue
+++ b/src/views/doctor/examination/index.vue
@@ -159,8 +159,9 @@
size="mini"
type="text"
v-show="
- scope.row.confirmStatus == '299' ||
- scope.row.confirmStatus == 288
+ (xianshi == 'Y' || xianshi == 'y') &&
+ (scope.row.confirmStatus == '299' ||
+ scope.row.confirmStatus == 288)
"
@click="tongguo(scope.row)"
>閫氳繃</el-button
@@ -169,8 +170,9 @@
size="mini"
type="text"
v-show="
- scope.row.confirmStatus == '301' ||
- scope.row.confirmStatus == 288
+ (xianshi == 'Y' || xianshi == 'y') &&
+ (scope.row.confirmStatus == '301' ||
+ scope.row.confirmStatus == 288)
"
@click="bohui(scope.row)"
>椹冲洖</el-button
@@ -264,23 +266,24 @@
</div>
<div class="pag">
<div class="pag1">
- <!-- <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :pager-count="5" :current-page.sync="currentPage1" :current-page="page"
+ <!-- <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :pager-count="5" :current-page.sync="currentPage1" :current-page="page"
:page-sizes="pageSize" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="total">
</el-pagination> -->
- <pagination
- v-show="total > 0"
- :total="total"
- :pager-count="5"
- :page.sync="queryParams.page"
- :limit.sync="queryParams.pageSize"
- @pagination="getList"
- />
- </div>
+ <pagination
+ v-show="total > 0"
+ :total="total"
+ :pager-count="5"
+ :page.sync="queryParams.page"
+ :limit.sync="queryParams.pageSize"
+ @pagination="getList"
+ />
+ </div>
</div>
</div>
</template>
<script>
+import { getConfigKey } from "@/api/system/config";
import {
getCsList,
confirmOrder,
@@ -313,6 +316,7 @@
checkStatus: "0",
exaList: [],
// 琛ㄥ崟鍙傛暟
+ xianshi: '',
form: {},
clearTimeSet: null,
tjNumbers: "",
@@ -357,6 +361,7 @@
},
created() {
this.getdate();
+
// this.getNowTime();
},
mounted() {
@@ -366,6 +371,9 @@
},
methods: {
getdate() {
+ getConfigKey("tj_confirm").then((res) => {
+ this.xianshi = res.msg;
+ });
getNewDateList().then((res) => {
this.createTimeList = [
moment(res.data).format("YYYY-MM-DD 00:00:00"),
@@ -562,21 +570,23 @@
this.$modal.loading("姝ｅ湪鍚屾锛岃绋嶅��...");
this.setTime();
let tjNumber = row.tjNumber;
- dataSynchronization(tjNumber).then((res, error) => {
- if (res.code == 200) {
- // this.$forceUpdate();
+ dataSynchronization(tjNumber)
+ .then((res, error) => {
+ if (res.code == 200) {
+ // this.$forceUpdate();
+ this.handleCurrentChange(row);
+ clearInterval(this.clearTimeSet);
+ this.clearTimeSet = null;
+ this.$modal.closeLoading();
+ this.$modal.msgSuccess("鍚屾鎴愬姛锛�");
+ }
+ })
+ .catch((error) => {
this.handleCurrentChange(row);
clearInterval(this.clearTimeSet);
this.clearTimeSet = null;
this.$modal.closeLoading();
- this.$modal.msgSuccess("鍚屾鎴愬姛锛�");
- }
- }).catch(error => {
- this.handleCurrentChange(row);
- clearInterval(this.clearTimeSet);
- this.clearTimeSet = null;
- this.$modal.closeLoading();
- });
+ });
},
// 椹冲洖鎸夐挳
bohui(row) {
diff --git a/src/views/hosp/customer/index.vue b/src/views/hosp/customer/index.vue
index 8108ad8..ae5970f 100644
--- a/src/views/hosp/customer/index.vue
+++ b/src/views/hosp/customer/index.vue
@@ -632,27 +632,27 @@
style="width: 200px"
/>
</el-form-item>
- <el-form-item label="鍗曚綅鍚嶇О" prop="dictCompId">
- <el-select
- :remote-method="getRemoteData"
- v-model="form.compName"
- remote
-
- 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-item label="鍗曚綅鍚嶇О" prop="compName">
+ <el-select
+ v-model="form.compName"
+ remote
+ default-first-option
+ allow-create
+ filterable
+ style="width: 200px"
+ placeholder="璇烽�夋嫨鍗曚綅鍚嶇О"
+ clearable
+ @change="idFn1"
+ >
+ <el-option
+ v-for="dict in CompanyList"
+ :key="dict.cnName"
+ :label="dict.cnName"
+ :value="dict.cnName"
+ />
+ </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>
@@ -1128,6 +1128,7 @@
submitFormS() {
this.$refs["form1"].validate((valid) => {
if (valid) {
+
addComp(this.form1).then((response) => {
this.$modal.msgSuccess("鏂板鎴愬姛");
this.open1 = false;
@@ -1137,14 +1138,24 @@
});
},
idFn1(value) {
- console.log(value);
if (value) {
- this.form.dictCompId = value;
+ // 淇濆瓨淇敼鍓嶇殑 dictCompId
+ const originalCompId = this.form.dictCompId;
+
+ // 鏇存柊鍏徃鍚嶇О
+ this.form.compName = value;
+
+ // 閬嶅巻鍏徃鍒楄〃锛屾牴鎹叕鍙稿悕绉拌缃搴旂殑 drugManufacturerId
this.CompanyList.forEach((item) => {
- if (item.drugManufacturerId == this.form.dictCompId) {
- this.form.compName = item.cnName;
+ if (item.cnName == this.form.compName) {
+ this.form.dictCompId = item.drugManufacturerId;
}
});
+
+ // 濡傛灉 dictCompId 娌℃湁鍙樺寲锛岄噸缃负绌�
+ if (this.form.dictCompId === originalCompId) {
+ this.form.dictCompId = '';
+ }
}
},
// 鎼滅储
@@ -1427,10 +1438,6 @@
.dialog-footer {
display: flex;
justify-content: center;
-}
-.el-icon-circle-plus-outline {
- line-height: 20px;
- font-size: 20px;
}
.dialog-footer2 {
width: 960px;
diff --git a/src/views/reservation/reservations/index.vue b/src/views/reservation/reservations/index.vue
index b95de86..e644f5e 100644
--- a/src/views/reservation/reservations/index.vue
+++ b/src/views/reservation/reservations/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"
@@ -38,20 +129,23 @@
<el-select
:remote-method="getRemoteData"
v-model="queryParams.company"
- value-key="drugManufacturerId"
remote
+ default-first-option
+ allow-create
filterable
+ style="width: 200px"
placeholder="璇烽�夋嫨鍗曚綅鍚嶇О"
clearable
- @change="searchSelect"
+ @change="idFn1"
>
<el-option
v-for="dict in CompanyList"
- :key="dict.drugManufacturerId"
+ :key="dict.cnName"
:label="dict.cnName"
- :value="dict.cnName"
+ :value="dict.drugManufacturerId"
/>
</el-select>
+ <i class="el-icon-circle-plus-outline" @click="handleAdd1"></i>
</el-form-item>
<el-form-item label="棰勭害瓒呮湡" prop="isExpire">
<el-select
@@ -89,7 +183,6 @@
size="mini"
:disabled="multiple"
@click="batch"
-
>鎾ら攢棰勭害</el-button
>
<!-- v-hasPermi="['reservation:reservation:remove']" -->
@@ -100,7 +193,6 @@
size="mini"
:disabled="single"
@click="receipt"
-
>琛ユ墦灏忕エ</el-button
>
<!-- v-hasPermi="['reservation:reservation:remove']" -->
@@ -452,12 +544,27 @@
style="width: 160px"
/>
</el-form-item>
- <el-form-item label="宸ヤ綔鍗曚綅" prop="company">
- <el-input
+ <el-form-item label="鍗曚綅鍚嶇О" prop="company">
+ <el-select
+ :remote-method="getRemoteData"
v-model="formIn.company"
- placeholder="璇疯緭鍏ュ伐浣滃崟浣�"
- style="width: 410px"
- />
+ remote
+ default-first-option
+ allow-create
+ filterable
+ style="width: 200px"
+ 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-item label="鑱屼笟" prop="career">
<el-select
@@ -1025,12 +1132,27 @@
style="width: 160px"
/>
</el-form-item>
- <el-form-item label="宸ヤ綔鍗曚綅" prop="company">
- <el-input
+ <el-form-item label="鍗曚綅鍚嶇О" prop="company">
+ <el-select
+ :remote-method="getRemoteData"
v-model="formIn.company"
- placeholder="璇疯緭鍏ュ伐浣滃崟浣�"
- style="width: 410px"
- />
+ remote
+ default-first-option
+ allow-create
+ filterable
+ style="width: 200px"
+ 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-item label="鑱屼笟" prop="career">
<el-select
@@ -1436,6 +1558,8 @@
</template>
<script>
+import { addComp } from "@/api/system/comp";
+
import {
listReservation,
gettjCancel,
@@ -1450,6 +1574,7 @@
getPackageListName,
getaddtTransition,
getTransitionList,
+ getconfigKey,
} from "@/api/system/tijian";
import { getCompany, queryCompany } from "@/api/team/tuanti";
import user from "@/store/modules/user";
@@ -1562,7 +1687,7 @@
multiple: true,
nodeobj: {},
// 鏄惁鏄剧ず寮瑰嚭灞�
- Seachopen: false,
+
pacId: "",
// 缁撴灉
result: "",
@@ -1610,6 +1735,22 @@
formIn: {},
fmobj: {},
// 琛ㄥ崟鏍￠獙
+ form1: {},
+ open1: false,
+ rules1: {
+ cnName: [{ required: true, trigger: "blur" }],
+ contactPerson: [{ required: true, trigger: "blur" }],
+ contactPhone: [
+ {
+ required: true,
+ trigger: "blur",
+ },
+ {
+ pattern: /^1[3-9]\d{9}$/,
+ trigger: "blur",
+ },
+ ],
+ },
rules: {
cusName: [
{ required: true, validator: checkPhoneNum, trigger: "blur" },
@@ -1716,6 +1857,58 @@
this.getList();
},
methods: {
+ 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;
+ });
+ },
+ cancel1() {
+ this.open1 = false;
+ this.reset1();
+ },
+ submitFormS() {
+ this.$refs["form1"].validate((valid) => {
+ if (valid) {
+ addComp(this.form1).then((response) => {
+ this.$modal.msgSuccess("鏂板鎴愬姛");
+ this.open1 = false;
+ this.getCompanyList();
+ });
+ }
+ });
+ },
+ reset1() {
+ this.form1 = {
+ company: "",
+ payType: "",
+ name: "",
+ phoe: "",
+ signingPic: "",
+ discount: "",
+ };
+ },
+ handleAdd1() {
+ this.reset1();
+ this.open1 = true;
+ this.title = "娣诲姞浣撴鍗曚綅淇℃伅缁存姢";
+ },
+ idFn1(value) {
+ if (value) {
+ this.form.dictCompId = value;
+ this.CompanyList.forEach((item) => {
+ if (item.drugManufacturerId == this.form.dictCompId) {
+ this.form.compName = item.cnName;
+ this.queryParams.company = item.cnName;
+ }
+ });
+ }
+ },
/** 鏌ヨ浣撴棰勭害鍒楄〃 */
getList() {
this.loading = true;
@@ -2504,7 +2697,12 @@
-moz-border-radius: 2em;
border-radius: 2em;
}
-
+.dialog-footer2 {
+ width: 960px;
+ height: 36px;
+ display: flex;
+ justify-content: center;
+}
/* 淇敼 婊戝潡 */
#printIframe::-webkit-scrollbar-thumb {
background-color: #dcdfe6;
diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue
index 7dcebe1..63ee372 100644
--- a/src/views/system/tijian/index.vue
+++ b/src/views/system/tijian/index.vue
@@ -327,7 +327,7 @@
/>
</el-form-item>
- <el-form-item label="骞撮緞 " prop="age">
+ <el-form-item label="骞撮緞" prop="age">
<el-input
v-model="form.age"
:disabled="isDisabled"
@@ -368,13 +368,15 @@
/>
</el-form-item>
- <el-form-item label="鍗曚綅鍚嶇О" prop="dictCompId">
+ <el-form-item label="鍗曚綅鍚嶇О" prop="compName">
<el-select
- :remote-method="getRemoteData"
+ :disabled="isDisabled"
v-model="form.compName"
remote
+ default-first-option
+ allow-create
filterable
- style="width: 300px"
+ style="width: 200px"
placeholder="璇烽�夋嫨鍗曚綅鍚嶇О"
clearable
@change="idFn1"
@@ -383,13 +385,13 @@
v-for="dict in CompanyList"
:key="dict.cnName"
:label="dict.cnName"
- :value="dict.drugManufacturerId"
+ :value="dict.cnName"
/>
</el-select>
- <i class="el-icon-circle-plus-outline" @click="handleAdd1"></i>
+ <!-- <i class="el-icon-circle-plus-outline" @click="handleAdd1"></i> -->
</el-form-item>
- <el-form-item label="鏂囧寲绋嬪害" prop="wenHua">
+ <el-form-item label="鏂囧寲绋嬪害" prop="wenHua" label-width="93px">
<el-input
:disabled="isDisabled"
v-model="form.wenHua"
@@ -1819,9 +1821,7 @@
this.getList1();
// this.getData();
},
- mounted() {
-
- },
+ mounted() {},
methods: {
getCompanyList() {
@@ -1866,25 +1866,19 @@
this.title = "娣诲姞浣撴鍗曚綅淇℃伅缁存姢";
},
idFn1(value) {
-
if (value) {
- this.form.dictCompId = value;
+
+ const originalCompId = this.form.dictCompId;
+ this.form.compName = value;
this.CompanyList.forEach((item) => {
- if (item.drugManufacturerId == this.form.dictCompId) {
- this.form.compName = item.cnName;
+ if (item.cnName == this.form.compName) {
+ this.form.dictCompId = item.drugManufacturerId;
}
});
- }
- },
- getRemoteData(query) {
- if (query) {
- let compName = query;
- queryCompany(compName).then((response) => {
- this.CompanyList = response.data;
- this.CompanyList.forEach((item) => {
- this.objs = item;
- });
- });
+
+ if (this.form.dictCompId === originalCompId) {
+ this.form.dictCompId = '';
+ }
}
},
getCurrentDateTime() {
@@ -2480,7 +2474,6 @@
} else {
let configKey = "getInfoFromSqlData";
getconfigKey(configKey).then((res) => {
-
if (res.code == 200) {
if (res.msg == "N") {
var websocket = null;
@@ -2490,7 +2483,6 @@
} else if ("MozWebSocket" in window) {
websocket = new MozWebSocket(url);
} else {
-
}
if (websocket == null) {
@@ -2523,10 +2515,9 @@
//鎺ユ敹鍒版秷鎭殑鍥炶皟鏂规硶
websocket.onmessage = (event) => {
-
var resultObj = eval("(" + event.data + ")");
//resultFlag涓�0浠ｈ〃璇诲崱鎴愬姛
-
+
// TODO 浠ヤ笅浠ｇ爜鍙兘鏄尘宸濅娇鐢ㄧ殑
// this.jingChuanHandlerWebSocketResult(resultObj)
this.readCardWebSocket(resultObj);
@@ -2545,14 +2536,14 @@
_this.cardreaderradio = 3;
_this.inputSSS = "";
// let url = window.location.protocol + "//" + window.location.host;
-
+
// axios
// .get("http://localhost:81/dev-api/readCertCardInfos")
// .then((res) => {
-
+
// })
// .catch((err) => {
-
+
// });
// readCertCardInfos().then((res) => {
@@ -2579,8 +2570,6 @@
readCardWebSocket(resultObj) {
let _this = this;
if (resultObj.code === 200 && resultObj.data.name != null) {
-
-
//鍥炴樉鐩稿叧鏁版嵁
_this.form.cusName = resultObj.data.name;
_this.form.cusSex = resultObj.data.sex == "0" ? "濂�" : "鐢�";
@@ -2678,7 +2667,6 @@
} else if ("MozWebSocket" in window) {
websocket = new MozWebSocket(url);
} else {
-
}
if (websocket == null) {
alert("11111");
@@ -2783,7 +2771,6 @@
} else if ("MozWebSocket" in window) {
websocket = new MozWebSocket(url);
} else {
-
}
if (websocket == null) {
alert("11111");
@@ -3176,7 +3163,6 @@
this.loading = true;
getProParentIdDxList().then((response) => {
this.Treedata = response.data.list;
-
if (this.tableData[0]) {
this.tableData[0].tjProjectList.forEach((selectionitem) => {
@@ -3200,7 +3186,7 @@
};
getlistByZhId(datas).then((res) => {
this.packagedataList = res.data.tjProjectList;
-
+
this.DataLists = [];
this.checkedListkey1 = [];
for (var i = 0; i < this.packagedataList.length; i++) {
@@ -3210,12 +3196,11 @@
getProSonDxList(proId).then((res) => {
this.TreedataList = res.data.list;
-
this.TreedataList.forEach((item) => {
// this.checkedListkey1.push(item.proId);
this.DataLists.push(item);
-
+
if (this.DataLists.length >= 1) {
this.marryalls = 0;
this.DataLists.forEach((item1) => {
@@ -3466,7 +3451,6 @@
};
getaddtTransition(data).then((response) => {
if (response.code == 200) {
-
let cusId = this.form.cusIdcard;
this.proIds = [];
getTransitionList(cusId).then((response) => {
@@ -3503,7 +3487,6 @@
});
} else {
console.log(澶辫触浜�);
-
}
});
this.taocan = false;
diff --git a/src/views/system/tijianall/index.vue b/src/views/system/tijianall/index.vue
index 6f12373..e737ec9 100644
--- a/src/views/system/tijianall/index.vue
+++ b/src/views/system/tijianall/index.vue
@@ -225,6 +225,7 @@
v-model="form.cusIdcard"
placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�"
@input="inputChange"
+ style="width: 190px"
/>
<!-- <i
style="font-size: 17px; margin-left: 3px"
@@ -249,7 +250,7 @@
filterable
v-model="form.cusNational"
placeholder="璇烽�夋嫨姘戞棌"
- style="width: 93%"
+ style="width: 94%"
>
<el-option
v-for="dict in dict.type.dict_user_national"
@@ -269,7 +270,7 @@
<el-select
:disabled="isDisabled"
v-model="form.ageUnit"
- style="width: 20%"
+ style="width: 19%"
>
<el-option
v-for="dict in dict.type.dict_ageunit"
@@ -330,13 +331,15 @@
:rules="rules"
label-width="106px"
>
- <el-form-item label="鍗曚綅鍚嶇О" prop="dictCompId">
+ <el-form-item label="鍗曚綅鍚嶇О" prop="compName">
<el-select
- :remote-method="getRemoteData"
+ :disabled="isDisabled"
v-model="form.compName"
remote
+ default-first-option
+ allow-create
filterable
- style="width: 300px"
+ style="width: 200px"
placeholder="璇烽�夋嫨鍗曚綅鍚嶇О"
clearable
@change="idFn1"
@@ -345,16 +348,16 @@
v-for="dict in CompanyList"
:key="dict.cnName"
:label="dict.cnName"
- :value="dict.drugManufacturerId"
+ :value="dict.cnName"
/>
</el-select>
- <i class="el-icon-circle-plus-outline" @click="handleAdd1"></i>
+ <!-- <i class="el-icon-circle-plus-outline" @click="handleAdd1"></i> -->
</el-form-item>
- <el-form-item label="浣撴绫诲埆" prop="category">
+ <el-form-item label="浣撴绫诲埆" prop="category" label-width="95px">
<el-select
v-model="form.category"
placeholder="璇烽�夋嫨浣撴绫诲埆"
- style="width: 95%"
+ style="width: 94%"
>
<el-option
v-for="dict in dict.type.dict_tjtype"
@@ -366,7 +369,11 @@
<!-- <el-input v-model="form.category" placeholder="璇疯緭鍏ヤ綋妫�绫诲埆" /> -->
</el-form-item>
<el-form-item label="閮ㄩ棬" prop="department">
- <el-input v-model="form.department" placeholder="璇疯緭鍏ラ儴闂�" />
+ <el-input
+ v-model="form.department"
+ placeholder="璇疯緭鍏ラ儴闂�"
+ style="width: 93%"
+ />
</el-form-item>
</el-form>
<el-form
@@ -818,7 +825,7 @@
<el-form
:model="form"
:inline="true"
- label-width="100px"
+ label-width="104px"
style="margin-left: 10px"
>
<el-form-item label="搴旀敹閲戦" style="margin-right: 20px">
@@ -833,14 +840,15 @@
<el-input-number style="width: 140px" v-model="discount" :precision="2" :step="0.1" :max="10" :min="1"
@change="numberChange" :disabled="isfalse"></el-input-number>
</el-form-item> -->
- <el-form-item label="瀹炴敹閲戦">
+ <el-form-item label="瀹炴敹閲戦" label-width="96px">
<el-input
placeholder="瀹炴敹閲戦"
v-model="TotalPrice"
disabled
+ style="width: 192px"
></el-input>
</el-form-item>
- <el-form-item>
+ <el-form-item style="margin-left: 50px">
<el-button type="primary" @click="Package" size="mini"
>閫夋嫨濂楅</el-button
>
@@ -1458,16 +1466,27 @@
this.title = "娣诲姞浣撴鍗曚綅淇℃伅缁存姢";
},
idFn1(value) {
- console.log(value);
if (value) {
- this.form.dictCompId = value;
+ // 淇濆瓨淇敼鍓嶇殑 dictCompId
+ const originalCompId = this.form.dictCompId;
+
+ // 鏇存柊鍏徃鍚嶇О
+ this.form.compName = value;
+
+ // 閬嶅巻鍏徃鍒楄〃锛屾牴鎹叕鍙稿悕绉拌缃搴旂殑 drugManufacturerId
this.CompanyList.forEach((item) => {
- if (item.drugManufacturerId == this.form.dictCompId) {
- this.form.compName = item.cnName;
+ if (item.cnName == this.form.compName) {
+ this.form.dictCompId = item.drugManufacturerId;
}
});
+
+ // 濡傛灉 dictCompId 娌℃湁鍙樺寲锛岄噸缃负绌�
+ if (this.form.dictCompId === originalCompId) {
+ this.form.dictCompId = '';
+ }
}
},
+
getRemoteData(query) {
if (query) {
let compName = query;
--
Gitblit v1.8.0