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:
yanggongyan
2020-02-10 15:08:35 +08:00
parent 0cf673eead e12ce46a6b
commit d5ed9b2da5
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>

12
src/views/Inventory/CreatePickingList/index.vue
View File

@@ -264,7 +264,7 @@
end-placeholder="结束日期"/>
<el-input v-model="pickingListPeople" clearable size="small" placeholder="制单人" style="width:120px;margin-left: 10px" />
<el-button size="small" type="primary" plain icon="el-icon-search" style="margin: 0 0 0 10px" @click="searchList()">查询</el-button>
<el-button size="small" type="warning" plain icon="el-icon-plus" style="margin: 0 0 0 10px" @click="createList()">创建领料单</el-button>
<el-button size="small" class="button111" icon="el-icon-circle-plus-outline" style="margin: 0 0 0 10px" @click="createList()">创建领料单</el-button>
<el-tooltip :open-delay="1200" effect="dark" content="为所选领料单增加物料明细" placement="top">
<el-button size="small" type="success" plain icon="el-icon-bottom" style="margin: 0 0 5px 10px" @click="selectInto()">选入物料</el-button>
</el-tooltip>
@@ -275,7 +275,7 @@
</div>
<div style="width: 26%;float: left;margin-right: 16px">
<el-card>
<el-table :data="pickListTable1" :row-class-name="tableRowClassName" class="shenpi" highlight-current-row border size="mini" width="100%" height="400px" @row-click="clickList">
<el-table :data="pickListTable1" :row-class-name="tableRowClassName" class="shenpi" stripe highlight-current-row border size="mini" width="100%" height="400px" @row-click="clickList">
<el-table-column prop="领料单编号" label="领料单编号" align="center" min-width="100px">
<template slot-scope="scope">
{{ scope.row.领料单编号 }}
@@ -356,9 +356,9 @@
<!--</el-table-column>-->
<el-table-column v-if="true" label="领料确认" align="center" prop="是否领料确认" width="75px">
<template slot-scope="scope">
<el-tag v-if="(Number(scope.row.总数量) <= Number(scope.row.出库数量1)) || Number(scope.row.是否领料确认) === 1" type="success" size="mini">已领完</el-tag>
<el-tag v-else-if="Number(scope.row.总数量) > Number(scope.row.出库数量1) && Number(scope.row.出库数量1) > 0" type="primary" size="mini">部分领用</el-tag>
<el-tag v-else-if="Number(scope.row.出库数量1) === 0" type="warning" size="mini">未领料</el-tag>
<span v-if="(Number(scope.row.总数量) <= Number(scope.row.出库数量1)) || Number(scope.row.是否领料确认) === 1" type="success" size="mini">已领完</span>
<span v-else-if="Number(scope.row.总数量) > Number(scope.row.出库数量1) && Number(scope.row.出库数量1) > 0" type="primary" size="mini">部分领用</span>
<span v-else-if="Number(scope.row.出库数量1) === 0" type="warning" size="mini">未领料</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" min-width="120px">
@@ -382,7 +382,7 @@
</template>
</el-table-column>
</el-table>
<el-button slot="reference" type="primary" size="mini" icon="el-icon-search" plain @click="searchTable02(scope.row)">领料详情</el-button>
<el-button slot="reference" type="text" size="mini" icon="el-icon-search" @click="searchTable02(scope.row)">领料详情</el-button>
</el-popover>
</template>
</el-table-column>

9
src/views/ManufacturingCenter/AntonMonitoring/index.vue
View File

@@ -10,7 +10,8 @@
size="mini"
height="800"
highlight-current-row
border>
border
stripe>
<el-table-column align="center" label="照片" width="50">
<template slot-scope="scope">
<el-popover
@@ -40,8 +41,8 @@
</el-table-column>
<el-table-column align="center" label="登陆人">
<template slot-scope="scope">
<el-tag v-if="scope.row.姓名===''||scope.row.姓名===null" slot="reference" size="small" style="width: 80px" type="warning">未登录</el-tag>
<el-tag v-else slot="reference" type="success" size="small" style="width: 80px"> {{ scope.row.姓名 }} </el-tag>
<span v-if="scope.row.姓名===''||scope.row.姓名===null" slot="reference" size="small" style="width: 80px" type="warning">未登录</span>
<span v-else slot="reference" type="success" size="small" style="width: 80px"> {{ scope.row.姓名 }} </span>
</template>
</el-table-column>
<el-table-column align="center" label="呼叫类型">
@@ -55,7 +56,7 @@
<el-button
:disabled="scope.row.文件标识 && scope.row.文件标识 !== 'null'"
size="mini"
type="primary"
type="text"
icon="el-icon-picture"
@click="handlePicture(scope.row)">上传图片</el-button>
</template>

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

