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-24 17:31:11 +08:00
parent 2482179bbd 90c9e4e743
commit 6cd2c4e1c3
72 changed files with 645 additions and 455 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/views/Assembly/AssemblyExecution/index.vue
View File

@@ -69,14 +69,14 @@
</el-table-column>
<el-table-column label="操作" align="center" width="430px" fixed="right">
<template slot-scope="scope">
<el-button v-if="scope.row.装配状态===null || scope.row.装配状态===0" type="success" size="small" @click="handlestart_1(scope.row)">开始装配</el-button>
<el-button v-if="scope.row.装配状态===1" type="danger" size="small" @click="handleend_1(scope.row)">结束装配</el-button>
<el-button v-if="scope.row.装配状态===2" type="info" size="small" >装配完成</el-button>
<el-button v-if="scope.row.装配状态===null || scope.row.装配状态===0" type="success" plain size="small" @click="handlestart_1(scope.row)">开始装配</el-button>
<el-button v-if="scope.row.装配状态===1" type="danger" plain size="small" @click="handleend_1(scope.row)">结束装配</el-button>
<el-button v-if="scope.row.装配状态===2" type="info" plain size="small" >装配完成</el-button>
<el-button v-if="scope.row.装配状态===1" plain size="small" @click="handleCancelStart_1(scope.row)">取消开始装配</el-button>
<el-button v-if="scope.row.装配状态===2" plain size="small" @click="handleCancelEnd_1(scope.row)">取消结束装配</el-button>
<el-button v-if="scope.row.调试状态===null || scope.row.调试状态===0" type="success" size="small" @click="handlestart_2(scope.row)">开始调试</el-button>
<el-button v-if="scope.row.调试状态===1" type="danger" size="small" @click="handleend_2(scope.row)">结束调试</el-button>
<el-button v-if="scope.row.调试状态===2" type="info" size="small" >调试完成</el-button>
<el-button v-if="scope.row.调试状态===null || scope.row.调试状态===0" type="success" plain size="small" @click="handlestart_2(scope.row)">开始调试</el-button>
<el-button v-if="scope.row.调试状态===1" type="danger" plain size="small" @click="handleend_2(scope.row)">结束调试</el-button>
<el-button v-if="scope.row.调试状态===2" type="info plain" size="small" >调试完成</el-button>
<el-button v-if="scope.row.调试状态===1" plain size="small" @click="handleCancelStart_2(scope.row)">取消开始调试</el-button>
<el-button v-if="scope.row.调试状态===2" plain size="small" @click="handleCancelEnd_2(scope.row)">取消结束调试</el-button>
</template>
@@ -131,12 +131,14 @@
</el-table-column>
<el-table-column label="操作" align="center" width="300px" fixed="right">
<template slot-scope="scope">
<el-button v-if="!scope.row.isEditing" type="primary" size="small" @click="editTable2(scope.row)">编辑</el-button>
<el-button v-if="scope.row.isEditing" type="primary" size="small" @click="submitTable2(scope.row)">确定</el-button>
<el-button v-if="scope.row.isEditing" size="small" @click="cancelTable2(scope.row)">取消</el-button>
<el-button v-if="scope.row.buttonStatus === 1" type="success" size="small" @click="handlestart_3(scope.row)">开始装配</el-button>
<el-button v-if="scope.row.buttonStatus === 2" type="danger" size="small" @click="handleend_3(scope.row)">结束装配</el-button>
<el-button v-if="scope.row.buttonStatus === 3" type="info" size="small" >装配完成</el-button>
<el-tooltip effect="dark" content="编辑部装工时" placement="top" open-delay="1200">
<el-button v-if="!scope.row.isEditing" type="primary" plain size="small" @click="editTable2(scope.row)">编辑</el-button>
</el-tooltip>
<el-button v-if="scope.row.isEditing" type="primary" plain size="small" @click="submitTable2(scope.row)">确定</el-button>
<el-button v-if="scope.row.isEditing" size="small" plain @click="cancelTable2(scope.row)">取消</el-button>
<el-button v-if="scope.row.buttonStatus === 1" type="success" plain size="small" @click="handlestart_3(scope.row)">开始装配部件</el-button>
<el-button v-if="scope.row.buttonStatus === 2" type="danger" plain size="small" @click="handleend_3(scope.row)">结束装配</el-button>
<el-button v-if="scope.row.buttonStatus === 3" type="info" plain size="small" >装配完成</el-button>
<el-button v-if="scope.row.buttonStatus === 2" plain size="small" @click="handleCancelStart_3(scope.row)">取消开始装配</el-button>
<el-button v-if="scope.row.buttonStatus === 3" plain size="small" @click="handleCancelEnd_3(scope.row)">取消结束装配</el-button>
</template>

