This commit is contained in:
zhangdingyu
2019-09-23 17:13:52 +08:00
parent b188e2a27d
commit f8c7e9afc3
8 changed files with 44 additions and 34 deletions

View File

@@ -315,7 +315,7 @@
</el-table>
</el-card>
<el-dialog :visible.sync="dialogFormVisible1" title="创建领料单" center width="380px">
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible1" title="创建领料单" center width="380px">
<el-form ref="form1" :model="form1" :rules="rules1" label-position="left">
<el-form-item label="领料人" prop="领料人流水号" label-width="100px" size="small">
<el-select v-model="form1.领料人流水号" placeholder="请选择" size="small" clearable filterable>

View File

@@ -49,7 +49,7 @@
plain
icon="el-icon-delete"
@click="handleDelete(scope.row)">删除</el-button>
<el-button size="mini" type="primary" icon="el-icon-circle-plus-outline" style="margin: 0 0 0 10px" @click="ADDLocate()">货位</el-button>
<el-button size="mini" type="primary" icon="el-icon-circle-plus-outline" style="margin: 0 0 0 10px" @click="ADDLocate()">增货位</el-button>
</template>
</el-table-column>
</el-table>
@@ -91,11 +91,13 @@
<el-button
size="mini"
icon="el-icon-edit"
type="primary"
plain
type="warning"
@click="handleLocateEdit(scope.row)">修改</el-button>
<el-button
size="mini"
type="danger"
plain
icon="el-icon-delete"
@click="locateDelete(scope.row)">删除</el-button>
</template>

View File

@@ -7,7 +7,7 @@
<el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="searchList()">查询</el-button>
</div>
<h4 style="margin-top:0">领料单</h4>
<el-table :data="pickListTable1" highlight-current-row border style="width: 100%;" size="mini" height="300" @row-click="clickList">
<el-table :data="pickListTable1" stripe highlight-current-row border style="width: 100%;" size="mini" height="300" @row-click="clickList">
<el-table-column label="序号" align="center" type="index" width="50"/>
<el-table-column label="领料单编号" align="center" min-width="200">
<template slot-scope="scope">
@@ -37,10 +37,6 @@
</el-table-column>
</el-table>
<el-row>
<el-col style="float:right;width: 200px;margin-top:15px">
<el-button :disabled="multipleSelection.length===0" size="small" type="primary" @click="prepareConfirm()">备料确认</el-button>
<el-button :disabled="multipleSelection.length===0" size="small" type="primary" @click="inputPassword()">领料确认</el-button>
</el-col>
<el-col style="width:calc(100% - 600px)">
<div class="block" style="margin: 10px 0;">
<el-pagination
@@ -55,11 +51,15 @@
</el-col>
</el-row>
<el-row style="margin: 0;">
<el-col style="width: 100px">
<el-col style="width: 300px">
<h4>领料单明细{{ pickingListNumberShow }}</h4>
</el-col>
<el-col style="float:left;width: 200px;margin-top:15px">
<el-button :disabled="multipleSelection.length===0" size="small" type="primary" @click="prepareConfirm()">备料确认</el-button>
<el-button :disabled="multipleSelection.length===0" size="small" type="primary" @click="inputPassword()">领料确认</el-button>
</el-col>
</el-row>
<el-table :data="pickListTable2" highlight-current-row border style="width: 100%;" size="mini" height="400" @row-click="clickListDetail" @selection-change="handleSelectionChange">
<el-table :data="pickListTable2" highlight-current-row stripe border style="width: 100%;" size="mini" height="400" @row-click="clickListDetail" @selection-change="handleSelectionChange">
<el-table-column type="selection" align="center" width="55"/>
<el-table-column label="序号" align="center" type="index" width="50"/>
<el-table-column label="名称" align="center" min-width="100">
@@ -109,21 +109,21 @@
</el-table-column>
<el-table-column v-if="true" label="备料确认" align="center" width="100">
<template slot-scope="scope">
<el-tag v-if="Number(scope.row.是否备料确认)===1" size="mini" type="success">确认</el-tag>
<el-tag v-else type="warning" size="mini">确认</el-tag>
<el-tag v-if="Number(scope.row.是否备料确认)===1" size="mini" type="success">备料</el-tag>
<el-tag v-else type="warning" size="mini">备料</el-tag>
</template>
</el-table-column>
<el-table-column v-if="true" label="领料确认" align="center" width="100">
<template slot-scope="scope">
<el-tag v-if="Number(scope.row.是否领料确认)===1" size="mini" type="success">确认</el-tag>
<el-tag v-else type="warning" size="mini">确认</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="100" fixed="right">
<template slot-scope="scope">
<el-button :disabled="Number(scope.row.出库数量)<=0" size="mini" icon="el-icon-back" plain type="primary" @click="sendBack(scope.row)">归还</el-button>
<el-tag v-if="Number(scope.row.是否领料确认)===1" size="mini" type="success">领料</el-tag>
<el-tag v-else type="warning" size="mini">领料</el-tag>
</template>
</el-table-column>
<!--<el-table-column label="操作" align="center" width="100" fixed="right">-->
<!--<template slot-scope="scope">-->
<!--<el-button :disabled="Number(scope.row.出库数量)<=0" size="mini" icon="el-icon-back" plain type="primary" @click="sendBack(scope.row)">归还</el-button>-->
<!--</template>-->
<!--</el-table-column>-->
</el-table>
</el-card>
@@ -136,7 +136,7 @@
占用数量{{ 占用数量 }}
</el-col>
</el-row>
<el-table :data="StockNumberTable" border style="width: 100%;" size="mini" height="300" show-summary>
<el-table :data="StockNumberTable" border stripe style="width: 100%;" size="mini" height="300" show-summary>
<el-table-column label="序号" align="center" type="index" width="50"/>
<el-table-column label="名称" align="center" min-width="100">
<template slot-scope="scope">

