zhc4dev
lenovo 3 years ago
parent 05fbdf1f01
commit 077b3087ec
  1. 37293
      ant-design-vue-jeecg/package-lock.json
  2. 10
      ant-design-vue-jeecg/package.json
  3. 41
      ant-design-vue-jeecg/src/mixins/JeecgListMixin.js
  4. 206
      ant-design-vue-jeecg/src/views/cloths/ZyProcessAccessoriesList.vue
  5. 68
      ant-design-vue-jeecg/src/views/cloths/ZyProcessFabricList.vue
  6. 69
      ant-design-vue-jeecg/src/views/cloths/ZyProcessMachineList.vue
  7. 150
      ant-design-vue-jeecg/src/views/cloths/modules/ZyProcessAccessoriesForm.vue
  8. 72
      ant-design-vue-jeecg/src/views/cloths/modules/ZyProcessAccessoriesModal.vue
  9. 84
      ant-design-vue-jeecg/src/views/cloths/modules/ZyProcessAccessoriesModal__Style#Drawer.vue
  10. 46
      ant-design-vue-jeecg/src/views/cloths/modules/ZyProcessFabricForm.vue
  11. 12
      ant-design-vue-jeecg/src/views/cloths/modules/ZyProcessFabricModal.vue
  12. 52
      ant-design-vue-jeecg/src/views/cloths/modules/ZyProcessMachineForm.vue
  13. 12
      ant-design-vue-jeecg/src/views/cloths/modules/ZyProcessMachineModal.vue
  14. 67
      ant-design-vue-jeecg/src/views/process/ZyClothActionList.vue
  15. 72
      ant-design-vue-jeecg/src/views/process/ZyProcessActionList.vue
  16. 78
      ant-design-vue-jeecg/src/views/process/ZyProcessList.vue
  17. 16
      ant-design-vue-jeecg/src/views/process/modules/ZyClothActionForm.vue
  18. 211
      ant-design-vue-jeecg/src/views/process/modules/ZyOperationtoolList.vue
  19. 211
      ant-design-vue-jeecg/src/views/process/modules/ZyProcessAccessoriesList.vue
  20. 58
      ant-design-vue-jeecg/src/views/process/modules/ZyProcessActionForm.vue
  21. 205
      ant-design-vue-jeecg/src/views/process/modules/ZyProcessActionList.vue
  22. 12
      ant-design-vue-jeecg/src/views/process/modules/ZyProcessActionModal.vue
  23. 215
      ant-design-vue-jeecg/src/views/process/modules/ZyProcessFabricList.vue
  24. 218
      ant-design-vue-jeecg/src/views/process/modules/ZyProcessMachineList.vue
  25. 61
      ant-design-vue-jeecg/src/views/process/modules/ZyProcessModal1.vue
  26. 63
      ant-design-vue-jeecg/src/views/process/modules/ZyProcessModal2.vue
  27. 63
      ant-design-vue-jeecg/src/views/process/modules/ZyProcessModal3.vue
  28. 64
      ant-design-vue-jeecg/src/views/process/modules/ZyProcessModal4.vue
  29. 62
      ant-design-vue-jeecg/src/views/process/modules/ZyProcessModal5.vue
  30. 22234
      ant-design-vue-jeecg/yarn.lock

File diff suppressed because it is too large Load Diff