6
src/views/Assembly/AssemblyQualityInspection/index.vue
View File

@@ -34,11 +34,13 @@
:value="item.value"/>
</el-select>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="pageSize=10; pageCurrent= 1;selecttable()">查询</el-button>
<el-button type="primary" size="small" icon="el-icon-download" style="margin-left:10px" @click="exportExcel()">导出</el-button>
<el-tooltip effect="dark" content="导出查询数据" placement="top" open-delay="1000">
<el-button type="primary" size="small" icon="el-icon-download" style="margin-left:10px" @click="exportExcel()">导出</el-button>
</el-tooltip>
</el-row>
</el-card>
<el-card>
<el-table :data="tableData1" border size="mini" highlight-current-row stripe style="width: 100%" height="500px">
<el-table :data="tableData1" border size="mini" highlight-current-row stripe style="width: 100%" height="600px">
<el-table-column align="center" label="检验情况" width="80px">
<template slot-scope="scope">
<el-tag v-if="parseInt(scope.row.是否合格)===0||scope.row.是否合格===''" type="primary" size="small" @click="approvalPass(scope.row)">未检验</el-tag>

8
src/views/Assembly/MakeAssemblyPlan/index.vue
View File

@@ -97,10 +97,10 @@
</el-table-column>
<el-table-column label="操作" align="center" width="250px" fixed="right">
<template slot-scope="scope">
<el-button v-if="scope.row.edit" type="success" size="small" @click="confirmEdit(scope.row)">确定</el-button>
<el-button v-else type="primary" size="small" @click="scope.row.edit=!scope.row.edit">编辑</el-button>
<el-button v-if="scope.row.edit" type="primary" size="small" @click="cancel(scope.row)">取消</el-button>
<el-button type="danger" size="small" @click="deleteData(scope.row)">删除</el-button>
<el-button v-if="scope.row.edit" type="success" plain size="small" @click="confirmEdit(scope.row)">确定</el-button>
<el-button v-else type="primary" size="small" plain @click="scope.row.edit=!scope.row.edit">编辑</el-button>
<el-button v-if="scope.row.edit" type="warning" plain size="small" @click="cancel(scope.row)">取消</el-button>
<el-button type="danger" plain size="small" @click="deleteData(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>

8
src/views/Assembly/MakeColdWorkPlan/index.vue
View File

@@ -97,10 +97,10 @@
</el-table-column>
<el-table-column label="操作" align="center" width="250px" fixed="right">
<template slot-scope="scope">
<el-button v-if="scope.row.edit" type="success" size="small" @click="confirmEdit(scope.row)">确定</el-button>
<el-button v-else type="primary" size="small" @click="scope.row.edit=!scope.row.edit">编辑</el-button>
<el-button v-if="scope.row.edit" type="primary" size="small" @click="cancel(scope.row)">取消</el-button>
<el-button type="danger" size="small" @click="deleteData(scope.row)">删除</el-button>
<el-button v-if="scope.row.edit" type="success" plain size="small" @click="confirmEdit(scope.row)">确定</el-button>
<el-button v-else type="warning" plain size="small" @click="scope.row.edit=!scope.row.edit">编辑</el-button>
<el-button v-if="scope.row.edit" type="primary" plain size="small" @click="cancel(scope.row)">取消</el-button>
<el-button type="danger" plain size="small" @click="deleteData(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>

10
src/views/Assembly/MakeElectricalAssembly/index.vue
View File

