Merge branch 'master' of ssh://192.168.0.149:29418/高精2.0
This commit is contained in:
jiangfuzhuang
645
src/views/Inventory/CreatePickingList/index.vue
Normal file
645
src/views/Inventory/CreatePickingList/index.vue
Normal file
@@ -0,0 +1,645 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<el-card>
|
||||
<div slot="header">
|
||||
<span>机床编号:</span>
|
||||
<el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="machineChange">
|
||||
<el-option
|
||||
v-for="item in machineNumber"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value">
|
||||
<div style="float: left">{{ item.label }}</div>
|
||||
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
|
||||
</el-option>
|
||||
</el-select>
|
||||
<span>组号:</span>
|
||||
<el-select v-model="groupNumberValue" placeholder="组号" size="small" clearable>
|
||||
<el-option
|
||||
v-for="item in groupNumber"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
<el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="pageCurrent0=1;pageSize0=20;pageCurrent1=1;pageSize1=20;pageCurrent2=1;pageSize2=20;searchTable()">查询</el-button>
|
||||
</div>
|
||||
<el-tabs v-model="PartType" type="card" @tab-click="searchTable()">
|
||||
<el-tab-pane label="标准件" name="标准件">
|
||||
<el-table ref="multipleTable" :data="tableData0" size="mini" style="max-height: 600px" height="600px" border stripe @selection-change="handleSelectionChange">
|
||||
<el-table-column type="selection" align="center" width="50"/>
|
||||
<el-table-column align="center" label="机床图号" min-width="100px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.机床图号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="组号" min-width="80px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.组号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="名称" min-width="100px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.物料名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="型号" min-width="100px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.物料型号 || '—' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="规格" min-width="200px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.物料规格 || '—' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="单台机床数量" min-width="100px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.单台机床数量 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="总数量" min-width="100px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.总数量 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="备件数量" min-width="100px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.备件总数量 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<div class="block" style="float:right;">
|
||||
<el-pagination
|
||||
:current-page="pageCurrent0"
|
||||
:page-sizes="[10, 20, 30, 40]"
|
||||
:page-size="pageSize0"
|
||||
:total="total0"
|
||||
style="margin-top:10px;display:inline-block;width:50%"
|
||||
layout="total, sizes, prev, pager, next, jumper"
|
||||
@size-change="handleSizeChange0"
|
||||
@current-change="handleCurrentChange0"/>
|
||||
</div>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="外购件" name="外购件">
|
||||
<el-table ref="multipleTable" :data="tableData1" size="mini" style="max-height: 600px" height="600px" border stripe @selection-change="handleSelectionChange">
|
||||
<el-table-column type="selection" align="center" width="50"/>
|
||||
<el-table-column align="center" label="机床图号" min-width="100px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.机床图号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="组号" min-width="80px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.组号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="名称" min-width="100px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.物料名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="型号" min-width="100px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.物料型号 || '—' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="规格" min-width="200px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.物料规格 || '—' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="总数量" min-width="100px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.总数量 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="备件数量" min-width="100px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.备件总数量 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<div class="block" style="float:right;">
|
||||
<el-pagination
|
||||
:current-page="pageCurrent1"
|
||||
:page-sizes="[10, 20, 30, 40]"
|
||||
:page-size="pageSize1"
|
||||
:total="total1"
|
||||
style="margin-top:10px;display:inline-block;width:50%"
|
||||
layout="total, sizes, prev, pager, next, jumper"
|
||||
@size-change="handleSizeChange1"
|
||||
@current-change="handleCurrentChange1"/>
|
||||
</div>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="基本件" name="基本件">
|
||||
<el-table ref="multipleTable" :data="tableData2" size="mini" style="max-height: 600px" height="600px" border stripe @selection-change="handleSelectionChange">
|
||||
<el-table-column type="selection" align="center" width="50"/>
|
||||
<el-table-column align="center" label="机床图号" min-width="100px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.机床图号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="组号" min-width="80px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.组号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="名称" min-width="100px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.零件名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="图号" min-width="100px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.零件图号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="规格" min-width="100px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.规格 || '—' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="材料" min-width="100px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.材料 || '—' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="总数量" min-width="100px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.总数量 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="备件数量" min-width="100px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.备件总数量 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<div class="block" style="float:right;">
|
||||
<el-pagination
|
||||
:current-page="pageCurrent2"
|
||||
:page-sizes="[10, 20, 30, 40]"
|
||||
:page-size="pageSize2"
|
||||
:total="total2"
|
||||
style="margin-top:10px;display:inline-block;width:50%"
|
||||
layout="total, sizes, prev, pager, next, jumper"
|
||||
@size-change="handleSizeChange2"
|
||||
@current-change="handleCurrentChange2"/>
|
||||
</div>
|
||||
</el-tab-pane>
|
||||
</el-tabs>
|
||||
</el-card>
|
||||
|
||||
<el-card>
|
||||
<div slot="header">
|
||||
<span style="margin: 5px">领料单编号:</span>
|
||||
<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>
|
||||
<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">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.领料单编号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="创建时间" align="center" min-width="200" >
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.操作日期.split(' ')[0] }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="领料人" align="center" min-width="130">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.姓名 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="领料单备注" align="center" min-width="130">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.领料单备注 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="领回确认" align="center" min-width="80">
|
||||
<template slot-scope="scope">
|
||||
<el-tag v-if="Number(scope.row.是否启用)===1" type="warning">未确认</el-tag>
|
||||
<el-tag v-else type="success">已确认</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" align="center" width="200px">
|
||||
<template slot-scope="scope" align="center">
|
||||
<el-button :disabled="Number(scope.row.是否启用)===0" size="mini" type="primary" icon="el-icon-check" @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>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<div class="block" style="float:right;margin: 10px 0;">
|
||||
<el-pagination
|
||||
:current-page="pageCurrent3"
|
||||
:page-sizes="[10, 20, 30, 40]"
|
||||
:page-size="pageSize3"
|
||||
:total="total3"
|
||||
layout="total, sizes, prev, pager, next, jumper"
|
||||
@size-change="handleSizeChange3"
|
||||
@current-change="handleCurrentChange3"/>
|
||||
</div>
|
||||
<h4>领料单明细：{{ pickingListNumberShow }}</h4>
|
||||
<el-table :data="pickListTable2" border style="width: 100%;" size="mini" height="300">
|
||||
<el-table-column label="序号" align="center" type="index" width="50"/>
|
||||
<el-table-column label="名称" align="center" min-width="100">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="图号或型号" align="center" min-width="100">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.图号或型号 || '—' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="规格" align="center" min-width="100">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.规格 || '—' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="机床图号" align="center" min-width="100">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.机床图号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="组号" align="center" min-width="70">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.组号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="总数量" align="center" min-width="70">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.总数量 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="备件数量" align="center" min-width="70">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.备件数量 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column v-if="true" label="操作" align="center" width="100">
|
||||
<template slot-scope="scope">
|
||||
<el-button :disabled="!!scope.row.是否出库" size="mini" 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-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>
|
||||
<el-option
|
||||
v-for="item in pickPerson"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="领料单备注" prop="领料单备注" label-width="100px">
|
||||
<el-input v-model="form1.领料单备注" size="small" placeholder="备注" style="width: 200px"/>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button @click="dialogFormVisible1=false">取消</el-button>
|
||||
<el-button type="primary" @click="submitCreateList()">确 定</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { initPickPerson, initMachineProject, searchgroup, searchTable, searchList, createList, dropList, selectIntoList, searchListDetail, dropListDetail } from '@/api/Inventory/CreatePickingList'
|
||||
import request from '@/utils/request'
|
||||
export default {
|
||||
name: 'CreatePickingList',
|
||||
data() {
|
||||
return {
|
||||
PartType: '基本件',
|
||||
machineNumberValue: '',
|
||||
machineNumber: [],
|
||||
groupNumberValue: '',
|
||||
groupNumber: [],
|
||||
tableData0: [],
|
||||
tableData1: [],
|
||||
tableData2: [],
|
||||
pageCurrent0: 1,
|
||||
pageSize0: 20,
|
||||
total0: 0,
|
||||
pageCurrent1: 1,
|
||||
pageSize1: 20,
|
||||
total1: 0,
|
||||
pageCurrent2: 1,
|
||||
pageSize2: 20,
|
||||
total2: 0,
|
||||
pickListTable1: [],
|
||||
pageCurrent3: 1,
|
||||
pageSize3: 20,
|
||||
total3: 0,
|
||||
pickListTable2: [],
|
||||
dialogFormVisible1: false,
|
||||
form1: {
|
||||
领料人流水号: '',
|
||||
领料单备注: ''
|
||||
},
|
||||
rules1: {
|
||||
领料人流水号: [{ required: true, message: '请选择领料人' }]
|
||||
},
|
||||
pickPerson: [],
|
||||
pickingListNumber: '', // 领料单编号
|
||||
pickingListNumberShow: '', // 领料单编号
|
||||
pickingListNum: '', // 领料单流水号
|
||||
multipleSelection: []
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
this.fetchData()
|
||||
this.searchTable()
|
||||
this.searchList()
|
||||
},
|
||||
methods: {
|
||||
// 初始化数据
|
||||
fetchData() {
|
||||
initPickPerson().then(response => {
|
||||
for (let i = 0; i < response.data.length; i++) {
|
||||
this.pickPerson.push({
|
||||
label: response.data[i].姓名,
|
||||
value: response.data[i].人员编号
|
||||
})
|
||||
}
|
||||
})
|
||||
initMachineProject().then(response => {
|
||||
for (let i = 0; i < response.data.length; i++) {
|
||||
this.machineNumber.push({
|
||||
label: response.data[i].机床图号,
|
||||
name: response.data[i].项目名称,
|
||||
value: response.data[i].机床流水号
|
||||
})
|
||||
}
|
||||
})
|
||||
},
|
||||
// 根据机床查分组
|
||||
machineChange() {
|
||||
this.groupNumberValue = ''
|
||||
this.groupNumber = []
|
||||
searchgroup(this.machineNumberValue).then(response => {
|
||||
for (let i = 0; i < response.data.length; i++) {
|
||||
this.groupNumber.push({
|
||||
label: response.data[i].组号,
|
||||
value: response.data[i].组件流水号
|
||||
})
|
||||
}
|
||||
})
|
||||
},
|
||||
// 查三表
|
||||
searchTable() {
|
||||
this.multipleSelection = []
|
||||
if (this.PartType === '标准件') {
|
||||
this.searchTable0()
|
||||
} else if (this.PartType === '外购件') {
|
||||
this.searchTable1()
|
||||
} else if (this.PartType === '基本件') {
|
||||
this.searchTable2()
|
||||
}
|
||||
},
|
||||
// 标准件
|
||||
searchTable0() {
|
||||
let check1, check2
|
||||
this.machineNumberValue ? check1 = 1 : check1 = 0
|
||||
this.groupNumberValue ? check2 = 1 : check2 = 0
|
||||
searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent0, this.pageSize0, 1).then(response => {
|
||||
this.tableData0 = response.data.rows
|
||||
this.total0 = response.data.total
|
||||
})
|
||||
},
|
||||
// 外购件
|
||||
searchTable1() {
|
||||
let check1, check2
|
||||
this.machineNumberValue ? check1 = 1 : check1 = 0
|
||||
this.groupNumberValue ? check2 = 1 : check2 = 0
|
||||
searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent1, this.pageSize1, 2).then(response => {
|
||||
this.tableData1 = response.data.rows
|
||||
this.total1 = response.data.total
|
||||
})
|
||||
},
|
||||
// 基本件
|
||||
searchTable2() {
|
||||
let check1, check2
|
||||
this.machineNumberValue ? check1 = 1 : check1 = 0
|
||||
this.groupNumberValue ? check2 = 1 : check2 = 0
|
||||
searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent2, this.pageSize2, 3).then(response => {
|
||||
this.tableData2 = response.data.rows
|
||||
this.total2 = response.data.total
|
||||
})
|
||||
},
|
||||
handleSizeChange0(val) {
|
||||
this.pageSize0 = val
|
||||
this.pageCurrent0 = 1
|
||||
this.searchTable0()
|
||||
},
|
||||
handleCurrentChange0(val) {
|
||||
this.pageCurrent0 = val
|
||||
this.searchTable0()
|
||||
},
|
||||
handleSizeChange1(val) {
|
||||
this.pageSize1 = val
|
||||
this.pageCurrent1 = 1
|
||||
this.searchTable1()
|
||||
},
|
||||
handleCurrentChange1(val) {
|
||||
this.pageCurrent1 = val
|
||||
this.searchTable1()
|
||||
},
|
||||
handleSizeChange2(val) {
|
||||
this.pageSize2 = val
|
||||
this.pageCurrent2 = 1
|
||||
this.searchTable2()
|
||||
},
|
||||
handleCurrentChange2(val) {
|
||||
this.pageCurrent2 = val
|
||||
this.searchTable2()
|
||||
},
|
||||
// 查询领料单列表
|
||||
searchList() {
|
||||
let check
|
||||
this.pickingListNumber ? check = 1 : check = 0
|
||||
searchList(this.pageCurrent3, this.pageSize3, check, this.pickingListNumber).then(response => {
|
||||
this.pickListTable1 = response.data.rows
|
||||
this.total3 = response.data.total
|
||||
})
|
||||
},
|
||||
handleSizeChange3(val) {
|
||||
this.pageSize3 = val
|
||||
this.pageCurrent3 = 1
|
||||
this.searchList()
|
||||
},
|
||||
handleCurrentChange3(val) {
|
||||
this.pageCurrent3 = val
|
||||
this.searchList()
|
||||
},
|
||||
// 创建领料单
|
||||
createList() {
|
||||
if (this.$refs['form1'] !== undefined) {
|
||||
this.$refs['form1'].resetFields()
|
||||
}
|
||||
this.form1.领料人流水号 = ''
|
||||
this.form1.领料单备注 = ''
|
||||
this.dialogFormVisible1 = true
|
||||
},
|
||||
// 提交创建领料单
|
||||
submitCreateList() {
|
||||
createList(this.form1.领料人流水号, this.form1.领料单备注).then(response => {
|
||||
if (response.data[0].result === '1') {
|
||||
this.$message.success('创建成功')
|
||||
this.dialogFormVisible1 = false
|
||||
this.searchList()
|
||||
} else { this.$message.error('操作失败') }
|
||||
})
|
||||
},
|
||||
// 确认领料单
|
||||
checkList(row) {
|
||||
this.$confirm('是否确认领回?', '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning'
|
||||
}).then(() => {
|
||||
const param = {
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '4',
|
||||
name: `update 车间装配管理_领料单 set 是否启用 = 0 where 领料单流水号 = ${row.领料单流水号}`
|
||||
}
|
||||
}
|
||||
request(param).then(res => {
|
||||
if (res.data[0].result === '1') {
|
||||
this.$message.success('操作成功')
|
||||
this.pickingListNumber = ''
|
||||
this.searchList()
|
||||
} else {
|
||||
this.$message.error('操作失败')
|
||||
}
|
||||
})
|
||||
}).catch(() => {
|
||||
this.$message({
|
||||
type: 'info',
|
||||
message: '已取消操作'
|
||||
})
|
||||
})
|
||||
},
|
||||
// 删除领料单
|
||||
dropList(row) {
|
||||
this.$confirm('此操作将永久删除该行, 是否继续?', '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning'
|
||||
}).then(() => {
|
||||
dropList(row.领料单流水号).then(response => {
|
||||
if (Number(response.data[0].result) === 1) {
|
||||
this.$message.success('删除成功')
|
||||
this.searchList()
|
||||
} else {
|
||||
this.$message.error('数据占用')
|
||||
}
|
||||
})
|
||||
}).catch(() => {
|
||||
this.$message({
|
||||
type: 'info',
|
||||
message: '已取消删除'
|
||||
})
|
||||
})
|
||||
},
|
||||
// 多选
|
||||
handleSelectionChange(val) {
|
||||
this.multipleSelection = val
|
||||
},
|
||||
// 选入
|
||||
selectInto() {
|
||||
const basePartGroup = []
|
||||
const purchasePartGroup = []
|
||||
this.multipleSelection.map(v => {
|
||||
v.基本件流水号 ? basePartGroup.push(v.基本件流水号) : purchasePartGroup.push(v.标准件和外购件流水号)
|
||||
})
|
||||
if (basePartGroup.length === 0 && purchasePartGroup.length === 0) {
|
||||
this.$message.warning('请勾选零件')
|
||||
return
|
||||
}
|
||||
if (!this.pickingListNum || !this.pickingListNumberShow) {
|
||||
this.$message.warning('请选择领料单')
|
||||
return
|
||||
}
|
||||
if (basePartGroup.length) { // 基本件
|
||||
selectIntoList(basePartGroup, null, this.pickingListNum).then(response => {
|
||||
if (response.data[0].result === '1') {
|
||||
this.$message.success('操作成功')
|
||||
this.searchTable()
|
||||
this.clickList()
|
||||
} else { this.$message.error('操作失败') }
|
||||
})
|
||||
} else { // 标准件外购件
|
||||
selectIntoList(null, purchasePartGroup, this.pickingListNum).then(response => {
|
||||
if (response.data[0].result === '1') {
|
||||
this.$message.success('操作成功')
|
||||
this.searchTable()
|
||||
this.clickList()
|
||||
} else { this.$message.error('操作失败') }
|
||||
})
|
||||
}
|
||||
},
|
||||
// 查看领料单明细
|
||||
clickList(row) {
|
||||
row ? this.pickingListNum = row.领料单流水号 : this.pickingListNum
|
||||
row ? this.pickingListNumberShow = row.领料单编号 : this.pickingListNumberShow
|
||||
searchListDetail(this.pickingListNum).then(res => {
|
||||
this.pickListTable2 = res.data
|
||||
})
|
||||
},
|
||||
// 删除领料单明细
|
||||
dropListDetail(row) {
|
||||
console.log(row)
|
||||
this.$confirm('此操作将永久删除该行, 是否继续?', '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning'
|
||||
}).then(() => {
|
||||
dropListDetail(row.领料单明细流水号).then(response => {
|
||||
if (Number(response.data[0].result) === 1) {
|
||||
this.$message.success('删除成功')
|
||||
this.clickList()
|
||||
} else {
|
||||
this.$message.error('已确认领回，不可删除')
|
||||
}
|
||||
})
|
||||
}).catch(() => {
|
||||
this.$message({
|
||||
type: 'info',
|
||||
message: '已取消删除'
|
||||
})
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.el-card{
|
||||
margin-bottom: 15px;
|
||||
}
|
||||
.el-select{
|
||||
width:200px
|
||||
}
|
||||
.el-input{
|
||||
width:200px
|
||||
}
|
||||
span{
|
||||
margin: 10px 0 10px 10px;
|
||||
}
|
||||
.el-tag{
|
||||
margin: 0
|
||||
}
|
||||
</style>
|
||||
235
src/views/Inventory/MaterialOut/index.vue
Normal file
235
src/views/Inventory/MaterialOut/index.vue
Normal file
@@ -0,0 +1,235 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<el-card>
|
||||
<div slot="header">
|
||||
<span style="margin: 5px">领料单编号:</span>
|
||||
<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>
|
||||
</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-column label="序号" align="center" type="index" width="50"/>
|
||||
<el-table-column label="领料单编号" align="center" min-width="200">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.领料单编号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="创建时间" align="center" min-width="200" >
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.操作日期.split(' ')[0] }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="领料人" align="center" min-width="130">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.姓名 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="领料单备注" align="center" min-width="130">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.领料单备注 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="领回确认" align="center" min-width="80">
|
||||
<template slot-scope="scope">
|
||||
<el-tag v-if="Number(scope.row.是否启用)===1" type="warning">未确认</el-tag>
|
||||
<el-tag v-else type="success">已确认</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<div class="block" style="float:right;margin: 10px 0;">
|
||||
<el-pagination
|
||||
:current-page="pageCurrent3"
|
||||
:page-sizes="[10, 20, 30, 40]"
|
||||
:page-size="pageSize3"
|
||||
:total="total3"
|
||||
layout="total, sizes, prev, pager, next, jumper"
|
||||
@size-change="handleSizeChange3"
|
||||
@current-change="handleCurrentChange3"/>
|
||||
</div>
|
||||
<h4>领料单明细：{{ pickingListNumberShow }}</h4>
|
||||
<el-table :data="pickListTable2" highlight-current-row border style="width: 100%;" size="mini" height="300" @row-click="clickListDetail">
|
||||
<el-table-column label="序号" align="center" type="index" width="50"/>
|
||||
<el-table-column label="名称" align="center" min-width="100">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="图号或型号" align="center" min-width="100">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.图号或型号 || '—' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="规格" align="center" min-width="100">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.规格 || '—' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="机床图号" align="center" min-width="100">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.机床图号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="组号" align="center" min-width="70">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.组号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="总数量" align="center" min-width="70">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.总数量 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="备件数量" align="center" min-width="70">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.备件数量 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="已领数量" align="center" min-width="70">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.备件数量 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-card>
|
||||
|
||||
<el-card>
|
||||
<h4 style="margin-top:0">物料货位数量信息</h4>
|
||||
<el-table :data="StockNumberTable" border style="width: 100%;" size="mini" height="300">
|
||||
<el-table-column label="序号" align="center" type="index" width="50"/>
|
||||
<el-table-column label="名称" align="center" min-width="100">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.物料名称 || scope.row.零件名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="图号或型号" align="center" min-width="100">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.物料型号 || scope.row.零件图号 || '—' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="规格" align="center" min-width="100">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.物料规格 || scope.row.规格 || '—' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="仓库名称" align="center" min-width="70">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.仓库名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="货位名称" align="center" min-width="70">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.货位名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="货位存量" align="center" min-width="70">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.货位存量 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="机床图号" align="center" min-width="100">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.机床图号 || '—' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="组号" align="center" min-width="70">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.组号 || '—' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" align="center" width="200px">
|
||||
<template slot-scope="scope" align="center">
|
||||
<el-button size="mini" type="primary" @click="outStore(scope.row)">出库</el-button>
|
||||
<el-button size="mini" type="warning" @click="errorRecord(scope.row)">异常记录</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-card>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { searchList, searchListDetail, searchStockNumber } from '@/api/Inventory/MaterialOut'
|
||||
export default {
|
||||
name: 'MaterialOut',
|
||||
data() {
|
||||
return {
|
||||
pickingListNumber: '',
|
||||
pickingListNumberShow: '',
|
||||
pickListTable1: [],
|
||||
pageCurrent3: 1,
|
||||
pageSize3: 20,
|
||||
total3: 0,
|
||||
pickListTable2: [],
|
||||
StockNumberTable: []
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
this.searchList()
|
||||
},
|
||||
methods: {
|
||||
// 查询领料单列表
|
||||
searchList() {
|
||||
let check
|
||||
this.pickingListNumber ? check = 1 : check = 0
|
||||
searchList(this.pageCurrent3, this.pageSize3, check, this.pickingListNumber).then(response => {
|
||||
this.pickListTable1 = response.data.rows
|
||||
this.total3 = response.data.total
|
||||
})
|
||||
},
|
||||
handleSizeChange3(val) {
|
||||
this.pageSize3 = val
|
||||
this.pageCurrent3 = 1
|
||||
this.searchList()
|
||||
},
|
||||
handleCurrentChange3(val) {
|
||||
this.pageCurrent3 = val
|
||||
this.searchList()
|
||||
},
|
||||
// 查看领料单明细
|
||||
clickList(row) {
|
||||
row ? this.pickingListNum = row.领料单流水号 : this.pickingListNum
|
||||
row ? this.pickingListNumberShow = row.领料单编号 : this.pickingListNumberShow
|
||||
searchListDetail(this.pickingListNum).then(res => {
|
||||
this.pickListTable2 = res.data
|
||||
})
|
||||
},
|
||||
// 查看领料单明细相关的物料货位数量
|
||||
clickListDetail(row) {
|
||||
console.log(row)
|
||||
if (row.物料流水号) {
|
||||
searchStockNumber(row.物料流水号).then(res => {
|
||||
this.StockNumberTable = res.data
|
||||
})
|
||||
} else if (row.基本件流水号) {
|
||||
console.log(row.基本件流水号)
|
||||
}
|
||||
},
|
||||
// 出库
|
||||
outStore(row) {
|
||||
console.log(row)
|
||||
},
|
||||
// 异常记录
|
||||
errorRecord(row) {
|
||||
console.log(row)
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.el-card{
|
||||
margin-bottom: 15px;
|
||||
}
|
||||
.el-select{
|
||||
width:200px
|
||||
}
|
||||
.el-input{
|
||||
width:200px
|
||||
}
|
||||
span{
|
||||
margin: 10px 0 10px 10px;
|
||||
}
|
||||
.el-tag{
|
||||
margin: 0
|
||||
}
|
||||
</style>
|
||||
@@ -164,6 +164,7 @@
|
||||
<el-table-column label="操作" width="200px" fixed="right" align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
:disabled="checked_hebing"
|
||||
size="mini"
|
||||
type="primary"
|
||||
@click="handleEdit(scope.$index, scope.row, 'form')">分批投产</el-button>
|
||||
@@ -185,8 +186,8 @@
|
||||
@size-change="handleSizeChange"
|
||||
@current-change="handleCurrentChange"/>
|
||||
<!--<el-checkbox v-model="checked_baitu" style="margin-top:0px">是否白图</el-checkbox>-->
|
||||
<!--<el-checkbox v-model="checked_gaonandu">是否高难度</el-checkbox>-->
|
||||
<el-button :loading="listLoading3" type="primary" size="small" style="float:right;margin-top:10px" @click="production">投产</el-button>
|
||||
<el-button :loading="listLoading3" type="primary" size="small" style="float:right;" @click="production">投产</el-button>
|
||||
<el-checkbox v-model="checked_hebing" style="float:right;margin-top:10px;margin-right:10px">合并生产</el-checkbox>
|
||||
</div>
|
||||
</div>
|
||||
</el-card>
|
||||
@@ -331,12 +332,13 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { getEntryNameValue, getToolNum, getNum, getTable, production, getTable1, revisionBatch, editList, dele } from '@/api/ManufacturingCenter/InitialProduction'
|
||||
import { getEntryNameValue, getToolNum, getNum, getTable, production, getTable1, revisionBatch, editList, dele, production2 } from '@/api/ManufacturingCenter/InitialProduction'
|
||||
import { mapGetters } from 'vuex'
|
||||
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
checked_hebing: true,
|
||||
maxmax: '',
|
||||
clearTable: 0,
|
||||
readonly: true,
|
||||
@@ -801,52 +803,102 @@ export default {
|
||||
if (this.multipleSelection.length === 0) {
|
||||
this.$message.error('请至少选择一个零件')
|
||||
} else {
|
||||
this.listLoading3 = true
|
||||
for (let i = 0; i < this.multipleSelection.length; i++) {
|
||||
if (this.multipleSelection[i].checked_waixie === false) {
|
||||
this.multipleSelection[i].checked_waixie = 1
|
||||
} else {
|
||||
this.multipleSelection[i].checked_waixie = 2
|
||||
}
|
||||
if (this.multipleSelection[i].checked_zhaoji === false) {
|
||||
this.multipleSelection[i].checked_zhaoji = 0
|
||||
} else {
|
||||
this.multipleSelection[i].checked_zhaoji = 1
|
||||
}
|
||||
if (this.multipleSelection[i].checked_dailiao === true) {
|
||||
this.multipleSelection[i].checked_dailiao = 2
|
||||
} else {
|
||||
this.multipleSelection[i].checked_dailiao = 1
|
||||
}
|
||||
if (this.checked_gaonandu === false) {
|
||||
this.checked_gaonandu = 0
|
||||
} else {
|
||||
this.checked_gaonandu = 1
|
||||
}
|
||||
if (this.checked_baitu === false) {
|
||||
this.checked_baitu = 0
|
||||
} else {
|
||||
this.checked_baitu = 1
|
||||
}
|
||||
production(this.multipleSelection[i].组件零件基本件流水号, this.multipleSelection[i].投产类型流水号, this.multipleSelection[i].数据类型, this.multipleSelection[i].投产总数量, this.time_planStart, this.time_planFinish, this.time_gongyiStart, this.time_gongyiFinish, this.time_dingeStart, this.time_dingeFinish, this.time_planpinghengStart, this.time_planpinghengFinish, this.time_machiningStart, this.time_machiningFinish, this.time_planStart, this.multipleSelection[i].checked_waixie, this.multipleSelection[i].checked_dailiao, this.id, this.multipleSelection[i].材料流水号, this.radio, this.checked_gaonandu, this.multipleSelection[i].checked_zhaoji, this.checked_baitu).then(response => {
|
||||
this.result += parseInt(response.data[0].result)
|
||||
if (this.result === this.multipleSelection.length) {
|
||||
this.$message.success('投产成功')
|
||||
this.total = 0
|
||||
this.pageList = 1
|
||||
this.getTable()
|
||||
this.checked_baitu = false
|
||||
this.checked_gaonandu = false
|
||||
this.tableData1 = []
|
||||
this.listLoading3 = false
|
||||
} else if (response.data[0].result === '0') {
|
||||
this.listLoading3 = false
|
||||
this.$message.error('投产失败')
|
||||
if (this.checked_hebing === true) {
|
||||
this.listLoading3 = true
|
||||
for (let i = 0; i < this.multipleSelection.length; i++) {
|
||||
if (this.multipleSelection[i].checked_waixie === false) {
|
||||
this.multipleSelection[i].checked_waixie = 1
|
||||
} else {
|
||||
this.multipleSelection[i].checked_waixie = 2
|
||||
}
|
||||
})
|
||||
this.shijiancuo1 = 0
|
||||
this.shijiancuo = 0
|
||||
this.jieguo = 0
|
||||
if (this.multipleSelection[i].checked_zhaoji === false) {
|
||||
this.multipleSelection[i].checked_zhaoji = 0
|
||||
} else {
|
||||
this.multipleSelection[i].checked_zhaoji = 1
|
||||
}
|
||||
if (this.multipleSelection[i].checked_dailiao === true) {
|
||||
this.multipleSelection[i].checked_dailiao = 2
|
||||
} else {
|
||||
this.multipleSelection[i].checked_dailiao = 1
|
||||
}
|
||||
if (this.checked_gaonandu === false) {
|
||||
this.checked_gaonandu = 0
|
||||
} else {
|
||||
this.checked_gaonandu = 1
|
||||
}
|
||||
if (this.checked_baitu === false) {
|
||||
this.checked_baitu = 0
|
||||
} else {
|
||||
this.checked_baitu = 1
|
||||
}
|
||||
production2(this.multipleSelection[i].组件零件基本件流水号, this.multipleSelection[i].投产类型流水号, this.multipleSelection[i].数据类型, this.multipleSelection[i].投产总数量, this.time_planStart, this.time_planFinish, this.time_gongyiStart, this.time_gongyiFinish, this.time_dingeStart, this.time_dingeFinish, this.time_planpinghengStart, this.time_planpinghengFinish, this.time_machiningStart, this.time_machiningFinish, this.time_planStart, this.multipleSelection[i].checked_waixie, this.multipleSelection[i].checked_dailiao, this.id, this.multipleSelection[i].材料流水号, this.radio, this.checked_gaonandu, this.multipleSelection[i].checked_zhaoji, this.checked_baitu).then(response => {
|
||||
this.result += parseInt(response.data[0].result)
|
||||
if (this.result === this.multipleSelection.length) {
|
||||
this.$message.success('投产成功')
|
||||
this.total = 0
|
||||
this.pageList = 1
|
||||
this.getTable()
|
||||
this.checked_baitu = false
|
||||
this.checked_gaonandu = false
|
||||
this.tableData1 = []
|
||||
this.listLoading3 = false
|
||||
} else if (response.data[0].result === '0') {
|
||||
this.listLoading3 = false
|
||||
this.$message.error('投产失败')
|
||||
}
|
||||
})
|
||||
this.shijiancuo1 = 0
|
||||
this.shijiancuo = 0
|
||||
this.jieguo = 0
|
||||
}
|
||||
} else {
|
||||
this.listLoading3 = true
|
||||
for (let i = 0; i < this.multipleSelection.length; i++) {
|
||||
if (this.multipleSelection[i].checked_waixie === false) {
|
||||
this.multipleSelection[i].checked_waixie = 1
|
||||
} else {
|
||||
this.multipleSelection[i].checked_waixie = 2
|
||||
}
|
||||
if (this.multipleSelection[i].checked_zhaoji === false) {
|
||||
this.multipleSelection[i].checked_zhaoji = 0
|
||||
} else {
|
||||
this.multipleSelection[i].checked_zhaoji = 1
|
||||
}
|
||||
if (this.multipleSelection[i].checked_dailiao === true) {
|
||||
this.multipleSelection[i].checked_dailiao = 2
|
||||
} else {
|
||||
this.multipleSelection[i].checked_dailiao = 1
|
||||
}
|
||||
if (this.checked_gaonandu === false) {
|
||||
this.checked_gaonandu = 0
|
||||
} else {
|
||||
this.checked_gaonandu = 1
|
||||
}
|
||||
if (this.checked_baitu === false) {
|
||||
this.checked_baitu = 0
|
||||
} else {
|
||||
this.checked_baitu = 1
|
||||
}
|
||||
production(this.multipleSelection[i].组件零件基本件流水号, this.multipleSelection[i].投产类型流水号, this.multipleSelection[i].数据类型, this.multipleSelection[i].投产总数量, this.time_planStart, this.time_planFinish, this.time_gongyiStart, this.time_gongyiFinish, this.time_dingeStart, this.time_dingeFinish, this.time_planpinghengStart, this.time_planpinghengFinish, this.time_machiningStart, this.time_machiningFinish, this.time_planStart, this.multipleSelection[i].checked_waixie, this.multipleSelection[i].checked_dailiao, this.id, this.multipleSelection[i].材料流水号, this.radio, this.checked_gaonandu, this.multipleSelection[i].checked_zhaoji, this.checked_baitu).then(response => {
|
||||
this.result += parseInt(response.data[0].result)
|
||||
if (this.result === this.multipleSelection.length) {
|
||||
this.$message.success('投产成功')
|
||||
this.total = 0
|
||||
this.pageList = 1
|
||||
this.getTable()
|
||||
this.checked_baitu = false
|
||||
this.checked_gaonandu = false
|
||||
this.tableData1 = []
|
||||
this.listLoading3 = false
|
||||
} else if (response.data[0].result === '0') {
|
||||
this.listLoading3 = false
|
||||
this.$message.error('投产失败')
|
||||
}
|
||||
})
|
||||
this.shijiancuo1 = 0
|
||||
this.shijiancuo = 0
|
||||
this.jieguo = 0
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -93,75 +93,77 @@
|
||||
@current-change="handleCurrentChange"/>
|
||||
</div>
|
||||
</el-card>
|
||||
<el-card v-if="tableData2.length">
|
||||
<el-card>
|
||||
<div slot="header">
|
||||
<el-button v-show="true" type="danger" icon="el-icon-edit" size="small" @click="returnEdit">在制零件工艺调整</el-button>
|
||||
</div>
|
||||
<table class="tg">
|
||||
<tr>
|
||||
<td class="tg-x61c" colspan="4" rowspan="2">江苏高精</td>
|
||||
<td class="tg-c3ow" colspan="2" rowspan="2">零件条码</td>
|
||||
<td class="tg-c3ow" colspan="3">零件图号</td>
|
||||
<td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].零件图号 : '' }}</td>
|
||||
<td class="tg-c3ow">数量</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="tg-c3ow" colspan="3">零件名称</td>
|
||||
<td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].零件名称 : '' }}</td>
|
||||
<td class="tg-c3ow" rowspan="3">{{ tableData2[0] ? tableData2[0].投产数量 : '' }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="tg-c3ow" colspan="2">项目名称</td>
|
||||
<td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].项目名称 : '' }}</td>
|
||||
<td class="tg-c3ow" colspan="2" rowspan="2">{{ tableData2[0] ? 'P' + tableData2[0].工艺计划流水号 : '' }}</td>
|
||||
<td class="tg-c3ow" colspan="3">机床</td>
|
||||
<td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].机床图号 : '' }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="tg-c3ow">材质</td>
|
||||
<td class="tg-c3ow">{{ tableData2[0] ? tableData2[0].材料 : '' }}</td>
|
||||
<td class="tg-c3ow">规格</td>
|
||||
<td class="tg-c3ow">{{ tableData2[0] ? tableData2[0].原材料规格 : '' }}</td>
|
||||
<td class="tg-c3ow" colspan="3">组号</td>
|
||||
<td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].组号 : '' }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="tg-c3ow">序次</td>
|
||||
<td class="tg-c3ow">工艺名称</td>
|
||||
<td class="tg-c3ow" colspan="3">工艺要求</td>
|
||||
<td class="tg-c3ow">难度系数</td>
|
||||
<td class="tg-c3ow">工作者</td>
|
||||
<td class="tg-c3ow">单件</td>
|
||||
<td class="tg-c3ow">准结</td>
|
||||
<td class="tg-c3ow">检查结果</td>
|
||||
<td class="tg-c3ow">计划完成日期</td>
|
||||
<td class="tg-c3ow">工序条码</td>
|
||||
</tr>
|
||||
<tr v-for="(value,key) in tableData2" :id="key" :key="key">
|
||||
<td class="tg-c3ow">{{ key + 1 }}</td>
|
||||
<td class="tg-c3ow">{{ value.工艺名称 }}</td>
|
||||
<td class="tg-c3ow" colspan="3">{{ value.工艺要求 }}</td>
|
||||
<td class="tg-c3ow">{{ value.工艺难度等级 }}</td>
|
||||
<td class="tg-c3ow"/>
|
||||
<td class="tg-c3ow">{{ value.单件定额工时 }}</td>
|
||||
<td class="tg-c3ow">{{ value.准结定额工时 }}</td>
|
||||
<td class="tg-c3ow"/>
|
||||
<td class="tg-c3ow">{{ value.计划日期 }}</td>
|
||||
<td class="tg-c3ow">{{ value.工序流水号 }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="tg-c3ow">工艺员</td>
|
||||
<td class="tg-c3ow">{{ tableData2[0] ? tableData2[0].工艺员 : '' }}</td>
|
||||
<td class="tg-c3ow">定额员</td>
|
||||
<td class="tg-c3ow">{{ tableData2[0] ? tableData2[0].定额员 : '' }}</td>
|
||||
<td class="tg-c3ow">工艺完成</td>
|
||||
<td class="tg-c3ow">{{ tableData2[0] ? tableData2[0].工艺实际完成时间.split(' ')[0] : '' }}</td>
|
||||
<td class="tg-c3ow">加工开始</td>
|
||||
<td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].机加工开始时间 : '' }}</td>
|
||||
<td class="tg-c3ow">加工结束</td>
|
||||
<td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].机加工结束时间 : '' }}</td>
|
||||
</tr>
|
||||
</table>
|
||||
<div v-if="tableData2.length">
|
||||
<table class="tg">
|
||||
<tr>
|
||||
<td class="tg-x61c" colspan="4" rowspan="2">江苏高精</td>
|
||||
<td class="tg-c3ow" colspan="2" rowspan="2">零件条码</td>
|
||||
<td class="tg-c3ow" colspan="3">零件图号</td>
|
||||
<td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].零件图号 : '' }}</td>
|
||||
<td class="tg-c3ow">数量</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="tg-c3ow" colspan="3">零件名称</td>
|
||||
<td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].零件名称 : '' }}</td>
|
||||
<td class="tg-c3ow" rowspan="3">{{ tableData2[0] ? tableData2[0].投产数量 : '' }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="tg-c3ow" colspan="2">项目名称</td>
|
||||
<td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].项目名称 : '' }}</td>
|
||||
<td class="tg-c3ow" colspan="2" rowspan="2">{{ tableData2[0] ? 'P' + tableData2[0].工艺计划流水号 : '' }}</td>
|
||||
<td class="tg-c3ow" colspan="3">机床</td>
|
||||
<td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].机床图号 : '' }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="tg-c3ow">材质</td>
|
||||
<td class="tg-c3ow">{{ tableData2[0] ? tableData2[0].材料 : '' }}</td>
|
||||
<td class="tg-c3ow">规格</td>
|
||||
<td class="tg-c3ow">{{ tableData2[0] ? tableData2[0].原材料规格 : '' }}</td>
|
||||
<td class="tg-c3ow" colspan="3">组号</td>
|
||||
<td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].组号 : '' }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="tg-c3ow">序次</td>
|
||||
<td class="tg-c3ow">工艺名称</td>
|
||||
<td class="tg-c3ow" colspan="3">工艺要求</td>
|
||||
<td class="tg-c3ow">难度系数</td>
|
||||
<td class="tg-c3ow">工作者</td>
|
||||
<td class="tg-c3ow">单件</td>
|
||||
<td class="tg-c3ow">准结</td>
|
||||
<td class="tg-c3ow">检查结果</td>
|
||||
<td class="tg-c3ow">计划完成日期</td>
|
||||
<td class="tg-c3ow">工序条码</td>
|
||||
</tr>
|
||||
<tr v-for="(value,key) in tableData2" :id="key" :key="key">
|
||||
<td class="tg-c3ow">{{ key + 1 }}</td>
|
||||
<td class="tg-c3ow">{{ value.工艺名称 }}</td>
|
||||
<td class="tg-c3ow" colspan="3">{{ value.工艺要求 }}</td>
|
||||
<td class="tg-c3ow">{{ value.工艺难度等级 }}</td>
|
||||
<td class="tg-c3ow"/>
|
||||
<td class="tg-c3ow">{{ value.单件定额工时 }}</td>
|
||||
<td class="tg-c3ow">{{ value.准结定额工时 }}</td>
|
||||
<td class="tg-c3ow"/>
|
||||
<td class="tg-c3ow">{{ value.计划日期 }}</td>
|
||||
<td class="tg-c3ow">{{ value.工序流水号 }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="tg-c3ow">工艺员</td>
|
||||
<td class="tg-c3ow">{{ tableData2[0] ? tableData2[0].工艺员 : '' }}</td>
|
||||
<td class="tg-c3ow">定额员</td>
|
||||
<td class="tg-c3ow">{{ tableData2[0] ? tableData2[0].定额员 : '' }}</td>
|
||||
<td class="tg-c3ow">工艺完成</td>
|
||||
<td class="tg-c3ow">{{ tableData2[0].工艺实际完成时间 ? tableData2[0].工艺实际完成时间.split(' ')[0] : '' }}</td>
|
||||
<td class="tg-c3ow">加工开始</td>
|
||||
<td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].机加工开始时间 : '' }}</td>
|
||||
<td class="tg-c3ow">加工结束</td>
|
||||
<td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].机加工结束时间 : '' }}</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
</el-card>
|
||||
</div>
|
||||
</template>
|
||||
@@ -173,6 +175,7 @@ import { initMachineProject, searchgroup, initPerson, search, searchtable1,
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
partNumValue: '',
|
||||
machineNumberValue: '',
|
||||
machineNumber: [],
|
||||
groupNumberValue: '',
|
||||
|
||||
@@ -63,18 +63,17 @@
|
||||
</el-select>
|
||||
</el-col>
|
||||
|
||||
<el-col v-show="materielValue==='1'||materielValue==='6'||materielValue==='7'||materielValue==='8'" :span="20">
|
||||
<el-col v-show="materielValue==='1'||materielValue==='6'||materielValue==='7'||materielValue==='8'" :span="15">
|
||||
<span>直径:</span>
|
||||
<el-input-number v-model="diameter" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
|
||||
<span>长度:</span>
|
||||
<el-input-number v-model="height2" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
|
||||
<el-button style="margin-top: 20px;margin-left: 10px;" type="primary" size="small" @click="Calculation1()">计算重量
|
||||
</el-button>
|
||||
<el-button style="margin-top: 20px;margin-left: 10px;" type="primary" size="small" @click="Calculation1()">计算重量</el-button>
|
||||
<span>重量:</span>
|
||||
<el-input v-model="weight" style="width:150px" size="small" placeholder="重量">
|
||||
<el-button slot="append" icon="el-icon-cjn-09" @click="saveWeight"/>
|
||||
</el-input>
|
||||
<!--<el-button style="margin-top: 20px;margin-left: 10px;" type="primary" size="small" @click="insertThestring()">计算重量</el-button>-->
|
||||
<el-button style="margin-left: 10px;" type="primary" size="small" @click="insertThestring()">合并生产</el-button>
|
||||
</el-col>
|
||||
|
||||
<el-col v-show="materielValue==='2'||materielValue==='9'||materielValue==='10'||materielValue==='11'" :span="20">
|
||||
|
||||
@@ -476,7 +476,7 @@ export default {
|
||||
return Number(prev)
|
||||
}
|
||||
}, 0)
|
||||
sums[index] += ' 元(含税)'
|
||||
sums[index] += ' 万元(含税)'
|
||||
} else {
|
||||
sums[index] = 'N/A'
|
||||
}
|
||||
@@ -484,10 +484,10 @@ export default {
|
||||
sums[index] = this.taxRate * 100 + '% (税率)'
|
||||
return
|
||||
} else if (index === 9) {
|
||||
sums[index] = (parseInt(sums[7]) * 100 * this.taxRate) / 100 + ' 万元(税额)'
|
||||
sums[index] = (parseFloat(sums[7]) - (parseFloat(sums[7]) / (1 + parseFloat(sums[8]) / 100)).toFixed(2)).toFixed(2) + ' 万元(税额)'
|
||||
return
|
||||
} else if (index === 10) {
|
||||
sums[index] = parseFloat(sums[7]) - parseFloat(sums[9]) + ' 万元(未税)'
|
||||
sums[index] = (parseFloat(sums[7]) / (1 + parseFloat(sums[8]) / 100)).toFixed(2) + ' 万元(未税)'
|
||||
return
|
||||
}
|
||||
})
|
||||
|
||||
@@ -20,6 +20,7 @@
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
<el-button type="primary" size="small" @click="opendialogVisibleMachine()">上传总图</el-button>
|
||||
</div>
|
||||
<upload-excel-component @on-selected-file="selected"/>
|
||||
</div>
|
||||
@@ -44,6 +45,50 @@
|
||||
<!--<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>-->
|
||||
<!--<div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>-->
|
||||
<!--</el-upload>-->
|
||||
<el-dialog
|
||||
:visible.sync="dialogVisibleMachine"
|
||||
width="30%">
|
||||
<el-card>
|
||||
<el-select v-model="machineDrawValue" clearable filterable size="small" placeholder="机床名称" @change="changeMachine">
|
||||
<el-option
|
||||
v-for="item in machineDraw"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
<div style="float: right;">
|
||||
<el-upload
|
||||
:disabled="disabledMachine"
|
||||
:action="action"
|
||||
:on-success="uploadSuccess"
|
||||
:on-error="uploadFailure"
|
||||
:show-file-list="showFileList"
|
||||
:file-list="fileList"
|
||||
class="upload-demo"
|
||||
multiple>
|
||||
<el-button :disabled="disabledMachine" size="small" type="primary">点击上传</el-button>
|
||||
</el-upload>
|
||||
</div>
|
||||
</el-card>
|
||||
<el-card>
|
||||
<div v-for="(file, key) in hadFile" :key="key">
|
||||
<div class="wrapper">
|
||||
<div class="content">
|
||||
<div class="action">
|
||||
<a class="delete" @click="deleteFileData(file.id)">删除</a>
|
||||
</div>
|
||||
<div v-if="file.suffix==='pdf'" class="icon"><svg-icon icon-class="pdf" /></div>
|
||||
<div v-else-if="file.suffix==='docx'||file.suffix === 'doc'" class="icon"><svg-icon icon-class="doc" /></div>
|
||||
<div v-else-if="file.suffix==='xlsx' || file.suffix === 'xls'" class="icon"><svg-icon icon-class="excel" /></div>
|
||||
<div v-else-if="file.suffix==='pptx' || file.suffix === 'ppt'" class="icon"><svg-icon icon-class="ppt" /></div>
|
||||
<div v-else-if="file.suffix==='jpg' || file.suffix === 'jpeg'|| file.suffix === 'png'" class="icon"><svg-icon icon-class="pic" /></div>
|
||||
<div v-else class="icon"><svg-icon icon-class="file" /></div>
|
||||
<a :href="file.url"><div class="info">{{ file.name }}</div></a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</el-card>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -51,13 +96,22 @@
|
||||
import UploadExcelComponent from './UploadExcel/index.vue'
|
||||
import specificationData from './specificationData'
|
||||
import { sleep } from '../../../utils/tool'
|
||||
import { initProject, isExit, isExit1, importBasics, importPurcharse, searchMachine, searchGroupNum } from '../../../api/TechnologyCenter/ImportParts'
|
||||
|
||||
import { initProject, isExit, isExit1, importBasics, importPurcharse, searchMachine, searchGroupNum, machineSelect, getFileData, deleteFileData } from '../../../api/TechnologyCenter/ImportParts'
|
||||
import { uploadFileMachine, downloadFileMachine } from '@/utils/request'
|
||||
export default {
|
||||
name: 'UploadExcel',
|
||||
components: { UploadExcelComponent, specificationData },
|
||||
data() {
|
||||
return {
|
||||
fileList: [],
|
||||
hadFile: [],
|
||||
showFileList: true,
|
||||
projectId: '',
|
||||
action: '',
|
||||
disabledMachine: true,
|
||||
machineDrawValue: '',
|
||||
machineDraw: [],
|
||||
dialogVisibleMachine: false,
|
||||
project: [],
|
||||
projectValue: '',
|
||||
worksheet: [],
|
||||
@@ -108,6 +162,57 @@ export default {
|
||||
this.fetchData()
|
||||
},
|
||||
methods: {
|
||||
opendialogVisibleMachine() {
|
||||
this.machineDraw = []
|
||||
this.machineDrawValue = ''
|
||||
this.dialogVisibleMachine = true
|
||||
this.machineDrawValue === '' ? this.disabledMachine = true : this.disabledMachine = false
|
||||
this.getSelect(machineSelect, ['机床图号', '机床流水号'], 'machineDraw', this.projectValue)
|
||||
},
|
||||
changeMachine() {
|
||||
this.machineDrawValue === '' ? this.disabledMachine = true : this.disabledMachine = false
|
||||
this.action = `${uploadFileMachine}?&MachineNum=${this.machineDrawValue}`
|
||||
this.getFileData(this.machineDrawValue)
|
||||
console.log(this.action)
|
||||
},
|
||||
uploadSuccess(res, file, fileList) {
|
||||
if (res[0].result === '1') {
|
||||
const index = fileList.indexOf(file)
|
||||
fileList.splice(index, 1)
|
||||
} else {
|
||||
this.$message.error(`${file.name}文件上传失败，请检查上传文件是否正确！`)
|
||||
}
|
||||
if (fileList.length === 0) {
|
||||
this.$message.success('文件上传成功')
|
||||
this.getFileData(this.machineDrawValue)
|
||||
}
|
||||
},
|
||||
uploadFailure(a, file, fileList) {
|
||||
fileList.map(file => {
|
||||
this.$message.error(`${file.name}文件上传失败，请检查上传文件是否正确！`)
|
||||
})
|
||||
},
|
||||
// 在什么情况下需要查询上传的附件，调用this.getFileData()即可根据
|
||||
getFileData(machineDrawValue) {
|
||||
console.log(machineDrawValue, 88)
|
||||
this.hadFile = []
|
||||
getFileData(machineDrawValue).then(res => {
|
||||
console.log(res)
|
||||
if (res.data.length > 0) {
|
||||
res.data.map(item => {
|
||||
this.hadFile.push({
|
||||
url: `${downloadFileMachine}?id=${item.文件标识}.${item.文件后缀}&name=${item.文件名称}.${item.文件后缀}`,
|
||||
name: `${item.文件名称}.${item.文件后缀}`,
|
||||
suffix: item.文件后缀,
|
||||
id: item.文件标识
|
||||
})
|
||||
})
|
||||
}
|
||||
})
|
||||
},
|
||||
deleteFileData(id) {
|
||||
this.deleteRow(deleteFileData, id, function() { this.getFileData(this.machineDrawValue) })
|
||||
},
|
||||
async test() {
|
||||
await sleep(10000)
|
||||
console.log(1)
|
||||
@@ -339,8 +444,52 @@ export default {
|
||||
}
|
||||
</script>
|
||||
<style lang="scss" scoped>
|
||||
/*.wrapper{*/
|
||||
/*width: 100%;*/
|
||||
/*margin: 0 auto;*/
|
||||
/*}*/
|
||||
.wrapper{
|
||||
width: 100%;
|
||||
margin: 0 auto;
|
||||
width: 225px;
|
||||
height: 50px;
|
||||
overflow: hidden;
|
||||
border: 1px solid #b8c7d9;
|
||||
float: left;
|
||||
margin: 10px;
|
||||
}
|
||||
</style>
|
||||
.content{
|
||||
position: relative;
|
||||
padding: 8px 8px 0 8px;
|
||||
}
|
||||
.action{
|
||||
position: absolute;
|
||||
top: 4px;
|
||||
right: 8px;
|
||||
}
|
||||
.delete{
|
||||
padding: 0 5px;
|
||||
border-radius: 3px;
|
||||
color: #0f84b0;
|
||||
font-size: 12px;
|
||||
}
|
||||
.delete:hover{
|
||||
background: -webkit-linear-gradient(top,#0ba9e3,#0099d3);
|
||||
color: #fff;
|
||||
}
|
||||
a{
|
||||
text-decoration: none;
|
||||
}
|
||||
.icon{
|
||||
width: 30px;
|
||||
height: 30px;
|
||||
display: inline-block;
|
||||
margin-right: 7px;
|
||||
margin-top: 2px;
|
||||
font-size: 26px;
|
||||
}
|
||||
.info{
|
||||
position: absolute;
|
||||
left: 44px;
|
||||
line-height: 30px;
|
||||
display: inline-block;
|
||||
color: #999;
|
||||
}</style>
|
||||
|
||||
@@ -13,8 +13,8 @@
|
||||
主页
|
||||
</el-dropdown-item>
|
||||
</router-link>
|
||||
<el-dropdown-item divided>
|
||||
<span style="display:block;" @click="logout">退出</span>
|
||||
<el-dropdown-item divided @click.native="logout">
|
||||
<span style="display:block;">退出</span>
|
||||
</el-dropdown-item>
|
||||
</el-dropdown-menu>
|
||||
</el-dropdown>
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
</router-link>
|
||||
</scroll-pane>
|
||||
<ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
|
||||
<li @click="refreshSelectedTag(selectedTag)">重新加载</li>
|
||||
<li @click="closeSelectedTag(selectedTag)">关闭当前</li>
|
||||
<li @click="closeOthersTags">关闭其他</li>
|
||||
<li @click="closeAllTags">关闭全部</li>
|
||||
@@ -20,6 +21,7 @@ import Cookies from 'js-cookie'
|
||||
|
||||
export default {
|
||||
components: { ScrollPane },
|
||||
inject: ['reload'],
|
||||
data() {
|
||||
return {
|
||||
visible: false,
|
||||
@@ -78,6 +80,11 @@ export default {
|
||||
}
|
||||
})
|
||||
},
|
||||
refreshSelectedTag() {
|
||||
this.$nextTick(() => {
|
||||
this.reload() // 2019.6.2 cjn
|
||||
})
|
||||
},
|
||||
closeSelectedTag(view) {
|
||||
this.$store.dispatch('delVisitedViews', view).then((views) => {
|
||||
if (this.isActive(view)) {
|
||||
|
||||
Reference in New Issue
Block a user