View File

@@ -13,7 +13,7 @@
</el-card>
<el-card>
<el-table v-loading="listLoading" :data="tableDataBasic" size="mini" border style="width: 100%;" height="440" @row-click="searchoutRecord">
<el-table v-loading="listLoading" :data="tableDataBasic" highlight-current-row size="mini" border style="width: 100%;" height="440" @row-click="searchoutRecord">
<el-table-column label="序号" align="center" type="index" width="50"/>
<el-table-column label="物料名称" align="center" min-width="120">
<template slot-scope="scope">

View File

@@ -29,6 +29,7 @@
:data="tableData"
:summary-method="getSummaries"
style="width: 100%"
highlight-current-row
height="400"
size="mini"
show-summary
@@ -71,7 +72,7 @@
</el-table-column>
<el-table-column align="center" label="操作" fixed="right">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="processingStatus(scope.row)">查看加工进度</el-button>
<el-button type="primary" plain size="mini" @click="processingStatus(scope.row)">查看加工进度</el-button>
</template>
</el-table-column>
</el-table>
@@ -316,7 +317,7 @@
@current-change="handleCurrentChange5"/>
</div>
</el-card>
<el-dialog :visible.sync="dialogFormVisible2" title="选择机床" center style="min-height: 300px">
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible2" title="选择机床" center style="min-height: 300px">
<el-table
:data="tableData6"
style="width:100%;max-height: 300px;display: inline-block"
@@ -377,7 +378,7 @@
</div>
</el-dialog>
<el-dialog :visible.sync="dialogFormVisible3" title="选择组号" center style="min-height: 300px">
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible3" title="选择组号" center style="min-height: 300px">
<el-table
:data="tableData7"
style="width:100%;max-height: 300px;display: inline-block"
@@ -428,7 +429,7 @@
</div>
</el-dialog>
<el-dialog :visible.sync="dialogFormVisible4" title="零件加工进度" center style="min-height: 300px">
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible4" :title="titleaa" center style="min-height: 300px">
<el-table
:data="tableData5"
style="width: 100%;max-height: 400px;"
@@ -480,6 +481,8 @@ import { initProject, searchTable, searchmachine, searchgroup, searchPurchaseTab
export default {
data() {
return {
titleaa: '',
零件图号: '',
entryNameValue: null, // 项目流水号
entryName: [], // 项目数组
machineToolNumber: '', // 机床图号
@@ -658,6 +661,7 @@ export default {
},
processingStatus(row) {
this.dialogFormVisible4 = true
this.titleaa = row.零件图号
processingStatus(row.工艺计划流水号).then(response => {
for (let i = 0; i < response.data.length; i++) {
if (response.data[i].计划日期 !== '' && response.data[i].计划日期 !== null) {

View File

@@ -59,7 +59,9 @@
</el-table-column>
<el-table-column label="操作" align="center" width="120" fixed="right">
<template slot-scope="scope">
<el-button :disabled="Number(scope.row.是否关联)===1" size="mini" type="warning" plain @click="connectBacklog(scope.row)">关联物料</el-button>
<el-tooltip effect="dark" content="将滞货与项目关联并使用" placement="top" open-delay="1200">
<el-button :disabled="Number(scope.row.是否关联)===1" size="mini" type="warning" plain @click="connectBacklog(scope.row)">关联物料</el-button>
</el-tooltip>
</template>
</el-table-column>
</el-table>

View File

@@ -46,7 +46,7 @@
height="300px"
highlight-current-row
@row-click="searchTable2">
<el-table-column type="expand">
<el-table-column type="expand" label="详情">
<template slot-scope="scope">
<el-form id="table" label-position="left" inline class="demo-table-expand">
<el-row>

View File

@@ -212,13 +212,15 @@
</el-table-column>
<el-table-column align="center" label="撤回分配" min-width="100px" fixed="right">
<template slot-scope="scope">
<el-button
:disabled="!(parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='')"
type="primary"
size="mini"
plain=""
icon="el-icon-back"
@click="retract(scope.row)">撤回</el-button>
<el-tooltip effect="dark" content="撤回已分配的采购任务" placement="top" open-delay="1200">
<el-button
:disabled="!(parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='')"
type="primary"
size="mini"
plain
icon="el-icon-back"
@click="retract(scope.row)">撤回</el-button>
</el-tooltip>
</template>
</el-table-column>
</el-table>