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

更新

Browse Source
This commit is contained in:
liushuai
2020-03-20 18:06:37 +08:00
parent 7389ead64d
commit 4d32454b1a
19 changed files with 387 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/views/PurchasingCenter/PurchaseContractReview/index.vue
View File

@@ -38,38 +38,38 @@
<!-- </el-card>-->
<el-card>
<el-table v-loading="loading1" :data="tableData1" size="mini" border stripe style="width: 60%; max-height: 500px" height="150px" highlight-current-row @row-click="searchTable2">
<el-table-column type="expand" label="详情">
<template slot-scope="scope">
<el-form id="table" label-position="left" inline class="demo-table-expand">
<el-row>
<el-form-item label="交货日期">
{{ scope.row.交货日期 }}
</el-form-item>
</el-row>
<el-row>
<el-form-item label="支付日期">
{{ scope.row.支付日期 }}
</el-form-item>
</el-row>
<el-row>
<el-form-item label="支付方式">
{{ scope.row.支付方式 }}
</el-form-item>
</el-row>
<el-row>
<el-form-item label="开票信息">
{{ scope.row.开票信息 }}
</el-form-item>
</el-row>
<el-row>
<el-form-item label="其他说明">
{{ scope.row.其他说明 }}
</el-form-item>
</el-row>
</el-form>
</template>
</el-table-column>
<el-table v-loading="loading1" :data="tableData1" size="mini" border stripe style="width: 60%;" height="210px" highlight-current-row @row-click="searchTable2">
<!-- <el-table-column type="expand" label="详情">-->
<!-- <template slot-scope="scope">-->
<!-- <el-form id="table" label-position="left" inline class="demo-table-expand">-->
<!-- <el-row>-->
<!-- <el-form-item label="交货日期">-->
<!-- {{ scope.row.交货日期 }}-->
<!-- </el-form-item>-->
<!-- </el-row>-->
<!-- <el-row>-->
<!-- <el-form-item label="支付日期">-->
<!-- {{ scope.row.支付日期 }}-->
<!-- </el-form-item>-->
<!-- </el-row>-->
<!-- <el-row>-->
<!-- <el-form-item label="支付方式">-->
<!-- {{ scope.row.支付方式 }}-->
<!-- </el-form-item>-->
<!-- </el-row>-->
<!-- <el-row>-->
<!-- <el-form-item label="开票信息">-->
<!-- {{ scope.row.开票信息 }}-->
<!-- </el-form-item>-->
<!-- </el-row>-->
<!-- <el-row>-->
<!-- <el-form-item label="其他说明">-->
<!-- {{ scope.row.其他说明 }}-->
<!-- </el-form-item>-->
<!-- </el-row>-->
<!-- </el-form>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="采购合同号" align="center" min-width="130">
<template slot-scope="scope">
{{ scope.row.采购合同编号 }}
@@ -80,7 +80,7 @@
<!-- {{ scope.row.采购合同名称 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="供应商" align="center" min-width="150">
<el-table-column label="供应商" align="center" min-width="150" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.供应商名称 }}
</template>

33
src/views/PurchasingCenter/PurchaseContractSearch/index.vue
View File

