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

刘璐珈

Browse Source
This commit is contained in:
Vergil
2020-03-10 16:23:48 +08:00
parent cb119988c7
commit 2f765422b5
8 changed files with 329 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/views/PurchasingCenter/CreateInquirySheet/index.vue
View File

@@ -797,7 +797,7 @@
</el-col> </el-col>
</el-row> </el-row>
</el-card> </el-card>
<!--<div id="inquirySheet" style="width: 800px;margin: 0 auto;display:none">-->
<div id="inquirySheet" style="width: 800px;margin: 0 auto;display:none"> <div id="inquirySheet" style="width: 800px;margin: 0 auto;display:none">
<table class="inquirySheet" cellspacing="0px" align="center" border="1 solid black" width="100%"> <table class="inquirySheet" cellspacing="0px" align="center" border="1 solid black" width="100%">
<tr> <tr>
@@ -806,10 +806,10 @@
<th style="border: none;" colspan="3"/> <th style="border: none;" colspan="3"/>
</tr> </tr>
<tr> <tr>
<td style="border: none;" colspan="2">询价单编号:</td> <td style="border: none;text-align: right" colspan="2">询价单编号:</td>
<td id="inquirySheetNum" style="border: none;" colspan="4"/> <td id="inquirySheetNum" style="border: none;text-align: left" colspan="4"/>
<td style="border: none;" colspan="3">供应商名称:</td> <td style="border: none;text-align: right" colspan="2">供应商名称:</td>
<td id="supplier" style="border: none;margin-left: -20px " colspan="5"/> <td id="supplier" style="border: none;text-align: left" colspan="6"/>
</tr> </tr>
<tr id="tablehead"> <tr id="tablehead">
<td width="8.3%">序号</td> <td width="8.3%">序号</td>

18
src/views/PurchasingCenter/MaterialMProcure/index.vue
View File

