质检和查询共识
This commit is contained in:
@@ -88,7 +88,7 @@
|
||||
<el-button type="success" size="small" icon="el-icon-download" style="margin-left: 10px" @click="addMateriel">选入</el-button>
|
||||
</el-tooltip>
|
||||
<el-tooltip :open-delay="1200" effect="dark" content="保存选中的采购计划单" placement="top">
|
||||
<el-button type="baocun" size="small" icon="el-icon-download" style="margin-left: 50px" @click="saveMateriel">保存</el-button>
|
||||
<el-button type="baocun" size="small" icon="el-icon-download" style="margin-left: 140px" @click="saveMateriel">保存</el-button>
|
||||
</el-tooltip>
|
||||
</div>
|
||||
<el-table v-loading="" :data="tableData2" border stripe style="max-height: 460px;" height="200px" size="mini" highlight-current-row @row-click="searchTable3">
|
||||
@@ -105,13 +105,13 @@
|
||||
{{ scope.row.采购单号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="采购计划单名称" prop="采购单名称" align="center" width="120">
|
||||
<el-table-column label="外购计划单名称" prop="采购单名称" align="center" width="120">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.采购单名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!--<el-table-column label="供应商" prop="供应商名称" align="center" min-width="200" width="200" show-overflow-tooltip>-->
|
||||
<el-table-column label="供应商" prop="供应商名称" align="center" min-width="200" width="230" show-overflow-tooltip>
|
||||
<el-table-column label="供应商" prop="供应商名称" align="center" min-width="200" width="200" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.供应商名称 }}
|
||||
</template>
|
||||
@@ -228,11 +228,11 @@
|
||||
</el-table>
|
||||
</el-card>
|
||||
|
||||
<el-dialog v-el-drag-dialog :title="title2" :visible.sync="dialogVisible2" center style="min-height: 300px" width="750px">
|
||||
<el-dialog v-el-drag-dialog :title="title2" :visible.sync="dialogVisible2" center style="min-height: 300px" width="750px" @close="closedialog()">
|
||||
<el-form ref="form2" :model="form2" :rules="rules2" label-position="right" label-width="120px">
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="采购计划单名称" prop="采购计划单名称">
|
||||
<el-form-item label="外购计划单名称" prop="采购计划单名称">
|
||||
<el-input v-model="form2.采购单名称" size="small"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
@@ -269,13 +269,13 @@
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button
|
||||
v-show="title2==='创建采购计划单'"
|
||||
v-show="title2==='创建外购计划单'"
|
||||
type="primary"
|
||||
size="small"
|
||||
icon="el-icon-check"
|
||||
@click="submitAddPurchaseOrder">确定</el-button>
|
||||
<el-button
|
||||
v-show="title2==='编辑采购计划单'"
|
||||
v-show="title2==='编辑外购计划单'"
|
||||
type="primary"
|
||||
size="small"
|
||||
icon="el-icon-check"
|
||||
@@ -466,7 +466,7 @@ export default {
|
||||
},
|
||||
created() {
|
||||
this.searchRawMaterial()
|
||||
this.searchTable1()
|
||||
// this.searchTable1()
|
||||
// this.searchTable2()
|
||||
},
|
||||
methods: {
|
||||
@@ -604,12 +604,20 @@ export default {
|
||||
if (this.$refs['form2'] !== undefined) {
|
||||
this.$refs['form2'].resetFields()
|
||||
}
|
||||
this.title2 = '创建采购计划单'
|
||||
this.title2 = '创建外购计划单'
|
||||
this.form2.supplierNameValue = ''
|
||||
this.form2.供应商名称 = ''
|
||||
this.form2.计划完成日期 = ''
|
||||
this.dialogVisible2 = true
|
||||
},
|
||||
closedialog() {
|
||||
this.form2.采购计划流水号 = ''
|
||||
this.form2.采购单名称 = ''
|
||||
this.form2.supplierNameValue = ''
|
||||
this.form2.计划完成日期 = ''
|
||||
this.form2.供应商名称 = ''
|
||||
this.form2.计划完成日期 = ''
|
||||
},
|
||||
submitAddPurchaseOrder() { // 新建采购单
|
||||
this.$refs['form2'].validate((valid) => {
|
||||
if (valid) {
|
||||
@@ -683,18 +691,18 @@ export default {
|
||||
},
|
||||
exportExcel2(row) {
|
||||
this.searchTable3(row).then(val => {
|
||||
console.log(val)
|
||||
console.log(row, 11111)
|
||||
console.log(this.tableData4)
|
||||
if (this.tableData4.length !== 0) {
|
||||
import('@/vendor/Export2Excel').then(excel => {
|
||||
const tHeader = ['备料状态', '物料编码', '零件名称', '材料', '数量', '成品尺寸', '单位', '备注']
|
||||
const filterVal = ['备料状态', '物料零件编码', '零件名称', '材料', '采购数量', '成品尺寸', '备注1']
|
||||
const filterVal = ['备料状态', '物料零件编码', '零件名称', '材料', '总数量', '成品尺寸', '单位', '备注1']
|
||||
const list = this.tableData4
|
||||
const data = this.formatJson(filterVal, list)
|
||||
excel.export_json_to_excel({
|
||||
header: tHeader,
|
||||
data,
|
||||
filename: '详情',
|
||||
filename: row.采购单名称 + '-' + row.计划完成日期,
|
||||
autoWidth: true,
|
||||
bookType: 'xlsx'
|
||||
})
|
||||
|
||||
@@ -10,18 +10,20 @@
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
<!--<el-input v-model="Name" placeholder="供应商" size="small" clearable/>-->
|
||||
<!--<span>关联情况:</span>-->
|
||||
<!--<el-select v-model="PickingValue" placeholder="关联情况" size="small" clearable>-->
|
||||
<!--<el-option-->
|
||||
<!--v-for="item in Picking"-->
|
||||
<!--:key="item.value"-->
|
||||
<!--:label="item.label"-->
|
||||
<!--:value="item.value"/>-->
|
||||
<!--</el-select>-->
|
||||
<!--<el-tooltip :open-delay="1200" effect="dark" content="查询到货单" placement="top">-->
|
||||
<!--<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent4=1;pageSize4=10;total4=0;searchTable4()">查询</el-button>-->
|
||||
<!--</el-tooltip>-->
|
||||
<span>请款时间段:</span>
|
||||
<el-date-picker
|
||||
v-model="dateRange"
|
||||
:picker-options="pickerOptions"
|
||||
size="small"
|
||||
type="daterange"
|
||||
align="center"
|
||||
style="width: 300px;margin: 3px 0"
|
||||
value-format="yyyy-MM-dd"
|
||||
format="yyyy-MM-dd"
|
||||
range-separator="~"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"/>
|
||||
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent4=1;pageSize4=10;total4=0;searchTable4()">查询</el-button>
|
||||
<el-button type="primary" size="small" icon="el-icon-plus" style="margin-left: 10px" @click="addArrivalOrder">新增到货单</el-button>
|
||||
</div>
|
||||
</el-card>
|
||||
@@ -34,7 +36,7 @@
|
||||
<el-tag v-else type="primary" size="mini">未结算</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="供应商" prop="供应商名称" align="center" width="200">
|
||||
<el-table-column label="供应商" prop="供应商名称" align="center" width="260" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.供应商名称 }}
|
||||
</template>
|
||||
@@ -44,12 +46,12 @@
|
||||
{{ scope.row.日期.split(' ')[0] }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="到货单号" align="center" width="150">
|
||||
<el-table-column label="到货单号" align="center" width="110">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.到货单编号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" align="center" width="200" fixed="right">
|
||||
<el-table-column label="操作" align="center" width="170" fixed="right">
|
||||
<template slot-scope="scope">
|
||||
<el-button :disabled="Number(scope.row.是否关联) === 1" type="text" size="mini" style="margin-left: 10px" icon="el-icon-circle-plus-outline" @click="addArrivalOrderMX(scope.row)">到货明细</el-button>
|
||||
<el-button :disabled="Number(scope.row.是否关联) === 1" type="text" size="mini" style="margin-left: 20px" icon="el-icon-delete" @click="deleteArrivalOrder(scope.row)">删除</el-button>
|
||||
@@ -245,7 +247,7 @@
|
||||
</el-dialog>
|
||||
<el-dialog v-el-drag-dialog :visible.sync="dialogVisible10" title="添加到货明细" center style="min-height: 400px" width="1600px">
|
||||
<el-form ref="form10" :model="form10" :rules="rules10" label-position="right" label-width="60px">
|
||||
<el-row>
|
||||
<el-row style="background-color: white">
|
||||
<el-col :span="5" style="margin-left: 2%">
|
||||
<span>供应商</span>
|
||||
<el-input v-model="供应商名称" style="width: 250px" size="small" readonly/>
|
||||
@@ -274,7 +276,7 @@
|
||||
</el-row>
|
||||
<el-row>
|
||||
<div style="width: 20%;float: left;margin-top: 20px">
|
||||
<div style="background: gainsboro">
|
||||
<div style="background: white">
|
||||
<el-row style="height: 50px">
|
||||
<el-form-item label="材料" prop="CailiaoValue">
|
||||
<el-input v-model="form10.CailiaoValue" size="small"/>
|
||||
@@ -505,6 +507,37 @@ import { ExcelWaiGou } from '@/utils/request'
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
check1: 0,
|
||||
check2: 0,
|
||||
dateRange: '',
|
||||
expands: [],
|
||||
pickerOptions: {
|
||||
shortcuts: [{
|
||||
text: '上季度',
|
||||
onClick(picker) {
|
||||
const end = new Date()
|
||||
const start = new Date()
|
||||
start.setTime(end.getTime() - 3600 * 1000 * 24 * 30 * 3)
|
||||
picker.$emit('pick', [start, end])
|
||||
}
|
||||
}, {
|
||||
text: '过去半年',
|
||||
onClick(picker) {
|
||||
const end = new Date()
|
||||
const start = new Date()
|
||||
start.setTime(end.getTime() - 3600 * 1000 * 24 * 366 / 2)
|
||||
picker.$emit('pick', [start, end])
|
||||
}
|
||||
}, {
|
||||
text: '过去一年',
|
||||
onClick(picker) {
|
||||
const end = new Date()
|
||||
const start = new Date()
|
||||
start.setTime(end.getTime() - 3600 * 1000 * 24 * 365)
|
||||
picker.$emit('pick', [start, end])
|
||||
}
|
||||
}]
|
||||
},
|
||||
excle_row: [],
|
||||
supplierNameValue: '',
|
||||
supplierName: [], // 供应商
|
||||
@@ -517,11 +550,11 @@ export default {
|
||||
planTypes: [
|
||||
{
|
||||
value: 0,
|
||||
label: '采购计划'
|
||||
label: '备料采购计划'
|
||||
},
|
||||
{
|
||||
value: 1,
|
||||
label: '离线采购计划'
|
||||
label: '备料(离线)采购计划'
|
||||
}
|
||||
],
|
||||
arrest: [],
|
||||
@@ -628,7 +661,7 @@ export default {
|
||||
created() {
|
||||
this.fetchdata()
|
||||
this.searchTable2()
|
||||
this.searchTable4()
|
||||
// this.searchTable4()
|
||||
},
|
||||
methods: {
|
||||
saveData(row) {
|
||||
@@ -711,7 +744,7 @@ export default {
|
||||
const sums = []
|
||||
columns.forEach((column, index) => {
|
||||
if (index === 1) {
|
||||
sums[index] = '总数量:'
|
||||
sums[index] = '总重量:'
|
||||
return
|
||||
} else if (index === 2) {
|
||||
const values = data.map(item => Number(item['数量']))
|
||||
@@ -728,6 +761,9 @@ export default {
|
||||
} else {
|
||||
sums[index] = 'N/A'
|
||||
}
|
||||
} else if (index === 3) {
|
||||
sums[index] = 'KG'
|
||||
return
|
||||
} else if (index === 4) {
|
||||
sums[index] = '总金额:'
|
||||
return
|
||||
@@ -804,12 +840,13 @@ export default {
|
||||
this.tableData5 = []
|
||||
this.tableData6 = []
|
||||
this.supplierNameValue ? this.check = 1 : this.check = 0
|
||||
this.dateRange ? this.check1 = 1 : (this.check1 = 0, this.dateRange = '')
|
||||
if (this.PickingValue === 0 || this.PickingValue === 1) {
|
||||
this.check2 = 1
|
||||
} else {
|
||||
this.check2 = 0
|
||||
}
|
||||
searchArriveOrder(this.check, this.supplierNameValue, this.check2, this.PickingValue, this.pageCurrent4, this.pageSize4).then(response => {
|
||||
searchArriveOrder(this.check, this.supplierNameValue, this.check2, this.PickingValue, this.check1, this.dateRange[0], this.dateRange[1], this.pageCurrent4, this.pageSize4).then(response => {
|
||||
this.tableData4 = response.data.rows
|
||||
this.total4 = response.data.total
|
||||
})
|
||||
|
||||
@@ -25,19 +25,19 @@
|
||||
<el-button type="success" class="el-icon-search" size="small" style="margin: 0px 10px;" @click="pageCurrent10 = 1;pageSize10 = 10;getTableData()">查询</el-button>
|
||||
</el-card>
|
||||
<el-card style="width: 1137px">
|
||||
<el-table v-loading="" :data="tableData10" stripe highlight-current-row border style="width: 100%;max-height: 315px;margin-top: 10px" height="315px" size="mini" @selection-change="handleSelectionChange">
|
||||
<el-table v-loading="" :data="tableData10" stripe highlight-current-row border style="width: 100%;max-height: 315px;margin-top: 10px" height="315px" size="mini" @sort-change="sortChange" @selection-change="handleSelectionChange">
|
||||
<el-table-column type="selection" align="center" width="55"/>
|
||||
<el-table-column label="机床图号" prop="机床图号" min-width="180" align="center">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.机床图号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="组号" prop="组号" width="120" align="center">
|
||||
<el-table-column label="组号" prop="组号" width="120" sortable="custom" align="center">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.组号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="零件图号" align="center" width="220">
|
||||
<el-table-column label="零件图号" prop="零件图号" align="center" sortable="custom" width="220">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.零件图号 }}
|
||||
</template>
|
||||
@@ -52,7 +52,7 @@
|
||||
{{ scope.row.批次数量 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="材料" align="center" min-width="160">
|
||||
<el-table-column label="材料" prop="材料" align="center" sortable="custom" min-width="160">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.材料 }}
|
||||
</template>
|
||||
@@ -71,8 +71,8 @@
|
||||
</div>
|
||||
</el-card>
|
||||
<el-card style="width: 1137px">
|
||||
<span>离线采购计划编号:</span>
|
||||
<el-input v-model="purchasingOrder" placeholder="离线采购计划编号" size="small" style="width: 160px" clearable/>
|
||||
<span>离线备料单号:</span>
|
||||
<el-input v-model="purchasingOrder" placeholder="离线备料单号" size="small" style="width: 160px" clearable/>
|
||||
<span style="margin-left: 10px">供应商:</span>
|
||||
<el-select v-model="supplierName" placeholder="供应商" size="small" style="width: 150px" filterable clearable>
|
||||
<el-option
|
||||
@@ -346,7 +346,7 @@ export default {
|
||||
},
|
||||
created() {
|
||||
this.searchRawMaterial()
|
||||
this.searchTable()
|
||||
// this.searchTable()
|
||||
this.getMachine()
|
||||
},
|
||||
methods: {
|
||||
@@ -377,7 +377,7 @@ export default {
|
||||
if (Cookie.get('group') !== undefined) {
|
||||
this.Machine = parseInt(Cookie.get('machineValue'))
|
||||
this.getGroup()
|
||||
this.getTableData()
|
||||
// this.getTableData()
|
||||
this.Group = parseInt(Cookie.get('group'))
|
||||
// this.getTableData()
|
||||
Cookie.remove('machineValue')
|
||||
@@ -418,7 +418,28 @@ export default {
|
||||
this.Group = response.data[0].组件流水号
|
||||
})
|
||||
this.getTableData()
|
||||
}, // 按条件查询
|
||||
},
|
||||
// 按零件图号 组号 材料排序
|
||||
sortChange(column) {
|
||||
console.log(column + '-' + column.prop + '-' + column.order, 11111)
|
||||
if (column.prop === '组号') {
|
||||
this.ordername = 1
|
||||
} else if (column.prop === '零件图号') {
|
||||
this.ordername = 2
|
||||
} else if (column.prop === '材料') {
|
||||
this.ordername = 3
|
||||
} else {
|
||||
this.ordername = ''
|
||||
}
|
||||
console.log(this.ordername, 9990999)
|
||||
if (column.order === 'ascending') {
|
||||
this.order = 1
|
||||
} else if (column.order === 'descending') { this.order = 2 } else {
|
||||
this.order = ''
|
||||
}
|
||||
this.getTableData()
|
||||
},
|
||||
// 按条件查询
|
||||
getTableData() {
|
||||
this.tableData10 = []
|
||||
if (this.Machine === '') {
|
||||
@@ -436,7 +457,7 @@ export default {
|
||||
} else {
|
||||
this.checkbox_number = 1
|
||||
}
|
||||
getTable(this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.checkbox_number, this.number, '', '', this.pageCurrent10, this.pageSize10).then(response => {
|
||||
getTable(this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.checkbox_number, this.number, '', '', this.pageCurrent10, this.pageSize10, this.ordername, this.order).then(response => {
|
||||
if (response.data.rows.length !== 0) {
|
||||
for (let i = 0; i < response.data.rows.length; i++) {
|
||||
this.tableData10.push({
|
||||
|
||||
@@ -121,7 +121,7 @@
|
||||
:disabled="Number(scope.row.是否请款)===1"
|
||||
type="text"
|
||||
size="mini"
|
||||
icon="el-icon-delete"
|
||||
icon="el-icon-right"
|
||||
style="margin-left: 20px"
|
||||
@click="deleteTable1(scope.row)"/>
|
||||
</div>
|
||||
@@ -142,7 +142,7 @@
|
||||
</div>
|
||||
</el-card>
|
||||
<el-card style="float: left;width: 41.3%;margin-left: 5px">
|
||||
<el-table :data="gridData" class="subTableHeader" show-summary stripe border size="mini" style="width: 100%">
|
||||
<el-table :data="gridData" class="subTableHeader" show-summary border size="mini" style="width: 100%">
|
||||
<el-table-column width="50" align="center" type="index" label="序号"/>
|
||||
<el-table-column label="到货单编号" align="center">
|
||||
<template slot-scope="scope">
|
||||
@@ -177,7 +177,7 @@
|
||||
<el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogVisible1" center style="min-height: 300px" width="800px">
|
||||
<el-form ref="form1" :model="form1" :rules="rules1" label-width="110px">
|
||||
<div style="width: 45%;float: left;margin-top: 5px">
|
||||
<div style="background: gainsboro">
|
||||
<div style="background: white">
|
||||
<el-form-item label="供应商" prop="supplierNameValue">
|
||||
<el-select v-model="form1.supplierNameValue" placeholder="供应商" size="small" filterable @change="Name=form1.supplierNameValue;searchTable4()">
|
||||
<el-option
|
||||
@@ -190,10 +190,10 @@
|
||||
<el-form-item label="发票号" prop="money">
|
||||
<el-input v-model="form1.Number" size="small" placeholder="发票号"/>
|
||||
</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-form-item>
|
||||
<el-form-item label="开票金额" prop="money">
|
||||
<el-form-item label="到票金额" prop="money">
|
||||
<el-input v-model="form1.money" size="small" placeholder="开票金额"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="备注" prop="remark">
|
||||
@@ -224,8 +224,8 @@
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button size="small" @click="dialogVisible1 = false">取消</el-button>
|
||||
<el-button v-show="title1==='新增备料发票'" size="small" type="primary" @click="submitAdd1('form1')">确定</el-button>
|
||||
<el-button v-show="title1==='编辑备料发票'" size="small" type="primary" @click="submitEdit1('form1')">确定</el-button>
|
||||
<el-button v-show="title1==='新增备料到票'" size="small" type="primary" @click="submitAdd1('form1')">确定</el-button>
|
||||
<el-button v-show="title1==='编辑备料到票'" size="small" type="primary" @click="submitEdit1('form1')">确定</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
|
||||
@@ -417,7 +417,7 @@ export default {
|
||||
if (this.$refs['form1'] !== undefined) {
|
||||
this.$refs['form1'].resetFields()
|
||||
}
|
||||
this.title1 = '新增备料发票'
|
||||
this.title1 = '新增备料到票'
|
||||
this.tableData4 = []
|
||||
this.dialogVisible1 = true
|
||||
console.log(this.supplierNames)
|
||||
@@ -457,7 +457,7 @@ export default {
|
||||
if (this.$refs['form1'] !== undefined) {
|
||||
this.$refs['form1'].resetFields()
|
||||
}
|
||||
this.title1 = '编辑备料发票'
|
||||
this.title1 = '编辑备料到票'
|
||||
this.dialogVisible1 = true
|
||||
this.form1.invoiceNumValue = row.发票流水号
|
||||
this.form1.invoiceTime = row.开票时间
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<el-card style="margin-left: 0px;width: 68%;float: left">
|
||||
<el-card>
|
||||
<el-col>
|
||||
<span>请款时间段:</span>
|
||||
<el-date-picker
|
||||
@@ -29,6 +29,31 @@
|
||||
<el-button type="primary" size="small" icon="el-icon-goods" style="" @click="requestFund">请款</el-button>
|
||||
</el-tooltip>
|
||||
</el-col>
|
||||
</el-card>
|
||||
<el-card style="margin-left: 0px;width: 68%;float: left">
|
||||
<!--@expand-change="searchTable02"-->
|
||||
<!--<el-table-column type="expand" label="详情">-->
|
||||
<!--<template slot-scope="scope">-->
|
||||
<!--<el-table :data="gridData" class="subTableHeader" stripe size="mini" show-summary style="width: 40%">-->
|
||||
<!--<el-table-column width="50" align="center" type="index" label="序号"/>-->
|
||||
<!--<el-table-column min-width="150" align="center" label="发票号">-->
|
||||
<!--<template slot-scope="scope">-->
|
||||
<!--{{ scope.row.发票号 }}-->
|
||||
<!--</template>-->
|
||||
<!--</el-table-column>-->
|
||||
<!--<el-table-column min-width="150" align="center" label="供应商">-->
|
||||
<!--<template slot-scope="scope">-->
|
||||
<!--{{ scope.row.供应商名称 }}-->
|
||||
<!--</template>-->
|
||||
<!--</el-table-column>-->
|
||||
<!--<el-table-column min-width="150" align="center" label="开票金额" prop="开票金额">-->
|
||||
<!--<template slot-scope="scope">-->
|
||||
<!--{{ scope.row.开票金额 }}-->
|
||||
<!--</template>-->
|
||||
<!--</el-table-column>-->
|
||||
<!--</el-table>-->
|
||||
<!--</template>-->
|
||||
<!--</el-table-column>-->
|
||||
<el-table
|
||||
v-loading=""
|
||||
:data="tableData1"
|
||||
@@ -42,29 +67,6 @@
|
||||
show-summary
|
||||
highlight-current-row
|
||||
@row-click="searchTable02">
|
||||
<!--@expand-change="searchTable02"-->
|
||||
<!--<el-table-column type="expand" label="详情">-->
|
||||
<!--<template slot-scope="scope">-->
|
||||
<!--<el-table :data="gridData" class="subTableHeader" stripe size="mini" show-summary style="width: 40%">-->
|
||||
<!--<el-table-column width="50" align="center" type="index" label="序号"/>-->
|
||||
<!--<el-table-column min-width="150" align="center" label="发票号">-->
|
||||
<!--<template slot-scope="scope">-->
|
||||
<!--{{ scope.row.发票号 }}-->
|
||||
<!--</template>-->
|
||||
<!--</el-table-column>-->
|
||||
<!--<el-table-column min-width="150" align="center" label="供应商">-->
|
||||
<!--<template slot-scope="scope">-->
|
||||
<!--{{ scope.row.供应商名称 }}-->
|
||||
<!--</template>-->
|
||||
<!--</el-table-column>-->
|
||||
<!--<el-table-column min-width="150" align="center" label="开票金额" prop="开票金额">-->
|
||||
<!--<template slot-scope="scope">-->
|
||||
<!--{{ scope.row.开票金额 }}-->
|
||||
<!--</template>-->
|
||||
<!--</el-table-column>-->
|
||||
<!--</el-table>-->
|
||||
<!--</template>-->
|
||||
<!--</el-table-column>-->
|
||||
<el-table-column label="供应商" prop="供应商名称" align="center" min-width="180" width="350" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.供应商名称 }}
|
||||
@@ -78,51 +80,47 @@
|
||||
<el-table-column label="请款人" align="center" min-width="80" width="100">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.姓名 }}
|
||||
<el-table-column label="请款时间" align="center" min-width="150" prop="date">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.请款时间 | formatTime }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="请款金额" align="center" min-width="90" width="90" prop="请款金额">
|
||||
<template slot-scope="scope">
|
||||
{{ parseFloat(scope.row.请款金额).toFixed(2) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="审批情况内容" width="100" align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-tag v-if="Number(scope.row.审批情况流水号)===3" type="primary" size="mini">未审批</el-tag>
|
||||
<el-tag v-if="Number(scope.row.审批情况流水号)===1" type="success" size="mini">已通过</el-tag>
|
||||
<el-tag v-if="Number(scope.row.审批情况流水号)===2" type="danger" size="mini">不通过</el-tag>
|
||||
{{ parseFloat(scope.row.请款金额).toFixed(2) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="未通过审批原因" width="110" align="center">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.未通过审批原因 === '通过' ? '—' : scope.row.未通过审批原因 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="付款情况" width="100" align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-tag v-if="Number(scope.row.付款情况流水号)===3" type="primary" size="mini">未操作</el-tag>
|
||||
<el-tag v-if="Number(scope.row.付款情况流水号)===1" type="success" size="mini">已同意</el-tag>
|
||||
<el-tag v-if="Number(scope.row.付款情况流水号)===2" type="danger" size="mini">不同意</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="未付款原因" width="100" align="center">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.未付款原因 === '通过' ? '—' : scope.row.未付款原因 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" align="center" width="80">
|
||||
<template slot-scope="scope">
|
||||
<el-tooltip effect="dark" content="取消请款" placement="top">
|
||||
<div style="display: inline-block">
|
||||
<el-button :disabled="Number(scope.row.审批情况流水号)!==3" type="text" size="mini" icon="el-icon-delete" style="margin-left: 10px" @click="cancelRequestFund(scope.row)"/>
|
||||
</div>
|
||||
</el-tooltip>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</template></el-table-column></el-table>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="请款金额" align="center" min-width="90" width="90" prop="请款金额">
|
||||
<template slot-scope="scope">
|
||||
{{ parseFloat(scope.row.请款金额).toFixed(2) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="审批情况内容" width="100" align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-tag v-if="Number(scope.row.审批情况流水号)===3" type="primary" size="mini">未审批</el-tag>
|
||||
<el-tag v-if="Number(scope.row.审批情况流水号)===1" type="success" size="mini">已通过</el-tag>
|
||||
<el-tag v-if="Number(scope.row.审批情况流水号)===2" type="danger" size="mini">不通过</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="未通过审批原因" width="110" align="center">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.未通过审批原因 === '通过' ? '—' : scope.row.未通过审批原因 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="付款情况" width="100" align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-tag v-if="Number(scope.row.付款情况流水号)===3" type="primary" size="mini">未操作</el-tag>
|
||||
<el-tag v-if="Number(scope.row.付款情况流水号)===1" type="success" size="mini">已同意</el-tag>
|
||||
<el-tag v-if="Number(scope.row.付款情况流水号)===2" type="danger" size="mini">不同意</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="未付款原因" width="100" align="center">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.未付款原因 === '通过' ? '—' : scope.row.未付款原因 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" align="center" width="80">
|
||||
<template slot-scope="scope">
|
||||
<el-tooltip effect="dark" content="取消请款" placement="top">
|
||||
<div style="display: inline-block">
|
||||
<el-button :disabled="Number(scope.row.审批情况流水号)!==3" type="text" size="mini" icon="el-icon-delete" style="margin-left: 10px" @click="cancelRequestFund(scope.row)"/>
|
||||
</div>
|
||||
</el-tooltip>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<div class="block" style="margin-top: 10px;">
|
||||
<el-pagination
|
||||
:current-page="pageCurrent1"
|
||||
@@ -135,7 +133,7 @@
|
||||
@current-change="handleCurrentChange1"/>
|
||||
</div>
|
||||
</el-card>
|
||||
<el-card style="margin-left: 0px;width: 31%;float: left">
|
||||
<el-card style="margin-left: 0px;width: 32%;float: left">
|
||||
<el-table-column type="expand" label="详情">
|
||||
<el-table :data="gridData" class="subTableHeader" stripe size="mini" show-summary style="width: 100%">
|
||||
<el-table-column width="50" align="center" type="index" label="序号"/>
|
||||
@@ -194,7 +192,6 @@
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>import { searchRequestFund, searchOfflineContract, searchOfflineContract1, submitRequestFund, searchRequsetFundDetail, cancelRequestFund } from '@/api/WorkshopProcurement/RequestOutsourcingMaterials'
|
||||
import { mapGetters } from 'vuex'
|
||||
|
||||
|
||||
Reference in New Issue
Block a user