刘璐珈

This commit is contained in:
Vergil
2020-03-04 10:58:28 +08:00
parent e0057f1f4c
commit 7abbe21959
12 changed files with 139 additions and 91 deletions

View File

@@ -22,7 +22,7 @@
:value="item.value"/>
</el-select>
<el-input v-model="AdvanceCharge" size="small" style="width: 120px" placeholder="预付款"/>
<el-select v-model="currencyValue" placeholder="币种" style="width: 120px" size="small" clearable>
<el-select v-model="currencyValue" placeholder="币种" style="width: 100px" size="small" clearable>
<el-option
v-for="item in currency"
:key="item.value"
@@ -37,9 +37,9 @@
value-format="yyyy-MM-dd"
placeholder="规定到货时间"/>
<el-input v-model="name" placeholder="采购员" style="width: 120px" size="small" readonly/>
<el-input v-model="taxRate" placeholder="税率" style="width: 120px" size="small"/>
<el-input v-model="taxRate" placeholder="税率" style="width: 100px" size="small"/>
<el-button v-show="contractNumType===0" type="primary" plain size="small" @click="linkGroup">成组采购</el-button>
<el-button v-show="contractNumType===1" type="danger" plain size="small" @click="unLinkGroup">取消成组采购</el-button>
<el-button v-show="contractNumType===1" type="danger" style="margin: 0px" plain size="small" @click="unLinkGroup">取消成组采购</el-button>
</el-row>
</el-card>
<el-card>

View File

@@ -1,14 +1,14 @@
<template>
<div class="app-container">
<el-card>
<span>发票号:</span>
<el-input v-model="invoiceNum" placeholder="发票号" size="small" clearable/>
<!-- <span>发票号:</span>-->
<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="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>
<h4 style="margin-top: 5px">票结算申请单</h4>
<h4 style="margin: 5px">票结算申请单</h4>
<el-table id="expandTable" :data="tableData1" border stripe highlight-current-row style="width: 100%;" height="350px" size="mini" @row-click="searchTable2">
<el-table-column label="详情" type="expand">
<template slot-scope="scope">
@@ -127,7 +127,7 @@
</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>
<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>
@@ -184,8 +184,8 @@
</el-table>
</el-card>
<el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogVisible1" center style="min-height: 300px" width="650px">
<el-form ref="form1" :model="form1" :rules="rules1" label-position="right" label-width="90px">
<el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogVisible1" center style="min-height: 300px" width="680px">
<el-form ref="form1" :model="form1" :rules="rules1" label-position="right" label-width="110px">
<el-row>
<el-col :span="12">
<el-form-item label="发票号" prop="invoiceNum">
@@ -193,8 +193,8 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="发票金额" prop="money">
<el-input v-model="form1.money" size="small" placeholder="发票金额"/>
<el-form-item label="发票金额(元)" prop="money">
<el-input v-positive="'float'" v-model="form1.money" type="float" size="small" placeholder="发票金额"/>
</el-form-item>
</el-col>
</el-row>
@@ -211,14 +211,14 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="尚欠金额">
<el-form-item label="尚欠金额(元)">
<el-input v-model="form1.unpaid" size="small" placeholder="尚欠金额"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="税额">
<el-form-item label="税额(元)">
<el-input v-model="form1.tax" size="small" placeholder="税额"/>
</el-form-item>
</el-col>

View File

@@ -113,7 +113,7 @@
<el-table-column label="操作" align="center" min-width="100px">
<template slot-scope="scope">
<el-button type="text" plain size="mini" icon="el-icon-printer" @click="exportTable()">打印</el-button>
<el-button type="text" plain size="mini" icon="el-icon-back" @click="Disable(scope.row)">打回</el-button>
<el-button :disabled="scope.row.审批情况内容==='通过审批'" type="text" plain size="mini" icon="el-icon-back" @click="Disable(scope.row)">打回</el-button>
</template>
</el-table-column>
</el-table>

View File

@@ -24,7 +24,7 @@
style="margin-left:10px"
@click="exportExcel()">导出项目采购明细</el-button>
</el-card>
<el-card style="width: 44%">
<el-card style="width: 54%">
<el-table v-loading="" :data="tableData2" :summary-method="getSummaries1" show-summary border style="width: 100%;max-height: 700px;" height="700px">
<el-table-column label="零件名称" align="center" width="150">
<template slot-scope="scope">
@@ -48,12 +48,12 @@
</el-table-column>
<el-table-column label="单价(元)" align="center" width="100">
<template slot-scope="scope">
{{ scope.row.单价 }}
{{ scope.row.单价.toFixed(2) }}
</template>
</el-table-column>
<el-table-column label="小计(元)" align="center" width="120" prop="金额">
<template slot-scope="scope">
{{ scope.row.金额 }}
{{ scope.row.金额.toFixed(2) }}
</template>
</el-table-column>
</el-table>

