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

更新

Browse Source
This commit is contained in:
liushuai
2020-04-09 18:35:58 +08:00
parent dc0b9cc5d9
commit 476a105bda
18 changed files with 408 additions and 443 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -177,6 +177,11 @@
{{ scope.row.采购合同名称 || scope.row.离线合同名称 }}
</template>
</el-table-column>
<el-table-column label="采购数量" align="center" width="100">
<template slot-scope="scope">
{{ scope.row.采购数量 }}
</template>
</el-table-column>
<el-table-column label="到票数量" align="center" width="100">
<template slot-scope="scope">
{{ scope.row.到票数量 }}

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

@@ -565,6 +565,11 @@ export default {
purchasingOrder: '',
ArrivalOrderNumber: '',
ArrivalOrderMXNumber: '',
ArrivalDetailSerialNumber: '',
ArrivalOrderGroup: [],
ArrivalOrderMXNumberGroup: [],
numberGroup: [],
LxnumberGroup: [],
supplierName0: '',
planType: 0,
planTypes: [
@@ -1036,12 +1041,34 @@ export default {
})
},
deleteArrivalOrder(row) { // 删除采购单
this.ArrivalOrderGroup = []
this.ArrivalOrderMXNumberGroup = []
this.numberGroup = []
this.LxnumberGroup = []
this.ArrivalDetailSerialNumber = ''
searchTable5(row.到货单流水号).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.ArrivalDetailSerialNumber = response.data[i].到货单明细流水号
this.ArrivalOrderGroup.push(response.data[i].到货单明细流水号)
console.log(this.ArrivalDetailSerialNumber, 231)
searchTable6(this.ArrivalDetailSerialNumber).then(response => {
for (let j = 0; j < response.data.length; j++) {
this.ArrivalOrderMXNumberGroup.push(response.data[j].到货单明细绑定流水号)
this.numberGroup.push(response.data[j].采购计划明细流水号)
this.LxnumberGroup.push(response.data[j].离线采购计划明细流水号)
}
})
}
console.log(this.ArrivalOrderMXNumberGroup, this.numberGroup, this.LxnumberGroup, 111)
})
this.$confirm('确定删除该到货单?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
deletePurchaseOrder(row.到货单流水号).then(response => {
console.log(row.到货单流水号, this.ArrivalOrderGroup, this.ArrivalOrderMXNumberGroup, this.numberGroup, this.LxnumberGroup, 2222)
deletePurchaseOrder(row.到货单流水号, this.ArrivalOrderGroup, this.ArrivalOrderMXNumberGroup, this.numberGroup, this.LxnumberGroup).then(response => {
console.log(response, 123)
if (response.data[0].result === '1') {
this.$message.success('删除成功')
this.searchTable4()
@@ -1101,12 +1128,14 @@ export default {
this.到货重量组 = []
this.到货金额组 = []
this.arrest.map(v => {
this.工艺计划流水号组.push(v.工艺计划流水号)
this.采购计划明细流水号组.push(v.采购计划明细流水号)
this.离线采购计划明细流水号组.push(v.离线采购计划明细流水号)
this.本次到货数量组.push(v.未到货数量)
this.到货重量组.push(v.到货重量)
this.到货金额组.push(v.到货重量 * this.form10.单价)
if (v.到货重量 > 0) {
this.工艺计划流水号组.push(v.工艺计划流水号)
this.采购计划明细流水号组.push(v.采购计划明细流水号)
this.离线采购计划明细流水号组.push(v.离线采购计划明细流水号)
this.本次到货数量组.push(v.未到货数量)
this.到货重量组.push(v.到货重量)
this.到货金额组.push(v.到货重量 * this.form10.单价)
}
})
AddArrivalOrderMX(this.ArrivalOrderNumber, this.form10.CailiaoValue, this.form10.数量, this.form10.单位, this.form10.单价, this.form10.金额, this.工艺计划流水号组, this.采购计划明细流水号组, this.本次到货数量组, this.离线采购计划明细流水号组, this.到货重量组, this.到货金额组, this.userId).then(response => {
if (response.data[0].result === '1') {
@@ -1176,17 +1205,28 @@ export default {
})
},
deleteArrivalMX(row) {
this.ArrivalOrderMXNumberGroup = []
this.numberGroup = []
this.LxnumberGroup = []
searchTable6(this.ArrivalOrderMXNumber).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.ArrivalOrderMXNumberGroup.push(response.data[i].到货单明细绑定流水号)
this.numberGroup.push(response.data[i].采购计划明细流水号)
this.LxnumberGroup.push(response.data[i].离线采购计划明细流水号)
}
})
this.$confirm('确定取消该物料的到货信息?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
deleteArrivalMX(row.到货单明细流水号).then(response => {
deleteArrivalMX(row.到货单明细流水号, this.ArrivalOrderMXNumberGroup, this.numberGroup, this.LxnumberGroup).then(response => {
if (response.data[0].result === '1') {
this.$message.success('删除成功')
searchTable5(this.ArrivalOrderNumber).then(response => {
this.tableData5 = response.data
})
this.tableData6 = []
} else { this.$message.error('数据占用，删除失败') }
})
}).catch(() => {
@@ -1205,7 +1245,6 @@ export default {
if (response.data.length !== 0) {
this.中间变量 = response.data[0].单件重量
this.未绑定数量 = response.data[0].未绑定数量
console.log(this.未绑定数量, 111)
} else {
this.未绑定数量 = row.数量
}
@@ -1248,12 +1287,14 @@ export default {
this.到货重量组 = []
this.到货金额组 = []
this.arrest1.map(v => {
this.工艺计划流水号组.push(v.工艺计划流水号)
this.采购计划明细流水号组.push(v.采购计划明细流水号)
this.离线采购计划明细流水号组.push(v.离线采购计划明细流水号)
this.本次到货数量组.push(v.未到货数量)
this.到货重量组.push(v.到货重量)
this.到货金额组.push(v.到货重量 * this.单价)
if (v.到货数量 > 0) {
this.工艺计划流水号组.push(v.工艺计划流水号)
this.采购计划明细流水号组.push(v.采购计划明细流水号)
this.离线采购计划明细流水号组.push(v.离线采购计划明细流水号)
this.本次到货数量组.push(v.未到货数量)
this.到货重量组.push(v.到货重量)
this.到货金额组.push(v.到货重量 * this.单价)
}
})
addMateriel(this.ArrivalOrderMXNumber, this.工艺计划流水号组, this.采购计划明细流水号组, this.本次到货数量组, this.离线采购计划明细流水号组, this.到货重量组, this.到货金额组, this.userId).then(response => {
if (response.data[0].result === '1') {

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

@@ -163,6 +163,7 @@
<el-tooltip effect="dark" content="取消关联" placement="top">
<div style="display: inline-block">
<el-button
:disabled="disabled"
type="text"
size="mini"
icon="el-icon-right"
@@ -290,6 +291,7 @@ export default {
name: '', // 发票交接单
data() {
return {
disabled: false,
addTable1_disable: false,
aboutArrival_disable: false,
dateRange: '',
@@ -469,6 +471,8 @@ export default {
},
searchTable02(row) { // 查看详情（发票包含的合同）
this.发票流水号 = row.发票流水号
row.是否请款 === '1' ? this.disabled = true : this.disabled = false
console.log(this.disabled, 123)
searchInvoiceDetail(this.发票流水号).then(response => {
this.gridData = response.data
})

34
src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue
View File

@@ -37,12 +37,15 @@
<el-card style="width: 100%">
<el-table v-loading="loading" :data="tableData" highlight-current-row border stripe size="mini" style="width: 100%" height="750" @sort-change="sortChange">
<el-table-column label="序号" align="center" type="index" width="50"/>
<!--<el-table-column label="进程" align="center" prop="进程" sortable="custom" width="80px">-->
<!--<template slot-scope="scope">-->
<!--<span v-if="Number(scope.row.是否到货)===0" type="warning" size="mini">未到</span>-->
<!--<span v-if="Number(scope.row.是否到货)===1" type="primary" size="mini">已到</span>-->
<!--<span v-if="Number(scope.row.是否到货)===2" type="success" size="mini">已结</span>-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column label="进程" align="center" prop="进程" sortable="custom" width="80px">
<template slot-scope="scope">
<span v-if="Number(scope.row.是否到货)===0" type="warning" size="mini">未到</span>
<span v-if="Number(scope.row.是否到货)===1" type="primary" size="mini">已到</span>
<span v-if="Number(scope.row.是否到货)===2" type="success" size="mini">已结</span>
</template>
<template slot-scope="scope">{{ scope.row.备料状态 }}</template>
</el-table-column>
<el-table-column
label="供应商"
@@ -58,7 +61,7 @@
label="物料编码"
align="center"
width="180px">
<template slot-scope="scope">{{ scope.row.物料编码 }}</template>
<template slot-scope="scope">{{ scope.row.物料编码 ? scope.row.物料编码 : scope.row.零件图号 }}</template>
</el-table-column>
<el-table-column
label="物料名称"
@@ -76,6 +79,12 @@
align="center">
<template slot-scope="scope">{{ scope.row.材料 }}</template>
</el-table-column>
<el-table-column
label="计划件数"
align="center"
width="100">
<template slot-scope="scope">{{ scope.row.批次数量 }}</template>
</el-table-column>
<el-table-column label="备料件数" align="center" width="100">
<template slot-scope="scope">
{{ scope.row.采购数量 }}
@@ -162,13 +171,22 @@ export default {
MaterialsValue: '',
Materials: [{
value: 0,
label: '未到'
label: '已结'
}, {
value: 1,
label: '已到'
}, {
value: 2,
label: '已结'
label: '未到'
}, {
value: 3,
label: '未采'
}, {
value: 4,
label: '自家'
}, {
value: 5,
label: '未分配'
}],
loading: false,
total: 0,

4
src/views/WorkshopProcurement/RequestApprovalQuery2/index.vue
View File

@@ -216,8 +216,8 @@ export default {
this.dateRange ? check2 = 1 : (check2 = 0, this.dateRange = '')
var param = []
param[0] = ['查询全部', this.radio]
param[1] = ['供应商名称_check', check1]
param[2] = ['供应商名称', this.supplierValue]
param[1] = ['供应商流水号_check', check1]
param[2] = ['供应商流水号', this.supplierValue]
param[3] = ['时间段_check', check2]
if (check2 === 0) {
param[4] = ['开始时间', '']