Skip to content

P
pda-ui
Commit f5b921bb authored by 沈翠玲's avatar 沈翠玲
Browse files
Options

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

parents 2eaf1cbf a13e1e25
Show whitespace changes
Inline Side-by-side
Showing with 80 additions and 115 deletions
src/components/workstationSelect/simpletableSingle.vue
View file @ f5b921bb
<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-col>
<el-col :span="7">
<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-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/md/workunit/index.vue
View file @ f5b921bb
......@@ -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 @ f5b921bb
......@@ -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>
......
src/views/mes/pro/workorder/indexApply.vue
View file @ f5b921bb
......@@ -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 @ f5b921bb
......@@ -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 @ f5b921bb
......@@ -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