This commit is contained in:
liushuai
2019-09-20 10:49:57 +08:00
parent a496a45189
commit 5b94c5823d
8 changed files with 73 additions and 30 deletions

View File

@@ -1,7 +1,7 @@
<template>
<div class="app-container">
<el-card>
<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-card style="margin: 10px">
<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" border>未编制</el-radio>
<el-radio v-model="radio" :label="2" border style="margin-left: 0px">已编制</el-radio>
</el-radio-group>
@@ -35,7 +35,7 @@
<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>-->
<div v-show="isShow">
<div v-show="isShow" style="margin-bottom: 10px;margin-left: 10px">
<span style="margin-left: 0">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</span>
<el-input v-model="typeValue" placeholder="种类" size="small" readonly style="width:100px;margin-top: 5px"/>
<span>零件名称:</span>
@@ -52,7 +52,7 @@
<!--<span>规格:</span>-->
<!--<el-input v-model="spec" :readonly="isShow2" style="width:100px" size="small" placeholder="规格"/>-->
</div>
<div>
<div style="margin-left: 10px">
<el-row>
<el-col style="width:180px">
<span style="margin-left: 0">物料类型:</span>
@@ -70,12 +70,12 @@
<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-button style="margin-top: 3px;margin-left: 10px;" type="success" size="small" @click="Calculation1()">计算重量</el-button>
<span>重量:</span>
<el-input v-model="weight" style="width:150px" size="small" placeholder="重量">
<el-button slot="append" icon="el-icon-cjn-09" @click="saveWeight"/>
</el-input>
<el-button style="margin-left: 10px;" type="primary" size="small" @click="insertThestring()">合并生产</el-button>
<el-button style="margin-left: 10px;" type="success" size="small" @click="insertThestring()">合并生产</el-button>
</el-col>
<el-col v-show="materielValue==='2'||materielValue==='9'||materielValue==='10'||materielValue==='11'" :span="20">
@@ -140,9 +140,9 @@
</div>
</el-card>
<el-card>
<el-row>
<span style="margin-left: 0">输入数值:</span>
<el-card style="margin: 10px">
<el-row style="margin-bottom: 10px">
<span style="margin-left: 10px">输入数值:</span>
<el-input v-model="numVal" size="small" style="width:100px;margin-top: 3px" placeholder="输入数值"/>
<span style="margin-left: 10px">选择参数:</span>
<el-select v-model="selParaValue" size="small" style="width:100px" placeholder="选择参数">
@@ -154,7 +154,7 @@
</el-select>
<span>公差:</span>
<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 style="margin-left: 10px" type="success" size="small" @click="calTol()">计算公差</el-button>
<el-button-group v-if="isShow1" style="margin-left: 10px" >
<el-button v-if="isShow1" type="info" size="small" icon="el-icon-document" @click="pasteTable">粘贴
</el-button>
@@ -165,10 +165,10 @@
</el-button>
<el-button :disabled="disabled" type="danger" size="small" icon="el-icon-delete" @click="deleteTable">删除
</el-button>
<el-button v-if="isShow1" type="primary" size="small" icon="el-icon-tickets" @click="copyAndSave">
<el-button v-if="isShow1" type="baocun" size="small" icon="el-icon-tickets" style="margin-left: 1px;margin-right: 1px" @click="copyAndSave">
复制并保存
</el-button>
<el-button :disabled="disabled" type="primary" size="small" icon="el-icon-tickets" @click="saveApprove">保存
<el-button :disabled="disabled" type="baocun" size="small" icon="el-icon-tickets" @click="saveApprove">保存
</el-button>
</el-button-group>
<el-button v-if="!isShow1" type="warning" size="small" icon="el-icon-tickets" @click="saveCompiled">记录修改备注</el-button>