This commit is contained in:
zhangdingyu
2019-09-24 14:37:03 +08:00
parent c42c2ef297
commit f7a4975c0a
11 changed files with 25 additions and 23 deletions

View File

@@ -18,7 +18,7 @@
<el-table <el-table
v-loading="listLoading" v-loading="listLoading"
:data="tableDataNum" :data="tableDataNum"
stripe="true" stripe
highlight-current-row highlight-current-row
border border
size="mini" size="mini"

View File

@@ -30,7 +30,7 @@
v-loading="listLoading1" v-loading="listLoading1"
:data="tableData1" :data="tableData1"
class="table" class="table"
stripe="true" stripe
size="mini" size="mini"
highlight-current-row highlight-current-row
border border

View File

@@ -29,7 +29,7 @@
<el-table <el-table
v-loading="listLoading1" v-loading="listLoading1"
:data="tableData1" :data="tableData1"
stripe="true" stripe
size="mini" size="mini"
highlight-current-row highlight-current-row
class="table" class="table"

View File

@@ -52,7 +52,7 @@
<el-card> <el-card>
<el-table <el-table
:data="tableData" :data="tableData"
:stripe="true" stripe
height="550" height="550"
size="mini" size="mini"
highlight-current-row highlight-current-row

View File

@@ -28,7 +28,7 @@
:data="tableData" :data="tableData"
:row-key="getRowKeys" :row-key="getRowKeys"
:expand-row-keys="expands" :expand-row-keys="expands"
stripe="true" stripe
size="mini" size="mini"
highlight-current-row highlight-current-row
border border

View File