@@ -20,7 +20,7 @@
style="width: 160px"
type="date"
placeholder="选择日期"/>
<el-button type="success" size="small" icon="el-icon-search" style="margin:0px 10px" @click="pageSize=10; pageCurrent= 1;searchData()">查询</el-button>
<el-button type="primary" plain size="small" icon="el-icon-search" style="margin:0px 10px" @click="pageSize=10; pageCurrent= 1;searchData()">查询</el-button>
</el-card>
<el-card>
<el-table
@@ -118,7 +118,7 @@
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
placeholder="选择日期"/>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="searchData1()">查询</el-button>
<el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 15px" @click="searchData1()">查询</el-button>
</el-card>
<el-card>
<div id="myChart" style="width: 1000px; height: 570px; margin: auto"/>
@@ -153,7 +153,7 @@
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
placeholder="选择日期"/>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="searchData2()">查询</el-button>
<el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 15px" @click="searchData2()">查询</el-button>
</el-card>
<el-card>
<div id="myChart3" style="width: 100%; height: 520px; margin: auto"/>

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

@@ -21,7 +21,7 @@
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
</el-option>
</el-select>
<el-button type="success" icon="el-icon-search" size="small" style="margin-top: 15px;margin-left: 10px" @click="total=0;pageSize=1000;pageCurrent=1;searchData();searchTable()">查询</el-button>
<el-button type="primary" plain icon="el-icon-search" size="small" style="margin-top: 15px;margin-left: 10px" @click="total=0;pageSize=1000;pageCurrent=1;searchData();searchTable()">查询</el-button>
</el-card>
<el-card>
<h3 style="text-align: center;">车间生产</h3>
@@ -73,7 +73,7 @@
</el-table-column>
<el-table-column align="center" label="操作" fixed="right">
<template slot-scope="scope">
<el-button type="primary" plain size="mini" @click="processingStatus(scope.row)">查看加工进度</el-button>
<el-button type="text" size="mini" @click="processingStatus(scope.row)">查看加工进度</el-button>
</template>
</el-table-column>
</el-table>

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

@@ -32,7 +32,7 @@
<span>提前</span>
<el-input-number v-model="warningValue" :min="1" controls-position="right" size="small" style="width: 90px"/>
<span>天预警</span>
<el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable1();searchAll()">查询</el-button>
<el-button size="small" icon="el-icon-search" type="primary" plain style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable1();searchAll()">查询</el-button>
</el-row>
</div>
<h1 class="word" style="margin: 0">总计划:</h1>

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

@@ -24,7 +24,7 @@
:value="item.value"/>
</el-select>
<el-input v-model="partNumber" placeholder="零件号" size="small" clearable style="width: 150px;margin: 10px 10px 0px 10px"/>
<el-button type="success" icon="el-icon-search" size="small" style="margin: 15px 0 0 10px" @click="pageCurrent=1;pageSize=20;total=0;searchData()">查询</el-button>
<el-button type="primary" plain icon="el-icon-search" size="small" style="margin: 15px 0 0 10px" @click="pageCurrent=1;pageSize=20;total=0;searchData()">查询</el-button>
</el-row>
</el-card>
<el-card>

10
src/views/ManufacturingCenter/machiningHoursStatistics/index.vue
View File

