From 16ad3d3ac0e7d477ce6d001cc7adc17ecc5d8879 Mon Sep 17 00:00:00 2001 From: qinxianzhangyao <11053546+qinxianzhangyao@user.noreply.gitee.com> Date: 星期三, 20 十二月 2023 14:28:07 +0800 Subject: [PATCH] qxtj --- src/views/hosp/project/index.vue | 430 +++++++++++++++++++++++++++++++++++------------------ 1 files changed, 286 insertions(+), 144 deletions(-) diff --git a/src/views/hosp/project/index.vue b/src/views/hosp/project/index.vue index a8b04ec..41f5838 100644 --- a/src/views/hosp/project/index.vue +++ b/src/views/hosp/project/index.vue @@ -48,16 +48,30 @@ </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-column label="椤圭洰鍚嶇О" prop="proName" fixed="left" width="150px" :show-overflow-tooltip="true" /> + :expand-row-keys="ListId" :row-class-name="selectSingleRow" :tree-props="{ + children: 'tjProjectList', + hasChildren: 'tjProjectList.length>0', + }"> + <!-- :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" :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="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="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="proCheckMethod" :show-overflow-tooltip="true" - width="110px" /> + <!-- <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"> + <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="proCheckMethod" :show-overflow-tooltip="true" width="110px"> + <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"> @@ -76,6 +90,8 @@ <template slot-scope="scope"> <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['hosp:project:edit']" title="淇敼"></el-button> + <el-button v-if="scope.row.proParentId == '0'" size="mini" type="text" icon="el-icon-plus" + @click="handleAdd(scope.row)" v-hasPermi="['system:dept:add']" title="澧炲姞"></el-button> <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['hosp:project:remove']" title="鍒犻櫎"></el-button> </template> @@ -85,14 +101,21 @@ </el-row> <!-- 娣诲姞鎴栦慨鏀逛綋妫�椤圭洰瀵硅瘽妗� --> - <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body :before-close="handleClose"> + <el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body :before-close="handleClose"> <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: 200px" @select="obtain" /> + placeholder="閫夋嫨涓婚」鍚嶇О" style="width: 260px" @select="obtain" /> </el-form-item> <el-form-item label="鏄庣粏椤圭洰" prop="proName" v-if="key == 'Y'"> - <el-input v-model="form.proName" placeholder="璇疯緭鍏ユ槑缁嗛」鐩�" @click.native="getDetailed"> + <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'"> @@ -103,32 +126,41 @@ <el-input v-model="form.proPrice" placeholder="璇疯緭鍏ラ」鐩环鏍�" /> </el-form-item> <el-form-item label="妫�鏌ョ被鍒�" prop="proCheckType"> - <el-input v-model="form.proCheckType" placeholder="璇疯緭鍏ユ鏌ョ被鍒�" /> + <el-input v-model="form.proCheckType" placeholder="璇疯緭鍏ユ鏌ョ被鍒�" style="width: 260px" /> </el-form-item> <el-form-item label="涓村簥鎰忎箟" prop="proMeaning"> <el-input v-model="form.proMeaning" placeholder="璇疯緭鍏ヤ复搴婃剰涔�" /> </el-form-item> - <el-form-item label="妫�鏌ユ柟寮�" prop="proCheckMethod"> - <el-input v-model="form.proCheckMethod" placeholder="璇疯緭鍏ユ鏌ユ柟寮�" /> + <el-form-item label="鍙備笌灏忕粨" prop="needReport"> + <el-select v-model="form.needReport" placeholder="璇烽�夋嫨鏄惁鍙備笌灏忕粨" style="width: 200px"> + <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="isEat"> + <el-form-item label="鏄惁绌鸿吂" prop="proCheckMethod"> + <el-select v-model="form.proCheckMethod" 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="isEat"> <el-select v-model="form.isEat" placeholder="璇烽�夋嫨鏄惁绌鸿吂" style="width: 200px"> - <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="proSex"> + <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="proSex"> <el-select v-model="form.proSex" placeholder="璇烽�夋嫨浣撴浜烘�у埆" style="width: 200px"> - <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label" - :value="dict.value"></el-option> - </el-select> + <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label" + :value="dict.value"></el-option> + </el-select> </el-form-item> <el-form-item label="椤圭洰绫诲瀷" prop="proType"> <el-input v-model="form.proType" placeholder="璇疯緭鍏ラ」鐩被鍨�" /> </el-form-item> - - <el-form-item label="绉戝鍚嶇О" prop="deptName "> - <el-select v-model="form.deptName" placeholder="璇烽�夋嫨绉戝鍚嶇О" @change="changeValue" filterable style="width: 205px"> + + <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> </el-form-item> @@ -136,12 +168,13 @@ <el-select v-model="form.proStatus" placeholder="璇烽�夋嫨鐘舵��" style="width: 200px" filterable clearable> <el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value"></el-option> - </el-select> </el-form-item> + </el-select> + </el-form-item> <el-form-item label="椤圭洰榛樿鍊�" prop="proDefault"> <el-input v-model="form.proDefault" placeholder="璇疯緭鍏ラ」鐩粯璁ゅ��" style="width: 200px" /> </el-form-item> <el-form-item label="閲囨牱鏍囪" prop="isSampling"> - <el-select v-model="form.isSampling" placeholder="璇烽�夋嫨閲囨牱鏍囪" style="width: 210px" filterable clearable> + <el-select v-model="form.isSampling" placeholder="璇烽�夋嫨閲囨牱鏍囪" style="width: 260px" filterable clearable> <el-option v-for="dict in dict.type.dis_sampling_tab" :key="dict.value" :label="dict.label" :value="dict.value"></el-option> </el-select> @@ -150,21 +183,23 @@ <el-select v-model="form.specimenType" placeholder="璇烽�夋嫨鏍囨湰绫诲瀷" style="width: 200px" filterable clearable> <el-option v-for="dict in dict.type.sys_dict_specimen" :key="dict.value" :label="dict.label" :value="dict.value"></el-option> - </el-select> </el-form-item> + </el-select> + </el-form-item> <el-form-item label="妫�鏌ラ儴浣�" prop="checkBw"> <el-select v-model="form.checkBw" placeholder="璇烽�夋嫨妫�鏌ラ儴浣�" style="width: 200px" filterable clearable> <el-option v-for="dict in dict.type.sys_dict_position" :key="dict.value" :label="dict.label" :value="dict.value"></el-option> - </el-select> </el-form-item> + </el-select> + </el-form-item> <el-form-item label="缁撴灉绫诲瀷" prop="resultType"> - <el-select v-model="form.resultType" placeholder="璇烽�夋嫨缁撴灉绫诲瀷" style="width: 210px" filterable clearable> + <el-select v-model="form.resultType" placeholder="璇烽�夋嫨缁撴灉绫诲瀷" style="width: 260px" 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-select> + </el-form-item> <el-form-item label="澶囨敞" prop="proRemark"> <el-input v-model="form.proRemark" placeholder="璇疯緭鍏ュ娉�" style="width: 510px" /> </el-form-item> - </el-form> <el-button style="margin-left: 40px" type="primary" plain size="mini" icon="el-icon-plus" @click="addmembers">鏂板琛�</el-button> @@ -237,33 +272,31 @@ </div> </el-dialog> - <el-dialog title="鏀惰垂椤圭洰" :visible.sync="dialogTableVisible" width="60%"> - + <el-dialog title="鏀惰垂椤圭洰" :visible.sync="dialogTableVisible" width="80%"> <div class="app-container"> - <el-row :gutter="20"> + <el-row :gutter="24"> <!--閮ㄩ棬鏁版嵁--> <el-col :span="6" :xs="24"> - <div style="height:560px;overflow-y: scroll;"> + <div style="height: 560px; overflow-y: scroll"> <div class="head-container"> <el-input v-model="xmmc" placeholder="璇疯緭鍏ラ」鐩紪鐮�" clearable size="small" prefix-icon="el-icon-search" style="margin-bottom: 20px" /> </div> <div id="changtree"> - <el-tree ref="tree" node-key="id" highlight-current :default-expanded-keys="chargeId" + <el-tree ref="tree" node-key="id" highlight-current :default-expanded-keys="chargeId" :data="deptOptionstree" :props="defaultPropstree" :expand-on-click-node="false" :auto-expand-parent="false" :filter-node-method="filterNode2" @node-click="handleNodecharge" /> </div> </div> - </el-col> - <el-col :span="17" :xs="24"> + <el-col :span="18" :xs="24"> <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="handleQuery" /> + <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="handleQuery" /> + <el-input v-model="querycharge.pym" placeholder="璇疯緭鍏ユ嫾闊崇爜" clearable @keyup.enter.native="handlecharge" /> </el-form-item> <el-form-item> <el-button type="primary" icon="el-icon-search" size="mini" @click="handlecharge">鎼滅储</el-button> @@ -271,19 +304,18 @@ </el-form> <el-table v-loading="loading" ref="tb" :data="sfxmList" @selection-change="handleSelectionChange" border - height="520px"> - <el-table-column type="selection" width="55" align="center" fixed="left" /> - <el-table-column label="搴忓彿" align="center" prop="newID" :show-overflow-tooltip="true" width="60px" - fixed="left" /> - <el-table-column label="椤圭洰缂栫爜" align="center" prop="xmbm" :show-overflow-tooltip="true" /> - <el-table-column label="椤圭洰鍚嶇О" align="center" prop="xmmc" :show-overflow-tooltip="true" /> - <el-table-column label="鎷奸煶鐮�" align="center" prop="pym" :show-overflow-tooltip="true" /> - <el-table-column label="浜旂瑪鐮�" align="center" prop="wbm" :show-overflow-tooltip="true" /> - <el-table-column label="鍙傝�冨崟浠�" align="center" prop="ckdj" :show-overflow-tooltip="true" /> - <el-table-column label="涓�绾ф渶楂橀檺浠�" align="center" prop="yjzgxj" :show-overflow-tooltip="true" width="60px" /> - <el-table-column label="浜岀骇鏈�楂橀檺浠�" align="center" prop="ejzgxj" :show-overflow-tooltip="true" width="60px" /> - <el-table-column label="涓夌骇鏈�楂橀檺浠�" align="center" prop="sjzgxj" :show-overflow-tooltip="true" width="60px" /> - <el-table-column label="鐗瑰畾鏈�楂橀檺浠�" align="center" prop="tdzgxj" :show-overflow-tooltip="true" /> + height="520px" style="width: 100%"> + <el-table-column type="selection" align="center" /> + <el-table-column label="搴忓彿" align="center" prop="newID" /> + <el-table-column label="椤圭洰缂栫爜" align="center" prop="xmbm" /> + <el-table-column label="椤圭洰鍚嶇О" align="center" prop="xmmc" /> + <el-table-column label="鎷奸煶鐮�" align="center" prop="pym" /> + <!-- <el-table-column label="浜旂瑪鐮�" align="center" prop="wbm" /> --> + <el-table-column label="鍙傝�冨崟浠�" align="center" prop="ckdj" /> + <el-table-column label="涓�绾ф渶楂橀檺浠�" align="center" prop="yjzgxj" /> + <el-table-column label="浜岀骇鏈�楂橀檺浠�" align="center" prop="ejzgxj" /> + <el-table-column label="涓夌骇鏈�楂橀檺浠�" align="center" prop="sjzgxj" /> + <el-table-column label="鐗瑰畾鏈�楂橀檺浠�" align="center" prop="tdzgxj" /> </el-table> <div class="pag" v-if="List == true"> @@ -332,14 +364,34 @@ addSfxm, updateSfxm, gettreeList, - getListByXmId + getListByXmId, } from "@/api/system/sfxm"; export default { name: "Project", - dicts: ["sys_normal_disable", "dict_personnel_type", "sys_user_sex", "tj_result_type", "dis_sampling_tab", "sys_dict_specimen", "sys_dict_position", "tj_result_type","sys_yes_no"], + dicts: [ + "sys_normal_disable", + "dict_personnel_type", + "sys_user_sex", + "tj_result_type", + "dis_sampling_tab", + "sys_dict_specimen", + "sys_dict_position", + "tj_result_type", + "sys_yes_no", + ], components: { Treeselect, IconSelect }, data() { + let checkPhoneNum = (rule, value, callback) => { + let patter = new RegExp(/^1\s*[3456789]\s*(\d\s*){9}$/); + if (value == "" && value == undefined && !value) { + return callback(""); + } else if (value != undefined && value != "") { + return callback(); + } else if (!patter.test(value)) { + return callback(""); + } + }; return { // 閮ㄩ棬鏍戦�夐」 deptOptions: undefined, @@ -378,7 +430,7 @@ // 琛ㄦ牸鏍戞暟鎹� deptList: [], parentNameList: [], - sfxmId:null, + sfxmId: null, // 浣撴椤圭洰琛ㄦ牸鏁版嵁 projectList: [], // 鑿滃崟鏍戦�夐」 @@ -395,7 +447,7 @@ children: "children", label: "label", }, - id:"", + id: "", // 閲嶆柊娓叉煋琛ㄦ牸鐘舵�� refreshTable: true, // 鏌ヨ鍙傛暟 @@ -409,7 +461,7 @@ }, querycharge: { pageNum: 1, - pageSize: 50, + pageSize: 10, xmmc: null, pym: null, }, @@ -423,23 +475,21 @@ // 琛ㄥ崟鏍¢獙 rules: { createTime: [ - { required: true, message: "鍒涘缓鏃堕棿涓嶈兘涓虹┖", trigger: "blur" }, + { required: true, validator: checkPhoneNum, trigger: "blur" }, ], updateTime: [ - { required: true, message: "淇敼鏃堕棿涓嶈兘涓虹┖", trigger: "blur" }, + { required: true, validator: checkPhoneNum, trigger: "blur" }, ], deleted: [ - { required: true, message: "鍒犻櫎鏍囪涓嶈兘涓虹┖", trigger: "blur" }, + { required: true, validator: checkPhoneNum, trigger: "blur" }, ], proName: [ - { required: true, message: "椤圭洰鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }, + { required: true, validator: checkPhoneNum, trigger: "blur" }, ], proPrice: [ - { required: true, message: "椤圭洰浠锋牸涓嶈兘涓虹┖", trigger: "blur" }, + { required: true, validator: checkPhoneNum, trigger: "blur" }, ], - deptName: [ - { required: true, message: "绉戝鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }, - ], + deptId: [{ required: true, validator: checkPhoneNum, trigger: "blur" }], // proStandard: [ // { required: true, message: "椤圭洰鏍囧噯鍊间笉鑳戒负绌�", trigger: "blur" }, // ], @@ -455,7 +505,7 @@ if (newVal) { this.$nextTick(() => { document - .querySelector('.el-tree-node__children .el-tree-node__content') + .querySelector(".el-tree-node__children .el-tree-node__content") .click(); }); } @@ -469,11 +519,13 @@ this.$nextTick(() => { // document.getElementById("changtree").click();; document - .querySelector('#changtree .el-tree-node__children .el-tree-node.is-focusable .el-tree-node__content') + .querySelector( + "#changtree .el-tree-node__children .el-tree-node.is-focusable .el-tree-node__content" + ) .click(); }); } - } + }, }, created() { @@ -482,7 +534,6 @@ this.getDeptTree(); }, methods: { - //鏄惁鏄剧ず閫変腑鐨勫�� display(value) { }, /** 鏌ヨ浣撴椤圭洰鍒楄〃 */ @@ -516,36 +567,90 @@ }, /** 鏂板鎸夐挳鎿嶄綔 */ - handleAdd() { + handleAdd(row) { this.reset(); - this.getData(); - // if (row != null && row.proId) { - // this.form.proParentId = row.proId; - // } else { - // this.form.proParentId = 0; - // } - this.open = true; - this.title = "浣撴椤圭洰淇℃伅缁存姢"; - if (this.key = "Y") { - gettreeList().then((response) => { - this.deptOptionstree = response.data; - this.chargeId.push(this.deptOptionstree[0].id) - }); + this.loading = true; + ProjectTree().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); + if (row) { + this.form.proParentId = row.proId; + this.open = true; + } else { + this.open = true; + } + } + }); + this.title = "浣撴椤圭洰淇℃伅缁存姢"; + + this.form.deptId = this.queryParams.deptId; + this.form.proCheckMethod = "N"; + this.form.needReport ="Y" + if ((this.key = "Y")) { + gettreeList().then((response) => { + this.deptOptionstree = response.data; + + }); + } }, // 鎵撳紑input寮规 getDetailed() { - this.dialogTableVisible = true; - this.getlistSfxm() + if (this.selectList) { + if (this.selectList.proName === "涓荤被鐩�") { + this.dialogTableVisible = false; + } else { + this.dialogTableVisible = true; + 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.chargeId.push(this.deptOptionstree[0].id); + }) + this.getlistSfxm(); + } else if (this.form.proParentId == 0) { + this.dialogTableVisible = false; + } + } else { + this.$message.error("璇烽�夋嫨涓婚」鍚嶇О"); + } + }, + + obtain(vals) { + if (this.projectOptions) { + this.selectList = vals; + console.log(this.selectList); + } + if (this.selectList.proName === "涓荤被鐩�") { + this.showPrise = true; + this.showRentPrise = false; + } else { + this.showPrise = false; + this.showRentPrise = true; + } }, getlistSfxm() { this.loading = true; - this.List = true + 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 + index + 1; + item.newID = + (this.querycharge.pageNum - 1) * this.querycharge.pageSize + + index + + 1; }); this.total = response.total; this.loading = false; @@ -554,14 +659,14 @@ // input寮规鎼滅储 handlecharge() { this.querycharge.pageNum = 1; - this.List = true - this.getlistSfxm() + this.List = true; + this.getlistSfxm(); }, handleNodecharge(data) { this.queryParam.id = data.id; - this.List = false - this.getListByXmId() + this.List = false; + this.getListByXmId(); }, getListByXmId() { @@ -569,7 +674,8 @@ getListByXmId(this.queryParam).then((response) => { this.sfxmList = response.data.date; response.data.date.forEach((item, index) => { - item.newID = (this.queryParam.page - 1) * this.queryParam.pageSize + index + 1; + item.newID = + (this.queryParam.page - 1) * this.queryParam.pageSize + index + 1; }); this.total = response.data.total; this.loading = false; @@ -594,19 +700,18 @@ this.projectOptions = []; const project = { proId: 0, proName: "涓荤被鐩�", children: [] }; project.children = this.handleTree(response.data.list, "proId"); - this.key = response.data.key + this.key = response.data.key; // if (this.key == "Y") { // this.key = response.data.key // } else if (response.data.key == "N") { // this.key = response.data.key // } - this.projectOptions.push(project); + this.projectOptions.push(project); }); }, /** 鏌ヨ閮ㄩ棬鍒楄〃 */ getDeptList() { listDept(this.queryParams).then((response) => { - console.log(response) this.parentNameList = response.data; this.deptList = this.handleTree(response.data, "proId"); }); @@ -615,7 +720,7 @@ getDeptTree() { deptTree().then((response) => { this.deptOptions = response.data; - this.treeId.push(this.deptOptions[0].id) + this.treeId.push(this.deptOptions[0].id); }); }, @@ -636,23 +741,31 @@ let data = { deptId: this.queryParams.deptId, }; + this.loading = true; ProjectTree(data).then((response) => { - this.projectList = this.handleTree(response.data.list, "proId"); - this.ListId.push(this.projectList[0].proId) - this.key = response.data.key - // if (this.key == "Y") { - // this.key = response.data.key - // } else if (response.data.key == "N") { - // this.key = response.data.key - // } - this.loading = false; + if (response.code == 200) { + if (response.data.list.length >= 1) { + this.projectList = this.handleTree(response.data.list, "proId"); + this.ListId.push(this.projectList[0].proId); + this.key = response.data.key; + } else { + this.projectList = []; + } + + // if (this.key == "Y") { + // this.key = response.data.key + // } else if (response.data.key == "N") { + // this.key = response.data.key + // } + this.loading = false; + } }); }, selectSingleRow({ row, rowIndex }) { if (rowIndex === 1) { - return 'warning-row'; + return "warning-row"; } - return ''; + return ""; }, /** 灞曞紑/鎶樺彔鎿嶄綔 */ @@ -673,14 +786,14 @@ }; ProjectTree(data).then((response) => { this.projectList = this.handleTree(response.data.list, "proId"); - this.ListId.push(this.projectList[0].proId) - this.key = response.data.key + this.ListId.push(this.projectList[0].proId); + this.key = response.data.key; this.loading = false; }); }, handleClose() { - this.cancel() + this.cancel(); }, // 琛ㄥ崟閲嶇疆 reset() { @@ -722,9 +835,44 @@ this.handleQuery(); }, + flexColumnWidth(column) { + if (!column) { + return; + } + let maxlength = 160; //鍦ㄦ澶勮缃粯璁ゅ搴� + if (column == "rwdtypeName") { + //鍦ㄦ澶勪负浜嗕繚璇佽〃澶翠笉鎹㈣锛屽彲浠ユ牴鎹〃澶村悕绉伴暱搴﹁缃粯璁ゅ搴� + // column1 灏辨槸瀵瑰簲琛ㄦ牸涓殑prop灞炴�у�硷紝姣斿涓婇潰鐨� rwdtypeName + maxlength = 160; + } + for (let i = 0; i < this.projectList.length; i++) { + if (this.projectList[i][column]) { + let now_temp = this.projectList[i][column] + ""; + let flexWidth = 0; + for (const char of now_temp) { + if ((char >= "A" && char <= "Z") || (char >= "a" && char <= "z")) { + //鑻辨枃瀛楁瘝 8 鍍忕礌 + flexWidth += 8; + } else if (char >= "\u4e00" && char <= "\u9fa5") { + //涓枃鏂囧瓧 15 鍍忕礌 + flexWidth += 15; + } else { + //鍏朵粬瀛楃 10 鍍忕礌 + flexWidth += 10; + } + } + if (flexWidth > maxlength) { + maxlength = flexWidth; + } + } + } + //el-table涓� cell 鏈夊乏鍙崇殑 padding 涓� 10 鍍忕礌 + return maxlength + 20 + "px"; + }, + // 澶氶�夋閫変腑鏁版嵁 handleSelectionChange(selection) { - this.ChangeList = selection + this.ChangeList = selection; this.ids = selection.map((item) => item.id); this.single = selection.length !== 1; this.multiple = !selection.length; @@ -734,20 +882,6 @@ } }, - - - obtain(vals) { - if (this.projectOptions) { - this.selectList = vals; - } - if (this.selectList.proName === "涓荤被鐩�") { - this.showPrise = true; - this.showRentPrise = false; - } else { - this.showPrise = false; - this.showRentPrise = true; - } - }, // 鏂板琛� addmembers() { if (this.form.proName) { @@ -823,6 +957,14 @@ const proId = row.proId || this.ids; getProject(proId).then((response) => { this.form = response.data; + if (this.form.proParentId === "0") { + this.showPrise = true; + this.showRentPrise = false; + } else { + this.showPrise = false; + this.showRentPrise = true; + } + this.form.deptId = Number(this.form.deptId); if (this.form.proStatus === 0) { this.form.proStatus = "鍚敤"; } else { @@ -949,7 +1091,7 @@ } updateProject(this.form).then((response) => { this.$modal.msgSuccess("淇敼鎴愬姛"); - this.cancel() + this.cancel(); }); } else { if (this.form.proParentId === 0) { @@ -957,7 +1099,8 @@ } else { this.form.consumablesList = null; } - if (this.form.deptName === null || this.form.proParentId === null) { + + if (this.form.deptId === null || this.form.proParentId === null) { this.$message.error("璇峰~鍐欑埗椤瑰悕绉版垨绉戝鍚嶇О"); this.open = true; } else { @@ -968,14 +1111,14 @@ } addProject(this.form).then((response) => { this.$modal.msgSuccess("鏂板鎴愬姛"); - this.cancel() + this.cancel(); }); } } } }); - }else if(this.key == "Y"){ - this.form.sfxmId = this.sfxmId + } else if (this.key == "Y") { + this.form.sfxmId = this.sfxmId; this.$refs["form"].validate((valid) => { if (valid) { if (this.form.proId != null) { @@ -1018,7 +1161,7 @@ } updateProject(this.form).then((response) => { this.$modal.msgSuccess("淇敼鎴愬姛"); - this.cancel() + this.cancel(); }); } else { if (this.form.proParentId === 0) { @@ -1026,7 +1169,8 @@ } else { this.form.consumablesList = null; } - if (this.form.deptName === null || this.form.proParentId === null) { + + if (this.form.deptId === null || this.form.proParentId === null) { this.$message.error("璇峰~鍐欑埗椤瑰悕绉版垨绉戝鍚嶇О"); this.open = true; } else { @@ -1037,24 +1181,23 @@ } addProject(this.form).then((response) => { this.$modal.msgSuccess("鏂板鎴愬姛"); - this.cancel() + this.cancel(); }); } } } }); } - }, // 鏀惰垂椤圭洰纭 submit() { - this.ChangeList.forEach(item => { - this.form.proName = item.xmmc - this.form.proPrice = item.ckdj - this.sfxmId = parseInt(item.id) - }) - this.dialogTableVisible = false + this.ChangeList.forEach((item) => { + this.form.proName = item.xmmc; + this.form.proPrice = item.ckdj; + this.sfxmId = parseInt(item.id); + }); + this.dialogTableVisible = false; }, /** 鍒犻櫎鎸夐挳鎿嶄綔 */ handleDelete(row) { @@ -1087,8 +1230,7 @@ ); }, }, -} - +}; </script> <style scoped> .el-table__header-wrapper .el-checkbox { @@ -1116,6 +1258,6 @@ .el-tree-node.is-current>.el-tree-node__content { background-color: #e5f3ff !important; - color: #333 !important + color: #333 !important; } </style> -- Gitblit v1.8.0