From 4bdd0b1ef2aff1fd6f174b0f44a7248c0d2168f1 Mon Sep 17 00:00:00 2001
From: qinxianzhangyao <11053546+qinxianzhangyao@user.noreply.gitee.com>
Date: 星期四, 26 十月 2023 14:13:56 +0800
Subject: [PATCH] tj
---
src/views/reservation/reservations/index.vue | 70 ++--
src/views/system/tijian/index.vue | 533 ++++++++++++++++++++++++++++++--
src/views/doctor/checkAll/index.vue | 2
src/views/login.vue | 3
src/views/system/tijian/TreeTransfer.vue | 272 +++++++++++++++++
src/views/system/charge/index.vue | 29 +
src/api/system/tijian.js | 9
src/views/system/tijianall/index.vue | 32 +
8 files changed, 840 insertions(+), 110 deletions(-)
diff --git a/src/api/system/tijian.js b/src/api/system/tijian.js
index 8d39375..6b12020 100644
--- a/src/api/system/tijian.js
+++ b/src/api/system/tijian.js
@@ -10,8 +10,13 @@
}
})
}
-
-
+// 姣忎釜椤圭洰
+export function getIsRequired() {
+ return request({
+ url: '/hosp/order/getIsRequired',
+ method: 'get',
+ })
+}
// 姣忎釜椤圭洰
export function projectGetList() {
diff --git a/src/views/doctor/checkAll/index.vue b/src/views/doctor/checkAll/index.vue
index bc52df5..acbb7c8 100644
--- a/src/views/doctor/checkAll/index.vue
+++ b/src/views/doctor/checkAll/index.vue
@@ -671,7 +671,7 @@
setTimeout(() => {
loading.close();
}, 3000);
- this.$message.error("鎶ュ憡姝ｅ湪鐢熸垚锛岃涓ゅ垎閽熷悗棰勮锛�");
+ this.$message.msgSuccess("鎶ュ憡姝ｅ湪鐢熸垚锛岃涓ゅ垎閽熷悗棰勮锛�");
} else {
this.dialogVisible = true;
diff --git a/src/views/login.vue b/src/views/login.vue
index 8ada90f..a7a4958 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -59,7 +59,8 @@
<!-- 搴曢儴 -->
<div class="el-login-footer">
- <span>Copyright 漏 2022-2023榫欑編缃戠粶 All Rights Reserved.</span>
+ <span>Copyright 漏 2022-2023璺嘲绉戞妧 All Rights Reserved.</span>
+ <!-- <span>Copyright 漏 2022-2023榫欑編缃戠粶 All Rights Reserved.</span> -->
</div>
</div>
</template>
diff --git a/src/views/reservation/reservations/index.vue b/src/views/reservation/reservations/index.vue
index 01742b9..438bb21 100644
--- a/src/views/reservation/reservations/index.vue
+++ b/src/views/reservation/reservations/index.vue
@@ -241,9 +241,12 @@
<el-tab-pane label="鍗曢」">
<div class="tab3">
<div class="tab2">
- <el-tree :data="data" show-checkbox node-key="proId" :props="defaultProps"
- @check-change="handleCurrentChecked">
- </el-tree>
+ <v-tree-transfer :treeData="treedataList"
+ :defaultProps="{ children: 'tjProjectList', label: 'proName' }" :defaultKeys="defaultKeys"
+ @changeKeys="changeCategoryKeys" :key="datekey"></v-tree-transfer>
+ <!-- <el-tree :data="data" show-checkbox node-key="proId" :props="defaultProps"
+ @check-change="handleCurrentChecked">
+ </el-tree>-->
</div>
</div>
</el-tab-pane>
@@ -515,7 +518,7 @@
<el-form-item label="鍗″彿" prop="indexCard">
<el-input v-model="formIn.indexCard" placeholder="璇疯緭鍏ュ崱鍙�" style="width: 190px" />
</el-form-item>
- <el-button type="primary" @click="taocan = true" size="mini">閫夋嫨濂楅</el-button>
+ <el-button type="primary" @click="Package" size="mini">閫夋嫨濂楅</el-button>
</el-form>
</div>
@@ -731,7 +734,11 @@
import { deptTreeSelect, projectGetList, getPackageListName, getaddtTransition, getTransitionList, } from "@/api/system/tijian";
import { getCompany, queryCompany } from "@/api/team/tuanti";
import user from "@/store/modules/user";
+import VTreeTransfer from '../../system/tijian/TreeTransfer.vue'
export default {
+ components: {
+ VTreeTransfer
+ },
name: "Reservation",
dicts: ["dict_user_national", "dict_user_national", "dict_user_marry", "sys_yes_no",
"sys_user_sex", "dict_team", "tj_time_region", "dict_tjtype", "dict_job",
@@ -750,6 +757,7 @@
},
},
taocan: false,
+ defaultKeys: [],
value1: "",
pacName: "",
hides: false,
@@ -769,6 +777,8 @@
thisCancas: null,
thisContext: null,
thisVideo: null,
+ datekey: Date.now(),
+ treedataList: [],
list: [],
activeName: "1",
// 閬僵灞�
@@ -972,30 +982,6 @@
// response.rows.forEach((item, index) =>
// {item.newID =(this.queryParams.pageNum - 1) * this.queryParams.pageSize +index +1;
// });
- this.reservationList.forEach((item) => {
- if (item.tjType === "2") {
- item.tjType = "涓汉";
- } else {
- item.tjType = "鍥㈤槦";
- }
- if (item.tjCategory === "01") {
- item.tjCategory = "鍋ュ悍浣撴";
- } else if (item.tjCategory === "02") {
- item.tjCategory = "鑱屼笟鐥呬綋妫�";
- } else if (item.tjCategory === "03") {
- item.tjCategory = "鍏崼浣撴";
- } else if (item.tjCategory === "04") {
- item.tjCategory = "鍏ヨ亴浣撴";
- } else if (item.tjCategory === "05") {
- item.tjCategory = "鍏姟鍛樹綋妫�";
- } else if (item.tjCategory === "06") {
- item.tjCategory = "鍖讳繚浣撴";
- } else if (item.tjCategory === "07") {
- item.tjCategory = "濠氭";
- } else if (item.tjCategory === "09") {
- item.tjCategory = "鍑哄叆澧冧綋妫�";
- }
- });
this.total = response.total;
this.loading = false;
});
@@ -1070,8 +1056,8 @@
},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
- selection.forEach(item =>{
- this.fmobj = item
+ selection.forEach(item => {
+ this.fmobj = item
})
console.log(this.fmobj)
this.ids = selection.map((item) => item.id);
@@ -1088,6 +1074,7 @@
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
+ console.log(row)
this.title = "淇敼浣撴棰勭害";
this.formIn = row;
if (this.formIn.timeRegion === 0) {
@@ -1173,13 +1160,17 @@
/** 鏌ヨ閮ㄩ棬涓嬫媺鏍戠粨鏋� */
projectGetList().then((response) => {
- this.data = response.data.list;
- this.dXData = response.data;
+ this.treedataList = response.data.list;
+ this.dXData = response.data.list;
return;
});
} else {
this.$message.warning("宸茶繃鏈熻閲嶆柊棰勭害");
}
+ },
+ changeCategoryKeys(val) {
+ this.proIds = [];
+ this.proIds = val
},
/** 淇敼璇︾粏鎸夐挳鎿嶄綔 */
handleUpdate1(row) {
@@ -1272,8 +1263,8 @@
/** 鏌ヨ閮ㄩ棬涓嬫媺鏍戠粨鏋� */
projectGetList().then((response) => {
- this.data = response.data.list;
- this.dXData = response.data;
+ this.treedataList = response.data.list;
+ this.dXData = response.data.list;
return;
});
},
@@ -1282,6 +1273,11 @@
numberChange(currentValue, oldValue) {
this.discount = currentValue;
this.TotalPrice = (this.TotalPrice1 * (this.discount / 10)).toFixed(2);
+ },
+
+ Package() {
+ this.taocan = true;
+ this.datekey = Date.now()
},
/** 鎼滅储鎿嶄綔 */
@@ -1312,9 +1308,9 @@
this.multiple = !selection.length;
if (selection[0]) {
this.DataList = [];
- this.data = JSON.parse(JSON.stringify(this.dXData));
+ this.treedataList = JSON.parse(JSON.stringify(this.dXData));
selection[0].tjProjectList.forEach((selectionitem) => {
- this.data.forEach((item) => {
+ this.treedataList.forEach((item) => {
if (selectionitem.proName == item.proName) {
item.disabled = true;
item.tjProjectList = [];
@@ -1338,7 +1334,7 @@
});
});
} else {
- this.data = JSON.parse(JSON.stringify(this.dXData));
+ this.treedataList = JSON.parse(JSON.stringify(this.dXData));
return;
}
},
diff --git a/src/views/system/charge/index.vue b/src/views/system/charge/index.vue
index 535d6da..d9c3abf 100644
--- a/src/views/system/charge/index.vue
+++ b/src/views/system/charge/index.vue
@@ -107,7 +107,7 @@
adviceList: [],
// 閬僵灞�
loading: false,
- disabled: "",
+ disabled: 1,
isDisabled: false,
// 缁戝畾鍗曢�夋寜閽�
tjStatus: "0",
@@ -158,7 +158,7 @@
submitFormchanck() {
this.loading = true;
getfindTj(this.form).then((response) => {
- if (response.data) {
+ if (response.data != []) {
this.tableData = response.data;
this.tableData.forEach(item1 => {
this.tjnumber = item1.tjNumber;
@@ -194,6 +194,7 @@
});
} else {
this.tableData = [];
+ this.disabled = 1
}
this.loading = false;
@@ -379,20 +380,22 @@
orderId: this.OrderId,
};
getwater(data).then((res) => {
- if (res.msg !="璇ヨ鍗曞凡浠樻 鏃犻』鍐嶄粯") {
- this.mobanId = res.data.mobanId;
- this.waterId = res.data.waterId;
+ if (res.msg != "璇ヨ鍗曞凡浠樻 鏃犻』鍐嶄粯") {
this.$modal.msgSuccess("鎿嶄綔鎴愬姛");
- // this.radioChange();
- // this.submitFormchanck();
- const tjnumber = this.waterId;
- const viewNum = this.mobanId;
- const params = { viewNum, tjnumber };
- this.$tab.openPage("鏀舵灏忕エ", "/report/charge", params);
- } else{
+ this.disabled = 1
+ if (res.data) {
+ this.mobanId = res.data.mobanId;
+ this.waterId = res.data.waterId;
+ const tjnumber = this.waterId;
+ const viewNum = this.mobanId;
+ const params = { viewNum, tjnumber };
+ this.$tab.openPage("鏀舵灏忕エ", "/report/charge", params);
+ }
+
+ } else {
this.$message({
type: "warning ",
- message: "鏌ヨ鍒版偍宸查��娆撅紝璇锋偍閲嶆柊棰勭害!",
+ message: "res.msg",
});
}
diff --git a/src/views/system/tijian/TreeTransfer.vue b/src/views/system/tijian/TreeTransfer.vue
new file mode 100644
index 0000000..455a7c7
--- /dev/null
+++ b/src/views/system/tijian/TreeTransfer.vue
@@ -0,0 +1,272 @@
+<template lang="html">
+ <div class="tree-transfer">
+ <div class="transfer-panel unselect">
+ <!-- <div class="transfer-panel__header">
+ <el-checkbox v-model="leftCheckAll" @change="clickLeftCheckAll">寰呴��</el-checkbox>
+ </div> -->
+ <div class="transfer-panel__content">
+ <el-input size="mini" placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="leftFilterText">
+ </el-input>
+ <el-tree filter ref="tree" :data="leftNodeData" show-checkbox node-key="proId"
+ :filter-node-method="filterNode" @check="nodeClick" :props="defaultProps">
+ </el-tree>
+ </div>
+ </div>
+ <div class="button">
+ <div :class="['btn', { 'disabled': !toLeft }]" @click="removeToLeft">
+ 绉婚櫎
+ </div>
+ <div :class="['btn', { 'disabled': !toRight }]" @click="removeToRight">
+ 娣诲姞
+ </div>
+ </div>
+ <div class="transfer-panel selected">
+ <!-- <div class="transfer-panel__header">
+ <el-checkbox v-model="rightCheckAll" @change="clickRightCheckAll">宸查��</el-checkbox>
+ </div> -->
+ <div class="transfer-panel__content">
+ <el-input size="mini" placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="rightFilterText">
+ </el-input>
+ <el-tree ref="selectedTree" :data="rightNodeData" show-checkbox node-key="proId"
+ :filter-node-method="filterNode" @check="selectedClick" :props="defaultProps">
+ </el-tree>
+ </div>
+ </div>
+ </div>
+</template>
+
+<script>
+export default {
+ props: {
+ defaultProps: {
+ type: Object,
+ default: () => {
+ return {
+ children: 'children',
+ label: 'name'
+ }
+ }
+ },
+ treeData: {
+ type: Array,
+ default: () => {
+ return []
+ }
+ },
+ defaultKeys: {
+ type: Array,
+ default: () => {
+ return []
+ }
+ }
+ },
+ watch: {
+ leftFilterText(val) {
+ this.$refs.tree.filter(val)
+ },
+ rightFilterText(val) {
+ this.$refs.selectedTree.filter(val)
+ },
+ rightKeys(val) {
+ this.$emit('changeKeys', val)
+ }
+ },
+ data() {
+ return {
+ leftCheckAll: false,
+ rightCheckAll: false,
+ toLeft: false,
+ toRight: false,
+ nodeData: this.treeData,
+ leftNodeData: [],
+ rightNodeData: [],
+ rightKeys: this.defaultKeys,
+ rightFilterText: '',
+ leftFilterText: ''
+ }
+ },
+ created() {
+ this.leftNodeData = this.nodeData
+ 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
+ } else {
+ this.$refs.tree.setCheckedKeys([])
+ this.toRight = false
+ }
+ },
+ clickRightCheckAll(v) {
+ //鍙充晶鍏ㄩ��
+ if (v) {
+ let keys = this.getChildNodeKeys(this.rightNodeData)
+ this.$refs.selectedTree.setCheckedKeys(keys)
+ this.toLeft = true
+ } else {
+ this.$refs.selectedTree.setCheckedKeys([])
+ this.toLeft = false
+ }
+ },
+ //鑾峰彇鏌愪釜鑺傜偣鐨勫瓙鑺傜偣鐨刬d鍊�
+ getChildNodeKeys(node) {
+ let keys = []
+ let childrenName = this.defaultProps.children
+ node.forEach((item) => {
+ if (item[childrenName].length > 0) {
+ item[childrenName].forEach((item2) => {
+ keys.push(item2.proId)
+ })
+ }
+ })
+ return keys
+ },
+ filterNode(value, data) {
+ let labelName = this.defaultProps.label
+ if (!value) return true
+ return data[labelName].indexOf(value) !== -1
+ },
+ nodeClick() {
+ let keys = this.$refs.tree.getCheckedKeys(true)
+ if (keys.length > 0) {
+ this.toRight = true
+ }
+ },
+ selectedClick() {
+ let keys = this.$refs.selectedTree.getCheckedKeys(true)
+ if (keys.length > 0) {
+ this.toLeft = true
+ }
+ },
+ removeToRight() {
+ //鍚戝彸绉诲姩
+ //鑾峰彇姝ゆ椂宸﹁竟鏍戠姸缁撴瀯涓閫変腑鐨勮妭鐐�,浣跨敤鍘熷鏁版嵁缁撴瀯鍒犻櫎涓嶅寘鍚湪閫変腑鏁扮粍涓殑鑺傜偣锛屽垱寤烘柊鐨勬暟缁勶紝娓叉煋鍦ㄥ彸渚�
+ //鑾峰彇姝ゆ椂宸︿晶涓閫変腑鐨勮妭鐐规暟缁刬d
+ this.leftCheckAll = false
+ this.leftFilterText = ""
+ let keys = this.$refs.tree.getCheckedKeys(true)
+ let checkedKeys = [...this.rightKeys, ...keys]
+ this.rightKeys = checkedKeys
+ this.rerenderData(this.rightKeys)
+ this.toRight = false
+ this.$refs.tree.setCheckedKeys([])
+ },
+ removeToLeft() {
+ //鍚戝乏绉诲姩鐨勬椂鍊�
+ //璇存槑鏈夊凡閫夋嫨鐨勬暟鎹敼鍙橈紝姝ゆ椂鍒ゆ柇鍙宠竟閫変腑鐨勬暟鎹噸鏂版覆鏌撳乏杈规爲鐘剁殑缁撴瀯
+ //娓叉煋閫昏緫锛氫娇鐢ㄥ師濮嬫暟鎹粨鏋勫垹闄ゅ寘鍚湪鍙宠竟閫変腑鏁扮粍涓殑鏁扮粍
+ //鎵惧埌鐩墠琚�変腑鐨刱eys,浠巖ightKeys涓幓鎺�,鍦ㄤ娇鐢╮ightKeys杩囨护宸﹀彸涓や晶鏁扮粍
+ this.rightCheckAll = false
+ this.rightFilterText = ""
+ let keys = this.$refs.selectedTree.getCheckedKeys(true)
+ this.rightKeys = this.rightKeys.filter(v => {
+ return !keys.includes(v)
+ })
+ let checkedKeys = this.rightKeys
+ this.rerenderData(checkedKeys)
+ this.toLeft = false
+ this.$refs.selectedTree.setCheckedKeys([])
+ },
+ rerenderData(checkedKeys) {
+ let childrenName = this.defaultProps.children
+ let leftNodeData = JSON.parse(JSON.stringify(this.nodeData))
+ let rightNodeData = JSON.parse(JSON.stringify(this.nodeData))
+ for (let i = 0; i < rightNodeData.length; i++) {
+ if (rightNodeData[i][childrenName].length > 0) {
+ let children = rightNodeData[i][childrenName]
+ for (let j = 0; j < children.length; j++) {
+ if (!checkedKeys.includes(children[j].proId)) {
+ children.splice(j, 1)
+ j--
+ }
+ }
+ }
+ if (!rightNodeData[i][childrenName].length > 0) {
+ rightNodeData.splice(i, 1)
+ i--
+ }
+ }
+
+ //宸︿晶娓叉煋锛氬寘鍚殑鍒犻櫎
+ for (let i = 0; i < leftNodeData.length; i++) {
+ if (leftNodeData[i][childrenName].length > 0) {
+ let children = leftNodeData[i][childrenName]
+ for (let j = 0; j < children.length; j++) {
+ if (checkedKeys.includes(children[j].proId)) {
+ children.splice(j, 1)
+ j--
+ }
+ }
+ }
+ if (!leftNodeData[i][childrenName].length > 0) {
+ leftNodeData.splice(i, 1)
+ i--
+ }
+ }
+ this.rightNodeData = rightNodeData
+ this.leftNodeData = leftNodeData
+ }
+ }
+}
+</script>
+
+<style lang="scss" scoped>
+.tree-transfer {
+ display: flex;
+ justify-content: center;
+ .transfer-panel {
+ box-sizing: border-box;
+ width: 322px;
+ height: 460px;
+ border: 1px solid #ebeef5;
+ border-radius: 5px;
+ .transfer-panel__header {
+ box-sizing: border-box;
+ height: 40px;
+ border-bottom: 1px solid #ebeef5;
+ background-color: rgb(245, 247, 250);
+ padding-left: 10px;
+ line-height: 40px;
+ .title {
+ font-size: 16px;
+ margin-left: 5px;
+ }
+ }
+
+ .transfer-panel__content {
+ height: calc(100% - 40px);
+ overflow-y: scroll;
+ }
+ }
+
+ .button {
+ width: 80px;
+ // display: flex;
+ // justify-content: center;
+ align-items: center;
+ min-height: 480px;
+ line-height: 480px;
+ padding-top: 140px;
+ div {
+ margin-left: 10px;
+ width: 55px;
+ height: 40px;
+ background-color: rgb(64, 158, 255);
+ line-height: 40px;
+ text-align: center;
+ color: #fff;
+ font-weight: 700;
+ border-radius: 5px;
+ }
+
+ .disabled {
+ background-color: rgb(160, 207, 255);
+ margin: 10px;
+ }
+ }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue
index 1eee7b0..ed25297 100644
--- a/src/views/system/tijian/index.vue
+++ b/src/views/system/tijian/index.vue
@@ -1,6 +1,6 @@
<template>
<div class="app-container">
- <el-row class="container">
+ <el-row class="container" v-show="top">
<el-col style="width: 1050px">
<div style="width: 1200px">
<el-form style="margin: 4px 8px; width: 1200px" :inline="true" ref="form" :model="form" :rules="rules"
@@ -20,7 +20,8 @@
</el-select>
</el-form-item>
- <el-form-item label="璇佷欢鍙�" prop="cusIdcard">
+ <el-form-item label="璇佷欢鍙�" prop="cusIdcard" :rules="showHidden.has_idcard === 'Y' ? rules.cusIdcard : []"
+ :required="showHidden.has_idcard === 'Y'">
<el-input :disabled="isDisabled" style="width: 186px" v-model="form.cusIdcard" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�"
@input="inputChange" />
<i style="font-size: 17px; margin-left: 3px" class="el-icon-search" @click="handleQuery"></i>
@@ -34,7 +35,8 @@
<el-option v-for="dict in dict.type.dict_ageunit" :key="dict.value" :label="dict.label"
:value="dict.value"></el-option>
</el-select> </el-form-item>
- <el-form-item label="鎬у埆" prop="cusSex">
+ <el-form-item label="鎬у埆" prop="cusSex" :rules="showHidden.has_sex === 'Y' ? rules.cusSex : []"
+ :required="showHidden.has_sex === 'Y'">
<el-select :disabled="isDisabled" style="width: 160px" v-model="form.cusSex" placeholder="鎬у埆">
<el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label"
:value="parseInt(dict.value)"></el-option>
@@ -45,18 +47,19 @@
value-format="yyyy-MM-dd" placeholder="璇烽�夋嫨鍑虹敓鏃ユ湡">
</el-date-picker>
</el-form-item>
- <el-form-item label="鑱旂郴鐢佃瘽" prop="cusPhone">
+ <el-form-item label="鑱旂郴鐢佃瘽" prop="cusPhone" :rules="showHidden.is_phone === 'Y' ? rules.cusPhone : []"
+ :required="showHidden.is_phone === 'Y'">
<el-input v-model="form.cusPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" :disabled="isDisabled" style="width: 186px" />
</el-form-item>
<el-form-item label="鎴峰彛鍦板潃" prop="addr">
- <el-input v-model="form.addr" placeholder="璇疯緭鍏ユ埛鍙ｅ湴鍧�" :disabled="isDisabled" style="width: 410px" />
+ <el-input v-model="form.addr" placeholder="璇疯緭鍏ユ埛鍙ｅ湴鍧�" :disabled="isDisabled" style="width: 380px" />
</el-form-item>
<el-form-item label="鐜颁綇鍧�" prop="cusAddr">
- <el-input v-model="form.cusAddr" placeholder="璇疯緭鍏ョ幇灞呬綇鍦板潃" :disabled="isDisabled" style="width: 430px" />
+ <el-input v-model="form.cusAddr" placeholder="璇疯緭鍏ョ幇灞呬綇鍦板潃" :disabled="isDisabled" style="width: 440px" />
</el-form-item><br />
<el-form-item label="鑱屼笟" prop="career">
- <el-select filterable :disabled="isDisabled" v-model="form.career" placeholder="璇疯緭鍏ヨ亴涓�" style="width: 160px">
+ <el-select filterable :disabled="isDisabled" v-model="form.career" placeholder="璇疯緭鍏ヨ亴涓�" style="width: 130px">
<el-option v-for="dict in dict.type.dict_job" :key="dict.value" :label="dict.label"
:value="dict.value"></el-option>
</el-select>
@@ -75,7 +78,7 @@
</el-select>
</el-form-item>
<el-form-item label="宸ヤ綔鍗曚綅" prop="company">
- <el-input :disabled="isDisabled" v-model="form.company" placeholder="璇疯緭鍏ュ伐浣滃崟浣�" style="width: 210px" />
+ <el-input :disabled="isDisabled" v-model="form.company" placeholder="璇疯緭鍏ュ伐浣滃崟浣�" style="width: 220px" />
</el-form-item><br />
<!-- <el-form-item label="閭斂缂栫爜" prop="cusPostcode">
@@ -86,7 +89,7 @@
</el-form-item> -->
<el-form-item label="浠嬬粛浜�" prop="cusIntroduce">
- <el-input :disabled="isDisabled" v-model="form.cusIntroduce" placeholder="璇疯緭鍏ヤ粙缁嶄汉" style="width: 160px" />
+ <el-input :disabled="isDisabled" v-model="form.cusIntroduce" placeholder="璇疯緭鍏ヤ粙缁嶄汉" style="width: 130px" />
</el-form-item>
<el-form-item label="閭" prop="cusEmail">
<el-input v-model="form.cusEmail" placeholder="璇疯緭鍏ラ偖绠�" :disabled="isDisabled" style="width: 160px" />
@@ -126,17 +129,17 @@
<el-radio label="涓汉" v-if="form.tjType == null"></el-radio>
</el-radio-group>
</el-form-item> -->
- <el-form-item style="margin-left: 205px">
+ <el-form-item style="margin-left: 260px">
<el-button :disabled="isDisabled" style="margin-left: 50px" type="primary" size="mini"
@click="submitForm">鐧昏</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery" @queryTable="getList">閲嶇疆</el-button>
- <el-button type="primary" @click="Package" size="mini" v-if="tcShows">閫夋嫨濂楅</el-button>
+ <!-- v-if="tcShows" -->
<!-- <el-button type="primary" icon="el-icon-search" @click="handleQuery" size="mini">鏌ヨ</el-button> -->
</el-form-item>
</el-form>
</div>
</el-col>
- <el-col :span="4" style="1px solid black;mar-right:60px">
+ <el-col :span="4" style="1px solid black;mar-right:60px" v-show="showHidden.mall_hasPhoto == 'Y'">
<div class="content">
<!-- <el-upload
v-show="hide"
@@ -194,6 +197,7 @@
style="width: 850px">
<el-table-column type="selection" width="40px" align="center" label="閫夋嫨" />
<el-table-column label="濂楅鍚嶇О" align="center" prop="pacName" width="120px" />
+ <el-table-column label="濂楅浠锋牸" align="center" prop="price" width="120px" />
<el-table-column label="濂楅鏄庣粏" align="center" prop="allProName" :show-overflow-tooltip="true" />
<!-- :selectable="checkSelectable" -->
<!-- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
@@ -222,11 +226,13 @@
</el-tab-pane>
<el-tab-pane label="鍗曢」">
<div class="tab3">
- <div class="tab2">
- <el-tree ref="tree" :data="data" show-checkbox node-key="proId" :props="defaultProps"
+ <!-- <div class="tab2"> -->
+ <v-tree-transfer :treeData="treedataList" :defaultProps="{ children: 'tjProjectList', label: 'proName' }"
+ :defaultKeys="defaultKeys" @changeKeys="changeCategoryKeys" :key="datekey"></v-tree-transfer>
+ <!-- <el-tree ref="tree" :data="treedataList" show-checkbox node-key="proId" :props="defaultProps"
:default-expanded-keys="treeId" :default-checked-keys="treeList" @check-change="handleCurrentChecked">
- </el-tree>
- </div>
+ </el-tree> -->
+ <!-- </div> -->
<!-- <el-button
style="
width: 20px;
@@ -244,7 +250,7 @@
</el-tab-pane>
</el-tabs>
<span slot="footer" class="dialog-footer">
- <el-button @click="taocan = false">鍙� 娑�</el-button>
+ <el-button @click="cancel">鍙� 娑�</el-button>
<el-button type="primary" @click="submit">纭� 瀹�</el-button>
</span>
</el-dialog>
@@ -294,9 +300,9 @@
</div> -->
<template>
- <el-form :model="form" :inline="true" label-width="80px" style="margin-left: 7px">
+ <el-form :model="form" :inline="true" label-width="75px" style="margin-left: 7px">
<el-form-item label="浣撴绫诲瀷">
- <el-select style="width: 160px" v-model="form.tjType" placeholder="璇烽�夋嫨浣撴绫诲瀷">
+ <el-select style="width: 100px" v-model="form.tjType" placeholder="璇烽�夋嫨浣撴绫诲瀷">
<el-option v-for="dict in dict.type.dict_team" :key="dict.value" :label="dict.label"
:value="dict.value"></el-option>
</el-select>
@@ -305,19 +311,23 @@
<!-- <div class="tab1"> -->
<!-- <el-form :inline="true" class="tab1"> -->
<el-form-item label="搴旀敹閲戦">
- <el-input placeholder="搴旀敹閲戦" :value="TotalPrice1 + '.00'" disabled style="width: 160px"></el-input>
+ <el-input placeholder="搴旀敹閲戦" v-model="TotalPrice1" disabled style="width: 126px"></el-input>
</el-form-item>
- <el-form-item label="浼樻儬鎶樻墸">
+ <el-form-item label="浼樻儬">
<!-- <el-input style="width: 100px" type="number" v-model="discount" :value="discount"></el-input> -->
- <el-input-number ref="inputNumber" style="width: 130px" v-model="discount" :precision="2" :step="0.1"
+ <el-input-number ref="inputNumber" style="width: 126px" v-model="discount" :precision="2" :step="0.1"
:max="10" :min="1" @change="numberChange" :disabled="isfalse"></el-input-number>
</el-form-item>
<el-form-item label="瀹炴敹閲戦">
- <el-input placeholder="瀹炴敹閲戦" v-model="TotalPrice" style="width: 120px"></el-input>
+ <el-input placeholder="瀹炴敹閲戦" v-model="TotalPrice" style="width: 126px"></el-input>
</el-form-item>
<el-form-item>
- <el-button type="primary" @click="submitPrice" :disabled="confirm" size="mini">绛惧埌鐧昏</el-button>
+ <el-button type="primary" @click="Package" size="mini">閫夋嫨濂楅</el-button>
+ <el-button type="primary" @click="submitPrice" :disabled="confirm" v-if="showHidden.has_charge == 'N'"
+ size="mini">绛惧埌鐧昏</el-button>
+ <el-button type="primary" @click="submitCheckinfee" :disabled="confirm"
+ v-if="showHidden.has_charge == 'Y'" size="mini">鐧昏鏀惰垂</el-button>
</el-form-item>
<!-- </el-form> -->
<!-- </div> -->
@@ -325,6 +335,7 @@
</template>
<div style="text-align: center; margin-bottom: 10px; margin-right: 800px">
+
宸查�夐」鐩垪琛�
</div>
<div style="
@@ -345,9 +356,9 @@
item.parentName +
" (搴旀敹閲戦:" +
item.ordPrice +
- ".00鍏� / 瀹炴敹閲戦:" +
+ "鍏� / 瀹炴敹閲戦:" +
item.nowPrice +
- ".00鍏�)"
+ "鍏�)"
}}
</template>
<el-table :data="item.list" border style="width: 100%" height="270">
@@ -355,7 +366,7 @@
</el-table-column>
<el-table-column prop="proType" label="鎬у埆" width="180">
<template slot-scope="scope" v-if="scope.row.proType == ''">
- {{ scope.row.proType == '' ? "鍏ㄩ儴" : ""}}
+ {{ scope.row.proType == '' ? "鍏ㄩ儴" : "" }}
</template>
<template slot-scope="scope" v-else>
<dict-tag :options="dict.type.sys_user_sex" :value="scope.row.proType" />
@@ -381,11 +392,11 @@
</el-table-column>
<el-table-column prop="proType" label="鎬у埆" width="180">
<template slot-scope="scope" v-if="scope.row.proType == ''">
- {{ scope.row.proType == '' ? "鍏ㄩ儴" : ""}}
- </template>
- <template slot-scope="scope" v-else>
- <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.proType" />
- </template>
+ {{ scope.row.proType == '' ? "鍏ㄩ儴" : "" }}
+ </template>
+ <template slot-scope="scope" v-else>
+ <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.proType" />
+ </template>
</el-table-column>
<el-table-column prop="ysPrice" label="搴旀敹閲戦">
</el-table-column>
@@ -407,7 +418,7 @@
</el-table-column>
<el-table-column prop="proType" label="鎬у埆" width="180">
<template slot-scope="scope" v-if="scope.row.proType == ''">
- {{ scope.row.proType == '' ? "鍏ㄩ儴" : ""}}
+ {{ scope.row.proType == '' ? "鍏ㄩ儴" : "" }}
</template>
<template slot-scope="scope" v-else>
<dict-tag :options="dict.type.sys_user_sex" :value="scope.row.proType" />
@@ -437,6 +448,104 @@
</div>
</el-dialog>
+
+ <el-dialog title="鏀惰垂" :visible.sync="charge" width="59%" height="700px">
+ <div>
+ <el-table id="sig" v-loading="loading" :data="feeitems" @selection-change="handleSelect" tooltip-effect="dark"
+ ref="multipleTable" border>
+ <el-table-column type="selection" width="55" align="center" />
+ <el-table-column label="濮撳悕" align="center" prop="tjName" width="100px" />
+ <el-table-column label="鎬у埆" align="center" prop="sex" width="90px">
+ <template slot-scope="scope">
+ <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex" />
+ </template>
+ </el-table-column>
+ <el-table-column label="韬唤璇�" align="center" prop="idCard" width="150px"
+ :show-overflow-tooltip="true"></el-table-column>
+ <el-table-column label="鎵嬫満鍙�" align="center" prop="tjPhone" width="120px"
+ :show-overflow-tooltip="true"></el-table-column>
+ <el-table-column label="浣撴鍙�" align="center" prop="tjNumber" width="160px" />
+ <el-table-column label="鐧昏鏃堕棿" align="center" prop="tjFlowingWater.createTime"
+ :show-overflow-tooltip="true"></el-table-column>
+ <el-table-column label="鍗曚綅鍚嶇О" align="center" prop="tjComp"></el-table-column>
+ <el-table-column label="浣撴绫诲瀷" align="center" prop="tjType" width="80px">
+ <template slot-scope="scope">
+ <dict-tag :options="dict.type.dict_team" :value="scope.row.tjType" />
+ </template>
+ </el-table-column>
+ <el-table-column label="璁㈠崟娴佹按鍙�" align="center" prop="tjFlowingWater.waterId" width="200px" />
+ <el-table-column label="鏀惰垂鍛�" align="center" prop="tjFlowingWater.updateBy" width="100px" />
+ </el-table>
+
+ <el-row :gutter="10" class="mb8">
+ <el-col :span="20">
+ <el-form :inline="true" :model="formInline" class="demo-form-inline" style="margin: 12px 6px">
+ <el-form-item label="搴旀敹閲戦">
+ <el-input style="width: 86px" :value="formInline.price + '.00'" placeholder="閲戦"
+ :disabled="true"></el-input>
+ </el-form-item>
+ <el-form-item label="浼樻儬">
+ <el-input-number style="width: 140px" v-model="discount" :precision="2" :step="0.1" :max="10" :min="1"
+ @change="numberChange" :disabled="isfalse"></el-input-number>
+ </el-form-item>
+ <el-form-item label="瀹炴敹閲戦">
+ <el-input v-model="formInline.paidIn" placeholder="瀹炰粯" style="width: 94px">
+ </el-input>
+ </el-form-item>
+ <el-form-item label="浠樻绫诲瀷" prop="payType">
+ <el-select style="width: 120px" v-model="formInline.payType" placeholder="璇烽�夋嫨浠樻绫诲瀷">
+ <el-option v-for="dict in dict.type.dict_pay_type" :key="dict.value" :label="dict.label"
+ :value="dict.value"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item>
+ <el-button style="margin-left: 15px" type="primary" size="mini" @click="SubmitEvent">鏀惰垂</el-button>
+ </el-form-item>
+ </el-form>
+ </el-col>
+ </el-row>
+
+ <el-table v-loading="loading" :data="Chargesubitem" border height="240">
+ <el-table-column type="index" width="50"> </el-table-column>
+ <el-table-column label="椤圭洰鍚嶇О" align="center" prop="proName" />
+ <el-table-column label="搴旀敹閲戦" align="center" prop="proOrdPrice" />
+ <el-table-column label="瀹炴敹閲戦" align="center" prop="proPrice" />
+ </el-table>
+ </div>
+ </el-dialog>
+ <div style="
+ position: absolute;
+ bottom: 100px;
+ width: 360px;
+ display: none;
+ ">
+ <div id="printBill" style="width: 280px;font-size: 1px;" ref="printContent">
+ <div style="font-size: 1px;">
+ <div style="text-align: center;">
+ <h3>{{ hospName }}灏忕エ</h3>
+ </div>
+
+ <div style="margin-top: 4px;">
+ <div>
+ 濮撳悕:{{ formIn.name }}
+ </div>
+ <div>
+ 鐢佃瘽:{{ formIn.phone }}
+ </div>
+ <div>
+ 浣撴椤圭洰:{{ formIn.tjPro }}
+ </div>
+ <div>
+ 瀹炴敹閲戦:{{ formInline.paidIn }}鍏�
+ </div>
+ <div>
+ 鏀惰垂鏃堕棿:{{ currentDate + " " + currentTime }}
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
<!-- <el-dialog
title="鎷嶇収"
:visible.sync="beat"
@@ -455,7 +564,9 @@
<script>
import { dataURLtoFile, random } from "./file";
import { getInfo } from "@/api/login";
-import { addCustomer } from "@/api/hosp/customer";
+import { addCustomer, getwater, getfindTj, getByTjNum } from "@/api/hosp/customer";
+import { getPrintSetUp } from "@/api/system/examcharge";
+
import {
deptTreeSelect,
projectGetList,
@@ -466,22 +577,26 @@
getTransitionList,
getByTeamNo,
getLoadFile,
+ getIsRequired
} from "@/api/system/tijian";
import { MessageBox } from "element-ui";
-
+import VTreeTransfer from './TreeTransfer.vue'
export default {
dicts: [
"dict_user_national",
"dict_user_marry",
"sys_yes_no",
"sys_user_sex",
+ "dict_pay_type",
"dict_team",
"dict_job",
"dict_user_cardtype",
"dict_ageunit",
],
name: "Tijian",
-
+ components: {
+ VTreeTransfer
+ },
data() {
return {
index: 0,
@@ -499,8 +614,29 @@
isNow: 1,
treeId: [],
treeList: [],
+ defaultKeys: [],
+ adviceList: [],
+ feeitems: [],
+ refundPros: [],
+ Chargesubitem: [],
+ standard: {},
+ formInline: {
+ price: "0",
+ payType: "0",
+ paidIn: "0.00",
+ },
+ hospName: "",
+ currentDate: "",
+ currentTime: "",
+ formIn: {
+ tjPro:"浣撴璐�"
+ },
+ selectionList: [],
+ OrderId: "",
+ customer: {},
// index:['0'],
taocan: false,
+ top: true,
value: "2",
getInfodis: "",
srcUrl: "",
@@ -508,8 +644,10 @@
hide: true,
beat: false,
dialogVisibles: false,
+ charge: false,
src: "",
url: "",
+ datekey: Date.now(),
dialogVisible: false,
/** 鐓х浉鏈哄脊绐楁ā鍧�-start */
videoWidth: 200,
@@ -557,6 +695,8 @@
name: "",
isfalse: false,
responseList: {},
+ showHidden: {},
+ tjNumbers: "",
// 閫変腑鏁扮粍
ids: [],
// 闈炲崟涓鐢�
@@ -573,7 +713,7 @@
// 鏄剧ず鎼滅储鏉′欢
showSearch: true,
// 鏍戠姸褰㈢姸
- data: [],
+ treedataList: [],
defaultProps: {
children: "tjProjectList",
label: "proName",
@@ -653,10 +793,54 @@
};
},
created() {
+ this.getCurrentDateTime()
+
+ this.startTimer()
this.getList1();
this.getData();
},
methods: {
+ getCurrentDateTime() {
+
+ const currentDate = new Date()
+
+ // 鏍煎紡鍖栨棩鏈燂細YYYY-MM-DD
+
+ const year = currentDate.getFullYear()
+
+ const month = String(currentDate.getMonth() + 1).padStart(2, '0')
+
+ const day = String(currentDate.getDate()).padStart(2, '0')
+
+ this.currentDate = `${year}-${month}-${day}`
+
+ // 鏍煎紡鍖栨椂闂达細HH:mm:ss
+
+ const hours = String(currentDate.getHours()).padStart(2, '0')
+
+ const minutes = String(currentDate.getMinutes()).padStart(2, '0')
+
+ const seconds = String(currentDate.getSeconds()).padStart(2, '0')
+
+ this.currentTime = `${hours}:${minutes}:${seconds}`
+
+ },
+
+ startTimer() {
+
+ this.timer = setInterval(() => {
+
+ this.getCurrentDateTime()
+
+ }, 1000) //姣忕閽熸洿鏂颁竴娆�
+
+ },
+
+ beforeDestroy() {
+
+ clearInterval(this.timer)
+
+ },//娓呴櫎瀹氭椂鍣紝浠ラ伩鍏嶅唴瀛樻硠闇层��
freezing(val) {
if (val == 0) {
this.form.cusName = random(2)
@@ -667,10 +851,14 @@
getList1() {
getInfo().then((response) => {
this.getInfodis = response.user.discount;
+ this.hospName = response.hospName;
if (this.getInfodis === null) {
this.isfalse = true;
}
});
+ getIsRequired().then((response) => {
+ this.showHidden = response.data
+ })
},
inputChange() {
const reg =
@@ -840,13 +1028,12 @@
this.loading = false;
});
}
- this.getData();
},
getData() {
/** 鏌ヨ閮ㄩ棬涓嬫媺鏍戠粨鏋� */
projectGetList().then((response) => {
- this.data = response.data.list;
- this.dXData = response.data;
+ this.treedataList = response.data.list;
+ this.dXData = response.data.list;
return;
});
},
@@ -942,6 +1129,7 @@
_this.tcShow = true;
_this.tcShows = true;
_this.isDisabled = true;
+ _this.top = false;
});
}
});
@@ -964,7 +1152,7 @@
if (this.form.tjType === null) {
this.form.tjType = "2";
}
- if (this.form.reservationId) {
+ if (this.form.reservationId != null) {
if (this.form.groupingId) {
_this.tcShow = true;
_this.tcShows = false;
@@ -1176,6 +1364,8 @@
// 鍙栨秷鎸夐挳
cancel() {
this.Seachopen = false;
+ this.taocan = false
+ this.defaultKeys = []
},
/** 鎼滅储鎿嶄綔 */
@@ -1211,7 +1401,7 @@
this.DataList = [];
// this.data = JSON.parse(JSON.stringify(this.dXData));
selection[0].tjProjectList.forEach((selectionitem) => {
- this.data.forEach((item) => {
+ this.treedataList.forEach((item) => {
if (selectionitem.proName == item.proName) {
item.disabled = true;
item.tjProjectList = [];
@@ -1235,7 +1425,7 @@
});
});
} else {
- this.data = JSON.parse(JSON.stringify(this.dXData));
+ this.treedataList = JSON.parse(JSON.stringify(this.dXData));
return;
}
},
@@ -1243,6 +1433,7 @@
Package() {
this.taocan = true;
let cusSex = this.form.cusSex;
+ this.datekey = Date.now()
//鍏ㄩ儴濂楅
deptTreeSelect(cusSex).then((response) => {
this.newpacName = response.rows;
@@ -1262,6 +1453,7 @@
} catch (error) { }
this.loading = false;
});
+ this.getData();
},
// checkSelectable(row, index) {
@@ -1324,17 +1516,16 @@
proIds: this.proIds,
};
getaddtTransition(data).then((response) => {
- if (response.msg === "鎿嶄綔鎴愬姛") {
+ if (response.code === 200) {
let cusId = this.form.cusIdcard;
+ this.proIds = [];
getTransitionList(cusId).then((response) => {
this.tableData1 = response.data;
- // this.checkSelectable();
+ console.log(this.tableData1)
this.TotalPrice1 = 0;
if (this.tableData1) {
this.tableData1.forEach((item) => {
this.TotalPrice1 += item.nowPrice;
- this.TotalPrice =
- this.TotalPrice1 * (this.discount / 10) + ".00";
if (item.pacName === null) {
item.pacName = "鍗曢」";
}
@@ -1345,16 +1536,264 @@
}
this.pacName = item.pacName;
});
+
+ const r = /^\+?[0-9][0-9]*$/; //姝ｆ暣鏁帮紙鍙互0鎵撳ご锛�
+ let TotalPrice = this.TotalPrice1 * (this.discount / 10);
+ if (r.test(TotalPrice)) {
+ this.TotalPrice =
+ TotalPrice + '.00';
+ } else {
+ this.TotalPrice =
+ TotalPrice
+ }
+
this.list1 = false;
this.list3 = true;
+
} else {
this.list1 = true;
+
this.TotalPrice = "0.00";
}
});
}
});
this.taocan = false;
+ this.defaultKeys = []
+ },
+ changeCategoryKeys(val) {
+ this.proIds = [];
+ this.proIds = val
+ // if (this.DataList.length != 0) {
+ // this.DataList.forEach((item) => {
+ // this.proIds.push(item.proId);
+ // });
+ // } else {
+ // this.proIds = [];
+ // }
+ },
+ submitCheckinfee() {
+ let _this = this;
+ let List = _this.tableData1; //鍗曚釜椤圭洰淇℃伅
+ if (this.responseList.cusId) {
+ var userId = this.responseList.cusId;
+ } else {
+ var userId = _this.form.cusId;
+ }
+ let tjType = _this.form.tjType;
+ if (this.tableData[0]) {
+ var pacId = this.tableData[0].pacId;
+ }
+
+ //tjOrderList//杩欎釜鏄鐞嗗畬鐨勬瘡涓�椤瑰椁愪俊鎭�
+ List.forEach((item) => {
+ if (item.list) {
+ item.list.forEach((item1) => {
+ this.tjOrderList.push({
+ proName: item1.proName,
+ proPrice: item1.nowPrice,
+ proId: item1.proId,
+ });
+ });
+ } else if (item.tjProjectList) {
+ item.tjProjectList.forEach((item1) => {
+ this.tjOrderList.push({
+ proName: item1.proName,
+ proPrice: item1.priceNow,
+ proId: item1.proId,
+ });
+ });
+ } else {
+ this.tjOrderList.push({
+ proName: item.proName,
+ proPrice: item.ysPrice,
+ proId: item.proId,
+ });
+ }
+ });
+ let copeWith = this.TotalPrice1;
+ let paidIn = this.TotalPrice.toString();
+ let discount = this.discount;
+ this.tjFlowingWater = { copeWith, paidIn, discount };
+
+ let data;
+ if (pacId) {
+ data = {
+ photo: this.srcUrl,
+ pacId,
+ tjOrderList: this.tjOrderList,
+ tjFlowingWater: this.tjFlowingWater,
+ userId,
+ tjType,
+ };
+ } else {
+ data = {
+ photo: this.srcUrl,
+ tjOrderList: this.tjOrderList,
+ tjFlowingWater: this.tjFlowingWater,
+ userId,
+ tjType,
+ };
+ }
+ getOrder(data).then((res) => {
+ this.$modal.msgSuccess("鎻愪氦鎴愬姛");
+ this.tjNumbers = res.msg
+ this.charge = true;
+ let data = {
+ tjNum: res.msg
+ }
+ getfindTj(data).then((response) => {
+ if (response.data) {
+ this.feeitems = response.data;
+ }
+ })
+ });
+ },
+
+ // 琛ㄦ牸鍗曢��
+ handleSelect(selection, val) {
+ console.log(selection, val)
+ this.selectionList = this.$refs.multipleTable.selection;
+ this.selectionList.forEach((item) => {
+ this.formIn.name = item.tjName
+ this.formIn.phone = item.tjPhone
+ this.OrderId = item.tjOrderId;
+ if (item.tjFlowingWater != null) {
+ this.waterId = item.tjFlowingWater.waterId;
+ this.tollCollectorName = item.tjFlowingWater.updateBy;
+ this.tjSerialNumber = item.tjFlowingWater.tjSerialNumber;
+ }
+ this.customer = {
+ cusIdcard: item.idCard,
+ cusName: item.tjName,
+ cusPhone: item.tjPhone,
+ cusSex: item.sex === "鐢�" ? "0" : "1",
+ };
+ if (item.tjComp != null) {
+ this.standard = {
+ company: item.tjComp,
+ tjType: item.tjType === "鍥㈤槦" ? "1" : "2",
+ };
+ } else {
+ this.standard = {
+ tjType: item.tjType === "鍥㈤槦" ? "1" : "2",
+ };
+ }
+ });
+ if (selection.length > 1) {
+ let del_row = selection.shift();
+ this.$refs.multipleTable.toggleRowSelection(del_row, false);
+ }
+ let data = {
+ type: "0",
+ OrderId: this.OrderId,
+ };
+ getByTjNum(data).then((response) => {
+ if (response.data) {
+ this.Chargesubitem = response.data;
+ this.formInline.price = 0;
+ this.adviceList = [];
+ if (this.Chargesubitem.length != 0) {
+ this.Chargesubitem.forEach((item) => {
+ this.adviceList.push({
+ proId: item.proId,
+ proName: item.proName,
+ });
+ if (this.formInline.price) {
+ this.formInline.price += item.proOrdPrice;
+ this.formInline.paidIn += item.proPrice;
+ } else {
+ this.formInline.price = item.proOrdPrice;
+ this.formInline.paidIn = item.proPrice;
+ }
+ });
+ const r = /^\+?[0-9][0-9]*$/; //姝ｆ暣鏁帮紙鍙互浠ユ墦澶达級
+ //const r=/^\+?[1-9][0-9]*$/;//姝ｆ暣鏁�
+ if (r.test(this.formInline.paidIn)) {
+ this.formInline.paidIn = this.formInline.paidIn + ".00";
+ }
+ this.discount =
+ (this.formInline.paidIn / this.formInline.price) * 10;
+ if (this.discount <= this.getInfodis) {
+ this.discount = this.getInfodis;
+ }
+ } else {
+ this.discount = 10;
+ this.formInline.paidIn = "0.00";
+ }
+
+ this.total = response.data.total;
+ } else {
+ this.tableList = [];
+ }
+ });
+ },
+ // 鏀惰垂
+ SubmitEvent() {
+ if (this.feeitems.length != 0) {
+ this.refundPros.push(
+ { standard: this.standard },
+ { adviceList: this.adviceList }
+ );
+ let data = {
+ paidIn: this.formInline.paidIn,
+ discount: this.discount,
+ copeWith: this.formInline.price,
+ waterId: this.waterId,
+ tollCollectorName: this.tollCollectorName,
+ tjSerialNumber: this.tjSerialNumber,
+ payType: this.formInline.payType,
+ customer: this.customer,
+ refundPros: this.refundPros,
+ orderId: this.OrderId,
+ };
+ getwater(data).then((res) => {
+ if (res.msg != "璇ヨ鍗曞凡浠樻 鏃犻』鍐嶄粯") {
+ this.mobanId = res.data.mobanId;
+ this.waterId = res.data.waterId;
+ this.$modal.msgSuccess("鎿嶄綔鎴愬姛");
+ this.charge = false
+ this.isDisabled = false;
+ this.top = true
+ this.reset()
+ getPrintSetUp().then(res => {
+ if (res.msg == "0") {
+ this.$nextTick(() => {
+ const style =
+ "@media print { @page{margin:0 10mm,size:4mm 6mm;}};"; //鎵撳嵃鏃跺幓鎺夌湁椤电湁灏�
+ printJS({
+ printable: "printBill", // 鏍囩鍏冪礌id
+ noPrint: ".noPrint",
+ type: 'html',
+ header: "",
+ targetStyles: ["*"],
+ maxWidth: "800",
+ scanStyles: true, //鎵撳嵃蹇呴』鍔犱笂锛屼笉鐒堕〉闈笂鐨刢ss鏍峰紡鏃犳晥
+ style,
+ });
+ });
+
+ } else {
+ const tjnumber = this.tjNumbers;
+ const viewNum = "809623418249637888";
+ const params = { viewNum, tjnumber };
+ this.$tab.openPage("涓汉鍙戠エ", "/report/charge", params);
+ }
+ })
+ } else {
+ this.$message({
+ type: "warning ",
+ message: "鏌ヨ鍒版偍宸查��娆撅紝璇锋偍閲嶆柊棰勭害!",
+ });
+ }
+
+ });
+ } else {
+ this.$message({
+ type: "warning ",
+ message: "璇峰厛鏌ヨ瀹㈡埛淇℃伅!",
+ });
+ }
},
// 鏈�鍚庢彁浜ゆ寜閽�
diff --git a/src/views/system/tijianall/index.vue b/src/views/system/tijianall/index.vue
index 9a4104d..304fb9f 100644
--- a/src/views/system/tijianall/index.vue
+++ b/src/views/system/tijianall/index.vue
@@ -105,7 +105,6 @@
<el-form-item label="鍗″彿" prop="indexCard">
<el-input v-model="form.indexCard" placeholder="璇疯緭鍏ュ崱鍙�" style="width: 190px" />
</el-form-item>
- <el-button style="margin-left: 155px" type="primary" @click="Package" size="mini">閫夋嫨濂楅</el-button>
</el-form>
</div>
@@ -129,6 +128,7 @@
<template slot="empty">鏁版嵁姝ｅ湪鍔犺浇涓�</template>
<el-table-column type="selection" width="40px" align="center" label="閫夋嫨" />
<el-table-column label="濂楅鍚嶇О" align="center" prop="pacName" width="120px" />
+ <el-table-column label="濂楅浠锋牸" align="center" prop="price" width="120px" />
<el-table-column label="濂楅鏄庣粏" align="center" prop="allProName" :show-overflow-tooltip="true" />
<!-- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
@@ -152,9 +152,11 @@
<el-tab-pane label="鍗曢」">
<div class="tab8">
<div class="tab7">
- <el-tree :data="data" show-checkbox node-key="proId" :props="defaultProps" :default-checked-keys="treeList"
+ <v-tree-transfer :treeData="treedataList" :defaultProps="{ children: 'tjProjectList', label: 'proName' }"
+ :defaultKeys="defaultKeys" @changeKeys="changeCategoryKeys" :key="datekey"></v-tree-transfer>
+ <!-- <el-tree :data="data" show-checkbox node-key="proId" :props="defaultProps" :default-checked-keys="treeList"
@check-change="handleCurrentChecked">
- </el-tree>
+ </el-tree> -->
</div>
<!-- <el-button style="
width: 20px;
@@ -237,6 +239,8 @@
<el-input placeholder="瀹炴敹閲戦" v-model="TotalPrice" disabled style="width: 190px"></el-input>
</el-form-item>
<el-form-item>
+ <el-button type="primary" @click="Package" size="mini">閫夋嫨濂楅</el-button>
+
<el-button type="primary" @click="submitPrice" size="mini" :disabled="confirm">棰勭害鐧昏</el-button>
</el-form-item>
</el-form>
@@ -394,8 +398,11 @@
getaddTj,
} from "@/api/system/tijian";
import { MessageBox } from "element-ui";
-
+import VTreeTransfer from '../tijian/TreeTransfer.vue'
export default {
+ components: {
+ VTreeTransfer
+ },
dicts: [
"dict_user_national",
"dict_user_marry",
@@ -457,6 +464,7 @@
src: "",
url: "",
dialogVisible: false,
+ datekey: Date.now(),
/** 鐓х浉鏈哄脊绐楁ā鍧�-start */
videoWidth: 200,
videoHeight: 200,
@@ -485,6 +493,7 @@
TotalPrice1: 0,
discount: 10,
newpacName: [],
+ defaultKeys: [],
// 鎵�鏈変綋妫�椤圭洰路
allpackageList: [],
tjProjectList: [],
@@ -518,7 +527,7 @@
// 鏄剧ず鎼滅储鏉′欢
showSearch: true,
// 鏍戠姸褰㈢姸
- data: [],
+ treedataList: [],
defaultProps: {
children: "tjProjectList",
label: "proName",
@@ -687,8 +696,8 @@
/** 鏌ヨ閮ㄩ棬涓嬫媺鏍戠粨鏋� */
projectGetList().then((response) => {
- this.data = response.data.list;
- this.dXData = response.data;
+ this.treedataList = response.data.list;
+ this.dXData = response.data.list;
return;
});
},
@@ -867,6 +876,7 @@
this.taocan = true;
// this.getData();
let cusSex = this.form.cusSex;
+ this.datekey = Date.now()
//鍏ㄩ儴濂楅
deptTreeSelect(cusSex).then((response) => {
this.newpacName = response.rows;
@@ -949,7 +959,7 @@
this.DataList = [];
// this.data = JSON.parse(JSON.stringify(this.dXData));
selection[0].tjProjectList.forEach((selectionitem) => {
- this.data.forEach((item) => {
+ this.treedataList.forEach((item) => {
if (selectionitem.proName == item.proName) {
item.disabled = true;
item.tjProjectList = [];
@@ -973,7 +983,7 @@
});
});
} else {
- this.data = JSON.parse(JSON.stringify(this.dXData));
+ this.treedataList = JSON.parse(JSON.stringify(this.dXData));
return;
}
},
@@ -994,6 +1004,10 @@
this.proIds = [];
}
},
+ changeCategoryKeys(val) {
+ this.proIds = [];
+ this.proIds = val
+ },
// 椤圭洰鎻愪氦
submit() {
--
Gitblit v1.8.0