| src/components/view/b2-standard.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/components/view/b3-classes.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/components/view/person-manage.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/components/view/b2-standard.vue
@@ -144,7 +144,10 @@ </div> <div class="right"> <el-row class="title"> <el-col :span="24" style="font-size: 14px;color: #999;">{{selectTree}}</el-col> <el-col :span="20" style="font-size: 14px;color: #999;">{{selectTree}}</el-col> <!-- <el-col :span="4"> <el-button size="small" type="primary" @click="handleMore">批量编辑</el-button> </el-col> --> </el-row> <el-row class="standard_table" v-loading="tableLoad"> <el-table class="el-table" :data="standardList" style="width: 100%;height: 220px !important;" height="220" tooltip-effect="dark" @@ -288,6 +291,46 @@ <span slot="footer" class="dialog-footer"> <el-button @click="addDia = false">取 消</el-button> <el-button type="primary" @click="addStandardTree" :loading="addLoad">确 定</el-button> </span> </el-dialog> <el-dialog title="批量编辑" :visible.sync="moreEdit" width="90%"> <div class="body"> <!-- <el-row style="line-height: 50px;"> <el-col :span="6" style="text-align: right;">工厂：</el-col> <el-col :span="16" :offset="1"> <el-input size="small" readonly v-model="addOb.factory"></el-input> </el-col> </el-row> <el-row style="line-height: 50px;"> <el-col :span="6" style="text-align: right;">实验室：</el-col> <el-col :span="16" :offset="1"> <el-input size="small" readonly v-model="addOb.laboratory"></el-input> </el-col> </el-row> <el-row style="line-height: 50px;"> <el-col :span="6" style="text-align: right;">样品大类：</el-col> <el-col :span="16" :offset="1"> <el-input size="small" readonly v-model="addOb.sampleType"></el-input> </el-col> </el-row> <el-row style="line-height: 50px;"> <el-col :span="6" style="text-align: right;">样品名称：</el-col> <el-col :span="16" :offset="1"> <el-input v-model="addOb.sample" readonly size="small"></el-input> </el-col> </el-row> <el-row style="line-height: 50px;"> <el-col :span="6" style="text-align: right;"> <span class="required-span">* </span>型号： </el-col> <el-col :span="16" :offset="1"> <el-input v-model="addOb.model" placeholder="请输入型号" clearable size="small"></el-input> </el-col> </el-row> --> </div> <span slot="footer" class="dialog-footer"> <el-button @click="moreEdit = false">取 消</el-button> <el-button type="primary" @click="subMoreEdit" :loading="moreEditLoad">确 定</el-button> </span> </el-dialog> <!-- <el-dialog title="新增标准" :visible.sync="addStandardDia" width="400px"> @@ -449,7 +492,9 @@ total:0, pageSize:100, currentPage:1, standardId: 0 standardId: 0, moreEdit:false, moreEditLoad:false, } }, mounted() { @@ -1080,6 +1125,10 @@ this.tableLoad2 = false }) }, handleMore(){ this.moreEdit = true }, subMoreEdit(){} } } </script> src/components/view/b3-classes.vue
@@ -87,7 +87,7 @@ <!-- <div class="work-box-left"> <span>{{ getShiftByDic(m.shift) }}</span> </div> --> <el-dropdown trigger="click" placement="bottom" @command="e=>handleCommand(e,m)" :disabled="!downPower"> <el-dropdown trigger="click" placement="bottom" @command="e=>handleCommand(e,m)" :disabled="!upPower"> <!-- <i class="el-icon-arrow-down el-icon--right" style="font-size: 20px;color: #fff;cursor: pointer;"></i> --> <span style="cursor: pointer;" :style="`opacity: ${getShiftByDic(m.shift)=='无'?0:1};`">{{ getShiftByDic(m.shift) }}</span> <el-dropdown-menu slot="dropdown"> src/components/view/person-manage.vue
@@ -82,7 +82,34 @@ justify-content: center; } </style> <style> .person_manage .el-tree-node__content { height: 32px; font-size: 14px; border-radius: 2px; } .person_manage .el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content { color: #3A7BFA; } .person_manage .has-gutter .el-table__cell .cell { line-height: 34px; background-color: #f8f8f8; } .person_manage .has-gutter .el-table__cell { background-color: #fafafa !important; } .person_manage .el-table__row .cell { font-size: 14px; } .person_manage .el-table .warning-row .cell { color: #bababa; } </style> <template> <div class="person_manage"> <!-- <el-row class="title"> @@ -95,7 +122,7 @@ <el-row> <el-col :span="20"> <el-input placeholder="输入关键字进行搜索" suffix-icon="el-icon-search" v-model="search" size="small" style="margin-bottom: 5px;" clearable @blur="searchFilter" @clear="searchFilter"></el-input> style="margin-bottom: 5px;" clearable @blur="searchFilter" @clear="searchFilter" @keyup.enter.native="searchFilter()"></el-input> </el-col> <el-col :span="4" style="text-align: center;line-height: 30px;" v-if="addPower"> <el-button type="primary" icon="el-icon-plus" size="mini" circle @click="handleAdd"></el-button> @@ -246,6 +273,7 @@ name: null, state: null, company: null, departId:null, orderBy:{ field: 'id', order: 'asc' @@ -305,6 +333,7 @@ }, */ requiredAdd:['account','name','state','roleId','password','nameEn','phone'], requiredUp:['account','name','state','roleId','nameEn','phone'], // disabledUp:['departId'], addUpload:['pictureUrl','signatureUrl'], addUploadConfig:{ accept:'.png, .jpg, .jpeg, .gif', @@ -345,7 +374,8 @@ }, refresh() { this.componentData.entity = this.HaveJson(this.entityCopy) this.upIndex++ // this.upIndex++ this.refreshTable() }, upUser(row){ console.log(row); @@ -363,7 +393,12 @@ }) }, opeaAdd(){ if(!this.addOb.fatherId||this.selectTree==''||this.selectTree=='全部'){ this.$message.error('请选择一个组织') return } this.$refs.ValueTable.openAddDia(this.$api.user.addUser); this.$refs['ValueTable'].upData.departId = this.selectTree }, selectTreeList(){ /* this.$axios.get(this.$api.department.selectDepartment).then(res => { @@ -386,6 +421,7 @@ let power = JSON.parse(sessionStorage.getItem('power')) let up = false let add = false let delStandardTree = false for (var i = 0; i < power.length; i++) { if(power[i].menuMethod=='updateUser'){ up = true @@ -393,10 +429,14 @@ if(power[i].menuMethod=='addUser'){ add = true } if(power[i].menuMethod=='delDepartment'){ delStandardTree = true } } if(!up){ this.componentData.do.splice(0, 1) } this.delStandardTree = delStandardTree this.addPower = add }, handleAdd(){ src/main.js
@@ -13,11 +13,11 @@ //本地 Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80"; // const javaApi = 'http://192.168.11.200:8001';//李 const javaApi = 'http://192.168.11.200:8001';//李 // const javaApi = 'http://10.20.102.168:8001';//张 // const javaApi = 'http://172.20.10.3:8001';//姜 // const javaApi = 'http://192.168.11.2:8001';//柴 const javaApi = 'http://114.132.189.42:1234';//测试服 // const javaApi = 'http://114.132.189.42:1234';//测试服 //胜云服务器 // Vue.prototype.LOCATIONVUE = "http://syxt.shxiao2.cn"; // const javaApi = 'http://122.114.52.69:8001';