@ -17,7 +17,7 @@
"@toast-ui/editor": "^2.1.2",
"ant-design-vue": "^1.7.2",
"area-data": "^5.0.6",
"axios": "^0.18.0",
"axios": "^0.27.2",
"clipboard": "^2.0.10",
"codemirror": "^5.65.1",
"cron-parser": "^2.10.0",
@ -42,7 +42,7 @@
"vue-i18n": "^8.27.0",
"vue-loader": "^15.7.0",
"vue-ls": "^3.2.0",
"vue-photo-preview": "^1.1.3",
"vue-photo-preview": "^1.0.9",
"vue-print-nb": "^1.7.5",
"vue-print-nb-jeecg": "^1.0.9",
"vue-router": "^3.0.1",
@ -56,11 +56,11 @@
"devDependencies": {
"@babel/polyfill": "^7.2.5",
"@vue/cli-plugin-babel": "^3.3.0",
"@vue/cli-plugin-eslint": "^3.3.0",
"@vue/cli-service": "^3.3.0",
"@vue/cli-plugin-eslint": "^5.0.8",
"@vue/cli-service": "^5.0.8",
"@vue/eslint-config-standard": "^4.0.0",
"babel-eslint": "7.2.3",
"compression-webpack-plugin": "^3.1.0",
"compression-webpack-plugin": "^10.0.0",
"eslint": "^5.16.0",
"eslint-plugin-vue": "^5.1.0",
"html-webpack-plugin": "^4.2.0",

@ -225,11 +225,52 @@ export const JeecgListMixin = {
this.$refs.modalForm.title = "编辑";
this.$refs.modalForm.disableSubmit = false;
},
handleEdit1: function (record,code) {
this.$refs.modalForm.edit1(record,code);
this.$refs.modalForm.title = "编辑";
this.$refs.modalForm.disableSubmit = false;
},
fuzhi: function (record) {
record.id=null;
this.$refs.modalForm.edit(record);
this.$refs.modalForm.title = "复制";
this.$refs.modalForm.disableSubmit = false;
},
dongzuo: function (id) {
this.$refs.modalForm1.edit(id);
this.$refs.modalForm1.title = "工序动作管理";
this.$refs.modalForm1.disableSubmit = false;
},
shebei: function (id) {
this.$refs.modalForm2.edit(id);
this.$refs.modalForm2.title = "工序设备管理";
this.$refs.modalForm2.disableSubmit = false;
},
fuliao: function (id) {
this.$refs.modalForm3.edit(id);
this.$refs.modalForm3.title = "工序辅料管理";
this.$refs.modalForm3.disableSubmit = false;
},
gongju: function (id) {
this.$refs.modalForm4.edit(id);
this.$refs.modalForm4.title = "工序工具管理";
this.$refs.modalForm4.disableSubmit = false;
},
mianliao: function (id) {
this.$refs.modalForm5.edit(id);
this.$refs.modalForm5.title = "工序面料管理";
this.$refs.modalForm5.disableSubmit = false;
},
handleAdd: function () {
this.$refs.modalForm.add();
this.$refs.modalForm.title = "新增";
this.$refs.modalForm.disableSubmit = false;
},
handleAdd1: function (id) {
this.$refs.modalForm.add1(id);
this.$refs.modalForm.title = "新增";
this.$refs.modalForm.disableSubmit = false;
},
handleTableChange(pagination, filters, sorter) {
//分页、排序、筛选变化时触发
//TODO 筛选

@ -0,0 +1,206 @@
<template>
<a-card :bordered="false">
<!-- 查询区域 -->
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :sm="5">
<a-form-model-item label="工序" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="annual" >
<a-input v-model="queryParam.processId" placeholder="请输入工序" ></a-input>
</a-form-model-item>
</a-col>
<a-col :sm="5">
<a-form-model-item label="设备" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="organizer">
<a-input v-model="queryParam.accessoriesId" placeholder="请输入设备名称" ></a-input>
</a-form-model-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
</span>
</a-col>
</a-row>
</a-form>
</div>
<!-- 查询区域-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>
<!-- 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>
<a-table
ref="table"
size="middle"
:scroll="{x:true}"
bordered
rowKey="id"
:columns="columns"
:dataSource="dataSource"
:pagination="ipagination"
:loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
class="j-table-force-nowrap"
@change="handleTableChange">
<template slot="htmlSlot" slot-scope="text">
<div v-html="text"></div>
</template>
<template slot="imgSlot" slot-scope="text">
<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;"/>
</template>
<template slot="fileSlot" slot-scope="text">
<span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
<a-button
v-else
:ghost="true"
type="primary"
icon="download"
size="small"
@click="downloadFile(text)">
下载
</a-button>
</template>
<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>
</span>
</a-table>
</div>
<zy-process-accessories-modal ref="modalForm" @ok="modalFormOk"></zy-process-accessories-modal>
</a-card>
</template>
<script>
import '@/assets/less/TableExpand.less'
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import ZyProcessAccessoriesModal from './modules/ZyProcessAccessoriesModal'
export default {
name: 'ZyProcessAccessoriesList',
mixins:[JeecgListMixin, mixinDevice],
components: {
ZyProcessAccessoriesModal
},
data () {
return {
labelCol: {
xs: { span: 24 },
sm: { span: 5 },
},
wrapperCol: {
xs: { span: 24 },
sm: { span: 16 },
},
description: '面料表管理页面',
//
columns: [
{
title: '#',
dataIndex: '',
key:'rowIndex',
width:60,
align:"center",
customRender:function (t,r,index) {
return parseInt(index)+1;
}
},
{
title:'工序编号',
align:"center",
dataIndex: 'processId'
},
{
title:'工序',
align:"center",
dataIndex: 'processId_dictText'
},
{
title:'面料编号',
align:"center",
dataIndex: 'accessoriesId'
},
{
title:'面料',
align:"center",
dataIndex: 'accessoriesId_dictText'
},
{
title: '操作',
dataIndex: 'action',
align:"center",
fixed:"right",
width:147,
scopedSlots: { customRender: 'action' }
}
],
url: {
list: "/pro/zyProcessAccessories/list",
delete: "/pro/zyProcessAccessories/delete",
deleteBatch: "/pro/zyProcessAccessories/deleteBatch",
exportXlsUrl: "/pro/zyProcessAccessories/exportXls",
importExcelUrl: "pro/zyProcessAccessories/importExcel",
},
dictOptions:{},
superFieldList:[],
}
},
created() {
this.getSuperFieldList();
},
computed: {
importExcelUrl: function(){
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
},
},
methods: {
initDictConfig(){
},
getSuperFieldList(){
let fieldList=[];
fieldList.push({type:'popup',value:'processId',text:'工序表id', popup:{code:'',field:'',orgFields:'',destFields:''}})
fieldList.push({type:'popup',value:'accessoriesId',text:'面料表id', popup:{code:'',field:'',orgFields:'',destFields:''}})
this.superFieldList = fieldList
}
}
}
</script>
<style scoped>
@import '~@assets/less/common.less';
</style>

@ -4,6 +4,22 @@
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :sm="5">
<a-form-model-item label="工序" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="annual" >
<a-input v-model="queryParam.processId" placeholder="请输入工序" ></a-input>
</a-form-model-item>
</a-col>
<a-col :sm="5">
<a-form-model-item label="设备" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="organizer">
<a-input v-model="queryParam.fabricId" placeholder="请输入辅料名称" ></a-input>
</a-form-model-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
</span>
</a-col>
</a-row>
</a-form>
</div>
@ -13,17 +29,17 @@
<div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('zy_process_fabric')">导出</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>
<!-- <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>
<!-- <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>
<!-- table区域-begin -->
@ -70,20 +86,14 @@
<span slot="action" slot-scope="text, record">
<a @click="handleEdit(record)">编辑</a>
<a-divider type="vertical" />
<a-dropdown>
<a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
<a-menu slot="overlay">
<a-menu-item>
<a-divider type="vertical" />
<a @click="handleDetail(record)">详情</a>
</a-menu-item>
<a-menu-item>
<a-divider type="vertical" />
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
<a>删除</a>
</a-popconfirm>
</a-menu-item>
</a-menu>
</a-dropdown>
</span>
</a-table>
@ -109,6 +119,14 @@
},
data () {
return {
labelCol: {
xs: { span: 24 },
sm: { span: 5 },
},
wrapperCol: {
xs: { span: 24 },
sm: { span: 16 },
},
description: 'zy_process_fabric管理页面',
//
columns: [
@ -122,11 +140,21 @@
return parseInt(index)+1;
}
},
{
title:'工序编号',
align:"center",
dataIndex: 'processId'
},
{
title:'工序',
align:"center",
dataIndex: 'processId_dictText'
},
{
title:'辅料编号',
align:"center",
dataIndex: 'fabricId'
},
{
title:'辅料',
align:"center",

@ -4,6 +4,22 @@
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :sm="5">
<a-form-model-item label="工序" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="annual" >
<a-input v-model="queryParam.processId" placeholder="请输入工序" ></a-input>
</a-form-model-item>
</a-col>
<a-col :sm="5">
<a-form-model-item label="设备" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="organizer">
<a-input v-model="queryParam.machineId" placeholder="请输入设备名称" ></a-input>
</a-form-model-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
</span>
</a-col>
</a-row>
</a-form>
</div>
@ -13,17 +29,17 @@
<div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('zy_process_machine')">导出</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>
<!-- <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>
<!-- <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>
<!-- table区域-begin -->
@ -71,19 +87,14 @@
<a @click="handleEdit(record)">编辑</a>
<a-divider type="vertical" />
<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-divider type="vertical" />
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
<a>删除</a>
</a-popconfirm>
</a-menu-item>
</a-menu>
</a-dropdown>
</span>
</a-table>
@ -110,6 +121,14 @@
data () {
return {
description: 'zy_process_machine管理页面',
labelCol: {
xs: { span: 24 },
sm: { span: 5 },
},
wrapperCol: {
xs: { span: 24 },
sm: { span: 16 },
},
//
columns: [
{
@ -122,13 +141,23 @@
return parseInt(index)+1;
}
},
{
title:'工序编号',
align:"center",
dataIndex: 'processId'
},
{
title:'工序',
align:"center",
dataIndex: 'processId_dictText'
},
{
title:'机器',
title:'设备编号',
align:"center",
dataIndex: 'machineId'
},
{
title:'设备名称',
align:"center",
dataIndex: 'machineId_dictText'
},

@ -0,0 +1,150 @@
<template>
<a-spin :spinning="confirmLoading">
<j-form-container :disabled="formDisabled">
<a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
<a-row>
<a-col :span="24" v-if="this.id===''&&code===1">
<a-form-model-item label="工序" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="processId">
<j-popup
v-model="model.processId"
field="processId"
org-fields="id,process_name"
dest-fields="processId,processId"
code="use_g"
:disabled="true"
/>
</a-form-model-item>
</a-col>
<a-col :span="24" v-else-if="this.id===''">
<a-form-model-item label="工序" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="processId">
<j-popup
v-model="model.processId"
field="processId"
org-fields="id,process_name"
dest-fields="processId,processId"
code="use_g"
/>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="面料" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="accessoriesId">
<j-popup
v-model="model.accessoriesId"
field="accessoriesId"
org-fields="id,contents"
dest-fields="accessoriesId,accessoriesId"
code="zy_accessories"
/>
</a-form-model-item>
</a-col>
</a-row>
</a-form-model>
</j-form-container>
</a-spin>
</template>
<script>
import { httpAction, getAction } from '@/api/manage'
import { validateDuplicateValue } from '@/utils/util'
export default {
name: 'ZyProcessAccessoriesForm',
components: {
},
props: {
//
disabled: {
type: Boolean,
default: false,
required: false
}
},
data () {
return {
code:'',
id:'',
model:{
},
labelCol: {
xs: { span: 24 },
sm: { span: 5 },
},
wrapperCol: {
xs: { span: 24 },
sm: { span: 16 },
},
confirmLoading: false,
validatorRules: {
},
url: {
add: "/pro/zyProcessAccessories/add",
edit: "/pro/zyProcessAccessories/edit",
queryById: "/pro/zyProcessAccessories/queryById"
}
}
},
computed: {
formDisabled(){
return this.disabled
},
},
created () {
//model
this.modelDefault = JSON.parse(JSON.stringify(this.model));
},
methods: {
add () {
this.edit(this.modelDefault);
},
add1 (id) {
this.id=id;
this.model.processId=id;
console.log(this.model.processId)
},
edit (record) {
this.model = Object.assign({}, record);
this.visible = true;
},
edit1 (record,code) {
this.model = Object.assign({}, record);
this.code=code;
this.visible = true;
},
submitForm () {
const that = this;
//
this.$refs.form.validate(valid => {
if (valid) {
that.confirmLoading = true;
let httpurl = '';
let method = '';
if(!this.model.id){
httpurl+=this.url.add;
method = 'post';
}else{
httpurl+=this.url.edit;
method = 'put';
}
httpAction(httpurl,this.model,method).then((res)=>{
if(res.success){
that.$message.success(res.message);
that.$emit('ok');
}else{
that.$message.warning(res.message);
}
}).finally(() => {
that.confirmLoading = false;
})
}
})
},
popupCallback(value,row){
this.model = Object.assign(this.model, row);
},
}
}
</script>

@ -0,0 +1,72 @@
<template>
<j-modal
:title="title"
:width="width"
:visible="visible"
switchFullscreen
@ok="handleOk"
:okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
@cancel="handleCancel"
cancelText="关闭">
<zy-process-accessories-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></zy-process-accessories-form>
</j-modal>
</template>
<script>
import ZyProcessAccessoriesForm from './ZyProcessAccessoriesForm'
export default {
name: 'ZyProcessAccessoriesModal',
components: {
ZyProcessAccessoriesForm
},
data () {
return {
title:'',
width:800,
visible: false,
disableSubmit: false
}
},
methods: {
add () {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.add();
})
},
add1 (id) {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.add1(id);
})
},
edit (record) {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.edit(record);
})
},
edit1 (record,code) {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.edit1(record,code);
})
},
close () {
this.$emit('close');
this.visible = false;
},
handleOk () {
this.$refs.realForm.submitForm();
},
submitCallback(){
this.$emit('ok');
this.visible = false;
},
handleCancel () {
this.close()
}
}
}
</script>

