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

外协执行

Browse Source
This commit is contained in:
zhangdingyu
2019-11-22 17:28:02 +08:00
parent 04ad218178
commit a08933ce06
4 changed files with 82 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
View File

@@ -76,29 +76,34 @@
{{ scope.row.外协厂家名称 }}
</template>
</el-table-column>
<el-table-column label="总价" align="center" min-width="70px">
<el-table-column label="总价" align="center" min-width="100px">
<template slot-scope="scope">
{{ scope.row.总价 }}
{{ parseFloat(scope.row.总价).toFixed(2) }}
</template>
</el-table-column>
<el-table-column label="质量扣款" align="center" min-width="70px">
<el-table-column label="扣款金额" align="center" min-width="100px">
<template slot-scope="scope">
{{ scope.row.扣款_质量 }}
{{ parseFloat(scope.row.扣款_质量).toFixed(2) }}
</template>
</el-table-column>
<el-table-column label="计划扣款" align="center" min-width="70px">
<!--<el-table-column label="计划扣款" align="center" min-width="70px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.扣款_计划 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="其他扣款" align="center" min-width="70px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.扣款_其他 }}-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column label="应付金额" align="center" min-width="100px">
<template slot-scope="scope">
{{ scope.row.扣款_计划 }}
{{ parseFloat(scope.row.应付总额).toFixed(2) }}
</template>
</el-table-column>
<el-table-column label="其他扣款" align="center" min-width="70px">
<el-table-column label="扣款说明" align="center" min-width="120px">
<template slot-scope="scope">
{{ scope.row.扣款_其他 }}
</template>
</el-table-column>
<el-table-column label="应付金额" align="center" min-width="70px">
<template slot-scope="scope">
{{ scope.row.应付总额 }}
{{ scope.row.扣款说明 }}
</template>
</el-table-column>
<el-table-column label="任务下达日期" prop="任务下达日期" align="center" min-width="125px">
@@ -160,32 +165,16 @@
<!--</template>-->
<!--</el-table-column>-->
<!--</el-table-column>-->
<el-table-column label="扣款说明" align="center" min-width="120px">
<template slot-scope="scope">
{{ scope.row.扣款说明 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="200px" fixed="right">
<template slot-scope="scope">
<!--<el-tooltip :open-delay="1200" effect="dark" content="记录外协付款到票信息" placement="top">-->
<!--<el-button :disabled="scope.row.实际付款时间!==''" size="mini" type="primary" plain class="el-icon-check" @click="editType1(scope.row, 'form');param = 0">到票</el-button>-->
<!--</el-tooltip>-->
<el-tooltip :open-delay="1200" effect="dark" content="记录外协扣款信息" placement="top">
<el-button
:disabled="scope.row.实际付款时间!==''"
size="mini"
type="primary"
plain
class="el-icon-edit"
@click="Withdrawing(scope.$index, scope.row, 'form2')">扣款</el-button>
<el-button :disabled="scope.row.实际付款时间!==''" size="mini" type="primary" plain class="el-icon-edit" @click="Withdrawing(scope.$index, scope.row, 'form2')">扣款</el-button>
</el-tooltip>
<el-tooltip :open-delay="1200" effect="dark" content="付款信息" placement="top">
<el-button
:disabled="scope.row.实际付款时间!==''||scope.row.单据状态!=='3'"
size="mini"
type="success"
class="el-icon-check"
@click="payment(scope.$index, scope.row)">付款</el-button>
<el-button :disabled="scope.row.实际付款时间!==''||scope.row.单据状态!=='3'" size="mini" type="success" class="el-icon-check" @click="payment(scope.$index, scope.row)">付款</el-button>
</el-tooltip>
</template>
</el-table-column>
@@ -224,7 +213,7 @@
{{ scope.row.外协厂家名称 }}
</template>
</el-table-column>
<el-table-column label="发票号" prop="发票号" align="center" width="230px">
<el-table-column label="发票号" prop="发票号" align="center" width="200px">
<template slot-scope="scope">
{{ scope.row.发票号 }}
</template>
@@ -239,9 +228,9 @@
<!--{{ scope.row.开户行 }}-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column label="开票金额" align="center" width="100px" prop="开票金额">
<el-table-column label="开票金额" align="center" width="130px" prop="开票金额">
<template slot-scope="scope">
{{ scope.row.开票金额 }}
{{ parseFloat(scope.row.开票金额).toFixed(2) }}
</template>
</el-table-column>
<el-table-column label="开票日期" align="center" width="100px">
@@ -279,20 +268,20 @@
</div>
</el-card>
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible2" title="扣款" center style="min-height: 300px" width="800px">
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible2" title="扣款" center style="min-height: 300px" width="500px">
<el-form ref="form2" :model="form2" :rules="rules" label-position="left" label-width="110px" class="demo-ruleForm">
<el-form-item label="质量" style="margin-left: 200px">
<el-input v-model="form2.质量" placeholder="质量" size="small" style="width:200px"/>
<el-form-item label="扣款金额" prop="质量" style="margin-left: 70px">
<el-input v-model="form2.质量" placeholder="扣款金额" size="small" style="width:200px"/>
</el-form-item>
<el-form-item label="计划" style="margin-left: 200px">
<el-input v-model="form2.计划" placeholder="计划" size="small" style="width:200px"/>
</el-form-item>
<el-form-item label="其他" style="margin-left: 200px">
<el-input v-model="form2.其他" placeholder="其他" size="small" style="width:200px"/>
</el-form-item>
<el-form-item label="扣款说明" prop="扣款说明" style="margin-left: 200px">
<el-form-item label="扣款说明" prop="扣款说明" style="margin-left: 70px">
<el-input v-model="form2.扣款说明" placeholder="扣款说明" size="small" style="width:200px"/>
</el-form-item>
<!--<el-form-item label="计划" style="margin-left: 200px">-->
<!--<el-input v-model="form2.计划" placeholder="计划" size="small" style="width:200px"/>-->
<!--</el-form-item>-->
<!--<el-form-item label="其他" style="margin-left: 200px">-->
<!--<el-input v-model="form2.其他" placeholder="其他" size="small" style="width:200px"/>-->
<!--</el-form-item>-->
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="callOff2('form2')">取消</el-button>
@@ -420,6 +409,7 @@ export default {
外协厂家: [{ required: true, message: '请选择外协厂家', trigger: 'change' }],
发票号: [{ required: true, message: '请输入发票号', trigger: 'blur' }],
开票金额: [{ required: true, message: '请输入开票金额', trigger: 'blur' }],
质量: [{ required: true, message: '请输入扣款金额', trigger: 'blur' }],
扣款说明: [{ required: true, message: '请输入扣款说明', trigger: 'blur' }]
},
date1: '',
@@ -452,28 +442,14 @@ export default {
},
methods: {
getSummaries(param) {
const { columns, data } = param
const sums = []
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '总金额'
return
const { data } = param
const sums = ['', '', 0, '', '', '', '']
sums[0] = '合计'
for (let i = 0; i < data.length; i++) {
sums[2] += parseInt(data[i].开票金额)
}
const values = data.map(item => Number(item[column.property]))
if (!values.every(value => isNaN(value))) {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
return prev + curr
} else {
return prev
}
}, 0)
sums[index] += ' 元'
} else {
sums[index] = ''
}
})
// sums[2] = Math.round(sums[2] * 100) / 100 + ' 元'
sums[2] = parseFloat(sums[2]).toFixed(2) + ' 元'
return sums
},
// 初始化外协厂家

