Skip to content

M
mes-ui
Commit 887a43fa authored by 何远江's avatar 何远江
Browse files
Options

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

parents 24b7b827 61353e13
Hide whitespace changes
Inline Side-by-side
Showing with 486 additions and 448 deletions
src/views/mes/proofing/proofingApply.vue
View file @ 887a43fa
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="70px"> <el-form
<el-form-item label="申请编码" prop="workorderCode"> :model="queryParams"
<el-input ref="queryForm"
v-model="queryParams.workorderCode" style="with"
placeholder="请输入申请单编码" size="small"
clearable :inline="true"
@keyup.enter.native="handleQuery" v-show="showSearch"
/> label-width="100px"
</el-form-item> >
<el-form-item label="产品名称" prop="workorderName"> <el-form-item label="产品名称" prop="itenName">
<el-input <el-input
v-model="queryParams.workorderName" v-model="queryParams.itenName"
placeholder="请输入产品名称" placeholder="请输入产品名称"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="单据状态" prop="prototypeRequestStatus">
<el-form-item label="产品编号" prop="productCode"> <el-select
<el-input v-model="queryParams.prototypeRequestStatus"
v-model="queryParams.productCode"
placeholder="请输入产品编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="客户编码" prop="clientCode">
<el-input
v-model="queryParams.clientCode"
placeholder="请输入客户编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="客户名称" prop="clientName">
<el-input
v-model="queryParams.clientName"
placeholder="请输入客户名称"
clearable clearable
@keyup.enter.native="handleQuery" placeholder="请选择单据状态"
/> >
</el-form-item> <el-option
<el-form-item label="单据状态" prop="status" >
<el-select v-model="queryParams.status" clearable placeholder="请选择单据状态">
<el-option
v-for="item in options" v-for="item in options"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value"> :value="item.value"
</el-option> >
</el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item label="样品名称" prop="abbreviation">
<el-form-item label="申请人员" prop="clientName">
<el-input <el-input
v-model="queryParams.clientName" v-model="queryParams.itenName"
placeholder="请输入申请人名称" placeholder="请输入样品名称"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> /> -->
</el-form-item> <!-- <el-date-picker
clearable
<el-form-item label="申请日期" prop="requestDate"> v-model="queryParams.abbreviation"
<el-date-picker clearable
v-model="queryParams.requestDate"
type="date" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="请选择申请日期"> placeholder="请选择申请日期"
</el-date-picker> >
</el-form-item> </el-date-picker>-->
<!-- </el-form-item> -->
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</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-item>
</el-form> </el-form>
...@@ -86,8 +70,9 @@ ...@@ -86,8 +70,9 @@
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['mes:pro:workorder:add']" v-hasPermi="['mes:pro:prototypeRequest:add']"
>新增</el-button> >新增</el-button
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
...@@ -97,8 +82,9 @@ ...@@ -97,8 +82,9 @@
size="mini" size="mini"
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['mes:pro:workorder:edit']" v-hasPermi="['mes:pro:prototypeRequest:edit']"
>修改</el-button> >修改</el-button
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
...@@ -108,8 +94,9 @@ ...@@ -108,8 +94,9 @@
size="mini" size="mini"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['mes:pro:workorder:remove']" v-hasPermi="['mes:pro:prototypeRequest:remove']"
>删除</el-button> >删除</el-button
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
...@@ -118,100 +105,139 @@ ...@@ -118,100 +105,139 @@
icon="el-icon-download" icon="el-icon-download"
size="mini" size="mini"
@click="handleExport" @click="handleExport"
v-hasPermi="['mes:pro:workorder:export']" v-hasPermi="['mes:pro:prototypeRequest:export']"
>导出</el-button> >导出</el-button
>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row> </el-row>
<el-table <el-table
v-loading="loading" v-loading="loading"
:data="workorderList" :data="prototypeRequestList"
row-key="workorderId" row-key="prototypeRequestId"
default-expand-all default-expand-all
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
> >
<el-table-column label="样品编码" width="180" prop="proofing_apply_no" > <el-table-column label="样品编码" width="180" prop="prototypeRequestCode">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
@click="handleView(scope.row)" @click="handleView(scope.row)"
v-hasPermi="['mes:pro:workorder:query']" v-hasPermi="['mes:pro:prototypeRequest:query']"
>{{scope.row.workorderCode}}</el-button> >{{ scope.row.prototypeRequestCode }}</el-button
>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="产品名称" width="200" align="center" prop="productName" :show-overflow-tooltip="true"/> <el-table-column
<el-table-column label="工单类型" align="center" prop="workorderType" > label="产品名称"
<template slot-scope="scope"> width="120"
<dict-tag :options="dict.type.mes_workorder_type" :value="scope.row.workorderType"/> align="center"
</template> prop="itemName"
:show-overflow-tooltip="true"
/>
<el-table-column label="工艺路线名称" align="center" prop="routeName">
</el-table-column> </el-table-column>
<el-table-column label="工单来源" align="center" prop="orderSource" > <el-table-column label="简称" align="center" prop="abbreviation">
<template slot-scope="scope">
<dict-tag :options="dict.type.mes_workorder_sourcetype" :value="scope.row.orderSource"/>
</template>
</el-table-column> </el-table-column>
<el-table-column label="订单编号" width="140" align="center" prop="sourceCode" /> <el-table-column
<el-table-column label="产品编号" width="120" align="center" prop="productCode" /> label="样品英文名称"
<el-table-column label="产品名称" width="200" align="center" prop="productName" :show-overflow-tooltip="true"/> width="140"
<el-table-column label="规格型号" align="center" prop="productSpc" :show-overflow-tooltip="true"/> align="center"
<el-table-column label="单位" align="center" prop="unitOfMeasure" /> prop="enName"
<el-table-column label="工单数量" align="center" prop="quantity" /> />
<el-table-column label="调整数量" align="center" prop="quantityChanged" /> <el-table-column label="样品数量" width="120" align="center" prop="num" />
<el-table-column label="已生产数量" align="center" width="100px" prop="quantityProduced" /> <el-table-column
<el-table-column label="批次号" align="center" width="100px" prop="batchCode" /> label="打样形式"
<el-table-column label="客户编码" align="center" prop="clientCode" /> width="200"
<el-table-column label="客户名称" align="center" prop="clientName" :show-overflow-tooltip="true"/> align="center"
<el-table-column label="需求日期" align="center" prop="requestDate" width="180"> prop="type"
:show-overflow-tooltip="true"
/>
<el-table-column
label="分配方式"
align="center"
prop="modality"
:show-overflow-tooltip="true"
/>
<el-table-column
label="表面处理"
align="center"
prop="surfaceTreatment"
/>
<el-table-column label="NG原因" align="center" prop="ngReason" />
<el-table-column
label="计划完成日期"
align="center"
prop="plannedFinishDate"
width="180"
>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.requestDate, '{y}-{m}-{d}') }}</span> <span>{{
parseTime(scope.row.plannedFinishDate, "{y}-{m}-{d}")
}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="单据状态" align="center" prop="status"> <el-table-column
label="版面需求时间"
align="center"
prop="plannedLayoutDate"
width="180"
>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.mes_order_status" :value="scope.row.status"/> <span>{{
parseTime(scope.row.plannedLayoutDate, "{y}-{m}-{d}")
}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="150px" align="center" class-name="small-padding fixed-width"> <el-table-column
label="申请单状态"
align="center"
prop="prototypeRequestStatus"
/>
<el-table-column label="测试标准" align="center" prop="testStandard" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column
label="操作"
width="200px"
align="center"
class-name="small-padding fixed-width"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
v-if="scope.row.status =='PREPARE'" v-if="scope.row.prototypeRequestStatus == '审批中'"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['mes:pro:workorder:edit']" v-hasPermi="['mes:pro:prototypeRequest:edit']"
>修改</el-button> >修改</el-button
<el-button >
size="mini"
type="text"
icon="el-icon-plus"
v-if="scope.row.status =='CONFIRMED' && scope.row.workorderType =='SELF'"
@click="handleAdd(scope.row)"
v-hasPermi="['mes:pro:workorder:update']"
>新增</el-button>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-circle-check" icon="el-icon-circle-check"
v-if="scope.row.status =='CONFIRMED'" v-if="scope.row.prototypeRequestStatus == '审批中'"
@click="handleFinish(scope.row)" @click="handleFinish(scope.row)"
v-hasPermi="['mes:pro:workorder:update']" v-hasPermi="['mes:pro:prototypeRequest:update']"
>完成</el-button> >完成</el-button
>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-delete" icon="el-icon-delete"
v-if="scope.row.status =='PREPARE'"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['mes:pro:workorder:remove']" v-hasPermi="['mes:pro:prototypeRequest:remove']"
>删除</el-button> >删除</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total > 0"
:total="total" :total="total"
:page.sync="queryParams.pageNum" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.pageSize"
...@@ -219,56 +245,78 @@ ...@@ -219,56 +245,78 @@
/> />
<!-- 添加或修改生产工单对话框 --> <!-- 添加或修改生产工单对话框 -->
<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="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="工单编号" prop="workorderCode"> <el-form-item label="工单编号" prop="prototypeRequestCode">
<el-input v-model="form.workorderCode" placeholder="请输入工单编号" /> <el-input
v-model="form.prototypeRequestCode"
placeholder="请输入工单编号"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label-width="80"> <el-form-item label-width="80">
<el-switch v-model="autoGenFlag" <el-switch
active-color="#13ce66" v-model="autoGenFlag"
active-text="自动生成" active-color="#13ce66"
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'"> active-text="自动生成"
@change="handleAutoGenChange(autoGenFlag)"
v-if="optType != 'view' && form.status == 'PREPARE'"
>
</el-switch> </el-switch>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="工单名称" prop="workorderName"> <el-form-item label="工单名称" prop="prototypeRequestName">
<el-input v-model="form.workorderName" placeholder="请输入工单名称" /> <el-input
v-model="form.prototypeRequestName"
placeholder="请输入工单名称"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="来源类型" prop="orderSource"> <el-form-item label="来源类型" prop="orderSource">
<el-radio-group v-model="form.orderSource" disabled v-if="optType=='view'"> <el-radio-group
v-model="form.orderSource"
disabled
v-if="optType == 'view'"
>
<el-radio <el-radio
v-for="dict in dict.type.mes_workorder_sourcetype" v-for="dict in dict.type.mes_prototypeRequest_sourcetype"
:key="dict.value" :key="dict.value"
:label="dict.value" :label="dict.value"
>{{dict.label}}</el-radio> >{{ dict.label }}</el-radio
>
</el-radio-group> </el-radio-group>
<el-radio-group v-model="form.orderSource" v-else> <el-radio-group v-model="form.orderSource" v-else>
<el-radio <el-radio
v-for="dict in dict.type.mes_workorder_sourcetype" v-for="dict in dict.type.mes_prototypeRequest_sourcetype"
:key="dict.value" :key="dict.value"
:label="dict.value" :label="dict.value"
>{{dict.label}}</el-radio> >{{ dict.label }}</el-radio
>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" v-if="form.orderSource == 'ORDER'"> <el-col :span="8" v-if="form.orderSource == 'ORDER'">
<el-form-item label="订单编号" prop="sourceCode"> <el-form-item label="订单编号" prop="sourceCode">
<el-input v-model="form.sourceCode" placeholder="请输入订单编号" /> <el-input
v-model="form.sourceCode"
placeholder="请输入订单编号"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="单据状态" prop="status"> <el-form-item label="单据状态" prop="status">
<el-select v-model="form.status" disabled placeholder="请选择单据状态"> <el-select
v-model="form.status"
disabled
placeholder="请选择单据状态"
>
<el-option <el-option
v-for="dict in dict.type.mes_order_status" v-for="dict in dict.type.mes_order_status"
:key="dict.value" :key="dict.value"
...@@ -277,14 +325,17 @@ ...@@ -277,14 +325,17 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="工单类型" prop="workorderType"> <el-form-item label="工单类型" prop="prototypeRequestType">
<el-select v-model="form.workorderType" placeholder="请选择类型"> <el-select
v-model="form.prototypeRequestType"
placeholder="请选择类型"
>
<el-option <el-option
v-for="dict in dict.type.mes_workorder_type" v-for="dict in dict.type.mes_prototypeRequest_type"
:key="dict.value" :key="dict.value"
:label="dict.label" :label="dict.label"
:value="dict.value" :value="dict.value"
...@@ -294,80 +345,125 @@ ...@@ -294,80 +345,125 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="产品编号" prop="productCode"> <el-form-item label="产品编号" prop="productCode">
<el-input v-model="form.productCode" placeholder="请选择产品" > <el-input v-model="form.productCode" placeholder="请选择产品">
<el-button slot="append" @click="handleSelectProduct" icon="el-icon-search"></el-button> <el-button
slot="append"
@click="handleSelectProduct"
icon="el-icon-search"
></el-button>
</el-input> </el-input>
<ItemSelect ref="itemSelect" @onSelected="onItemSelected" > </ItemSelect> <ItemSelect ref="itemSelect" @onSelected="onItemSelected">
</ItemSelect>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="产品名称" prop="productName"> <el-form-item label="产品名称" prop="productName">
<el-input v-model="form.productName" placeholder="请选择产品" disabled/> <el-input
v-model="form.productName"
placeholder="请选择产品"
disabled
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="规格型号" prop="productSpc"> <el-form-item label="规格型号" prop="productSpc">
<el-input v-model="form.productSpc" placeholder="请选择产品" disabled/> <el-input
v-model="form.productSpc"
placeholder="请选择产品"
disabled
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="单位" prop="unitOfMeasure"> <el-form-item label="单位" prop="unitOfMeasure">
<el-input v-model="form.unitOfMeasure" placeholder="请选择产品" disabled/> <el-input
v-model="form.unitOfMeasure"
placeholder="请选择产品"
disabled
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="工单数量" prop="quantity"> <el-form-item label="工单数量" prop="quantity">
<el-input-number :min="1" v-model="form.quantity" placeholder="请输入生产数量" /> <el-input-number
:min="1"
v-model="form.quantity"
placeholder="请输入生产数量"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="需求日期" prop="requestDate"> <el-form-item label="需求日期" prop="requestDate">
<el-date-picker clearable <el-date-picker
clearable
v-model="form.requestDate" v-model="form.requestDate"
type="date" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="请选择需求日期"> placeholder="请选择需求日期"
>
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="批次号" prop="batchCode"> <el-form-item label="批次号" prop="batchCode">
<el-input v-model="form.batchCode" placeholder="请输入批次号" /> <el-input v-model="form.batchCode" placeholder="请输入批次号" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row v-if="form.orderSource == 'ORDER'"> <el-row v-if="form.orderSource == 'ORDER'">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="客户编码" prop="clientCode"> <el-form-item label="客户编码" prop="clientCode">
<el-input v-model="form.clientCode" placeholder="请选择客户" > <el-input v-model="form.clientCode" placeholder="请选择客户">
<el-button slot="append" @click="handleSelectClient" icon="el-icon-search"></el-button> <el-button
slot="append"
@click="handleSelectClient"
icon="el-icon-search"
></el-button>
</el-input> </el-input>
<ClientSelect ref="clientSelect" @onSelected="onClientSelected" > </ClientSelect> <ClientSelect ref="clientSelect" @onSelected="onClientSelected">
</ClientSelect>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="客户名称" prop="clientName"> <el-form-item label="客户名称" prop="clientName">
<el-input v-model="form.clientName" readonly="readonly" placeholder="请输入客户名称" /> <el-input
v-model="form.clientName"
readonly="readonly"
placeholder="请输入客户名称"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col></el-col> <el-col></el-col>
</el-row> </el-row>
<el-row v-if="form.workorderType == 'OUTSOURCE' || form.workorderType == 'PURCHASE'"> <el-row
v-if="
form.prototypeRequestType == 'OUTSOURCE' ||
form.prototypeRequestType == 'PURCHASE'
"
>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="供应商编码" prop="vendorCode"> <el-form-item label="供应商编码" prop="vendorCode">
<el-input v-model="form.vendorCode" placeholder="请选择供应商" > <el-input v-model="form.vendorCode" placeholder="请选择供应商">
<el-button slot="append" @click="handleSelectVendor" icon="el-icon-search"></el-button> <el-button
slot="append"
@click="handleSelectVendor"
icon="el-icon-search"
></el-button>
</el-input> </el-input>
<VendorSelect ref="vendorSelect" @onSelected="onVendorSelected" /> <VendorSelect ref="vendorSelect" @onSelected="onVendorSelected" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="供应商名称" prop="vendorName"> <el-form-item label="供应商名称" prop="vendorName">
<el-input v-model="form.vendorName" readonly="readonly" placeholder="请选择供应商" /> <el-input
v-model="form.vendorName"
readonly="readonly"
placeholder="请选择供应商"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col></el-col> <el-col></el-col>
...@@ -380,56 +476,87 @@ ...@@ -380,56 +476,87 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" /> <el-input
v-model="form.remark"
type="textarea"
placeholder="请输入内容"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<!-- <el-tabs type="border-card" v-if="form.workorderId != null"> <el-tabs type="border-card" v-if="form.prototypeRequestId != null">
<el-tab-pane label="BOM组成"> <el-tab-pane label="BOM组成">
<Workorderbom ref="bomlist" :optType="optType" :workorder="form" @handleAddSub="handleSubAdd" ></Workorderbom> <prototypeRequestbom ref="bomlist" :optType="optType" :prototypeRequest="form" @handleAddSub="handleSubAdd" ></prototypeRequestbom>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="物料需求"> <el-tab-pane label="物料需求">
</el-tab-pane> </el-tab-pane>
</el-tabs> --> </el-tabs>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="cancel" v-if="optType =='view' || form.status !='PREPARE' ">返回</el-button> <el-button
<el-button type="primary" @click="submitForm" v-if="form.status =='PREPARE' && optType !='view' ">保 存</el-button> type="primary"
<el-button type="success" @click="handleConfirm" v-if="form.status =='PREPARE' && optType !='view' && form.workorderId !=null">确 认</el-button> @click="cancel"
v-if="optType == 'view' || form.status != 'PREPARE'"
>返回</el-button
>
<el-button
type="primary"
@click="submitForm"
v-if="form.status == 'PREPARE' && optType != 'view'"
>保 存</el-button
>
<el-button
type="success"
@click="handleConfirm"
v-if="
form.status == 'PREPARE' &&
optType != 'view' &&
form.prototypeRequestId != null
"
>确 认</el-button
>
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
</div> </div></el-dialog> -->
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { listWorkorder, getWorkorder, delWorkorder, addWorkorder, updateWorkorder ,dofinish} from "@/api/mes/pro/workorder"; import {
// import Workorderbom from "./bom/bom.vue"; listPrototypeRequest,
// import WorkorderItemList from "./items/item.vue"; getPrototypeRequest,
import ItemSelect from "@/components/itemSelect/single.vue"; delPrototypeRequest,
addPrototypeRequest,
updatePrototypeRequest,
} from "@/api/mes/pro/prototypeRequest";
import ItemSelect from "@/components/itemSelect/single.vue";
import ClientSelect from "@/components/clientSelect/single.vue"; import ClientSelect from "@/components/clientSelect/single.vue";
import VendorSelect from "@/components/vendorSelect/single.vue"; import VendorSelect from "@/components/vendorSelect/single.vue";
import {genCode} from "@/api/system/autocode/rule"
import Treeselect from "@riophae/vue-treeselect"; import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css"; import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default { export default {
name: "Workorder", name: "PrototypeRequest",
dicts: ['mes_order_status','mes_workorder_sourcetype','mes_workorder_type'], dicts: [
"mes_order_status",
"mes_prototypeRequest_sourcetype",
"mes_prototypeRequest_type",
],
components: { components: {
Treeselect, Treeselect,
ItemSelect , ItemSelect,
ClientSelect, ClientSelect,
VendorSelect VendorSelect,
}, },
data() { data() {
return { return {
//自动生成编码 //自动生成编码
autoGenFlag:false, autoGenFlag: false,
optType: undefined, optType: undefined,
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 选中数组
ids: [],
// 显示搜索条件 // 显示搜索条件
showSearch: true, showSearch: true,
// 非单个禁用 // 非单个禁用
...@@ -439,9 +566,9 @@ export default { ...@@ -439,9 +566,9 @@ export default {
// 非多个禁用 // 非多个禁用
multiple: true, multiple: true,
// 生产工单表格数据 // 生产工单表格数据
workorderList: [], prototypeRequestList: [],
// 生产工单树选项 // 生产工单树选项
workorderOptions: [], prototypeRequestOptions: [],
// 弹出层标题 // 弹出层标题
title: "", title: "",
// 是否显示弹出层 // 是否显示弹出层
...@@ -450,86 +577,26 @@ export default { ...@@ -450,86 +577,26 @@ export default {
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
workorderCode: null, itemName: null,// 可以查简称与英文名
workorderName: null, prototypeRequestStatus: null,
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: null,
}, },
options: [ options: [
{ { value: "审批中", label: "审批中" },
value: '1', { value: "待制作", label: "待制作" },
label: '审批中' { value: "打样中", label: "打样中" },
}, { value: "待质检", label: "待质检" },
{ { value: "待确认", label: "待确认" },
value: '2', { value: "已完成", label: "已完成" },
label: '待制作' ],
},
{
value: '3',
label: '打样中'
},
{
value: '4',
label: '待质检'
},
{
value: '5',
label: '待确认'
},
{
value: '6',
label: '已完成'
}
],
// 表单参数 // 表单参数
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {
workorderCode: [ // prototypeRequestCode: [
{ required: true, message: "工单编码不能为空", trigger: "blur" } // { required: true, message: "工单编码不能为空", trigger: "blur" }
], // ],
workorderName: [ },
{ required: true, message: "工单名称不能为空", trigger: "blur" }
],
workorderType: [
{ required: true, message: "请选择生产工单类型", trigger: "blur" }
],
orderSource: [
{ required: true, message: "来源类型不能为空", trigger: "blur" }
],
productId: [
{ required: true, message: "产品不能为空", trigger: "blur" }
],
productCode: [
{ required: true, message: "产品编号不能为空", trigger: "blur" }
],
productName: [
{ required: true, message: "产品名称不能为空", trigger: "blur" }
],
quantity: [
{ required: true, message: "生产数量不能为空", trigger: "blur" }
],
requestDate: [
{ required: true, message: "需求日期不能为空", trigger: "blur" }
],
}
}; };
}, },
created() { created() {
...@@ -539,32 +606,12 @@ export default { ...@@ -539,32 +606,12 @@ export default {
/** 查询生产工单列表 */ /** 查询生产工单列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listWorkorder(this.queryParams).then(response => { listPrototypeRequest(this.queryParams).then((response) => {
this.workorderList = this.handleTree(response.rows, "workorderId", "parentId"); this.prototypeRequestList = response.rows;
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
}); });
}, },
/** 转换生产工单数据结构 */
normalizer(node) {
if (node.children && !node.children.length) {
delete node.children;
}
return {
id: node.workorderId,
label: node.workorderName,
children: node.children
};
},
/** 查询生产工单下拉树结构 */
getTreeselect() {
listWorkorder().then(response => {
this.workorderOptions = [];
const data = { workorderId: 0, workorderName: '顶级节点', children: [] };
data.children = this.handleTree(response.data, "workorderId", "parentId");
this.workorderOptions.push(data);
});
},
// 取消按钮 // 取消按钮
cancel() { cancel() {
this.open = false; this.open = false;
...@@ -573,41 +620,34 @@ export default { ...@@ -573,41 +620,34 @@ export default {
// 表单重置 // 表单重置
reset() { reset() {
this.form = { this.form = {
workorderId: null, prototypeRequestId: null,
workorderCode: null, prototypeRequestCode: null,
workorderName: null, itemId: null,
workorderType: 'SELF', itemName: null,
orderSource: null, routeId: null,
sourceCode: null, routeName: null,
productId: null, abbreviation: null,
productCode: null, enName: null,
productName: null, num: null,
productSpc: null, type: null,
unitOfMeasure: null, modality: null,
quantity: null, surfaceTreatment: null,
quantityProduced: null, ngReason: null,
quantityChanged: null, plannedFinishDate: null,
quantityScheduled: null, plannedLayoutDate: null,
clientId: null, prototypeRequestStatus: "0",
clientCode: null, testStandard: null,
clientName: null,
vendorId: null,
vendorCode: null,
vendorName: null,
requestDate: null,
parentId: null,
status: "PREPARE",
remark: null, remark: null,
createBy: null, createBy: null,
createTime: null, createTime: null,
updateBy: null, updateBy: null,
updateTime: null updateTime: null,
}; };
this.autoGenFlag = false;
this.resetForm("form"); this.resetForm("form");
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1;
this.getList(); this.getList();
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
...@@ -615,167 +655,165 @@ export default { ...@@ -615,167 +655,165 @@ export default {
this.resetForm("queryForm"); this.resetForm("queryForm");
this.handleQuery(); this.handleQuery();
}, },
//从BOM行中直接新增
handleSubAdd(row){
this.open = false;
this.reset();
this.getTreeselect();
if (row != null && row.workorderId) {
this.form = row;
this.form.parentId = row.workorderId;
this.form.workorderId = null;
this.form.workorderCode = null;
} else {
this.form.parentId = 0;
}
this.open = true;
this.title = "添加生产工单";
this.optType="add";
},
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd(row) { handleAdd(row) {
this.$router.push('/mes/proofing/info') // 跳转到申请单界面
return this.$router.push("/mes/proofing/apply");
// this.reset(); return;
// this.getTreeselect(); // this.reset();
// if (row != null && row.workorderId) { // this.getTreeselect();
// this.form.parentId = row.workorderId; // if (row != null && row.prototypeRequestId) {
// this.form.orderSource = row.orderSource; // this.form.parentId = row.prototypeRequestId;
// this.form.sourceCode = row.sourceCode; // this.form.orderSource = row.orderSource;
// this.form.clientId = row.clientId; // this.form.sourceCode = row.sourceCode;
// this.form.clientCode = row.clientCode; // this.form.clientId = row.clientId;
// this.form.clientName = row.clientName; // this.form.clientCode = row.clientCode;
// } else { // this.form.clientName = row.clientName;
// this.form.parentId = 0; // } else {
// } // this.form.parentId = 0;
// this.open = true; // }
// this.open = true;
}, },
// 查询明细按钮操作 // 查询明细按钮操作
handleView(row){ handleView(row) {
this.reset(); this.reset();
this.getTreeselect(); const prototypeRequestId = row.prototypeRequestId || this.ids;
const workorderId = row.workorderId || this.ids; this.$router.push(
getWorkorder(workorderId).then(response => { "/mes/proofing/info?prototypeRequestId="+prototypeRequestId
this.form = response.data; );
this.open = true; // getprototypeRequest(prototypeRequestId).then((response) => {
this.title = "查看工单信息"; // this.form = response.data;
this.optType = "view"; // this.open = true;
}); // this.title = "查看工单信息";
// this.optType = "view";
// });
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset();
this.getTreeselect(); const prototypeRequestId = row.prototypeRequestId || this.ids;
if (row != null) { this.$router.push(
this.form.parentId = row.workorderId; "/mes/proofing/edit?prototypeRequestId="+prototypeRequestId
} );
getWorkorder(row.workorderId).then(response => { // getPrototypeRequest(prototypeRequestId).then((response) => {
this.form = response.data; // // this.form = response.data;
this.open = true; // // this.open = true;
this.title = "修改生产工单"; // // this.title = "修改生产工单";
this.optType="edit"; // // this.optType="edit";
}); // // 跳转修改
}, // });
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.workorderId != null) {
updateWorkorder(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
//this.open = false;
this.$refs["bomlist"].getList();
this.getList();
});
} else {
addWorkorder(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
//this.open = false;
this.form.workorderId = response.data;
this.getList();
});
}
}
});
}, },
// /** 提交按钮 */
// submitForm() {
// this.$refs["form"].validate(valid => {
// if (valid) {
// if (this.form.prototypeRequestId != null) {
// updateprototypeRequest(this.form).then(response => {
// this.$modal.msgSuccess("修改成功");
// //this.open = false;
// this.$refs["bomlist"].getList();
// this.getList();
// });
// } else {
// addprototypeRequest(this.form).then(response => {
// this.$modal.msgSuccess("新增成功");
// //this.open = false;
// this.form.prototypeRequestId = response.data;
// this.getList();
// });
// }
// }
// });
// },
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
this.$modal.confirm('是否确认删除生产工单编号为"' + row.workorderId + '"的数据项？').then(function() { this.$modal
return delWorkorder(row.workorderId); .confirm('是否确认删除编号为"' + row.prototypeRequestId + '"的打样单？')
}).then(() => { .then(function () {
this.getList(); return delPrototypeRequest(row.prototypeRequestId);
this.$modal.msgSuccess("删除成功"); })
}).catch(() => {}); .then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
})
.catch(() => {});
}, },
handleSelectProduct(){
handleSelectProduct() {
this.$refs.itemSelect.showFlag = true; this.$refs.itemSelect.showFlag = true;
}, },
handleSelectClient(){ handleSelectClient() {
this.$refs.clientSelect.showFlag = true; this.$refs.clientSelect.showFlag = true;
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
this.download('mes/pro/workorder/export', { this.download(
...this.queryParams "mes/pro/prototypeRequest/export",
}, `workorder_${new Date().getTime()}.xlsx`) {
}, ...this.queryParams,
handleConfirm(){ },
let that = this; `打样申请单_${new Date().getTime()}.xlsx`
this.$modal.confirm('是确认完成工单编制？【确认后将不能更改】').then(function(){ );
that.form.status = 'CONFIRMED';
that.submitForm();
});
},
handleFinish(row){
const workorderIds = row.workorderId || this.ids;
this.$modal.confirm('确认完成工单？一旦完成，此工单将无法继续报工').then(function() {
return dofinish(workorderIds) //完成工单
}).then(() => {
this.getList();
this.$modal.msgSuccess("更改成功");
}).catch(() => {});
},
//物料选择弹出框
onItemSelected(obj){
if(obj != undefined && obj != null){
this.form.productId = obj.itemId;
this.form.productCode = obj.itemCode;
this.form.productName = obj.itemName;
this.form.productSpc = obj.specification;
this.form.unitOfMeasure = obj.unitOfMeasure;
}
},
//客户选择弹出框
onClientSelected(obj){
if(obj != undefined && obj != null){
this.form.clientId = obj.clientId;
this.form.clientCode = obj.clientCode;
this.form.clientName = obj.clientName;
}
},
//供应商选择
handleSelectVendor(){
this.$refs.vendorSelect.showFlag = true;
},
//供应商选择弹出框
onVendorSelected(obj){
debugger;
if(obj != undefined && obj != null){
this.form.vendorId = obj.vendorId;
this.form.vendorCode = obj.vendorCode;
this.form.vendorName = obj.vendorName;
}
}, },
//自动生成编码 // // 审批通过
handleAutoGenChange(autoGenFlag){ // handleConfirm(){
if(autoGenFlag){ // let that = this;
genCode('WORKORDER_CODE').then(response =>{ // this.$modal.confirm('是确认完成工单编制？【确认后将不能更改】').then(function(){
this.form.workorderCode = response; // that.form.status = '待制作';
}); // that.submitForm();
}else{ // });
this.form.workorderCode = null; // },
} // // 审批
} // handleFinish(row){
} // const prototypeRequestIds = row.prototypeRequestId || this.ids;
// this.$modal.confirm('确认完成工单？一旦完成，此工单将无法继续报工').then(function() {
// return dofinish(prototypeRequestIds) //完成工单
// }).then(() => {
// this.getList();
// this.$modal.msgSuccess("更改成功");
// }).catch(() => {});
// },
// //物料选择弹出框
// onItemSelected(obj) {
// if (obj != undefined && obj != null) {
// this.form.productId = obj.itemId;
// this.form.productCode = obj.itemCode;
// this.form.productName = obj.itemName;
// this.form.productSpc = obj.specification;
// this.form.unitOfMeasure = obj.unitOfMeasure;
// }
// },
// //客户选择弹出框
// onClientSelected(obj) {
// if (obj != undefined && obj != null) {
// this.form.clientId = obj.clientId;
// this.form.clientCode = obj.clientCode;
// this.form.clientName = obj.clientName;
// }
// },
// //供应商选择
// handleSelectVendor() {
// this.$refs.vendorSelect.showFlag = true;
// },
// //供应商选择弹出框
// onVendorSelected(obj) {
// debugger;
// if (obj != undefined && obj != null) {
// this.form.vendorId = obj.vendorId;
// this.form.vendorCode = obj.vendorCode;
// this.form.vendorName = obj.vendorName;
// }
// },
// //自动生成编码
// handleAutoGenChange(autoGenFlag) {
// if (autoGenFlag) {
// genCode("WORKORDER_CODE").then((response) => {
// this.form.prototypeRequestCode = response;
// });
// } else {
// this.form.prototypeRequestCode = null;
// }
// },
},
}; };
</script> </script>
src/views/mes/proofing/proofingInfo.vue
View file @ 887a43fa
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<el-col :md="8" :xs="12" style="height: 50.5px"> <el-col :md="8" :xs="12" style="height: 50.5px">
<el-form-item label="产品" prop="itemId"> <el-form-item label="产品" prop="itemId">
<el-input v-model="form.itemId" readonly placeholder="请选择产品"> <el-input v-model="form.itemName" readonly placeholder="请选择产品">
<el-button <el-button
slot="append" slot="append"
icon="el-icon-search" icon="el-icon-search"
......
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