diff --git a/src/api/WorkshopProcurement/ArrivalStateSearch.js b/src/api/WorkshopProcurement/ArrivalStateSearch.js index 9e9ac3c6..fc550fe1 100644 --- a/src/api/WorkshopProcurement/ArrivalStateSearch.js +++ b/src/api/WorkshopProcurement/ArrivalStateSearch.js @@ -7,7 +7,8 @@ export function initArrivalStateContact() { method: 'post', data: { type: '1', - name: '车间管理_到货情况_查询数据' + name: '车间管理_到货情况_查询数据', + param: '采购合同流水号_check=0&供应商名称_check=0' } }) } diff --git a/src/api/WorkshopProcurement/OutsourcingProcessPlanning.js b/src/api/WorkshopProcurement/OutsourcingProcessPlanning.js index ab5ae7ec..57496b04 100644 --- a/src/api/WorkshopProcurement/OutsourcingProcessPlanning.js +++ b/src/api/WorkshopProcurement/OutsourcingProcessPlanning.js @@ -8,7 +8,7 @@ export function initCraftmen() { data: { type: '1', name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号', - param: '考核部门编号=17' + param: '考核部门编号=9' } }) } diff --git a/src/api/WorkshopProcurement/OutsourcingQuotaSetting.js b/src/api/WorkshopProcurement/OutsourcingQuotaSetting.js index a4527017..0c4b846b 100644 --- a/src/api/WorkshopProcurement/OutsourcingQuotaSetting.js +++ b/src/api/WorkshopProcurement/OutsourcingQuotaSetting.js @@ -8,7 +8,7 @@ export function getPerson() { data: { type: '1', name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号', - param: '考核部门编号=17' + param: '考核部门编号=9' } }) } diff --git a/src/api/WorkshopProcurement/PurchaseContractChange.js b/src/api/WorkshopProcurement/PurchaseContractChange.js index bc8cae34..82b842c0 100644 --- a/src/api/WorkshopProcurement/PurchaseContractChange.js +++ b/src/api/WorkshopProcurement/PurchaseContractChange.js @@ -35,14 +35,14 @@ export function initBuyer() { }) } // 采购合同查询 -export function searchTable1(pageCurrent, pageSize, check1, start, end, check2, contract, check3, name, check4, supplier) { +export function searchTable1(pageCurrent, pageSize, check2, contract, check3, name, check4, supplier) { return request({ url: '', method: 'post', data: { type: '1', name: '车间采购管理_现有合同_查询数据', - param: '时间段_check=' + check1 + '&开始时间=' + start + '=datetime&结束时间=' + end + '=datetime&采购合同流水号_check=' + check2 + '&采购合同流水号=' + contract + '&人员编号_check=' + check3 + '&人员编号=' + name + '&供应商名称_check=' + check4 + '&供应商名称=' + supplier, + param: '采购合同流水号_check=' + check2 + '&采购合同流水号=' + contract + '&人员编号_check=' + check3 + '&人员编号=' + name + '&供应商名称_check=' + check4 + '&供应商名称=' + supplier, Pagination: pageCurrent + '&' + pageSize } }) @@ -72,14 +72,14 @@ export function searchTable5(num) { }) } // 采购合同变更查询 -export function searchTable3(pageCurrent, pageSize, check1, start, end, check2, contract, check3, name, check4, supplier) { +export function searchTable3(pageCurrent, pageSize, check2, contract, check3, name, check4, supplier) { return request({ url: '', method: 'post', data: { type: '1', name: '车间采购管理_采购合同变更_查询数据_根据条件_cjn', - param: '时间段_check=' + check1 + '&开始时间=' + start + '=datetime&结束时间=' + end + '=datetime&采购合同变更流水号_check=' + check2 + '&采购合同变更流水号=' + contract + '&人员编号_check=' + check3 + '&人员编号=' + name + '&供应商名称_check=' + check4 + '&供应商名称=' + supplier, + param: '采购合同变更流水号_check=' + check2 + '&采购合同变更流水号=' + contract + '&人员编号_check=' + check3 + '&人员编号=' + name + '&供应商名称_check=' + check4 + '&供应商名称=' + supplier, Pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/api/WorkshopProcurement/ReceiptConnectionSheet.js b/src/api/WorkshopProcurement/ReceiptConnectionSheet.js index 11c45928..48ec53bc 100644 --- a/src/api/WorkshopProcurement/ReceiptConnectionSheet.js +++ b/src/api/WorkshopProcurement/ReceiptConnectionSheet.js @@ -68,7 +68,8 @@ export function initContract() { method: 'post', data: { type: '1', - name: '车间采购管理_付款情况_查询数据' + name: '车间采购管理_付款情况_查询数据', + param: '采购合同流水号_check=0&供应商名称_check=0' } }) } diff --git a/src/icons/svg/OfflineContract1.svg b/src/icons/svg/OfflineContract1.svg new file mode 100644 index 00000000..2edf5865 --- /dev/null +++ b/src/icons/svg/OfflineContract1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/OutsourcingProcessPlanning.svg b/src/icons/svg/OutsourcingProcessPlanning.svg new file mode 100644 index 00000000..ce9f5559 --- /dev/null +++ b/src/icons/svg/OutsourcingProcessPlanning.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/OutsourcingQuotaSetting.svg b/src/icons/svg/OutsourcingQuotaSetting.svg new file mode 100644 index 00000000..aaf07848 --- /dev/null +++ b/src/icons/svg/OutsourcingQuotaSetting.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/ReceiptConnectionSheet.svg b/src/icons/svg/ReceiptConnectionSheet.svg new file mode 100644 index 00000000..6b3cb48f --- /dev/null +++ b/src/icons/svg/ReceiptConnectionSheet.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/views/TechnologyCenter/ImportParts/specificationData.vue b/src/views/TechnologyCenter/ImportParts/specificationData.vue index 20f9fcb7..92fb47f2 100644 --- a/src/views/TechnologyCenter/ImportParts/specificationData.vue +++ b/src/views/TechnologyCenter/ImportParts/specificationData.vue @@ -406,18 +406,29 @@ export default { } }, allDelete() { - if (this.projectName !== '' && this.machineValue !== '' && this.groupValue !== '') { - allDelete(this.projectName, this.machineValue, this.groupValue).then(response => { - if (response.data[0].result === '1') { - this.tableData = [] - this.$message.success('删除成功') - } else { - this.$message.error('删除失败') - } + this.$confirm('此操作将永久删除该行, 是否继续?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + if (this.projectName !== '' && this.machineValue !== '' && this.groupValue !== '') { + allDelete(this.projectName, this.machineValue, this.groupValue).then(response => { + if (response.data[0].result === '1') { + this.tableData = [] + this.$message.success('删除成功') + } else { + this.$message.error('删除失败') + } + }) + } else { + this.$message.warning('请选择好项目机床分组') + } + }).catch(() => { + this.$message({ + type: 'info', + message: '已取消删除' }) - } else { - this.$message.warning('请选择好项目机床分组') - } + }) }, getGroups() { this.$emit('machineChange', this.machineValue) diff --git a/src/views/WorkshopProcurement/PurchaseContractChange/index.vue b/src/views/WorkshopProcurement/PurchaseContractChange/index.vue index 376c18e7..d7052564 100644 --- a/src/views/WorkshopProcurement/PurchaseContractChange/index.vue +++ b/src/views/WorkshopProcurement/PurchaseContractChange/index.vue @@ -3,18 +3,8 @@