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

更新

Browse Source
This commit is contained in:
liushuai
2019-10-29 16:36:34 +08:00
parent ad31970800 e35b2215d3
commit 4f5db3ff46
116 changed files with 5956 additions and 1870 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -262,36 +262,31 @@
<el-button :disabled="Number(审批情况)===1" size="small" type="danger" icon="el-icon-delete" style="margin: 0 0 0 10px" @click="dropList()">删除领料单</el-button>
<span style="font-weight: bold">选中领料单：{{ pickingListNumberShow }}</span>
<span style="font-weight: bold">领料人：{{ peopleName }}</span>
<el-button :disabled="Number(审批情况)===1" size="small" plain type="danger" icon="el-icon-delete" style="margin-right: 20px;float: right" @click="dropListDetail(scope.row)">移除领料明细</el-button>
</div>
<div style="width: 30%;float: left">
<el-table :data="pickListTable1" :row-class-name="tableRowClassName" highlight-current-row border size="mini" height="300" @row-click="clickList">
<el-table :data="pickListTable1" :row-class-name="tableRowClassName" class="shenpi" highlight-current-row border size="mini" width="100%" height="300px" @row-click="clickList">
<el-table-column label="序号" align="center" type="index" width="50"/>
<el-table-column prop="领料单编号" label="领料单编号" align="center" width="100px">
<el-table-column prop="领料单编号" label="领料单编号" align="center" min-width="100px">
<template slot-scope="scope">
{{ scope.row.领料单编号 }}
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" width="100px" >
<el-table-column label="创建时间" align="center" min-width="100px" >
<template slot-scope="scope">
{{ scope.row.操作日期.split(' ')[0] }}
</template>
</el-table-column>
<el-table-column label="领料人" prop="领料人" align="center" width="90px">
<el-table-column label="领料人" prop="领料人" align="center" min-width="90px">
<template slot-scope="scope">
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column label="备注" prop="备注" align="center" width="130px">
<el-table-column label="备注" prop="备注" align="center" min-width="130px">
<template slot-scope="scope">
{{ scope.row.领料单备注 }}
</template>
</el-table-column>
<el-table-column label="审批" prop="审批" align="center" width="90">
<template slot-scope="scope">
<el-tag v-if="Number(scope.row.是否审批)===1" type="success">已审批</el-tag>
<el-tag v-else type="warning">未审批</el-tag>
</template>
</el-table-column>
</el-table>
<div class="block" style="float:right;margin: 10px 0;">
<el-pagination
@@ -304,35 +299,35 @@
@current-change="handleCurrentChange3"/>
</div>
</div>
<div style="width: 69%;float: left">
<el-table :data="pickListTable2" border style="width: 100%;" size="mini" height="300">
<div style="width: 69.8%;float: left">
<el-table :data="pickListTable2" border style="width: 100%;" size="mini" height="300px">
<el-table-column label="序号" align="center" type="index" width="50"/>
<el-table-column label="名称" align="center" sortable prop="名称" min-width="100">
<el-table-column label="名称" align="center" prop="名称" min-width="100">
<template slot-scope="scope">
{{ scope.row.名称 }}
</template>
</el-table-column>
<el-table-column label="图号或型号" align="center" sortable prop="图号或型号" min-width="100">
<el-table-column label="图号或型号" align="center" prop="图号或型号" min-width="110px">
<template slot-scope="scope">
{{ scope.row.图号或型号 || '—' }}
</template>
</el-table-column>
<el-table-column label="规格" align="center" sortable prop="规格" min-width="100">
<el-table-column label="规格" align="center" prop="规格" min-width="120">
<template slot-scope="scope">
{{ scope.row.规格 || '—' }}
</template>
</el-table-column>
<el-table-column label="机床图号" align="center" sortable prop="机床图号" min-width="100">
<el-table-column label="机床图号" align="center" prop="机床图号" min-width="100">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="组号" align="center" sortable prop="组号" min-width="70">
<el-table-column label="组号" align="center" prop="组号" min-width="70">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="总数量" align="center" min-width="70">
<el-table-column label="领用数量" align="center" min-width="70">
<template slot-scope="scope">
{{ scope.row.总数量 }}
</template>
@@ -347,20 +342,20 @@
{{ scope.row.出库数量1 }}
</template>
</el-table-column>
<el-table-column v-if="true" label="备料确认" align="center" sortable prop="是否备料确认" width="100">
<el-table-column v-if="true" label="备料确认" align="center" prop="是否备料确认" min-width="75px">
<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>
</template>
</el-table-column>
<el-table-column v-if="true" label="领料确认" align="center" sortable prop="是否领料确认" width="100">
<el-table-column v-if="true" label="领料确认" align="center" prop="是否领料确认" width="75px">
<template slot-scope="scope">
<el-tag v-if="(Number(scope.row.总数量) <= Number(scope.row.出库数量1)) || Number(scope.row.是否领料确认) === 1" type="success" size="mini">已领料</el-tag>
<el-tag v-else-if="Number(scope.row.总数量) > Number(scope.row.出库数量1) && Number(scope.row.出库数量1) > 0" type="primary" size="mini">未领完</el-tag>
<el-tag v-else-if="Number(scope.row.出库数量1) === 0" type="warning" size="mini">未领料</el-tag>
</template>
</el-table-column>
<el-table-column v-if="true" label="操作" align="center" width="230">
<el-table-column label="操作" align="center" min-width="120px">
<template slot-scope="scope">
<el-popover placement="right" width="500" trigger="click">
<el-table :data="gridData" highlight-current-row size="mini" show-summary>
@@ -383,7 +378,6 @@
</el-table>
<el-button slot="reference" type="primary" size="mini" icon="el-icon-search" plain @click="searchTable02(scope.row)">查看详情</el-button>
</el-popover>
<el-button :disabled="!!scope.row.是否出库 || Number(scope.row.是否领料确认)===1" size="mini" plain type="danger" icon="el-icon-delete" style="margin-left: 10px" @click="dropListDetail(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
@@ -556,11 +550,12 @@ export default {
})
},
tableRowClassName({ row }) {
if (row.是否审批 === 1) {
return 'shenpi-row'
} else {
return ''
}
return '.warning-row'
// if (row.是否审批 === 1) {
// return '.warning-row'
// } else {
// return ''
// }
},
selectable(row, index) { // 控制某行是否可选
console.log(row)
@@ -889,9 +884,6 @@ export default {
</script>
<style scoped>
.el-card{
margin-bottom: 15px;
}
.el-select{
width:200px
}
@@ -904,8 +896,11 @@ export default {
.el-tag{
margin: 0
}
.el-table .shenpi-row {
background: #55a532 !important;
</style>
<style lang="scss">
.shenpi{
.el-table .warning-row {
background: #55a532 !important;
}
}
</style>

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

@@ -32,32 +32,32 @@
</el-row>
</div>
<el-table :data="tableData1" stripe highlight-current-row border style="max-height: 500px;" height="500px" size="mini" show-summary>
<el-table-column label="名称" sortable prop="物料名称" align="center" width="150" show-overflow-tooltip>
<el-table-column label="名称" prop="物料名称" align="center" width="150" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料名称 }}
</template>
</el-table-column>
<el-table-column label="图号或型号" sortable prop="物料型号" align="center" width="120" show-overflow-tooltip>
<el-table-column label="图号或型号" prop="物料型号" align="center" width="120" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料型号 }}
</template>
</el-table-column>
<el-table-column label="规格" sortable prop="物料规格" align="center" width="130" show-overflow-tooltip>
<el-table-column label="规格" prop="物料规格" align="center" width="130" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料规格 }}
</template>
</el-table-column>
<el-table-column label="物料来源" sortable prop="物料来源" align="center" width="100">
<el-table-column label="物料来源" prop="物料来源" align="center" width="100">
<template slot-scope="scope">
{{ scope.row.物料来源 }}
</template>
</el-table-column>
<el-table-column label="仓库" sortable prop="仓库名称" align="center" min-width="90">
<el-table-column label="仓库" prop="仓库名称" align="center" min-width="90">
<template slot-scope="scope">
{{ scope.row.仓库名称 }}
</template>
</el-table-column>
<el-table-column label="货位" sortable prop="货位名称" align="center" min-width="90">
<el-table-column label="货位" prop="货位名称" align="center" min-width="90">
<template slot-scope="scope">
{{ scope.row.货位名称 }}
</template>

