Skip to content

P
pda-ui
Commit 8a66b8a5 authored by zhuli's avatar zhuli
Browse files
Options

Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-ui into dev

parents da259226 f5b921bb
Hide whitespace changes
Inline Side-by-side
Showing with 157 additions and 146 deletions
src/api/mes/cal/team.js
View file @ 8a66b8a5
import request from '@/utils/request'
// 查询工作单元列表
export function listTeam(query) {
export function listTeam (query) {
return request({
url: "/md/cal/workunit/unSelectList",
method: "get",
......@@ -10,15 +10,15 @@ export function listTeam(query) {
}
// 查询工作单元列表
export function listAllTeam() {
export function listAllTeam () {
return request({
url: "/md/cal/workunit/calWorkunitList",
url: "/md/cal/workunit/treeMenu",
method: "get",
});
}
// 查询班组详细
export function getTeam(teamId) {
export function getTeam (teamId) {
return request({
url: '/mes/cal/team/' + teamId,
method: 'get'
......@@ -26,7 +26,7 @@ export function getTeam(teamId) {
}
// 新增班组
export function addTeam(data) {
export function addTeam (data) {
return request({
url: '/mes/cal/team',
method: 'post',
......@@ -35,7 +35,7 @@ export function addTeam(data) {
}
// 修改班组
export function updateTeam(data) {
export function updateTeam (data) {
return request({
url: '/mes/cal/team',
method: 'put',
......@@ -44,7 +44,7 @@ export function updateTeam(data) {
}
// 删除班组
export function delTeam(teamId) {
export function delTeam (teamId) {
return request({
url: '/mes/cal/team/' + teamId,
method: 'delete'
......
src/components/workstationSelect/simpletableSingle.vue
View file @ 8a66b8a5
<template>
<el-dialog
title="工作中心选择"
v-if="showFlag"
:visible.sync="showFlag"
:modal="false"
width="80%"
center
>
<el-form
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="90px"
>
<el-dialog title="工作中心选择" v-if="showFlag" :visible.sync="showFlag" :modal="false" width="80%" center>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
<el-row>
<el-col :span="7">
<el-form-item
label="工作中心编号"
label-width="120"
prop="workstationCode"
>
<el-input
v-model="queryParams.workstationCode"
placeholder="请输入工作中心编号"
clearable
@keyup.enter.native="handleQuery"
/>
<el-form-item label="工作中心编号" label-width="120" prop="workstationCode">
<el-input v-model="queryParams.workstationCode" placeholder="请输入工作中心编号" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
</el-col>
<el-col :span="7">
<el-form-item label="所属工序" prop="processId">
<el-select v-model="queryParams.processId" placeholder="请选择工序">
<el-option
v-for="item in processOptions"
:key="item.processId"
:label="item.processName"
:value="item.processId"
></el-option>
</el-select>
<el-form-item label="工作中心名称" label-width="120" prop="workstationName">
<el-input v-model="queryParams.workstationName" placeholder="请输入工作中心编号" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="所属工序" label-width="120" prop="processName">
<el-input v-model="queryParams.processName" placeholder="请输入工作中心编号" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
</el-col>
<el-col :span="7">
<el-form-item label="所在车间" prop="workshopName">
<el-select
v-model="queryParams.workshopId"
placeholder="请选择车间"
>
<el-option
v-for="item in workshopOptions"
:key="item.workshopId"
:label="item.workshopName"
:value="item.workshopId"
></el-option>
<el-select v-model="queryParams.workshopId" placeholder="请选择车间">
<el-option v-for="item in workshopOptions" :key="item.workshopId" :label="item.workshopName"
:value="item.workshopId"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="3">
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24"> </el-col>
</el-row>
</el-form>
<el-table
v-loading="loading"
:data="workstationList"
@current-change="handleCurrent"
@row-dblclick="handleRowDbClick"
>
<el-table v-loading="loading" :data="workstationList" @current-change="handleCurrent"
@row-dblclick="handleRowDbClick">
<el-table-column width="55" align="center">
<template v-slot="scope">
<el-radio
v-model="selectedWorkstationId"
:label="scope.row.workstationId"
@change="handleRowChange(scope.row)"
>{{ "" }}</el-radio
>
<el-radio v-model="selectedWorkstationId" :label="scope.row.workstationId"
@change="handleRowChange(scope.row)">{{ "" }}</el-radio>
</template>
</el-table-column>
<el-table-column label="工作中心编号" align="center" prop="workstationCode">
</el-table-column>
<el-table-column
label="工作中心名称"
align="center"
prop="workstationName"
/>
<el-table-column
label="工作中心地点"
align="center"
prop="workstationAddress"
/>
<el-table-column
label="所在车间名称"
align="center"
prop="workshopName"
/>
<el-table-column label="工作中心名称" align="center" prop="workstationName" />
<el-table-column label="工作中心地点" align="center" prop="workstationAddress" />
<el-table-column label="所在车间名称" align="center" prop="workshopName" />
<el-table-column label="所属工序" align="center" prop="processName" />
<el-table-column label="标准工时" align="center" prop="stdWorkingTime" />
<el-table-column label="备注" align="center" prop="remark" />
</el-table>
<pagination
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="confirmSelect">确 定</el-button>
<el-button @click="showFlag = false">取 消</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</template>
......@@ -136,7 +71,7 @@ import {
addWorkstation,
updateWorkstation,
} from "@/api/mes/md/workstation";
import { listAllProcess } from "@/api/mes/pro/process";
// import { listAllProcess } from "@/api/mes/pro/process";
import { listAllWorkshop } from "@/api/mes/md/workshop";
export default {
name: "WorkstationSelect",
......@@ -226,16 +161,16 @@ export default {
this.workshopOptions = response.data;
});
},
//查询工序信息
getProcess() {
listAllProcess().then((response) => {
this.processOptions = response.data;
});
},
// //查询工序信息
// getProcess() {
// listAllProcess().then((response) => {
// this.processOptions = response.data;
// });
// },
// 取消按钮
cancel() {
this.open = false;
this.reset();
this.showFlag=false;
this.resetQuery();
},
// 表单重置
reset() {
......@@ -267,6 +202,27 @@ export default {
},
/** 重置按钮操作 */
resetQuery() {
this.queryParams = {
pageNum: 1,
pageSize: 10,
workstationId: null,
workstationCode: null,
workstationName: null,
workstationAddress: null,
workshopId: null,
workshopCode: null,
workshopName: null,
processId: null,
processCode: null,
processName: null,
enableFlag: "Y",
remark: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null,
stdWorkingTime: null,
};
this.resetForm("queryForm");
this.handleQuery();
},
......
src/views/mes/cal/calendar/index.vue
View file @ 8a66b8a5
<template>
<div class="app-container">
<el-tabs type="border-card">
<el-tab-pane label="首页">
<!-- <el-tab-pane label="首页">
<CalendarTypeView></CalendarTypeView>
</el-tab-pane>
</el-tab-pane> -->
<el-tab-pane label="工作单元">
<TeamView></TeamView>
</el-tab-pane>
......@@ -15,11 +15,12 @@
</template>
<script>
import CalendarTypeView from "./calendarType.vue"
// import CalendarTypeView from "./calendarType.vue"
import TeamView from "./team.vue"
import UserView from "./person.vue"
export default {
components:{CalendarTypeView,TeamView,UserView},
// components:{CalendarTypeView,TeamView,UserView},
components:{TeamView,UserView},
data(){
return {
......
src/views/mes/cal/calendar/team.vue
View file @ 8a66b8a5
<template>
<div class="app-container">
<el-container>
<el-aside width="200px">
<el-radio-group v-model="selectedType" class="x-fillitem el-group-list" @change="onSelected">
<el-radio-button
v-for="(item, index) in teamList"
:key="index"
:label="item"
>{{item}}</el-radio-button>
</el-radio-group>
<el-container class="el-container-cal">
<el-aside width="200px" class="el-aside-cal">
<el-tree :data="teamList" :props="defaultProps" :expand-on-click-node="false" class="el-tree-pro" node-key="id"
:filter-node-method="filterNode" ref="tree" :default-expanded-keys="defaultExpandedKeys" @node-click="onSelected" >
<span slot-scope="{ data }" :title="data.label"
>{{ data.label }}</span>
</el-tree>
</el-aside>
<el-main>
<el-calendar v-loading="loading" v-model="date">
......@@ -59,7 +57,12 @@ export default {
data(){
return {
// 遮罩层
loading: true,
loading: false,
defaultExpandedKeys: [],
defaultProps: {
children: "children",
label: "label",
},
date: new Date(),
teamList: [], //所有的班组
holidayList:[],//假日
......@@ -85,13 +88,21 @@ export default {
}
},
created() {
this.getList();
// this.getList();
this.getTeams();
},
methods:{
// 筛选节点
filterNode(value, data) {
if (!value) return true;
return data.label.indexOf(value) !== -1;
},
getTeams(){
listAllTeam().then(response =>{
this.teamList = response.data;
if(response.data.length > 0) {
this.defaultExpandedKeys.push(response.data[0]?.id)
}
});
},
/** 查询节假日设置列表 */
......@@ -118,11 +129,13 @@ export default {
});
},
//点击班组类型
onSelected(teamId){
this.loading = true;
this.queryParams.workunitName = teamId;
this.queryParams.theDay = this.date.getFullYear()+'-'+(this.date.getMonth()+1)+'-'+this.date.getDate();
this.getList()
onSelected(data){
if(data['level'] === 4){
this.loading = true;
this.queryParams.workunitName = data['label'];
this.queryParams.theDay = this.date.getFullYear()+'-'+(this.date.getMonth()+1)+'-'+this.date.getDate();
this.getList()
}
},
isFestival(slotDate, slotData) {
let solarDayArr = slotData.day.split('-');
......@@ -156,6 +169,15 @@ export default {
}
</script>
<style>
.el-aside-cal {
max-height: 700px;
padding: 0;
}
.el-aside-cal .el-tree-node__content span {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.grid-content{
padding: 5px 0;
}
......
src/views/mes/md/product/index.vue
View file @ 8a66b8a5
......@@ -7,9 +7,12 @@
<el-input v-model="itemTypeName" placeholder="请输入分类名称" clearable size="small" prefix-icon="el-icon-search"
style="margin-bottom: 20px" />
</div>
<div class="head-container">
<el-tree :data="itemTypeOptions" :props="defaultProps" :expand-on-click-node="false"
:filter-node-method="filterNode" ref="tree" default-expand-all @node-click="handleNodeClick" />
<div class="head-container" style="overflow: auto;">
<el-tree :data="itemTypeOptions" :props="defaultProps" :expand-on-click-node="false" class="el-tree-pro" node-key="id"
:filter-node-method="filterNode" ref="tree" :default-expanded-keys="defaultExpandedKeys" @node-click="handleNodeClick" >
<span slot-scope="{ data }" :title="data.label"
>{{ data.label }}</span>
</el-tree>
</div>
</el-col>
<!--物料数据-->
......@@ -379,6 +382,7 @@ export default {
data() {
return {
activeName: "BaseInfo",
defaultExpandedKeys: [],
// 遮罩层
loading: true,
// 选中数组
......@@ -502,6 +506,9 @@ export default {
getTreeselect() {
treeselect().then((response) => {
this.itemTypeOptions = response.data;
if(response.data.length > 0) {
this.defaultExpandedKeys.push(response.data[0]?.id)
}
});
},
// 筛选节点
......@@ -773,3 +780,14 @@ export default {
},
};
</script>
<style scoped>
.el-tree-pro {
height: 700px;
padding-right: 5px;
}
.el-tree-pro .el-tree-node__content span {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
</style>
\ No newline at end of file
src/views/mes/md/workunit/index.vue
View file @ 8a66b8a5
......@@ -17,6 +17,14 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="工作中心名称" label-width="100px" prop="workstationName">
<el-input
v-model="queryParams.workstationName"
placeholder="请输入工作中心"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="是否启用" prop="enableFlag">
<el-select v-model="queryParams.enableFlag" placeholder="请选择是或否" clearable>
<el-option
......
src/views/mes/pro/scheduleList/index.vue
View file @ 8a66b8a5
......@@ -111,14 +111,14 @@
@click="handleSchedule"
>排程</el-button>
</el-col>
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button
type="primary"
plain
size="mini"
@click="handleSumbmitMakeProduction"
>下达生产</el-button>
</el-col>
</el-col> -->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
......@@ -152,6 +152,8 @@
:show-overflow-tooltip="true"
/>
<el-table-column label="排产数量" align="center" prop="quantity" />
<el-table-column label="可加工数量" align="center" prop="quantityWait"/>
<el-table-column label="已完成数量" align="center" prop="quantityQualify" />
<el-table-column
label="工作中心"
align="center"
......@@ -476,7 +478,7 @@ export default {
pageSize: 10,
taskCode: null,
processName: null,
statusArr: ['UN_ASSIGN'],
statusArr: ['PREPARE'],
scheduleStartDate: null,
scheduleEndDate: null,
},
......@@ -571,6 +573,9 @@ export default {
delete params.scheduleEndDate
const response = await getListData(params)
this.maintenanceList = response.rows;
this.maintenanceList.forEach(s=>{
s.quantityWait = (s.quantity-s.quantityQualify)|0;
})
this.total = response.total;
this.loading = false;
},
......
src/views/mes/pro/workorder/indexApply.vue
View file @ 8a66b8a5
......@@ -32,10 +32,10 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="工单名称" prop="workorderName">
<el-form-item label="工单编码" prop="workorderCode">
<el-input
v-model="queryParams.workorderName"
placeholder="请输入工单名称"
v-model="queryParams.workorderCode"
placeholder="请输入工单编码"
clearable
@keyup.enter.native="handleQuery"
/>
......
src/views/mes/pro/workorder/proofingInfo.vue
View file @ 8a66b8a5
......@@ -327,8 +327,10 @@ import {
getMakeWorkorderCode,
makeSubmitWorkorder
} from "@/api/mes/pro/workorder";
var isRefresh = false;
export default {
components: {
isRefresh,
ProogingProcess,
ProogingBom,
WorkOrderSale,
......
src/views/system/user/index.vue
View file @ 8a66b8a5
......@@ -136,7 +136,6 @@
<el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="50" align="center" />
<el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
<el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
<el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
<el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment