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-10-23 19:04:14 +08:00
parent 8d7ed0ccdf
commit ea3bf600f3
63 changed files with 1031 additions and 547 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/views/ManufacturingCenter/ActualTimeSupplement/index.vue
View File

@@ -59,12 +59,12 @@
style="width: 100%;"
border>
<el-table-column label="序号" type="index" align="center" width="55"/>
<el-table-column label="零件图号" sortable prop="零件图号" align="center" min-width="150px">
<el-table-column label="零件图号" prop="零件图号" align="center" min-width="150px">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column label="零件名称" sortable prop="零件名称" align="center" min-width="120px">
<el-table-column label="零件名称" prop="零件名称" align="center" min-width="120px">
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
@@ -74,12 +74,12 @@
{{ scope.row.完成数量 }}
</template>
</el-table-column>
<el-table-column label="工艺名称" sortable prop="工艺名称" align="center" min-width="90px">
<el-table-column label="工艺名称" prop="工艺名称" align="center" min-width="90px">
<template slot-scope="scope">
{{ scope.row.工艺名称 }}
</template>
</el-table-column>
<el-table-column label="操作者" sortable prop="姓名" align="center" min-width="80px">
<el-table-column label="操作者" prop="姓名" align="center" min-width="80px">
<template slot-scope="scope">
{{ scope.row.姓名 }}
</template>
@@ -115,12 +115,12 @@
<span v-else>{{ scope.row.修补工时 }}</span>
</template>
</el-table-column>
<el-table-column label="修补操作时间" sortable prop="修补操作时间" align="center" min-width="160px">
<el-table-column label="修补操作时间" prop="修补操作时间" align="center" min-width="160px">
<template slot-scope="scope">
{{ scope.row.修补操作时间 || '—' }}
</template>
</el-table-column>
<el-table-column label="修补人" sortable prop="修补人" align="center" min-width="100px">
<el-table-column label="修补人" prop="修补人" align="center" min-width="100px">
<template slot-scope="scope">
{{ scope.row.修补人 || '—' }}
</template>

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

@@ -27,18 +27,18 @@
type="selection"
width="55"
align="center"/>
<el-table-column label="打印状态" sortable prop="备料打印" align="center">
<el-table-column label="打印状态" prop="备料打印" align="center">
<template slot-scope="scope">
<el-tag v-if="scope.row.备料打印!=='0'" type="success" size="mini">已导出</el-tag>
<el-tag v-else type="warning" size="mini">未导出</el-tag>
</template>
</el-table-column>
<el-table-column label="零件名称" sortable prop="零件名称" align="center" >
<el-table-column label="零件名称" prop="零件名称" align="center" >
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column label="零件图号" sortable prop="零件图号" align="center" >
<el-table-column label="零件图号" prop="零件图号" align="center" >
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>

74
src/views/ManufacturingCenter/CreateWarehousePurchasing/index.vue
View File

