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

a

Browse Source
This commit is contained in:
Vergil
2020-05-19 10:28:00 +08:00
parent c5bc4b54db
commit ec119bfcf6
5 changed files with 19 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/views/ManufacturingCenter/CreatePreparationBill/index.vue
View File

@@ -156,7 +156,6 @@ export default {
order: '', order: '',
gouxuan: 0, gouxuan: 0,
totalnumber: 0 totalnumber: 0
} }
}, },
created() { created() {
@@ -215,9 +214,6 @@ export default {
if (response.data.total === 0) { if (response.data.total === 0) {
this.loading = false this.loading = false
} else { } else {
// this.tableData.push({
// 重量: response.data.rows[0].重量
// })
this.totalnumber = response.data.rows.length this.totalnumber = response.data.rows.length
this.tableData = response.data.rows this.tableData = response.data.rows
this.total = response.data.total this.total = response.data.total
@@ -245,7 +241,7 @@ export default {
edit(this.tableData2[i].工艺计划流水号).then(response => { edit(this.tableData2[i].工艺计划流水号).then(response => {
this.a += parseInt(response.data[0].result) this.a += parseInt(response.data[0].result)
if (this.a === this.tableData2.length) { if (this.a === this.tableData2.length) {
this.pageSize = 10 this.pageSize = 30
this.pageCurrent = 1 this.pageCurrent = 1
this.searchTable() this.searchTable()
} }
@@ -268,7 +264,7 @@ export default {
edit2(this.tableData2[i].工艺计划流水号, this.$store.state.user.id).then(response => { edit2(this.tableData2[i].工艺计划流水号, this.$store.state.user.id).then(response => {
this.a += parseInt(response.data[0].result) this.a += parseInt(response.data[0].result)
if (this.a === this.tableData2.length) { if (this.a === this.tableData2.length) {
this.pageSize = 10 this.pageSize = 30
this.pageCurrent = 1 this.pageCurrent = 1
this.searchTable() this.searchTable()
} }

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

@@ -76,12 +76,12 @@
{{ scope.row.任务下达日期 ? scope.row.任务下达日期.split(' ')[0]:scope.row.任务下达日期 }} {{ scope.row.任务下达日期 ? scope.row.任务下达日期.split(' ')[0]:scope.row.任务下达日期 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="规定到货日期" align="center" width="120"> <el-table-column label="计划到货" align="center" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.到货日期 ? (scope.row.到货日期.split(' ')[0] !== '1900-01-01' ? scope.row.到货日期.split(' ')[0] : '') : scope.row.到货日期 }} {{ scope.row.到货日期 ? (scope.row.到货日期.split(' ')[0] !== '1900-01-01' ? scope.row.到货日期.split(' ')[0] : '') : scope.row.到货日期 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="到货日期" align="center" width="120"> <el-table-column label="实际到货" align="center" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.到货时间 ? (scope.row.到货时间.split(' ')[0] !== '1900-01-01' ? scope.row.到货时间.split(' ')[0] : '') : scope.row.到货时间 }} {{ scope.row.到货时间 ? (scope.row.到货时间.split(' ')[0] !== '1900-01-01' ? scope.row.到货时间.split(' ')[0] : '') : scope.row.到货时间 }}
</template> </template>

6
src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
View File

@@ -19,7 +19,7 @@
stripe stripe
highlight-current-row highlight-current-row
style="width:720px ;margin-top:3px;" style="width:720px ;margin-top:3px;"
height="690" height="505"
size="mini" size="mini"
@sort-change="sortChange" @sort-change="sortChange"
@selection-change="handleSelectionChange"> @selection-change="handleSelectionChange">
@@ -117,7 +117,7 @@
border border
stripe stripe
style="max-height: 460px;width: 1120px" style="max-height: 460px;width: 1120px"
height="230px" height="140px"
size="mini" size="mini"
highlight-current-row highlight-current-row
@row-click="searchTable3"> @row-click="searchTable3">
@@ -191,7 +191,7 @@
@size-change="handleSizeChange2" @size-change="handleSizeChange2"
@current-change="handleCurrentChange2"/> @current-change="handleCurrentChange2"/>
</div> </div>
<el-table v-loading="" :data="tableData3" :header-cell-style="{fontFamily:'YouYuan',fontSize:'14px',fontWeight:200}" border highlight-current-row style="margin: 3px 0;width: 1100px" height="475px" width="1100px" size="mini"> <el-table v-loading="" :data="tableData3" :header-cell-style="{fontFamily:'YouYuan',fontSize:'14px',fontWeight:200}" border highlight-current-row style="margin: 3px 0;width: 1100px" height="380px" width="1100px" size="mini">
<el-table-column label="进程" align="center" width="60"> <el-table-column label="进程" align="center" width="60">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="Number(scope.row.是否到货)===0" type="warning" size="mini">未到货</span> <span v-if="Number(scope.row.是否到货)===0" type="warning" size="mini">未到货</span>

2
src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue
View File

@@ -1,6 +1,6 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-card> <el-card style="width: 1360px">
<el-row> <el-row>
<el-input v-model="invoiceNum" placeholder="到票号" size="small" style="margin: 3px 0;width: 140px" clearable/> <el-input v-model="invoiceNum" placeholder="到票号" size="small" style="margin: 3px 0;width: 140px" clearable/>
<el-input v-show="false" v-model="supplierName0" placeholder="供应商" size="small" style="width:140px;margin-left: 10px" clearable @focus="fetchData"/> <el-input v-show="false" v-model="supplierName0" placeholder="供应商" size="small" style="width:140px;margin-left: 10px" clearable @focus="fetchData"/>

23
src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue
View File

@@ -36,18 +36,17 @@
</el-card> </el-card>
<el-card style="width: 100%"> <el-card style="width: 100%">
<el-table v-loading="loading" :data="tableData" highlight-current-row border stripe size="mini" style="width: 100%" height="750" @sort-change="sortChange"> <el-table v-loading="loading" :data="tableData" highlight-current-row border stripe size="mini" style="width: 100%" height="750" @sort-change="sortChange">
<el-table-column label="序号" align="center" type="index" width="50" fixed/>
<el-table-column label="进程" align="center" prop="进程" sortable="custom" width="80px" fixed> <el-table-column label="进程" align="center" prop="进程" sortable="custom" width="80px" fixed>
<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="210px" width="300" prop="供应商名称" sortable="custom" show-overflow-tooltip fixed> <el-table-column label="供应商" align="center" width="120" prop="供应商名称" sortable="custom" show-overflow-tooltip fixed>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.备料状态==='自家' ? '自家' : scope.row.供应商名称 }} {{ scope.row.备料状态==='自家' ? '自家' : scope.row.供应商名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="物料编码" align="center" width="180px" fixed> <el-table-column label="物料编码" align="center" width="140px" fixed>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料编码 ? scope.row.物料编码 : scope.row.零件图号 }} {{ scope.row.物料编码 ? scope.row.物料编码 : scope.row.零件图号 }}
</template> </template>
@@ -62,47 +61,47 @@
{{ scope.row.材料 }} {{ scope.row.材料 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="计划件数" align="center" width="100"> <el-table-column label="计划件数" align="center" width="80">
<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" width="100"> <el-table-column label="备料件数" align="center" width="80">
<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" width="100"> <el-table-column label="到货件数" align="center" width="80">
<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" width="100"> <el-table-column label="备料人" align="center" width="80">
<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="下单日期" sortable="custom" width="120"> <el-table-column label="备料时间" align="center" prop="下单日期" sortable="custom" width="110">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.下单日期 ? scope.row.下单日期.split(' ')[0] : '' }} {{ scope.row.下单日期 ? 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="90">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.日期 ? scope.row.日期.split(' ')[0] : '' }} {{ scope.row.日期 ? 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="90">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.开票时间 ? scope.row.开票时间.split(' ')[0] : '' }} {{ scope.row.开票时间 ? 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="90">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.备料任务接受时间 ? scope.row.备料任务接受时间.split(' ')[0] : '' }} {{ scope.row.备料任务接受时间 ? 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="90">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.备料任务分配时间 ? scope.row.备料任务分配时间.split(' ')[0] : '' }} {{ scope.row.备料任务分配时间 ? scope.row.备料任务分配时间.split(' ')[0] : '' }}
</template> </template>