12
src/views/Inventory/MaterialOut/index.vue
View File

@@ -9,7 +9,7 @@
<h4 style="margin-top:0">领料单</h4>
<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="领料单编号" sortable prop="领料单编号" align="center" min-width="200">
<el-table-column label="领料单编号" prop="领料单编号" align="center" min-width="200">
<template slot-scope="scope">
{{ scope.row.领料单编号 }}
</template>
@@ -19,7 +19,7 @@
{{ scope.row.操作日期.split(' ')[0] }}
</template>
</el-table-column>
<el-table-column label="领料人" sortable prop="姓名" align="center" min-width="130">
<el-table-column label="领料人" prop="姓名" align="center" min-width="130">
<template slot-scope="scope">
{{ scope.row.姓名 }}
</template>
@@ -62,22 +62,22 @@
<el-table :data="pickListTable2" highlight-current-row stripe border style="width: 100%;" size="mini" height="400" @selection-change="handleSelectionChange">
<el-table-column :selectable="selectable" type="selection" align="center" width="55"/>
<el-table-column label="序号" align="center" type="index" width="50"/>
<el-table-column label="名称" sortable prop="名称" align="center" min-width="100">
<el-table-column label="名称" prop="名称" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.名称 }}
</template>
</el-table-column>
<el-table-column label="图号或型号" sortable prop="图号或型号" align="center" min-width="100">
<el-table-column label="图号或型号" prop="图号或型号" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.图号或型号 || '—' }}
</template>
</el-table-column>
<el-table-column label="规格" sortable prop="规格" align="center" min-width="100">
<el-table-column label="规格" prop="规格" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.规格 || '—' }}
</template>
</el-table-column>
<el-table-column label="机床图号" sortable prop="机床图号" align="center" min-width="100">
<el-table-column label="机床图号" prop="机床图号" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>