View File

@@ -1,7 +1,7 @@
<template>
<div class="app-container">
<el-card>
<span>时间段:</span>
<!-- <span>时间段:</span>-->
<el-date-picker
v-model="dateRange"
:picker-options="pickerOptions"
@@ -11,11 +11,11 @@
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
range-separator=""
style="width:300px"
style="width:300px;margin-right: 10px;"
start-placeholder="开始日期"
end-placeholder="结束日期"/>
<span>供应商</span>
<el-select v-model="supplierValue" placeholder="供应商" filterable size="small" clearable @change="totalSum=0;totalPay=0;totalDebt=0;">
<!-- <span>供应商</span>-->
<el-select v-model="supplierValue" placeholder="供应商" style="margin-right: 10px" filterable size="small" clearable @change="totalSum=0;totalPay=0;totalDebt=0;">
<el-option
v-for="item in supplier"
:key="item.value"
@@ -29,13 +29,13 @@
icon="el-icon-search"
style="margin-left: 10px"
@click="pageCurrent1=1;pageSize1=30;total1=0;searchTable1()">查询</el-button>
<el-button type="distribution" size="small" icon="el-icon-goods" style="" @click="requestFund">新增请款</el-button>
<el-button type="distribution" size="small" icon="el-icon-goods" style="" @click="requestFund">请款</el-button>
</el-card>
<el-row>
<el-col style="width: 1200px">
<el-col style="width: 940px">
<el-card>
<el-table v-loading="" :data="tableData1" border style="max-height: 500px;" height="500px" size="mini" stripe @row-click="searchTable02">
<el-table-column label="供应商" prop="供应商名称" align="center" min-width="340">
<el-table-column label="供应商" prop="供应商名称" align="center" width="230" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.供应商名称 }}
</template>
@@ -56,19 +56,19 @@
</template>
</el-table-column>
<!-- <el-table-column label="请款付款情况" align="center">-->
<el-table-column label="审批情况内容" width="100" align="center">
<el-table-column label="审批情况" width="80" align="center">
<template slot-scope="scope">
<span v-if="Number(scope.row.审批情况流水号)===3" type="primary" size="small">未审批</span>
<span v-if="Number(scope.row.审批情况流水号)===1" type="success" size="small">已通过</span>
<span v-if="Number(scope.row.审批情况流水号)===2" type="danger" size="small">不通过</span>
</template>
</el-table-column>
<el-table-column label="未通过审批原因" width="130" align="center">
<el-table-column label="未通过原因" width="100" align="center">
<template slot-scope="scope">
{{ scope.row.未通过审批原因 === '通过' ? '—' : scope.row.未通过审批原因 }}
</template>
</el-table-column>
<el-table-column label="付款情况" width="100" align="center">
<el-table-column label="付款情况" width="80" align="center">
<template slot-scope="scope">
<span v-if="Number(scope.row.付款情况流水号)===3" type="primary" size="small">未操作</span>
<span v-if="Number(scope.row.付款情况流水号)===1" type="success" size="small">已同意</span>
@@ -81,7 +81,7 @@
</template>
</el-table-column>
<!-- </el-table-column>-->
<el-table-column label="操作" align="center" width="120">
<el-table-column label="操作" align="center" width="50">
<template slot-scope="scope">
<el-tooltip :open-delay="1000" effect="dark" content="取消请款" placement="top">
<div style="display: inline-block">
@@ -110,23 +110,23 @@
</div>
</el-card>
</el-col>
<el-col style="width: 500px">
<el-col style="width: 440px">
<el-card>
<el-table :data="gridData" highlight-current-row size="mini" show-summary>
<el-table-column width="50" align="center" type="index" label="序号"/>
<el-table-column min-width="150" align="center" label="采购合同编号">
<el-table-column min-width="120" align="center" label="采购合同编号">
<template slot-scope="scope">
{{ scope.row.采购合同编号 }}
</template>
</el-table-column>
<el-table-column min-width="100" align="center" label="已付金额" prop="已付金额">
<el-table-column min-width="120" align="center" label="已付金额(元)" prop="已付金额">
<template slot-scope="scope">
{{ scope.row.已付金额 }}
{{ scope.row.已付金额.toFixed(2) }}
</template>
</el-table-column>
<el-table-column min-width="100" align="center" label="请款金额" prop="请款金额">
<el-table-column min-width="120" align="center" label="请款金额(元)" prop="请款金额">
<template slot-scope="scope">
{{ scope.row.请款金额 }}
{{ scope.row.请款金额.toFixed(2) }}
</template>
</el-table-column>
</el-table>
@@ -394,6 +394,7 @@ export default {
searchTable02(row) { // 查看详情(请款信息包含的合同)
searchRequsetFundDetail(row.采购合同请款流水号).then(response => {
this.gridData = response.data
console.log(response, 123123)
})
},
cancelRequestFund(row) { // 取消请款