@@ -19,9 +19,9 @@
style="width: 170px;margin:0px 10px"
type="date"
placeholder="选择加工完成日期"/>
<el-button type="success" class="el-icon-search" size="small" style="margin:0px 10px" @click="pageCurrent=1;total = 0;searchTable();">查询</el-button>
<el-button type="primary" plain class="el-icon-search" size="small" style="margin:0px 10px" @click="pageCurrent=1;total = 0;searchTable();">查询</el-button>
<el-tooltip :open-delay="1000" content="导出人员工时统计表" placement="right">
<el-button type="primary" size="small" icon="el-icon-download" style="margin:0px 10px" @click="exportUninquirySheet1()">导出</el-button>
<el-button type="primary" plain size="small" icon="el-icon-download" style="margin:0px 10px" @click="exportUninquirySheet1()">导出</el-button>
</el-tooltip>
</el-row>
</el-card>
@@ -66,7 +66,7 @@
</div>
</el-col>
<el-col :span="17" style="margin-left: 30px;">
<el-table v-loading="loading2" :data="tableData2" height="380" size="mini" stripe highlight-current-row style="width: 100%;" border element-loading-text="拼命加载中">
<el-table v-loading="loading2" :data="tableData2" height="380" size="mini" highlight-current-row style="width: 100%;" border element-loading-text="拼命加载中">
<el-table-column label="零件图号" align="center" width="150px">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
@@ -128,7 +128,7 @@
</el-option>
</el-select>
<el-tooltip :open-delay="1000" content="导出机床工时统计明细表" placement="top">
<el-button type="warning" size="mini" icon="el-icon-download" plain style="margin-left:10px" @click="exportUninquirySheet2()">机床导出</el-button>
<el-button type="primary" size="mini" icon="el-icon-download" plain style="margin-left:10px" @click="exportUninquirySheet2()">机床导出</el-button>
</el-tooltip>
<el-tooltip :open-delay="1000" content="导出组件工时统计明细表" placement="top">
<el-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px" plain @click="exportUninquirySheet3()">组件导出</el-button>
@@ -165,7 +165,7 @@
<!-- </div>-->
</el-col>
<el-col :span="17" style="margin-left: 30px;">
<el-table v-loading="loading4" :data="tableData4" size="mini" height="380" stripe highlight-current-row style="width: 100%;" border element-loading-text="拼命加载中">
<el-table v-loading="loading4" :data="tableData4" size="mini" height="380" highlight-current-row style="width: 100%;" border element-loading-text="拼命加载中">
<el-table-column label="机床编号" align="center">
<template slot-scope="scope">
{{ scope.row.机床图号 }}

8
src/views/PurchasingCenter/FundApproval2/index.vue
View File

@@ -2,7 +2,7 @@
<div class="app-container">
<el-card>
<h3 style="margin-top: 0">采购合同</h3>
<el-table v-loading="" :data="tableData1" border style="width: 100%;max-height: 300px;" height="300px" size="mini" highlight-current-row @row-click="searchTable01">
<el-table v-loading="" :data="tableData1" border stripe style="width: 100%;max-height: 300px;" height="300px" size="mini" highlight-current-row @row-click="searchTable01">
<el-table-column label="供应商" align="center" min-width="170">
<template slot-scope="scope">
{{ scope.row.供应商名称 }}
@@ -25,8 +25,8 @@
</el-table-column>
<el-table-column label="审核" align="center" width="200">
<template slot-scope="scope">
<el-button type="warning" plain size="mini" icon="el-icon-check" @click="yesApproval(scope.row)">通过</el-button>
<el-button type="danger" plain size="mini" icon="el-icon-close" @click="noApproval(scope.row)">不通过</el-button>
<el-button type="text" size="mini" icon="el-icon-check" @click="yesApproval(scope.row)">通过</el-button>
<el-button type="text" size="mini" icon="el-icon-close" @click="noApproval(scope.row)">不通过</el-button>
</template>
</el-table-column>
</el-table>
@@ -45,7 +45,7 @@
<h3 style="">合同明细</h3>
<el-row>
<el-col :span="8">
<el-table :data="gridData1" :summary-method="getSummaries2" border highlight-current-row size="mini" show-summary @row-click="searchContactDetail">
<el-table :data="gridData1" :summary-method="getSummaries2" border stripe highlight-current-row size="mini" show-summary @row-click="searchContactDetail">
<el-table-column min-width="150" align="center" label="合同编号">
<template slot-scope="scope">
{{ scope.row.采购合同编号 ? scope.row.采购合同编号 : scope.row.离线合同编号 }}

5
src/views/PurchasingCenter/PurchaseContractApproval/index.vue
View File

