|
|
|
|
@ -10,36 +10,42 @@ |
|
|
|
|
<!-- 查询区域-END --> |
|
|
|
|
|
|
|
|
|
<!-- 操作按钮区域 --> |
|
|
|
|
<!-- <div class="table-operator">--> |
|
|
|
|
<!--<!– <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>–>--> |
|
|
|
|
<!-- <a-button type="primary" icon="download" @click="handleExportXls('生产计划工序')">导出</a-button>--> |
|
|
|
|
<!-- <!– <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"–>--> |
|
|
|
|
<!-- <!– @change="handleImportExcel">–>--> |
|
|
|
|
<!-- <!– <a-button type="primary" icon="import">导入</a-button>–>--> |
|
|
|
|
<!-- <!– </a-upload>–>--> |
|
|
|
|
<!-- <!– 高级查询区域 –>--> |
|
|
|
|
<!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal"--> |
|
|
|
|
<!-- @handleSuperQuery="handleSuperQuery"></j-super-query>--> |
|
|
|
|
<!-- <a-dropdown v-if="selectedRowKeys.length > 0">--> |
|
|
|
|
<!-- <a-menu slot="overlay">--> |
|
|
|
|
<!-- <a-menu-item key="1" @click="batchDel">--> |
|
|
|
|
<!-- <a-icon type="delete"/>--> |
|
|
|
|
<!-- 删除--> |
|
|
|
|
<!-- </a-menu-item>--> |
|
|
|
|
<!-- </a-menu>--> |
|
|
|
|
<!-- <a-button style="margin-left: 8px"> 批量操作--> |
|
|
|
|
<!-- <a-icon type="down"/>--> |
|
|
|
|
<!-- </a-button>--> |
|
|
|
|
<!-- </a-dropdown>--> |
|
|
|
|
<!-- </div>--> |
|
|
|
|
<div class="table-operator"> |
|
|
|
|
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button> |
|
|
|
|
<a-button type="primary" icon="download" @click="handleExportXls('生产计划工序')">导出</a-button> |
|
|
|
|
<!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"--> |
|
|
|
|
<!-- @change="handleImportExcel">--> |
|
|
|
|
<!-- <a-button type="primary" icon="import">导入</a-button>--> |
|
|
|
|
<!-- </a-upload>--> |
|
|
|
|
<!-- 高级查询区域 --> |
|
|
|
|
<j-super-query :fieldList="superFieldList" ref="superQueryModal" |
|
|
|
|
@handleSuperQuery="handleSuperQuery"></j-super-query> |
|
|
|
|
<a-dropdown v-if="selectedRowKeys.length > 0"> |
|
|
|
|
<a-menu slot="overlay"> |
|
|
|
|
<a-menu-item key="1" @click="batchDel"> |
|
|
|
|
<a-icon type="delete"/> |
|
|
|
|
删除 |
|
|
|
|
</a-menu-item> |
|
|
|
|
</a-menu> |
|
|
|
|
<a-button style="margin-left: 8px"> 批量操作 |
|
|
|
|
<a-icon type="down"/> |
|
|
|
|
</a-button> |
|
|
|
|
</a-dropdown> |
|
|
|
|
<!-- <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>--> |
|
|
|
|
<!-- <a-button @click="zyStyleFabricHandleAdd(stationId)" type="primary" icon="plus">新增</a-button>--> |
|
|
|
|
<a-button type="primary" icon="download" @click="handleExportXls('1')">导出</a-button> |
|
|
|
|
<a-button type="primary" @click="fanHui()">返回</a-button> |
|
|
|
|
</div> |
|
|
|
|
|
|
|
|
|
<!-- table区域-begin --> |
|
|
|
|
<div> |
|
|
|
|
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;"> |
|
|
|
|
<i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a |
|
|
|
|
style="font-weight: 600">{{ selectedRowKeys.length }}</a>项 |
|
|
|
|
<a style="margin-left: 24px" @click="onClearSelected">清空</a> |
|
|
|
|
</div> |
|
|
|
|
<!-- <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">--> |
|
|
|
|
<!-- <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a--> |
|
|
|
|
<!-- style="font-weight: 600">{{ selectedRowKeys.length }}</a>项--> |
|
|
|
|
<!-- <a style="margin-left: 24px" @click="onClearSelected">清空</a>--> |
|
|
|
|
<!-- </div>--> |
|
|
|
|
|
|
|
|
|
<a-table |
|
|
|
|
ref="table" |
|
|
|
|
@ -54,28 +60,37 @@ |
|
|
|
|
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" |
|
|
|
|
class="j-table-force-nowrap" |
|
|
|
|
@change="handleTableChange"> |
|
|
|
|
<span slot="stationList" slot-scope="stationList"> |
|
|
|
|
<a-select @change="getToolAndMachine" style="width: 180px" placeholder="请选择"> |
|
|
|
|
<a-select-option v-for="item in stationList" :value="item.id"> |
|
|
|
|
{{ item.stationName }} |
|
|
|
|
</a-select-option> |
|
|
|
|
</a-select> |
|
|
|
|
</span> |
|
|
|
|
|
|
|
|
|
<!-- <span slot="action1" slot-scope="text, record">--> |
|
|
|
|
<!-- <a @click="jumpPage1(record)">班组成员管理</a>--> |
|
|
|
|
<!-- <!– <a-divider type="vertical"/>–>--> |
|
|
|
|
<!-- <!– <a @click="jumpPage2(record)">工位工具管理</a>–>--> |
|
|
|
|
<!-- </span>--> |
|
|
|
|
<span slot="action" slot-scope="text, record"> |
|
|
|
|
<!-- <a @click="handleEdit(record)">编辑</a>--> |
|
|
|
|
<!-- <a-divider type="vertical"/>--> |
|
|
|
|
<!-- <a @click="handleDetail(record)">详情</a>--> |
|
|
|
|
<!-- <a-divider type="vertical"/>--> |
|
|
|
|
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)"> |
|
|
|
|
<a>删除</a> |
|
|
|
|
</a-popconfirm> |
|
|
|
|
<a-divider type="vertical"/> |
|
|
|
|
<a @click="jumpPage1(record)">制定计划详情</a> |
|
|
|
|
<span slot="toolsList" slot-scope="toolsList"> |
|
|
|
|
<a-select style="width: 180px" placeholder="请选择"> |
|
|
|
|
<a-select-option v-for="item in toolsList" :value="item.id"> |
|
|
|
|
{{ item.name }} |
|
|
|
|
</a-select-option> |
|
|
|
|
</a-select> |
|
|
|
|
</span> |
|
|
|
|
|
|
|
|
|
<span slot="machineList" slot-scope="machineList"> |
|
|
|
|
<a-select style="width: 180px" placeholder="请选择"> |
|
|
|
|
<a-select-option v-for="item in machineList" :value="item.id"> |
|
|
|
|
{{ item.name }} |
|
|
|
|
</a-select-option> |
|
|
|
|
</a-select> |
|
|
|
|
</span> |
|
|
|
|
</a-table> |
|
|
|
|
</div> |
|
|
|
|
|
|
|
|
|
<zy-plan-process-modal ref="modalForm" @ok="modalFormOk"></zy-plan-process-modal> |
|
|
|
|
<div class="table-operator" style="text-align: right"> |
|
|
|
|
<a-button type="primary" @click="fanHui()">提交</a-button> |
|
|
|
|
</div> |
|
|
|
|
|
|
|
|
|
<!-- <zy-plan-process-modal @valueChange="valueChange" ref="modalForm" @ok="modalFormOk"></zy-plan-process-modal>--> |
|
|
|
|
</a-card> |
|
|
|
|
</template> |
|
|
|
|
|
|
|
|
|
@ -85,6 +100,8 @@ import '@/assets/less/TableExpand.less' |
|
|
|
|
import {mixinDevice} from '@/utils/mixin' |
|
|
|
|
import {JeecgListMixin} from '@/mixins/JeecgListMixin' |
|
|
|
|
import ZyPlanProcessModal from './modules/ZyPlanProcessModal2' |
|
|
|
|
import {getAction} from "@api/manage"; |
|
|
|
|
import {filterObj} from "@/utils/util"; |
|
|
|
|
|
|
|
|
|
export default { |
|
|
|
|
name: 'ZyPlanProcessList', |
|
|
|
|
@ -94,7 +111,7 @@ export default { |
|
|
|
|
}, |
|
|
|
|
data() { |
|
|
|
|
return { |
|
|
|
|
description: '计划工序制定数据列表', |
|
|
|
|
description: '生产计划工序管理页面', |
|
|
|
|
// 表头 |
|
|
|
|
columns: [ |
|
|
|
|
{ |
|
|
|
|
@ -107,35 +124,57 @@ export default { |
|
|
|
|
return parseInt(index) + 1; |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
// { |
|
|
|
|
// title: '计划id', |
|
|
|
|
// align: "center", |
|
|
|
|
// dataIndex: 'planId' |
|
|
|
|
// }, |
|
|
|
|
{ |
|
|
|
|
title: '生产计划id', |
|
|
|
|
title: '工单编号', |
|
|
|
|
align: "center", |
|
|
|
|
dataIndex: 'planId' |
|
|
|
|
dataIndex: 'workOrderId' |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
title: '车间名称', |
|
|
|
|
title: '产品id', |
|
|
|
|
align: "center", |
|
|
|
|
dataIndex: 'teamName' |
|
|
|
|
dataIndex: 'productId' |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
title: '工单编号', |
|
|
|
|
title: '产品', |
|
|
|
|
align: "center", |
|
|
|
|
dataIndex: 'productCode' |
|
|
|
|
dataIndex: 'productName' |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
title: '产品名称', |
|
|
|
|
title: '车间', |
|
|
|
|
align: "center", |
|
|
|
|
dataIndex: 'productCode2' |
|
|
|
|
dataIndex: 'departName' |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
title:'工序名称', |
|
|
|
|
align:"center", |
|
|
|
|
dataIndex: 'processId_dictText' |
|
|
|
|
title: '工序', |
|
|
|
|
align: "center", |
|
|
|
|
dataIndex: 'processName' |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
title:'序号', |
|
|
|
|
align:"center", |
|
|
|
|
dataIndex: 'number' |
|
|
|
|
title: '工位列表', |
|
|
|
|
align: "center", |
|
|
|
|
dataIndex: 'stationList', |
|
|
|
|
width: 150, |
|
|
|
|
scopedSlots: {customRender: 'stationList'} |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
title: '工位工具列表', |
|
|
|
|
align: "center", |
|
|
|
|
dataIndex: 'toolsList', |
|
|
|
|
width: 150, |
|
|
|
|
scopedSlots: {customRender: 'toolsList'} |
|
|
|
|
// scopedSlots: {customRender: this.toolsList} |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
title: '工具设备列表', |
|
|
|
|
align: "center", |
|
|
|
|
dataIndex: 'machineList', |
|
|
|
|
width: 150, |
|
|
|
|
scopedSlots: {customRender: 'machineList'} |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
title: '操作', |
|
|
|
|
@ -147,16 +186,21 @@ export default { |
|
|
|
|
} |
|
|
|
|
], |
|
|
|
|
url: { |
|
|
|
|
list: "/org.jeecg.modules.productplan/zyPlanProcess/list", |
|
|
|
|
productPlanlist: "/org.jeecg.modules.productplan/zyProductPlan/list", |
|
|
|
|
list: "/org.jeecg.modules.productplan/zyPlanProcess/getProcessDatalist", |
|
|
|
|
stationToolslist: "/stationTool/list", |
|
|
|
|
stationMachinelist: "/stationMachine/list", |
|
|
|
|
// productPlanlist: "/org.jeecg.modules.productplan/zyProductPlan/list", |
|
|
|
|
delete: "/org.jeecg.modules.productplan/zyPlanProcess/delete", |
|
|
|
|
deleteBatch: "/org.jeecg.modules.productplan/zyPlanProcess/deleteBatch", |
|
|
|
|
exportXlsUrl: "/org.jeecg.modules.productplan/zyPlanProcess/exportXls", |
|
|
|
|
importExcelUrl: "org.jeecg.modules.productplan/zyPlanProcess/importExcel", |
|
|
|
|
|
|
|
|
|
// deleteBatch: "/org.jeecg.modules.productplan/zyPlanProcess/deleteBatch", |
|
|
|
|
// exportXlsUrl: "/org.jeecg.modules.productplan/zyPlanProcess/exportXls", |
|
|
|
|
// importExcelUrl: "org.jeecg.modules.productplan/zyPlanProcess/importExcel", |
|
|
|
|
}, |
|
|
|
|
loadRouteType: false, |
|
|
|
|
planId: "", |
|
|
|
|
dictOptions: {}, |
|
|
|
|
superFieldList: [], |
|
|
|
|
toolsList: [], |
|
|
|
|
machineList: [], |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
created() { |
|
|
|
|
@ -168,8 +212,88 @@ export default { |
|
|
|
|
}, |
|
|
|
|
}, |
|
|
|
|
methods: { |
|
|
|
|
initDictConfig() { |
|
|
|
|
fanHui() { |
|
|
|
|
this.$router.push({ |
|
|
|
|
path: '/productplan/ZyPlanProcessList', |
|
|
|
|
}); |
|
|
|
|
}, |
|
|
|
|
getToolAndMachine(stationId) { |
|
|
|
|
// alert("stationId=" + stationId); |
|
|
|
|
getAction(this.url.stationToolslist, {"stationId": stationId}).then((res) => { |
|
|
|
|
if (res.success) { |
|
|
|
|
this.toolsList = res.result.records || res.result; |
|
|
|
|
console.log("toolsList", JSON.stringify(this.toolsList)) |
|
|
|
|
} else { |
|
|
|
|
this.$message.warning(res.message) |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
getAction(this.url.stationMachinelist, {"stationId": stationId}).then((res) => { |
|
|
|
|
if (res.success) { |
|
|
|
|
this.machineList = res.result.records || res.result; |
|
|
|
|
console.log("machineList", JSON.stringify(this.toolsList)) |
|
|
|
|
} else { |
|
|
|
|
this.$message.warning(res.message) |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
}, |
|
|
|
|
//加载传递参数 |
|
|
|
|
loadParameter() { |
|
|
|
|
if (this.loadRouteType === false) { |
|
|
|
|
this.planId = this.$route.query.planId; |
|
|
|
|
// this.biaoTi = this.$route.query.styleNames+"款式面料管理"; |
|
|
|
|
console.log("*******传递的planId:" + this.planId) |
|
|
|
|
this.loadRouteType = true; |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
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); |
|
|
|
|
}, |
|
|
|
|
// initDictConfig() { |
|
|
|
|
// }, |
|
|
|
|
getSuperFieldList() { |
|
|
|
|
let fieldList = []; |
|
|
|
|
fieldList.push({type: 'string', value: 'planId', text: '生产计划id', dictCode: ''}) |
|
|
|
|
@ -180,16 +304,17 @@ export default { |
|
|
|
|
fieldList.push({type: 'string', value: 'userIds', text: '成员id列表', dictCode: ''}) |
|
|
|
|
this.superFieldList = fieldList |
|
|
|
|
}, |
|
|
|
|
jumpPage1(record) { |
|
|
|
|
this.$router.push({ |
|
|
|
|
path: '/productplan/ZyProductPlanList', |
|
|
|
|
|
|
|
|
|
// query: { // 路由携带参数 |
|
|
|
|
// 'stationId': record.id, |
|
|
|
|
// 'stationName': record.stationName, |
|
|
|
|
// }, |
|
|
|
|
}); |
|
|
|
|
}, |
|
|
|
|
// jumpPage1(record) { |
|
|
|
|
// this.$router.push({ |
|
|
|
|
// // path: '/productplan/ZyProductPlanList', |
|
|
|
|
// path: '/productplan/ZyPlanProcessDataList', |
|
|
|
|
// |
|
|
|
|
// // query: { // 路由携带参数 |
|
|
|
|
// // 'stationId': record.id, |
|
|
|
|
// // 'stationName': record.stationName, |
|
|
|
|
// // }, |
|
|
|
|
// }); |
|
|
|
|
// }, |
|
|
|
|
// pf(record) { |
|
|
|
|
// this.$router.push({ |
|
|
|
|
// path: '/productplan/ZyPlanProcessAddList', |
|
|
|
|
@ -197,17 +322,17 @@ export default { |
|
|
|
|
// } |
|
|
|
|
// }); |
|
|
|
|
|
|
|
|
|
// getAction("productPlanlist", {id: record.id}).then((res) => { |
|
|
|
|
// if (res.success) { |
|
|
|
|
// this.$router.push({ |
|
|
|
|
// path: '/src/views/processassessment/assessmentCourse/ClassOpeningTaskList', |
|
|
|
|
// query: { // 路由携带参数 |
|
|
|
|
// } |
|
|
|
|
// }); |
|
|
|
|
// } else { |
|
|
|
|
// this.$message.error(res.message) |
|
|
|
|
// } |
|
|
|
|
// }); |
|
|
|
|
// getAction("productPlanlist", {id: record.id}).then((res) => { |
|
|
|
|
// if (res.success) { |
|
|
|
|
// this.$router.push({ |
|
|
|
|
// path: '/src/views/processassessment/assessmentCourse/ClassOpeningTaskList', |
|
|
|
|
// query: { // 路由携带参数 |
|
|
|
|
// } |
|
|
|
|
// }); |
|
|
|
|
// } else { |
|
|
|
|
// this.$message.error(res.message) |
|
|
|
|
// } |
|
|
|
|
// }); |
|
|
|
|
// }, |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
zhc077
2 years ago