刘璐珈

This commit is contained in:
Vergil
2020-03-09 17:18:31 +08:00
parent 8d4607b5ca
commit c2d4e64c35
21 changed files with 998 additions and 350 deletions

View File

@@ -1,14 +1,14 @@
<template>
<div class="app-container">
<el-card style="">
<div v-if="Number(token)===2" style="width:100%">
<el-divider content-position="right">
<div v-if="Number(token)===2" style="width:100%;height: 300px; overflow:auto;" >
<el-divider content-position="right" style="background-color: #FFFFFF">
<el-button type="text" @click="searchUnallocatePartNumber">刷新</el-button> | 待分配零件数
</el-divider>
<el-row >
<el-row style="">
<el-col v-for="(machine,index) in machines" :key="index" style="width: 200px">
<el-card shadow="hover" class="sudoku_item" style="height:80px;width: 90%" @click.native="clickCard(machine.项目流水号, machine.机床流水号)">
<el-badge :value="machine.未分配零件数">
<el-card shadow="hover" class="sudoku_item" style="height:50px;width: 90%" @click.native="clickCard(machine.项目流水号, machine.机床流水号)">
<el-badge :value="machine.未分配零件数" style="margin-top: 17px">
<div style="width: 100px;height:50px;margin:0" class="sudoku_item">
{{ machine.机床图号 }}
</div>
@@ -124,7 +124,7 @@
:header-cell-style="{fontFamily:'YouYuan',fontSize:'14px',fontWeight:200}"
size="mini"
height="740px"
style="width: 1265px"
style="width: 1363px"
border
stripe
highlight-current-row
@@ -193,6 +193,16 @@
{{ scope.row.供货商 }}
</template>
</el-table-column>
<el-table-column align="center" prop="接收日期" label="接收日期" min-width="100px" width="100px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.接收日期 }}
</template>
</el-table-column>
<el-table-column v-if="radio===2" align="center" prop="分配日期" label="分配日期" min-width="100px" width="100px" 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="零件类型">-->
<!--<template slot-scope="scope">-->
<!--{{ Number(scope.row.零件类型) === 1 ? 'BZ' : 'WG' }}-->
@@ -208,7 +218,7 @@
<!--{{ scope.row.操作日期.split(' ')[0] }}-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column v-if="radio==='2'" :filters="person" :filter-method="filterHandler" align="center" label="采购员" min-width="80px" prop="姓名">
<el-table-column v-if="radio===2" :filters="person" :filter-method="filterHandler" align="center" label="采购员" min-width="80px" width="80" prop="姓名">
<template slot-scope="scope">
{{ scope.row.姓名 ? scope.row.姓名 : '—' }}
</template>
@@ -218,7 +228,7 @@
<!--{{ scope.row.任务分配时间 ? scope.row.任务分配时间.split(' ')[0] : '—' }}-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column v-if="radio==='2'" align="center" label="撤回分配" min-width="100px" fixed="right">
<el-table-column v-if="radio===2" align="center" label="撤回分配" min-width="100px" width="120px" fixed="right">
<template slot-scope="scope">
<el-tooltip :open-delay="1200" effect="dark" content="撤回已分配的采购任务" placement="top">
<el-button
@@ -330,7 +340,7 @@
<!--<el-button type="danger" size="small" icon="el-icon-back" style="margin-left: 10px" @click="executeReturn1">打回</el-button>-->
</el-row>
<el-row style="margin-bottom: 10px">
<el-table v-loading="loading" :data="tableData1" size="mini" height="800px" style="width: 1255px" border stripe @selection-change="handleSelectionChange1">
<el-table v-loading="loading" :data="tableData1" size="mini" height="800px" style="width: 1365px" border stripe @selection-change="handleSelectionChange1">
<el-table-column :selectable="selectable" align="center" type="selection" width="42px"/>
<el-table-column align="center" prop="询价状态编号" label="进程" min-width="100px" width="60px">
<template slot-scope="scope">
@@ -390,6 +400,16 @@
{{ scope.row.供货商 }}
</template>
</el-table-column>
<el-table-column align="center" prop="接收日期" label="接收日期" min-width="100px" width="100px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.接收日期 }}
</template>
</el-table-column>
<el-table-column v-if="radio===2" align="center" prop="分配日期" label="分配日期" min-width="100px" width="100px" 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="零件类型">-->
<!--<template slot-scope="scope">-->
<!--{{ Number(scope.row.零件类型) === 1 ? 'BZ' : 'WG' }}-->
@@ -405,7 +425,7 @@
<!--{{ scope.row.操作日期.split(' ')[0] }}-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column v-if="radio==='2'" :filters="person" :filter-method="filterHandler" align="center" label="采购员" min-width="80px" prop="姓名">
<el-table-column v-if="radio===2" :filters="person" :filter-method="filterHandler" align="center" label="采购员" min-width="80px" width="80px" prop="姓名">
<template slot-scope="scope">
{{ scope.row.姓名 ? scope.row.姓名 : '—' }}
</template>
@@ -415,11 +435,12 @@
<!--{{ scope.row.任务分配时间 ? scope.row.任务分配时间.split(' ')[0] : '—' }}-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column v-if="radio==='2'" align="center" label="撤回分配" min-width="100px" fixed="right">
<el-table-column v-if="radio===2" align="center" label="撤回分配" min-width="100px" width="100px" fixed="right">
<template slot-scope="scope">
<el-button
:disabled="!(parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='')"
plain
type="repulse"
size="mini"
icon="el-icon-back"
@click="retract(scope.row)">撤回</el-button>
@@ -499,7 +520,7 @@
<!--<el-button type="danger" size="small" icon="el-icon-back" style="margin-left: 10px" @click="executeReturn2">打回</el-button>-->
</el-row>
<el-row style="margin-bottom: 10px">
<el-table v-loading="loading" :data="tableData2" size="mini" height="800px" style="width: 1303px" border stripe @selection-change="handleSelectionChange2">
<el-table v-loading="loading" :data="tableData2" size="mini" height="800px" style="width: 1324px" border stripe @selection-change="handleSelectionChange2">
<el-table-column :selectable="selectable" align="center" type="selection" width="42px"/>
<el-table-column align="center" prop="询价状态编号" label="进程" min-width="80px" width="60px">
<template slot-scope="scope">
@@ -514,7 +535,7 @@
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column align="center" prop="零件名称" label="名称" width="160px" show-overflow-tooltip>
<el-table-column align="center" prop="零件名称" label="名称" width="120px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
@@ -524,7 +545,7 @@
{{ scope.row.规格 }}
</template>
</el-table-column>
<el-table-column align="center" label="材料" width="180">
<el-table-column align="center" label="材料" width="160">
<template slot-scope="scope">
{{ scope.row.材料 }}
</template>
@@ -539,7 +560,7 @@
<!--{{ scope.row.项目名称 }}-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column align="center" prop="机床图号" label="机床图号" min-width="100px" width="120px">
<el-table-column align="center" prop="机床图号" label="机床图号" min-width="100px" width="100px">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
@@ -559,6 +580,16 @@
{{ scope.row.供货商 }}
</template>
</el-table-column>
<el-table-column align="center" prop="接收日期" label="接收日期" min-width="100px" width="100px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.操作日期.split(' ')[0] }}
</template>
</el-table-column>
<el-table-column v-if="radio===2" align="center" prop="分配日期" label="分配日期" min-width="100px" width="100px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.任务分配时间.split(' ')[0] }}
</template>
</el-table-column>
<!--<el-table-column align="center" label="计划到货时间" min-width="100px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.物料计划到货时间.split(' ')[0] }}-->
@@ -569,7 +600,7 @@
<!--{{ scope.row.操作日期.split(' ')[0] }}-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column v-if="radio==='2'" :filters="person" :filter-method="filterHandler" align="center" label="采购员" min-width="80px" prop="buyer">
<el-table-column v-if="radio===2" :filters="person" :filter-method="filterHandler" align="center" label="采购员" min-width="80px" width="80px" prop="buyer">
<template slot-scope="scope">
{{ scope.row.姓名 ? scope.row.姓名 : '—' }}
</template>
@@ -579,10 +610,11 @@
<!--{{ scope.row.任务分配时间 ? scope.row.任务分配时间.split(' ')[0] : '—' }}-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column v-if="radio==='2'" align="center" label="撤回分配" min-width="100px" fixed="right">
<el-table-column v-if="radio===2" align="center" label="撤回分配" min-width="100px" width="100px" fixed="right">
<template slot-scope="scope">
<el-button
:disabled="!(parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='')"
type="repulse"
plain
size="mini"
icon="el-icon-back"
@@ -656,6 +688,8 @@ export default {
dateRange: '',
timer2: '',
radio: '1',
radio1: '1',
radio2: '1',
machines: [],
source: [
{
@@ -901,8 +935,8 @@ export default {
}
},
searchTable0() { // 查询标准件
console.log(this.checked)
this.checked ? this.radio = 2 : this.radio = 1
console.log(this.checked, this.radio, 991)
this.loading = true
this.MaterialCategoryValue ? this.check1 = 1 : this.check1 = 0
this.MaterialVarietyValue ? this.check2 = 1 : this.check2 = 0
@@ -931,8 +965,8 @@ export default {
this.materialName ? this.check4 = 1 : this.check4 = 0
this.materialSpec ? check2 = 1 : check2 = 0
this.materialModel ? check3 = 1 : check3 = 0
this.checked2 ? this.radio = 2 : this.radio = 1
searchTable1(this.pageCurrent1, this.pageSize1, this.check1, this.MaterialCategoryValue, this.check2, this.MaterialVarietyValue, this.check3, this.projectValue, check0, this.machineValue, check1, this.groupValue, this.check4, this.materialName, parseInt(this.radio), check2, this.materialSpec, check3, this.materialModel, 2).then(response => {
this.checked2 ? this.radio1 = 2 : this.radio1 = 1
searchTable1(this.pageCurrent1, this.pageSize1, this.check1, this.MaterialCategoryValue, this.check2, this.MaterialVarietyValue, this.check3, this.projectValue, check0, this.machineValue, check1, this.groupValue, this.check4, this.materialName, parseInt(this.radio1), check2, this.materialSpec, check3, this.materialModel, 2).then(response => {
this.tableData1 = response.data.rows
this.total1 = response.data.total
this.loading = false
@@ -948,8 +982,8 @@ export default {
this.partMaterial ? check4 = 1 : check4 = 0
this.machineValue ? check5 = 1 : check5 = 0
this.groupValue ? check6 = 1 : check6 = 0
this.checked3 ? this.radio = 2 : this.radio = 1
searchTable2(this.pageCurrent2, this.pageSize2, this.check3, this.projectValue, check5, this.machineValue, check6, this.groupValue, parseInt(this.radio), check1, this.partNum, check2, this.partName, check3, this.partSpec, check4, this.partMaterial).then(response => {
this.checked3 ? this.radio2 = 2 : this.radio2 = 1
searchTable2(this.pageCurrent2, this.pageSize2, this.check3, this.projectValue, check5, this.machineValue, check6, this.groupValue, parseInt(this.radio2), check1, this.partNum, check2, this.partName, check3, this.partSpec, check4, this.partMaterial).then(response => {
this.tableData2 = response.data.rows
this.total2 = response.data.total
this.loading = false
@@ -1192,6 +1226,7 @@ export default {
line-height: 46px;
}
}
/*.el-table td.gutter,.el-table th.gutter{*/
/*width: 15px;*/
/*border-right-width: 0;*/
@@ -1201,6 +1236,29 @@ export default {
/*}*/
</style>
<style>
/*!*滚动条凹槽的颜色,还可以设置边框属性 *!*/
/*::-webkit-scrollbar-track-piece {*/
/*background-color:#f8f8f8;*/
/*-webkit-border-radius: 2em;*/
/*-moz-border-radius: 2em;*/
/*border-radius: 2em;*/
/*}*/
/*!*滚动条的宽度*!*/
/*::-webkit-scrollbar {*/
/*width:9px;*/
/*}*/
/*!*滚动条的设置*!*/
/*::-webkit-scrollbar-thumb {*/
/*background-color:#dddddd;*/
/*background-clip:padding-box;*/
/*-webkit-border-radius: 2em;*/
/*-moz-border-radius: 2em;*/
/*border-radius: 2em;*/
/*}*/
/*!*滚动条鼠标移上去*!*/
/*::-webkit-scrollbar-thumb:hover {*/
/*background-color:#bbb;*/
/*}*/
/*.el-table td.gutter,.el-table th.gutter{*/
/*width: 15px;*/
/*border-right-width: 0;*/