8
src/views/Inventory/OfflinePartOut/index.vue
View File

@@ -15,22 +15,22 @@
<el-card>
<el-table v-loading="listLoading" :data="tableDataBasic" highlight-current-row size="mini" border stripe style="width: 100%;" height="440" @row-click="searchoutRecord">
<el-table-column label="序号" align="center" type="index" width="50"/>
<el-table-column label="物料名称" sortable prop="物料名称" align="center" min-width="120">
<el-table-column label="物料名称" prop="物料名称" align="center" min-width="120">
<template slot-scope="scope">
{{ scope.row.物料名称 }}
</template>
</el-table-column>
<el-table-column label="物料型号" sortable prop="物料型号" align="center" min-width="120">
<el-table-column label="物料型号" prop="物料型号" align="center" min-width="120">
<template slot-scope="scope">
{{ scope.row.物料型号 }}
</template>
</el-table-column>
<el-table-column label="物料规格" sortable prop="物料规格" align="center" min-width="120">
<el-table-column label="物料规格" prop="物料规格" align="center" min-width="120">
<template slot-scope="scope">
{{ scope.row.物料规格 }}
</template>
</el-table-column>
<el-table-column label="仓库名称" sortable prop="仓库名称" align="center" min-width="80">
<el-table-column label="仓库名称" prop="仓库名称" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.仓库名称 }}
</template>

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

@@ -26,12 +26,12 @@
{{ scope.row.离线合同编号 }}
</template>
</el-table-column>
<el-table-column label="名称" sortable prop="物料名称" width="150px" align="center" show-overflow-tooltip>
<el-table-column label="名称" prop="物料名称" width="150px" align="center" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料名称 }}
</template>
</el-table-column>
<el-table-column label="规格型号" sortable prop="规格型号" width="180px" align="center" show-overflow-tooltip>
<el-table-column label="规格型号" prop="规格型号" width="180px" align="center" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.规格型号 }}
</template>

12
src/views/Inventory/OutPartSelect/index.vue
View File

