Skip to content

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

任务单--未完成版

parent ed46a900
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 692 additions and 270 deletions
src/api/mes/pro/protask.js
View file @ c0268649
......@@ -52,3 +52,11 @@ export function delProtask(taskId) {
method: 'delete'
})
}
// 生成任务单、合并任务单
export function addProtaskList(taskId) {
return request({
url: '/mes/pro/protask' + taskId,
method: 'post',
})
}
src/components/workunitSelect/single.vue 0 → 100644
View file @ c0268649
<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="68px">
<el-form-item label="工作单元编码" prop="workunitCode">
<el-input
v-model="queryParams.workunitCode"
placeholder="请输入工单编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="工作单元名称" prop="workunitName">
<el-input
v-model="queryParams.workunitName"
placeholder="请输入工作单元名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="工作站" prop="workstationName">
<el-input
v-model="queryParams.workstationName"
placeholder="请输入工作站名称"
clearable
@keyup.enter.native="handleQuery"
/>
</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-form>
<el-table v-loading="loading" :data="workorderList" @current-change="handleCurrent" @row-dblclick="handleRowDbClick">
<el-table-column width="55" align="center" >
<template v-slot="scope">
<el-radio v-model="selectedWorkorderId" :label="scope.row.workorderId" @change="handleRowChange(scope.row)">{{""}}</el-radio>
</template>
</el-table-column>
<el-table-column label="工单编码" width="180" prop="workorderCode" >
</el-table-column>
<el-table-column label="工单名称" width="200" align="center" prop="workorderName" :show-overflow-tooltip="true"/>
<el-table-column label="工单来源" align="center" prop="orderSource" >
<template slot-scope="scope">
<dict-tag :options="dict.type.mes_workorder_sourcetype" :value="scope.row.orderSource"/>
</template>
</el-table-column>
<el-table-column label="订单编号" width="140" align="center" prop="sourceCode" />
<el-table-column label="产品编号" width="120" align="center" prop="productCode" />
<el-table-column label="产品名称" width="200" align="center" prop="productName" :show-overflow-tooltip="true"/>
<el-table-column label="规格型号" align="center" prop="productSpc" :show-overflow-tooltip="true"/>
<el-table-column label="单位" align="center" prop="unitOfMeasure" />
<el-table-column label="工单数量" align="center" prop="quantity" />
<el-table-column label="客户编码" align="center" prop="clientCode" />
<el-table-column label="客户名称" align="center" prop="clientName" :show-overflow-tooltip="true"/>
<el-table-column label="需求日期" align="center" prop="requestDate" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.requestDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
</el-table>
<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>
</div>
</el-dialog>
</template>
<script>
import { listWorkorder} from "@/api/mes/pro/workunit";
export default {
name: 'WorkOrderSelectSingle',
components: {},
dicts: ['mes_order_status','mes_workorder_sourcetype'],
props:{
workunit: {
type: Object,
default: function(){
return {'workorderType': 'SELF'}
}} //外部传入的工单过滤信息
},
data() {
return {
showFlag: false,
// 遮罩层
loading: true,
// 选中数组
selectedWorkorderId: undefined,
selectedRows: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 生产工单表格数据
workorderList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
workorderCode: null,
workorderName: null,
workorderType: this.workunit.workunitType,
orderSource: null,
sourceCode: null,
productId: null,
productCode: null,
productName: null,
productSpc: null,
unitOfMeasure: null,
quantity: null,
quantityProduced: null,
quantityChanged: null,
quantityScheduled: null,
clientId: null,
clientCode: null,
clientName: null,
requestDate: null,
parentId: null,
ancestors: null,
status: 'CONFIRMED',
},
}
},
created() {
this.getList();
},
methods:{
/** 查询生产工单列表 */
getList() {
this.loading = true;
listWorkorder(this.queryParams).then(response => {
this.workorderList = response.rows;
this.loading = false;
});
},
/** 搜索按钮操作 */
handleQuery() {
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
handleCurrent(row){
if(row){
this.selectedRows = row;
}
},
// 单选选中数据
handleRowChange(row) {
if(row){
this.selectedRows = row;
}
},
//双击选中
handleRowDbClick(row){
if(row){
this.selectedRows = row;
this.$emit('onSelected',this.selectedRows);
this.showFlag = false;
}
},
//确定选中
confirmSelect(){
if(this.selectedWorkorderId == null || this.selectedWorkorderId == 0){
this.$notify({
title:'提示',
type:'warning',
message: '请至少选择一条数据!'
});
return;
}
this.$emit('onSelected',this.selectedRows);
this.showFlag = false;
}
}
}
</script>
\ No newline at end of file
src/views/mes/pro/schedule/index.vue
View file @ c0268649
This diff is collapsed.
src/views/mes/proofing/components/ProogingBom.vue
View file @ c0268649
......@@ -113,6 +113,7 @@
<el-dialog :visible.sync="showFlag" width="700px" title="添加BOM">
<el-form
ref="form"
class="page-form"
:model="form"
:rules="rules"
inline
......@@ -120,7 +121,7 @@
size="small"
>
<el-row>
<el-col :span="24">
<el-col :span="12">
<el-form-item label="物料" prop="itemId">
<el-input
v-model="form.itemName"
......
src/views/mes/proofing/proofingInfo.vue
View file @ c0268649
......@@ -24,7 +24,7 @@
label-width="100px"
>
<el-row>
<el-col :md="6" :sm="12" :xs="12">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item prop="prototypeRequestCode">
<template slot="label"> 申请单编码 </template>
<el-input
......@@ -35,7 +35,7 @@
</el-form-item>
</el-col>
<el-col :md="6" :sm="12" :xs="12">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="产品" prop="itemId">
<el-input
v-model="form.itemName"
......@@ -51,7 +51,7 @@
<ItemSelect ref="ItemSelectRef" @onSelected="onItemSelect" />
</el-form-item>
</el-col>
<el-col :md="6" :sm="12" :xs="12">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="工艺路线" prop="routeId">
<el-input
v-model="form.routeName"
......@@ -70,7 +70,7 @@
/>
</el-form-item>
</el-col>
<el-col :md="6" :sm="12" :xs="12">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="简称" prop="abbreviation">
<el-input
v-model="form.abbreviation"
......@@ -80,7 +80,7 @@
</el-col>
</el-row>
<el-row>
<el-col :md="6" :sm="12" :xs="12">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="样品英文名" prop="enName">
<el-input
v-model="form.enName"
......@@ -88,14 +88,14 @@
></el-input>
</el-form-item>
</el-col>
<el-col :md="6" :sm="12" :xs="12">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="样品数量" prop="num">
<el-input v-model="form.num" placeholder="请输入样品数量">
<template slot="suffix">{{ form.unit }}</template>
</el-input>
</el-form-item>
</el-col>
<el-col :md="6" :sm="12" :xs="12">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="打样形式" prop="type">
<el-input
v-model="form.type"
......@@ -103,7 +103,7 @@
></el-input>
</el-form-item>
</el-col>
<el-col :md="6" :sm="12" :xs="12">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="分配方式" prop="modality">
<el-input
v-model="form.modality"
......@@ -111,7 +111,7 @@
></el-input>
</el-form-item>
</el-col>
<el-col :md="6" :sm="12" :xs="12">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="表面处理" prop="surfaceTreatment">
<el-input
v-model="form.surfaceTreatment"
......@@ -119,7 +119,7 @@
></el-input>
</el-form-item>
</el-col>
<el-col :md="6" :sm="12" :xs="12">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="NG原因" prop="ngReason">
<el-input
v-model="form.ngReason"
......@@ -127,7 +127,7 @@
></el-input>
</el-form-item>
</el-col>
<el-col :md="6" :sm="12" :xs="12">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item prop="plannedFinishDate">
<template slot="label">
<TipLabel title="完成日期" tip="计划完成日期" />
......@@ -139,7 +139,7 @@
></el-date-picker>
</el-form-item>
</el-col>
<el-col :md="6" :sm="12" :xs="12">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item prop="plannedLayoutDate">
<template slot="label">
<TipLabel title="版面时间" tip="版面需求时间" />
......@@ -151,7 +151,7 @@
></el-date-picker>
</el-form-item>
</el-col>
<el-col :md="6" :sm="12" :xs="12">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="测试标准" prop="testStandard">
<el-input
v-model="form.testStandard"
......@@ -161,7 +161,7 @@
</el-col>
</el-row>
<el-row>
<el-col :md="6" :sm="12" :xs="12">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="备注" prop="remark">
<el-input
type="textarea"
......@@ -254,7 +254,7 @@ export default {
created() {
this.getFormInfo();
if (this.mode == "apply") {
this.gCode();
this.gCode();
}
},
methods: {
......
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