From c7b33db117fd2893d7d1c93bf5d46e87d33e44d0 Mon Sep 17 00:00:00 2001
From: lkk <364857242@qq.com>
Date: 星期一, 16 十二月 2024 16:08:51 +0800
Subject: [PATCH] 初审结果查询
---
src/views/system/tijian/index.vue | 1153 +++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 994 insertions(+), 159 deletions(-)
diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue
index c56e90d..63ee372 100644
--- a/src/views/system/tijian/index.vue
+++ b/src/views/system/tijian/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-row :gutter="20">
<el-col :span="17">
<div class="grid-content bg-purple">
@@ -236,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"
@@ -277,15 +368,30 @@
/>
</el-form-item>
- <el-form-item label="宸ヤ綔鍗曚綅" prop="company">
- <el-input
+ <el-form-item label="鍗曚綅鍚嶇О" prop="compName">
+ <el-select
:disabled="isDisabled"
- v-model="form.company"
- placeholder="璇疯緭鍏ュ伐浣滃崟浣�"
- />
+ 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-item label="鏂囧寲绋嬪害" prop="wenHua">
+ <el-form-item label="鏂囧寲绋嬪害" prop="wenHua" label-width="93px">
<el-input
:disabled="isDisabled"
v-model="form.wenHua"
@@ -525,6 +631,117 @@
></el-button> -->
</div>
</el-tab-pane>
+ <el-tab-pane label="缁勫悎" name="third">
+ <!-- <div class="tab3"> -->
+ <el-row :gutter="20" style="width: 100%">
+ <el-col :span="6">
+ <div
+ style="
+ text-align: center;
+ margin-bottom: 10px;
+ margin-top: 10px;
+ "
+ >
+ 椤圭洰鍒楄〃
+ </div>
+ <el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="filterage">
+ </el-input>
+ <div class="tab3">
+ <el-tree
+ class="filter-tree"
+ v-loading="loading"
+ :data="packageList"
+ :props="defaultProp"
+ show-checkbox
+ node-key="id"
+ @check="handlepackage"
+ :default-checked-keys="checkedkeys"
+ :filter-node-method="filterpackage"
+ ref="treas"
+ :render-content="renderContents"
+ >
+ </el-tree>
+ </div>
+ </el-col>
+ <el-col :span="6">
+ <div
+ style="
+ text-align: center;
+ margin-bottom: 10px;
+ margin-top: 10px;
+ "
+ >
+ 鏄庣粏椤圭洰鍒楄〃
+ </div>
+ <div class="tab3">
+ <el-tree
+ class="filter-tree"
+ v-loading="loading"
+ :data="packagedataList"
+ node-key="proId"
+ :props="defaultpackProps"
+ :filter-node-method="filterpackage"
+ @check-change="handlePackageChecked"
+ :default-checked-keys="checkedListkey1"
+ :render-content="renderContent"
+ >
+ </el-tree>
+ </div>
+ </el-col>
+ <el-col :span="11">
+ <div class="grid-content bg-purple">
+ <div
+ style="
+ text-align: center;
+ margin-bottom: 10px;
+ margin-top: 10px;
+ "
+ >
+ 宸查�夐」鐩垪琛�
+ </div>
+ <el-table
+ :data="DataLists"
+ border
+ style="width: 100%"
+ height="400"
+ :span-method="objectspanmethod"
+ >
+ <el-table-column prop="propinName" label="妫�鏌ラ」鐩�">
+ </el-table-column>
+ <el-table-column
+ prop="proName"
+ label="鏄庣粏椤圭洰"
+ width="260px"
+ >
+ </el-table-column>
+ <el-table-column prop="proPrice" label="鍘熶环" width="56px">
+ </el-table-column>
+
+ <el-table-column
+ label="鎿嶄綔"
+ align="center"
+ fixed="right"
+ class-name="small-padding fixed-width"
+ width="50px"
+ >
+ <template slot-scope="scope">
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-delete"
+ @click="handleDel(scope.row)"
+ title="鍒犻櫎"
+ ></el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+
+ <h3 style="font-weight: 600">鍚堣锛歿{ marryalls }}鍏�</h3>
+ </div>
+ </el-col>
+ </el-row>
+ <!-- </div> -->
+ </el-tab-pane>
<el-tab-pane label="鍗曢」" name="second">
<div class="tab8">
<!-- <div class="tab7">
@@ -550,6 +767,7 @@
>
椤圭洰鍒楄〃
</div>
+ <!-- @input="gaibian" -->
<el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="filterText">
</el-input>
<div class="tab3">
@@ -645,7 +863,7 @@
</template>
</el-table-column>
</el-table>
- <div>鍚堣锛歿{ marryall }}鍏�</div>
+ <h3 style="font-weight: 600">鍚堣锛歿{ marryall }}鍏�</h3>
<!-- <el-collapse v-model="activeName" accordion v-if="list1">
<div>
<el-collapse-item title="璇烽�夋嫨椤圭洰">
@@ -904,30 +1122,35 @@
>
<el-collapse-item :name="index">
<template slot="title">
- {{
- item.pacName +
- ":" +
- item.parentName +
- " (搴旀敹閲戦:" +
- item.ordPrice +
- "鍏� / 瀹炴敹閲戦:" +
- item.nowPrice +
- "鍏�)"
- }}
+ <div style="width: 70%">
+ {{
+ item.pacName +
+ ":" +
+ item.parentName +
+ " (搴旀敹閲戦:" +
+ item.ordPrice +
+ "鍏� / 瀹炴敹閲戦:" +
+ item.nowPrice +
+ "鍏�)"
+ }}
+ </div>
+
+ <div style="width: 20%">
+ <el-button
+ type="primary"
+ @click="candelete(item)"
+ style="float: right"
+ >鍒� 闄�</el-button
+ >
+ </div>
</template>
- <el-button
- type="primary"
- @click="candelete(item)"
- style="margin: 5px"
- >鍒� 闄�</el-button
- >
<el-table
:data="item.list"
border
style="width: 100%"
height="270"
>
- <el-table-column prop="proName" label="椤圭洰" width="180">
+ <el-table-column prop="s" label="椤圭洰" width="180">
</el-table-column>
<el-table-column prop="proType" label="鎬у埆" width="180">
<template
@@ -1206,6 +1429,31 @@
</el-table>
</div>
</el-dialog>
+ <el-dialog
+ title="鎻愮ず"
+ :visible.sync="cardreader"
+ width="30%"
+ :close-on-press-escape="false"
+ :close-on-click-modal="false"
+ >
+ <template>
+ <el-radio-group v-model="cardreaderradio" @input="changeradio">
+ <el-radio :label="3">韬唤璇�</el-radio>
+ <el-radio :label="6">鍋ュ悍鐮�</el-radio>
+ </el-radio-group>
+ <div style="margin-top: 10px" v-show="cardreaderradio == 6">
+ <el-input
+ v-model="inputSSS"
+ ref="tableHeadFilterInp"
+ placeholder="璇疯緭鍏ュ唴瀹�"
+ ></el-input>
+ </div>
+ </template>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="cardreader = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="cardreadercopes">纭� 瀹�</el-button>
+ </span>
+ </el-dialog>
<div style="position: absolute; bottom: 100px; width: 360px; display: none">
<div
id="printBill"
@@ -1241,12 +1489,7 @@
</span> -->
<!-- </el-dialog> -->
<historyTj :cusIdCard="form.cusIdcard" ref="historyTj"></historyTj>
- <el-dialog
- title="鎻愮ず"
- :visible.sync="dialogVisiblese"
- width="30%"
- :before-close="handleClose"
- >
+ <el-dialog title="鎻愮ず" :visible.sync="dialogVisiblese" width="30%">
<span>鏄惁澶嶅埗鏈�杩戜竴娆＄殑浣撴椤圭洰锛�</span>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisiblese = false">鍙� 娑�</el-button>
@@ -1267,7 +1510,8 @@
getByTjNum,
} from "@/api/hosp/customer";
import { getPrintSetUp } from "@/api/system/examcharge";
-
+import axios from "axios";
+import { getIp } from "@/utils/auth";
import {
deptTreeSelect,
projectGetList,
@@ -1284,10 +1528,14 @@
getIsRequired,
getconfigKey,
getHistryTjOrderProByCusIdCard,
+ readCertCardInfos,
} from "@/api/system/tijian";
+import { addComp } from "@/api/system/comp";
+import { getCompany, queryCompany } from "@/api/team/tuanti";
import Packages from "@/components/Packages";
import { MessageBox } from "element-ui";
import VTreeTransfer from "./TreeTransfer.vue";
+import { getZhList, getlistByZhId } from "@/api/system/package";
import historyTj from "@/components/historyTj/index";
export default {
dicts: [
@@ -1311,14 +1559,27 @@
},
data() {
return {
+ open1: false,
+ filterage: "",
+ checkedkeys: [],
+ DataLists: [],
+ marryalls: 0,
+ packagedataList: [],
+ packageList: [],
+ zhxqList: [],
+ zhList: [],
+ pname: "",
filterText: "",
proIdList: [],
tableDatas: [],
dialogVisiblese: false,
+ cardreaderradio: 3,
lishi: false,
table: false,
HistoryList: {},
index: 0,
+ names: "",
+ inputSSS: "",
dictType: [
{
value: 0,
@@ -1348,7 +1609,7 @@
hospName: "",
currentDate: "",
currentTime: "",
- tjCategory: "",
+ tjCategory: "12",
formIn: {
tjPro: "浣撴璐�",
},
@@ -1424,6 +1685,7 @@
ids: [],
// 闈炲崟涓鐢�
single: true,
+ cardreader: false,
// 闈炲涓鐢�
multiple: true,
nodeobj: {},
@@ -1439,10 +1701,20 @@
// 鏍戠姸褰㈢姸
Treedata: [],
TreedataList: [],
+ TreedataLists: [],
treedataList: [],
checkedkey: [],
checkedListkey: [],
+ checkedListkey1: [],
defaultProps: {
+ children: [],
+ label: "proName",
+ },
+ defaultProp: {
+ children: [],
+ label: "zhmc",
+ },
+ defaultpackProps: {
children: [],
label: "proName",
},
@@ -1456,8 +1728,12 @@
pacName: null,
pacRemark: null,
},
- valueUrl: "ws://127.0.0.1:18890",
- WebSocket: null,
+ // valueUrl: "ws://127.0.0.1:18890",
+ // valueUrl: "ws://192.168.1.3:6789/websocket",
+ valueUrl: "ws://127.0.0.1:6789/websocket",
+ valueUrls: "ws://127.0.0.1:6789/websocket",
+ // valueUrls: "ws://"+getIp() +":6789/websocket",
+ webSocket: null,
// 韬唤璇侀渶瑕�
// socket: null,
// value: 1,
@@ -1487,15 +1763,19 @@
// 琛ㄥ崟鍙傛暟
// 琛ㄥ崟鍙傛暟
+ obj: {},
+ CompanyList: [],
form: {
cusIdcard: "",
- tjType: "2",
+ tjType: "3",
cusSex: 1,
cusNational: "1",
- cusMarryStatus: "1",
+ cusMarryStatus: "5",
idType: "1",
ageUnit: "0",
},
+ form1: {},
+ title: "",
// 琛ㄥ崟鏍￠獙
rules: {
cusName: [{ required: true, message: "", trigger: "blur" }],
@@ -1509,21 +1789,98 @@
// ],
cusIdcard: [{ required: true, message: "", trigger: "change" }],
},
+ rules1: {
+ cnName: [{ required: true, trigger: "blur" }],
+ contactPerson: [{ required: true, trigger: "blur" }],
+ contactPhone: [
+ {
+ required: true,
+ trigger: "blur",
+ },
+ {
+ pattern: /^1[3-9]\d{9}$/,
+ trigger: "blur",
+ },
+ ],
+ },
};
},
watch: {
filterText(val) {
this.$refs.tree.filter(val);
},
+ filterage(val) {
+ this.$refs.treas.filter(val);
+ },
},
created() {
- this.getCurrentDateTime();
+ this.getCompanyList();
+ this.getCurrentDateTime();
this.startTimer();
this.getList1();
// this.getData();
},
+ mounted() {},
+
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) {
+
+ const originalCompId = this.form.dictCompId;
+ this.form.compName = value;
+ this.CompanyList.forEach((item) => {
+ if (item.cnName == this.form.compName) {
+ this.form.dictCompId = item.drugManufacturerId;
+ }
+ });
+
+ if (this.form.dictCompId === originalCompId) {
+ this.form.dictCompId = '';
+ }
+ }
+ },
getCurrentDateTime() {
const currentDate = new Date();
@@ -1555,7 +1912,20 @@
},
filterNode(value, data) {
if (!value) return true;
- return data.proName.indexOf(value) !== -1;
+ // return data.proName.indexOf(value) !== -1;
+ if (data.proName.indexOf(value) !== -1) {
+ return data.proName.indexOf(value) !== -1;
+ } else {
+ return data.proEngName.indexOf(value) !== -1;
+ }
+ },
+ filterpackage(value, data) {
+ if (!value) return true;
+ if (data.zhmc.indexOf(value) !== -1) {
+ return data.zhmc.indexOf(value) !== -1;
+ } else {
+ return data.pym.indexOf(value) !== -1;
+ }
},
beforeDestroy() {
clearInterval(this.timer);
@@ -2015,7 +2385,13 @@
this.discount = this.form.discount;
}
if (this.form.tjType === null) {
- this.form.tjType = "2";
+ this.form.tjType = "3";
+ }
+ if (this.form.cusMarryStatus === "null") {
+ this.form.cusMarryStatus = "5";
+ }
+ if (this.form.cusNational === "null") {
+ this.form.cusNational = "1";
}
if (this.form.reservationId != null) {
if (this.form.groupingId) {
@@ -2030,7 +2406,6 @@
if (this.tableData1) {
this.tableData1.forEach((item) => {
this.TotalPrice1 += item.ysPrice;
- console.log(this.TotalPrice1);
this.TotalPrice = (
this.TotalPrice1 *
(this.discount / 10)
@@ -2086,6 +2461,7 @@
} else {
_this.tcShow = true;
this.$message.warning("鏆傛棤棰勭害淇℃伅");
+ _this.resetpackage();
}
_this.isDisabled = true;
} else {
@@ -2107,7 +2483,6 @@
} else if ("MozWebSocket" in window) {
websocket = new MozWebSocket(url);
} else {
- // console.log("SockJS");
}
if (websocket == null) {
@@ -2124,72 +2499,28 @@
this.websocket = websocket;
// 杩炴帴璁惧
var jsonObj = {
- name: "connect",
+ // name: "connect",
+ type: "1",
};
var jStr = JSON.stringify(jsonObj);
this.websocket.send(jStr);
- alert("璇锋斁韬唤璇佸啀鐐圭‘璁�");
+ // alert("璇锋斁韬唤璇佸啀鐐圭‘璁�");
var jsonObj = {
- name: "readCert",
+ // name: "readCert",
};
- var jStr = JSON.stringify(jsonObj);
- this.websocket.send(jStr);
+ // var jStr = JSON.stringify(jsonObj);
+ // this.websocket.send(jStr);
this.dialogVisible = false;
};
//鎺ユ敹鍒版秷鎭殑鍥炶皟鏂规硶
- websocket.onmessage = function (event) {
+ websocket.onmessage = (event) => {
var resultObj = eval("(" + event.data + ")");
//resultFlag涓�0浠ｈ〃璇诲崱鎴愬姛
- if (
- resultObj.name == "readCard" ||
- resultObj.name == "readCert" ||
- resultObj.name == "PushWithImg" ||
- resultObj.name == "PushWithOutImg"
- ) {
- if (resultObj.resultFlag == "0") {
- //鍥炴樉鐩稿叧鏁版嵁
- _this.form.cusName = resultObj.resultContent.partyName;
- _this.form.cusSex =
- resultObj.resultContent.gender == "0" ? "濂�" : "鐢�";
- _this.form.cusNational = resultObj.resultContent.nation;
- _this.form.cusBrithday = resultObj.resultContent.bornDay;
- if (_this.form.cusBrithday) {
- _this.form.cusBrithday = _this.form.cusBrithday.replace(
- /^(\d{4})(\d{2})(\d{2})$/,
- "$1-$2-$3"
- );
- }
- _this.form.cusAddr = resultObj.resultContent.certAddress;
- _this.form.cusIdcard = resultObj.resultContent.certNumber;
- _this.imageUrl =
- "data:image/jpeg;base64," +
- resultObj.resultContent.identityPic;
- if (
- resultObj.name == "readCert" ||
- resultObj.name == "PushWithImg"
- ) {
- this.imageUrl =
- "data:image/jpeg;base64," +
- resultObj.resultContent.identityPrintPic;
- }
- } else if (resultObj.resultFlag == "-1") {
- if (resultObj.errorMsg == "绔彛鎵撳紑澶辫触") {
- //alert("璇诲崱鍣ㄦ湭杩炴帴");
- } else {
- //alert(resultObj.errorMsg);
- }
- } else if (resultObj.resultFlag == "-2") {
- //alert(resultObj.errorMsg);
- }
- } else if (resultObj.name == "getStatus") {
- if (resultObj.resultFlag == "0") {
- if (resultObj.status == "0") {
- } else {
- alert("璁惧杩炴帴宸叉柇寮�锛岃妫�鏌ヨ鍗″櫒杩炴帴");
- }
- }
- }
+
+ // TODO 浠ヤ笅浠ｇ爜鍙兘鏄尘宸濅娇鐢ㄧ殑
+ // this.jingChuanHandlerWebSocketResult(resultObj)
+ this.readCardWebSocket(resultObj);
};
//杩炴帴鍏抽棴鐨勫洖璋冩柟娉�
@@ -2200,9 +2531,337 @@
this.$refs.aaa.open = true;
this.$refs.aaa.getAllList();
this.$refs.aaa.title = "璇佷欢瀛楀吀";
+ } else if (res.msg == "S") {
+ this.cardreader = true;
+ _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) => {
+ // _this.form.cusName = res.data.name;
+ // _this.form.cusSex =
+ // res.data.sex;
+ // _this.form.cusNational = res.data.mz;
+ // _this.form.cusBrithday = res.data.csrq;
+ // if (_this.form.cusBrithday) {
+ // _this.form.cusBrithday = _this.form.cusBrithday.replace(
+ // /^(\d{4})(\d{2})(\d{2})$/,
+ // "$1-$2-$3"
+ // );
+ // }
+ // _this.form.cusAddr = res.data.addres;
+ // _this.form.cusIdcard = res.data.card;
+ // });
}
}
});
+ }
+ },
+ // 鏈�鏂颁娇鐢╳ebSocket閫氫俊
+ 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" ? "濂�" : "鐢�";
+ _this.form.cusNational = resultObj.data.mz;
+ _this.form.cusBrithday = resultObj.data.csrq;
+ if (_this.form.cusBrithday) {
+ _this.form.cusBrithday = _this.form.cusBrithday.replace(
+ /^(\d{4})(\d{2})(\d{2})$/,
+ "$1-$2-$3"
+ );
+ }
+ _this.form.cusAddr = resultObj.data.addres;
+ _this.form.cusIdcard = resultObj.data.card;
+ _this.imageUrl = "data:image/jpeg;base64," + resultObj.data.img;
+ if (resultObj.name == "readCert" || resultObj.name == "PushWithImg") {
+ this.imageUrl = "data:image/jpeg;base64," + resultObj.data.img;
+ }
+ } else {
+ this.$message.warning("璇锋斁缃韩浠借瘉鍚庡啀鐐瑰嚮璇诲彇");
+ } /* if (resultObj.resultFlag == "-1") {
+ if (resultObj.errorMsg == "绔彛鎵撳紑澶辫触") {
+ //alert("璇诲崱鍣ㄦ湭杩炴帴");
+ } else {
+ //alert(resultObj.errorMsg);
+ }
+ } else if (resultObj.resultFlag == "-2") {
+ //alert(resultObj.errorMsg);
+ } */
+ },
+ // TODO 浠ヤ笅浠ｇ爜鍙兘鏄尘宸濅娇鐢ㄧ殑
+ jingChuanHandlerWebSocketResult(resultObj) {
+ let _this = this;
+ if (
+ resultObj.name == "readCard" ||
+ resultObj.name == "readCert" ||
+ resultObj.name == "PushWithImg" ||
+ resultObj.name == "PushWithOutImg"
+ ) {
+ if (resultObj.resultFlag == "0") {
+ //鍥炴樉鐩稿叧鏁版嵁
+ _this.form.cusName = resultObj.resultContent.partyName;
+ _this.form.cusSex =
+ resultObj.resultContent.gender == "0" ? "濂�" : "鐢�";
+ _this.form.cusNational = resultObj.resultContent.nation;
+ _this.form.cusBrithday = resultObj.resultContent.bornDay;
+ if (_this.form.cusBrithday) {
+ _this.form.cusBrithday = _this.form.cusBrithday.replace(
+ /^(\d{4})(\d{2})(\d{2})$/,
+ "$1-$2-$3"
+ );
+ }
+ _this.form.cusAddr = resultObj.resultContent.certAddress;
+ _this.form.cusIdcard = resultObj.resultContent.certNumber;
+ _this.imageUrl =
+ "data:image/jpeg;base64," + resultObj.resultContent.identityPic;
+ if (resultObj.name == "readCert" || resultObj.name == "PushWithImg") {
+ this.imageUrl =
+ "data:image/jpeg;base64," +
+ resultObj.resultContent.identityPrintPic;
+ }
+ } else if (resultObj.resultFlag == "-1") {
+ if (resultObj.errorMsg == "绔彛鎵撳紑澶辫触") {
+ //alert("璇诲崱鍣ㄦ湭杩炴帴");
+ } else {
+ //alert(resultObj.errorMsg);
+ }
+ } else if (resultObj.resultFlag == "-2") {
+ //alert(resultObj.errorMsg);
+ }
+ } else if (resultObj.name == "getStatus") {
+ if (resultObj.resultFlag == "0") {
+ if (resultObj.status == "0") {
+ } else {
+ alert("璁惧杩炴帴宸叉柇寮�锛岃妫�鏌ヨ鍗″櫒杩炴帴");
+ }
+ }
+ }
+ },
+ changeradio() {
+ if (this.cardreaderradio != 3) {
+ this.$nextTick(() => {
+ this.$refs.tableHeadFilterInp.focus();
+ });
+ }
+ },
+ cardreadercopes() {
+ let _this = this;
+
+ if (this.cardreaderradio == 3) {
+ var websocket = null;
+ var url = this.valueUrls;
+ // var url = 'ws://'+ getIp() +':6789/websocket'
+ if ("WebSocket" in window) {
+ websocket = new WebSocket(url);
+ } else if ("MozWebSocket" in window) {
+ websocket = new MozWebSocket(url);
+ } else {
+ }
+ if (websocket == null) {
+ alert("11111");
+ }
+ websocket.onopen = function () {
+ try {
+ // 杩炴帴璁惧
+ var jsonObjs = {
+ type: 1,
+ data: {},
+ };
+ var jStrs = JSON.stringify(jsonObjs);
+ websocket.send(jStrs);
+ } catch (err) {
+ var tryTime = 0;
+ // 閲嶈瘯10娆★紝姣忔涔嬮棿闂撮殧3绉�
+ if (tryTime < 1) {
+ var t1 = setTimeout(function () {
+ tryTime++;
+ var jsonObjs = {
+ type: 1,
+ data: {},
+ };
+ var jStrs = JSON.stringify(jsonObjs);
+ websocket.send(jStrs);
+ }, 1 * 1000);
+ } else {
+ console.error("閲嶈繛澶辫触.");
+ }
+ }
+ };
+ websocket.onclose = function () {
+ alert("璇诲崱鍣ㄨ繛鎺ュ叧闂�");
+ };
+ websocket.onmessage = function (event) {
+ var resultObj = JSON.parse(event.data);
+ _this.form.cusName = resultObj.data.name;
+ _this.form.cusSex = resultObj.data.sex;
+ _this.form.cusNational = resultObj.data.mz;
+ _this.form.cusBrithday = resultObj.data.csrq;
+ if (_this.form.cusBrithday) {
+ _this.form.cusBrithday = _this.form.cusBrithday.replace(
+ /^(\d{4})(\d{2})(\d{2})$/,
+ "$1-$2-$3"
+ );
+ }
+ _this.form.cusIdcard = resultObj.data.card;
+ if (_this.form.cusIdcard) {
+ const reg =
+ /^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/;
+ if (reg.test(_this.form.cusIdcard)) {
+ var org_birthday = _this.form.cusIdcard.substring(6, 14);
+ var birthday =
+ org_birthday.substring(0, 4) +
+ "-" +
+ org_birthday.substring(4, 6) +
+ "-" +
+ org_birthday.substring(6, 8);
+ var birthdays = new Date(birthday.replace(/-/g, "-"));
+ let d = new Date();
+ let age =
+ d.getFullYear() -
+ birthdays.getFullYear() -
+ (d.getMonth() < birthdays.getMonth() ||
+ (d.getMonth() == birthdays.getMonth() &&
+ d.getDate() < birthdays.getDate())
+ ? 1
+ : 0);
+
+ _this.form.age = age;
+ }
+ }
+ _this.form.cusAddr = resultObj.data.addres;
+
+ _this.cardreader = false;
+ };
+
+ //杩炴帴鍙戠敓閿欒鐨勫洖璋冩柟娉�
+ websocket.onerror = function () {
+ alert("璇锋鏌ヨ鍗″櫒杩炴帴鏄惁姝ｅ父");
+ };
+ } else {
+ // if (_this.inputSSS.indexOf(":1") != -1) {
+
+ // var str1 = _this.inputSSS.indexOf(":1");
+ // var result1 = _this.inputSSS.substring(0, str1);
+
+ // var str2 = _this.inputSSS.indexOf(":1");
+ // var result2 = _this.inputSSS.substring(
+ // str2 + 2,
+ // _this.inputSSS.length
+ // );
+
+ // _this.inputSSS = result1 + result2;
+ // }
+ _this.inputSSS = _this.inputSSS.replace(":1", "");
+ var websocket = null;
+ var url = this.valueUrls;
+ // var url = 'ws://'+ getIp() +':6789/websocket'
+ if ("WebSocket" in window) {
+ websocket = new WebSocket(url);
+ } else if ("MozWebSocket" in window) {
+ websocket = new MozWebSocket(url);
+ } else {
+ }
+ if (websocket == null) {
+ alert("11111");
+ }
+ websocket.onopen = function () {
+ try {
+ // 杩炴帴璁惧
+ var jsonObjs = {
+ type: 2,
+ data: {
+ qrcode: _this.inputSSS,
+ },
+ };
+ var jStrs = JSON.stringify(jsonObjs);
+ websocket.send(jStrs);
+ } catch (err) {
+ var tryTime = 0;
+ // 閲嶈瘯10娆★紝姣忔涔嬮棿闂撮殧3绉�
+ if (tryTime < 1) {
+ var t1 = setTimeout(function () {
+ tryTime++;
+ var jsonObjs = {
+ type: 2,
+ data: {
+ qrcode: _this.inputSSS,
+ },
+ };
+ var jStrs = JSON.stringify(jsonObjs);
+ websocket.send(jStrs);
+ }, 1 * 1000);
+ } else {
+ console.error("閲嶈繛澶辫触.");
+ }
+ }
+ };
+ websocket.onclose = function () {
+ alert("璇诲崱鍣ㄨ繛鎺ュ叧闂�");
+ };
+ websocket.onmessage = function (event) {
+ var resultObj = JSON.parse(event.data);
+ _this.form.cusName = resultObj.data.name;
+
+ if (resultObj.data.nation == "姹夋棌") {
+ _this.form.cusNational = "1";
+ }
+ if (resultObj.data.gender == "鐢�") {
+ _this.form.cusSex = 0;
+ } else {
+ _this.form.cusSex = 1;
+ }
+ _this.form.cusBrithday = resultObj.data.birthday;
+ if (_this.form.cusBrithday) {
+ _this.form.cusBrithday = _this.form.cusBrithday.replace(
+ /^(\d{4})(\d{2})(\d{2})$/,
+ "$1-$2-$3"
+ );
+ }
+ _this.form.cusPhone = resultObj.data.phone;
+ _this.form.cusIdcard = resultObj.data.idenno;
+ if (_this.form.cusIdcard) {
+ const reg =
+ /^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/;
+ if (reg.test(_this.form.cusIdcard)) {
+ var org_birthday = _this.form.cusIdcard.substring(6, 14);
+ var birthday =
+ org_birthday.substring(0, 4) +
+ "-" +
+ org_birthday.substring(4, 6) +
+ "-" +
+ org_birthday.substring(6, 8);
+ var birthdays = new Date(birthday.replace(/-/g, "-"));
+ let d = new Date();
+ let age =
+ d.getFullYear() -
+ birthdays.getFullYear() -
+ (d.getMonth() < birthdays.getMonth() ||
+ (d.getMonth() == birthdays.getMonth() &&
+ d.getDate() < birthdays.getDate())
+ ? 1
+ : 0);
+
+ _this.form.age = age;
+ }
+ }
+ _this.cardreader = false;
+ };
+
+ //杩炴帴鍙戠敓閿欒鐨勫洖璋冩柟娉�
+ websocket.onerror = function () {
+ alert("璇锋鏌ヨ鍗″櫒杩炴帴鏄惁姝ｅ父");
+ };
}
},
@@ -2256,6 +2915,7 @@
this.taocan = false;
this.malldisble = false;
this.defaultKeys = [];
+ this.DataLists = [];
},
cancell() {
@@ -2339,6 +2999,7 @@
let _this = this;
_this.pacId = "";
this.proIds = [];
+ this.tjCategory = "12";
let data = {
cusId,
pacId: _this.pacId,
@@ -2403,54 +3064,106 @@
}
this.single = selection.length !== 1;
this.multiple = !selection.length;
+ if (this.tableData1.length != 0) {
+ this.tableData.forEach((item) => {
+ this.tableData1.forEach((item1) => {
+ item.tjProjectList.forEach((item2) => {
+ if (item2.proId == item1.proPrantId && item1.pacName == "鍗曢」") {
+ this.$confirm(
+ "璇ュ椁愬寘鍚簡宸查�夊崟椤癸紝鏄惁纭閫夋嫨璇ュ椁愶紵",
+ "纭淇℃伅",
+ {
+ distinguishCancelAndClose: true,
+ confirmButtonText: "纭",
+ cancelButtonText: "鍙栨秷",
+ }
+ )
+ .then(() => {
+ this.$message({
+ type: "success",
+ message: "璇锋敞鎰忔煡鐪嬩环鏍�",
+ });
+ })
+ .catch((action) => {
+ if (action === "cancel") {
+ let del_row = selection.shift();
+ this.$refs.tb.toggleRowSelection(del_row, false);
+ this.$message({
+ type: "warning",
+ message: "宸插彇娑�",
+ });
+ }
+ });
+ // this.$message.warning("璇ュ椁愬寘鍚簡宸查�夊崟椤癸紝鑻ラ�夋嫨璇ュ椁愶紝璇峰厛鍒犻櫎鍗曢」");
+ }
+ });
+ });
+ });
+ }
if (selection[0]) {
// this.DataList = [];
// this.data = JSON.parse(JSON.stringify(this.dXData));
- selection[0].tjProjectList.forEach((selectionitem) => {
- this.Treedata.forEach((item) => {
- if (selectionitem.proName == item.proName) {
- item.disabled = true;
- item.tjProjectList = [];
- }
- // if (item.tjProjectList) {
- // item.tjProjectList.forEach((item1) => {
- // if (selectionitem.proName == item1.proName) {
- // item1.disabled = true;
- // item1.tjProjectList = [];
- // }
- // if (item1.tjProjectList) {
- // item1.tjProjectList.forEach((item2) => {
- // if (selectionitem.proName == item2.proName) {
- // item2.disabled = true;
- // item2.tjProjectList = [];
- // }
- // });
- // }
- // });
- // }
- });
- this.TreedataList.forEach((item3) => {
- if (item3.proParentId == selectionitem.proId) {
- item.disabled = true;
- }
- });
- });
+ // selection[0].tjProjectList.forEach((selectionitem) => {
+ // this.Treedata.forEach((item) => {
+ // if (selectionitem.proName == item.proName) {
+ // item.disabled = true;
+ // item.tjProjectList = [];
+ // }
+ // if (item.tjProjectList) {
+ // item.tjProjectList.forEach((item1) => {
+ // if (selectionitem.proName == item1.proName) {
+ // item1.disabled = true;
+ // item1.tjProjectList = [];
+ // }
+ // if (item1.tjProjectList) {
+ // item1.tjProjectList.forEach((item2) => {
+ // if (selectionitem.proName == item2.proName) {
+ // item2.disabled = true;
+ // item2.tjProjectList = [];
+ // }
+ // });
+ // }
+ // });
+ // }
+ // });
+ // this.TreedataList.forEach((item3) => {
+ // if (item3.proParentId == selectionitem.proId) {
+ // item.disabled = true;
+ // }
+ // });
+ // });
} else {
this.treedataList = JSON.parse(JSON.stringify(this.dXData));
return;
}
},
handleClick(tab, event) {
- console.log(tab, event);
- if (tab.label == "鍗曢」") {
+ if (this.activeNames == "second") {
this.DataList = [];
+ this.checkedkey = [];
this.getDataList();
+ } else if (this.activeNames == "third") {
+ this.DataLists = [];
+ this.checkedkeys = [];
+ getZhList().then((response) => {
+ if (response.data) {
+ this.packageList = response.data;
+ }
+ this.loading = false;
+ });
}
},
+ // gaibian(val){
+ // let pname = val;
+ // getProParentIdDxList(pname).then(response=>{
+ // this.Treedata = response.data.list;
+ // })
+ // },
getDataList() {
this.loading = true;
getProParentIdDxList().then((response) => {
this.Treedata = response.data.list;
+
if (this.tableData[0]) {
this.tableData[0].tjProjectList.forEach((selectionitem) => {
this.Treedata.forEach((item) => {
@@ -2460,41 +3173,123 @@
});
});
}
- this.checkedkey.push(this.Treedata[0].proId);
- let proId = this.Treedata[0].proId;
- getProSonDxList(proId).then((res) => {
- this.TreedataList = res.data.list;
- this.TreedataList.forEach((item) => {
- this.checkedListkey.push(item.proId);
- this.DataList.push(item);
- this.DataList.forEach((item) => {
- item.propinName = this.Treedata[0].proName;
- });
- });
- this.TotalPrice1 = 0;
- this.marryall = 0;
- if (this.DataList.length != 0) {
- this.list1 = false;
- this.DataList.forEach((item) => {
- this.TotalPrice1 = item.proPrice + this.TotalPrice1;
- this.marryall += item.proPrice;
- });
- }
- });
this.loading = false;
});
},
+ handlepackage(data, checked, checkedNodes) {
+ this.dataObj = data;
+ if (checked.checkedNodes.length != 0) {
+ this.$refs.treas.setCheckedKeys([data.id]);
+ let datas = {
+ zhId: data.id,
+ };
+ getlistByZhId(datas).then((res) => {
+ this.packagedataList = res.data.tjProjectList;
+
+ this.DataLists = [];
+ this.checkedListkey1 = [];
+ for (var i = 0; i < this.packagedataList.length; i++) {
+ let proId = this.packagedataList[i].proId;
+ this.checkedListkey1.push(proId);
+ // this.DataLists.push(this.packagedataList[i]);
+ 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) => {
+ this.marryalls += item1.proPrice;
+
+ this.packagedataList.forEach((item3) => {
+ if (item1.proParentId == item3.proId) {
+ item1.propinName = item3.proName;
+ }
+ });
+ });
+ }
+ });
+ });
+ }
+ });
+ } else if (checked.checkedNodes.length == 0) {
+ this.DataLists = [];
+ this.marryalls = 0; // 娓呴浂鎬讳环
+ this.checkedListkey1 = [];
+ }
+ },
+ objectspanmethod({ row, column, rowIndex, columnIndex }) {
+ let fields = ["propinName"];
+ let cellValue = row[column.property];
+ if (cellValue && fields.includes(column.property)) {
+ let prevRow = this.DataLists[rowIndex - 1];
+ let nextRow = this.DataLists[rowIndex + 1];
+ if (prevRow && prevRow[column.property] === cellValue) {
+ return { rowspan: 0, colspan: 0 };
+ } else {
+ let countRowspan = 1;
+ while (nextRow && nextRow[column.property] === cellValue) {
+ nextRow = this.DataLists[++countRowspan + rowIndex];
+ }
+
+ if (countRowspan > 1) {
+ return { rowspan: countRowspan, colspan: 1 };
+ }
+ }
+ }
+
+ // if (columnIndex == 3) {
+ // let rowspan = 0;
+ // this.DataLists.forEach((element) => {
+ // if (element.propinName === row.propinName) {
+ // rowspan++;
+ // }
+ // });
+ // return [rowspan, 1];
+ // }
+ },
+ handlePackageChecked(data, checked, checkedNodes) {
+ if (checked == false) {
+ this.DataLists.forEach((item, index) => {
+ if (item.proId == data.proId) {
+ this.DataLists.splice(index, 1);
+ this.marryalls = 0; // 閲嶇疆鍚堣閲戦
+ this.DataLists.forEach((item1) => {
+ this.marryalls += item1.proPrice; // 閲嶆柊璁＄畻鍚堣閲戦
+ });
+ }
+ });
+ } else if (checked == true) {
+ this.DataLists.push(data); // 娣诲姞鏁版嵁鍒板凡閫夊垪琛�
+ this.DataLists.forEach((item1) => {
+ if (item1.proParentId == this.dataObj.proId) {
+ item1.propinName = this.dataObj.proName; // 璁剧疆鐖剁骇鍚嶇О
+ }
+ });
+ // this.spliceData();
+ this.marryalls = 0; // 閲嶇疆鍚堣閲戦
+ this.DataLists.forEach((item1) => {
+ this.marryalls += item1.proPrice; // 閲嶆柊璁＄畻鍚堣閲戦
+ });
+ }
+ },
// 鐐瑰嚮鑾峰彇姣忎釜鏍戣妭鐐�
handleCurrentChecked(data, checked, checkedNodes) {
this.dataObj = data;
if (checked.checkedNodes.length != 0) {
this.$refs.tree.setCheckedKeys([data.proId]);
+
let proId = data.proId;
getProSonDxList(proId).then((res) => {
this.TreedataList = res.data.list;
this.TreedataList.forEach((item) => {
this.checkedListkey.push(item.proId);
+
this.DataList.push(item);
this.spliceData();
this.DataList.forEach((item1) => {
@@ -2543,6 +3338,14 @@
</span>
);
},
+ renderContents(h, { node, data, store }) {
+ return (
+ <span class="custom-tree-node">
+ <span>{node.label}</span>
+ <span>({data.price}鍏�)</span>
+ </span>
+ );
+ },
// 鐐瑰嚮鑾峰彇姣忎釜鏍戣妭鐐�
handleCurrentChecked1(data, checked, checkedNodes) {
if (checked == false) {
@@ -2582,9 +3385,19 @@
}
});
},
+ handleDel(row) {
+ this.DataLists.forEach((item, index) => {
+ if (item.proId == row.proId) {
+ this.DataLists.splice(index, 1);
+ this.marryalls = 0;
+ this.DataLists.forEach((item1) => {
+ this.marryalls += item1.proPrice;
+ });
+ }
+ });
+ },
// // 榛樿鎺ュ彈鍥涗釜鍊� { 褰撳墠琛岀殑鍊�, 褰撳墠鍒楃殑鍊�, 琛岀殑涓嬫爣, 鍒楃殑涓嬫爣 }
objectSpanMethod({ row, column, rowIndex, columnIndex }) {
- console.log(row, column, rowIndex, columnIndex);
let fields = ["propinName"];
let cellValue = row[column.property];
if (cellValue && fields.includes(column.property)) {
@@ -2626,13 +3439,18 @@
this.proIds.push(item.proId);
});
}
+ if (this.DataLists.length != 0) {
+ this.DataLists.forEach((item) => {
+ this.proIds.push(item.proId);
+ });
+ }
let data = {
cusId,
pacId: _this.pacId,
proIds: this.proIds,
};
getaddtTransition(data).then((response) => {
- if (response.code === 200) {
+ if (response.code == 200) {
let cusId = this.form.cusIdcard;
this.proIds = [];
getTransitionList(cusId).then((response) => {
@@ -2641,8 +3459,8 @@
if (this.tableData1) {
this.tableData1.forEach((item) => {
this.TotalPrice1 += item.nowPrice;
- if (item.pacName === null) {
- item.pacName = "鍗曢」";
+ if (item.tjCategory != null) {
+ this.tjCategory = item.tjCategory;
}
if (item.pacName == "鍗曢」") {
item.list.forEach((item9) => {
@@ -2659,19 +3477,21 @@
} else {
this.TotalPrice = TotalPrice;
}
-
this.list1 = false;
this.list3 = true;
+ this.list2 = false;
} else {
this.list1 = true;
-
this.TotalPrice = "0.00";
}
});
+ } else {
+ console.log(澶辫触浜�);
}
});
this.taocan = false;
this.defaultKeys = [];
+ this.DataLists = [];
},
// changeCategoryKeys(val) {
// this.proIds = [];
@@ -3070,11 +3890,17 @@
width: 100%;
display: flex;
}
-
.tab3 {
- max-height: 390px;
+ border: 1px solid #dcdfe6;
+}
+
+.filter-tree {
+ /* max-height: 360px;
overflow-y: auto;
- border: 1px solid #d9d9d9;
+ border: 1px solid #d9d9d9; */
+ overflow: auto;
+ flex: 1;
+ height: 350px;
}
.tab2 {
@@ -3141,7 +3967,12 @@
width: 300px;
height: 300px;
}
-
+.dialog-footer2 {
+ width: 960px;
+ height: 36px;
+ display: flex;
+ justify-content: center;
+}
.el-input--suffix .el-input__inner {
padding-right: 15px;
}
@@ -3172,4 +4003,8 @@
.content {
margin-bottom: 25px;
}
+.tab8 {
+ width: 100%;
+ display: flex;
+}
</style>
--
Gitblit v1.8.0