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

Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0

Browse Source
This commit is contained in:
zhangdingyu
2019-03-09 16:19:56 +08:00
parent 2c20ebaa6e c4fa647582
commit 726efbbace
6 changed files with 97 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/Inventory/InboundCard.js
View File

@@ -33,14 +33,14 @@ export function searchInventory() {
}) })
} }
// 入库记录查询 // 入库记录查询
export function searchInbound(data1, data2, data3) { export function searchInbound(...data) {
return request({ return request({
url: '', url: '',
method: 'post', method: 'post',
data: { data: {
type: '1', type: '1',
name: '库存管理_入库记录_采购部查询', name: '库存管理_入库记录_采购部查询',
param: '采购合同流水号=' + data1 + '&到货时间=' + data2 + '&仓库流水号=' + data3 param: `采购合同流水号_check=${data[0]}&采购合同流水号=${data[1]}&到货时间_check=${data[2]}&到货开始时间=${data[3]}&到货结束时间=${data[4]}&仓库流水号_check=${data[5]}&仓库流水号=${data[6]}`
} }
}) })
} }

147
src/views/Inventory/InboundCard/index.vue
View File

@@ -11,14 +11,21 @@
:label="item.label" :label="item.label"
:value="item.value"/> :value="item.value"/>
</el-select> </el-select>
<span class="demonstration">入库日期</span> <span class="demonstration">到货时间</span>
<el-date-picker <el-date-picker
v-model="InboundDate" v-model="InboundStartDate"
type="date" type="date"
size="small" size="small"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
format="yyyy-MM-dd" format="yyyy-MM-dd"
placeholder="选择日期"/> placeholder="选择开始日期"/>&nbsp;~
<el-date-picker
v-model="InboundEndDate"
type="date"
size="small"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
placeholder="选择结束日期"/>
<span>仓库:</span> <span>仓库:</span>
<el-select v-model="InventoryValue" filterable clearable size="small" placeholder="仓库" style="width: 200px"> <el-select v-model="InventoryValue" filterable clearable size="small" placeholder="仓库" style="width: 200px">
<el-option <el-option
@@ -44,37 +51,42 @@
align="center" align="center"
type="index" type="index"
width="50"/> width="50"/>
<el-table-column label="存货名称" align="center" min-width="80"> <el-table-column label="到货时间" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.到货时间 ? scope.row.到货时间.split(' ')[0] : '—' }}
</template>
</el-table-column>
<el-table-column label="存货名称" align="center" min-width="100">
<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="80"> <el-table-column label="物料规格" align="center" min-width="120">
<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="80"> <el-table-column label="物料型号" align="center" min-width="120">
<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="80"> <el-table-column label="零件图号" align="center" min-width="120">
<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="80"> <el-table-column label="数量" align="center" width="100">
<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="80"> <el-table-column label="本币单价" align="center" width="100">
<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="80"> <el-table-column label="本币总价" align="center" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.单价 * scope.row.实际到货数量 }} {{ scope.row.单价 * scope.row.实际到货数量 }}
</template> </template>
@@ -164,35 +176,25 @@
</el-card> </el-card>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<el-card> <el-card>
<span style="margin: 5px">入库单编号</span> <span>入库单编号：</span>
<el-input v-model="inboundCardNumber" clearable size="small" style="width:200px" /> <el-input v-model="inboundCardNumber" clearable size="small" style="width:200px" />
<el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="searchInboundCard1()">查询</el-button> <el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="searchInboundCard1()">查询</el-button>
<el-button size="small" type="primary" icon="el-icon-plus" style="margin: 0 0 0 10px" @click="addCard()">创建</el-button> <el-button size="small" type="primary" icon="el-icon-plus" style="margin: 0 0 0 10px" @click="addCard()">创建</el-button>
<el-button size="small" type="primary" icon="el-icon-arrow-down" style="margin: 0 0 0 10px" @click="InboundCardDetail()">选入</el-button> <el-button size="small" type="primary" icon="el-icon-arrow-down" style="margin: 0 0 0 10px" @click="InboundCardDetail()">选入</el-button>
</el-card> </el-card>
<el-card> <el-card>
<el-table <el-table v-loading="listLoading3" :data="tableData3" border style="width: 100%;" size="mini" height="200" highlight-current-row @row-click="searchDetail">
v-loading="listLoading3" <el-table-column label="入库单号" align="center" min-width="110">
:data="tableData3"
border
style="width: 100%;"
size="mini"
height="200"
@row-click = "searchDetail">
<el-table-column
label="序号"
align="center"
type="index"
width="50"/>
<el-table-column label="入库单号" align="center" min-width="100">
<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" value-format="yyyy-MM-dd"> <template slot-scope="scope" value-format="yyyy-MM-dd">
{{ scope.row.入库日期 }} {{ scope.row.入库日期 ? scope.row.入库日期.split(' ')[0] : '—' }}
</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">
@@ -200,7 +202,7 @@
{{ 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="160">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.采购合同编号 }} {{ scope.row.采购合同编号 }}
</template> </template>
@@ -212,7 +214,7 @@
</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.到货日期 ? 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="60">
@@ -220,7 +222,7 @@
{{ 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="200">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.供应商名称 }} {{ scope.row.供应商名称 }}
</template> </template>
@@ -230,17 +232,17 @@
{{ 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" width="80">
<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="80"> <el-table-column label="采购类型" align="center" width="80">
<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="80"> <el-table-column label="入库类别" align="center" width="80">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.入库类别 }} {{ scope.row.入库类别 }}
</template> </template>
@@ -252,9 +254,9 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" min-width="300px"> <el-table-column label="操作" align="center" min-width="300px">
<template slot-scope="scope" align="center"> <template slot-scope="scope" align="center">
<el-button size="small" type="primary" icon="el-icon-edit" style="margin: 0 0 0 10px" @click="editInboundCardInfor(scope.row)">编辑</el-button> <el-button size="mini" type="primary" icon="el-icon-edit" style="margin: 0 0 0 10px" @click="editInboundCardInfor(scope.row)">编辑</el-button>
<el-button size="small" type="danger" icon="el-icon-delete" style="margin: 0 0 0 10px" @click="dropCard(scope.row)">删除</el-button> <el-button size="mini" type="danger" icon="el-icon-delete" style="margin: 0 0 0 10px" @click="dropCard(scope.row)">删除</el-button>
<el-button size="small" type="warning" icon="el-icon-download" style="margin: 0 0 0 10px" @click="exportCard(scope.row)">导出</el-button> <el-button size="mini" type="warning" icon="el-icon-download" style="margin: 0 0 0 10px" @click="exportCard(scope.row)">导出</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -268,16 +270,7 @@
@size-change="handleSizeChange2" @size-change="handleSizeChange2"
@current-change="handleCurrentChange2"/> @current-change="handleCurrentChange2"/>
</div> </div>
<el-table <el-table v-loading="listLoading4" id="cardDetail" :data="tableData4" :summary-method="calculateContractSum" :show-summary="true" border style="width: 100%;" size="mini" height="200">
v-loading="listLoading4"
id = "cardDetail"
:data="tableData4"
:summary-method="calculateContractSum"
:show-summary="true"
border
style="width: 100%;"
size="mini"
height="200">
<el-table-column <el-table-column
label="序号" label="序号"
align="center" align="center"
@@ -303,32 +296,33 @@
{{ scope.row.图号 }} {{ scope.row.图号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="数量" align="center" min-width="100" prop="数量"> <el-table-column label="数量" align="center" width="100" 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" min-width="100"> <el-table-column label="本币单价" align="center" width="100">
<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" prop="sum"> <el-table-column label="本币金额" align="center" width="100" prop="sum">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.sum = scope.row.本币单价 * scope.row.数量 }} {{ scope.row.sum = scope.row.本币单价 * scope.row.数量 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" min-width="80"> <el-table-column label="操作" align="center" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button :disabled="scope.row.是否出库" size="small" type="danger" icon="el-icon-delete" style="margin: 0 0 10px 10px" @click="dropCarddetail(scope.row)">删除</el-button> <el-button :disabled="scope.row.是否出库" size="mini" type="danger" icon="el-icon-delete" @click="dropCarddetail(scope.row)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-card> </el-card>
<el-dialog :visible.sync="dialogVisibleExport" center style="min-height: 300px" width="60%"> <el-dialog :visible.sync="dialogVisibleExport" center style="min-height: 300px" width="60%">
<el-card> <el-card>
<div id="print"> <div id="print">
<div style="text-align: center"> <div style="text-align: center;border: 1px solid white">
<h2>采 购 入 库 单</h2> <h2>采 购 入 库 单</h2>
<hr> <hr>
<table class="tgClass" style="table-layout: fixed; width: 820px;margin: auto"> <table class="tgClass" style="table-layout: fixed; width: 820px;margin: auto">
@@ -385,13 +379,13 @@
<div style="margin-top: 10px"> <div style="margin-top: 10px">
<table class="tg" style="table-layout: fixed; width: 820px; margin: auto"> <table class="tg" style="table-layout: fixed; width: 820px; margin: auto">
<colgroup> <colgroup>
<col style="width: 150px"> <col style="width: 50px">
<col style="width: 150px"> <col style="width: 70px">
<col style="width: 120px"> <col style="width: 200px">
<col style="width: 100px">
<col style="width: 100px">
<col style="width: 100px">
<col style="width: 100px"> <col style="width: 100px">
<col style="width: 50px">
<col style="width: 50px">
<col style="width: 50px">
</colgroup> </colgroup>
<tr> <tr>
<th class="tg-c3ow">存货编码</th> <th class="tg-c3ow">存货编码</th>
@@ -405,7 +399,7 @@
<tr v-for="(list, index) in tableData4" :key="index"> <tr v-for="(list, index) in tableData4" :key="index">
<td class="tg-c3ow">{{ index + 1 }}</td> <td class="tg-c3ow">{{ index + 1 }}</td>
<td class="tg-c3ow">{{ list.名称 }}</td> <td class="tg-c3ow">{{ list.名称 }}</td>
<td class="tg-c3ow">{{ list.规格 }}</td> <td class="tg-c3ow">{{ list.规格 + list.型号 }}</td>
<td class="tg-baqh">{{ list.零件图号 }}</td> <td class="tg-baqh">{{ list.零件图号 }}</td>
<td class="tg-c3ow">{{ list.数量 }}</td> <td class="tg-c3ow">{{ list.数量 }}</td>
<td class="tg-c3ow">{{ list.本币单价 }}</td> <td class="tg-c3ow">{{ list.本币单价 }}</td>
@@ -423,8 +417,8 @@
</table> </table>
</div> </div>
<div style="margin-top: 20px; text-align: right"> <div style="margin-top: 20px; text-align: right">
<span style="margin-right: 50px">制单人:{{ '李鑫' }}</span> <span style="margin-right: 50px">制单人:</span>
<span style="margin-right: 50px">审核人:{{ '李鑫' }}</span> <span style="margin-right: 50px">审核人:</span>
</div> </div>
</div> </div>
</el-card> </el-card>
@@ -433,6 +427,7 @@
<el-button type="primary" size="small" @click="printCard">打印</el-button> <el-button type="primary" size="small" @click="printCard">打印</el-button>
</div> </div>
</el-dialog> </el-dialog>
<el-dialog :visible.sync="dialogVisible1" title="增加采购入库单" center style="min-height: 300px" width="700px"> <el-dialog :visible.sync="dialogVisible1" title="增加采购入库单" center style="min-height: 300px" width="700px">
<el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="90px"> <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="90px">
<el-row> <el-row>
@@ -526,6 +521,7 @@
<el-button type="primary" size="small" @click="submitCard('form')">确定</el-button> <el-button type="primary" size="small" @click="submitCard('form')">确定</el-button>
</div> </div>
</el-dialog> </el-dialog>
<el-dialog :visible.sync="dialogVisible2" title="修改采购入库单" center style="min-height: 300px" width="700px"> <el-dialog :visible.sync="dialogVisible2" title="修改采购入库单" center style="min-height: 300px" width="700px">
<el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="90px"> <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="90px">
<el-row> <el-row>
@@ -636,6 +632,8 @@ export default {
ShopContractValue: '', // 车间采购合同流水号 ShopContractValue: '', // 车间采购合同流水号
Inventory: [], Inventory: [],
InventoryValue: '', InventoryValue: '',
InboundStartDate: '',
InboundEndDate: '',
InboundDate: '', InboundDate: '',
listLoading: '', listLoading: '',
tableData: [], tableData: [],
@@ -701,6 +699,7 @@ export default {
created() { created() {
this.searchContractData() this.searchContractData()
this.searchInventoryData() this.searchInventoryData()
this.searchInboundCard1()
}, },
methods: { methods: {
searchContractData() { // 查询合同 searchContractData() { // 查询合同
@@ -743,7 +742,11 @@ export default {
searchPartinfo() { searchPartinfo() {
this.tableData = [] this.tableData = []
this.listLoading = true this.listLoading = true
searchInbound(this.ContractValue, this.InboundDate, this.InventoryValue).then(response => { let check1, check2, check3
this.ContractValue ? check1 = 1 : check1 = 0
this.InboundStartDate && this.InboundEndDate ? check2 = 1 : (check2 = 0, this.InboundStartDate = null, this.InboundEndDate = null)
this.InventoryValue ? check3 = 1 : check3 = 0
searchInbound(check1, this.ContractValue, check2, this.InboundStartDate, this.InboundEndDate, check3, this.InventoryValue).then(response => {
for (let i = 0; i < response.data.length; i++) { for (let i = 0; i < response.data.length; i++) {
if (response.data[i].组件零件流水号 === 0) { if (response.data[i].组件零件流水号 === 0) {
response.data[i].物料名称 = response.data[i].零件名称 response.data[i].物料名称 = response.data[i].零件名称
@@ -786,6 +789,7 @@ export default {
addInboundCard(this.form.inboundDay, this.form.house, this.form.contract, this.form.arrive, this.form.affairPeople, this.form.affair, this.form.arriveDay, this.form.affirType, this.form.purchaseType, this.form.inboundType, this.form.note).then(response => { addInboundCard(this.form.inboundDay, this.form.house, this.form.contract, this.form.arrive, this.form.affairPeople, this.form.affair, this.form.arriveDay, this.form.affirType, this.form.purchaseType, this.form.inboundType, this.form.note).then(response => {
if (response.data[0].result === '1') { if (response.data[0].result === '1') {
this.$message.success('增加成功') this.$message.success('增加成功')
this.searchInboundCard1()
this.dialogVisible1 = false this.dialogVisible1 = false
} else { } else {
this.$message.error('增加失败') this.$message.error('增加失败')
@@ -867,6 +871,7 @@ export default {
editInboundCard(this.DetailNumber, this.form.inboundDay, this.form.house, this.form.contract, this.form.arrive, this.form.affairPeople, this.form.affair, this.form.arriveDay, this.form.affirType, this.form.purchaseType, this.form.inboundType, this.form.note).then(response => { editInboundCard(this.DetailNumber, this.form.inboundDay, this.form.house, this.form.contract, this.form.arrive, this.form.affairPeople, this.form.affair, this.form.arriveDay, this.form.affirType, this.form.purchaseType, this.form.inboundType, this.form.note).then(response => {
if (response.data[0].result === '1') { if (response.data[0].result === '1') {
this.$message.success('修改成功') this.$message.success('修改成功')
this.searchInboundCard1()
this.dialogVisible2 = false this.dialogVisible2 = false
} else { } else {
this.$message.error('修改失败') this.$message.error('修改失败')
@@ -879,11 +884,10 @@ export default {
searchDetail(row) { searchDetail(row) {
this.DetailNumber = row.采购入库单流水号 this.DetailNumber = row.采购入库单流水号
searchInboundCardDetail(this.DetailNumber).then(response => { searchInboundCardDetail(this.DetailNumber).then(response => {
const data = response.data for (let i = 0; i < response.data.length; i++) {
for (let i = 0; i < data[i].length; i++) { response.data[i].数量 = parseInt(response.data[i].数量)
data[i].数量 = parseInt(data[i].数量)
} }
this.tableData4 = data this.tableData4 = response.data
}) })
}, },
// 删除领料单 // 删除领料单
@@ -1007,6 +1011,7 @@ export default {
this.inbondCard[13] = row.备注 this.inbondCard[13] = row.备注
this.DetailNumber = row.采购入库单流水号 this.DetailNumber = row.采购入库单流水号
searchInboundCardDetail(this.DetailNumber).then(response => { searchInboundCardDetail(this.DetailNumber).then(response => {
console.log(this.tableData4)
this.tableData4 = response.data this.tableData4 = response.data
return this.tableData4 return this.tableData4
}).then(data => { }).then(data => {
@@ -1035,6 +1040,18 @@ export default {
</script> </script>
<style scoped> <style scoped>
.el-card{
margin-bottom: 15px;
}
.el-select{
width:200px
}
.el-input{
width:200px
}
span{
margin: 10px 0 10px 10px;
}
.tg {border-collapse:collapse;border-spacing:0;} .tg {border-collapse:collapse;border-spacing:0;}
.tg td{font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;} .tg td{font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;}
.tg th{font-family:Arial, sans-serif;font-size:14px;font-weight:normal;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;} .tg th{font-family:Arial, sans-serif;font-size:14px;font-weight:normal;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;}

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

@@ -62,7 +62,7 @@
<el-progress <el-progress
:text-inside="true" :text-inside="true"
:stroke-width="18" :stroke-width="18"
:percentage="parseFloat((100*scope.row.合同到货总数/scope.row.合同采购总数).toFixed(2))" :percentage="scope.row.到货进度 = (100*(Number(scope.row.合同到货总数))/scope.row.合同采购总数) > 100 ? 100 : Number((100*(Number(scope.row.合同到货总数))/scope.row.合同采购总数).toFixed(2))"
status="success"/> status="success"/>
</template> </template>
</el-table-column> </el-table-column>

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

@@ -303,7 +303,7 @@
</div> </div>
</el-dialog> </el-dialog>
<el-dialog :title="title2" :visible.sync="dialogVisible2" center style="min-height: 300px" width="800px"> <el-dialog :title="title2" :visible.sync="dialogVisible2" center style="min-height: 300px" width="900px">
<span>入库单号：</span> <span>入库单号：</span>
<el-input v-model="inboundCardNumber" clearable size="small" style="width:200px" /> <el-input v-model="inboundCardNumber" clearable size="small" style="width:200px" />
<el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 10px 10px" @click="searchInboundCard()">查询</el-button> <el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 10px 10px" @click="searchInboundCard()">查询</el-button>
@@ -314,7 +314,7 @@
{{ 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" width="100" >
<template slot-scope="scope" value-format="yyyy-MM-dd"> <template slot-scope="scope" value-format="yyyy-MM-dd">
{{ scope.row.入库日期 ? scope.row.入库日期.split(' ')[0] : '—' }} {{ scope.row.入库日期 ? scope.row.入库日期.split(' ')[0] : '—' }}
</template> </template>
@@ -324,7 +324,7 @@
{{ 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="150">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.采购合同编号 }} {{ scope.row.采购合同编号 }}
</template> </template>
@@ -334,17 +334,12 @@
{{ 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" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.到货日期 ? scope.row.到货日期.split(' ')[0] : '—' }} {{ 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="200">
<template slot-scope="scope">
{{ scope.row.业务号 }}
</template>
</el-table-column>
<el-table-column label="供应商" align="center" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.供应商名称 }} {{ scope.row.供应商名称 }}
</template> </template>
@@ -381,7 +376,7 @@
{{ 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="150">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.型号 }} {{ scope.row.型号 }}
</template> </template>
@@ -396,17 +391,17 @@
{{ scope.row.图号 }} {{ scope.row.图号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="数量" align="center" min-width="100" prop="数量"> <el-table-column label="数量" align="center" width="100" 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" min-width="100"> <el-table-column label="本币单价" align="center" width="100">
<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" prop="sum"> <el-table-column label="本币金额" align="center" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.sum = scope.row.本币单价 * scope.row.数量 }} {{ scope.row.sum = scope.row.本币单价 * scope.row.数量 }}
</template> </template>

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

@@ -95,7 +95,7 @@
<el-progress <el-progress
:text-inside="true" :text-inside="true"
:stroke-width="18" :stroke-width="18"
:percentage="(100*(Number(scope.row.已付金额))/scope.row.合同总额).toFixed(2)" :percentage="scope.row.付款进度 = (100*(Number(scope.row.已付金额))/scope.row.合同总额) > 100 ? 100 : Number((100*(Number(scope.row.已付金额))/scope.row.合同总额).toFixed(2))"
status="success"/> status="success"/>
</template> </template>
</el-table-column> </el-table-column>

2
src/views/layout/components/AppMain.vue
View File

@@ -3,7 +3,9 @@
<transition name="fade-transform" mode="out-in"> <transition name="fade-transform" mode="out-in">
<!-- or name="fade" --> <!-- or name="fade" -->
<!-- <router-view :key="key"></router-view> --> <!-- <router-view :key="key"></router-view> -->
<!--<keep-alive>-->
<router-view/> <router-view/>
<!--</keep-alive>-->
</transition> </transition>
</section> </section>
</template> </template>