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

页面修改

Browse Source
This commit is contained in:
bryan sun
2019-11-09 14:18:56 +08:00
parent 3c87327400
commit 6d8379c8da
13 changed files with 167 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1888,7 +1888,8 @@ export default {
this.supplierName = ''
this.supplierValue = ''
this.dialogVisible2 = false
this.searchTable2()
this.inquirySheetNum = this.form2.inquirySheetNum
this.searchTable2(this.inquirySheetNum)
} else { this.$message.error('操作失败！该询价单已存在，请重新输入') }
})
}

4
src/views/PurchasingCenter/FundApproval3/index.vue
View File

@@ -10,7 +10,7 @@
</el-table-column>
<el-table-column label="请款时间" align="center" min-width="140">
<template slot-scope="scope">
{{ scope.row.请款时间 }}
{{ scope.row.请款时间.substr(0,10) }}
</template>
</el-table-column>
<el-table-column label="请款人" align="center" min-width="80">
@@ -68,7 +68,7 @@
</el-table-column>
<el-table-column label="请款时间" align="center" min-width="140">
<template slot-scope="scope">
{{ scope.row.请款时间 }}
{{ scope.row.请款时间.substr(0,10) }}
</template>
</el-table-column>
<el-table-column label="请款人" align="center" min-width="80">

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

