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
2020-03-25 17:59:26 +08:00
parent ff3a340570 ca2bedc570
commit 6480d06063
22 changed files with 228 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/api/ManufacturingCenter/GroupMatching.js
View File

@@ -36,8 +36,20 @@ export function searchTable(check1, machine, check2, groupNum, pageCurrent, page
ModularID: router.currentRoute.path,
type: '1',
name: '车间生产管理工艺_基本件成组配套_查询数据_新',
param: '机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '=int',
pagination: pageCurrent + '&' + pageSize
param: '机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + `&PageCurrent=${pageCurrent}&PageSize=${pageSize}&PageCount=1111=int=output&ItemCount=1111=int=output`
}
})
}
export function getTable(check1, machine, check2, groupNum, pageCurrent, pageSize) {
return request({
url: '',
method: 'post',
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '1',
name: '车间生产管理工艺_基本件成组配套_查询数据_新',
param: '机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + `&PageCurrent=${pageCurrent}&PageSize=${pageSize}&PageCount=1111=int=output&ItemCount=1111=int=output`
}
})
}

67
src/views/BasicData/MenuManagement/index.vue
View File

@@ -2,27 +2,15 @@
<div class="app-container">
<el-row>
<el-col :span="7">
<el-card style="margin-bottom: 20px">
<el-card style="margin-bottom: 10px">
<el-button size="small" type="distribution" @click="addFisrtLevel">创建一级菜单</el-button>
</el-card>
<el-card>
<div slot="header">
<el-input v-model="filterTextLeft" size="small" placeholder="输入关键字进行过滤" clearable/>
</div>
<el-table
ref="multipleTableLeft"
:data="fisrtLevelFilter"
stripe
highlight-current-row
size="mini"
height="calc(100vh - 330px)"
style="height:calc(100vh - 330px);"
@selection-change="handleSelectionChangeLeft">
<el-table-column
:selectable="selectable"
align="center"
type="selection"
width="55"/>
<el-table ref="multipleTableLeft" :data="fisrtLevelFilter" stripe highlight-current-row size="mini" height="500" style="height:calc(100vh - 330px);" @selection-change="handleSelectionChangeLeft">
<el-table-column :selectable="selectable" align="center" type="selection" width="55"/>
<el-table-column align="center" label="模块名称">
<template slot-scope="scope">
{{ scope.row.title }}
@@ -37,7 +25,7 @@
</el-tooltip>
</el-col>
<el-col :span="8">
<el-card style="margin-bottom: 20px">
<el-card style="margin-bottom: 10px">
<span>角色:</span>
<el-select v-model="roleName" placeholder="请选择" size="small" style="width:200px;margin-left:10px" filterable @change="getModule">
<el-option
@@ -47,20 +35,11 @@
:value="item.value"/>
</el-select>
</el-card>
<el-card style="height:calc(100vh - 220px);overflow: auto">
<el-card style="height: 550px;overflow: auto">
<div slot="header">
<el-input v-model="filterText" size="small" placeholder="输入关键字进行过滤" clearable/>
</div>
<el-tree
ref="moduleTree"
:data="moduleTree"
:filter-node-method="filterNode"
check-strictly
class="moduleTree"
show-checkbox
node-key="id"
default-expand-all
@check-change="treeCheck">
<el-tree ref="moduleTree" :data="moduleTree" :filter-node-method="filterNode" check-strictly class="moduleTree" show-checkbox node-key="id" default-expand-all @check-change="treeCheck">
<span slot-scope="{ node, data }" class="custom-tree-node">
<span>{{ node.label }}</span>
<span>
@@ -82,27 +61,15 @@
</el-tooltip>
</el-col>
<el-col :span="7">
<el-card style="margin-bottom: 20px">
<el-card style="margin-bottom: 10px">
<el-button size="small" type="distribution" @click="addSecondLevel">创建二级菜单</el-button>
</el-card>
<el-card>
<div slot="header">
<el-input v-model="filterTextRight" size="small" placeholder="输入关键字进行过滤" clearable/>
</div>
<el-table
ref="multipleTableRight"
:data="secondLevelFilter"
stripe
highlight-current-row
size="mini"
height="calc(100vh - 330px)"
style="height:calc(100vh - 330px);"
@selection-change="handleSelectionChangeRight">
<el-table-column
:selectable="selectable"
align="center"
type="selection"
width="55"/>
<el-table ref="multipleTableRight" :data="secondLevelFilter" stripe highlight-current-row size="mini" height="500" style="height:calc(100vh - 330px);" @selection-change="handleSelectionChangeRight">
<el-table-column :selectable="selectable" align="center" type="selection" width="55"/>
<el-table-column align="center" label="模块名称">
<template slot-scope="scope">
{{ scope.row.title }}
@@ -113,6 +80,22 @@
</el-col>
</el-row>
<el-row v-if="false">
<el-card>
<div slot="header">
<el-input v-model="filterTextRight" size="small" placeholder="输入关键字进行过滤" clearable/>
</div>
<el-table :data="secondLevelFilter" stripe size="mini" height="200" border>
<el-table-column label="序号" align="center" type="index" width="50"/>
<el-table-column align="center" label="模块名称">
<template slot-scope="scope">
{{ scope.row.title }}
</template>
</el-table-column>
</el-table>
</el-card>
</el-row>
<el-dialog :visible.sync="dialogVisible1" title="新增一级模块" center style="min-height: 300px" width="400px">
<el-form ref="form1" :model="form1" :rules="rules1" label-position="left" label-width="110px" class="demo-ruleForm">
<el-form-item label="模块名称" prop="moduleName">

53
src/views/BasicData/PartsNumberMaintenance/index.vue
View File

