From e17811c1d7b1e6318af32a366d23bd586750b6d2 Mon Sep 17 00:00:00 2001
From: lkk <364857242@qq.com>
Date: 星期三, 27 十一月 2024 11:32:48 +0800
Subject: [PATCH] 2024 11 27
---
src/utils/request.js | 4
src/views/system/tijian/index.vue | 143 ++++-------
src/views/doctor/pacsCheck/index.vue | 516 +++++++++++++++++++++++++++++++++++++++++++
src/views/hosp/order/index.vue | 3
src/views/system/tijian/TreeTransfer.vue | 3
vue.config.js | 4
src/utils/request1.js | 4
src/views/sampling/sampling/index.vue | 2
src/api/doctor/pacsCheck.js | 31 ++
9 files changed, 616 insertions(+), 94 deletions(-)
diff --git a/src/api/doctor/pacsCheck.js b/src/api/doctor/pacsCheck.js
new file mode 100644
index 0000000..1b8c931
--- /dev/null
+++ b/src/api/doctor/pacsCheck.js
@@ -0,0 +1,31 @@
+import request from '@/utils/request'
+
+// 宸﹁竟琛ㄦ牸鎺ュ彛
+export function getLeftList(data) {
+ return request({
+ url: '/api/His/pacs/getList',
+ method: 'post',
+ data:data
+ })
+ }
+
+
+ // 浣撴绉戝鍒楄〃鏄剧ず鎺ュ彛
+export function getRightList(code) {
+ return request({
+ url: '/api/His/getTjList',
+ method: 'get',
+ params:{
+ code:code
+ }
+ })
+}
+
+// 鍚屾鎺ュ彛
+export function asyncPacs(data) {
+ return request({
+ url: '/api/His/asyncPacs',
+ method: 'post',
+ data:data
+ })
+}
diff --git a/src/utils/request.js b/src/utils/request.js
index c9972a7..3bef1d2 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -120,13 +120,13 @@
// console.log('err' + error)
let { message } = error;
if (message == "Network Error") {
- message = "鍚庣鎺ュ彛杩炴帴寮傚父";
+ message = "璇锋鏌ョ綉缁�!";
}
// else if (message.includes("timeout")) {
// message = "鏁版嵁鍔犺浇澶辫触锛岃鍒锋柊椤甸潰";
// }
else if (message.includes("Request failed with status code")) {
- message = "绯荤粺鎺ュ彛" + message.substr(message.length - 3) + "寮傚父";
+ message = "绯荤粺鎺ュ彛寮傚父, "+"璇锋鏌ョ綉缁�!";
}
Message({
message: message,
diff --git a/src/utils/request1.js b/src/utils/request1.js
index 72586f2..e3ed2cb 100644
--- a/src/utils/request1.js
+++ b/src/utils/request1.js
@@ -121,13 +121,13 @@
// console.log('err' + error)
let { message } = error;
if (message == "Network Error") {
- message = "鍚庣鎺ュ彛杩炴帴寮傚父";
+ message = "璇锋鏌ョ綉缁�!";
}
// else if (message.includes("timeout")) {
// message = "鏁版嵁鍔犺浇澶辫触锛岃鍒锋柊椤甸潰";
// }
else if (message.includes("Request failed with status code")) {
- message = "绯荤粺鎺ュ彛" + message.substr(message.length - 3) + "寮傚父";
+ message = "绯荤粺鎺ュ彛寮傚父, "+"璇锋鏌ョ綉缁�!";
}
Message({
message: message,
diff --git a/src/views/doctor/pacsCheck/index.vue b/src/views/doctor/pacsCheck/index.vue
new file mode 100644
index 0000000..d3bd6ed
--- /dev/null
+++ b/src/views/doctor/pacsCheck/index.vue
@@ -0,0 +1,516 @@
+<template>
+ <div class="app-container">
+ <el-form
+ :model="queryParams"
+ ref="queryForm"
+ size="small"
+ :inline="true"
+ label-width="68px"
+ >
+ <el-form-item label="浣撴鍙�" prop="reportDoctorCode">
+ <el-input
+ ref="inputName"
+ v-model="queryParams.tjNum"
+ placeholder="璇疯緭鍏ヤ綋妫�鍙�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ style="width: 170px"
+ />
+ </el-form-item>
+ <el-form-item label="濮撳悕" prop="name">
+ <el-input
+ v-model="queryParams.name"
+ placeholder="璇疯緭鍏ュ鍚�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ style="width: 110px"
+ />
+ </el-form-item>
+ <el-form-item label="鐧昏鏃堕棿" prop="createTimeList">
+ <el-date-picker
+ v-model="createTimeList"
+ type="datetimerange"
+ align="right"
+ :picker-options="pickerOptions"
+ style="width: 310px"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ format="yyyy.MM.dd"
+ value-format="yyyy.MM.dd "
+ @change="handleDateChange"
+ >
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item>
+ <el-button
+ type="primary"
+ icon="el-icon-search"
+ size="mini"
+ @click="handleQuery"
+ style="margin-right: 15px"
+ >鏌ヨ</el-button
+ >
+ <!-- <el-button size="mini" @click="tongbu(scope.row)"
+ >鍚屾</el-button
+ > -->
+ <el-button
+ icon="el-icon-refresh"
+ type="primary"
+ size="mini"
+ @click="resetQuery"
+ >閲嶇疆</el-button
+ >
+ <el-button
+ icon="el-icon-check"
+ type="primary"
+ size="mini"
+ style="margin-right: 15px"
+ @click="tongbu"
+ :disabled="!selectedFirstTable"
+ >鍚屾</el-button
+ >
+ </el-form-item>
+ </el-form>
+ <!-- <el-radio-group
+ v-model="checkStatus"
+ @input="radioChange"
+ style="margin: 10px 15px"
+ >
+ </el-radio-group> -->
+
+ <div class="table-title">
+ <h3>妫�鏌ヨ褰�</h3>
+ </div>
+ <!-- v-loading="loading" :row-class-name="tableRowClassName" @current-change="handleCurrentChange" -->
+ <el-table
+ id="ta"
+ ref="tb"
+ :data="exaLists"
+ v-loading="loading"
+ border
+ max-height="350"
+ @current-change="handleCurrentChange"
+ @selection-change="handleSelectionChange"
+ :row-class-name="tableRowClassName"
+ >
+ <el-table-column
+ fixed
+ type="selection"
+ align="center"
+ label="閫夋嫨"
+ width="40"
+ :selectable="isSelectable"
+ >
+ </el-table-column>
+
+ <el-table-column label="濮撳悕" align="center" prop="name" width="80px" />
+ <el-table-column label="鎬у埆" align="center" prop="gender" width="80px" />
+ <el-table-column
+ label="骞撮緞"
+ align="center"
+ prop="patientAge"
+ width="80px"
+ >
+ </el-table-column>
+ <el-table-column
+ label="閫佹绉戝"
+ align="center"
+ prop="deptName"
+ width="100px"
+ />
+
+ <el-table-column
+ label="妫�鏌ラ」鐩�"
+ align="center"
+ prop="checkParts"
+ width="150px"
+ />
+ <el-table-column
+ label="鎶ュ憡鏃堕棿"
+ align="center"
+ prop="examinationDate"
+ width="150px"
+ />
+
+ <el-table-column label="闂ㄨ瘖鍙�" align="center" prop="mzh" width="140px" />
+ <el-table-column
+ label="鐢宠鍗曞彿"
+ align="center"
+ prop="brid"
+ width="145px"
+ />
+ <el-table-column
+ label="缁撴灉鐘舵��"
+ align="center"
+ prop="diagnosis"
+ width="150"
+ :show-overflow-tooltip="true"
+ />
+ <!-- :show-overflow-tooltip="true" -->
+ <el-table-column
+ label="鎶ュ憡鍖诲笀"
+ align="center"
+ prop="reportDoctorName"
+ width="120px"
+ />
+ <el-table-column
+ label="妫�鏌ュ尰甯堝悕"
+ align="center"
+ prop="checkDoctorName"
+ width="120px"
+ />
+
+ <el-table-column
+ label="缁撴灉琛ㄧ幇"
+ align="center"
+ prop="examination"
+ :show-overflow-tooltip="true"
+ />
+ </el-table>
+
+ <div class="table-title">
+ <h3>浣撴璁板綍</h3>
+ </div>
+ <el-table
+ border
+ max-height="280"
+ ref="tab1"
+ :data="checkList"
+ v-loading="loading"
+ @selection-change="handleSelectionChangeSecond"
+ >
+ <el-table-column type="selection" width="55"> </el-table-column>
+ <el-table-column
+ label="鐘舵��"
+ align="center"
+ prop="type"
+ :show-overflow-tooltip="true"
+ min-width="60"
+ >
+ <template slot-scope="scope">
+ <span v-if="scope.row.type == '0'">鏈</span>
+ <span v-if="scope.row.type == '1'">宸叉</span>
+ <span v-if="scope.row.type == '2'">寮冩</span>
+ <span v-if="scope.row.type == '3'">寤舵湡</span>
+ </template>
+ </el-table-column>
+ <el-table-column
+ label="绉戝"
+ align="center"
+ prop="deptName"
+ min-width="115"
+ />
+ <el-table-column
+ label="椤圭洰"
+ align="center"
+ prop="proName"
+ min-width="160"
+ />
+ <el-table-column
+ label="鏀惰垂鏂瑰紡"
+ align="center"
+ prop="sffs"
+ min-width="80"
+ />
+ <el-table-column
+ label="鏄惁鏀惰垂"
+ align="center"
+ prop="isPay"
+ min-width="80"
+ />
+ <el-table-column
+ label="妫�鏌ユ椂闂�"
+ align="center"
+ prop="bcupdateTime"
+ min-width="160"
+ />
+
+ <el-table-column
+ label="鏈�鍚庝慨鏀规椂闂�"
+ align="center"
+ prop="zhupdateTime"
+ min-width="160"
+ />
+ </el-table>
+
+ <div class="pag">
+ <div class="pag1">
+ <!-- <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>
+ </div>
+ </div>
+</template>
+
+ <script>
+import { getLeftList, getRightList, asyncPacs } from "@/api/doctor/pacsCheck";
+import moment from "moment";
+
+export default {
+ dicts: ["dict_tj_status"],
+ data() {
+ return {
+ dis: false,
+ code: null,
+ createTimeList: "",
+ total: 0,
+ loading: false,
+ isSyncing: false,
+ // 鏌ヨ鍙傛暟
+ queryParams: {
+ // page: 1,
+ // pageSize: 20,
+ name: null,
+ start: null,
+ end: null,
+ tjNum: null,
+ },
+ // 缁戝畾鍗曢�夋寜閽�
+ checkStatus: "0",
+ exaLists: [],
+ selectedFirstTable: null, // 绗竴涓〃鏍奸�変腑琛�
+ selectedSecondTable: [], // 绗簩涓〃鏍奸�変腑琛�
+ // 琛ㄥ崟鍙傛暟
+ form: {},
+ clearTimeSet: null,
+ tjNumbers: "",
+ multipleSelection: "",
+ tjnum: "",
+ xiangmuList: [],
+ checkList: [],
+ tg: true,
+ bh: true,
+ pickerOptions: {
+ shortcuts: [
+ {
+ text: "鏈�杩戜竴鍛�",
+ onClick(picker) {
+ const end = new Date();
+ const start = new Date();
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+ picker.$emit("pick", [start, end]);
+ },
+ },
+ {
+ text: "鏈�杩戜竴涓湀",
+ onClick(picker) {
+ const end = new Date();
+ const start = new Date();
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+ picker.$emit("pick", [start, end]);
+ },
+ },
+ {
+ text: "鏈�杩戜笁涓湀",
+ onClick(picker) {
+ const end = new Date();
+ const start = new Date();
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+ picker.$emit("pick", [start, end]);
+ },
+ },
+ ],
+ },
+ };
+ },
+
+ mounted() {
+ this.$nextTick(() => {
+ this.$refs.inputName.focus();
+ });
+ },
+ methods: {
+
+ handleDateChange(val){
+ if (val && val.length === 2) {
+ this.queryParams.start = val[0]; // 璁剧疆寮�濮嬫椂闂�
+ this.queryParams.end = val[1]; // 璁剧疆缁撴潫鏃堕棿
+ } else {
+ this.queryParams.start = null;
+ this.queryParams.end = null;
+ }
+ console.log('Query Params:', this.queryParams);
+
+ },
+ isSelectable(row) {
+ return !!row.mzh;
+ },
+ tableRowClassName({ row }) {
+ return !row.mzh ? "row-disabled" : "";
+ },
+
+ handleSelectionChange(val) {
+ console.log(val);
+ if (val.length > 1) {
+ let del_row = val.shift();
+ this.$refs.tb.toggleRowSelection(del_row, false); //璁剧疆杩欎竴琛屽彇娑堥�変腑
+ }
+ console.log(val, 999);
+
+ if (val.length > 0) {
+ const selectedRow = val[0];
+ console.log(val[0], 555);
+ /* if (!selectedRow.mzh) {
+ this.$refs.tb.toggleRowSelection(selectedRow, false);
+ this.$message.warning("褰撳墠琛屾棤鏈夋晥闂ㄨ瘖鍙凤紝涓嶈兘閫変腑");
+ return;
+ } */
+
+ this.selectedFirstTable = selectedRow;
+ console.log("褰撳墠閫変腑鐨勮鏁版嵁:", this.selectedFirstTable);
+ this.fetchRightTableData(selectedRow);
+ } else {
+ this.selectedFirstTable = null;
+ this.checkList = [];
+ }
+ },
+ // 鏍规嵁閫変腑鐨勮鏁版嵁璇锋眰鍙宠竟琛ㄦ牸鏁版嵁
+ fetchRightTableData(selectedRow) {
+ const code = selectedRow.mzh;
+ if (!code) return;
+ this.loading = true;
+ getRightList(code).then((response) => {
+ this.checkList = response.data;
+ this.loading = false;
+ });
+ },
+
+ handleSelectionChangeSecond(selectedRows) {
+ this.selectedSecondTable = selectedRows;
+ console.log("褰撳墠閫変腑鐨勮鏁版嵁:", this.selectedSecondTable);
+ },
+ getList() {
+ if (this.createTimeList) {
+ this.queryParams.start = this.createTimeList[0];
+ this.queryParams.end = this.createTimeList[1];
+ } else if (this.createTimeList == null) {
+ this.queryParams.start = null;
+ this.queryParams.end = null;
+ }
+ },
+
+ /** 鎼滅储鎸夐挳鎿嶄綔 */
+ handleQuery() {
+ // this.queryParams.page = 1;
+ this.loading = true;
+ getLeftList(this.queryParams)
+ .then((res) => {
+ console.log(res, 1111);
+ if (res.code == 200) {
+ this.loading = false;
+ this.exaLists = res.data;
+ this.code = this.exaLists.mzh;
+ }
+ })
+ .catch((error) => {
+ this.loading = false;
+ this.$message.error(res.msg || "鏌ヨ澶辫触锛岃绋嶅悗閲嶈瘯");
+ });
+ this.getList();
+ },
+
+ /** 閲嶇疆鎸夐挳鎿嶄綔 */
+ resetQuery() {
+ this.createTimeList = [];
+ this.resetForm("queryForm");
+ this.queryParams = {
+ name: null,
+ start: null,
+ end: null,
+ tjNum: null,
+ };
+
+ // 娓呯┖鍏朵粬渚濊禆鏁版嵁
+ this.checkList = [];
+ this.exaLists = [];
+ },
+
+ handleCurrentChange(row) {
+ this.currentRow = row;
+ // console.log('褰撳墠閫変腑鐨勮:', row);
+ },
+
+ setTime() {
+ //璁剧疆瀹氭椂鍣�
+ this.clearTimeSet = setInterval(() => {
+ this.$modal.closeLoading();
+ }, 300000);
+ },
+ tongbu(row) {
+ this.$modal.loading("姝ｅ湪鍚屾锛岃绋嶅��...");
+ this.setTime();
+ // console.log(val, 66);
+ const requestData = {
+ pacs: this.selectedFirstTable, // 宸︿晶琛ㄦ牸閫変腑鏁版嵁
+ tj: this.selectedSecondTable[0], // 鍙充晶琛ㄦ牸閫変腑鏁版嵁
+ };
+
+ if (!this.selectedSecondTable || this.selectedSecondTable.length === 0) {
+ this.$message.error("鑷冲皯閫変竴鏉℃暟鎹紒");
+ return;
+ }
+
+ asyncPacs(requestData)
+ .then((res) => {
+ if (res.code == 200) {
+ this.fetchRightTableData(this.selectedFirstTable);
+ clearInterval(this.clearTimeSet);
+ this.clearTimeSet = null;
+ this.$modal.closeLoading();
+ this.$modal.msgSuccess("鍚屾鎴愬姛锛�");
+ } else {
+ this.$message.error(res.message || "鍚屾澶辫触锛岃绋嶅悗閲嶈瘯");
+ }
+ })
+ .catch((error) => {
+ clearInterval(this.clearTimeSet);
+ this.clearTimeSet = null;
+ this.$modal.closeLoading();
+ // this.$modal.error("鎿嶄綔澶辫触锛岃绋嶅悗閲嶈瘯");
+ })
+ },
+ },
+};
+</script>
+
+ <style lang="scss" scoped>
+#ta .el-table__header-wrapper .el-checkbox {
+ display: none;
+}
+
+.el-table .warning-row {
+ background: #e5f3ff !important;
+}
+::v-deep .el-table__body tr.current-row > td {
+ background: #edf2fa !important;
+}
+
+.table-title {
+ text-align: center;
+ margin-bottom: 15px;
+}
+.row-disabled {
+ color: #ccc; /* 璁剧疆绂佺敤琛岀殑瀛椾綋棰滆壊 */
+ pointer-events: none; /* 绂佹榧犳爣鎿嶄綔 */
+ background-color: #f5f5f5; /* 璁剧疆绂佺敤琛岀殑鑳屾櫙鑹� */
+}
+
+.pag {
+ width: 100%;
+ display: flex;
+ justify-content: center;
+}
+
+.pag1 {
+ width: 30%;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/hosp/order/index.vue b/src/views/hosp/order/index.vue
index 0135d0c..7168850 100644
--- a/src/views/hosp/order/index.vue
+++ b/src/views/hosp/order/index.vue
@@ -1619,7 +1619,6 @@
methods: {
onPayTypeChange() {
if (this.payType === "6" && this.form.tjType !== 3) {
-
this.cannotSelectPayType = true;
this.$message.warning("璇ヤ粯娆剧被鍨嬪湪姝や綋妫�绫诲瀷涓嬩笉鍏佽閫夋嫨锛�");
this.payType = this.dict.type.dict_pay_type[0]?.value || null;
@@ -1958,7 +1957,7 @@
this.cusSex = item.tjCustomerSex;
this.form.tjType = parseInt(item.tjType);
});
-
+
this.ids = selection.map((item) => item.orderId);
// this.tjNumbers = selection.map((item) => item.tjNumber);
this.single = selection.length !== 1;
diff --git a/src/views/sampling/sampling/index.vue b/src/views/sampling/sampling/index.vue
index 3618dde..1d411b0 100644
--- a/src/views/sampling/sampling/index.vue
+++ b/src/views/sampling/sampling/index.vue
@@ -803,11 +803,9 @@
try {
// 璇锋眰鎺ュ彛骞惰幏鍙栧搴﹀��
const widthResponse = await getTxmkd();
- // console.log("浠� getTxmkd 杩斿洖鐨勫搷搴�:", widthResponse); // 鎵撳嵃鍚庣杩斿洖鍊�
const barcodeWidth = `${Number(widthResponse.msg)}%` || "70%"; // 鑾峰彇瀹藉害鍊硷紝榛樿浣跨敤 70%
const jyxh = this.selectList.map((item) => item.jyxh);
- // console.log(this.selectList, 999);
await this.$nextTick(); // 纭繚 DOM 鏇存柊
diff --git a/src/views/system/tijian/TreeTransfer.vue b/src/views/system/tijian/TreeTransfer.vue
index 455a7c7..7525415 100644
--- a/src/views/system/tijian/TreeTransfer.vue
+++ b/src/views/system/tijian/TreeTransfer.vue
@@ -87,12 +87,15 @@
},
created() {
this.leftNodeData = this.nodeData
+ console.log(this.leftNodeData,111);
+
this.rightKeys.length > 0 ? this.rerenderData(this.rightKeys) : ''
},
methods: {
clickLeftCheckAll(v) {
//宸︿晶鍏ㄩ��
if (v) {
+
let keys = this.getChildNodeKeys(this.leftNodeData)
this.$refs.tree.setCheckedKeys(keys)
this.toRight = true
diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue
index f84b262..1ea1d2c 100644
--- a/src/views/system/tijian/index.vue
+++ b/src/views/system/tijian/index.vue
@@ -574,6 +574,9 @@
:data="packagedataList"
node-key="proId"
:props="defaultpackProps"
+ :filter-node-method="filterpackage"
+ @check-change="handlePackageChecked"
+ :default-checked-keys="checkedListkey1"
:render-content="renderContent"
>
</el-tree>
@@ -1593,6 +1596,7 @@
treedataList: [],
checkedkey: [],
checkedListkey: [],
+ checkedListkey1: [],
defaultProps: {
children: [],
label: "proName",
@@ -2505,7 +2509,7 @@
}
}
_this.form.cusAddr = resultObj.data.addres;
-
+
_this.cardreader = false;
};
@@ -2578,13 +2582,13 @@
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.nation == "姹夋棌") {
+ _this.form.cusNational = "1";
}
- if(resultObj.data.gender == "鐢�"){
+ if (resultObj.data.gender == "鐢�") {
_this.form.cusSex = 0;
- }else{
+ } else {
_this.form.cusSex = 1;
}
_this.form.cusBrithday = resultObj.data.birthday;
@@ -2915,33 +2919,6 @@
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;
});
@@ -2959,6 +2936,8 @@
this.loading = true;
getProParentIdDxList().then((response) => {
this.Treedata = response.data.list;
+ console.log(response, 77788);
+
if (this.tableData[0]) {
this.tableData[0].tjProjectList.forEach((selectionitem) => {
this.Treedata.forEach((item) => {
@@ -2968,40 +2947,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 = {
@@ -3009,16 +2960,27 @@
};
getlistByZhId(datas).then((res) => {
this.packagedataList = res.data.tjProjectList;
+ console.log(this.packagedataList, 1122);
+ this.DataLists = [];
+ this.checkedListkey1 = [];
for (var i = 0; i < this.packagedataList.length; i++) {
let proId = this.packagedataList[i].proId;
- getProSonDxList(proId).then((res) => {
+ this.checkedListkey1.push(proId);
+ // this.DataLists.push(this.packagedataList[i]);
+ getProSonDxList(proId).then((res) => {
this.TreedataList = res.data.list;
+ console.log(this.TreedataList,888);
+
this.TreedataList.forEach((item) => {
+ // this.checkedListkey1.push(item.proId);
+
this.DataLists.push(item);
+ // console.log(this.DataLists,556644);
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;
@@ -3031,25 +2993,12 @@
}
});
} 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 = [];
+
+ // 浣犲彲浠ュ湪姝ゅ鏍规嵁闇�瑕佽繘琛屽叾浠栨搷浣滐紝濡傛洿鏂� UI
+ console.log("鍙栨秷閫変腑锛屾暟鎹凡娓呯┖锛屾�讳环宸查噸缃�");
}
},
objectspanmethod({ row, column, rowIndex, columnIndex }) {
@@ -3082,17 +3031,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) => {
diff --git a/vue.config.js b/vue.config.js
index fc036f6..e5ab00d 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -53,8 +53,8 @@
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
// target: `https://ltpeis.xaltjdkj.cn:5801/`,
- // target: `http://192.168.1.3:5011`,
- target: `http://192.168.1.113:5011`,
+ target: `http://192.168.1.3:5011`,
+ // target: `http://192.168.1.113:5011`,
// // target: `http://192.168.0.99:8080/ltkj-admin`,
// target: `https://ltpeis.xaltjdkj.cn:5011/ltkj-admin`,
// target: `http://10.168.0.9:5011`,
--
Gitblit v1.8.0