Skip to content

M
mes-ui
Commit 5dd0e5db authored by 赵汉亭's avatar 赵汉亭
Browse files
Options

工单、生产版本前端修改 工作中心前端修改

parent 9173cd9c
Hide whitespace changes
Inline Side-by-side
Showing with 389 additions and 125 deletions
src/views/mes/md/workstation/index.vue
View file @ 5dd0e5db
...@@ -8,22 +8,45 @@ ...@@ -8,22 +8,45 @@
v-show="showSearch" v-show="showSearch"
label-width="100px" label-width="100px"
> >
<el-form-item label="工作站编码" prop="workstationCode"> <el-row>
<el-col :span="6">
<el-form-item label="工厂" prop="factory">
<el-select
v-model="form.factoryCode"
class="form-item"
clearable
placeholder="请选择工厂"
>
<el-option
v-for="item in factoryCodes"
:key="item.value"
:value="item.value"
:label="item.label"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="工作中心编码" prop="workstationCode">
<el-input <el-input
v-model="queryParams.workstationCode" v-model="queryParams.workstationCode"
placeholder="请输入工作站编码" placeholder="请输入工作中心编码"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="工作站名称" prop="workstationName"> </el-col>
<el-col :span="6">
<el-form-item label="工作中心名称" prop="workstationName">
<el-input <el-input
v-model="queryParams.workstationName" v-model="queryParams.workstationName"
placeholder="请输入工作站名称" placeholder="请输入工作中心名称"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="所在车间名称" prop="workshopName"> <el-form-item label="所在车间名称" prop="workshopName">
<el-select <el-select
v-model="queryParams.workshopId" v-model="queryParams.workshopId"
...@@ -37,6 +60,8 @@ ...@@ -37,6 +60,8 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="所属工序" prop="processName"> <el-form-item label="所属工序" prop="processName">
<el-select v-model="queryParams.processId" placeholder="请选择工序"> <el-select v-model="queryParams.processId" placeholder="请选择工序">
<el-option <el-option
...@@ -47,6 +72,8 @@ ...@@ -47,6 +72,8 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="6">
<el-form-item> <el-form-item>
<el-button <el-button
type="primary" type="primary"
...@@ -59,6 +86,8 @@ ...@@ -59,6 +86,8 @@
>重置</el-button >重置</el-button
> >
</el-form-item> </el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
...@@ -119,27 +148,25 @@ ...@@ -119,27 +148,25 @@
:data="workstationList" :data="workstationList"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column type="selection" width="55" align="center" /> <el-table-column
<el-table-column label="工作站编号" align="center" prop="workstationCode"> label="工作中心编号"
align="center"
prop="workstationCode"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="text" type="text"
@click="handleView(scope.row)" @click="handleView(scope.row)"
v-hasPermi="['mes:md:workstation:query']" v-hasPermi="['md:workstation:query']"
>{{ scope.row.workstationCode }}</el-button >{{ scope.row.workstationCode }}</el-button
> >
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="工作站名称" label="工作中心名称"
align="center" align="center"
prop="workstationName" prop="workstationName"
/> />
<el-table-column
label="工作站地点"
align="center"
prop="workstationAddress"
/>
<el-table-column <el-table-column
label="所在车间名称" label="所在车间名称"
align="center" align="center"
...@@ -167,7 +194,7 @@ ...@@ -167,7 +194,7 @@
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['mes:md:workstation:edit']" v-hasPermi="['md:workstation:edit']"
>修改</el-button >修改</el-button
> >
<el-button <el-button
...@@ -175,7 +202,7 @@ ...@@ -175,7 +202,7 @@
type="text" type="text"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['mes:md:workstation:remove']" v-hasPermi="['md:workstation:remove']"
>删除</el-button >删除</el-button
> >
</template> </template>
...@@ -190,39 +217,83 @@ ...@@ -190,39 +217,83 @@
@pagination="getList" @pagination="getList"
/> />
<!-- 添加或修改工作站对话框 --> <!-- 添加或修改工作中心对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form
class="page-form"
ref="form"
:model="form"
:rules="rules"
label-width="120px"
>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="工作站编号" prop="workstationCode"> <el-form-item label="工厂" prop="factoryCode">
<el-select
v-model="form.factoryCode"
class="form-item"
clearable
placeholder="请选择工厂"
>
<el-option
v-for="item in factoryCodes"
:key="item.value"
:value="item.value"
:label="item.label"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="工作中心编号" prop="workstationCode">
<el-input <el-input
v-model="form.workstationCode" v-model="form.workstationCode"
placeholder="请输入工作站编码" disabled
maxlength="64"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="工作站名称" prop="workstationName"> <el-form-item label="工作中心名称" prop="workstationName">
<el-input <el-input
v-model="form.workstationName" v-model="form.workstationName"
placeholder="请输入工作站名称" placeholder="请输入工作中心名称"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="工作站地点" prop="workstationAddress"> <el-form-item label="工作中心类型" prop="workstationType">
<el-input <el-select
v-model="form.workstationAddress" v-model="form.workstationType"
placeholder="请输入工作站地点" placeholder="请选择工作中心类型"
/> >
<el-option
v-for="dict in dict.type.md_workstation_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="工作中心用途" prop="usageCode">
<el-select
v-model="form.usageCode"
placeholder="请选择工作中心用途"
>
<el-option
v-for="dict in dict.type.md_workstation_usage"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="所在车间" prop="workshopId"> <el-form-item label="所在车间" prop="workshopId">
<el-select style="width:100%;" v-model="form.workshopId" placeholder="请选择车间"> <el-select v-model="form.workshopId" placeholder="请选择车间">
<el-option <el-option
v-for="item in workshopOptions" v-for="item in workshopOptions"
:key="item.workshopId" :key="item.workshopId"
...@@ -232,11 +303,9 @@ ...@@ -232,11 +303,9 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="所属工序" prop="processId"> <el-form-item label="所属工序" prop="processId">
<el-select style="width:100%;" v-model="form.processId" placeholder="请选择工序"> <el-select v-model="form.processId" placeholder="请选择工序">
<el-option <el-option
v-for="item in processOptions" v-for="item in processOptions"
:key="item.processId" :key="item.processId"
...@@ -254,7 +323,103 @@ ...@@ -254,7 +323,103 @@
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8">
<el-col :span="12">
<el-form-item label="负责人" prop="responsiblePerson">
<el-input
v-model="form.nickName"
placeholder="请选择负责人"
readonly="readonly"
>
<el-button
slot="append"
icon="el-icon-search"
@click="handleBrandSelect"
></el-button>
</el-input>
<BrandSelect
ref="brSelect"
@onSelected="onBrandSelected"
></BrandSelect>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="标准值码" prop="standardValueCode">
<el-select
v-model="form.standardValueCode"
placeholder="请选择标准值码"
>
<el-option
v-for="dict in dict.type.standard_value_code"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="加工方式" prop="processingMethod">
<el-select
v-model="form.processingMethod"
placeholder="请选择标准值码"
>
<el-option
v-for="dict in dict.type.process_control_code"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
<!-- 成本中心-待完善为查询接口 -->
<el-col :span="12">
<el-form-item label="成本中心" prop="costCenterCode">
<el-input
v-model="form.costCenterCode"
placeholder="请选择成本中心"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="看机人数" prop="watchingAircraftNum">
<el-input
v-model="form.watchingAircraftNum"
placeholder="请输入看机人数"
type="number"
min="1"
></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="是否倒冲" prop="isBackflush">
<el-radio-group
v-model="form.isBackflush"
disabled
v-if="optType == 'view'"
>
<el-radio
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.value"
>{{ dict.label }}</el-radio
>
</el-radio-group>
<el-radio-group v-model="form.isBackflush" v-else>
<el-radio
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.value"
>{{ dict.label }}</el-radio
>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="是否启用" prop="enableFlag"> <el-form-item label="是否启用" prop="enableFlag">
<el-radio-group <el-radio-group
v-model="form.enableFlag" v-model="form.enableFlag"
...@@ -292,16 +457,16 @@ ...@@ -292,16 +457,16 @@
</el-row> </el-row>
</el-form> </el-form>
<el-divider content-position="center" v-if="form.workstationId != null" <el-divider content-position="center" v-if="form.workstationId != null"
>工作站资源</el-divider >工作中心资源</el-divider
> >
<MachinerySelectSingle <!-- <MachinerySelectSingle
ref="machinerySelect" ref="machinerySelect"
@onSelected="onMachineryAdd" @onSelected="onMachineryAdd"
></MachinerySelectSingle> ></MachinerySelectSingle> -->
<el-row v-if="form.workstationId != null"> <el-row v-if="form.workstationId != null">
<el-col :span="24"> <el-col :span="24">
<el-carousel trigger="click" type="card" :autoplay="false"> <el-carousel trigger="click" type="card" :autoplay="false">
<el-carousel-item> <!-- <el-carousel-item>
<el-card shadow="always" style="width: 450px"> <el-card shadow="always" style="width: 450px">
<div slot="header"> <div slot="header">
<span>设备资源</span> <span>设备资源</span>
...@@ -320,7 +485,7 @@ ...@@ -320,7 +485,7 @@
style="align: center" style="align: center"
></WorkStationMachine> ></WorkStationMachine>
</el-card> </el-card>
</el-carousel-item> </el-carousel-item> -->
<el-carousel-item> <el-carousel-item>
<el-card shadow="always" style="width: 400px"> <el-card shadow="always" style="width: 400px">
<div slot="header"> <div slot="header">
...@@ -340,7 +505,7 @@ ...@@ -340,7 +505,7 @@
></Workstationworker> ></Workstationworker>
</el-card> </el-card>
</el-carousel-item> </el-carousel-item>
<el-carousel-item> <!-- <el-carousel-item>
<el-card shadow="always" style="width: 400px"> <el-card shadow="always" style="width: 400px">
<div slot="header"> <div slot="header">
<span>工装夹具</span> <span>工装夹具</span>
...@@ -358,7 +523,7 @@ ...@@ -358,7 +523,7 @@
:workstationId="form.workstationId" :workstationId="form.workstationId"
></WorkStationTool> ></WorkStationTool>
</el-card> </el-card>
</el-carousel-item> </el-carousel-item> -->
</el-carousel> </el-carousel>
</el-col> </el-col>
</el-row> </el-row>
...@@ -372,7 +537,6 @@ ...@@ -372,7 +537,6 @@
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { import {
listWorkstation, listWorkstation,
...@@ -382,31 +546,38 @@ import { ...@@ -382,31 +546,38 @@ import {
updateWorkstation, updateWorkstation,
} from "@/api/mes/md/workstation"; } from "@/api/mes/md/workstation";
//设备资源选择与保存 //设备资源选择与保存
import WorkStationMachine from "./components/machine"; // import WorkStationMachine from "./components/machine";
import MachinerySelectSingle from "@/components/machinerySelect/single.vue"; // import MachinerySelectSingle from "@/components/machinerySelect/single.vue";
import { addWorkstationmachine } from "@/api/mes/md/workstationmachine"; // import { addWorkstationmachine } from "@/api/mes/md/workstationmachine";
//人力资源选择与保存 //人力资源选择与保存
import Workstationworker from "./components/worker"; import Workstationworker from "./components/worker";
import BrandSelect from "@/components/userSelect/single.vue";
//工装夹具资源选择与保存 //工装夹具资源选择与保存
import WorkStationTool from "./components/tool"; // import WorkStationTool from "./components/tool";
import { getTreeList } from "@/api/mes/wm/warehouse"; // import { getTreeList } from "@/api/mes/wm/warehouse";
import { listAllProcess } from "@/api/mes/pro/process"; import { listAllProcess } from "@/api/mes/pro/process";
import { genCode } from "@/api/system/autocode/rule"; import { genCode } from "@/api/system/autocode/rule";
import { listAllWorkshop } from "@/api/mes/md/workshop"; import { listAllWorkshop } from "@/api/mes/md/workshop";
export default { export default {
name: "Workstation", name: "Workstation",
dicts: ["sys_yes_no"], dicts: [
"sys_yes_no",
"md_workstation_type",
"md_workstation_usage",
"standard_value_code",
"process_control_code",
],
components: { components: {
WorkStationMachine, // WorkStationMachine,
MachinerySelectSingle, // MachinerySelectSingle,
Workstationworker, Workstationworker,
WorkStationTool, // WorkStationTool,
BrandSelect,
}, },
data() { data() {
return { return {
//自动生成编码 //自动生成编码
autoGenFlag: false, autoGenFlag: true,
optType: undefined, optType: undefined,
warehouseInfo: [], warehouseInfo: [],
warehouseOptions: [], warehouseOptions: [],
...@@ -415,6 +586,10 @@ export default { ...@@ -415,6 +586,10 @@ export default {
value: "pId", value: "pId",
label: "pName", label: "pName",
}, },
factoryCodes: [
{ value: "1000", label: "广州市宝绅科技应用有限公司" },
{ value: "1010", label: "广州市宝绅科技有限公司RFID工厂" },
],
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 选中数组 // 选中数组
...@@ -443,16 +618,12 @@ export default { ...@@ -443,16 +618,12 @@ export default {
pageSize: 10, pageSize: 10,
workstationCode: null, workstationCode: null,
workstationName: null, workstationName: null,
workstationAddress: null,
workshopId: null, workshopId: null,
workshopCode: null, workshopCode: null,
workshopName: null, workshopName: null,
processId: null, processId: null,
processCode: null, processCode: null,
processName: null, processName: null,
warehouseId: null,
locationId: null,
areaId: null,
enableFlag: null, enableFlag: null,
stdWorkingTime: null, stdWorkingTime: null,
}, },
...@@ -485,7 +656,7 @@ export default { ...@@ -485,7 +656,7 @@ export default {
this.getList(); this.getList();
this.getWorkshops(); this.getWorkshops();
this.getProcess(); this.getProcess();
this.getWarehouseList(); // this.getWarehouseList();
}, },
methods: { methods: {
/** 查询工作站列表 */ /** 查询工作站列表 */
...@@ -510,38 +681,38 @@ export default { ...@@ -510,38 +681,38 @@ export default {
}); });
}, },
//获取仓库 //获取仓库
getWarehouseList() { // getWarehouseList() {
getTreeList().then((response) => { // getTreeList().then((response) => {
this.warehouseOptions = response.data; // this.warehouseOptions = response.data;
this.warehouseOptions.map((w) => { // this.warehouseOptions.map((w) => {
w.children.map((l) => { // w.children.map((l) => {
let lstr = JSON.stringify(l.children) // let lstr = JSON.stringify(l.children)
.replace(/locationId/g, "lId") // .replace(/locationId/g, "lId")
.replace(/areaId/g, "pId") // .replace(/areaId/g, "pId")
.replace(/areaName/g, "pName"); // .replace(/areaName/g, "pName");
l.children = JSON.parse(lstr); // l.children = JSON.parse(lstr);
}); // });
let wstr = JSON.stringify(w.children) // let wstr = JSON.stringify(w.children)
.replace(/warehouseId/g, "wId") // .replace(/warehouseId/g, "wId")
.replace(/locationId/g, "pId") // .replace(/locationId/g, "pId")
.replace(/locationName/g, "pName"); // .replace(/locationName/g, "pName");
w.children = JSON.parse(wstr); // w.children = JSON.parse(wstr);
}); // });
let ostr = JSON.stringify(this.warehouseOptions) // let ostr = JSON.stringify(this.warehouseOptions)
.replace(/warehouseId/g, "pId") // .replace(/warehouseId/g, "pId")
.replace(/warehouseName/g, "pName"); // .replace(/warehouseName/g, "pName");
this.warehouseOptions = JSON.parse(ostr); // this.warehouseOptions = JSON.parse(ostr);
}); // });
}, // },
//选择默认的仓库、库区、库位 //选择默认的仓库、库区、库位
handleWarehouseChanged(obj) { // handleWarehouseChanged(obj) {
if (obj != null) { // if (obj != null) {
this.form.warehouseId = obj[0]; // this.form.warehouseId = obj[0];
this.form.locationId = obj[1]; // this.form.locationId = obj[1];
this.form.areaId = obj[2]; // this.form.areaId = obj[2];
} // }
}, // },
// 取消按钮 // 取消按钮
cancel() { cancel() {
this.open = false; this.open = false;
...@@ -553,24 +724,28 @@ export default { ...@@ -553,24 +724,28 @@ export default {
workstationId: null, workstationId: null,
workstationCode: null, workstationCode: null,
workstationName: null, workstationName: null,
workstationAddress: null, workstationType: null,
workshopId: null, workshopId: null,
workshopCode: null,
workshopName: null, workshopName: null,
processId: null, processId: null,
processCode: null,
processName: null, processName: null,
warehouseId: null,
locationId: null,
areaId: null,
enableFlag: "Y", enableFlag: "Y",
remark: null, remark: null,
createBy: null, createBy: null,
createTime: null, createTime: null,
updateBy: null, updateBy: null,
updateTime: null, updateTime: null,
usageCode: null,
responsiblePerson: null,
nickName: null,
isBackflush: null,
standardValueCode: null,
processingMethod: null,
costCenterCode: null,
watchingAircraftNum: null,
factoryCode: null,
}; };
this.autoGenFlag = false; this.autoGenFlag = true;
this.resetForm("form"); this.resetForm("form");
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
...@@ -583,19 +758,29 @@ export default { ...@@ -583,19 +758,29 @@ export default {
this.queryParams = { this.queryParams = {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
workstationId: null,
workstationCode: null, workstationCode: null,
workstationName: null, workstationName: null,
workstationAddress: null, workstationType: null,
workshopId: null, workshopId: null,
workshopCode: null,
workshopName: null, workshopName: null,
processId: null, processId: null,
processCode: null,
processName: null, processName: null,
warehouseId: null, enableFlag: "Y",
locationId: null, remark: null,
areaId: null, createBy: null,
enableFlag: null, createTime: null,
updateBy: null,
updateTime: null,
usageCode: null,
responsiblePerson: null,
nickName: null,
isBackflush: null,
standardValueCode: null,
processingMethod: null,
costCenterCode: null,
watchingAircraftNum: null,
factoryCode: null,
}; };
this.resetForm("queryForm"); this.resetForm("queryForm");
this.handleQuery(); this.handleQuery();
...@@ -694,19 +879,19 @@ export default { ...@@ -694,19 +879,19 @@ export default {
} }
}, },
//设备资源选择弹出 //设备资源选择弹出
handleMachineryAdd() { // handleMachineryAdd() {
this.$refs.machinerySelect.showFlag = true; // this.$refs.machinerySelect.showFlag = true;
}, // },
//设备资源选择回调 //设备资源选择回调
onMachineryAdd(rows) { // onMachineryAdd(rows) {
debugger; // debugger;
this.loading = true; // this.loading = true;
rows.workstationId = this.form.workstationId; // rows.workstationId = this.form.workstationId;
addWorkstationmachine(rows).then((response) => { // addWorkstationmachine(rows).then((response) => {
this.$refs.machineryList.getList(); // this.$refs.machineryList.getList();
this.loading = false; // this.loading = false;
}); // });
}, // },
//人力资源-岗位新增 //人力资源-岗位新增
handlePostAdd() { handlePostAdd() {
this.$refs.postList.handleAdd(); this.$refs.postList.handleAdd();
...@@ -715,6 +900,16 @@ export default { ...@@ -715,6 +900,16 @@ export default {
handleToolTypeAdd() { handleToolTypeAdd() {
this.$refs.toolList.handleAdd(); this.$refs.toolList.handleAdd();
}, },
handleBrandSelect() {
this.$refs.brSelect.showFlag = true;
},
onBrandSelected(row) {
if (row != undefined && row != null) {
// this.form.userId = row.userId;
this.form.userName = row.responsiblePerson;
this.form.nickName = row.nickName;
}
},
}, },
}; };
</script> </script>
src/views/mes/pro/productionSolution/components/ProogingProcess.vue
View file @ 5dd0e5db
...@@ -13,14 +13,14 @@ ...@@ -13,14 +13,14 @@
/> />
<el-table-column <el-table-column
label="加工方式" label="加工方式"
prop="controlCode" prop="processingMethod"
align="center" align="center"
width="215" width="215"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag <dict-tag
:options="dict.type.process_control_code" :options="dict.type.process_control_code"
:value="scope.row.controlCode" :value="scope.row.processingMethod"
/> />
</template> </template>
</el-table-column> </el-table-column>
...@@ -204,9 +204,9 @@ ...@@ -204,9 +204,9 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="加工方式" prop="controlCode"> <el-form-item label="加工方式" prop="processingMethod">
<el-select <el-select
v-model="form.controlCode" v-model="form.processingMethod"
placeholder="请选择加工方式" placeholder="请选择加工方式"
clearable clearable
style="width: 150px" style="width: 150px"
...@@ -220,7 +220,7 @@ ...@@ -220,7 +220,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<template v-if="form.controlCode == 'PP02'"> <template v-if="form.processingMethod == 'PP02'">
<el-col :span="12"> <el-col :span="12">
<el-form-item <el-form-item
label="采购信息记录号" label="采购信息记录号"
......
src/views/mes/pro/workorder/components/WorkOrderSale.vue
View file @ 5dd0e5db
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
</el-col> </el-col>
</el-row> --> </el-row> -->
<el-form <!-- <el-form
class="page-form" class="page-form"
:model="form" :model="form"
ref="form" ref="form"
...@@ -294,9 +294,9 @@ ...@@ -294,9 +294,9 @@
></el-input></el-form-item ></el-input></el-form-item
></el-col> ></el-col>
</el-row> </el-row>
</el-form> </el-form> -->
<!-- <el-table :data="tableData"> <el-table :data="tableData">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column <el-table-column
label="指令号" label="指令号"
...@@ -456,6 +456,39 @@ ...@@ -456,6 +456,39 @@
prop="purchaseOrg" prop="purchaseOrg"
width="120" width="120"
/> />
<!-- <el-table-column
label="包装数量"
align="center"
prop="packNum"
width="120"
/>
<el-table-column
label="按指令包装"
align="center"
prop="packByDirective"
width="120"
>
<template slot-scope="scope">
<dict-tag
:options="dict.type.sys_yes_no"
:value="scope.row.packByDirective"
/>
</template>
</el-table-column>
<el-table-column
label="按size包装"
align="center"
prop="packBySize"
width="120"
>
<template slot-scope="scope">
<dict-tag
:options="dict.type.sys_yes_no"
:value="scope.row.packBySize"
/>
</template> -->
<!-- </el-table-column> -->
<el-table-column <el-table-column
v-if="mode != 'info'" v-if="mode != 'info'"
label="操作" label="操作"
...@@ -470,16 +503,16 @@ ...@@ -470,16 +503,16 @@
@click="updateRow(row, $index)" @click="updateRow(row, $index)"
>修改</el-button >修改</el-button
> >
<el-button <!-- <el-button
type="text" type="text"
icon="el-icon-delete" icon="el-icon-delete"
size="small" size="small"
@click="deleteRow($index)" @click="deleteRow($index)"
>删除</el-button >删除</el-button
> > -->
</template> </template>
</el-table-column> </el-table-column>
</el-table> --> </el-table>
</div> </div>
</template> </template>
......
src/views/mes/pro/workorder/proofingInfo.vue
View file @ 5dd0e5db
...@@ -187,7 +187,36 @@ ...@@ -187,7 +187,36 @@
</el-col> </el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"> <el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="厚度(丝)" prop="thickness"> <el-form-item label="厚度(丝)" prop="thickness">
<el-input v-model="form.thickness" placeholder="厚度(丝)" /> <el-input v-model="form.thickness" placeholder="请输入厚度(丝)" />
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="包装数量" prop="packNum">
<el-input v-model="form.packNum" placeholder="请输入包装数量" />
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="按指令包装" prop="packByDirective">
<el-select v-model="form.packByDirective" placeholder="请选择类型">
<el-option
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="按size包装" prop="packBySize">
<el-select v-model="form.packBySize" placeholder="请选择类型">
<el-option
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -267,6 +296,7 @@ export default { ...@@ -267,6 +296,7 @@ export default {
"mes_workorder_status", "mes_workorder_status",
"mes_workorder_sourcetype", "mes_workorder_sourcetype",
"mes_workorder_type", "mes_workorder_type",
"sys_yes_no",
], ],
provide() { provide() {
return { return {
...@@ -315,6 +345,9 @@ export default { ...@@ -315,6 +345,9 @@ export default {
createTime: null, createTime: null,
updateBy: null, updateBy: null,
updateTime: null, updateTime: null,
packBySize: null,
packByDirective: null,
packNum: null,
}, },
// 表单校验 // 表单校验
rules: { rules: {
...@@ -593,6 +626,9 @@ export default { ...@@ -593,6 +626,9 @@ export default {
createTime: null, createTime: null,
updateBy: null, updateBy: null,
updateTime: null, updateTime: null,
packBySize: null,
packByDirective: null,
packNum: null,
}; };
this.$refs["ProogingBomRef"].resetState(); this.$refs["ProogingBomRef"].resetState();
this.$refs["ProogingProcessRef"].resetState(); this.$refs["ProogingProcessRef"].resetState();
......
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