@@ -23,7 +23,7 @@
</el-card>
<el-card>
<div>
<span style="font-size: 20px">基本件三表数量</span>
<span style="font-size: 20px">基本件</span>
<el-tooltip :open-delay="1000" effect="dark" content="删除基本件三表数量" placement="top">
<el-button style="float: right;margin-bottom: 3px" type="danger" size="small" plain @click="alldelete()">全部删除</el-button>
</el-tooltip>
@@ -36,21 +36,13 @@
<el-table-column label="零件图号" align="center" min-width="200px">
<template slot-scope="scope">{{ scope.row.零件图号 }}</template>
</el-table-column>
<el-table-column
label="零件名称"
align="center"
min-width="100px">
<el-table-column label="零件名称" align="center" min-width="100px">
<template slot-scope="scope">{{ scope.row.零件名称 }}</template>
</el-table-column>
<el-table-column
label="组号"
align="center"
min-width="100px">
<el-table-column label="组号" align="center" min-width="100px">
<template slot-scope="scope">{{ scope.row.组号 }}</template>
</el-table-column>
<el-table-column
label="零件数量"
align="center">
<el-table-column label="零件数量" align="center">
<template slot-scope="scope">{{ scope.row.零件数量 }}</template>
</el-table-column>
<el-table-column label="部件数量" align="center">
@@ -63,19 +55,13 @@
{{ scope.row.机床数量 }}
</template>
</el-table-column>
<el-table-column
label="材料"
align="center">
<el-table-column label="材料" align="center">
<template slot-scope="scope">{{ scope.row.材料 }}</template>
</el-table-column>
<el-table-column
label="备注"
align="center">
<el-table-column label="备注" align="center">
<template slot-scope="scope">{{ scope.row.零件备注 }}</template>
</el-table-column>
<el-table-column
label="零件类型"
align="center">
<el-table-column label="零件类型" align="center">
<template slot-scope="scope">{{ scope.row.零件类型名称 }}</template>
</el-table-column>
<el-table-column align="center" label="分类码" width="150">
@@ -93,24 +79,13 @@
{{ scope.row.整改类型 }}
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" align="center" width="200">
<el-table-column label="操作" fixed="right" align="center" width="100">
<template slot-scope="scope">
<el-tooltip :open-delay="1000" effect="dark" content="编辑零件数量" placement="top">
<el-button
:disabled="scope.row.考核状态>=6&&scope.row.状态==='已加工'"
size="mini"
type="primary"
plain
icon="el-icon-edit"
@click="type=1;handleEdit(scope.row)">编辑</el-button>
<el-button :disabled="scope.row.考核状态>=6&&scope.row.状态==='已加工'" size="mini" type="text" plain icon="el-icon-edit" @click="type=1;handleEdit(scope.row)"/>
</el-tooltip>
<el-tooltip :open-delay="1000" effect="dark" content="删除该行" placement="top">
<el-button
size="mini"
type="danger"
plain
icon="el-icon-delete"
@click="handleDelete(scope.row)">删除</el-button>
<el-button size="mini" type="text" plain icon="el-icon-delete" @click="handleDelete(scope.row)"/>
</el-tooltip>
</template>
</el-table-column>
@@ -128,7 +103,7 @@
</el-card>
<el-card>
<div>
<span style="font-size: 20px">外购件和标准件三表数量</span>
<span style="font-size: 20px">外购件和标准件</span>
<el-tooltip :open-delay="1000" effect="dark" content="删除外购件和标准件数量" placement="top">
<el-button style="float: right;margin-bottom: 3px" type="danger" size="small" plain @click="alldeleteWB()">全部删除</el-button>
</el-tooltip>
@@ -226,7 +201,7 @@
</el-card>
<el-card>
<div>
<div style="font-size: 20px">未投产数量</div>
<div style="font-size: 20px">未投产</div>
<el-table
:data="tableData1"
border
@@ -291,7 +266,7 @@
</div>
</el-card>
<el-card>
<div style="font-size: 20px">未平衡数量</div>
<div style="font-size: 20px">未平衡</div>
<el-table
:data="tableData2"
border
@@ -350,7 +325,7 @@
<!-- </div>-->
</el-card>
<el-card>
<div style="font-size: 20px">未分配采购零件数量</div>
<div style="font-size: 20px">未分配采购</div>
<el-tabs type="border-card" @tab-click="searchTable1();searchTable2()">
<el-tab-pane label="标准件和外购件">
<el-table :data="tableData3" size="mini" style="max-height: 320px" height="320px" border>

40
src/views/BasicData/SystemRrolemaintenance/index.vue
View File

@@ -1,47 +1,31 @@
<template>
<div class="app-container">
<el-card>
<!-- <span>角色功能:</span>-->
<el-input v-model="RoleFunctioning" size="small" clearable placeholder="请输入角色功能" style="width:200px"/>
<el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 15px" plain @click="searchData()">查询</el-button>
<!--<el-input v-model="RoleFunctioning" size="small" clearable placeholder="请输入角色功能" style="width:200px"/>-->
<!--<el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 15px" plain @click="searchData()">查询</el-button>-->
<el-button type="distribution" icon="el-icon-circle-plus-outline" size="small" @click="handleAdd()">增加</el-button>
</el-card>
<el-card style="margin-top: 0px">
<el-table
v-loading="loading"
:data="tableData"
height="830"
highlight-current-row
border>
<el-table v-loading="loading" :data="tableData" height="700" highlight-current-row border style="width: 550px;">
<el-table-column align="center" label="角色编号" width="100">
<template slot-scope="scope">
{{ scope.row.角色编号 }}
</template>
</el-table-column>
<el-table-column align="center" label="角色功能">
<el-table-column align="center" label="角色功能" width="300">
<template slot-scope="scope">
{{ scope.row.角色功能 }}
</template>
</el-table-column>
<el-table-column align="center" label="操作日期">
<!--<el-table-column align="center" label="操作日期">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.操作日期 }}-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column label="操作" fixed="right" align="center">
<template slot-scope="scope">
{{ scope.row.操作日期 }}
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" align="center" width="200">
<template slot-scope="scope">
<el-button
size="mini"
type="primary"
plain
icon="el-icon-edit"
@click="handleEdit(scope.row)">编辑</el-button>
<el-button
size="mini"
type="danger"
plain
icon="el-icon-delete"
@click="handleDelete(scope.row)">删除</el-button>
<el-button size="mini" type="text" plain icon="el-icon-edit" @click="handleEdit(scope.row)"/>
<el-button size="mini" type="text" plain icon="el-icon-delete" @click="handleDelete(scope.row)"/>
</template>
</el-table-column>
</el-table>

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

