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:
chenjianan
2018-12-15 09:35:27 +08:00
parent 5ed260c956 5cae4fedab
commit 504262a206
4 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/ManufacturingCenter/ProcessPlanning.js
View File

@@ -8,7 +8,7 @@ export function initCraftmen() {
data: { data: {
type: '1', type: '1',
name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号', name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
param: '考核部门编号=17' param: '考核部门编号=9'
} }
}) })
} }
@@ -174,7 +174,7 @@ export function initPerson() {
data: { data: {
type: '1', type: '1',
name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号', name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
param: '考核部门编号=17' param: '考核部门编号=9'
} }
}) })
} }

2
src/api/ManufacturingCenter/QuotaFormulation.js
View File

@@ -32,7 +32,7 @@ export function getPerson() {
data: { data: {
type: '1', type: '1',
name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号', name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
param: '考核部门编号=17' param: '考核部门编号=9'
} }
}) })
} }

2
src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue
View File

@@ -111,7 +111,7 @@ export default {
}, },
edit() { edit() {
if (this.arrest.length === 0) { if (this.arrest.length === 0) {
this.$message.warning('暂无数据') this.$message.warning('请选择零件')
} else { } else {
for (let i = 0; i < this.arrest.length; i++) { for (let i = 0; i < this.arrest.length; i++) {
edit(this.arrest[i].工艺计划流水号) edit(this.arrest[i].工艺计划流水号)

4
src/views/MarketingCenter/PerformanceBond/index.vue
View File

@@ -270,6 +270,7 @@ export default {
if (this.endTime === '' || this.endTime === null) { this.endTime_check = 0 } else { this.endTime_check = 1 } if (this.endTime === '' || this.endTime === null) { this.endTime_check = 0 } else { this.endTime_check = 1 }
this.listLoading1 = true this.listLoading1 = true
searchTableData1(this.PageCurrent, this.PageSize, this.entryNameValue, this.entryNameValue_check, this.startTime_check, this.endTime_check, this.startTime, this.endTime).then(response => { searchTableData1(this.PageCurrent, this.PageSize, this.entryNameValue, this.entryNameValue_check, this.startTime_check, this.endTime_check, this.startTime, this.endTime).then(response => {
this.tableData2 = []
this.listLoading1 = false this.listLoading1 = false
const data = response.data const data = response.data
for (let i = 0; i < data.rows.length; i++) { for (let i = 0; i < data.rows.length; i++) {
@@ -283,11 +284,13 @@ export default {
handleSizeChange(val) { handleSizeChange(val) {
this.PageCurrent = 1 this.PageCurrent = 1
this.PageSize = val this.PageSize = val
this.tableData2 = []
this.fetchTableData1() this.fetchTableData1()
}, },
// 项目信息表格翻页 // 项目信息表格翻页
handleCurrentChange(val) { handleCurrentChange(val) {
this.PageCurrent = val this.PageCurrent = val
this.tableData2 = []
this.fetchTableData1() this.fetchTableData1()
}, },
// 履约保证金查询 // 履约保证金查询
@@ -315,6 +318,7 @@ export default {
this.activeName = 'second' this.activeName = 'second'
} else { } else {
this.$message.warning('未缴纳履约保证金') this.$message.warning('未缴纳履约保证金')
this.tableData2 = []
} }
}) })
}, },