@@ -48,7 +48,9 @@
type="date" type="date"
placeholder="选择日期"/> placeholder="选择日期"/>
<el-button type="success" class="el-icon-search" size="small" style="margin: 10px 0 0 10px" @click="getTableData();pageCurrent=1;pageSize=10;total = 0">查询</el-button> <el-button type="success" class="el-icon-search" size="small" style="margin: 10px 0 0 10px" @click="getTableData();pageCurrent=1;pageSize=10;total = 0">查询</el-button>
<el-button type="warning" class="el-icon-download" size="small" style="margin: 10px 0 0 10px" @click="exportExcel">导出</el-button> <el-tooltip :open-delay="1000" effect="dark" content="导出所选机床的加工进度" placement="top">
<el-button type="warning" class="el-icon-download" size="small" style="margin: 10px 0 0 10px" @click="exportExcel">导出</el-button>
</el-tooltip>
</el-row> </el-row>
</el-card> </el-card>
@@ -392,9 +394,9 @@ export default {
} }
} }
}, },
// created() { created() {
// this.getMachine() this.getMachine()
// }, },
methods: { methods: {
formatJson(filterVal, jsonData) { formatJson(filterVal, jsonData) {
return jsonData.map(v => filterVal.map(j => { return jsonData.map(v => filterVal.map(j => {

View File

@@ -50,7 +50,7 @@
v-loading="listLoading1" v-loading="listLoading1"
id="ProcessingStatusEdit" id="ProcessingStatusEdit"
:data="tableData1" :data="tableData1"
:stripe="true" stripe
class="table" class="table"
size="mini" size="mini"
highlight-current-row highlight-current-row

View File

@@ -17,7 +17,7 @@
:label="item.label" :label="item.label"
:value="item.value"/> :value="item.value"/>
</el-select> </el-select>
<span>机床号:</span> <span>机床:</span>
<el-input v-model="machineToolNumber" placeholder="机床号" size="small" readonly clearable style="width:200px" @change="empty1"> <el-input v-model="machineToolNumber" placeholder="机床号" size="small" readonly clearable style="width:200px" @change="empty1">
<el-button slot="append" icon="el-icon-search" @click="SearchMachine" /> <el-button slot="append" icon="el-icon-search" @click="SearchMachine" />
</el-input> </el-input>
@@ -27,7 +27,7 @@
</el-input> </el-input>
</el-row> </el-row>
<el-row> <el-row>
<span>零件号:</span> <span>零件:</span>
<el-input v-model="partNumber" placeholder="零件号" size="small" clearable style="width:200px;margin-top: 10px"/> <el-input v-model="partNumber" placeholder="零件号" size="small" clearable style="width:200px;margin-top: 10px"/>
<span>零件状态:</span> <span>零件状态:</span>
<el-select v-model="partStateValue" placeholder="零件状态" size="small" clearable style="width:200px"> <el-select v-model="partStateValue" placeholder="零件状态" size="small" clearable style="width:200px">
@@ -54,7 +54,7 @@
:data="tableData" :data="tableData"
style="width: 100%;max-height: 600px" style="width: 100%;max-height: 600px"
height="600" height="600"
stripe="true" stripe
size="mini" size="mini"
highlight-current-row highlight-current-row
border> border>
@@ -69,12 +69,12 @@
{{ scope.row.组号 }} {{ scope.row.组号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="零件图号" min-width="160px"> <el-table-column align="center" label="零件图号" width="160px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件图号 }} {{ scope.row.零件图号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="零件名称" min-width="170px"> <el-table-column align="center" label="零件名称" width="120px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件名称 }} {{ scope.row.零件名称 }}
</template> </template>
@@ -89,7 +89,7 @@
{{ scope.row.传递时间 }} {{ scope.row.传递时间 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="零件状态" width="750px"> <el-table-column align="center" label="零件状态" min-width="400px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-steps :active="scope.row.考核状态" finish-status="success" simple> <el-steps :active="scope.row.考核状态" finish-status="success" simple>
<el-step title="投产" /> <el-step title="投产" />

View File

@@ -32,7 +32,7 @@
highlight-current-row highlight-current-row
height="380" height="380"
size="mini" size="mini"
stripe="true" stripe
style="width: 100%;" style="width: 100%;"
border border
element-loading-text="拼命加载中" element-loading-text="拼命加载中"
@@ -65,7 +65,7 @@
</div> </div>
</el-col> </el-col>
<el-col :span="17" style="margin-left: 30px;"> <el-col :span="17" style="margin-left: 30px;">
<el-table v-loading="loading2" :data="tableData2" height="380" size="mini" stripe="true" highlight-current-row style="width: 100%;" border element-loading-text="拼命加载中"> <el-table v-loading="loading2" :data="tableData2" height="380" size="mini" stripe highlight-current-row style="width: 100%;" border element-loading-text="拼命加载中">
<el-table-column label="零件图号" align="center" width="150px"> <el-table-column label="零件图号" align="center" width="150px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件图号 }} {{ scope.row.零件图号 }}
@@ -131,7 +131,7 @@
</el-card> </el-card>
<el-card> <el-card>
<el-col :span="6"> <el-col :span="6">
<el-table v-loading="loading3" :data="tableData3" stripe="true" size="mini" highlight-current-row height="380" style="width: 100%;" border element-loading-text="拼命加载中" @row-click="searchTable5"> <el-table v-loading="loading3" :data="tableData3" stripe size="mini" highlight-current-row height="380" style="width: 100%;" border element-loading-text="拼命加载中" @row-click="searchTable5">
<el-table-column label="机床编号" align="center" width="110px"> <el-table-column label="机床编号" align="center" width="110px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.机床图号 }} {{ scope.row.机床图号 }}
@@ -160,7 +160,7 @@
</div> </div>
</el-col> </el-col>
<el-col :span="17" style="margin-left: 30px;"> <el-col :span="17" style="margin-left: 30px;">
<el-table v-loading="loading4" :data="tableData4" size="mini" height="380" stripe="true" highlight-current-row style="width: 100%;" border element-loading-text="拼命加载中"> <el-table v-loading="loading4" :data="tableData4" size="mini" height="380" stripe highlight-current-row style="width: 100%;" border element-loading-text="拼命加载中">
<el-table-column label="机床编号" align="center"> <el-table-column label="机床编号" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.机床图号 }} {{ scope.row.机床图号 }}

View File

@@ -21,7 +21,7 @@
:label="item.label" :label="item.label"
:value="item.value"/> :value="item.value"/>
</el-select> </el-select>
<el-tooltip effect="dark" content="查询外购备料发货信息" placement="top" open-delay="1200"> <el-tooltip :open-delay="1200" effect="dark" content="查询外购备料发货信息" placement="top">
<el-button <el-button
type="success" type="success"
size="small" size="small"

View File

@@ -16,7 +16,7 @@
end-placeholder="结束日期"/> end-placeholder="结束日期"/>
<span style="margin-left: 10px">供应商:</span> <span style="margin-left: 10px">供应商:</span>
<el-input v-model="supplierName0" placeholder="供应商" size="small" clearable/> <el-input v-model="supplierName0" placeholder="供应商" size="small" clearable/>
<el-tooltip effect="dark" content="查询外购备料清款信息" placement="top" open-delay="1200"> <el-tooltip :open-delay="1000" effect="dark" content="查询外购备料清款信息" placement="top">
<el-button <el-button
type="success" type="success"
size="small" size="small"
@@ -24,7 +24,7 @@
style="margin-left: 10px" style="margin-left: 10px"
@click="pageCurrent1=1;pageSize1=10;total1=0;searchTable1()">查询</el-button> @click="pageCurrent1=1;pageSize1=10;total1=0;searchTable1()">查询</el-button>
</el-tooltip> </el-tooltip>
<el-tooltip effect="dark" content="对选择的请款任务创建请款申请" placement="top" open-delay="1200"> <el-tooltip :open-delay="1000" effect="dark" content="对选择的请款任务创建请款申请" placement="top">
<el-button type="primary" size="small" icon="el-icon-goods" style="" @click="requestFund">请款</el-button> <el-button type="primary" size="small" icon="el-icon-goods" style="" @click="requestFund">请款</el-button>
</el-tooltip> </el-tooltip>
</el-card> </el-card>