@@ -30,11 +30,11 @@
{{ 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="150">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.离线合同名称 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="离线合同编号" align="center" min-width="160">
<template slot-scope="scope">
{{ scope.row.离线合同编号 }}

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

@@ -159,6 +159,7 @@ export default {
})
},
searchTable1() {
this.tableData1 = []
this.contractNumValue ? this.check1 = 1 : this.check1 = 0
this.supplierName ? this.check2 = 1 : this.check2 = 0
searchPayState(this.pageCurrent1, this.pageSize1, this.check1, this.contractNumValue, this.check2, this.supplierName).then(response => {

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

@@ -3,7 +3,7 @@
<el-card>
<div slot="header">
<span>项目名称:</span>
<el-select v-model="projectValue" style="width:200px" placeholder="项目名称" size="small" filterable clearable @change="projectChange">
<el-select v-model="projectValue" style="width:150px" placeholder="项目名称" size="small" filterable clearable @change="projectChange">
<el-option
v-for="item in project"
:key="item.value"
@@ -11,21 +11,21 @@
:value="item.value"/>
</el-select>
<span>机床图号:</span>
<el-select v-model="machineValue" style="width:190px" placeholder="请选择" size="small" clearable filterable @change="machineChange">
<el-select v-model="machineValue" style="width:150px" placeholder="请选择" size="small" clearable filterable @change="searchTable1">
<el-option
v-for="item in machine"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<span>组号:</span>
<el-select v-model="groupValue" style="width:140px" placeholder="请选择" size="small" clearable filterable>
<el-option
v-for="item in group"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<!-- <span>组号:</span>-->
<!-- <el-select v-model="groupValue" style="width:140px" placeholder="请选择" size="small" clearable filterable>-->
<!-- <el-option-->
<!-- v-for="item in group"-->
<!-- :key="item.value"-->
<!-- :label="item.label"-->
<!-- :value="item.value"/>-->
<!-- </el-select>-->
<el-button
type="success"
size="small"
@@ -35,11 +35,18 @@
</div>
<el-table v-loading="" :data="tableData1" show-summary stripe border style="width: 100%;max-height: 600px;" height="600px" size="mini">
<el-table-column label="序号" align="center" width="80" type="index"/>
<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">-->
<!-- <template slot-scope="scope">-->
<!-- <span>采购</span>-->
<!-- <span>到货</span>-->
<!-- <span>领用</span>-->
<!-- </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 align="center" label="机床图号" width="100px">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
@@ -50,12 +57,12 @@
{{ scope.row.组号 || '—' }}
</template>
</el-table-column>
<el-table-column label="名称" align="center" min-width="100">
<el-table-column label="名称" align="center" min-width="120">
<template slot-scope="scope">
{{ scope.row.名称 }}
</template>
</el-table-column>
<el-table-column label="图号或型号" align="center" min-width="100">
<el-table-column label="图号或型号" align="center" min-width="120">
<template slot-scope="scope">
{{ scope.row.图号 }}
</template>
@@ -70,21 +77,30 @@
{{ 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">
<template slot-scope="scope">
{{ scope.row.单价 }}
{{ Number(scope.row.优惠后单价).toFixed(2) }}
</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="金额">
<el-table-column label="采购小计(元)" align="center" min-width="100" prop="金额">
<template slot-scope="scope">
{{ scope.row.金额 = (Number(scope.row.优惠后单价) * Number(scope.row.数量)).toFixed(2) }}
</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">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.领用小计 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
</el-card>
</div>
@@ -145,6 +161,7 @@ export default {
})
}
})
this.searchTable1()
},
machineChange() {
this.group = []
@@ -163,6 +180,7 @@ export default {
let check2, check3
this.machineValue ? check2 = 1 : check2 = 0
this.groupValue ? check3 = 1 : check3 = 0
console.log(1, this.projectValue, check2, this.machineValue, check3, this.groupValue)
searchProjectTotal(1, this.projectValue, check2, this.machineValue, check3, this.groupValue).then(response => {
this.tableData1 = response.data
})

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

@@ -24,7 +24,7 @@
<!--</el-option>-->
<!--</el-select>-->
<!--<span>合同编号:</span>-->
<el-input v-model="contractNumber" placeholder="合同编号" size="small" clearable style="width:180px"/>
<el-input v-model="contractNumber" placeholder="合同编号" size="small" clearable style="width:200px"/>
<!--<span>供应商:</span>-->
<el-input v-model="supplierName" placeholder="供应商" size="small" clearable style="width:180px"/>
<!--<span>采购员:</span>-->
@@ -56,7 +56,7 @@
size="small"
icon="el-icon-search"
style="margin-left:10px"
@click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
@click="total1=0;pageCurrent1=1;pageSize1=30;searchTable1()">查询</el-button>
<el-tooltip :open-delay="1000" effect="dark" content="打印采购合同" placement="top">
<el-button
type="warning"
@@ -107,75 +107,100 @@
</el-form>
</template>
</el-table-column>
<el-table-column label="供应商" prop="供应商名称" align="center" width="150" show-overflow-tooltip>
<el-table-column label="供应商" prop="供应商名称" align="center" min-width="150" show-overflow-tooltip>
<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="采购合同号" prop="采购合同编号" align="center" min-width="160">
<!-- <el-table-column label="采购合同名称" align="center" min-width="150">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.采购合同名称 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="采购合同号" prop="采购合同编号" align="center" min-width="150" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.采购合同编号 }}
</template>
</el-table-column>
<el-table-column label="审核情况" prop="审核情况内容" align="center" min-width="100">
<el-table-column label="合同审核" prop="审核情况内容" align="center" width="70">
<template slot-scope="scope">
<el-tag v-if="scope.row.审核情况内容==='未审核'" type="primary" size="small">未审核</el-tag>
<el-tag v-if="scope.row.审核情况内容==='通过审核'" type="success" size="small">已通过</el-tag>
<el-tag v-if="scope.row.审核情况内容==='未通过审核'" type="danger" size="small">未通过</el-tag>
<span v-if="scope.row.审核情况内容==='未审核'">未审核</span>
<span v-if="scope.row.审核情况内容==='通过审核'">已通过</span>
<span v-if="scope.row.审核情况内容==='未通过审核'">未通过</span>
<!-- <el-tag v-if="scope.row.审核情况内容==='未审核'" type="primary" size="small">未审核</el-tag>-->
<!-- <el-tag v-if="scope.row.审核情况内容==='通过审核'" type="success" size="small">已通过</el-tag>-->
<!-- <el-tag v-if="scope.row.审核情况内容==='未通过审核'" type="danger" size="small">未通过</el-tag>-->
</template>
</el-table-column>
<el-table-column label="审批情况" prop="审批情况内容" align="center" min-width="100">
<el-table-column label="合同审批" prop="审批情况内容" align="center" width="70">
<template slot-scope="scope">
<el-tag v-if="scope.row.审批情况内容==='未审批'" type="primary" size="small">未审批</el-tag>
<el-tag v-if="scope.row.审批情况内容==='通过审批'" type="success" size="small">已通过</el-tag>
<el-tag v-if="scope.row.审批情况内容==='不通过审批'" type="danger" size="small">未通过</el-tag>
<span v-if="scope.row.审批情况内容==='未审批'">未审批</span>
<span v-if="scope.row.审批情况内容==='通过审批'">已通过</span>
<span v-if="scope.row.审批情况内容==='不通过审批'">未通过</span>
<!-- <el-tag v-if="scope.row.审批情况内容==='未审批'" type="primary" size="small">未审批</el-tag>-->
<!-- <el-tag v-if="scope.row.审批情况内容==='通过审批'" type="success" size="small">已通过</el-tag>-->
<!-- <el-tag v-if="scope.row.审批情况内容==='不通过审批'" type="danger" size="small">未通过</el-tag>-->
</template>
</el-table-column>
<el-table-column label="未通过审核原因" align="center" width="150" show-overflow-tooltip>
<el-table-column label="未审核原因" align="center" min-width="90" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.未通过审核原因 ? scope.row.未通过审核原因 : '—' }}
</template>
</el-table-column>
<el-table-column label="未通过审批原因" align="center" width="150" show-overflow-tooltip>
<el-table-column label="未审批原因" align="center" min-width="90" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.未通过原因 ? scope.row.未通过原因 : '—' }}
</template>
</el-table-column>
<el-table-column label="审核时间" align="center" min-width="140">
<template slot-scope="scope">
{{ scope.row.审核时间 ? scope.row.审核时间 : '—' }}
</template>
</el-table-column>
<el-table-column label="审批时间" align="center" min-width="140">
<template slot-scope="scope">
{{ scope.row.审批时间 ? scope.row.审核时间 : '—' }}
</template>
</el-table-column>
<el-table-column label="处理" align="center" min-width="130">
<template slot-scope="scope">
<el-tag v-if="Number(scope.row.是否未通过)===1&&Number(scope.row.不通过处理)===1" type="success" size="small">处理完成</el-tag>
<el-button v-else-if="Number(scope.row.是否未通过)===1&&Number(scope.row.不通过处理)===0" type="primary" size="mini" @click="done(scope.row)">点击处理完成</el-button>
<span v-else>—</span>
</template>
</el-table-column>
<el-table-column label="采购员" prop="姓名" align="center" min-width="90">
<el-table-column label="采购员" prop="姓名" align="center" width="60">
<template slot-scope="scope">
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column label="总金额" align="center" width="100">
<el-table-column label="总金额" align="center" width="90">
<template slot-scope="scope">
{{ scope.row.合同总额 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" min-width="100" fixed="right">
<el-table-column label="已付金额" align="center" width="90" show-overflow-tooltip>
<template slot-scope="scope">
<el-button :disabled="false" type="danger" plain size="mini" icon="el-icon-delete" @click="deleteContract(scope.row)">删除</el-button>
{{ scope.row.付款金额 }}
</template>
</el-table-column>
<el-table-column label="欠款金额" align="center" width="90" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.欠款金额 }}
</template>
</el-table-column>
<!-- <el-table-column label="审核时间" align="center" width="80">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.审核时间 ? scope.row.审核时间.substr(0,9) : '—' }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="审批时间" align="center" min-width="80">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.审批时间 ? scope.row.审核时间.substr(0,9) : '—' }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="处理" align="center" width="110">
<template slot-scope="scope">
<el-tag v-if="Number(scope.row.是否未通过)===1&&Number(scope.row.不通过处理)===1" type="success" size="small">处理完成</el-tag>
<el-button v-else-if="Number(scope.row.是否未通过)===1&&Number(scope.row.不通过处理)===0" plain type="primary" size="mini" @click="done(scope.row)">点击处理</el-button>
<span v-else>—</span>
</template>
</el-table-column>
<!-- <el-table-column label="到货进度" align="center" min-width="150">-->
<!-- <template slot-scope="scope">-->
<!-- <el-progress-->
<!-- :text-inside="true"-->
<!-- :stroke-width="18"-->
<!-- :percentage="scope.row.到货进度 = (100*(Number(scope.row.合同到货总数))/scope.row.合同采购总数) > 100 ? 100 : Number((100*(Number(scope.row.合同到货总数))/scope.row.合同采购总数).toFixed(2))"-->
<!-- status="success"/>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="操作" align="center" width="70">
<template slot-scope="scope">
<el-button :disabled="false" type="text" size="mini" icon="el-icon-delete" @click="deleteContract(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
@@ -201,7 +226,7 @@
</template>
<script>
import { initContract, initBuyer, searchTable1, searchTable2, deleteContract, handleDone } from '@/api/PurchasingCenter/PurchaseContractSearch'
import { initContract, initBuyer, searchTable1, searchTable2, handleDone, deleteContract } from '@/api/PurchasingCenter/PurchaseContractSearch'
import QRCode from 'qrcode'
import $ from 'jquery'
// import { exportExcelMethod } from './exportExcel'
@@ -392,7 +417,27 @@ export default {
for (let i = 0; i < response.data.rows.length; i++) {
response.data.rows[i].审批情况内容 === '未审批' ? this.disable.push(false) : this.disable.push(true) // 删除按钮禁用
}
this.tableData1 = response.data.rows
console.log(response, 12)
if (response.data.rows.length !== 0) {
for (let i = 0; i < response.data.rows.length; i++) {
this.tableData1.push({
供应商名称: response.data.rows[i].供应商名称,
采购合同编号: response.data.rows[i].采购合同编号,
未通过审核原因: response.data.rows[i].未通过审核原因,
审核情况内容: response.data.rows[i].审核情况内容,
审批情况内容: response.data.rows[i].审批情况内容,
未通过原因: response.data.rows[i].未通过原因,
合同总额: response.data.rows[i].合同总额,
付款金额: response.data.rows[i].付款金额,
是否未通过: response.data.rows[i].是否未通过,
不通过处理: response.data.rows[i].不通过处理,
姓名: response.data.rows[i].姓名,
合同金额: response.data.rows[i].合同金额,
欠款金额: response.data.rows[i].欠款金额,
采购合同流水号: response.data.rows[i].采购合同流水号
})
}
}
this.total1 = response.data.total
this.loading1 = false
})