From 683b2620e0fbfba24787046e2630cbfed0337484 Mon Sep 17 00:00:00 2001
From: qinxianzhangyao <11053546+qinxianzhangyao@user.noreply.gitee.com>
Date: 星期四, 04 七月 2024 17:32:44 +0800
Subject: [PATCH] qxtj
---
src/views/hosp/order/index.vue | 621 ++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 444 insertions(+), 177 deletions(-)
diff --git a/src/views/hosp/order/index.vue b/src/views/hosp/order/index.vue
index 3a04bfa..2c3440a 100644
--- a/src/views/hosp/order/index.vue
+++ b/src/views/hosp/order/index.vue
@@ -96,6 +96,16 @@
>瀵煎嚭</el-button
>
</el-col>
+
+ <el-col :span="1.5">
+ <el-button
+ type="primary"
+ size="mini"
+ @click="handleRevoke"
+ :disabled="single"
+ >鎾ら攢绛惧埌</el-button
+ >
+ </el-col>
<el-col :span="1.5">
<el-button
type="primary"
@@ -106,6 +116,17 @@
>琛ュ綍椤圭洰</el-button
>
</el-col>
+ <!-- <el-col :span="1.5">
+ <el-button
+ type="primary"
+ size="mini"
+ @click="revokeProject"
+ :disabled="single"
+ v-hasPermi="['hosp:order:export']"
+ >鎾ら攢琛ュ綍</el-button
+ >
+ </el-col> -->
+
<el-col :span="1.5">
<el-button
type="primary"
@@ -159,7 +180,15 @@
align="center"
prop="tjCustomerName"
fixed="left"
- width="100px"
+ width="90px"
+ :show-overflow-tooltip="true"
+ />
+ <el-table-column
+ label="韬唤璇佸彿"
+ align="center"
+ prop="tjCusIdCard"
+ fixed="left"
+ width="180px"
:show-overflow-tooltip="true"
/>
<el-table-column
@@ -208,11 +237,19 @@
:show-overflow-tooltip="true"
width="160px"
/>
+ <el-table-column
+ label="闂ㄨ瘖鍙�"
+ align="center"
+ prop="cardId"
+ :show-overflow-tooltip="true"
+ width="160px"
+ />
<!-- <el-table-column label="娴佹按鍙�" align="center" prop="tjSerialNumber" /> -->
<el-table-column
label="鎵�閫夊椁�"
align="center"
prop="pacName"
+ :formatter="driver"
:show-overflow-tooltip="true"
/>
<el-table-column
@@ -426,21 +463,20 @@
<el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="filterText">
</el-input>
<div class="tab3">
-
- <el-tree
- class="filter-tree"
- v-loading="loading"
- :data="Treedata"
- :props="defaultProps"
- show-checkbox
- node-key="proId"
- @check="handleCurrentChecked"
- :default-checked-keys="checkedkey"
- :filter-node-method="filterNode"
- ref="tree"
- >
- </el-tree>
-
+ <el-tree
+ class="filter-tree"
+ v-loading="loading"
+ :data="Treedata"
+ :props="defaultProps"
+ show-checkbox
+ node-key="proId"
+ @check="handleCurrentChecked"
+ :default-checked-keys="checkedkey"
+ :filter-node-method="filterNode"
+ ref="tree"
+ :render-content="renderContent"
+ >
+ </el-tree>
</div>
</el-col>
<el-col :span="5">
@@ -450,69 +486,72 @@
鏄庣粏椤圭洰鍒楄〃
</div>
<div class="tab3">
- <el-tree
- class="filter-tree"
- v-loading="loading"
- :data="TreedataList"
- node-key="proId"
- :props="defaultProps"
- :filter-node-method="filterNode"
- show-checkbox
- @check-change="handleCurrentChecked1"
- :default-checked-keys="checkedListkey"
- >
- </el-tree>
+ <el-tree
+ class="filter-tree"
+ v-loading="loading"
+ :data="TreedataList"
+ node-key="proId"
+ :props="defaultProps"
+ :filter-node-method="filterNode"
+ show-checkbox
+ @check-change="handleCurrentChecked1"
+ :default-checked-keys="checkedListkey"
+ :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">
+ <div
+ style="text-align: center; margin-bottom: 10px; margin-top: 10px"
+ >
宸查�夐」鐩垪琛�
</div>
- <el-table
- :data="DataList"
- border
- style="width: 100%"
- height="250"
- >
- <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
+ :data="DataList"
+ border
+ style="width: 100%"
+ height="400"
+ :span-method="objectSpanMethod"
+ >
+ <el-table-column prop="propinName" label="妫�鏌ラ」鐩�">
+ </el-table-column>
+ <el-table-column prop="proPrice" label="鍘熶环" width="56px">
+ </el-table-column>
+ <el-table-column prop="proName" label="鏄庣粏椤圭洰" width="260px">
+ </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="handleDelete(scope.row)"
- title="鍒犻櫎"
- ></el-button
- >
- </template>
- </el-table-column>
- </el-table>
- <el-collapse v-model="activeName" accordion v-if="list1">
- <div>
- <el-collapse-item title="璇烽�夋嫨椤圭洰">
- <el-table :data="DataList" border style="width: 100%">
- <el-table-column prop="proName" label="椤圭洰" width="180">
- </el-table-column>
- <el-table-column prop="ordPrice" label="鍘熶环">
- </el-table-column>
- </el-table>
- </el-collapse-item>
- </div>
- </el-collapse>
+ <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="handleDelete(scope.row)"
+ title="鍒犻櫎"
+ ></el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <el-collapse v-model="activeName" accordion v-if="list1">
+ <div>
+ <el-collapse-item title="璇烽�夋嫨椤圭洰">
+ <el-table :data="DataList" border style="width: 100%">
+ <el-table-column prop="proName" label="椤圭洰" width="180">
+ </el-table-column>
+ <el-table-column prop="ordPrice" label="鍘熶环">
+ </el-table-column>
+ </el-table>
+ </el-collapse-item>
+ </div>
+ </el-collapse>
<template>
<el-form :model="form">
<el-form-item label="浣撴绫诲瀷" prop="tjType">
@@ -569,7 +608,7 @@
@click="submitPrice"
:disabled="confirm"
style="margin-top: 34px"
- >鏀惰垂</el-button
+ >鎻愪氦</el-button
>
</el-form-item>
</el-form>
@@ -597,28 +636,27 @@
<el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="filterText">
</el-input>
<div class="tab3">
-
- <el-tree
- class="filter-tree"
- v-loading="loading"
- :data="Treedata"
- :props="defaultProps"
- show-checkbox
- node-key="proId"
- @check="handleCurrentChecked"
- :default-checked-keys="checkedkey"
- :filter-node-method="filterNode"
- ref="tree"
- >
- </el-tree>
-
+ <el-tree
+ class="filter-tree"
+ v-loading="loading"
+ :data="Treedata"
+ :props="defaultProps"
+ show-checkbox
+ node-key="proId"
+ @check="handleCurrentChecked"
+ :default-checked-keys="checkedkey"
+ :filter-node-method="filterNode"
+ ref="tree"
+ :render-content="renderContent"
+ >
+ </el-tree>
</div>
</el-col>
<el-col :span="5">
<div
style="text-align: center; margin-bottom: 10px; margin-top: 10px"
>
- 鏄庣粏椤圭洰鍒楄〃
+ 鏄庣粏椤圭洰鍒楄〃
</div>
<div class="tab3">
<div class="outside1">
@@ -632,6 +670,7 @@
show-checkbox
@check-change="handleCurrentChecked1"
:default-checked-keys="checkedListkey"
+ :render-content="renderContent"
>
</el-tree>
</div>
@@ -639,54 +678,63 @@
</el-col>
<el-col :span="11">
<div class="grid-content bg-purple">
- <div style="text-align: center; margin-bottom: 10px">
+ <div
+ style="text-align: center; margin-bottom: 10px; margin-top: 10px"
+ >
宸查�夐」鐩垪琛�
</div>
-
- <el-table
- :data="DataList"
- border
- style="width: 100%"
- height="250"
- >
- <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="handleDelete(scope.row)"
- title="鍒犻櫎"
- ></el-button>
- </template>
- </el-table-column>
- </el-table>
- <el-collapse v-model="activeName" accordion v-if="list1">
- <div>
- <el-collapse-item title="璇烽�夋嫨椤圭洰">
- <el-table :data="DataList" border style="width: 100%">
- <el-table-column prop="proName" label="椤圭洰" width="180">
- </el-table-column>
- <el-table-column prop="ordPrice" label="鍘熶环">
- </el-table-column>
- </el-table>
- </el-collapse-item>
- </div>
- </el-collapse>
-
+ <el-table
+ :data="DataList"
+ border
+ style="width: 100%"
+ height="400"
+ :span-method="objectSpanMethod"
+ >
+ <el-table-column prop="propinName" label="妫�鏌ラ」鐩�">
+ </el-table-column>
+ <el-table-column prop="proPrice" label="鍘熶环" width="56px">
+ </el-table-column>
+ <el-table-column prop="proName" label="鏄庣粏椤圭洰" width="260px">
+ </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="handleDelete(scope.row)"
+ title="鍒犻櫎"
+ ></el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <el-collapse v-model="activeName" accordion v-if="list1">
+ <div>
+ <el-collapse-item title="璇烽�夋嫨椤圭洰">
+ <el-table
+ :data="DataList"
+ border
+ style="width: 100%"
+ height="400"
+ :span-method="objectSpanMethod"
+ >
+ <el-table-column prop="proName" label="椤圭洰" width="180">
+ </el-table-column>
+ <el-table-column prop="ordPrice" label="鍘熶环">
+ </el-table-column>
+ </el-table>
+ </el-collapse-item>
+ </div>
+ </el-collapse>
+
<template>
<el-form :model="form">
<el-form-item label="浣撴绫诲瀷" prop="tjType">
@@ -743,7 +791,7 @@
@click="submitPrice1"
:disabled="confirm"
style="margin-top: 34px"
- >鏀惰垂</el-button
+ >鎻愪氦</el-button
>
</el-form-item>
</el-form>
@@ -755,43 +803,140 @@
<!-- 娣诲姞鎴栦慨鏀逛綋妫�璁板綍瀵硅瘽妗� -->
<el-dialog :title="title" :visible.sync="open" width="950px" append-to-body>
- <el-table :data="numberList" style="width: 100%">
- <el-table-column prop="proName" label="椤圭洰/鑰楁潗" width="300">
- </el-table-column>
- <el-table-column prop="price" label="鍗曚环" width="300">
- </el-table-column>
- <el-table-column prop="count" label="鏁伴噺" width="300">
- </el-table-column>
- </el-table>
- <el-table :data="bill" style="width: 100%">
- <el-table-column prop="copeWith" label="搴斾粯" width="180">
- </el-table-column>
- <el-table-column prop="discount" label="鎶樻墸" width="180">
- </el-table-column>
- <el-table-column prop="paidIn" label="瀹炰粯" width="180">
- </el-table-column>
- <el-table-column prop="payType" label="浠樻鏂瑰紡" width="180">
- <template slot-scope="scope">
- <span v-if="scope.row.payType == '0'">鐜伴噾鏀粯</span>
- <span v-if="scope.row.payType == '1'">鍒峰崱鏀粯</span>
- <span v-if="scope.row.payType == '2'">鏀粯瀹濇敮浠�</span>
- <span v-if="scope.row.payType == '3'">寰俊鏀粯</span>
- <span v-if="scope.row.payType == '4'">浜戦棯浠樻敮浠�</span>
- </template>
- </el-table-column>
- <el-table-column prop="payStasus" label="浠樻鐘舵��" width="180">
- <template slot-scope="scope">
- <span v-if="scope.row.payStasus == '0'">鏈粯娆�</span>
- <span v-if="scope.row.payStasus == '1'">宸蹭粯娆�</span>
- <span v-if="scope.row.payStasus == '2'">閫�璐�</span>
- <span v-if="scope.row.payStasus == '3'">棰勪粯娆�</span>
- </template>
- </el-table-column>
- </el-table>
+ <el-tabs v-model="activeName1" type="card">
+ <!-- <el-tab-pane label="璁㈠崟娴佹按" name="first">
+ <el-table :data="numberList" style="width: 100%">
+ <el-table-column prop="proName" label="椤圭洰/鑰楁潗" width="300">
+ </el-table-column>
+ <el-table-column prop="price" label="鍗曚环" width="300">
+ </el-table-column>
+ <el-table-column prop="count" label="鏁伴噺" width="300">
+ </el-table-column>
+ </el-table>
+ <el-table :data="bill" style="width: 100%">
+ <el-table-column prop="copeWith" label="搴斾粯" width="180">
+ </el-table-column>
+ <el-table-column prop="discount" label="鎶樻墸" width="180">
+ </el-table-column>
+ <el-table-column prop="paidIn" label="瀹炰粯" width="180">
+ </el-table-column>
+ <el-table-column prop="payType" label="浠樻鏂瑰紡" width="180">
+ <template slot-scope="scope">
+ <span v-if="scope.row.payType == '0'">鐜伴噾鏀粯</span>
+ <span v-if="scope.row.payType == '1'">鍒峰崱鏀粯</span>
+ <span v-if="scope.row.payType == '2'">鏀粯瀹濇敮浠�</span>
+ <span v-if="scope.row.payType == '3'">寰俊鏀粯</span>
+ <span v-if="scope.row.payType == '4'">浜戦棯浠樻敮浠�</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="payStasus" label="浠樻鐘舵��" width="180">
+ <template slot-scope="scope">
+ <span v-if="scope.row.payStasus == '0'">鏈粯娆�</span>
+ <span v-if="scope.row.payStasus == '1'">宸蹭粯娆�</span>
+ <span v-if="scope.row.payStasus == '2'">閫�璐�</span>
+ <span v-if="scope.row.payStasus == '3'">棰勪粯娆�</span>
+ </template>
+ </el-table-column>
+ </el-table>
+ </el-tab-pane> -->
+ <el-tab-pane label="椤圭洰姹囨��" name="second">
+ <el-table :data="huizongList" style="width: 100%" max-height="280">
+ <el-table-column align="center" prop="newID" label="搴忓彿" width="50"> </el-table-column>
+ <el-table-column align="center" prop="parent_pro_name" label="椤圭洰">
+ </el-table-column>
+ <el-table-column align="center" prop="ks" label="绉戝"> </el-table-column>
+ <el-table-column align="center" prop="price" label="璐圭敤鍚堣"> </el-table-column>
+ </el-table>
+ <el-table :data="bill" style="width: 100%;margin-top: 10px;">
+ <el-table-column align="center" prop="copeWith" label="搴斾粯">
+ </el-table-column>
+ <el-table-column align="center" prop="discount" label="鎶樻墸">
+ </el-table-column>
+ <el-table-column align="center" prop="paidIn" label="瀹炰粯" >
+ </el-table-column>
+ </el-table>
+ </el-tab-pane>
+ <el-tab-pane label="鏄庣粏椤圭洰" name="third">
+ <el-table :data="infoList" style="width: 100%" max-height ="300" :span-method="objectSpanMethod1">
+ <el-table-column align="center" prop="newID" label="搴忓彿" width="50"> </el-table-column>
+ <el-table-column align="center" prop="parent_pro_name" label="鐖堕」">
+ </el-table-column>
+ <el-table-column align="center" prop="pro_name" label="瀛愰」"> </el-table-column>
+ <el-table-column align="center" prop="danjia" label="鍗曚环"> </el-table-column>
+ <el-table-column align="center" prop="num" label="鏁伴噺"> </el-table-column>
+ <el-table-column align="center" prop="zongjia" label="鎬讳环"> </el-table-column>
+ <el-table-column align="center" prop="time" label="寮�鍗曟椂闂�" width="180"> </el-table-column>
+ </el-table>
+ </el-tab-pane>
+ </el-tabs>
<div slot="footer" class="dialog-footer">
<el-button @click="cancel">鍙� 娑�</el-button>
</div>
</el-dialog>
+
+ <!-- <el-dialog
+ :title="title"
+ :visible.sync="Projectopen"
+ width="1100px"
+ style="height: 860px"
+ append-to-body
+ >
+ <el-row type="flex" class="row-bg" justify="space-around">
+ <el-col :span="6">
+ <div
+ style="text-align: center; margin-bottom: 10px; margin-top: 10px"
+ >
+ 椤圭洰鍒楄〃
+ </div>
+ <el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="filterText">
+ </el-input>
+ <div class="tab3">
+ <el-table
+ :data="DataList"
+ border
+ style="width: 100%"
+ height="400"
+ :span-method="objectSpanMethod"
+ >
+ <el-table-column prop="propinName" label="妫�鏌ラ」鐩�">
+ </el-table-column>
+ <el-table-column prop="proPrice" label="鍘熶环" width="56px">
+ </el-table-column>
+ <el-table-column prop="proName" label="鏄庣粏椤圭洰" width="260px">
+ </el-table-column>
+
+
+ </el-table>
+ </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="DataList"
+ border
+ style="width: 100%"
+ height="400"
+ :span-method="objectSpanMethod"
+ >
+ <el-table-column prop="propinName" label="妫�鏌ラ」鐩�">
+ </el-table-column>
+ <el-table-column prop="proPrice" label="鍘熶环" width="56px">
+ </el-table-column>
+ <el-table-column prop="proName" label="鏄庣粏椤圭洰" width="260px">
+ </el-table-column>
+
+
+ </el-table>
+ </div>
+ </el-col>
+ </el-row>
+ </el-dialog> -->
</div>
</template>
@@ -802,6 +947,8 @@
getPdf,
getOrderList,
getNewDateList,
+ revokeTjOrderByTjNum,
+ getTransitionInfo,
} from "@/api/hosp/order";
import moment from "moment";
import { getwater } from "@/api/hosp/customer";
@@ -820,6 +967,9 @@
name: "Order",
data() {
return {
+ huizongList: [],
+ infoList: [],
+ activeName1: "second",
filterText: "",
orderIds: "",
tjnumbers: "",
@@ -863,7 +1013,7 @@
loading: true,
// 閫変腑鏁扮粍
ids: [],
- dataObj:{},
+ dataObj: {},
// 闈炲崟涓鐢�
single: true,
// 闈炲涓鐢�
@@ -962,7 +1112,12 @@
},
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;
+ }
},
// / 澶勭悊榛樿閫変腑褰撳墠鏃ユ湡
// getNowTime() {
@@ -1033,6 +1188,9 @@
this.loading = false;
});
},
+ driver(row) {
+ return row.pacName == null ? "鏅�氫綋妫�" : row.pacName;
+ },
/** 鐐瑰嚮鏄剧ず瀵兼鍗曟姤琛�*/ //lige 寮�濮�
handleReport(row) {
const tjNumber = row.tjNumber;
@@ -1058,6 +1216,28 @@
this.$message.error("璇ョ敤鎴锋殏鏃犻」鐩紒");
}
});
+ },
+
+ handleRevoke() {
+ this.$confirm("鎮ㄧ‘璁よ鎾ら攢锛�", "纭淇℃伅", {
+ distinguishCancelAndClose: true,
+ confirmButtonText: "纭",
+ cancelButtonText: "鍙栨秷",
+ })
+ .then(() => {
+ revokeTjOrderByTjNum(this.tjnumbers).then((res) => {
+ this.$modal.msgSuccess(res.msg);
+ this.getList();
+ });
+ })
+ .catch((action) => {
+ if (action === "cancel") {
+ this.$message({
+ type: "warning",
+ message: "宸插彇娑�",
+ });
+ }
+ });
},
/** 鐐瑰嚮鏄剧ず浣撴鎶ュ憡鎶ヨ〃*/
// viewReport(row) {
@@ -1195,6 +1375,22 @@
this.bill = response.data.water;
this.title = "璁㈠崟娴佹按";
});
+ getTransitionInfo(tjNumber).then((res) => {
+ this.huizongList = res.data.huizong;
+ this.infoList = res.data.info;
+ this.huizongList.forEach((item, index) => {
+ item.newID =
+ (this.queryParams.pageNum - 1) * this.queryParams.pageSize +
+ index +
+ 1;
+ });
+ this.infoList.forEach((item, index) => {
+ item.newID =
+ (this.queryParams.pageNum - 1) * this.queryParams.pageSize +
+ index +
+ 1;
+ });
+ });
},
/** 璁㈠崟鏄庣粏鎸夐挳 */
handleUpdate1(row) {
@@ -1206,6 +1402,31 @@
this.bill = response.data.water;
this.title = "璁㈠崟娴佹按";
});
+ getTransitionInfo(tjNumber).then((res) => {
+ this.huizongList = res.data.huizong;
+ this.infoList = res.data.info;
+ this.huizongList.forEach((item, index) => {
+ item.newID =
+ (this.queryParams.pageNum - 1) * this.queryParams.pageSize +
+ index +
+ 1;
+ });
+ this.infoList.forEach((item, index) => {
+ item.newID =
+ (this.queryParams.pageNum - 1) * this.queryParams.pageSize +
+ index +
+ 1;
+ });
+ });
+ },
+
+ renderContent(h, { node, data, store }) {
+ return (
+ <span class="custom-tree-node">
+ 聽 <span>{node.label}</span>
+ <span>({data.proPrice}鍏�)</span>
+ </span>
+ );
},
// 琛ュ綍椤圭洰
@@ -1258,6 +1479,9 @@
this.loading = false;
});
},
+ revokeProject(){
+
+ },
// 琛ュ綍椤圭洰
handleProject1() {
this.loading = true;
@@ -1276,9 +1500,10 @@
this.Projectopen1 = true;
this.title = "琛ュ綍椤圭洰";
},
+
// 鐐瑰嚮鑾峰彇姣忎釜鏍戣妭鐐�
handleCurrentChecked(data, checked, checkedNodes) {
- this.dataObj = data
+ this.dataObj = data;
if (checked.checkedNodes.length != 0) {
this.$refs.tree.setCheckedKeys([data.proId]);
let proId = data.proId;
@@ -1308,7 +1533,6 @@
this.TreedataList = res.data.list;
this.checkedListkey = [];
});
-
}
},
@@ -1340,11 +1564,11 @@
} else if (checked == true) {
this.DataList.push(data);
this.DataList.forEach((item1) => {
- if (item1.proParentId == this.dataObj.proId) {
- item1.propinName = this.dataObj.proName;
- }
- });
- this.spliceData()
+ if (item1.proParentId == this.dataObj.proId) {
+ item1.propinName = this.dataObj.proName;
+ }
+ });
+ this.spliceData();
this.TotalPrice1 = 0;
this.DataList.forEach((item1) => {
this.TotalPrice1 = item1.proPrice + this.TotalPrice1;
@@ -1365,6 +1589,49 @@
});
},
+ // // 榛樿鎺ュ彈鍥涗釜鍊� { 褰撳墠琛岀殑鍊�, 褰撳墠鍒楃殑鍊�, 琛岀殑涓嬫爣, 鍒楃殑涓嬫爣 }
+ 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)) {
+ let prevRow = this.DataList[rowIndex - 1];
+ let nextRow = this.DataList[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.DataList[++countRowspan + rowIndex];
+ }
+ if (countRowspan > 1) {
+ return { rowspan: countRowspan, colspan: 1 };
+ }
+ }
+ }
+ },
+
+ objectSpanMethod1({ row, column, rowIndex, columnIndex }) {
+ // console.log(row, column, rowIndex, columnIndex);
+ let fields = ["parent_pro_name"];
+ let cellValue = row[column.property];
+ if (cellValue && fields.includes(column.property)) {
+ let prevRow = this.infoList[rowIndex - 1];
+ let nextRow = this.infoList[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.infoList[++countRowspan + rowIndex];
+ }
+ if (countRowspan > 1) {
+ return { rowspan: countRowspan, colspan: 1 };
+ }
+ }
+ }
+ },
+
// 鏀惰垂鎸夐挳
submitPrice() {
this.proIds = [];
--
Gitblit v1.8.0