@@ -40,12 +40,12 @@
align="center"
width="55"
type="index"/>
<el-table-column align="center" label="零件名称" width="150px">
<el-table-column align="center" label="零件名称" prop="零件名称" width="150px">
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="零件图号" width="150px">
<el-table-column align="center" label="零件图号" prop="零件图号" width="150px">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
@@ -55,22 +55,22 @@
{{ scope.row.出库数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="机床图号" width="120px">
<el-table-column align="center" label="机床图号" prop="机床图号" width="120px">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column align="center" label="组号" width="120px">
<el-table-column align="center" label="组号" prop="组号" width="120px">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column align="center" label="领料人">
<el-table-column align="center" label="领料人" prop="出库备注">
<template slot-scope="scope">
{{ scope.row.出库备注 }}
</template>
</el-table-column>
<el-table-column align="center" label="出库时间">
<el-table-column align="center" label="出库时间" prop="出库时间">
<template slot-scope="scope">
{{ scope.row.出库时间 }}
</template>

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

@@ -50,17 +50,17 @@
</div>
<h4 style="margin-top: 0">采购合同入库</h4>
<el-table :data="tableData1" border stripe size="mini" style="width: 100%;" height="400">
<el-table-column label="名称" sortable prop="名称" align="center" width="100" show-overflow-tooltip>
<el-table-column label="名称" prop="名称" align="center" width="100" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.名称 }}
</template>
</el-table-column>
<el-table-column label="图号或型号" sortable prop="图号或型号" align="center" width="120" show-overflow-tooltip>
<el-table-column label="图号或型号" prop="图号或型号" align="center" width="120" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.图号或型号 }}
</template>
</el-table-column>
<el-table-column label="规格" sortable prop="规格" align="center" width="120" show-overflow-tooltip>
<el-table-column label="规格" prop="规格" align="center" width="120" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.规格 }}
</template>
@@ -70,12 +70,12 @@
{{ scope.row.入库数量 }}
</template>
</el-table-column>
<el-table-column label="入库人" sortable prop="入库人" align="center" width="100" show-overflow-tooltip>
<el-table-column label="入库人" prop="入库人" align="center" width="100" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.入库人 }}
</template>
</el-table-column>
<el-table-column label="入库时间" sortable prop="入库时间" align="center" min-width="100">
<el-table-column label="入库时间" prop="入库时间" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.入库时间 }}
</template>
@@ -94,17 +94,17 @@
</div>
<h4>离线合同入库</h4>
<el-table :data="tableData2" border stripe size="mini" style="width: 100%;" height="400">
<el-table-column label="名称" sortable prop="名称" align="center" width="120" show-overflow-tooltip>
<el-table-column label="名称" prop="名称" align="center" width="120" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.名称 }}
</template>
</el-table-column>
<el-table-column label="图号或型号" sortable prop="图号或型号" align="center" width="120" show-overflow-tooltip>
<el-table-column label="图号或型号" prop="图号或型号" align="center" width="120" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.图号或型号 }}
</template>
</el-table-column>
<el-table-column label="规格" sortable prop="规格" align="center" width="120" show-overflow-tooltip>
<el-table-column label="规格" prop="规格" align="center" width="120" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.规格 }}
</template>
@@ -114,12 +114,12 @@
{{ scope.row.入库数量 }}
</template>
</el-table-column>
<el-table-column label="入库人" sortable prop="入库人" align="center" width="100">
<el-table-column label="入库人" prop="入库人" align="center" width="100">
<template slot-scope="scope">
{{ scope.row.入库人 }}
</template>
</el-table-column>
<el-table-column label="入库时间" sortable prop="入库时间" align="center" min-width="100">
<el-table-column label="入库时间" prop="入库时间" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.入库时间 }}
</template>

7
src/views/Inventory/PurchasePartsStorage/index.vue
View File

@@ -30,17 +30,12 @@
<el-card>
<el-table ref="multipleTable" :data="table1" border stripe size="mini" highlight-current-row style="width: 100%;margin-bottom: 5px" @selection-change="handleSelectionChange">
<el-table-column :selectable="selectable" type="selection" align="center" width="50px"/>
<!--<el-table-column label="合同编号" sortable prop="合同编号" width="120px" align="center" show-overflow-tooltip>-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.合同编号 }}-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column label="名称" sortable prop="物料名称" width="150px" align="center" show-overflow-tooltip >
<template slot-scope="scope">
{{ scope.row.物料名称 ? scope.row.物料名称 : scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column label="规格型号" sortable prop="规格型号" width="180px" align="center" show-overflow-tooltip>
<el-table-column label="规格型号" prop="规格型号" width="180px" align="center" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料规格 ? scope.row.物料规格 : '-' + '&nbsp;' + scope.row.物料型号 ? scope.row.零件图号 : '-' }}
</template>

12
src/views/Inventory/StockInquiry/index.vue
View File

@@ -40,12 +40,12 @@
align="center"
width="55"
type="index"/>
<el-table-column align="center" label="零件名称" width="150px">
<el-table-column align="center" label="零件名称" prop="零件名称" width="150px">
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="零件图号" width="150px">
<el-table-column align="center" label="零件图号" prop="零件图号" width="150px">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
@@ -55,12 +55,12 @@
{{ scope.row.入库数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="机床图号" width="120px">
<el-table-column align="center" label="机床图号" prop="机床图号" width="120px">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column align="center" label="组号" width="120px">
<el-table-column align="center" label="组号" prop="组号" width="120px">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
@@ -70,12 +70,12 @@
{{ scope.row.仓库名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="货位名称" width="120px">
<el-table-column align="center" label="货位名称" prop="货位名称" width="120px">
<template slot-scope="scope">
{{ scope.row.货位名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="入库时间">
<el-table-column align="center" label="入库时间" prop="入库时间">
<template slot-scope="scope">
{{ scope.row.入库时间 }}
</template>