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-05-20 18:08:00 +08:00
parent 56c42f1a52
commit 6e4a26aeed
7 changed files with 107 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/views/Outsourcing/OutsourcingPartsQuery/index.vue
View File

@@ -11,32 +11,32 @@
:label="item.label"
:value="item.value"/>
</el-select>
<el-button icon="el-icon-search" type="primary" size="small" plain @click="getTableData()">查询</el-button>
<el-button icon="el-icon-search" type="primary" size="small" plain @click="pageCurrent=1;pageSize=50;getTableData()">查询</el-button>
<el-button v-positive="'loading'" :disabled="false" type="success" class="el-icon-download" size="small" style="margin: 10px 0 0 10px" plain @click="exportExcel">导出</el-button>
</div>
</el-card>
<el-card>
<el-table v-loading="loading" :data="tableData" border stripe size="mini" height="650" style="width: 1480px">
<el-table-column label="序号" align="center" type="index" width="50" fixed/>
<el-table-column label="外协状态" align="center" width="80px" fixed>
<el-table-column label="序号" align="center" type="index" width="50"/>
<el-table-column label="外协状态" align="center" width="80px">
<template slot-scope="scope">
<el-tag v-if="Number(scope.row.外协状态)==1" type="primary" size="mini">未提交</el-tag>
<el-tag v-if="Number(scope.row.外协状态)===0" type="success" size="mini">未外协</el-tag>
<el-tag v-if="Number(scope.row.外协状态)==2 && Number(scope.row.到货状态)!==1" type="warning" size="mini">未到货</el-tag>
<el-tag v-if="Number(scope.row.外协状态)==2 && Number(scope.row.到货状态)===1" type="success" size="mini">已到货</el-tag>
<el-tag v-if="Number(scope.row.外协状态)==3 && Number(scope.row.到货状态)===1" type="success" size="mini">已到货</el-tag>
</template>
</el-table-column>
<el-table-column label="机床图号" align="center" width="110px" fixed>
<el-table-column label="项目名称" align="center" width="115px">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
{{ scope.row.项目名称 }}
</template>
</el-table-column>
<el-table-column label="零件图号" align="center" width="100px" show-overflow-tooltip fixed>
<el-table-column label="零件图号" align="center" width="140px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column label="零件名称" align="center" width="100px" fixed>
<el-table-column label="零件名称" align="center" width="110px">
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
@@ -46,22 +46,22 @@
{{ scope.row.批次数量 }}
</template>
</el-table-column>
<el-table-column label="外协工序" align="center" width="80">
<el-table-column label="外协工序" align="center" width="100">
<template slot-scope="scope">
{{ scope.row.外协工序 }}
</template>
</el-table-column>
<el-table-column label="外协工时(分)" align="center" width="70">
<el-table-column label="外协工时(分)" align="center" width="110">
<template slot-scope="scope">
{{ scope.row.外协工时 }}
</template>
</el-table-column>
<el-table-column label="工时费用(元)" align="center" width="70">
<el-table-column label="工时费用(元)" align="center" width="110">
<template slot-scope="scope">
{{ scope.row.加工价格_成交 }}
</template>
</el-table-column>
<el-table-column label="外协厂家" align="center" width="100px" show-overflow-tooltip>
<el-table-column label="外协厂家" align="center" width="140px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.外协厂家名称 }}
</template>
@@ -71,22 +71,22 @@
{{ scope.row.表单号 }}
</template>
</el-table-column>
<el-table-column label="外协日期" align="center" width="90">
<el-table-column label="外协日期" align="center" width="100">
<template slot-scope="scope">
{{ scope.row.任务下达日期 ? scope.row.任务下达日期.split(' ')[0]:scope.row.任务下达日期 }}
</template>
</el-table-column>
<el-table-column label="计划到货" align="center" width="90">
<el-table-column label="规定到货日期" align="center" width="120">
<template slot-scope="scope">
{{ scope.row.到货日期 ? (scope.row.到货日期.split(' ')[0] !== '1900-01-01' ? scope.row.到货日期.split(' ')[0] : '') : scope.row.到货日期 }}
</template>
</el-table-column>
<el-table-column label="实际到货" align="center" width="90">
<el-table-column label="到货日期" align="center" width="120">
<template slot-scope="scope">
{{ scope.row.到货时间 ? (scope.row.到货时间.split(' ')[0] !== '1900-01-01' ? scope.row.到货时间.split(' ')[0] : '') : scope.row.到货时间 }}
</template>
</el-table-column>
<el-table-column label="外协员" align="center" show-overflow-tooltip>
<el-table-column label="外协员" align="center" width="70" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.外协计划员 }}
</template>

4
src/views/Outsourcing/OutsourcingTaskExecution/index.vue
View File

@@ -66,7 +66,7 @@
<el-button type="text" size="mini" icon="el-icon-edit" @click="handleEdit(scope.row)"/>
</div>
<div style="display: inline-block">
<el-button :disabled="scope.row.单据状态==='成交'" type="text" size="mini" icon="el-icon-delete" style="margin-left:10px" @click="handleDelete(scope.row)"/>
<el-button :disabled="scope.row.单据状态==='成交' || scope.row.单据状态 === '到货'" type="text" size="mini" icon="el-icon-delete" style="margin-left:10px" @click="handleDelete(scope.row)"/>
</div>
</template>
</el-table-column>
@@ -375,7 +375,7 @@ export default {
},
// 点击表2 查询表3
searchProcess(row) {
row.单据状态 === '成交' ? this.jinyong = true : this.jinyong = false
row.单据状态 === '成交' || row.单据状态 === '到货' ? this.jinyong = true : this.jinyong = false
this.loading = true
this.List3 = []
this.Number = row.外协加工任务单流水号