班组管理问题修改 12.14

zhc4dev
zhc077 2 years ago
parent 14cbd6f53d
commit ceb101e904
  1. 213
      ant-design-vue-jeecg/src/views/erp/tool/ZyToolListRef.vue
  2. 71
      ant-design-vue-jeecg/src/views/team/modules/StationToolModal.vue

@ -0,0 +1,213 @@
<template>
<a-card :bordered="false">
<!-- 查询区域 -->
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
</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('zy_tool')">导出</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-dropdown>-->
<!-- <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>-->
<!-- <a-menu slot="overlay">-->
<!-- <a-menu-item>-->
<!-- <a @click="handleDetail(record)">详情</a>-->
<!-- </a-menu-item>-->
<!-- <a-menu-item>-->
<!-- <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">-->
<!-- <a>删除</a>-->
<!-- </a-popconfirm>-->
<!-- </a-menu-item>-->
<!-- </a-menu>-->
<!-- </a-dropdown>-->
<!-- </span>-->
</a-table>
</div>
<!-- <zy-tool-modal ref="modalForm" @ok="modalFormOk"></zy-tool-modal>-->
</a-card>
</template>
<script>
import '@/assets/less/TableExpand.less'
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import ZyToolModal from './modules/ZyToolModal'
export default {
name: 'ZyToolList',
mixins:[JeecgListMixin, mixinDevice],
components: {
ZyToolModal
},
data () {
return {
description: 'zy_tool管理页面',
//
columns: [
// {
// title: '#',
// dataIndex: '',
// key:'rowIndex',
// width:60,
// align:"center",
// customRender:function (t,r,index) {
// return parseInt(index)+1;
// }
// },
{
title:'工具编号',
align:"center",
dataIndex: 'nums'
},
{
title:'工具名称',
align:"center",
dataIndex: 'name'
},
{
title:'功能',
align:"center",
dataIndex: 'function'
},
{
title:'规格',
align:"center",
dataIndex: 'specs'
},
// {
// title:'',
// align:"center",
// dataIndex: 'scope'
// },
// {
// title:'',
// align:"center",
// dataIndex: 'workshopSection'
// },
// {
// title:' ( 0 1 2 3 4 )',
// align:"center",
// dataIndex: 'status'
// },
// {
// title:'',
// align:"center",
// dataIndex: 'qrode'
// },
// {
// title: '',
// dataIndex: 'action',
// align:"center",
// fixed:"right",
// width:147,
// scopedSlots: { customRender: 'action' }
// }
],
url: {
list: "/tool/zyTool/list",
delete: "/tool/zyTool/delete",
deleteBatch: "/tool/zyTool/deleteBatch",
exportXlsUrl: "/tool/zyTool/exportXls",
importExcelUrl: "tool/zyTool/importExcel",
},
dictOptions:{},
superFieldList:[],
}
},
created() {
this.getSuperFieldList();
},
computed: {
importExcelUrl: function(){
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
},
},
methods: {
initDictConfig(){
},
getSuperFieldList(){
let fieldList=[];
fieldList.push({type:'string',value:'name',text:'工具名称'})
fieldList.push({type:'string',value:'nums',text:'工具编号'})
fieldList.push({type:'string',value:'function',text:'功能'})
fieldList.push({type:'string',value:'specs',text:'规格'})
fieldList.push({type:'string',value:'scope',text:'适用范围'})
fieldList.push({type:'string',value:'workshopSection',text:'责人工段'})
fieldList.push({type:'string',value:'status',text:'状态 ( 0 在库、1 在用、2 遗失 、3 损坏、4 报废)'})
fieldList.push({type:'string',value:'qrode',text:'二维码'})
this.superFieldList = fieldList
}
}
}
</script>
<style scoped>
@import '~@assets/less/common.less';
</style>

@ -1,44 +1,35 @@
<template>
<j-modal
:title="title"
:width="700"
:width="900"
:visible="visible"
:confirmLoading="confirmLoading"
switchFullscreen
@ok="handleOk"
@ok="handleOk2(record)"
@cancel="handleCancel"
cancelText="关闭">
<a-spin :spinning="confirmLoading">
<a-form-model ref="form" :model="model" :rules="validatorRules">
<!-- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="stationId" label="车间工位编号">-->
<!-- <a-input placeholder="车间工位编号" v-model="model.stationId"/>-->
<!--&lt;!&ndash; <j-select-depart placeholder="请选择工位" v-model="model.stationId"/>&ndash;&gt;-->
<!-- <a-spin :spinning="confirmLoading">-->
<!-- <a-form-model ref="form" :model="model" :rules="validatorRules">-->
<!-- <a-form-model-item prop="toolsId" label="工具">-->
<!-- <j-dict-select-tag v-model="model.toolsId" dictCode="zy_tool,name,id" placeholder="请选择工具" />-->
<!-- </a-form-model-item>-->
<!-- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="stationId" label="工位ID">-->
<!-- <a-input placeholder="请输入工位ID" v-model="model.stationId" />-->
<!-- </a-form-model-item>-->
<!-- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolsId" label="工具ID">-->
<!-- <a-input placeholder="请输入工具ID" v-model="model.toolsId" />-->
<!-- </a-form-model-item>-->
<a-form-model-item prop="toolsId" label="工具">
<!-- <a-input placeholder="请输入部门编号" v-model="model.departId"/>-->
<!-- <j-select-depart placeholder="请选择工具" v-model="model.toolsId"/>-->
<j-dict-select-tag v-model="model.toolsId" dictCode="zy_tool,name,id" placeholder="请选择工具" />
</a-form-model-item>
</a-form-model>
</a-spin>
<!-- </a-form-model>-->
<!-- </a-spin>-->
<ZyToolList ref="modalForm2"></ZyToolList>
</j-modal>
</template>
<script>
import {httpAction} from '@/api/manage'
import moment from "moment"
import ZyToolList from "@views/erp/tool/ZyToolListRef"
export default {
name: "StationToolModal",
components: {
ZyToolList
},
data() {
return {
title: "操作",
@ -91,6 +82,40 @@ export default {
this.visible = false;
this.$refs.form.clearValidate();
},
handleOk2(record) {
alert(record);
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';
}
console.log("----------the add() model:", this.model);
this.model.stationId =
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;
that.close();
})
// } else {
// return false;
// }
// })
},
handleOk() {
const that = this;
//
@ -127,8 +152,6 @@ export default {
handleCancel() {
this.close()
},
}
}
</script>

Loading…
Cancel
Save