@@ -128,6 +128,7 @@
@click="addpurchasingDetailsForm">创建采购明细表</el-button>
<el-tooltip :open-delay="1000" effect="dark" content="将勾选的物料库中物料选入到选中的采购明细表" placement="top">
<el-button
:disabled="Number(whetherToAllocate) === 1"
type="warning"
size="small"
style="margin-left: 10px"
@@ -160,12 +161,25 @@
{{ scope.row.申请人 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="240" fixed="right">
<el-table-column label="操作" align="center" width="280" fixed="right">
<template slot-scope="scope">
<el-popover v-model="scope.row.visible2" title="调整采购任务" placement="top" width="180">
<div style="text-align: right; margin: 0">
<el-select v-model="PersonValue" style="width:150px" placeholder="人员" size="small" filterable clearable>
<el-option
v-for="item in Person"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-button type="primary" size="mini" style="margin:10px 50px 0px 20px" @click="scope.row.visible2 = false;tiaoZheng()">确定</el-button>
</div>
<el-button v-if="!scope.row.edit" slot="reference" :disabled="Number(scope.row.是否分配)===1" type="primary" icon="el-icon-tickets" plain size="mini" style="margin-right:10px" @click="scope.row.visible2 = true;getPeople()">分配</el-button>
</el-popover>
<el-button v-if="scope.row.edit" type="text" size="mini" icon="el-icon-circle-check-outline" @click="confirmEdit(scope.row)">确定</el-button>
<el-button v-if="scope.row.edit" class="cancel-btn" size="mini" type="text" @click="cancelEdit(scope.$index, scope.row)">取消</el-button>
<el-button v-else type="warning" size="mini" icon="el-icon-edit" plain @click="scope.row.edit=!scope.row.edit">编辑</el-button>
<el-button v-if="!scope.row.edit" type="danger" size="mini" icon="el-icon-delete" plain @click="openDelete(scope.row)">删除</el-button>
<el-button v-else :disabled="Number(scope.row.是否分配)===1" type="warning" size="mini" icon="el-icon-edit" plain @click="scope.row.edit=!scope.row.edit">编辑</el-button>
<el-button v-if="!scope.row.edit" :disabled="Number(scope.row.是否分配)===1" type="danger" size="mini" icon="el-icon-delete" plain @click="openDelete(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
@@ -205,17 +219,17 @@
</el-table-column>
<el-table-column label="数量" align="center" min-width="100">
<template slot-scope="scope">
<el-input v-model="scope.row.数量" size="mini" style="width:70px" @change="updateNumber(scope.row)"/>
<el-input v-model="scope.row.数量" :disabled="Number(whetherToAllocate) === 1" size="mini" style="width:70px" @change="updateNumber(scope.row)"/>
</template>
</el-table-column>
<el-table-column label="备注" align="center" min-width="150" prop="备注">
<template slot-scope="scope">
<el-input v-model="scope.row.备注" size="mini" style="width:120px" @change="updateNumber(scope.row)"/>
<el-input v-model="scope.row.备注" :disabled="Number(whetherToAllocate) === 1" size="mini" style="width:120px" @change="updateNumber(scope.row)"/>
</template>
</el-table-column>
<el-table-column label="操作" align="center" min-width="100">
<template slot-scope="scope">
<el-button type="danger" plain size="mini" icon="el-icon-delete" @click="deleteMateriel(scope.row)">移除</el-button>
<el-button :disabled="Number(whetherToAllocate) === 1" type="danger" plain size="mini" icon="el-icon-delete" @click="deleteMateriel(scope.row)">移除</el-button>
</template>
</el-table-column>
</el-table>
@@ -236,12 +250,13 @@
</template>
<script>
import { searchInventoryNum, submitaddpurchasingdetailsform, searchpurchasingDetailsForm, confirmEditpurchasingDetailsForm, openDeletepurchasingDetailsForm, addmateriel, searchtable2, setSafeValue, updateNumber } from '@/api/ManufacturingCenter/CreateWarehousePurchasing'
import { searchInventoryNum, submitaddpurchasingdetailsform, searchpurchasingDetailsForm, confirmEditpurchasingDetailsForm, openDeletepurchasingDetailsForm, addmateriel, searchtable2, setSafeValue, updateNumber, getperson, tiaozheng, deletematerial } from '@/api/ManufacturingCenter/CreateWarehousePurchasing'
import { mapGetters } from 'vuex'
export default {
name: '', // 创建仓库采购
data() {
return {
visible2: false,
dialogVisible: false, // 新增明细表弹出框
title: '', // 新增明细表标题
form: {
@@ -278,7 +293,10 @@ export default {
applicant: '',
formNumber: '', // 表单编号
materielGroup: [], // 物料组
tableData2: [] // 采购明细
tableData2: [], // 采购明细
PersonValue: '', // 采购员编号
Person: [], // 采购员
whetherToAllocate: '' // 是否分配
}
},
computed: {
@@ -292,6 +310,20 @@ export default {
this.searchTable1()
},
methods: {
// 查询采购员
getPeople() {
this.PersonValue = ''
this.Person = []
getperson().then(response => {
for (let i = 0; i < response.data.length; i++) {
this.Person.push({
value: response.data[i].人员编号,
label: response.data[i].姓名
})
}
this.PersonValue = response.data[0].人员编号
})
},
searchTable() { // 查询物料库物料
this.loading = true
let check2, check3
@@ -367,7 +399,8 @@ export default {
表单名称_原: response.data.rows[i].表单名称,
表单流水号: response.data.rows[i].表单流水号,
是否分配: response.data.rows[i].是否分配,
edit: false
edit: false,
visible2: false
})
}
}
@@ -426,11 +459,32 @@ export default {
searchTable2(row) {
this.formNumber = row.表单流水号
this.tableData2 = []
this.whetherToAllocate = row.是否分配
searchtable2(row.表单流水号).then(response => {
console.log(response.data)
this.tableData2 = response.data
})
}, // 勾选物料
}, // 调整采购计划
tiaoZheng() {
tiaozheng(this.formNumber, this.PersonValue).then(response => {
if (response.data[0].result === '1') {
this.$message.success('分配成功')
} else {
this.$message.error('分配失败')
}
})
this.searchTable1()
}, // 移除物料明细
deleteMateriel(row) {
deletematerial(row.id).then(response => {
if (response.data[0].result === '1') {
this.$message.success('移除成功')
} else {
this.$message.error('移除失败')
}
})
},
// 勾选物料
handleSelectionChange(val) {
this.materielGroup = []
for (let i = 0; i < val.length; i++) {

9
src/views/ManufacturingCenter/InitialProduction/index.vue
View File

@@ -102,17 +102,17 @@
type="selection"
align="center"
width="35"/>
<el-table-column label="零件号" sortable prop="零件图号" align="center" min-width="220">
<el-table-column label="零件号" prop="零件图号" align="center" min-width="220">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column label="零件名称" sortable prop="零件名称" align="center">
<el-table-column label="零件名称" prop="零件名称" align="center">
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column label="规格" sortable prop="规格" align="center">
<el-table-column label="规格" prop="规格" align="center">
<template slot-scope="scope">
{{ scope.row.规格 }}
</template>
@@ -137,7 +137,7 @@
{{ scope.row.未投产数量 }}
</template>
</el-table-column>
<el-table-column label="零件类型" sortable prop="零件类型名称" align="center" width="120">
<el-table-column label="零件类型" prop="零件类型名称" align="center" width="120">
<template slot-scope="scope">
{{ scope.row.零件类型名称 }}
</template>
@@ -219,7 +219,6 @@
<template slot-scope="scope">{{ scope.row.零件图号 }}</template>
</el-table-column>
<el-table-column
sortable
prop="零件名称"
label="零件名称" >
<template slot-scope="scope">{{ scope.row.零件名称 }}</template>

10
src/views/ManufacturingCenter/InventoryQuery/index.vue
View File

@@ -13,27 +13,27 @@
</el-row>
</div>
<el-table :data="tableData1" stripe border height="700px" size="mini" show-summary>
<el-table-column label="名称" sortable prop="物料名称" align="center" width="130" show-overflow-tooltip>
<el-table-column label="名称" prop="物料名称" align="center" width="130" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料名称 }}
</template>
</el-table-column>
<el-table-column label="图号或型号" sortable prop="物料型号" align="center" width="150" show-overflow-tooltip>
<el-table-column label="图号或型号" prop="物料型号" align="center" width="150" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料型号 }}
</template>
</el-table-column>
<el-table-column label="规格" sortable prop="物料规格" align="center" width="200" show-overflow-tooltip>
<el-table-column label="规格" prop="物料规格" align="center" width="200" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料规格 }}
</template>
</el-table-column>
<el-table-column label="物料来源" sortable prop="物料来源" align="center" width="100">
<el-table-column label="物料来源" prop="物料来源" align="center" width="100">
<template slot-scope="scope">
{{ scope.row.物料来源 }}
</template>
</el-table-column>
<el-table-column label="仓库" sortable prop="仓库名称" align="center" min-width="90">
<el-table-column label="仓库" prop="仓库名称" align="center" min-width="90">
<template slot-scope="scope">
{{ scope.row.仓库名称 }}
</template>

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

@@ -35,12 +35,12 @@
<el-card>
<el-table v-loading="loading" :data="tableData" height="350" style="width: 100%;margin: 3px 0" size="mini" border stripe highlight-current-row element-loading-text="拼命加载中" @selection-change="handleSelectionChange2">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="零件名称" sortable prop="零件名称" align="center" width="220px">
<el-table-column label="零件名称" prop="零件名称" align="center" width="220px">
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column label="零件图号" sortable prop="零件图号" align="center" width="280px">
<el-table-column label="零件图号" prop="零件图号" align="center" width="280px">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
@@ -78,12 +78,12 @@
<el-card>
<el-table v-loading="loading2" :data="tableData2" height="350" style="width: 100%;margin: 3px 0" size="mini" border stripe highlight-current-row element-loading-text="拼命加载中" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="零件名称" sortable prop="零件名称" align="center" width="220px">
<el-table-column label="零件名称" prop="零件名称" align="center" width="220px">
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column label="零件图号" sortable prop="零件图号" align="center" width="240px">
<el-table-column label="零件图号" prop="零件图号" align="center" width="240px">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>

10
src/views/ManufacturingCenter/PartAssignment/index.vue
View File

@@ -32,27 +32,27 @@
</el-card>
<el-card>
<el-table :data="tableData" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="250px" @row-click="searchPart">
<el-table-column label="项目名称" sortable prop="项目名称" align="center">
<el-table-column label="项目名称" prop="项目名称" align="center">
<template slot-scope="scope">
{{ scope.row.项目名称 }}
</template>
</el-table-column>
<el-table-column label="机床编号" sortable prop="机床图号" align="center">
<el-table-column label="机床编号" prop="机床图号" align="center">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="机床名称" sortable prop="机床名称" align="center">
<el-table-column label="机床名称" prop="机床名称" align="center">
<template slot-scope="scope">
{{ scope.row.机床名称 }}
</template>
</el-table-column>
<el-table-column label="组号" sortable prop="组号" align="center">
<el-table-column label="组号" prop="组号" align="center">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="组件名称" sortable prop="组件名称" align="center">
<el-table-column label="组件名称" prop="组件名称" align="center">
<template slot-scope="scope">
{{ scope.row.组件名称 }}
</template>

10
src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
View File

@@ -53,22 +53,22 @@
type="selection"
align="center"
width="55"/>
<el-table-column label="机床号" sortable prop="机床图号" align="center">
<el-table-column label="机床号" prop="机床图号" align="center">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="组号" sortable prop="组号" align="center">
<el-table-column label="组号" prop="组号" align="center">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="零件图号" sortable prop="零件图号" align="center">
<el-table-column label="零件图号" prop="零件图号" align="center">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column label="零件名称" sortable prop="零件名称" align="center">
<el-table-column label="零件名称" prop="零件名称" align="center">
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
@@ -78,7 +78,7 @@
{{ scope.row.批次数量 }}
</template>
</el-table-column>
<el-table-column label="工艺员" sortable prop="工艺员" align="center">
<el-table-column label="工艺员" prop="工艺员" align="center">
<template slot-scope="scope">
{{ scope.row.工艺员 }}
</template>

4
src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
View File

@@ -40,12 +40,12 @@
stripe
@selection-change="handleSelectionChange">
<el-table-column align="center" type="selection"/>
<el-table-column align="center" label="零件号" sortable prop="零件号" min-width="160">
<el-table-column align="center" label="零件号" prop="零件号" min-width="160">
<template slot-scope="scope">
{{ scope.row.零件号 }}
</template>
</el-table-column>
<el-table-column align="center" sortable prop="零件名称" label="零件名称">
<el-table-column align="center" prop="零件名称" label="零件名称">
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>

4
src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
View File

@@ -65,12 +65,12 @@
type="selection"
align="center"
width="50"/>
<el-table-column label="零件图号" sortable prop="零件图号" align="center" width="200">
<el-table-column label="零件图号" prop="零件图号" align="center" width="200">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column label="零件名称" sortable prop="零件名称" align="center" width="300">
<el-table-column label="零件名称" prop="零件名称" align="center" width="300">
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>

2
src/views/ManufacturingCenter/SparePartsForScrap/index.vue
View File

@@ -49,7 +49,6 @@
@current-change="fetchTableData2">
<el-table-column
align="center"
sortable
prop="零件图号"
label="零件号"
>
@@ -57,7 +56,6 @@
</el-table-column>
<el-table-column
align="center"
sortable
prop="零件名称"
label="零件名称"
>

83
src/views/ManufacturingCenter/StatusQuery/index.vue
View File

@@ -2,11 +2,11 @@
<div class="app-container">
<el-card>
<el-row>
<span>项目名称:</span>
<!-- <span>项目名称:</span>-->
<el-select
v-model="entryNameValue"
placeholder="项目名称"
style="width:200px;margin-top: 10px"
style="width:200px;margin: 10px 10px 0px 10px"
size="small"
clearable
filterable
@@ -17,20 +17,18 @@
:label="item.label"
:value="item.value"/>
</el-select>
<span>机床图号:</span>
<el-input v-model="machineToolNumber" placeholder="机床号" size="small" readonly clearable style="width:200px" @change="empty1">
<!-- <span>机床图号:</span>-->
<el-input v-model="machineToolNumber" placeholder="机床号" size="small" readonly clearable style="width:200px;margin: 10px 10px 0px 10px" @change="empty1">
<el-button slot="append" icon="el-icon-search" @click="SearchMachine" />
</el-input>
<span>组号:</span>
<el-input v-model="groupNumber" placeholder="组号" size="small" readonly clearable style="width:200px">
<!-- <span>组号:</span>-->
<el-input v-model="groupNumber" placeholder="组号" size="small" readonly clearable style="width:200px;margin: 10px 10px 0px 10px">
<el-button slot="append" icon="el-icon-search" @click="searchGroupList" />
</el-input>
</el-row>
<el-row>
<span>零件图号:</span>
<el-input v-model="partNumber" placeholder="零件号" size="small" clearable style="width:200px;margin-top: 10px"/>
<span>零件状态:</span>
<el-select v-model="partStateValue" placeholder="零件状态" size="small" clearable style="width:200px">
<!-- <span>零件图号:</span>-->
<el-input v-model="partNumber" placeholder="零件号" size="small" clearable style="width:200px;margin: 10px 10px 0px 10px"/>
<!-- <span>零件状态:</span>-->
<el-select v-model="partStateValue" placeholder="零件状态" size="small" clearable style="width:200px;margin: 10px 10px 0px 10px">
<el-option
v-for="item in partState"
:key="item.value"
@@ -47,13 +45,15 @@
<!--</el-select>-->
<el-button type="success" icon="el-icon-search" size="small" style="margin: 15px 0 0 10px" @click="pageCurrent=1;pageSize=20;total=0;searchData()">查询</el-button>
</el-row>
<!-- <el-row>-->
<!-- </el-row>-->
</el-card>
<el-card>
<el-table
v-loading="loading0"
:data="tableData"
style="width: 100%;max-height: 600px"
height="600"
style="width: 100%"
height="780"
stripe
size="mini"
highlight-current-row
@@ -112,16 +112,16 @@
<!--</template>-->
<!--</el-table-column>-->
</el-table>
<div class="block" style="margin-top: 10px;">
<el-pagination
:current-page="pageCurrent"
:page-sizes="[10, 20, 30, 40, 50]"
:page-size="pageSize"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
</div>
<!-- <div class="block" style="margin-top: 10px;">-->
<!-- <el-pagination-->
<!-- :current-page="pageCurrent"-->
<!-- :page-sizes="[10, 20, 30, 40, 50]"-->
<!-- :page-size="pageSize"-->
<!-- :total="total"-->
<!-- layout="total, sizes, prev, pager, next, jumper"-->
<!-- @size-change="handleSizeChange"-->
<!-- @current-change="handleCurrentChange"/>-->
<!-- </div>-->
</el-card>
<el-dialog :title="title" :visible.sync="dialogFormVisible4" center style="min-height: 300px" width="400px">
<el-form label-position="left" label-width="110px" class="demo-ruleForm">
@@ -272,8 +272,8 @@ export default {
partState: [], // 零件状态数组
partTypeValue: null, // 零件类型
num: null,
pageCurrent: 1,
pageSize: 20,
// pageCurrent: 1,
// pageSize: 20,
pageCurrent1: 1,
pageSize1: 20,
pageCurrent2: 1,
@@ -282,7 +282,7 @@ export default {
tableData6: [],
tableData: [],
state: null,
total: null,
// total: null,
total1: null,
total2: null,
title: '',
@@ -352,16 +352,15 @@ export default {
this.check5 = 0
}
this.loading0 = true
searchTable(this.check, this.entryNameValue, this.check1, this.machine, this.check2, this.groupNum, this.check3, this.partNumber, this.check4, this.partStateValue, this.check5, this.partTypeValue, this.pageSize, this.pageCurrent).then(response => {
for (let i = 0; i < response.data.rows.length; i++) {
response.data.rows[i].考核状态 = parseInt(response.data.rows[i].考核状态) - 2
if (response.data.rows[i].传递时间 !== undefined || response.data.rows[i].hasOwnProperty('传递时间')) {
response.data.rows[i].传递时间 = response.data.rows[i].传递时间.split(' ', 2)[0]
searchTable(this.check, this.entryNameValue, this.check1, this.machine, this.check2, this.groupNum, this.check3, this.partNumber, this.check4, this.partStateValue, this.check5, this.partTypeValue).then(response => {
for (let i = 0; i < response.data.length; i++) {
response.data[i].考核状态 = parseInt(response.data[i].考核状态) - 2
if (response.data[i].传递时间 !== undefined || response.data[i].hasOwnProperty('传递时间')) {
response.data[i].传递时间 = response.data[i].传递时间.split(' ', 2)[0]
}
}
this.loading0 = false
this.tableData = response.data.rows
this.total = parseInt(response.data.total)
this.tableData = response.data
})
},
getList() { // 初始化项目名称
@@ -454,14 +453,14 @@ export default {
cancel() { // 取消
this.dialogFormVisible4 = false
},
handleSizeChange(val) {
this.pageSize = val
this.searchData()
},
handleCurrentChange(val) {
this.pageCurrent = val
this.searchData()
},
// handleSizeChange(val) {
// this.pageSize = val
// this.searchData()
// },
// handleCurrentChange(val) {
// this.pageCurrent = val
// this.searchData()
// },
handleSizeChange1(val) {
this.pageSize1 = val
this.SearchMachine()

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

@@ -11,17 +11,17 @@
<el-card>
<el-table :data="List" border size="small" stripe highlight-current-row height="500px">
<el-table-column label="设备名称" sortable prop="设备名称" align="center" >
<el-table-column label="设备名称" prop="设备名称" align="center" >
<template slot-scope="scope">
{{ scope.row.设备名称 }}
</template>
</el-table-column>
<el-table-column label="设备编号" sortable prop="设备编号" align="center" >
<el-table-column label="设备编号" prop="设备编号" align="center" >
<template slot-scope="scope">
{{ scope.row.设备编号 }}
</template>
</el-table-column>
<el-table-column label="设备型号" sortable prop="设备型号" align="center" >
<el-table-column label="设备型号" rop="设备型号" align="center" >
<template slot-scope="scope">
{{ scope.row.设备型号 }}
</template>
@@ -32,7 +32,7 @@
</template>
</el-table-column>
<el-table-column label="设备加工能力" align="center" >
<template slot-scope="scope">
<template slot-scope="scope">p
{{ scope.row.设备加工能力工时 }}
</template>
</el-table-column>