@@ -4,21 +4,10 @@
<el-badge :value="value" class="item" style="margin-bottom: 10px; float: right">
<el-button size="small" @click="openWindow">Andon信息</el-button>
</el-badge>
<el-table
:data="tableData"
style="width: 100%;"
size="mini"
height="800"
highlight-current-row
border
stripe>
<el-table :data="tableData" style="width: 100%;" size="mini" height="800" highlight-current-row border stripe>
<el-table-column align="center" label="照片" width="50">
<template slot-scope="scope">
<el-popover
v-if="scope.row.文件标识 && scope.row.文件标识 !== 'null'"
placement="top-start"
width="200"
trigger="hover">
<el-popover v-if="scope.row.文件标识 && scope.row.文件标识 !== 'null'" placement="top-start" width="200" trigger="hover">
<el-button type="text" style="float:right" @click="deletePhoto(scope.row)">删除</el-button>
<el-image :src="scope.row.文件标识 && scope.row.文件标识 !== 'null' ? (readFile + scope.row.文件标识 + '.' + scope.row.文件后缀) : readFile + '123.jpg'">
<div slot="error" class="image-slot">
@@ -63,16 +52,8 @@
</el-table-column>
</el-table>
</el-card>
<el-dialog
:visible.sync="dialogVisible"
width="60%">
<el-table
:data="tableDataMassage"
style="width: 100%;"
size="mini"
height="500"
highlight-current-row
border>
<el-dialog :visible.sync="dialogVisible" width="60%">
<el-table :data="tableDataMassage" style="width: 100%;" size="mini" height="500" highlight-current-row border>
<el-table-column align="center" label="工位号">
<template slot-scope="scope">
<el-button type="text">{{ scope.row.工位号 }}</el-button>

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

@@ -35,12 +35,12 @@
{{ scope.row.工序名 }}
</template>
</el-table-column>
<el-table-column label="投产数" align="center" width="80">
<el-table-column label="投产数" align="center" prop="计划数量" width="80">
<template slot-scope="scope">
{{ scope.row.计划数量 }}
</template>
</el-table-column>
<el-table-column label="计划准结(分)" align="center" width="110">
<el-table-column label="计划准结(分)" align="center" prop="计划准备工时" width="110">
<template slot-scope="scope">
{{ scope.row.计划准备工时 }}
</template>
@@ -60,12 +60,12 @@
{{ scope.row.计划加工日期 }}
</template>
</el-table-column>
<el-table-column label="加工件数" align="center" width="80">
<el-table-column label="加工件数" align="center" prop="加工数量" width="80">
<template slot-scope="scope">
{{ scope.row.加工数量 }}
</template>
</el-table-column>
<el-table-column label="准结(分)" align="center" width="110">
<el-table-column label="准结(分)" align="center" prop="修补工时" width="110">
<template slot-scope="scope">
{{ scope.row.修补工时 }}
</template>
@@ -75,7 +75,7 @@
{{ scope.row.修补单件工时 }}
</template>
</el-table-column>
<el-table-column label="加工工时(分)" align="center" prop="加工工时" width="110">
<el-table-column label="加工工时(分)" align="center" prop="完成工时" width="110">
<template slot-scope="scope">
{{ scope.row.完成工时 }}
</template>

38
src/views/ManufacturingCenter/CreateWarehousePurchasing/index.vue
View File

@@ -19,23 +19,11 @@
:label="item.label"
:value="item.value"/>
</el-select>
<el-button
type="success"
size="small"
icon="el-icon-search"
style="margin-left: 10px"
@click="pageCurrent1=1;pageSize1=10;total1=0;searchTable()">查询</el-button>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent1=1;pageSize1=10;total1=0;searchTable()">查询</el-button>
</el-row>
</div>
<div>
<el-table
v-loading="loading"
:data="tableData"
border
style="width: 100%;max-height: 460px;"
height="460"
size="mini"
@selection-change="handleSelectionChange">
<el-table v-loading="loading" :data="tableData" border style="width: 100%;max-height: 460px;" height="460" size="mini" @selection-change="handleSelectionChange">
<el-table-column type="selection" align="center" width="55"/>
<el-table-column label="库存状态" width="100" align="center">
<template slot-scope="scope">
@@ -115,27 +103,13 @@
<div slot="header">
<span>采购明细表名称:</span>
<el-input v-model="purchasingDetailsForm" placeholder="采购明细表名称" size="small" clearable/>
<el-button
type="success"
size="small"
icon="el-icon-search"
style="margin-left: 10px"
@click="pageCurrent1=1;pageSize1=10;total1=0;searchTable1()">查询</el-button>
<el-button
type="primary"
size="small"
style="margin-left: 10px"
@click="addpurchasingDetailsForm">创建采购明细表</el-button>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent1=1;pageSize1=10;total1=0;searchTable1()">查询</el-button>
<el-button type="primary" size="small" style="margin-left: 10px" @click="addpurchasingDetailsForm">创建采购明细表</el-button>
<el-tooltip :open-delay="1000" effect="dark" content="将勾选的物料库中物料选入到选中的采购明细表" placement="top">
<el-button
:disabled="Number(whetherToAllocate) === 1"
type="warning"
size="small"
style="margin-left: 10px"
@click="addMateriel">选入物料</el-button>
<el-button :disabled="Number(whetherToAllocate) === 1" type="warning" size="small" style="margin-left: 10px" @click="addMateriel">选入物料</el-button>
</el-tooltip>
</div>
<!-- -->
<el-table v-loading="loading1" :data="tableData1" border style="max-height: 460px;" height="300px" size="mini" highlight-current-row @row-click="searchTable2">
<el-table-column label="分配状态" align="center" min-width="170">
<template slot-scope="scope">

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

