From 835593aefe1d17a6f37d3d82aa31a895bcd7f98f Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Fri, 30 Nov 2018 14:25:54 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E5=A4=96=E5=8D=8F=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/icons/svg/OutsourcingTaskQuery.svg | 1 + 1 file changed, 1 insertion(+) create mode 100644 src/icons/svg/OutsourcingTaskQuery.svg diff --git a/src/icons/svg/OutsourcingTaskQuery.svg b/src/icons/svg/OutsourcingTaskQuery.svg new file mode 100644 index 00000000..fc3107f5 --- /dev/null +++ b/src/icons/svg/OutsourcingTaskQuery.svg @@ -0,0 +1 @@ + \ No newline at end of file From 6f84497322ebfd4ec68d5108c1c79bf891c95e87 Mon Sep 17 00:00:00 2001 From: lixin Date: Sun, 2 Dec 2018 12:09:14 +0800 Subject: [PATCH 02/14] lx --- src/utils/request.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/utils/request.js b/src/utils/request.js index a9554197..3273b55e 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -14,8 +14,8 @@ const service = axios.create({ // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, - // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, - baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, + baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, + // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, // baseURL: `http://192.168.1.112:8411/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) From deb01386547f40d1230c1ad57ff08f7fb9f6e61c Mon Sep 17 00:00:00 2001 From: chenjianan Date: Tue, 4 Dec 2018 09:30:45 +0800 Subject: [PATCH 03/14] request --- src/utils/request.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/utils/request.js b/src/utils/request.js index a9554197..66f14a6d 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -14,8 +14,8 @@ const service = axios.create({ // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, - // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, - baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, + baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, + // baseURL: `http://192.168.137.85:8411/submit/MESCommonBase.ashx`, // 李鑫 // baseURL: `http://192.168.1.112:8411/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) From 9533aa69bdd360768f5f28684694256094483603 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Tue, 4 Dec 2018 09:36:50 +0800 Subject: [PATCH 04/14] =?UTF-8?q?=E5=8F=91=E8=B4=A7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E3=80=81=E5=BA=8F=E9=97=B4=E5=A4=96=E5=8D=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/request.js | 2 +- src/views/MarketingCenter/DeliveryManagement/index.vue | 1 + src/views/Outsourcing/InterBudgetaryBudgets/index.vue | 1 + src/views/Outsourcing/PreorderAssociation/index.vue | 10 +++++++++- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/utils/request.js b/src/utils/request.js index a9554197..432ec366 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -15,7 +15,7 @@ const service = axios.create({ // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, - baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, + baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, // baseURL: `http://192.168.1.112:8411/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) diff --git a/src/views/MarketingCenter/DeliveryManagement/index.vue b/src/views/MarketingCenter/DeliveryManagement/index.vue index fad2122d..446578e3 100644 --- a/src/views/MarketingCenter/DeliveryManagement/index.vue +++ b/src/views/MarketingCenter/DeliveryManagement/index.vue @@ -1046,6 +1046,7 @@ export default { this.form3.数量 = '' if (response.data[0].result === '1') { this.searchCargoBoxDetailed() + this.searchPackingListDetails() searchParts(this.code).then(response => { this.tableData4 = response.data }) diff --git a/src/views/Outsourcing/InterBudgetaryBudgets/index.vue b/src/views/Outsourcing/InterBudgetaryBudgets/index.vue index 5595bd25..999b803b 100644 --- a/src/views/Outsourcing/InterBudgetaryBudgets/index.vue +++ b/src/views/Outsourcing/InterBudgetaryBudgets/index.vue @@ -281,6 +281,7 @@ export default { this.tableData = [] if (this.radio === 1) { searchPartNum1(this.check_entryNameValue, this.entryNameValue, this.check_toolNumValue, this.toolNumValue, this.check_NumValue, this.NumValue, this.check_partName, this.partName, 0, this.pageCurrent2, this.pageSize2).then(response => { + console.log(response.data) this.tableData2 = response.data.rows this.total2 = response.data.total }).then(() => { diff --git a/src/views/Outsourcing/PreorderAssociation/index.vue b/src/views/Outsourcing/PreorderAssociation/index.vue index f0e7284f..6da8b560 100644 --- a/src/views/Outsourcing/PreorderAssociation/index.vue +++ b/src/views/Outsourcing/PreorderAssociation/index.vue @@ -85,9 +85,16 @@ type="index" align="center" width="50"/> + + + @@ -235,6 +242,7 @@ export default { this.checkBox = [] this.tableData2 = [] searchTable2(row.工艺计划流水号).then(response => { + console.log(response.data) this.num1 = row.工艺计划流水号 if (response.data.length === 0) { this.loading0 = false From b87ef572ebb132012b4ab580753ad5746b71d09b Mon Sep 17 00:00:00 2001 From: lixin Date: Tue, 4 Dec 2018 09:45:51 +0800 Subject: [PATCH 05/14] lx --- src/utils/request.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/request.js b/src/utils/request.js index 3273b55e..9f7e021d 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -14,7 +14,7 @@ const service = axios.create({ // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, - baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, + baseURL: `http://192.168.0.104:8411/submit/MESCommonBase.ashx`, // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, // baseURL: `http://192.168.1.112:8411/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 From fa3c5250880db3ee1e645227efed7389cc3a49d0 Mon Sep 17 00:00:00 2001 From: lixin Date: Tue, 4 Dec 2018 14:07:45 +0800 Subject: [PATCH 06/14] lx --- src/api/Inventory/ExchangePart.js | 4 ++-- src/views/Inventory/ExchangePart/index.vue | 2 +- src/views/Inventory/InventoryManagement/index.vue | 2 +- src/views/Inventory/PickingList/index.vue | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/api/Inventory/ExchangePart.js b/src/api/Inventory/ExchangePart.js index 47028fdc..40037811 100644 --- a/src/api/Inventory/ExchangePart.js +++ b/src/api/Inventory/ExchangePart.js @@ -85,14 +85,14 @@ export function addExchangepart(data1, data2, data3, data4, data5, data6, data7, }) } // 删除交换单 -export function dropExchangeList(PickingListNumberx, data) { +export function dropExchangeList(PickingListNumberx) { return request({ url: '', method: 'post', data: { type: '2', name: '库存管理_交换件_交换件删除', - param: '交换单流水号=' + PickingListNumberx + '&交换件组件零件流水号=' + data + param: '交换单流水号=' + PickingListNumberx } }) } diff --git a/src/views/Inventory/ExchangePart/index.vue b/src/views/Inventory/ExchangePart/index.vue index fdf92e01..7bbb1661 100644 --- a/src/views/Inventory/ExchangePart/index.vue +++ b/src/views/Inventory/ExchangePart/index.vue @@ -513,7 +513,7 @@ export default { cancelButtonText: '取消', type: 'warning' }).then(() => { - dropExchangeList(this.exchangeListNumber, this.eTeamPartNumber).then(response => { + dropExchangeList(this.exchangeListNumber).then(response => { if (response.data[0].result === '1') { this.$message.success('删除成功') this.dialogFormVisible = false diff --git a/src/views/Inventory/InventoryManagement/index.vue b/src/views/Inventory/InventoryManagement/index.vue index 5a20a791..b1196317 100644 --- a/src/views/Inventory/InventoryManagement/index.vue +++ b/src/views/Inventory/InventoryManagement/index.vue @@ -450,7 +450,7 @@ export default { this.getTable() this.$message.success('删除成功') } else { - this.$message.error('删除失败') + this.$message.error('数据占用') } }) }) diff --git a/src/views/Inventory/PickingList/index.vue b/src/views/Inventory/PickingList/index.vue index e57c3f11..2bddcc4c 100644 --- a/src/views/Inventory/PickingList/index.vue +++ b/src/views/Inventory/PickingList/index.vue @@ -729,7 +729,7 @@ export default { this.$message.success('删除成功') this.searchListinfor() } else { - this.$message.error('删除失败') + this.$message.error('数据占用') } }) }).catch(() => { @@ -752,7 +752,7 @@ export default { this.$message.success('删除成功') this.searchListDetailt() } else { - this.$message.error('删除失败') + this.$message.error('数据占用') } }) }).catch(() => { From 7cdb10d153358b72f95165dd7f3a12ad7675f14d Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Wed, 5 Dec 2018 10:40:07 +0800 Subject: [PATCH 07/14] 1205 --- .../BasicData/PersonnelManagement/index.vue | 30 +++++----- .../WorkshopProcessMaintenance/index.vue | 56 +++++++++++++------ .../ProcessPlanning/index.vue | 41 ++++++-------- .../WorkshopEquipmentManagement/index.vue | 11 +++- 4 files changed, 80 insertions(+), 58 deletions(-) diff --git a/src/views/BasicData/PersonnelManagement/index.vue b/src/views/BasicData/PersonnelManagement/index.vue index e8d75235..8fdd3e83 100644 --- a/src/views/BasicData/PersonnelManagement/index.vue +++ b/src/views/BasicData/PersonnelManagement/index.vue @@ -537,26 +537,26 @@ export default { } }, addPeople() { - this.people_title = '新增人员' - this.people_DFV = true - this.addForm('people_form') - }, - submitAddPeople() { - this.people_DFV = false if (this.id) { - addPeople(this.id, this.people_form.Sex, this.people_form.Education, this.people_form.Address, this.people_form.Nation, this.people_form.Post, this.people_form.AccountNumber, this.people_form.Password, this.people_form.Name, this.people_form.IDcard, this.people_form.TimeOfEntry, this.people_form.Birthday, this.people_form.ContactInformation).then(response => { - if (response.data[0].result === '1') { - this.i = 1 - this.handleNodeClick() - this.$message.success('添加成功') - } else { - this.$message.error('添加失败') - } - }) + this.people_title = '新增人员' + this.people_DFV = true + this.addForm('people_form') } else { this.$message.warning(`请选择部门名称`) } }, + submitAddPeople() { + this.people_DFV = false + addPeople(this.id, this.people_form.Sex, this.people_form.Education, this.people_form.Address, this.people_form.Nation, this.people_form.Post, this.people_form.AccountNumber, this.people_form.Password, this.people_form.Name, this.people_form.IDcard, this.people_form.TimeOfEntry, this.people_form.Birthday, this.people_form.ContactInformation).then(response => { + if (response.data[0].result === '1') { + this.i = 1 + this.handleNodeClick() + this.$message.success('添加成功') + } else { + this.$message.error('添加失败') + } + }) + }, handleEditPeople(row) { this.people_title = '编辑人员' this.people_DFV = true diff --git a/src/views/BasicData/WorkshopProcessMaintenance/index.vue b/src/views/BasicData/WorkshopProcessMaintenance/index.vue index c3d527b5..8d45eb2c 100644 --- a/src/views/BasicData/WorkshopProcessMaintenance/index.vue +++ b/src/views/BasicData/WorkshopProcessMaintenance/index.vue @@ -25,15 +25,15 @@ stripe tooltip-effect="dark" style="width: 100%" - height="700" - highlight-current-row - border> - + height="700"> + - + @@ -191,6 +191,7 @@ export default { data() { return { // 工艺分类所需变量 + a: '', expands: [], tableData1: [], ProcessNum: '', @@ -221,8 +222,8 @@ export default { ProcessClassification: [{ required: true, message: '请输入工艺分类名称', trigger: 'blur' }] }, rules2: { - Process: [{ required: true, message: '请输入工艺名称', trigger: 'blur' }], - ProcessShort: [{ required: true, message: '请输入工艺名称简称', trigger: 'blur' }] + Process: [{ required: true, message: '请输入工艺名称' }], + ProcessShort: [{ required: true, message: '请输入工艺名称简称' }] }, rules3: { TechnologicalRequirements: [{ required: true, message: '请输入工艺要求', trigger: 'blur' }] @@ -318,27 +319,41 @@ export default { if (valid) { if (this.temp === 1) { this.submitaddProcessClassification() - this.form1 = {} + this.form1 = { + ProcessClassification: '' + } this.temp = null } else if (this.temp === 2) { this.submitProcessClassification() - this.form1 = {} + this.form1 = { + ProcessClassification: '' + } this.temp = null } else if (this.temp === 3) { this.submitaddProcess() - this.form2 = {} + this.form2 = { + Process: '', + ProcessShort: '' + } this.temp = null } else if (this.temp === 4) { this.submiteditProcess() - this.form2 = {} + this.form2 = { + Process: '', + ProcessShort: '' + } this.temp = null } else if (this.temp === 5) { this.submitTechnologicalRequirements() - this.form3 = {} + this.form3 = { + TechnologicalRequirements: '' + } this.temp = null } else if (this.temp === 6) { this.submiteditTechnologicalRequirements() - this.form3 = {} + this.form3 = { + TechnologicalRequirements: '' + } this.temp = null } } @@ -371,9 +386,16 @@ export default { this.dialogFormVisible4 = false this.dialogFormVisible5 = false this.dialogFormVisible6 = false - this.form1 = {} - this.form2 = {} - this.form3 = {} + this.form1 = { + ProcessClassification: '' + } + this.form2 = { + Process: '', + ProcessShort: '' + } + this.form3 = { + TechnologicalRequirements: '' + } }, getCurrentRow(row) { searchProcessClassificationOfProcessClassificationNum(this.radio).then(response => { diff --git a/src/views/ManufacturingCenter/ProcessPlanning/index.vue b/src/views/ManufacturingCenter/ProcessPlanning/index.vue index 4c1c8237..89d9bb97 100644 --- a/src/views/ManufacturingCenter/ProcessPlanning/index.vue +++ b/src/views/ManufacturingCenter/ProcessPlanning/index.vue @@ -205,7 +205,7 @@ @current-change="handleCurrentChange"/>
- 提交 + 提交
@@ -616,7 +616,9 @@ export default { result: 0, oldNum: '', newNum: '', - tableRecord: [] + tableRecord: [], + materialName2: '', + material2: '' } }, created() { @@ -635,15 +637,6 @@ export default { this.spec = '' this.batchNum = '' }, - // tableRowClassName({ row }) { - // for (let i = 0; i < this.tableRecord.length; i++) { - // if (this.tableRecord[i].工序流水号 === row.工序流水号 && this.radio === 2 && this.tableRecord[i].工艺编号 !== null) { // && this.tableRecord[i].工艺难度等级 !== null && this.tableRecord[i].工艺要求 !== null - // if (this.tableRecord[i].工艺编号 !== row.工艺编号 || this.tableRecord[i].工艺要求 !== row.工艺要求 || this.tableRecord[i].工艺难度等级 !== row.工艺难度等级 || this.tableRecord[i].工序顺序 !== row.工序顺序) { - // return 'change' - // } - // } - // } - // }, returnEdit() { // 在制零件工艺修改 if (this.partNumValue === '' || this.partNumValue === null) { this.$message.error('请选择零件') @@ -688,10 +681,17 @@ export default { } }, selectMaterial(row) { // 选择材质 + this.materialName2 = '' + this.material2 = '' + this.materialName2 = row.材料 + this.material2 = row.材料流水号 + }, + selectMaterial2() { this.materialName = '' this.material = '' - this.materialName = row.材料 - this.material = row.材料流水号 + this.materialName = this.materialName2 + this.material = this.material2 + this.dialogMaterial = false }, fetchData() { this.materialClass = [] @@ -923,10 +923,8 @@ export default { this.tableData[i].工艺难度等级 = this.tableData2[i].工艺难度等级 this.tableData[i].工艺要求 = this.tableData2[i].工艺要求 selectRequest(this.tableData[i].工序流水号, this.tableData[i].工艺计划流水号, this.tableData2[i].工艺编号, this.tableData2[i].工艺序号, this.tableData2[i].工艺要求).then(response => { - console.log('该工艺保存成功', 501) }) hardEdit(this.tableData[i].工序流水号, this.tableData2[i].工艺难度等级).then(response => { - console.log(response.data, '难度等级修改成功', 502) }) this.dialogFormVisible = false } @@ -970,7 +968,6 @@ export default { this.$message.error('请在主界面选择一个零件作为被拷贝对象') } else { gongyiCopy(this.num, this.partNumValue).then(() => { // 工艺计划流水号_完成工艺, 工艺计划流水号_被拷工艺 - console.log('已拷贝到主表', 503) this.searchDetail() }) } @@ -985,18 +982,15 @@ export default { } } gongyiYQ(this.num).then(response => { - console.log(response.data, 119) this.tableData4 = response.data }) }, hardEdit(row) { // 修改难度等级 hardEdit(row.工序流水号, row.工艺难度等级).then(response => { - console.log(response.data, '难度等级修改成功', 504) }) }, requestEdit(row) { // 修改工艺要求 requestEdit(row.工序流水号, row.工艺要求).then(response => { - console.log(response.data, '工艺要求修改成功', 505) }) }, tableSearch(index) { // 主界面工艺名称分类、工艺名称及工艺要求后续查询 @@ -1027,7 +1021,10 @@ export default { } }, cChange() { // 工艺名称分类改变 + this.processNameValue = '' this.processName = [] + this.processRequestValue = '' + this.processRequest = [] for (let i = 0; i < this.processNameClass.length; i++) { if (this.processNameClassValue === this.processNameClass[i].value) { processNameSelect(this.processSelect[i].value).then(response => { // 查询工艺名称 @@ -1042,6 +1039,7 @@ export default { } }, nChange() { // 工艺名称改变 + this.processRequestValue = '' this.processRequest = [] for (let i = 0; i < this.processName.length; i++) { if (this.processNameValue === this.processName[i].value) { @@ -1063,7 +1061,6 @@ export default { this.tableData[this.index].工艺要求 = this.str this.dialogFormVisible2 = false selectRequest(this.tableData[this.index].工序流水号, this.tableData[this.index].工艺计划流水号, this.tableData[this.index].工艺编号, this.tableData[this.index].工序顺序, this.tableData[this.index].工艺要求).then(response => { - console.log('该工艺保存成功', 506) }) }, calTol() { // 计算公差 @@ -1114,7 +1111,6 @@ export default { this.$message.error('请先选择一个零件') } else { insertOne(this.partNumValue, row.工序流水号).then(response => { - console.log(response.data, '插入成功', 507) this.searchDetail() }) } @@ -1145,7 +1141,6 @@ export default { this.$message.error('请先选择一个零件') } else { upOne(this.partNumValue, row.工序流水号).then(response => { - console.log(response.data, '上移成功', 508) this.searchDetail() }) } @@ -1155,7 +1150,6 @@ export default { this.$message.error('请先选择一个零件') } else { downOne(this.partNumValue, row.工序流水号).then(response => { - console.log(response.data, '下移成功', 509) this.searchDetail() }) } @@ -1198,7 +1192,6 @@ export default { }).then(() => { for (let i = 0; i < 30; i++) { hardEdit(this.tableData[i].工序流水号, '').then(response => { - console.log(response.data, '清空难度等级', 510) }) } deleteTable(this.newNum).then(response => { diff --git a/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue b/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue index 83b8b0f1..c3a6fafa 100644 --- a/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue +++ b/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue @@ -8,7 +8,7 @@ - + From 099489e358307222a9963668956d62151eecf574 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Wed, 5 Dec 2018 13:31:45 +0800 Subject: [PATCH 09/14] =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E5=AE=9A=E9=A2=9D?= =?UTF-8?q?=E5=88=B6=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/request.js | 2 +- .../QuotaFormulation/index.vue | 86 +++++++++++-------- 2 files changed, 50 insertions(+), 38 deletions(-) diff --git a/src/utils/request.js b/src/utils/request.js index 1af64819..2ce7de49 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -15,7 +15,7 @@ const service = axios.create({ // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, - baseURL: `http://192.168.0.105:8411/submit/MESCommonBase.ashx`, + baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, diff --git a/src/views/ManufacturingCenter/QuotaFormulation/index.vue b/src/views/ManufacturingCenter/QuotaFormulation/index.vue index 63d20dc6..fe1f2ecf 100644 --- a/src/views/ManufacturingCenter/QuotaFormulation/index.vue +++ b/src/views/ManufacturingCenter/QuotaFormulation/index.vue @@ -175,7 +175,7 @@ export default { this.fetchData() }, methods: { - fetchData() { // 初始化未编制零件号、材料、公差 + fetchData() { // 初始化未编制零件号 getPerson().then(response => { for (let i = 0; i < response.data.length; i++) { this.person.push({ @@ -255,49 +255,61 @@ export default { this.num0 = '' if (this.radio === 1) { detailInfo(this.partNumValue).then(response => { - this.typeValue = response.data[0].零件类型名称 - this.partName = response.data[0].零件名称 - this.batchNum = response.data[0].批次数量 - this.num0 = response.data[0].工艺计划流水号 - console.log(response.data[0].工艺计划流水号, 520) - this.material = response.data[0].材料 + if (response.data.length !== 0) { + this.typeValue = response.data[0].零件类型名称 + this.partName = response.data[0].零件名称 + this.batchNum = response.data[0].批次数量 + this.num0 = response.data[0].工艺计划流水号 + this.material = response.data[0].材料 + } + }).then(() => { mainTable(this.num0).then(response => { - for (let i = 0; i < response.data.length; i++) { - this.tableData.push({ - name: response.data[i].工艺名称, - request: response.data[i].工艺要求, - num1: response.data[i].工序流水号, - Settlement: response.data[i].准结定额工时, - singleton: response.data[i].单件定额工时, - lingjian: response.data[i].零件图号, - numm: response.data[i].工艺计划流水号 - }) + if (response.data.length === 0) { + this.listLoading = false + } else { + for (let i = 0; i < response.data.length; i++) { + this.tableData.push({ + name: response.data[i].工艺名称, + request: response.data[i].工艺要求, + num1: response.data[i].工序流水号, + Settlement: response.data[i].准结定额工时, + singleton: response.data[i].单件定额工时, + lingjian: response.data[i].零件图号, + numm: response.data[i].工艺计划流水号 + }) + } + this.listLoading = false } - this.listLoading = false }) }) } else { detailInfo(this.partNumValue).then(response => { - this.typeValue = response.data[0].零件类型名称 - this.partName = response.data[0].零件名称 - this.batchNum = response.data[0].批次数量 - this.num0 = response.data[0].工艺计划流水号 - this.material = response.data[0].材料 - }) - mainTable1(this.partNumValue).then(response => { - for (let i = 0; i < response.data.length; i++) { - this.tableData.push({ - name: response.data[i].工艺名称, - request: response.data[i].工艺要求, - num1: response.data[i].工序流水号, - Settlement: response.data[i].准结定额工时, - singleton: response.data[i].单件定额工时, - budget: response.data[i].外协预算价格1, - lingjian: response.data[i].零件图号, - numm: response.data[i].工艺计划流水号 - }) + if (response.data.length !== 0) { + this.typeValue = response.data[0].零件类型名称 + this.partName = response.data[0].零件名称 + this.batchNum = response.data[0].批次数量 + this.num0 = response.data[0].工艺计划流水号 + this.material = response.data[0].材料 } - this.listLoading = false + }).then(() => { + mainTable1(this.partNumValue).then(response => { + if (response.data.length === 0) { + this.listLoading = false + } else { + for (let i = 0; i < response.data.length; i++) { + this.tableData.push({ + name: response.data[i].工艺名称, + request: response.data[i].工艺要求, + num1: response.data[i].工序流水号, + Settlement: response.data[i].准结定额工时, + singleton: response.data[i].单件定额工时, + budget: response.data[i].外协预算价格1, + lingjian: response.data[i].零件图号, + numm: response.data[i].工艺计划流水号 + }) + } + } + }) }) } }, From ff28e5f0ac8933e1032374b8de1fb9f10b45c118 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Wed, 5 Dec 2018 13:41:02 +0800 Subject: [PATCH 10/14] =?UTF-8?q?=E8=BD=A6=E9=97=B4=E5=B7=A5=E8=89=BA?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/request.js | 15 --------------- src/views/BasicData/PersonnelManagement/index.vue | 3 --- .../WorkshopProcessMaintenance/index.vue | 4 ++-- 3 files changed, 2 insertions(+), 20 deletions(-) diff --git a/src/utils/request.js b/src/utils/request.js index 17fe11bf..c4850253 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -10,22 +10,7 @@ export const name = `OP8888` export const upload = `http://localhost:8411/submit/uploadFile.ashx` export const download = `http://localhost:8411/submit/downloadFile.ashx` const service = axios.create({ -<<<<<<< HEAD baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, -======= - - // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, - // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, ->>>>>>> 7cdb10d153358b72f95165dd7f3a12ad7675f14d - // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, - - baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, - // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, - - // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, - // baseURL: `http://192.168.137.85:8411/submit/MESCommonBase.ashx`, // 李鑫 - - // baseURL: `http://192.168.1.112:8411/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) diff --git a/src/views/BasicData/PersonnelManagement/index.vue b/src/views/BasicData/PersonnelManagement/index.vue index 56a3237e..050a1deb 100644 --- a/src/views/BasicData/PersonnelManagement/index.vue +++ b/src/views/BasicData/PersonnelManagement/index.vue @@ -538,7 +538,6 @@ export default { }, addPeople() { if (this.id) { -<<<<<<< HEAD addPeople(this.id, this.people_form.Sex, this.people_form.Education, this.people_form.Address, this.people_form.Nation, this.people_form.Post, this.people_form.AccountNumber, this.people_form.Password, this.people_form.Name, this.people_form.IDcard, this.people_form.TimeOfEntry, this.people_form.Birthday, this.people_form.ContactInformation).then(response => { if (response.data[0].result === '1') { this.i = 1 @@ -548,11 +547,9 @@ export default { this.$message.error('添加失败') } }) -======= this.people_title = '新增人员' this.people_DFV = true this.addForm('people_form') ->>>>>>> 7cdb10d153358b72f95165dd7f3a12ad7675f14d } else { this.$message.warning(`请选择部门名称`) } diff --git a/src/views/BasicData/WorkshopProcessMaintenance/index.vue b/src/views/BasicData/WorkshopProcessMaintenance/index.vue index 8d45eb2c..23add9cb 100644 --- a/src/views/BasicData/WorkshopProcessMaintenance/index.vue +++ b/src/views/BasicData/WorkshopProcessMaintenance/index.vue @@ -222,8 +222,8 @@ export default { ProcessClassification: [{ required: true, message: '请输入工艺分类名称', trigger: 'blur' }] }, rules2: { - Process: [{ required: true, message: '请输入工艺名称' }], - ProcessShort: [{ required: true, message: '请输入工艺名称简称' }] + Process: [{ required: true, message: '请输入工艺名称', trigger: 'blur' }], + ProcessShort: [{ required: true, message: '请输入工艺名称简称', trigger: 'blur' }] }, rules3: { TechnologicalRequirements: [{ required: true, message: '请输入工艺要求', trigger: 'blur' }] From c301637c34580c90709c0ef15a092143c1cebaca Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Wed, 5 Dec 2018 13:51:13 +0800 Subject: [PATCH 11/14] =?UTF-8?q?=E4=BA=BA=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/BasicData/PersonnelManagement/index.vue | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/views/BasicData/PersonnelManagement/index.vue b/src/views/BasicData/PersonnelManagement/index.vue index 050a1deb..8fdd3e83 100644 --- a/src/views/BasicData/PersonnelManagement/index.vue +++ b/src/views/BasicData/PersonnelManagement/index.vue @@ -538,15 +538,6 @@ export default { }, addPeople() { if (this.id) { - addPeople(this.id, this.people_form.Sex, this.people_form.Education, this.people_form.Address, this.people_form.Nation, this.people_form.Post, this.people_form.AccountNumber, this.people_form.Password, this.people_form.Name, this.people_form.IDcard, this.people_form.TimeOfEntry, this.people_form.Birthday, this.people_form.ContactInformation).then(response => { - if (response.data[0].result === '1') { - this.i = 1 - this.handleNodeClick() - this.$message.success('添加成功') - } else { - this.$message.error('添加失败') - } - }) this.people_title = '新增人员' this.people_DFV = true this.addForm('people_form') From c7dbdb4c4bceb2738eed82ae2022c7d528474c90 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Wed, 5 Dec 2018 19:23:50 +0800 Subject: [PATCH 12/14] =?UTF-8?q?=E5=BA=8F=E9=97=B4=E5=A4=96=E5=8D=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Outsourcing/PreorderAssociation/index.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/Outsourcing/PreorderAssociation/index.vue b/src/views/Outsourcing/PreorderAssociation/index.vue index 6da8b560..4538a52f 100644 --- a/src/views/Outsourcing/PreorderAssociation/index.vue +++ b/src/views/Outsourcing/PreorderAssociation/index.vue @@ -97,10 +97,10 @@ 选择 - + From 352af60c30301365554609d0bf7d2666e3f8a40a Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Wed, 5 Dec 2018 19:59:30 +0800 Subject: [PATCH 13/14] =?UTF-8?q?=E5=BA=8F=E9=97=B4=E5=A4=96=E5=8D=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Outsourcing/PreorderAssociation/index.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/Outsourcing/PreorderAssociation/index.vue b/src/views/Outsourcing/PreorderAssociation/index.vue index 4538a52f..b92cd5a1 100644 --- a/src/views/Outsourcing/PreorderAssociation/index.vue +++ b/src/views/Outsourcing/PreorderAssociation/index.vue @@ -242,7 +242,6 @@ export default { this.checkBox = [] this.tableData2 = [] searchTable2(row.工艺计划流水号).then(response => { - console.log(response.data) this.num1 = row.工艺计划流水号 if (response.data.length === 0) { this.loading0 = false From 628ec49496235e48df8f48cd217a964af4675e5f Mon Sep 17 00:00:00 2001 From: caoxinyu Date: Wed, 5 Dec 2018 20:03:10 +0800 Subject: [PATCH 14/14] =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/BasicData/PersonnelManagement.js | 22 +++ src/utils/request.js | 15 -- .../BasicData/PersonnelManagement/index.vue | 163 ++++++++++++++++-- .../WorkshopPersonnelRoleMana/index.vue | 1 + 4 files changed, 169 insertions(+), 32 deletions(-) diff --git a/src/api/BasicData/PersonnelManagement.js b/src/api/BasicData/PersonnelManagement.js index fff648d1..83959a0d 100644 --- a/src/api/BasicData/PersonnelManagement.js +++ b/src/api/BasicData/PersonnelManagement.js @@ -330,3 +330,25 @@ export function delPost(num1) { } }) } +export function quit(num1) { + return request({ + url: '', + method: 'post', + data: { + type: 2, + name: '人事档案管理_人员_离职操作', + param: '人员编号=' + num1 + '=int' + } + }) +} +export function searchLeavingList(pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + type: 1, + name: '人事档案管理_人员_离职人员查询', + pagination: pageCurrent + '&' + pageSize + } + }) +} diff --git a/src/utils/request.js b/src/utils/request.js index 2c735cb7..c4850253 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -10,22 +10,7 @@ export const name = `OP8888` export const upload = `http://localhost:8411/submit/uploadFile.ashx` export const download = `http://localhost:8411/submit/downloadFile.ashx` const service = axios.create({ -<<<<<<< HEAD baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, -======= - - // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, - // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, ->>>>>>> 7cdb10d153358b72f95165dd7f3a12ad7675f14d - // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, - - baseURL: `http://192.168.0.105:8411/submit/MESCommonBase.ashx`, - // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, - - // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, - // baseURL: `http://192.168.137.85:8411/submit/MESCommonBase.ashx`, // 李鑫 - - // baseURL: `http://192.168.1.112:8411/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) diff --git a/src/views/BasicData/PersonnelManagement/index.vue b/src/views/BasicData/PersonnelManagement/index.vue index 56a3237e..ac53c58a 100644 --- a/src/views/BasicData/PersonnelManagement/index.vue +++ b/src/views/BasicData/PersonnelManagement/index.vue @@ -15,6 +15,8 @@ 新增 + 离职 + 离职名单 @@ -51,7 +53,7 @@ - +
部门维护 展开 @@ -77,9 +79,10 @@ stripe tooltip-effect="dark" style="width: 100%" - height="679" + height="659" highlight-current-row border + size="mini" @selection-change="handleSelectionChange"> 确定
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+