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

20200205lljV5备料出库排序修改

Browse Source
This commit is contained in:
liulujia@meswork.com
2020-02-05 11:52:27 +08:00
parent ba258431e2 fb3b32ff7d
commit da82d12e74
5 changed files with 88 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/ManufacturingCenter/WorkshopEquipmentManagement.js
View File

@@ -7,8 +7,8 @@ export function getData(check, equipmentName, pageCurrent, pageSize) {
data: { data: {
type: '1', type: '1',
name: '设备管理_设备加工能力_查询数据_设备维护NEW', name: '设备管理_设备加工能力_查询数据_设备维护NEW',
param: '设备名称_check=' + check + '=int&设备名称=' + equipmentName, param: '设备名称_check=' + check + '=int&设备名称=' + equipmentName
pagination: pageCurrent + '&' + pageSize // pagination: pageCurrent + '&' + pageSize
} }
}) })
} }

83
src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
View File

@@ -3,14 +3,27 @@
<el-card> <el-card>
<span>设备名称:</span> <span>设备名称:</span>
<el-input v-model="equipmentName" placeholder="设备名称" size="small" clearable style="width:200px;margin-left: 10px"/> <el-input v-model="equipmentName" placeholder="设备名称" size="small" clearable style="width:200px;margin-left: 10px"/>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left:30px" @click="pageCurrent = 1;fetchData()">查询</el-button> <el-button type="success" size="small" icon="el-icon-search" style="margin-left:30px;background: #ecf5ff;border-color: #2d72d5;color: #2d72d5;" @click="pageCurrent = 1;fetchData()">查询</el-button>
<el-tooltip effect="dark" content="添加新设备" placement="top"> <el-tooltip effect="dark" content="添加新设备" placement="top">
<el-button type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="handleAdd()">新增</el-button> <el-button type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px;background: #fdf6ec;border-color: #ff9759;color: #ff9759;" @click="handleAdd()">新增</el-button>
</el-tooltip>
<span style="margin-left: 40px">有效时间：</span>
<el-date-picker
v-model="time"
type="date"
size="small"
value-format="yyyy-MM-dd"
placeholder="选择日期"/>
<el-tooltip :open-delay="1200" effect="dark" content="设定设备参数有效时间" placement="top">
<el-button type="primary" size="small" icon="el-icon-setting" style="margin-left:10px;background: #fdf6ec;border-color: #ff9759;color: #ff9759;" @click="setUp">设定</el-button>
</el-tooltip>
<el-tooltip effect="dark" content="生成有效时间内设备加工能力" placement="top">
<el-button type="success" size="small" icon="el-icon-edit-outline" style="margin-left:10px;background: #ecf5ff;border-color: #2d72d5;color: #2d72d5;" @click="generate">生成设备加工能力</el-button>
</el-tooltip> </el-tooltip>
</el-card> </el-card>
<el-card> <el-card>
<el-table :data="List" border size="small" stripe highlight-current-row height="500px"> <el-table :data="List" border size="small" stripe highlight-current-row height="700px">
<el-table-column label="设备名称" prop="设备名称" align="center" > <el-table-column label="设备名称" prop="设备名称" align="center" >
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.设备名称 }} {{ scope.row.设备名称 }}
@@ -68,32 +81,32 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="block" style="margin-top: 10px;"> <!-- <div class="block" style="margin-top: 10px;">-->
<el-pagination <!-- <el-pagination-->
:current-page="pageCurrent" <!-- :current-page="pageCurrent"-->
:page-sizes="[10, 20, 30, 40]" <!-- :page-sizes="[10, 20, 30, 40]"-->
:page-size="pageSize" <!-- :page-size="pageSize"-->
:total="total" <!-- :total="total"-->
layout="total, sizes, prev, pager, next, jumper" <!-- layout="total, sizes, prev, pager, next, jumper"-->
@size-change="handleSizeChange" <!-- @size-change="handleSizeChange"-->
@current-change="handleCurrentChange"/> <!-- @current-change="handleCurrentChange"/>-->
</div> <!-- </div>-->
</el-card>
<el-card>
<span>有效时间：</span>
<el-date-picker
v-model="time"
type="date"
size="small"
value-format="yyyy-MM-dd"
placeholder="选择日期"/>
<el-tooltip :open-delay="1200" effect="dark" content="设定设备参数有效时间" placement="top">
<el-button type="primary" size="small" icon="el-icon-setting" style="margin-left:10px" @click="setUp">设定</el-button>
</el-tooltip>
<el-tooltip effect="dark" content="生成有效时间内设备加工能力" placement="top">
<el-button type="success" size="small" icon="el-icon-edit-outline" style="margin-left:10px" @click="generate">生成设备加工能力</el-button>
</el-tooltip>
</el-card> </el-card>
<!-- <el-card>-->
<!-- <span>有效时间：</span>-->
<!-- <el-date-picker-->
<!-- v-model="time"-->
<!-- type="date"-->
<!-- size="small"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- placeholder="选择日期"/>-->
<!-- <el-tooltip :open-delay="1200" effect="dark" content="设定设备参数有效时间" placement="top">-->
<!-- <el-button type="primary" size="small" icon="el-icon-setting" style="margin-left:10px" @click="setUp">设定</el-button>-->
<!-- </el-tooltip>-->
<!-- <el-tooltip effect="dark" content="生成有效时间内设备加工能力" placement="top">-->
<!-- <el-button type="success" size="small" icon="el-icon-edit-outline" style="margin-left:10px" @click="generate">生成设备加工能力</el-button>-->
<!-- </el-tooltip>-->
<!-- </el-card>-->
<el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogFormVisible" center style="min-height: 300px" width="800px"> <el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogFormVisible" center style="min-height: 300px" width="800px">
<el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="120px" class="demo-ruleForm"> <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="120px" class="demo-ruleForm">
@@ -240,8 +253,8 @@ export default {
this.check = 0 this.check = 0
} }
getData(this.check, this.equipmentName, this.pageCurrent, this.pageSize).then(response => { getData(this.check, this.equipmentName, this.pageCurrent, this.pageSize).then(response => {
this.List = response.data.rows this.List = response.data
this.total = response.data.total // this.total = response.data.total
}) })
}, },
initialization() { initialization() {
@@ -399,4 +412,14 @@ export default {
.el-card{ .el-card{
margin-bottom: 1px; margin-bottom: 1px;
} }
/*.el-button--success {*/
/* background: #ecf5ff;*/
/* border-color: #2d72d5;*/
/* color: #2d72d5;*/
/*}*/
/*.el-button--primary {*/
/* background: #fdf6ec;*/
/* border-color: #ff9759;*/
/* color: #ff9759;*/
/*}*/
</style> </style>

35
src/views/MarketingCenter/CreateProject/index.vue
View File

@@ -39,11 +39,10 @@
<!-- size="small"--> <!-- size="small"-->
<!-- type="date"--> <!-- type="date"-->
<!-- placeholder="请选择结束日期"/>--> <!-- placeholder="请选择结束日期"/>-->
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 10;PageCurrent = 1;fetchTableData1()">查询</el-button> <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px;background: #ecf5ff;border-color: #2d72d5;color: #2d72d5;" @click="PageSize = 10;PageCurrent = 1;fetchTableData1()">查询</el-button>
<el-tooltip :open-delay="1200" effect="dark" content="新增项目" placement="top"> <el-tooltip :open-delay="1200" effect="dark" content="新增项目" placement="top">
<el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()">新增</el-button> <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px;background: #fdf6ec;border-color: #ff9759;color: #ff9759;" @click="ADD()">新增</el-button>
</el-tooltip> </el-tooltip>
<!-- <el-button type="info" size="small" style="margin-left: 10px">导出Excel</el-button>-->
</div> </div>
</el-card> </el-card>
<el-row> <el-row>
@@ -456,21 +455,21 @@ export default {
</script> </script>
<style scoped> <style scoped>
.el-button--success { /*.el-button--success {*/
background: #ffffff; /* background: #ecf5ff;*/
border-color: #2d72d5; /* border-color: #2d72d5;*/
color: #2d72d5; /* color: #2d72d5;*/
} /*}*/
.el-button--primary { /*.el-button--primary {*/
background: #ffffff; /* background: #fdf6ec;*/
border-color: #ff9759; /* border-color: #ff9759;*/
color: #ff9759; /* color: #ff9759;*/
} /* }*/
.el-button--info { /*.el-button--info {*/
background: #ffffff; /* background: #f0f9eb;*/
border-color: #67c23a; /* border-color: #67c23a;*/
color: #67c23a; /* color: #67c23a;*/
} /*}*/
</style> </style>
<style lang="scss"> <style lang="scss">
.subTableHeader { .subTableHeader {

22
src/views/Outsourcing/OutsourcingTaskExecution/index.vue
View File

@@ -4,7 +4,7 @@
<span>零件号:</span> <span>零件号:</span>
<el-input v-model="partNumber" size="small" placeholder="零件号" clearable style="width:200px"/> <el-input v-model="partNumber" size="small" placeholder="零件号" clearable style="width:200px"/>
<el-button type="success" size="mini" icon="el-icon-search" style="margin-left:10px" @click="getList()">查询</el-button> <el-button type="success" size="mini" icon="el-icon-search" style="margin-left:10px" @click="getList()">查询</el-button>
<el-button type="danger" size="mini" icon="el-icon-caret-right" style="margin-left:10px" @click="getBack()">打回车间</el-button> <el-button type="danger" plain size="mini" icon="el-icon-caret-right" style="float: right;margin-right:10px" @click="getBack()">打回车间</el-button>
<el-table <el-table
v-loading="loading1" v-loading="loading1"
ref="multipleTable" ref="multipleTable"
@@ -139,15 +139,15 @@
<!--<el-button type="success" size="mini" icon="el-icon-edit" style="margin-left:10px;margin-top: 15px" @click="calculatingPrice">计算价格</el-button>--> <!--<el-button type="success" size="mini" icon="el-icon-edit" style="margin-left:10px;margin-top: 15px" @click="calculatingPrice">计算价格</el-button>-->
<!--</el-tooltip>--> <!--</el-tooltip>-->
<el-button type="warning" size="mini" icon="el-icon-arrow-down" style="margin-left:10px" @click="getSpareParts">选入零件</el-button> <el-button type="warning" size="mini" icon="el-icon-arrow-down" style="margin-left:10px" @click="getSpareParts">选入零件</el-button>
<el-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px;margin-top: 3px;float: right" @click="exportTable('RWD')">导出单据</el-button> <el-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px;margin-top: 3px;float: right" @click="exportTable('RWD')">导出任务单</el-button>
<el-tooltip :open-delay="1200" effect="dark" content="成交" placement="top"> <el-tooltip :open-delay="1200" effect="dark" content="成交" placement="top">
<el-button type="success" size="mini" icon="el-icon-success" style="margin-left:10px;margin-top: 3px;float: right" @click="Deal">成交</el-button> <el-button type="success" size="mini" icon="el-icon-success" style="margin-left:10px;margin-top: 3px;float: right" @click="Deal">提交</el-button>
</el-tooltip> </el-tooltip>
<el-tooltip :open-delay="1200" effect="dark" content="核对价格信息后确定" placement="top"> <el-tooltip :open-delay="1200" effect="dark" content="核对价格信息后确定" placement="top">
<el-button type="success" size="mini" icon="el-icon-edit" style="margin-left:10px;margin-top: 3px;float: right" @click="confirmPrice">保存</el-button> <el-button type="success" size="mini" icon="el-icon-edit" style="margin-left:10px;margin-top: 3px;float: right" @click="confirmPrice">保存</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
<el-table v-loading="loading" :data="List3" :summary-method="getSummaries" :row-class-name="tableRowClassName" height="488" stripe size="mini" show-summary border> <el-table v-loading="loading" :data="List3" :summary-method="getSummaries" height="488" stripe size="mini" show-summary border>
<el-table-column label="零件图号" align="center" min-width="150px"> <el-table-column label="零件图号" align="center" min-width="150px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ 零件图号[scope.$index] }} {{ 零件图号[scope.$index] }}
@@ -205,13 +205,13 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="80px"> <el-table-column label="操作" align="center" width="80px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" plain icon="el-icon-delete" @click="handleDelete1(scope.$index)">移除</el-button> <el-button size="mini" type="text" plain icon="el-icon-right" @click="handleDelete1(scope.$index)">移出</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-col> </el-col>
</el-card> </el-card>
<el-card v-show="true"> <el-card v-show="false">
<div id="RWD"> <div id="RWD">
<table cellspacing="0px" align="center" width="100%" style=""> <table cellspacing="0px" align="center" width="100%" style="">
<tbody id="1"> <tbody id="1">
@@ -315,7 +315,7 @@
<!--<el-button slot="append" icon="el-icon-search" @click="onFocus1();param=1"/>--> <!--<el-button slot="append" icon="el-icon-search" @click="onFocus1();param=1"/>-->
<!--</el-input>--> <!--</el-input>-->
</el-form-item> </el-form-item>
<el-form-item label="运费" prop="运费" style="margin-left: 70px"> <el-form-item v-show="false" label="运费" prop="运费" style="margin-left: 70px">
<el-input v-model="form.运费" placeholder="运费" size="small" style="width:200px" clearable/> <el-input v-model="form.运费" placeholder="运费" size="small" style="width:200px" clearable/>
</el-form-item> </el-form-item>
</el-form> </el-form>
@@ -682,9 +682,9 @@ export default {
submit(formName) { submit(formName) {
this.$refs[formName].validate((valid) => { this.$refs[formName].validate((valid) => {
if (valid) { if (valid) {
if (this.title === '增加外协表单') { if (this.title === '新增外协任务单') {
this.submitAdd() this.submitAdd()
} else if (this.title === '编辑外协表单') { } else if (this.title === '编辑外协任务单') {
this.submitEdit() this.submitEdit()
} }
} }
@@ -694,7 +694,7 @@ export default {
if (this.$refs['form'] !== undefined) { if (this.$refs['form'] !== undefined) {
this.$refs['form'].resetFields() this.$refs['form'].resetFields()
} }
this.title = '增加外协表单' this.title = '新增外协任务单'
var time = new Date() var time = new Date()
var month = time.getMonth() + 1 var month = time.getMonth() + 1
var day = time.getDate() var day = time.getDate()
@@ -1145,7 +1145,7 @@ export default {
if (this.$refs['form'] !== undefined) { if (this.$refs['form'] !== undefined) {
this.$refs['form'].resetFields() this.$refs['form'].resetFields()
} }
this.title = '编辑外协表单' this.title = '编辑外协任务单'
this.dialogFormVisible = true this.dialogFormVisible = true
this.form.表单号 = row.表单号 this.form.表单号 = row.表单号
this.form.运费 = row.运费 this.form.运费 = row.运费

73
src/views/Outsourcing/PreorderAssociation/index.vue
View File

@@ -20,13 +20,8 @@
:value="item.value"/> :value="item.value"/>
</el-select> </el-select>
<el-input v-model="partName" placeholder="零件图号" size="small" clearable style="width:150px"/> <el-input v-model="partName" placeholder="零件图号" size="small" clearable style="width:150px"/>
<el-button size="small" icon="el-icon-search" type="success" style="" @click="pageSize1=50; pageCurrent1=1;searchTable()">查询</el-button> <el-button size="small" icon="el-icon-search" type="primary" plain @click="pageSize1=50; pageCurrent1=1;searchTable()">查询</el-button>
<el-table v-loading="loading1" :data="tableData1" size="mini" highlight-current-row height="550px" style="width: 100%;" border element-loading-text="拼命加载中" @row-click="searchTable2"> <el-table v-loading="loading1" :data="tableData1" size="mini" highlight-current-row height="550px" style="width: 100%;" border element-loading-text="拼命加载中" @row-click="searchTable2">
<el-table-column
label="序号"
type="index"
align="center"
width="50"/>
<el-table-column label="零件图号" prop="零件图号" align="center" width="140px" show-overflow-tooltip> <el-table-column label="零件图号" prop="零件图号" align="center" width="140px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件图号 }} {{ scope.row.零件图号 }}
@@ -42,11 +37,6 @@
{{ scope.row.材料 }} {{ scope.row.材料 }}
</template> </template>
</el-table-column> </el-table-column>
<!--<el-table-column label="种类" prop="零件类型名臣" align="center" width="80px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.零件类型名称 }}-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column label="数量" align="center" width="60px"> <el-table-column label="数量" align="center" width="60px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.批次数量 }} {{ scope.row.批次数量 }}
@@ -68,7 +58,7 @@
</el-col> </el-col>
<el-col :span="14"> <el-col :span="14">
<el-card> <el-card>
<el-button size="small" type="primary" style="margin: 10px" @click="saveRowPrice()">保存</el-button> <el-button size="small" type="success" plain style="margin: 10px" @click="saveRowPrice()">保存</el-button>
<el-table v-loading="loading2" :data="tableData2" :row-class-name="tableData1ClassName" height="580" style="width: 100%;" border element-loading-text="拼命加载中" size="small"> <el-table v-loading="loading2" :data="tableData2" :row-class-name="tableData1ClassName" height="580" style="width: 100%;" border element-loading-text="拼命加载中" size="small">
<el-table-column label="序号" type="index" align="center" width="50"/> <el-table-column label="序号" type="index" align="center" width="50"/>
<el-table-column label="加工状态" width="100" align="center"> <el-table-column label="加工状态" width="100" align="center">
@@ -84,12 +74,6 @@
<el-checkbox :disabled="parseInt(scope.row.工序状态)!==3||parseInt(scope.row.工艺编号)===29" v-model="checkBox[scope.$index]" @change="edit(scope.$index, scope.row)"/> <el-checkbox :disabled="parseInt(scope.row.工序状态)!==3||parseInt(scope.row.工艺编号)===29" v-model="checkBox[scope.$index]" @change="edit(scope.$index, scope.row)"/>
</template> </template>
</el-table-column> </el-table-column>
<!--<el-table-column label="外协状态" width="100" align="center">-->
<!--<template slot-scope="scope">-->
<!--<span v-if="parseInt(scope.row.工序间是否外协)===2" type="success" size="small">是</span>-->
<!--<span v-else size="small">否</span>-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column label="工艺名称" align="center"> <el-table-column label="工艺名称" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.工艺名称 }} {{ scope.row.工艺名称 }}
@@ -125,6 +109,7 @@ export default {
count: 0, // 计数器 (表二是否有外协工序) count: 0, // 计数器 (表二是否有外协工序)
InOut: 1, // 工序间是否外协变量 1自家 2外协 InOut: 1, // 工序间是否外协变量 1自家 2外协
index: 0, // 当前点击行（改变颜色不刷新用） index: 0, // 当前点击行（改变颜色不刷新用）
index2: 0, // 当前点击行（改变颜色不刷新用）
num1: '', num1: '',
checkBox: [], checkBox: [],
loading1: false, loading1: false,
@@ -217,6 +202,7 @@ export default {
this.loading2 = true this.loading2 = true
this.checkBox = [] this.checkBox = []
this.tableData2 = [] this.tableData2 = []
this.index2 = row.index
searchTable2(row.工艺计划流水号).then(response => { searchTable2(row.工艺计划流水号).then(response => {
this.num1 = row.工艺计划流水号 this.num1 = row.工艺计划流水号
if (response.data.length === 0) { if (response.data.length === 0) {
@@ -265,63 +251,14 @@ export default {
this.InOut = 2 this.InOut = 2
edit(row.工序流水号, this.InOut).then(response => { edit(row.工序流水号, this.InOut).then(response => {
edit2(row.工序流水号, row.工艺计划流水号, 1).then(response => { edit2(row.工序流水号, row.工艺计划流水号, 1).then(response => {
this.$message.success('工序外协状态更改成功')
this.tableData2[this.index].工序间是否外协 = 2 this.tableData2[this.index].工序间是否外协 = 2
// this.loading2 = true this.tableData1[this.index2].工序间是否外协 = 2
// this.checkBox = []
// this.tableData2 = []
// searchTable2(this.num1).then(response => {
// if (response.data.length === 0) {
// this.loading0 = false
// } else {
// for (let i = 0; i < response.data.length; i++) {
// if (response.data[i].工序间是否外协 === 1) {
// this.checkBox.push(false)
// } else {
// this.checkBox.push(true)
// }
// }
// for (let i = 0; i < response.data.length; i++) {
// response.data[i].机加工开始时间 = response.data[i].机加工开始时间.split(' ')[0]
// response.data[i].机加工结束时间 = response.data[i].机加工结束时间.split(' ')[0]
// response.data[i].计划日期 = response.data[i].计划日期.split(' ')[0]
// }
// this.tableData2 = response.data
// }
// }).then(() => {
// this.loading2 = false
// })
}) })
}) })
} else { } else {
this.InOut = 1 this.InOut = 1
edit(row.工序流水号, this.InOut).then(response => { edit(row.工序流水号, this.InOut).then(response => {
this.$message.success('工序外协状态更改成功')
this.tableData2[this.index].工序间是否外协 = 1 this.tableData2[this.index].工序间是否外协 = 1
// this.loading2 = true
// this.checkBox = []
// this.tableData2 = []
// searchTable2(this.num1).then(response => {
// if (response.data.length === 0) {
// this.loading0 = false
// } else {
// for (let i = 0; i < response.data.length; i++) {
// if (response.data[i].工序间是否外协 === 1) {
// this.checkBox.push(false)
// } else {
// this.checkBox.push(true)
// }
// }
// for (let i = 0; i < response.data.length; i++) {
// response.data[i].机加工开始时间 = response.data[i].机加工开始时间.split(' ')[0]
// response.data[i].机加工结束时间 = response.data[i].机加工结束时间.split(' ')[0]
// response.data[i].计划日期 = response.data[i].计划日期.split(' ')[0]
// }
// this.tableData2 = response.data
// }
// }).then(() => {
// this.loading2 = false
// })
}) })
} }
}, },