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

样式

Browse Source
This commit is contained in:
zhangdingyu
2019-09-18 12:24:50 +08:00
parent 93eb6ec5c5
commit faab73c1fa
58 changed files with 0 additions and 4278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue
View File

@@ -1,19 +1,11 @@
<template>
<div class="app-container">
<el-card>
<<<<<<< HEAD
<el-radio-group v-model="radio" size="small" style="margin-top: 3px;" @change="checked = false;partNum=[];partNumValue = '';typeValue = '';Specifications = '';partName = '';material = '';materialName = '';prepareMateriel = '';spec = '';batchNum = '';searchPartsByMachineGroup();">
<el-radio v-model="radio" :label="1" border>未编制</el-radio>
<el-radio v-model="radio" :label="2" border style="margin-left: 0px">已编制</el-radio>
</el-radio-group>
<span style="margin-left: 10px">工艺员:</span>
=======
<el-radio-group v-model="radio" size="small" style="margin: 10px;" @change="checked = false;partNum=[];partNumValue = '';typeValue = '';Specifications = '';partName = '';material = '';materialName = '';prepareMateriel = '';spec = '';batchNum = '';searchPartsByMachineGroup();">
<el-radio v-model="radio" :label="1">未编制</el-radio>
<el-radio v-model="radio" :label="2">已编制</el-radio>
</el-radio-group>
<span>工艺员:</span>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-select v-model="CraftmenValue" placeholder="工艺员" size="small" style="width:100px" @change="clearDetail();">
<el-option
v-for="item in Craftmen"
@@ -25,11 +17,7 @@
<el-input v-model="partNumber" clearable placeholder="零件号" size="small" style="width:200px">
<el-button slot="append" icon="el-icon-right" @click="searchParts();partNumValue=''"/>
</el-input>-->
<<<<<<< HEAD
<span style="margin-left: 10px">机床-分组或零件号:</span>
=======
<span>机床-分组 或 零件号:</span>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-input v-model="machine_Group_part" clearable placeholder="例：机床号-组号 或 零件号" size="small" style="width:260px">
<el-button slot="append" icon="el-icon-right" @click="partNumValue='';searchPartsByMachineGroup();"/>
</el-input>
@@ -44,7 +32,6 @@
<b style="float: right; color: #8492a6; font-size: 13px">&nbsp;&nbsp;{{ item.machine }}</b>
</el-option>
</el-select>
<<<<<<< HEAD
<el-checkbox v-model="checked" :disabled="isShow2 || (parseInt(token) !== 6 && parseInt(token) !== 19)" size="small" style="margin-left:10px">是否核准</el-checkbox>
<!--<el-button v-show="isShow2" type="danger" icon="el-icon-edit" size="small" @click="returnEdit">在制零件工艺调整</el-button>-->
<!--<el-button v-show="false" plain size="small" style="margin: 10px;float:right" @click="switchEdit()">切换编辑模式</el-button>-->
@@ -57,20 +44,6 @@
<el-input v-model="Specifications" placeholder="规格" size="small" readonly style="width:100px"/>
<span>投产总数量:</span>
<el-input v-model="batchNum" readonly size="small" style="width:100px"/>
=======
<el-checkbox v-model="checked" :disabled="isShow2 || (parseInt(token) !== 6 && parseInt(token) !== 19)" size="small" style="margin:10px">是否核准</el-checkbox>
<!--<el-button v-show="isShow2" type="danger" icon="el-icon-edit" size="small" @click="returnEdit">在制零件工艺调整</el-button>-->
<!--<el-button v-show="false" plain size="small" style="margin: 10px;float:right" @click="switchEdit()">切换编辑模式</el-button>-->
<div v-show="isShow">
<span>种类:</span>
<el-input v-model="typeValue" placeholder="种类" size="small" readonly style="width:100px"/>
<span>零件名称:</span>
<el-input v-model="partName" placeholder="零件名称" size="small" readonly style="width:115px"/>
<span>规格:</span>
<el-input v-model="Specifications" placeholder="规格" size="small" readonly style="width:115px"/>
<span>投产总数量:</span>
<el-input v-model="batchNum" readonly size="small" style="width:80px;margin-top:10px;"/>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<span>物料:</span>
<el-input v-model="materialName" placeholder="物料" size="small" style="width:215px" readonly>
<el-button slot="prepend" icon="el-icon-search" @click="dialogMaterial=true"/>
@@ -81,15 +54,9 @@
</div>
<div>
<el-row>
<<<<<<< HEAD
<el-col style="width:180px">
<span style="margin-left: 0">物料类型:</span>
<el-select v-model="materielValue" size="small" style="margin-top: 7px;width:100px;margin-bottom: 3px" placeholder="物料类型" @change="clear()">
=======
<el-col style="width:210px">
<span>物料类型:</span>
<el-select v-model="materielValue" size="small" style="margin-top: 20px;width:120px" placeholder="物料类型" @change="clear()">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-option
v-for="item in materiel"
:key="item.value"
@@ -98,21 +65,12 @@
</el-select>
</el-col>
<<<<<<< HEAD
<el-col v-show="materielValue==='1'||materielValue==='6'||materielValue==='7'||materielValue==='8'" :span="12" >
<span >直&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;径:</span>
<el-input-number v-model="diameter" size="small" controls-position="right" style="width:100px;margin-top: 7px"/>
<span>长度:</span>
<el-input-number v-model="height2" size="small" controls-position="right" style="width:100px;margin-top:3px;"/>
<el-button style="margin-top: 3px;margin-left: 10px;" type="primary" size="small" @click="Calculation1()">计算重量</el-button>
=======
<el-col v-show="materielValue==='1'||materielValue==='6'||materielValue==='7'||materielValue==='8'" :span="15">
<span>直径:</span>
<el-input-number v-model="diameter" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
<span>长度:</span>
<el-input-number v-model="height2" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
<el-button style="margin-top: 20px;margin-left: 10px;" type="primary" size="small" @click="Calculation1()">计算重量</el-button>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<span>重量:</span>
<el-input v-model="weight" style="width:150px" size="small" placeholder="重量">
<el-button slot="append" icon="el-icon-cjn-09" @click="saveWeight"/>
@@ -184,15 +142,9 @@
<el-card>
<el-row>
<<<<<<< HEAD
<span style="margin-left: 0">输入数值:</span>
<el-input v-model="numVal" size="small" style="width:100px;margin-top: 3px" placeholder="输入数值"/>
<span style="margin-left: 10px">选择参数:</span>
=======
<span>输入数值:</span>
<el-input v-model="numVal" size="small" style="width:100px" placeholder="输入数值"/>
<span>选择参数:</span>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-select v-model="selParaValue" size="small" style="width:100px" placeholder="选择参数">
<el-option
v-for="item in selPara"
@@ -201,15 +153,9 @@
:value="item.value"/>
</el-select>
<span>公差:</span>
<<<<<<< HEAD
<el-input v-model="tolerance" size="small" style="width:100px" placeholder="公差"/>
<el-button style="margin-left: 10px" type="primary" size="small" @click="calTol()">计算公差</el-button>
<el-button-group v-if="isShow1" style="margin-left: 10px" >
=======
<el-input v-model="tolerance" size="small" style="width:150px" placeholder="公差"/>
<el-button style="margin:10px" type="primary" size="small" @click="calTol()">计算公差</el-button>
<el-button-group v-if="isShow1" style="margin: 10px">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-button v-if="isShow1" type="info" size="small" icon="el-icon-document" @click="pasteTable">粘贴
</el-button>
<el-button v-if="true" :disabled="disabled" type="warning" size="small" icon="el-icon-tickets" @click="DYbtn">原有
@@ -310,34 +256,22 @@
<el-button
icon="el-icon-arrow-up"
type="primary"
<<<<<<< HEAD
size="mini"
=======
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
@click="upOne(scope.row)"/>
<el-button
icon="el-icon-arrow-down"
type="primary"
<<<<<<< HEAD
size="mini"
=======
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
@click="downOne(scope.row)"/>
<el-button
icon="el-icon-circle-plus-outline"
type="primary"
<<<<<<< HEAD
size="mini"
=======
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
@click="insertOne(scope.row)"/>
<el-button
icon="el-icon-delete"
type="danger"
<<<<<<< HEAD
size="mini"
=======
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
@click="deleteOne(scope.row)"/>
</div>
</template>
@@ -1739,21 +1673,13 @@ export default {
background: #f0f9eb;
}
.el-card {
<<<<<<< HEAD
/*margin-bottom: 15px;*/
=======
margin-bottom: 15px;
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
}
.el-date-editor {
width: 150px
}
span {
<<<<<<< HEAD
margin-left: 10px;
=======
margin: 10px 0 10px 10px;
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
}
.el-table .change {
background: oldlace;
@@ -1763,7 +1689,6 @@ export default {
.processTable{
.el-input__inner{
font-weight: bold;
<<<<<<< HEAD
font-size: 18px;
height: 35px;
}
@@ -1774,17 +1699,6 @@ export default {
.el-cascader__label{
font-weight: bold;
font-size: 18px;
=======
font-size: 20px;
}
.el-textarea__inner{
font-weight: bold;
font-size: 20px;
}
.el-cascader__label{
font-weight: bold;
font-size: 20px;
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
}
}
</style>