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

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

Browse Source
This commit is contained in:
zhangdingyu
2019-12-12 14:11:35 +08:00
parent da58336320 da9f8a12b8
commit da64ae65cb
23 changed files with 562 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,11 +37,11 @@
</el-row>
<el-row>
<span>操作者:</span>
<el-input v-model="workerName" placeholder="操作者" size="small" clearable style="width:120px; margin-top: 10px;margin-bottom: 10px"/>
<el-input v-model="workerName" placeholder="操作者" size="small" clearable style="width:100px; margin-top: 10px;margin-bottom: 10px"/>
<span>零件图号:</span>
<el-input v-model="partNumber" placeholder="零件图号" size="small" clearable style="width:150px"/>
<el-input v-model="partNumber" placeholder="零件图号" size="small" clearable style="width:170px"/>
<span>工艺名称:</span>
<el-input v-model="technologyName" placeholder="工艺名称" size="small" clearable style="width:150px"/>
<el-input v-model="technologyName" placeholder="工艺名称" size="small" clearable style="width:100px"/>
<el-button type="success" class="el-icon-search" size="small" style="margin: 10px 0 0 10px" @click="pageCurrent=1;total=0;searchTable();">查询</el-button>
<el-tooltip :open-delay="1200" effect="dark" content="新增补录工时" placement="top">
<el-button type="primary" class="el-icon-plus" size="small" style="margin: 10px 0 0 10px" @click="addSupplement();">新增</el-button>

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

@@ -3,7 +3,7 @@
<el-card>
<span>工位号:</span>
<el-select v-model="MachineValue" filterable size="small" style="width:220px;margin-bottom:10px" placeholder="工位号" @change="searchTable();searchParts()">
<el-select v-model="MachineValue" filterable size="small" style="width:120px;margin-bottom:10px" placeholder="工位号" @change="searchTable();searchParts()">
<el-option
v-for="item in Machine"
:key="item.value"

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

@@ -3,7 +3,7 @@
<el-card>
<el-row>
<span>机床号:</span>
<el-select v-model="Machine" filterable clearable size="small" style="margin-top:10px;width: 220px" placeholder="机床号" @change="getGroup()">
<el-select v-model="Machine" filterable clearable size="small" style="margin-top:10px;width: 185px" placeholder="机床号" @change="getGroup()">
<el-option
v-for="item in Machines"
:key="item.value"
@@ -22,7 +22,7 @@
:value="item.value"/>
</el-select>
<span>零件号:</span>
<el-input v-model="number" placeholder="零件号" clearable size="small" style="width: 200px;"/>
<el-input v-model="number" placeholder="零件号" clearable size="small" style="width: 170px;"/>
<el-button type="success" class="el-icon-search" size="small" style="margin: 10px 0 0 10px" @click="pageCurrent=1;pageSize=10;total = 0;getTableData();">查询</el-button>
</el-row>
<el-row v-if="false">

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

@@ -2,7 +2,7 @@
<div class="app-container">
<el-card>
<el-button :disabled="isShow" type="info" size="small" style="margin: 0px 180px;float: right" @click="EditData">补录完成日期</el-button>
<el-select v-model="Machine" filterable clearable size="small" style="margin:0px 10px 0px 10px;width: 180px;" placeholder="机床号" @change="getGroup">
<el-select v-model="Machine" filterable clearable size="small" style="margin:0px 10px 0px 10px;width: 185px;" placeholder="机床号" @change="getGroup">
<el-option
v-for="item in Machines"
:key="item.value"
@@ -12,14 +12,14 @@
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
</el-option>
</el-select>
<el-select v-model="Group" size="small" clearable placeholder="组号" style="margin:0px 10px;width: 120px;" @change="getTableData">
<el-select v-model="Group" size="small" clearable placeholder="组号" style="margin:0px 10px;width: 100px;" @change="getTableData">
<el-option
v-for="item in Groups"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-input v-model="number" placeholder="零件号" clearable size="small" style="width: 180px;margin:0px 10px;"/>
<el-input v-model="number" placeholder="零件号" clearable size="small" style="width: 170px;margin:0px 10px;"/>
<el-button type="success" class="el-icon-search" size="small" style="margin: 0px 10px;" @click="pageCurrent = 1;pageSize = 100;getTableData()">查询</el-button>
</el-card>
<el-row>

2
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: 150px" @keyup.enter.native="getParts"/>
<el-input v-model="Parts" placeholder="零件图号" size="small" style="width: 170px" @keyup.enter.native="getParts"/>
<el-select v-model="PersonValue" filterable placeholder="操作者" size="small" style="width: 100px;float: right" @change="searchTableData2">
<el-option
v-for="item in Person"