|
|
|
@ -1,5 +1,5 @@ |
|
|
|
<template> |
|
|
|
<template> |
|
|
|
<!-- <a-card :bordered="false">--> |
|
|
|
<!-- <a-card :bordered="false">--> |
|
|
|
<a-modal |
|
|
|
<a-modal |
|
|
|
width="70%" |
|
|
|
width="70%" |
|
|
|
title="" |
|
|
|
title="" |
|
|
|
@ -22,8 +22,9 @@ |
|
|
|
</a-col> |
|
|
|
</a-col> |
|
|
|
|
|
|
|
|
|
|
|
<a-col :xl="6" :lg="7" :md="8" :sm="24"> |
|
|
|
<a-col :xl="6" :lg="7" :md="8" :sm="24"> |
|
|
|
<a-form-item label="工序" > |
|
|
|
<a-form-item label="工序"> |
|
|
|
<j-dict-select-tag v-model="queryParam.processId" dictCode="zy_process,process_name,id" placeholder="请选择工序" /> |
|
|
|
<j-dict-select-tag v-model="queryParam.processId" dictCode="zy_process,process_name,id" |
|
|
|
|
|
|
|
placeholder="请选择工序"/> |
|
|
|
</a-form-item> |
|
|
|
</a-form-item> |
|
|
|
</a-col> |
|
|
|
</a-col> |
|
|
|
|
|
|
|
|
|
|
|
@ -41,24 +42,30 @@ |
|
|
|
<!-- 操作按钮区域 --> |
|
|
|
<!-- 操作按钮区域 --> |
|
|
|
<div class="table-operator"> |
|
|
|
<div class="table-operator"> |
|
|
|
<a-button @click="handleAdd1(componentId1)" type="primary" icon="plus">新增</a-button> |
|
|
|
<a-button @click="handleAdd1(componentId1)" type="primary" icon="plus">新增</a-button> |
|
|
|
<!-- <a-button type="primary" icon="download" @click="handleExportXls('zy_process_component')">导出</a-button>--> |
|
|
|
<!-- <a-button type="primary" icon="download" @click="handleExportXls('zy_process_component')">导出</a-button>--> |
|
|
|
<!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">--> |
|
|
|
<!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">--> |
|
|
|
<!-- <a-button type="primary" icon="import">导入</a-button>--> |
|
|
|
<!-- <a-button type="primary" icon="import">导入</a-button>--> |
|
|
|
<!-- </a-upload>--> |
|
|
|
<!-- </a-upload>--> |
|
|
|
<!-- 高级查询区域 --> |
|
|
|
<!-- 高级查询区域 --> |
|
|
|
<!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>--> |
|
|
|
<!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>--> |
|
|
|
<a-dropdown v-if="selectedRowKeys.length > 0"> |
|
|
|
<a-dropdown v-if="selectedRowKeys.length > 0"> |
|
|
|
<a-menu slot="overlay"> |
|
|
|
<a-menu slot="overlay"> |
|
|
|
<a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item> |
|
|
|
<a-menu-item key="1" @click="batchDel"> |
|
|
|
|
|
|
|
<a-icon type="delete"/> |
|
|
|
|
|
|
|
删除 |
|
|
|
|
|
|
|
</a-menu-item> |
|
|
|
</a-menu> |
|
|
|
</a-menu> |
|
|
|
<a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button> |
|
|
|
<a-button style="margin-left: 8px"> 批量操作 |
|
|
|
|
|
|
|
<a-icon type="down"/> |
|
|
|
|
|
|
|
</a-button> |
|
|
|
</a-dropdown> |
|
|
|
</a-dropdown> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
|
|
|
|
|
|
|
|
<!-- table区域-begin --> |
|
|
|
<!-- table区域-begin --> |
|
|
|
<div> |
|
|
|
<div> |
|
|
|
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;"> |
|
|
|
<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>项 |
|
|
|
<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> |
|
|
|
<a style="margin-left: 24px" @click="onClearSelected">清空</a> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
|
|
|
|
|
|
|
|
@ -81,7 +88,8 @@ |
|
|
|
</template> |
|
|
|
</template> |
|
|
|
<template slot="imgSlot" slot-scope="text"> |
|
|
|
<template slot="imgSlot" slot-scope="text"> |
|
|
|
<span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span> |
|
|
|
<span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span> |
|
|
|
<img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/> |
|
|
|
<img v-else :src="getImgView(text)" height="25px" alt="" |
|
|
|
|
|
|
|
style="max-width:80px;font-size: 12px;font-style: italic;"/> |
|
|
|
</template> |
|
|
|
</template> |
|
|
|
<template slot="fileSlot" slot-scope="text"> |
|
|
|
<template slot="fileSlot" slot-scope="text"> |
|
|
|
<span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span> |
|
|
|
<span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span> |
|
|
|
@ -98,9 +106,9 @@ |
|
|
|
|
|
|
|
|
|
|
|
<span slot="action" slot-scope="text, record"> |
|
|
|
<span slot="action" slot-scope="text, record"> |
|
|
|
<!-- <a @click="handleEdit(record)">编辑</a>--> |
|
|
|
<!-- <a @click="handleEdit(record)">编辑</a>--> |
|
|
|
|
|
|
|
<!-- <a-divider type="vertical" />--> |
|
|
|
<!-- <a-divider type="vertical" />--> |
|
|
|
<!-- <a @click="handleDetail(record.id)">详情</a>--> |
|
|
|
<a @click="handleDetail(record.id)">详情</a> |
|
|
|
<a @click="openDetail(record.processId)">详情</a> |
|
|
|
<a-divider type="vertical"/> |
|
|
|
<a-divider type="vertical"/> |
|
|
|
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)"> |
|
|
|
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)"> |
|
|
|
<a>删除</a> |
|
|
|
<a>删除</a> |
|
|
|
@ -110,60 +118,64 @@ |
|
|
|
</a-table> |
|
|
|
</a-table> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
|
|
|
|
|
|
|
|
<zy-process-component-modal @valueChange="valueChange" ref="modalForm" @ok="modalFormOk"></zy-process-component-modal> |
|
|
|
<zy-process-component-modal @valueChange="valueChange" ref="modalForm" |
|
|
|
|
|
|
|
@ok="modalFormOk"></zy-process-component-modal> |
|
|
|
<ZyProcessComponentFormDetail ref="ZyProcessComponentFormDetail"></ZyProcessComponentFormDetail> |
|
|
|
<ZyProcessComponentFormDetail ref="ZyProcessComponentFormDetail"></ZyProcessComponentFormDetail> |
|
|
|
|
|
|
|
<ZyProcessDetail ref="zyProcessDetail"></ZyProcessDetail> |
|
|
|
</a-modal> |
|
|
|
</a-modal> |
|
|
|
</template> |
|
|
|
</template> |
|
|
|
|
|
|
|
|
|
|
|
<script> |
|
|
|
<script> |
|
|
|
|
|
|
|
|
|
|
|
import '@/assets/less/TableExpand.less' |
|
|
|
import ZyProcessDetail from '@views/process/modules/ZyProcessDetail' |
|
|
|
import { mixinDevice } from '@/utils/mixin' |
|
|
|
import '@/assets/less/TableExpand.less' |
|
|
|
import { JeecgListMixin } from '@/mixins/JeecgListMixin' |
|
|
|
import {mixinDevice} from '@/utils/mixin' |
|
|
|
import ZyProcessComponentModal from './modules/ZyProcessComponentModal' |
|
|
|
import {JeecgListMixin} from '@/mixins/JeecgListMixin' |
|
|
|
import ZyProcessComponentFormDetail from './modules/ZyProcessComponentFormDetail' |
|
|
|
import ZyProcessComponentModal from './modules/ZyProcessComponentModal' |
|
|
|
import {filterMultiDictText} from '@/components/dict/JDictSelectUtil' |
|
|
|
import ZyProcessComponentFormDetail from './modules/ZyProcessComponentFormDetail' |
|
|
|
import {filterObj} from "@/utils/util"; |
|
|
|
import {filterMultiDictText} from '@/components/dict/JDictSelectUtil' |
|
|
|
import {getAction} from "@api/manage"; |
|
|
|
import {filterObj} from "@/utils/util"; |
|
|
|
|
|
|
|
import {getAction} from "@api/manage"; |
|
|
|
|
|
|
|
|
|
|
|
export default { |
|
|
|
export default { |
|
|
|
name: 'ZyProcessComponentList', |
|
|
|
name: 'ZyProcessComponentList', |
|
|
|
mixins:[JeecgListMixin, mixinDevice], |
|
|
|
mixins: [JeecgListMixin, mixinDevice], |
|
|
|
components: { |
|
|
|
components: { |
|
|
|
|
|
|
|
ZyProcessDetail, |
|
|
|
ZyProcessComponentModal, |
|
|
|
ZyProcessComponentModal, |
|
|
|
ZyProcessComponentFormDetail |
|
|
|
ZyProcessComponentFormDetail |
|
|
|
}, |
|
|
|
}, |
|
|
|
data () { |
|
|
|
data() { |
|
|
|
return { |
|
|
|
return { |
|
|
|
description: 'zy_process_component管理页面', |
|
|
|
description: 'zy_process_component管理页面', |
|
|
|
visible: false, |
|
|
|
visible: false, |
|
|
|
confirmLoading: false, |
|
|
|
confirmLoading: false, |
|
|
|
componentId1:'', |
|
|
|
componentId1: '', |
|
|
|
// 表头 |
|
|
|
// 表头 |
|
|
|
columns: [ |
|
|
|
columns: [ |
|
|
|
{ |
|
|
|
{ |
|
|
|
title: '#', |
|
|
|
title: '#', |
|
|
|
dataIndex: '', |
|
|
|
dataIndex: '', |
|
|
|
key:'rowIndex', |
|
|
|
key: 'rowIndex', |
|
|
|
width:60, |
|
|
|
width: 60, |
|
|
|
align:"center", |
|
|
|
align: "center", |
|
|
|
customRender:function (t,r,index) { |
|
|
|
customRender: function (t, r, index) { |
|
|
|
return parseInt(index)+1; |
|
|
|
return parseInt(index) + 1; |
|
|
|
} |
|
|
|
} |
|
|
|
}, |
|
|
|
}, |
|
|
|
{ |
|
|
|
{ |
|
|
|
title:'部件名称', |
|
|
|
title: '部件名称', |
|
|
|
align:"center", |
|
|
|
align: "center", |
|
|
|
dataIndex: 'componentId_dictText' |
|
|
|
dataIndex: 'componentId_dictText' |
|
|
|
}, |
|
|
|
}, |
|
|
|
{ |
|
|
|
{ |
|
|
|
title:'工序代码', |
|
|
|
title: '工序代码', |
|
|
|
align:"center", |
|
|
|
align: "center", |
|
|
|
dataIndex: 'processCode' |
|
|
|
dataIndex: 'processCode' |
|
|
|
}, |
|
|
|
}, |
|
|
|
{ |
|
|
|
{ |
|
|
|
title:'工序', |
|
|
|
title: '工序', |
|
|
|
align:"center", |
|
|
|
align: "center", |
|
|
|
dataIndex: 'processId_dictText' |
|
|
|
dataIndex: 'processId_dictText' |
|
|
|
}, |
|
|
|
}, |
|
|
|
// { |
|
|
|
// { |
|
|
|
@ -172,17 +184,17 @@ |
|
|
|
// dataIndex: 'bottleneck_dictText' |
|
|
|
// dataIndex: 'bottleneck_dictText' |
|
|
|
// }, |
|
|
|
// }, |
|
|
|
{ |
|
|
|
{ |
|
|
|
title:'创建时间', |
|
|
|
title: '创建时间', |
|
|
|
align:"center", |
|
|
|
align: "center", |
|
|
|
dataIndex: 'createTime' |
|
|
|
dataIndex: 'createTime' |
|
|
|
}, |
|
|
|
}, |
|
|
|
{ |
|
|
|
{ |
|
|
|
title: '操作', |
|
|
|
title: '操作', |
|
|
|
dataIndex: 'action', |
|
|
|
dataIndex: 'action', |
|
|
|
align:"center", |
|
|
|
align: "center", |
|
|
|
fixed:"right", |
|
|
|
fixed: "right", |
|
|
|
width:147, |
|
|
|
width: 147, |
|
|
|
scopedSlots: { customRender: 'action' } |
|
|
|
scopedSlots: {customRender: 'action'} |
|
|
|
} |
|
|
|
} |
|
|
|
], |
|
|
|
], |
|
|
|
url: { |
|
|
|
url: { |
|
|
|
@ -196,15 +208,15 @@ |
|
|
|
//参数 |
|
|
|
//参数 |
|
|
|
loadRouteType: false, |
|
|
|
loadRouteType: false, |
|
|
|
biaoTi: '', |
|
|
|
biaoTi: '', |
|
|
|
dictOptions:{}, |
|
|
|
dictOptions: {}, |
|
|
|
superFieldList:[], |
|
|
|
superFieldList: [], |
|
|
|
} |
|
|
|
} |
|
|
|
}, |
|
|
|
}, |
|
|
|
created() { |
|
|
|
created() { |
|
|
|
this.getSuperFieldList(); |
|
|
|
this.getSuperFieldList(); |
|
|
|
}, |
|
|
|
}, |
|
|
|
computed: { |
|
|
|
computed: { |
|
|
|
importExcelUrl: function(){ |
|
|
|
importExcelUrl: function () { |
|
|
|
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`; |
|
|
|
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`; |
|
|
|
}, |
|
|
|
}, |
|
|
|
}, |
|
|
|
}, |
|
|
|
@ -287,22 +299,31 @@ |
|
|
|
console.log('Clicked cancel button'); |
|
|
|
console.log('Clicked cancel button'); |
|
|
|
this.visible = false; |
|
|
|
this.visible = false; |
|
|
|
}, |
|
|
|
}, |
|
|
|
initDictConfig(){ |
|
|
|
initDictConfig() { |
|
|
|
}, |
|
|
|
}, |
|
|
|
getSuperFieldList(){ |
|
|
|
getSuperFieldList() { |
|
|
|
let fieldList=[]; |
|
|
|
let fieldList = []; |
|
|
|
fieldList.push({type:'string',value:'componentId',text:'部件',dictCode:'zy_cloths_component,parts_name,nums'}) |
|
|
|
fieldList.push({ |
|
|
|
fieldList.push({type:'string',value:'processId',text:'工艺',dictCode:'zy_process,process_name,id'}) |
|
|
|
type: 'string', |
|
|
|
|
|
|
|
value: 'componentId', |
|
|
|
|
|
|
|
text: '部件', |
|
|
|
|
|
|
|
dictCode: 'zy_cloths_component,parts_name,nums' |
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
fieldList.push({type: 'string', value: 'processId', text: '工艺', dictCode: 'zy_process,process_name,id'}) |
|
|
|
this.superFieldList = fieldList |
|
|
|
this.superFieldList = fieldList |
|
|
|
}, |
|
|
|
}, |
|
|
|
handleDetail(id){ |
|
|
|
// handleDetail(id) { |
|
|
|
//id = this.model.id; |
|
|
|
// //id = this.model.id; |
|
|
|
console.log("this。model.id +++++"+id); |
|
|
|
// console.log("this。model.id +++++" + id); |
|
|
|
this.$refs.ZyProcessComponentFormDetail.showModal(id); |
|
|
|
// this.$refs.ZyProcessComponentFormDetail.showModal(id); |
|
|
|
} |
|
|
|
// } |
|
|
|
|
|
|
|
openDetail(id) { |
|
|
|
|
|
|
|
this.$refs.zyProcessDetail.showModal(id) |
|
|
|
|
|
|
|
// this.$children[0].showModal(id) |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
</script> |
|
|
|
</script> |
|
|
|
<style scoped> |
|
|
|
<style scoped> |
|
|
|
@import '~@assets/less/common.less'; |
|
|
|
@import '~@assets/less/common.less'; |
|
|
|
</style> |
|
|
|
</style> |
|
|
|
|
