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-12-03 18:01:32 +08:00
parent 266a82f423 f6908d87cc
commit ad1a5d749f
3 changed files with 358 additions and 321 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 MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx`
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 // 请求超时时间
})
export default service

75
src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue
View File

@@ -23,15 +23,14 @@
<el-col style="width: 450px">
<el-card>
<el-table :data="tableData1" style="height: 670px" highlight-current-row border>
<el-table-column type="index" label="序号" width="50"/>
<el-table-column align="center" label="工序名" width="150">
<el-table-column align="center" label="工序名" width="110">
<template slot-scope="scope">
{{ scope.row.工艺名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="操作者" width="120">
<el-table-column align="center" label="操作者" width="100">
<template slot-scope="scope">
{{ scope.row.员工姓名 }}
{{ scope.row.员工姓名 === '超级管理员' && scope.row.工序状态 !== 4 ? '' : scope.row.员工姓名 }}
</template>
</el-table-column>
<el-table-column align="center" label="数量" show-overflow-tooltip min-width="90">
@@ -39,24 +38,31 @@
{{ scope.row.投产数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="工序状态" show-overflow-tooltip min-width="90">
<template slot-scope="scope">
{{ scope.row.工序状态 === 4 ? '已完成' : '未完成' }}
</template>
</el-table-column>
</el-table>
</el-card>
</el-col>
<el-col style="width:600px">
<el-col style="width:1000px">
<el-card>
<span>机床图号：{{ 机床图号 }} 机床名称：{{ 机床名称 }}</span>
<div style="margin: 10px 0 0 50px;height: 300px;overflow: auto">
<div style="margin: 10px 0 0 20px;height: 650px;overflow: auto">
<el-tree
:data="departmentData"
:props="defaultProps"
:indent="80"
:indent="50"
:expand-on-click-node="false"
:render-content="renderContent"
node-key="机床流水号"
class="selectTree"
default-expand-all
@node-click="onClick"/>
</div>
</el-card>
<el-card style="height: 350px">
<el-card v-if="false" style="height: 350px">
<el-table :data="tableData2" height="300" highlight-current-row border @row-click="searchTable1">
<el-table-column type="index" label="序号" width="50"/>
<el-table-column align="center" label="图号及规格" width="220">
@@ -157,8 +163,11 @@ export default {
firstLevel.children = []
for (let j = 0; j < response.data.length; j++) {
firstLevel.children.push({
label: (response.data[j].零件图号 ? response.data[j].零件图号 : '无零件图号') + '\xa0\xa0\xa0\xa0\xa0\xa0' + (response.data[j].规格 ? response.data[j].规格 : '') + '\xa0\xa0\xa0\xa0\xa0\xa0' + (response.data[j].投产总数量 ? response.data[j].投产总数量 : '') + '..........' + (response.data[j].零件名称 ? response.data[j].零件名称 : '无零件名称'),
label: (response.data[j].零件图号 ? response.data[j].零件图号 : '无零件图号') + '\xa0\xa0\xa0\xa0\xa0\xa0' + (response.data[j].规格 ? response.data[j].规格 : '') + '\xa0\xa0\xa0\xa0\xa0\xa0' + (response.data[j].投产总数量 ? response.data[j].投产总数量 : '') + '..........' + (response.data[j].零件名称 ? response.data[j].零件名称 : '无零件名称') + (response.data[j].零件类型 === 1 ? '' : '\xa0\xa0\xa0\xa0\xa0\xa0外购'),
value: response.data[j].工艺计划流水号,
考核状态: response.data[j].考核状态,
采购状态: response.data[j].采购状态,
零件类型: response.data[j].零件类型,
father: false
})
}
@@ -171,14 +180,40 @@ export default {
onClick(num) {
this.tableData1 = []
this.tableData2 = []
if (num.father === true) {
selectParts(1, num.value, 0, 0).then(response => {
this.tableData2 = response.data
if (num.father === false) {
if (num.零件类型 === 1) {
selectProcedure(num.value).then(response => {
this.tableData1 = response.data
})
}
}
// if (num.father === true) {
// selectParts(1, num.value, 0, 0).then(response => {
// this.tableData2 = response.data
// })
// } else {
// selectParts(0, 0, 1, num.value).then(response => {
// this.tableData2 = response.data
// })
// }
},
renderContent(h, { node, data, store }) {
if (node.data.father === false) {
if (node.data.零件类型 === 1) { // 自制
if (parseInt(node.data.考核状态) > 6) {
return (<span class='treeNotesComplate'>{node.label}</span>)
} else {
selectParts(0, 0, 1, num.value).then(response => {
this.tableData2 = response.data
})
return (<span class='treeNotesUnComplate'>{node.label}</span>)
}
} else { // 外购
if (node.data.采购状态 === '已完成') {
return (<span class='treeNotesComplate'>{node.label}</span>)
} else {
return (<span class='treeNotesUnComplate'>{node.label}</span>)
}
}
} else {
return (<span>{node.label}</span>)
}
},
searchTable1(row) {
@@ -196,5 +231,15 @@ export default {
.el-tree-node__content>.el-tree-node__expand-icon{
display: inline !important;
}
.el-tree-node:focus > .el-tree-node__content {
background-color: #ccc !important;
}
}
.treeNotesComplate {
color: black;
background-color: #67C23A;
}
.treeNotesUnComplate {
color: black;
}
</style>

18
src/views/MarketingCenter/ContractCapitalManagement/index.vue
View File

@@ -9,8 +9,6 @@
:label="item.label"
:value="item.value"/>
</el-select>
<!-- <span style="margin-left: 10px">营销经理：</span>-->
<!-- <el-input v-model="MarketingManagerValue" clearable size="small" style="width:200px" placeholder="请双击选择营销经理" @dblclick.native="openName" @clear="clear()"/>-->
<span>客户名称：</span>
<el-select v-model="customerName" filterable placeholder="客户名称" style="margin: 3px " size="small" clearable>
<el-option
@@ -20,12 +18,12 @@
:value="item.value"/>
</el-select>
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 30;PageCurrent = 1;tableData2=[];getTableData()">查询</el-button>
<!-- <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD('form2')">新增</el-button>-->
<el-badge :value="value" :max="99" class="item">
<el-button size="small" plain @click="AccountsReceivable">查看收款信息</el-button>
</el-badge>
</el-card>
<el-card>
<el-col :span="14">
<el-table
v-loading="listLoading"
:row-key="getRowKeys"
@@ -167,8 +165,8 @@
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
</div>
</el-card>
<el-card>
</el-col>
<el-col :span="10">
<el-table
v-loading="listLoading2"
:row-style="tableRowClassName1"
@@ -319,7 +317,9 @@
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
</el-col>
</el-card>
<!--新增合同资金对话框-->
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible2" title="新增合同收款计划" center width="380px">
<el-form ref="form2" :model="form2" :rules="rules" label-position="left">
@@ -411,14 +411,6 @@
<span>姓名：</span>
<el-input v-model="name" clearable size="small" style="width: 200px"/>
<el-button size="small" icon="el-icon-search" style="margin-left: 10px" type="success" @click="searchName">查询</el-button>
<!--<span>责权省份：</span>-->
<!--<el-select v-model="ProvinceValue" clearable filterable placeholder="请选择省份" style="margin-right: 10px" size="small" @change="changeProvince">-->
<!--<el-option-->
<!--v-for="item in Province"-->
<!--:key="item.value"-->
<!--:label="item.label"-->
<!--:value="item.value"/>-->
<!--</el-select>-->
<div style="margin-top: 15px">
<el-table :data="dataPeople" border stripe size="mini" style="width: 100%; text-align: center;margin-top: 15px" highlight-current-row @row-click="handleChange">
<el-table-column label="销售经理" align="center" >