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:
bryan sun
2019-12-25 17:52:44 +08:00
parent 44dd68f62e 56769837a2
commit 5a063d752d
8 changed files with 46 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/ManufacturingCenter/DiscardedPartsInquiry.js
View File

@@ -41,7 +41,7 @@ export function searchTable(entryValue, machineValue, check2, GroupNumValue, che
data: { data: {
type: '1', type: '1',
name: '车间生产管理工艺_传递后_零件报废补投_查询数据_综合查询', name: '车间生产管理工艺_传递后_零件报废补投_查询数据_综合查询',
param: '项目流水号_check=1&项目流水号=' + entryValue + '&机床流水号_check=1&机床流水号=' + machineValue + '&组件流水号_check=' + check2 + '&组件流水号=' + GroupNumValue + '&组件零件基本件流水号_check=0&工艺计划流水号_check=0&工艺计划流水号_补投前_check=0&零件图号_check=' + check3 + '&零件图号=' + PartDrawingNumber, param: '项目流水号_check=0&项目流水号=' + entryValue + '&机床流水号_check=1&机床流水号=' + machineValue + '&组件流水号_check=' + check2 + '&组件流水号=' + GroupNumValue + '&组件零件基本件流水号_check=0&工艺计划流水号_check=0&工艺计划流水号_补投前_check=0&零件图号_check=' + check3 + '&零件图号=' + PartDrawingNumber,
pagination: pageCurrent + '&' + pageSize pagination: pageCurrent + '&' + pageSize
} }
}) })

4
src/router/index.js
View File

@@ -33,10 +33,6 @@ export const constantRouterMap = [
path: 'http://192.168.1.231:8005/#/TVF', path: 'http://192.168.1.231:8005/#/TVF',
meta: { title: '设备运行监控', icon: 'MaterialManagement' } meta: { title: '设备运行监控', icon: 'MaterialManagement' }
}, },
{
path: 'http://192.168.1.231:8005/#/TVA',
meta: { title: 'MES工作站', icon: 'MaterialManagement' }
},
{ {
path: 'http://192.168.1.231:8005/#/TVD', path: 'http://192.168.1.231:8005/#/TVD',
meta: { title: '设备状态监控', icon: 'MaterialManagement' } meta: { title: '设备状态监控', icon: 'MaterialManagement' }

6
src/utils/request.js
View File

@@ -17,8 +17,8 @@ export const uploadInvoiceScan1 = `http://192.168.1.231:8411/submit/uploadInvoic
export const download = `http://192.168.1.231:8411/submit/downloadFile.ashx` // ContractInformationManagement export const download = `http://192.168.1.231:8411/submit/downloadFile.ashx` // ContractInformationManagement
export const uploadPerson = `http://192.168.1.231:8411/submit/uploadPerson.ashx` export const uploadPerson = `http://192.168.1.231:8411/submit/uploadPerson.ashx`
export const uploadOP = `http://192.168.1.231:8411/submit/uploadOP.ashx` export const uploadOP = `http://192.168.1.231:8411/submit/uploadOP.ashx`
export const url = `http://192.168.0.104:8079/submit/MESCommonBase.ashx` // 采购件入库、离线件入库 export const url = `http://192.168.1.231:8411/submit/MESCommonBase.ashx` // 采购件入库、离线件入库
export const ExcelDownLoad = 'http://192.168.0.104:8079/submit/downloadFile.ashx' // 导出excel export const ExcelDownLoad = 'http://192.168.1.231:8411/submit/downloadFile.ashx' // 导出excel
// 技术中心程序发布时要更改下面所有的IP到0段 // 技术中心程序发布时要更改下面所有的IP到0段
export const ServerIP = `http://192.168.1.231:8411/webpage/file/` export const ServerIP = `http://192.168.1.231:8411/webpage/file/`
export const uploadFileMachine = `http://192.168.1.231:8411/submit/uploadFileMachine.ashx` // 机床总图 发布时改成0.231 export const uploadFileMachine = `http://192.168.1.231:8411/submit/uploadFileMachine.ashx` // 机床总图 发布时改成0.231
@@ -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.0.104:8079/submit/MESCommonBase.ashx`, baseURL: `http://192.168.0.110:8002/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间 timeout: 1500000 // 请求超时时间
}) })
export default service export default service

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

