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

1
src/icons/svg/ContractApprovalQuery.svg Normal file
View File

@@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1532937577028" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3113" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M947.2 102.4H76.8c-15.36 0-25.6 10.24-25.6 25.6v768c0 15.36 10.24 25.6 25.6 25.6h870.4c15.36 0 25.6-10.24 25.6-25.6V128c0-15.36-10.24-25.6-25.6-25.6z m-25.6 51.2v512H102.4V153.6h819.2zM102.4 870.4v-153.6h819.2v153.6H102.4z" p-id="3114"></path><path d="M537.6 768H179.2c-12.8 0-25.6 12.8-25.6 25.6s12.8 25.6 25.6 25.6h358.4c12.8 0 25.6-12.8 25.6-25.6s-12.8-25.6-25.6-25.6zM844.8 768h-153.6c-12.8 0-25.6 10.24-25.6 25.6 0 12.8 12.8 25.6 25.6 25.6h153.6c12.8 0 25.6-12.8 25.6-25.6 0-15.36-12.8-25.6-25.6-25.6zM179.2 460.8h102.4c10.24 0 17.92-5.12 23.04-15.36l79.36-158.72 156.16 312.32c5.12 7.68 12.8 15.36 23.04 15.36s17.92-5.12 23.04-15.36l104.96-209.92 28.16 56.32c5.12 7.68 12.8 15.36 23.04 15.36h102.4c15.36 0 25.6-10.24 25.6-25.6s-10.24-25.6-25.6-25.6h-87.04l-43.52-87.04c-7.68-17.92-38.4-17.92-46.08 0L563.2 532.48 407.04 220.16c-7.68-17.92-38.4-17.92-46.08 0L266.24 409.6H179.2c-15.36 0-25.6 10.24-25.6 25.6s10.24 25.6 25.6 25.6z" p-id="3115"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

1
src/icons/svg/RequestApprovalQuery.svg Normal file
View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1000 1000"><path d="M23.85 26.83c-3.46 2.12-7.89 6.54-10 10C10 43.18 10 47.6 10 500c0 452.4 0 456.82 3.85 463.17 2.12 3.46 6.54 7.89 10 10 6.35 3.85 10.58 3.85 362.38 3.85h356.03l6.54-4.42c13.85-9.04 13.27-4.04 12.89-137.91l-.58-119.83-26.35 28.28-26.55 28.26v151.77H63.86V76.84h644.36l.39 189.65.58 189.46 26.54-37.7 26.35-37.7V212.83c0-187.15.77-176.19-13.27-185.42l-6.54-4.42H386.23c-351.8-.01-356.03-.01-362.38 3.84z"/><path d="M154.64 210.71c-3.85 2.69-4.23 4.62-4.23 18.85 0 13.08.58 16.54 3.46 19.04 3.27 3.08 22.12 3.27 231.39 3.27 203.12 0 228.31-.39 232.16-3.08 3.85-2.5 4.23-4.62 4.23-18.27 0-25.77 29.04-22.89-235.24-22.89-202.72 0-227.92.39-231.77 3.08zm751.11 41.16c-10.58 2.69-25 10.58-32.51 17.7-4.81 4.62-245.24 345.65-254.09 360.45-2.31 3.85-34.04 150.61-34.04 157.34 0 7.69 4.04 11.54 9.81 9.81 2.31-.77 34.43-20.58 71.17-44.05l66.94-42.51 124.44-177.72c68.48-97.9 126.18-181.77 128.49-186.57 3.08-6.92 3.85-12.89 4.04-26.16 0-15.77-.58-18.66-6.16-30.01-11.54-23.27-32.89-37.7-57.7-39.24-7.12-.38-16.35 0-20.39.96zm-25.39 124.64c12.69 8.85 24.23 17.12 25.58 18.47 1.73 1.73-17.89 31.16-93.67 139.45-52.7 75.4-96.56 137.14-97.33 137.14-.77.19-13.46-8.27-28.08-18.47l-26.74-18.66 12.89-18.85c97.71-140.41 180.8-257.36 182.34-256.4.97.59 12.32 8.48 25.01 17.32zM682.63 694.27c4.23 3.27 3.85 3.46-21.93 19.81-14.43 9.23-26.54 16.35-26.93 15.96-.58-.38 5.58-29.62 11.93-56.55.96-4.23 1.73-4.04 16.93 6.54 8.65 6.16 17.69 12.51 20 14.24zM154.26 346.12c-5.39 5.39-5.58 32.31-.39 37.12 3.27 3.08 22.12 3.27 232.55 3.27 264.09 0 235.24 2.69 235.24-21.73 0-25.2 28.85-22.5-235.62-22.5-225.43 0-227.93 0-231.78 3.84zm2.88 133.11c-5.96 3.46-6.73 5.39-6.73 20.77 0 7.89.77 15.39 1.54 16.54 4.23 6.35 7.89 6.54 234.66 6.54 262.75 0 235.05 2.69 235.05-23.08s27.7-23.08-235.43-23.08c-164.27.19-226.2.77-229.09 2.31zm6.74 133.87c-11.35 1.16-13.46 4.62-13.46 21.93 0 24.81-11.35 22.7 117.33 22.7s117.33 2.12 117.33-22.7c0-23.85 10.39-21.73-110.98-22.12-56.94-.2-106.57-.2-110.22.19zm388.53 60.01c-1.54.77-13.66 23.27-26.93 49.82-13.27 26.54-24.43 48.28-25.01 48.28s-5.96-10-12.12-22.12c-8.08-16.54-12.31-22.7-15.77-24.04-9.62-3.66-13.66.19-25.39 24.04-6.15 12.12-11.54 22.12-12.12 22.12s-5.96-10-12.12-22.12c-11.73-23.85-15.77-27.7-25.39-24.04-3.46 1.35-7.69 7.5-15.77 24.04-6.15 12.12-11.54 22.12-12.12 22.12s-5.96-10-12.12-22.12c-11.73-23.85-15.77-27.7-25.39-24.04-3.46 1.35-7.69 7.5-15.77 24.04-6.15 12.12-11.54 22.12-12.12 22.12s-5.96-10-12.12-22.12c-8.27-16.93-12.12-22.7-15.96-24.04-10.96-4.23-13.08-1.35-46.36 64.44-17.12 33.85-31.16 63.86-31.35 66.74 0 10 11.54 16.35 20.77 11.35 1.73-.96 14.04-23.46 27.31-50.01 13.27-26.54 24.43-48.28 25-48.28s6.16 10.19 12.5 22.7c9.23 18.08 12.5 22.7 16.16 23.08 10.77 1.54 13.27-.77 24.62-23.66 6.15-12.12 11.54-22.12 12.12-22.12s6.16 10.19 12.5 22.7c9.23 18.08 12.5 22.7 16.16 23.08 10.77 1.54 13.27-.77 24.62-23.66 6.15-12.12 11.54-22.12 12.12-22.12s6.16 10.19 12.5 22.7l11.54 22.5h17.32l11.54-22.5c6.35-12.5 11.93-22.7 12.5-22.7s6.16 10.19 12.5 22.7l11.54 22.5h17.32l32.12-63.47c17.7-35.01 32.12-65.4 32.31-67.9.21-8.86-12.67-15.2-21.14-10.01z"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

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'