Merge branch 'master' of http://123.56.95.229:10010/r/高精
This commit is contained in:
Vergil
@@ -1,14 +1,14 @@
|
||||
import request from '@/utils/request'
|
||||
|
||||
// 查询零件
|
||||
export function searchtable(num1, num2, num3, num4, pageCurrent, pageSize) {
|
||||
export function searchtable(num1, num2, num3, num4, pageCurrent, pageSize, ordername, order) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '1',
|
||||
name: '车间生产管理工艺_零件工艺计划_编制工艺_备料零件查询',
|
||||
param: '零件图号_check=' + num1 + '&零件图号=' + num2 + '&备料打印_check=' + num3 + '&备料打印=' + num4 + '&备料到货=0',
|
||||
param: '零件图号_check=' + num1 + '&零件图号=' + num2 + '&备料打印_check=' + num3 + '&备料打印=' + num4 + '&备料到货=0' + '&排序名称=' + ordername + '&排序方式=' + order,
|
||||
Pagination: pageCurrent + '&' + pageSize
|
||||
}
|
||||
})
|
||||
|
||||
@@ -17,8 +17,7 @@ export function searchTable1(pageCurrent, pageSize, num1, num3, num5, num6, num7
|
||||
data: {
|
||||
type: '1',
|
||||
name: '合同信息管理_合同信息_制造部_查询_新',
|
||||
param: '合同ID=' + num1 + '=int&项目流水号_check=' + num3 + '=int&开始日期_check=' + num5 + '=int&结束日期_check=' + num6 + '=int&开始日期=' + num7 + '=date&结束日期=' + num8 + '=date&机床型号_check=' + num9 + '=int&机床型号=' + num10 + '=string&合同编号_check=' + num11 + '=int&合同编号=' + num12 + '=string',
|
||||
Pagination: pageCurrent + '&' + pageSize
|
||||
param: '合同ID=' + num1 + '=int&项目流水号_check=' + num3 + '=int&开始日期_check=' + num5 + '=int&结束日期_check=' + num6 + '=int&开始日期=' + num7 + '=date&结束日期=' + num8 + '=date&机床型号_check=' + num9 + '=int&机床型号=' + num10 + '=string&合同编号_check=' + num11 + '=int&合同编号=' + num12 + '=string'
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
@@ -64,15 +64,15 @@ export function searchPurchasedMaterials(check1, name) {
|
||||
})
|
||||
}
|
||||
// 查询采购单
|
||||
export function searchPurchaseOrder(pageCurrent, pageSize, check1, num, check2, name, check3, name2) {
|
||||
export function searchPurchaseOrder(check1, num, check2, name, check3, name2, checktime, starttime, endtime) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '1',
|
||||
name: '备料管理_采购计划_查询数据',
|
||||
param: `采购单号_check=${check1}&采购单号=${num}&供应商名称_check=${check2}&供应商名称=${name}&供应商流水号_check=${check3}&供应商流水号=${name2}`,
|
||||
Pagination: pageCurrent + '&' + pageSize
|
||||
param: `采购单号_check=${check1}&采购单号=${num}&供应商名称_check=${check2}&供应商名称=${name}&供应商流水号_check=${check3}&供应商流水号=${name2}&时间_check=${checktime}&开始时间=${starttime}&结束时间=${endtime}`
|
||||
// Pagination: pageCurrent + '&' + pageSize
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
@@ -7,6 +7,7 @@ export const name3 = `OP2000`
|
||||
export const name4 = `OP9999`
|
||||
|
||||
// 创建axios实例
|
||||
|
||||
export const readFile = `http://123.56.95.229:8010/webpage/file/` // invoice
|
||||
export const readImg = `http://123.56.95.229:8010/webpage/img/` // delivery/MS/performancebond
|
||||
export const upload = `http://123.56.95.229:8010/submit/uploadFile.ashx` // ContractInformationManagement
|
||||
@@ -19,6 +20,7 @@ export const uploadPerson = `http://123.56.95.229:8010/submit/uploadPerson.ashx`
|
||||
export const uploadOP = `http://123.56.95.229:8010/submit/uploadOP.ashx`
|
||||
export const url = `http://123.56.95.229:8010/submit/MESCommonBase.ashx` // 采购件入库、离线件入库
|
||||
export const ExcelDownLoad = 'http://123.56.95.229:8010/submit/downloadFile.ashx' // 导出excel
|
||||
export const ExcelWaiGou = 'http://123.56.95.229:8010/submit/excel.ashx' // 导出excel
|
||||
// 技术中心程序发布时要更改下面所有的IP到0段
|
||||
export const ServerIP = `http://123.56.95.229:8010/webpage/file/`
|
||||
export const uploadFileMachine = `http://123.56.95.229:8010/submit/uploadFileMachine.ashx` // 机床总图 发布时改成0.231
|
||||
|
||||
@@ -19,13 +19,27 @@
|
||||
<el-button type="primary" size="small" icon="el-icon-printer" style="margin-left:10px" @click="exportTable('BL')">打印自家备料单</el-button>
|
||||
</el-tooltip>
|
||||
<el-tooltip :open-delay="1000" effect="dark" content="导出备料分配单" placement="top">
|
||||
<el-button type="warning" class="el-icon-download" size="small" style="margin: 10px 0 0 140px" @click="exportExcel">导出</el-button>
|
||||
<el-button type="warning" class="el-icon-download" size="small" style="margin: 10px 0 0 10px" @click="exportExcel">导出</el-button>
|
||||
</el-tooltip>
|
||||
</el-row>
|
||||
</el-card>
|
||||
|
||||
<el-card>
|
||||
<el-table v-loading="loading" :data="tableData" height="760" style="width: 1126px; margin: 3px 0" size="mini" border stripe highlight-current-row element-loading-text="拼命加载中" @selection-change="handleSelectionChange">
|
||||
<el-table
|
||||
v-loading="loading"
|
||||
:data="tableData"
|
||||
height="760"
|
||||
style="width: 1126px; margin: 3px 0"
|
||||
size="mini"
|
||||
border
|
||||
stripe
|
||||
sortable
|
||||
highlight-current-row
|
||||
element-loading-text="拼命加载中"
|
||||
@sort-change="sortChange"
|
||||
@selection-change="handleSelectionChange">
|
||||
<!--<el-table v-loading="loading" :data="tableData" height="760" style="width: 1126px; margin: 3px 0" size="mini" border stripe highlight-current-row element-loading-text="拼命加载中" @selection-change="handleSelectionChange">-->
|
||||
<el-table-column
|
||||
type="selection"
|
||||
width="50"
|
||||
@@ -37,12 +51,13 @@
|
||||
<el-tag v-if="scope.row.备料打印 ==='0' && scope.row.是否外购备料==='0'" type="warning" size="mini">未分配</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="零件名称" prop="零件名称" align="center" width="250" show-overflow-tooltip>
|
||||
<el-table-column label="零件名称" prop="零件名称" align="center" width="250" sortable="custom" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.零件名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="零件图号" prop="零件图号" align="center" width="180" show-overflow-tooltip>
|
||||
<el-table-column label="零件图号" prop="零件图号" align="center" width="180" sortable="custom" show-overflow-tooltip>
|
||||
<!--<el-table-column label="零件图号" prop="零件图号" align="center" width="180" show-overflow-tooltip>-->
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.零件图号 }}
|
||||
</template>
|
||||
@@ -133,13 +148,30 @@ export default {
|
||||
tableData: [], // 表格数据
|
||||
total: null, // 总条数
|
||||
pageSize: 30, // 每页显示条数
|
||||
pageCurrent: 1 // 后台获取页
|
||||
pageCurrent: 1, // 后台获取页
|
||||
ordername: '',
|
||||
order: ''
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.searchTable()
|
||||
},
|
||||
methods: {
|
||||
sortChange(column, prop, order) {
|
||||
console.log(column + '-' + column.prop + '-' + column.order, 11111)
|
||||
if (column.prop === '零件名称') {
|
||||
this.ordername = 1
|
||||
} else if (column.prop === '零件图号') { this.ordername = 2 } 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.searchTable()
|
||||
},
|
||||
exportTable() {
|
||||
if (this.tableData2.length === 0) {
|
||||
this.$message.warning('暂无数据')
|
||||
@@ -164,8 +196,7 @@ export default {
|
||||
} else {
|
||||
this.partNamecheck = false
|
||||
}
|
||||
searchtable(this.partNamecheck, this.partName, !this.all, 0, this.pageCurrent, this.pageSize).then(response => {
|
||||
console.log(response)
|
||||
searchtable(this.partNamecheck, this.partName, !this.all, 0, this.pageCurrent, this.pageSize, this.ordername, this.order).then(response => {
|
||||
if (response.data.total === 0) {
|
||||
this.loading = false
|
||||
} else {
|
||||
|
||||
@@ -69,7 +69,7 @@
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="加工日期" width="100px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.操作时间 }}
|
||||
{{ scope.row.操作时间.substr(0,10) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="计划准结工时" width="100px">
|
||||
|
||||
@@ -9,7 +9,16 @@
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
<el-input v-model="contractNumber" clearable size="small" style="width:200px;margin: 3px 10px" placeholder="请输入合同编号"/>
|
||||
<el-date-picker
|
||||
v-model="date"
|
||||
size="small"
|
||||
clearable
|
||||
type="daterange"
|
||||
range-separator="至"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"/>
|
||||
<!-- <el-input v-model="contractNumber" clearable size="small" style="width:200px;margin: 3px 10px" placeholder="请输入合同编号"/>-->
|
||||
|
||||
<!-- <span style="margin-left: 10px">机床型号：</span>-->
|
||||
<!-- <el-input v-model="machine" clearable size="small" style="width:200px" placeholder="请输入机床型号"/>-->
|
||||
<!-- </div>-->
|
||||
@@ -34,6 +43,7 @@
|
||||
<el-tooltip :open-delay="1200" effect="dark" content="新增项目" placement="top">
|
||||
<el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()">新增</el-button>
|
||||
</el-tooltip>
|
||||
<!-- <el-button type="info" size="small" style="margin-left: 10px">导出Excel</el-button>-->
|
||||
</div>
|
||||
</el-card>
|
||||
<el-row>
|
||||
@@ -45,7 +55,7 @@
|
||||
:row-key="getRowKeys"
|
||||
:expand-row-keys="expands"
|
||||
style="width: 100%"
|
||||
height="500"
|
||||
height="700"
|
||||
border
|
||||
stripe
|
||||
size="mini"
|
||||
@@ -95,16 +105,16 @@
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<div class="block" style="margin-top: 10px;">
|
||||
<el-pagination
|
||||
:current-page="PageCurrent"
|
||||
:page-sizes="[10, 20, 30, 40]"
|
||||
:page-size="PageSize"
|
||||
:total="total"
|
||||
layout="total, sizes, prev, pager, next, jumper"
|
||||
@size-change="handleSizeChange"
|
||||
@current-change="handleCurrentChange"/>
|
||||
</div>
|
||||
<!-- <div class="block" style="margin-top: 10px;">-->
|
||||
<!-- <el-pagination-->
|
||||
<!-- :current-page="PageCurrent"-->
|
||||
<!-- :page-sizes="[10, 20, 30, 40]"-->
|
||||
<!-- :page-size="PageSize"-->
|
||||
<!-- :total="total"-->
|
||||
<!-- layout="total, sizes, prev, pager, next, jumper"-->
|
||||
<!-- @size-change="handleSizeChange"-->
|
||||
<!-- @current-change="handleCurrentChange"/>-->
|
||||
<!-- </div>-->
|
||||
</el-card>
|
||||
</el-col>
|
||||
<el-col style="width: 43%">
|
||||
@@ -131,12 +141,12 @@
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-edit"
|
||||
@click="editMachine(scope.row);flag = 2">编辑</el-button>
|
||||
@click="editMachine(scope.row);flag = 2"/>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-delete"
|
||||
@click="deleteMachine(scope.row)">删除</el-button>
|
||||
@click="deleteMachine(scope.row)"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
@@ -221,6 +231,7 @@ export default {
|
||||
machine: '',
|
||||
startTime: '',
|
||||
endTime: '',
|
||||
date: null,
|
||||
PageCurrent: 1,
|
||||
PageSize: 10,
|
||||
total: null,
|
||||
@@ -266,7 +277,7 @@ export default {
|
||||
},
|
||||
created() {
|
||||
this.init()
|
||||
this.fetchTableData1()
|
||||
// this.fetchTableData1()
|
||||
},
|
||||
methods: {
|
||||
init() {
|
||||
@@ -282,13 +293,37 @@ export default {
|
||||
this.fetchTableData1()
|
||||
},
|
||||
fetchTableData1() {
|
||||
if (this.date !== null) {
|
||||
this.startTime = this.datetoYYMMDD(this.date[0])
|
||||
this.endTime = this.datetoYYMMDD(this.date[1])
|
||||
} else {
|
||||
this.startTime = ''
|
||||
this.endTime = ''
|
||||
}
|
||||
if (this.contractNumber === '' || this.contractNumber === null) { this.contractNumber_check = 0 } else { this.contractNumber_check = 1 }
|
||||
if (this.entryNameValue === '' || this.entryNameValue === null) { this.entryNameValue_check = 0 } else { this.entryNameValue_check = 1 }
|
||||
if (this.startTime === '' || this.startTime === null) { this.startTime_check = 0 } else { this.startTime_check = 1 }
|
||||
if (this.endTime === '' || this.endTime === null) { this.endTime_check = 0 } else { this.endTime_check = 1 }
|
||||
if (this.machine === '' || this.machine === null) { this.machine_check = 0 } else { this.machine_check = 1 }
|
||||
this.listLoading = true
|
||||
this.getTable(searchTable1, [this.PageCurrent, this.PageSize, this.entryNameValue, this.entryNameValue_check, this.startTime_check, this.endTime_check, this.startTime, this.endTime, this.machine_check, this.machine, this.contractNumber_check, this.contractNumber], ['tableData1', 'total', 'listLoading'])
|
||||
searchTable1(this.PageCurrent, this.PageSize, this.entryNameValue, this.entryNameValue_check, this.startTime_check, this.endTime_check, this.startTime, this.endTime, this.machine_check, this.machine, this.contractNumber_check, this.contractNumber).then(response => {
|
||||
this.tableData1 = response.data
|
||||
this.listLoading = false
|
||||
})
|
||||
// this.getTable(searchTable1, [this.PageCurrent, this.PageSize, this.entryNameValue, this.entryNameValue_check, this.startTime_check, this.endTime_check, this.startTime, this.endTime, this.machine_check, this.machine, this.contractNumber_check, this.contractNumber], ['tableData1', 'total', 'listLoading'])
|
||||
},
|
||||
// 标准时间转年月日
|
||||
datetoYYMMDD(date) {
|
||||
var y = date.getFullYear()
|
||||
var m = date.getMonth() + 1
|
||||
m = m < 10 ? ('0' + m) : m
|
||||
var d = date.getDate()
|
||||
d = d < 10 ? ('0' + d) : d
|
||||
// var h = date.getHours()
|
||||
// var minute = date.getMinutes()
|
||||
// minute = minute < 10 ? ('0' + minute) : minute
|
||||
// return y + '-' + m + '-' + d + ' ' + h + ':' + minute
|
||||
return y + '-' + m + '-' + d
|
||||
},
|
||||
selectMachine(row) {
|
||||
this.projectNum = row.项目流水号
|
||||
@@ -421,7 +456,21 @@ export default {
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
|
||||
.el-button--success {
|
||||
background: #ffffff;
|
||||
border-color: #2d72d5;
|
||||
color: #2d72d5;
|
||||
}
|
||||
.el-button--primary {
|
||||
background: #ffffff;
|
||||
border-color: #ff9759;
|
||||
color: #ff9759;
|
||||
}
|
||||
.el-button--info {
|
||||
background: #ffffff;
|
||||
border-color: #67c23a;
|
||||
color: #67c23a;
|
||||
}
|
||||
</style>
|
||||
<style lang="scss">
|
||||
.subTableHeader {
|
||||
@@ -431,11 +480,12 @@ export default {
|
||||
}
|
||||
|
||||
tr.el-table__row td {
|
||||
background-color: #d8e5f6 !important;
|
||||
background-color: #ffffff !important;
|
||||
}
|
||||
|
||||
tr.el-table__row.el-table__row--striped td {
|
||||
background: #e9f0f9 !important;
|
||||
}
|
||||
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -57,7 +57,7 @@
|
||||
|
||||
<el-card style="margin-left: 10px;width: 62.3%;float: left">
|
||||
<div> <!--slot="header"-->
|
||||
<el-input v-model="purchasingOrder" placeholder="采购计划单号" size="small" style="margin: 3px 0;width: 155px" clearable @keyup.enter.native="pageCurrent2=1;pageSize2=10;total2=0;searchTable2()"/>
|
||||
<!--<el-input v-model="purchasingOrder" placeholder="采购计划单号" size="small" style="margin: 3px 0;width: 155px" clearable @keyup.enter.native="pageCurrent2=1;pageSize2=10;total2=0;searchTable2()"/>-->
|
||||
<el-select v-model="supplierName0" placeholder="供应商" size="small" filterable clearable @change="pageCurrent2=1;pageSize2=10;total2=0;searchTable2()">
|
||||
<el-option
|
||||
v-for="item in supplierName0s"
|
||||
@@ -65,20 +65,34 @@
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
<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-input v-model="supplierName0" placeholder="供应商" size="small" clearable/>-->
|
||||
<!--<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="pageCurrent2=1;pageSize2=10;total2=0;searchTable2()">查询</el-button>-->
|
||||
<!--</el-tooltip>-->
|
||||
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="searchTable2">查询</el-button>
|
||||
<el-button type="primary" size="small" icon="el-icon-plus" style="margin-left: 10px" @click="addPurchaseOrder">新增</el-button>
|
||||
<el-tooltip :open-delay="1200" effect="dark" content="向选择的采购计划里添加采购零件" placement="top">
|
||||
<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: 10px" @click="saveMateriel">保存</el-button>
|
||||
<el-button type="baocun" size="small" icon="el-icon-download" style="margin-left: 50px" @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">
|
||||
<el-table-column label="采购状态" prop="采购计划状态" align="center" width="75" fixed="left">
|
||||
<el-table-column label="备料状态" prop="采购计划状态" align="center" width="75" fixed="left">
|
||||
<template slot-scope="scope">
|
||||
<el-tag v-if="Number(scope.row.采购计划状态)===0" type="warning" size="mini">编辑中</el-tag>
|
||||
<el-tag v-if="Number(scope.row.采购计划状态)===1" type="primary" size="mini">已保存</el-tag>
|
||||
@@ -86,16 +100,17 @@
|
||||
<el-tag v-if="Number(scope.row.采购计划状态)===4" type="info" size="mini">已结算</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="采购计划单号" prop="采购单号" align="center" width="140">
|
||||
<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" width="130">
|
||||
<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>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.供应商名称 }}
|
||||
@@ -111,8 +126,13 @@
|
||||
{{ scope.row.计划完成日期.split(' ')[0] }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" align="center" width="250" fixed="right">
|
||||
<el-table-column label="操作" align="center" width="330" fixed="right">
|
||||
<template slot-scope="scope">
|
||||
<el-tooltip :open-delay="1200" effect="dark" content="导出" placement="top">
|
||||
<div style="display: inline-block">
|
||||
<el-button size="mini" type="success" plain icon="el-icon-download" @click="exportExcel2(scope.row)">导出</el-button>
|
||||
</div>
|
||||
</el-tooltip>
|
||||
<el-tooltip :open-delay="1200" effect="dark" content="打印" placement="top">
|
||||
<div style="display: inline-block">
|
||||
<el-button size="mini" type="success" plain icon="el-icon-printer" @click="exportExcel(scope.row)">打印</el-button>
|
||||
@@ -131,6 +151,17 @@
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<!--<div class="block">-->
|
||||
<!--<el-pagination-->
|
||||
<!--:current-page="pageCurrent2"-->
|
||||
<!--:page-sizes="[10, 20, 30, 40]"-->
|
||||
<!--:page-size="pageSize2"-->
|
||||
<!--:total="total2"-->
|
||||
<!--style="display:inline-block;width:40%;float: right;margin-right: 60px"-->
|
||||
<!--layout="total, sizes, prev, pager, next, jumper"-->
|
||||
<!--@size-change="handleSizeChange2"-->
|
||||
<!--@current-change="handleCurrentChange2"/>-->
|
||||
<!--</div>-->
|
||||
<div class="block">
|
||||
<el-pagination
|
||||
:current-page="pageCurrent2"
|
||||
@@ -143,7 +174,7 @@
|
||||
@current-change="handleCurrentChange2"/>
|
||||
</div>
|
||||
<el-table v-loading="" :data="tableData3" border highlight-current-row stripe style="margin: 3px 0" height="455px" size="mini">
|
||||
<el-table-column label="采购状态" align="center" width="80">
|
||||
<el-table-column label="备料状态" align="center" width="80">
|
||||
<template slot-scope="scope">
|
||||
<el-tag v-if="Number(scope.row.是否到货)===0" type="warning" size="mini">未到货</el-tag>
|
||||
<el-tag v-if="Number(scope.row.是否到货)===1" type="success" size="mini">已到货</el-tag>
|
||||
@@ -312,6 +343,35 @@ export default {
|
||||
name: '', // 采购计划
|
||||
data() {
|
||||
return {
|
||||
dateRange: '',
|
||||
checktime: '',
|
||||
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])
|
||||
}
|
||||
}]
|
||||
},
|
||||
RawMaterialGroup: [],
|
||||
RawMaterialName: '',
|
||||
tableData: [],
|
||||
@@ -392,6 +452,7 @@ export default {
|
||||
Remarks: [], // 备注组
|
||||
tableData4: [], // 合同模板
|
||||
采购计划状态: '',
|
||||
采购计划状态2: '',
|
||||
paramRow: '' // 参数row
|
||||
}
|
||||
},
|
||||
@@ -406,7 +467,7 @@ export default {
|
||||
created() {
|
||||
this.searchRawMaterial()
|
||||
this.searchTable1()
|
||||
this.searchTable2()
|
||||
// this.searchTable2()
|
||||
},
|
||||
methods: {
|
||||
// 获取原材料
|
||||
@@ -525,9 +586,10 @@ export default {
|
||||
searchTable2() { // 查询采购单列表
|
||||
this.purchasingOrder ? this.check3 = 1 : this.check3 = 0
|
||||
this.supplierName0 ? this.check4 = 1 : this.check4 = 0
|
||||
searchPurchaseOrder(this.pageCurrent2, this.pageSize2, this.check3, this.purchasingOrder, 0, 0, this.check4, this.supplierName0).then(response => {
|
||||
this.tableData2 = response.data.rows
|
||||
this.total2 = response.data.total
|
||||
this.dateRange ? this.checktime = 1 : (this.checktime = 0, this.dateRange = '')
|
||||
searchPurchaseOrder(this.check3, this.purchasingOrder, 0, 0, this.check4, this.supplierName0, this.checktime, this.dateRange[0], this.dateRange[1]).then(response => {
|
||||
this.tableData2 = response.data
|
||||
// this.total2 = response.data.total
|
||||
})
|
||||
},
|
||||
handleSizeChange2(val) { // 采购单列表分页
|
||||
@@ -614,6 +676,34 @@ export default {
|
||||
})
|
||||
})
|
||||
},
|
||||
formatJson(filterVal, jsonData) {
|
||||
return jsonData.map(v => filterVal.map(j => {
|
||||
return v[j]
|
||||
}))
|
||||
},
|
||||
exportExcel2(row) {
|
||||
this.searchTable3(row).then(val => {
|
||||
console.log(val)
|
||||
console.log(this.tableData4)
|
||||
if (this.tableData4.length !== 0) {
|
||||
import('@/vendor/Export2Excel').then(excel => {
|
||||
const tHeader = ['备料状态', '物料编码', '零件名称', '材料', '数量', '成品尺寸', '单位', '备注']
|
||||
const filterVal = ['备料状态', '物料零件编码', '零件名称', '材料', '采购数量', '成品尺寸', '备注1']
|
||||
const list = this.tableData4
|
||||
const data = this.formatJson(filterVal, list)
|
||||
excel.export_json_to_excel({
|
||||
header: tHeader,
|
||||
data,
|
||||
filename: '详情',
|
||||
autoWidth: true,
|
||||
bookType: 'xlsx'
|
||||
})
|
||||
})
|
||||
} else {
|
||||
this.$message.warning('没有导出内容')
|
||||
}
|
||||
})
|
||||
},
|
||||
searchTable3(row) { // 查询采购计划明细
|
||||
this.purchasingOrderNumber = row.采购计划流水号
|
||||
this.采购单名称 = row.采购单名称
|
||||
@@ -627,8 +717,8 @@ export default {
|
||||
})
|
||||
searchMateriel1(this.purchasingOrderNumber).then(response => {
|
||||
this.tableData3 = response.data
|
||||
console.log(response.data)
|
||||
})
|
||||
return Promise.resolve(/* 这里是需要返回的数据*/)
|
||||
},
|
||||
addMateriel() { // 将材料选入请购单
|
||||
if (!this.purchasingOrderNumber) {
|
||||
|
||||
@@ -83,6 +83,7 @@
|
||||
</el-card>
|
||||
<el-card style="width: 54%;float: left;margin-left: 10px">
|
||||
<span>到货单明细</span>
|
||||
<el-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px" @click="downloadExcel()">导出</el-button>
|
||||
<!--<el-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px" @click="downloadExcel()">导出</el-button>-->
|
||||
<el-table
|
||||
v-loading=""
|
||||
@@ -500,7 +501,7 @@
|
||||
import { searchPurchaseOrder, searchMateriel, addMateriel, searchArriveOrder, addPurchaseOrder, editPurchaseOrder, deletePurchaseOrder, searchTable5,
|
||||
searchSupplier, deleteArrivalMX, EditArrivalOrderMX, AddArrivalOrderMX, deleteMateriel, searchTable6, searchLxPurchaseOrder, searchLxMateriel } from '@/api/WorkshopProcurement/NewArrivalList.js'
|
||||
import { mapGetters } from 'vuex'
|
||||
// import { ExcelWaiGou } from '@/utils/request'
|
||||
import { ExcelWaiGou } from '@/utils/request'
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
@@ -1124,10 +1125,10 @@ export default {
|
||||
})
|
||||
})
|
||||
},
|
||||
// downloadExcel() {
|
||||
// const _ExcelWaiGou = ExcelWaiGou
|
||||
// this.download(`${_ExcelWaiGou}?type=Excel_NewArrivalList&folename=外购单&rec1=${this.excle_row.到货单流水号}&rec2=${this.excle_row.到货单流水号}&rec3=${this.excle_row.到货单流水号}&rec4=${this.excle_row.到货单流水号}`)
|
||||
// },
|
||||
downloadExcel() {
|
||||
const _ExcelWaiGou = ExcelWaiGou
|
||||
this.download(`${_ExcelWaiGou}?type=Excel_NewArrivalList&folename=外购单&rec1=${this.excle_row.到货单流水号}&rec2=${this.excle_row.到货单流水号}&rec3=${this.excle_row.到货单流水号}&rec4=${this.excle_row.到货单流水号}`)
|
||||
},
|
||||
/**
|
||||
* 下载
|
||||
* @param {String} url 目标文件地址
|
||||
|
||||
@@ -13,7 +13,19 @@
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
<span v-show="false" class="demonstration">时间段:</span>
|
||||
<span v-show="true" class="demonstration">时间段:</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-date-picker
|
||||
v-show="false"
|
||||
v-model="startTime"
|
||||
@@ -252,6 +264,34 @@ export default {
|
||||
name: '', // 发票交接单
|
||||
data() {
|
||||
return {
|
||||
dateRange: '',
|
||||
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])
|
||||
}
|
||||
}]
|
||||
},
|
||||
gongyingshangValue: '',
|
||||
gongyingshang: [],
|
||||
startTime: '',
|
||||
@@ -269,7 +309,7 @@ export default {
|
||||
tableData1: [],
|
||||
tableData01: [],
|
||||
tableData4: [],
|
||||
dateRange: '',
|
||||
// dateRange: '',
|
||||
gridData: [],
|
||||
check1: 0,
|
||||
check2: 0,
|
||||
@@ -332,8 +372,9 @@ export default {
|
||||
this.invoiceNum ? this.check1 = 1 : this.check1 = 0
|
||||
this.supplierName0 ? this.check2 = 1 : this.check2 = 0
|
||||
this.gongyingshangValue ? this.check3 = 1 : this.check3 = 0
|
||||
this.startTime && this.endTime ? this.check4 = 1 : this.check4 = 0
|
||||
searchInvoice(this.pageCurrent1, this.pageSize1, this.check1, this.invoiceNum, this.check2, this.supplierName0, this.check3, this.gongyingshangValue, this.check4, this.startTime, this.endTime).then(response => {
|
||||
this.dateRange ? this.check4 = 1 : (this.check4 = 0, this.dateRange = '')
|
||||
// this.startTime && this.endTime ? this.check4 = 1 : this.check4 = 0
|
||||
searchInvoice(this.pageCurrent1, this.pageSize1, this.check1, this.invoiceNum, this.check2, this.supplierName0, this.check3, this.gongyingshangValue, this.check4, this.dateRange[0], this.dateRange[1]).then(response => {
|
||||
for (let j = 0; j < response.data.rows.length; j++) {
|
||||
response.data.rows[j].开票金额 = parseInt(response.data.rows[j].开票金额 * 100) / 100
|
||||
if (response.data.rows[j].开票时间 !== null) {
|
||||
|
||||
@@ -1,35 +1,59 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<el-card>
|
||||
<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="结束日期"/>
|
||||
<span style="margin-left: 10px">供应商:</span>
|
||||
<el-input v-model="supplierName0" placeholder="供应商" size="small" clearable/>
|
||||
<el-tooltip :open-delay="1000" effect="dark" content="查询外购备料清款信息" placement="top">
|
||||
<el-button
|
||||
type="success"
|
||||
<el-col>
|
||||
<span>请款时间段:</span>
|
||||
<el-date-picker
|
||||
v-model="dateRange"
|
||||
:picker-options="pickerOptions"
|
||||
size="small"
|
||||
icon="el-icon-search"
|
||||
style="margin-left: 10px"
|
||||
@click="pageCurrent1=1;pageSize1=10;total1=0;searchTable1()">查询</el-button>
|
||||
</el-tooltip>
|
||||
<el-tooltip :open-delay="1000" effect="dark" content="对选择的请款任务创建请款申请" placement="top">
|
||||
<el-button type="primary" size="small" icon="el-icon-goods" style="" @click="requestFund">请款</el-button>
|
||||
</el-tooltip>
|
||||
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="结束日期"/>
|
||||
<span style="margin-left: 10px">供应商:</span>
|
||||
<el-input v-model="supplierName0" placeholder="供应商" size="small" clearable/>
|
||||
<el-tooltip :open-delay="1000" effect="dark" content="查询外购备料清款信息" placement="top">
|
||||
<el-button
|
||||
type="success"
|
||||
size="small"
|
||||
icon="el-icon-search"
|
||||
style="margin-left: 10px"
|
||||
@click="pageCurrent1=1;pageSize1=10;total1=0;searchTable1()">查询</el-button>
|
||||
</el-tooltip>
|
||||
<el-tooltip :open-delay="1000" effect="dark" content="对选择的请款任务创建请款申请" placement="top">
|
||||
<el-button type="primary" size="small" icon="el-icon-goods" style="" @click="requestFund">请款</el-button>
|
||||
</el-tooltip>
|
||||
</el-col>
|
||||
</el-card>
|
||||
|
||||
<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"
|
||||
@@ -37,81 +61,57 @@
|
||||
:expand-row-keys="expands"
|
||||
border
|
||||
stripe
|
||||
highlight-current-row
|
||||
style="margin-top: 3px;"
|
||||
height="600px"
|
||||
size="mini"
|
||||
show-summary
|
||||
@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="250" show-overflow-tooltip>
|
||||
highlight-current-row
|
||||
@row-click="searchTable02">
|
||||
<el-table-column label="供应商" prop="供应商名称" align="center" min-width="180" width="350" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.供应商名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="请款时间" align="center" min-width="150" prop="date">
|
||||
<el-table-column label="请款时间" align="center" min-width="90" width="90" prop="date">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.请款时间 | formatTime }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="请款人" align="center" min-width="80">
|
||||
<el-table-column label="请款人" align="center" min-width="80" width="100">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.姓名 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="请款金额" align="center" min-width="90" prop="请款金额">
|
||||
<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="请款付款情况" align="center">
|
||||
<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="审批情况内容" 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="操作" align="center" width="150">
|
||||
<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">
|
||||
@@ -133,7 +133,28 @@
|
||||
@current-change="handleCurrentChange1"/>
|
||||
</div>
|
||||
</el-card>
|
||||
|
||||
<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="序号"/>
|
||||
<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>
|
||||
</el-table-column>
|
||||
</el-card>
|
||||
<el-dialog v-el-drag-dialog :visible.sync="dialogVisible2" title="外购备料请款" center style="min-height: 300px" width="800px">
|
||||
<span>供应商：</span>
|
||||
<el-select v-model="supplierValue" placeholder="供应商" filterable size="small" clearable @change="pageCurrent1=1;pageSize1=10;total1=0;searchTable01()">
|
||||
@@ -317,23 +338,25 @@ export default {
|
||||
}
|
||||
},
|
||||
searchTable02(row) { // 查看详情（请款信息包含的合同）
|
||||
if (this.a === 1) {
|
||||
this.expands.push(row.采购计划请款流水号)
|
||||
this.b = row.采购计划请款流水号
|
||||
this.a = 0
|
||||
} else {
|
||||
if (this.b === row.采购计划请款流水号) {
|
||||
this.expands = []
|
||||
this.a = 1
|
||||
} else {
|
||||
this.expands = []
|
||||
this.expands.push(row.采购计划请款流水号)
|
||||
this.a = 0
|
||||
this.b = row.采购计划请款流水号
|
||||
}
|
||||
}
|
||||
console.log(row, 1111)
|
||||
// if (this.a === 1) {
|
||||
// this.expands.push(row.采购计划请款流水号)
|
||||
// this.b = row.采购计划请款流水号
|
||||
// this.a = 0
|
||||
// } else {
|
||||
// if (this.b === row.采购计划请款流水号) {
|
||||
// this.expands = []
|
||||
// this.a = 1
|
||||
// } else {
|
||||
// this.expands = []
|
||||
// this.expands.push(row.采购计划请款流水号)
|
||||
// this.a = 0
|
||||
// this.b = row.采购计划请款流水号
|
||||
// }
|
||||
// }
|
||||
searchRequsetFundDetail(row.采购计划请款流水号).then(response => {
|
||||
this.gridData = response.data
|
||||
console.log(response.data, 2222)
|
||||
})
|
||||
},
|
||||
getRowKeys(row) {
|
||||
|
||||
Reference in New Issue
Block a user