From 613cacecb0ad855db114d2d393565850798a3312 Mon Sep 17 00:00:00 2001 From: liushuai Date: Sat, 17 Nov 2018 15:22:57 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=B8=E5=9E=8B?= =?UTF-8?q?=E8=A3=85=E9=85=8D=E5=B7=A5=E8=89=BA=E6=A8=A1=E5=9D=97=E5=8F=8A?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=BA=9B=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/Assembly/AssemblyProcessPlanning.js | 8 +- .../Assembly/TypicalAssemblyMaintenance.js | 240 +++++++++ .../AssemblyInformationInput/index.vue | 2 +- src/views/Assembly/AssemblyPlan/index.vue | 6 + .../AssemblyProcessPlanning/index.vue | 53 +- .../TypicalAssemblyMaintenance/index.vue | 477 ++++++++++++++++++ .../GroupMatching/index.vue | 12 +- .../PartAssignment/index.vue | 8 +- .../ManufacturingCenter/StatusQuery/index.vue | 12 +- .../WorkshopEquipmentManagement/index.vue | 1 + .../CreatingProcurementContracts/index.vue | 2 +- .../ProcurementContractApproval/index.vue | 6 +- .../PurchaseContractChange/index.vue | 8 +- 13 files changed, 796 insertions(+), 39 deletions(-) create mode 100644 src/api/Assembly/TypicalAssemblyMaintenance.js create mode 100644 src/views/Assembly/TypicalAssemblyMaintenance/index.vue diff --git a/src/api/Assembly/AssemblyProcessPlanning.js b/src/api/Assembly/AssemblyProcessPlanning.js index a8b70aaf..41619c17 100644 --- a/src/api/Assembly/AssemblyProcessPlanning.js +++ b/src/api/Assembly/AssemblyProcessPlanning.js @@ -95,26 +95,26 @@ export function searchDetail(num) { }) } // 增加组件工艺 -export function submitAdd(machineNumberValue, SerialNumber, Group, AssemblyTask) { +export function submitAdd(machineNumberValue, SerialNumber, Group, AssemblyTask, GroupNumberValue1) { return request({ url: '', method: 'post', data: { type: '2', name: '车间装配管理_组件工艺_增加数据', - param: '机床流水号=' + machineNumberValue + '&序号=' + SerialNumber + '&组号=' + Group + '&装配任务=' + AssemblyTask + param: '机床流水号=' + machineNumberValue + '&序号=' + SerialNumber + '&组号=' + Group + '&装配任务=' + AssemblyTask + '&组件流水号=' + GroupNumberValue1 } }) } // 编辑组件工艺 -export function submitEdit(GroupProcessNumber, SerialNumber, Group, AssemblyTask) { +export function submitEdit(GroupProcessNumber, SerialNumber, Group, AssemblyTask, GroupNumberValue1) { return request({ url: '', method: 'post', data: { type: '2', name: '车间装配管理_组件工艺_编辑数据', - param: '组件工艺流水号=' + GroupProcessNumber + '&序号=' + SerialNumber + '&组号=' + Group + '&装配任务=' + AssemblyTask + param: '组件工艺流水号=' + GroupProcessNumber + '&序号=' + SerialNumber + '&组号=' + Group + '&装配任务=' + AssemblyTask + '&组件流水号=' + GroupNumberValue1 } }) } diff --git a/src/api/Assembly/TypicalAssemblyMaintenance.js b/src/api/Assembly/TypicalAssemblyMaintenance.js new file mode 100644 index 00000000..81e27e4d --- /dev/null +++ b/src/api/Assembly/TypicalAssemblyMaintenance.js @@ -0,0 +1,240 @@ +import request from '@/utils/request' + +// 初始化 工艺员A +export function initCraftmen() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号', + param: '考核部门编号=17' + } + }) +} +// 初始化 工序分类 +export function initprocessNameClass() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间装配管理_工序分类_查询数据' + } + }) +} +// 初始化 机床分类 +export function initmachineType() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间装配管理_机床分类_查询数据' + } + }) +} +// 查询机床编号 +export function SearchMachine(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间装配管理_典型机床_查询数据', + param: '机床分类流水号=' + num + } + }) +} +// 查询工序名称 +export function initProcessName(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间装配管理_工序名称_查询数据', + param: '工序分类流水号=' + num + } + }) +} +// 查询组件 +export function searchGroup(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间装配管理_组件名称_查询数据', + param: '机床流水号=' + num + } + }) +} +// 查询组件工艺 +export function searchDetail(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间装配管理_组件工艺_查询数据', + param: '机床流水号=' + num + } + }) +} +// 增加组件工艺 +export function submitAdd(machineNumberValue, SerialNumber, Group, AssemblyTask, GroupNumberValue1) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间装配管理_组件工艺_增加数据', + param: '机床流水号=' + machineNumberValue + '&序号=' + SerialNumber + '&组号=' + Group + '&装配任务=' + AssemblyTask + '&组件流水号=' + GroupNumberValue1 + } + }) +} +// 编辑组件工艺 +export function submitEdit(GroupProcessNumber, SerialNumber, Group, AssemblyTask, GroupNumberValue1) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间装配管理_组件工艺_编辑数据', + param: '组件工艺流水号=' + GroupProcessNumber + '&序号=' + SerialNumber + '&组号=' + Group + '&装配任务=' + AssemblyTask + '&组件流水号=' + GroupNumberValue1 + } + }) +} +// 删除组件工艺 +export function deleteGroup(GroupProcessNumber) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间装配管理_组件工艺_删除数据', + param: '组件工艺流水号=' + GroupProcessNumber + } + }) +} +// 查询工序 +export function searchProcess(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间装配管理_装配工序_查询数据', + param: '组件工艺流水号=' + num + } + }) +} +// 增加工序 +export function insertOne(num) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间装配管理_装配工序_增加数据', + param: '组件工艺流水号=' + num + } + }) +} +// 编辑工序 +export function update(num, num1, num2, num3, num4) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间装配管理_装配工序_编辑数据', + param: '装配工序流水号=' + num + '&序号=' + num1 + '&工序名称=' + num2 + '&工艺内容及装配具体要求=' + num3 + '&质检=' + num4 + } + }) +} +// 编辑工序1 +export function update1(num, num1, num2, num3) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间装配管理_装配工序_编辑数据', + param: '装配工序流水号=' + num + '&序号=' + num1 + '&工序名称=' + num2 + '&工艺内容及装配具体要求=' + num3 + } + }) +} +// 编辑工时 +export function update2(num, num1) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间装配管理_装配工序工时_编辑数据', + param: '装配工序流水号=' + num + '&工艺工时=' + num1 + } + }) +} +// 保存 +export function saveApprove(num) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间装配管理_机床工艺_定额完成', + param: '机床流水号=' + num + } + }) +} +// 上移 +export function upOne(num, num1, num2) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间装配管理_装配工序_上移', + param: '装配工序流水号=' + num + '&组件工艺流水号=' + num1 + '&工序顺序=' + num2 + } + }) +} +// 下移 +export function downOne(num, num1, num2) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间装配管理_装配工序_下移', + param: '装配工序流水号=' + num + '&组件工艺流水号=' + num1 + '&工序顺序=' + num2 + } + }) +} +// 删除工序 +export function deleteOne(num) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间装配管理_装配工序_删除数据', + param: '装配工序流水号=' + num + } + }) +} +// 工艺删除 +export function deleteTable(num) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间装配管理_机床工艺_删除数据', + param: '机床流水号=' + num + } + }) +} diff --git a/src/views/Assembly/AssemblyInformationInput/index.vue b/src/views/Assembly/AssemblyInformationInput/index.vue index 148bac8e..4f0d9cf5 100644 --- a/src/views/Assembly/AssemblyInformationInput/index.vue +++ b/src/views/Assembly/AssemblyInformationInput/index.vue @@ -11,7 +11,7 @@ :value="item.value"/> 机床编号: - + { + for (let i = 0; i < response.data.rows.length; i++) { + console.log(response.data.rows[i].项目计划完成时间) + if (response.data.rows[i].项目计划完成时间 !== '') { + response.data.rows[i].项目计划完成时间 = (response.data.rows[i].项目计划完成时间).split(' ')[0] + } + } this.tableData = response.data.rows this.total = response.data.total this.loading = false diff --git a/src/views/Assembly/AssemblyProcessPlanning/index.vue b/src/views/Assembly/AssemblyProcessPlanning/index.vue index db88fa43..643b9306 100644 --- a/src/views/Assembly/AssemblyProcessPlanning/index.vue +++ b/src/views/Assembly/AssemblyProcessPlanning/index.vue @@ -38,7 +38,7 @@ 保存 是否核准 -
+
- + 工艺拷贝 -
+
工艺拷贝 -
+
{ 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('此操作将永久删除该行, 是否继续?', '提示', { 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 @@ + + + + + diff --git a/src/views/ManufacturingCenter/GroupMatching/index.vue b/src/views/ManufacturingCenter/GroupMatching/index.vue index a5e4c68d..aa1b7500 100644 --- a/src/views/ManufacturingCenter/GroupMatching/index.vue +++ b/src/views/ManufacturingCenter/GroupMatching/index.vue @@ -19,9 +19,9 @@ :value="item.value"/> 机床号: - + 组号: - + 年:
- 提交 +
+ 提交 +
@@ -202,7 +204,9 @@ @size-change="handleSizeChange3" @current-change="handleCurrentChange3"/>
- 提交 +
+ 提交 +
diff --git a/src/views/ManufacturingCenter/PartAssignment/index.vue b/src/views/ManufacturingCenter/PartAssignment/index.vue index 39201f1e..f1babfd4 100644 --- a/src/views/ManufacturingCenter/PartAssignment/index.vue +++ b/src/views/ManufacturingCenter/PartAssignment/index.vue @@ -299,7 +299,7 @@ style="width:200px"/> - + { + for (let i = 0; i < response.data.length; i++) { + console.log(response.data[i].请购时间) + if (response.data[i].请购时间 !== '') { + response.data[i].请购时间 = (response.data[i].请购时间).split(' ')[0] + } + } this.tableData4 = response.data }) }, diff --git a/src/views/ManufacturingCenter/StatusQuery/index.vue b/src/views/ManufacturingCenter/StatusQuery/index.vue index b2ff8692..4cefe297 100644 --- a/src/views/ManufacturingCenter/StatusQuery/index.vue +++ b/src/views/ManufacturingCenter/StatusQuery/index.vue @@ -20,9 +20,9 @@ :value="item.value"/> 机床号: - + 组号: - + 零件号:
@@ -187,7 +187,9 @@ @size-change="handleSizeChange1" @current-change="handleCurrentChange1"/>
- 提交 +
+ 提交 +
@@ -234,7 +236,9 @@ @size-change="handleSizeChange3" @current-change="handleCurrentChange3"/>
- 提交 +
+ 提交 +
diff --git a/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue b/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue index a6f5bd35..42603b0d 100644 --- a/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue +++ b/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue @@ -253,6 +253,7 @@ export default { this.form.设备型号 = row.设备型号 this.form.设备性能指标 = row.设备性能指标 this.form.设备加工能力 = row.设备加工能力工时 + this.form.设备加工工艺 = parseInt(row.工艺属性代码) this.form.班次类型 = row.班次类型 this.form.设备工时系数 = row.设备工时系数 this.form.整改工时系数 = row.整改工时比例 diff --git a/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue b/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue index 0de8e68f..3eae8017 100644 --- a/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue +++ b/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue @@ -21,7 +21,7 @@ - + diff --git a/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue b/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue index 3d44e5e4..7d490c17 100644 --- a/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue +++ b/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue @@ -23,7 +23,7 @@ 采购员: - + 供应商: 合同号: - + 采购员: - + 供应商: @@ -152,7 +152,7 @@ start-placeholder="开始日期" end-placeholder="结束日期"/> 合同号: - + 采购员: - + 供应商: From 305186058e51e654e109b227bcd3e0f9fbca47bb Mon Sep 17 00:00:00 2001 From: liushuai Date: Mon, 19 Nov 2018 09:50:08 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PrintingAssemblyProcessCard/index.vue | 4 ++-- .../GroupMatching/index.vue | 22 +------------------ .../ManufacturingCenter/StatusQuery/index.vue | 19 +--------------- .../DepartmentBuyerRequestFund/index.vue | 5 ++--- .../ProcurementContractApproval/index.vue | 2 +- .../ProcurementContractEnquiry/index.vue | 2 +- .../PurchaseContractChange/index.vue | 8 +++---- 7 files changed, 12 insertions(+), 50 deletions(-) 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/ManufacturingCenter/GroupMatching/index.vue b/src/views/ManufacturingCenter/GroupMatching/index.vue index aa1b7500..5058e5b8 100644 --- a/src/views/ManufacturingCenter/GroupMatching/index.vue +++ b/src/views/ManufacturingCenter/GroupMatching/index.vue @@ -4,13 +4,11 @@ 项目名称: { for (let i = 0; i < response.data.length; i++) { - this.list.push({ + this.entryName.push({ label: response.data[i].项目名称, value: response.data[i].项目流水号 }) } }) }, - remoteMethod(query) { - if (query !== '') { - setTimeout(() => { - this.entryName = this.list.filter(item => { - if (item.label !== null) { - return item.label.toLowerCase() - .indexOf(query.toLowerCase()) > -1 - } - }) - }, 1000) - } else { - this.entryName = [] - } - }, empty() { this.machineToolNumber = '' this.groupNumber = '' diff --git a/src/views/ManufacturingCenter/StatusQuery/index.vue b/src/views/ManufacturingCenter/StatusQuery/index.vue index 4cefe297..7182108a 100644 --- a/src/views/ManufacturingCenter/StatusQuery/index.vue +++ b/src/views/ManufacturingCenter/StatusQuery/index.vue @@ -5,13 +5,11 @@ 项目名称: { for (let i = 0; i < response.data.length; i++) { - this.list.push({ + this.entryName.push({ label: response.data[i].项目名称, value: response.data[i].项目流水号 }) } }) }, - remoteMethod(query) { - if (query !== '') { - setTimeout(() => { - this.entryName = this.list.filter(item => { - return item.label.toLowerCase() - .indexOf(query.toLowerCase()) > -1 - }) - }, 1000) - } else { - this.entryName = [] - } - }, empty() { this.machineToolNumber = '' this.groupNumber = '' diff --git a/src/views/WorkshopProcurement/DepartmentBuyerRequestFund/index.vue b/src/views/WorkshopProcurement/DepartmentBuyerRequestFund/index.vue index ffedafcf..ab86dbdb 100644 --- a/src/views/WorkshopProcurement/DepartmentBuyerRequestFund/index.vue +++ b/src/views/WorkshopProcurement/DepartmentBuyerRequestFund/index.vue @@ -22,11 +22,10 @@ 采购员: 供应商: diff --git a/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue b/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue index 7d490c17..c2cfd8f3 100644 --- a/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue +++ b/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue @@ -23,7 +23,7 @@ 采购员: - + 供应商: 采购员: - + 供应商: 审批情况: diff --git a/src/views/WorkshopProcurement/PurchaseContractChange/index.vue b/src/views/WorkshopProcurement/PurchaseContractChange/index.vue index 875a0525..3cc52b00 100644 --- a/src/views/WorkshopProcurement/PurchaseContractChange/index.vue +++ b/src/views/WorkshopProcurement/PurchaseContractChange/index.vue @@ -6,7 +6,7 @@ 时间段: 采购员: - + 供应商: @@ -144,7 +144,7 @@ 时间段: 采购员: - + 供应商: From fd63e551f4c77a330f49b5f1a413f4c13559c07a Mon Sep 17 00:00:00 2001 From: lixin Date: Mon, 19 Nov 2018 10:07:11 +0800 Subject: [PATCH 3/3] lx --- src/views/Inventory/PickingList/index.vue | 71 ++++++++++++++--------- 1 file changed, 42 insertions(+), 29 deletions(-) diff --git a/src/views/Inventory/PickingList/index.vue b/src/views/Inventory/PickingList/index.vue index 2ab5ffb1..91df82e9 100644 --- a/src/views/Inventory/PickingList/index.vue +++ b/src/views/Inventory/PickingList/index.vue @@ -23,8 +23,8 @@ {{ scope.row.领料单编号 }} - -