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:
zhangdingyu
2019-03-12 16:09:49 +08:00
parent 26d729f497 5759ace0e4
commit 10def64124
4 changed files with 50 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,14 +34,14 @@ export function getGroups(stepNumber) {
})
}
export function getTable(stepNumber, a, b, c, d, e, f, g, pageCurrent, pageSize) {
export function getTable(stepNumber, a, b, c, d, e, f, g, h, i, j, k, pageCurrent, pageSize) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_零件工序_查询数据_已编制工序的全部零件及工序_加工进度修改专用',
param: '项目流水号_check=' + stepNumber + '=string&项目流水号=' + a + '=string&机床流水号_check=' + b + '=string&机床流水号=' + c + '=string&组件流水号_check=' + d + '=string&组件流水号=' + e + '=string&零件图号_check=' + f + '=string&零件图号=' + g + '=string&是否查询全部数据=1=string&单件是否外协=0',
param: '项目流水号_check=' + stepNumber + '=string&项目流水号=' + a + '=string&机床流水号_check=' + b + '=string&机床流水号=' + c + '=string&组件流水号_check=' + d + '=string&组件流水号=' + e + '=string&零件图号_check=' + f + '=string&零件图号=' + g + '=string&是否查询全部数据=1=string&单件是否外协=0&开始时间_check=' + h + '&开始时间=' + i + '&结束时间_check=' + j + '&结束时间=' + k,
Pagination: pageCurrent + '&' + pageSize
}
})

2
src/utils/request.js
View File

@@ -3,7 +3,7 @@ import axios from 'axios'
// import store from '../store'
// import { getToken } from '@/utils/auth'
export const wsuri = `ws://192.168.1.231:61101//WebMoudule//websocket`
export const wsuri = `ws://192.168.1.232:61101//WebMoudule//websocket`
export const name = `OP8888`
// 创建axios实例

32
src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue
View File

