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

更新

Browse Source
This commit is contained in:
liushuai
2019-09-19 19:52:46 +08:00
parent faab73c1fa
commit aef7132f40
49 changed files with 733 additions and 585 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/views/TechnologyCenter/CreatePackingList/index.vue
View File

@@ -91,19 +91,20 @@
size="mini"
height="170px"
style="margin-top:3px;margin-bottom: 0">
<el-table-column type="expand">
<el-table-column type="expand" label="详情">
<template slot-scope="props">
<el-table
:data="groupData"
border
stripe
size="mini"
style="width: 90%">
class="subTableHeader"
style="width: 50%">
<el-table-column
label="序号"
type="index"
align="center"
width="100px"/>
width="50px"/>
<el-table-column
align="center"
label="类别"
@@ -319,7 +320,7 @@
</el-table>
</el-card>
<el-dialog :title="receiptTitle" :visible.sync="receiptVisible" center style="min-height: 200px" width="800px">
<el-dialog v-el-drag-dialog :title="receiptTitle" :visible.sync="receiptVisible" center style="min-height: 200px" width="800px">
<el-form ref="receiptForm" :rules="receiptRules" :model="receiptForm" label-position="left" label-width="110px" class="demo-ruleForm">
<el-row>
<el-col :span="12">
@@ -367,7 +368,7 @@
</div>
</el-dialog>
<el-dialog :visible.sync="machineVisible" :title="machineTitle" center style="min-height: 200px" width="400px">
<el-dialog v-el-drag-dialog :visible.sync="machineVisible" :title="machineTitle" center style="min-height: 200px" width="400px">
<el-form ref="machineForm" :rules="machineRules" :model="machineForm" label-position="left" label-width="110px" class="demo-ruleForm">
<el-row>
<el-col v-if="machineTitle==='添加主机'" :span="24">
@@ -400,7 +401,7 @@
</div>
</el-dialog>
<el-dialog :visible.sync="fileVisible" :title="fileTitle" center style="min-height: 200px" width="400px">
<el-dialog v-el-drag-dialog :visible.sync="fileVisible" :title="fileTitle" center style="min-height: 200px" width="400px">
<el-form ref="fileForm" :rules="filerules" :model="fileForm" label-position="left" label-width="110px" class="demo-ruleForm">
<el-row>
<el-col :span="24">
@@ -427,7 +428,7 @@
</div>
</el-dialog>
<el-dialog :visible.sync="spareVisible" :title="spareTitle" center style="min-height: 200px" width="400px">
<el-dialog v-el-drag-dialog :visible.sync="spareVisible" :title="spareTitle" center style="min-height: 200px" width="400px">
<el-form ref="spareForm" :rules="spareRule" :model="spareForm" label-position="left" label-width="110px" class="demo-ruleForm">
<el-row>
<el-col :span="24">
@@ -1064,3 +1065,19 @@ span{
.tg1 .tg-0lax{text-align:center;vertical-align:top}
.tg1 .tg-a8eg{font-size:28px;text-align:center;vertical-align:top}
</style>
<style lang="scss">
.subTableHeader {
th {
background: #8ff4ea !important;
color: black;
}
tr.el-table__row td {
background-color: #d8e5f6 !important;
}
tr.el-table__row.el-table__row--striped td {
background: #e9f0f9 !important;
}
}
</style>

12
src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue
View File

@@ -23,7 +23,7 @@
<el-row style="margin-top: 10px">
<span>机床名称：</span>
<el-input v-model="machineName" readonly size="small" placeholder="机床名称" style="width: 200px;"/>
<span>机床数量：</span>
<span style="margin-left: 10px">机床数量：</span>
<el-input v-model="machineNum" readonly size="small" placeholder="机床数量" style="width: 200px;"/>
</el-row>
</div>
@@ -46,8 +46,8 @@
width="50"/>
<el-table-column align="center" label="物料状态" min-width="90">
<template slot-scope="scope">
<el-tag v-if="scope.row.物料流水号===null" type="warning" size="small">不存在</el-tag>
<el-tag v-if="scope.row.物料流水号!==null" type="primary" size="small">存在</el-tag>
<el-tag v-if="scope.row.物料流水号===null" type="warning" size="mini">不存在</el-tag>
<el-tag v-if="scope.row.物料流水号!==null" type="primary" size="mini">存在</el-tag>
</template>
</el-table-column>
<el-table-column align="center" label="图号" min-width="120">
@@ -164,7 +164,7 @@
</el-table>
</el-card>
<el-dialog :title="title" :visible.sync="dialogFormVisible" center style="min-height: 300px" width="800px">
<el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogFormVisible" center style="min-height: 300px" width="800px">
<el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="110px" class="demo-ruleForm">
<el-row>
<el-col :span="12">
@@ -270,7 +270,7 @@
</div>
</el-dialog>
<el-dialog :visible.sync="dialogMaterial" title="物料选择">
<el-dialog v-el-drag-dialog :visible.sync="dialogMaterial" title="物料选择">
<el-input v-model="inputMaterial" placeholder="材质" size="small" style="width:200px"/>
<el-button type="success" size="small" icon="el-icon-search" style="margin: 0 0 10px 10px" @click="searchMaterial()">查询</el-button>
<el-table
@@ -316,7 +316,7 @@
</div>
</el-dialog>
<el-dialog :visible.sync="dialogParts" :title="title1" :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false" center width="400px">
<el-dialog v-el-drag-dialog :visible.sync="dialogParts" :title="title1" :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false" center width="400px">
<span>零件图号：</span>
<el-input v-model="PartsValueNum" size="small" placeholder="零件图号" style="width: 200px"/>
<!--<el-select v-model="PartsValueNum" filterable size="small" placeholder="零件图号">-->

1
src/views/TechnologyCenter/ImportParts/index.vue
View File

@@ -46,6 +46,7 @@
<!--<div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>-->
<!--</el-upload>-->
<el-dialog
v-el-drag-dialog
:visible.sync="dialogVisibleMachine"
width="30%">
<el-card>

6
src/views/TechnologyCenter/ImportParts/specificationData.vue
View File

@@ -46,8 +46,8 @@
width="50"/>
<el-table-column align="center" label="物料状态" min-width="50">
<template slot-scope="scope">
<el-tag v-if="scope.row.物料流水号===null" type="warning" size="small" style="margin: 0px">不存在</el-tag>
<el-tag v-if="scope.row.物料流水号!==null" type="primary" size="small" style="margin: 0px">存在</el-tag>
<el-tag v-if="scope.row.物料流水号===null" type="warning" size="mini" style="margin: 0px">不存在</el-tag>
<el-tag v-if="scope.row.物料流水号!==null" type="primary" size="mini" style="margin: 0px">存在</el-tag>
</template>
</el-table-column>
<el-table-column align="center" label="图号" min-width="150">
@@ -65,7 +65,7 @@
{{ scope.row.材料或者规格 }}
</template>
</el-table-column>
<el-table-column align="center" label="规格" width="150">
<el-table-column align="center" label="规格" width="150" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.规格 }}
</template>