meswork/JY1.0
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://192.168.0.112:10010/r/高精2.0

Browse Source
This commit is contained in:
zhangdingyu
2019-01-26 10:52:01 +08:00
parent 44dd02b55f e75f21dc0f
commit fd2b65dcc1
3 changed files with 76 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/utils/request.js
View File

@@ -3,17 +3,17 @@ import axios from 'axios'
// import store from '../store' // import store from '../store'
// import { getToken } from '@/utils/auth' // import { getToken } from '@/utils/auth'
export const wsuri = `ws://192.168.1.212:61101//WebMoudule//websocket` export const wsuri = `ws://192.168.1.231:61101//WebMoudule//websocket`
export const name = `OP8888` export const name = `OP8888`
// 创建axios实例 // 创建axios实例
export const readFile = `192.168.1.212:8411/webpage/file/` // invoice export const readFile = `192.168.1.231:8411/webpage/file/` // invoice
export const readImg = `192.168.1.212:8411/webpage/img/` // delivery/MS/performancebond export const readImg = `192.168.1.231:8411/webpage/img/` // delivery/MS/performancebond
export const upload = `192.168.1.212:8411/submit/uploadFile.ashx` // ContractInformationManagement export const upload = `192.168.1.231:8411/submit/uploadFile.ashx` // ContractInformationManagement
export const upload2 = `192.168.1.212:8411/submit/upload2.ashx` // delivery export const upload2 = `192.168.1.231:8411/submit/upload2.ashx` // delivery
export const upload3 = `192.168.1.212:8411/submit/upload3.ashx` // performancebond export const upload3 = `192.168.1.231:8411/submit/upload3.ashx` // performancebond
export const uploadInvoiceScan = `192.168.1.212:8411/submit/uploadInvoiceScan.ashx` // invoice export const uploadInvoiceScan = `192.168.1.231:8411/submit/uploadInvoiceScan.ashx` // invoice
export const download = `192.168.1.212:8411/submit/downloadFile.ashx` // ContractInformationManagement export const download = `192.168.1.231:8411/submit/downloadFile.ashx` // ContractInformationManagement
const service = axios.create({ const service = axios.create({
// baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,

2
src/views/BasicData/FactoryCalendar/index.vue
View File

@@ -64,7 +64,7 @@ export default {
var nian = str.substr(0, 4) var nian = str.substr(0, 4)
var yue = str.substr(5, 2) var yue = str.substr(5, 2)
var ri = str.substr(8, 2) var ri = str.substr(8, 2)
if (str.substr(5, 1) === '0') { if (str.substr(5, 1) === '0') {z
yue = yue.replace('0', '') yue = yue.replace('0', '')
} }
if (str.substr(8, 1) === '0') { if (str.substr(8, 1) === '0') {

104
src/views/BasicData/PersonnelManagement/index.vue
View File

@@ -17,36 +17,36 @@
<el-button type="primary" icon="el-icon-circle-plus-outline" size="small" @click="addPeople()">新增</el-button> <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" @click="addPeople()">新增</el-button>
<el-button type="danger" icon="el-icon-circle-close-outline" size="small" @click="Quit()">离职</el-button> <el-button type="danger" icon="el-icon-circle-close-outline" size="small" @click="Quit()">离职</el-button>
<el-button type="text" size="small" style="float: right" @click="searchLeavingList">离职名单</el-button> <el-button type="text" size="small" style="float: right" @click="searchLeavingList">离职名单</el-button>
<!--<el-button v-popover:popover4 type="success" icon="el-icon-sort" size="small" @click="moveGroup">移动--> <el-button v-popover:popover4 :disabled="disabledMove" type="success" icon="el-icon-sort" size="small" @click="moveGroup">移动
<!--</el-button>--> </el-button>
<!--<el-button size="small" @click="postMaintain()">岗位维护</el-button>--> <!--<el-button size="small" @click="postMaintain()">岗位维护</el-button>-->
<!--<el-popover--> <el-popover
<!--ref="popover4"--> ref="popover4"
<!--width="178"--> width="178"
<!--placement="right"--> placement="right"
<!--trigger="click"--> trigger="click"
<!--@hide="hide()">--> @hide="hide()">
<!--<el-dropdown size="small" placement="bottom-start" style="margin-right: 0">--> <el-dropdown size="small" placement="bottom-start" style="margin-right: 0">
<!--<el-input--> <el-input
<!--v-model="nodeName1"--> v-model="nodeName1"
<!--:disabled="true"--> :disabled="true"
<!--size="small"--> size="small"
<!--placeholder="请选择部门"/>--> placeholder="请选择部门"/>
<!--<el-button type="text" size="small" style="margin-left: 60px; margin-top: 15px" @click="moveGroupConfim">--> <el-button type="text" size="small" style="margin-left: 60px; margin-top: 15px" @click="moveGroupConfim">
<!--确认--> 确认
<!--</el-button>--> </el-button>
<!--<el-dropdown-menu slot="dropdown">--> <el-dropdown-menu slot="dropdown">
<!--<el-tree--> <el-tree
<!--ref="treeForm"--> ref="treeForm"
<!--:data="departmentData"--> :data="departmentData"
<!--:props="defaultProps"--> :props="defaultProps"
<!--style="width: 150px"--> style="width: 150px"
<!--node-key="id"--> node-key="id"
<!--accordion--> accordion
<!--@node-click="NodeClick"/>--> @node-click="NodeClick"/>
<!--</el-dropdown-menu>--> </el-dropdown-menu>
<!--</el-dropdown>--> </el-dropdown>
<!--</el-popover>--> </el-popover>
</el-card> </el-card>
</el-col> </el-col>
</el-row> </el-row>
@@ -124,12 +124,12 @@
</el-table-column> </el-table-column>
<el-table-column align="center" label="入职时间" width="100"> <el-table-column align="center" label="入职时间" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.入公司时间 }} {{ scope.row.入公司时间 !== '' && scope.row.入公司时间 !== null ? scope.row.入公司时间 = scope.row.入公司时间.split(' ')[0]: scope.row.入公司时间 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="出生日期" width="100"> <el-table-column align="center" label="出生日期" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.出生日期 }} {{ scope.row.出生日期 !== '' && scope.row.出生日期 !== null ? scope.row.出生日期 = scope.row.出生日期.split(' ')[0]: scope.row.出生日期 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="联系方式" width="110"> <el-table-column align="center" label="联系方式" width="110">
@@ -170,7 +170,7 @@
<div class="block" style="margin-top: 10px;"> <div class="block" style="margin-top: 10px;">
<el-pagination <el-pagination
:current-page="PageCurrent" :current-page="PageCurrent"
:page-sizes="[10, 20, 30, 40]" :page-sizes="[10, 20, 30, 40, 50]"
:page-size="PageSize" :page-size="PageSize"
:total="total" :total="total"
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next, jumper"
@@ -345,12 +345,12 @@
</el-table-column> </el-table-column>
<el-table-column align="center" label="入职时间" width="100"> <el-table-column align="center" label="入职时间" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.入公司时间 }} {{ scope.row.入公司时间 !== '' && scope.row.入公司时间 !== null ? scope.row.入公司时间 = scope.row.入公司时间.split(' ')[0]: scope.row.入公司时间 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="出生日期" width="100"> <el-table-column align="center" label="出生日期" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.出生日期 }} {{ scope.row.出生日期 !== '' && scope.row.出生日期 !== null ? scope.row.出生日期 = scope.row.出生日期.split(' ')[0]: scope.row.出生日期 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="联系方式" width="110"> <el-table-column align="center" label="联系方式" width="110">
@@ -368,7 +368,7 @@
{{ scope.row.民族 }} {{ scope.row.民族 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="家庭住址" width="200"> <el-table-column align="center" label="家庭住址">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.家庭住址 }} {{ scope.row.家庭住址 }}
</template> </template>
@@ -389,10 +389,11 @@
</template> </template>
<script> <script>
import { getTree, tree, getTablePeople, getTablePeopleForName, addDepartmentName, delList, editList, delPeopleList, fetchEducationData, fetchPostData, addPeople, editPeople, quit, searchLeavingList } from '@/api/BasicData/PersonnelManagement' import { moveGroups, getTree, tree, getTablePeople, getTablePeopleForName, addDepartmentName, delList, editList, delPeopleList, fetchEducationData, fetchPostData, addPeople, editPeople, quit, searchLeavingList } from '@/api/BasicData/PersonnelManagement'
export default { export default {
data() { data() {
return { return {
disabledMove: true,
PageCurrentN: 1, PageCurrentN: 1,
PageSizeN: 10, PageSizeN: 10,
totalN: null, totalN: null,
@@ -403,7 +404,7 @@ export default {
i: 1, i: 1,
id: '', id: '',
PageCurrent: 1, PageCurrent: 1,
PageSize: 10, PageSize: 50,
List: [], List: [],
total: null, total: null,
nodeName: '', nodeName: '',
@@ -729,6 +730,7 @@ export default {
}, },
handleSelectionChange(val) { handleSelectionChange(val) {
this.multipleSelection = val this.multipleSelection = val
this.multipleSelection.length === 0 ? this.disabledMove = true : this.disabledMove = false
}, },
Quit() { Quit() {
if (this.multipleSelection.length === 0) { if (this.multipleSelection.length === 0) {
@@ -761,6 +763,34 @@ export default {
searchLeavingList() { searchLeavingList() {
this.LeavingListVisiable = true this.LeavingListVisiable = true
this.getTable(searchLeavingList, [this.PageCurrentN, this.PageSizeN], ['LeavingList', 'totalN']) this.getTable(searchLeavingList, [this.PageCurrentN, this.PageSizeN], ['LeavingList', 'totalN'])
},
moveGroupConfim() {
this.id = this.node
for (let i = 0; i < this.multipleSelection.length; i++) {
moveGroups(this.multipleSelection[i].人员编号, this.node).then(response => {
if (response.data[0].result === '1') {
this.handleNodeClick()
if (i === this.multipleSelection.length - 1) {
this.$message.success('移组成功')
}
} else {
this.$message.error('更新失败')
}
})
}
},
hide() {
this.nodeName1 = ''
this.node = ''
},
moveGroup() {
if (this.multipleSelection.length === 0) {
this.$message.warning('请至少选择一个人员')
}
},
NodeClick(data) {
this.node = data.id
this.nodeName1 = data.label
} }
} }
} }