diff --git a/src/api/ManufacturingCenter/ProcessAdjustQuery.js b/src/api/ManufacturingCenter/ProcessAdjustQuery.js index 151b6d6d..ae7575dd 100644 --- a/src/api/ManufacturingCenter/ProcessAdjustQuery.js +++ b/src/api/ManufacturingCenter/ProcessAdjustQuery.js @@ -8,7 +8,7 @@ export function initCraftmen() { data: { type: '1', name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号', - param: '考核部门编号=17' + param: '考核部门编号=20' } }) } diff --git a/src/api/ManufacturingCenter/RawMaterialsMaintenance.js b/src/api/ManufacturingCenter/RawMaterialsMaintenance.js new file mode 100644 index 00000000..e9c8bbb3 --- /dev/null +++ b/src/api/ManufacturingCenter/RawMaterialsMaintenance.js @@ -0,0 +1,47 @@ +import request from '@/utils/request' + +export function searchTableData(num, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '库存管理_原材料库存管理_查询', + param: '原材料名称=' + num, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +export function addData(num) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '库存管理_原材料库存管理_新增', + param: '原材料名称=' + num + } + }) +} +export function editData(num1, num2) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '库存管理_原材料库存管理_编辑', + param: '原材料流水号=' + num1 + '&原材料名称=' + num2 + } + }) +} +export function deleteCategory(num) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '库存管理_原材料库存管理_删除', + param: '原材料流水号=' + num + } + }) +} diff --git a/src/api/ManufacturingCenter/SparePartsPurchase.js b/src/api/ManufacturingCenter/SparePartsPurchase.js new file mode 100644 index 00000000..e9c8bbb3 --- /dev/null +++ b/src/api/ManufacturingCenter/SparePartsPurchase.js @@ -0,0 +1,47 @@ +import request from '@/utils/request' + +export function searchTableData(num, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '库存管理_原材料库存管理_查询', + param: '原材料名称=' + num, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +export function addData(num) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '库存管理_原材料库存管理_新增', + param: '原材料名称=' + num + } + }) +} +export function editData(num1, num2) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '库存管理_原材料库存管理_编辑', + param: '原材料流水号=' + num1 + '&原材料名称=' + num2 + } + }) +} +export function deleteCategory(num) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '库存管理_原材料库存管理_删除', + param: '原材料流水号=' + num + } + }) +} diff --git a/src/api/PurchasingCenter/InvoiceSettlementApprove.js b/src/api/PurchasingCenter/InvoiceSettlementApprove.js index 15f3e5ac..650d34d5 100644 --- a/src/api/PurchasingCenter/InvoiceSettlementApprove.js +++ b/src/api/PurchasingCenter/InvoiceSettlementApprove.js @@ -8,7 +8,7 @@ export function searchTable1(...group) { data: { type: '1', name: '采购管理_发票结算申请单_查询数据', - param: `时间段_check=${group[0]}&开始日期=${group[1]}&结束日期=${group[2]}&是否提交=1`, + param: `时间段_check=${group[0]}&开始日期=${group[1]}&结束日期=${group[2]}&是否提交=1&角色编号=${group[5]}`, Pagination: group[3] + '&' + group[4] } }) diff --git a/src/api/PurchasingCenter/OfflineContract.js b/src/api/PurchasingCenter/OfflineContract.js index a47cae3e..0cd9792f 100644 --- a/src/api/PurchasingCenter/OfflineContract.js +++ b/src/api/PurchasingCenter/OfflineContract.js @@ -1,6 +1,6 @@ import request from '@/utils/request' -// 查询库存数 +// 询价状态修改 export function changeInquiryStatus(num) { return request({ url: '', diff --git a/src/icons/svg/FundApproval2workshop.svg b/src/icons/svg/FundApproval2workshop.svg new file mode 100644 index 00000000..5e6226be --- /dev/null +++ b/src/icons/svg/FundApproval2workshop.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/views/ManufacturingCenter/ProcessAdjustQuery/index.vue b/src/views/ManufacturingCenter/ProcessAdjustQuery/index.vue index 372a510d..1a2f5e0f 100644 --- a/src/views/ManufacturingCenter/ProcessAdjustQuery/index.vue +++ b/src/views/ManufacturingCenter/ProcessAdjustQuery/index.vue @@ -10,14 +10,13 @@ :value="item.value"/> 零件图号: - + - 查询 打回时间: @@ -219,15 +218,11 @@ export default { tableRowClassName2({ row }) { for (let i = 0; i < this.tableData1.length; i++) { row.工艺编号 === null ? row.工艺编号 = 0 : row.工艺编号 - if (this.tableData1[i].工序流水号 === row.工序流水号 && this.tableData1[i].工艺编号 !== null) { + if (this.tableData1[i].工序顺序 === row.工序顺序) { if (this.tableData1[i].工艺编号 !== row.工艺编号 || this.tableData1[i].工艺要求 !== row.工艺要求 || this.tableData1[i].工艺难度等级 !== row.工艺难度等级) { return 'change' } else { - if (this.tableData1[i].工序顺序 !== row.工序顺序 && (row.工艺要求 || row.工艺难度等级)) { - return 'change' - } else { - return '' - } + return '' } } } @@ -235,15 +230,11 @@ export default { tableRowClassName1({ row }) { for (let i = 0; i < this.tableData2.length; i++) { row.工艺编号 === null ? row.工艺编号 = 0 : row.工艺编号 - if (this.tableData2[i].工序流水号 === row.工序流水号 && this.tableData2[i].工艺编号 !== null) { + if (this.tableData2[i].工序顺序 === row.工序顺序) { if (this.tableData2[i].工艺编号 !== row.工艺编号 || this.tableData2[i].工艺要求 !== row.工艺要求 || this.tableData2[i].工艺难度等级 !== row.工艺难度等级) { return 'change' } else { - if (this.tableData1[i].工序顺序 !== row.工序顺序 && (row.工艺要求 || row.工艺难度等级)) { - return 'change' - } else { - return '' - } + return '' } } } diff --git a/src/views/ManufacturingCenter/RawMaterialsMaintenance/index.vue b/src/views/ManufacturingCenter/RawMaterialsMaintenance/index.vue new file mode 100644 index 00000000..198186ba --- /dev/null +++ b/src/views/ManufacturingCenter/RawMaterialsMaintenance/index.vue @@ -0,0 +1,169 @@ + + + + + diff --git a/src/views/ManufacturingCenter/SparePartsPurchase/index.vue b/src/views/ManufacturingCenter/SparePartsPurchase/index.vue new file mode 100644 index 00000000..aa335836 --- /dev/null +++ b/src/views/ManufacturingCenter/SparePartsPurchase/index.vue @@ -0,0 +1,130 @@ + + + + + diff --git a/src/views/PurchasingCenter/FundApproval2/index.vue b/src/views/PurchasingCenter/FundApproval2/index.vue index 060db5c8..e7454513 100644 --- a/src/views/PurchasingCenter/FundApproval2/index.vue +++ b/src/views/PurchasingCenter/FundApproval2/index.vue @@ -117,9 +117,48 @@ @current-change="handleCurrentChange2"/> -

采购合同

-
-

离线合同

+

采购合同

+
+

离线合同

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +

离线合同

GAOJING合同名称 + 供应商 + +
合同编号 + 采购员 +
序号名称规格型号数量单价合计交货期备注
总计 + + +
+
+