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.112:10010/r/高精2.0

Browse Source
This commit is contained in:
liushuai
2018-12-07 18:58:31 +08:00
parent 3fed67dec1 044ceeb344
commit 081758df73
18 changed files with 333 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/api/BasicData/WorkshopProcessMaintenance.js
View File

@@ -1,13 +1,12 @@
import request from '@/utils/request'
// 查工艺分类名称
export function searchProcessClassification(ProcessClassification) {
export function searchProcessClassification() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_基础表_工艺分类名称_查询数据',
param: '工艺分类名称=' + ProcessClassification
name: '车间生产管理工艺_基础表_工艺分类名称_查询数据'
}
})
}

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

@@ -8,7 +8,7 @@ export function initCraftmen() {
data: {
type: '1',
name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
param: '考核部门编号=17'
param: '考核部门编号=9'
}
})
}

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

@@ -129,7 +129,7 @@ export function initPerson() {
data: {
type: '1',
name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
param: '考核部门编号=17=int'
param: '考核部门编号=9'
}
})
}

1
src/api/ManufacturingCenter/ProcessingStatus.js
View File

@@ -43,7 +43,6 @@ export function getTable(stepNumber, a, b, c, d, e, f, g, i, pageCurrent, pageSi
data: {
type: '1',
name: '车间生产管理工艺_零件工序_查询数据_已编制工序的全部零件及工序_横向赋值新建存储过程',
// param: '项目流水号_check=0=string&项目流水号=428=string&机床流水号_check=0=string&机床流水号=8903=string&组件流水号_check=1=string&组件流水号=39539=string&零件图号_check=0=string&零件图号=0=string&是否查询全部数据=1=string&单件是否外协=1=string&考核状态=6=string',
param: '项目流水号_check=' + stepNumber + '=string&项目流水号=' + a + '=string&机床流水号_check=' + b + '=string&机床流水号=' + c + '=string&组件流水号_check=' + d + '=string&组件流水号=' + e + '=string&零件图号_check=' + f + '=string&零件图号=' + g + '=string&是否查询全部数据=1=string&单件是否外协=' + i + '=string&考核状态=6=int',
Pagination: pageCurrent + '&' + pageSize
}

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

@@ -32,7 +32,7 @@ export function getPerson() {
data: {
type: '1',
name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
param: '考核部门编号=17=int'
param: '考核部门编号=9'
}
})

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

@@ -30,7 +30,7 @@ export function addTable(equipmentName, equipmentModel, performance, processingC
data: {
type: '2',
name: '设备管理_设备加工能力_增加数据_设备维护New',
param: '设备名称=' + equipmentName + '=string&设备型号=' + equipmentModel + '=string&设备性能指标=' + performance + '= string&设备加工能力工时=' + processingCapacity + '=string&设备工时系数=' + workingTimeFactor + '=string&工艺名称简称=' + processName + '=string&工艺编号=' + processNumber + '=string&班次类型=' + shift + '= string&整改工时系数=' + reorganizationTimeFactor + '=string&设备编号=' + equipmentNumber + '=string&预留工时系数=' + reservedTimeFactor
param: '设备名称=' + equipmentName + '&设备型号=' + equipmentModel + '&设备性能指标=' + performance + '&设备加工能力工时=' + processingCapacity + '&设备工时系数=' + workingTimeFactor + '&工艺名称简称=' + processName + '&工艺编号=' + processNumber + '&班次类型=' + shift + '&整改工时系数=' + reorganizationTimeFactor + '&设备编号=' + equipmentNumber + '&预留工时系数=' + reservedTimeFactor
}
})
}

30
src/api/MarketingCenter/ContractInformationManagement.js
View File

