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-03-27 10:46:57 +08:00
parent 4007800ad1 1938b741b2
commit 8b062b17e3
9 changed files with 146 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/api/Inventory/StockInquiry.js Normal file
View File

@@ -0,0 +1,37 @@
import request from '@/utils/request'
// 初始化项目
export function initProject() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: 'PDM_项目名称_查询数据_按时间排序'
}
})
}
// 机床查询
export function searchmachine(check, num) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: 'PDM_机床名称_查询数据',
param: '项目流水号_check=' + check + '=int&项目流水号=' + num
}
})
}
// 分组查询
export function searchTeam(machineNumber) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: 'PDM_组件名称_查询数据',
param: '机床流水号=' + machineNumber
}
})
}

6
src/api/ManufacturingCenter/machiningHoursStatistics.js
View File

@@ -7,8 +7,8 @@ export function searchtable(num1, num2, num3, num4, num5, pageCurrent, pageSize)
method: 'post', method: 'post',
data: { data: {
type: '1', type: '1',
name: '车间生产管理工艺_工时统计_查询数据', name: '车间生产管理工艺_工时统计_查询数据2',
param: '操作者_check=' + num1 + '&操作者=' + num2 + '&时间_check=' + num3 + '&开始时间=' + num4 + '&结束时间=' + num5, param: '操作者_check=' + num1 + '&姓名=' + num2 + '&时间_check=' + num3 + '&开始时间=' + num4 + '&结束时间=' + num5,
Pagination: pageCurrent + '&' + pageSize Pagination: pageCurrent + '&' + pageSize
} }
}) })
@@ -20,7 +20,7 @@ export function searchtable2(num1, num2, num3, num4, pageCurrent, pageSize) {
method: 'post', method: 'post',
data: { data: {
type: '1', type: '1',
name: '车间生产管理工艺_工时统计按人员查询_查询数据', name: '车间生产管理工艺_工时统计按人员查询_查询数据2',
param: '工作者编号=' + num1 + '&时间_check=' + num2 + '&开始时间=' + num3 + '&结束时间=' + num4, param: '工作者编号=' + num1 + '&时间_check=' + num2 + '&开始时间=' + num3 + '&结束时间=' + num4,
Pagination: pageCurrent + '&' + pageSize Pagination: pageCurrent + '&' + pageSize
} }

1
src/icons/svg/StockInquiry.svg Normal file
View File

@@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1553579626916" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2009" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M65.344 944.64l893.312 0 0 72.064-893.312 0 0-72.064Z" p-id="2010"></path><path d="M838.016 40 185.984 40c-70.656 0-128 57.344-128 128l0 531.968c0 70.656 57.344 128 128 128l652.032 0c70.656 0 128-57.344 128-128L966.016 168C966.016 97.344 908.672 40 838.016 40zM832 486.656l-60.032 0 0 193.344L254.976 680 256 486.656 192 486.656 192 416l325.312-275.968L832 428.032 832 486.656z" p-id="2011"></path><path d="M512 266.304 316.032 436.288 316.032 620.352 446.72 620.352 446.72 494.976 577.344 494.976 577.344 620.352 707.968 620.352 707.968 436.288Z" p-id="2012"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 959 B

11
src/styles/element-ui.scss
View File

@@ -27,3 +27,14 @@
} }
} }
} }
//.el-table td, .el-table th.is-leaf{
// border-bottom: 1px solid DarkGray;
// border-left: 1px solid DarkGray;
// border-top: 1px solid DarkGray;
// border-right: 1px solid DarkGray;
//}
.el-textarea__inner,
.el-radio__inner,
.el-input__inner{
border: 1px solid rgb(49, 56, 72)!important;
}

0
src/views/Inventory/StockInquiry/index.vue Normal file
View File

60
src/views/ManufacturingCenter/machiningHoursStatistics/index.vue
View File

