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

a

Browse Source
This commit is contained in:
hedekun
2020-02-10 15:00:03 +08:00
parent 8331401261
commit e796a69dc9
16 changed files with 119 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,7 +26,7 @@
</el-card>
<el-card>
<h3 style="text-align: center">总装调试</h3>
<el-table :data="tableData1" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="200px">
<el-table :data="tableData1" border stripe size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="200px">
<el-table-column label="项目名称" align="center">
<template slot-scope="scope">
{{ scope.row.项目名称 }}
@@ -69,23 +69,23 @@
</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" 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" 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>
<el-button v-if="scope.row.装配状态===null || scope.row.装配状态===0" type="text" size="small" @click="handlestart_1(scope.row)">开始装配</el-button>
<el-button v-if="scope.row.装配状态===1" type="text" size="small" @click="handleend_1(scope.row)">结束装配</el-button>
<el-button v-if="scope.row.装配状态===2" type="text" size="small" >装配完成</el-button>
<el-button v-if="scope.row.装配状态===1" size="small" type="text" @click="handleCancelStart_1(scope.row)">取消开始装配</el-button>
<el-button v-if="scope.row.装配状态===2" size="small" type="text" @click="handleCancelEnd_1(scope.row)">取消结束装配</el-button>
<el-button v-if="scope.row.调试状态===null || scope.row.调试状态===0" type="text" size="small" @click="handlestart_2(scope.row)">开始调试</el-button>
<el-button v-if="scope.row.调试状态===1" type="text" size="small" @click="handleend_2(scope.row)">结束调试</el-button>
<el-button v-if="scope.row.调试状态===2" type="text" size="small" >调试完成</el-button>
<el-button v-if="scope.row.调试状态===1" size="small" type="text" @click="handleCancelStart_2(scope.row)">取消开始调试</el-button>
<el-button v-if="scope.row.调试状态===2" size="small" type="text" @click="handleCancelEnd_2(scope.row)">取消结束调试</el-button>
</template>
</el-table-column>
</el-table>
</el-card>
<el-card>
<h3 style="text-align: center">部装</h3>
<el-table :data="tableData2" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="380px">
<el-table :data="tableData2" border stripe size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="380px">
<el-table-column label="组号" align="center">
<template slot-scope="scope">
{{ scope.row.组号 }}
@@ -132,15 +132,15 @@
<el-table-column label="操作" align="center" width="300px" fixed="right">
<template slot-scope="scope">
<el-tooltip :open-delay="1200" effect="dark" content="编辑部装工时" placement="top">
<el-button v-if="!scope.row.isEditing" type="primary" plain size="small" @click="editTable2(scope.row)">编辑</el-button>
<el-button v-if="!scope.row.isEditing" type="text" icon="el-icon-edit-outline" size="small" @click="editTable2(scope.row)"/>
</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>
<el-button v-if="scope.row.isEditing" type="text" size="small" @click="submitTable2(scope.row)">确定</el-button>
<el-button v-if="scope.row.isEditing" size="small" type="text" @click="cancelTable2(scope.row)">取消</el-button>
<el-button v-if="scope.row.buttonStatus === 1" type="text" size="small" @click="handlestart_3(scope.row)">开始装配部件</el-button>
<el-button v-if="scope.row.buttonStatus === 2" type="text" size="small" @click="handleend_3(scope.row)">结束装配</el-button>
<el-button v-if="scope.row.buttonStatus === 3" type="text" size="small" >装配完成</el-button>
<el-button v-if="scope.row.buttonStatus === 2" type="text" size="small" @click="handleCancelStart_3(scope.row)">取消开始装配</el-button>
<el-button v-if="scope.row.buttonStatus === 3" type="text" size="small" @click="handleCancelEnd_3(scope.row)">取消结束装配</el-button>
</template>
</el-table-column>
</el-table>

24
src/views/Assembly/ColdWorkPlanExecution/index.vue
View File

@@ -14,7 +14,7 @@
</el-option>
</el-select>
</div>
<el-table :data="tableData1" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="200px">
<el-table :data="tableData1" border stripe size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="200px">
<el-table-column label="项目名称" align="center">
<template slot-scope="scope">
{{ scope.row.项目名称 }}
@@ -39,7 +39,7 @@
</el-card>
<el-card>
<h3 style="margin: 0;text-align: center;">工作计划</h3>
<el-table :data="tableData2" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="380px">
<el-table :data="tableData2" border stripe size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="380px">
<el-table-column label="组号" align="center">
<template slot-scope="scope">
{{ scope.row.组号 }}
@@ -85,14 +85,18 @@
</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-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>
<el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top">
<div style="display: inline-block">
<el-button v-if="!scope.row.isEditing" type="text" size="small" @click="editTable2(scope.row)"/>
<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>
</div>
</el-tooltip>
<el-button v-if="scope.row.buttonStatus === 1" type="text" size="small" @click="handlestart_3(scope.row)">开始工作</el-button>
<el-button v-if="scope.row.buttonStatus === 2" type="text" size="small" @click="handleend_3(scope.row)">结束工作</el-button>
<el-button v-if="scope.row.buttonStatus === 3" type="text" size="small" >工作完成</el-button>
<el-button v-if="scope.row.buttonStatus === 2" type="text" size="small" @click="handleCancelStart_3(scope.row)">取消开始工作</el-button>
<el-button v-if="scope.row.buttonStatus === 3" type="text" size="small" @click="handleCancelEnd_3(scope.row)">取消结束工作</el-button>
</template>
</el-table-column>
</el-table>