@@ -21,7 +21,7 @@
<!--:value="item.value"/>--> <!--:value="item.value"/>-->
<!--</el-select>--> <!--</el-select>-->
<span>机床图号:</span> <span>机床图号:</span>
<el-select v-model="machineNameValue" placeholder="机床号" style="margin-right: 10px; width: 150px" size="small" clearable @change="machineChange"> <el-select v-model="machineNameValue" placeholder="机床号" style="margin-right: 10px; width: 150px" size="small" filterable clearable @change="machineChange">
<el-option <el-option
v-for="item in machineName" v-for="item in machineName"
:key="item.value" :key="item.value"
@@ -326,6 +326,7 @@ export default {
this.check3 = 0 this.check3 = 0
} }
searchTable(this.entryNameValue, this.machineValue, this.check2, this.GroupNumValue, this.check3, this.PartDrawingNumber, this.pageCurrent, this.pageSize).then(response => { searchTable(this.entryNameValue, this.machineValue, this.check2, this.GroupNumValue, this.check3, this.PartDrawingNumber, this.pageCurrent, this.pageSize).then(response => {
console.log(response.data)
this.tableData = response.data.rows this.tableData = response.data.rows
this.total = response.data.total this.total = response.data.total
this.listLoading = false this.listLoading = false

34
src/views/ManufacturingCenter/InventoryQuery/index.vue
View File

@@ -10,7 +10,7 @@
<!-- <el-button type="primary" icon="el-icon-edit" size="small" @click="addMaterial()">新增</el-button>--> <!-- <el-button type="primary" icon="el-icon-edit" size="small" @click="addMaterial()">新增</el-button>-->
</el-row> </el-row>
</div> </div>
<el-table :data="tableData1" stripe highlight-current-row border height="600px" style="width: 790px" size="mini"> <el-table :data="tableData1" stripe highlight-current-row border height="600px" style="width: 639px" size="mini">
<el-table-column label="名称" prop="物料名称" align="center" width="150" show-overflow-tooltip> <el-table-column label="名称" prop="物料名称" align="center" width="150" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料名称 }} {{ scope.row.物料名称 }}
@@ -26,21 +26,21 @@
{{ scope.row.物料规格 }} {{ scope.row.物料规格 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="物料来源" prop="物料来源" align="center" width="80"> <!--<el-table-column label="物料来源" prop="物料来源" align="center" width="80">-->
<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" min-width="90">--> <!--&lt;!&ndash; <el-table-column label="仓库" prop="仓库名称" align="center" min-width="90">&ndash;&gt;-->
<!-- <template slot-scope="scope">--> <!--&lt;!&ndash; <template slot-scope="scope">&ndash;&gt;-->
<!-- {{ scope.row.仓库名称 }}--> <!--&lt;!&ndash; {{ scope.row.仓库名称 }}&ndash;&gt;-->
<!-- </template>--> <!--&lt;!&ndash; </template>&ndash;&gt;-->
<!-- </el-table-column>--> <!--&lt;!&ndash; </el-table-column>&ndash;&gt;-->
<el-table-column label="货位" prop="货位名称" align="center" width="80"> <!--<el-table-column label="货位" prop="货位名称" align="center" width="80">-->
<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" width="100" prop="货位存量"> <el-table-column label="货位存量" align="center" width="100" prop="货位存量">
<template slot-scope="scope"> <template slot-scope="scope">
<template v-if="scope.row.changeValue"> <template v-if="scope.row.changeValue">
@@ -220,7 +220,7 @@ export default {
method: 'post', method: 'post',
data: { data: {
type: '1', type: '1',
name: `库存管理_库存盘点_物料货位数量_查询数据`, name: `库存管理_库存盘点_物料货位数量_查询数据_新`,
param: `物料名称_check=${check1}&物料名称=${this.materialName}&物料规格_check=${check2}&物料规格=${this.materialSpec}&物料型号_check=${check3}&物料型号=${this.materialModel}`, param: `物料名称_check=${check1}&物料名称=${this.materialName}&物料规格_check=${check2}&物料规格=${this.materialSpec}&物料型号_check=${check3}&物料型号=${this.materialModel}`,
Pagination: this.pageCurrent + '&' + this.pageSize Pagination: this.pageCurrent + '&' + this.pageSize
} }

1
src/views/ManufacturingCenter/ManHourAnalysis/index.vue
View File

@@ -142,6 +142,7 @@ export default {
this.search2() this.search2()
this.search4() this.search4()
this.search5() this.search5()
this.search6()
}, },
methods: { methods: {
fetchData() { fetchData() {

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

@@ -327,18 +327,28 @@ export default {
}, },
// 保存行价格 // 保存行价格
saveRowPrice() { saveRowPrice() {
this.count = 0
for (let i = 0; i < this.tableData2.length; i++) {
if (this.checkBox[i] === false) {
this.count = this.count + 1
}
}
if (this.tableData2.length === 0) { if (this.tableData2.length === 0) {
this.$message.error('请选择零件') this.$message.error('请选择零件')
} else { } else {
this.a = 0 if (this.count !== this.tableData2.length) {
for (let i = 0; i < this.tableData2.length; i++) { this.a = 0
saveRowPrice(this.tableData2[i].工序流水号, 0, this.tableData2[i].工艺计划流水号, 0).then(response => { for (let i = 0; i < this.tableData2.length; i++) {
this.a += parseInt(response.data[0].result) saveRowPrice(this.tableData2[i].工序流水号, 0, this.tableData2[i].工艺计划流水号, 0).then(response => {
if (this.a === this.tableData2.length) { this.a += parseInt(response.data[0].result)
this.$message.success('保存成功') if (this.a === this.tableData2.length) {
this.searchTable() this.$message.success('保存成功')
} this.searchTable()
}) }
})
}
} else {
this.$message.error('请选择需要外协工序')
} }
} }
}, },

6
src/views/TechnologyCenter/PartDrawingMaintenance/index.vue
View File

@@ -2,7 +2,7 @@
<div> <div>
<el-card> <el-card>
<span>项目名称</span> <span>项目名称</span>
<el-select v-model="projectValue" placeholder="请选择项目名称" filterable size="small" style="width: 185px"> <el-select v-model="projectValue" placeholder="请选择项目名称" clearable filterable size="small" style="width: 185px">
<el-option <el-option
v-for="item in project" v-for="item in project"
:key="item.value" :key="item.value"
@@ -10,7 +10,7 @@
:value="item.value"/> :value="item.value"/>
</el-select> </el-select>
<span>机床图号</span> <span>机床图号</span>
<el-select v-model="machineValue" placeholder="请选择机床图号" filterable size="small" style="width: 185px"> <el-select v-model="machineValue" placeholder="请选择机床图号" clearable filterable size="small" style="width: 185px">
<el-option <el-option
v-for="item in machine" v-for="item in machine"
:key="item.value" :key="item.value"
@@ -18,7 +18,7 @@
:value="item.value"/> :value="item.value"/>
</el-select> </el-select>
<span>组号</span> <span>组号</span>
<el-select v-model="groupValue" placeholder="请选择组号" filterable size="small" style="width: 100px"> <el-select v-model="groupValue" placeholder="请选择组号" clearable filterable size="small" style="width: 100px">
<el-option <el-option
v-for="item in group" v-for="item in group"
:key="item.value" :key="item.value"