meswork/JY1.0
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://123.56.95.229:10010/r/高精

Browse Source
This commit is contained in:
liulujia@meswork.com
2020-02-12 08:39:37 +08:00
parent 347babb73b 21010d5403
commit 84434c5854
201 changed files with 4442 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

170
src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
View File

@@ -23,12 +23,12 @@
{{ scope.row.开票金额 }}
</template>
</el-table-column>
<el-table-column label="付款金额(元)" align="center">
<el-table-column label="付款金额(元)" align="center" width="130px">
<template slot-scope="scope">
{{ scope.row.备注 }}
</template>
</el-table-column>
<el-table-column label="未付金额(元)" align="center">
<el-table-column label="未付金额(元)" align="center" width="130px">
<template slot-scope="scope">
{{ scope.row.备注 }}
</template>
@@ -52,21 +52,21 @@
<el-button class="button111" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="handleAdd1()">新增</el-button>
</el-row>
<el-table v-loading="loading2" :data="tableData2" size="mini" stripe height="500" style="width: 100%" border element-loading-text="拼命加载中">
<el-table-column label="发票号" prop="外协厂家名称" align="center" width="230px">
<el-table-column label="发票号" prop="发票号" align="center" width="230px">
<template slot-scope="scope">
{{ scope.row.外协厂家名称 }}
{{ scope.row.发票号 }}
</template>
</el-table-column>
<el-table-column label="开票金额" prop="总价" align="center" width="200px">
<template slot-scope="scope">
{{ scope.row.总价 }}
</template>
</el-table-column>
<el-table-column label="开票时间" align="center" width="130px" prop="开票金额">
<el-table-column label="开票金额" prop="开票金额" align="center" width="200px">
<template slot-scope="scope">
{{ scope.row.开票金额 }}
</template>
</el-table-column>
<el-table-column label="开票时间" align="center" width="130px" prop="开票日期">
<template slot-scope="scope">
{{ scope.row.开票时间 }}
</template>
</el-table-column>
</el-table>
<div class="block">
<el-pagination
@@ -86,14 +86,14 @@
<el-button class="button111" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="handleAdd2()">新增</el-button>
</el-row>
<el-table v-loading="loading3" :data="tableData3" size="mini" stripe height="500" style="width: 100%" border element-loading-text="拼命加载中">
<el-table-column label="付款金额" prop="外协厂家名称" align="center" width="230px">
<el-table-column label="付款金额" prop="付款金额" align="center" width="230px">
<template slot-scope="scope">
{{ scope.row.外协厂家名称 }}
{{ scope.row.付款金额 }}
</template>
</el-table-column>
<el-table-column label="付款时间" prop="总价" align="center" width="200px">
<el-table-column label="付款日期" prop="总价" align="center" width="200px">
<template slot-scope="scope">
{{ scope.row.总价 }}
{{ scope.row.付款日期 }}
</template>
</el-table-column>
</el-table>
@@ -142,16 +142,44 @@
<el-button type="primary" @click="submit1('form1')" >确定</el-button>
</div>
</el-dialog>
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible2" title="新增付款" center style="min-height: 300px" width="400px">
<el-form ref="form2" :model="form2" :rules="rules" label-position="left" label-width="100px" class="demo-ruleForm">
<el-row>
<el-form-item label="付款金额" prop="付款金额">
<el-input v-model="form2.付款金额" placeholder="开票金额" style="width:200px" clearable size="small"/>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="付款时间" prop="付款时间">
<el-date-picker
v-model="form2.付款时间"
style="width:200px"
size="small"
type="date"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
clearable
placeholder="付款时间"/>
</el-form-item>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="callOff2('form2')">取消</el-button>
<el-button type="primary" @click="submit2('form2')" >确定</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { searchtable, getInvoice, getPayment, AddType1, handlechange, handledelete } from '@/api/Outsourcing/OutsourcingPaymentPlanManagement'
import { searchtable, getInvoice, getPayment, AddType1, AddType2, handlechange, handledelete } from '@/api/Outsourcing/OutsourcingPaymentPlanManagement'
export default {
data() {
return {
ManufacturerName: '', // 外协厂家
外协厂家流水号: '',
外协厂家流水号_Select: '',
loading: false,
tableData: [], // 表格数据
total: null, // 总条数
@@ -167,13 +195,26 @@ export default {
total3: null, // 总条数
pageSize3: 50, // 每页显示条数
pageCurrent3: 1, // 后台获取页
param1: 0,
dialogFormVisible1: false,
form1: {
发票号: '',
开票时间: '',
开票金额: ''
},
rules: {}
param2: 0,
dialogFormVisible2: false,
form2: {
付款金额: '',
付款时间: ''
},
rules: {
发票号: [{ required: true, message: '请输入发票号', trigger: 'blur' }],
开票时间: [{ required: true, message: '请选择开票时间', trigger: 'change' }],
开票金额: [{ required: true, message: '请输入开票金额', trigger: 'blur' }],
付款时间: [{ required: true, message: '请选择开票时间', trigger: 'change' }],
付款金额: [{ required: true, message: '请输入开票金额', trigger: 'blur' }]
}
}
},
created() {
@@ -182,13 +223,13 @@ export default {
methods: {
// 获取表格1数据
getParts() {
this.外协厂家流水号 = ''
this.loading = true
this.tableData = []
var check
var check2 = 0
this.ManufacturerName ? check = 1 : check = 0
searchtable(check, this.ManufacturerName, check2, '', '', this.pageCurrent, this.pageSize).then(response => {
console.log(response.data)
this.loading = false
if (response.data.rows.length !== 0) {
this.tableData = response.data.rows
@@ -198,20 +239,19 @@ export default {
},
rowClick(row) {
this.外协厂家流水号 = row.外协厂家流水号
this.外协厂家流水号_Select = row.外协厂家流水号
this.loading2 = true
this.tableData2 = []
this.loading3 = true
this.tableData3 = []
getInvoice(row.外协厂家流水号, this.pageCurrent2, this.pageSize2).then(response => {
console.log(response.data, 2)
this.loading2 = false
if (response.data.rows.length !== 0) {
this.tableData2 = response.data.rows
this.total2 = response.data.total
}
})
getPayment(this.外协厂家流水号, this.pageCurrent2, this.pageSize2).then(response => {
console.log(response.data, 3)
getPayment(row.外协厂家流水号, this.pageCurrent2, this.pageSize2).then(response => {
this.loading3 = false
if (response.data.rows.length !== 0) {
this.tableData3 = response.data.rows
@@ -220,11 +260,10 @@ export default {
})
},
// 发票
getInvoice(row) {
getInvoice() {
this.loading2 = true
this.tableData2 = []
getInvoice(this.外协厂家流水号, this.pageCurrent2, this.pageSize2).then(response => {
console.log(response.data, 2)
getInvoice(this.外协厂家流水号_Select, this.pageCurrent2, this.pageSize2).then(response => {
this.loading2 = false
if (response.data.rows.length !== 0) {
this.tableData2 = response.data.rows
@@ -233,11 +272,10 @@ export default {
})
},
// 付款
getPayment(row) {
getPayment() {
this.loading3 = true
this.tableData3 = []
getPayment(this.外协厂家流水号, this.pageCurrent2, this.pageSize2).then(response => {
console.log(response.data, 3)
getPayment(this.外协厂家流水号_Select, this.pageCurrent2, this.pageSize2).then(response => {
this.loading3 = false
if (response.data.rows.length !== 0) {
this.tableData3 = response.data.rows
@@ -247,22 +285,25 @@ export default {
},
// 点击增加
handleAdd1(formName) {
this.form1.发票号 = ''
this.form1.开票时间 = ''
this.form1.开票金额 = ''
this.form1.外协厂家 = ''
this.dialogFormVisible1 = true
if (this.外协厂家流水号) {
this.param1 = 1
this.form1.发票号 = ''
this.form1.开票时间 = ''
this.form1.开票金额 = ''
this.form1.外协厂家 = ''
this.dialogFormVisible1 = true
} else {
this.$message.error('请先选择外协厂家')
}
},
// 增加确定
AddType1() {
AddType1(this.外协厂家流水号, this.form.发票号, this.form.开票时间, this.form.开票金额, this.form.外协厂家).then(response => {
AddType1(this.外协厂家流水号, this.form1.发票号, this.form1.开票时间, this.form1.开票金额).then(response => {
if (response.data[0].result === '1') {
this.$notify({
title: '成功',
message: '信息增加成功',
type: 'success'
})
this.$message.success('信息增加成功')
this.getParts()
this.getInvoice()
this.getPayment()
} else {
this.$message.error('信息增加失败')
}
@@ -270,7 +311,8 @@ export default {
this.dialogFormVisible1 = false
},
// 编辑打开
handleChange1(index, row, formName) {
ChangeOpen1(index, row, formName) {
this.param1 = 0
this.form1.外协厂家 = row.外协厂家流水号
this.form1.发票号 = row.发票号
this.form1.开户行 = row.开户行
@@ -282,7 +324,7 @@ export default {
this.dialogFormVisible1 = true
},
// 编辑确定
handleChange() {
handleChange1() {
handlechange(this.CoManufacturerFlowNumber1, this.form.发票号, this.form.开户行, this.form.开票时间, this.form.开票金额, this.form.接收人, this.form.接收时间, this.form.备注).then(response => {
if (response.data[0].result === '1') {
this.$notify({
@@ -298,13 +340,13 @@ export default {
this.dialogFormVisible1 = false
},
// 提交添加或者修改
submit(formName) {
submit1(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
if (this.param === 0) {
this.editType()
if (this.param1 === 0) {
this.handleChange1()
} else {
this.handleChange()
this.AddType1()
}
} else {
return false
@@ -312,7 +354,7 @@ export default {
})
},
// 重置表单
callOff(formName) {
callOff1(formName) {
this.dialogFormVisible1 = false
this.$refs[formName].resetFields()
},
@@ -345,6 +387,46 @@ export default {
})
})
},
handleAdd2(formName) {
if (this.外协厂家流水号) {
this.param2 = 1
this.form2.付款时间 = ''
this.form2.付款金额 = ''
this.dialogFormVisible2 = true
} else {
this.$message.error('请先选择外协厂家')
}
},
AddType2() {
AddType2(this.外协厂家流水号, this.form2.付款金额, this.form2.付款时间).then(response => {
if (response.data[0].result === '1') {
this.$message.success('信息增加成功')
this.getParts()
this.getInvoice()
this.getPayment()
} else {
this.$message.error('信息增加失败')
}
})
this.dialogFormVisible2 = false
},
submit2(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
if (this.param2 === 0) {
this.handleChange2()
} else {
this.AddType2()
}
} else {
return false
}
})
},
callOff2(formName) {
this.dialogFormVisible2 = false
this.$refs[formName].resetFields()
},
// 分页
handleSizeChange(val) {
this.pageCurrent = 1

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

@@ -39,7 +39,7 @@
</el-table-column>
<el-table-column label="数量" align="center" width="60px">
<template slot-scope="scope">
{{ scope.row.批次数量 }}
{{ scope.row.投产数量 }}
</template>
</el-table-column>
</el-table>
@@ -84,7 +84,7 @@
{{ scope.row.计划日期 }}
</template>
</el-table-column>
<el-table-column label="工序工时" align="center" width="85px">
<el-table-column label="计划工时" align="center" width="85px">
<template slot-scope="scope">
{{ scope.row.工序工时 }}
</template>
@@ -327,7 +327,7 @@ export default {
background: #9bd7fc !important;
}
.XJWXywc{
background: #AEF199 !important;
background: rgb(103,194,58) !important;
}
</style>

30
src/views/TechnologyCenter/ImportParts/uploadFile.js
View File

@@ -1,4 +1,6 @@
import request from '@/utils/request'
import state from '@/store'
import router from '@/router'
// 初始化 项目名称
export function initProject() {
@@ -6,6 +8,8 @@ export function initProject() {
url: '',
method: 'post',
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '1',
name: 'PDM_项目名称_查询数据_按时间排序'
}
@@ -17,6 +21,8 @@ export function upload(project, machine, group, designer) {
url: '',
method: 'post',
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '2',
name: '组件明细表_基本件_导入数据',
param: '项目=' + project + '&机床=' + machine + '&组号=' + group + '&设计者=' + designer
@@ -29,6 +35,8 @@ export function upload1(designer, time, project, machine, group, num1, num2, nam
url: '',
method: 'post',
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '2',
name: '组件明细表_基本件_导入数据1',
param: '设计者=' + designer + '&保存时间=' + time + '&项目=' + project + '&机床=' + machine + '&组号=' + group + '&序号=' + num1 + '&图号或者型号=' + num2 + '=string&名称=' + name + '&材料或者规格=' + size + '&数量=' + num3 + '&供货商=' + supplier + '&备注=' + remark + '&标记=' + mark
@@ -41,6 +49,8 @@ export function searchPart(project, machine, group) {
url: '',
method: 'post',
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '1',
name: '导入数据_查询',
param: '项目=' + project + '&机床=' + machine + '&组号=' + group
@@ -53,6 +63,8 @@ export function outBuyUpload(project, machine, group, designer) {
url: '',
method: 'post',
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '2',
name: '组件明细表_外购件_导入数据',
param: '项目=' + project + '&机床=' + machine + '&组号=' + group + '&设计者=' + designer
@@ -65,6 +77,8 @@ export function outBuyUpload1(designer, time, project, machine, group, num1, num
url: '',
method: 'post',
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '2',
name: '组件明细表_外购件_导入数据1',
param: '设计者=' + designer + '&保存时间=' + time + '&项目=' + project + '&机床=' + machine + '&组号=' + group + '&序号=' + num1 + '&图号或者型号=' + num2 + '&名称=' + name + '&材料或者规格=' + size + '&数量=' + num3 + '&供货商=' + supplier + '&备注=' + remark + '&标记=' + mark
@@ -77,6 +91,8 @@ export function outBuySearchPart(project, machine, group) {
url: '',
method: 'post',
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '1',
name: '导入数据_外购件_查询',
param: '项目=' + project + '&机床=' + machine + '&组号=' + group
@@ -89,6 +105,8 @@ export function searchBasePartDetail(project, machine, group) {
url: '',
method: 'post',
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '1',
name: 'PDM_零件明细表_基本件_数据导入保存_查询数据_综合_全部',
param: '项目=' + project + '&机床=' + machine + '&组号=' + group
@@ -101,6 +119,8 @@ export function searchOutPartDetail(project, machine, group) {
url: '',
method: 'post',
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '1',
name: 'PDM_零件明细表_外购件和标准件_数据导入保存_综合_全部',
param: '项目=' + project + '&机床=' + machine + '&组号=' + group
@@ -113,6 +133,8 @@ export function deleteTable1(id) {
url: '',
method: 'post',
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '2',
name: 'PDM_零件明细表_基本件_数据导入保存_删除数据',
param: 'id=' + id
@@ -125,6 +147,8 @@ export function deleteTable2(id) {
url: '',
method: 'post',
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '2',
name: 'PDM_零件明细表_外购件和标准件_数据导入保存_删除数据',
param: 'id=' + id
@@ -137,6 +161,8 @@ export function initStandard1() {
url: '',
method: 'post',
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '1',
name: 'PDM_零件明细表_基本件_数据导入保存_查询数据_规范表_备注'
}
@@ -148,6 +174,8 @@ export function initStandard2() {
url: '',
method: 'post',
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '1',
name: 'PDM_零件明细表_基本件_数据导入保存_查询数据_规范表_材料或者规格'
}
@@ -159,6 +187,8 @@ export function initStandard3() {
url: '',
method: 'post',
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '1',
name: 'PDM_零件明细表_基本件_数据导入保存_查询数据_规范表_物料流水号'
}