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

Merge branch 'master' of http://123.56.95.229:10010/r/高精

Browse Source
This commit is contained in:
liushuai
2020-03-20 18:06:46 +08:00
parent 4d32454b1a 5df2a41db0
commit 3c554e5909
10 changed files with 41 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/views/Inventory/Inboundscanning/index.vue
View File

@@ -15,20 +15,8 @@
</el-card>
<el-card style="width: 1000px">
<el-table
v-loading="listLoading"
:data="tableDataNum"
stripe
highlight-current-row
border
size="mini"
style="width: 100%;margin: 3px 0px"
height="750px">
<el-table-column
label="序号"
align="center"
type="index"
width="55"/>
<el-table v-loading="listLoading" :data="tableDataNum" stripe highlight-current-row border size="mini" style="width: 100%;margin: 3px 0px" height="750px">
<el-table-column label="序号" align="center" type="index" width="55"/>
<el-table-column label="项目名称" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.项目名称 }}
@@ -56,7 +44,7 @@
</el-table-column>
<el-table-column label="货位" align="center" width="120">
<template slot-scope="scope">
<el-select v-model="locateNumber" filterable clearable size="mini" placeholder="货位名称">
<el-select v-model="locateNumber" filterable clearable size="mini" placeholder="货位名称" style="width: 100px">
<el-option
v-for="item in locateName"
:key="item.value"
@@ -256,7 +244,7 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
if (this.locateNumber === '') {
if (!this.locateNumber) {
this.$message.error('请选择货位')
} else {
for (let i = 0; i < this.tableDataNum.length; i++) {

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

@@ -28,7 +28,7 @@
<el-button type="success" size="small" icon="el-icon-download" style="margin-left:10px;margin-top: 3px;margin-right: 20px;float: right" plain @click="exportTable('')">导出</el-button>
</el-card>
<el-card style="margin-top: 5px">
<el-table v-loading="loading1" :data="tableData1" size="mini" border stripe style="width: 100%" height="600px" highlight-current-row @row-click="searchTable2">
<el-table v-loading="loading1" :data="tableData1" size="mini" border stripe style="width: 100%" height="600px" highlight-current-row>
<el-table-column label="采购合同编号" align="center" min-width="130">
<template slot-scope="scope">
{{ scope.row.采购合同编号 }}
@@ -97,7 +97,7 @@
</div>
</el-card>
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="合同审批通知" center style="min-height: 300px;" width="370px">
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="合同审批通知" center style="min-height: 300px;" width="1000px">
<div style="min-height:500px;margin: 0px auto;width:800px;border:1px solid black" v-html="returns"/>
</el-dialog>
</div>

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

@@ -2,7 +2,7 @@
<div class="app-container">
<div style="width: 100%;overflow:auto">
<div style="white-space: nowrap">
<el-card style="width: 1455px">
<el-card style="width: 1375px">
<el-select v-model="Machine" filterable clearable size="small" style="margin:0px 10px 0px 10px;width: 180px;" placeholder="机床号" @change="getGroup">
<el-option
v-for="item in Machines"
@@ -25,7 +25,7 @@
<el-button :disabled="Name===1" type="success" plain class="el-icon-finished" size="small" style="margin-left: 220px" @click="submit">完成</el-button>
</el-card>
<el-row>
<el-card style="width: 850px; margin-left: 0px;display: inline-block;" >
<el-card style="width: 870px; margin-left: 0px;display: inline-block;" >
<el-table
:data="tableData"
loading="loading"
@@ -79,7 +79,7 @@
@current-change="handleCurrentChange"/>
</div>
</el-card>
<el-card style="width: 600px; margin-left: 1px;display: inline-block;vertical-align: top;">
<el-card style="width: 500px; margin-left: 1px;display: inline-block;vertical-align: top;">
<el-table
:data="tableData1"
loading="loading"

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

@@ -59,7 +59,7 @@
{{ scope.row.操作者 }}
</template>
</el-table-column>
<el-table-column align="center" label="扫码开始" width="90">
<el-table-column align="center" label="扫码开始" width="95">
<template slot-scope="scope">
{{ scope.row.加工开始时间 }}
</template>

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

@@ -28,7 +28,7 @@
<el-button type="success" size="small" icon="el-icon-download" style="margin-left:10px;margin-top: 3px;margin-right: 20px;float: right" plain @click="exportTable('')">导出</el-button>
</el-card>
<el-card style="margin-top: 5px">
<el-table v-loading="loading1" :data="tableData1" size="mini" border stripe style="width: 100%" height="600px" highlight-current-row @row-click="searchTable2">
<el-table v-loading="loading1" :data="tableData1" size="mini" border stripe style="width: 100%" height="600px" highlight-current-row>
<el-table-column label="供应商" align="center" min-width="150">
<template slot-scope="scope">
{{ scope.row.供应商名称 }}
@@ -83,7 +83,7 @@
</el-card>
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="请款信息明细" center width="800px">
<el-table :data="gridData1" border highlight-current-row size="mini">
<el-table :data="gridData1" border highlight-current-row size="mini" height="300px">
<el-table-column min-width="150" align="center" label="合同编号">
<template slot-scope="scope">
{{ scope.row.采购合同编号 ? scope.row.采购合同编号 : scope.row.离线合同编号 }}

48
src/views/ManufacturingCenter/ShopScheduling/index.vue
View File

@@ -4,7 +4,7 @@
<el-col style="width: 610px">
<el-card style="height: 680px">
<el-row style="margin-top: 5px">
<el-input v-model="Parts" placeholder="零件图号" size="small" style="width: 170px" @keyup.enter.native="getParts"/>
<el-input v-model="Parts" placeholder="零件图号" size="small" style="width: 170px" clearable @keyup.enter.native="pageCurrent=1;getParts()"/>
<el-select v-model="PersonValue" filterable placeholder="操作者" size="small" style="width: 100px;float: right" @change="searchTableData2">
<el-option
v-for="item in Person"
@@ -47,12 +47,12 @@
</el-table>
<div class="block" style="margin-top: 10px;">
<el-pagination
:current-page="pageCurrent"
:pager-count="5"
:page-sizes="[50, 100, 200, 500, 1000]"
:current-page="pageCurrent"
:page-size="pageSize"
:total="total"
:pager-count="4"
layout="total, sizes, prev, pager, next, jumper"
layout="total, sizes, prev, pager, next"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
</div>
@@ -60,7 +60,7 @@
</el-col>
<el-col style="width: 600px">
<el-card style="height: 680px">
<el-table :data="tableData2" height="380" highlight-current-row size="mini" style="width: 100%" border stripe @row-dblclick="XuanChu">
<el-table v-loading="loading2" :data="tableData2" height="380" highlight-current-row size="mini" style="width: 100%" border stripe @row-dblclick="XuanChu">
<el-table-column label="零件图号" align="center" width="190px">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
@@ -87,7 +87,7 @@
</template>
</el-table-column>
</el-table>
<el-table :data="tableData3" :row-class-name="tableData3ClassName" height="393" size="mini" style="width: 100%" border @row-dblclick="XuanRu">
<el-table v-loading="loading3" :data="tableData3" :row-class-name="tableData3ClassName" height="280" size="mini" style="width: 100%" border @row-dblclick="XuanRu">
<el-table-column label="序号" align="center" width="50px">
<template slot-scope="scope">
{{ scope.row.工序顺序 }}
@@ -181,25 +181,27 @@ export default {
})
},
getGongxu(row) {
this.loading3 = true
this.tableData3 = []
this.index = row.index
this.工艺计划流水号 = row.工艺计划流水号
getGongxu(row.工艺计划流水号).then(response => {
response.data.map(v => {
this.tableData3.push({
工序流水号: v.工序流水号,
工序状态: v.工序状态,
工序顺序: v.工序顺序,
工艺名称: v.工艺名称,
姓名: parseInt(v.工序间是否外协) === 2 ? '外协' : v.姓名,
排产时间: v.排产时间 ? v.排产时间.split(' ')[0] : '',
完成日期: v.完成日期 ? v.完成日期.split(' ')[0] : '',
工序间是否外协: v.工序间是否外协
if (!this.loading3) {
this.loading3 = true
this.tableData3 = []
this.index = row.index
this.工艺计划流水号 = row.工艺计划流水号
getGongxu(row.工艺计划流水号).then(response => {
response.data.map(v => {
this.tableData3.push({
工序流水号: v.工序流水号,
工序状态: v.工序状态,
工序顺序: v.工序顺序,
工艺名称: v.工艺名称,
姓名: parseInt(v.工序间是否外协) === 2 ? '外协' : v.姓名,
排产时间: v.排产时间 ? v.排产时间.split(' ')[0] : '',
完成日期: v.完成日期 ? v.完成日期.split(' ')[0] : '',
工序间是否外协: v.工序间是否外协
})
})
this.loading3 = false
})
this.loading3 = false
})
}
},
tableData1ClassName({ row, rowIndex }) {
row.index = rowIndex

1
src/views/layout/components/Navbar.vue
View File

@@ -291,6 +291,7 @@ export default {
<style rel="stylesheet/scss" lang="scss" scoped>
.navbar {
min-width: 1380px;
height: 50px;
line-height: 50px;
border-radius: 0px !important;

2
src/views/layout/components/TagsView.vue
View File

@@ -71,7 +71,7 @@ export default {
document.getElementById('app-main').style.width = '1710px'
break
case 'CreatingPurchasingMaterials': // 外购备料
document.getElementById('app-main').style.width = '1950px'
document.getElementById('app-main').style.width = '1865px'
break
case 'RequestOutsourcingMaterials': // 外购备料请款
document.getElementById('app-main').style.width = '1710px'