|
|
|
|
@ -81,19 +81,8 @@ |
|
|
|
|
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)"> |
|
|
|
|
<a>删除</a> |
|
|
|
|
</a-popconfirm> |
|
|
|
|
<!-- <a-dropdown> |
|
|
|
|
<a class="ant-dropdown-link">更多 <a-icon type="down" /></a> |
|
|
|
|
<a-menu slot="overlay"> |
|
|
|
|
<a-menu-item> |
|
|
|
|
<a @click="handleDetail(record)">详情</a> |
|
|
|
|
</a-menu-item> |
|
|
|
|
<a-menu-item> |
|
|
|
|
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)"> |
|
|
|
|
<a>删除</a> |
|
|
|
|
</a-popconfirm> |
|
|
|
|
</a-menu-item> |
|
|
|
|
</a-menu> |
|
|
|
|
</a-dropdown>--> |
|
|
|
|
<a-divider type="vertical"/> |
|
|
|
|
<a @click="getPaiWeiTu(record)">生产计划排位图</a> |
|
|
|
|
</span> |
|
|
|
|
|
|
|
|
|
</a-table> |
|
|
|
|
@ -109,6 +98,8 @@ import '@/assets/less/TableExpand.less' |
|
|
|
|
import {mixinDevice} from '@/utils/mixin' |
|
|
|
|
import {JeecgListMixin} from '@/mixins/JeecgListMixin' |
|
|
|
|
import ZyProductPlanModal from './modules/ZyProductPlanModal' |
|
|
|
|
import {getAction} from "@api/manage"; |
|
|
|
|
import {filterObj} from "@/utils/util"; |
|
|
|
|
|
|
|
|
|
export default { |
|
|
|
|
name: 'ZyProductPlanList', |
|
|
|
|
@ -164,11 +155,11 @@ export default { |
|
|
|
|
{ |
|
|
|
|
title: '组长', |
|
|
|
|
align: "center", |
|
|
|
|
dataIndex: 'teamLeader' |
|
|
|
|
dataIndex: 'teamLeader_dictText' |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
title: '生产开始时间', |
|
|
|
|
width:150, |
|
|
|
|
width: 150, |
|
|
|
|
align: "center", |
|
|
|
|
dataIndex: 'workTime', |
|
|
|
|
// customRender: function (text) { |
|
|
|
|
@ -205,7 +196,7 @@ export default { |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
title: '审核时间', |
|
|
|
|
width:150, |
|
|
|
|
width: 150, |
|
|
|
|
align: "center", |
|
|
|
|
dataIndex: 'auditTimr', |
|
|
|
|
// customRender: function (text) { |
|
|
|
|
@ -223,6 +214,7 @@ export default { |
|
|
|
|
], |
|
|
|
|
url: { |
|
|
|
|
list: "/org.jeecg.modules.productplan/zyProductPlan/list", |
|
|
|
|
paiweitu: "/org.jeecg.modules.productplan/zyProductPlan/paiweitu", |
|
|
|
|
delete: "/org.jeecg.modules.productplan/zyProductPlan/delete", |
|
|
|
|
deleteBatch: "/org.jeecg.modules.productplan/zyProductPlan/deleteBatch", |
|
|
|
|
exportXlsUrl: "/org.jeecg.modules.productplan/zyProductPlan/exportXls", |
|
|
|
|
@ -234,7 +226,7 @@ export default { |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
created() { |
|
|
|
|
this.getSuperFieldList(); |
|
|
|
|
// this.getSuperFieldList(); |
|
|
|
|
}, |
|
|
|
|
computed: { |
|
|
|
|
// importExcelUrl: function(){ |
|
|
|
|
@ -242,23 +234,71 @@ export default { |
|
|
|
|
// }, |
|
|
|
|
}, |
|
|
|
|
methods: { |
|
|
|
|
initDictConfig() { |
|
|
|
|
}, |
|
|
|
|
getSuperFieldList() { |
|
|
|
|
let fieldList = []; |
|
|
|
|
fieldList.push({type: 'string', value: 'productCode', text: '工单编号', dictCode: ''}) |
|
|
|
|
fieldList.push({type: 'string', value: 'workshopId', text: '车间id', dictCode: ''}) |
|
|
|
|
fieldList.push({type: 'string', value: 'responsiblePerson', text: '车间负责人', dictCode: ''}) |
|
|
|
|
fieldList.push({type: 'string', value: 'teamId', text: '班组', dictCode: ''}) |
|
|
|
|
fieldList.push({type: 'string', value: 'teamLeader', text: '组长', dictCode: ''}) |
|
|
|
|
fieldList.push({type: 'date', value: 'workTime', text: '生产开始时间'}) |
|
|
|
|
fieldList.push({type: 'int', value: 'duration', text: '生产时长', dictCode: ''}) |
|
|
|
|
fieldList.push({type: 'int', value: 'status', text: '状态', dictCode: ''}) |
|
|
|
|
fieldList.push({type: 'int', value: 'speedUp', text: '是否加急', dictCode: ''}) |
|
|
|
|
fieldList.push({type: 'string', value: 'auditBy', text: '审核人', dictCode: ''}) |
|
|
|
|
fieldList.push({type: 'date', value: 'auditTimr', text: '审核时间'}) |
|
|
|
|
this.superFieldList = fieldList |
|
|
|
|
getPaiWeiTu(record) { |
|
|
|
|
// alert(JSON.stringify(record)); |
|
|
|
|
getAction(this.url.paiweitu, record).then((res) => { |
|
|
|
|
if (res.success) { |
|
|
|
|
// this.dataSource = res.result.records || res.result; |
|
|
|
|
console.log("the paiweitu----------"+JSON.stringify(res.result)) |
|
|
|
|
} else { |
|
|
|
|
this.$message.warning(res.message) |
|
|
|
|
} |
|
|
|
|
}).finally(() => { |
|
|
|
|
// this.dataSource.forEach(item => { |
|
|
|
|
// item['stationName'] = this.stationName; |
|
|
|
|
// item['stationNum'] = this.stationNum; |
|
|
|
|
// }) |
|
|
|
|
this.loading = false |
|
|
|
|
}) |
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
// loadData(arg) { |
|
|
|
|
// if (!this.url.list) { |
|
|
|
|
// this.$message.error("请设置url.list属性!") |
|
|
|
|
// return |
|
|
|
|
// } |
|
|
|
|
// //加载数据 若传入参数1则加载第一页的内容 |
|
|
|
|
// if (arg === 1) { |
|
|
|
|
// this.ipagination.current = 1; |
|
|
|
|
// } |
|
|
|
|
// this.loadParameter(); |
|
|
|
|
// var params = this.getQueryParams();//查询条件 |
|
|
|
|
// this.loading = true; |
|
|
|
|
// console.log("----------------the params:", params); |
|
|
|
|
// getAction(this.url.list, params).then((res) => { |
|
|
|
|
// if (res.success) { |
|
|
|
|
// this.dataSource = res.result.records || res.result; |
|
|
|
|
// if (res.result.total) { |
|
|
|
|
// this.ipagination.total = res.result.total; |
|
|
|
|
// } else { |
|
|
|
|
// this.ipagination.total = 0; |
|
|
|
|
// } |
|
|
|
|
// } else { |
|
|
|
|
// this.$message.warning(res.message) |
|
|
|
|
// } |
|
|
|
|
// }).finally(() => { |
|
|
|
|
// // this.dataSource.forEach(item => { |
|
|
|
|
// // item['stationName'] = this.stationName; |
|
|
|
|
// // item['stationNum'] = this.stationNum; |
|
|
|
|
// // }) |
|
|
|
|
// this.loading = false |
|
|
|
|
// }) |
|
|
|
|
// }, |
|
|
|
|
// getQueryParams() { |
|
|
|
|
// //获取查询条件 |
|
|
|
|
// let sqp = {} |
|
|
|
|
// if (this.superQueryParams) { |
|
|
|
|
// sqp['superQueryParams'] = encodeURI(this.superQueryParams) |
|
|
|
|
// sqp['superQueryMatchType'] = this.superQueryMatchType |
|
|
|
|
// } |
|
|
|
|
// var param = Object.assign(sqp, this.queryParam, this.isorter, this.filters); |
|
|
|
|
// param.field = this.getQueryField(); |
|
|
|
|
// param.pageNo = this.ipagination.current; |
|
|
|
|
// param.pageSize = this.ipagination.pageSize; |
|
|
|
|
// param.planId = this.planId; |
|
|
|
|
// return filterObj(param); |
|
|
|
|
// }, |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
</script> |
|
|
|
|
|
zhc077
2 years ago