17
src/views/Assembly/DeliveryConfirmation/index.vue
View File

@@ -132,8 +132,8 @@
size="small"
type="datetime"
placeholder="结束日期"/>
<el-button type="success" icon="el-icon-menu" size="mini" style="margin-left: 74px" @click="search">查询</el-button>
<el-button type="warning" icon="el-icon-delete" size="mini" @click="clearSearch">清空</el-button>
<el-button type="primary" plain icon="el-icon-search" size="mini" style="margin-left: 74px" @click="search">查询</el-button>
<el-button class="button111" icon="el-icon-delete" size="mini" @click="clearSearch">清空</el-button>
</el-row>
</div>
<el-divider/>
@@ -144,12 +144,13 @@
style="width: 100%"
height="500"
border
stripe
size="mini"
@row-click="openDialogFormVisible">
<el-table-column align="center" label="状态" min-width="80">
<template slot-scope="scope">
<el-tag v-if="scope.row.是否发出.toString() === '1'" type="success" size="small">已发出</el-tag>
<el-tag v-else type="danger" size="small">未发出</el-tag>
<span v-if="scope.row.是否发出.toString() === '1'" type="success" size="small">已发出</span>
<span v-else type="danger" size="small">未发出</span>
<!--{{ scope.row.是否发出.toString() === '1' ? '已发出' : '未发出' }}-->
</template>
</el-table-column>
@@ -168,7 +169,7 @@
{{ scope.row.收货单位 }}
</template>
</el-table-column>
<el-table-column align="center" label="收货地址" min-width="250">
<el-table-column align="center" label="收货地址" min-width="250" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.收货地址 }}
</template>
@@ -183,7 +184,7 @@
{{ scope.row.联系电话 }}
</template>
</el-table-column>
<el-table-column align="center" label="车辆牌号" min-width="110">
<el-table-column align="center" label="车辆牌号" min-width="110" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.车辆牌号 }}
</template>
@@ -198,12 +199,12 @@
{{ scope.row.司机电话 }}
</template>
</el-table-column>
<el-table-column align="center" label="制单人" min-width="80">
<el-table-column align="center" label="制单人" min-width="80" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.制单人 }}
</template>
</el-table-column>
<el-table-column align="center" label="审核人" min-width="80">
<el-table-column align="center" label="审核人" min-width="80" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.审核人 }}
</template>

24
src/views/Assembly/PaintPlanExecution/index.vue
View File

@@ -14,7 +14,7 @@
</el-option>
</el-select>
</div>
<el-table :data="tableData1" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="200px">
<el-table :data="tableData1" border stripe size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="200px">
<el-table-column label="项目名称" align="center">
<template slot-scope="scope">
{{ scope.row.项目名称 }}
@@ -39,7 +39,7 @@
</el-card>
<el-card>
<h3 style="margin: 0;text-align: center;">工作计划</h3>
<el-table :data="tableData2" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="380px">
<el-table :data="tableData2" border stripe size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="380px">
<el-table-column label="组号" align="center">
<template slot-scope="scope">
{{ scope.row.组号 }}
@@ -85,14 +85,18 @@
</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-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>
<el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top">
<div style="display: inline-block">
<el-button v-if="!scope.row.isEditing" type="text" size="small" @click="editTable2(scope.row)"/>
<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>
</div>
</el-tooltip>
<el-button v-if="scope.row.buttonStatus === 1" type="text" size="small" @click="handlestart_3(scope.row)">开始工作</el-button>
<el-button v-if="scope.row.buttonStatus === 2" type="text" size="small" @click="handleend_3(scope.row)">结束工作</el-button>
<el-button v-if="scope.row.buttonStatus === 3" type="text" size="small" >工作完成</el-button>
<el-button v-if="scope.row.buttonStatus === 2" type="text" size="small" @click="handleCancelStart_3(scope.row)">取消开始工作</el-button>
<el-button v-if="scope.row.buttonStatus === 3" type="text" size="small" @click="handleCancelEnd_3(scope.row)">取消结束工作</el-button>
</template>
</el-table-column>
</el-table>