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

机床查询、使用滞货

Browse Source
This commit is contained in:
liushuai
2019-01-21 09:37:51 +08:00
parent 969a1bc8d6
commit bce18ed9cd
17 changed files with 373 additions and 514 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,13 +27,6 @@
<el-col :span="6">
<el-form-item label="预付款">
<el-input v-model="AdvanceCharge" size="small" placeholder="预付款"/>
<!--<el-select v-model="payMethodValue" placeholder="预付款" size="small" @change="payMethodChange">-->
<!--<el-option-->
<!--v-for="item in payMethod"-->
<!--:key="item.value"-->
<!--:label="item.label"-->
<!--:value="item.value"/>-->
<!--</el-select>-->
</el-form-item>
</el-col>
</el-row>
@@ -53,8 +46,6 @@
<el-form-item label="规定到货时间">
<el-date-picker
v-model="stipulateArrivalTime"
:picker-options="endDateOpt"
:disabled="Boolean(!contractNumValue)"
size="small"
type="date"
format="yyyy-MM-dd"
@@ -78,6 +69,16 @@
<el-card>
<el-table :data="tableData4" border style="width: 100%;max-height: 400px;" height="300px" size="mini">
<el-table-column label="单件定额工时" align="center" width="150">
<template slot-scope="scope">
{{ scope.row.单件定额工时 }}
</template>
</el-table-column>
<el-table-column label="准结定额工时" align="center" width="150">
<template slot-scope="scope">
{{ scope.row.准结定额工时 }}
</template>
</el-table-column>
<el-table-column label="单价" align="center" width="150">
<template slot-scope="scope">
<el-input v-model="scope.row.单价" size="mini" style="width:70px"/>
@@ -127,16 +128,21 @@
</el-table-column>
</el-table>
<el-table :data="tableData3" border style="width: 100%;max-height: 400px;" height="300px" size="mini">
<el-table-column label="单件定额工时" align="center" width="150">
<template slot-scope="scope">
{{ scope.row.单件定额工时 }}
</template>
</el-table-column>
<el-table-column label="准结定额工时" align="center" width="150">
<template slot-scope="scope">
{{ scope.row.准结定额工时 }}
</template>
</el-table-column>
<el-table-column label="单价" align="center" width="150">
<template slot-scope="scope">
<el-input v-model="scope.row.单价" size="mini" style="width:70px"/>
</template>
</el-table-column>
<!--<el-table-column label="发货天数" align="center" width="150">-->
<!--<template slot-scope="scope">-->
<!--<el-input v-model="deliveryDay[scope.$index]" size="mini" style="width:70px"/>-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column label="物料名称" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.物料名称 }}
@@ -179,23 +185,6 @@
<el-input v-model="scope.row.备注" size="small" style="width: 120px" @change="update(scope.row)"/>
</template>
</el-table-column>
<!--<el-table-column label="计算方式" align="center" width="110">-->
<!--<template slot-scope="scope">-->
<!--<el-select v-model="calculateWayValue[scope.$index]" style="width:75px" size="mini">-->
<!--<el-option-->
<!--v-for="item in calculateWay"-->
<!--:key="item.value"-->
<!--:label="item.label"-->
<!--:value="item.value">-->
<!--</el-option>-->
<!--</el-select>-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="重量" align="center" width="100">-->
<!--<template slot-scope="scope">-->
<!--<el-input size="mini" v-model="weight[scope.$index]" style="width:70px"></el-input>-->
<!--</template>-->
<!--</el-table-column>-->
</el-table>
<el-button
type="primary"
@@ -216,8 +205,6 @@
icon=""
style="margin-left: 4.5%"
@click="doneContract">生成采购合同</el-button>
<!--<el-button type="primary" size="small" icon="" style="float:right;margin: 0 10px 15px 0"-->
<!--@click="doneContract">生成采购合同</el-button>-->
</el-card>
<el-dialog :visible.sync="dialogVisible1" title="供应商选择" center style="min-height: 300px">
@@ -335,21 +322,13 @@
</template>
<script>
import { searchSupplier, update, doneContract, initPurchaseOrder, searchData, searchData1, searchData2, searchContractDemo } from '@/api/WorkshopProcurement/CreatingProcurementContracts'
import { searchSupplier, update, doneContract, initPurchaseOrder, searchData1, searchData2, searchContractDemo } from '@/api/WorkshopProcurement/CreatingProcurementContracts'
import { mapGetters } from 'vuex'
export default {
inject: ['reload'],
data() {
return {
submitDisable: true, // 不点击表格中的行不让确定
minDate: null,
endDateOpt: { // 禁用大于规定到货日期和小于当前日期
disabledDate: (time) => {
if (this.minDate) {
return time.getTime() > this.minDate || time.getTime() < new Date()
}
}
},
AdvanceCharge: '',
loading: false,
dialogVisible1: false,
@@ -444,7 +423,9 @@ export default {
group7: '',
group8: '',
group9: '',
group10: ''
group10: '',
group11: '',
group12: ''
}
},
computed: {
@@ -460,14 +441,6 @@ export default {
},
methods: {
searchData() {
const numGroup = [] // 空数组，放物料的计划到货时间
searchData(this.contractNumValue).then(response => {
console.log(response.data, 111)
for (let i = 0; i < response.data.length; i++) {
numGroup.push(Date.parse(response.data[i].物料计划到货时间))
}
this.minDate = new Date(Math.min(...numGroup))
})
searchData1(this.contractNumValue).then(response => {
console.log(response.data, 222)
for (let j = 0; j < response.data.length; j++) {
@@ -607,12 +580,12 @@ export default {
this.group1 = ''
this.group2 = ''
this.group3 = ''
// this.group5 = ''
// this.group6 = ''
this.group7 = ''
this.group8 = ''
this.group9 = ''
this.group10 = ''
this.group11 = ''
this.group12 = ''
for (let i = 0; i < this.tableData3.length; i++) {
this.group1 += this.tableData3[i].物料流水号 + ','
this.group2 += this.tableData3[i].零件数量 + ','
@@ -620,6 +593,8 @@ export default {
this.group7 += this.taxRate + ','
this.group8 += this.currencyValue + ','
this.group9 += this.tableData3[i].请购单明细流水号 + ','
this.group11 += this.tableData3[i].单件定额工时 + ','
this.group12 += this.tableData3[i].准结定额工时 + ','
}
for (let i = 0; i < this.tableData4.length; i++) {
this.group1 += this.tableData4[i].物料流水号 + ','
@@ -628,56 +603,18 @@ export default {
this.group7 += this.taxRate + ','
this.group8 += this.currencyValue + ','
this.group9 += this.tableData4[i].请购单明细流水号 + ','
this.group11 += this.tableData4[i].单件定额工时 + ','
this.group12 += this.tableData4[i].准结定额工时 + ','
}
for (let i = 0; i < this.contractNum.length; i++) {
if (this.contractNum[i].value === this.contractNumValue) {
this.RequisitionNumber = this.contractNum[i].label
}
}
// for (let i = 0; i < this.payMethod.length; i++) {
// if (this.payMethod[i].value === this.payMethodValue) {
// this.payMethodName = this.payMethod[i].label
// }
// }
// const payTimeNum = this.payMethodName.split(':')
// if (payTimeNum.length > 1) {
// for (let i = 0; i < payTimeNum.length; i++) {
// switch (i) {
// case 0:
// this.group6 += this.payTime1Value + ','
// break
// case 1:
// this.group6 += this.payTime2Value + ','
// break
// case 2:
// this.group6 += this.payTime3Value + ','
// break
// case 3:
// this.group6 += this.payTime4Value + ','
// break
// case 4:
// this.group6 += this.payTime5Value + ','
// break
// case 5:
// this.group6 += this.payTime6Value + ','
// break
// }
// this.group5 += payTimeNum[i] + ',' // 付款比例 付款方式 付款计划
// }
// } else {
// this.group5 = '10,' // 付款比例 付款方式 付款计划
// this.group6 = this.payTime1Value + ',' // 付款时间
// }
this.group1 = this.group1.substr(0, this.group1.length - 1)
this.group2 = this.group2.substr(0, this.group2.length - 1)
this.group3 = this.group3.substr(0, this.group3.length - 1)
// this.group5 = this.group5.substr(0, this.group5.length - 1)
// this.group6 = this.group6.substr(0, this.group6.length - 1)
// this.group7 = this.group7.substr(0, this.group7.length - 1)
// this.group8 = this.group8.substr(0, this.group8.length - 1)
// this.group9 = this.group9.substr(0, this.group9.length - 1)
// this.group10 = this.group10.substr(0, this.group10.length - 1)
doneContract(this.contractNumValue, this.RequisitionNumber, this.contractName, this.planArrivalTime, this.stipulateArrivalTime, this.supplierValue, this.textArea, this.freight, this.group1, this.group2, this.group3, this.group7, this.group8, this.group9, this.id, this.AdvanceCharge).then(response => {
doneContract(this.contractNumValue, this.RequisitionNumber, this.contractName, this.planArrivalTime, this.stipulateArrivalTime, this.supplierValue, this.textArea, this.freight, this.group1, this.group2, this.group3, this.group7, this.group8, this.group9, this.id, this.group11, this.group12, this.AdvanceCharge).then(response => {
if (response.data[0].result === '1') {
this.$message.success('生成合同成功')
this.reload()

123
src/views/WorkshopProcurement/OutsourcingProcessPlanning/index.vue
View File

@@ -22,20 +22,6 @@
:label="item.label"
:value="item.value"/>
</el-select>
<span>项目名称:</span>
<el-select
v-model="projectNameValue"
placeholder="项目名称"
size="small"
style="width:100px"
clearable
@change="searchMachine()">
<el-option
v-for="item in projectName"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<span>机床编号:</span>
<el-select
v-model="machineValue"
@@ -48,7 +34,10 @@
v-for="item in Machine"
:key="item.value"
: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">{{ item.name }}</div>
</el-option>
</el-select>
<span>组号:</span>
<el-select
@@ -230,23 +219,7 @@
<el-dialog :visible.sync="dialogFormVisible1" title="已完工艺选择" center width="800px">
<el-form ref="form1" :model="form1" label-position="left" label-width="140px" class="demo-ruleForm">
<el-row>
<el-col :span="10">
<el-form-item label="项目名称">
<el-select
v-model="projectNameValue1"
placeholder="项目名称"
size="small"
style="width:150px"
@change="searchMachine1()">
<el-option
v-for="item in projectName1"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="10">
<el-col :span="12">
<el-form-item label="机床名称">
<el-select
v-model="machineValue1"
@@ -258,16 +231,14 @@
v-for="item in Machine1"
:key="item.value"
: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">{{ item.name }}</div>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-button size="small" type="success" icon="el-icon-search" @click="searchDetail1()">查询</el-button>
</el-col>
</el-row>
<el-row>
<el-col :span="10">
<el-col :span="12">
<el-form-item label="组号">
<el-select
v-model="groupNumberValue1"
@@ -283,7 +254,9 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="10">
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="图号/名称">
<el-input
v-model="partNum1"
@@ -294,7 +267,8 @@
@dblclick.native="searchParts1"/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-col :span="12">
<el-button size="small" type="success" icon="el-icon-search" @click="searchDetail1()">查询</el-button>
<el-button size="small" @click="processCopy1()">工艺拷贝</el-button>
</el-col>
</el-row>
@@ -524,7 +498,6 @@ import '@/icon/iconfont.css'
import {
initCraftmen,
getProject,
getMachine,
getGroup,
getPartnames1,
getProcedure,
@@ -553,16 +526,12 @@ export default {
},
data() {
return {
projectNameValue: '',
projectName: [],
machineValue: '',
Machine: [],
groupNumberValue: '',
groupNumber: [],
groupNum: '',
groupType: '',
projectNameValue1: '',
projectName1: [],
machineValue1: '',
Machine1: [],
groupNumberValue1: '',
@@ -644,11 +613,12 @@ export default {
})
}
})
getProject(0).then(response => { // 初始化项目
getProject(0).then(response => { // 初始化机床项目
for (let i = 0; i < response.data.length; i++) {
this.projectName.push({
label: response.data[i].项目名称,
value: response.data[i].项目流水号
this.Machine.push({
label: response.data[i].机床图号,
value: response.data[i].机床流水号,
name: response.data[i].项目名称
})
}
})
@@ -675,18 +645,15 @@ export default {
this.isShow2 = false
}
this.checked = false
this.projectNameValue = ''
this.projectName = []
getProject(this.radio).then(response => { // 初始化项目
getProject(this.radio).then(response => { // 初始化机床项目
for (let i = 0; i < response.data.length; i++) {
this.projectName.push({
label: response.data[i].项目名称,
value: response.data[i].项目流水号
this.Machine.push({
label: response.data[i].机床图号,
value: response.data[i].机床流水号,
name: response.data[i].项目名称
})
}
})
this.machineValue = ''
this.Machine = []
this.groupNumberValue = ''
this.groupNumber = []
this.partNum = ''
@@ -724,21 +691,6 @@ export default {
})
}
},
searchMachine() {
this.clear()
this.machineValue = ''
this.Machine = []
this.groupNumberValue = ''
this.groupNumber = []
getMachine(this.radio, this.projectNameValue).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.Machine.push({
label: response.data[i].机床图号,
value: response.data[i].机床流水号
})
}
})
},
searchGroup() {
this.clear()
this.groupNumberValue = ''
@@ -824,20 +776,6 @@ export default {
}
})
},
searchMachine1() {
this.machineValue1 = ''
this.Machine1 = []
this.groupNumberValue1 = ''
this.groupNumber1 = []
getMachine(1, this.projectNameValue1).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.Machine1.push({
label: response.data[i].机床图号,
value: response.data[i].机床流水号
})
}
})
},
searchGroup1() {
this.groupNumberValue1 = ''
this.groupNumber1 = []
@@ -993,18 +931,17 @@ export default {
WYbtn() { // 完艺按钮
this.tableData4 = []
this.dialogFormVisible1 = true
this.projectNameValue1 = ''
this.projectName1 = []
this.machineValue1 = ''
this.Machine1 = []
this.groupNumberValue1 = ''
this.groupNumber1 = []
this.partNum1 = ''
getProject(1).then(response => { // 初始化项目
getProject(1).then(response => { // 初始化机床项目
for (let i = 0; i < response.data.length; i++) {
this.projectName1.push({
label: response.data[i].项目名称,
value: response.data[i].项目流水号
this.Machine1.push({
label: response.data[i].机床图号,
value: response.data[i].机床流水号,
name: response.data[i].项目名称
})
}
})

56
src/views/WorkshopProcurement/OutsourcingQuotaSetting/index.vue
View File

@@ -14,20 +14,6 @@
:label="item.label"
:value="item.value"/>
</el-select>
<span>项目名称:</span>
<el-select
v-model="projectNameValue"
placeholder="项目名称"
size="small"
style="width:100px"
clearable
@change="searchMachine()">
<el-option
v-for="item in projectName"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<span>机床编号:</span>
<el-select
v-model="machineValue"
@@ -40,7 +26,10 @@
v-for="item in Machine"
:key="item.value"
: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">{{ item.name }}</div>
</el-option>
</el-select>
<span>组号:</span>
<el-select
@@ -208,7 +197,7 @@
</template>
<script>
import { getPerson, getPartnames1, getProject, getMachine, getGroup, update, getProcedure, returnEdit, saveApprove } from '@/api/WorkshopProcurement/OutsourcingQuotaSetting'
import { getPerson, getPartnames1, getProject, getGroup, update, getProcedure, returnEdit, saveApprove } from '@/api/WorkshopProcurement/OutsourcingQuotaSetting'
export default {
data() {
@@ -257,11 +246,12 @@ export default {
})
}
})
getProject(0).then(response => { // 初始化项目
getProject(0).then(response => { // 初始化机床项目
for (let i = 0; i < response.data.length; i++) {
this.projectName.push({
label: response.data[i].项目名称,
value: response.data[i].项目流水号
this.Machine.push({
label: response.data[i].机床图号,
value: response.data[i].机床流水号,
name: response.data[i].项目名称
})
}
})
@@ -281,13 +271,12 @@ export default {
this.isShow2 = false
}
this.checked = false
this.projectNameValue = ''
this.projectName = []
getProject(this.radio).then(response => { // 初始化项目
getProject(this.radio).then(response => { // 初始化机床项目
for (let i = 0; i < response.data.length; i++) {
this.projectName.push({
label: response.data[i].项目名称,
value: response.data[i].项目流水号
this.Machine.push({
label: response.data[i].机床图号,
value: response.data[i].机床流水号,
name: response.data[i].项目名称
})
}
})
@@ -348,21 +337,6 @@ export default {
})
}
},
searchMachine() {
this.clear()
this.machineValue = ''
this.Machine = []
this.groupNumberValue = ''
this.groupNumber = []
getMachine(this.radio, this.projectNameValue).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.Machine.push({
label: response.data[i].机床图号,
value: response.data[i].机床流水号
})
}
})
},
searchGroup() {
this.clear()
this.groupNumberValue = ''

28
src/views/WorkshopProcurement/ProcurementContractApproval/index.vue
View File

@@ -89,7 +89,7 @@
</el-card>
<el-card>
<div style="width:900px;margin-left: 350px">
<div style="width:1000px;margin-left: 300px">
<el-card>
<table id="1" cellspacing="0px" align="center" border width="100%" style="">
<tr style="height: 40px">
@@ -98,7 +98,7 @@
</tr>
<tr style="height: 40px">
<td colspan="1" align="center">需方</td>
<td colspan="1" align="center">江苏高精机电装备有限公司</td>
<td colspan="1" align="center" width="37%">江苏高精机电装备有限公司</td>
<td colspan="1" align="center">合同编号</td>
<td colspan="1" align="center">{{ contract }}</td>
</tr>
@@ -120,6 +120,8 @@
<td colspan="1" align="center">交货期</td>
<td colspan="1" align="center">备注</td>
<td colspan="1" align="center">数量</td>
<td colspan="1" align="center" width="12%">单件定额工时</td>
<td colspan="1" align="center" width="12%">准结定额工时</td>
<td colspan="1" align="center">单价</td>
<td colspan="1" align="center">总价</td>
</tr>
@@ -135,17 +137,19 @@
<td colspan="1" align="center">交货期</td>
<td colspan="1" align="center">备注</td>
<td colspan="1" align="center">数量</td>
<td colspan="1" align="center" width="12%">单件定额工时</td>
<td colspan="1" align="center" width="12%">准结定额工时</td>
<td colspan="1" align="center">单价</td>
<td colspan="1" align="center">总价</td>
</tr>
</tbody>
<tfoot>
<tr style="height: 40px">
<td colspan="8">总价: (人民币){{ RMB }}(未税) </td>
<td colspan="10">总价: (人民币){{ RMB }}(未税) </td>
<td colspan="1" align="center">{{ TotalAmount }}</td>
</tr>
<tr style="height: 40px">
<td colspan="8">总价: (人民币){{ RMB1 }}(含{{ taxRate }}增值税) </td>
<td colspan="10">总价: (人民币){{ RMB1 }}(含{{ taxRate }}增值税) </td>
<td colspan="1" align="center">{{ TotalAmount1 }}</td>
</tr>
</tfoot>
@@ -458,7 +462,7 @@ export default {
for (let i = 0; i < this.returns.length; i++) {
tr[i] = document.createElement('tr')
tr[i].setAttribute('class', 'tableData')
tr[i].innerHTML = '<td colspan="2" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' +
tr[i].innerHTML = '<td colspan="2" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' +
'<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>'
document.getElementById('tableHead').after(tr[i])
}
@@ -469,8 +473,10 @@ export default {
document.getElementsByClassName('tableData')[j].children[3].innerHTML = response.data[j].物料计划到货时间.split(' ')[0]
document.getElementsByClassName('tableData')[j].children[4].innerHTML = response.data[j].备注
document.getElementsByClassName('tableData')[j].children[5].innerHTML = response.data[j].数量
document.getElementsByClassName('tableData')[j].children[6].innerHTML = response.data[j].单价
document.getElementsByClassName('tableData')[j].children[7].innerHTML = response.data[j].金额
document.getElementsByClassName('tableData')[j].children[6].innerHTML = response.data[j].单件定额工时
document.getElementsByClassName('tableData')[j].children[7].innerHTML = response.data[j].准结定额工时
document.getElementsByClassName('tableData')[j].children[8].innerHTML = response.data[j].单价
document.getElementsByClassName('tableData')[j].children[9].innerHTML = response.data[j].金额
}
})
searchTable3(this.contractValue).then(response => {
@@ -486,7 +492,7 @@ export default {
for (let i = 0; i < this.returns1.length; i++) {
tr[i] = document.createElement('tr')
tr[i].setAttribute('class', 'tableData1')
tr[i].innerHTML = '<td colspan="2" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' +
tr[i].innerHTML = '<td colspan="2" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' +
'<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>'
document.getElementById('tableHead1').after(tr[i])
}
@@ -497,8 +503,10 @@ export default {
document.getElementsByClassName('tableData1')[j].children[3].innerHTML = response.data[j].物料计划到货时间.split(' ')[0]
document.getElementsByClassName('tableData1')[j].children[4].innerHTML = response.data[j].备注
document.getElementsByClassName('tableData1')[j].children[5].innerHTML = response.data[j].数量
document.getElementsByClassName('tableData1')[j].children[6].innerHTML = response.data[j].单价
document.getElementsByClassName('tableData1')[j].children[7].innerHTML = response.data[j].金额
document.getElementsByClassName('tableData1')[j].children[6].innerHTML = response.data[j].单件定额工时
document.getElementsByClassName('tableData1')[j].children[7].innerHTML = response.data[j].准结定额工时
document.getElementsByClassName('tableData1')[j].children[8].innerHTML = response.data[j].单价
document.getElementsByClassName('tableData1')[j].children[9].innerHTML = response.data[j].金额
}
})
}