@ -0,0 +1,84 @@
<template>
<a-drawer
:title="title"
:width="width"
placement="right"
:closable="false"
@close="close"
destroyOnClose
:visible="visible">
<zy-process-accessories-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></zy-process-accessories-form>
<div class="drawer-footer">
<a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
<a-button v-if="!disableSubmit" @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
</div>
</a-drawer>
</template>
<script>
import ZyProcessAccessoriesForm from './ZyProcessAccessoriesForm'
export default {
name: 'ZyProcessAccessoriesModal',
components: {
ZyProcessAccessoriesForm
},
data () {
return {
title:"操作",
width:800,
visible: false,
disableSubmit: false
}
},
methods: {
add () {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.add();
})
},
edit (record) {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.edit(record);
});
},
close () {
this.$emit('close');
this.visible = false;
},
submitCallback(){
this.$emit('ok');
this.visible = false;
},
handleOk () {
this.$refs.realForm.submitForm();
},
handleCancel () {
this.close()
}
}
}
</script>
<style lang="less" scoped>
/** Button按钮间距 */
.ant-btn {
margin-left: 30px;
margin-bottom: 30px;
float: right;
}
.drawer-footer{
position: absolute;
bottom: -8px;
width: 100%;
border-top: 1px solid #e8e8e8;
padding: 10px 16px;
text-align: right;
left: 0;
background: #fff;
border-radius: 0 0 2px 2px;
}
</style>