@@ -96,41 +96,42 @@
<el-card> <el-card>
<el-table <el-table
v-loading="loading"
:data="tableData" :data="tableData"
style="width: 100%;margin-top: 3px" style="width: 945px;margin-top: 3px"
height="600" height="600"
size="mini" size="mini"
highlight-current-row highlight-current-row
border border
stripe> stripe>
<el-table-column align="center" label="物料名称"> <el-table-column align="center" label="物料名称" width="153px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料名称 }} {{ scope.row.物料名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="物料规格"> <el-table-column align="center" label="物料规格" width="184px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料规格 }} {{ scope.row.物料规格 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="物料型号"> <el-table-column align="center" label="物料型号" width="191px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料型号 }} {{ scope.row.物料型号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="供货商"> <el-table-column align="center" label="供货商" width="132px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.供货商 }} {{ scope.row.供货商 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="审核状态"> <el-table-column align="center" label="审核状态" width="80px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="scope.row.是否通过===0" type="primary" size="small">未审核</el-tag> <el-tag v-if="scope.row.是否通过===0" type="primary" size="small">未审核</el-tag>
<el-tag v-if="scope.row.是否通过===1" type="success" size="small">已通过</el-tag> <el-tag v-if="scope.row.是否通过===1" type="success" size="small">已通过</el-tag>
<el-tag v-if="scope.row.是否通过===2" type="danger" size="small">未通过</el-tag> <el-tag v-if="scope.row.是否通过===2" type="danger" size="small">未通过</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="打回原因"> <el-table-column align="center" label="打回原因" width="180px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.打回原因 ? scope.row.打回原因 : '——' }} {{ scope.row.打回原因 ? scope.row.打回原因 : '——' }}
</template> </template>
@@ -322,6 +323,7 @@ import { mapGetters } from 'vuex'
export default { export default {
data() { data() {
return { return {
loading: false,
Gonghuoshang: [], Gonghuoshang: [],
Gonghuoshang2: [], Gonghuoshang2: [],
GonghuoshangValue: '', GonghuoshangValue: '',
@@ -487,9 +489,11 @@ export default {
this.MeasurementUnitValue !== '' ? this.check7 = 1 : this.check7 = 0 // 计量单位 this.MeasurementUnitValue !== '' ? this.check7 = 1 : this.check7 = 0 // 计量单位
this.MaterialSourceValue !== '' ? this.check8 = 1 : this.check8 = 0 // 物料来源 this.MaterialSourceValue !== '' ? this.check8 = 1 : this.check8 = 0 // 物料来源
this.GonghuoshangValue !== '' ? this.check9 = 1 : this.check9 = 0 // 供货商 this.GonghuoshangValue !== '' ? this.check9 = 1 : this.check9 = 0 // 供货商
this.loading = true
searchmaterial(this.check1, this.MaterialName, this.check2, this.FullNameOfMaterial, this.check3, this.MaterialSpecification, this.check4, this.MaterialModel, this.pageCurrent, this.pageSize, this.check5, this.MaterialCategoryValue, this.check6, this.MaterialVarietyValue, this.check7, this.MeasurementUnitValue, this.check8, this.MaterialSourceValue, this.check9, this.GonghuoshangValue).then(response => { searchmaterial(this.check1, this.MaterialName, this.check2, this.FullNameOfMaterial, this.check3, this.MaterialSpecification, this.check4, this.MaterialModel, this.pageCurrent, this.pageSize, this.check5, this.MaterialCategoryValue, this.check6, this.MaterialVarietyValue, this.check7, this.MeasurementUnitValue, this.check8, this.MaterialSourceValue, this.check9, this.GonghuoshangValue).then(response => {
this.tableData = response.data.result this.tableData = response.data.result
this.total = parseInt(response.data.output[0].ItemCount) this.total = parseInt(response.data.output[0].ItemCount)
this.loading = false
}) })
}, },
openSupplier() { openSupplier() {

55
src/views/PurchasingCenter/OfflineContract/index.vue
View File

@@ -41,7 +41,7 @@
</el-row> </el-row>
<!--:row-class-name="tableRowClassName"--> <!--:row-class-name="tableRowClassName"-->
<el-table <el-table
v-loading="" v-loading="loading1"
:data="tableData00" :data="tableData00"
border border
style="width: 100%;max-height: 500px;" style="width: 100%;max-height: 500px;"
@@ -164,32 +164,32 @@
<el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 10px" @click="searchTable22()">查询</el-button> <el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 10px" @click="searchTable22()">查询</el-button>
</el-row> </el-row>
<el-table <el-table
v-loading="" v-loading="loading2"
:data="tableData22" :data="tableData22"
border border
stripe stripe
style="width: 100%;max-height: 500px;" style="width: 594px;max-height: 500px;"
height="500px" height="500px"
size="mini" size="mini"
@selection-change="handleSelectionChange1" @selection-change="handleSelectionChange1"
@select="handleSelection1"> @select="handleSelection1">
<el-table-column align="center" width="50" type="selection"/> <el-table-column align="center" width="43" type="selection"/>
<el-table-column label="名称" align="center" prop="物料名称" min-width="100" show-overflow-tooltip> <el-table-column label="名称" align="center" prop="物料名称" width="153" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料名称 }} {{ scope.row.物料名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="图号或型号" prop="物料型号" align="center" min-width="100"> <el-table-column label="图号或型号" prop="物料型号" align="center" width="128" show-overflow-tooltip>
<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" prop="物料规格" min-width="200" show-overflow-tooltip> <el-table-column label="规格" align="center" prop="物料规格" width="119" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料规格 }} {{ scope.row.物料规格 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :filters="supplierFilters" :filter-method="filterHandler" prop="供货商" label="供货商" align="center" min-width="100"> <el-table-column :filters="supplierFilters" :filter-method="filterHandler" prop="供货商" label="供货商" align="center" width="132">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.供货商 }} {{ scope.row.供货商 }}
</template> </template>
@@ -221,7 +221,7 @@
</el-tooltip> </el-tooltip>
<!--<el-button :disabled="disable" type="info" size="mini" style="float:right" @click="saveContract">保存</el-button>--> <!--<el-button :disabled="disable" type="info" size="mini" style="float:right" @click="saveContract">保存</el-button>-->
<el-tooltip :content="hasTax" placement="top"> <el-tooltip :content="hasTax" placement="top" style="margin-right: 370px">
<el-switch v-model="hasTax" active-color="#13ce66" inactive-color="#ff4949" active-value="含税" inactive-value="未税" style="margin: 3px;float:right"/> <el-switch v-model="hasTax" active-color="#13ce66" inactive-color="#ff4949" active-value="含税" inactive-value="未税" style="margin: 3px;float:right"/>
</el-tooltip> </el-tooltip>
<el-input v-model="taxRate" style="float:right;width:100px;" placeholder="税率" size="mini"/> <el-input v-model="taxRate" style="float:right;width:100px;" placeholder="税率" size="mini"/>
@@ -229,12 +229,12 @@
<el-tooltip :open-delay="1000" effect="dark" content="生成合同" placement="top"> <el-tooltip :open-delay="1000" effect="dark" content="生成合同" placement="top">
<el-button :disabled="disable" type="success" size="small" plain style="float:right;margin-left:10px;margin-right: 10px" @click="doneOfflineContact">生成离线合同</el-button> <el-button :disabled="disable" type="success" size="small" plain style="float:right;margin-left:10px;margin-right: 10px" @click="doneOfflineContact">生成离线合同</el-button>
</el-tooltip> </el-tooltip>
<el-button type="warning" size="small" plain style="float:right;margin-left:10px;" @click="addOfflineContract">创建离线合同</el-button> <el-button type="warning" size="small" plain style="float:right;margin-right:10px;" @click="addOfflineContract">创建离线合同</el-button>
<!--<el-button v-if="quickChangePrice" size="mini" style="float:right; width: 100px" @click="quickChangePrice=!quickChangePrice">快速修改价格</el-button>--> <!--<el-button v-if="quickChangePrice" size="mini" style="float:right; width: 100px" @click="quickChangePrice=!quickChangePrice">快速修改价格</el-button>-->
<!--<el-button v-else size="mini" style="float:right;" @click="quickChangePrice=!quickChangePrice">还原</el-button>--> <!--<el-button v-else size="mini" style="float:right;" @click="quickChangePrice=!quickChangePrice">还原</el-button>-->
</div> </div>
<el-table v-loading="" :data="tableData2" border stripe style="max-height: 460px;" size="mini" highlight-current-row @row-click="searchTable3"> <el-table v-loading="loading3" :data="tableData2" border stripe style="max-height: 460px;" size="mini" highlight-current-row @row-click="searchTable3">
<el-table-column label="详情" type="expand" fixed="left"> <el-table-column label="详情" type="expand" fixed="left" width="50px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-form label-position="left" inline class="demo-table-expand"> <el-form label-position="left" inline class="demo-table-expand">
<el-form-item label="离线合同备注"> <el-form-item label="离线合同备注">
@@ -250,22 +250,22 @@
<el-tag v-if="arrival(scope.row)" type="success" size="small">全部到货</el-tag> <el-tag v-if="arrival(scope.row)" type="success" size="small">全部到货</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="离线合同编号" prop="离线合同编号" align="center" min-width="150"> <el-table-column label="离线合同编号" prop="离线合同编号" align="center" 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="130" show-overflow-tooltip> <el-table-column label="离线合同名称" align="center" width="130" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.离线合同名称 }} {{ scope.row.离线合同名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="供应商" prop="供应商名称" align="center" min-width="220" show-overflow-tooltip> <el-table-column label="供应商" prop="供应商名称" align="center" width="180" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.供应商名称 }} {{ scope.row.供应商名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="采购员" prop="采购员" align="center" min-width="80"> <el-table-column label="采购员" prop="采购员" align="center" width="90">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.采购员 }} {{ scope.row.采购员 }}
</template> </template>
@@ -275,12 +275,12 @@
{{ scope.row.创建日期.split(' ')[0] }} {{ scope.row.创建日期.split(' ')[0] }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="规定到货时间" align="center" width="100"> <el-table-column label="规定到货时间" align="center" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.规定到货时间.split(' ')[0] }} {{ scope.row.规定到货时间.split(' ')[0] }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="120" fixed="right"> <el-table-column label="操作" align="center" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button :disabled="arrival(scope.row)" type="text" icon="el-icon-edit" plain size="mini" @click="editOfflineContract(scope.row)"/> <el-button :disabled="arrival(scope.row)" type="text" icon="el-icon-edit" plain size="mini" @click="editOfflineContract(scope.row)"/>
<el-button :disabled="arrival(scope.row)" type="text" icon="el-icon-delete" plain size="mini" @click="deleteOfflineContract(scope.row)"/> <el-button :disabled="arrival(scope.row)" type="text" icon="el-icon-delete" plain size="mini" @click="deleteOfflineContract(scope.row)"/>
@@ -694,6 +694,9 @@ export default {
PersonValue: '', PersonValue: '',
showMaterialTable: true, showMaterialTable: true,
loading1: false, loading1: false,
loading2: false,
loading3: false,
loading4: false,
title2: '', title2: '',
purchaseStateValue: 2, // 采购状态 全部 purchaseStateValue: 2, // 采购状态 全部
purchaseState: [ purchaseState: [
@@ -1057,9 +1060,11 @@ export default {
searchTable2() { // 查询离线合同列表 searchTable2() { // 查询离线合同列表
this.offlineContract ? this.check3 = 1 : this.check3 = 0 this.offlineContract ? this.check3 = 1 : this.check3 = 0
this.supplierName0 ? this.check4 = 1 : this.check4 = 0 this.supplierName0 ? this.check4 = 1 : this.check4 = 0
this.loading3 = true
searchOfflineContract(this.pageCurrent2, this.pageSize2, this.check3, this.offlineContract, this.check4, this.supplierName0).then(response => { searchOfflineContract(this.pageCurrent2, this.pageSize2, this.check3, this.offlineContract, this.check4, this.supplierName0).then(response => {
this.tableData2 = response.data.rows this.tableData2 = response.data.rows
this.total2 = response.data.total this.total2 = response.data.total
this.loading3 = false
}) })
}, },
handleSizeChange2(val) { // 离线合同列表分页 handleSizeChange2(val) { // 离线合同列表分页
@@ -1261,6 +1266,7 @@ export default {
this.stipulateArrivalTime = row.规定到货时间.split(' ')[0] this.stipulateArrivalTime = row.规定到货时间.split(' ')[0]
this.offlineContractNum = row.离线合同流水号 this.offlineContractNum = row.离线合同流水号
this.离线合同状态 = row.离线合同状态 this.离线合同状态 = row.离线合同状态
this.loading4 = true
searchMateriel(this.offlineContractNum).then(response => { searchMateriel(this.offlineContractNum).then(response => {
console.log(response.data) console.log(response.data)
this.tableData3 = response.data this.tableData3 = response.data
@@ -1270,6 +1276,7 @@ export default {
!v.单价 ? v.单价 = v.参考价格 : v.单价 !v.单价 ? v.单价 = v.参考价格 : v.单价
this.$set(v, '未税单价', v.单价 / (1 + this.taxRate)) this.$set(v, '未税单价', v.单价 / (1 + this.taxRate))
}) })
this.loading4 = false
}) })
this.arrival(row) || this.purchasing(row) ? this.disable = true : this.disable = false // 是否为编辑模式 this.arrival(row) || this.purchasing(row) ? this.disable = true : this.disable = false // 是否为编辑模式
}, },
@@ -1562,6 +1569,7 @@ export default {
}, },
searchTable11() { // 查询外购件列表 searchTable11() { // 查询外购件列表
let check1, check5, check7 let check1, check5, check7
this.loading1 = true
this.materialName ? check1 = 1 : check1 = 0 this.materialName ? check1 = 1 : check1 = 0
this.machineValue ? check5 = 1 : check5 = 0 this.machineValue ? check5 = 1 : check5 = 0
this.startTime ? check7 = 1 : (check7 = 0, this.startTime = '') this.startTime ? check7 = 1 : (check7 = 0, this.startTime = '')
@@ -1586,6 +1594,9 @@ export default {
this.supplierFilters.push({ text: v.供货商, value: v.供货商 }) this.supplierFilters.push({ text: v.供货商, value: v.供货商 })
} }
}) })
this.loading1 = false
}).catch(() => {
this.loading1 = false
}) })
}, },
handleSizeChange11(val) { // 标准件和外购件列表分页 handleSizeChange11(val) { // 标准件和外购件列表分页
@@ -1607,6 +1618,7 @@ export default {
this.machineValue ? check5 = 1 : check5 = 0 this.machineValue ? check5 = 1 : check5 = 0
this.groupValue ? check6 = 1 : check6 = 0 this.groupValue ? check6 = 1 : check6 = 0
this.startTime ? check7 = 1 : (check7 = 0, this.startTime = '') this.startTime ? check7 = 1 : (check7 = 0, this.startTime = '')
this.loading2 = true
searchPart(this.pageCurrent12, this.pageSize12, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.partNum, check2, this.partName, check3, this.partSpec, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue, check7, this.startTime[0], this.startTime[1]).then(response => { searchPart(this.pageCurrent12, this.pageSize12, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.partNum, check2, this.partName, check3, this.partSpec, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue, check7, this.startTime[0], this.startTime[1]).then(response => {
this.tableData12 = response.data.rows this.tableData12 = response.data.rows
this.total12 = response.data.total this.total12 = response.data.total
@@ -1623,6 +1635,9 @@ export default {
this.supplierFilters.push({ text: v.供货商, value: v.供货商 }) this.supplierFilters.push({ text: v.供货商, value: v.供货商 })
} }
}) })
this.loading2 = false
}).catch(() => {
this.loading2 = false
}) })
}, },
handleSizeChange12(val) { // 基本件列表分页 handleSizeChange12(val) { // 基本件列表分页
@@ -1637,6 +1652,7 @@ export default {
searchTable22() { searchTable22() {
let check1 let check1
this.materialName ? check1 = 1 : check1 = 0 this.materialName ? check1 = 1 : check1 = 0
this.loading2 = true
searchMaterial22(check1, this.materialName, this.pageCurrent22, this.pageSize22).then(response => { searchMaterial22(check1, this.materialName, this.pageCurrent22, this.pageSize22).then(response => {
console.log(response.data, 3333) console.log(response.data, 3333)
this.tableData22 = response.data.rows this.tableData22 = response.data.rows
@@ -1651,6 +1667,9 @@ export default {
this.supplierFilters.push({ text: v.供货商, value: v.供货商 }) this.supplierFilters.push({ text: v.供货商, value: v.供货商 })
} }
}) })
this.loading2 = false
}).catch(() => {
this.loading2 = false
}) })
}, },
handleSizeChange22(val) { // 仓库表分页 handleSizeChange22(val) { // 仓库表分页

79
src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
View File

@@ -42,8 +42,8 @@
<el-tabs v-model="PartType" type="border-card" @tab-click="searchTable()"> <el-tabs v-model="PartType" type="border-card" @tab-click="searchTable()">
<el-tab-pane label="标准件" name="标准件"> <el-tab-pane label="标准件" name="标准件">
<el-table :data="tableData0" size="mini" height="700px" border stripe> <el-table v-loading="loading0" :data="tableData0" size="mini" height="700px" border stripe>
<el-table-column align="center" prop="询价状态编号" label="采购状态" width="100px"> <el-table-column align="center" prop="询价状态编号" label="采购状态" width="90px">
<template slot-scope="scope"> <template slot-scope="scope">
<!--<el-tag v-if="!scope.row.人员编号" type="primary" size="small">未分配</el-tag>--> <!--<el-tag v-if="!scope.row.人员编号" type="primary" size="small">未分配</el-tag>-->
<!--<el-tag v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</el-tag>--> <!--<el-tag v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</el-tag>-->
@@ -55,32 +55,32 @@
<span v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</span> <span v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="机床图号" prop="机床图号" width="100px" show-overflow-tooltip> <el-table-column align="center" label="机床图号" prop="机床图号" width="94px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.机床图号 }} {{ scope.row.机床图号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="组号" prop="组号" width="80px"> <el-table-column align="center" label="组号" prop="组号" width="50px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.组号 }} {{ scope.row.组号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="名称" prop="物料名称" width="100px" show-overflow-tooltip> <el-table-column align="center" label="名称" prop="物料名称" width="153px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料名称 }} {{ scope.row.物料名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="型号" min-width="100px" show-overflow-tooltip> <el-table-column align="center" label="型号" width="128px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料型号 }} {{ scope.row.物料型号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="规格" prop="物料规格" min-width="200px" show-overflow-tooltip> <el-table-column align="center" label="规格" prop="物料规格" width="128px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料规格 }} {{ scope.row.物料规格 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="供货商" prop="供货商" min-width="100px" show-overflow-tooltip> <el-table-column align="center" label="供货商" prop="供货商" width="132px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.供货商 || '—' }} {{ scope.row.供货商 || '—' }}
</template> </template>
@@ -105,7 +105,7 @@
{{ scope.row.不合格数量 }} {{ scope.row.不合格数量 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="到货状态" width="100px"> <el-table-column align="center" label="到货状态" width="90px">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="Number(scope.row.到货数量) >= Number(scope.row.采购数量)">已到货</span> <span v-if="Number(scope.row.到货数量) >= Number(scope.row.采购数量)">已到货</span>
<span v-else>未到货</span> <span v-else>未到货</span>
@@ -131,7 +131,7 @@
{{ scope.row.备注 || '—' }} {{ scope.row.备注 || '—' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="下达任务时间" min-width="100px" show-overflow-tooltip> <el-table-column align="center" label="下达时间" min-width="100px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.操作日期 ? scope.row.操作日期.split(' ')[0] : '-' }} {{ scope.row.操作日期 ? scope.row.操作日期.split(' ')[0] : '-' }}
</template> </template>
@@ -150,8 +150,8 @@
</div> </div>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="外购件" name="外购件"> <el-tab-pane label="外购件" name="外购件">
<el-table :data="tableData1" size="mini" height="700px" border stripe> <el-table v-loading="loading1" :data="tableData1" size="mini" height="700px" border stripe>
<el-table-column align="center" label="采购状态" prop="询价状态编号" width="100px"> <el-table-column align="center" label="采购状态" prop="询价状态编号" width="90px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="!scope.row.人员编号" type="primary" size="small">未分配</el-tag> <el-tag v-if="!scope.row.人员编号" type="primary" size="small">未分配</el-tag>
<el-tag v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</el-tag> <el-tag v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</el-tag>
@@ -159,32 +159,32 @@
<el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag> <el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="机床图号" prop="机床图号" width="100px" show-overflow-tooltip> <el-table-column align="center" label="机床图号" prop="机床图号" width="94px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.机床图号 }} {{ scope.row.机床图号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="组号" prop="组号" width="80px"> <el-table-column align="center" label="组号" prop="组号" width="50px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.组号 }} {{ scope.row.组号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="名称" prop="物料名称" width="100px" show-overflow-tooltip> <el-table-column align="center" label="名称" prop="物料名称" width="153px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料名称 }} {{ scope.row.物料名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="型号" min-width="100px" show-overflow-tooltip> <el-table-column align="center" label="型号" width="128px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料型号 }} {{ scope.row.物料型号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="规格" prop="物料规格" min-width="200px" show-overflow-tooltip> <el-table-column align="center" label="规格" prop="物料规格" width="128px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料规格 }} {{ scope.row.物料规格 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="供货商" prop="供货商" min-width="100px" show-overflow-tooltip> <el-table-column align="center" label="供货商" prop="供货商" width="132px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.供货商 || '—' }} {{ scope.row.供货商 || '—' }}
</template> </template>
@@ -209,7 +209,7 @@
{{ scope.row.不合格数量 }} {{ scope.row.不合格数量 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="到货状态" width="100px"> <el-table-column align="center" label="到货状态" width="90px">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="Number(scope.row.到货数量) >= Number(scope.row.采购数量)">已到货</span> <span v-if="Number(scope.row.到货数量) >= Number(scope.row.采购数量)">已到货</span>
<span v-else>未到货</span> <span v-else>未到货</span>
@@ -235,7 +235,7 @@
{{ scope.row.备注 || '—' }} {{ scope.row.备注 || '—' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="下达任务时间" min-width="100px" show-overflow-tooltip> <el-table-column align="center" label="下达时间" min-width="100px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.操作日期 ? scope.row.操作日期.split(' ')[0] : '-' }} {{ scope.row.操作日期 ? scope.row.操作日期.split(' ')[0] : '-' }}
</template> </template>
@@ -254,8 +254,8 @@
</div> </div>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="基本件" name="基本件"> <el-tab-pane label="基本件" name="基本件">
<el-table :data="tableData2" size="mini" height="700px" border stripe> <el-table v-loading="loading2" :data="tableData2" size="mini" height="700px" border stripe>
<el-table-column align="center" label="采购状态" prop="询价状态编号" width="100px"> <el-table-column align="center" label="采购状态" prop="询价状态编号" width="90px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="!scope.row.人员编号" type="primary" size="small">未分配</el-tag> <el-tag v-if="!scope.row.人员编号" type="primary" size="small">未分配</el-tag>
<el-tag v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</el-tag> <el-tag v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</el-tag>
@@ -263,37 +263,37 @@
<el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag> <el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="机床图号" prop="机床图号" width="100px" show-overflow-tooltip> <el-table-column align="center" label="机床图号" prop="机床图号" width="94px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.机床图号 }} {{ scope.row.机床图号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="组号" prop="组号" width="80px"> <el-table-column align="center" label="组号" prop="组号" width="50px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.组号 }} {{ scope.row.组号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="名称" prop="物料名称" min-width="100px" show-overflow-tooltip> <el-table-column align="center" label="名称" prop="物料名称" width="153px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件名称 }} {{ scope.row.零件名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="图号" min-width="100px" show-overflow-tooltip> <el-table-column align="center" label="图号" width="100px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件图号 }} {{ scope.row.零件图号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="规格" prop="规格" min-width="100px" show-overflow-tooltip> <el-table-column align="center" label="规格" prop="规格" width="128px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.规格 }} {{ scope.row.规格 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="材料" min-width="100px" show-overflow-tooltip> <el-table-column align="center" label="材料" width="119px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.材料 }} {{ scope.row.材料 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="供货商" prop="供货商" min-width="100px" show-overflow-tooltip> <el-table-column align="center" label="供货商" prop="供货商" width="132px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.供货商 || '—' }} {{ scope.row.供货商 || '—' }}
</template> </template>
@@ -320,7 +320,7 @@
{{ scope.row.不合格数量 }} {{ scope.row.不合格数量 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="到货状态" width="100px"> <el-table-column align="center" label="到货状态" width="90px">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="Number(scope.row.到货数量) >= Number(scope.row.采购数量)">已到货</span> <span v-if="Number(scope.row.到货数量) >= Number(scope.row.采购数量)">已到货</span>
<span v-else>未到货</span> <span v-else>未到货</span>
@@ -331,7 +331,7 @@
{{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.供应商名称 || '—' }} {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.供应商名称 || '—' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="采购合同编号" min-width="100px"> <el-table-column align="center" label="采购合同编号" width="110px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.采购合同编号 || '—' }} {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.采购合同编号 || '—' }}
</template> </template>
@@ -346,7 +346,7 @@
{{ scope.row.备注 || '—' }} {{ scope.row.备注 || '—' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="下达任务时间" min-width="100px" show-overflow-tooltip> <el-table-column align="center" label="下达时间" min-width="100px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.操作日期 ? scope.row.操作日期.split(' ')[0] : '-' }} {{ scope.row.操作日期 ? scope.row.操作日期.split(' ')[0] : '-' }}
</template> </template>
@@ -375,6 +375,9 @@ export default {
name: '', // 采购件采购查询 name: '', // 采购件采购查询
data() { data() {
return { return {
loading0: false,
loading1: false,
loading2: false,
startTime: '', startTime: '',
Name: '', Name: '',
spec: '', spec: '',
@@ -569,6 +572,7 @@ export default {
this.spec ? check4 = 1 : check4 = 0 this.spec ? check4 = 1 : check4 = 0
this.model ? check5 = 1 : check5 = 0 this.model ? check5 = 1 : check5 = 0
this.startTime ? check6 = 1 : (check6 = 0, this.startTime = '') this.startTime ? check6 = 1 : (check6 = 0, this.startTime = '')
this.loading0 = true
searchTable1(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent0, this.pageSize0, 1, check3, this.Name, check4, this.spec, check5, this.model, check6, this.startTime[0], this.startTime[1]).then(response => { searchTable1(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent0, this.pageSize0, 1, check3, this.Name, check4, this.spec, check5, this.model, check6, this.startTime[0], this.startTime[1]).then(response => {
console.log(this.tableData0) console.log(this.tableData0)
if (response.data.rows.length !== 0) { if (response.data.rows.length !== 0) {
@@ -601,6 +605,9 @@ export default {
} }
} }
this.total0 = response.data.total this.total0 = response.data.total
this.loading0 = false
}).catch(() => {
this.loading0 = false
}) })
}, },
searchTable1() { // 查询外购件 searchTable1() { // 查询外购件
@@ -612,6 +619,7 @@ export default {
this.spec ? check4 = 1 : check4 = 0 this.spec ? check4 = 1 : check4 = 0
this.model ? check5 = 1 : check5 = 0 this.model ? check5 = 1 : check5 = 0
this.startTime ? check6 = 1 : (check6 = 0, this.startTime = '') this.startTime ? check6 = 1 : (check6 = 0, this.startTime = '')
this.loading1 = true
searchTable1(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent1, this.pageSize1, 2, check3, this.Name, check4, this.spec, check5, this.model, check6, this.startTime[0], this.startTime[1]).then(response => { searchTable1(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent1, this.pageSize1, 2, check3, this.Name, check4, this.spec, check5, this.model, check6, this.startTime[0], this.startTime[1]).then(response => {
this.total1 = response.data.total this.total1 = response.data.total
if (response.data.rows.length !== 0) { if (response.data.rows.length !== 0) {
@@ -644,6 +652,9 @@ export default {
} }
} }
console.log(response.data.total, this.total1, 898989) console.log(response.data.total, this.total1, 898989)
this.loading1 = false
}).catch(() => {
this.loading1 = false
}) })
}, },
searchTable2() { // 查询基本件 searchTable2() { // 查询基本件
@@ -653,10 +664,14 @@ export default {
this.Name ? check3 = 1 : check3 = 0 this.Name ? check3 = 1 : check3 = 0
this.spec ? check4 = 1 : check4 = 0 this.spec ? check4 = 1 : check4 = 0
this.model ? check5 = 1 : check5 = 0 this.model ? check5 = 1 : check5 = 0
this.loading2 = true
this.startTime ? check6 = 1 : (check6 = 0, this.startTime = '') this.startTime ? check6 = 1 : (check6 = 0, this.startTime = '')
searchTable2(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent2, this.pageSize2, check3, this.Name, check4, this.spec, check5, this.model, check6, this.startTime[0], this.startTime[1]).then(response => { searchTable2(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent2, this.pageSize2, check3, this.Name, check4, this.spec, check5, this.model, check6, this.startTime[0], this.startTime[1]).then(response => {
this.tableData2 = response.data.rows this.tableData2 = response.data.rows
this.total2 = response.data.total this.total2 = response.data.total
this.loading2 = false
}).catch(() => {
this.loading2 = false
}) })
} }
} }

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

@@ -183,16 +183,6 @@
{{ scope.row.物料品种 }} {{ scope.row.物料品种 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="备注" min-width="100px" width="120px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.备注 }}
</template>
</el-table-column>
<el-table-column align="center" prop="供货商" label="供货商" min-width="100px" width="120px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.供货商 }}
</template>
</el-table-column>
<el-table-column align="center" prop="接收日期" label="接收日期" min-width="100px" width="100px" show-overflow-tooltip> <el-table-column align="center" prop="接收日期" label="接收日期" min-width="100px" width="100px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.接收日期 }} {{ scope.row.接收日期 }}
@@ -203,6 +193,16 @@
{{ scope.row.任务分配时间 }} {{ scope.row.任务分配时间 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="备注" min-width="100px" width="120px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.备注 }}
</template>
</el-table-column>
<el-table-column align="center" prop="供货商" label="供货商" min-width="100px" width="120px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.供货商 }}
</template>
</el-table-column>
<!--<el-table-column :filters="source" :filter-method="filterSource" align="center" label="数据来源" min-width="90px" prop="零件类型">--> <!--<el-table-column :filters="source" :filter-method="filterSource" align="center" label="数据来源" min-width="90px" prop="零件类型">-->
<!--<template slot-scope="scope">--> <!--<template slot-scope="scope">-->
<!--{{ Number(scope.row.零件类型) === 1 ? 'BZ' : 'WG' }}--> <!--{{ Number(scope.row.零件类型) === 1 ? 'BZ' : 'WG' }}-->
@@ -313,7 +313,7 @@
<el-checkbox v-model="checked2" style="margin-left: 10px" @change="pageCurrent1=1;pageSize1=50;total1=0;searchTable1()">已分配</el-checkbox> <el-checkbox v-model="checked2" style="margin-left: 10px" @change="pageCurrent1=1;pageSize1=50;total1=0;searchTable1()">已分配</el-checkbox>
<!--<el-radio v-model="radio" label="1" style="margin-left: 10px" @change="pageCurrent1=1;pageSize1=50;total1=0;searchTable1()">未分配</el-radio>--> <!--<el-radio v-model="radio" label="1" style="margin-left: 10px" @change="pageCurrent1=1;pageSize1=50;total1=0;searchTable1()">未分配</el-radio>-->
<!--<el-radio v-model="radio" label="2" style="margin-left: 10px" @change="pageCurrent1=1;pageSize1=50;total1=0;searchTable1()">已分配</el-radio>--> <!--<el-radio v-model="radio" label="2" style="margin-left: 10px" @change="pageCurrent1=1;pageSize1=50;total1=0;searchTable1()">已分配</el-radio>-->
<el-select v-model="personValue" placeholder="采购员" size="small" style="width: 100px;margin-left: 160px"> <el-select v-model="personValue" placeholder="采购员" size="small" style="width: 100px;margin-left: 162px">
<el-option <el-option
v-for="item in person" v-for="item in person"
:key="item.value" :key="item.value"
@@ -390,16 +390,6 @@
{{ scope.row.物料品种 }} {{ scope.row.物料品种 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="备注" min-width="100px" width="120px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.备注 }}
</template>
</el-table-column>
<el-table-column align="center" prop="供货商" label="供货商" min-width="100px" width="120px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.供货商 }}
</template>
</el-table-column>
<el-table-column align="center" prop="接收日期" label="接收日期" min-width="100px" width="100px" show-overflow-tooltip> <el-table-column align="center" prop="接收日期" label="接收日期" min-width="100px" width="100px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.接收日期 }} {{ scope.row.接收日期 }}
@@ -410,6 +400,16 @@
{{ scope.row.任务分配时间 }} {{ scope.row.任务分配时间 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="备注" min-width="100px" width="120px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.备注 }}
</template>
</el-table-column>
<el-table-column align="center" prop="供货商" label="供货商" min-width="100px" width="120px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.供货商 }}
</template>
</el-table-column>
<!--<el-table-column :filters="source" :filter-method="filterSource" align="center" label="数据来源" min-width="90px" prop="零件类型">--> <!--<el-table-column :filters="source" :filter-method="filterSource" align="center" label="数据来源" min-width="90px" prop="零件类型">-->
<!--<template slot-scope="scope">--> <!--<template slot-scope="scope">-->
<!--{{ Number(scope.row.零件类型) === 1 ? 'BZ' : 'WG' }}--> <!--{{ Number(scope.row.零件类型) === 1 ? 'BZ' : 'WG' }}-->
@@ -493,7 +493,7 @@
<el-checkbox v-model="checked3" style="margin-left: 10px" @change="pageCurrent2=1;pageSize2=50;total2=0;searchTable2()">已分配</el-checkbox> <el-checkbox v-model="checked3" style="margin-left: 10px" @change="pageCurrent2=1;pageSize2=50;total2=0;searchTable2()">已分配</el-checkbox>
<!--<el-radio v-model="radio" label="1" style="margin-left: 10px" @change="pageCurrent2=1;pageSize2=50;total2=0;searchTable2()">未分配</el-radio>--> <!--<el-radio v-model="radio" label="1" style="margin-left: 10px" @change="pageCurrent2=1;pageSize2=50;total2=0;searchTable2()">未分配</el-radio>-->
<!--<el-radio v-model="radio" label="2" style="margin-left: 10px" @change="pageCurrent2=1;pageSize2=50;total2=0;searchTable2()">已分配</el-radio>--> <!--<el-radio v-model="radio" label="2" style="margin-left: 10px" @change="pageCurrent2=1;pageSize2=50;total2=0;searchTable2()">已分配</el-radio>-->
<el-select v-model="personValue" placeholder="采购员" size="small" style="width: 100px;margin-left: 470px"> <el-select v-model="personValue" placeholder="采购员" size="small" style="width: 100px;margin-left: 430px">
<el-option <el-option
v-for="item in person" v-for="item in person"
:key="item.value" :key="item.value"
@@ -520,7 +520,7 @@
<!--<el-button type="danger" size="small" icon="el-icon-back" style="margin-left: 10px" @click="executeReturn2">打回</el-button>--> <!--<el-button type="danger" size="small" icon="el-icon-back" style="margin-left: 10px" @click="executeReturn2">打回</el-button>-->
</el-row> </el-row>
<el-row style="margin-bottom: 10px"> <el-row style="margin-bottom: 10px">
<el-table v-loading="loading" :data="tableData2" size="mini" height="800px" style="width: 1324px" border stripe @selection-change="handleSelectionChange2"> <el-table v-loading="loading" :data="tableData2" size="mini" height="800px" style="width: 1355px" border stripe @selection-change="handleSelectionChange2">
<el-table-column :selectable="selectable" align="center" type="selection" width="42px"/> <el-table-column :selectable="selectable" align="center" type="selection" width="42px"/>
<el-table-column align="center" prop="询价状态编号" label="进程" min-width="80px" width="60px"> <el-table-column align="center" prop="询价状态编号" label="进程" min-width="80px" width="60px">
<template slot-scope="scope"> <template slot-scope="scope">
@@ -530,12 +530,7 @@
<span v-if="parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</span> <span v-if="parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" prop="零件图号" label="零件图号" min-width="120px" width="180px"> <el-table-column align="center" prop="零件名称" label="名称" width="160px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column align="center" prop="零件名称" label="名称" width="120px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件名称 }} {{ scope.row.零件名称 }}
</template> </template>
@@ -545,6 +540,11 @@
{{ scope.row.规格 }} {{ scope.row.规格 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" prop="零件图号" label="图号或型号" width="150px">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column align="center" label="材料" width="160"> <el-table-column align="center" label="材料" width="160">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.材料 }} {{ scope.row.材料 }}
@@ -560,26 +560,16 @@
<!--{{ scope.row.项目名称 }}--> <!--{{ scope.row.项目名称 }}-->
<!--</template>--> <!--</template>-->
<!--</el-table-column>--> <!--</el-table-column>-->
<el-table-column align="center" prop="机床图号" label="机床图号" min-width="100px" width="100px"> <el-table-column align="center" prop="机床图号" label="机床图号" width="120px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.机床图号 }} {{ scope.row.机床图号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" prop="组号" label="组号" min-width="80px" width="70px"> <el-table-column align="center" prop="组号" label="组号" width="70px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.组号 }} {{ scope.row.组号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="备注" min-width="100px" width="120px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.备注 }}
</template>
</el-table-column>
<el-table-column align="center" prop="供货商" label="供货商" min-width="100px" width="120" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.供货商 }}
</template>
</el-table-column>
<el-table-column align="center" prop="接收日期" label="接收日期" min-width="100px" width="100px" show-overflow-tooltip> <el-table-column align="center" prop="接收日期" label="接收日期" min-width="100px" width="100px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.操作日期.split(' ')[0] }} {{ scope.row.操作日期.split(' ')[0] }}
@@ -590,6 +580,17 @@
{{ scope.row.任务分配时间.split(' ')[0] }} {{ scope.row.任务分配时间.split(' ')[0] }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="备注" width="120px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.备注 }}
</template>
</el-table-column>
<el-table-column align="center" prop="供货商" label="供货商" width="120" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.供货商 }}
</template>
</el-table-column>
<!--<el-table-column align="center" label="计划到货时间" min-width="100px">--> <!--<el-table-column align="center" label="计划到货时间" min-width="100px">-->
<!--<template slot-scope="scope">--> <!--<template slot-scope="scope">-->
<!--{{ scope.row.物料计划到货时间.split(' ')[0] }}--> <!--{{ scope.row.物料计划到货时间.split(' ')[0] }}-->
@@ -600,7 +601,7 @@
<!--{{ scope.row.操作日期.split(' ')[0] }}--> <!--{{ scope.row.操作日期.split(' ')[0] }}-->
<!--</template>--> <!--</template>-->
<!--</el-table-column>--> <!--</el-table-column>-->
<el-table-column v-if="radio===2" :filters="person" :filter-method="filterHandler" align="center" label="采购员" min-width="80px" width="80px" prop="buyer"> <el-table-column v-if="radio===2" :filters="person" :filter-method="filterHandler" align="center" label="采购员" width="80px" prop="buyer">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.姓名 ? scope.row.姓名 : '—' }} {{ scope.row.姓名 ? scope.row.姓名 : '—' }}
</template> </template>
@@ -610,7 +611,7 @@
<!--{{ scope.row.任务分配时间 ? scope.row.任务分配时间.split(' ')[0] : '—' }}--> <!--{{ scope.row.任务分配时间 ? scope.row.任务分配时间.split(' ')[0] : '—' }}-->
<!--</template>--> <!--</template>-->
<!--</el-table-column>--> <!--</el-table-column>-->
<el-table-column v-if="radio===2" align="center" label="撤回分配" min-width="100px" width="100px" fixed="right"> <el-table-column v-if="radio===2" align="center" label="撤回分配" width="100px" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
:disabled="!(parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='')" :disabled="!(parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='')"

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

@@ -43,6 +43,7 @@
</el-tooltip> </el-tooltip>
</div> </div>
<el-table <el-table
v-loading="loading"
:data="tableData1" :data="tableData1"
:summary-method="getSummaries" :summary-method="getSummaries"
style="width: 990px" style="width: 990px"
@@ -88,12 +89,12 @@
{{ scope.row.数量 }} {{ scope.row.数量 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="采购单价" width="100px"> <el-table-column align="center" label="采购单价(元)" width="105px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ Number(scope.row.单价).toFixed(2) }} {{ Number(scope.row.单价).toFixed(2) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="领用数量" width="90px"> <el-table-column align="center" label="领用数量" width="85px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.出库数量 }} {{ scope.row.出库数量 }}
</template> </template>
@@ -131,6 +132,7 @@ import Cookie from 'js-cookie'
export default { export default {
data() { data() {
return { return {
loading: false,
projectValue: '', // 项目名称 projectValue: '', // 项目名称
project: [], project: [],
machine: '', machine: '',
@@ -226,8 +228,8 @@ export default {
if (index === 0) { if (index === 0) {
sums[index] = '总价' sums[index] = '总价'
return return
} else if (index === 7) { } else if (index === 8) {
sums[index] = this.sum sums[index] = this.sum + '元'
return return
} }
// const values = data.map(item => Number(item[column.property])) // const values = data.map(item => Number(item[column.property]))
@@ -256,15 +258,18 @@ export default {
this.machine ? check2 = 1 : check2 = 0 this.machine ? check2 = 1 : check2 = 0
this.groupValue ? check3 = 1 : check3 = 0 this.groupValue ? check3 = 1 : check3 = 0
this.machinenum ? check4 = 1 : check4 = 0 this.machinenum ? check4 = 1 : check4 = 0
this.loading = true
searchReceiveCheck(0, this.projectValue, check2, this.machine, check3, this.groupValue, check4, this.machinenum, this.pageCurrent, this.pageSize).then(response => { searchReceiveCheck(0, this.projectValue, check2, this.machine, check3, this.groupValue, check4, this.machinenum, this.pageCurrent, this.pageSize).then(response => {
this.tableData1 = response.data.result this.tableData1 = response.data.result
this.total = parseInt(response.data.output[0].ItemCount) this.total = parseInt(response.data.output[0].ItemCount)
this.loading = false
}).then(() => { }).then(() => {
searchsum(0, this.projectValue, check2, this.machine, check3, this.groupValue, check4, this.machinenum).then(res => { searchsum(0, this.projectValue, check2, this.machine, check3, this.groupValue, check4, this.machinenum).then(res => {
console.log(res.data) console.log(res.data)
this.sum = Number(res.data[0].合计).toFixed(2) this.sum = Number(res.data[0].合计).toFixed(2)
}) })
}) }).catch(() => {})
this.loading = false
}, },
handleSizeChange(val) { // 基本件列表分页 handleSizeChange(val) { // 基本件列表分页
this.pageSize = val this.pageSize = val
@@ -276,6 +281,11 @@ export default {
this.searchProject() this.searchProject()
}, },
exportExcel() { exportExcel() {
if (this.sum === '' || this.sum === 0) {
this.$message.error('请先查询内容，确认无误后导出')
console.log(this.sum)
return
}
let check2, check3, check4 let check2, check3, check4
this.machine ? check2 = 1 : check2 = 0 this.machine ? check2 = 1 : check2 = 0
this.groupValue ? check3 = 1 : check3 = 0 this.groupValue ? check3 = 1 : check3 = 0
@@ -289,7 +299,9 @@ export default {
param[4] = ['组件流水号_check', check3] param[4] = ['组件流水号_check', check3]
param[5] = ['组件流水号', this.groupValue] param[5] = ['组件流水号', this.groupValue]
param[6] = ['机床号物料名称_check', check4] param[6] = ['机床号物料名称_check', check4]
param[7] = ['机床号物料名称', check4] param[7] = ['机床号物料名称', this.machinenum]
param[8] = ['合计', this.sum]
param[9] = ['表名', '采购核算']
var Data = this.CreateData('2001', '采购管理_领用核算_查询数据_导出', param) var Data = this.CreateData('2001', '采购管理_领用核算_查询数据_导出', param)
this.exportExcel_NPOI(Data) this.exportExcel_NPOI(Data)
} }

10
src/views/PurchasingCenter/SupplierManagement/index.vue
View File

@@ -73,7 +73,7 @@
<el-card> <el-card>
<div style="display: inline-block;margin-bottom: 5px">供应商列表</div> <div style="display: inline-block;margin-bottom: 5px">供应商列表</div>
<el-table :data="List" stripe highlight-current-row border style="width: 100%;max-height: 600px;" height="500" size="mini" @row-click="rowClick"> <el-table v-loading="loading" :data="List" stripe highlight-current-row border style="width: 100%;max-height: 600px;" height="500" size="mini" @row-click="rowClick">
<el-table-column label="供应商名称" align="center" fixed="left" min-width="250"> <el-table-column label="供应商名称" align="center" fixed="left" min-width="250">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.供应商名称 }} {{ scope.row.供应商名称 }}
@@ -155,7 +155,7 @@
<el-card> <el-card>
<div style="display: inline-block;margin-bottom: 20px;width:90%">供应商联系人列表</div> <div style="display: inline-block;margin-bottom: 20px;width:90%">供应商联系人列表</div>
<el-button type="warning" size="small" icon="el-icon-circle-plus-outline" plain style="margin-bottom:10px;float:right" @click="handleAdd2()">新增联系人</el-button> <el-button type="warning" size="small" icon="el-icon-circle-plus-outline" plain style="margin-bottom:10px;float:right" @click="handleAdd2()">新增联系人</el-button>
<el-table :data="List1" border stripe size="mini"> <el-table v-loading="loading2" :data="List1" border stripe size="mini">
<el-table-column label="姓名" align="center"> <el-table-column label="姓名" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.姓名 }} {{ scope.row.姓名 }}
@@ -344,6 +344,8 @@ import { searchData, addTable, editTable, deleteData, getName, addPerson, editPe
export default { export default {
data() { data() {
return { return {
loading: false,
loading2: false,
mainProduction: '', // 主要产品 mainProduction: '', // 主要产品
form1: {}, form1: {},
supplierName: '', supplierName: '',
@@ -431,9 +433,11 @@ export default {
this.fax ? this.check11 = 1 : this.check11 = 0 this.fax ? this.check11 = 1 : this.check11 = 0
this.deliveryPeriod ? this.check12 = 1 : this.check12 = 0 this.deliveryPeriod ? this.check12 = 1 : this.check12 = 0
this.mainProduction ? check1 = 1 : check1 = 0 this.mainProduction ? check1 = 1 : check1 = 0
this.loading = true
searchData(this.check1, this.supplierName, this.check2, this.businessNature, this.check3, this.creationDate, this.check4, this.registeredCapital, this.check5, this.taxNumber, this.check6, this.bank, this.check7, this.account, this.check8, this.email, this.check9, this.address, this.check10, this.telephone, this.check11, this.fax, this.check12, this.deliveryPeriod, this.pageCurrent, this.pageSize, check1, this.mainProduction).then(response => { searchData(this.check1, this.supplierName, this.check2, this.businessNature, this.check3, this.creationDate, this.check4, this.registeredCapital, this.check5, this.taxNumber, this.check6, this.bank, this.check7, this.account, this.check8, this.email, this.check9, this.address, this.check10, this.telephone, this.check11, this.fax, this.check12, this.deliveryPeriod, this.pageCurrent, this.pageSize, check1, this.mainProduction).then(response => {
this.List = response.data.rows this.List = response.data.rows
this.total = response.data.total this.total = response.data.total
this.loading = false
}) })
}, },
handleAdd() { handleAdd() {
@@ -551,8 +555,10 @@ export default {
rowClick(row) { rowClick(row) {
this.List1 = [] this.List1 = []
this.form2.供应商流水号 = row.供应商流水号 this.form2.供应商流水号 = row.供应商流水号
this.loading2 = true
getName(this.form2.供应商流水号).then(response => { getName(this.form2.供应商流水号).then(response => {
this.List1 = response.data this.List1 = response.data
this.loading2 = false
}) })
}, },
handleAdd2() { handleAdd2() {

249
src/views/WorkshopProcurement/FundApproval2/index.vue
View File

@@ -2,7 +2,12 @@
<div class="app-container"> <div class="app-container">
<el-card> <el-card>
<!--<h3>采购合同</h3>--> <!--<h3>采购合同</h3>-->
<el-table v-loading="" :data="tableData" border stripe style="width: 100%;max-height: 500px;" height="300px" size="mini"> <el-table v-loading="" :data="tableData" border stripe style="width: 100%;" height="600px" size="mini">
<el-table-column label="类别" align="center" width="70">
<template slot-scope="scope">
{{ scope.row.类别 }}
</template>
</el-table-column>
<el-table-column label="供应商" align="center" min-width="170"> <el-table-column label="供应商" align="center" min-width="170">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.供应商名称 }} {{ scope.row.供应商名称 }}
@@ -26,7 +31,7 @@
<el-table-column label="审核" align="center" width="320"> <el-table-column label="审核" align="center" width="320">
<template slot-scope="scope"> <template slot-scope="scope">
<el-popover placement="right" width="400" trigger="click"> <el-popover placement="right" width="400" trigger="click">
<el-table :data="gridData2" stripe size="mini" show-summary> <el-table v-show="scope.row.类别==='采购'" :data="gridData2" stripe size="mini" show-summary>
<el-table-column width="50" align="center" type="index" label="序号"/> <el-table-column width="50" align="center" type="index" label="序号"/>
<el-table-column min-width="150" align="center" label="采购合同编号"> <el-table-column min-width="150" align="center" label="采购合同编号">
<template slot-scope="scope"> <template slot-scope="scope">
@@ -39,6 +44,24 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-table v-show="scope.row.类别==='备料'" :data="gridData1" stripe size="mini" show-summary>
<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="100" align="center" label="开票金额" prop="开票金额">
<template slot-scope="scope">
{{ scope.row.开票金额 }}
</template>
</el-table-column>
</el-table>
<el-button slot="reference" type="text" size="mini" icon="el-icon-search" style="margin-right: 10px" plain @click="searchTable01(scope.row)">查看详情</el-button> <el-button slot="reference" type="text" size="mini" icon="el-icon-search" style="margin-right: 10px" plain @click="searchTable01(scope.row)">查看详情</el-button>
</el-popover> </el-popover>
<el-button type="text" size="mini" icon="el-icon-check" plain @click="yesApproval(scope.row)">通过</el-button> <el-button type="text" size="mini" icon="el-icon-check" plain @click="yesApproval(scope.row)">通过</el-button>
@@ -59,6 +82,69 @@
</div> </div>
</el-card> </el-card>
<!--<el-card>--> <!--<el-card>-->
<!--&lt;!&ndash;<h3>备料合同</h3>&ndash;&gt;-->
<!--<el-table v-loading="" :data="tableData3" border style="width: 100%;max-height: 300px;" height="300px" size="mini">-->
<!--<el-table-column label="供应商" align="center" min-width="170">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.供应商名称 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="请款时间" align="center" min-width="150">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.请款时间 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="请款人" align="center" min-width="100">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.姓名 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="请款金额" align="center" min-width="100" prop="请款金额">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.请款金额 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="审核" align="center" width="320">-->
<!--<template slot-scope="scope">-->
<!--<el-popover placement="right" width="500" trigger="click">-->
<!--<el-table :data="gridData1" stripe size="mini" show-summary>-->
<!--<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="100" align="center" label="开票金额" prop="开票金额">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.开票金额 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--</el-table>-->
<!--<el-button slot="reference" type="success" size="mini" icon="el-icon-search" style="margin-right: 10px" plain @click="searchTable03(scope.row)">查看详情</el-button>-->
<!--</el-popover>-->
<!--<el-button type="primary" size="mini" icon="el-icon-check" plain @click="yesMaterials(scope.row)">通过</el-button>-->
<!--<el-button type="danger" size="mini" icon="el-icon-close" plain @click="noMaterials(scope.row)">不通过</el-button>-->
<!--</template>-->
<!--</el-table-column>-->
<!--</el-table>-->
<!--<div class="block" style="margin-top: 10px;">-->
<!--<el-pagination-->
<!--:current-page="pageCurrent3"-->
<!--:page-sizes="[10, 20, 30, 40]"-->
<!--:page-size="pageSize3"-->
<!--:total="total3"-->
<!--style="display:inline-block;width:50%"-->
<!--layout="total, sizes, prev, pager, next, jumper"-->
<!--@size-change="handleSizeChange3"-->
<!--@current-change="handleCurrentChange3"/>-->
<!--</div>-->
<!--</el-card>-->
<!--<el-card>-->
<!--<h3>离线合同</h3>--> <!--<h3>离线合同</h3>-->
<!--<el-table v-loading="" :data="tableData2" border style="width: 100%;max-height: 300px;" height="300px" size="mini">--> <!--<el-table v-loading="" :data="tableData2" border style="width: 100%;max-height: 300px;" height="300px" size="mini">-->
<!--<el-table-column label="供应商" align="center" min-width="170">--> <!--<el-table-column label="供应商" align="center" min-width="170">-->
@@ -116,69 +202,6 @@
<!--@current-change="handleCurrentChange2"/>--> <!--@current-change="handleCurrentChange2"/>-->
<!--</div>--> <!--</div>-->
<!--</el-card>--> <!--</el-card>-->
<el-card>
<!--<h3>备料合同</h3>-->
<el-table v-loading="" :data="tableData3" border style="width: 100%;max-height: 300px;" height="300px" size="mini">
<el-table-column label="供应商" align="center" min-width="170">
<template slot-scope="scope">
{{ scope.row.供应商名称 }}
</template>
</el-table-column>
<el-table-column label="请款时间" align="center" min-width="150">
<template slot-scope="scope">
{{ scope.row.请款时间 }}
</template>
</el-table-column>
<el-table-column label="请款人" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column label="请款金额" align="center" min-width="100" prop="请款金额">
<template slot-scope="scope">
{{ scope.row.请款金额 }}
</template>
</el-table-column>
<el-table-column label="审核" align="center" width="320">
<template slot-scope="scope">
<el-popover placement="right" width="500" trigger="click">
<el-table :data="gridData1" stripe size="mini" show-summary>
<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="100" align="center" label="开票金额" prop="开票金额">
<template slot-scope="scope">
{{ scope.row.开票金额 }}
</template>
</el-table-column>
</el-table>
<el-button slot="reference" type="success" size="mini" icon="el-icon-search" style="margin-right: 10px" plain @click="searchTable03(scope.row)">查看详情</el-button>
</el-popover>
<el-button type="primary" size="mini" icon="el-icon-check" plain @click="yesMaterials(scope.row)">通过</el-button>
<el-button type="danger" size="mini" icon="el-icon-close" plain @click="noMaterials(scope.row)">不通过</el-button>
</template>
</el-table-column>
</el-table>
<div class="block" style="margin-top: 10px;">
<el-pagination
:current-page="pageCurrent3"
:page-sizes="[10, 20, 30, 40]"
:page-size="pageSize3"
:total="total3"
style="display:inline-block;width:50%"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange3"
@current-change="handleCurrentChange3"/>
</div>
</el-card>
</div> </div>
</template> </template>
@@ -221,23 +244,53 @@ export default {
methods: { methods: {
fetchData() { fetchData() {
this.searchTable() this.searchTable()
this.searchTable2()
this.searchTable3()
}, },
searchTable() { searchTable() {
initApproval1(this.pageCurrent, this.pageSize, 1).then(response => { initApproval1(this.pageCurrent, this.pageSize, 1).then(response => {
for (let j = 0; j < response.data.rows.length; j++) { if (response.data.rows.length !== 0) {
response.data.rows[j].含税总金额 = parseInt(response.data.rows[j].含税总金额 * 100) / 100 for (let i = 0; i < response.data.rows.length; i++) {
response.data.rows[j].欠款金额 = parseInt(response.data.rows[j].欠款金额 * 100) / 100 response.data.rows[i].含税总金额 = parseInt(response.data.rows[i].含税总金额 * 100) / 100
response.data.rows[i].欠款金额 = parseInt(response.data.rows[i].欠款金额 * 100) / 100
this.tableData.push({
采购合同请款流水号: response.data.rows[i].采购合同请款流水号,
供应商名称: response.data.rows[i].供应商名称,
请款金额: response.data.rows[i].请款金额,
姓名: response.data.rows[i].姓名,
请款时间: response.data.rows[i].请款时间,
类别: '采购'
})
}
} }
this.tableData = response.data.rows initApprovalMaterials(this.pageCurrent3, this.pageSize3, 1).then(response1 => {
this.total = response.data.total if (response1.data.rows.length !== 0) {
for (let i = 0; i < response1.data.rows.length; i++) {
this.tableData.push({
采购计划请款流水号: response1.data.rows[i].采购计划请款流水号,
供应商名称: response1.data.rows[i].供应商名称,
请款金额: response1.data.rows[i].请款金额,
姓名: response1.data.rows[i].姓名,
请款时间: response1.data.rows[i].请款时间,
类别: '备料'
})
}
}
this.total = response.data.total + response1.data.total
})
}) })
}, },
searchTable01(row) { // 查看详情（请款信息包含的合同） // 查看详情（请款信息包含的合同）
searchRequsetFundDetail3(row.采购合同请款流水号).then(response => { searchTable01(row) {
this.gridData2 = response.data this.gridData1 = []
}) this.gridData2 = []
if (row.类别 === '采购') {
searchRequsetFundDetail3(row.采购合同请款流水号).then(response => {
this.gridData2 = response.data
})
} else {
searchRequsetFundDetail1(row.采购计划请款流水号).then(response => {
this.gridData1 = response.data
})
}
}, },
handleSizeChange(val) { handleSizeChange(val) {
this.pageSize = val this.pageSize = val
@@ -250,7 +303,6 @@ export default {
}, },
searchTable2() { searchTable2() {
initApprovalOffline(this.pageCurrent2, this.pageSize2, 1).then(response => { initApprovalOffline(this.pageCurrent2, this.pageSize2, 1).then(response => {
console.log(response.data.rows)
this.tableData2 = response.data.rows this.tableData2 = response.data.rows
this.total2 = response.data.total this.total2 = response.data.total
}) })
@@ -271,7 +323,6 @@ export default {
}, },
searchTable3() { searchTable3() {
initApprovalMaterials(this.pageCurrent3, this.pageSize3, 1).then(response => { initApprovalMaterials(this.pageCurrent3, this.pageSize3, 1).then(response => {
console.log(response.data.rows)
this.tableData3 = response.data.rows this.tableData3 = response.data.rows
this.total3 = response.data.total this.total3 = response.data.total
}) })
@@ -296,12 +347,21 @@ export default {
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
execApproval(row.采购合同请款流水号, 1, '通过', this.id, 1).then(response => { if (row.类别 === '采购') {
if (response.data[0].result === '1') { execApproval(row.采购合同请款流水号, 1, '通过', this.id, 1).then(response => {
this.$message.success('执行成功') if (response.data[0].result === '1') {
this.searchTable() this.$message.success('执行成功')
} else { this.$message.error('执行失败') } this.searchTable()
}) } else { this.$message.error('执行失败') }
})
} else {
execMaterials(row.采购计划请款流水号, 1, '通过', this.id, 1).then(response => {
if (response.data[0].result === '1') {
this.$message.success('执行成功')
this.searchTable3()
} else { this.$message.error('执行失败') }
})
}
}).catch(() => { }).catch(() => {
this.$message({ this.$message({
type: 'info', type: 'info',
@@ -314,12 +374,21 @@ export default {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消' cancelButtonText: '取消'
}).then(({ value }) => { }).then(({ value }) => {
execApproval(row.采购合同请款流水号, 2, value, this.id, 1).then(response => { if (row.类别 === '采购') {
if (response.data[0].result === '1') { execApproval(row.采购合同请款流水号, 2, value, this.id, 1).then(response => {
this.$message.success('执行成功') if (response.data[0].result === '1') {
this.searchTable() this.$message.success('执行成功')
} else { this.$message.error('执行失败') } this.searchTable()
}) } else { this.$message.error('执行失败') }
})
} else {
execMaterials(row.采购计划请款流水号, 2, value, this.id, 1).then(response => {
if (response.data[0].result === '1') {
this.$message.success('执行成功')
this.searchTable3()
} else { this.$message.error('执行失败') }
})
}
}).catch(() => { }).catch(() => {
this.$message({ this.$message({
type: 'info', type: 'info',