@@ -80,6 +80,7 @@
plain
@click="download()">打印</el-button>
</el-tooltip>
<el-button type="success" size="small" icon="el-icon-download" plain style="float: right; margin-right: 130px;" @click="exportExcel">导出</el-button>
</el-row>
</div>
<el-table
@@ -377,6 +378,38 @@ export default {
})
})
},
exportExcel() { // 采购合同导出
this.dateRange ? this.check1 = 1 : (this.check1 = 0, this.dateRange = '')
this.contractNumValue ? this.check2 = 1 : this.check2 = 0
this.personValue ? this.check3 = 1 : this.check3 = 0
this.supplierName ? this.check4 = 1 : this.check4 = 0
if (this.approvalValue === '' || this.approvalValue === 0) {
this.check5 = 0
} else {
this.check5 = 1
}
let check, check2
this.contractNumber ? check = 1 : check = 0
this.revieweValue ? check2 = 1 : check2 = 0
var param = []
param[0] = ['时间段_check', this.check1]
param[1] = ['开始时间', this.dateRange[0]]
param[2] = ['结束时间', this.dateRange[1]]
param[3] = ['采购合同流水号_check', this.check2]
param[4] = ['采购合同流水号', this.contractNumValue]
param[5] = ['人员编号_check', this.check3]
param[6] = ['人员编号', this.personValue]
param[7] = ['供应商名称_check', this.check4]
param[8] = ['供应商名称', this.supplierName]
param[9] = ['审批情况流水号_check', this.check5]
param[10] = ['审批情况流水号', this.approvalValue]
param[11] = ['采购合同编号_check', check]
param[12] = ['采购合同编号', this.contractNumber]
param[13] = ['审核情况流水号_check', check2]
param[14] = ['审核情况流水号', this.revieweValue]
var Data = this.CreateData('2001', '报表_采购合同信息', param)
this.exportExcel_NPOI(Data)
},
deleteContract(row) { // 删除合同
this.$confirm('此操作将永久删除合同所有内容，确定删除?', '提示', {
confirmButtonText: '确定',

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

@@ -48,7 +48,7 @@
<el-tabs v-model="PartType" type="border-card" @tab-click="searchTable()">
<el-tab-pane label="标准件" name="标准件">
<el-table v-loading="loading0" :data="tableData0" size="mini" height="700px" border stripe>
<el-table v-loading="loading0" :data="tableData0" size="mini" height="700px" border stripe @sort-change="sortChange0">
<el-table-column align="center" prop="询价状态编号" label="采购状态" width="90px">
<template slot-scope="scope">
<!--<el-tag v-if="!scope.row.人员编号" type="primary" size="small">未分配</el-tag>-->
@@ -66,12 +66,12 @@
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column align="center" label="组号" prop="组号" width="70px">
<el-table-column align="center" label="组号" prop="组号" width="80px" sortable="custom">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column align="center" label="名称" prop="物料名称" width="153px" show-overflow-tooltip>
<el-table-column align="center" label="名称" prop="物料名称" width="153px" show-overflow-tooltip sortable="custom">
<template slot-scope="scope">
{{ scope.row.物料名称 }}
</template>
@@ -81,12 +81,12 @@
{{ scope.row.物料型号 }}
</template>
</el-table-column>
<el-table-column align="center" label="规格" prop="物料规格" width="128px" show-overflow-tooltip>
<el-table-column align="center" label="规格" prop="物料规格" width="128px" show-overflow-tooltip sortable="custom">
<template slot-scope="scope">
{{ scope.row.物料规格 }}
</template>
</el-table-column>
<el-table-column align="center" label="供货商" prop="供货商" width="132px" show-overflow-tooltip>
<el-table-column align="center" label="供货商" prop="供货商" width="132px" show-overflow-tooltip sortable="custom">
<template slot-scope="scope">
{{ scope.row.供货商 || '—' }}
</template>
@@ -117,7 +117,7 @@
<span v-else>未到货</span>
</template>
</el-table-column>
<el-table-column align="center" label="供应商" prop="供应商名称" min-width="150px" show-overflow-tooltip>
<el-table-column align="center" label="供应商" prop="供应商名称" min-width="150px" show-overflow-tooltip sortable="custom">
<template slot-scope="scope">
{{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.供应商名称 || scope.row.离线合同供应商名称 || '—' }}
</template>
@@ -156,7 +156,7 @@
</div>
</el-tab-pane>
<el-tab-pane label="外购件" name="外购件">
<el-table v-loading="loading1" :data="tableData1" size="mini" height="700px" border stripe>
<el-table v-loading="loading1" :data="tableData1" size="mini" height="700px" border stripe @sort-change="sortChange1">
<el-table-column align="center" label="采购状态" prop="询价状态编号" width="90px">
<template slot-scope="scope">
<el-tag v-if="!scope.row.人员编号" type="primary" size="small">未分配</el-tag>
@@ -170,12 +170,12 @@
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column align="center" label="组号" prop="组号" width="70px">
<el-table-column align="center" label="组号" prop="组号" width="70px" sortable="custom">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column align="center" label="名称" prop="物料名称" width="153px" show-overflow-tooltip>
<el-table-column align="center" label="名称" prop="物料名称" width="153px" show-overflow-tooltip sortable="custom">
<template slot-scope="scope">
{{ scope.row.物料名称 }}
</template>
@@ -185,12 +185,12 @@
{{ scope.row.物料型号 }}
</template>
</el-table-column>
<el-table-column align="center" label="规格" prop="物料规格" width="128px" show-overflow-tooltip>
<el-table-column align="center" label="规格" prop="物料规格" width="128px" show-overflow-tooltip sortable="custom">
<template slot-scope="scope">
{{ scope.row.物料规格 }}
</template>
</el-table-column>
<el-table-column align="center" label="供货商" prop="供货商" width="132px" show-overflow-tooltip>
<el-table-column align="center" label="供货商" prop="供货商" width="132px" show-overflow-tooltip sortable="custom">
<template slot-scope="scope">
{{ scope.row.供货商 || '—' }}
</template>
@@ -221,7 +221,7 @@
<span v-else>未到货</span>
</template>
</el-table-column>
<el-table-column align="center" label="供应商" prop="供应商名称" min-width="150px" show-overflow-tooltip>
<el-table-column align="center" label="供应商" prop="供应商名称" min-width="150px" show-overflow-tooltip sortable="custom">
<template slot-scope="scope">
{{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.供应商名称 || scope.row.离线合同供应商名称 || '—' }}
</template>
@@ -260,7 +260,7 @@
</div>
</el-tab-pane>
<el-tab-pane label="基本件" name="基本件">
<el-table v-loading="loading2" :data="tableData2" size="mini" height="700px" border stripe>
<el-table v-loading="loading2" :data="tableData2" size="mini" height="700px" border stripe @sort-change="sortChange2">
<el-table-column align="center" label="采购状态" prop="询价状态编号" width="90px">
<template slot-scope="scope">
<span v-if="!scope.row.人员编号" type="primary" size="small">未分配</span>
@@ -274,12 +274,12 @@
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column align="center" label="组号" prop="组号" width="70px">
<el-table-column align="center" label="组号" prop="组号" width="70px" sortable="custom">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column align="center" label="名称" prop="物料名称" width="153px" show-overflow-tooltip>
<el-table-column align="center" label="名称" prop="物料名称" width="153px" show-overflow-tooltip sortable="custom">
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
@@ -289,7 +289,7 @@
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column align="center" label="规格" prop="规格" width="128px" show-overflow-tooltip>
<el-table-column align="center" label="规格" prop="规格" width="128px" show-overflow-tooltip sortable="custom">
<template slot-scope="scope">
{{ scope.row.规格 }}
</template>
@@ -299,7 +299,7 @@
{{ scope.row.材料 }}
</template>
</el-table-column>
<el-table-column align="center" label="供货商" prop="供货商" width="132px" show-overflow-tooltip>
<el-table-column align="center" label="供货商" prop="供货商" width="132px" show-overflow-tooltip sortable="custom">
<template slot-scope="scope">
{{ scope.row.供货商 || '—' }}
</template>
@@ -332,7 +332,7 @@
<span v-else>未到货</span>
</template>
</el-table-column>
<el-table-column align="center" label="供应商" prop="供应商名称" min-width="100px" show-overflow-tooltip>
<el-table-column align="center" label="供应商" prop="供应商名称" min-width="100px" show-overflow-tooltip sortable="custom">
<template slot-scope="scope">
{{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.供应商名称 || '—' }}
</template>
@@ -613,6 +613,27 @@ export default {
this.pageCurrent2 = val
this.searchTable2()
},
sortChange0(column, prop, order) {
console.log(column + '-' + column.prop + '-' + column.order, 11111)
if (column.prop === '组号') {
this.partName = 1
} else if (column.prop === '物料名称') { this.partName = 2 } else if (column.prop === '物料规格') {
this.partName = 3
} else if (column.prop === '供货商') {
this.partName = 4
} else if (column.prop === '供应商名称') {
this.partName = 5
} else {
this.partName = ''
}
console.log(this.ordername, 9990999)
if (column.order === 'ascending') {
this.order = 1
} else if (column.order === 'descending') { this.order = 2 } else {
this.order = ''
}
this.searchTable0()
},
searchTable0() { // 查询标准件
this.tableData0 = []
let check1, check2, check3, check4, check5, check6
@@ -623,7 +644,7 @@ export default {
this.model ? check5 = 1 : check5 = 0
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], this.order, this.partName).then(response => {
if (response.data.result !== 0) {
for (let i = 0; i < response.data.result.length; i++) {
this.tableData0.push({
@@ -659,6 +680,27 @@ export default {
this.loading0 = false
})
},
sortChange1(column, prop, order) {
console.log(column + '-' + column.prop + '-' + column.order, 11111)
if (column.prop === '组号') {
this.partName = 1
} else if (column.prop === '物料名称') { this.partName = 2 } else if (column.prop === '物料规格') {
this.partName = 3
} else if (column.prop === '供货商') {
this.partName = 4
} else if (column.prop === '供应商名称') {
this.partName = 5
} else {
this.partName = ''
}
console.log(this.ordername, 9990999)
if (column.order === 'ascending') {
this.order = 1
} else if (column.order === 'descending') { this.order = 2 } else {
this.order = ''
}
this.searchTable1()
},
searchTable1() { // 查询外购件
this.tableData1 = []
let check1, check2, check3, check4, check5, check6
@@ -669,7 +711,7 @@ export default {
this.model ? check5 = 1 : check5 = 0
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], this.order, this.partName).then(response => {
console.log(response.data.result.length, 222)
// this.total02 = parseInt(response.data.output[0].ItemCount)
@@ -708,6 +750,27 @@ export default {
this.loading1 = false
})
},
sortChange2(column, prop, order) {
console.log(column + '-' + column.prop + '-' + column.order, 11111)
if (column.prop === '组号') {
this.partName = 1
} else if (column.prop === '物料名称') { this.partName = 2 } else if (column.prop === '物料规格') {
this.partName = 3
} else if (column.prop === '供货商') {
this.partName = 4
} else if (column.prop === '供应商名称') {
this.partName = 5
} else {
this.partName = ''
}
console.log(this.ordername, 9990999)
if (column.order === 'ascending') {
this.order = 1
} else if (column.order === 'descending') { this.order = 2 } else {
this.order = ''
}
this.searchTable2()
},
searchTable2() { // 查询基本件
let check1, check2, check3, check4, check5, check6
this.machineNumberValue ? check1 = 1 : check1 = 0
@@ -717,7 +780,7 @@ export default {
this.model ? check5 = 1 : check5 = 0
this.loading2 = true
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], this.order, this.partName).then(response => {
this.tableData2 = response.data.result
this.total2 = parseInt(response.data.output[0].ItemCount)
this.loading2 = false

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

@@ -39,19 +39,21 @@
</el-select>
<el-button type="primary" icon="el-icon-search" size="small" plain style="margin-left: 10px" @click="searchProject()">查询</el-button>
<el-tooltip v-show="true" :open-delay="1000" effect="dark" content="导出领用核算表" placement="top">
<el-button type="primary" plain class="el-icon-download" size="small" style="margin: 10px 0 0 410px" @click="exportExcel">导出</el-button>
<el-button type="primary" plain class="el-icon-download" size="small" style="margin: 10px 50px 0px 10px" @click="exportExcel">导出</el-button>
</el-tooltip>
<span>领用合计（元）：</span>
<span>{{ totalPrice }}</span>
</div>
<el-table
v-loading="loading"
:data="tableData1"
:summary-method="getSummaries"
style="width: 990px"
style="width: 1040px"
height="650"
size="mini"
show-summary
stripe
border>
border
@sort-change="sortChange">
<!--<el-table-column align="center" label="序号" type="index"/>-->
<!--<el-table-column align="center" label="项目名称">-->
<!--<template slot-scope="scope">-->
@@ -78,18 +80,17 @@
{{ scope.row.物料规格 }}
</template>
</el-table-column>
<el-table-column align="center" label="物料型号" width="100px" show-overflow-tooltip>
<el-table-column align="center" label="物料型号" width="150px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料型号 }}
</template>
</el-table-column>
<el-table-column label="采购数量" align="center" width="80px">
<template slot-scope="scope">
{{ scope.row.数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="采购单价(元)" width="105px">
<el-table-column align="center" label="采购单价(元)" width="110px">
<template slot-scope="scope">
{{ Number(scope.row.单价).toFixed(2) }}
</template>
@@ -104,7 +105,7 @@
{{ scope.row.小计 ? scope.row.小计.toFixed(2) : 0.00 }}
</template>
</el-table-column>
<el-table-column align="center" label="领用时间" width="110px" show-overflow-tooltip>
<el-table-column align="center" label="领用时间" prop="领用时间" width="110px" sortable="custom" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.出库时间.substr(0,10) }}
</template>
@@ -145,7 +146,10 @@ export default {
pageSize: 50,
total: 0,
sum: 0,
machinenum: ''
machinenum: '',
totalPrice: 0.00,
partName: '',
order: ''
}
},
created() {
@@ -250,6 +254,20 @@ export default {
})
return sums
},
sortChange(column, prop, order) {
console.log(column + '-' + column.prop + '-' + column.order, 11111)
if (column.prop === '领用时间') {
this.partName = 1
} else {
this.partName = ''
}
if (column.order === 'ascending') {
this.order = 1
} else if (column.order === 'descending') { this.order = 2 } else {
this.order = ''
}
this.searchProject()
},
searchProject() { // 查询
// if (!this.projectValue) {
// this.$message.error('请选择项目')
@@ -259,14 +277,17 @@ export default {
this.groupValue ? check3 = 1 : check3 = 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, this.order, this.partName).then(response => {
this.tableData1 = response.data.result
// for (let i = 0; i <= response.data.rows.length; i++) {
// this.totalPrice = (Number(this.totalPrice) + Number(response.data.rows[i].数量) * Number(response.data.rows[i].单价)).toFixed(2)
// }
this.total = parseInt(response.data.output[0].ItemCount)
this.loading = false
}).then(() => {
searchsum(0, this.projectValue, check2, this.machine, check3, this.groupValue, check4, this.machinenum).then(res => {
console.log(res.data)
this.sum = Number(res.data[0].合计).toFixed(2)
console.log(res.data, 121)
this.totalPrice = Number(res.data[0].合计).toFixed(2)
})
}).catch(() => {})
this.loading = false

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

@@ -3,10 +3,10 @@
<el-card>
<el-form ref="form1" :model="form1" label-position="right" label-width="70px" class="searchForm">
<el-row>
<el-col style="width: 250px">
<el-form-item label="供应商">
<el-input v-model="supplierName" placeholder="供应商名称" size="small" clearable/>
</el-form-item>
<el-col style="width: 180px">
<!-- <el-form-item label="供应商">-->
<el-input v-model="supplierName" placeholder="供应商名称" size="small" clearable @change="fetchData"/>
<!-- </el-form-item>-->
</el-col>
<!-- <el-col style="width: 250px">-->
<!-- <el-form-item label="法人">-->
@@ -63,16 +63,16 @@
<!-- <el-input v-model="mainProduction" placeholder="主要产品" size="small" clearable/>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col style="width: 250px;margin:2px 0 0 15px">
<el-button type="primary" size="small" icon="el-icon-search" plain @click="pageCurrent = 1;fetchData()">查询</el-button>
<el-button type="warning" size="small" icon="el-icon-circle-plus-outline" plain style="margin-left:10px" @click="handleAdd()">新增供应商</el-button>
<el-col style="width: 250px;margin:0px 0 0 15px">
<!-- <el-button type="primary" size="small" icon="el-icon-search" plain @click="pageCurrent = 1;fetchData()">查询</el-button>-->
<el-button type="warning" size="small" icon="el-icon-circle-plus-outline" plain style="margin-left:10px" @click="handleAdd()">供应商</el-button>
</el-col>
</el-row>
</el-form>
</el-card>
<el-card>
<div style="display: inline-block;margin-bottom: 5px">供应商列表</div>
<!-- <div style="display: inline-block;margin-bottom: 5px">供应商列表</div>-->
<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">
<template slot-scope="scope">