From cb1f69717eed3b6a61b6c61a8934bac752782b2d Mon Sep 17 00:00:00 2001
From: wwl <xchao828@163.com>
Date: 星期三, 05 三月 2025 17:00:38 +0800
Subject: [PATCH] 1
---
src/views/hosp/project/index.vue | 666 +++++++++++++++++++++++++++++++++++++------------------
1 files changed, 447 insertions(+), 219 deletions(-)
diff --git a/src/views/hosp/project/index.vue b/src/views/hosp/project/index.vue
index 90638db..31609a5 100644
--- a/src/views/hosp/project/index.vue
+++ b/src/views/hosp/project/index.vue
@@ -6,19 +6,23 @@
<el-input v-model="deptName" placeholder="璇疯緭鍏ラ儴闂ㄥ悕绉�" clearable size="small" prefix-icon="el-icon-search"
style="margin-bottom: 15px" />
</div>
- <div class="head-container">
- <el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false"
- :filter-node-method="filterNode" ref="tree" node-key="id" :default-expanded-keys="treeId" highlight-current
- @node-click="handleNodeClick" />
+ <div class="scrollable-container">
+ <div class="content">
+ <el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false"
+ :filter-node-method="filterNode" ref="tree" node-key="id" :default-expanded-keys="treeId"
+ highlight-current @node-click="handleNodeClick" :render-content="renderContent" v-loading="loadings"/>
+ </div>
</div>
</el-col>
<el-col :span="20" :xs="24">
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+ label-width="68px">
<el-form-item label="椤圭洰鍚嶇О" prop="proName">
<el-input v-model="queryParams.proName" placeholder="璇疯緭鍏ラ」鐩悕绉�" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="妫�鏌ョ被鍒�" prop="checkType">
- <el-input v-model="queryParams.checkType" placeholder="璇疯緭鍏ユ鏌ョ被鍒�" clearable @keyup.enter.native="handleQuery" />
+ <el-input v-model="queryParams.checkType" placeholder="璇疯緭鍏ユ鏌ョ被鍒�" clearable
+ @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
@@ -31,6 +35,10 @@
<el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['hosp:project:add']">鏂板</el-button>
</el-col>
+ <el-col :span="1.5">
+ <el-button :disabled="xiugais" type="primary" icon="el-icon-plus" size="mini" @click="handleUpdate1"
+ v-hasPermi="['hosp:project:add']">淇敼</el-button>
+ </el-col>
<!-- <el-col :span="1.5">
<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate" v-hasPermi="['hosp:project:edit']">淇敼</el-button>
</el-col> -->
@@ -42,43 +50,47 @@
v-hasPermi="['hosp:project:export']">瀵煎嚭</el-button>
</el-col>
<el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-download" size="mini"
+ @click="Synchronizationfees">鎵归噺鍚屾璐圭敤</el-button>
+ </el-col>
+ <el-col :span="1.5">
<el-button type="primary" icon="el-icon-sort" size="mini" @click="toggleExpandAll">灞曞紑/鎶樺彔</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
- <el-table v-if="refreshTable" v-loading="loading" :data="projectList" ref="tableRef" border row-key="proId"
- :expand-row-keys="ListId" :row-class-name="selectSingleRow" :tree-props="{
- children: 'tjProjectList',
- hasChildren: 'tjProjectList.length>0',
- }">
+ <el-table v-if="refreshTable" v-loading="loading" :data="projectList" ref="tableRef" border>
<!-- :show-overflow-tooltip="true" -->
<el-table-column label="椤圭洰鍚嶇О" prop="proName" fixed="left" :width="flexColumnWidth('rwdtypeName')" />
- <el-table-column label="椤圭洰浠锋牸(鍗曚綅/鍏�)" align="center" prop="proPrice" width="75px"
+ <el-table-column label="浠锋牸(/鍏�)" align="center" prop="proPrice" width="75px"
+ :show-overflow-tooltip="true"></el-table-column>
+ <el-table-column label="鏁伴噺" align="center" prop="sl" width="65px"
:show-overflow-tooltip="true"></el-table-column>
<!-- <el-table-column label="绉戝鍚嶇О" align="center" prop="deptName" width="110px" :show-overflow-tooltip="true" /> -->
- <el-table-column label="妫�鏌ョ被鍒�" align="center" prop="proCheckType" width="110px" :show-overflow-tooltip="true" />
+ <el-table-column label="妫�鏌ョ被鍒�" align="center" prop="proCheckType" width="110px"
+ :show-overflow-tooltip="true" />
<el-table-column label="榛樿鍊�" align="center" prop="proDefault" width="110px" :show-overflow-tooltip="true" />
- <el-table-column label="涓村簥鎰忎箟" align="center" prop="proMeaning" width="350px" :show-overflow-tooltip="true" />
+ <el-table-column label="缁撴灉绫诲瀷" align="center" prop="resultType" width="80px" :show-overflow-tooltip="true">
+ <template slot-scope="scope">
+ <dict-tag :options="dict.type.tj_result_type" :value="scope.row.resultType" />
+ </template>
+ </el-table-column>
+
<!-- <el-table-column label="妫�鏌ユ柟寮�" align="center" prop="proCheckMethod" :show-overflow-tooltip="true"
width="110px" /> -->
- <el-table-column label="鍙備笌灏忕粨" align="center" prop="needReport" :show-overflow-tooltip="true" width="110px">
+ <el-table-column label="鍙備笌灏忕粨" align="center" prop="needReport" :show-overflow-tooltip="true" width="75px">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.needReport" />
</template>
</el-table-column>
- <el-table-column label="鏄惁绌鸿吂" align="center" prop="proCheckMethod" :show-overflow-tooltip="true" width="110px">
+ <el-table-column label="鏄惁绌鸿吂" align="center" prop="proCheckMethod" :show-overflow-tooltip="true" width="75px">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.proCheckMethod" />
</template>
</el-table-column>
<el-table-column label="椤圭洰鏍囧噯鍊�" align="center" prop="proScope" :show-overflow-tooltip="true" width="90px">
</el-table-column>
- <el-table-column label="椤圭洰绫诲瀷" align="center" prop="resultType" width="110px" :show-overflow-tooltip="true">
- <template slot-scope="scope">
- <dict-tag :options="dict.type.tj_result_type" :value="scope.row.resultType" />
- </template>
- </el-table-column>
+ <el-table-column label="涓村簥鎰忎箟" align="center" prop="proMeaning" width="350px" :show-overflow-tooltip="true" />
<el-table-column label="澶囨敞" prop="remark" align="center" width="120px" :show-overflow-tooltip="true">
</el-table-column>
<el-table-column label="鐘舵��" align="center" prop="proStatus" fixed="right" width="80px">
@@ -101,29 +113,20 @@
</el-row>
<!-- 娣诲姞鎴栦慨鏀逛綋妫�椤圭洰瀵硅瘽妗� -->
- <el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body :before-close="handleClose">
+ <el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body :before-close="handleClose"
+ :close-on-click-modal="false">
<el-form ref="form" :model="form" :rules="rules" label-width="100px" :inline="true">
<el-form-item label="涓婚」鍚嶇О" prop="proParentId">
- <treeselect v-model="form.proParentId" :options="projectOptions" :normalizer="normalizer" :show-count="true"
- placeholder="閫夋嫨涓婚」鍚嶇О" style="width: 260px" @select="obtain" />
+ <treeselect :disabled="proParent" v-model="form.proParentId" :options="projectOptions"
+ :normalizer="normalizer" :show-count="true" placeholder="閫夋嫨涓婚」鍚嶇О" style="width: 260px" @select="obtain" />
</el-form-item>
- <el-form-item label="鏄庣粏椤圭洰" prop="proName" v-if="key == 'Y'">
- <span slot="label" style="display: inline-block; border-bottom: 2px solid blue" @click="getDetailed">
- 鏄庣粏椤圭洰
- <!-- <el-tooltip effect="dark" content="鏄庣粏椤圭洰" placement="bottom">
- <i class='el-icon-question' @click="getDetailed" />
- </el-tooltip> -->
- </span>
- <el-input v-model="form.proName" placeholder="璇疯緭鍏ユ槑缁嗛」鐩�">
- </el-input>
- </el-form-item>
- <el-form-item label="鏄庣粏椤圭洰" prop="proName" v-if="key == 'N'">
+ <el-form-item label="鏄庣粏椤圭洰" prop="proName">
<el-input v-model="form.proName" placeholder="璇疯緭鍏ユ槑缁嗛」鐩�">
</el-input>
</el-form-item>
<el-form-item label="椤圭洰浠锋牸" prop="proPrice">
- <el-input v-model="form.proPrice" placeholder="璇疯緭鍏ラ」鐩环鏍�" />
+ <el-input v-model="form.proPrice" :disabled="isPriceDisabled" placeholder="璇疯緭鍏ラ」鐩环鏍�" />
</el-form-item>
<el-form-item label="妫�鏌ョ被鍒�" prop="proCheckType">
<el-input v-model="form.proCheckType" placeholder="璇疯緭鍏ユ鏌ョ被鍒�" style="width: 260px" />
@@ -150,7 +153,7 @@
</el-select>
</el-form-item> -->
<el-form-item label="鎬у埆" prop="proSex">
- <el-select v-model="form.proSex" placeholder="璇烽�夋嫨浣撴浜烘�у埆" style="width: 200px">
+ <el-select v-model="form.proSex" placeholder="璇烽�夋嫨浣撴浜烘�у埆" style="width: 200px" clearable>
<el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label"
:value="dict.value"></el-option>
</el-select>
@@ -160,8 +163,8 @@
</el-form-item>
<el-form-item label="绉戝鍚嶇О" prop="deptId">
- <el-select v-model="form.deptId" placeholder="璇烽�夋嫨绉戝鍚嶇О" @change="changeValue" filterable style="width: 260px">
- <el-option v-for="dict in parentNameList" :key="dict.deptId" :label="dict.deptName" :value="dict.deptId" />
+ <el-select v-model="form.deptId" placeholder="璇烽�夋嫨绉戝鍚嶇О" @change="changeType" filterable style="width: 260px">
+ <el-option v-for="item in parentNameList" :key="item.deptId" :label="item.deptName" :value="item.deptId" />
</el-select>
</el-form-item>
<el-form-item label="鍚敤鏍囧織" prop="proStatus">
@@ -191,14 +194,63 @@
:value="dict.value"></el-option>
</el-select>
</el-form-item>
+ <el-form-item label="鍗曚綅" prop="proMetering">
+ <el-input v-model="form.proMetering" placeholder="璇疯緭鍏ュ崟浣�" style="width: 260px" />
+ </el-form-item>
+ <el-form-item label="鍙傝�冭寖鍥�" prop="proScope">
+ <el-input v-model="form.proScope" placeholder="璇疯緭鍏ュ弬鑰冭寖鍥�" style="width: 200px" />
+ </el-form-item>
+ <el-form-item label="鏁伴噺" prop="sl">
+ <el-input v-model="form.sl" placeholder="璇疯緭鍏ユ暟閲�" style="width: 200px" />
+ </el-form-item>
+ <el-form-item label="缁勫悎鏍囧織" prop="sfzhfy">
+ <el-select v-model="form.sfzhfy" placeholder="璇烽�夋嫨鏄惁缁勫悎鏍囧織" style="width: 260px">
+ <el-option v-for="dict in dict.type.sys_yes_no" :key="dict.value" :label="dict.label"
+ :value="dict.value"></el-option>
+ </el-select>
+ </el-form-item>
+
<el-form-item label="缁撴灉绫诲瀷" prop="resultType">
- <el-select v-model="form.resultType" placeholder="璇烽�夋嫨缁撴灉绫诲瀷" style="width: 260px" filterable clearable>
+ <el-select v-model="form.resultType" placeholder="璇烽�夋嫨缁撴灉绫诲瀷" style="width: 200px" filterable clearable>
<el-option v-for="dict in dict.type.tj_result_type" :key="dict.value" :label="dict.label"
:value="dict.value"></el-option>
</el-select>
</el-form-item>
+ <el-form-item label="his椤圭洰鍚嶇О" prop="hisXmmc" v-if="key == 'Y'">
+ <span slot="label" style="display: inline-block; border-bottom: 2px solid blue" @click="getDetailed">
+ his椤圭洰鍚嶇О
+ </span>
+
+ <el-input v-model="form.hisXmmc" placeholder="his椤圭洰鍚嶇О" style="width: 200px">
+ </el-input>
+ </el-form-item>
+ <el-form-item label="his椤圭洰鍚嶇О" prop="hisXmmc" v-if="key == 'N'">
+ <el-input v-model="form.hisXmmc" placeholder="璇疯緭鍏ユ槑缁嗛」鐩�" style="width: 260px">
+ </el-input>
+ </el-form-item>
+ <el-form-item label="his缂栫爜" prop="hisXmbm">
+ <el-input v-model="form.hisXmbm" placeholder="璇疯緭鍏is缂栫爜" style="width: 260px" />
+ </el-form-item>
+ <el-form-item label="his鍗曚环" prop="hisdj">
+ <el-input v-model="form.hisdj" placeholder="璇疯緭鍏is鍗曚环" style="width: 200px" />
+ </el-form-item>
+ <el-form-item label="LIS椤圭洰" prop="lisXmmc">
+ <span slot="label" style="display: inline-block; border-bottom: 2px solid blue" @click="handleQuerys">
+ LIS椤圭洰
+ </span>
+
+ <el-input v-model="form.lisXmmc" placeholder="璇疯緭鍏IS椤圭洰" style="width: 200px">
+ </el-input>
+ </el-form-item>
+
+ <el-form-item label="LIS缂栫爜" prop="lisXmbm">
+ <el-input v-model="form.lisXmbm" placeholder="璇疯緭鍏is缂栫爜" style="width: 260px" />
+ </el-form-item>
<el-form-item label="澶囨敞" prop="proRemark">
- <el-input v-model="form.proRemark" placeholder="璇疯緭鍏ュ娉�" style="width: 510px" />
+ <el-input v-model="form.proRemark" placeholder="璇疯緭鍏ュ娉�" style="width: 200px" />
+ </el-form-item>
+ <el-form-item label="鎺掑簭" prop="xh">
+ <el-input v-model="form.xh" placeholder="璇疯緭鍏ュ娉�" style="width: 200px" />
</el-form-item>
</el-form>
<el-button style="margin-left: 40px" type="primary" plain size="mini" icon="el-icon-plus"
@@ -209,7 +261,8 @@
<el-table-column label="鑰楁潗鍚嶇О" align="center" prop="makings" width="200px">
<template slot-scope="scope">
<el-select filterable v-model="scope.row.makings" placeholder="璇烽�夋嫨鏀惰垂椤圭洰" @change="getSelectValue">
- <el-option v-for="(item, index) in consumableList" :key="index" :label="item.makings" :value="item.makings">
+ <el-option v-for="(item, index) in consumableList" :key="index" :label="item.makings"
+ :value="item.makings">
</el-option>
</el-select>
</template>
@@ -267,12 +320,12 @@
</el-table-column>
</el-table>
<div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
+ <el-button type="primary" @click.stop="submitForm">纭� 瀹�</el-button>
<el-button @click="cancel">鍙� 娑�</el-button>
</div>
</el-dialog>
- <el-dialog title="鏀惰垂椤圭洰" :visible.sync="dialogTableVisible" width="80%">
+ <el-dialog title="鏀惰垂椤圭洰" :visible.sync="dialogTableVisible" width="80%" :close-on-click-modal="false">
<div class="app-container">
<el-row :gutter="24">
<!--閮ㄩ棬鏁版嵁-->
@@ -293,7 +346,8 @@
<el-form :model="querycharge" ref="queryForm" size="small" :inline="true" v-show="showSearch"
label-width="68px">
<el-form-item label="椤圭洰鍚嶇О" prop="xmmc">
- <el-input v-model="querycharge.xmmc" placeholder="璇疯緭鍏ラ」鐩悕绉�" clearable @keyup.enter.native="handlecharge" />
+ <el-input v-model="querycharge.xmmc" placeholder="璇疯緭鍏ラ」鐩悕绉�" clearable
+ @keyup.enter.native="handlecharge" />
</el-form-item>
<el-form-item label="鎷奸煶鐮�" prop="pym">
<el-input v-model="querycharge.pym" placeholder="璇疯緭鍏ユ嫾闊崇爜" clearable @keyup.enter.native="handlecharge" />
@@ -339,17 +393,24 @@
<el-button type="primary" @click="submit">纭� 瀹�</el-button>
</div>
</el-dialog>
+ <Packagese ref="aaa" @add="handleChanges" />
</div>
</template>
<script>
+import Packagese from "@/components/Packagese";
import {
getProject,
delProject,
addProject,
updateProject,
ProjectTree,
+ getlist,
deptTree,
+ deptTree111,
+ getAllChildListById,
+ getInfoByProId,
+ tbhisproprice,
} from "@/api/hosp/project";
import { listDept } from "@/api/system/dept";
import Treeselect from "@riophae/vue-treeselect";
@@ -357,6 +418,7 @@
import IconSelect from "@/components/IconSelect";
import { listConsumables } from "@/api/hosp/consumables";
import { Message } from "element-ui";
+import cnchar from 'cnchar';
import {
listSfxm,
getSfxm,
@@ -380,7 +442,7 @@
"tj_result_type",
"sys_yes_no",
],
- components: { Treeselect, IconSelect },
+ components: { Treeselect, IconSelect, Packagese },
data() {
let checkPhoneNum = (rule, value, callback) => {
let patter = new RegExp(/^1\s*[3456789]\s*(\d\s*){9}$/);
@@ -393,9 +455,12 @@
}
};
return {
+ xiugais: true,
+ xiugaiList: [],
// 閮ㄩ棬鏍戦�夐」
deptOptions: undefined,
dialogTableVisible: false,
+ isPriceDisabled: false,
sfxmList: [],
deptOptionstree: [],
defaultPropstree: {
@@ -411,6 +476,7 @@
ChangeList: [],
// 閬僵灞�
loading: true,
+ loadings: false,
key: "",
// 閫変腑鏁扮粍
ids: [],
@@ -422,8 +488,9 @@
showSearch: true,
// 鎬绘潯鏁�
total: 0,
- treeId: [],
+ treeId: ["532"],
ListId: [],
+ noclick: false,
// 浣撴鑰楁潗琛ㄦ牸鏁版嵁
consumableList: [],
tjStandardList: [],
@@ -447,7 +514,9 @@
children: "children",
label: "label",
},
+ proParent: false,
id: "",
+ isSubmitting: false,
// 閲嶆柊娓叉煋琛ㄦ牸鐘舵��
refreshTable: true,
// 鏌ヨ鍙傛暟
@@ -458,6 +527,7 @@
proEngName: null,
checkType: null,
deptId: undefined,
+ proId: undefined,
},
querycharge: {
pageNum: 1,
@@ -465,6 +535,7 @@
xmmc: null,
pym: null,
},
+ treeDate: {},
queryParam: {
page: 1,
pageSize: 10,
@@ -472,10 +543,25 @@
},
// 琛ㄥ崟鍙傛暟
form: {
- needReport :"Y",
- proName:"",
- proPrice:"",
- sfxmId:"",
+ proParentId: "",
+ deptId: "",
+ needReport: "Y",
+ hisXmbm: "",
+ hisXmmc: "",
+ sfzhfy: "Y",
+ hisdj: "",
+ sl: "",
+ xh:"0",
+ proStatus: "0",
+ proName: "",
+ proPrice: "",
+ sfxmId: "",
+ lisXmbm: "",
+ lisXmmc: "",
+ proMetering: "",
+ proScope: "",
+ proSex: "2",
+ resultType: "", // 鍒濆鍊�
},
// 琛ㄥ崟鏍￠獙
rules: {
@@ -507,11 +593,23 @@
this.$refs.tree.filter(val);
},
treeId(newVal, oldVal) {
- if (newVal) {
+ if (newVal && newVal.length > 0) {
this.$nextTick(() => {
- document
- .querySelector(".el-tree-node__children .el-tree-node__content")
- .click();
+ // Find the last ID in the treeId array
+ const lastId = newVal[newVal.length - 1] || "532"; // Default to 100 if undefined
+ // Search for the node in deptOptions
+ const node = this.findNodeById(this.deptOptions, lastId);
+
+ if (node) {
+ // Set the current key for the tree
+ this.$refs.tree.setCurrentKey(lastId);
+
+ // Simulate clicking on the node
+ const nodeElement = document.querySelector(`.el-tree-node[data-key="${lastId}"] .el-tree-node__content`);
+ if (nodeElement) {
+ nodeElement.click();
+ }
+ }
});
}
},
@@ -537,28 +635,42 @@
this.getConsumables();
this.getDeptList();
this.getDeptTree();
+
+ },
+ mounted() {
+ this.getDeptTree();
},
methods: {
+ handleQuerys() {
+ this.$refs.aaa.open = true;
+ this.$refs.aaa.getAllList();
+ this.$refs.aaa.title = "鏁版嵁瀛楀吀";
+ },
+ handleChanges(param1) {
+ // if(this.form.pacCode == "涓嶈"){
+ // this.form.cusIdcard = param1[0].xh;
+ // }else{
+ // this.form.cusIdcard = param1[0].pacCode;
+ // }
+
+ this.form.lisXmbm = param1[0].pacCode;
+ this.form.lisXmmc = param1[0].pacName;
+ },
//鏄惁鏄剧ず閫変腑鐨勫��
display(value) { },
/** 鏌ヨ浣撴椤圭洰鍒楄〃 */
getList() {
- // this.loading = true;
- // listProject(this.queryParams).then((response) => {
- // this.projectList = response.rows;
- // this.total = response.total;
- // this.loading = false;
- // });
- // this.getData();
-
this.loading = true;
let data = {
proName: this.queryParams.proName,
checkType: this.queryParams.checkType,
deptId: this.queryParams.deptId,
+ proId: this.queryParams.proId,
};
- ProjectTree(data).then((response) => {
- this.projectList = this.handleTree(response.data.list, "proId");
+ getAllChildListById(data).then((response) => {
+ this.projectList = response.data.list;
+ // console.log("杩涙潵浜嗗垪琛ㄥ苟涓旇幏鍙栧埌浜嗗��", this.projectList);
+
this.loading = false;
});
},
@@ -573,12 +685,18 @@
/** 鏂板鎸夐挳鎿嶄綔 */
handleAdd(row) {
+ this.form.hisXmbm = "";
+ this.form.hisXmmc = "";
+ this.form.hisdj = "";
// this.reset();
this.loading = true;
- // this.form.proPrice = 0.00
- // this.form.proName = ""
- // this.form.proId = null
- ProjectTree().then((response) => {
+ this.proParent = false;
+ this.form.proPrice = 0.0;
+ this.form.proName = "";
+ this.form.proId = null;
+ this.form.resultType = "1";
+ // ProjectTree
+ getlist().then((response) => {
if (response.code == 200) {
this.loading = false;
this.projectOptions = [];
@@ -586,47 +704,77 @@
project.children = this.handleTree(response.data.list, "proId");
this.key = response.data.key;
this.projectOptions.push(project);
- if (row) {
- this.form.proParentId = row.proId;
+ if (row.proId) {
+ for (var i = 0; i < project.children.length; i++) {
+ if (project.children[i].proId === row.proId) {
+ this.form.proParentId = row.proId;
+ break;
+ } else {
+ this.form.proParentId = 0;
+ }
+ }
+
+ this.open = true;
+ } else if (this.treeDate.id) {
+ for (var i = 0; i < project.children.length; i++) {
+ if (project.children[i].proId === this.treeDate.id) {
+ this.form.proParentId = this.treeDate.id;
+ break;
+ } else {
+ this.form.proParentId = 0;
+ }
+ }
+
+ this.projectOptions.forEach((item) => {
+ item.children.forEach((item1) => {
+ if (this.form.proParentId == item1.proId) {
+ this.form.deptId = item1.deptId;
+ }
+ });
+ });
this.open = true;
} else {
this.open = true;
}
-
}
});
- this.title = "浣撴椤圭洰淇℃伅缁存姢";
- this.form.deptId = this.queryParams.deptId;
+ this.title = "浣撴椤圭洰淇℃伅缁存姢";
+ if (this.queryParams.deptId) {
+ this.form.deptId = this.queryParams.deptId;
+ } else {
+ this.form.deptId = null;
+ }
+ // this.form.proId = this.queryParams.proId;
this.form.proCheckMethod = "N";
-
+
if ((this.key = "Y")) {
gettreeList().then((response) => {
this.deptOptionstree = response.data;
-
});
}
},
// 鎵撳紑input寮规
getDetailed() {
+ this.querycharge.xmmc = "";
+ this.querycharge.pym = "";
if (this.selectList) {
if (this.selectList.proName === "涓荤被鐩�") {
this.dialogTableVisible = false;
} else {
this.dialogTableVisible = true;
- this.$nextTick(()=>{
+ this.$nextTick(() => {
this.chargeId.push(this.deptOptionstree[0].id);
- })
+ });
this.getlistSfxm();
-
}
} else if (this.form.proParentId) {
if (this.form.proParentId != 0) {
this.dialogTableVisible = true;
- this.$nextTick(()=>{
+ this.$nextTick(() => {
this.chargeId.push(this.deptOptionstree[0].id);
- })
+ });
this.getlistSfxm();
} else if (this.form.proParentId == 0) {
this.dialogTableVisible = false;
@@ -635,16 +783,19 @@
this.$message.error("璇烽�夋嫨涓婚」鍚嶇О");
}
},
+ changeType() {
+ this.$forceUpdate();
+ },
obtain(vals) {
if (this.projectOptions) {
this.selectList = vals;
- console.log(this.selectList);
}
if (this.selectList.proName === "涓荤被鐩�") {
this.showPrise = true;
this.showRentPrise = false;
} else {
+ this.form.deptId = this.selectList.deptId;
this.showPrise = false;
this.showRentPrise = true;
}
@@ -654,6 +805,7 @@
this.List = true;
listSfxm(this.querycharge).then((response) => {
this.sfxmList = response.rows;
+
response.rows.forEach((item, index) => {
item.newID =
(this.querycharge.pageNum - 1) * this.querycharge.pageSize +
@@ -662,6 +814,12 @@
});
this.total = response.total;
this.loading = false;
+ });
+ },
+
+ Synchronizationfees() {
+ tbhisproprice().then((response) => {
+ this.$modal.msgSuccess("鎵归噺鍚屾璐圭敤鎴愬姛");
});
},
// input寮规鎼滅储
@@ -673,6 +831,7 @@
handleNodecharge(data) {
this.queryParam.id = data.id;
+
this.List = false;
this.getListByXmId();
},
@@ -704,7 +863,7 @@
// // 鏌ヨ浣撴椤圭洰鍒楄〃(鏍戝舰缁撴瀯)
getData() {
/** 鏌ヨ閮ㄩ棬涓嬫媺鏍戠粨鏋� */
- ProjectTree().then((response) => {
+ getAllChildListById().then((response) => {
this.projectOptions = [];
const project = { proId: 0, proName: "涓荤被鐩�", children: [] };
project.children = this.handleTree(response.data.list, "proId");
@@ -726,10 +885,36 @@
},
/** 鏌ヨ閮ㄩ棬涓嬫媺鏍戠粨鏋� */
getDeptTree() {
- deptTree().then((response) => {
+
+ deptTree111().then((response) => {
this.deptOptions = response.data;
- this.treeId.push(this.deptOptions[0].id);
+ this.treeId.push(this.treeDate.id);
});
+
+ },
+ findNodeById(nodes, id) {
+ for (let node of nodes) {
+ if (node.id === id) {
+ return node;
+ }
+ if (node.children) {
+ let result = this.findNodeById(node.children, id);
+ if (result) return result;
+ }
+ }
+ return null;
+ },
+ renderContent(h, { node, data }) {
+ return h(
+ "span",
+ {
+ style: {
+ color: data.status === "1" ? "red" : "inherit", // 鍔ㄦ�佽缃鑹�
+ fontSize: "14px",
+ },
+ },
+ data.label // 鏄剧ず鑺傜偣鐨� label
+ );
},
// 绛涢�夎妭鐐�
@@ -738,19 +923,55 @@
return data.xmmc.indexOf(value) !== -1;
},
// 绛涢�夎妭鐐�
+ // filterNode(value, data) {
+ // console.log(value, data)
+ // if (!value) return true;
+ // return data.label.indexOf(value) !== -1;
+ // },
filterNode(value, data) {
- if (!value) return true;
- return data.label.indexOf(value) !== -1;
+ if (!value) return true;
+ if (data.label.indexOf(value) !== -1) return true;
+ // 鍖归厤灏忓啓
+ let arr = data.label.spell('low', 'array');
+ let spell = arr.join('');
+ let lengths = [0];
+ for (var i = 0; i < arr.length - 1; i++) {
+ lengths.push(lengths[i] + arr[i].length);
+ };
+ //鍒ゆ柇label瀹屾暣鎷奸煶 涓� 杈撳叆鍊肩殑 index 鏄笉鏄瓑浜庢煇涓眽瀛楃涓�涓嫾闊冲瓧姣嶇殑index鍊�
+ if(lengths.indexOf(spell.indexOf(value)) !== -1) return true
+ // 澶у啓
+ let arrUp = data.label.spell('up', 'array');
+ let spellUp = arrUp.join('');
+ let lengthsUp = [0];
+ for (var i = 0; i < arrUp.length - 1; i++) {
+ lengthsUp.push(lengthsUp[i] + arrUp[i].length);
+ };
+ return lengthsUp.indexOf(spellUp.indexOf(value)) !== -1;
},
+
// 鑺傜偣鍗曞嚮浜嬩欢
handleNodeClick(date) {
+
+ // console.log("璋冪敤浜唄andleNodeClick ", date.id, this.id)
+ this.treeDate = date;
+ if (date.qf == "0") {
+ this.xiugais = true;
+ } else {
+ this.xiugais = false;
+ }
+ let proId = date.id;
+ getInfoByProId(proId).then((response) => {
+ this.xiugaiList = response.data;
+ });
this.id = date.id;
- this.queryParams.deptId = date.id;
+ this.queryParams.proId = date.id;
let data = {
- deptId: this.queryParams.deptId,
+ proId: this.queryParams.proId,
+ proName: this.queryParams.proNamez,
};
this.loading = true;
- ProjectTree(data).then((response) => {
+ getAllChildListById(data).then((response) => {
if (response.code == 200) {
if (response.data.list.length >= 1) {
this.projectList = this.handleTree(response.data.list, "proId");
@@ -790,12 +1011,10 @@
this.open = false;
this.queryParam.id = this.id;
let data = {
- deptId: this.queryParams.deptId,
+ proId: this.queryParams.proId,
};
- ProjectTree(data).then((response) => {
- this.projectList = this.handleTree(response.data.list, "proId");
- this.ListId.push(this.projectList[0].proId);
- this.key = response.data.key;
+ getAllChildListById(data).then((response) => {
+
this.loading = false;
});
},
@@ -811,6 +1030,7 @@
proEngName: null,
proPrice: "0.00",
proRemark: null,
+ xh:"0",
createBy: null,
createTime: null,
updateBy: null,
@@ -827,6 +1047,7 @@
consumablesList: [],
tjStandardList: [],
proStatus: "0",
+ resultType: "1",
};
this.resetForm("form");
},
@@ -838,7 +1059,7 @@
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
this.resetForm("queryForm");
- this.queryParams.deptId = undefined;
+ this.queryParams.proId = undefined;
this.$refs.tree.setCurrentKey(null);
this.handleQuery();
},
@@ -957,12 +1178,39 @@
this.form.tjStandardList.splice(index, 1);
}
},
+ handleUpdate1() {
+ this.form = this.xiugaiList;
+
+ this.form.proStatus = this.form.proStatus.toString();
+ this.proParent = true;
+ // 璁剧疆椤圭洰浠锋牸绂佺敤
+ this.isPriceDisabled = true;
+ // if(){
+ // this.proParent = true
+ // }
+ getlist().then((response) => {
+ if (response.code == 200) {
+ this.loading = false;
+ this.projectOptions = [];
+ const project = { proId: 0, proName: "涓荤被鐩�", children: [] };
+ project.children = this.handleTree(response.data.list, "proId");
+ this.key = response.data.key;
+ this.projectOptions.push(project);
+ }
+ });
+ this.open = true;
+
+ },
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
+ console.log('璋冪敤浜唄andleUpdate');
+
this.reset();
this.getData();
// this.form = row;
const proId = row.proId || this.ids;
+ this.proParent = false;
+ this.isPriceDisabled = false;
getProject(proId).then((response) => {
this.form = response.data;
if (this.form.proParentId === "0") {
@@ -972,7 +1220,7 @@
this.showPrise = false;
this.showRentPrise = true;
}
- this.form.deptId = Number(this.form.deptId);
+ // this.form.deptId = Number(this.form.deptId);
if (this.form.proStandard === 0) {
this.showPrise = true;
this.showRentPrise = false;
@@ -980,7 +1228,7 @@
this.showPrise = false;
this.showRentPrise = true;
}
- this.form.proStatus = this.form.proStatus.toString()
+ this.form.proStatus = this.form.proStatus.toString();
this.form.consumablesList = response.data.consumablesList;
this.form.tjStandardList = response.data.tjStandardList;
if (this.form.tjStandardList != null) {
@@ -1015,7 +1263,16 @@
}
});
}
-
+ getlist().then((response) => {
+ if (response.code == 200) {
+ this.loading = false;
+ this.projectOptions = [];
+ const project = { proId: 0, proName: "涓荤被鐩�", children: [] };
+ project.children = this.handleTree(response.data.list, "proId");
+ this.key = response.data.key;
+ this.projectOptions.push(project);
+ }
+ });
this.open = true;
this.title = "浣撴椤圭洰淇℃伅缁存姢";
});
@@ -1052,138 +1309,75 @@
/** 鎻愪氦鎸夐挳 */
submitForm() {
- if (this.key == "N") {
- this.$refs["form"].validate((valid) => {
- if (valid) {
- if (this.form.proId != null) {
- if (this.form.tjStandardList != null) {
- this.form.tjStandardList.forEach((items) => {
- if (items.tjSex === "鐢�" || items.tjSex === "0") {
- items.tjSex = "0";
- } else if (items.tjSex === "濂�" || items.tjSex === "1") {
- items.tjSex = "1";
- } else {
- items.tjSex = null;
- }
- if (items.tjType === "濠村効") {
- items.tjType = 0;
- }
- if (items.tjType === "骞煎効") {
- items.tjType = 1;
- }
- if (items.tjType === "鍎跨") {
- items.tjType = 2;
- }
- if (items.tjType === "灏戝勾") {
- items.tjType = 3;
- }
- if (items.tjType === "闈掑勾") {
- items.tjType = 4;
- }
- if (items.tjType === "涓勾") {
- items.tjType = 5;
- }
- if (items.tjType === "鑰佸勾") {
- items.tjType = 6;
- }
- });
- }
-
-
- updateProject(this.form).then((response) => {
- this.$modal.msgSuccess("淇敼鎴愬姛");
- this.cancel();
- });
- } else {
- if (this.form.proParentId === 0) {
- this.form.tjStandardList = null;
- } else {
- this.form.consumablesList = null;
- }
+ this.noclick = true;
+ this.$refs["form"].validate(valid => {
+ if (valid) {
+ const isUpdate = this.form.proId != null;
- if (this.form.deptId === null || this.form.proParentId === null) {
- this.$message.error("璇峰～鍐欑埗椤瑰悕绉版垨绉戝鍚嶇О");
- this.open = true;
- } else {
-
- addProject(this.form).then((response) => {
- this.$modal.msgSuccess("鏂板鎴愬姛");
- this.cancel();
- });
- }
- }
+ // 澶勭悊鎬у埆鍜屽勾榫勭粍鐨勮浆鎹�
+ if (this.form.tjStandardList) {
+ this.form.tjStandardList.forEach(item => {
+ item.tjSex = item.tjSex === "鐢�" || item.tjSex === "0" ? "0" : (item.tjSex === "濂�" || item.tjSex === "1" ? "1" : null);
+ item.tjType = {
+ "濠村効": 0, "骞煎効": 1, "鍎跨": 2, "灏戝勾": 3, "闈掑勾": 4, "涓勾": 5, "鑰佸勾": 6
+ }[item.tjType] || null;
+ });
}
- });
- } else if (this.key == "Y") {
- this.form.sfxmId = this.sfxmId;
- this.$refs["form"].validate((valid) => {
- if (valid) {
- if (this.form.proId != null) {
- if (this.form.tjStandardList != null) {
- this.form.tjStandardList.forEach((items) => {
- if (items.tjSex === "鐢�" || items.tjSex === "0") {
- items.tjSex = "0";
- } else if (items.tjSex === "濂�" || items.tjSex === "1") {
- items.tjSex = "1";
- } else {
- items.tjSex = null;
- }
- if (items.tjType === "濠村効") {
- items.tjType = 0;
- }
- if (items.tjType === "骞煎効") {
- items.tjType = 1;
- }
- if (items.tjType === "鍎跨") {
- items.tjType = 2;
- }
- if (items.tjType === "灏戝勾") {
- items.tjType = 3;
- }
- if (items.tjType === "闈掑勾") {
- items.tjType = 4;
- }
- if (items.tjType === "涓勾") {
- items.tjType = 5;
- }
- if (items.tjType === "鑰佸勾") {
- items.tjType = 6;
- }
- });
- }
-
- updateProject(this.form).then((response) => {
- this.$modal.msgSuccess("淇敼鎴愬姛");
- this.cancel();
- });
- } else {
- if (this.form.proParentId === 0) {
- this.form.tjStandardList = null;
- } else {
- this.form.consumablesList = null;
- }
- if (this.form.deptId === null || this.form.proParentId === null) {
- this.$message.error("璇峰～鍐欑埗椤瑰悕绉版垨绉戝鍚嶇О");
- this.open = true;
- } else {
-
- addProject(this.form).then((response) => {
- this.$modal.msgSuccess("鏂板鎴愬姛");
- this.cancel();
- });
- }
- }
+ // 璁剧疆 lisXmbm
+ this.form.lisXmbm = this.form.lisXmbm;
+
+ // 鏍规嵁 key 鍊奸�夋嫨涓嶅悓鐨勬搷浣滄祦绋�
+ if (this.key === "N") {
+ this.processSubmission(isUpdate, false);
+ } else if (this.key === "Y") {
+ this.form.sfxmId = this.sfxmId;
+ this.processSubmission(isUpdate, true);
}
+ }
+ });
+ },
+
+ processSubmission(isUpdate, isY) {
+ if (isUpdate) {
+ updateProject(this.form).then(response => {
+ this.$modal.msgSuccess("淇敼鎴愬姛");
+ this.handleSuccess(isY);
});
+ } else {
+ // 鏂板閫昏緫
+ if (this.form.proParentId === 0) {
+ this.form.tjStandardList = null;
+ } else {
+ this.form.consumablesList = null;
+ }
+
+ if (this.form.deptId === null || this.form.proParentId === null) {
+ this.$message.error("璇峰～鍐欑埗椤瑰悕绉版垨绉戝鍚嶇О");
+ this.open = true;
+ } else {
+ addProject(this.form).then(response => {
+ this.$modal.msgSuccess("鏂板鎴愬姛");
+ this.handleSuccess(isY);
+ });
+ }
}
},
+ handleSuccess(isY) {
+ this.cancel();
+ this.getList();
+ if (this.proParent || isY) {
+ this.getDeptTree();
+ }
+ },
// 鏀惰垂椤圭洰纭
submit() {
this.ChangeList.forEach((item) => {
- this.form.proName = item.xmmc;
this.form.proPrice = item.ckdj;
+ this.form.hisXmbm = item.xmbm;
+ this.form.hisXmmc = item.xmmc;
+ this.form.hisdj = item.ckdj;
this.sfxmId = parseInt(item.id);
});
this.dialogTableVisible = false;
@@ -1222,8 +1416,32 @@
};
</script>
<style scoped>
+.scrollable-container {
+ width: 200px;
+ /* 璁剧疆瀹瑰櫒鐨勫搴� */
+ height: 629px;
+ /* 璁剧疆瀹瑰櫒鐨勯珮搴� */
+ overflow: auto;
+ /* 鍏佽鍐呭婧㈠嚭鏃舵樉绀烘粴鍔ㄦ潯 */
+ border: 1px solid #ccc;
+ /* 鍙�夛細娣诲姞杈规浠ユ洿濂藉湴鏄剧ず瀹瑰櫒 */
+ position: relative;
+ /* 鍙�夛細浣垮鍣ㄥ唴鐨勭粷瀵瑰畾浣嶅厓绱犺兘澶熸纭樉绀� */
+}
+
+.content {
+ width: 1000px;
+ /* 璁剧疆鍐呭鐨勫搴︼紝浠ヨЕ鍙戞按骞虫粴鍔ㄦ潯 */
+ height: 1000px;
+ /* 璁剧疆鍐呭鐨勯珮搴︼紝浠ヨЕ鍙戝瀭鐩存粴鍔ㄦ潯 */
+}
+
.el-table__header-wrapper .el-checkbox {
display: none;
+}
+
+.red-text {
+ color: red !important;
}
.pag {
@@ -1249,4 +1467,14 @@
background-color: #e5f3ff !important;
color: #333 !important;
}
+
+.el-scrollbar__bar.is-vertical {
+ opacity: 1;
+ padding-right: 5px;
+ width: 7px;
+}
+
+.el-scrollbar__wrap {
+ overflow-x: hidden;
+}
</style>
--
Gitblit v1.8.0