@@ -25,21 +25,21 @@
</el-row> </el-row>
</el-card> </el-card>
<el-card> <el-card>
<el-col :span="7"> <el-col :span="6">
<el-table v-loading="loading" :data="tableData" highlight-current-row height="580" style="width: 100%;" border element-loading-text="拼命加载中" @row-click="searchTable2"> <el-table v-loading="loading" :data="tableData" highlight-current-row height="580" style="width: 100%;" border element-loading-text="拼命加载中" @row-click="searchTable2">
<el-table-column <el-table-column label="操作者" align="center" width="110px">
label=" "
type="index"
align="center"
width="50"/>
<el-table-column label="操作者" align="center" width="150px">
<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">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.工人总工时 }} {{ scope.row.理论加工时间段 }}
</template>
</el-table-column>
<el-table-column label="实际工时" align="center">
<template slot-scope="scope">
{{ scope.row.实际加工时间段 }}
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -54,36 +54,41 @@
@current-change="handleCurrentChange"/> @current-change="handleCurrentChange"/>
</div> </div>
</el-col> </el-col>
<el-col :span="16" style="margin-left: 30px;"> <el-col :span="17" style="margin-left: 30px;">
<el-table v-loading="loading2" :data="tableData2" height="580" style="width: 100%;" border element-loading-text="拼命加载中"> <el-table v-loading="loading2" :data="tableData2" height="580" style="width: 100%;" border element-loading-text="拼命加载中">
<el-table-column
label=" "
type="index"
align="center"
width="50"/>
<el-table-column label="零件图号" align="center" width="150px"> <el-table-column label="零件图号" align="center" width="150px">
<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="150px"> <el-table-column label="零件名称" align="center" width="130px">
<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="150px"> <el-table-column label="工艺名称" align="center" width="120px">
<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="150px"> <el-table-column label="完成数量" align="center" width="100px">
<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="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.完成日期 }} {{ scope.row.理论加工时间段 }}
</template>
</el-table-column>
<el-table-column label="实际工时" align="center" width="100px">
<template slot-scope="scope">
{{ scope.row.实际加工时间段 }}
</template>
</el-table-column>
<el-table-column label="完成时间" align="center">
<template slot-scope="scope">
{{ scope.row.加工完成时间 }}
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -160,14 +165,12 @@ export default {
this.loading2 = true this.loading2 = true
this.tableData2 = [] this.tableData2 = []
this.pageCurrent2 = 1 this.pageCurrent2 = 1
this.gongzuozhebianhao = row.工作者编号 this.gongzuozhebianhao = row.人员编号
searchtable2(row.工作者编号, this.timeCheck, this.startTime, this.endTime, this.pageCurrent2, this.pageSize2).then(response => { searchtable2(row.人员编号, this.timeCheck, this.startTime, this.endTime, this.pageCurrent2, this.pageSize2).then(response => {
if (response.data.total === 0) { if (response.data.total === 0) {
this.loading2 = false this.loading2 = false
} else { } else {
for (let i = 0; i < response.data.rows.length; i++) { console.log(response.data)
response.data.rows[i].完成日期 = response.data.rows[i].完成日期.split(' ')[0]
}
this.total2 = response.data.total this.total2 = response.data.total
this.tableData2 = response.data.rows this.tableData2 = response.data.rows
} }
@@ -182,9 +185,6 @@ export default {
if (response.data.total === 0) { if (response.data.total === 0) {
this.loading2 = false this.loading2 = false
} else { } else {
for (let i = 0; i < response.data.rows.length; i++) {
response.data.rows[i].完成日期 = response.data.rows[i].完成日期.split(' ')[0]
}
this.total2 = response.data.total this.total2 = response.data.total
this.tableData2 = response.data.rows this.tableData2 = response.data.rows
} }

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

@@ -24,7 +24,7 @@
<el-button type="success" icon="el-icon-search" class="move" size="small" @click="selectCustomerOfName">查询</el-button> <el-button type="success" icon="el-icon-search" class="move" size="small" @click="selectCustomerOfName">查询</el-button>
</el-card> </el-card>
<el-row> <el-row>
<el-col :span="4"> <el-col :span="6">
<el-card> <el-card>
<el-table <el-table
v-loading="loading1" v-loading="loading1"
@@ -48,7 +48,7 @@
</el-table> </el-table>
</el-card> </el-card>
</el-col> </el-col>
<el-col :span="20"> <el-col :span="18">
<el-card> <el-card>
<el-button type="text" icon="el-icon-circle-plus-outline" size="mini" @click="addMarketingManager();flag = 1">添加销售经理</el-button> <el-button type="text" icon="el-icon-circle-plus-outline" size="mini" @click="addMarketingManager();flag = 1">添加销售经理</el-button>
<span style="float: right">销售经理</span> <span style="float: right">销售经理</span>
@@ -586,5 +586,9 @@ export default {
.move{ .move{
margin-left: 10px; margin-left: 10px;
} }
.el-table td, .el-table th.is-leaf,
.el-radio__inner,
.el-input__inner{
border: 1px solid black!important;
}
</style> </style>

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

@@ -380,8 +380,8 @@
</div> </div>
</el-dialog> </el-dialog>
<!--营销经理选择--> <!--营销经理选择-->
<el-dialog :visible.sync="dialogFormVisiblePeople" title="营销经理" center width="30%"> <el-dialog :visible.sync="dialogFormVisiblePeople" title="营销经理" center width="500px">
<span>责权省份</span> <span>责权省份：</span>
<el-select v-model="ProvinceValue" clearable filterable placeholder="请选择省份" style="margin-right: 10px" size="small" @change="changeProvince"> <el-select v-model="ProvinceValue" clearable filterable placeholder="请选择省份" style="margin-right: 10px" size="small" @change="changeProvince">
<el-option <el-option
v-for="item in Province" v-for="item in Province"
@@ -1633,4 +1633,9 @@ export default {
margin-top: 10px; margin-top: 10px;
margin-right: 40px; margin-right: 40px;
} }
.el-table td, .el-table th.is-leaf,
.el-radio__inner,
.el-input__inner{
border: 1px solid black!important;
}
</style> </style>

93
src/views/MarketingCenter/ContractInformationManagement/index.vue
View File

@@ -1,36 +1,40 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-card> <el-card>
<span>项目名称：</span> <div>
<el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" style="margin-right: 10px" size="small"> <span>项目名称：</span>
<el-option <el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" size="small">
v-for="item in entryName" <el-option
:key="item.value" v-for="item in entryName"
:label="item.label" :key="item.value"
:value="item.value"/> :label="item.label"
</el-select> :value="item.value"/>
<span style="margin-left: 10px">机床型号：</span> </el-select>
<el-input v-model="machine" clearable size="small" style="width:200px" placeholder="请输入机床型号"/> <span style="margin-left: 10px">机床型号：</span>
<span style="margin-left: 10px">销售经理：</span> <el-input v-model="machine" clearable size="small" style="width:200px" placeholder="请输入机床型号"/>
<el-input v-model="MarketingManagerValue" readonly clearable size="small" style="width:200px" placeholder="请选择营销经理" @dblclick.native="openName();param = 1" @clear="clear()"/> <span style="margin-left: 10px">销售经理：</span>
<span style="margin-left: 10px">时间区间：</span> <el-input v-model="MarketingManagerValue" readonly clearable size="small" style="width:200px" placeholder="请选择营销经理" @dblclick.native="openName();param = 1" @clear="clear()"/>
<el-date-picker </div>
v-model="startTime" <div style="margin-top: 20px">
style="width: 200px;" <span style="margin-top: 20px">开始日期：</span>
value-format="yyyy-MM-dd" <el-date-picker
size="small" v-model="startTime"
type="date" style="width: 200px;"
placeholder="请选择开始日期"/> value-format="yyyy-MM-dd"
<span>-</span> size="small"
<el-date-picker type="date"
v-model="endTime" placeholder="请选择开始日期"/>
style="width: 200px;" <span style="margin-left: 10px">结束日期：</span>
value-format="yyyy-MM-dd" <el-date-picker
size="small" v-model="endTime"
type="date" style="width: 200px;"
placeholder="请选择结束日期"/> value-format="yyyy-MM-dd"
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 10;PageCurrent = 1;fetchTableData1()">查询</el-button> size="small"
<el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()">增加</el-button> type="date"
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="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()">增加</el-button>
</div>
</el-card> </el-card>
<el-card> <el-card>
<el-table <el-table
@@ -46,18 +50,18 @@
@expand-change="selectMachine"> @expand-change="selectMachine">
<el-table-column type="expand"> <el-table-column type="expand">
<template slot-scope="scope"> <template slot-scope="scope">
<el-table :data="tableData2" border style="width: 600px; text-align: center" size="mini"> <el-table :data="tableData2" border style="width: 491px; text-align: center" size="mini">
<el-table-column label="设备型号" align="center"> <el-table-column label="设备型号" align="center" width="130">
<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="160">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.机床名称 }} {{ scope.row.机床名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" fixed="right" width="200px" align="center"> <el-table-column label="操作" width="200" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
@@ -100,7 +104,7 @@
{{ scope.row.项目名称 }} {{ scope.row.项目名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="付款方式" width="150"> <el-table-column align="center" label="付款方式" width="80">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.付款方式 }} {{ scope.row.付款方式 }}
</template> </template>
@@ -360,7 +364,7 @@
</el-dialog> </el-dialog>
<!--新增机床对话框--> <!--新增机床对话框-->
<el-dialog :title="title1" :visible.sync="dialogFormVisible2" center style="min-height: 300px" width="25%"> <el-dialog :title="title1" :visible.sync="dialogFormVisible2" center style="min-height: 300px" width="450px">
<el-form ref="form1" :model="form1" :rules="rules1" label-width="140px"> <el-form ref="form1" :model="form1" :rules="rules1" label-width="140px">
<el-form-item label="设备型号" prop="设备型号"> <el-form-item label="设备型号" prop="设备型号">
<el-input v-model="form1.设备型号" size="small" placeholder="请输入设备型号" style="width:200px"/> <el-input v-model="form1.设备型号" size="small" placeholder="请输入设备型号" style="width:200px"/>
@@ -376,8 +380,8 @@
</el-dialog> </el-dialog>
<!--营销经理选择--> <!--营销经理选择-->
<el-dialog :visible.sync="dialogFormVisiblePeople" title="营销经理" center width="30%"> <el-dialog :visible.sync="dialogFormVisiblePeople" title="营销经理" center width="500px">
<span>责权省份</span> <span>责权省份：</span>
<el-select v-model="ProvinceValue" clearable filterable placeholder="请选择省份" style="margin-right: 10px" size="small" @change="changeProvince"> <el-select v-model="ProvinceValue" clearable filterable placeholder="请选择省份" style="margin-right: 10px" size="small" @change="changeProvince">
<el-option <el-option
v-for="item in Province" v-for="item in Province"
@@ -467,7 +471,7 @@
</el-dialog> </el-dialog>
<!--客户选择--> <!--客户选择-->
<el-dialog :visible.sync="dialogCustomerFormVisible" title="客户选择" center width="600px"> <el-dialog :visible.sync="dialogCustomerFormVisible" title="客户选择" center width="800px">
<el-input v-model="Customer" clearable size="small" style="width:200px" placeholder="请输入客户名称"/> <el-input v-model="Customer" clearable size="small" style="width:200px" placeholder="请输入客户名称"/>
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize1 = 10;PageCurrent1 = 1;fetchCustomerData()">查询</el-button> <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize1 = 10;PageCurrent1 = 1;fetchCustomerData()">查询</el-button>
<el-table v-loading="loading1" :data="CustomerData" highlight-current-row height="300" show-overflow-tooltip style="height: 330px; margin-top: 20px" @row-click="handleCustomerChange"> <el-table v-loading="loading1" :data="CustomerData" highlight-current-row height="300" show-overflow-tooltip style="height: 330px; margin-top: 20px" @row-click="handleCustomerChange">
@@ -507,7 +511,7 @@
</el-dialog> </el-dialog>
<!--改变节点时间对话框--> <!--改变节点时间对话框-->
<el-dialog :visible.sync="dialogTimeVisible" :show-close="false" :close-on-click-modal="false" title="进度完成时间" center style="min-height: 300px" width="23%"> <el-dialog :visible.sync="dialogTimeVisible" :show-close="false" :close-on-click-modal="false" title="进度完成时间" center style="min-height: 300px" width="400px">
<el-form ref="form2" :model="form2" :rules="rules2" :disabled="disabledTime" label-width="140px"> <el-form ref="form2" :model="form2" :rules="rules2" :disabled="disabledTime" label-width="140px">
<el-form-item label="进度完成日期" prop="进度完成日期"> <el-form-item label="进度完成日期" prop="进度完成日期">
<el-date-picker <el-date-picker
@@ -1228,9 +1232,7 @@ export default {
</script> </script>
<style scoped> <style scoped>
.el-card {
margin-top: 15px;
}
.el-date-editor{ .el-date-editor{
width:200px; width:200px;
} }
@@ -1280,4 +1282,9 @@ a{
display: inline-block; display: inline-block;
color: #999; color: #999;
} }
.el-table td, .el-table th.is-leaf,
.el-radio__inner,
.el-input__inner{
border: 1px solid black!important;
}
</style> </style>