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

Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0

Browse Source
This commit is contained in:
liushuai
2019-11-20 17:55:29 +08:00
parent 2eb1e0f1a1 ca0ccecf47
commit a6f0f43967
5 changed files with 171 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/utils/request.js
View File

@@ -26,7 +26,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil
export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx` export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx`
export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx` export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx`
const service = axios.create({ const service = axios.create({
baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`, baseURL: `http://192.168.0.110:8002/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间 timeout: 1500000 // 请求超时时间
}) })
export default service export default service

16
src/views/Outsourcing/InterBudgetaryBudgets/index.vue
View File

@@ -1,20 +1,11 @@
<template> <template>
<div> <div>
<el-card> <el-card>
<el-row> <el-row>
<el-radio-group v-show="false" v-model="radio" style="margin: 10px;" @change="radioChange"> <el-radio-group v-show="false" v-model="radio" style="margin: 10px;" @change="radioChange">
<el-radio :label="1">未编制</el-radio> <el-radio :label="1">未编制</el-radio>
<el-radio :label="2">已编制</el-radio> <el-radio :label="2">已编制</el-radio>
</el-radio-group> </el-radio-group>
<!--<span>项目名称:</span>-->
<!--<el-select v-model="entryNameValue" clearable filterable size="small" style="margin-bottom:10px" placeholder="项目名称" @change="typeChange()">-->
<!--<el-option-->
<!--v-for="item in entryName"-->
<!--:key="item.value"-->
<!--:label="item.label"-->
<!--:value="item.value"/>-->
<!--</el-select>-->
<span>机床名称:</span> <span>机床名称:</span>
<el-select v-model="toolNumValue" filterable clearable size="small" style="margin-top:10px;width: 220px" placeholder="机床号" @change="typeChange1()"> <el-select v-model="toolNumValue" filterable clearable size="small" style="margin-top:10px;width: 220px" placeholder="机床号" @change="typeChange1()">
<el-option <el-option
@@ -26,13 +17,6 @@
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div> <div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
</el-option> </el-option>
</el-select> </el-select>
<!--<el-select v-model="toolNumValue" clearable filterable size="small" placeholder="机床号" style="margin-bottom:10px" @change="typeChange1()">-->
<!--<el-option-->
<!--v-for="item in toolNum"-->
<!--:key="item.value"-->
<!--:label="item.label"-->
<!--:value="item.value"/>-->
<!--</el-select>-->
<span>分组:</span> <span>分组:</span>
<el-select v-model="NumValue" clearable filterable size="small" style="margin-bottom:10px" placeholder="机床组号"> <el-select v-model="NumValue" clearable filterable size="small" style="margin-bottom:10px" placeholder="机床组号">
<el-option <el-option

14
src/views/Outsourcing/OutFactoryMaintenance/index.vue
View File

