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-03-25 17:57:28 +08:00
parent b032a43809
commit ff3a340570
11 changed files with 300 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/views/ManufacturingCenter/RequestApprovalQuery/index.vue
View File

@@ -101,6 +101,11 @@
{{ scope.row.采购合同编号 ? scope.row.采购合同编号 : scope.row.离线合同编号 }} {{ scope.row.采购合同编号 ? scope.row.采购合同编号 : scope.row.离线合同编号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="120" align="center" label="合同金额(元)" prop="到货金额">
<template slot-scope="scope">
{{ parseFloat(scope.row.合同总金额).toFixed(2) }}
</template>
</el-table-column>
<el-table-column width="120" align="center" label="到货金额(元)" prop="到货金额"> <el-table-column width="120" align="center" label="到货金额(元)" prop="到货金额">
<template slot-scope="scope"> <template slot-scope="scope">
{{ parseFloat(scope.row.到货金额).toFixed(2) }} {{ parseFloat(scope.row.到货金额).toFixed(2) }}

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

@@ -1,6 +1,6 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-row style="width: 895px"> <el-row style="width: 720px">
<el-card style="margin-bottom: 5px"> <el-card style="margin-bottom: 5px">
<el-row> <el-row>
<el-input v-model="ManufacturerName" size="small" placeholder="外协厂家" clearable style="width:200px"/> <el-input v-model="ManufacturerName" size="small" placeholder="外协厂家" clearable style="width:200px"/>
@@ -15,31 +15,31 @@
style="width:250px;margin-left: 5px;margin-top: 10px;margin-bottom: 10px" style="width:250px;margin-left: 5px;margin-top: 10px;margin-bottom: 10px"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期"/> end-placeholder="结束日期"/>
<el-button type="primary" class="el-icon-search" style="margin-left: 20px" size="small" plain @click="外协厂家流水号 = '';getParts()">查询</el-button> <el-button type="primary" class="el-icon-search" style="margin-left: 20px" size="small" plain @click="getParts()">查询</el-button>
<el-button type="success" plain class="el-icon-download" style="margin-left: 220px" size="small" @click="exportExcel">导出</el-button> <el-button type="success" plain class="el-icon-download" style="margin-left: 30px" size="small" @click="exportExcel">导出</el-button>
</el-row> </el-row>
<el-table v-loading="loading" :data="tableData" size="mini" highlight-current-row height="300" style="width: 870px;margin-bottom: 10px" border element-loading-text="拼命加载中" @row-click="rowClick"> <el-table v-loading="loading" :data="tableData" size="mini" highlight-current-row height="300" style="width: 690px;margin-bottom: 10px" border element-loading-text="拼命加载中" @row-click="rowClick">
<el-table-column label="厂家" prop="外协厂家名称" align="center" width="255px"> <el-table-column label="厂家" prop="外协厂家名称" align="center" width="230px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.外协厂家名称 }} {{ scope.row.外协厂家名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="外协金额(元)" prop="总价" align="center" width="150px"> <el-table-column label="外协金额(元)" prop="总价" align="center" 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 label="到票金额(元)" align="center" width="150px" prop="开票金额"> <el-table-column label="到票金额(元)" align="center" width="110px" 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="150px"> <el-table-column label="付款金额(元)" align="center" 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 label="未付金额(元)" align="center" width="150px"> <el-table-column label="未付金额(元)" align="center" width="110px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.应付金额 }} {{ scope.row.应付金额 }}
</template> </template>
@@ -54,7 +54,7 @@
<el-button type="distribution" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="handleAdd1('form1')">到票</el-button> <el-button type="distribution" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="handleAdd1('form1')">到票</el-button>
</el-row> </el-row>
<el-table v-loading="loading2" :data="tableData2" size="mini" stripe height="400" style="width: 100%" border element-loading-text="拼命加载中"> <el-table v-loading="loading2" :data="tableData2" size="mini" stripe height="400" style="width: 100%" border element-loading-text="拼命加载中">
<el-table-column label="发票号" prop="发票号" align="center" width="150px"> <el-table-column label="到票号" prop="发票号" align="center" width="150px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.发票号 }} {{ scope.row.发票号 }}
</template> </template>
@@ -71,8 +71,8 @@
</el-table-column> </el-table-column>
<el-table-column align="center" label="操作" fixed="right" width="130px"> <el-table-column align="center" label="操作" fixed="right" width="130px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" size="mini" icon="el-icon-edit" @click="ChangeOpen1(scope.row)"/> <el-button type="text" size="mini" icon="el-icon-edit" @click="ChangeOpen1(scope.row)">编辑</el-button>
<el-button type="text" size="mini" icon="el-icon-delete" @click="handleDelete1(scope.row)"/> <el-button type="text" size="mini" icon="el-icon-delete" @click="handleDelete1(scope.row)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -108,8 +108,8 @@
</el-table-column> </el-table-column>
<el-table-column align="center" label="操作" fixed="right" width="130px"> <el-table-column align="center" label="操作" fixed="right" width="130px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" size="mini" icon="el-icon-edit" @click="ChangeOpen2(scope.row)"/> <el-button type="text" size="mini" icon="el-icon-edit" @click="ChangeOpen2(scope.row)">编辑</el-button>
<el-button type="text" size="mini" icon="el-icon-delete" @click="handleDelete2(scope.row)"/> <el-button type="text" size="mini" icon="el-icon-delete" @click="handleDelete2(scope.row)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -131,16 +131,16 @@
<el-form ref="form1" :model="form1" :rules="rules" label-position="left" label-width="120px" class="demo-ruleForm"> <el-form ref="form1" :model="form1" :rules="rules" label-position="left" label-width="120px" class="demo-ruleForm">
<el-row> <el-row>
<el-form-item label="到票票号" prop="发票号" > <el-form-item label="到票票号" prop="发票号" >
<el-input v-model="form1.发票号" placeholder="发票号" style="width:200px" clearable size="small"/> <el-input v-model="form1.发票号" placeholder="到票号" style="width:200px" clearable size="small"/>
</el-form-item> </el-form-item>
</el-row> </el-row>
<el-row> <el-row>
<el-form-item label="开票金额(元)" prop="开票金额"> <el-form-item label="到票金额(元)" prop="开票金额">
<el-input v-positive="'float'" v-model="form1.开票金额" placeholder="开票金额" type="float" style="width:200px" clearable size="small" @blur="checkNumber"/> <el-input v-positive="'float'" v-model="form1.开票金额" placeholder="到票金额" type="float" style="width:200px" clearable size="small"/>
</el-form-item> </el-form-item>
</el-row> </el-row>
<el-row> <el-row>
<el-form-item label="开票时间" prop="开票时间"> <el-form-item label="到票时间" prop="开票时间">
<el-date-picker <el-date-picker
v-model="form1.开票时间" v-model="form1.开票时间"
style="width:200px" style="width:200px"
@@ -149,7 +149,7 @@
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
format="yyyy-MM-dd" format="yyyy-MM-dd"
clearable clearable
placeholder="开票时间"/> placeholder="到票时间"/>
</el-form-item> </el-form-item>
</el-row> </el-row>
</el-form> </el-form>
@@ -163,7 +163,7 @@
<el-form ref="form2" :model="form2" :rules="rules" label-position="left" label-width="120px" class="demo-ruleForm"> <el-form ref="form2" :model="form2" :rules="rules" label-position="left" label-width="120px" class="demo-ruleForm">
<el-row> <el-row>
<el-form-item label="付款金额(元)" prop="付款金额"> <el-form-item label="付款金额(元)" prop="付款金额">
<el-input v-positive="'float'" v-model="form2.付款金额" placeholder="付款金额" type="float" style="width:200px" clearable size="small" @blur="checkNumber"/> <el-input v-positive="'float'" v-model="form2.付款金额" placeholder="付款金额" type="float" style="width:200px" clearable size="small"/>
</el-form-item> </el-form-item>
</el-row> </el-row>
<el-row> <el-row>
@@ -230,11 +230,11 @@ export default {
付款时间: '' 付款时间: ''
}, },
rules: { rules: {
发票号: [{ required: true, message: '请输入发票号', trigger: 'blur' }], 发票号: [{ required: true, message: '请输入到票号', trigger: 'blur' }],
开票时间: [{ required: true, message: '请选择开票时间', trigger: 'change' }], 开票时间: [{ required: true, message: '请选择到票时间', trigger: 'change' }],
开票金额: [{ required: true, message: '请输入开票金额', trigger: 'blur' }], 开票金额: [{ required: true, message: '请输入到票金额', trigger: 'blur' }],
付款时间: [{ required: true, message: '请选择开票时间', trigger: 'change' }], 付款时间: [{ required: true, message: '请选择到票时间', trigger: 'change' }],
付款金额: [{ required: true, message: '请输入开票金额', trigger: 'blur' }] 付款金额: [{ required: true, message: '请输入到票金额', trigger: 'blur' }]
} }
} }
}, },
@@ -244,6 +244,7 @@ export default {
methods: { methods: {
// 获取表格1数据 // 获取表格1数据
getParts() { getParts() {
this.外协厂家流水号 = ''
this.loading = true this.loading = true
this.tableData = [] this.tableData = []
var check var check
@@ -257,11 +258,6 @@ export default {
} }
}) })
}, },
checkNumber() {
// content.withdrawAmount = (withdrawAmount.match(/^\d*(\.?\d{0,2})/g)[0]) || null
this.form1.开票金额 = Number(this.form1.开票金额).toFixed(2)
this.form2.付款金额 = Number(this.form2.付款金额).toFixed(2)
},
rowClick(row) { rowClick(row) {
this.外协厂家流水号 = row.外协厂家流水号 this.外协厂家流水号 = row.外协厂家流水号
this.外协厂家流水号_Select = row.外协厂家流水号 this.外协厂家流水号_Select = row.外协厂家流水号
@@ -290,9 +286,7 @@ export default {
getInvoice() { getInvoice() {
this.loading2 = true this.loading2 = true
this.tableData2 = [] this.tableData2 = []
var check2 getInvoice(this.外协厂家流水号_Select, this.pageCurrent2, this.pageSize2).then(response => {
this.startTime ? check2 = 1 : (check2 = 0, this.startTime = '')
getInvoice(this.外协厂家流水号_Select, check2, this.startTime[0], this.startTime[1], this.pageCurrent2, this.pageSize2).then(response => {
this.loading2 = false this.loading2 = false
if (response.data.rows.length !== 0) { if (response.data.rows.length !== 0) {
this.tableData2 = response.data.rows this.tableData2 = response.data.rows
@@ -304,9 +298,7 @@ export default {
getPayment() { getPayment() {
this.loading3 = true this.loading3 = true
this.tableData3 = [] this.tableData3 = []
var check2 getPayment(this.外协厂家流水号_Select, this.pageCurrent2, this.pageSize2).then(response => {
this.startTime ? check2 = 1 : (check2 = 0, this.startTime = '')
getPayment(this.外协厂家流水号_Select, check2, this.startTime[0], this.startTime[1], this.pageCurrent2, this.pageSize2).then(response => {
this.loading3 = false this.loading3 = false
if (response.data.rows.length !== 0) { if (response.data.rows.length !== 0) {
this.tableData3 = response.data.rows this.tableData3 = response.data.rows
@@ -352,7 +344,7 @@ export default {
} }
this.id_edit1 = row.id this.id_edit1 = row.id
this.param1 = 0 this.param1 = 0
this.title1 = '编辑发票' this.title1 = '编辑到票'
this.form1.发票号 = row.发票号 this.form1.发票号 = row.发票号
this.form1.开票时间 = row.开票时间 this.form1.开票时间 = row.开票时间
this.form1.开票金额 = row.开票金额 this.form1.开票金额 = row.开票金额
@@ -451,7 +443,7 @@ export default {
} }
this.id_edit2 = row.外协付款流水号 this.id_edit2 = row.外协付款流水号
this.param2 = 0 this.param2 = 0
this.title2 = '编辑发票' this.title2 = '编辑到票'
this.form2.付款金额 = row.付款金额 this.form2.付款金额 = row.付款金额
this.form2.付款时间 = row.付款日期 this.form2.付款时间 = row.付款日期
this.dialogFormVisible2 = true this.dialogFormVisible2 = true

230
src/views/PurchasingCenter/BacklogGoodsAnalysis/index.vue
View File

@@ -12,119 +12,123 @@
<el-button size="small" type="primary" icon="el-icon-search" plain style="margin: 0 0 0 10px" @click="pageCurrent1=1;pageSize1=10;total1=0;searchTable1();pageCurrent2=1;pageSize2=10;total2=0;searchTable2()">查询</el-button> <el-button size="small" type="primary" icon="el-icon-search" plain style="margin: 0 0 0 10px" @click="pageCurrent1=1;pageSize1=10;total1=0;searchTable1();pageCurrent2=1;pageSize2=10;total2=0;searchTable2()">查询</el-button>
</el-row> </el-row>
</div> </div>
<h4 style="margin-top: 0">采购件列表</h4> <el-card style="margin: 0px">
<el-table :data="tableData1" size="mini" border stripe style="width: 100%;" height="440"> <h4 style="margin: 0">采购件列表</h4>
<el-table-column label="名称" prop="物料名称" align="center" min-width="100"> <el-table :data="tableData1" size="mini" border stripe style="width: 100%;" height="370">
<template slot-scope="scope"> <el-table-column label="名称" prop="物料名称" align="center" min-width="100">
{{ scope.row.物料名称 }} <template slot-scope="scope">
</template> {{ scope.row.物料名称 }}
</el-table-column> </template>
<el-table-column label="图号或型号" prop="物料型号" align="center" min-width="100"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="图号或型号" prop="物料型号" align="center" min-width="100">
{{ scope.row.物料型号 }} <template slot-scope="scope">
</template> {{ scope.row.物料型号 }}
</el-table-column> </template>
<el-table-column label="规格" prop="物料规格" align="center" min-width="150"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="规格" prop="物料规格" align="center" min-width="150">
{{ scope.row.物料规格 }} <template slot-scope="scope">
</template> {{ scope.row.物料规格 }}
</el-table-column> </template>
<el-table-column props="仓库名称" prop="仓库名称" label="仓库名称" align="center" min-width="80"> </el-table-column>
<template slot-scope="scope"> <el-table-column props="仓库名称" prop="仓库名称" label="仓库名称" align="center" min-width="80">
{{ scope.row.仓库名称 }} <template slot-scope="scope">
</template> {{ scope.row.仓库名称 }}
</el-table-column> </template>
<el-table-column label="货位名称" align="center" min-width="80"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="货位名称" align="center" min-width="80">
{{ scope.row.货位名称 }} <template slot-scope="scope">
</template> {{ scope.row.货位名称 }}
</el-table-column> </template>
<el-table-column label="货位存量" align="center" width="80"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="货位存量" align="center" width="80">
{{ scope.row.货位存量 }} <template slot-scope="scope">
</template> {{ scope.row.货位存量 }}
</el-table-column> </template>
<el-table-column label="待出库数量" align="center" width="90"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="待出库数量" align="center" width="90">
{{ scope.row.待出库数量 }} <template slot-scope="scope">
</template> {{ scope.row.待出库数量 }}
</el-table-column> </template>
<el-table-column label="可转滞货数量" align="center" width="100"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="可转滞货数量" align="center" width="100">
{{ scope.row.可转滞货数量 = scope.row.货位存量 - scope.row.待出库数量 }} <template slot-scope="scope">
</template> {{ scope.row.可转滞货数量 = scope.row.货位存量 - scope.row.待出库数量 }}
</el-table-column> </template>
<el-table-column label="所属机床" align="center" width="100"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="所属机床" align="center" width="100">
{{ scope.row.机床图号 }} <template slot-scope="scope">
</template> {{ scope.row.机床图号 }}
</el-table-column> </template>
<el-table-column label="所属分组" align="center" width="80"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="所属分组" align="center" width="80">
{{ scope.row.组号 }} <template slot-scope="scope">
</template> {{ scope.row.组号 }}
</el-table-column> </template>
<el-table-column label="操作" align="center" width="100"> </el-table-column>
<template slot-scope="scope" align="center"> <el-table-column label="操作" align="center" width="100">
<el-button size="mini" type="text" @click="turnToBacklogGoods(scope.row)">转为滞货</el-button> <template slot-scope="scope" align="center">
</template> <el-button size="mini" type="text" @click="turnToBacklogGoods(scope.row)">转为滞货</el-button>
</el-table-column> </template>
</el-table> </el-table-column>
<div class="block" style="margin-top: 10px;"> </el-table>
<el-pagination <div class="block" style="margin-top: 10px;">
:current-page="pageCurrent1" <el-pagination
:page-sizes="[10, 20, 30, 40]" :current-page="pageCurrent1"
:page-size="pageSize1" :page-sizes="[10, 20, 30, 40]"
:total="total1" :page-size="pageSize1"
style="display:inline-block;width:50%" :total="total1"
layout="total, sizes, prev, pager, next, jumper" style="display:inline-block;width:50%"
@size-change="handleSizeChange1" layout="total, sizes, prev, pager, next, jumper"
@current-change="handleCurrentChange1"/> @size-change="handleSizeChange1"
</div> @current-change="handleCurrentChange1"/>
<h4>滞货件列表</h4> </div>
<el-table :data="tableData2" size="mini" stripe border style="width: 100%;" height="440"> </el-card>
<el-table-column label="名称" prop="物料名称" align="center" min-width="100"> <el-card>
<template slot-scope="scope"> <h4 style="margin: 0px">滞货件列表</h4>
{{ scope.row.物料名称 }} <el-table :data="tableData2" size="mini" stripe border style="width: 100%;" height="300">
</template> <el-table-column label="名称" prop="物料名称" align="center" min-width="100">
</el-table-column> <template slot-scope="scope">
<el-table-column label="图号或型号" prop="物料型号" align="center" min-width="120" show-overflow-tooltip> {{ scope.row.物料名称 }}
<template slot-scope="scope"> </template>
{{ scope.row.物料型号 }} </el-table-column>
</template> <el-table-column label="图号或型号" prop="物料型号" align="center" min-width="120" show-overflow-tooltip>
</el-table-column> <template slot-scope="scope">
<el-table-column label="规格" prop="物料规格" align="center" min-width="120" show-overflow-tooltip> {{ scope.row.物料型号 }}
<template slot-scope="scope"> </template>
{{ scope.row.物料规格 }} </el-table-column>
</template> <el-table-column label="规格" prop="物料规格" align="center" min-width="120" show-overflow-tooltip>
</el-table-column> <template slot-scope="scope">
<el-table-column label="仓库名称" prop="仓库名称" align="center" min-width="80"> {{ scope.row.物料规格 }}
<template slot-scope="scope"> </template>
{{ scope.row.仓库名称 }} </el-table-column>
</template> <el-table-column label="仓库名称" prop="仓库名称" align="center" min-width="80">
</el-table-column> <template slot-scope="scope">
<el-table-column label="货位名称" align="center" min-width="80"> {{ scope.row.仓库名称 }}
<template slot-scope="scope"> </template>
{{ scope.row.货位名称 }} </el-table-column>
</template> <el-table-column label="货位名称" align="center" min-width="80">
</el-table-column> <template slot-scope="scope">
<el-table-column label="滞货货位存量" align="center" min-width="80"> {{ scope.row.货位名称 }}
<template slot-scope="scope"> </template>
{{ scope.row.货位存量 }} </el-table-column>
</template> <el-table-column label="滞货货位存量" align="center" min-width="80">
</el-table-column> <template slot-scope="scope">
</el-table> {{ scope.row.货位存量 }}
<div class="block" style="margin-top: 10px;"> </template>
<el-pagination </el-table-column>
:current-page="pageCurrent2" </el-table>
:page-sizes="[10, 20, 30, 40]" <div class="block" style="margin-top: 10px;">
:page-size="pageSize2" <el-pagination
:total="total2" :current-page="pageCurrent2"
style="display:inline-block;width:50%" :page-sizes="[10, 20, 30, 40]"
layout="total, sizes, prev, pager, next, jumper" :page-size="pageSize2"
@size-change="handleSizeChange2" :total="total2"
@current-change="handleCurrentChange2"/> style="display:inline-block;width:50%"
</div> layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange2"
@current-change="handleCurrentChange2"/>
</div>
</el-card>
</el-card> </el-card>
<el-dialog :visible.sync="dialogFormVisible" title="转为滞货" center width="380px"> <el-dialog :visible.sync="dialogFormVisible" title="转为滞货" center width="380px">

86
src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue
View File

@@ -3,7 +3,7 @@
<el-card> <el-card>
<div slot="header"> <div slot="header">
<!--<span>供应商:</span>--> <!--<span>供应商:</span>-->
<el-input v-model="supperiler" placeholder="供应商或发票号" size="small" clearable @change="searchTable1()"/> <el-input v-model="supperiler" placeholder="供应商或到票号" size="small" clearable @change="searchTable1()"/>
<!--<span>发票号:</span>--> <!--<span>发票号:</span>-->
<!--<el-input v-model="invoiceNum" placeholder="发票号" size="small" clearable/>--> <!--<el-input v-model="invoiceNum" placeholder="发票号" size="small" clearable/>-->
<!-- <el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left:10px" @click="tableData2=[];total1=0;pageCurrent1=1;pageSize1=100000;searchTable1()">查询</el-button>--> <!-- <el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left:10px" @click="tableData2=[];total1=0;pageCurrent1=1;pageSize1=100000;searchTable1()">查询</el-button>-->
@@ -49,12 +49,12 @@
{{ scope.row.供应商名称 }} {{ scope.row.供应商名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="发票号" prop="发票号" align="center" min-width="90"> <el-table-column label="到票号" prop="发票号" align="center" min-width="90">
<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="110"> <el-table-column label="到票金额(元)" align="center" width="110">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.发票金额 }} {{ scope.row.发票金额 }}
</template> </template>
@@ -174,13 +174,13 @@
<el-form ref="form1" :model="form1" :rules="rules1" label-position="left" label-width="110px"> <el-form ref="form1" :model="form1" :rules="rules1" label-position="left" label-width="110px">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="发票号" prop="invoiceNum"> <el-form-item label="到票号" prop="invoiceNum">
<el-input v-model="form1.invoiceNum" size="small" placeholder="发票号"/> <el-input v-model="form1.invoiceNum" size="small" placeholder="到票号"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="发票金额(元)" prop="money"> <el-form-item label="到票金额(元)" prop="money">
<el-input v-positive="'float'" v-model="form1.money" class="editWorkTime" size="small" placeholder="发票金额" type="number" @blur="changeToFixde"/> <el-input v-positive="'float'" v-model="form1.money" class="editWorkTime" size="small" placeholder="到票金额" type="number" @blur="changeToFixde"/>
<!--<el-input v-model="form1.money" size="small" placeholder="发票金额"/>--> <!--<el-input v-model="form1.money" size="small" placeholder="发票金额"/>-->
</el-form-item> </el-form-item>
</el-col> </el-col>
@@ -188,7 +188,7 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="供应商" prop="supplierValue"> <el-form-item label="供应商" prop="supplierValue">
<el-select v-model="form1.supplierValue" :disabled="title1 === '编辑发票结算申请单'" placeholder="供应商" filterable size="small"> <el-select v-model="form1.supplierValue" :disabled="title1 === '编辑到票结算申请单'" placeholder="供应商" filterable size="small">
<el-option <el-option
v-for="item in supplier" v-for="item in supplier"
:key="item.value" :key="item.value"
@@ -218,7 +218,7 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item v-show="false" label="是否费用类"> <el-form-item v-show="false" label="是否费用类">
<el-input v-model="form1.isCost" size="small" placeholder="是否费用类发票"/> <el-input v-model="form1.isCost" size="small" placeholder="是否费用类到票"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@@ -245,17 +245,17 @@
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button size="small" @click="dialogVisible1 = false">取消</el-button> <el-button size="small" @click="dialogVisible1 = false">取消</el-button>
<el-button v-if="title1 === '发票结算申请'" size="small" type="primary" @click="submitAdd1()">确定</el-button> <el-button v-if="title1 === '到票结算申请'" size="small" type="primary" @click="submitAdd1()">确定</el-button>
<el-button v-else size="small" type="primary" @click="submitEdit()">确定</el-button> <el-button v-else size="small" type="primary" @click="submitEdit()">确定</el-button>
</div> </div>
</el-dialog> </el-dialog>
<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-model="contractType" size="small" @change="searchTable01()">
<el-radio label="采购合同" border/> <el-radio label="采购合同" border @click="showtable02 = true,showtable03 = false"/>
<el-radio label="离线合同" border/> <el-radio label="离线合同" border @click="showtable03 = true,showtable02 = false"/>
</el-radio-group> </el-radio-group>
<el-table :data="tableData01" border highlight-current-row style="width: 100%;max-height: 250px;" height="200px" size="mini" @row-click="searchTable02"> <el-table :data="tableData01" border highlight-current-row style="width: 100%;max-height: 250px;" height="200px" size="mini" @row-click="searchTable02">
<el-table-column label="供应商" align="center" min-width="200"> <el-table-column label="供应商" align="center" min-width="200">
@@ -274,7 +274,45 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-table ref="multipleTable" :data="tableData02" border style="width: 100%;max-height: 250px;" height="250px" size="mini" @selection-change="handleSelectionChange"> <el-table v-show="showtable02" ref="multipleTable" :data="tableData02" border style="width: 100%;max-height: 250px;" height="250px" size="mini" @selection-change="handleSelectionChange">
<el-table-column :selectable="selectable" type="selection" align="center" width="45"/>
<el-table-column label="名称" align="center" width="100">
<template slot-scope="scope">
{{ scope.row.物料名称 ? scope.row.物料名称 : scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column label="图号或型号" align="center" min-width="150">
<template slot-scope="scope">
{{ scope.row.物料型号 ? scope.row.物料型号 : scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column label="规格" align="center" min-width="150">
<template slot-scope="scope">
{{ scope.row.物料规格 ? scope.row.物料规格 : scope.row.规格 }}
</template>
</el-table-column>
<el-table-column label="采购数量" align="center" width="80">
<template slot-scope="scope">
{{ scope.row.数量 }}
</template>
</el-table-column>
<el-table-column label="已到货数量" align="center" width="90">
<template slot-scope="scope">
{{ scope.row.已到货数量 }}
</template>
</el-table-column>
<el-table-column label="已到票数量" align="center" width="90">
<template slot-scope="scope">
{{ scope.row.到票数量 }}
</template>
</el-table-column>
<el-table-column label="本次到票数量" align="center" width="120">
<template slot-scope="scope">
<el-input-number v-model="scope.row.本次到票数量" :min="0" :max="scope.row.已到货数量 - scope.row.到票数量" size="mini" controls-position="right" style="width: 100%;"/>
</template>
</el-table-column>
</el-table>
<el-table v-show="showtable03" ref="multipleTable" :data="tableData03" border style="width: 100%;max-height: 250px;" height="250px" size="mini" @selection-change="handleSelectionChange">
<el-table-column :selectable="selectable" type="selection" align="center" width="45"/> <el-table-column :selectable="selectable" type="selection" align="center" width="45"/>
<el-table-column label="名称" align="center" width="100"> <el-table-column label="名称" align="center" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
@@ -308,7 +346,7 @@
</el-table-column> </el-table-column>
<el-table-column label="本次到票数量" align="center" width="120"> <el-table-column label="本次到票数量" align="center" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input-number v-model="scope.row.本次到票数量" :min="0" :max="(scope.row.已到货数量||scope.row.到货数量)-scope.row.到票数量" size="mini" controls-position="right" style="width: 100%;"/> <el-input-number v-model="scope.row.本次到票数量" :min="0" :max="(scope.row.已到货数量 ||scope.row.到货数量)-scope.row.到票数量" size="mini" controls-position="right" style="width: 100%;"/>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -329,6 +367,8 @@ export default {
name: '', // 发票结算申请 name: '', // 发票结算申请
data() { data() {
return { return {
showtable02: true,
showtable03: false,
supperiler: '', supperiler: '',
disabled: false, disabled: false,
contractType: '采购合同', contractType: '采购合同',
@@ -360,7 +400,7 @@ export default {
}, },
rules1: { rules1: {
invoiceNum: [ invoiceNum: [
{ required: true, message: '请输入发票号' } { required: true, message: '请输入到票号' }
], ],
money: [ money: [
{ required: true, message: '请输入开票金额' } { required: true, message: '请输入开票金额' }
@@ -373,6 +413,7 @@ export default {
limit: 1, limit: 1,
tableData01: [], tableData01: [],
tableData02: [], tableData02: [],
tableDara03: [],
inboundCardNumber: '', // 入库单号 inboundCardNumber: '', // 入库单号
group: [] // 发票结算申请单明细流水号组 group: [] // 发票结算申请单明细流水号组
} }
@@ -415,10 +456,11 @@ export default {
this.form1.tax = '' this.form1.tax = ''
this.form1.isCost = '' this.form1.isCost = ''
this.form1.remark = '' this.form1.remark = ''
this.title1 = '发票结算申请' this.title1 = '到票结算申请'
this.dialogVisible1 = true this.dialogVisible1 = true
}, },
searchTable1() { searchTable1() {
this.tableData2 = []
let check1, check2 let check1, check2
this.invoiceNum ? check1 = 1 : check1 = 0 this.invoiceNum ? check1 = 1 : check1 = 0
this.supperiler ? check2 = 1 : check2 = 0 this.supperiler ? check2 = 1 : check2 = 0
@@ -482,7 +524,7 @@ export default {
this.form1.isCost = row.是否费用类 this.form1.isCost = row.是否费用类
this.form1.remark = row.备注 this.form1.remark = row.备注
this.form1.applyOrderNum = row.发票结算申请单流水号 this.form1.applyOrderNum = row.发票结算申请单流水号
this.title1 = '编辑发票结算申请单' this.title1 = '编辑到票结算申请单'
this.dialogVisible1 = true this.dialogVisible1 = true
}, },
handleDelete(row) { handleDelete(row) {
@@ -543,7 +585,7 @@ export default {
}, },
submitApply(row) { submitApply(row) {
if (this.tableData2.length === 0) { if (this.tableData2.length === 0) {
this.$message.warning('发票结算申请明细为空！') this.$message.warning('到票结算申请明细为空！')
} else { } else {
this.$confirm('确认提交申请吗?', '提示', { this.$confirm('确认提交申请吗?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
@@ -581,12 +623,13 @@ export default {
this.title2 = '追加入库' this.title2 = '追加入库'
this.dialogVisible2 = true this.dialogVisible2 = true
} else { } else {
this.$message.error('请选择发票！') this.$message.error('请选择到票！')
} }
}, },
searchTable01() { searchTable01() {
this.tableData01 = [] this.tableData01 = []
this.tableData02 = [] this.tableData02 = []
this.tableData03 = []
if (this.contractType === '采购合同') { if (this.contractType === '采购合同') {
searchPurchase(this.supplierValue).then(response => { searchPurchase(this.supplierValue).then(response => {
this.tableData01 = response.data this.tableData01 = response.data
@@ -603,6 +646,7 @@ export default {
}, },
searchTable02(row) { searchTable02(row) {
this.tableData02 = [] this.tableData02 = []
this.tableData03 = []
if (this.contractType === '采购合同') { if (this.contractType === '采购合同') {
searchPurchaseDetail(row.采购合同流水号).then(response => { searchPurchaseDetail(row.采购合同流水号).then(response => {
response.data.map(data => { response.data.map(data => {
@@ -616,7 +660,7 @@ export default {
response.data.map(data => { response.data.map(data => {
this.$set(data, '本次到票数量', 0) this.$set(data, '本次到票数量', 0)
data.本次到票数量 = data.到货数量 - data.到票数量 data.本次到票数量 = data.到货数量 - data.到票数量
this.tableData02.push(data) this.tableData03.push(data)
}) })
}) })
} }

4
src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue
View File

@@ -53,12 +53,12 @@
{{ scope.row.供应商名称 }} {{ scope.row.供应商名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="发票号" align="center" min-width="90"> <el-table-column label="到票号" align="center" min-width="90">
<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>

2
src/views/PurchasingCenter/PurchaseContractSearch/index.vue
View File

@@ -360,7 +360,7 @@ export default {
}, },
created() { created() {
this.fetchData() this.fetchData()
// this.searchTable1() this.searchTable1()
}, },
methods: { methods: {
// 处理完成 // 处理完成

4
src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
View File

@@ -506,7 +506,7 @@
size="small" size="small"
icon="el-icon-menu" icon="el-icon-menu"
style="margin-left: 10px" style="margin-left: 10px"
@click="executeReturn2">分配</el-button> @click="allocateTask2">分配</el-button>
</el-tooltip> </el-tooltip>
<el-tooltip :open-delay="1000" effect="dark" content="打回制造部重新分配" placement="top"> <el-tooltip :open-delay="1000" effect="dark" content="打回制造部重新分配" placement="top">
<el-button <el-button
@@ -514,7 +514,7 @@
size="small" size="small"
icon="el-icon-back" icon="el-icon-back"
style="margin-left: 10px" style="margin-left: 10px"
@click="allocateTask2">打回</el-button> @click="executeReturn2">打回</el-button>
</el-tooltip> </el-tooltip>
<!--<el-button type="primary" size="small" icon="el-icon-menu" style="margin-left: 10px" @click="allocateTask2">分配</el-button>--> <!--<el-button type="primary" size="small" icon="el-icon-menu" style="margin-left: 10px" @click="allocateTask2">分配</el-button>-->
<!--<el-button type="danger" size="small" icon="el-icon-back" style="margin-left: 10px" @click="executeReturn2">打回</el-button>--> <!--<el-button type="danger" size="small" icon="el-icon-back" style="margin-left: 10px" @click="executeReturn2">打回</el-button>-->

6
src/views/PurchasingCenter/ReceiveCheck/index.vue
View File

@@ -302,9 +302,9 @@ export default {
this.searchProject() this.searchProject()
}, },
exportExcel() { exportExcel() {
if (this.sum === '' || this.sum === 0) { if (this.totalPrice === '' || this.totalPrice === 0) {
this.$message.error('请先查询内容，确认无误后导出') this.$message.error('请先查询内容，确认无误后导出')
console.log(this.sum) console.log(this.totalPrice)
return return
} }
let check2, check3, check4 let check2, check3, check4
@@ -321,7 +321,7 @@ export default {
param[5] = ['组件流水号', this.groupValue] param[5] = ['组件流水号', this.groupValue]
param[6] = ['机床号物料名称_check', check4] param[6] = ['机床号物料名称_check', check4]
param[7] = ['机床号物料名称', this.machinenum] param[7] = ['机床号物料名称', this.machinenum]
param[8] = ['合计', this.sum] param[8] = ['合计', this.totalPrice]
param[9] = ['表名', '采购核算'] param[9] = ['表名', '采购核算']
var Data = this.CreateData('2001', '采购管理_领用核算_查询数据_导出', param) var Data = this.CreateData('2001', '采购管理_领用核算_查询数据_导出', param)
this.exportExcel_NPOI(Data) this.exportExcel_NPOI(Data)

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

@@ -2,7 +2,7 @@
<div class="app-container"> <div class="app-container">
<el-card> <el-card>
<!-- <span>发票号:</span>--> <!-- <span>发票号:</span>-->
<el-input v-model="invoiceNum" placeholder="发票号\供应商" size="small" clearable/> <el-input v-model="invoiceNum" placeholder="到票号\供应商" size="small" clearable/>
<el-button type="primary" size="small" plain icon="el-icon-search" style="margin-left:10px" @click="tableData2=[];total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button> <el-button type="primary" size="small" plain icon="el-icon-search" style="margin-left:10px" @click="tableData2=[];total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
<el-button type="distribution" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="createOrder()">到票</el-button> <el-button type="distribution" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="createOrder()">到票</el-button>
</el-card> </el-card>
@@ -47,12 +47,12 @@
{{ scope.row.供应商名称 }} {{ scope.row.供应商名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="发票号" prop="发票号" align="center" width="130"> <el-table-column label="到票号" prop="发票号" align="center" width="130">
<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="110"> <el-table-column label="到票金额(元)" align="center" min-width="110">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.发票金额 }} {{ scope.row.发票金额 }}
</template> </template>
@@ -128,8 +128,8 @@
<el-card> <el-card>
<h4 style="margin: 5px;display: inline-block;width: 150px;">到票结算申请单明</h4> <h4 style="margin: 5px;display: inline-block;width: 150px;">到票结算申请单明</h4>
<span>发票号：</span> <span>到票号：</span>
<el-input v-model="invoiceNumber" size="small" placeholder="请选择发票结算申请单" readonly/> <el-input v-model="invoiceNumber" size="small" placeholder="请选择到票结算申请单" readonly/>
<el-button :disabled="disabled" type="distribution" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="addInStoreRecord()">追加入库记录</el-button> <el-button :disabled="disabled" type="distribution" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="addInStoreRecord()">追加入库记录</el-button>
<el-table :data="tableData2" border highlight-current-row style="width: 100%;max-height: 250px;" height="250px" size="mini"> <el-table :data="tableData2" border highlight-current-row style="width: 100%;max-height: 250px;" height="250px" size="mini">
<el-table-column label="名称" align="center" width="150"> <el-table-column label="名称" align="center" width="150">
@@ -188,20 +188,20 @@
<el-form ref="form1" :model="form1" :rules="rules1" label-position="right" label-width="110px"> <el-form ref="form1" :model="form1" :rules="rules1" label-position="right" label-width="110px">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="发票号" prop="invoiceNum"> <el-form-item label="到票号" prop="invoiceNum">
<el-input v-model="form1.invoiceNum" size="small" placeholder="发票号"/> <el-input v-model="form1.invoiceNum" size="small" placeholder="到票号"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="发票金额(元)" prop="money"> <el-form-item label="到票金额(元)" prop="money">
<el-input v-positive="'float'" v-model="form1.money" type="float" size="small" placeholder="发票金额"/> <el-input v-positive="'float'" v-model="form1.money" type="float" size="small" placeholder="到票金额"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="供应商" prop="supplierValue"> <el-form-item label="供应商" prop="supplierValue">
<el-select v-model="form1.supplierValue" :disabled="title1 === '编辑发票结算申请单'" placeholder="供应商" filterable size="small"> <el-select v-model="form1.supplierValue" :disabled="title1 === '编辑到票结算申请单'" placeholder="供应商" filterable size="small">
<el-option <el-option
v-for="item in supplier" v-for="item in supplier"
:key="item.value" :key="item.value"
@@ -231,7 +231,7 @@
<el-row v-if="false"> <el-row v-if="false">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="是否费用类"> <el-form-item label="是否费用类">
<el-input v-model="form1.isCost" size="small" placeholder="是否费用类发票"/> <el-input v-model="form1.isCost" size="small" placeholder="是否费用类到票"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@@ -258,14 +258,14 @@
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button size="small" @click="dialogVisible1 = false">取消</el-button> <el-button size="small" @click="dialogVisible1 = false">取消</el-button>
<el-button v-if="title1 === '创建发票结算申请单'" size="small" type="primary" @click="submitAdd1()">确定</el-button> <el-button v-if="title1 === '创建到票结算申请单'" size="small" type="primary" @click="submitAdd1()">确定</el-button>
<el-button v-else size="small" type="primary" @click="submitEdit()">确定</el-button> <el-button v-else size="small" type="primary" @click="submitEdit()">确定</el-button>
</div> </div>
</el-dialog> </el-dialog>
<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-show="false" 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/>
@@ -412,10 +412,10 @@ export default {
}, },
rules1: { rules1: {
invoiceNum: [ invoiceNum: [
{ required: true, message: '请输入发票号' } { required: true, message: '请输入到票号' }
], ],
money: [ money: [
{ required: true, message: '请输入开票金额' } { required: true, message: '请输入到票金额' }
], ],
supplierValue: [ supplierValue: [
{ required: true, message: '请选择供应商' } { required: true, message: '请选择供应商' }
@@ -465,7 +465,7 @@ export default {
this.form1.tax = '' this.form1.tax = ''
this.form1.isCost = '' this.form1.isCost = ''
this.form1.remark = '' this.form1.remark = ''
this.title1 = '创建发票结算申请单' this.title1 = '创建到票结算申请单'
this.dialogVisible1 = true this.dialogVisible1 = true
}, },
searchTable1() { searchTable1() {
@@ -530,7 +530,7 @@ export default {
this.form1.isCost = row.是否费用类 this.form1.isCost = row.是否费用类
this.form1.remark = row.备注 this.form1.remark = row.备注
this.form1.applyOrderNum = row.发票结算申请单流水号 this.form1.applyOrderNum = row.发票结算申请单流水号
this.title1 = '编辑发票结算申请单' this.title1 = '编辑到票结算申请单'
this.dialogVisible1 = true this.dialogVisible1 = true
}, },
handleDelete(row) { handleDelete(row) {
@@ -557,7 +557,7 @@ export default {
async searchPic(row, i) { async searchPic(row, i) {
}, },
warningExceed() { warningExceed() {
this.$message.error('仅可上传一张发票') this.$message.error('仅可上传一张到票')
}, },
beforeUpload(file) { // 上传前检测 beforeUpload(file) { // 上传前检测
const isJPG = /^image\/.*/.test(file.type) const isJPG = /^image\/.*/.test(file.type)
@@ -591,7 +591,7 @@ export default {
}, },
submitApply(row) { submitApply(row) {
if (this.tableData2.length === 0) { if (this.tableData2.length === 0) {
this.$message.warning('发票结算申请明细为空！') this.$message.warning('到票结算申请明细为空！')
} else { } else {
this.$confirm('确认提交申请吗?', '提示', { this.$confirm('确认提交申请吗?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
@@ -630,7 +630,7 @@ export default {
this.title2 = '追加入库单' this.title2 = '追加入库单'
this.dialogVisible2 = true this.dialogVisible2 = true
} else { } else {
this.$message.error('请选择发票！') this.$message.error('请选择到票！')
} }
}, },
searchTable01() { searchTable01() {

84
src/views/WorkshopProcurement/InvoiceSettlementApprove1/index.vue
View File

@@ -7,51 +7,51 @@
<el-button type="success" size="small" icon="el-icon-search" style="margin-left:10px" @click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button> <el-button type="success" size="small" icon="el-icon-search" style="margin-left:10px" @click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
</el-card> </el-card>
<el-card> <el-card>
<h4 style="margin-top: 5px">发票结算申请单</h4> <h4 style="margin: 5px">到票结算申请单</h4>
<el-table id="expandTable" :data="tableData1" border highlight-current-row style="width: 100%" height="330" size="mini" @row-click="searchTable2"> <el-table id="expandTable" :data="tableData1" border highlight-current-row style="width: 100%" height="330" size="mini" @row-click="searchTable2">
<el-table-column label="展开" align="center" type="expand" > <!-- <el-table-column label="展开" align="center" type="expand" >-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<el-form label-position="left" inline class="demo-table-expand"> <!-- <el-form label-position="left" inline class="demo-table-expand">-->
<el-row> <!-- <el-row>-->
<el-col :span="6"> <!-- <el-col :span="6">-->
<viewer> <!-- <viewer>-->
<img :src="scope.row.scanSrc" alt="发票扫描件" height="120px"> <!-- <img :src="scope.row.scanSrc" alt="发票扫描件" height="120px">-->
</viewer> <!-- </viewer>-->
</el-col> <!-- </el-col>-->
<el-col :span="6"> <!-- <el-col :span="6">-->
<el-form-item label="已付款项"> <!-- <el-form-item label="已付款项">-->
<span>{{ scope.row.已付款项 }}</span> <!-- <span>{{ scope.row.已付款项 }}</span>-->
</el-form-item><br> <!-- </el-form-item><br>-->
<el-form-item label="尚欠金额"> <!-- <el-form-item label="尚欠金额">-->
<span>{{ scope.row.尚欠金额 }}</span> <!-- <span>{{ scope.row.尚欠金额 }}</span>-->
</el-form-item><br> <!-- </el-form-item><br>-->
<el-form-item label="备注"> <!-- <el-form-item label="备注">-->
<span>{{ scope.row.备注 }}</span> <!-- <span>{{ scope.row.备注 }}</span>-->
</el-form-item><br> <!-- </el-form-item><br>-->
</el-col> <!-- </el-col>-->
<el-col :span="6"> <!-- <el-col :span="6">-->
<el-form-item label="是否费用类发票"> <!-- <el-form-item label="是否费用类发票">-->
<span>{{ scope.row.是否费用类 }}</span> <!-- <span>{{ scope.row.是否费用类 }}</span>-->
</el-form-item><br> <!-- </el-form-item><br>-->
<el-form-item label="税额"> <!-- <el-form-item label="税额">-->
<span>{{ scope.row.税额 }}</span> <!-- <span>{{ scope.row.税额 }}</span>-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
</el-row> <!-- </el-row>-->
</el-form> <!-- </el-form>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column label="供应商" align="center" min-width="200"> <el-table-column label="供应商" align="center" min-width="200">
<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="118"> <el-table-column label="到票号" align="center" min-width="118">
<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="70"> <el-table-column label="到票金额（元）" align="center" min-width="120">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.发票金额 }} {{ scope.row.发票金额 }}
</template> </template>
@@ -63,10 +63,10 @@
</el-table-column> </el-table-column>
<el-table-column label="申请时间" align="center" min-width="140"> <el-table-column label="申请时间" align="center" min-width="140">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.申请时间 ? scope.row.申请时间 : '—' }} {{ scope.row.申请时间 ? scope.row.申请时间.split(' ')[0] : '—' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="采购审批" align="center" min-width="60"> <el-table-column label="采购审批" align="center" min-width="80">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.审批人1姓名 ? scope.row.审批人1姓名 : '未审批' }} {{ scope.row.审批人1姓名 ? scope.row.审批人1姓名 : '未审批' }}
</template> </template>
@@ -76,7 +76,7 @@
{{ scope.row.审批1时间 ? scope.row.审批1时间 : '—' }} {{ scope.row.审批1时间 ? scope.row.审批1时间 : '—' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="财务审批" align="center" min-width="60"> <el-table-column label="财务审批" align="center" min-width="80">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.审批人2姓名 ? scope.row.审批人2姓名 : '未审批' }} {{ scope.row.审批人2姓名 ? scope.row.审批人2姓名 : '未审批' }}
</template> </template>
@@ -86,7 +86,7 @@
{{ scope.row.审批2时间 ? scope.row.审批2时间 : '—' }} {{ scope.row.审批2时间 ? scope.row.审批2时间 : '—' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="总经理审批" align="center" min-width="70"> <el-table-column label="总经理审批" align="center" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.审批人3姓名 ? scope.row.审批人3姓名 : '未审批' }} {{ scope.row.审批人3姓名 ? scope.row.审批人3姓名 : '未审批' }}
</template> </template>
@@ -116,9 +116,9 @@
</el-card> </el-card>
<el-card> <el-card>
<h4 style="margin-top: 5px;display: inline-block;width: 150px;">发票结算申请单明细</h4> <h4 style="margin: 5px;display: inline-block;width: 150px;">到结算申请单明细</h4>
<span>发票号：</span> <span>到票号：</span>
<el-input v-model="invoiceNumber" size="small" placeholder="请选择发票结算申请单" readonly/> <el-input v-model="invoiceNumber" size="small" placeholder="请选择到票结算申请单" readonly/>
<el-table :data="tableData2" border highlight-current-row style="width: 100%;max-height: 250px;" height="250px" size="mini"> <el-table :data="tableData2" border highlight-current-row style="width: 100%;max-height: 250px;" height="250px" size="mini">
<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">

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

@@ -2,7 +2,7 @@
<div class="app-container"> <div class="app-container">
<el-card> <el-card>
<el-row> <el-row>
<el-input v-model="invoiceNum" placeholder="发票号" size="small" style="margin: 3px 0;width: 140px" clearable/> <el-input v-model="invoiceNum" placeholder="到票号" size="small" style="margin: 3px 0;width: 140px" clearable/>
<el-input v-show="false" v-model="supplierName0" placeholder="供应商" size="small" style="width:140px;margin-left: 10px" clearable @focus="fetchData"/> <el-input v-show="false" v-model="supplierName0" placeholder="供应商" size="small" style="width:140px;margin-left: 10px" clearable @focus="fetchData"/>
<el-select v-model="gongyingshangValue" placeholder="供应商" style="width: 180px;margin-left: 10px" size="small" filterable clearable @change="searchTable1"> <el-select v-model="gongyingshangValue" placeholder="供应商" style="width: 180px;margin-left: 10px" size="small" filterable clearable @change="searchTable1">
<el-option <el-option
@@ -41,7 +41,7 @@
style="width: 180px" style="width: 180px"
type="date" type="date"
placeholder="选择日期"/> placeholder="选择日期"/>
<el-tooltip :open-delay="1200" effect="dark" content="查询外购备料发票信息" placement="top"> <el-tooltip :open-delay="1200" effect="dark" content="查询外购备料到信息" placement="top">
<el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 10px" @click="total1=0;pageCurrent1=1;pageSize1=30;searchTable1()">查询</el-button> <el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 10px" @click="total1=0;pageCurrent1=1;pageSize1=30;searchTable1()">查询</el-button>
</el-tooltip> </el-tooltip>
<el-button class="button111" size="small" icon="el-icon-circle-plus-outline" style="margin-left: 10px" @click="addTable1()">到票</el-button> <el-button class="button111" size="small" icon="el-icon-circle-plus-outline" style="margin-left: 10px" @click="addTable1()">到票</el-button>
@@ -64,26 +64,21 @@
<span v-else-if="Number(scope.row.是否请款) === 1" type="primary" size="mini">已请款</span> <span v-else-if="Number(scope.row.是否请款) === 1" type="primary" size="mini">已请款</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="发票号" width="110px"> <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="开票时间" prop="开票时间" width="100px"> <el-table-column align="center" label="到票时间" prop="开票时间" width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.开票时间 | formatTime }} {{ scope.row.开票时间 | formatTime }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="开票金额(元)" width="110px"> <el-table-column align="center" label="到票金额(元)" width="110px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.开票金额.toFixed(2) }} {{ scope.row.开票金额.toFixed(2) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="到货金额(元)" width="110px">
<template slot-scope="scope">
{{ Number(scope.row.到货金额).toFixed(2) }}
</template>
</el-table-column>
<el-table-column align="center" label="供应商" prop="供应商名称" min-width="190px" width="190px" show-overflow-tooltip> <el-table-column align="center" label="供应商" prop="供应商名称" min-width="190px" width="190px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.供应商名称 }} {{ scope.row.供应商名称 }}
@@ -147,7 +142,7 @@
</el-card> </el-card>
<el-card style="float: left;margin-left: 5px"> <el-card style="float: left;margin-left: 5px">
<el-table :data="gridData" :header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}" :summary-method="getSummaries" class="subTableHeader" show-summary border size="mini" style="width: 100%"> <el-table :data="gridData" :header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}" :summary-method="getSummaries" class="subTableHeader" show-summary border size="mini" style="width: 100%">
<el-table-column width="55" align="center" type="index" label="序号"/> <el-table-column width="50" align="center" type="index" label="序号"/>
<el-table-column label="到货单编号" align="center" width="120px"> <el-table-column label="到货单编号" align="center" width="120px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.到货单编号 }} {{ scope.row.到货单编号 }}
@@ -191,8 +186,8 @@
:value="item.value"/> :value="item.value"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="发票号"> <el-form-item label="到票号">
<el-input v-model="form1.Number" size="small" placeholder="发票号"/> <el-input v-model="form1.Number" size="small" placeholder="到票号"/>
</el-form-item> </el-form-item>
<el-form-item label="到票时间" prop="invoiceTime"> <el-form-item label="到票时间" prop="invoiceTime">
<el-date-picker v-model="form1.invoiceTime" size="small" type="date" value-format="yyyy-MM-dd" format="yyyy-MM-dd" placeholder="选择日期"/> <el-date-picker v-model="form1.invoiceTime" size="small" type="date" value-format="yyyy-MM-dd" format="yyyy-MM-dd" placeholder="选择日期"/>
@@ -243,8 +238,8 @@
:value="item.value"/> :value="item.value"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="发票号" prop="money"> <el-form-item label="到票号" prop="money">
<el-input v-model="form1.Number" size="small" placeholder="发票号"/> <el-input v-model="form1.Number" size="small" placeholder="到票号"/>
</el-form-item> </el-form-item>
<el-form-item label="到票时间" prop="invoiceTime"> <el-form-item label="到票时间" prop="invoiceTime">
<el-date-picker v-model="form1.invoiceTime" size="small" type="date" value-format="yyyy-MM-dd" format="yyyy-MM-dd" placeholder="选择日期"/> <el-date-picker v-model="form1.invoiceTime" size="small" type="date" value-format="yyyy-MM-dd" format="yyyy-MM-dd" placeholder="选择日期"/>
@@ -504,15 +499,6 @@ export default {
this.$message.success('增加成功') this.$message.success('增加成功')
this.dialogVisible1 = false this.dialogVisible1 = false
this.searchTable1() this.searchTable1()
this.gongyingshang = []
getGongyingshang().then(response => {
for (let i = 0; i < response.data.length; i++) {
this.gongyingshang.push({
label: response.data[i].供应商名称,
value: response.data[i].供应商
})
}
})
} else { } else {
this.$message.error('增加失败') this.$message.error('增加失败')
} }
@@ -567,15 +553,6 @@ export default {
if (response.data[0].result === '1') { if (response.data[0].result === '1') {
this.$message.success('删除成功') this.$message.success('删除成功')
this.searchTable1() this.searchTable1()
this.gongyingshang = []
getGongyingshang().then(response => {
for (let i = 0; i < response.data.length; i++) {
this.gongyingshang.push({
label: response.data[i].供应商名称,
value: response.data[i].供应商
})
}
})
} else { this.$message.error('删除失败') } } else { this.$message.error('删除失败') }
}) })
}).catch(() => { }).catch(() => {
@@ -612,7 +589,6 @@ export default {
if (response.data[0].result === '1') { if (response.data[0].result === '1') {
this.$message.success('关联成功') this.$message.success('关联成功')
this.dialogVisible = false this.dialogVisible = false
this.searchTable1()
searchInvoiceDetail(this.发票流水号).then(response => { searchInvoiceDetail(this.发票流水号).then(response => {
this.gridData = response.data this.gridData = response.data
}) })
@@ -621,15 +597,15 @@ export default {
} }
}, },
deleteTable10(row) { deleteTable10(row) {
this.$confirm('确认取消关联吗?', '提示', { this.$confirm('确认删除吗?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
deleteInvoiceMX(row.发票明细流水号, row.到货单流水号).then(response => { deleteInvoiceMX(row.发票明细流水号, row.到货单流水号).then(response => {
console.log(response.data)
if (response.data[0].result === '1') { if (response.data[0].result === '1') {
this.$message.success('取消成功') this.$message.success('取消成功')
this.searchTable1()
searchInvoiceDetail(this.发票流水号).then(response => { searchInvoiceDetail(this.发票流水号).then(response => {
this.gridData = response.data this.gridData = response.data
}) })
@@ -667,6 +643,7 @@ export default {
xhr.responseType = 'blob' xhr.responseType = 'blob'
xhr.onload = function() { xhr.onload = function() {
if (xhr.status === 200) { if (xhr.status === 200) {
console.log(xhr, 1111)
const name = xhr.getResponseHeader('content-disposition').split('=')[1] const name = xhr.getResponseHeader('content-disposition').split('=')[1]
cb(xhr.response, name) cb(xhr.response, name)
} }