meswork/JY1.0
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

j

Browse Source
This commit is contained in:
caoxinyu
2019-09-24 08:23:38 +08:00
parent ac47b69ea3 f8c7e9afc3
commit 2a90014ac1
29 changed files with 172 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/views/Inventory/CreatePickingList/index.vue
View File

@@ -196,9 +196,11 @@
<el-input v-model="pickingListNumber" clearable size="small" style="width:200px" />
<el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="searchList()">查询</el-button>
<el-button size="small" type="primary" icon="el-icon-plus" style="margin: 0 0 0 10px" @click="createList()">创建</el-button>
<el-button size="small" type="primary" icon="el-icon-bottom" style="margin: 0 0 0 10px" @click="selectInto()">选入</el-button>
</div>
<h4 style="margin-top:0">领料单</h4>
<span style="margin:0;width: 100px;font-size: 20px">领料单</span>
<el-tooltip effect="dark" content="为所选领料单增加物料明细" placement="top" open-delay="1200">
<el-button size="small" type="primary" icon="el-icon-bottom" style="margin: 0 0 5px 10px" @click="selectInto()">选入</el-button>
</el-tooltip>
<el-table :data="pickListTable1" 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">
@@ -236,7 +238,7 @@
<el-table-column label="操作" align="center" width="230px">
<template slot-scope="scope" align="center">
<!--<el-button v-if="Number(token)===21 || Number(token)===36" :disabled="Number(scope.row.是否审批)===0 || Number(scope.row.是否启用)===0" size="mini" type="primary" @click="checkList(scope.row)">确认领回</el-button>-->
<el-button :disabled="Number(scope.row.是否启用)===0" size="mini" type="danger" icon="el-icon-delete" @click="dropList(scope.row)">删除</el-button>
<el-button :disabled="Number(scope.row.是否启用)===0" size="mini" plain type="danger" icon="el-icon-delete" @click="dropList(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
@@ -295,25 +297,25 @@
</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" type="success" size="mini">已确认</el-tag>
<el-tag v-else type="warning" size="mini">未确认</el-tag>
<el-tag v-if="Number(scope.row.是否备料确认)===1" type="success" size="mini">已备料</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" type="success" size="mini">已确认</el-tag>
<el-tag v-else type="warning" size="mini">未确认</el-tag>
<el-tag v-if="Number(scope.row.是否领料确认)===1" type="success" size="mini">已领料</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-button :disabled="!!scope.row.是否出库 || Number(scope.row.是否领料确认)===1" size="mini" type="danger" icon="el-icon-delete" @click="dropListDetail(scope.row)">删除</el-button>
<el-button :disabled="!!scope.row.是否出库 || Number(scope.row.是否领料确认)===1" size="mini" plain type="danger" icon="el-icon-delete" @click="dropListDetail(scope.row)">删除</el-button>
</template>
</el-table-column>
</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>

4
src/views/Inventory/InventoryCheck/index.vue
View File

@@ -84,7 +84,7 @@
<el-table-column label="操作" align="center" width="100">
<template slot-scope="scope">
<el-button v-if="scope.row.changeValue" type="mini" size="mini" icon="el-icon-circle-check-outline" @click="confirmEdit(scope.row)">确定</el-button>
<el-button v-else type="primary" icon="el-icon-edit" size="mini" @click="scope.row.changeValue=!scope.row.changeValue">编辑</el-button>
<el-button v-else type="primary" icon="el-icon-edit" size="mini" plain @click="scope.row.changeValue=!scope.row.changeValue">编辑</el-button>
</template>
</el-table-column>
</el-table>
@@ -100,7 +100,7 @@
</div>
</el-card>
<el-dialog :visible.sync="dialogVisible" title="新增" center style="min-height: 300px" width="880px">
<el-dialog v-el-drag-dialog :visible.sync="dialogVisible" title="新增" center style="min-height: 300px" width="880px">
<el-row>
<el-col style="width: 240px">
<span>物料名称:</span>

10
src/views/Inventory/InventoryManagement/index.vue
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>
@@ -103,7 +105,7 @@
</el-table>
</el-card>
<!--仓库表单-->
<el-dialog :visible.sync="dialogFormVisible" title="仓库" center width="450px">
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="仓库" center width="450px">
<el-form ref="form" :model="form" :rules="rules" label-position="center" label-width="110px" class="demo-ruleForm">
<el-row>
<el-col :span="12">
@@ -180,7 +182,7 @@
</div>
</el-dialog>
<!--货位表单-->
<el-dialog :visible.sync="dialogFormVisible2" title="货位" center style="min-height: 300px" width="400px">
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible2" title="货位" center style="min-height: 300px" width="400px">
<el-form ref="form2" :model="form2" :rules="rules2" label-position="left" label-width="110px" class="demo-ruleForm">
<el-row>
<el-col :span="12">

34
src/views/Inventory/MaterialOut/index.vue
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">

2
src/views/Inventory/OfflinePartOut/index.vue
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">