@@ -20,14 +20,14 @@ export function initMarketingManager() {
}
})
}
export function searchTable1(pageCurrent, pageSize, num1, num2) {
export function searchTable1(pageCurrent, pageSize, num1, num2, num3, num4, num5, num6, num7, num8) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '合同信息管理_合同信息_查询',
param: '合同ID=' + num1 + '=int&人员ID=' + num2 + '=int',
param: '合同ID=' + num1 + '=int&人员ID=' + num2 + '=int&项目流水号_check=' + num3 + '=int&营销经理流水号_check=' + num4 + '=int&开始日期_check=' + num5 + '=int&结束日期_check=' + num6 + '=int&开始日期=' + num7 + '=date&结束日期=' + num8 + '=date',
Pagination: pageCurrent + '&' + pageSize
}
})
@@ -61,7 +61,7 @@ export function addList() {
data: {
type: '2',
name: '基础表_合同信息表_增加数据',
param: '项目名称=' + arguments[0] + '&图纸会签节点=' + arguments[1] + '&设备预验收节点=' + arguments[2] + '&发货节点=' + arguments[3] + '&安装调试节点=' + arguments[4] + '&人员ID=' + arguments[5] + '&执行进度ID=' + arguments[6] + '&客户流水号=' + arguments[7] + '&备注=' + arguments[8] + '&付款方式代码=' + arguments[9]
param: '项目名称=' + arguments[0] + '&图纸会签节点=' + arguments[1] + '&设备预验收节点=' + arguments[2] + '&发货节点=' + arguments[3] + '&安装调试节点=' + arguments[4] + '&人员ID=' + arguments[5] + '&执行进度ID=' + arguments[6] + '&客户流水号=' + arguments[7] + '&备注=' + arguments[8] + '&付款方式代码=' + arguments[9] + '&合同签订日期=' + arguments[10] + '&招标保证金流水号=' + arguments[11]
}
})
}
@@ -92,7 +92,7 @@ export function editchar() {
data: {
type: '2',
name: '合同信息管理_合同信息_编辑',
param: '项目名称=' + arguments[0] + '&图纸会签节点=' + arguments[1] + '&设备预验收节点=' + arguments[2] + '&发货节点=' + arguments[3] + '&安装调试节点=' + arguments[4] + '&人员ID=' + arguments[5] + '&执行进度ID=' + arguments[6] + '&客户流水号=' + arguments[7] + '&合同信息备注=' + arguments[8] + '&项目流水号=' + arguments[9] + '&付款方式代码=' + arguments[10]
param: '项目名称=' + arguments[0] + '&图纸会签节点=' + arguments[1] + '&设备预验收节点=' + arguments[2] + '&发货节点=' + arguments[3] + '&安装调试节点=' + arguments[4] + '&人员ID=' + arguments[5] + '&执行进度ID=' + arguments[6] + '&客户流水号=' + arguments[7] + '&合同信息备注=' + arguments[8] + '&项目流水号=' + arguments[9] + '&付款方式代码=' + arguments[10] + '&合同签订日期=' + arguments[11] + '&招标保证金流水号=' + arguments[12]
}
})
}
@@ -243,3 +243,25 @@ export function money() {
}
})
}
export function changeExecutionProgressID() {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '创建合同_改变执行进度',
param: '执行进度流水号=' + arguments[0] + '&项目流水号=' + arguments[1]
}
})
}
export function selectBidBond() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '投标保证金管理_投标保证金查询',
param: '是否收回_check=' + arguments[0] + '&是否收回=' + arguments[1] + '&保金类型_check=' + arguments[2] + '&保金类型=' + arguments[3] + '&投标人_check=' + arguments[4] + '&投标人=' + arguments[5] + '&招标企业_check=' + arguments[6] + '&招标企业=' + arguments[7] + '&开始日期_check=' + arguments[8] + '&开始日期=' + arguments[9] + '&结束日期_check=' + arguments[10] + '&结束日期=' + arguments[11]
}
})
}

4
src/views/BasicData/WorkshopProcessMaintenance/index.vue
View File

