Skip to content

M
mes-ui
Commit 7705ccf6 authored by 沈翠玲's avatar 沈翠玲
Browse files
Options

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

parents 76379a2e d08c5153
Hide whitespace changes
Inline Side-by-side
Showing with 170 additions and 506 deletions
src/views/mes/pro/workorder/indexApply.vue
View file @ 7705ccf6
<template>
<div class="app-container">
<el-form
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="100px"
>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<!-- <el-form-item label="工单编码" prop="workorderCode">
<el-input
v-model="queryParams.workorderCode"
......@@ -17,36 +10,18 @@
/>
</el-form-item> -->
<el-form-item label="状态" prop="status">
<el-select
v-model="queryParams.statusArr"
clearable
placeholder="请选择状态"
multiple
>
<el-option
v-for="dict in dict.type.mes_workorder_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
>
<el-select v-model="queryParams.statusArr" clearable placeholder="请选择状态" multiple>
<el-option v-for="dict in dict.type.mes_workorder_status" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="工单编码" prop="workorderCode">
<el-input
v-model="queryParams.workorderCode"
placeholder="请输入工单编码"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.workorderCode" placeholder="请输入工单编码" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="来源单据" prop="sourceCode">
<el-input
v-model="queryParams.sourceCode"
placeholder="请输入来源单据"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.sourceCode" placeholder="请输入来源单据" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<!-- <el-form-item label="产品编号" prop="productCode">
......@@ -58,12 +33,7 @@
/>
</el-form-item> -->
<el-form-item label="产品名称" prop="productName">
<el-input
v-model="queryParams.productName"
placeholder="请输入产品名称"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.productName" placeholder="请输入产品名称" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<!-- <el-form-item label="客户编码" prop="clientCode">
......@@ -75,21 +45,22 @@
/>
</el-form-item> -->
<el-form-item label="客户名称" prop="clientName">
<el-input
v-model="queryParams.clientName"
placeholder="请输入客户名称"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.clientName" placeholder="请输入客户名称" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="产品分类" prop="itemTypeName">
<el-input
v-model="queryParams.itemTypeName"
placeholder="请输入产品分类"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.itemTypeName" placeholder="请输入产品分类" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="工单类型" prop="workorderType">
<el-select v-model="queryParams.workorderType" clearable placeholder="请选择状态" >
<el-option v-for="dict in dict.type.mes_workorder_type"
:key="dict.value"
:label="dict.label"
:value="dict.value">
</el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="工单类型" prop="workorderType">
<el-input
v-model="queryParams.workorderType"
......@@ -99,56 +70,27 @@
/>
</el-form-item> -->
<el-form-item label="需求日期">
<el-date-picker
v-model="daterangePurchaseDate"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
<el-date-picker v-model="daterangePurchaseDate" value-format="yyyy-MM-dd" type="daterange" range-separator="-"
start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
</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-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-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['mes:pro:workorder:add']"
>新增
</el-button
>
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['mes:pro:workorder:add']">新增
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['mes:pro:workorder:edit']"
>修改
</el-button
>
<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
v-hasPermi="['mes:pro:workorder:edit']">修改
</el-button>
</el-col>
<!-- <el-col :span="1.5">
......@@ -165,78 +107,34 @@
>
</el-col> -->
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['mes:pro:workorder:export']"
>导出
</el-button
>
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
v-hasPermi="['mes:pro:workorder:export']">导出
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="info"
plain
icon="el-icon-upload2"
size="mini"
@click="handleImport"
v-hasPermi="['mes:pro:workorder:edit']"
>导入
</el-button
>
<el-button type="info" plain icon="el-icon-upload2" size="mini" @click="handleImport"
v-hasPermi="['mes:pro:workorder:edit']">导入
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-plus"
size="mini"
:disabled="multiple"
@click="handleToolNumCheck"
v-hasPermi="['mes:pro:workorder:dofinish']"
>刀模版具齐套检查
</el-button
>
<el-button type="warning" plain icon="el-icon-plus" size="mini" :disabled="multiple" @click="handleToolNumCheck"
v-hasPermi="['mes:pro:workorder:dofinish']">刀模版具齐套检查
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-plus"
size="mini"
:disabled="multiple"
@click="handleCombination"
v-hasPermi="['pro:combination:add']"
>订单组合
<el-button type="warning" plain icon="el-icon-plus" size="mini" :disabled="multiple" @click="handleCombination"
v-hasPermi="['pro:combination:add']">订单组合
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-plus"
size="mini"
:disabled="multiple"
@click="handleArrange"
v-hasPermi="['mes:pro:workorder:dofinish']"
>生产编排
</el-button
>
<el-button type="warning" plain icon="el-icon-plus" size="mini" :disabled="multiple" @click="handleArrange"
v-hasPermi="['mes:pro:workorder:dofinish']">生产编排
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleMake"
v-hasPermi="['mes:pro:workorder:make']"
>生产补单
<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleMake"
v-hasPermi="['mes:pro:workorder:make']">生产补单
</el-button>
</el-col>
......@@ -253,15 +151,8 @@
</el-button> -->
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-plus"
size="mini"
:disabled="single"
@click="handleCommandClick"
v-hasPermi="['mes:pro:workorder:dofinish']"
>生产打样下达
<el-button type="warning" plain icon="el-icon-plus" size="mini" :disabled="single" @click="handleCommandClick"
v-hasPermi="['mes:pro:workorder:dofinish']">生产打样下达
</el-button>
</el-col>
<!-- <right-toolbar
......@@ -271,13 +162,9 @@
</el-row>
<!-- 生产打样下达 -->
<el-dialog
title="打样下达填报"
:visible.sync="commandVisible"
width="1200px"
append-to-body
>
<CommandList v-if="commandVisible" ref="CommandListRef" :currentData="currentData" @close="commandVisible = false" :workorderId="currentData.workorderId"></CommandList>
<el-dialog title="打样下达填报" :visible.sync="commandVisible" width="1200px" append-to-body>
<CommandList v-if="commandVisible" ref="CommandListRef" :currentData="currentData" @close="commandVisible = false"
:workorderId="currentData.workorderId"></CommandList>
<div slot="footer" class="dialog-footer">
<el-button @click="commandVisible = false">取 消</el-button>
<el-button type="primary" @click="$refs.CommandListRef.submit(), getList()">确 定</el-button>
......@@ -286,30 +173,16 @@
<!-- 用户导入对话框 -->
<el-dialog title="导入工单" :visible.sync="upload.open" width="400px">
<el-upload
ref="upload"
:limit="1"
accept=".xlsx, .xls"
:headers="upload.headers"
:action="upload.url"
:disabled="upload.isUploading"
:on-progress="handleFileUploadProgress"
:on-success="handleFileSuccess"
:auto-upload="false"
drag
>
<el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers" :action="upload.url"
:disabled="upload.isUploading" :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess"
:auto-upload="false" drag>
<i class="el-icon-upload"></i>
<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
<div class="el-upload__tip text-center" slot="tip">
<span>仅允许导入xls、xlsx格式文件。</span>
<el-link
type="primary"
:underline="false"
style="font-size: 12px; vertical-align: baseline"
@click="importTemplate"
>下载模板
</el-link
>
<el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline"
@click="importTemplate">下载模板
</el-link>
</div>
</el-upload>
<div slot="footer" class="dialog-footer">
......@@ -318,143 +191,59 @@
</div>
</el-dialog>
<el-table
v-loading="loading"
:data="workorderList"
row-key="workorderId"
default-expand-all
@selection-change="handleSelectionChange"
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
>
<el-table v-loading="loading" :data="workorderList" row-key="workorderId" default-expand-all
@selection-change="handleSelectionChange" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
<!-- 新增复选框 -->
<el-table-column type="selection" width="55" align="center"/>
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="工单编码" width="180" prop="workorderCode">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
@click="handleView(scope.row)"
v-hasPermi="['mes:pro:workorder:query']"
>{{ scope.row.workorderCode }}
</el-button
>
<el-button size="mini" type="text" @click="handleView(scope.row)" v-hasPermi="['mes:pro:workorder:query']">{{
scope.row.workorderCode }}
</el-button>
</template>
</el-table-column>
<el-table-column label="单据状态" align="center" prop="status">
<template slot-scope="scope">
<dict-tag
:options="dict.type.mes_workorder_status"
:value="scope.row.status"
/>
<dict-tag :options="dict.type.mes_workorder_status" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="工单类型" align="center" prop="workorderType">
<template slot-scope="scope">
<dict-tag
:options="dict.type.mes_workorder_type"
:value="scope.row.workorderType"
/>
<dict-tag :options="dict.type.mes_workorder_type" :value="scope.row.workorderType" />
</template>
</el-table-column>
<el-table-column
label="组合单号"
width="180"
align="center"
prop="combinationCode"
:show-overflow-tooltip="true"
>
<el-table-column label="组合单号" width="180" align="center" prop="combinationCode" :show-overflow-tooltip="true">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
@click="showCombDetail(scope.row, scope.row.combinationCode)"
>{{ scope.row.combinationCode }}
</el-button
>
<el-button size="mini" type="text" @click="showCombDetail(scope.row, scope.row.combinationCode)">{{
scope.row.combinationCode }}
</el-button>
</template>
</el-table-column>
<el-table-column
label="编排单号"
width="100px"
align="center"
prop="arrangeCode"
:show-overflow-tooltip="true"
>
<el-table-column label="编排单号" width="100px" align="center" prop="arrangeCode" :show-overflow-tooltip="true">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
@click="showArrangDetail(scope.row, scope.row.arrangeCode)"
>{{ scope.row.arrangeCode }}
</el-button
>
<el-button size="mini" type="text" @click="showArrangDetail(scope.row, scope.row.arrangeCode)">{{
scope.row.arrangeCode }}
</el-button>
</template>
</el-table-column>
<el-table-column
label="订单编号"
width="140"
align="center"
prop="salesVoucher"
/>
<el-table-column
label="产品编号"
width="120"
align="center"
prop="sapItemCode"
/>
<el-table-column
label="产品名称"
width="200"
align="center"
prop="productName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="产品分类"
width="200"
align="center"
prop="itemTypeName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="规格型号"
align="center"
prop="productSpc"
:show-overflow-tooltip="true"
/>
<el-table-column
label="需求日期"
align="center"
prop="requestDate"
width="180"
>
<el-table-column label="订单编号" width="140" align="center" prop="salesVoucher" />
<el-table-column label="产品分类" width="200" align="center" prop="itemTypeName" :show-overflow-tooltip="true" />
<el-table-column label="产品编号" width="120" align="center" prop="sapItemCode" />
<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="requestDate" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.requestDate, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column>
<el-table-column label="单位" align="center" prop="unitOfMeasure"/>
<el-table-column label="工单数量" align="center" prop="quantity"/>
<el-table-column label="调整数量" align="center" prop="quantityChanged"/>
<el-table-column
label="已生产数量"
align="center"
width="100px"
prop="quantityProduced"
/>
<el-table-column
label="批次号"
align="center"
width="100px"
prop="batchCode"
/>
<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="unitOfMeasure" />
<el-table-column label="工单数量" align="center" prop="quantity" />
<el-table-column label="调整数量" align="center" prop="quantityChanged" />
<el-table-column label="已生产数量" align="center" width="100px" prop="quantityProduced" />
<el-table-column label="批次号" align="center" width="100px" prop="batchCode" />
<el-table-column label="客户编码" align="center" prop="clientCode" />
<el-table-column label="客户名称" align="center" prop="clientName" :show-overflow-tooltip="true" />
<!-- <el-table-column
label="工单名称"
width="200"
......@@ -486,43 +275,17 @@
show-overflow-tooltip
/> -->
<el-table-column
label="操作"
width="220px"
align="center"
fixed="right"
class-name="small-padding fixed-width"
>
<el-table-column label="操作" width="220px" align="center" fixed="right" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
v-if="scope.row.status == 'PREPARE'"
@click="handleUpdate(scope.row)"
v-hasPermi="['mes:pro:workorder:edit']"
>修改
</el-button
>
<el-button
size="mini"
type="text"
icon="el-icon-search"
@click="handleViewRecord(scope.row)"
>查看更新记录
<el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.status == 'PREPARE'"
@click="handleUpdate(scope.row)" v-hasPermi="['mes:pro:workorder:edit']">修改
</el-button>
<el-button size="mini" type="text" icon="el-icon-search" @click="handleViewRecord(scope.row)">查看更新记录
</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
v-if="scope.row.status == 'PREPARE'"
@click="handleDelete(scope.row)"
v-hasPermi="['mes:pro:workorder:remove']"
>删除
</el-button
>
<el-button size="mini" type="text" icon="el-icon-delete" v-if="scope.row.status == 'PREPARE'"
@click="handleDelete(scope.row)" v-hasPermi="['mes:pro:workorder:remove']">删除
</el-button>
<!-- <el-button
size="mini"
type="text"
......@@ -556,14 +319,8 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total > 0"
:total="total"
:page-sizes="[50, 100, 500, 1000, 2000, 3000, 4000]"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<pagination v-show="total > 0" :total="total" :page-sizes="[50, 100, 500, 1000, 2000, 3000, 4000]"
:page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
<!-- 添加或修改生产工单对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
......@@ -571,30 +328,19 @@
<el-row>
<el-col :span="8">
<el-form-item label="工单编号" prop="workorderCode">
<el-input
v-model="form.workorderCode"
placeholder="请输入工单编号"
/>
<el-input v-model="form.workorderCode" placeholder="请输入工单编号" />
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label-width="80">
<el-switch
v-model="autoGenFlag"
active-color="#13ce66"
active-text="自动生成"
@change="handleAutoGenChange(autoGenFlag)"
v-if="optType != 'view' && form.status == 'PREPARE'"
>
<el-switch v-model="autoGenFlag" active-color="#13ce66" active-text="自动生成"
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status == 'PREPARE'">
</el-switch>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="工单名称" prop="workorderName">
<el-input
v-model="form.workorderName"
placeholder="请输入工单名称"
/>
<el-input v-model="form.workorderName" placeholder="请输入工单名称" />
</el-form-item>
</el-col>
</el-row>
......@@ -627,25 +373,14 @@
</el-col> -->
<el-col :span="8" v-if="form.orderSource == 'ORDER'">
<el-form-item label="订单编号" prop="salesVoucher">
<el-input
v-model="form.salesVoucher"
placeholder="请输入订单编号"
/>
<el-input v-model="form.salesVoucher" placeholder="请输入订单编号" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="单据状态" prop="status">
<el-select
v-model="form.status"
disabled
placeholder="请选择单据状态"
>
<el-option
v-for="dict in dict.type.mes_workorder_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
<el-select v-model="form.status" disabled placeholder="请选择单据状态">
<el-option v-for="dict in dict.type.mes_workorder_status" :key="dict.value" :label="dict.label"
:value="dict.value"></el-option>
</el-select>
</el-form-item>
</el-col>
......@@ -654,12 +389,8 @@
<el-col :span="8">
<el-form-item label="工单类型" prop="workorderType">
<el-select v-model="form.workorderType" placeholder="请选择类型">
<el-option
v-for="dict in dict.type.mes_workorder_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
<el-option v-for="dict in dict.type.mes_workorder_type" :key="dict.value" :label="dict.label"
:value="dict.value"></el-option>
</el-select>
</el-form-item>
</el-col>
......@@ -673,59 +404,38 @@
</el-col> -->
<el-col :span="8">
<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-col>
</el-row>
<el-row>
<el-col :span="12">
<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-col>
<el-col :span="12">
<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-col>
</el-row>
<el-row>
<el-col :span="8">
<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-col>
<el-col :span="8">
<el-form-item label="需求日期" prop="requestDate">
<el-date-picker
clearable
v-model="form.requestDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择需求日期"
>
<el-date-picker clearable v-model="form.requestDate" type="date" value-format="yyyy-MM-dd"
placeholder="请选择需求日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="批次号" prop="batchCode">
<el-input v-model="form.batchCode" placeholder="请输入批次号"/>
<el-input v-model="form.batchCode" placeholder="请输入批次号" />
</el-form-item>
</el-col>
</el-row>
......@@ -733,11 +443,7 @@
<el-col :span="12">
<el-form-item label="客户编码" prop="clientCode">
<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>
<ClientSelect ref="clientSelect" @onSelected="onClientSelected">
</ClientSelect>
......@@ -745,40 +451,26 @@
</el-col>
<el-col :span="12">
<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-col>
<el-col></el-col>
</el-row>
<el-row
v-if="
form.workorderType == 'OUTSOURCE' ||
form.workorderType == 'PURCHASE'
"
>
<el-row v-if="
form.workorderType == 'OUTSOURCE' ||
form.workorderType == 'PURCHASE'
">
<el-col :span="12">
<el-form-item label="供应商编码" prop="vendorCode">
<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>
<VendorSelect ref="vendorSelect" @onSelected="onVendorSelected"/>
<VendorSelect ref="vendorSelect" @onSelected="onVendorSelected" />
</el-form-item>
</el-col>
<el-col :span="12">
<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-col>
<el-col></el-col>
......@@ -791,75 +483,47 @@
<el-row>
<el-col :span="24">
<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-col>
</el-row>
</el-form>
<el-tabs type="border-card" v-if="form.workorderId != null">
<el-tab-pane label="BOM组成">
<Workorderbom
ref="bomlist"
:optType="optType"
:workorder="form"
@handleAddSub="handleSubAdd"
></Workorderbom>
<Workorderbom ref="bomlist" :optType="optType" :workorder="form" @handleAddSub="handleSubAdd"></Workorderbom>
</el-tab-pane>
<el-tab-pane label="物料需求"></el-tab-pane>
</el-tabs>
<div slot="footer" class="dialog-footer">
<el-button
type="primary"
@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.workorderId != null
"
>确 认
</el-button
>
<el-button type="primary" @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.workorderId != null
">确 认
</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
<el-dialog title="组合单明细" v-if="combOpen" :visible.sync="combOpen" width="1000px" append-to-body
@close="getList">
<el-dialog title="组合单明细" v-if="combOpen" :visible.sync="combOpen" width="1000px" append-to-body @close="getList">
<CombinationInfos :combinationCodes="combinationCodes" :showBtn="showCombinationBtn"></CombinationInfos>
</el-dialog>
<el-dialog title="编排单明细" v-if="arrangeOpen" :visible.sync="arrangeOpen" width="1000px" append-to-body
@close="getList">
@close="getList">
<ArrangeInfo :arrange-code="arrangeCode" :showBtn="showArrangBtn"></ArrangeInfo>
</el-dialog>
<el-dialog title="编排单明细" v-if="arrangeOpen2" :visible.sync="arrangeOpen2" width="1000px" append-to-body
@close="getList">
@close="getList">
<ArrangeInfo :group-code="groupCode" :addBtn="false"></ArrangeInfo>
</el-dialog>
<WorkorderRecordSelect
ref="WorkorderRecordSelectRef"
:data="currentData"
/>
<WorkorderRecordSelect ref="WorkorderRecordSelectRef" :data="currentData" />
</div>
</template>
......@@ -877,20 +541,20 @@ import {
doCheckToolNum
} from "@/api/mes/pro/workorder";
import {addProtaskList} from "@/api/mes/pro/protask";
import { addProtaskList } from "@/api/mes/pro/protask";
import Workorderbom from "./bom/bom.vue";
import WorkorderItemList from "./items/item.vue";
import ItemSelect from "@/components/itemSelect/single.vue";
import ClientSelect from "@/components/clientSelect/single.vue";
import VendorSelect from "@/components/vendorSelect/single.vue";
import {genCode} from "@/api/system/autocode/rule";
import { genCode } from "@/api/system/autocode/rule";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import {getToken} from "@/utils/auth";
import {addCombination, batchAddCombination} from "@/api/mes/pro/combination";
import { getToken } from "@/utils/auth";
import { addCombination, batchAddCombination } from "@/api/mes/pro/combination";
import CombinationInfos from "@/views/mes/pro/combination/infos.vue";
import {batchAddArrange} from "@/api/mes/pro/arrange";
import { batchAddArrange } from "@/api/mes/pro/arrange";
import ArrangeInfo from "@/views/mes/pro/arrange/info.vue";
import CommandList from "./commandList.vue";
import dayjs from 'dayjs';
......@@ -960,7 +624,7 @@ export default {
// 是否更新已经存在的用户数据
updateSupport: 0,
// 设置上传的请求头部
headers: {Authorization: "Bearer " + getToken()},
headers: { Authorization: "Bearer " + getToken() },
// 上传的地址
url: process.env.VUE_APP_BASE_API + "/mes/pro/workorder/importData",
},
......@@ -996,36 +660,36 @@ export default {
// 表单校验
rules: {
workorderCode: [
{required: true, message: "工单编码不能为空", trigger: "blur"},
{ required: true, message: "工单编码不能为空", trigger: "blur" },
],
workorderName: [
{required: true, message: "工单名称不能为空", trigger: "blur"},
{ required: true, message: "工单名称不能为空", trigger: "blur" },
],
workorderType: [
{required: true, message: "请选择生产工单类型", trigger: "blur"},
{ required: true, message: "请选择生产工单类型", trigger: "blur" },
],
orderSource: [
{required: true, message: "来源类型不能为空", trigger: "blur"},
{ required: true, message: "来源类型不能为空", trigger: "blur" },
],
productId: [
{required: true, message: "产品不能为空", trigger: "blur"},
{ required: true, message: "产品不能为空", trigger: "blur" },
],
productCode: [
{required: true, message: "产品编号不能为空", trigger: "blur"},
{ required: true, message: "产品编号不能为空", trigger: "blur" },
],
productName: [
{required: true, message: "产品名称不能为空", trigger: "blur"},
{ required: true, message: "产品名称不能为空", trigger: "blur" },
],
quantity: [
{required: true, message: "生产数量不能为空", trigger: "blur"},
{ required: true, message: "生产数量不能为空", trigger: "blur" },
],
requestDate: [
{required: true, message: "需求日期不能为空", trigger: "blur"},
{ required: true, message: "需求日期不能为空", trigger: "blur" },
],
},
};
},
activated () {
activated() {
this.getList();
},
created() {
......@@ -1034,21 +698,21 @@ export default {
},
methods: {
//筛选日期设置默认值
setDate(){
this.daterangePurchaseDate = [dayjs().format('YYYY-MM-DD'), dayjs().add(6, 'day').format('YYYY-MM-DD')]
setDate() {
this.daterangePurchaseDate = [dayjs().format('YYYY-MM-DD'), dayjs().add(7, 'day').format('YYYY-MM-DD')]
},
handleCommandClick() {
this.currentData = this.selectedRows[0]
if (this.selectedRows[0].workorderType == 'prototype'&&this.selectedRows[0].status === "PREPARE") {
if (this.selectedRows[0].workorderType == 'prototype' && this.selectedRows[0].status === "PUBLISHED") {
this.commandVisible = true
} else {
this.$message.warning('请选择工单类型为打样工单、状态为待发布的数据')
this.$message.warning('请选择工单类型为打样工单、状态为已发布的数据')
}
},
handleViewRecord(row){
handleViewRecord(row) {
this.currentData = row
this.$refs.WorkorderRecordSelectRef.showFlag = true
},
......@@ -1143,7 +807,7 @@ export default {
/** 查询生产工单列表 */
getList() {
this.loading = true;
this.queryParams.params = {};
this.queryParams.params = {};
if (null != this.daterangePurchaseDate && '' != this.daterangePurchaseDate) {
this.queryParams.params["beginPurchaseDate"] = this.daterangePurchaseDate[0];
this.queryParams.params["endPurchaseDate"] = this.daterangePurchaseDate[1];
......@@ -1183,7 +847,7 @@ export default {
response.msg +
"</div>",
"导入结果",
{dangerouslyUseHTMLString: true}
{ dangerouslyUseHTMLString: true }
);
this.getList();
},
......@@ -1270,7 +934,7 @@ export default {
/** 重置按钮操作 */
resetQuery() {
this.daterangePurchaseDate= [];
this.daterangePurchaseDate = [];
this.resetForm("queryForm");
this.handleQuery();
},
......@@ -1300,7 +964,7 @@ export default {
},
// 查询明细按钮操作
handleView(row) {
if(row.workorderType === 'complements') {
if (row.workorderType === 'complements') {
this.reset();
this.getTreeselect();
const workorderId = row.workorderId || this.ids;
......@@ -1338,7 +1002,7 @@ export default {
// 查询记录
handleSelectChangerecord(){
handleSelectChangerecord() {
this.reset();
this.$router.push("/mes/pro/workorder/changerecord");
},
......
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