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:
sujiaqi
2020-02-08 21:28:16 +08:00
parent 6544fe4823 47e25ccf26
commit 30e041c70f
68 changed files with 967 additions and 357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,7 +14,7 @@
@change="pageCurrent=1;total=0;searchTable()"/>
<span>操作者:</span>
<el-input v-model="workerName" placeholder="操作者" size="small" clearable style="width:100px; margin-top: 10px;margin-bottom: 10px"/>
<el-button :disabled="loading" type="success" class="el-icon-search" size="small" style="margin: 10px 0 0 10px" @click="pageCurrent=1;total=0;searchTable();">查询</el-button>
<el-button :disabled="loading" type="primary" class="el-icon-search" size="small" style="margin: 10px 0 0 10px" plain @click="pageCurrent=1;total=0;searchTable();">查询</el-button>
</el-row>
</el-card>

32
src/views/ManufacturingCenter/CreatePreparationBill/index.vue
View File

@@ -4,7 +4,7 @@
<el-row>
<span>零件图号:</span>
<el-input v-model="partName" placeholder="零件图号" size="small" clearable style="width:200px;margin: 3px 0"/>
<el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="pageSize=30; pageCurrent=1;searchTable()">查询</el-button>
<el-button size="small" icon="el-icon-search" type="primary" plain style="margin-left: 10px" @click="pageSize=30; pageCurrent=1;searchTable()">查询</el-button>
<el-tooltip :open-delay="1200" effect="dark" content="已导出和未导出备料单" placement="top">
<el-checkbox v-model="all" size="small">查询全部</el-checkbox>
</el-tooltip>
@@ -13,13 +13,13 @@
<el-button type="primary" size="small" icon="el-icon-success" plain style="margin-left:0px" @click="edit2()">分配外购备料</el-button>
</el-tooltip>
<el-tooltip :open-delay="1200" effect="dark" content="将选中零件分配为自家备料" placement="top">
<el-button type="warning" size="small" icon="el-icon-success" plain style="margin-left:10px" @click="edit()">分配自家备料</el-button>
<el-button type="primary" size="small" icon="el-icon-success" plain style="margin-left:10px" @click="edit()">分配自家备料</el-button>
</el-tooltip>
<el-tooltip :open-delay="1200" effect="dark" content="打印备料单" placement="top">
<el-button type="primary" size="small" icon="el-icon-printer" style="margin-left:10px" @click="exportTable('BL')">打印自家备料单</el-button>
<el-button class="button111" size="small" icon="el-icon-printer" style="margin-left:10px" @click="exportTable('BL')">打印自家备料单</el-button>
</el-tooltip>
<el-tooltip :open-delay="1000" effect="dark" content="导出备料分配单" placement="top">
<el-button type="warning" class="el-icon-download" size="small" style="margin: 10px 0 0 140px" @click="exportExcel">导出</el-button>
<el-button type="primary" plain class="el-icon-download" size="small" style="margin: 10px 0 0 140px" @click="exportExcel">导出</el-button>
</el-tooltip>
</el-row>
</el-card>
@@ -45,9 +45,9 @@
align="center"/>
<el-table-column label="备料分配" prop="备料分配" align="center" width="90">
<template slot-scope="scope">
<el-tag v-if="scope.row.备料打印 ==='1' && scope.row.是否外购备料==='0'" type="success" size="mini">自家</el-tag>
<el-tag v-if="scope.row.备料打印 ==='0' && scope.row.是否外购备料==='1'" type="success" size="mini">外购</el-tag>
<el-tag v-if="scope.row.备料打印 ==='0' && scope.row.是否外购备料==='0'" type="warning" size="mini">未分配</el-tag>
<span v-if="scope.row.备料打印 ==='1' && scope.row.是否外购备料==='0'" type="success" size="mini">自家</span>
<span v-if="scope.row.备料打印 ==='0' && scope.row.是否外购备料==='1'" type="success" size="mini">外购</span>
<span v-if="scope.row.备料打印 ==='0' && scope.row.是否外购备料==='0'" type="warning" size="mini">未分配</span>
</template>
</el-table-column>
<el-table-column label="零件名称" prop="零件名称" align="center" width="250" sortable="custom" show-overflow-tooltip>
@@ -327,3 +327,21 @@ export default {
<style scoped>
</style>
<style lang="scss">
.button111{
background:rgb(253,246,236);
border-color: #ff9759;
color: #ff9759;
&:hover{
background: #ff9759;
border-color: #ff9759;
color: white;
}
&:focus{
background: #ff9759;
border-color: #ff9759;
color: white;
}
}
</style>

5
src/views/ManufacturingCenter/MaterialArrival/index.vue
View File

@@ -19,8 +19,8 @@
:value="item.value"/>
</el-select>
<el-input v-model="Partpaint" placeholder="零件号" clearable size="small" style="width: 180px;margin:0px 10px;"/>
<el-button type="success" class="el-icon-search" size="small" style="margin: 0px 10px;" @click="pageCurrent = 1;pageSize = 50;getTableData()">查询</el-button>
<el-button :disabled="Name===1" type="baocun" class="el-icon-finished" size="small" style="margin-left: 220px" @click="submit">完成</el-button>
<el-button type="primary" plain class="el-icon-search" size="small" style="margin: 0px 10px;" @click="pageCurrent = 1;pageSize = 50;getTableData()">查询</el-button>
<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: 50%; float: left">
@@ -30,6 +30,7 @@
class="table"
highlight-current-row
border
stripe
height="750"
style="width: 100%"
@current-change="getCurrentRow">

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

@@ -12,8 +12,8 @@
style="width:250px;margin-left: 5px;margin-top: 10px;margin-bottom: 10px"
start-placeholder="开始日期"
end-placeholder="结束日期"/>
<el-button size="small" type="success" icon="el-icon-search" style="margin-left: 5px" @click="searchTable">查询</el-button>
<el-button size="small" type="primary" icon="el-icon-download" @click="exportExcel">导出</el-button>
<el-button size="small" type="primary" icon="el-icon-search" style="margin-left: 5px" plain @click="searchTable">查询</el-button>
<el-button size="small" type="primary" icon="el-icon-download" plain @click="exportExcel">导出</el-button>
</el-card>
<el-card>
<el-table :data="tableData" size="mini" style="max-height: 720px" height="720px" border>

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

@@ -28,7 +28,7 @@
:label="item.label"
:value="item.value"/>
</el-select>
<el-button type="success" size="small" style="margin: 0px 10px" icon="el-icon-search" @click="pageCurrent=1;pageSize=300;total=0;searchData()">查询</el-button>
<el-button type="primary" size="small" style="margin: 0px 10px" icon="el-icon-search" plain @click="pageCurrent=1;pageSize=300;total=0;searchData()">查询</el-button>
<el-tooltip effect="dark" content="将零件打回，重新编制工艺定额" placement="top">
<el-button v-show="true" type="danger" plain style="margin-left: 0px;margin-top: 3px" icon="el-icon-edit" size="small" @click="returnEdit">零件工艺调整</el-button>
</el-tooltip>

22
src/views/ManufacturingCenter/ProcessPlanningNew/index.vue
View File

@@ -29,7 +29,7 @@
</el-option>
</el-select>
<el-checkbox v-model="checked" :disabled="isShow2 || (parseInt(token) !== 6 && parseInt(token) !== 19)" size="small" style="margin-left:10px">是否核准</el-checkbox>
<el-button :disabled="disabled" type="baocun" size="small" icon="el-icon-tickets" @click="saveApprove">保存</el-button>
<el-button :disabled="disabled" type="success" size="small" plain icon="el-icon-tickets" @click="saveApprove">保存</el-button>
<el-button v-show="isShowN" type="text" style="margin-top: 8px;float: right" @click="isShowN=false">折叠</el-button>
<el-button v-show="!isShowN" type="text" style="margin-top: 8px;float: right" @click="isShowN=true">展开</el-button>
</el-card>
@@ -69,7 +69,7 @@
<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="success" size="small" @click="Calculation1()">计算重量</el-button>
<el-button style="margin-top: 3px;margin-left: 10px;" type="primary" size="small" plain @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"/>
@@ -84,7 +84,7 @@
<el-input-number v-model="Width" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
<span>厚:</span>
<el-input-number v-model="height1" 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="Calculation2()">计算重量
<el-button style="margin-top: 20px;margin-left: 10px;" type="primary" size="small" plain @click="Calculation2()">计算重量
</el-button>
<span>重量:</span>
<el-input v-model="weight" style="width:150px" size="small" placeholder="重量">
@@ -112,7 +112,7 @@
<el-input-number v-model="bianhou" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
<span>长度:</span>
<el-input-number v-model="changdu" 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="Calculation4()">计算重量
<el-button style="margin-top: 20px;margin-left: 10px;" type="primary" size="small" plain @click="Calculation4()">计算重量
</el-button>
<span>重量:</span>
<el-input v-model="weight" style="width:150px" size="small" placeholder="重量">
@@ -150,21 +150,21 @@
</el-select>
<span>公差:</span>
<el-input v-model="tolerance" size="small" style="width:100px" placeholder="公差"/>
<el-button style="margin-left: 10px" type="success" size="small" @click="calTol()">计算公差</el-button>
<el-button style="margin-left: 10px" type="primary" size="small" plain @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 v-if="isShow1" type="info" size="small" icon="el-icon-document" plain @click="pasteTable">粘贴
</el-button>
<el-button v-if="true" :disabled="disabled" type="warning" size="small" icon="el-icon-tickets" @click="DYbtn">原有
<el-button v-if="true" :disabled="disabled" type="warning" size="small" icon="el-icon-tickets" plain @click="DYbtn">原有
</el-button>
<el-button :disabled="disabled" type="warning" size="small" icon="el-icon-tickets" @click="WYbtn">
<el-button :disabled="disabled" type="warning" size="small" icon="el-icon-tickets" plain @click="WYbtn">
完艺
</el-button>
<el-button :disabled="disabled" type="danger" size="small" icon="el-icon-delete" @click="deleteTable">删除
<el-button :disabled="disabled" type="danger" size="small" icon="el-icon-delete" plain @click="deleteTable">删除
</el-button>
<el-button v-if="isShow1" type="baocun" size="small" icon="el-icon-tickets" style="margin-left: 1px;margin-right: 1px" @click="copyAndSave">
<el-button v-if="isShow1" type="success" size="small" icon="el-icon-tickets" style="margin-left: 1px;margin-right: 1px" plain @click="copyAndSave">
复制并保存
</el-button>
<el-button :disabled="disabled" type="baocun" size="small" icon="el-icon-tickets" @click="saveApprove">保存
<el-button :disabled="disabled" type="success" size="small" icon="el-icon-tickets" plain @click="saveApprove">保存
</el-button>
</el-button-group>
<el-button v-if="!isShow1" type="warning" size="small" icon="el-icon-tickets" @click="saveCompiled">记录修改备注</el-button>

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

@@ -22,9 +22,9 @@
:label="item.label"
:value="item.value"/>
</el-select>
<el-button type="primary" size="small" icon="el-icon-bangzhu" style="margin-left: 10px" @click="selectAll(tableData)">全选</el-button>
<el-button type="baocun" size="small" icon="el-icon-upload" style="margin-left: 10px" @click="save">保存</el-button>
<el-button type="baocun" size="small" icon="el-icon-upload" style="margin-left: 10px;float: right" @click="currency">通用件保存</el-button>
<el-button type="primary" size="small" icon="el-icon-bangzhu" style="margin-left: 10px" plain @click="selectAll(tableData)">全选</el-button>
<el-button type="success" size="small" icon="el-icon-upload" style="margin-left: 10px" plain @click="save">保存</el-button>
<el-button type="success" size="small" icon="el-icon-upload" style="margin-left: 10px;float: right" plain @click="currency">通用件保存</el-button>
</el-card>
<el-card>
<el-table