+
{
for (let i = 0; i < response.data.length; i++) {
this.GroupNumber.push({
label: response.data[i].组号,
- value: response.data[i].组号
+ value: response.data[i].组件流水号
})
}
})
@@ -670,37 +669,55 @@ export default {
},
handleAdd() {
if (this.machineNumberValue !== '') {
- // this.title = '增加组件工艺'
- this.addForm('form2', [this.dialogFormVisible4 = true, this.title = '增加组件工艺', this.Group = ''])
+ this.addForm('form2', [this.dialogFormVisible4 = true, this.title = '增加组件工艺', this.Group = '', this.GroupNumberValue1 = ''])
} else {
this.$message.warning('请先选择机床编号')
}
},
handleEdit(row, formName) {
- console.log(this.$refs[formName])
if (this.$refs[formName] !== undefined) {
this.$refs[formName].resetFields()
}
- // this.editForm(row, 'form2', [this.title = '编辑组件工艺', this.GroupProcessNumber = row.组件工艺流水号, this.dialogFormVisible4 = true, this.Group = '', this.form2.组件 = []])
+ this.GroupProcessNumber = row.组件工艺流水号
+ this.GroupNumberValue1 = ''
this.title = '编辑组件工艺'
this.dialogFormVisible4 = true
this.form2.序号 = row.序号
this.form2.装配任务 = row.装配任务
this.Group = ''
- this.form2.组件 = []
- this.GroupProcessNumber = row.组件工艺流水号
+ console.log(row, 1111)
+ this.form2.组件 = (row.组件流水号.split(',')).map(Number)
+ console.log(this.form2.组件)
},
submitAdd() {
- for (var i = 0; i < this.form2.组件.length; i++) {
+ this.GroupNumberValue1 = this.form2.组件[0]
+ for (let h = 1; h < this.form2.组件.length; h++) {
+ this.GroupNumberValue1 += ',' + this.form2.组件[h]
+ }
+ for (let i = 0; i < this.form2.组件.length; i++) {
+ for (let j = 0; j < this.GroupNumber.length; j++) {
+ if (this.form2.组件[i] === this.GroupNumber[j].value) {
+ this.form2.组件[i] = this.GroupNumber[j].label
+ }
+ }
this.Group += this.form2.组件[i] + '组 '
}
- this.addTable(submitAdd, [this.machineNumberValue, this.form2.序号, this.Group, this.form2.装配任务], 'form2', function() { this.dialogFormVisible4 = false; this.searchDetail() })
+ this.addTable(submitAdd, [this.machineNumberValue, this.form2.序号, this.Group, this.form2.装配任务, this.GroupNumberValue1], 'form2', function() { this.dialogFormVisible4 = false; this.searchDetail() })
},
submitEdit() {
- for (var i = 0; i < this.form2.组件.length; i++) {
+ this.GroupNumberValue1 = this.form2.组件[0]
+ for (let h = 1; h < this.form2.组件.length; h++) {
+ this.GroupNumberValue1 += ',' + this.form2.组件[h]
+ }
+ for (let i = 0; i < this.form2.组件.length; i++) {
+ for (let j = 0; j < this.GroupNumber.length; j++) {
+ if (this.form2.组件[i] === this.GroupNumber[j].value) {
+ this.form2.组件[i] = this.GroupNumber[j].label
+ }
+ }
this.Group += this.form2.组件[i] + '组 '
}
- this.editTable(submitEdit, [this.GroupProcessNumber, this.form2.序号, this.Group, this.form2.装配任务], 'form2', function() { this.searchDetail(); this.dialogFormVisible4 = false })
+ this.editTable(submitEdit, [this.GroupProcessNumber, this.form2.序号, this.Group, this.form2.装配任务, this.GroupNumberValue1], 'form2', function() { this.searchDetail(); this.dialogFormVisible4 = false })
},
deleteGroup(row) {
this.$confirm('此操作将永久删除该行, 是否继续?', '提示', {
@@ -766,6 +783,8 @@ export default {
this.dataAll = []
} else { this.$message.error('保存失败') }
})
+ } else {
+ this.$message.warning('请勾选是否核准')
}
},
upOne(row) {
diff --git a/src/views/Assembly/PrintingAssemblyProcessCard/index.vue b/src/views/Assembly/PrintingAssemblyProcessCard/index.vue
index 08164f7a..cb92e4b8 100644
--- a/src/views/Assembly/PrintingAssemblyProcessCard/index.vue
+++ b/src/views/Assembly/PrintingAssemblyProcessCard/index.vue
@@ -99,8 +99,8 @@
| {{ list.工艺内容及装配具体要求 }} |
{{ list.质检 }} |
{{ list.工时 }} |
- {{ list.完成情况 }} |
- {{ list.检验情况 }} |
+ {{ list.装配员 }} |
+ {{ list.检验员 }} |
{{ list.备注 }} |
diff --git a/src/views/Assembly/TypicalAssemblyMaintenance/index.vue b/src/views/Assembly/TypicalAssemblyMaintenance/index.vue
new file mode 100644
index 00000000..423324e9
--- /dev/null
+++ b/src/views/Assembly/TypicalAssemblyMaintenance/index.vue
@@ -0,0 +1,477 @@
+
+
+
+
+ 机床分类:
+
+
+
+ 机床编号:
+
+
+
+ 查询
+ 增加
+ 删除
+
+
+
+
+
+
+ {{ 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.操作日期 }}
+
+
+
+
+ 编辑
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 角色功能:
+
+ 查询
+ 增加
+
+
+
+
+
+ {{ 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.工艺名称 }}
+
+
+
+
+ 编辑工艺
+ 删除工艺
+ 新增要求
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/Inventory/DirectPart/index.vue b/src/views/Inventory/DirectPart/index.vue
index 06ac5275..efda0f78 100644
--- a/src/views/Inventory/DirectPart/index.vue
+++ b/src/views/Inventory/DirectPart/index.vue
@@ -59,12 +59,12 @@
- {{ scope.row.机床名称 }}
+ {{ scope.row.机床图号 }}
- {{ scope.row.组件名称 }}
+ {{ scope.row.组号 }}
@@ -268,9 +268,8 @@ export default {
this.PeopleNumber = this.id
},
searchMachine() { // 查询机床
- if (this.ProjectValue === '') {
- this.ProjectValue_check = 0
- }
+ this.Machine = []
+ this.ProjectValue ? this.ProjectValue_check = 1 : this.ProjectValue_check = 0
searchmachine(this.ProjectValue_check, this.ProjectValue).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.Machine.push({
@@ -281,6 +280,7 @@ export default {
})
},
searchGroupList() { // 查询组号
+ this.GroupNum = []
searchTeam(this.MachineValue).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.GroupNum.push({
@@ -291,16 +291,19 @@ export default {
})
},
searchPeopleData() { // 查询人员
+ this.People = []
searchPeople().then(response => {
for (let i = 0; i < response.data.length; i++) {
this.People.push({
label: response.data[i].姓名,
- value: response.data[i].考勤编号
+ value: parseInt(response.data[i].考勤编号)
})
}
+ console.log(this.People)
})
},
searchContractData() { // 查询合同
+ this.Contract = []
searchContract().then(response => {
for (let i = 0; i < response.data.length; i++) {
this.Contract.push({
@@ -312,18 +315,10 @@ export default {
},
searchPartinfo() {
this.tableDataPurchase = []
- if (this.ProjectValue === '') {
- this.ProjectValue_check = 0
- }
- if (this.MachineValue === '') {
- this.MachineValue_check = 0
- }
- if (this.GroupNumValue === '') {
- this.GroupNumValue_check = 0
- }
- if (this.ContractValue === '') {
- this.ContractValue_check = 0
- }
+ this.ProjectValue ? this.ProjectValue_check = 1 : this.ProjectValue_check = 0
+ this.MachineValue ? this.MachineValue_check = 1 : this.MachineValue_check = 0
+ this.GroupNumValue ? this.GroupNumValue_check = 1 : this.GroupNumValue_check = 0
+ this.ContractValue ? this.ContractValue_check = 1 : this.ContractValue_check = 0
this.listLoading = true
searchDirectPart(this.PageCurrent, this.PageSize, this.ProjectValue_check, this.ProjectValue, this.MachineValue_check, this.MachineValue, this.GroupNumValue_check, this.GroupNumValue, this.ContractValue_check, this.ContractValue).then(response => {
this.tableDataPurchase = response.data.rows
@@ -349,8 +344,7 @@ export default {
// 打开直达件表单
addDirect(row) {
this.PeopleValue = ''
- this.form = []
- console.log(row)
+ this.form = {}
this.dialogFormVisible = true
this.materialNum = row.物料流水号
this.purchaseContractNumber = row.采购合同明细流水号
@@ -367,7 +361,7 @@ export default {
this.dialogFormVisible1 = true
this.directPartNumber = row.直达件流水号
this.form.DirectNumber = row.到货数量
- this.PeopleValue = row.领用人员流水号
+ this.PeopleValue = parseInt(row.领用人员流水号)
this.form.DirectNote = row.备注
},
// 修改直达件
diff --git a/src/views/Inventory/ExchangePart/index.vue b/src/views/Inventory/ExchangePart/index.vue
index ca8adaa1..9506ffba 100644
--- a/src/views/Inventory/ExchangePart/index.vue
+++ b/src/views/Inventory/ExchangePart/index.vue
@@ -46,12 +46,12 @@
- {{ scope.row.机床名称 }}
+ {{ scope.row.机床图号 }}
- {{ scope.row.组件名称 }}
+ {{ scope.row.组号 }}
@@ -76,17 +76,17 @@
+
+
+
-
-
-
@@ -109,12 +109,12 @@
- {{ scope.row.机床名称 }}
+ {{ scope.row.机床图号 }}
- {{ scope.row.组件名称 }}
+ {{ scope.row.组号 }}
@@ -127,7 +127,7 @@
- 交换
+ 交换
@@ -149,12 +149,12 @@
- {{ scope.row.机床名称 }}
+ {{ scope.row.机床图号 }}
- {{ scope.row.组件名称 }}
+ {{ scope.row.组号 }}
@@ -167,24 +167,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 编辑
- 删除
+ 编辑
+ 删除
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -265,13 +265,15 @@ import { mapGetters } from 'vuex'
export default {
data() {
return {
- ProjectValue: ' ',
+ count1: 0,
+ count2: 0, // 清表单验证计数器
+ ProjectValue: '',
Project: [],
- ProjectValue_check: 1,
- MachineValue: ' ',
+ ProjectValue_check: 0,
+ MachineValue: '',
Machine: [],
MachineValue_check: 1,
- GroupNumValue: ' ',
+ GroupNumValue: '',
GroupNumValue_check: 1,
GroupNum: [],
tableDataBasic: [],
@@ -302,7 +304,7 @@ export default {
rules: { // 表单验证规则
ExchangeNumber: [{ required: true, message: '请输入交换件编号', trigger: 'blur' }],
ExchangeNumberx: [{ required: true, message: '请输入交换件数量', trigger: 'blur' }],
- ExchangeNote: [{ required: true, message: '请输入交换件备注', trigger: 'change' }]
+ ExchangeNote: [{ required: true, message: '请输入交换件备注', trigger: 'blur' }]
},
PageCurrent: 1,
PageSize: 10,
@@ -334,26 +336,33 @@ export default {
// 获取人员编号
getpeopleid() {
this.picikingPeople = this.id
- console.log(this.picikingPeople)
},
- searchMachine() { // 查询机床
- if (this.ProjectValue === '') {
+ searchMachine() {
+ this.MachineValue = ''
+ this.Machine = []
+ this.GroupNumValue = ''
+ this.GroupNum = []
+ if (this.ProjectValue !== '') {
+ this.ProjectValue_check = 1
+ searchmachine(this.ProjectValue_check, this.ProjectValue).then(response => {
+ for (let i = 0; i < response.data.length; i++) {
+ this.Machine.push({
+ label: response.data[i].机床图号,
+ value: response.data[i].机床流水号
+ })
+ }
+ })
+ } else {
this.ProjectValue_check = 0
}
- searchmachine(this.ProjectValue_check, this.ProjectValue).then(response => {
- for (let i = 0; i < response.data.length; i++) {
- this.Machine.push({
- label: response.data[i].机床图号,
- value: response.data[i].机床流水号
- })
- }
- })
},
- searchGroupList() { // 查询组号
+ searchGroupList() {
+ this.GroupNumValue = ''
+ this.GroupNum = []
searchTeam(this.MachineValue).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.GroupNum.push({
- label: response.data[i].组件名称,
+ label: response.data[i].组号,
value: response.data[i].组件流水号
})
}
@@ -362,19 +371,18 @@ export default {
searchPartinfo() {
this.tableDataPurchase = []
this.tableDataBasic = []
- if (this.ProjectValue === ' ') {
+ if (this.ProjectValue === '') {
this.ProjectValue_check = 0
}
- if (this.MachineValue === ' ') {
+ if (this.MachineValue === '') {
this.MachineValue_check = 0
}
- if (this.GroupNumValue === ' ') {
+ if (this.GroupNumValue === '') {
this.GroupNumValue_check = 0
}
this.listLoading = true
searchPurchasePart(this.PageCurrent, this.PageSize, this.ProjectValue_check, this.ProjectValue, this.MachineValue_check, this.MachineValue, this.GroupNumValue_check, this.GroupNumValue).then(response => {
this.tableDataPurchase = response.data.rows
- console.log(this.tableDataPurchase)
this.total = response.data.total
})
this.listLoading = false
@@ -392,44 +400,76 @@ export default {
getExchangeTable() {
this.listLoading1 = true
searchExchangePart(this.PageCurrent1, this.PageSize1).then(response => {
- this.tableDataExchange = response.data.rows
+ const data = response.data.rows
+ console.log(data)
+ for (let i = 0; i < data.length; i++) {
+ data[i].审批通过 === '1' ? data[i].是否禁用 = true : data[i].是否禁用 = false
+ }
+ this.tableDataExchange = data
this.total1 = response.data.total
this.listLoading1 = false
})
},
+ handleSizeChange1(val) {
+ this.PageCurrent1 = 1
+ this.PageSize1 = val
+ this.getExchangeTable()
+ },
+ handleCurrentChange1(val) {
+ this.PageCurrent1 = val
+ this.getExchangeTable()
+ },
// 选择领料单
chooseListinfor(row) {
this.pickingListNumberx = row.领料单流水号
- console.log(this.pickingListNumberx)
this.searchListDetailt()
},
// 增加交换件
- addListDetailinfor() {
- addExchangepart(this.form.ExchangeNumber, this.tableData1[0].组件零件流水号, this.tableData1[0].物料流水号, this.tableData1[0].采购合同明细流水号, this.tableData2[0].组件零件流水号, this.tableData1[0].物料名称, this.tableData2[0].物料名称, this.tableData2[0].货位流水号, this.form.ExchangeNumberx, this.picikingPeople, this.form.ExchangeNote).then(response => {
- if (response.data[0].result === '1') {
- this.$message.success('增加成功')
- } else { this.$message.error('增加失败') }
+ addListDetailinfor(form) {
+ this.$refs[form].validate((valid) => {
+ if (valid) {
+ addExchangepart(this.form.ExchangeNumber, this.tableData1[0].组件零件流水号, this.tableData1[0].物料流水号, this.tableData1[0].采购合同明细流水号, this.tableData2[0].组件零件流水号, this.tableData1[0].物料名称, this.tableData2[0].物料名称, this.tableData2[0].货位流水号, this.form.ExchangeNumberx, this.picikingPeople, this.form.ExchangeNote).then(response => {
+ if (response.data[0].result === '1') {
+ this.$message.success('增加成功')
+ } else { this.$message.error('增加失败') }
+ }).then(() => {
+ this.dialogFormVisible = false
+ this.PageCurrent1 = 1
+ this.getExchangeTable()
+ })
+ }
})
- this.dialogFormVisible = false
- this.getExchangeTable()
},
// 打开交换表单
- exchange() {
- this.title = '交换'
- this.dialogFormVisible = true
+ exchange(form) {
+ if (this.tableData1.length === 0) {
+ this.$message.error('请选择交换件')
+ } else if (this.tableData2.length === 0) {
+ this.$message.error('请选择交换件')
+ } else {
+ this.count1 = this.count1 + 1
+ if (this.count1 !== 1) {
+ this.$refs[form].resetFields()
+ }
+ this.title = '交换'
+ this.form.ExchangeNumber = ''
+ this.form.ExchangeNumberx = ''
+ this.form.ExchangeNote = ''
+ this.dialogFormVisible = true
+ }
},
// 重置表单
- callOff() {
+ callOff(formName) {
this.form.ExchangeNumber = ''
this.form.ExchangeNumberx = ''
this.form.ExchangeNote = ''
this.dialogFormVisible = false
+ this.$refs[formName].resetFields()
},
// 选中零件交换
selecting(row) {
const arr = new Array(row)
this.tableData1 = arr
- console.log(this.tableData1)
},
// 选中被零件交换
selected(row) {
@@ -448,8 +488,9 @@ export default {
dropExchangeList(this.exchangeListNumber, this.eTeamPartNumber).then(response => {
if (response.data[0].result === '1') {
this.$message.success('删除成功')
- this.getExchangeTable().then(response => {
- })
+ this.dialogFormVisible = false
+ this.PageCurrent1 = 1
+ this.getExchangeTable()
} else {
this.$message.error('删除失败')
}
diff --git a/src/views/Inventory/genneralPart/index.vue b/src/views/Inventory/GenneralPart/index.vue
similarity index 98%
rename from src/views/Inventory/genneralPart/index.vue
rename to src/views/Inventory/GenneralPart/index.vue
index facdccf5..bbd1b774 100644
--- a/src/views/Inventory/genneralPart/index.vue
+++ b/src/views/Inventory/GenneralPart/index.vue
@@ -90,7 +90,7 @@
+
+
+
+
diff --git a/src/views/ManufacturingCenter/ProcessPlanning/index.vue b/src/views/ManufacturingCenter/ProcessPlanning/index.vue
index bf114849..4c1c8237 100644
--- a/src/views/ManufacturingCenter/ProcessPlanning/index.vue
+++ b/src/views/ManufacturingCenter/ProcessPlanning/index.vue
@@ -10,11 +10,16 @@
partNumValue = '';typeValue = '';partName = '';
material = '';materialName = '';spec = '';batchNum = '';
searchParts()">
-
未编制
-
已编制
+
未编制
+
已编制
工艺员:
-
+
零件号:
-
+
- 查询
- 在制零件工艺调整
- 切换编辑模式
+ 查询
+
+ 在制零件工艺调整
+
+ 切换编辑模式
+
种类:
@@ -66,15 +81,26 @@
计算公差
- 复制并保存
+ 复制并保存
+
粘贴
- 典艺
- 完艺
- 删除
- 保存
+ 典艺
+
+ 完艺
+
+ 删除
+
+ 保存
+
-
+
@@ -147,7 +173,13 @@
- 查询
+ 查询
+
-
+
-
+
-
+
工艺拷贝
-
+
{{ scope.row.工艺序号 }}
@@ -292,7 +346,9 @@
-
+
+
+
@@ -300,9 +356,7 @@
-
- 查询
-
+
@@ -328,13 +382,18 @@
- 工艺拷贝
+ 查询
-
+
-
+
+
+ 工艺拷贝
+
-
+
{{ scope.row.工序顺序 }}
@@ -423,12 +490,46 @@
diff --git a/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue b/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
index e56ed66b..29bc3258 100644
--- a/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
+++ b/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
@@ -42,6 +42,7 @@
全选
保存
+
@@ -143,6 +144,8 @@ import { getProject0, getProject, getGraphNum, getGroupNum, getTable0, getGraphN
export default {
data() {
return {
+ num1: '', // 工艺员中间变量
+ num2: '', // 工艺员流水号中间变量
loading: false,
loading0: false,
projectNameValue: '',
@@ -323,8 +326,13 @@ export default {
this.dialogFormVisible = true
},
confirmPerson(row) { // 选择一行
- this.tableData[this.index].工艺员 = row.姓名
- this.tableData[this.index].人员编号 = row.人员编号
+ this.num1 = row.姓名
+ this.num2 = row.人员编号
+ },
+ tijiao() {
+ this.tableData[this.index].工艺员 = this.num1
+ this.tableData[this.index].人员编号 = this.num2
+ this.dialogFormVisible = false
},
selectAll(rows) {
if (this.tableData[0].工艺员 !== '') {
diff --git a/src/views/ManufacturingCenter/ProcessingStatus/index.vue b/src/views/ManufacturingCenter/ProcessingStatus/index.vue
index 58f6697d..33fe4419 100644
--- a/src/views/ManufacturingCenter/ProcessingStatus/index.vue
+++ b/src/views/ManufacturingCenter/ProcessingStatus/index.vue
@@ -40,11 +40,11 @@
查询
进度颜色：
- 全部
- 拖期
- 即将拖期
- 如期
- 工序外协
+
+ 拖期
+ 即将拖期
+ 如期
+ 工序外协
@@ -396,6 +396,7 @@ export default {
this.Groups = []
if (this.project !== '') {
getMachines(this.project).then(response => {
+ console.log(response.data)
for (let i = 0; i < response.data.length; i++) {
this.Machines.push({
label: response.data[i].机床图号,
@@ -539,7 +540,7 @@ export default {
background-color: transparent;
border: 0px solid white;
}
- .lightgreen{
+ .green{
background-color: lightgreen;
border: 1px solid #1f2d3d;
}
diff --git a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
index f21e6f59..b049a482 100644
--- a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
+++ b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
@@ -73,12 +73,12 @@
type="selection"
align="center"
width="35"/>
-
+
{{ scope.row.零件图号 }}
-
+
{{ scope.row.零件名称 }}
@@ -103,42 +103,42 @@
{{ scope.row.工序数量 }}
-
-
- {{ scope.row.是否超负荷 }}
-
-
-
-
- 外协
-
-
-
-
-
-
-
-
-
- {{ scope.row.板焊 }}
-
-
-
-
- 板焊
- 分批
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{
this.tableData1.push(this.result[i])
+ console.log(this.tableData1)
selection2(this.工艺计划流水号[this.indexAdjust]).then(response => { // 刷新对话框显示和颜色
for (let i = 0; i < response.data.length; i++) {
this.partType = response.data[i].零件类型
diff --git a/src/views/ManufacturingCenter/StatusQuery/index.vue b/src/views/ManufacturingCenter/StatusQuery/index.vue
index b2ff8692..d82822f5 100644
--- a/src/views/ManufacturingCenter/StatusQuery/index.vue
+++ b/src/views/ManufacturingCenter/StatusQuery/index.vue
@@ -5,13 +5,11 @@
项目名称:
机床号:
-
+
+
+
组号:
-
+
+
+
零件号:
@@ -187,7 +189,9 @@
@size-change="handleSizeChange1"
@current-change="handleCurrentChange1"/>
- 提交
+
@@ -234,7 +238,9 @@
@size-change="handleSizeChange3"
@current-change="handleCurrentChange3"/>