@ -3,14 +3,42 @@
<j-form-container :disabled="formDisabled">
<a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
<a-row>
<a-col :span="24">
<a-col :span="24" v-if="this.id===''&&code===1">
<a-form-model-item label="工序" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="processId">
<j-dict-select-tag type="list" v-model="model.processId" dictCode="zy_process,process_name,id" placeholder="请选择工序" />
<!-- <j-dict-select-tag type="list" v-model="model.processId" dictCode="zy_process,process_name,id" placeholder="请选择工序" />-->
<j-popup
v-model="model.processId"
field="processId"
org-fields="id,process_name"
dest-fields="processId,processId"
code="use_g"
:disabled="true"
/>
</a-form-model-item>
</a-col>
<a-col :span="24" v-else-if="this.id===''">
<a-form-model-item label="工序" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="processId">
<!-- <j-dict-select-tag type="list" v-model="model.processId" dictCode="zy_process,process_name,id" placeholder="请选择工序" />-->
<j-popup
v-model="model.processId"
field="processId"
org-fields="id,process_name"
dest-fields="processId,processId"
code="use_g"
/>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="辅料" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fabricId">
<j-dict-select-tag type="list" v-model="model.fabricId" dictCode="zy_fabric,name,id" placeholder="请选择辅料" />
<!-- <j-dict-select-tag type="list" v-model="model.fabricId" dictCode="zy_fabric,name,id" placeholder="请选择辅料" />-->
<j-popup
v-model="model.fabricId"
field="fabricId"
org-fields="id,process_name"
dest-fields="fabricId,fabricId"
code="zy_fabrc"
/>
</a-form-model-item>
</a-col>
</a-row>
@ -38,6 +66,8 @@
},
data () {
return {
code:'',
id:'',
model:{
},
labelCol: {
@ -71,10 +101,20 @@
add () {
this.edit(this.modelDefault);
},
add1 (id) {
this.id=id;
this.model.processId=id;
console.log(this.model.processId)
},
edit (record) {
this.model = Object.assign({}, record);
this.visible = true;
},
edit1 (record,code) {
this.model = Object.assign({}, record);
this.code=code;
this.visible = true;
},
submitForm () {
const that = this;
//

@ -35,12 +35,24 @@
this.$refs.realForm.add();
})
},
add1 (id) {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.add1(id);
})
},
edit (record) {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.edit(record);
})
},
edit1 (record,code) {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.edit1(record,code);
})
},
close () {
this.$emit('close');
this.visible = false;

@ -3,14 +3,43 @@
<j-form-container :disabled="formDisabled">
<a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
<a-row>
<a-col :span="24">
<a-form-model-item label="工序" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="processId">
<j-dict-select-tag type="list" v-model="model.processId" dictCode="zy_process,process_name,id" placeholder="请选择工序" />
<a-col :span="24" v-if="this.id===''&&code===1">
<a-form-model-item label="工序" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="processId" >
<!-- <j-dict-select-tag type="list" v-model="model.processId" dictCode="zy_process,process_name,id" placeholder="请选择工序" />-->
<j-popup
v-model="model.processId"
field="processId"
org-fields="id,process_name"
dest-fields="processId,processId"
code="use_g"
:disabled="true"
/>
</a-form-model-item>
</a-col>
<a-col :span="24" v-else-if="this.id===''">
<a-form-model-item label="工序" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="processId" >
<!-- <j-dict-select-tag type="list" v-model="model.processId" dictCode="zy_process,process_name,id" placeholder="请选择工序" />-->
<j-popup
v-model="model.processId"
field="processId"
org-fields="id,process_name"
dest-fields="processId,processId"
code="use_g"
/>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="机器" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="machineId">
<j-dict-select-tag type="list" v-model="model.machineId" dictCode="zy_devicetype,name,id" placeholder="请选择机器" />
<a-form-model-item label="设备" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="machineId">
<!-- <j-dict-select-tag type="list" v-model="model.machineId" dictCode="zy_devicetype,name,id" placeholder="请选择机器" />-->
<j-popup
v-model="model.machineId"
field="machineId"
org-fields="id,process_name"
dest-fields="machineId,machineId"
code="zy_advice"
/>
</a-form-model-item>
</a-col>
</a-row>
@ -38,7 +67,10 @@
},
data () {
return {
code:'',
id:'',
model:{
processId:'',
},
labelCol: {
xs: { span: 24 },
@ -71,10 +103,20 @@
add () {
this.edit(this.modelDefault);
},
add1 (id) {
this.id=id;
this.model.processId=id;
console.log(this.model.processId)
},
edit (record) {
this.model = Object.assign({}, record);
this.visible = true;
},
edit1 (record,code) {
this.model = Object.assign({}, record);
this.code=code;
this.visible = true;
},
submitForm () {
const that = this;
//

@ -35,12 +35,24 @@
this.$refs.realForm.add();
})
},
add1 (id) {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.add1(id);
})
},
edit (record) {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.edit(record);
})
},
edit1 (record,code) {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.edit1(record,code);
})
},
close () {
this.$emit('close');
this.visible = false;

@ -4,6 +4,22 @@
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :sm="5">
<a-form-model-item label="描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="annual" >
<a-input v-model="queryParam.descr" placeholder="请输入描述" ></a-input>
</a-form-model-item>
</a-col>
<a-col :sm="5">
<a-form-model-item label="编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="organizer">
<a-input v-model="queryParam.nums" placeholder="请输入编号" ></a-input>
</a-form-model-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
<!-- <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>-->
</span>
</a-col>
</a-row>
</a-form>
</div>
@ -13,9 +29,9 @@
<div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('zy_cloth_action')">导出</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>
<!-- <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">
@ -71,19 +87,13 @@
<a @click="handleEdit(record)">编辑</a>
<a-divider type="vertical" />
<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-divider type="vertical" />
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
<a>删除</a>
</a-popconfirm>
</a-menu-item>
</a-menu>
</a-dropdown>
</span>
</a-table>
@ -108,6 +118,14 @@
},
data () {
return {
labelCol: {
xs: { span: 24 },
sm: { span: 5 },
},
wrapperCol: {
xs: { span: 24 },
sm: { span: 16 },
},
description: 'zy_cloth_action管理页面',
//
columns: [
@ -122,22 +140,23 @@
}
},
{
title:'添加人',
title:'编号',
align:"center",
dataIndex: 'addPeople'
dataIndex: 'nums'
},
{
title:'频率',
title:'描述',
align:"center",
dataIndex: 'freq'
dataIndex: 'descr'
},
{
title:'描述',
title:'频率',
align:"center",
dataIndex: 'descr'
dataIndex: 'freq'
},
{
title:'机器TMU',
title:'设备TMU',
align:"center",
dataIndex: 'machineTmu'
},
@ -146,10 +165,16 @@
align:"center",
dataIndex: 'manualTmu'
},
{
title:'编号',
title:'创建人',
align:"center",
dataIndex: 'nums'
dataIndex: 'addPeople'
},
{
title:'创建时间',
align:"center",
dataIndex: 'createTime'
},
{
title: '操作',

@ -4,6 +4,22 @@
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :sm="5">
<a-form-model-item label="工序" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="annual" >
<a-input v-model="queryParam.processId" placeholder="请输入工序" ></a-input>
</a-form-model-item>
</a-col>
<a-col :sm="5">
<a-form-model-item label="动作" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="organizer">
<a-input v-model="queryParam.actionId" placeholder="请输入动作名称" ></a-input>
</a-form-model-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
</span>
</a-col>
</a-row>
</a-form>
</div>
@ -13,17 +29,17 @@
<div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('zy_process_action')">导出</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>
<!-- <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>
<!-- <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>
<!-- table区域-begin -->
@ -71,19 +87,14 @@
<a @click="handleEdit(record)">编辑</a>
<a-divider type="vertical" />
<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 @click="handleDetail(record)">详情</a>
<a-divider type="vertical" />
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
<a>删除</a>
</a-popconfirm>
</a-menu-item>
</a-menu>
</a-dropdown>
</span>
</a-table>
@ -109,6 +120,15 @@
},
data () {
return {
id:'',
labelCol: {
xs: { span: 24 },
sm: { span: 5 },
},
wrapperCol: {
xs: { span: 24 },
sm: { span: 16 },
},
description: 'zy_process_action管理页面',
//
columns: [
@ -122,11 +142,21 @@
return parseInt(index)+1;
}
},
{
title:'工序编号',
align:"center",
dataIndex: 'processId'
},
{
title:'工序',
align:"center",
dataIndex: 'processId_dictText'
},
{
title:'动作编号',
align:"center",
dataIndex: 'actionId'
},
{
title:'动作',
align:"center",
@ -155,7 +185,9 @@
},
created() {
this.getSuperFieldList();
},
computed: {
importExcelUrl: function(){
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;

@ -13,9 +13,9 @@
<div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('zy_process')">导出</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>
<!-- <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">
@ -71,6 +71,19 @@
<a @click="handleEdit(record)">编辑</a>
<a-divider type="vertical" />
<a @click="fuzhi(record)">复制</a>
<a-divider type="vertical" />
<a @click="dongzuo(record.id)">动作</a>
<a-divider type="vertical" />
<a @click="shebei(record.id)">设备</a>
<a-divider type="vertical" />
<a @click="fuliao(record.id)">辅料</a>
<a-divider type="vertical" />
<a @click="gongju(record.id)">工具</a>
<a-divider type="vertical" />
<a @click="mianliao(record.id)">面料</a>
<a-divider type="vertical" />
<a-dropdown>
<a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
<a-menu slot="overlay">
@ -85,11 +98,19 @@
</a-menu>
</a-dropdown>
</span>
<!-- 新建一个管理列-->
<!-- <span slot="action1" slot-scope="text, record">-->
<!-- -->
<!-- </span>-->
</a-table>
</div>
<ZyProcessDetail ref="zyProcessDetail"></ZyProcessDetail>
<zy-process-modal ref="modalForm" @ok="modalFormOk"></zy-process-modal>
<zy-process-modal1 ref="modalForm1" @ok="modalFormOk"></zy-process-modal1>
<zy-process-modal2 ref="modalForm2" @ok="modalFormOk"></zy-process-modal2>
<zy-process-modal3 ref="modalForm3" @ok="modalFormOk"></zy-process-modal3>
<zy-process-modal4 ref="modalForm4" @ok="modalFormOk"></zy-process-modal4>
<zy-process-modal5 ref="modalForm5" @ok="modalFormOk"></zy-process-modal5>
</a-card>
</template>
@ -99,6 +120,11 @@
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import ZyProcessModal from './modules/ZyProcessModal'
import ZyProcessModal1 from './modules/ZyProcessModal1'
import ZyProcessModal2 from './modules/ZyProcessModal2'
import ZyProcessModal3 from './modules/ZyProcessModal3'
import ZyProcessModal4 from './modules/ZyProcessModal4'
import ZyProcessModal5 from './modules/ZyProcessModal5'
import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
import ZyProcessDetail from './modules/ZyProcessDetail'
export default {
@ -106,7 +132,12 @@
mixins:[JeecgListMixin, mixinDevice],
components: {
ZyProcessModal,
ZyProcessDetail
ZyProcessDetail,
ZyProcessModal1,
ZyProcessModal2,
ZyProcessModal3,
ZyProcessModal4,
ZyProcessModal5
},
data () {
return {
@ -133,11 +164,11 @@
align:"center",
dataIndex: 'processName'
},
{
title:'工艺描述',
align:"center",
dataIndex: 'processDescribe'
},
// {
// title:'',
// align:"center",
// dataIndex: 'processDescribe'
// },
{
title:'品质要求',
align:"center",
@ -164,15 +195,15 @@
dataIndex: 'fabricNum'
},
{
title:'机器名',
title:'设备名',
align:"center",
dataIndex: 'machineId_dictText'
},
{
title:'部件',
align:"center",
dataIndex: 'componentId_dictText'
},
// {
// title:'',
// align:"center",
// dataIndex: 'componentId_dictText'
// },
{
title:'工具名称',
align:"center",
@ -209,10 +240,23 @@
dataIndex: 'totalMaunal'
},
{
title:'合计(机器秒)',
title:'合计(设备秒)',
align:"center",
dataIndex: 'totalMachine'
},
{
title:'创建时间',
align:"center",
dataIndex: 'createTime'
},
// {
// title: '',
// dataIndex: 'action1',
// align:"center",
// fixed:"right",
// width:147,
// scopedSlots: { customRender: 'action1' }
// },
{
title: '操作',
dataIndex: 'action',

@ -3,11 +3,11 @@
<j-form-container :disabled="formDisabled">
<a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
<a-row>
<a-col :span="24">
<a-form-model-item label="添加人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="addPeople">
<a-input v-model="model.addPeople" placeholder="请输入添加人" ></a-input>
</a-form-model-item>
</a-col>
<!-- <a-col :span="24">-->
<!-- <a-form-model-item label="添加人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="addPeople">-->
<!-- <a-input v-model="model.addPeople" placeholder="请输入添加人" ></a-input>-->
<!-- </a-form-model-item>-->
<!-- </a-col>-->
<a-col :span="24">
<a-form-model-item label="频率" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="freq">
<a-input-number v-model="model.freq" placeholder="请输入频率" style="width: 100%" />
@ -43,7 +43,7 @@
import { httpAction, getAction } from '@/api/manage'
import { validateDuplicateValue } from '@/utils/util'
import store from '@/store'
export default {
name: 'ZyClothActionForm',
components: {
@ -59,6 +59,7 @@
data () {
return {
model:{
addPeople:'',
},
labelCol: {
xs: { span: 24 },
@ -86,6 +87,7 @@
created () {
//model
this.modelDefault = JSON.parse(JSON.stringify(this.model));
},
methods: {
add () {
@ -93,6 +95,8 @@
},
edit (record) {
this.model = Object.assign({}, record);
let usercode = store.getters.userInfo.realname
this.model.addPeople=usercode
this.visible = true;
},
submitForm () {

@ -0,0 +1,211 @@
<template>
<a-card :bordered="false">
<!-- 查询区域 -->
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :sm="5">
<a-form-model-item label="设备" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="organizer">
<a-input v-model="queryParam.toolid" placeholder="请输入工具名称" ></a-input>
</a-form-model-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
<!-- <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>-->
</span>
</a-col>
</a-row>
</a-form>
</div>
<!-- 查询区域-END -->
<!-- 操作按钮区域 -->
<div class="table-operator">
<a-button @click="handleAdd1(id)" 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>
<!-- 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>
<a-table
ref="table"
size="middle"
:scroll="{x:true}"
bordered
rowKey="id"
:columns="columns"
:dataSource="dataSource"
:pagination="ipagination"
:loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
class="j-table-force-nowrap"
@change="handleTableChange">
<template slot="htmlSlot" slot-scope="text">
<div v-html="text"></div>
</template>
<template slot="imgSlot" slot-scope="text">
<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;"/>
</template>
<template slot="fileSlot" slot-scope="text">
<span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
<a-button
v-else
:ghost="true"
type="primary"
icon="download"
size="small"
@click="downloadFile(text)">
下载
</a-button>
</template>
<span slot="action" slot-scope="text, record">
<a @click="handleEdit1(record,code)">编辑</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>
</span>
</a-table>
</div>
<zy-operationtool-modal ref="modalForm" @ok="modalFormOk"></zy-operationtool-modal>
</a-card>
</template>
<script>
import '@/assets/less/TableExpand.less'
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import ZyOperationtoolModal from "@/views/operationtool/modules/ZyOperationtoolModal"
import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
export default {
name: 'ZyOperationtoolList',
mixins:[JeecgListMixin, mixinDevice],
components: {
ZyOperationtoolModal
},
data () {
return {
code:1,
id:'',
labelCol: {
xs: { span: 24 },
sm: { span: 7 },
},
wrapperCol: {
xs: { span: 24 },
sm: { span: 12 },
md: { span: 10 },
},
description: '工序工具管理页面',
//
columns: [
{
title: '#',
dataIndex: '',
key:'rowIndex',
width:60,
align:"center",
customRender:function (t,r,index) {
return parseInt(index)+1;
}
},
{
title:'工序编号',
align:"center",
dataIndex: 'operationid'
},
{
title:'工序',
align:"center",
dataIndex: 'operationid_dictText'
},
{
title:'工具编号',
align:"center",
dataIndex: 'toolid'
},
{
title:'工具',
align:"center",
dataIndex: 'toolid_dictText'
},
{
title: '操作',
dataIndex: 'action',
align:"center",
fixed:"right",
width:147,
scopedSlots: { customRender: 'action' }
}
],
url: {
list: "/operationtool/zyOperationtool/list1",
delete: "/operationtool/zyOperationtool/delete",
deleteBatch: "/operationtool/zyOperationtool/deleteBatch",
exportXlsUrl: "/operationtool/zyOperationtool/exportXls",
importExcelUrl: "operationtool/zyOperationtool/importExcel",
},
dictOptions:{},
superFieldList:[],
}
},
created() {
this.getSuperFieldList();
},
computed: {
importExcelUrl: function(){
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
},
},
methods: {
edit (record) {
this.id = record;
this.queryParam.operationid=this.id;
this.loadData();
this.visible = true;
},
initDictConfig(){
},
getSuperFieldList(){
let fieldList=[];
fieldList.push({type:'string',value:'operationid',text:'工序',dictCode:'zy_process,process_name,id'})
fieldList.push({type:'string',value:'device',text:'机器',dictCode:'zy_device,code,id'})
fieldList.push({type:'string',value:'tools',text:'工具',dictCode:''})
this.superFieldList = fieldList
}
}
}
</script>
<style scoped>
@import '~@assets/less/common.less';
</style>

@ -0,0 +1,211 @@
<template>
<a-card :bordered="false">
<!-- 查询区域 -->
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :sm="5">
<a-form-model-item label="设备" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="organizer">
<a-input v-model="queryParam.accessoriesId" placeholder="请输入设备名称" ></a-input>
</a-form-model-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
</span>
</a-col>
</a-row>
</a-form>
</div>
<!-- 查询区域-END -->
<!-- 操作按钮区域 -->
<div class="table-operator">
<a-button @click="handleAdd1(id)" 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>
<!-- 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>
<a-table
ref="table"
size="middle"
:scroll="{x:true}"
bordered
rowKey="id"
:columns="columns"
:dataSource="dataSource"
:pagination="ipagination"
:loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
class="j-table-force-nowrap"
@change="handleTableChange">
<template slot="htmlSlot" slot-scope="text">
<div v-html="text"></div>
</template>
<template slot="imgSlot" slot-scope="text">
<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;"/>
</template>
<template slot="fileSlot" slot-scope="text">
<span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
<a-button
v-else
:ghost="true"
type="primary"
icon="download"
size="small"
@click="downloadFile(text)">
下载
</a-button>
</template>
<span slot="action" slot-scope="text, record">
<a @click="handleEdit1(record,code)">编辑</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>
</span>
</a-table>
</div>
<zy-process-accessories-modal ref="modalForm" @ok="modalFormOk"></zy-process-accessories-modal>
</a-card>
</template>
<script>
import '@/assets/less/TableExpand.less'
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import ZyProcessAccessoriesModal from '@/views/cloths/modules/ZyProcessAccessoriesModal'
export default {
name: 'ZyProcessAccessoriesList',
mixins:[JeecgListMixin, mixinDevice],
components: {
ZyProcessAccessoriesModal
},
data () {
return {
code:1,
id:'',
labelCol: {
xs: { span: 24 },
sm: { span: 5 },
},
wrapperCol: {
xs: { span: 24 },
sm: { span: 16 },
},
description: '面料表管理页面',
//
columns: [
{
title: '#',
dataIndex: '',
key:'rowIndex',
width:60,
align:"center",
customRender:function (t,r,index) {
return parseInt(index)+1;
}
},
{
title:'工序编号',
align:"center",
dataIndex: 'processId'
},
{
title:'工序',
align:"center",
dataIndex: 'processId_dictText'
},
{
title:'面料编号',
align:"center",
dataIndex: 'accessoriesId'
},
{
title:'面料',
align:"center",
dataIndex: 'accessoriesId_dictText'
},
{
title: '操作',
dataIndex: 'action',
align:"center",
fixed:"right",
width:147,
scopedSlots: { customRender: 'action' }
}
],
url: {
list: "/pro/zyProcessAccessories/list1",
delete: "/pro/zyProcessAccessories/delete",
deleteBatch: "/pro/zyProcessAccessories/deleteBatch",
exportXlsUrl: "/pro/zyProcessAccessories/exportXls",
importExcelUrl: "pro/zyProcessAccessories/importExcel",
},
dictOptions:{},
superFieldList:[],
}
},
created() {
this.getSuperFieldList();
},
computed: {
importExcelUrl: function(){
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
},
},
methods: {
edit (record) {
this.id = record;
this.queryParam.processId=this.id;
console.log("燕慧森1号")
this.loadData();
this.visible = true;
},
initDictConfig(){
},
getSuperFieldList(){
let fieldList=[];
fieldList.push({type:'popup',value:'processId',text:'工序表id', popup:{code:'',field:'',orgFields:'',destFields:''}})
fieldList.push({type:'popup',value:'accessoriesId',text:'面料表id', popup:{code:'',field:'',orgFields:'',destFields:''}})
this.superFieldList = fieldList
}
}
}
</script>
<style scoped>
@import '~@assets/less/common.less';
</style>

@ -3,16 +3,51 @@
<j-form-container :disabled="formDisabled">
<a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
<a-row>
<a-col :span="24">
<a-form-model-item label="工序id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="processId">
<j-dict-select-tag type="list" v-model="model.processId" dictCode="zy_process,process_name,id" placeholder="请选择工序id" />
<!-- <a-col :span="24">-->
<!-- <a-form-model-item label="工序id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="processId">-->
<!-- <j-dict-select-tag type="list" v-model="model.processId" dictCode="zy_process,process_name,id" placeholder="请选择工序id" />-->
<!-- </a-form-model-item>-->
<!-- </a-col>-->
<a-col :span="24" v-if="this.id===''&&code===1">
<a-form-model-item label="工序" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="processId">
<!-- <j-dict-select-tag type="list" v-model="model.processId" dictCode="zy_process,process_name,id" placeholder="请选择工序" />-->
<j-popup
v-model="model.processId"
field="processId"
org-fields="id,process_name"
dest-fields="processId,processId"
code="use_g"
:disabled="true"
/>
</a-form-model-item>
</a-col>
<a-col :span="24" v-else-if="this.id===''">
<a-form-model-item label="工序" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="processId">
<!-- <j-dict-select-tag type="list" v-model="model.processId" dictCode="zy_process,process_name,id" placeholder="请选择工序" />-->
<j-popup
v-model="model.processId"
field="processId"
org-fields="id,process_name"
dest-fields="processId,processId"
code="use_g"
/>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="动作id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="actionId">
<j-dict-select-tag type="list" v-model="model.actionId" dictCode="zy_cloth_action,descr,id" placeholder="请选择动作id" />
<a-form-model-item label="动作" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="actionId">
<!-- <j-dict-select-tag type="list" v-model="model.actionId" dictCode="zy_cloth_action,descr,id" placeholder="请选择动作id" />-->
<j-popup
v-model="model.actionId"
field="actionId"
org-fields="id,descr"
dest-fields="actionId,actionId"
code="zy_clothes_action"
/>
</a-form-model-item>
</a-col>
</a-row>
</a-form-model>
</j-form-container>
@ -38,7 +73,10 @@
},
data () {
return {
code:'',
id:'',
model:{
processId:'',
},
labelCol: {
xs: { span: 24 },
@ -71,10 +109,20 @@
add () {
this.edit(this.modelDefault);
},
add1 (id) {
this.id=id;
this.model.processId=id;
console.log(this.model.processId)
},
edit (record) {
this.model = Object.assign({}, record);
this.visible = true;
},
edit1 (record,code) {
this.model = Object.assign({}, record);
this.code=code;
this.visible = true;
},
submitForm () {
const that = this;
//

@ -0,0 +1,205 @@
<template>
<a-card :bordered="false">
<!-- 查询区域 -->
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :sm="5">
<a-form-model-item label="动作" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="organizer">
<a-input v-model="queryParam.actionId" placeholder="请输入动作名称" ></a-input>
</a-form-model-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
<!-- <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>-->
</span>
</a-col>
</a-row>
</a-form>
</div>
<!-- 查询区域-END -->
<!-- 操作按钮区域 -->
<div class="table-operator">
<a-button @click="handleAdd1(id)" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('zy_process_action')">导出</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>-->
<!-- &lt;!&ndash; 高级查询区域 &ndash;&gt;-->
<!-- <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>
<!-- 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>
<a-table
ref="table"
size="middle"
:scroll="{x:true}"
bordered
rowKey="id"
:columns="columns"
:dataSource="dataSource"
:pagination="ipagination"
:loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
class="j-table-force-nowrap"
@change="handleTableChange">
<template slot="htmlSlot" slot-scope="text">
<div v-html="text"></div>
</template>
<template slot="imgSlot" slot-scope="text">
<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;"/>
</template>
<template slot="fileSlot" slot-scope="text">
<span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
<a-button
v-else
:ghost="true"
type="primary"
icon="download"
size="small"
@click="downloadFile(text)">
下载
</a-button>
</template>
<span slot="action" slot-scope="text, record">
<a @click="handleEdit1(record,code)">编辑</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>
</span>
</a-table>
</div>
<zy-process-action-modal ref="modalForm" @ok="modalFormOk"></zy-process-action-modal>
</a-card>
</template>
<script>
import '@/assets/less/TableExpand.less'
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import ZyProcessActionModal from './ZyProcessActionModal'
import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
export default {
name: 'ZyProcessActionList',
mixins:[JeecgListMixin, mixinDevice],
components: {
ZyProcessActionModal
},
data () {
return {
code:1,
labelCol: {
xs: { span: 24 },
sm: { span: 7 },
},
wrapperCol: {
xs: { span: 24 },
sm: { span: 12 },
md: { span: 10 },
},
id:'',
description: 'zy_process_action管理页面',
//
columns: [
{
title: '#',
dataIndex: '',
key:'rowIndex',
width:60,
align:"center",
customRender:function (t,r,index) {
return parseInt(index)+1;
}
},
{
title:'工序',
align:"center",
dataIndex: 'processId_dictText'
},
{
title:'动作',
align:"center",
dataIndex: 'actionId_dictText'
},
{
title: '操作',
dataIndex: 'action',
align:"center",
fixed:"right",
width:147,
scopedSlots: { customRender: 'action' }
}
],
url: {
list: "/pro/zyProcessAction/list1",
delete: "/pro/zyProcessAction/delete",
deleteBatch: "/pro/zyProcessAction/deleteBatch",
exportXlsUrl: "/pro/zyProcessAction/exportXls",
importExcelUrl: "pro/zyProcessAction/importExcel",
},
dictOptions:{},
superFieldList:[],
}
},
created() {
this.getSuperFieldList();
},
computed: {
importExcelUrl: function(){
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
},
},
methods: {
edit (record) {
this.id = record;
this.queryParam.processId=this.id;
console.log("燕慧森1号")
this.url.list='/pro/zyProcessAction/list1'
this.loadData();
this.visible = true;
},
initDictConfig(){
},
getSuperFieldList(){
let fieldList=[];
fieldList.push({type:'string',value:'processId',text:'工序id',dictCode:'zy_process,process_name,id'})
fieldList.push({type:'string',value:'actionId',text:'动作id',dictCode:'zy_cloth_action,descr,nums'})
this.superFieldList = fieldList
}
}
}
</script>
<style scoped>
@import '~@assets/less/common.less';
</style>

@ -35,12 +35,24 @@
this.$refs.realForm.add();
})
},
add1 (id) {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.add1(id);
})
},
edit (record) {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.edit(record);
})
},
edit1 (record,code) {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.edit1(record,code);
})
},
close () {
this.$emit('close');
this.visible = false;

@ -0,0 +1,215 @@
<template>
<a-card :bordered="false">
<!-- 查询区域 -->
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<!-- <a-col :sm="5">-->
<!-- <a-form-model-item label="工序" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="annual" >-->
<!-- <a-input v-model="queryParam.processId" placeholder="请输入工序" ></a-input>-->
<!-- </a-form-model-item>-->
<!-- </a-col>-->
<a-col :sm="5">
<a-form-model-item label="设备" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="organizer">
<a-input v-model="queryParam.fabricId" placeholder="请输入辅料名称" ></a-input>
</a-form-model-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
<!-- <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>-->
</span>
</a-col>
</a-row>
</a-form>
</div>
<!-- 查询区域-END -->
<!-- 操作按钮区域 -->
<div class="table-operator">
<a-button @click="handleAdd1(id)" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('zy_process_fabric')">导出</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>
<!-- 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>
<a-table
ref="table"
size="middle"
:scroll="{x:true}"
bordered
rowKey="id"
:columns="columns"
:dataSource="dataSource"
:pagination="ipagination"
:loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
class="j-table-force-nowrap"
@change="handleTableChange">
<template slot="htmlSlot" slot-scope="text">
<div v-html="text"></div>
</template>
<template slot="imgSlot" slot-scope="text">
<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;"/>
</template>
<template slot="fileSlot" slot-scope="text">
<span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
<a-button
v-else
:ghost="true"
type="primary"
icon="download"
size="small"
@click="downloadFile(text)">
下载
</a-button>
</template>
<span slot="action" slot-scope="text, record">
<a @click="handleEdit1(record,code)">编辑</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>
</span>
</a-table>
</div>
<zy-process-fabric-modal ref="modalForm" @ok="modalFormOk"></zy-process-fabric-modal>
</a-card>
</template>
<script>
import '@/assets/less/TableExpand.less'
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import ZyProcessFabricModal from '@/views/cloths/modules/ZyProcessFabricModal'
import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
export default {
name: 'ZyProcessFabricList',
mixins:[JeecgListMixin, mixinDevice],
components: {
ZyProcessFabricModal
},
data () {
return {
code:1,
id:'',
labelCol: {
xs: { span: 24 },
sm: { span: 5 },
},
wrapperCol: {
xs: { span: 24 },
sm: { span: 16 },
},
description: 'zy_process_fabric管理页面',
//
columns: [
{
title: '#',
dataIndex: '',
key:'rowIndex',
width:60,
align:"center",
customRender:function (t,r,index) {
return parseInt(index)+1;
}
},
{
title:'工序编号',
align:"center",
dataIndex: 'processId'
},
{
title:'工序',
align:"center",
dataIndex: 'processId_dictText'
},
{
title:'辅料编号',
align:"center",
dataIndex: 'fabricId'
},
{
title:'辅料',
align:"center",
dataIndex: 'fabricId_dictText'
},
{
title: '操作',
dataIndex: 'action',
align:"center",
fixed:"right",
width:147,
scopedSlots: { customRender: 'action' }
}
],
url: {
list: "/pro/zyProcessFabric/list1",
delete: "/pro/zyProcessFabric/delete",
deleteBatch: "/pro/zyProcessFabric/deleteBatch",
exportXlsUrl: "/pro/zyProcessFabric/exportXls",
importExcelUrl: "pro/zyProcessFabric/importExcel",
},
dictOptions:{},
superFieldList:[],
}
},
created() {
this.getSuperFieldList();
},
computed: {
importExcelUrl: function(){
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
},
},
methods: {
edit (record) {
this.id = record;
this.queryParam.processId=this.id;
console.log("燕慧森1号")
this.loadData();
this.visible = true;
},
initDictConfig(){
},
getSuperFieldList(){
let fieldList=[];
fieldList.push({type:'string',value:'processId',text:'工序',dictCode:'zy_process,process_name,id'})
fieldList.push({type:'string',value:'fabricId',text:'辅料',dictCode:'zy_fabric,name,id'})
this.superFieldList = fieldList
}
}
}
</script>
<style scoped>
@import '~@assets/less/common.less';
</style>

@ -0,0 +1,218 @@
<template>
<a-card :bordered="false">
<!-- 查询区域 -->
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<!-- <a-col :sm="5">-->
<!-- <a-form-model-item label="工序" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="annual" >-->
<!-- <a-input v-model="queryParam.processId" placeholder="请输入工序" ></a-input>-->
<!-- </a-form-model-item>-->
<!-- </a-col>-->
<a-col :sm="5">
<a-form-model-item label="设备" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="organizer">
<a-input v-model="queryParam.machineId" placeholder="请输入设备名称" ></a-input>
</a-form-model-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
<!-- <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>-->
</span>
</a-col>
</a-row>
</a-form>
</div>
<!-- 查询区域-END -->
<!-- 操作按钮区域 -->
<div class="table-operator">
<a-button @click="handleAdd1(id)" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('zy_process_machine')">导出</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>
<!-- 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>
<a-table
ref="table"
size="middle"
:scroll="{x:true}"
bordered
rowKey="id"
:columns="columns"
:dataSource="dataSource"
:pagination="ipagination"
:loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
class="j-table-force-nowrap"
@change="handleTableChange">
<template slot="htmlSlot" slot-scope="text">
<div v-html="text"></div>
</template>
<template slot="imgSlot" slot-scope="text">
<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;"/>
</template>
<template slot="fileSlot" slot-scope="text">
<span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
<a-button
v-else
:ghost="true"
type="primary"
icon="download"
size="small"
@click="downloadFile(text)">
下载
</a-button>
</template>
<span slot="action" slot-scope="text, record">
<a @click="handleEdit1(record,code)">编辑</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>
</span>
</a-table>
</div>
<zy-process-machine-modal ref="modalForm" @ok="modalFormOk"></zy-process-machine-modal>
</a-card>
</template>
<script>
import '@/assets/less/TableExpand.less'
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import ZyProcessMachineModal from '@/views/cloths/modules/ZyProcessMachineModal'
import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
export default {
name: 'ZyProcessMachineList',
mixins:[JeecgListMixin, mixinDevice],
components: {
ZyProcessMachineModal
},
data () {
return {
code:1,
labelCol: {
xs: { span: 24 },
sm: { span: 7 },
},
wrapperCol: {
xs: { span: 24 },
sm: { span: 12 },
md: { span: 10 },
},
id:'',
description: 'zy_process_machine管理页面',
//
columns: [
{
title: '#',
dataIndex: '',
key:'rowIndex',
width:60,
align:"center",
customRender:function (t,r,index) {
return parseInt(index)+1;
}
},
{
title:'工序编号',
align:"center",
dataIndex: 'processId'
},
{
title:'工序',
align:"center",
dataIndex: 'processId_dictText'
},
{
title:'设备编号',
align:"center",
dataIndex: 'machineId'
},
{
title:'设备名称',
align:"center",
dataIndex: 'machineId_dictText'
},
{
title: '操作',
dataIndex: 'action',
align:"center",
fixed:"right",
width:147,
scopedSlots: { customRender: 'action' }
}
],
url: {
list: "/pro/zyProcessMachine/list1",
delete: "/pro/zyProcessMachine/delete",
deleteBatch: "/pro/zyProcessMachine/deleteBatch",
exportXlsUrl: "/pro/zyProcessMachine/exportXls",
importExcelUrl: "pro/zyProcessMachine/importExcel",
},
dictOptions:{},
superFieldList:[],
}
},
created() {
this.getSuperFieldList();
},
computed: {
importExcelUrl: function(){
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
},
},
methods: {
edit (record) {
this.id = record;
this.queryParam.processId=this.id;
console.log("燕慧森1号")
this.loadData();
this.visible = true;
},
initDictConfig(){
},
getSuperFieldList(){
let fieldList=[];
fieldList.push({type:'string',value:'processId',text:'工序',dictCode:'zy_process,process_name,id'})
fieldList.push({type:'string',value:'machineId',text:'机器',dictCode:'zy_device,code,id'})
this.superFieldList = fieldList
}
}
}
</script>
<style scoped>
@import '~@assets/less/common.less';
</style>

@ -0,0 +1,61 @@
<template>
<j-modal
:title="title"
:width="width"
:visible="visible"
switchFullscreen
@ok="handleOk"
:okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
@cancel="handleCancel"
cancelText="关闭">
<zy-process-action-list ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></zy-process-action-list>
</j-modal>
</template>
<script>
// import ZyProcessForm from './ZyProcessForm'
import ZyProcessActionList from "./ZyProcessActionList";
export default {
name: 'ZyProcessModal1',
components: {
ZyProcessActionList
},
data () {
return {
title:'',
width:800,
visible: false,
disableSubmit: false
}
},
methods: {
add () {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.add();
})
},
edit (id) {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.edit(id);
})
},
close () {
this.$emit('close');
this.visible = false;
},
handleOk () {
this.$refs.realForm.submitForm();
},
submitCallback(){
this.$emit('ok');
this.visible = false;
},
handleCancel () {
this.close()
}
}
}
</script>

@ -0,0 +1,63 @@
<template>
<j-modal
:title="title"
:width="width"
:visible="visible"
switchFullscreen
@ok="handleOk"
:okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
@cancel="handleCancel"
cancelText="关闭">
<zy-process-machine-list ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></zy-process-machine-list>
</j-modal>
</template>
<script>
// import ZyProcessForm from './ZyProcessForm'
// import ZyProcessActionList from "./ZyProcessActionList";
import ZyProcessMachineList from "@views/process/modules/ZyProcessMachineList";
export default {
name: 'ZyProcessModal1',
components: {
ZyProcessMachineList,
// ZyProcessActionList
},
data () {
return {
title:'',
width:800,
visible: false,
disableSubmit: false
}
},
methods: {
add () {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.add();
})
},
edit (id) {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.edit(id);
})
},
close () {
this.$emit('close');
this.visible = false;
},
handleOk () {
this.$refs.realForm.submitForm();
},
submitCallback(){
this.$emit('ok');
this.visible = false;
},
handleCancel () {
this.close()
}
}
}
</script>

