更新
This commit is contained in:
@@ -190,9 +190,12 @@
|
|||||||
:value="item.value"/>
|
:value="item.value"/>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="人员编号" prop="DirectNoteCode" label-width="100px" size="small">
|
<el-form-item label="备注" label-width="100px" size="small">
|
||||||
<el-input v-model="form.DirectNoteCode" size="small" placeholder="请输入人员编号" style="width: 200px"/>
|
<el-input v-model="form.Remarks" size="small" placeholder="备注" style="width: 200px"/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
<!--<el-form-item label="人员编号" prop="DirectNoteCode" label-width="100px" size="small">-->
|
||||||
|
<!--<el-input v-model="form.DirectNoteCode" size="small" placeholder="请输入人员编号" style="width: 200px"/>-->
|
||||||
|
<!--</el-form-item>-->
|
||||||
<!-- <el-form-item label="领料人" prop="DirectNote" label-width="100px">-->
|
<!-- <el-form-item label="领料人" prop="DirectNote" label-width="100px">-->
|
||||||
<!-- <el-input v-model="form.DirectNote" size="small" placeholder="请输入领料人" style="width: 200px"/>-->
|
<!-- <el-input v-model="form.DirectNote" size="small" placeholder="请输入领料人" style="width: 200px"/>-->
|
||||||
<!-- </el-form-item>-->
|
<!-- </el-form-item>-->
|
||||||
@@ -233,12 +236,13 @@ export default {
|
|||||||
DirectNumber: 1,
|
DirectNumber: 1,
|
||||||
PeopleValue: '',
|
PeopleValue: '',
|
||||||
DirectNote: '',
|
DirectNote: '',
|
||||||
DirectNoteCode: ''
|
Remarks: ''
|
||||||
|
// DirectNoteCode: ''
|
||||||
},
|
},
|
||||||
rules: { // 表单验证规则
|
rules: { // 表单验证规则
|
||||||
ProjectValue: [{ required: true, message: '请选择项目', trigger: 'blur' }],
|
ProjectValue: [{ required: true, message: '请选择项目', trigger: 'blur' }],
|
||||||
MachineValue: [{ required: true, message: '请选择机床', trigger: 'blur' }],
|
MachineValue: [{ required: true, message: '请选择机床', trigger: 'blur' }],
|
||||||
DirectNoteCode: [{ required: true, message: '请输入人员编号', trigger: 'blur' }],
|
// DirectNoteCode: [{ required: true, message: '请输入人员编号', trigger: 'blur' }],
|
||||||
// GroupNumValue: [{ required: true, message: '请选择分组', trigger: 'blur' }],
|
// GroupNumValue: [{ required: true, message: '请选择分组', trigger: 'blur' }],
|
||||||
DirectNumber: [
|
DirectNumber: [
|
||||||
{ required: true, message: '请输入数量', trigger: 'blur' },
|
{ required: true, message: '请输入数量', trigger: 'blur' },
|
||||||
@@ -396,7 +400,7 @@ export default {
|
|||||||
},
|
},
|
||||||
// 打开表单
|
// 打开表单
|
||||||
parOut(row) {
|
parOut(row) {
|
||||||
this.form.DirectNoteCode = ''
|
// this.form.DirectNoteCode = ''
|
||||||
this.locateNumber = row.货位流水号
|
this.locateNumber = row.货位流水号
|
||||||
this.materialNumber = row.物料流水号
|
this.materialNumber = row.物料流水号
|
||||||
this.partnumber = row.货位存量
|
this.partnumber = row.货位存量
|
||||||
@@ -433,7 +437,7 @@ export default {
|
|||||||
} else {
|
} else {
|
||||||
this.$refs['form'].validate((valid) => {
|
this.$refs['form'].validate((valid) => {
|
||||||
if (valid) {
|
if (valid) {
|
||||||
if (Number(this.form.DirectNoteCode) === Number(this.form.DirectNote)) {
|
if (this.form.DirectNote) {
|
||||||
this.buttonDisable = true
|
this.buttonDisable = true
|
||||||
for (let i = 0; i < this.departments.length; i++) {
|
for (let i = 0; i < this.departments.length; i++) {
|
||||||
if (this.form.department === this.departments[i].value) {
|
if (this.form.department === this.departments[i].value) {
|
||||||
@@ -445,7 +449,7 @@ export default {
|
|||||||
this.DirectNote111 = this.DirectNotes[i].label
|
this.DirectNote111 = this.DirectNotes[i].label
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
outlinePartOut(this.form.PeopleValue, this.form.DirectNumber, this.locateNumber, this.DirectNote111, this.form.ProjectValue, this.form.MachineValue, this.form.GroupNumValue, this.materialNumber, this.PeopleNumber, this.离线合同明细流水号, this.组件零件基本件流水号, this.department111).then(response => {
|
outlinePartOut(this.form.PeopleValue, this.form.DirectNumber, this.locateNumber, this.DirectNote111, this.form.ProjectValue, this.form.MachineValue, this.form.GroupNumValue, this.materialNumber, this.PeopleNumber, this.离线合同明细流水号, this.组件零件基本件流水号, this.department111, this.form.Remarks).then(response => {
|
||||||
if (response.data[0].result === '1') {
|
if (response.data[0].result === '1') {
|
||||||
this.$message.success('零件出库成功')
|
this.$message.success('零件出库成功')
|
||||||
this.dialogFormVisible = false
|
this.dialogFormVisible = false
|
||||||
@@ -461,7 +465,7 @@ export default {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
this.$message.error('人员编号错误')
|
this.$message.error('请选择领料人')
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
console.log('error submit!!')
|
console.log('error submit!!')
|
||||||
|
|||||||
@@ -103,7 +103,7 @@
|
|||||||
</el-tooltip>
|
</el-tooltip>
|
||||||
<el-tooltip :open-delay="1000" effect="dark" content="撤销审核" placement="top">
|
<el-tooltip :open-delay="1000" effect="dark" content="撤销审核" placement="top">
|
||||||
<div style="display: inline-block">
|
<div style="display: inline-block">
|
||||||
<el-button type="text" size="mini" @click="editSubmit(scope.row)">撤销</el-button>
|
<el-button :disabled="scope.row.审核情况流水号 === '3'" type="text" size="mini" @click="editSubmit(scope.row)">撤销</el-button>
|
||||||
</div>
|
</div>
|
||||||
</el-tooltip>
|
</el-tooltip>
|
||||||
</template>
|
</template>
|
||||||
@@ -210,7 +210,7 @@ export default {
|
|||||||
if (row.审批情况流水号 !== '3') {
|
if (row.审批情况流水号 !== '3') {
|
||||||
this.$message.error('该合同已审批,无法撤回!')
|
this.$message.error('该合同已审批,无法撤回!')
|
||||||
} else {
|
} else {
|
||||||
this.$confirm('确定删除?', '提示', {
|
this.$confirm('确定撤销你的审核意见吗?', '提示', {
|
||||||
confirmButtonText: '确定',
|
confirmButtonText: '确定',
|
||||||
cancelButtonText: '取消',
|
cancelButtonText: '取消',
|
||||||
type: 'warning'
|
type: 'warning'
|
||||||
@@ -218,6 +218,7 @@ export default {
|
|||||||
editsubmit(row.采购合同流水号).then(response => {
|
editsubmit(row.采购合同流水号).then(response => {
|
||||||
if (response.data[0].result === '1') {
|
if (response.data[0].result === '1') {
|
||||||
this.$message.success('撤销成功')
|
this.$message.success('撤销成功')
|
||||||
|
this.searchTable1()
|
||||||
} else {
|
} else {
|
||||||
this.$message.error('操作失败')
|
this.$message.error('操作失败')
|
||||||
}
|
}
|
||||||
@@ -229,7 +230,6 @@ export default {
|
|||||||
})
|
})
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
this.searchTable1()
|
|
||||||
},
|
},
|
||||||
handleSizeChange1(val) {
|
handleSizeChange1(val) {
|
||||||
this.pageCurrent1 = 1
|
this.pageCurrent1 = 1
|
||||||
|
|||||||
@@ -103,7 +103,7 @@
|
|||||||
</el-tooltip>
|
</el-tooltip>
|
||||||
<el-tooltip :open-delay="1000" effect="dark" content="撤销审核" placement="top">
|
<el-tooltip :open-delay="1000" effect="dark" content="撤销审核" placement="top">
|
||||||
<div style="display: inline-block">
|
<div style="display: inline-block">
|
||||||
<el-button type="text" size="mini" @click="editSubmit(scope.row)">撤销</el-button>
|
<el-button :disabled="scope.row.审批情况流水号 === '3'" type="text" size="mini" @click="editSubmit(scope.row)">撤销</el-button>
|
||||||
</div>
|
</div>
|
||||||
</el-tooltip>
|
</el-tooltip>
|
||||||
</template>
|
</template>
|
||||||
@@ -129,7 +129,7 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { initBuyer, searchTable1, searchTable2, editsubmit } from '@/api/ManufacturingCenter/ContractApprovalQuery'
|
import { initBuyer, searchTable1, searchTable2, editsubmit } from '@/api/ManufacturingCenter/ContractApprovalQuery1'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
data() {
|
data() {
|
||||||
@@ -207,10 +207,10 @@ export default {
|
|||||||
})
|
})
|
||||||
},
|
},
|
||||||
editSubmit(row) {
|
editSubmit(row) {
|
||||||
if (row.审批情况流水号 !== '3') {
|
if (row.采购合同请款明细流水号 !== '') {
|
||||||
this.$message.error('该合同已审批,无法撤回!')
|
this.$message.error('该合同已请款,无法撤回!')
|
||||||
} else {
|
} else {
|
||||||
this.$confirm('确定撤回?', '提示', {
|
this.$confirm('确定撤回你的审批意见吗?', '提示', {
|
||||||
confirmButtonText: '确定',
|
confirmButtonText: '确定',
|
||||||
cancelButtonText: '取消',
|
cancelButtonText: '取消',
|
||||||
type: 'warning'
|
type: 'warning'
|
||||||
@@ -218,6 +218,7 @@ export default {
|
|||||||
editsubmit(row.采购合同流水号).then(response => {
|
editsubmit(row.采购合同流水号).then(response => {
|
||||||
if (response.data[0].result === '1') {
|
if (response.data[0].result === '1') {
|
||||||
this.$message.success('撤销成功')
|
this.$message.success('撤销成功')
|
||||||
|
this.searchTable1()
|
||||||
} else {
|
} else {
|
||||||
this.$message.error('操作失败')
|
this.$message.error('操作失败')
|
||||||
}
|
}
|
||||||
@@ -229,7 +230,6 @@ export default {
|
|||||||
})
|
})
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
this.searchTable1()
|
|
||||||
},
|
},
|
||||||
handleSizeChange1(val) {
|
handleSizeChange1(val) {
|
||||||
this.pageCurrent1 = 1
|
this.pageCurrent1 = 1
|
||||||
|
|||||||
@@ -83,7 +83,7 @@
|
|||||||
<el-table-column label="操作" align="center" width="100px">
|
<el-table-column label="操作" align="center" width="100px">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-button v-if="checked" type="text" size="mini" icon="el-icon-right" plain @click="inParts(scope.row)">解除禁用</el-button>
|
<el-button v-if="checked" type="text" size="mini" icon="el-icon-right" plain @click="inParts(scope.row)">解除禁用</el-button>
|
||||||
<el-button v-else type="text" size="mini" icon="el-icon-right" plain @click="OutParts(scope.row)">移出</el-button>
|
<el-button v-else type="text" size="mini" icon="el-icon-right" plain @click="OutParts(scope.row)">禁用</el-button>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
@@ -632,6 +632,7 @@ export default {
|
|||||||
MaterialModel: [],
|
MaterialModel: [],
|
||||||
NumberOfParts: [],
|
NumberOfParts: [],
|
||||||
multipleSelection: [],
|
multipleSelection: [],
|
||||||
|
multipleSelection_variable: [],
|
||||||
multipleSelection10: [],
|
multipleSelection10: [],
|
||||||
multipleSelection11: [],
|
multipleSelection11: [],
|
||||||
ReMarks: [],
|
ReMarks: [],
|
||||||
@@ -1281,15 +1282,17 @@ export default {
|
|||||||
this.multipleSelection11 = val
|
this.multipleSelection11 = val
|
||||||
},
|
},
|
||||||
purchaseRequisition() {
|
purchaseRequisition() {
|
||||||
this.purchaseRequisition_loading = true
|
// this.purchaseRequisition_loading = true
|
||||||
var that = this
|
// var that = this
|
||||||
setTimeout(function() {
|
// setTimeout(function() {
|
||||||
that.purchaseRequisition_loading = false
|
// that.purchaseRequisition_loading = false
|
||||||
}, 5000)
|
// }, 5000)
|
||||||
if (this.RequisitionList !== '') {
|
if (this.RequisitionList !== '') {
|
||||||
if (this.time !== '' && this.time !== null) {
|
if (this.time !== '' && this.time !== null) {
|
||||||
if (this.multipleSelection.length !== 0) {
|
if (this.multipleSelection.length !== 0) {
|
||||||
this.result = 0
|
this.result = 0
|
||||||
|
this.multipleSelection_variable = this.multipleSelection
|
||||||
|
this.multipleSelection = []
|
||||||
if (this.PartType === '基本件') {
|
if (this.PartType === '基本件') {
|
||||||
this.MaterialNum = []
|
this.MaterialNum = []
|
||||||
this.BasicPartsNumber = []
|
this.BasicPartsNumber = []
|
||||||
@@ -1297,14 +1300,14 @@ export default {
|
|||||||
this.PartToolNumber = []
|
this.PartToolNumber = []
|
||||||
this.Material = []
|
this.Material = []
|
||||||
this.NumberOfParts = []
|
this.NumberOfParts = []
|
||||||
for (let i = 0; i < this.multipleSelection.length; i++) {
|
for (let i = 0; i < this.multipleSelection_variable.length; i++) {
|
||||||
this.MaterialNum[i] = this.multipleSelection[i].物料流水号
|
this.MaterialNum[i] = this.multipleSelection_variable[i].物料流水号
|
||||||
this.BasicPartsNumber[i] = this.multipleSelection[i].基本件流水号
|
this.BasicPartsNumber[i] = this.multipleSelection_variable[i].基本件流水号
|
||||||
this.MaterialName[i] = this.multipleSelection[i].零件名称
|
this.MaterialName[i] = this.multipleSelection_variable[i].零件名称
|
||||||
this.PartToolNumber[i] = this.multipleSelection[i].零件图号
|
this.PartToolNumber[i] = this.multipleSelection_variable[i].零件图号
|
||||||
this.Material[i] = this.multipleSelection[i].材料
|
this.Material[i] = this.multipleSelection_variable[i].材料
|
||||||
this.NumberOfParts[i] = this.multipleSelection[i].投产总数量
|
this.NumberOfParts[i] = this.multipleSelection_variable[i].投产总数量
|
||||||
this.ReMarks[i] = this.multipleSelection[i].零件备注
|
this.ReMarks[i] = this.multipleSelection_variable[i].零件备注
|
||||||
}
|
}
|
||||||
for (let i = 0; i < this.BasicPartsNumber.length; i++) {
|
for (let i = 0; i < this.BasicPartsNumber.length; i++) {
|
||||||
purchaseRequisition(this.RequisitionList, this.projectName, this.projectFloatValue, this.MachineToolNumber, this.machineFloatValue, this.groupName, this.groupFloatValue, this.BasicPartsNumber[i], this.MaterialName[i], this.PartToolNumber[i], this.Material[i], this.NumberOfParts[i], 3, this.time, this.MaterialNum[i], this.ReMarks[i]).then(response => {
|
purchaseRequisition(this.RequisitionList, this.projectName, this.projectFloatValue, this.MachineToolNumber, this.machineFloatValue, this.groupName, this.groupFloatValue, this.BasicPartsNumber[i], this.MaterialName[i], this.PartToolNumber[i], this.Material[i], this.NumberOfParts[i], 3, this.time, this.MaterialNum[i], this.ReMarks[i]).then(response => {
|
||||||
@@ -1343,15 +1346,15 @@ export default {
|
|||||||
this.MaterialSpecification = []
|
this.MaterialSpecification = []
|
||||||
this.MaterialModel = []
|
this.MaterialModel = []
|
||||||
this.NumberOfParts = []
|
this.NumberOfParts = []
|
||||||
for (let i = 0; i < this.multipleSelection.length; i++) {
|
for (let i = 0; i < this.multipleSelection_variable.length; i++) {
|
||||||
this.StandardPartsAndOutsourcing[i] = this.multipleSelection[i].标准件和外购件流水号
|
this.StandardPartsAndOutsourcing[i] = this.multipleSelection_variable[i].标准件和外购件流水号
|
||||||
this.MaterialNum[i] = this.multipleSelection[i].物料流水号
|
this.MaterialNum[i] = this.multipleSelection_variable[i].物料流水号
|
||||||
this.MaterialCode[i] = this.multipleSelection[i].物料代码
|
this.MaterialCode[i] = this.multipleSelection_variable[i].物料代码
|
||||||
this.MaterialName[i] = this.multipleSelection[i].物料名称
|
this.MaterialName[i] = this.multipleSelection_variable[i].物料名称
|
||||||
this.MaterialSpecification[i] = this.multipleSelection[i].物料规格
|
this.MaterialSpecification[i] = this.multipleSelection_variable[i].物料规格
|
||||||
this.MaterialModel[i] = this.multipleSelection[i].物料型号
|
this.MaterialModel[i] = this.multipleSelection_variable[i].物料型号
|
||||||
this.NumberOfParts[i] = this.multipleSelection[i].采购总数量
|
this.NumberOfParts[i] = this.multipleSelection_variable[i].采购总数量
|
||||||
this.ReMarks[i] = this.multipleSelection[i].备注
|
this.ReMarks[i] = this.multipleSelection_variable[i].备注
|
||||||
}
|
}
|
||||||
for (let i = 0; i < this.StandardPartsAndOutsourcing.length; i++) {
|
for (let i = 0; i < this.StandardPartsAndOutsourcing.length; i++) {
|
||||||
purchaseRequisition1(this.RequisitionList, this.projectName, this.projectFloatValue, this.MachineToolNumber, this.machineFloatValue, this.groupName, this.groupFloatValue, this.StandardPartsAndOutsourcing[i], this.MaterialName[i], this.MaterialCode[i], this.MaterialSpecification[i], this.MaterialModel[i], this.NumberOfParts[i], 2, this.time, this.MaterialNum[i], this.ReMarks[i]).then(response => {
|
purchaseRequisition1(this.RequisitionList, this.projectName, this.projectFloatValue, this.MachineToolNumber, this.machineFloatValue, this.groupName, this.groupFloatValue, this.StandardPartsAndOutsourcing[i], this.MaterialName[i], this.MaterialCode[i], this.MaterialSpecification[i], this.MaterialModel[i], this.NumberOfParts[i], 2, this.time, this.MaterialNum[i], this.ReMarks[i]).then(response => {
|
||||||
@@ -1390,15 +1393,15 @@ export default {
|
|||||||
this.MaterialSpecification = []
|
this.MaterialSpecification = []
|
||||||
this.MaterialModel = []
|
this.MaterialModel = []
|
||||||
this.NumberOfParts = []
|
this.NumberOfParts = []
|
||||||
for (let i = 0; i < this.multipleSelection.length; i++) {
|
for (let i = 0; i < this.multipleSelection_variable.length; i++) {
|
||||||
this.StandardPartsAndOutsourcing[i] = this.multipleSelection[i].标准件和外购件流水号
|
this.StandardPartsAndOutsourcing[i] = this.multipleSelection_variable[i].标准件和外购件流水号
|
||||||
this.MaterialNum[i] = this.multipleSelection[i].物料流水号
|
this.MaterialNum[i] = this.multipleSelection_variable[i].物料流水号
|
||||||
this.MaterialCode[i] = this.multipleSelection[i].物料代码
|
this.MaterialCode[i] = this.multipleSelection_variable[i].物料代码
|
||||||
this.MaterialName[i] = this.multipleSelection[i].物料名称
|
this.MaterialName[i] = this.multipleSelection_variable[i].物料名称
|
||||||
this.MaterialSpecification[i] = this.multipleSelection[i].物料规格
|
this.MaterialSpecification[i] = this.multipleSelection_variable[i].物料规格
|
||||||
this.MaterialModel[i] = this.multipleSelection[i].物料型号
|
this.MaterialModel[i] = this.multipleSelection_variable[i].物料型号
|
||||||
this.NumberOfParts[i] = this.multipleSelection[i].采购总数量
|
this.NumberOfParts[i] = this.multipleSelection_variable[i].采购总数量
|
||||||
this.ReMarks[i] = this.multipleSelection[i].备注
|
this.ReMarks[i] = this.multipleSelection_variable[i].备注
|
||||||
}
|
}
|
||||||
for (let i = 0; i < this.StandardPartsAndOutsourcing.length; i++) {
|
for (let i = 0; i < this.StandardPartsAndOutsourcing.length; i++) {
|
||||||
purchaseRequisition1(this.RequisitionList, this.projectName, this.projectFloatValue, this.MachineToolNumber, this.machineFloatValue, this.groupName, this.groupFloatValue, this.StandardPartsAndOutsourcing[i], this.MaterialName[i], this.MaterialCode[i], this.MaterialSpecification[i], this.MaterialModel[i], this.NumberOfParts[i], 1, this.time, this.MaterialNum[i], this.ReMarks[i]).then(response => {
|
purchaseRequisition1(this.RequisitionList, this.projectName, this.projectFloatValue, this.MachineToolNumber, this.machineFloatValue, this.groupName, this.groupFloatValue, this.StandardPartsAndOutsourcing[i], this.MaterialName[i], this.MaterialCode[i], this.MaterialSpecification[i], this.MaterialModel[i], this.NumberOfParts[i], 1, this.time, this.MaterialNum[i], this.ReMarks[i]).then(response => {
|
||||||
@@ -1444,13 +1447,15 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
PurchasingDepartment() {
|
PurchasingDepartment() {
|
||||||
this.PurchasingDepartment_loading = true
|
// this.PurchasingDepartment_loading = true
|
||||||
var that = this
|
// var that = this
|
||||||
setTimeout(function() {
|
// setTimeout(function() {
|
||||||
that.PurchasingDepartment_loading = false
|
// that.PurchasingDepartment_loading = false
|
||||||
}, 5000)
|
// }, 5000)
|
||||||
if (this.time !== '' && this.time !== null) {
|
if (this.time !== '' && this.time !== null) {
|
||||||
if (this.multipleSelection.length !== 0) {
|
if (this.multipleSelection.length !== 0) {
|
||||||
|
this.multipleSelection_variable = this.multipleSelection
|
||||||
|
this.multipleSelection = []
|
||||||
if (this.PartType === '基本件') {
|
if (this.PartType === '基本件') {
|
||||||
this.MaterialNum = []
|
this.MaterialNum = []
|
||||||
this.BasicPartsNumber = []
|
this.BasicPartsNumber = []
|
||||||
@@ -1458,14 +1463,14 @@ export default {
|
|||||||
this.PartToolNumber = []
|
this.PartToolNumber = []
|
||||||
this.Material = []
|
this.Material = []
|
||||||
this.NumberOfParts = []
|
this.NumberOfParts = []
|
||||||
for (let i = 0; i < this.multipleSelection.length; i++) {
|
for (let i = 0; i < this.multipleSelection_variable.length; i++) {
|
||||||
this.MaterialNum[i] = this.multipleSelection[i].物料流水号
|
this.MaterialNum[i] = this.multipleSelection_variable[i].物料流水号
|
||||||
this.BasicPartsNumber[i] = this.multipleSelection[i].基本件流水号
|
this.BasicPartsNumber[i] = this.multipleSelection_variable[i].基本件流水号
|
||||||
this.MaterialName[i] = this.multipleSelection[i].零件名称
|
this.MaterialName[i] = this.multipleSelection_variable[i].零件名称
|
||||||
this.PartToolNumber[i] = this.multipleSelection[i].零件图号
|
this.PartToolNumber[i] = this.multipleSelection_variable[i].零件图号
|
||||||
this.Material[i] = this.multipleSelection[i].材料
|
this.Material[i] = this.multipleSelection_variable[i].材料
|
||||||
this.NumberOfParts[i] = this.multipleSelection[i].投产总数量
|
this.NumberOfParts[i] = this.multipleSelection_variable[i].投产总数量
|
||||||
this.ReMarks[i] = this.multipleSelection[i].零件备注
|
this.ReMarks[i] = this.multipleSelection_variable[i].零件备注
|
||||||
}
|
}
|
||||||
purchaseRequisition2(this.projectFloatValue, this.machineFloatValue, this.groupFloatValue, this.BasicPartsNumber, this.NumberOfParts, this.time).then(response => {
|
purchaseRequisition2(this.projectFloatValue, this.machineFloatValue, this.groupFloatValue, this.BasicPartsNumber, this.NumberOfParts, this.time).then(response => {
|
||||||
if (response.data[0].result !== '0') {
|
if (response.data[0].result !== '0') {
|
||||||
@@ -1486,15 +1491,15 @@ export default {
|
|||||||
this.MaterialSpecification = []
|
this.MaterialSpecification = []
|
||||||
this.MaterialModel = []
|
this.MaterialModel = []
|
||||||
this.NumberOfParts = []
|
this.NumberOfParts = []
|
||||||
for (let i = 0; i < this.multipleSelection.length; i++) {
|
for (let i = 0; i < this.multipleSelection_variable.length; i++) {
|
||||||
this.StandardPartsAndOutsourcing[i] = this.multipleSelection[i].标准件和外购件流水号
|
this.StandardPartsAndOutsourcing[i] = this.multipleSelection_variable[i].标准件和外购件流水号
|
||||||
this.MaterialNum[i] = this.multipleSelection[i].物料流水号
|
this.MaterialNum[i] = this.multipleSelection_variable[i].物料流水号
|
||||||
this.MaterialCode[i] = this.multipleSelection[i].物料代码
|
this.MaterialCode[i] = this.multipleSelection_variable[i].物料代码
|
||||||
this.MaterialName[i] = this.multipleSelection[i].物料名称
|
this.MaterialName[i] = this.multipleSelection_variable[i].物料名称
|
||||||
this.MaterialSpecification[i] = this.multipleSelection[i].物料规格
|
this.MaterialSpecification[i] = this.multipleSelection_variable[i].物料规格
|
||||||
this.MaterialModel[i] = this.multipleSelection[i].物料型号
|
this.MaterialModel[i] = this.multipleSelection_variable[i].物料型号
|
||||||
this.NumberOfParts[i] = this.multipleSelection[i].采购总数量
|
this.NumberOfParts[i] = this.multipleSelection_variable[i].采购总数量
|
||||||
this.ReMarks[i] = this.multipleSelection[i].备注
|
this.ReMarks[i] = this.multipleSelection_variable[i].备注
|
||||||
}
|
}
|
||||||
PurchasingDepartment(this.groupFloatValue, this.StandardPartsAndOutsourcing, this.time, this.MaterialNum, this.NumberOfParts, this.projectFloatValue, this.machineFloatValue).then(response => {
|
PurchasingDepartment(this.groupFloatValue, this.StandardPartsAndOutsourcing, this.time, this.MaterialNum, this.NumberOfParts, this.projectFloatValue, this.machineFloatValue).then(response => {
|
||||||
if (response.data[0].result !== '0') {
|
if (response.data[0].result !== '0') {
|
||||||
@@ -1523,26 +1528,28 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
Production() {
|
Production() {
|
||||||
this.Production_loading = true
|
// this.Production_loading = true
|
||||||
var that = this
|
// var that = this
|
||||||
setTimeout(function() {
|
// setTimeout(function() {
|
||||||
that.Production_loading = false
|
// that.Production_loading = false
|
||||||
}, 5000)
|
// }, 5000)
|
||||||
if (this.PartType === '基本件' && this.multipleSelection.length !== 0) {
|
if (this.PartType === '基本件' && this.multipleSelection.length !== 0) {
|
||||||
|
this.multipleSelection_variable = this.multipleSelection
|
||||||
this.MaterialNum = []
|
this.MaterialNum = []
|
||||||
this.BasicPartsNumber = []
|
this.BasicPartsNumber = []
|
||||||
this.MaterialName = []
|
this.MaterialName = []
|
||||||
this.PartToolNumber = []
|
this.PartToolNumber = []
|
||||||
this.Material = []
|
this.Material = []
|
||||||
this.NumberOfParts = []
|
this.NumberOfParts = []
|
||||||
for (let i = 0; i < this.multipleSelection.length; i++) {
|
this.multipleSelection = []
|
||||||
this.MaterialNum[i] = this.multipleSelection[i].物料流水号
|
for (let i = 0; i < this.multipleSelection_variable.length; i++) {
|
||||||
this.BasicPartsNumber[i] = this.multipleSelection[i].基本件流水号
|
this.MaterialNum[i] = this.multipleSelection_variable[i].物料流水号
|
||||||
this.MaterialName[i] = this.multipleSelection[i].零件名称
|
this.BasicPartsNumber[i] = this.multipleSelection_variable[i].基本件流水号
|
||||||
this.PartToolNumber[i] = this.multipleSelection[i].零件图号
|
this.MaterialName[i] = this.multipleSelection_variable[i].零件名称
|
||||||
this.Material[i] = this.multipleSelection[i].材料
|
this.PartToolNumber[i] = this.multipleSelection_variable[i].零件图号
|
||||||
this.NumberOfParts[i] = this.multipleSelection[i].投产总数量
|
this.Material[i] = this.multipleSelection_variable[i].材料
|
||||||
this.ReMarks[i] = this.multipleSelection[i].零件备注
|
this.NumberOfParts[i] = this.multipleSelection_variable[i].投产总数量
|
||||||
|
this.ReMarks[i] = this.multipleSelection_variable[i].零件备注
|
||||||
}
|
}
|
||||||
Production(this.groupFloatValue, this.BasicPartsNumber, this.NumberOfParts, this.projectFloatValue, this.machineFloatValue).then(response => {
|
Production(this.groupFloatValue, this.BasicPartsNumber, this.NumberOfParts, this.projectFloatValue, this.machineFloatValue).then(response => {
|
||||||
if (response.data[0].result !== '0') {
|
if (response.data[0].result !== '0') {
|
||||||
|
|||||||
@@ -260,16 +260,16 @@
|
|||||||
{{ scope.row.操作日期 | formatTime }}
|
{{ scope.row.操作日期 | formatTime }}
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="操作" fixed="right" align="center" width="150">
|
<!--<el-table-column label="操作" fixed="right" align="center" width="150">-->
|
||||||
<template slot-scope="scope">
|
<!--<template slot-scope="scope">-->
|
||||||
<el-button
|
<!--<el-button-->
|
||||||
:disabled="Number(id)!==0"
|
<!--:disabled="Number(id)!==0"-->
|
||||||
size="mini"
|
<!--size="mini"-->
|
||||||
type="text"
|
<!--type="text"-->
|
||||||
icon="el-icon-delete"
|
<!--icon="el-icon-delete"-->
|
||||||
@click="handleDelete(scope.row)">删除</el-button>
|
<!--@click="handleDelete(scope.row)">删除</el-button>-->
|
||||||
</template>
|
<!--</template>-->
|
||||||
</el-table-column>
|
<!--</el-table-column>-->
|
||||||
</el-table>
|
</el-table>
|
||||||
<div class="block" style="margin-top: 10px">
|
<div class="block" style="margin-top: 10px">
|
||||||
<el-pagination
|
<el-pagination
|
||||||
|
|||||||
@@ -101,6 +101,11 @@ export default {
|
|||||||
document.getElementsByClassName('tags-view-wrapper')[0].style.minWidth = '1910px'
|
document.getElementsByClassName('tags-view-wrapper')[0].style.minWidth = '1910px'
|
||||||
document.getElementsByClassName('navbar')[0].style.minWidth = '1910px'
|
document.getElementsByClassName('navbar')[0].style.minWidth = '1910px'
|
||||||
break
|
break
|
||||||
|
case 'PurchaseTaskAllocate': // 采购任务分配
|
||||||
|
document.getElementById('app-main').style.width = '1680px'
|
||||||
|
document.getElementsByClassName('tags-view-wrapper')[0].style.minWidth = '1680px'
|
||||||
|
document.getElementsByClassName('navbar')[0].style.minWidth = '1680px'
|
||||||
|
break
|
||||||
default:
|
default:
|
||||||
document.getElementById('app-main').style.width = '1380px'
|
document.getElementById('app-main').style.width = '1380px'
|
||||||
document.getElementsByClassName('tags-view-wrapper')[0].style.minWidth = '1380px'
|
document.getElementsByClassName('tags-view-wrapper')[0].style.minWidth = '1380px'
|
||||||
|
|||||||
Reference in New Issue
Block a user