|
|
@ -76,7 +76,6 @@ |
|
|
|
</a-button> |
|
|
|
</a-button> |
|
|
|
</template> |
|
|
|
</template> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
</a-table> |
|
|
|
</a-table> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</a-card> |
|
|
|
</a-card> |
|
|
@ -97,6 +96,9 @@ export default { |
|
|
|
data() { |
|
|
|
data() { |
|
|
|
return { |
|
|
|
return { |
|
|
|
description: 'zy_process管理页面', |
|
|
|
description: 'zy_process管理页面', |
|
|
|
|
|
|
|
model:{ |
|
|
|
|
|
|
|
clothStyleId: '', |
|
|
|
|
|
|
|
}, |
|
|
|
// 表头 |
|
|
|
// 表头 |
|
|
|
columns: [ |
|
|
|
columns: [ |
|
|
|
{ |
|
|
|
{ |
|
|
@ -124,6 +126,11 @@ export default { |
|
|
|
// align:"center", |
|
|
|
// align:"center", |
|
|
|
// dataIndex: 'processDescribe' |
|
|
|
// dataIndex: 'processDescribe' |
|
|
|
// }, |
|
|
|
// }, |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
title: '服装类型', |
|
|
|
|
|
|
|
align: "center", |
|
|
|
|
|
|
|
dataIndex: 'styleId_dictText' |
|
|
|
|
|
|
|
}, |
|
|
|
{ |
|
|
|
{ |
|
|
|
title: '工序等级', |
|
|
|
title: '工序等级', |
|
|
|
align: "center", |
|
|
|
align: "center", |
|
|
@ -138,7 +145,7 @@ export default { |
|
|
|
|
|
|
|
|
|
|
|
], |
|
|
|
], |
|
|
|
url: { |
|
|
|
url: { |
|
|
|
list: "/base/zyProcess/list", |
|
|
|
list: "/base/zyProcess/listScreen", |
|
|
|
delete: "/base/zyProcess/delete", |
|
|
|
delete: "/base/zyProcess/delete", |
|
|
|
deleteBatch: "/base/zyProcess/deleteBatch", |
|
|
|
deleteBatch: "/base/zyProcess/deleteBatch", |
|
|
|
exportXlsUrl: "/base/zyProcess/exportXls", |
|
|
|
exportXlsUrl: "/base/zyProcess/exportXls", |
|
|
@ -147,7 +154,7 @@ export default { |
|
|
|
}, |
|
|
|
}, |
|
|
|
//参数 |
|
|
|
//参数 |
|
|
|
loadRouteType: false, |
|
|
|
loadRouteType: false, |
|
|
|
styleId: "", |
|
|
|
styleId: '', |
|
|
|
dictOptions: {}, |
|
|
|
dictOptions: {}, |
|
|
|
superFieldList: [], |
|
|
|
superFieldList: [], |
|
|
|
} |
|
|
|
} |
|
|
@ -165,7 +172,13 @@ export default { |
|
|
|
methods: { |
|
|
|
methods: { |
|
|
|
initDictConfig() { |
|
|
|
initDictConfig() { |
|
|
|
}, |
|
|
|
}, |
|
|
|
add() { |
|
|
|
add(id) { |
|
|
|
|
|
|
|
//console.log("list层 id "+ id) |
|
|
|
|
|
|
|
this.model.clothStyleId = id; |
|
|
|
|
|
|
|
this.queryParam.clothStyleId = id; |
|
|
|
|
|
|
|
//根据服装类型筛选list中的数据 |
|
|
|
|
|
|
|
this.url.list = '/base/zyProcess/listScreen'; |
|
|
|
|
|
|
|
this.loadData(); |
|
|
|
}, |
|
|
|
}, |
|
|
|
onSelectChange1(selectedRowKeys, selectionRows) { |
|
|
|
onSelectChange1(selectedRowKeys, selectionRows) { |
|
|
|
this.selectedRowKeys = selectedRowKeys; |
|
|
|
this.selectedRowKeys = selectedRowKeys; |
|
|
@ -177,56 +190,56 @@ export default { |
|
|
|
this.$emit('onChangeRowKey', ids) |
|
|
|
this.$emit('onChangeRowKey', ids) |
|
|
|
}, |
|
|
|
}, |
|
|
|
//加载传递参数 |
|
|
|
//加载传递参数 |
|
|
|
loadParameter() { |
|
|
|
// loadParameter() { |
|
|
|
if (this.loadRouteType === false) { |
|
|
|
// if (this.loadRouteType === false) { |
|
|
|
this.styleId = this.$route.query.styleId; |
|
|
|
// this.styleId = this.$route.query.styleId; |
|
|
|
console.log(this.styleId) |
|
|
|
// console.log(this.styleId) |
|
|
|
this.loadRouteType = true; |
|
|
|
// this.loadRouteType = true; |
|
|
|
} |
|
|
|
// } |
|
|
|
}, |
|
|
|
// }, |
|
|
|
loadData(arg) { |
|
|
|
// loadData(arg) { |
|
|
|
if (!this.url.list) { |
|
|
|
// if (!this.url.list) { |
|
|
|
this.$message.error("请设置url.list属性!") |
|
|
|
// this.$message.error("请设置url.list属性!") |
|
|
|
return |
|
|
|
// return |
|
|
|
} |
|
|
|
// } |
|
|
|
//加载数据 若传入参数1则加载第一页的内容 |
|
|
|
// //加载数据 若传入参数1则加载第一页的内容 |
|
|
|
if (arg === 1) { |
|
|
|
// if (arg === 1) { |
|
|
|
this.ipagination.current = 1; |
|
|
|
// this.ipagination.current = 1; |
|
|
|
} |
|
|
|
// } |
|
|
|
this.loadParameter(); |
|
|
|
// this.loadParameter(); |
|
|
|
var params = this.getQueryParams();//查询条件 |
|
|
|
// var params = this.getQueryParams();//查询条件 |
|
|
|
this.loading = true; |
|
|
|
// this.loading = true; |
|
|
|
getAction(this.url.list, params).then((res) => { |
|
|
|
// getAction(this.url.list, params).then((res) => { |
|
|
|
if (res.success) { |
|
|
|
// if (res.success) { |
|
|
|
//update-begin---author:zhangyafei Date:20201118 for:适配不分页的数据列表------------ |
|
|
|
// //update-begin---author:zhangyafei Date:20201118 for:适配不分页的数据列表------------ |
|
|
|
this.dataSource = res.result.records || res.result; |
|
|
|
// this.dataSource = res.result.records || res.result; |
|
|
|
if (res.result.total) { |
|
|
|
// if (res.result.total) { |
|
|
|
this.ipagination.total = res.result.total; |
|
|
|
// this.ipagination.total = res.result.total; |
|
|
|
} else { |
|
|
|
// } else { |
|
|
|
this.ipagination.total = 0; |
|
|
|
// this.ipagination.total = 0; |
|
|
|
} |
|
|
|
// } |
|
|
|
//update-end---author:zhangyafei Date:20201118 for:适配不分页的数据列表------------ |
|
|
|
// //update-end---author:zhangyafei Date:20201118 for:适配不分页的数据列表------------ |
|
|
|
} else { |
|
|
|
// } else { |
|
|
|
this.$message.warning(res.message) |
|
|
|
// this.$message.warning(res.message) |
|
|
|
} |
|
|
|
// } |
|
|
|
}).finally(() => { |
|
|
|
// }).finally(() => { |
|
|
|
this.loading = false |
|
|
|
// this.loading = false |
|
|
|
}) |
|
|
|
// }) |
|
|
|
}, |
|
|
|
// }, |
|
|
|
getQueryParams() { |
|
|
|
// getQueryParams() { |
|
|
|
//获取查询条件 |
|
|
|
// //获取查询条件 |
|
|
|
let sqp = {} |
|
|
|
// let sqp = {} |
|
|
|
if (this.superQueryParams) { |
|
|
|
// if (this.superQueryParams) { |
|
|
|
sqp['superQueryParams'] = encodeURI(this.superQueryParams) |
|
|
|
// sqp['superQueryParams'] = encodeURI(this.superQueryParams) |
|
|
|
sqp['superQueryMatchType'] = this.superQueryMatchType |
|
|
|
// sqp['superQueryMatchType'] = this.superQueryMatchType |
|
|
|
} |
|
|
|
// } |
|
|
|
var param = Object.assign(sqp, this.queryParam, this.isorter, this.filters); |
|
|
|
// var param = Object.assign(sqp, this.queryParam, this.isorter, this.filters); |
|
|
|
param.field = this.getQueryField(); |
|
|
|
// param.field = this.getQueryField(); |
|
|
|
param.pageNo = this.ipagination.current; |
|
|
|
// param.pageNo = this.ipagination.current; |
|
|
|
param.pageSize = this.ipagination.pageSize; |
|
|
|
// param.pageSize = this.ipagination.pageSize; |
|
|
|
param.styleId = this.styleId; |
|
|
|
// param.styleId = this.styleId; |
|
|
|
return filterObj(param); |
|
|
|
// return filterObj(param); |
|
|
|
}, |
|
|
|
// }, |
|
|
|
getSuperFieldList() { |
|
|
|
getSuperFieldList() { |
|
|
|
let fieldList = []; |
|
|
|
let fieldList = []; |
|
|
|
fieldList.push({type: 'string', value: 'processCode', text: '工序代码', dictCode: ''}) |
|
|
|
fieldList.push({type: 'string', value: 'processCode', text: '工序代码', dictCode: ''}) |
|
|
|