@@ -3,10 +3,10 @@
<el-card> <el-card>
<span>厂家名称:</span> <span>厂家名称:</span>
<el-input v-model="ManufacturerName" clearable size="small" style="width:200px"/> <el-input v-model="ManufacturerName" clearable size="small" style="width:200px" @keyup.enter.native="pageCurrent=1;pageSize=50;searchTable()" @clear="pageCurrent=1;pageSize=50;searchTable()"/>
<span>电话:</span> <!--<span>电话:</span>-->
<el-input v-model="phNumber" size="small" clearable style="width:200px"/> <!--<el-input v-model="phNumber" size="small" clearable style="width:200px"/>-->
<el-button type="success" class="el-icon-search" size="small" @click="pageCurrent=1;pageSize=10;searchTable()">查询</el-button> <!--<el-button type="success" class="el-icon-search" size="small" @click="pageCurrent=1;pageSize=50;searchTable()">查询</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" class="el-icon-circle-plus-outline" size="small" @click="editType1('form');param = 0">新增</el-button> <el-button type="primary" class="el-icon-circle-plus-outline" size="small" @click="editType1('form');param = 0">新增</el-button>
</el-tooltip> </el-tooltip>
@@ -68,7 +68,7 @@
<el-pagination <el-pagination
v-if="!loading0" v-if="!loading0"
:current-page="pageCurrent" :current-page="pageCurrent"
:page-sizes="[10, 20, 30, 40]" :page-sizes="[50, 100]"
:page-size="pageSize" :page-size="pageSize"
:total="total" :total="total"
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next, jumper"
@@ -167,7 +167,7 @@ export default {
attention: '', // 关注 attention: '', // 关注
num11: '', num11: '',
tableData: [], // 表格数据 tableData: [], // 表格数据
pageSize: 10, pageSize: 50,
pageCurrent: 1, pageCurrent: 1,
total: 0, total: 0,
CoManufacturerFlowNumber: '', // 外协厂家流水号 CoManufacturerFlowNumber: '', // 外协厂家流水号
@@ -302,7 +302,7 @@ export default {
type: 'success' type: 'success'
}) })
this.pageCurrent = 1 this.pageCurrent = 1
this.pageSize = 10 this.pageSize = 50
this.searchTable() this.searchTable()
} else { } else {
this.$message.error('信息增加失败') this.$message.error('信息增加失败')

7
src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
View File

@@ -56,12 +56,7 @@
</el-card> </el-card>
<el-card> <el-card>
<el-table v-loading="loading" :data="tableData" height="580" size="mini" stripe style="width: 100%;" border highlight-current-row element-loading-text="拼命加载中" @row-click="getParts"> <el-table v-loading="loading" :data="tableData" height="580" size="mini" stripe style="width: 100%;" border highlight-current-row element-loading-text="拼命加载中" @row-click="getParts">
<el-table-column <el-table-column label="序号" type="index" align="center" fixed="left" width="50"/>
label="序号"
type="index"
align="center"
fixed="left"
width="50"/>
<el-table-column label="付款状态" prop="实际付款时间" width="100" align="center" fixed="left"> <el-table-column label="付款状态" prop="实际付款时间" width="100" align="center" fixed="left">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="scope.row.实际付款时间!==''" type="success" size="small">已付</el-tag> <el-tag v-if="scope.row.实际付款时间!==''" type="success" size="small">已付</el-tag>

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

@@ -1,17 +1,8 @@
<template> <template>
<div> <div>
<el-col :span="10">
<el-card> <el-card>
<el-row> <el-select v-model="toolNumValue" filterable clearable size="small" style="margin-top:10px;width: 150px" placeholder="机床号" @change="typeChange1()">
<!--<span>项目名称:</span>-->
<!--<el-select v-model="entryNameValue" clearable filterable size="small" style="margin-bottom:10px" placeholder="项目名称" @change="typeChange()">-->
<!--<el-option-->
<!--v-for="item in entryName"-->
<!--:key="item.value"-->
<!--:label="item.label"-->
<!--:value="item.value"/>-->
<!--</el-select>-->
<span>机床名称:</span>
<el-select v-model="toolNumValue" filterable clearable size="small" style="margin-top:10px;width: 220px" placeholder="机床号" @change="typeChange1()">
<el-option <el-option
v-for="item in toolNum" v-for="item in toolNum"
:key="item.value" :key="item.value"
@@ -21,55 +12,42 @@
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div> <div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
</el-option> </el-option>
</el-select> </el-select>
<!--<el-select v-model="toolNumValue" clearable filterable size="small" placeholder="机床号" style="margin-bottom:10px" @change="typeChange1()">--> <el-select v-model="NumValue" clearable filterable size="small" style="margin-bottom:10px;width: 100px" placeholder="组号">
<!--<el-option-->
<!--v-for="item in toolNum"-->
<!--:key="item.value"-->
<!--:label="item.label"-->
<!--:value="item.value"/>-->
<!--</el-select>-->
<span>分组:</span>
<el-select v-model="NumValue" clearable filterable size="small" style="margin-bottom:10px" placeholder="机床组号">
<el-option <el-option
v-for="item in Num" v-for="item in Num"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value"/> :value="item.value"/>
</el-select> </el-select>
<span>零件图号:</span> <el-input v-model="partName" placeholder="零件图号" size="small" clearable style="width:150px"/>
<el-input v-model="partName" placeholder="零件图号" size="small" clearable style="width:200px"/> <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="success" style="margin-left: 10px" @click="pageSize1=10; 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-row>
</el-card>
<el-card>
<el-table v-loading="loading1" :data="tableData1" size="mini" highlight-current-row stripe height="450px" style="width: 100%;" border element-loading-text="拼命加载中" @row-click="searchTable2">
<el-table-column <el-table-column
label="序号" label="序号"
type="index" type="index"
align="center" align="center"
width="50"/> width="50"/>
<el-table-column label="零件图号" prop="零件图号" align="center" width="220px"> <el-table-column label="零件图号" prop="零件图号" align="center" width="140px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件图号 }} {{ scope.row.零件图号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="零件名称" prop="零件名称" align="center" width="220px"> <el-table-column label="零件名称" prop="零件名称" align="center" width="140px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件名称 }} {{ scope.row.零件名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="材料" prop="材料" align="center"> <el-table-column label="材料" prop="材料" align="center" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.材料 }} {{ scope.row.材料 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="种类" prop="零件类型名臣" align="center" width="220px"> <!--<el-table-column label="种类" prop="零件类型名臣" align="center" width="80px">-->
<template slot-scope="scope"> <!--<template slot-scope="scope">-->
{{ scope.row.零件类型名称 }} <!--{{ scope.row.零件类型名称 }}-->
</template> <!--</template>-->
</el-table-column> <!--</el-table-column>-->
<el-table-column label="投产数量" align="center"> <el-table-column label="数量" align="center" width="60px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.批次数量 }} {{ scope.row.批次数量 }}
</template> </template>
@@ -79,27 +57,25 @@
<el-pagination <el-pagination
v-if="!loading1" v-if="!loading1"
:current-page="pageCurrent1" :current-page="pageCurrent1"
:page-sizes="[10, 20, 30, 40]"
:page-size="pageSize1" :page-size="pageSize1"
:total="total1" :total="total1"
layout="total, sizes, prev, pager, next, jumper" :pager-count="5"
layout="total, prev, pager, next, jumper"
@size-change="handleSizeChange1" @size-change="handleSizeChange1"
@current-change="handleCurrentChange1"/> @current-change="handleCurrentChange1"/>
</div> </div>
</el-card> </el-card>
</el-col>
<el-col :span="14">
<el-card> <el-card>
<el-table v-loading="loading2" :data="tableData2" height="450" style="width: 100%;" border stripe element-loading-text="拼命加载中" size="small"> <el-table v-loading="loading2" :data="tableData2" :row-class-name="tableData1ClassName" height="635" style="width: 100%;" border element-loading-text="拼命加载中" size="small">
<el-table-column <el-table-column label="序号" type="index" align="center" width="50"/>
label="序号" <el-table-column label="加工状态" width="100" align="center">
type="index"
align="center"
width="50"/>
<el-table-column label="加工状态" width="75" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="parseInt(scope.row.工序状态)===3" type="success" size="small">未加工</el-tag> <span v-if="parseInt(scope.row.工序状态)===3" type="success" size="small">未加工</span>
<el-tag v-if="parseInt(scope.row.工序状态)===4&&parseInt(scope.row.工艺编号)!==29" size="small">已完成</el-tag> <span v-if="parseInt(scope.row.工序状态)===4&&parseInt(scope.row.工艺编号)!==29" size="small">已完成</span>
<el-tag v-if="parseInt(scope.row.工艺编号)===29" size="small">备料</el-tag> <span v-if="parseInt(scope.row.工艺编号)===29" size="small">备料</span>
<el-tag v-if="parseInt(scope.row.工序状态)===5" size="small">停产</el-tag> <span v-if="parseInt(scope.row.工序状态)===5" size="small">停产</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="是否外协" width="75" align="center"> <el-table-column label="是否外协" width="75" align="center">
@@ -107,33 +83,18 @@
<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="75" align="center"> <!--<el-table-column label="外协状态" width="100" align="center">-->
<template slot-scope="scope"> <!--<template slot-scope="scope">-->
<el-tag v-if="parseInt(scope.row.工序间是否外协)===2" type="success" size="small">是</el-tag> <!--<span v-if="parseInt(scope.row.工序间是否外协)===2" type="success" size="small">是</span>-->
<el-tag v-else size="small">否</el-tag> <!--<span v-else size="small">否</span>-->
</template> <!--</template>-->
</el-table-column> <!--</el-table-column>-->
<el-table-column label="工艺名称" align="center" width="120px"> <el-table-column label="工艺名称" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.工艺名称 }} {{ scope.row.工艺名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="工艺要求" align="center" min-width="300"> <el-table-column label="工序计划" align="center" width="100px">
<template slot-scope="scope">
<el-input v-model="scope.row.工艺要求" :autosize="{ minRows: 1, maxRows: 1}" size="mini" readonly type="textarea"/>
</template>
</el-table-column>
<el-table-column label="机加工计划开始" align="center" width="105px">
<template slot-scope="scope">
{{ scope.row.机加工开始时间 }}
</template>
</el-table-column>
<el-table-column label="机加工计划结束" align="center" width="105px">
<template slot-scope="scope">
{{ scope.row.机加工结束时间 }}
</template>
</el-table-column>
<el-table-column label="工序计划" align="center" width="85px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.计划日期 }} {{ scope.row.计划日期 }}
</template> </template>
@@ -145,6 +106,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-card> </el-card>
</el-col>
</div> </div>
</template> </template>
@@ -161,6 +123,7 @@ export default {
Num: [], // 分组 Num: [], // 分组
count: 0, // 计数器 (表二是否有外协工序) count: 0, // 计数器 (表二是否有外协工序)
InOut: 1, // 工序间是否外协变量 1自家 2外协 InOut: 1, // 工序间是否外协变量 1自家 2外协
index: 0, // 当前点击行（改变颜色不刷新用）
num1: '', num1: '',
checkBox: [], checkBox: [],
loading1: false, loading1: false,
@@ -170,7 +133,7 @@ export default {
tableData1: [], // 表格数据 tableData1: [], // 表格数据
tableData2: [], tableData2: [],
total1: null, // 总条数 total1: null, // 总条数
pageSize1: 10, // 每页显示条数 pageSize1: 50, // 每页显示条数
pageCurrent1: 1 pageCurrent1: 1
} }
}, },
@@ -254,10 +217,6 @@ export default {
this.checkBox = [] this.checkBox = []
this.tableData2 = [] this.tableData2 = []
searchTable2(row.工艺计划流水号).then(response => { searchTable2(row.工艺计划流水号).then(response => {
for (let i = 0; i < response.data.length; i++) {
console.log(response.data[i].工序顺序)
}
console.log(response.data, 1111111)
this.num1 = row.工艺计划流水号 this.num1 = row.工艺计划流水号
if (response.data.length === 0) { if (response.data.length === 0) {
this.loading0 = false this.loading0 = false
@@ -280,9 +239,19 @@ export default {
this.loading2 = false this.loading2 = false
}) })
}, },
tableData1ClassName({ row, rowIndex }) {
row.index = rowIndex
if (row.工序间是否外协 === 2) {
return 'XJWXwx'
}
if (parseInt(row.工序状态) !== 3 || parseInt(row.工艺编号) === 29) {
return 'XJWXywc'
}
},
// 修改外协状态 // 修改外协状态
edit(index, row) { edit(index, row) {
this.count = 0 this.count = 0
this.index = row.index
for (let i = 0; i < this.tableData2.length; i++) { for (let i = 0; i < this.tableData2.length; i++) {
if (this.checkBox[i] === false) { if (this.checkBox[i] === false) {
this.count = this.count + 1 this.count = this.count + 1
@@ -296,68 +265,62 @@ export default {
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.$message.success('工序外协状态更改成功')
this.loading2 = true this.tableData2[this.index].工序间是否外协 = 2
this.checkBox = [] // this.loading2 = true
this.tableData2 = [] // this.checkBox = []
searchTable2(this.num1).then(response => { // this.tableData2 = []
for (let i = 0; i < response.data.length; i++) { // searchTable2(this.num1).then(response => {
console.log(response.data[i].工序顺序) // if (response.data.length === 0) {
} // this.loading0 = false
console.log(response.data, 1111111) // } else {
if (response.data.length === 0) { // for (let i = 0; i < response.data.length; i++) {
this.loading0 = false // if (response.data[i].工序间是否外协 === 1) {
} else { // this.checkBox.push(false)
for (let i = 0; i < response.data.length; i++) { // } else {
if (response.data[i].工序间是否外协 === 1) { // this.checkBox.push(true)
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]
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
response.data[i].计划日期 = response.data[i].计划日期.split(' ')[0] // }
} // }).then(() => {
this.tableData2 = response.data // this.loading2 = false
} // })
}).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.$message.success('工序外协状态更改成功')
this.loading2 = true this.tableData2[this.index].工序间是否外协 = 1
this.checkBox = [] // this.loading2 = true
this.tableData2 = [] // this.checkBox = []
searchTable2(this.num1).then(response => { // this.tableData2 = []
for (let i = 0; i < response.data.length; i++) { // searchTable2(this.num1).then(response => {
console.log(response.data[i].工序顺序) // if (response.data.length === 0) {
} // this.loading0 = false
console.log(response.data, 1111111) // } else {
if (response.data.length === 0) { // for (let i = 0; i < response.data.length; i++) {
this.loading0 = false // if (response.data[i].工序间是否外协 === 1) {
} else { // this.checkBox.push(false)
for (let i = 0; i < response.data.length; i++) { // } else {
if (response.data[i].工序间是否外协 === 1) { // this.checkBox.push(true)
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]
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
response.data[i].计划日期 = response.data[i].计划日期.split(' ')[0] // }
} // }).then(() => {
this.tableData2 = response.data // this.loading2 = false
} // })
}).then(() => {
this.loading2 = false
})
}) })
} }
}, },
@@ -388,6 +351,13 @@ export default {
</style> </style>
<style> <style>
.el-table .waixie { .el-table .waixie {
background: #AEF199; background: #AEF199 !important;
} }
.XJWXwx{
background: #9bd7fc !important;
}
.XJWXywc{
background: #AEF199 !important;
}
</style> </style>