@@ -161,7 +161,8 @@
</div>
</template>
<script>import { getData, getData1, getData2, getData3, getMachine, searchState } from '@/api/ManufacturingCenter/EquipmentConditionAnalysis'
<script>
import { getData, getData1, getData2, getData3, getMachine, searchState } from '@/api/ManufacturingCenter/EquipmentConditionAnalysis'
export default {
data() {

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

@@ -11,7 +11,7 @@
<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="width: 150px;" @change="total=0;pageSize=1000;pageCurrent=1;searchData();searchTable()">
<el-select v-model="Group" size="small" clearable placeholder="组号" style="width: 150px;" @change="total=0;pageSize=50;pageCurrent=1;searchData();searchTable()">
<el-option
v-for="item in Groups"
:key="item.value"
@@ -21,7 +21,7 @@
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
</el-option>
</el-select>
<el-button type="primary" plain icon="el-icon-search" size="small" style="margin-left: 20px" @click="total=0;pageSize=1000;pageCurrent=1;searchData();searchTable()">查询</el-button>
<el-button type="primary" plain icon="el-icon-search" size="small" style="margin-left: 20px" @click="total=0;pageSize=50;pageCurrent=1;searchData();searchTable()">查询</el-button>
</el-card>
<el-card>
<el-tabs v-model="PartType2" type="border-card" style="margin-top: 10px">
@@ -77,10 +77,10 @@
<div class="block">
<el-pagination
:current-page="pageCurrent"
:page-sizes="[10, 20, 30, 40, 50]"
:page-sizes="[50, 100, 150, 200]"
:page-size="pageSize"
:total="total"
layout="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
</div>
@@ -139,11 +139,11 @@
<div class="block">
<el-pagination
:current-page="pageCurrent00"
:page-sizes="[10, 20, 30, 40]"
:page-sizes="[50, 100, 150, 200]"
:page-size="pageSize00"
:total="total00"
style="margin-top:10px;display:inline-block;width:50%"
layout="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange00"
@current-change="handleCurrentChange00"/>
</div>
@@ -199,11 +199,11 @@
<div class="block">
<el-pagination
:current-page="pageCurrent01"
:page-sizes="[10, 20, 30, 40]"
:page-sizes="[50, 100, 150, 200]"
:page-size="pageSize01"
:total="total01"
style="margin-top:10px;display:inline-block;width:50%"
layout="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange01"
@current-change="handleCurrentChange01"/>
</div>
@@ -264,11 +264,11 @@
<div class="block">
<el-pagination
:current-page="pageCurrent02"
:page-sizes="[10, 20, 30, 40]"
:page-sizes="[50, 100, 150, 200]"
:page-size="pageSize02"
:total="total02"
style="margin-top:10px;display:inline-block;width:50%"
layout="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange02"
@current-change="handleCurrentChange02"/>
</div>
@@ -317,10 +317,10 @@
<div class="block" style="margin-top: 10px;">
<el-pagination
:current-page="pageCurrent5"
:page-sizes="[10, 20, 30, 40]"
:page-sizes="[50, 100, 150, 200]"
:page-size="pageSize5"
:total="total5"
layout="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange5"
@current-change="handleCurrentChange5"/>
</div>
@@ -398,13 +398,13 @@ export default {
PartType: '标准件',
PartType2: '车间生产',
pageCurrent00: 1,
pageSize00: 1000,
pageSize00: 50,
pageCurrent01: 1,
pageSize01: 10,
pageCurrent02: 1,
pageSize02: 1000,
pageSize02: 50,
pageCurrent: 1,
pageSize: 1000,
pageSize: 50,
pageCurrent1: 1,
pageSize1: 10,
pageCurrent2: 1,
@@ -496,19 +496,19 @@ export default {
this.Machine ? this.check1 = 1 : this.check1 = 0
this.Group ? this.check2 = 1 : this.check2 = 0
searchTable(this.check1, this.Machine, this.check2, this.Group, this.pageCurrent, this.pageSize).then(response => {
for (let i = 0; i < response.data.rows.length; i++) {
if (response.data.rows[i].入库时间 !== '') {
response.data.rows[i].入库时间 = response.data.rows[i].入库时间.split(' ', 2)[0]
for (let i = 0; i < response.data.result.length; i++) {
if (response.data.result[i].入库时间) {
response.data.result[i].入库时间 = response.data.result[i].入库时间.split(' ', 2)[0]
}
if (response.data.rows[i].计划完成时间 !== '') {
response.data.rows[i].计划完成时间 = response.data.rows[i].计划完成时间.split(' ', 2)[0]
if (response.data.result[i].计划完成时间) {
response.data.result[i].计划完成时间 = response.data.result[i].计划完成时间.split(' ', 2)[0]
}
if (response.data.rows[i].机加工实际完成时间 !== '') {
response.data.rows[i].机加工实际完成时间 = response.data.rows[i].机加工实际完成时间.split(' ', 2)[0]
if (response.data.result[i].机加工实际完成时间) {
response.data.result[i].机加工实际完成时间 = response.data.result[i].机加工实际完成时间.split(' ', 2)[0]
}
}
this.tableData = response.data.rows
this.total = parseInt(response.data.total)
this.tableData = response.data.result
this.total = parseInt(response.data.output[0].ItemCount)
this.loading = false
})
searchTable22(this.check1, this.Machine, this.check2, this.Group, this.check3, this.year, this.check4, this.month, this.check5, this.time, this.pageCurrent, this.pageSize).then(response => {
@@ -603,16 +603,16 @@ export default {
this.Machine ? this.check1 = 1 : this.check1 = 0
this.Group ? this.check2 = 1 : this.check2 = 0
searchTable(this.check1, this.Machine, this.check2, this.Group, this.pageCurrent, this.pageSize).then(response => {
for (let i = 0; i < response.data.rows.length; i++) {
if (response.data.rows[i].入库时间 !== '') {
response.data.rows[i].入库时间 = response.data.rows[i].入库时间.split(' ', 2)[0]
for (let i = 0; i < response.data.result.length; i++) {
if (response.data.result[i].入库时间) {
response.data.result[i].入库时间 = response.data.result[i].入库时间.split(' ', 2)[0]
}
if (response.data.rows[i].计划完成时间 !== '') {
response.data.rows[i].计划完成时间 = response.data.rows[i].计划完成时间.split(' ', 2)[0]
if (response.data.result[i].计划完成时间) {
response.data.result[i].计划完成时间 = response.data.result[i].计划完成时间.split(' ', 2)[0]
}
}
this.tableData = response.data.rows
this.total = parseInt(response.data.total)
this.tableData = response.data.result
this.total = parseInt(response.data.output[0].ItemCount)
this.loading = false
})
},
@@ -622,16 +622,16 @@ export default {
this.Machine ? this.check1 = 1 : this.check1 = 0
this.Group ? this.check2 = 1 : this.check2 = 0
searchTable(this.check1, this.Machine, this.check2, this.Group, this.pageCurrent, this.pageSize).then(response => {
for (let i = 0; i < response.data.rows.length; i++) {
if (response.data.rows[i].入库时间 !== '') {
response.data.rows[i].入库时间 = response.data.rows[i].入库时间.split(' ', 2)[0]
for (let i = 0; i < response.data.result.length; i++) {
if (response.data.result[i].入库时间) {
response.data.result[i].入库时间 = response.data.result[i].入库时间.split(' ', 2)[0]
}
if (response.data.rows[i].计划完成时间 !== '') {
response.data.rows[i].计划完成时间 = response.data.rows[i].计划完成时间.split(' ', 2)[0]
if (response.data.result[i].计划完成时间) {
response.data.result[i].计划完成时间 = response.data.result[i].计划完成时间.split(' ', 2)[0]
}
}
this.tableData = response.data.rows
this.total = parseInt(response.data.total)
this.tableData = response.data.result
this.total = parseInt(response.data.output[0].ItemCount)
this.loading = false
})
},

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

@@ -29,7 +29,7 @@
{{ scope.row.计划工时 }}
</template>
</el-table-column>
<el-table-column label="录入工时(分)" align="center">
<el-table-column label="加工工时(分)" align="center">
<template slot-scope="scope">
{{ scope.row.录入工时 }}
</template>

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

@@ -37,7 +37,7 @@
:data="tableData"
:row-class-name="tableRowClassName"
height="570"
style="width: 960px; margin: 3px 0"
style="width: 1000px; margin: 3px 0"
size="mini"
border
highlight-current-row
@@ -63,7 +63,7 @@
{{ scope.row.规格 }}
</template>
</el-table-column>
<el-table-column label="计划投产" align="center" width="80">
<el-table-column label="计划投产数" align="center" width="100">
<template slot-scope="scope">
{{ scope.row.投产总数量 }}
</template>
@@ -78,7 +78,7 @@
{{ scope.row.投产批次 }}
</template>
</el-table-column>
<el-table-column label="投产" align="center" width="80">
<el-table-column label="批次投产数" align="center" width="100">
<template slot-scope="scope">
{{ scope.row.批次数量 }}
</template>

8
src/views/ManufacturingCenter/ProjectPlanningManagementQuery/index.vue
View File

@@ -119,11 +119,11 @@
</div>
</el-card>
</el-col>
<el-col style="width: 370px;margin-left: 10px">
<el-col style="width: 373px;margin-left: 10px">
<el-card style="height: 370px">
<div style="width: 110px;font-size: 18px;float: left;text-align: center;">进程</div>
<div style="width: 110px;font-size: 18px;float: left;text-align: center;">计划时间</div>
<div style="width: 110px;font-size: 18px;float: left;text-align: center;">实际时间</div>
<!--<div style="width: 110px;font-size: 14px;float: left;text-align: center;margin-top: 30px;margin-bottom: 20px;font-weight: bold">进程</div>-->
<div style="width: 110px;font-size: 14px;float: left;text-align: center;margin-top: 30px;margin-bottom: 20px;font-weight: bold;margin-left: 100px">计划时间</div>
<div style="width: 110px;font-size: 14px;float: left;text-align: center;margin-top: 30px;margin-bottom: 20px;font-weight: bold;margin-left: 10px">实际时间</div>
<el-form label-position="right" label-width="100px" class="ProjectPlanningManagementQuery">
<el-row>
<el-col style="width: 370px">

29
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="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-button type="primary" plain icon="el-icon-search" size="small" style="margin: 15px 0 0 10px" @click="pageCurrent=1;pageSize=30;total=0;searchData()">查询</el-button>
</el-row>
</el-card>
<el-card>
@@ -60,14 +60,14 @@
{{ scope.row.传递时间 }}
</template>
</el-table-column>
<el-table-column align="center" label="零件状态" width="650px">
<el-table-column align="center" label="零件状态" width="550px">
<template slot-scope="scope">
<el-steps :active="scope.row.考核状态" finish-status="success" simple>
<el-step title="投产" />
<el-step title="工艺" />
<el-step title="定额" />
<el-step title="平衡" />
<el-step title="完成" />
<!--<el-step title="定额" />-->
<!--<el-step title="平衡" />-->
<el-step title="制造" />
<el-step title="入库" />
<el-step title="出库" />
</el-steps>
@@ -77,7 +77,7 @@
<div class="block" style="margin-top: 10px;">
<el-pagination
:current-page="pageCurrent"
:page-sizes="[10, 20, 30, 40, 50]"
:page-sizes="[30, 50, 100]"
:page-size="pageSize"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@@ -108,7 +108,7 @@ export default {
partTypeValue: null, // 零件类型
num: null,
pageCurrent: 1,
pageSize: 20,
pageSize: 30,
tableData7: [],
tableData6: [],
tableData: [],
@@ -173,9 +173,18 @@ export default {
this.loading0 = true
searchTable(check1, this.machineToolValue, check2, this.groupNumberValue, check3, this.partNumber, check4, this.partStateValue, check5, this.partTypeValue, this.pageCurrent, this.pageSize).then(response => {
for (let i = 0; i < response.data.result.length; i++) {
response.data.result[i].考核状态 = parseInt(response.data.result[i].考核状态) - 2
if (response.data.result[i].传递时间 !== undefined || response.data.result[i].hasOwnProperty('传递时间')) {
response.data.result[i].传递时间 = response.data.result[i].传递时间.split(' ', 2)[0]
if (response.data.result[i].考核状态 === 3) {
response.data.result[i].考核状态 = 1
} else if (response.data.result[i].考核状态 === 4) {
response.data.result[i].考核状态 = 2
} else if (response.data.result[i].考核状态 === 5) {
response.data.result[i].考核状态 = 2
} else if (response.data.result[i].考核状态 === 6) {
response.data.result[i].考核状态 = 3
} else if (response.data.result[i].考核状态 === 7) {
response.data.result[i].考核状态 = 4
} else if (response.data.result[i].考核状态 === 8) {
response.data.result[i].考核状态 = 5
}
}
this.loading0 = false

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

@@ -22,26 +22,11 @@
</el-select>
<span>供应商:</span>
<el-input v-model="supplierName" placeholder="供应商" size="small" clearable style="width:180px"/>
<el-button
type="primary"
plain
size="small"
icon="el-icon-search"
style="margin-left:10px"
@click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
<el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left:10px" @click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
</el-card>
<el-card>
<el-table
v-loading="loading1"
:data="tableData1"
size="mini"
stripe
border
style="width: 100%;max-height: 450px;"
height="450px"
highlight-current-row
@row-click="searchTable2">
<el-table v-loading="loading1" :data="tableData1" size="mini" stripe border style="width: 100%;max-height: 450px;" height="450px" highlight-current-row @row-click="searchTable2">
<el-table-column label="展开" align="center" type="expand">
<template slot-scope="scope">
<el-form id="table" label-position="left" inline class="demo-table-expand">
@@ -130,7 +115,7 @@
:value="item.value"/>
</el-select>
</el-form-item>
<el-form-item label="未通过原因" prop="未通过原因">
<el-form-item v-show="form2.审批是否通过!==2" label="未通过原因" prop="未通过原因">
<el-input v-model="form2.未通过原因" :disabled="form2.审批是否通过!==2" size="small"/>
</el-form-item>
</el-form>

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

@@ -298,11 +298,11 @@ export default {
}
},
watch: {
machine(val) {
if (val.length > 0) {
this.machineValue = val[0].value
}
},
// machine(val) {
// if (val.length > 0) {
// this.machineValue = val[0].value
// }
// },
machineValue(val) {
this.groupValue = ''
this.group = []

71
src/views/WorkshopProcurement/AccountingPrice/index.vue
View File

@@ -16,15 +16,7 @@
</el-row>
</el-card>
<el-card>
<el-table
v-loading="loading"
:data="tableData"
size="small"
highlight-current-row
min-height="540px"
height="540px"
stripe
border>
<el-table v-loading="loading" :data="tableData" :summary-method="getSummaries" size="small" highlight-current-row show-summary min-height="540px" height="540px" stripe border>
<el-table-column align="center" label="采购合同编号" width="150px">
<template slot-scope="scope">
{{ scope.row.采购合同编号 }}
@@ -45,7 +37,7 @@
{{ scope.row.物料名称 ? scope.row.物料名称 : scope.row.组件名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="数量" width="70px">
<el-table-column align="center" label="数量" width="70px" prop="数量">
<template slot-scope="scope">
{{ scope.row.数量 }}
</template>
@@ -55,9 +47,9 @@
<el-input v-model="scope.row.单价" size="mini" width="80px" align="center" @blur="filterNuber(scope.row.单价, scope.$index, '单价', scope.row)"/>
</template>
</el-table-column>
<el-table-column align="center" label="总额(元)" width="90px">
<el-table-column align="center" label="总额(元)" width="90px" prop="金额">
<template slot-scope="scope">
{{ Number(scope.row.金额).toFixed(2) }}
{{ scope.row.金额 }}
</template>
</el-table-column>
</el-table>
@@ -75,7 +67,8 @@
</div>
</template>
<script>import { initPayState, searchParts, Preservation } from '@/api/WorkshopProcurement/AccountingPrice'
<script>
import { initPayState, searchParts, Preservation } from '@/api/WorkshopProcurement/AccountingPrice'
import { mapGetters } from 'vuex'
export default {
data() {
@@ -128,7 +121,6 @@ export default {
if (value.indexOf('.') < 0 && value !== '') {
value = parseFloat(value).toFixed(2)
}
console.log(value)
this.tableData[index][date] = value
this.tableData[index]['金额'] = value * row.数量
this.update(row)
@@ -140,7 +132,6 @@ export default {
this.contractNumValue ? this.check1 = 1 : this.check1 = 0
searchParts(this.pageCurrent, this.pageSize, this.check1, this.contractNumValue).then(response => {
this.loading = false
console.log(response.data.rows)
for (let i = 0; i < response.data.rows.length; i++) {
if (response.data.rows[i].物料型号 === null || response.data.rows[i].物料型号 === '') {
response.data.rows[i].物料型号 = response.data.rows[i].零件图号
@@ -156,27 +147,59 @@ export default {
物料名称: response.data.rows[i].物料名称,
数量: response.data.rows[i].数量,
单价: Number(response.data.rows[i].单价).toFixed(2),
金额: response.data.rows[i].金额
金额: Number(response.data.rows[i].金额).toFixed(2)
})
}
}
console.log(response, 90)
this.total = response.data.total
})
} else {
this.tableData = []
}
},
update(row) {
console.log(row, 12)
Preservation(row.采购合同明细流水号, row.单价).then(response => {
if (response.data[0].result === '1') {
this.$message.success('编辑成功')
// this.searchTable()
// 合计
getSummaries(param) {
const { columns, data } = param
const sums = []
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '总价'
} else if (index === 4) {
const values = data.map(item => Number(item['数量']))
if (!values.every(value => isNaN(value))) {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
return (Number(prev) + Number(curr))
} else {
this.$message.error('编辑失败')
return (Number(prev) + Number(curr))
}
}, 0)
sums[index] += ''
} else {
sums[index] = 'N/A'
}
} else if (index === 6) {
const values = data.map(item => Number(item['金额']))
if (!values.every(value => isNaN(value))) {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
return (parseInt((Number(prev) + Number(curr)) * 100) / 100).toFixed(2)
} else {
return (parseInt(Number(prev) * 100) / 100).toFixed(2)
}
}, 0)
sums[index] += ' 元'
} else {
sums[index] = 'N/A'
}
}
})
return sums
},
update(row) {
Preservation(row.采购合同明细流水号, row.单价)
},
handleSizeChange(val) {
this.pageSize = val

12
src/views/WorkshopProcurement/ArrivalStateSearch/index.vue
View File

@@ -14,18 +14,23 @@
</el-card>
<el-card>
<el-table v-loading="" :data="tableData" stripe border style="width: 100%;max-height: 600px;margin-top: 10px" height="600px" size="mini">
<el-table v-loading="" :data="tableData" stripe border style="width: 740px;margin-top: 10px" height="600px" size="mini">
<el-table-column label="采购合同编号" align="center" width="140">
<template slot-scope="scope">
{{ scope.row.采购合同编号 }}
</template>
</el-table-column>
<el-table-column label="机床图号" align="center" width="140">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="零件名称" align="center" width="120">
<template slot-scope="scope">
{{ scope.row.物料名称 ? scope.row.物料名称 : scope.row.组件名称 }}
</template>
</el-table-column>
<el-table-column label="图号或型号" align="center" width="130">
<el-table-column label="图号或型号" align="center" width="160">
<template slot-scope="scope">
{{ scope.row.物料型号 ? scope.row.物料型号 : scope.row.组号 }}
</template>
@@ -40,7 +45,7 @@
{{ scope.row.数量 }}
</template>
</el-table-column>
<el-table-column label="已到货数量" align="center" width="100">
<el-table-column label="到货数量" align="center" width="100">
<template slot-scope="scope">
{{ scope.row.已到货数量 }}
</template>
@@ -91,6 +96,7 @@ export default {
},
searchTable() {
searchArrivalState(this.contractNumValue).then(response => {
console.log(response.data)
for (let i = 0; i < response.data.length; i++) {
if (response.data[i].物料型号 === '' || response.data[i].物料型号 === null) {
response.data[i].物料型号 = response.data[i].零件图号

42
src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue
View File

@@ -1,47 +1,14 @@
<template>
<div class="app-container">
<el-card>
<!-- <span>发票号:</span>-->
<el-input v-model="invoiceNum" placeholder="到票号\供应商" size="small" clearable/>
<el-input v-model="invoiceNum" placeholder="发票号\供应商" size="small" clearable/>
<el-button type="primary" size="small" plain icon="el-icon-search" style="margin-left:10px" @click="tableData2=[];total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
<el-button type="distribution" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="createOrder()">到票</el-button>
</el-card>
<el-card>
<h4 style="margin: 5px">到票结算申请单</h4>
<h5 style="margin: 5px">到票结算申请单</h5>
<el-table id="expandTable" :data="tableData1" border stripe highlight-current-row style="width: 100%;" height="350px" size="mini" @row-click="searchTable2">
<!-- <el-table-column label="详情" type="expand">-->
<!-- <template slot-scope="scope">-->
<!-- <el-form label-position="left" inline class="demo-table-expand">-->
<!-- <el-row>-->
<!-- <el-col :span="6">-->
<!-- <viewer>-->
<!-- <img :src="scope.row.scanSrc" alt="发票扫描件" height="120px">-->
<!-- </viewer>-->
<!-- </el-col>-->
<!-- <el-col :span="6">-->
<!-- <el-form-item label="已付款项">-->
<!-- <span>{{ scope.row.已付款项 }}</span>-->
<!-- </el-form-item><br>-->
<!-- <el-form-item label="尚欠金额">-->
<!-- <span>{{ scope.row.尚欠金额 }}</span>-->
<!-- </el-form-item><br>-->
<!-- <el-form-item label="备注">-->
<!-- <span>{{ scope.row.备注 }}</span>-->
<!-- </el-form-item><br>-->
<!-- </el-col>-->
<!-- <el-col :span="6">-->
<!-- <el-form-item label="是否费用类发票">-->
<!-- <span>{{ scope.row.是否费用类 }}</span>-->
<!-- </el-form-item><br>-->
<!-- <el-form-item label="税额">-->
<!-- <span>{{ scope.row.税额 }}</span>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- </el-form>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="供应商" prop="供应商名称" align="center" width="170" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.供应商名称 }}
@@ -152,11 +119,6 @@
{{ scope.row.备注 }}
</template>
</el-table-column>
<el-table-column label="供应商" align="center" min-width="150" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.供应商名称 }}
</template>
</el-table-column>
<el-table-column label="合同编号" align="center" width="120">
<template slot-scope="scope">
{{ scope.row.采购合同编号 || scope.row.离线合同编号 }}

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

@@ -84,7 +84,7 @@
<span v-if="Number(scope.row.采购计划状态)===4" type="info" size="mini">已结算</span>
</template>
</el-table-column>
<el-table-column label="离线备料计划编号" align="center" width="140">
<el-table-column label="离线备料单号" align="center" width="140">
<template slot-scope="scope">
{{ scope.row.离线采购计划编号 }}
</template>

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

@@ -39,7 +39,7 @@
size="small"
plain
icon="el-icon-search"
@click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
@click="total1=0;pageCurrent1=1;pageSize1=20;searchTable1()">查询</el-button>
<el-button
type="primary"
size="small"
@@ -120,7 +120,7 @@
<div class="block" style="margin-top: 10px;">
<el-pagination
:current-page="pageCurrent1"
:page-sizes="[10, 20, 30, 40]"
:page-sizes="[20, 30, 40, 50]"
:page-size="pageSize1"
:total="total1"
style="display:inline-block;width:50%"
@@ -436,7 +436,7 @@ export default {
supplierValue: '',
total1: 0,
pageCurrent1: 1,
pageSize1: 10,
pageSize1: 20,
tableData1: [],
loading1: false,
dialogVisible1: false,

10
src/views/WorkshopProcurement/ProjectTotalSearch/index.vue
View File

@@ -1,7 +1,7 @@
<template>
<div class="app-container">
<el-card style="width: 44%">
<span>项目名称:</span>
<el-card style="width: 800px">
<!--<span>项目名称:</span>-->
<el-select v-model="projectValue" placeholder="项目名称" size="small" style="width: 180px" filterable clearable>
<el-option
v-for="item in project"
@@ -22,16 +22,16 @@
plain
icon="el-icon-download"
style="margin-left:10px"
@click="exportExcel()">导出项目采购明细</el-button>
@click="exportExcel()">导出</el-button>
</el-card>
<el-card style="width: 54%">
<el-card style="width: 800px">
<el-table v-loading="" :data="tableData2" :summary-method="getSummaries1" show-summary border style="width: 100%;max-height: 700px;" height="700px">
<el-table-column label="零件名称" align="center" width="150">
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column label="图号或型号" align="center" width="150">
<el-table-column label="图号或型号" align="center" min-width="150">
<template slot-scope="scope">
{{ scope.row.图号或型号 }}
</template>

8
src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue
View File

@@ -133,6 +133,7 @@
</el-card>
</el-col>
</el-row>
<el-dialog :visible.sync="dialogVisible2" title="采购合同请款" center style="min-height: 300px" width="1200px">
<span>供应商：</span>
<el-select v-model="supplierValue" placeholder="供应商" filterable clearable size="small" @change="searchTable01()">
@@ -166,17 +167,17 @@
</el-table-column>
<el-table-column label="合同总额(元)" align="center" width="110" prop="合同总额">
<template slot-scope="scope">
{{ scope.row.含税总金额 }}
{{ parseFloat(scope.row.含税总金额).toFixed(2) }}
</template>
</el-table-column>
<el-table-column label="已付金额(元)" align="center" min-width="100" prop="已付金额">
<template slot-scope="scope">
{{ scope.row.已付金额 }}
{{ parseFloat(scope.row.已付金额).toFixed(2) }}
</template>
</el-table-column>
<el-table-column label="申请中金额(元)" align="center" min-width="100" prop="申请中金额">
<template slot-scope="scope">
{{ scope.row.申请中金额 }}
{{ parseFloat(scope.row.申请中金额).toFixed(2) }}
</template>
</el-table-column>
<el-table-column label="请款金额(元)" align="center" min-width="130" prop="请款金额">
@@ -359,6 +360,7 @@ export default {
this.contractGroup.push(val[i].采购合同流水号)
this.sumGroup.push(val[i].请款金额)
}
this.SUM = parseFloat(this.SUM).toFixed(2)
},
submitRequestFund() { // 确认请款
if (this.supplierValue && this.contractGroup.length !== 0) {