@@ -23,7 +23,8 @@
<span>供应商:</span>
<el-input v-model="supplierName" placeholder="供应商" size="small" clearable style="width:180px"/>
<el-button
type="success"
type="primary"
plain
size="small"
icon="el-icon-search"
style="margin-left:10px"
@@ -99,7 +100,7 @@
</el-table-column>
<el-table-column label="操作" align="center" min-width="100" fixed="right">
<template slot-scope="scope">
<el-button type="primary" size="mini" plain icon="el-icon-edit-outline" @click="Open(scope.row)">审批</el-button>
<el-button type="text" size="mini" icon="el-icon-edit-outline" @click="Open(scope.row)">审批</el-button>
</template>
</el-table-column>
</el-table>

36
src/views/TechnologyCenter/QueryParts/index.vue
View File

@@ -26,7 +26,7 @@
:value="item.value"/>
</el-select>
<el-button icon="el-icon-search" type="primary" plain size="small" @click="pageCurrentWB = 1;pageSizeWB = 1000;pageCurrent = 1;pageSize = 1000;getTableData()">查询</el-button>
<el-button icon="el-icon-circle-plus-outline" type="warning" plain size="small" @click="openUrgentItem()">加急件</el-button>
<el-button icon="el-icon-circle-plus-outline" class="button111" size="small" @click="openUrgentItem()">加急件</el-button>
</el-card>
<el-card>
<div v-for="(file, key) in hadFile" :key="key">
@@ -78,7 +78,8 @@
label="零件名称"
align="center"
prop="零件名称"
min-width="140px">
min-width="140px"
show-overflow-tooltip>
<template slot-scope="scope">{{ scope.row.零件名称 }}</template>
</el-table-column>
<el-table-column
@@ -107,13 +108,15 @@
<el-table-column
label="材料"
prop="材料"
align="center">
align="center"
show-overflow-tooltip>
<template slot-scope="scope">{{ scope.row.材料 }}</template>
</el-table-column>
<el-table-column
label="规格"
prop="规格"
align="center">
align="center"
show-overflow-tooltip>
<template slot-scope="scope">{{ scope.row.规格 }}</template>
</el-table-column>
<el-table-column
@@ -146,10 +149,9 @@
<el-button
:disabled="Number(id)!==0"
size="mini"
type="danger"
plain
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)">删除</el-button>
@click="handleDelete(scope.row)"/>
</template>
</el-table-column>
</el-table>
@@ -245,8 +247,7 @@
<el-button
:disabled="Number(id)!==0"
size="mini"
plain
type="danger"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)">删除</el-button>
</template>
@@ -570,3 +571,20 @@ a{
margin: 0px !important;
}
</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>

2
src/views/WorkshopProcurement/FundApproval2/index.vue
View File

@@ -2,7 +2,7 @@
<div class="app-container">
<el-card>
<h3>采购合同</h3>
<el-table v-loading="" :data="tableData" border style="width: 100%;max-height: 500px;" height="300px" size="mini">
<el-table v-loading="" :data="tableData" border stripe style="width: 100%;max-height: 500px;" height="300px" size="mini">
<el-table-column label="供应商" align="center" min-width="170">
<template slot-scope="scope">
{{ scope.row.供应商名称 }}

6
src/views/WorkshopProcurement/ProcurementContractApproval/index.vue
View File

@@ -17,8 +17,9 @@
<span>供应商:</span>
<el-input v-model="supplierName" placeholder="供应商" size="small" clearable/>
<el-button
type="success"
type="primary"
size="small"
plain
icon="el-icon-search"
style="margin-left:10px"
@click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
@@ -30,6 +31,7 @@
:data="tableData1"
size="mini"
border
stripe
style="width: 100%;max-height: 300px;"
height="450px"
highlight-current-row
@@ -71,7 +73,7 @@
</el-table-column>
<el-table-column label="操作" align="center">
<template slot-scope="scope">
<el-button type="primary" size="mini" plain icon="el-icon-edit-outline" @click="Open(scope.row)">审批</el-button>
<el-button type="text" size="mini" icon="el-icon-edit-outline" @click="Open(scope.row)">审批</el-button>
</template>
</el-table-column>
</el-table>