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

Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0

Browse Source
This commit is contained in:
bryan sun
2019-12-03 10:05:12 +08:00
parent add19d8335 490d6d008d
commit fa7f1d94ae
19 changed files with 913 additions and 1047 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/api/ManufacturingCenter/CompletionOfWorkshopComponents.js
View File

@@ -7,7 +7,7 @@ export function getMachines() {
method: 'post', method: 'post',
data: { data: {
type: '1', type: '1',
name: 'PDM_机床名称_全部_查询数据' name: 'PDM_机床名称_查询数据_查询全部'
} }
}) })
} }
@@ -18,9 +18,32 @@ export function getGroups(stepNumber) {
method: 'post', method: 'post',
data: { data: {
type: '1', type: '1',
name: '车间生产管理工艺_传递后_组件名称_查询数据_查询所有组_新', name: '车间生产管理工艺_传递后_组件名称_查询数据_查询所有组',
param: '机床流水号=' + stepNumber + '=int' 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
}
})
}

4
src/api/ManufacturingCenter/PartAssignment.js
View File

@@ -67,14 +67,14 @@ export function searchTable1(PurchaseOrder, check4) {
} }
}) })
} }
export function addData(num1, num2, id, time) { export function addData(num1, num2, id, time, remarks) {
return request({ return request({
url: '', url: '',
method: 'post', method: 'post',
data: { data: {
type: '2', type: '2',
name: '车间管理_基本件采购_请购单_增加数据', name: '车间管理_基本件采购_请购单_增加数据',
param: '请购车间=' + num1 + '&请购人=' + num2 + '&人员编号=' + id + '&请购时间=' + time param: '请购车间=' + num1 + '&请购人=' + num2 + '&人员编号=' + id + '&请购时间=' + time + '&备注=' + remarks
} }
}) })
} }

8
src/api/WorkshopProcurement/NewArrivalList.js
View File

@@ -38,26 +38,26 @@ export function searchLxPurchaseOrder(pageCurrent, pageSize, check1, num, check2
}) })
} }
// 查询采购计划明细 // 查询采购计划明细
export function searchMateriel(num) { export function searchMateriel(num, check, num1) {
return request({ return request({
url: '', url: '',
method: 'post', method: 'post',
data: { data: {
type: '1', type: '1',
name: '备料管理_采购计划明细_查询数据_未选入', name: '备料管理_采购计划明细_查询数据_未选入',
param: `供应商=${num}` param: `供应商=${num}&零件图号_check=${check}&零件图号=${num1}`
} }
}) })
} }
// 查询离线采购计划明细 // 查询离线采购计划明细
export function searchLxMateriel(num) { export function searchLxMateriel(num, check, num1) {
return request({ return request({
url: '', url: '',
method: 'post', method: 'post',
data: { data: {
type: '1', type: '1',
name: '备料管理_离线采购计划明细_查询数据_未选入', name: '备料管理_离线采购计划明细_查询数据_未选入',
param: `供应商流水号=${num}` param: `供应商流水号=${num}&零件图号_check=${check}&零件图号=${num1}`
} }
}) })
} }

5
src/api/WorkshopProcurement/OutsourcingMaterialsInvoice.js
View File

@@ -132,15 +132,14 @@ export function searchSupplier(check1, value1, check2, value2, check3, value3, c
}) })
} }
// 查询到货单 // 查询到货单
export function searchArriveOrder(num, num1, num2, num3, num5, pageCurrent, pageSize) { export function searchArriveOrder(num, num1, num2, num3, num5) {
return request({ return request({
url: '', url: '',
method: 'post', method: 'post',
data: { data: {
type: '1', type: '1',
name: '备料管理_到货单查询', name: '备料管理_到货单查询',
param: `供应商_check=${num}&供应商=${num1}&开始日期_check=${num2}&开始日期=${num3}&结束日期=${num5}`, param: `供应商_check=${num}&供应商=${num1}&开始日期_check=${num2}&开始日期=${num3}&结束日期=${num5}`
Pagination: pageCurrent + '&' + pageSize
} }
}) })
} }

2
src/utils/request.js
View File

@@ -26,7 +26,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil
export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx` export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx`
export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx` export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx`
const service = axios.create({ const service = axios.create({
baseURL: `http://192.168.0.110:8002/submit/MESCommonBase.ashx`, baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间 timeout: 1500000 // 请求超时时间
}) })
export default service export default service

226
src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue
View File