@@ -24,6 +24,22 @@
</el-select>
<span>零件号:</span>
<el-input v-model="number" placeholder="零件号" clearable size="small" style="width: 200px;"/>
<span class="demonstration">计划下达时间:</span>
<el-date-picker
v-model="startTime"
value-format="yyyy-MM-dd"
size="small"
style="width: 160px"
type="date"
placeholder="选择日期"/>
<span class="demonstration">-</span>
<el-date-picker
v-model="endTime"
value-format="yyyy-MM-dd"
size="small"
style="width: 160px"
type="date"
placeholder="选择日期"/>
<el-button type="success" class="el-icon-search" size="small" style="margin: 10px 0 0 10px" @click="pageCurrent=1;pageSize=10;total = 0;getTableData();">查询</el-button>
</el-row>
</el-card>
@@ -366,6 +382,10 @@ export default {
person: '',
title: '',
Num: '',
startTime: '',
endTime: '',
startTime_check: 0,
endTime_check: 0,
form: {
人员: '',
考勤编号: '',
@@ -525,6 +545,16 @@ export default {
} else {
this.checkbox_number = true
}
if(this.startTime === '' || this.startTime === null) {
this.startTime_check = 0
} else {
this.startTime_check = 1
}
if(this.endTime === '' || this.endTime === null) {
this.endTime_check = 0
} else {
this.endTime_check = 1
}
this.tableData1 = []
this.零件图号 = []
this.零件名称 = []
@@ -538,7 +568,7 @@ export default {
this.colorCode = [[]]
this.realDate = [[]]
this.length = 0
getTable(this.checkbox_project, this.project, this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.checkbox_number, this.number, this.pageCurrent, this.pageSize).then(response => {
getTable(this.checkbox_project, this.project, this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.checkbox_number, this.number, this.startTime_check, this.startTime, this.endTime_check, this.endTime, this.pageCurrent, this.pageSize).then(response => {
if (response.data.rows.length === 0) {
this.listLoading1 = false
} else {

32
src/views/MarketingCenter/CRM/index.vue
View File

@@ -37,7 +37,7 @@
border>
<el-table-column align="center" label="序号" width="80">
<template slot-scope="scope">
<el-radio :label="scope.row.省份流水号" v-model="radio" @change.native="getCurrentRow(scope.row.省份流水号, scope.row.省份)"/>
<el-radio :label="scope.row.省份流水号" v-model="radio" @change="pageCurrent = 1;pageSize = 10;getCurrentRow(scope.row.省份流水号, scope.row.省份)"/>
</template>
</el-table-column>
<el-table-column align="center" label="地区">
@@ -53,7 +53,7 @@
<el-button type="text" icon="el-icon-circle-plus-outline" size="mini" @click="addMarketingManager();flag = 1">添加销售经理</el-button>
<span style="float: right">销售经理</span>
<el-table v-loading="loading3" :data="tableData3" height="192" style="width: 100%;margin-top: 10px" border>
<el-table-column label="责权省份" align="center" width="80">
<el-table-column label="责权省份" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.省份 }}
</template>
@@ -98,67 +98,67 @@
<el-button type="text" icon="el-icon-circle-plus-outline" size="mini" @click = "addCustomer();flag1 = 1">新增客户</el-button>
<span style="float: right">客户信息</span>
<el-table v-loading="loading2" :data="tableData2" height="400" style="width: 100%;margin-top: 10px" border>
<el-table-column label="省份" align="center" width="80px">
<el-table-column label="省份" align="center" min-width="80px">
<template slot-scope="scope">
{{ scope.row.省份 }}
</template>
</el-table-column>
<el-table-column label="客户名称" align="center" width="280">
<el-table-column label="客户名称" align="center" min-width="400">
<template slot-scope="scope">
{{ scope.row.客户名称 }}
</template>
</el-table-column>
<el-table-column label="联系人" align="center" width="100spx">
<el-table-column label="联系人" align="center" min-width="120">
<template slot-scope="scope">
{{ scope.row.联系人 }}
</template>
</el-table-column>
<el-table-column label="联系电话" align="center" width="192px">
<el-table-column label="联系电话" align="center" min-width="300">
<template slot-scope="scope">
{{ scope.row.电话 }}
</template>
</el-table-column>
<el-table-column label="开票电话" align="center" width="140px">
<el-table-column label="开票电话" align="center" min-width="200">
<template slot-scope="scope">
{{ scope.row.传真 }}
</template>
</el-table-column>
<el-table-column label="联系地址" align="center" width="200px">
<el-table-column label="联系地址" align="center" min-width="350">
<template slot-scope="scope">
{{ scope.row.地址 }}
</template>
</el-table-column>
<el-table-column label="电子邮箱" align="center" width="200px">
<el-table-column label="电子邮箱" align="center" min-width="250">
<template slot-scope="scope">
{{ scope.row.电子邮箱 }}
</template>
</el-table-column>
<el-table-column label="税号" align="center" width="100px">
<el-table-column label="税号" align="center" min-width="120">
<template slot-scope="scope">
{{ scope.row.税号 }}
</template>
</el-table-column>
<el-table-column label="开户行" align="center" width="200px">
<el-table-column label="开户行" align="center" min-width="200">
<template slot-scope="scope">
{{ scope.row.开户行 }}
</template>
</el-table-column>
<el-table-column label="银行账号" align="center" width="200px">
<el-table-column label="银行账号" align="center" min-width="260">
<template slot-scope="scope">
{{ scope.row.银行账号 }}
</template>
</el-table-column>
<el-table-column label="信誉等级" align="center" width="100px">
<el-table-column label="信誉等级" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.价值评估 }}
</template>
</el-table-column>
<el-table-column label="备注" align="center">
<el-table-column label="备注" align="center" min-width="350">
<template slot-scope="scope">
{{ scope.row.备注 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="200px" fixed="right">
<el-table-column label="操作" align="center" min-width="200px" fixed="right">
<template slot-scope="scope">
<el-button
size="mini"
@@ -348,7 +348,7 @@ export default {
radio: null, // 地区选择框
tableData2: [], // 客户表
pageCurrent: 1,
pageSize: 10,
pageSize: 40,
total: null,
AdressID: null, // 地区流水号
MarketingManagerValue: '', // 营销经理