49
src/views/Outsourcing/OutsourcingStatus/index.vue
View File

@@ -72,55 +72,6 @@
{{ scope.row.外协员姓名 }}
</template>
</el-table-column>
<!--<el-table-column label="加工价格" align="center">-->
<!--<el-table-column label="预算总价" align="center" width="85px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.加工价格_预算_总价 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="成交总价" align="center" width="85px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.加工价格_成交_总价 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--</el-table-column>-->
<!--<el-table-column label="材料费" align="center" min-width="70px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.材料价格_价格_总价 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="运费" align="center" min-width="70px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.运费 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="其他费用" align="center" min-width="70px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.其他价格_总价 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="总价" align="center" min-width="70px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.总价 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="付款日期" align="center" width="240px">-->
<!--<el-table-column label="入库" align="center" min-width="70px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.入库时间 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="计划" align="center" min-width="70px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.计划付款时间 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="实际" align="center" min-width="70px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.实际付款时间 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--</el-table-column>-->
<el-table-column label="扣款说明" align="center" min-width="120px">
<template slot-scope="scope">
{{ scope.row.扣款说明 }}

72
src/views/Outsourcing/OutsourcingTaskExecution/index.vue
View File

@@ -24,7 +24,7 @@
{{ scope.row.项目名称 }}
</template>
</el-table-column>
<el-table-column label="零件图号" prop="零件图号" align="center" width="200px" >
<el-table-column label="零件图号" prop="零件图号" align="center" min-width="200px" >
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
@@ -34,42 +34,42 @@
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column label="数量" align="center" width="65px" >
<el-table-column label="数量" align="center" width="100px" >
<template slot-scope="scope">
{{ scope.row.批次数量 }}
</template>
</el-table-column>
<el-table-column label="材料费" align="center" width="65px" >
<template slot-scope="scope">
{{ scope.row.材料费 }}
</template>
</el-table-column>
<el-table-column label="分类" align="center" width="65px" >
<template slot-scope="scope">
{{ scope.row.外协分类 }}
</template>
</el-table-column>
<el-table-column label="投产" align="center" width="65px" >
<template slot-scope="scope">
{{ scope.row.传递时间_短 }}
</template>
</el-table-column>
<el-table-column label="计划结束" align="center" >
<template slot-scope="scope">
{{ scope.row.计划结束时间_短 }}
</template>
</el-table-column>
<el-table-column label="预算" align="center" >
<template slot-scope="scope">
{{ (scope.row.外协预算总价格).toFixed(2) }}
</template>
</el-table-column>
<el-table-column label="零件类型" align="center" width="">
<template slot-scope="scope">
{{ scope.row.是否临时件 }}
</template>
</el-table-column>
<el-table-column label="外协工序" align="center" show-overflow-tooltip>
<!--<el-table-column label="材料费" align="center" width="65px" >-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.材料费 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="分类" align="center" width="65px" >-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.外协分类 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="投产" align="center" width="65px" >-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.传递时间_短 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="计划结束" align="center" >-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.计划结束时间_短 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="预算" align="center" >-->
<!--<template slot-scope="scope">-->
<!--{{ (scope.row.外协预算总价格).toFixed(2) }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="零件类型" align="center" width="">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.是否临时件 }}-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column label="外协工序" align="center" show-overflow-tooltip min-width="150px">
<template slot-scope="scope">
{{ scope.row.外协工序 }}
</template>
@@ -169,7 +169,7 @@
<!--</el-table-column>-->
<el-table-column label="外协价格" align="center" width="130px">
<template slot-scope="scope">
<el-input v-model="加工价格_成交[scope.$index]" size="small" readonly/>
<el-input v-model="加工价格_成交[scope.$index]" size="small"/>
</template>
</el-table-column>
<!--<el-table-column label="材料类别" align="center" width="130px">-->
@@ -210,8 +210,7 @@
</el-table>
</el-col>
</el-card>
<el-card v-if="card">
<el-card v-show="true">
<div id="RWD">
<table cellspacing="0px" align="center" width="100%" style="">
<tbody id="1">
@@ -610,6 +609,7 @@ export default {
$('#tableHead').after(tr[i])
}
for (let j = 0; j < this.returns.length; j++) {
console.log(document.getElementsByClassName('tableData')[j].children)
document.getElementsByClassName('tableData')[j].children[0].innerHTML = j + 1
document.getElementsByClassName('tableData')[j].children[1].innerHTML = response.data[j].零件图号
document.getElementsByClassName('tableData')[j].children[2].innerHTML = response.data[j].零件名称

8
src/views/Outsourcing/OutsourcingTaskQuery/index.vue
View File

@@ -43,9 +43,9 @@
<el-col :span="14">
<el-card>
<el-button type="warning" size="mini" icon="el-icon-arrow-down" style="margin-left:10px" @click="getSpareParts">收货</el-button>
<el-tooltip :open-delay="1200" effect="dark" content="打印外协采购单" placement="top">
<el-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px;float: right" @click="exportTable('RWD')">导出单据</el-button>
</el-tooltip>
<!--<el-tooltip :open-delay="1200" effect="dark" content="打印外协任务单" placement="top">-->
<!--<el-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px;float: right" @click="exportTable('RWD')">导出单据</el-button>-->
<!--</el-tooltip>-->
<el-table ref="multipleTable" :data="List3" border stripe size="mini" highlight-current-row height="595" tooltip-effect="dark" style="width: 100%" @selection-change="handleSelectionChange">
<el-table-column
:selectable="selectable"
@@ -81,7 +81,7 @@
</el-table>
</el-card>
</el-col>
<el-card v-if="false">
<el-card v-show="false">
<div id="RWD">
<table cellspacing="0px" align="center" width="100%" style="">
<tbody id="1">