-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- 表单号:
-
- 任务下达时间段:
-
- ~
-
-
-
- 厂家名:
+ 厂家:
- 实际付款时间段:
-
- ~
-
- 查询
+ 查询
-
-
-
+
-
+
已付
未付
-
+
已到
未到
-
+
{{ scope.row.表单号 }}
-
+
{{ scope.row.外协厂家名称 }}
+
+
+ {{ scope.row.总价 }}
+
+
+
+
+ {{ scope.row.扣款_质量 }}
+
+
+
+
+ {{ scope.row.扣款_计划 }}
+
+
+
+
+ {{ scope.row.扣款_其他 }}
+
+
+
+
+ {{ scope.row.应付总额 }}
+
+
{{ scope.row.任务下达日期 }}
@@ -89,93 +111,65 @@
{{ scope.row.外协员姓名 }}
-
-
-
- {{ scope.row.加工价格_预算_总价 }}
-
-
-
-
- {{ scope.row.加工价格_成交_总价 }}
-
-
-
-
-
- {{ scope.row.材料价格_价格_总价 }}
-
-
-
-
- {{ scope.row.运费 }}
-
-
-
-
- {{ scope.row.其他价格_总价 }}
-
-
-
-
- {{ scope.row.总价 }}
-
-
-
-
-
- {{ scope.row.扣款_质量 }}
-
-
-
-
- {{ scope.row.扣款_计划 }}
-
-
-
-
- {{ scope.row.扣款_其他 }}
-
-
-
-
-
- {{ scope.row.应付总额 }}
-
-
-
-
-
- {{ scope.row.入库时间 }}
-
-
-
-
- {{ scope.row.计划付款时间 }}
-
-
-
-
- {{ scope.row.实际付款时间 }}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ scope.row.扣款说明 }}
-
+
-
- 到票
-
+
+
+
+
+ 厂家:
+
+
+
+ 查询
+
+ 到票
+
+
+
+
+ {{ scope.row.外协厂家名称 }}
+
+
{{ scope.row.发票号 }}
-
-
- {{ scope.row.接收人 }}
-
-
-
-
- {{ scope.row.开户行 }}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
{{ scope.row.开票金额 }}
-
+
- {{ scope.row.开票时间 }}
+ {{ scope.row.开票时间 === '1900/1/1' ? '-' : scope.row.开票时间 }}
-
+
- {{ scope.row.接收时间 }}
+ {{ scope.row.接收时间 === '1900/1/1' ? '-' : scope.row.接收时间 }}
@@ -246,22 +259,10 @@
{{ scope.row.备注 }}
-
+
- 编辑
- 删除
+ 编辑
+ 删除
@@ -269,7 +270,7 @@
+
+
+
+
+
+
+
+
+
@@ -381,6 +395,7 @@ export default {
count1: 0,
count2: 0,
form: {
+ 外协厂家: '',
发票号: '',
开户行: '',
开票时间: '',
@@ -389,6 +404,7 @@ export default {
接收时间: '',
备注: ''
},
+ 外协厂家: [],
实际付款时间: '',
loading: false,
loading2: false,
@@ -401,6 +417,7 @@ export default {
扣款说明: ''
},
rules: {
+ 外协厂家: [{ required: true, message: '请选择外协厂家', trigger: 'change' }],
发票号: [{ required: true, message: '请输入发票号', trigger: 'blur' }],
开票金额: [{ required: true, message: '请输入开票金额', trigger: 'blur' }],
扣款说明: [{ required: true, message: '请输入扣款说明', trigger: 'blur' }]
@@ -412,23 +429,26 @@ export default {
FormNumber: '',
ManufacturerNameValue: '',
ManufacturerName: [], // 厂家名称
+ ManufacturerNameValue2: '',
+ ManufacturerName2: [], // 厂家名称
FormNumber_check: false,
ManufacturerNameValue_check: false,
date1_check: false,
date3_check: false,
tableData: [], // 表格数据
total: null, // 总条数
- pageSize: 10, // 每页显示条数
+ pageSize: 20, // 每页显示条数
pageCurrent: 1, // 后台获取页
tableData2: [], // 表格数据
total2: null, // 总条数
- pageSize2: 10, // 每页显示条数
+ pageSize2: 20, // 每页显示条数
pageCurrent2: 1 // 后台获取页
}
},
created() {
this.fetchData()
this.searchTable()
+ this.getParts()
},
methods: {
getSummaries(param) {
@@ -459,12 +479,22 @@ export default {
// 初始化外协厂家
fetchData() {
this.ManufacturerName = []
+ this.ManufacturerName2 = []
+ this.外协厂家 = []
initOutHelp().then(response => {
for (let i = 0; i < response.data.length; i++) {
this.ManufacturerName.push({
label: response.data[i].外协厂家名称,
value: response.data[i].外协厂家流水号
})
+ this.ManufacturerName2.push({
+ label: response.data[i].外协厂家名称,
+ value: response.data[i].外协厂家流水号
+ })
+ this.外协厂家.push({
+ label: response.data[i].外协厂家名称,
+ value: response.data[i].外协厂家流水号
+ })
}
})
},
@@ -492,7 +522,6 @@ export default {
this.date3_check = true
}
this.tableData = []
- this.tableData2 = []
searchtable(this.FormNumber_check, this.FormNumber, this.ManufacturerNameValue_check, this.ManufacturerNameValue, this.date1_check, this.date1, this.date2, this.date3_check, this.date3, this.date4, this.pageCurrent, this.pageSize).then(response => {
for (let i = 0; i < response.data.rows.length; i++) {
response.data.rows[i].任务下达日期 = response.data.rows[i].任务下达日期.substring(0, response.data.rows[i].任务下达日期.indexOf(' '))
@@ -574,15 +603,14 @@ export default {
this.$refs[formName].resetFields()
},
// 获取表格2数据
- getParts(row) {
+ getParts() {
this.loading2 = true
this.tableData2 = []
- this.zhongjianbianliang = row.外协加工任务单流水号
- this.fukuanshijian = row.实际付款时间
- getParts(row.外协加工任务单流水号, this.pageCurrent2, this.pageSize2).then(response => {
- if (response.data.rows.length === 0) {
- this.loading2 = false
- } else {
+ let check
+ this.ManufacturerNameValue2 ? check = 1 : check = 0
+ getParts(check, this.ManufacturerNameValue2, this.pageCurrent2, this.pageSize2).then(response => {
+ this.loading2 = false
+ if (response.data.rows.length !== 0) {
for (let i = 0; i < response.data.rows.length; i++) {
response.data.rows[i].开票时间 = response.data.rows[i].开票时间.substring(0, response.data.rows[i].开票时间.indexOf(' '))
response.data.rows[i].接收时间 = response.data.rows[i].接收时间.substring(0, response.data.rows[i].接收时间.indexOf(' '))
@@ -590,8 +618,6 @@ export default {
this.tableData2 = response.data.rows
this.total2 = response.data.total
}
- }).then(() => {
- this.loading2 = false
})
},
getParts2() {
@@ -609,13 +635,13 @@ export default {
})
},
// 点击增加
- editType1(row, formName) {
+ editType1(formName) {
this.count1 = this.count1 + 1
if (this.count1 !== 1) {
this.$refs[formName].resetFields()
}
this.title1 = '到票'
- this.renwudan = row.外协加工任务单流水号
+ // this.renwudan = row.外协加工任务单流水号
this.form.发票号 = ''
this.form.开户行 = ''
this.form.开票时间 = ''
@@ -623,18 +649,19 @@ export default {
this.form.接收人 = ''
this.form.接收时间 = ''
this.form.备注 = ''
+ this.form.外协厂家 = ''
this.dialogFormVisible = true
},
// 增加确定
editType() {
- edittype(this.renwudan, this.form.发票号, this.form.开户行, this.form.开票时间, this.form.开票金额, this.form.接收人, this.form.接收时间, this.form.备注).then(response => {
+ edittype(this.form.外协厂家, this.form.发票号, this.form.开户行, this.form.开票时间, this.form.开票金额, this.form.接收人, this.form.接收时间, this.form.备注).then(response => {
if (response.data[0].result === '1') {
this.$notify({
title: '成功',
message: '信息增加成功',
type: 'success'
})
- this.getParts2()
+ this.getParts()
} else {
this.$message.error('信息增加失败')
}
@@ -647,6 +674,13 @@ export default {
if (this.count2 !== 1) {
this.$refs[formName].resetFields()
}
+ if (row.开票时间 === '1900/1/1') {
+ row.开票时间 = ''
+ }
+ if (row.接收时间 === '1900/1/1') {
+ row.接收时间 = ''
+ }
+ this.form.外协厂家 = row.外协厂家流水号
this.form.发票号 = row.发票号
this.form.开户行 = row.开户行
this.form.开票时间 = row.开票时间
@@ -667,7 +701,7 @@ export default {
message: '信息修改成功',
type: 'success'
})
- this.getParts2()
+ this.getParts()
} else {
this.$message.error('信息修改失败')
}
@@ -710,7 +744,7 @@ export default {
message: '信息删除成功',
type: 'success'
})
- this.getParts2()
+ this.getParts()
} else {
this.$message.error('信息删除失败')
}
@@ -735,12 +769,12 @@ export default {
handleSizeChange2(val) {
this.pageCurrent2 = 1
this.pageSize2 = val
- this.getParts2()
+ this.getParts()
},
handleCurrentChange2(val) {
this.pageCurrent2 = val
this.tableData2 = []
- this.getParts2()
+ this.getParts()
}
}
}
diff --git a/src/views/Outsourcing/OutsourcingStatus/index.vue b/src/views/Outsourcing/OutsourcingStatus/index.vue
index 2b889a3e..cb4bcd5f 100644
--- a/src/views/Outsourcing/OutsourcingStatus/index.vue
+++ b/src/views/Outsourcing/OutsourcingStatus/index.vue
@@ -4,50 +4,126 @@
零件号:
+ 厂家:
+
+
+
查询
-
-
-
-
-
+
+
+
- {{ scope.row.机床图号 }}
+ 已付
+ 未付
-
+
- {{ scope.row.组号 }}
+ 已到
+ 未到
-
+
- {{ scope.row.零件图号 }}
+ {{ scope.row.表单号 }}
-
+
- {{ scope.row.零件名称 }}
+ {{ scope.row.外协厂家名称 }}
-
+
- {{ scope.row.批次数量 }}
+ {{ scope.row.总价 }}
-
+
+
+ {{ scope.row.扣款_质量 }}
+
+
+
+
+ {{ scope.row.扣款_计划 }}
+
+
+
+
+ {{ scope.row.扣款_其他 }}
+
+
+
+
+ {{ scope.row.应付总额 }}
+
+
+
+
+ {{ scope.row.任务下达日期 }}
+
+
+
+
+ {{ scope.row.外协员姓名 }}
+
+
+
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+ {{ scope.row.扣款说明 }}
@@ -118,9 +194,6 @@ export default {