@@ -1,9 +1,9 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-card> <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 <el-option
v-for="item in Machines" v-for="item in Machine"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value"> :value="item.value">
@@ -11,7 +11,7 @@
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div> <div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
</el-option> </el-option>
</el-select> </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 <el-option
v-for="item in Completes" v-for="item in Completes"
:key="item.value" :key="item.value"
@@ -20,85 +20,79 @@
</el-select> </el-select>
</el-card> </el-card>
<el-row> <el-row>
<el-col style="width: 530px"> <el-col style="width: 450px">
<el-card> <el-card>
<el-table <el-table :data="tableData1" style="height: 670px" highlight-current-row border>
:data="tableData1"
loading="loading"
class="table"
style="height: 800px"
highlight-current-row
empty-text=" "
border>
<el-table-column type="index" label="序号" width="50"/> <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"> <template slot-scope="scope">
{{ scope.row.工艺名称 }} {{ scope.row.工艺名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="序间质检" width="90"> <el-table-column align="center" label="操作者" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.序间质检 }} {{ scope.row.员工姓名 }}
</template> </template>
</el-table-column> </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"> <template slot-scope="scope">
{{ scope.row.不合格数量 }} {{ 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.完成日期 }}
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-card> </el-card>
</el-col> </el-col>
<el-col style="width:600px"> <el-col style="width:600px">
<el-row> <el-card>
<el-card class="box-card" style="min-height: 400px"> <span>机床图号：{{ 机床图号 }} 机床名称：{{ 机床名称 }}</span>
<div>机床图号：{{ MachineLabel }} 机床名称：{{ MachineName }}</div> <div style="margin: 10px 0 0 50px;height: 300px;overflow: auto">
<div style="min-height: 400px;margin-left: 50px;">
<el-tree <el-tree
:data="departmentData" :data="departmentData"
:props="defaultProps" :props="defaultProps"
:indent="80"
:expand-on-click-node="false" :expand-on-click-node="false"
:indent="30" class="selectTree"
class="gongyizhiding"
default-expand-all default-expand-all
@node-click="onClick"/> @node-click="onClick"/>
</div> </div>
</el-card> </el-card>
</el-row> <el-card style="height: 350px">
<el-row> <el-table :data="tableData2" height="300" highlight-current-row border @row-click="searchTable1">
<el-card style="height: 400px"> <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-card>
</el-row>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
</template> </template>
<script> <script>
import { getMachines, getGroups } from '@/api/ManufacturingCenter/CompletionOfWorkshopComponents' import { getMachines, getGroups, selectParts, selectProcedure } from '@/api/ManufacturingCenter/CompletionOfWorkshopComponents'
import Cookie from 'js-cookie'
export default { export default {
data() { data() {
return { return {
Machine: '', // 机床号 MachineValue: '', // 机床号
Machines: [], Machine: [],
Group: '', // 组号 option: [], // 组号
Groups: [],
number: '', // 零件图号
tableData1: [], tableData1: [],
Complete: '', tableData2: [],
Complete: 2,
Completes: [{ Completes: [{
value: 1, value: 1,
label: '完成' label: '完成'
@@ -106,10 +100,13 @@ export default {
value: 2, value: 2,
label: '在制' label: '在制'
}], }],
departmentData: [], // 树状数据 机床图号: '',
MachineDrawingNumber: [], // 获取树状机床信息 机床名称: '',
MachineLabel: '', // 机床图号 defaultProps: {
MachineName: '' // 机床名称 children: 'children',
label: 'label'
},
departmentData: [] // 树状数据
} }
}, },
created() { created() {
@@ -117,100 +114,87 @@ export default {
}, },
methods: { methods: {
getMachine() { getMachine() {
if (Cookie.get('machineValue') !== undefined) { this.MachineValue = ''
this.Machine = '' this.Machine = []
this.Machines = []
this.Group = ''
this.Groups = []
getMachines().then(response => { getMachines().then(response => {
for (let i = 0; i < response.data.length; i++) { for (let i = 0; i < response.data.length; i++) {
this.Machines.push({ this.Machine.push({
label: response.data[i].机床图号, label: response.data[i].机床图号,
value: response.data[i].机床流水号, value: response.data[i].机床流水号,
value2: response.data[i].机床名称 value2: response.data[i].机床名称
}) })
} }
if (Cookie.get('group') !== undefined) { }).then(() => {
this.Machine = parseInt(Cookie.get('machineValue')) this.MachineValue = this.Machine[0].value
this.getGroup() this.getTreeData()
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 => {
for (let i = 0; i < response.data.length; i++) {
this.Groups.push({
label: response.data[i].组号,
value: response.data[i].组件流水号
})
}
this.Group = response.data[0].组件流水号
})
}, // 获取树状数据
getTreeData() { getTreeData() {
for (let i = 0; i < this.Machines.length; i++) { this.tableData1 = []
if (this.Machine === this.Machines[i].value) { this.tableData2 = []
this.MachineLabel = this.Machines[i].label for (let i = 0; i < this.Machine.length; i++) {
this.MachineName = this.Machines[i].value2 if (this.MachineValue === this.Machine[i].value) {
this.机床图号 = this.Machine[i].label
this.机床名称 = this.Machine[i].value2
} }
} }
getGroups(this.Machine).then(response => { // 初始化机床图号分类 this.option = []
this.options = [] getGroups(this.MachineValue).then(response => {
for (let i = 0; i < response.data.length; i++) { for (let i = 0; i < response.data.length; i++) {
this.options.push({ this.option.push({
label: response.data[i].组号 + '..........' + response.data[i].组件名称, isLeaf: false,
label: response.data[i].组号 + '\xa0\xa0\xa0' + (response.data[i].组件名称 ? response.data[i].组件名称 : ''),
value: response.data[i].组件流水号, value: response.data[i].组件流水号,
father: true, father: true,
children: [] children: []
}) })
} }
}).then(() => { }).then(() => {
// this.options.map(firstLevel => { this.option.map(firstLevel => {
// processNameSelect(firstLevel.value).then(response => { // 根据分类查询机床图号 // 根据分组查零件
// firstLevel.children = [] selectParts(1, firstLevel.value, 0, 0).then(response => {
// for (let j = 0; j < response.data.length; j++) { firstLevel.children = []
// firstLevel.children.push({ for (let j = 0; j < response.data.length; j++) {
// label: response.data[j].机床图号, firstLevel.children.push({
// value: response.data[j].机床流水号, 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].零件名称 : '无零件名称'),
// father: false value: response.data[j].工艺计划流水号,
// }) father: false
// } })
// }) }
// }) })
})
}).then(() => { }).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> </script>
<style scoped> <style lang="scss">
.selectTree{
.el-tree-node__content>.el-tree-node__expand-icon{
display: inline !important;
}
}
</style> </style>

1
src/views/ManufacturingCenter/ParseQuery/index.vue
View File

@@ -1330,6 +1330,7 @@
<el-table-column align="center" label="发货状态"> <el-table-column align="center" label="发货状态">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="scope.row.是否发出 === 1" type="success" size="mini" style="width: 80px">已发货</el-tag> <el-tag v-if="scope.row.是否发出 === 1" type="success" size="mini" style="width: 80px">已发货</el-tag>
<el-tag v-if="scope.row.是否发出 === 0" type="success" size="mini" style="width: 80px">未发货</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="发货单编号"> <el-table-column align="center" label="发货单编号">

18
src/views/ManufacturingCenter/PartAssignment/index.vue
View File

@@ -219,7 +219,7 @@
</el-row> </el-row>
</el-card> </el-card>
<el-row> <el-row>
<el-col style="width: 300px"> <el-col style="width: 400px">
<el-card> <el-card>
<el-table :data="tableData4" border size="mini" style="width: 100%" height="300px" highlight-current-row @row-click="searchDetailed"> <el-table :data="tableData4" border size="mini" style="width: 100%" height="300px" highlight-current-row @row-click="searchDetailed">
<el-table-column label="请购单号" show-overflow-tooltip align="center" width="120px"> <el-table-column label="请购单号" show-overflow-tooltip align="center" width="120px">
@@ -242,6 +242,11 @@
{{ scope.row.请购时间 }} {{ scope.row.请购时间 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备注" align="center" width="107px">
<template slot-scope="scope">
{{ scope.row.备注 }}
</template>
</el-table-column>
<!-- <el-table-column label="操作" align="center" width="250px" fixed="right">--> <!-- <el-table-column label="操作" align="center" width="250px" fixed="right">-->
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- <el-button type="warning" size="mini" icon="el-icon-edit" plain @click="handleEdit(scope.row)">编辑</el-button>--> <!-- <el-button type="warning" size="mini" icon="el-icon-edit" plain @click="handleEdit(scope.row)">编辑</el-button>-->
@@ -349,6 +354,12 @@
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="选择日期"/> placeholder="选择日期"/>
</el-form-item> </el-form-item>
<el-form-item label="备注">
<el-input
v-model="form.Remarks"
size="small"
style="width:200px"/>
</el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="cancel('form')">取消</el-button> <el-button @click="cancel('form')">取消</el-button>
@@ -563,7 +574,8 @@ export default {
form: { form: {
请购单编号: '', 请购单编号: '',
请购车间: '制造部', 请购车间: '制造部',
请购时间: '' 请购时间: '',
Remarks: ''
}, },
rules: { rules: {
请购单编号: [{ required: true, message: '请输入请购单编号', trigger: 'blur' }], 请购单编号: [{ required: true, message: '请输入请购单编号', trigger: 'blur' }],
@@ -908,7 +920,7 @@ export default {
submitAdd(formName) { submitAdd(formName) {
this.$refs[formName].validate((valid) => { this.$refs[formName].validate((valid) => {
if (valid) { if (valid) {
addData(this.form.请购车间, this.name, this.id, this.form.请购时间).then(response => { addData(this.form.请购车间, this.name, this.id, this.form.请购时间, this.form.Remarks).then(response => {
if (response.data[0].result === '1') { if (response.data[0].result === '1') {
this.$message.success('增加成功') this.$message.success('增加成功')
this.dialogFormVisible = false this.dialogFormVisible = false

2
src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
View File

@@ -413,7 +413,7 @@ export default {
}) })
}, },
getTable9() { getTable9() {
this.khbmbh = 12 this.khbmbh = 12 // 考核部门编号
getTable8(this.khbmbh).then(response => { getTable8(this.khbmbh).then(response => {
this.List1 = response.data this.List1 = response.data
}) })

8
src/views/MarketingCenter/CRM/index.vue
View File

@@ -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-button type="success" icon="el-icon-search" class="move" size="small" style="margin-left: 10px" @click="selectCustomerOfName">查询</el-button>
</el-card> </el-card>
<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 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">--> <!--<el-table-column label="责权省份" align="center" min-width="80">-->
<!--<template slot-scope="scope">--> <!--<template slot-scope="scope">-->
@@ -87,7 +88,7 @@
highlight-current-row highlight-current-row
tooltip-effect="dark" tooltip-effect="dark"
style="width: 100%; margin-top: 3px;" style="width: 100%; margin-top: 3px;"
height="700" height="550"
size="mini" size="mini"
border> border>
<el-table-column align="center" label="序号" width="65"> <el-table-column align="center" label="序号" width="65">
@@ -105,8 +106,7 @@
</el-col> </el-col>
<el-col :span="20"> <el-col :span="20">
<el-card> <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="520" size="mini" stripe style="width: 100%;margin-top: 2px" border>
<el-table v-loading="loading2" :data="tableData2" highlight-current-row height="640" size="mini" stripe style="width: 100%;margin-top: 2px" border>
<el-table-column label="客户名称" prop="客户名称" align="center" min-width="180" show-overflow-tooltip> <el-table-column label="客户名称" prop="客户名称" align="center" min-width="180" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.客户名称 }} {{ scope.row.客户名称 }}

1007
src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue
View File

File diff suppressed because it is too large Load Diff

88
src/views/MarketingCenter/ShippingInquiries/index.vue
View File

@@ -1,30 +1,17 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-card> <el-card>
<el-input v-model="invoiceNumber" 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-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-button type="success" icon="el-icon-menu" size="mini" style="margin-left: 10px" @click="openSearch">查询</el-button>
</el-card> </el-card>
<el-card> <el-card>
<el-table <el-col :span="10">
:data="tableDataSearchList" <el-table :data="tableDataSearchList" style="width: 100%" height="600" border stripe size="mini" highlight-current-row @row-click="searchListItem">
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"> <el-table-column align="center" label="状态" width="60px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.是否发出.toString() === '1' ? '已发出' : '未发出' }} <span v-if="scope.row.是否发出.toString() === '1'" style="color: green">已发出</span>
<span v-else>未发出</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="发货单号" width="120px"> <el-table-column align="center" label="发货单号" width="120px">
@@ -32,27 +19,27 @@
{{ scope.row.发货单编号 }} {{ scope.row.发货单编号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="发货单名"> <el-table-column align="center" label="发货单名" width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.发货单名称 }} {{ scope.row.发货单名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="收货单位" width="180px"> <el-table-column align="center" label="收货单位" width="180px" show-overflow-tooltip="">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.收货单位 }} {{ scope.row.收货单位 }}
</template> </template>
</el-table-column> </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"> <el-table-column align="center" label="收货人员" width="80px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.收货人员 }} {{ scope.row.收货人员 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="联系电话"> <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"> <template slot-scope="scope">
{{ scope.row.联系电话 }} {{ scope.row.联系电话 }}
</template> </template>
@@ -67,55 +54,26 @@
{{ scope.row.司机姓名 }} {{ scope.row.司机姓名 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="司机电话"> <el-table-column align="center" label="司机电话" width="110px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.司机电话 }} {{ scope.row.司机电话 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="制单人"> <el-table-column align="center" label="制单人" width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.制单人 }} {{ scope.row.制单人 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="审核人"> <el-table-column align="center" label="发货时间" width="110px">
<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"> <template slot-scope="scope">
<span v-if="scope.row.发出时间 === null"/> <span v-if="scope.row.发出时间 === null"/>
<span v-else>{{ scope.row.发出时间.substr(0,10) }}</span> <span v-else>{{ scope.row.发出时间.substr(0,10) }}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-card> </el-col>
<el-card> <el-col :span="14">
<el-table <el-table v-loading="listLoading" :data="tableData" highlight-current-row style="width: 100%" height="560" border size="mini">
v-loading="listLoading"
:data="tableData"
highlight-current-row
style="width: 100%"
height="560"
border
size="mini">
<el-table-column align="center" label="货品类别" width="80"> <el-table-column align="center" label="货品类别" width="80">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag effect="dark" size="small" type="success">{{ scope.row.货品类别 }}</el-tag> <el-tag effect="dark" size="small" type="success">{{ scope.row.货品类别 }}</el-tag>
@@ -126,7 +84,7 @@
{{ scope.row.货品编号 }} {{ scope.row.货品编号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="货品名称"> <el-table-column align="center" label="货品名称" width="150px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.货品名称 }} {{ scope.row.货品名称 }}
</template> </template>
@@ -141,7 +99,7 @@
{{ scope.row.货品型号 }} {{ scope.row.货品型号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="数量" width="130"> <el-table-column align="center" label="数量" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<template v-if="disabledPick === false"> <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-input-number v-model="scope.row.数量" :min="1" label="描述文字" size="mini" controls-position="right" style="width:100px" @change="handleChange"/>
@@ -157,6 +115,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-col>
</el-card> </el-card>
</div> </div>
</template> </template>
@@ -185,7 +144,6 @@ export default {
this.receivingUnit !== null && this.receivingUnit !== '' ? this.receivingUnit_check = 1 : this.receivingUnit_check = 0 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 => { InvoiceListSearch(this.invoiceNumber, this.receivingUnit, this.invoiceNumber_check, this.receivingUnit_check).then(response => {
if (response.data.length !== 0) { if (response.data.length !== 0) {
console.log(response)
this.tableDataSearchList = response.data this.tableDataSearchList = response.data
} }
}) })

21
src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue
View File

@@ -515,36 +515,35 @@ export default {
submitChangeType(row) { submitChangeType(row) {
this.Number = row.id this.Number = row.id
this.Type = row.整改类型 this.Type = row.整改类型
if (row.整改类型 === 1) {
if (this.groupName.indexOf('MX') > -1) { if (this.groupName.indexOf('MX') > -1) {
if (row.整改类型 === 1) {
update(this.projectName, this.machineValue, row.id, row.整改类型).then(response => { update(this.projectName, this.machineValue, row.id, row.整改类型).then(response => {
if (response.data[0].result === '1') { if (response.data[0].result === '1') {
this.fetchData() this.fetchData()
} }
}) })
} else { } else if (row.整改类型 === 2) {
update1(row.id, row.整改类型).then(response => {
if (response.data[0].result === '1') {
this.fetchData()
}
})
}
} else {
if (row.整改类型 === 2) {
this.title1 = '替换' this.title1 = '替换'
this.oldPartsValue = row.图号或者型号.split('-')[0] + '-' + row.图号或者型号.split('-')[1].substring(2, 7) this.oldPartsValue = row.图号或者型号.split('-')[0] + '-' + row.图号或者型号.split('-')[1].substring(2, 7)
searchOldParts(this.projectName, this.machineValue, this.oldPartsValue).then(response => { searchOldParts(this.projectName, this.machineValue, this.oldPartsValue).then(response => {
this.PartsValueNum = response.data[0].图号或者型号 this.PartsValueNum = response.data[0].图号或者型号
}) })
this.dialogParts = true
} else { } else {
this.title1 = '补充加工' this.title1 = '补充加工'
this.oldPartsValue = row.图号或者型号.split('-')[0] + '-' + row.图号或者型号.split('-')[1].substring(2, 7) this.oldPartsValue = row.图号或者型号.split('-')[0] + '-' + row.图号或者型号.split('-')[1].substring(2, 7)
searchOldParts(this.projectName, this.machineValue, this.oldPartsValue).then(response => { searchOldParts(this.projectName, this.machineValue, this.oldPartsValue).then(response => {
this.PartsValueNum = response.data[0].图号或者型号 this.PartsValueNum = response.data[0].图号或者型号
}) })
}
this.dialogParts = true this.dialogParts = true
} }
} else {
update1(row.id, row.整改类型).then(response => {
if (response.data[0].result === '1') {
this.fetchData()
}
})
}
}, },
searchMaterial1(row) { searchMaterial1(row) {
console.log(row) console.log(row)

3
src/views/WorkshopProcurement/AccountingPrice/index.vue
View File

@@ -3,7 +3,7 @@
<el-card> <el-card>
<el-row> <el-row>
<span>合同号:</span> <span>合同号:</span>
<el-select v-model="contractNumValue" placeholder="合同号" size="small" filterable clearable> <el-select v-model="contractNumValue" placeholder="合同号" size="small" filterable clearable @change="total=0;pageCurrent=1;pageSize=10;searchTable()">
<el-option <el-option
v-for="item in contractNum" v-for="item in contractNum"
:key="item.value" :key="item.value"
@@ -13,7 +13,6 @@
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div> <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
</el-option> </el-option>
</el-select> </el-select>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left:10px" @click="total=0;pageCurrent=1;pageSize=10;searchTable()">查询</el-button>
</el-row> </el-row>
</el-card> </el-card>
<el-card> <el-card>

19
src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue
View File

@@ -7,7 +7,10 @@
v-for="item in contractNum" v-for="item in contractNum"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value"/> :value="item.value">
<div style="float: left">{{ item.label }}</div>
<div style="float: right; color: #8492a6; font-size: 13px;margin-left: 10px">{{ item.name }}</div>
</el-option>
</el-select> </el-select>
<el-input v-model="contractName" placeholder="合同名称" style="width: 120px" size="small"/> <el-input v-model="contractName" placeholder="合同名称" style="width: 120px" size="small"/>
<!-- <el-input v-model="supplierName" size="small" placeholder="请双击选择供应商" readonly clearable @dblclick.native="dialogVisible1=true;submitDisable=true" @clear="emptySupplierDetail"/>--> <!-- <el-input v-model="supplierName" size="small" placeholder="请双击选择供应商" readonly clearable @dblclick.native="dialogVisible1=true;submitDisable=true" @clear="emptySupplierDetail"/>-->
@@ -141,9 +144,9 @@
style="margin-top:10px" style="margin-top:10px"
@click="calculateContractSum">计算合同总额</el-button> @click="calculateContractSum">计算合同总额</el-button>
<span>合同总额(未税):</span> <span>合同总额(未税):</span>
<el-input v-model="contractSum" size="small"/>
<span>合同总额(含税):</span>
<el-input v-model="contractSum2" size="small"/> <el-input v-model="contractSum2" size="small"/>
<span>合同总额(含税):</span>
<el-input v-model="contractSum" size="small"/>
</el-card> </el-card>
<el-card> <el-card>
<el-input :rows="20" v-model="textArea" type="textarea" style="width:calc(99% - 250px);float:right;margin-bottom: 20px" resize="none"/> <el-input :rows="20" v-model="textArea" type="textarea" style="width:calc(99% - 250px);float:right;margin-bottom: 20px" resize="none"/>
@@ -466,7 +469,8 @@ export default {
this.contractNum.push({ this.contractNum.push({
label: response.data[i].请购单编号, label: response.data[i].请购单编号,
value: response.data[i].请购单流水号, value: response.data[i].请购单流水号,
id: response.data[i].请购类型 id: response.data[i].请购类型,
name: response.data[i].备注
}) })
} }
}) })
@@ -548,7 +552,7 @@ export default {
this.tableData4.push(this.groupNum2[i]) this.tableData4.push(this.groupNum2[i])
} }
this.contractSum = (this.contractSum1).toFixed(2) this.contractSum = (this.contractSum1).toFixed(2)
this.contractSum2 = parseInt(this.contractSum * (1 + parseFloat(this.taxRate)) * 100) / 100 this.contractSum2 = parseInt(this.contractSum * (1 - parseFloat(this.taxRate)) * 100) / 100
this.costAccount = this.contractSum this.costAccount = this.contractSum
if (parseInt(this.costAccount) === 0) { if (parseInt(this.costAccount) === 0) {
this.$message.error('成本核算不可为0') this.$message.error('成本核算不可为0')
@@ -566,7 +570,7 @@ export default {
} }
console.log(this.contractSum1, this.groupNum5, 898989) console.log(this.contractSum1, this.groupNum5, 898989)
this.contractSum = (this.contractSum1).toFixed(2) this.contractSum = (this.contractSum1).toFixed(2)
this.contractSum2 = parseInt(this.contractSum * (1 + parseFloat(this.taxRate)) * 100) / 100 this.contractSum2 = parseInt(this.contractSum * (1 - parseFloat(this.taxRate)) * 100) / 100
this.costAccount = this.contractSum this.costAccount = this.contractSum
if (parseInt(this.costAccount) === 0) { if (parseInt(this.costAccount) === 0) {
this.$message.error('成本核算不可为0') this.$message.error('成本核算不可为0')
@@ -585,7 +589,8 @@ export default {
this.contractNum.push({ this.contractNum.push({
label: response.data[i].请购单编号, label: response.data[i].请购单编号,
value: response.data[i].请购单流水号, value: response.data[i].请购单流水号,
id: response.data[i].请购类型 id: response.data[i].请购类型,
name: response.data[i].备注
}) })
} }
}) })

116
src/views/WorkshopProcurement/FundApproval2/index.vue
View File

@@ -58,64 +58,64 @@
@current-change="handleCurrentChange"/> @current-change="handleCurrentChange"/>
</div> </div>
</el-card> </el-card>
<el-card> <!--<el-card>-->
<h3>离线合同</h3> <!--<h3>离线合同</h3>-->
<el-table v-loading="" :data="tableData2" border style="width: 100%;max-height: 300px;" height="300px" size="mini"> <!--<el-table v-loading="" :data="tableData2" border style="width: 100%;max-height: 300px;" height="300px" size="mini">-->
<el-table-column label="供应商" align="center" min-width="170"> <!--<el-table-column label="供应商" align="center" min-width="170">-->
<template slot-scope="scope"> <!--<template slot-scope="scope">-->
{{ scope.row.供应商名称 }} <!--{{ scope.row.供应商名称 }}-->
</template> <!--</template>-->
</el-table-column> <!--</el-table-column>-->
<el-table-column label="请款时间" align="center" min-width="150"> <!--<el-table-column label="请款时间" align="center" min-width="150">-->
<template slot-scope="scope"> <!--<template slot-scope="scope">-->
{{ scope.row.请款时间 }} <!--{{ scope.row.请款时间 }}-->
</template> <!--</template>-->
</el-table-column> <!--</el-table-column>-->
<el-table-column label="请款人" align="center" min-width="100"> <!--<el-table-column label="请款人" align="center" min-width="100">-->
<template slot-scope="scope"> <!--<template slot-scope="scope">-->
{{ scope.row.姓名 }} <!--{{ scope.row.姓名 }}-->
</template> <!--</template>-->
</el-table-column> <!--</el-table-column>-->
<el-table-column label="请款金额" align="center" min-width="100" prop="请款金额"> <!--<el-table-column label="请款金额" align="center" min-width="100" prop="请款金额">-->
<template slot-scope="scope"> <!--<template slot-scope="scope">-->
{{ scope.row.请款金额 }} <!--{{ scope.row.请款金额 }}-->
</template> <!--</template>-->
</el-table-column> <!--</el-table-column>-->
<el-table-column label="审核" align="center" width="320"> <!--<el-table-column label="审核" align="center" width="320">-->
<template slot-scope="scope"> <!--<template slot-scope="scope">-->
<el-popover placement="right" width="400" trigger="click"> <!--<el-popover placement="right" width="400" trigger="click">-->
<el-table :data="gridData" stripe size="mini" show-summary> <!--<el-table :data="gridData" stripe size="mini" show-summary>-->
<el-table-column width="50" align="center" type="index" label="序号"/> <!--<el-table-column width="50" align="center" type="index" label="序号"/>-->
<el-table-column min-width="150" align="center" label="离线合同编号"> <!--<el-table-column min-width="150" align="center" label="离线合同编号">-->
<template slot-scope="scope"> <!--<template slot-scope="scope">-->
{{ scope.row.离线合同编号 }} <!--{{ scope.row.离线合同编号 }}-->
</template> <!--</template>-->
</el-table-column> <!--</el-table-column>-->
<el-table-column min-width="100" align="center" label="合同总额" prop="请款金额"> <!--<el-table-column min-width="100" align="center" label="合同总额" prop="请款金额">-->
<template slot-scope="scope"> <!--<template slot-scope="scope">-->
{{ scope.row.请款金额 }} <!--{{ scope.row.请款金额 }}-->
</template> <!--</template>-->
</el-table-column> <!--</el-table-column>-->
</el-table> <!--</el-table>-->
<el-button slot="reference" type="success" size="mini" icon="el-icon-search" style="margin-right: 10px" plain @click="searchTable02(scope.row)">查看详情</el-button> <!--<el-button slot="reference" type="success" size="mini" icon="el-icon-search" style="margin-right: 10px" plain @click="searchTable02(scope.row)">查看详情</el-button>-->
</el-popover> <!--</el-popover>-->
<el-button type="primary" size="mini" icon="el-icon-check" plain @click="yesApprovalOffline(scope.row)">通过</el-button> <!--<el-button type="primary" size="mini" icon="el-icon-check" plain @click="yesApprovalOffline(scope.row)">通过</el-button>-->
<el-button type="danger" size="mini" icon="el-icon-close" plain @click="noApprovalOffline(scope.row)">不通过</el-button> <!--<el-button type="danger" size="mini" icon="el-icon-close" plain @click="noApprovalOffline(scope.row)">不通过</el-button>-->
</template> <!--</template>-->
</el-table-column> <!--</el-table-column>-->
</el-table> <!--</el-table>-->
<div class="block" style="margin-top: 10px;"> <!--<div class="block" style="margin-top: 10px;">-->
<el-pagination <!--<el-pagination-->
:current-page="pageCurrent2" <!--:current-page="pageCurrent2"-->
:page-sizes="[10, 20, 30, 40]" <!--:page-sizes="[10, 20, 30, 40]"-->
:page-size="pageSize2" <!--:page-size="pageSize2"-->
:total="total2" <!--:total="total2"-->
style="display:inline-block;width:50%" <!--style="display:inline-block;width:50%"-->
layout="total, sizes, prev, pager, next, jumper" <!--layout="total, sizes, prev, pager, next, jumper"-->
@size-change="handleSizeChange2" <!--@size-change="handleSizeChange2"-->
@current-change="handleCurrentChange2"/> <!--@current-change="handleCurrentChange2"/>-->
</div> <!--</div>-->
</el-card> <!--</el-card>-->
<el-card> <el-card>
<h3>备料合同</h3> <h3>备料合同</h3>
<el-table v-loading="" :data="tableData3" border style="width: 100%;max-height: 300px;" height="300px" size="mini"> <el-table v-loading="" :data="tableData3" border style="width: 100%;max-height: 300px;" height="300px" size="mini">

2
src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue
View File

@@ -254,7 +254,7 @@
<el-dialog v-el-drag-dialog :title="title2" :visible.sync="dialogVisible2" center style="min-height: 300px" width="900px"> <el-dialog v-el-drag-dialog :title="title2" :visible.sync="dialogVisible2" center style="min-height: 300px" width="900px">
<span>供应商：</span> <span>供应商：</span>
<el-input v-model="supplierName" size="small" placeholder="请选择供应商发票" style="margin: 0 5px 10px 0;" readonly/> <el-input v-model="supplierName" size="small" placeholder="请选择供应商发票" style="margin: 0 5px 10px 0;" readonly/>
<el-radio-group v-model="contractType" size="small" @change="searchTable01()"> <el-radio-group v-show="false" v-model="contractType" size="small" @change="searchTable01()">
<el-radio label="采购合同" border/> <el-radio label="采购合同" border/>
<el-radio label="离线合同" border/> <el-radio label="离线合同" border/>
</el-radio-group> </el-radio-group>

86
src/views/WorkshopProcurement/NewArrivalList/index.vue
View File

@@ -249,7 +249,15 @@
<el-dialog v-el-drag-dialog :visible.sync="dialogVisible10" title="添加到货明细" center style="min-height: 400px" width="1600px"> <el-dialog v-el-drag-dialog :visible.sync="dialogVisible10" title="添加到货明细" center style="min-height: 400px" width="1600px">
<el-form ref="form10" :model="form10" :rules="rules10" label-position="right" label-width="60px"> <el-form ref="form10" :model="form10" :rules="rules10" label-position="right" label-width="60px">
<el-row> <el-row>
<el-col :span="5" style="margin-left: 27%"> <el-col :span="5" style="margin-left: 2%">
<span>供应商</span>
<el-input v-model="供应商名称" style="width: 250px" size="small" readonly/>
</el-col>
<el-col :span="4">
<span>到货单编号</span>
<el-input v-model="到货单编号" style="width: 150px" size="small" readonly/>
</el-col>
<el-col :span="4">
<span>计划类型</span> <span>计划类型</span>
<el-select v-model="planType" placeholder="计划类型" size="small" style="width: 150px" filterable @change="searchTable20()"> <el-select v-model="planType" placeholder="计划类型" size="small" style="width: 150px" filterable @change="searchTable20()">
<el-option <el-option
@@ -259,17 +267,16 @@
:value="item.value"/> :value="item.value"/>
</el-select> </el-select>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="4">
<span>供应商</span> <span>零件图号</span>
<el-input v-model="供应商名称" style="width: 250px" size="small" readonly/> <el-input v-model="零件图号" style="width: 150px" size="small" clearable/>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="2">
<span>到货单编号</span> <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="searchTable20()">查询</el-button>
<el-input v-model="到货单编号" style="width: 150px" size="small" readonly/>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<div style="width: 20%;float: left;margin-top: 5px"> <div style="width: 20%;float: left;margin-top: 20px">
<div style="background: gainsboro"> <div style="background: gainsboro">
<el-row style="height: 50px"> <el-row style="height: 50px">
<el-form-item label="材料" prop="CailiaoValue"> <el-form-item label="材料" prop="CailiaoValue">
@@ -302,8 +309,8 @@
</div> </div>
</div> </div>
<div style="width: 79%;float: left;margin-left: 10px"> <div style="width: 79%;float: left;margin-left: 10px">
<el-table v-loading="" :data="tableData20" border show-summary highlight-current-row stripe style="margin: 3px 0" height="300px" size="mini" @selection-change="handleSelectionChange"> <el-table :row-key="getRowKeys" :data="tableData20" border show-summary highlight-current-row stripe style="margin: 3px 0" height="550px" size="mini" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="50" align="center"/> <el-table-column :reserve-selection="true" type="selection" width="50" align="center"/>
<el-table-column label="采购单号" align="center" width="120"> <el-table-column label="采购单号" align="center" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.采购单号 }} {{ scope.row.采购单号 }}
@@ -336,12 +343,12 @@
</el-table-column> </el-table-column>
<el-table-column label="到货件数" align="center" width="110px"> <el-table-column label="到货件数" align="center" width="110px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input-number v-model="scope.row.未到货数量" :disabled="disable === '1'" :max="scope.row.批次数量-parseInt(scope.row.到货数量)" :step="1" :min="0" size="mini" style="width:90px"/> <el-input-number v-model="scope.row.未到货数量" :disabled="disable === '1'" :max="scope.row.批次数量-parseInt(scope.row.到货数量)" :step="1" :min="0" size="mini" style="width:90px" @change="saveData(scope.row)"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="到货重量" align="center" width="110px" prop="到货重量"> <el-table-column label="到货重量" align="center" width="110px" prop="到货重量">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input-number v-model="scope.row.到货重量" :disabled="disable === '1'" :step="1" :min="0" size="mini" style="width:90px"/> <el-input-number v-model="scope.row.到货重量" :disabled="disable === '1'" :step="1" :min="0" size="mini" style="width:90px" @change="saveData(scope.row)"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="成品尺寸（长、宽、高）" align="center"> <el-table-column label="成品尺寸（长、宽、高）" align="center">
@@ -417,7 +424,7 @@
<!--</div>--> <!--</div>-->
<!--</el-dialog>--> <!--</el-dialog>-->
<el-dialog v-el-drag-dialog :visible.sync="dialogVisible2" title="关联备料材料" center style="min-height: 400px" width="1400px"> <el-dialog v-el-drag-dialog :visible.sync="dialogVisible2" title="关联备料材料" center style="min-height: 550px" width="1400px">
<span>计划类型</span> <span>计划类型</span>
<el-select v-model="planType" placeholder="计划类型" size="small" style="width: 150px" filterable @change="searchTable20()"> <el-select v-model="planType" placeholder="计划类型" size="small" style="width: 150px" filterable @change="searchTable20()">
<el-option <el-option
@@ -426,8 +433,11 @@
:label="item.label" :label="item.label"
:value="item.value"/> :value="item.value"/>
</el-select> </el-select>
<el-table v-loading="" :data="tableData20" border highlight-current-row stripe style="margin: 3px 0" height="300px" size="mini" @selection-change="handleSelectionChange"> <span>零件图号</span>
<el-table-column type="selection" width="50" align="center"/> <el-input v-model="零件图号" style="width: 150px" size="small" clearable/>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="searchTable20()">查询</el-button>
<el-table :row-key="getRowKeys" :data="tableData20" border highlight-current-row stripe style="margin: 3px 0" height="300px" size="mini" @selection-change="handleSelectionChange">
<el-table-column :reserve-selection="true" type="selection" width="50" align="center"/>
<el-table-column label="采购单号" align="center" width="120"> <el-table-column label="采购单号" align="center" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.采购单号 }} {{ scope.row.采购单号 }}
@@ -460,12 +470,12 @@
</el-table-column> </el-table-column>
<el-table-column label="到货件数" align="center" width="110px"> <el-table-column label="到货件数" align="center" width="110px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input-number v-model="scope.row.未到货数量" :disabled="disable === '1'" :max="scope.row.批次数量-parseInt(scope.row.到货数量)" :step="1" :min="0" size="mini" style="width:90px"/> <el-input-number v-model="scope.row.未到货数量" :disabled="disable === '1'" :max="scope.row.批次数量-parseInt(scope.row.到货数量)" :step="1" :min="0" size="mini" style="width:90px" @change="saveData(scope.row)"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="到货重量" align="center" width="110px"> <el-table-column label="到货重量" align="center" width="110px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input-number v-model="scope.row.到货重量" :disabled="disable === '1'" :step="1" :min="0" size="mini" style="width:90px"/> <el-input-number v-model="scope.row.到货重量" :disabled="disable === '1'" :step="1" :min="0" size="mini" style="width:90px" @change="saveData(scope.row)"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="成品尺寸（长、宽、高）" align="center"> <el-table-column label="成品尺寸（长、宽、高）" align="center">
@@ -535,6 +545,7 @@ export default {
ALLMoney: '', ALLMoney: '',
材料名称: '', 材料名称: '',
未绑定数量: '', 未绑定数量: '',
零件图号: '',
tableData2: [], tableData2: [],
total2: 0, total2: 0,
pageCurrent2: 1, pageCurrent2: 1,
@@ -595,12 +606,17 @@ export default {
单位: [{ required: true, message: '请填写单位' }], 单位: [{ required: true, message: '请填写单位' }],
单价: [{ required: true, message: '请填写单价' }] 单价: [{ required: true, message: '请填写单价' }]
}, },
到货单编号: '',
供应商名称: '',
本次到货数量组: [], 本次到货数量组: [],
到货重量组: [], 到货重量组: [],
工艺计划流水号组: [], 工艺计划流水号组: [],
采购计划明细流水号组: [], 采购计划明细流水号组: [],
离线采购计划明细流水号组: [], 离线采购计划明细流水号组: [],
到货金额组: [] 到货金额组: [],
getRowKeys(row) {
return row.采购计划明细流水号
}
} }
}, },
computed: { computed: {
@@ -618,6 +634,23 @@ export default {
this.searchTable4() this.searchTable4()
}, },
methods: { methods: {
saveData(row) {
var a = 0
this.tableData30.map(v => {
if (v.采购计划明细流水号 === row.采购计划明细流水号) {
v.到货重量 = row.到货重量
v.未到货数量 = row.未到货数量
a = 1
}
})
if (a === 0) {
this.tableData30.push({
采购计划明细流水号: row.采购计划明细流水号,
到货重量: row.到货重量,
未到货数量: row.未到货数量
})
}
},
fetchdata() { fetchdata() {
searchSupplier(0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '').then(response => { searchSupplier(0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '').then(response => {
for (let i = 0; i < response.data.length; i++) { for (let i = 0; i < response.data.length; i++) {
@@ -629,12 +662,22 @@ export default {
}) })
}, },
searchTable20() { searchTable20() {
let check
this.零件图号 ? check = 1 : check = 0
if (this.planType === 0) { if (this.planType === 0) {
searchMateriel(this.供应商).then(response => { searchMateriel(this.供应商, check, this.零件图号).then(response => {
this.tableData20 = response.data this.tableData20 = response.data
for (let i = 0; i < this.tableData20.length; i++) {
for (let j = 0; j < this.tableData30.length; j++) {
if (this.tableData20[i].采购计划明细流水号 === this.tableData30[j].采购计划明细流水号) {
this.tableData20[i].未到货数量 = this.tableData30[j].未到货数量
this.tableData20[i].到货重量 = this.tableData30[j].到货重量
}
}
}
}) })
} else { } else {
searchLxMateriel(this.供应商).then(response => { searchLxMateriel(this.供应商, check, this.零件图号).then(response => {
this.tableData20 = response.data this.tableData20 = response.data
}) })
} }
@@ -924,7 +967,9 @@ export default {
this.form10.数量 = '' this.form10.数量 = ''
this.form10.单价 = '' this.form10.单价 = ''
this.form10.金额 = '' this.form10.金额 = ''
this.tableData30 = []
this.searchTable20() this.searchTable20()
this.$refs['form10'].resetFields()
searchTable5(this.ArrivalOrderNumber).then(response => { searchTable5(this.ArrivalOrderNumber).then(response => {
this.tableData5 = response.data this.tableData5 = response.data
}) })
@@ -1046,6 +1091,7 @@ export default {
addMateriel(this.ArrivalOrderMXNumber, this.工艺计划流水号组, this.采购计划明细流水号组, this.本次到货数量组, this.离线采购计划明细流水号组, this.到货重量组, this.到货金额组, this.userId).then(response => { addMateriel(this.ArrivalOrderMXNumber, this.工艺计划流水号组, this.采购计划明细流水号组, this.本次到货数量组, this.离线采购计划明细流水号组, this.到货重量组, this.到货金额组, this.userId).then(response => {
if (response.data[0].result === '1') { if (response.data[0].result === '1') {
this.$message.success('关联成功') this.$message.success('关联成功')
this.tableData30 = []
this.searchTable20() this.searchTable20()
searchTable6(this.ArrivalOrderMXNumber).then(response => { searchTable6(this.ArrivalOrderMXNumber).then(response => {
this.tableData6 = response.data this.tableData6 = response.data

113
src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue
View File

@@ -132,9 +132,9 @@
<el-card style="float: left;width: 41.3%;margin-left: 5px"> <el-card style="float: left;width: 41.3%;margin-left: 5px">
<el-table :data="gridData" class="subTableHeader" show-summary stripe border size="mini" style="width: 100%"> <el-table :data="gridData" class="subTableHeader" show-summary stripe border size="mini" style="width: 100%">
<el-table-column width="50" align="center" type="index" label="序号"/> <el-table-column width="50" align="center" type="index" label="序号"/>
<el-table-column min-width="150" align="center" label="供应商"> <el-table-column label="到货单编号" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.供应商名称 }} {{ scope.row.到货单编号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="100" align="center" label="到货日期"> <el-table-column width="100" align="center" label="到货日期">
@@ -147,11 +147,6 @@
{{ scope.row.到货金额 }} {{ scope.row.到货金额 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column min-width="100" align="center" label="备注">
<template slot-scope="scope">
{{ scope.row.备注 }}
</template>
</el-table-column>
<el-table-column min-width="100" align="center" label="操作"> <el-table-column min-width="100" align="center" label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tooltip effect="dark" content="取消关联" placement="top"> <el-tooltip effect="dark" content="取消关联" placement="top">
@@ -167,12 +162,12 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-card> </el-card>
<el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogVisible1" center style="min-height: 300px" width="1400px"> <el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogVisible1" center style="min-height: 300px" width="800px">
<el-form ref="form1" :model="form1" :rules="rules1" label-width="110px"> <el-form ref="form1" :model="form1" :rules="rules1" label-width="110px">
<div style="width: 25%;float: left;margin-top: 5px"> <div style="width: 45%;float: left;margin-top: 5px">
<div style="background: gainsboro"> <div style="background: gainsboro">
<el-form-item label="供应商" prop="supplierNameValue"> <el-form-item label="供应商" prop="supplierNameValue">
<el-select v-model="form1.supplierNameValue" placeholder="供应商" size="small" filterable @change="Name=form1.supplierNameValue;pageCurrent4=1;pageSize4=10;total4=0;searchTable4()"> <el-select v-model="form1.supplierNameValue" placeholder="供应商" size="small" filterable @change="Name=form1.supplierNameValue;searchTable4()">
<el-option <el-option
v-for="item in supplierNames" v-for="item in supplierNames"
:key="item.value" :key="item.value"
@@ -194,29 +189,12 @@
</el-form-item> </el-form-item>
</div> </div>
</div> </div>
<div style="width: 74%;float: left;margin-left: 5px"> <div style="width: 54%;float: left;margin-left: 5px">
<div> <el-table v-loading="" :data="tableData4" border stripe style="max-height: 460px;" height="280px" size="mini" highlight-current-row @selection-change="handleSelectionChange">
<span style="margin-left: 10px">时间段:</span>
<el-date-picker
v-model="dateRange"
size="small"
type="daterange"
align="center"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
range-separator="～"
style="width:260px"
start-placeholder="开始日期"
end-placeholder="结束日期"/>
<el-tooltip :open-delay="1200" effect="dark" content="查询到货单" placement="top">
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent4=1;pageSize4=10;total4=0;searchTable4()">查询</el-button>
</el-tooltip>
</div>
<el-table v-loading="" :data="tableData4" border stripe style="max-height: 460px;" height="230px" size="mini" highlight-current-row @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center"/> <el-table-column type="selection" width="55" align="center"/>
<el-table-column label="供应商" align="center"> <el-table-column label="到货单编号" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.供应商名称 }} {{ scope.row.到货单编号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="到货日期" align="center"> <el-table-column label="到货日期" align="center">
@@ -229,23 +207,7 @@
{{ scope.row.到货金额 }} {{ scope.row.到货金额 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备注" align="center" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.备注 }}
</template>
</el-table-column>
</el-table> </el-table>
<div class="block">
<el-pagination
:current-page="pageCurrent4"
:page-sizes="[10, 20, 30, 40]"
:page-size="pageSize4"
:total="total4"
style="display:inline-block;width:50%"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange4"
@current-change="handleCurrentChange4"/>
</div>
</div> </div>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@@ -255,29 +217,12 @@
</div> </div>
</el-dialog> </el-dialog>
<el-dialog v-el-drag-dialog :visible.sync="dialogVisible" title="关联到货单" center style="min-height: 200px" width="45%"> <el-dialog v-el-drag-dialog :visible.sync="dialogVisible" title="关联到货单" center style="min-height: 200px" width="35%">
<div>
<span style="margin-left: 10px">时间段:</span>
<el-date-picker
v-model="dateRange"
size="small"
type="daterange"
align="center"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
range-separator="～"
style="width:260px"
start-placeholder="开始日期"
end-placeholder="结束日期"/>
<el-tooltip :open-delay="1200" effect="dark" content="查询到货单" placement="top">
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent4=1;pageSize4=10;total4=0;searchTable4()">查询</el-button>
</el-tooltip>
</div>
<el-table v-loading="" :data="tableData4" border stripe style="max-height: 460px;" height="230px" size="mini" highlight-current-row @selection-change="handleSelectionChange"> <el-table v-loading="" :data="tableData4" border stripe style="max-height: 460px;" height="230px" size="mini" highlight-current-row @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center"/> <el-table-column type="selection" width="55" align="center"/>
<el-table-column label="供应商" align="center"> <el-table-column label="到货单编号" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.供应商名称 }} {{ scope.row.到货单编号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="到货日期" align="center"> <el-table-column label="到货日期" align="center">
@@ -290,23 +235,7 @@
{{ scope.row.到货金额 }} {{ scope.row.到货金额 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备注" align="center" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.备注 }}
</template>
</el-table-column>
</el-table> </el-table>
<div class="block">
<el-pagination
:current-page="pageCurrent4"
:page-sizes="[10, 20, 30, 40]"
:page-size="pageSize4"
:total="total4"
style="display:inline-block;width:50%"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange4"
@current-change="handleCurrentChange4"/>
</div>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" size="small" icon="el-icon-download" style="margin-left: 10px" @click="addMateriel">关联到货单</el-button> <el-button type="primary" size="small" icon="el-icon-download" style="margin-left: 10px" @click="addMateriel">关联到货单</el-button>
</div> </div>
@@ -337,9 +266,6 @@ export default {
pageCurrent1: 1, pageCurrent1: 1,
pageSize1: 30, pageSize1: 30,
total1: 0, total1: 0,
pageCurrent4: 1,
pageSize4: 10,
total4: 0,
tableData1: [], tableData1: [],
tableData01: [], tableData01: [],
tableData4: [], tableData4: [],
@@ -436,20 +362,10 @@ export default {
console.log(this.Name) console.log(this.Name)
this.Name ? this.check = 1 : this.check = 0 this.Name ? this.check = 1 : this.check = 0
this.dateRange ? this.check1 = 1 : (this.check1 = 0, this.dateRange = '') this.dateRange ? this.check1 = 1 : (this.check1 = 0, this.dateRange = '')
searchArriveOrder(this.check, this.Name, this.check1, this.dateRange[0], this.dateRange[1], this.pageCurrent4, this.pageSize4).then(response => { searchArriveOrder(this.check, this.Name, this.check1, this.dateRange[0], this.dateRange[1]).then(response => {
this.tableData4 = response.data.rows this.tableData4 = response.data
this.total4 = response.data.total
}) })
}, },
handleSizeChange4(val) { // 采购单列表分页
this.pageSize4 = val
this.pageCurrent4 = 1
this.searchTable4()
},
handleCurrentChange4(val) { // 采购单列表分页
this.pageCurrent4 = val
this.searchTable4()
},
searchTable02(row) { // 查看详情（发票包含的合同） searchTable02(row) { // 查看详情（发票包含的合同）
this.发票流水号 = row.发票流水号 this.发票流水号 = row.发票流水号
searchInvoiceDetail(this.发票流水号).then(response => { searchInvoiceDetail(this.发票流水号).then(response => {
@@ -461,6 +377,7 @@ export default {
this.$refs['form1'].resetFields() this.$refs['form1'].resetFields()
} }
this.title1 = '新增备料发票' this.title1 = '新增备料发票'
this.tableData4 = []
this.dialogVisible1 = true this.dialogVisible1 = true
console.log(this.supplierNames) console.log(this.supplierNames)
this.form1.supplierNameValue = '' this.form1.supplierNameValue = ''