Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0
This commit is contained in:
liushuai
@@ -7,7 +7,7 @@ export function getMachines() {
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '1',
|
||||
name: 'PDM_机床名称_全部_查询数据'
|
||||
name: 'PDM_机床名称_查询数据_查询全部'
|
||||
}
|
||||
})
|
||||
}
|
||||
@@ -18,9 +18,32 @@ export function getGroups(stepNumber) {
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '1',
|
||||
name: '车间生产管理工艺_传递后_组件名称_查询数据_查询所有组_新',
|
||||
name: '车间生产管理工艺_传递后_组件名称_查询数据_查询所有组',
|
||||
param: '机床流水号=' + stepNumber + '=int'
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
// 查询零件
|
||||
export function selectParts(check1, stepNumber, check2, num) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '1',
|
||||
name: '车间生产管理工艺_车间组件完成情况_查询数据',
|
||||
param: '组件流水号_check=' + check1 + '&组件流水号=' + stepNumber + '&工艺计划流水号_check=' + check2 + '&工艺计划流水号=' + num
|
||||
}
|
||||
})
|
||||
}
|
||||
// 查询工序
|
||||
export function selectProcedure(num) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '1',
|
||||
name: '车间生产管理工艺_零件工序_查询数据_车间组件完成情况',
|
||||
param: '工艺计划流水号=' + num
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<el-card>
|
||||
<el-select v-model="Machine" filterable clearable size="small" style="margin:0px 10px 0px 10px;width: 180px;" placeholder="机床号" @change="getTreeData">
|
||||
<el-select v-model="MachineValue" filterable size="small" style="margin:0px 10px 0px 10px;width: 180px;" placeholder="机床号" @change="getTreeData">
|
||||
<el-option
|
||||
v-for="item in Machines"
|
||||
v-for="item in Machine"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value">
|
||||
@@ -11,7 +11,7 @@
|
||||
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
|
||||
</el-option>
|
||||
</el-select>
|
||||
<el-select v-model="Complete" size="small" clearable placeholder="是否完成" style="margin:0px 10px;width: 120px;">
|
||||
<el-select v-show="false" v-model="Complete" size="small" clearable placeholder="是否完成" style="margin:0px 10px;width: 120px;">
|
||||
<el-option
|
||||
v-for="item in Completes"
|
||||
:key="item.value"
|
||||
@@ -20,85 +20,79 @@
|
||||
</el-select>
|
||||
</el-card>
|
||||
<el-row>
|
||||
<el-col style="width: 530px">
|
||||
<el-col style="width: 450px">
|
||||
<el-card>
|
||||
<el-table
|
||||
:data="tableData1"
|
||||
loading="loading"
|
||||
class="table"
|
||||
style="height: 800px"
|
||||
highlight-current-row
|
||||
empty-text=" "
|
||||
border>
|
||||
<el-table :data="tableData1" style="height: 670px" highlight-current-row border>
|
||||
<el-table-column type="index" label="序号" width="50"/>
|
||||
<el-table-column align="center" label="工艺名" width="90">
|
||||
<el-table-column align="center" label="工序名" width="150">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.工艺名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="序间质检" width="90">
|
||||
<el-table-column align="center" label="操作者" width="120">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.序间质检 }}
|
||||
{{ scope.row.员工姓名 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="不合格数" width="90">
|
||||
<el-table-column align="center" label="数量" show-overflow-tooltip min-width="90">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.不合格数量 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="操作者" show-overflow-tooltip width="90">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.操作者 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="完成日期" width="100">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.完成日期 }}
|
||||
{{ scope.row.投产数量 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-card>
|
||||
</el-col>
|
||||
<el-col style="width:600px">
|
||||
<el-row>
|
||||
<el-card class="box-card" style="min-height: 400px">
|
||||
<div>机床图号：{{ MachineLabel }} 机床名称：{{ MachineName }}</div>
|
||||
<div style="min-height: 400px;margin-left: 50px;">
|
||||
<el-tree
|
||||
:data="departmentData"
|
||||
:props="defaultProps"
|
||||
:expand-on-click-node="false"
|
||||
:indent="30"
|
||||
class="gongyizhiding"
|
||||
default-expand-all
|
||||
@node-click="onClick"/>
|
||||
</div>
|
||||
</el-card>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-card style="height: 400px">
|
||||
详情
|
||||
</el-card>
|
||||
</el-row>
|
||||
<el-card>
|
||||
<span>机床图号：{{ 机床图号 }} 机床名称：{{ 机床名称 }}</span>
|
||||
<div style="margin: 10px 0 0 50px;height: 300px;overflow: auto">
|
||||
<el-tree
|
||||
:data="departmentData"
|
||||
:props="defaultProps"
|
||||
:indent="80"
|
||||
:expand-on-click-node="false"
|
||||
class="selectTree"
|
||||
default-expand-all
|
||||
@node-click="onClick"/>
|
||||
</div>
|
||||
</el-card>
|
||||
<el-card style="height: 350px">
|
||||
<el-table :data="tableData2" height="300" highlight-current-row border @row-click="searchTable1">
|
||||
<el-table-column type="index" label="序号" width="50"/>
|
||||
<el-table-column align="center" label="图号及规格" width="220">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.零件图号 + '\xa0\xa0\xa0\xa0\xa0' + scope.row.规格 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="制品名称" width="200">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.零件名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="数量" min-width="90">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.投产总数量 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-card>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { getMachines, getGroups } from '@/api/ManufacturingCenter/CompletionOfWorkshopComponents'
|
||||
import Cookie from 'js-cookie'
|
||||
import { getMachines, getGroups, selectParts, selectProcedure } from '@/api/ManufacturingCenter/CompletionOfWorkshopComponents'
|
||||
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
Machine: '', // 机床号
|
||||
Machines: [],
|
||||
Group: '', // 组号
|
||||
Groups: [],
|
||||
number: '', // 零件图号
|
||||
MachineValue: '', // 机床号
|
||||
Machine: [],
|
||||
option: [], // 组号
|
||||
tableData1: [],
|
||||
Complete: '',
|
||||
tableData2: [],
|
||||
Complete: 2,
|
||||
Completes: [{
|
||||
value: 1,
|
||||
label: '完成'
|
||||
@@ -106,10 +100,13 @@ export default {
|
||||
value: 2,
|
||||
label: '在制'
|
||||
}],
|
||||
departmentData: [], // 树状数据
|
||||
MachineDrawingNumber: [], // 获取树状机床信息
|
||||
MachineLabel: '', // 机床图号
|
||||
MachineName: '' // 机床名称
|
||||
机床图号: '',
|
||||
机床名称: '',
|
||||
defaultProps: {
|
||||
children: 'children',
|
||||
label: 'label'
|
||||
},
|
||||
departmentData: [] // 树状数据
|
||||
}
|
||||
},
|
||||
created() {
|
||||
@@ -117,100 +114,87 @@ export default {
|
||||
},
|
||||
methods: {
|
||||
getMachine() {
|
||||
if (Cookie.get('machineValue') !== undefined) {
|
||||
this.Machine = ''
|
||||
this.Machines = []
|
||||
this.Group = ''
|
||||
this.Groups = []
|
||||
getMachines().then(response => {
|
||||
for (let i = 0; i < response.data.length; i++) {
|
||||
this.Machines.push({
|
||||
label: response.data[i].机床图号,
|
||||
value: response.data[i].机床流水号,
|
||||
value2: response.data[i].机床名称
|
||||
})
|
||||
}
|
||||
if (Cookie.get('group') !== undefined) {
|
||||
this.Machine = parseInt(Cookie.get('machineValue'))
|
||||
this.getGroup()
|
||||
this.getTableData()
|
||||
this.Group = parseInt(Cookie.get('group'))
|
||||
// this.getTableData()
|
||||
Cookie.remove('machineValue')
|
||||
Cookie.remove('group')
|
||||
} else {
|
||||
// this.getTableData()
|
||||
Cookie.remove('machineValue')
|
||||
Cookie.remove('group')
|
||||
}
|
||||
})
|
||||
} else {
|
||||
this.Machine = ''
|
||||
this.Machines = []
|
||||
this.Group = ''
|
||||
this.Groups = []
|
||||
getMachines().then(response => {
|
||||
for (let i = 0; i < response.data.length; i++) {
|
||||
this.Machines.push({
|
||||
label: response.data[i].机床图号,
|
||||
value: response.data[i].机床流水号,
|
||||
value2: response.data[i].机床名称
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
}, // 获取组号
|
||||
getGroup() {
|
||||
this.Group = ''
|
||||
this.Groups = []
|
||||
getGroups(this.Machine).then(response => {
|
||||
this.MachineValue = ''
|
||||
this.Machine = []
|
||||
getMachines().then(response => {
|
||||
for (let i = 0; i < response.data.length; i++) {
|
||||
this.Groups.push({
|
||||
label: response.data[i].组号,
|
||||
value: response.data[i].组件流水号
|
||||
this.Machine.push({
|
||||
label: response.data[i].机床图号,
|
||||
value: response.data[i].机床流水号,
|
||||
value2: response.data[i].机床名称
|
||||
})
|
||||
}
|
||||
this.Group = response.data[0].组件流水号
|
||||
}).then(() => {
|
||||
this.MachineValue = this.Machine[0].value
|
||||
this.getTreeData()
|
||||
})
|
||||
}, // 获取树状数据
|
||||
},
|
||||
// 获取树状数据
|
||||
getTreeData() {
|
||||
for (let i = 0; i < this.Machines.length; i++) {
|
||||
if (this.Machine === this.Machines[i].value) {
|
||||
this.MachineLabel = this.Machines[i].label
|
||||
this.MachineName = this.Machines[i].value2
|
||||
this.tableData1 = []
|
||||
this.tableData2 = []
|
||||
for (let i = 0; i < this.Machine.length; i++) {
|
||||
if (this.MachineValue === this.Machine[i].value) {
|
||||
this.机床图号 = this.Machine[i].label
|
||||
this.机床名称 = this.Machine[i].value2
|
||||
}
|
||||
}
|
||||
getGroups(this.Machine).then(response => { // 初始化机床图号分类
|
||||
this.options = []
|
||||
this.option = []
|
||||
getGroups(this.MachineValue).then(response => {
|
||||
for (let i = 0; i < response.data.length; i++) {
|
||||
this.options.push({
|
||||
label: response.data[i].组号 + '..........' + response.data[i].组件名称,
|
||||
this.option.push({
|
||||
isLeaf: false,
|
||||
label: response.data[i].组号 + '\xa0\xa0\xa0' + (response.data[i].组件名称 ? response.data[i].组件名称 : ''),
|
||||
value: response.data[i].组件流水号,
|
||||
father: true,
|
||||
children: []
|
||||
})
|
||||
}
|
||||
}).then(() => {
|
||||
// this.options.map(firstLevel => {
|
||||
// processNameSelect(firstLevel.value).then(response => { // 根据分类查询机床图号
|
||||
// firstLevel.children = []
|
||||
// for (let j = 0; j < response.data.length; j++) {
|
||||
// firstLevel.children.push({
|
||||
// label: response.data[j].机床图号,
|
||||
// value: response.data[j].机床流水号,
|
||||
// father: false
|
||||
// })
|
||||
// }
|
||||
// })
|
||||
// })
|
||||
this.option.map(firstLevel => {
|
||||
// 根据分组查零件
|
||||
selectParts(1, firstLevel.value, 0, 0).then(response => {
|
||||
firstLevel.children = []
|
||||
for (let j = 0; j < response.data.length; j++) {
|
||||
firstLevel.children.push({
|
||||
label: (response.data[j].零件图号 ? response.data[j].零件图号 : '无零件图号') + '\xa0\xa0\xa0\xa0\xa0\xa0' + (response.data[j].规格 ? response.data[j].规格 : '') + '\xa0\xa0\xa0\xa0\xa0\xa0' + (response.data[j].投产总数量 ? response.data[j].投产总数量 : '') + '..........' + (response.data[j].零件名称 ? response.data[j].零件名称 : '无零件名称'),
|
||||
value: response.data[j].工艺计划流水号,
|
||||
father: false
|
||||
})
|
||||
}
|
||||
})
|
||||
})
|
||||
}).then(() => {
|
||||
this.departmentData = this.options
|
||||
this.departmentData = this.option
|
||||
})
|
||||
},
|
||||
onClick(num) {
|
||||
this.tableData1 = []
|
||||
this.tableData2 = []
|
||||
if (num.father === true) {
|
||||
selectParts(1, num.value, 0, 0).then(response => {
|
||||
this.tableData2 = response.data
|
||||
})
|
||||
} else {
|
||||
selectParts(0, 0, 1, num.value).then(response => {
|
||||
this.tableData2 = response.data
|
||||
})
|
||||
}
|
||||
},
|
||||
searchTable1(row) {
|
||||
this.tableData1 = []
|
||||
selectProcedure(row.工艺计划流水号).then(response => {
|
||||
this.tableData1 = response.data
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
|
||||
<style lang="scss">
|
||||
.selectTree{
|
||||
.el-tree-node__content>.el-tree-node__expand-icon{
|
||||
display: inline !important;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -413,7 +413,7 @@ export default {
|
||||
})
|
||||
},
|
||||
getTable9() {
|
||||
this.khbmbh = 12
|
||||
this.khbmbh = 12 // 考核部门编号
|
||||
getTable8(this.khbmbh).then(response => {
|
||||
this.List1 = response.data
|
||||
})
|
||||
|
||||
@@ -24,7 +24,8 @@
|
||||
<el-button type="success" icon="el-icon-search" class="move" size="small" style="margin-left: 10px" @click="selectCustomerOfName">查询</el-button>
|
||||
</el-card>
|
||||
<el-card>
|
||||
<el-button icon="el-icon-circle-plus-outline" size="small" style="margin-top: 3px" @click="addMarketingManager();flag = 1" >添加营销经理</el-button>
|
||||
<el-button icon="el-icon-circle-plus-outline" size="small" style="margin-top: 3px;background-color: orange" @click="addMarketingManager();flag = 1" >添加营销经理</el-button>
|
||||
<el-button icon="el-icon-circle-plus-outline" size="small" style="margin-top: 3px;background-color: #f2dede" @click = "addCustomer();flag1 = 1">新增客户</el-button>
|
||||
<el-table v-loading="loading3" :data="tableData3" highlight-current-row height="192" size="mini" stripe style="width: 100%;margin-top: 3px;margin-bottom: 0px" border>
|
||||
<!--<el-table-column label="责权省份" align="center" min-width="80">-->
|
||||
<!--<template slot-scope="scope">-->
|
||||
@@ -87,7 +88,7 @@
|
||||
highlight-current-row
|
||||
tooltip-effect="dark"
|
||||
style="width: 100%; margin-top: 3px;"
|
||||
height="700"
|
||||
height="550"
|
||||
size="mini"
|
||||
border>
|
||||
<el-table-column align="center" label="序号" width="65">
|
||||
@@ -105,8 +106,7 @@
|
||||
</el-col>
|
||||
<el-col :span="20">
|
||||
<el-card>
|
||||
<el-button icon="el-icon-circle-plus-outline" size="small" style="margin-top: 3px" @click = "addCustomer();flag1 = 1">新增客户</el-button>
|
||||
<el-table v-loading="loading2" :data="tableData2" highlight-current-row height="640" size="mini" stripe style="width: 100%;margin-top: 2px" border>
|
||||
<el-table v-loading="loading2" :data="tableData2" highlight-current-row height="520" size="mini" stripe style="width: 100%;margin-top: 2px" border>
|
||||
<el-table-column label="客户名称" prop="客户名称" align="center" min-width="180" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.客户名称 }}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,162 +1,121 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<el-card>
|
||||
<el-input v-model="invoiceNumber" placeholder="请输入发货单号" clearable style="width: 150px;margin-right: 10px" size="mini"/>
|
||||
<el-input v-model="receivingUnit" placeholder="请输入收货单位" clearable style="width: 150px;margin-right: 10px" size="mini"/>
|
||||
<el-input v-model="invoiceNumber" placeholder="发货单号和收货单位" clearable style="width: 200px;margin-right: 10px" size="small" @keyup.enter.native="openSearch"/>
|
||||
<!--<el-input v-model="receivingUnit" placeholder="请输入收货单位" clearable style="width: 150px;margin-right: 10px" size="mini"/>-->
|
||||
<el-button type="success" icon="el-icon-menu" size="mini" style="margin-left: 10px" @click="openSearch">查询</el-button>
|
||||
</el-card>
|
||||
<el-card>
|
||||
<el-table
|
||||
:data="tableDataSearchList"
|
||||
style="width: 100%; max-height: 500px"
|
||||
height="650"
|
||||
border
|
||||
stripe
|
||||
size="mini"
|
||||
highlight-current-row
|
||||
@row-click="searchListItem">
|
||||
<!-- <el-table-->
|
||||
<!-- :data="tableDataSearchList"-->
|
||||
<!-- highlight-current-row-->
|
||||
<!-- style="width: 100%; max-height: 500px"-->
|
||||
<!-- border-->
|
||||
<!-- size="mini"-->
|
||||
<!-- @row-click="searchListItem">-->
|
||||
<el-table-column align="center" label="状态" width="60px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.是否发出.toString() === '1' ? '已发出' : '未发出' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="发货单号" width="120px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.发货单编号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="发货单名">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.发货单名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="收货单位" width="180px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.收货单位 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="收货地址" width="150px" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.收货地址 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="收货人员" width="80px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.收货人员 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="联系电话">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.联系电话 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="车辆牌号" width="140px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.车辆牌号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="司机姓名" width="80px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.司机姓名 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="司机电话">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.司机电话 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="制单人">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.制单人 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="审核人">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.审核人 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="发货人">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.发货人 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="制单时间" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.操作日期 === null"/>
|
||||
<span v-else>{{ scope.row.操作日期.substr(0,10) }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="审核时间">
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.审核日期 === null"/>
|
||||
<span v-else>{{ scope.row.审核日期.substr(0,10) }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="发货时间">
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.发出时间 === null"/>
|
||||
<span v-else>{{ scope.row.发出时间.substr(0,10) }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-card>
|
||||
<el-card>
|
||||
<el-table
|
||||
v-loading="listLoading"
|
||||
:data="tableData"
|
||||
highlight-current-row
|
||||
style="width: 100%"
|
||||
height="560"
|
||||
border
|
||||
size="mini">
|
||||
<el-table-column align="center" label="货品类别" width="80">
|
||||
<template slot-scope="scope">
|
||||
<el-tag effect="dark" size="small" type="success">{{ scope.row.货品类别 }}</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="货品编号">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.货品编号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="货品名称">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.货品名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="货品规格">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.货品规格 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="货品型号">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.货品型号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="数量" width="130">
|
||||
<template slot-scope="scope">
|
||||
<template v-if="disabledPick === false">
|
||||
<el-input-number v-model="scope.row.数量" :min="1" label="描述文字" size="mini" controls-position="right" style="width:100px" @change="handleChange"/>
|
||||
<el-col :span="10">
|
||||
<el-table :data="tableDataSearchList" style="width: 100%" height="600" border stripe size="mini" highlight-current-row @row-click="searchListItem">
|
||||
<el-table-column align="center" label="状态" width="60px">
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.是否发出.toString() === '1'" style="color: green">已发出</span>
|
||||
<span v-else>未发出</span>
|
||||
</template>
|
||||
<template v-else>
|
||||
{{ scope.row.数量 }}
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="发货单号" width="120px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.发货单编号 }}
|
||||
</template>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="设计者" width="80">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.设计者 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="发货单名" width="100px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.发货单名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="收货单位" width="180px" show-overflow-tooltip="">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.收货单位 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="收货人员" width="80px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.收货人员 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="收货地址" width="150px" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.收货地址 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="联系电话" width="110px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.联系电话 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="车辆牌号" width="140px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.车辆牌号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="司机姓名" width="80px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.司机姓名 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="司机电话" width="110px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.司机电话 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="制单人" width="100px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.制单人 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="发货时间" width="110px">
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.发出时间 === null"/>
|
||||
<span v-else>{{ scope.row.发出时间.substr(0,10) }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-col>
|
||||
<el-col :span="14">
|
||||
<el-table v-loading="listLoading" :data="tableData" highlight-current-row style="width: 100%" height="560" border size="mini">
|
||||
<el-table-column align="center" label="货品类别" width="80">
|
||||
<template slot-scope="scope">
|
||||
<el-tag effect="dark" size="small" type="success">{{ scope.row.货品类别 }}</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="货品编号">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.货品编号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="货品名称" width="150px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.货品名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="货品规格">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.货品规格 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="货品型号">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.货品型号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="数量" width="100">
|
||||
<template slot-scope="scope">
|
||||
<template v-if="disabledPick === false">
|
||||
<el-input-number v-model="scope.row.数量" :min="1" label="描述文字" size="mini" controls-position="right" style="width:100px" @change="handleChange"/>
|
||||
</template>
|
||||
<template v-else>
|
||||
{{ scope.row.数量 }}
|
||||
</template>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="设计者" width="80">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.设计者 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-col>
|
||||
</el-card>
|
||||
</div>
|
||||
</template>
|
||||
@@ -185,7 +144,6 @@ export default {
|
||||
this.receivingUnit !== null && this.receivingUnit !== '' ? this.receivingUnit_check = 1 : this.receivingUnit_check = 0
|
||||
InvoiceListSearch(this.invoiceNumber, this.receivingUnit, this.invoiceNumber_check, this.receivingUnit_check).then(response => {
|
||||
if (response.data.length !== 0) {
|
||||
console.log(response)
|
||||
this.tableDataSearchList = response.data
|
||||
}
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user