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 | 597 +++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 430 insertions(+), 167 deletions(-)
diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue
index da8a012..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"
@@ -574,6 +680,9 @@
:data="packagedataList"
node-key="proId"
:props="defaultpackProps"
+ :filter-node-method="filterpackage"
+ @check-change="handlePackageChecked"
+ :default-checked-keys="checkedListkey1"
:render-content="renderContent"
>
</el-tree>
@@ -1041,7 +1150,7 @@
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
@@ -1421,6 +1530,8 @@
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";
@@ -1448,6 +1559,7 @@
},
data() {
return {
+ open1: false,
filterage: "",
checkedkeys: [],
DataLists: [],
@@ -1593,6 +1705,7 @@
treedataList: [],
checkedkey: [],
checkedListkey: [],
+ checkedListkey1: [],
defaultProps: {
children: [],
label: "proName",
@@ -1615,10 +1728,12 @@
pacName: null,
pacRemark: null,
},
- valueUrl: "ws://127.0.0.1:18890",
+ // 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,
+ webSocket: null,
// 韬唤璇侀渶瑕�
// socket: null,
// value: 1,
@@ -1648,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" }],
@@ -1670,6 +1789,20 @@
// ],
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: {
@@ -1681,13 +1814,73 @@
},
},
created() {
+ 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();
@@ -2192,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) {
@@ -2284,7 +2483,6 @@
} else if ("MozWebSocket" in window) {
websocket = new MozWebSocket(url);
} else {
- // console.log("SockJS");
}
if (websocket == null) {
@@ -2301,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);
};
//杩炴帴鍏抽棴鐨勫洖璋冩柟娉�
@@ -2382,14 +2536,14 @@
_this.cardreaderradio = 3;
_this.inputSSS = "";
// let url = window.location.protocol + "//" + window.location.host;
- // console.log(url);
+
// axios
// .get("http://localhost:81/dev-api/readCertCardInfos")
// .then((res) => {
- // console.log(res);
+
// })
// .catch((err) => {
- // console.log(err);
+
// });
// readCertCardInfos().then((res) => {
@@ -2412,6 +2566,88 @@
});
}
},
+ // 鏈�鏂颁娇鐢╳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(() => {
@@ -2431,7 +2667,6 @@
} else if ("MozWebSocket" in window) {
websocket = new MozWebSocket(url);
} else {
- // console.log("SockJS");
}
if (websocket == null) {
alert("11111");
@@ -2478,8 +2713,34 @@
"$1-$2-$3"
);
}
- _this.form.cusAddr = resultObj.data.addres;
_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;
};
@@ -2489,7 +2750,7 @@
};
} else {
// if (_this.inputSSS.indexOf(":1") != -1) {
-
+
// var str1 = _this.inputSSS.indexOf(":1");
// var result1 = _this.inputSSS.substring(0, str1);
@@ -2501,7 +2762,7 @@
// _this.inputSSS = result1 + result2;
// }
- _this.inputSSS = _this.inputSSS.replace(":1","");
+ _this.inputSSS = _this.inputSSS.replace(":1", "");
var websocket = null;
var url = this.valueUrls;
// var url = 'ws://'+ getIp() +':6789/websocket'
@@ -2510,7 +2771,6 @@
} else if ("MozWebSocket" in window) {
websocket = new MozWebSocket(url);
} else {
- // console.log("SockJS");
}
if (websocket == null) {
alert("11111");
@@ -2552,17 +2812,49 @@
websocket.onmessage = function (event) {
var resultObj = JSON.parse(event.data);
_this.form.cusName = resultObj.data.name;
- _this.form.cusSex = resultObj.data.gender;
- _this.form.cusNational = resultObj.data.nation;
- // _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"
- // );
- // }
+
+ 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;
};
@@ -2776,7 +3068,6 @@
this.tableData.forEach((item) => {
this.tableData1.forEach((item1) => {
item.tjProjectList.forEach((item2) => {
- console.log(item1);
if (item2.proId == item1.proPrantId && item1.pacName == "鍗曢」") {
this.$confirm(
"璇ュ椁愬寘鍚簡宸查�夊崟椤癸紝鏄惁纭閫夋嫨璇ュ椁愶紵",
@@ -2857,42 +3148,13 @@
getZhList().then((response) => {
if (response.data) {
this.packageList = response.data;
- // this.checkedkeys.push(this.packageList[0].id);
- // let datas = {
- // zhId: this.packageList[0].id,
- // };
- // getlistByZhId(datas).then((res) => {
- // this.packagedataList = res.data.tjProjectList;
- // for (var i = 0; i < this.packagedataList.length; i++) {
- // let proId = this.packagedataList[i].proId;
- // getProSonDxList(proId).then((res) => {
- // this.TreedataList = res.data.list;
- // this.TreedataList.forEach((item) => {
- // 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;
- // }
- // });
- // });
- // }
- // });
- // });
- // }
- // });
}
this.loading = false;
});
}
},
// gaibian(val){
- // console.log(val);
// let pname = val;
- // console.log(pname);
// getProParentIdDxList(pname).then(response=>{
// this.Treedata = response.data.list;
// })
@@ -2901,6 +3163,7 @@
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) => {
@@ -2910,40 +3173,12 @@
});
});
}
- // if (this.DataLists.length != 0) {
- // this.DataLists.forEach((selectionitem) => {
- // this.Treedata.forEach((item) => {
- // if (selectionitem.propinName == item.proName) {
- // item.disabled = true;
- // }
- // });
- // });
- // }
- // 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 = {
@@ -2951,16 +3186,26 @@
};
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;
@@ -2973,25 +3218,9 @@
}
});
} else if (checked.checkedNodes.length == 0) {
- // for (var i = 0; i < data.tjProjectList.length; i++) {
- // let proId = data.tjProjectList[i].proId;
- // getProSonDxList(proId).then((res) => {
- // this.TreedataList = res.data.list;
- // this.TreedataList.forEach((item) => {
- // this.DataLists.forEach((item1, index) => {
- // if (item.proId == item1.proId) {
- // this.DataLists.splice(index, 1);
- // }
- // });
- // });
- // this.marryalls = 0
- // if(this.DataLists.length != 0){
- // this.DataLists.forEach((item1, index) => {
- // this.marryalls += item1.proPrice;
- // })
- // }
- // });
- // }
+ this.DataLists = [];
+ this.marryalls = 0; // 娓呴浂鎬讳环
+ this.checkedListkey1 = [];
}
},
objectspanmethod({ row, column, rowIndex, columnIndex }) {
@@ -3024,17 +3253,43 @@
// 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) => {
@@ -3224,11 +3479,14 @@
}
this.list1 = false;
this.list3 = true;
+ this.list2 = false;
} else {
this.list1 = true;
this.TotalPrice = "0.00";
}
});
+ } else {
+ console.log(澶辫触浜�);
}
});
this.taocan = false;
@@ -3709,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;
}
--
Gitblit v1.8.0