@@ -102,7 +102,6 @@
</el-table-column>
</el-table>
</el-card>
</el-col>
</el-row>
<el-dialog :visible.sync="dialogFormVisible1" title="增加工艺分类" center style="min-height: 300px" width="400px">
@@ -242,13 +241,14 @@ export default {
methods: {
searchProcessClassification() {
this.loading1 = true
searchProcessClassification(this.ProcessClassification).then(response => {
searchProcessClassification().then(response => {
this.loading1 = false
this.tableData1 = response.data
this.total1 = response.data
return this.tableData1
}).then(data => {
this.Num = data
this.max = []
for (let i = 0; i < this.Num.length; i++) {
this.max.push(this.Num[i].工艺分类流水号)
}

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

@@ -609,7 +609,7 @@ export default {
this.form.完成时间 = ''
this.form.人员 = ''
this.form.考勤编号 = ''
if (this.worker[index][a] !== '请选择') {
if (this.worker[index][a] !== '超级管理员') {
this.midd = 1
this.form.人员 = this.worker[index][a]
}

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

@@ -308,6 +308,7 @@ export default {
numm: response.data[i].工艺计划流水号
})
}
this.listLoading = false
}
})
})

9
src/views/ManufacturingCenter/SparePartsForScrap/index.vue
View File

@@ -51,36 +51,42 @@
style="width: 100%; text-align: center"
@current-change="fetchTableData2">
<el-table-column
align="center"
prop="province1"
label="零件号"
>
<template slot-scope="scope">{{ scope.row.零件图号 }}</template>
</el-table-column>
<el-table-column
align="center"
prop="province2"
label="零件名称"
>
<template slot-scope="scope">{{ scope.row.零件名称 }}</template>
</el-table-column>
<el-table-column
align="center"
prop="province4"
label="批次数量"
>
<template slot-scope="scope">{{ scope.row.批次数量 }}</template>
</el-table-column>
<el-table-column
align="center"
prop="province5"
label="开始时间"
>
<template slot-scope="scope">{{ scope.row.机加工开始时间 }}</template>
</el-table-column>
<el-table-column
align="center"
prop="province6"
label="结束时间"
>
<template slot-scope="scope">{{ scope.row.机加工结束时间 }}</template>
</el-table-column>
<el-table-column
align="center"
prop="province7"
label="批次零件状态"
>
@@ -90,6 +96,7 @@
</template>
</el-table-column>
<el-table-column
align="center"
fixed="right"
label="操作"
width="100px"
@@ -119,7 +126,6 @@
element-loading-spinner="el-icon-loading"
element-loading-background="rgba(226,223,223,1)"
height="250"
highlight-current-row
border
stripe
style="width: 100%">
@@ -377,6 +383,7 @@ export default {
this.MachineDrawingValue ? this.MachineCode_check = 1 : this.MachineCode_check = 0
this.TeamValue ? this.TeamCode_check = 1 : this.TeamCode_check = 0
this.PartDrawing ? this.PartDrawing_check = 1 : this.PartDrawing_check = 0
this.tableData2 = []
this.getTable(TableDataSelect, [this.ProjectCode_check, this.ProjectNameValue, this.MachineCode_check, this.MachineDrawingValue, this.TeamCode_check, this.TeamValue, this.ComponentPartsBasicCattleTaxNumber_check, this.ComponentPartsBasicCattleTaxNumber, this.CutCode_check, this.CutCode, this.CutCodeBefore_check, this.CutCodeBefore, this.Assess_check, this.Assess, this.PartDrawing_check, this.PartDrawing, this.currentPage1, this.pageSize1], ['tableData', 'total1', 'loading'])
},
fetchTableData2(row) {

37
src/views/ManufacturingCenter/StatusQuery/index.vue
View File

@@ -27,7 +27,6 @@
</el-input>
<span>零件号:</span>
<el-input v-model="partNumber" placeholder="零件号" size="small" clearable style="width:200px"/>
<br>
<span>零件状态:</span>
<el-select v-model="partStateValue" placeholder="零件状态" size="small" clearable style="width:200px">
<el-option
@@ -36,14 +35,14 @@
:label="item.label"
:value="item.value"/>
</el-select>
<span>零件类型:</span>
<el-select v-model="partTypeValue" placeholder="零件类型" size="small" clearable style="margin-top: 15px;width: 200px">
<el-option
v-for="item in partType"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<!--<span>零件类型:</span>-->
<!--<el-select v-model="partTypeValue" placeholder="零件类型" size="small" clearable style="margin-top: 15px;width: 200px">-->
<!--<el-option-->
<!--v-for="item in partType"-->
<!--:key="item.value"-->
<!--:label="item.label"-->
<!--:value="item.value"/>-->
<!--</el-select>-->
<el-button type="success" icon="el-icon-search" size="small" style="margin: 15px 0 0 10px" @click="pageCurrent=1;pageSize=10;total=0;searchData()">查询</el-button>
</el-card>
@@ -100,15 +99,15 @@
</el-steps>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" align="center" width="120px">
<template slot-scope="scope">
<el-button
size="mini"
type="primary"
icon="el-icon-edit"
@click="handleEdit(scope.row)">编辑</el-button>
</template>
</el-table-column>
<!--<el-table-column label="操作" fixed="right" align="center" width="120px">-->
<!--<template slot-scope="scope">-->
<!--<el-button-->
<!--size="mini"-->
<!--type="primary"-->
<!--icon="el-icon-edit"-->
<!--@click="handleEdit(scope.row)">编辑</el-button>-->
<!--</template>-->
<!--</el-table-column>-->
</el-table>
<div class="block" style="margin-top: 10px;">
<el-pagination
@@ -352,7 +351,6 @@ export default {
}
this.loading0 = true
searchTable(this.check, this.entryNameValue, this.check1, this.machine, this.check2, this.groupNum, this.check3, this.partNumber, this.check4, this.partStateValue, this.check5, this.partTypeValue, this.pageSize, this.pageCurrent).then(response => {
console.log(response.data)
for (let i = 0; i < response.data.rows.length; i++) {
response.data.rows[i].考核状态 = parseInt(response.data.rows[i].考核状态) - 2
if (response.data.rows[i].传递时间 !== undefined || response.data.rows[i].hasOwnProperty('传递时间')) {
@@ -435,7 +433,6 @@ export default {
this.dialogFormVisible3 = false
},
handleEdit(row) {
console.log(row)
this.title = '编辑'
this.partStateValue1 = parseInt(row.考核状态) + 2
this.dialogFormVisible4 = true

59
src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
View File

@@ -98,18 +98,6 @@
<el-input v-model="form.设备型号" placeholder="设备型号" size="small" style="width:200px" clearable />
</el-form-item>
</el-col>
<el-col :span = "12">
<el-form-item label="设备性能指标" prop="设备性能指标" >
<el-input v-model="form.设备性能指标" placeholder="设备性能指标" size="small" style="width:200px" clearable />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span = "12">
<el-form-item label="设备加工能力" prop="设备加工能力" >
<el-input v-model="form.设备加工能力" placeholder="设备加工能力" size="small" style="width:200px" clearable />
</el-form-item>
</el-col>
<el-col :span = "12">
<el-form-item label="设备加工工艺" prop="设备加工工艺" >
<el-select v-model="form.设备加工工艺" placeholder="设备加工工艺" size="small" style="width:200px" clearable >
@@ -122,7 +110,19 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-row v-show="title!=='增加'">
<el-col :span = "12">
<el-form-item label="设备加工能力" prop="设备加工能力" >
<el-input v-model="form.设备加工能力" placeholder="设备加工能力" size="small" style="width:200px" clearable />
</el-form-item>
</el-col>
<el-col :span = "12">
<el-form-item label="设备性能指标" prop="设备性能指标" >
<el-input v-model="form.设备性能指标" placeholder="设备性能指标" size="small" style="width:200px" clearable />
</el-form-item>
</el-col>
</el-row>
<el-row v-show="title!=='增加'">
<el-col :span = "12">
<el-form-item label="班次类型" prop="班次类型" >
<el-select v-model="form.班次类型" placeholder="班次类型" size="small" style="width:200px" clearable >
@@ -140,7 +140,7 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-row v-show="title!=='增加'">
<el-col :span = "12">
<el-form-item label="整改工时系数" prop="整改工时系数" >
<el-input v-model="form.整改工时系数" placeholder="整改工时系数" size="small" style="width:200px" clearable />
@@ -200,12 +200,12 @@ export default {
设备名称: [{ required: true, message: '请选择设备名称', change: 'blur' }],
设备编号: [{ required: true, message: '请选择设备编号', change: 'blur' }],
设备型号: [{ required: true, message: '请选择设备型号', change: 'blur' }],
设备加工能力: [{ required: true, message: '请选择设备加工能力', change: 'blur' }],
设备加工工艺: [{ required: true, message: '请选择设备加工工艺', trigger: 'blur' }],
班次类型: [{ required: true, message: '请选择班次类型', trigger: 'blur' }],
设备工时系数: [{ required: true, message: '请选择设备工时系数', change: 'blur' }],
整改工时系数: [{ required: true, message: '请选择整改工时系数', change: 'blur' }],
预留工时系数: [{ required: true, message: '请选择预留工时系数', change: 'blur' }]
设备加工工艺: [{ required: true, message: '请选择设备加工工艺', trigger: 'blur' }]
// 设备加工能力: [{ required: true, message: '请选择设备加工能力', change: 'blur' }],
// 班次类型: [{ required: true, message: '请选择班次类型', trigger: 'blur' }],
// 设备工时系数: [{ required: true, message: '请选择设备工时系数', change: 'blur' }],
// 整改工时系数: [{ required: true, message: '请选择整改工时系数', change: 'blur' }],
// 预留工时系数: [{ required: true, message: '请选择预留工时系数', change: 'blur' }]
}
}
},
@@ -241,9 +241,20 @@ export default {
if (this.$refs['form'] !== undefined) {
this.$refs['form'].resetFields()
}
this.dialogFormVisible = true
this.title = '增加'
this.form = {}
this.form = {
设备名称: '',
设备编号: '',
设备型号: '',
设备加工工艺: ''
}
this.form.设备性能指标 = 1
this.form.设备加工能力 = 1
this.form.班次类型 = 1
this.form.设备工时系数 = 1
this.form.整改工时系数 = 1
this.form.预留工时系数 = 1
this.dialogFormVisible = true
},
handleEdit(row) {
if (this.$refs['form'] !== undefined) {
@@ -268,10 +279,8 @@ export default {
if (valid) {
if (this.title === '增加') {
this.submitAdd()
this.title = ''
} else if (this.title === '编辑') {
this.submitEdit()
this.title = ''
}
}
})
@@ -290,6 +299,7 @@ export default {
type: 'success'
})
this.dialogFormVisible = false
this.title = ''
this.fetchData()
} else {
this.$message.error('信息添加失败')
@@ -305,6 +315,7 @@ export default {
type: 'success'
})
this.dialogFormVisible = false
this.title = ''
this.fetchData()
} else {
this.$message.error('信息编辑失败')

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

@@ -1,7 +1,7 @@
<template>
<div class="app-container">
<el-card>
<span>项目名称</span>
<span>项目名称：</span>
<el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" style="margin-right: 10px" size="small">
<el-option
v-for="item in entryName"
@@ -9,8 +9,24 @@
:label="item.label"
:value="item.value"/>
</el-select>
<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()"/>
<span style="margin-left: 10px">开始日期：</span>
<el-date-picker
v-model="startTime"
style="width: 200px;"
value-format="yyyy-MM-dd"
size="small"
type="date"
placeholder="请选择开始日期"/>
<span style="margin-left: 10px">结束日期：</span>
<el-date-picker
v-model="endTime"
style="width: 200px;"
value-format="yyyy-MM-dd"
size="small"
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>
</el-card>
@@ -21,13 +37,14 @@
:row-key="getRowKeys"
:expand-row-keys="expands"
style="width: 100%"
height="600"
height="460"
border
size="mini"
@row-click="fetchExecutionProgressdata"
@expand-change="selectMachine">
<el-table-column type="expand">
<template slot-scope="scope">
<el-table :data="tableData2" border style="width: 600px; text-align: center">
<el-table :data="tableData2" border style="width: 600px; text-align: center" size="mini">
<el-table-column label="设备型号" align="center">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
@@ -57,7 +74,23 @@
</el-table-column>
<el-table-column align="center" label="合同编号" width="150">
<template slot-scope="scope">
{{ scope.row.合同编号 }}
<template>
<el-popover
placement="right"
title="投标保证金情况"
width="300"
trigger="hover">
<div v-show="!scope.row.招标企业" style="text-align: center">
<h4>未缴纳投标保证金</h4>
</div>
<div v-show="scope.row.招标企业">
<h4>招标企业： {{ scope.row.招标企业 }}</h4>
<h4>投标保证金金额： {{ scope.row.保证金金额 }}</h4>
<h4>是否收回： {{ parseInt(scope.row.是否收回) === 1 ? '未收回' : '已收回' }}</h4>
</div>
<el-tag slot="reference">{{ scope.row.合同编号 }}</el-tag>
</el-popover>
</template>
</template>
</el-table-column>
<el-table-column align="center" label="项目名称" width="200">
@@ -70,6 +103,11 @@
{{ scope.row.付款方式 }}
</template>
</el-table-column>
<el-table-column align="center" label="合同签订日期" width="150">
<template slot-scope="scope">
{{ scope.row.合同签订日期 }}
</template>
</el-table-column>
<el-table-column align="center" label="图纸会签节点" width="150">
<template slot-scope="scope">
{{ scope.row.图纸会签节点 }}
@@ -147,7 +185,20 @@
</div>
</el-card>
<el-card v-show="ExecutionProgressShow">
<h4>合同进度</h4>
<div>
<h4 style="display: inline-block">合同进度</h4>
<div style="display: inline-block; float:right">
<span>已完成进度：</span>
<el-select v-model="executionProgressID" placeholder="请输入目前执行进度" size="small" style="width: 130px;margin-left: 20px" @change="changeExecutionProgressID">
<el-option
v-for="item in executionProgress"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</div>
</div>
<div>
<el-steps :active="ExecutionProgress" finish-status="success" process-status="process " style="margin-left: 10px">
<el-step title="签订合同" icon="el-icon-edit-outline"/>
<el-step title="图纸会签" icon="el-icon-picture-outline"/>
@@ -156,7 +207,9 @@
<el-step title="设备发货" icon="el-icon-sold-out"/>
<el-step title="安装调试" icon="el-icon-time"/>
<el-step title="项目验收" icon="el-icon-circle-check-outline"/>
<el-step title="质保期" icon="el-icon-service"/>
</el-steps>
</div>
</el-card>
<el-card v-show="uploader" style="min-height: 145px;">
<h4>纪要文件</h4>
@@ -198,6 +251,11 @@
<el-input v-model="form.EntryName" size="small" placeholder="请输入项目名称" style="width:200px"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="投标保证金" prop="">
<el-input v-model="form.bidding" readonly clearable size="small" style="width:200px" placeholder="若缴纳保证金请选择" @dblclick.native="openBidding()" @clear="clearBidding()"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="已完成进度" prop="executionProgressID">
<el-select v-model="form.executionProgressID" :disabled="infoDisable" placeholder="请输入目前执行进度" size="small" style="width: 200px">
@@ -214,6 +272,16 @@
<el-input v-model="form.MarketingManagerValue" readonly clearable size="small" style="width:200px" placeholder="请双击选择营销经理" @dblclick.native="openName()" @clear="clear()"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="合同签订日期" prop="contractSigningDate">
<el-date-picker
v-model="form.contractSigningDate"
value-format="yyyy-MM-dd"
size="small"
type="date"
placeholder="请选择图纸会签节点"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="图纸会签节点" prop="drawingJointSignNode">
<el-date-picker
@@ -374,6 +442,67 @@
</div>
</el-dialog>
<!--投标保证金选择-->
<el-dialog :visible.sync="dialogFormVisibleBidding" title="请选择投标保证金" center width="65%">
<span>招标企业：</span>
<el-input v-model="enterprise" size="small" style="width:200px" clearable/>
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="searchBidding">查询</el-button>
<div style="margin-top: 15px">
<el-table
:data="tableDataBidding"
highlight-current-row
style="width: 100%"
height="400"
border
@row-click="biddingNum">
<el-table-column align="center" label="招标企业" width="300">
<template slot-scope="scope">
{{ scope.row.招标企业 }}
</template>
</el-table-column>
<el-table-column align="center" label="联系人" width="100">
<template slot-scope="scope">
{{ scope.row.联系人 }}
</template>
</el-table-column>
<el-table-column align="center" label="联系电话" width="120">
<template slot-scope="scope">
{{ scope.row.联系电话 }}
</template>
</el-table-column>
<el-table-column align="center" label="保证金金额" width="100">
<template slot-scope="scope">
{{ scope.row.保证金金额 }}
</template>
</el-table-column>
<el-table-column align="center" label="投标人" width="100">
<template slot-scope="scope">
{{ scope.row.投标人 }}
</template>
</el-table-column>
<el-table-column align="center" label="保金类型" width="150">
<template slot-scope="scope">
{{ scope.row.保证金类型 }}
</template>
</el-table-column>
<el-table-column align="center" label="投标日期" width="150">
<template slot-scope="scope">
{{ scope.row.投标日期 }}
</template>
</el-table-column>
<el-table-column align="center" label="备注">
<template slot-scope="scope">
{{ scope.row.备注 }}
</template>
</el-table-column>
</el-table>
</div>
<div slot="footer" class="dialog-footer">
<el-button @click="offBidding">取消</el-button>
<el-button type="primary" @click="getBidding">确认</el-button>
</div>
</el-dialog>
<!--客户选择-->
<el-dialog :visible.sync="dialogCustomerFormVisible" title="客户选择" center width="600px">
<el-input v-model="Customer" clearable size="small" style="width:200px" placeholder="请输入客户名称"/>
@@ -418,7 +547,7 @@
<script>
import elInput from 'element-ui/packages/input'
import { initProject, searchTable1, fetchExecutionProgress, delList, addList, executionProgressID, editchar, getTree, tree, getTablePeople, fetchCustomerData, getFileData, deleteFileData, selectMachine, selectProvince, SelectMarketingManager, submitMachine, editMachine, delMachine, money } from '@/api/MarketingCenter/ContractInformationManagement'
import { selectBidBond, changeExecutionProgressID, initProject, searchTable1, fetchExecutionProgress, delList, addList, executionProgressID, editchar, getTree, tree, getTablePeople, fetchCustomerData, getFileData, deleteFileData, selectMachine, selectProvince, SelectMarketingManager, submitMachine, editMachine, delMachine, money } from '@/api/MarketingCenter/ContractInformationManagement'
import { upload, download } from '@/utils/request'
export default {
components: {
@@ -429,6 +558,14 @@ export default {
a: 1,
b: 1,
c: 1,
enterpriseInput: '', // 表单承接招标企业的中间变量
biddingNumber: '',
dialogFormVisibleBidding: false,
enterprise: '', // 招标企业
startTime: '',
startTime_check: null,
endTime: '',
endTime_check: null,
money: [],
expands: [],
flag: '',
@@ -443,6 +580,7 @@ export default {
id1: '',
action: '',
peoplename: '',
peopleid_check: null,
peopleid: '',
dataPeople: [],
ListPeople: [],
@@ -456,6 +594,7 @@ export default {
listLoading: false,
showFileList: true,
entryNameValue: '', // 项目名称下拉框
entryNameValue_check: null,
entryName: [], // 项目名称下拉框数据
list1: [], // 项目名称临时存储
MarketingManagerValue: '', // 营销经理下拉框
@@ -479,6 +618,7 @@ export default {
form: {
MarketingManagerValue: '',
EntryName: '', // 项目名称
contractSigningDate: '',
drawingJointSignNode: '', // 图纸会签节点
EquipmentPreAcceptanceNode: '', // 设备预验收节点
ConsignmentNode: '', // 发货节点
@@ -486,8 +626,11 @@ export default {
executionProgressID: 1, // 执行进度ID
customerName: '', // 客户名称
remark: '',
付款方式: 1
付款方式: 1,
bidding: ''
},
tableDataBidding: [],
executionProgressID: '',
form1: {
设备型号: '',
设备名称: ''
@@ -502,6 +645,7 @@ export default {
EntryName: [{ required: true, message: '请输入项目名称', trigger: 'blur' }],
MarketingManagerValue: [{ required: true, message: '请选择营销经理', trigger: 'change' }],
executionProgressID: [{ required: true, message: '请选择已完成进度', trigger: 'change' }],
contractSigningDate: [{ required: true, message: '请选择合同签订日期', trigger: 'change' }],
付款方式: [{ required: true, message: '请选择付款方式', trigger: 'change' }]
},
rules1: { // 表单验证规则
@@ -522,6 +666,7 @@ export default {
this.dataPeople = tree(data, 0)
})
this.getSelect(initProject, ['项目名称', '项目流水号'], 'entryName')
this.executionProgressID = this.form.executionProgressID
this.getSelect(executionProgressID, ['执行进度名', '执行进度ID'], 'executionProgress')
this.getSelect(selectProvince, ['省份', '省份流水号'], 'Province')
this.getSelect(money, ['付款方式', '付款方式代码'], 'money')
@@ -559,11 +704,15 @@ export default {
this.peoplename = ''
},
fetchTableData1() {
if (this.entryNameValue === '' || this.entryNameValue === null) { this.entryNameValue_check = 0 } else { this.entryNameValue_check = 1 }
if (this.MarketingManagerValue === '' || this.MarketingManagerValue === null) { this.peopleid_check = 0 } else { this.peopleid_check = 1 }
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.ExecutionProgressShow = false
this.uploader = false
this.ExecutionProgress = null
this.listLoading = true
this.getTable(searchTable1, [this.PageCurrent, this.PageSize, this.entryNameValue, this.peopleid], ['tableData1', 'total', 'listLoading'])
this.getTable(searchTable1, [this.PageCurrent, this.PageSize, this.entryNameValue, this.peopleid, this.entryNameValue_check, this.peopleid_check, this.startTime_check, this.endTime_check, this.startTime, this.endTime], ['tableData1', 'total', 'listLoading'])
},
fetchExecutionProgressdata(row) {
this.projectNum = row.项目流水号
@@ -573,6 +722,7 @@ export default {
this.getFileData(this.projectNum)
fetchExecutionProgress(row.项目流水号).then(response => {
this.ExecutionProgress = response.data[0].执行进度流水号
this.executionProgressID = response.data[0].执行进度流水号
})
},
selectMachine(row) {
@@ -630,9 +780,11 @@ export default {
this.temp = 1
this.title = '增加'
this.disabled = false
this.biddingNumber = ''
this.tableDataBidding = []
},
addTableData1() {
addList(this.form.EntryName, this.form.drawingJointSignNode, this.form.EquipmentPreAcceptanceNode, this.form.ConsignmentNode, this.form.installDebugNode, this.id1, this.form.executionProgressID, this.CustomerCode, this.form.remark, this.form.付款方式).then(response => {
addList(this.form.EntryName, this.form.drawingJointSignNode, this.form.EquipmentPreAcceptanceNode, this.form.ConsignmentNode, this.form.installDebugNode, this.id1, this.form.executionProgressID, this.CustomerCode, this.form.remark, this.form.付款方式, this.form.contractSigningDate, this.biddingNumber).then(response => {
this.dialogFormVisible1 = false
if (response.data[0].result === '1') {
this.$message.success('添加成功')
@@ -665,9 +817,10 @@ export default {
})
},
handleEdit(row) {
console.log(row)
this.editForm(row, 'form')
this.title = '编辑'
this.dialogFormVisible1 = true
this.form.contractSigningDate = row.合同签订日期
this.form.contractNumber = row.合同编号
this.form.EntryName = row.项目名称
this.form.drawingJointSignNode = row.图纸会签节点
@@ -675,18 +828,21 @@ export default {
this.form.ConsignmentNode = row.发货节点
this.form.installDebugNode = row.安装调试节点
this.form.MarketingManagerValue = row.营销经理
this.id1 = row.营销经理流水号
this.form.executionProgressID = parseInt(row.执行进度流水号)
this.form.customerName = row.客户名称
this.hetongID = row.项目流水号
this.form.remark = row.合同信息备注
this.CustomerCode = row.客户流水号
this.form.付款方式 = parseInt(row.付款方式代码)
this.biddingNumber = parseInt(row.招标保证金流水号)
this.form.bidding = row.招标企业
this.disabled = true
this.temp = 2
this.infoDisable = false
},
chaEdit() {
editchar(this.form.EntryName, this.form.drawingJointSignNode, this.form.EquipmentPreAcceptanceNode, this.form.ConsignmentNode, this.form.installDebugNode, this.id1, this.form.executionProgressID, this.CustomerCode, this.form.remark, this.hetongID, this.form.付款方式).then(response => {
editchar(this.form.EntryName, this.form.drawingJointSignNode, this.form.EquipmentPreAcceptanceNode, this.form.ConsignmentNode, this.form.installDebugNode, this.id1, this.form.executionProgressID, this.CustomerCode, this.form.remark, this.hetongID, this.form.付款方式, this.form.contractSigningDate, this.biddingNumber).then(response => {
this.dialogFormVisible1 = false
if (response.data[0].result === '1') {
this.$message.success('信息更新成功')
@@ -809,6 +965,42 @@ export default {
})
}
this.deleteRow(delMachine, row.机床流水号, a)
},
changeExecutionProgressID() {
changeExecutionProgressID(this.executionProgressID, this.projectNum).then(response => {
if (response.data[0].result === '1') {
this.$message.success('信息更新成功')
fetchExecutionProgress(this.projectNum).then(response => {
this.ExecutionProgress = response.data[0].执行进度流水号
})
} else {
this.$message.error('信息更新失败')
}
})
},
openBidding() {
this.dialogFormVisibleBidding = true
},
searchBidding() {
selectBidBond(0, '', 0, '', 0, '', 1, this.enterprise, 0, '', 0, '').then(response => {
const data = response.data
for (let i = 0; i < data.length; i++) {
data[i].投标日期 = data[i].投标日期.substring(0, data[i].投标日期.length - 8)
}
this.tableDataBidding = data
})
},
biddingNum(row) {
this.biddingNumber = parseInt(row.招标保证金流水号)
this.enterpriseInput = row.招标企业
},
clearBidding() {
this.biddingNumber = ''
this.tableDataBidding = []
},
getBidding() {
this.form.bidding = this.enterpriseInput
this.dialogFormVisibleBidding = false
}
}
}

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

@@ -281,7 +281,6 @@ export default {
this.tableData = []
if (this.radio === 1) {
searchPartNum1(this.check_entryNameValue, this.entryNameValue, this.check_toolNumValue, this.toolNumValue, this.check_NumValue, this.NumValue, this.check_partName, this.partName, 0, this.pageCurrent2, this.pageSize2).then(response => {
console.log(response.data)
this.tableData2 = response.data.rows
this.total2 = response.data.total
}).then(() => {

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

@@ -113,12 +113,12 @@
<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="150px">
<el-table-column label="机加工计划开始日期" align="center" width="150px">
<template slot-scope="scope">
{{ scope.row.机加工开始时间 }}
</template>
</el-table-column>
<el-table-column label="机加工结束日期" align="center" width="150px">
<el-table-column label="机加工计划结束日期" align="center" width="150px">
<template slot-scope="scope">
{{ scope.row.机加工结束时间 }}
</template>
@@ -266,14 +266,14 @@ export default {
},
// 修改外协状态
edit(index, row) {
this.count = 0
for (let i = 0; i < this.tableData2.length; i++) {
if (this.checkBox[i] === false) {
this.count = this.count + 1
}
}
if (this.count === this.tableData2.length) {
edit2(row.工序流水号, row.工艺计划流水号, 0).then(response => {
})
edit2(row.工序流水号, row.工艺计划流水号, 0)
}
if (this.checkBox[index] === true) {
this.InOut = 2

1
src/views/TechnologyCenter/CreatePackingList/index.vue
View File

@@ -293,6 +293,7 @@
value-format="yyyy-MM-dd"
size="small"
type="date"
style="width:200px"
placeholder="请选择发货节点"/>
</el-form-item>
</el-col>

58
src/views/login/index.vue
View File

@@ -41,63 +41,43 @@
</el-button>
<div class="tips">
<span>超级管理员</span>
<span>账号：1001</span>
<span>密码：1001</span>
<span>账号：0000</span>
<span>密码：admin</span>
</div>
<div class="tips">
<span>采购管理员</span>
<span>账号：6201</span>
<span>密码：6201</span>
<span>营销中心</span>
<span>账号：2001</span>
<span>密码：2001</span>
</div>
<div class="tips">
<span>外协管理员</span>
<span>账号：1003</span>
<span>密码：1003</span>
</div>
<div class="tips">
<span>车间计划管理员</span>
<span>账号：2002</span>
<span>密码：2002</span>
</div>
<div class="tips">
<span>技术中心管理员</span>
<span>技术中心</span>
<span>账号：3001</span>
<span>密码：3001</span>
</div>
<div class="tips">
<span>库存管理员</span>
<span>账号：3002</span>
<span>密码：3002</span>
</div>
<div class="tips">
<span>营销中心管理员</span>
<span>制造中心</span>
<span>账号：4001</span>
<span>密码：4001</span>
</div>
<div class="tips">
<span>财务总监</span>
<span>账号：7001</span>
<span>密码：7001</span>
<span>采购部</span>
<span>账号：4101</span>
<span>密码：4101</span>
</div>
<div class="tips">
<span>出纳</span>
<span>账号：7002</span>
<span>密码：7002</span>
<span>仓库</span>
<span>账号：4201</span>
<span>密码：4201</span>
</div>
<div class="tips">
<span>会计</span>
<span>账号：7003</span>
<span>密码：7003</span>
<span>金工车间</span>
<span>账号：4301</span>
<span>密码：4301</span>
</div>
<div class="tips">
<span>总经理</span>
<span>账号：1002</span>
<span>密码：1002</span>
</div>
<div class="tips">
<span>工艺定额员</span>
<span>账号：6301</span>
<span>密码：6301</span>
<span>装配车间</span>
<span>账号：4401</span>
<span>密码：4401</span>
</div>
</div>
</el-form>