Skip to content

M
mes-ui
Commit 111e45c8 authored by tanjunxin's avatar tanjunxin
Browse files
Options

fix: 1.客户物料对照接口查询字段优化; 2.项目标题更改; 3.领料申请新增弹窗优化;

parent c9a5a0fc
Hide whitespace changes
Inline Side-by-side
Showing with 93 additions and 80 deletions
src/components/workstationSelect/simpletableSingle.vue
View file @ 111e45c8
......@@ -2,36 +2,38 @@
<el-dialog title="工作中心选择" v-if="showFlag" :visible.sync="showFlag" :modal="false" width="80%" center>
<el-form :model="queryParams" @submit.native.prevent ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
<el-row>
<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-form-item label="工作中心名称" label-width="120" prop="workstationName">
<el-input v-model="queryParams.workstationName" placeholder="请输入工作中心编号" clearable
<el-input v-model="queryParams.workstationName" placeholder="请输入工作中心名称" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="工作单元名称" label-width="120" prop="workunitName">
<el-input v-model="queryParams.workunitName" 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
<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>
</el-form-item>
<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-form-item>
</el-row>
<el-row>
<el-col :span="24"> </el-col>
......@@ -58,7 +60,7 @@
@pagination="getList" />
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="confirmSelect">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button @click="showFlag = false">取 消</el-button>
</div>
</el-dialog>
</template>
......@@ -119,6 +121,7 @@ export default {
processName: null,
enableFlag: null,
stdWorkingTime: null,
workunitName: this.workunitName,
},
// 表单参数
form: {},
......@@ -133,27 +136,28 @@ export default {
type: Number | undefined,
default: undefined,
},
workunitName: {
type: String,
default: ""
},
},
created() {
this.getList();
this.getWorkshops();
this.getProcess();
// this.getProcess();
},
watch: {
processId: {
handler(val) {
this.queryParams.processId = val;
showFlag: {
handler(newName) {
this.selectedWorkstationId = null
this.selectedRows = []
this.queryParams.processId = this.processId;
this.queryParams.workstationCode = this.workstationCode;
this.queryParams.workunitName = this.workunitName;
this.getList();
},
immediate: true,
},
workstationCode: {
handler(val) {
this.queryParams.workstationCode = val;
this.getList();
},
immediate: true,
},
immediate: true
}
},
methods: {
/** 查询工作中心列表 */
......
src/views/mes/pro/ClientItemRelation/index.vue
View file @ 111e45c8
......@@ -31,8 +31,8 @@
<el-button icon="el-icon-refresh" size="mini" @click="getList(0)">重置</el-button>
</el-form-item>
</el-form>
<el-table v-loading="tableLoading" :data="page.rows" >
<el-table-column label="客户编码" prop="clientCode" show-overflow-tooltip/>
<el-table-column label="客户名称" prop="clientName" show-overflow-tooltip/>
......@@ -53,13 +53,13 @@
<el-table-column label="更新人" prop="updateBy" width="80"/>
<el-table-column label="更新时间" prop="updateTime" width="100"/>
</el-table>
<pagination v-show="page.total>0" :total="+page.total" :page.sync="pageReq.current" :limit.sync="pageReq.size" @pagination="getList"/>
<pagination v-show="page.total>0" :total="+page.total" :page.sync="pageReq.pageNum" :limit.sync="pageReq.pageSize" @pagination="getList"/>
</div>
</template>
<script>
import {
listClientItem
......@@ -74,8 +74,8 @@
showSearch: true,
tableLoading: false,
pageReq: {
current: 1,
size: 10,
pageNum: 1,
pageSize: 10,
clientName: null,
clientItemCode: null,
clientItemName: null,
......@@ -103,7 +103,7 @@
},
methods: {
getList(num) {
if (num === 1 || num === 0) this.pageReq.current = 1
if (num === 1 || num === 0) this.pageReq.pageNum = 1
if (num === 0) this.$refs.queryForm.resetFields()
this.tableLoading = true
listClientItem(this.pageReq).then(res => this.page = res).finally(() => this.tableLoading = false)
......@@ -114,4 +114,3 @@
},
}
</script>
\ No newline at end of file
src/views/mes/pro/request/components/requestIndex.vue
View file @ 111e45c8
......@@ -20,13 +20,13 @@
<!-- 添加或修改调拨料申请对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row>
<el-row :gutter="10">
<el-col :span="12">
<el-form-item label="产品编码" prop="sapItemCode">
<el-input v-model="form.sapItemCode" placeholder="请输入产品编码">
<el-button slot="append" icon="el-icon-search" @click="handleItemSelect" />
<el-button slot="append" icon="el-icon-search" @click="handleItemSelect('itemSelectRef')" />
</el-input>
<itemSelect ref="brSelectpro" @onSelected="onItemSelect">
<itemSelect ref="itemSelectRef" @onSelected="onItemSelect">
</itemSelect>
</el-form-item>
</el-col>
......@@ -36,25 +36,36 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-row :gutter="10">
<el-col :span="12">
<el-form-item label="工作中心编码" prop="workstationCode">
<el-input disabled v-model="form.workstationCode" placeholder="请输入工作中心编码" />
<el-input v-model="form.workstationCode" placeholder="请输入工作中心编码">
<el-button slot="append" icon="el-icon-search" @click="handleItemSelect('WorkstationSelectrRef')" />
</el-input>
<WorkstationSelect
ref="WorkstationSelectrRef"
:workunitName="form.workunitName"
@onSelected="onWorkstationSelected"
></WorkstationSelect>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="工作单元编码" prop="workunitCode">
<el-input disabled v-model="form.workunitCode" placeholder="请输入工作单元" />
<el-form-item label="工作中心名称" prop="workstationName">
<el-input disabled v-model="form.workstationName" placeholder="请输入工作中心名称" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-row :gutter="10">
<el-col :span="12">
<el-form-item label="工作中心名称" prop="workstationName">
<el-input disabled v-model="form.workstationName" placeholder="请输入工作中心名称" />
</el-form-item>
<el-form-item label="工作单元编码" prop="workunitCode">
<el-input v-model="form.workunitCode" placeholder="请输入工作单元编码">
<el-button slot="append" icon="el-icon-search" @click="handleItemSelect('WorkunitSelectRef')" />
</el-input>
<WorkuintSelect
ref="WorkunitSelectRef"
:workstationName="form.workstationName"
@onSelected="onWorkunitSelect"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="工作单元名称" prop="workunitName">
......@@ -62,9 +73,7 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-row :gutter="10">
<el-col :span="12">
<el-form-item label="申请数量" prop="applyNum">
<el-input-number v-model="form.applyNum" :min="0" />
......@@ -80,7 +89,7 @@
<!--
<!--
<pagination v-show="total > 0 && $attrs.optType !== 'add'" :total="total" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" @pagination="getList" /> -->
</div>
......@@ -88,6 +97,7 @@
<script>
import codeSelect from "./codeSelect.vue";
import WorkuintSelect from "@/components/workunitSelect/single.vue";
import WorkstationSelect from "@/components/workstationSelect/simpletableSingle.vue";
import ItemSelect from "@/components/itemSelect/single.vue";
export default {
......@@ -95,7 +105,7 @@ export default {
dicts: [
"warehouse_desc"
],
components: { ItemSelect, WorkstationSelect, codeSelect },
components: { ItemSelect, WorkuintSelect, WorkstationSelect, codeSelect },
props: {
id: {
type: String,
......@@ -155,7 +165,7 @@ export default {
workunitName: null,
},
// 表单参数
form: {
form: {
itemId: null,
sapItemCode: null,
itemName: null,
......@@ -176,7 +186,6 @@ export default {
},
watch: {
workunitCodes(val) {
console.log('sdfsd', val)
this.form.workunitCode = val
},
workstationCodes(val) {
......@@ -191,12 +200,12 @@ export default {
},
created() {
if (this.$attrs.optType !== 'add') {
this.getList();
this.getList();
}
console.log('workstationCodes', this.workstationCodes)
},
methods: {
/** 新增按钮操作 */
handleAdd() {
this.reset();
......@@ -204,8 +213,8 @@ export default {
this.title = "添加表体";
this.optType = "add";
},
handleItemSelect() {
this.$refs.brSelectpro.showFlag = true;
handleItemSelect(refName) {
this.$refs[refName].showFlag = true;
},
onItemSelect(row) {
console.log('sdaa', row)
......@@ -215,7 +224,18 @@ export default {
this.$set(this.form,'itemName',row.itemName)
}
},
onWorkstationSelected(row){
if(row) {
this.$set(this.form,'workstationCode',row.workstationCode);
this.$set(this.form,'workstationName',row.workstationName);
}
},
onWorkunitSelect(row){
if(row) {
this.$set(this.form,'workunitCode',row.workunitCode);
this.$set(this.form,'workunitName',row.workunitName);
}
},
/**表单提交 */
submitForm() {
if(this.form.sapItemCode==null){
......@@ -268,8 +288,6 @@ export default {
this.open = true;
this.optType = "edit";
},
handleRemove(row, index) {
console.log(row, index)
// this.tags.splice(this.tags.indexOf(tag), 1)
......@@ -288,18 +306,12 @@ export default {
},
// 表单重置
reset() {
this.form.itemId=null;
this.form.sapItemCode=null;
this.form.itemName=null;
this.form.applyNum=null;
//this.resetForm("form");
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
......@@ -313,4 +325,4 @@ export default {
}
}
};
</script>
\ No newline at end of file
</script>
src/views/mes/pro/request/index.vue
View file @ 111e45c8
......@@ -110,7 +110,6 @@
</template>
</el-table-column>
<el-table-column label="编排单号" align="center" prop="arrangeCode" width="150" />
<el-table-column label="创建人" align="center" prop="createBy" />
<el-table-column label="领料方式" align="center" prop="materialType">
<template slot-scope="scope">
......@@ -268,7 +267,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="工单号" prop="workorderCode">
<el-input v-model="form.workorderCode" placeholder="请输入编排单号" >
<el-input v-model="form.workorderCode" placeholder="请输入工单号" >
<el-button slot="append" icon="el-icon-search" @click="$refs.workorderselect.showFlag = true"
:disabled="form.materialRequestId"></el-button>
</el-input>
......@@ -459,20 +458,18 @@ export default {
optType: null,
// 表单校验
rules: {
taskCode: [
{ required: true, message: "任务单号称不能为空", trigger: "blur" }
],
// taskCode: [
// { required: true, message: "任务单号称不能为空", trigger: "blur" }
// ],
arrangeCode: [
{ required: true, message: "编排单号称不能为空", trigger: "blur" }
],
createTime: [
{ required: true, message: "编排单号称不能为空", trigger: "blur" }
],
workorderCode: [
{ required: true, message: "任务单号称不能为空", trigger: "blur" }
{ required: true, message: "申请时间不能为空", trigger: "blur" }
],
// workorderCode: [
// { required: true, message: "工单号称不能为空", trigger: "blur" }
// ],
}
};
......
vue.config.js
View file @ 111e45c8
......@@ -7,7 +7,8 @@ function resolve(dir) {
const CompressionPlugin = require('compression-webpack-plugin')
const name = process.env.VUE_APP_TITLE || 'MES-软件开发记录' // 网页标题
// const name = process.env.VUE_APP_TITLE || 'MES-软件开发记录' // 网页标题
const name = '宝绅-生产执行系统' // 网页标题
const port = process.env.port || process.env.npm_config_port || 80 // 端口
......
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