@ -0,0 +1,63 @@
<template>
<j-modal
:title="title"
:width="width"
:visible="visible"
switchFullscreen
@ok="handleOk"
:okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
@cancel="handleCancel"
cancelText="关闭">
<zy-process-fabric-list ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></zy-process-fabric-list>
</j-modal>
</template>
<script>
// import ZyProcessForm from './ZyProcessForm'
// import ZyProcessActionList from "./ZyProcessActionList";
import ZyProcessFabricList from "@views/process/modules/ZyProcessFabricList";
export default {
name: 'ZyProcessModal1',
components: {
ZyProcessFabricList
// ZyProcessActionList
},
data () {
return {
title:'',
width:800,
visible: false,
disableSubmit: false
}
},
methods: {
add () {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.add();
})
},
edit (id) {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.edit(id);
})
},
close () {
this.$emit('close');
this.visible = false;
},
handleOk () {
this.$refs.realForm.submitForm();
},
submitCallback(){
this.$emit('ok');
this.visible = false;
},
handleCancel () {
this.close()
}
}
}
</script>

@ -0,0 +1,64 @@
<template>
<j-modal
:title="title"
:width="width"
:visible="visible"
switchFullscreen
@ok="handleOk"
:okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
@cancel="handleCancel"
cancelText="关闭">
<zy-operationtool-list ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></zy-operationtool-list>
</j-modal>
</template>
<script>
// import ZyProcessForm from './ZyProcessForm'
// import ZyProcessActionList from "./ZyProcessActionList";
import ZyOperationtoolList from "@/views/process/modules/ZyOperationtoolList";
export default {
name: 'ZyProcessModal1',
components: {
ZyOperationtoolList,
// ZyProcessActionList
},
data () {
return {
title:'',
width:800,
visible: false,
disableSubmit: false
}
},
methods: {
add () {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.add();
})
},
edit (id) {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.edit(id);
})
},
close () {
this.$emit('close');
this.visible = false;
},
handleOk () {
this.$refs.realForm.submitForm();
},
submitCallback(){
this.$emit('ok');
this.visible = false;
},
handleCancel () {
this.close()
}
}
}
</script>

@ -0,0 +1,62 @@
<template>
<j-modal
:title="title"
:width="width"
:visible="visible"
switchFullscreen
@ok="handleOk"
:okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
@cancel="handleCancel"
cancelText="关闭">
<zy-process-accessories-list ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></zy-process-accessories-list>
</j-modal>
</template>
<script>
import ZyProcessAccessoriesList from "@views/process/modules/ZyProcessAccessoriesList";
export default {
name: 'ZyProcessModal1',
components: {
ZyProcessAccessoriesList,
// ZyProcessActionList
},
data () {
return {
title:'',
width:800,
visible: false,
disableSubmit: false
}
},
methods: {
add () {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.add();
})
},
edit (id) {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.edit(id);
})
},
close () {
this.$emit('close');
this.visible = false;
},
handleOk () {
this.$refs.realForm.submitForm();
},
submitCallback(){
this.$emit('ok');
this.visible = false;
},
handleCancel () {
this.close()
}
}
}
</script>

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save