@@ -57,7 +57,7 @@
</el-table>
</el-card>
<el-card>
<el-button size="small" icon="el-icon-circle-plus" type="primary" style="float:left;margin: 7px 0 0 0" @click="addTable()">增加电气计划</el-button>
<el-button size="small" icon="el-icon-circle-plus" type="primary" style="float:left;margin: 7px 0 0 0" @click="addTable()">新增电气计划</el-button>
<el-table :data="tableData2" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="380px">
<el-table-column label="组号" align="center">
<template slot-scope="scope">
@@ -97,10 +97,10 @@
</el-table-column>
<el-table-column label="操作" align="center" width="250px" fixed="right">
<template slot-scope="scope">
<el-button v-if="scope.row.edit" type="success" size="small" @click="confirmEdit(scope.row)">确定</el-button>
<el-button v-else type="primary" size="small" @click="scope.row.edit=!scope.row.edit">编辑</el-button>
<el-button v-if="scope.row.edit" type="primary" size="small" @click="cancel(scope.row)">取消</el-button>
<el-button type="danger" size="small" @click="deleteData(scope.row)">删除</el-button>
<el-button v-if="scope.row.edit" type="success" plain size="small" @click="confirmEdit(scope.row)">确定</el-button>
<el-button v-else type="warning" size="small" plain @click="scope.row.edit=!scope.row.edit">编辑</el-button>
<el-button v-if="scope.row.edit" type="primary" plain size="small" @click="cancel(scope.row)">取消</el-button>
<el-button type="danger" plain size="small" @click="deleteData(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>

8
src/views/Assembly/MakePaintPlan/index.vue
View File

@@ -97,10 +97,10 @@
</el-table-column>
<el-table-column label="操作" align="center" width="250px" fixed="right">
<template slot-scope="scope">
<el-button v-if="scope.row.edit" type="success" size="small" @click="confirmEdit(scope.row)">确定</el-button>
<el-button v-else type="primary" size="small" @click="scope.row.edit=!scope.row.edit">编辑</el-button>
<el-button v-if="scope.row.edit" type="primary" size="small" @click="cancel(scope.row)">取消</el-button>
<el-button type="danger" size="small" @click="deleteData(scope.row)">删除</el-button>
<el-button v-if="scope.row.edit" type="success" plain size="small" @click="confirmEdit(scope.row)">确定</el-button>
<el-button v-else type="primary" size="small" plain @click="scope.row.edit=!scope.row.edit">编辑</el-button>
<el-button v-if="scope.row.edit" type="warning" plain size="small" @click="cancel(scope.row)">取消</el-button>
<el-button type="danger" size="small" plain @click="deleteData(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>

10
src/views/Assembly/QualityInspectionInformationInquiry/index.vue
View File

@@ -66,11 +66,13 @@
:value="item.value"/>
</el-select>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="pageSize=10; pageCurrent= 1;selecttable()">查询</el-button>
<el-button type="primary" size="small" icon="el-icon-download" style="margin-left:10px" @click="exportExcel()">导出</el-button>
<el-tooltip effect="dark" content="导出查询数据" placement="top" open-delay="1000">
<el-button type="primary" size="small" icon="el-icon-download" style="margin-left:10px" @click="exportExcel()">导出</el-button>
</el-tooltip>
</el-row>
</el-card>
<el-card>
<el-table :data="tableData1" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="475px">
<el-table :data="tableData1" border size="mini" highlight-current-row style="width: 100%" stripe height="475px">
<el-table-column align="center" label="禁用情况" width="80px">
<template slot-scope="scope">
<el-tag v-if="parseInt(scope.row.是否禁用)===0||scope.row.是否禁用===''" type="success" size="small" @click="approvalPass(scope.row)">未禁用</el-tag>
@@ -257,7 +259,7 @@
</el-card>
<el-card>
<h4 style="margin-left: 45%;">正在加工零件列表</h4>
<el-table :data="tableData10" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="475px">
<el-table :data="tableData10" border size="mini" highlight-current-row style="width: 100%" stripe height="475px">
<el-table-column label="机床图号" align="center">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
@@ -327,7 +329,7 @@
</el-card>
<el-card>
<h4 style="margin-left: 45%;">待加工零件列表</h4>
<el-table :data="tableData20" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="475px">
<el-table :data="tableData20" border size="mini" highlight-current-row style="width: 100%" stripe height="475px">
<el-table-column label="机床图号" align="center" width="110px">
<template slot-scope="scope">
{{ scope.row.机床图号 }}

4
src/views/Assembly/SparePartsOutStockRecord/index.vue
View File

@@ -39,7 +39,9 @@
style="width: 130px"
type="date"
placeholder="选择日期"/>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="total=0;pageSize=20; pageCurrent=1;selecttable()">查询</el-button>
<el-tooltip effect="dark" content="查询备料出库记录" placement="top" open-delay="1200">
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="total=0;pageSize=20; pageCurrent=1;selecttable()">查询</el-button>
</el-tooltip>
</el-row>
</el-card>
<el-card>