diff --git a/src/api/BasicData/PartsNumberMaintenance.js b/src/api/BasicData/PartsNumberMaintenance.js index d0f660ab..c7e1652d 100644 --- a/src/api/BasicData/PartsNumberMaintenance.js +++ b/src/api/BasicData/PartsNumberMaintenance.js @@ -115,7 +115,7 @@ export function alldelete(basicNum) { ModularID: router.currentRoute.path, type: '2', name: 'PDM_零件明细表_基本件_删除数据_根据组件流水号', - param: `组件流水号=${basicNum}` + param: `基本件流水号组=${basicNum}` } }) } @@ -193,7 +193,7 @@ export function alldeleteWB(num) { ModularID: router.currentRoute.path, type: '2', name: 'PDM_零件明细表_标准件和外购件_删除数据_根据组件流水号', - param: '组件流水号=' + num + '=int' + param: '标准件和外购件流水号组=' + num } }) } diff --git a/src/api/ManufacturingCenter/AntonMonitoring.js b/src/api/ManufacturingCenter/AntonMonitoring.js index 578b7ba1..a9f630e3 100644 --- a/src/api/ManufacturingCenter/AntonMonitoring.js +++ b/src/api/ManufacturingCenter/AntonMonitoring.js @@ -2,7 +2,7 @@ import request from '@/utils/request' import state from '@/store' import router from '@/router' -export function searchTable(check, dateRange0, dateRange1, pageCurrent, pageSize) { +export function searchTable(check, dateRange0, dateRange1, order, partName, pageCurrent, pageSize) { return request({ url: '', method: 'post', @@ -11,7 +11,7 @@ export function searchTable(check, dateRange0, dateRange1, pageCurrent, pageSize ModularID: router.currentRoute.path, type: '1', name: 'ANDON监控_查询', - param: `日期_check=${check}&开始时间=${dateRange0}&结束时间=${dateRange1}`, + param: `日期_check=${check}&开始时间=${dateRange0}&结束时间=${dateRange1}&排序方式=${order}&排序名称=${partName}`, Pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/api/ManufacturingCenter/QualityInspectionQueryMetalworking.js b/src/api/ManufacturingCenter/QualityInspectionQueryMetalworking.js new file mode 100644 index 00000000..28342f4b --- /dev/null +++ b/src/api/ManufacturingCenter/QualityInspectionQueryMetalworking.js @@ -0,0 +1,33 @@ +import request from '@/utils/request' +import state from '@/store' +import router from '@/router' + +// 质检管理_质量情况_查询数据 +export function selecttable(check1, value1, check2, value2, check3, value3, check4, value4, check5, value5, check6, value6, check7, value7, check8, value8, check9, value9, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '质检管理_质量情况_金工_查询数据', + param: '机床流水号_check=0&机床流水号=' + value1 + '&组件流水号_check=0&组件流水号=' + value2 + '&零件名称_check=' + check3 + '&零件名称=' + value3 + + '&质检类型代码_check=1&质检类型代码=10&开始时间_check=' + check5 + '&开始时间=' + value5 + '&结束时间_check=' + check6 + '&结束时间=' + value6 + '&质检情况_check=' + check7 + '&质检情况=' + value7 + '&人员编号_check=0&人员编号=' + value8 + '&处理结果_check=' + check9 + '&处理结果=' + value9 + `&PageCurrent=${pageCurrent}&PageSize=${pageSize}&PageCount=1111=int=output&ItemCount=1111=int=output` + } + }) +} + +// 质检管理_质量情况_查询数据 +export function getprocessingresult() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '质检管理_不合格处理_查询数据' + } + }) +} diff --git a/src/api/PurchasingCenter/OfflineContract.js b/src/api/PurchasingCenter/OfflineContract.js index c4f07a15..59cd36e4 100644 --- a/src/api/PurchasingCenter/OfflineContract.js +++ b/src/api/PurchasingCenter/OfflineContract.js @@ -32,7 +32,7 @@ export function searchInventoryNum(pageCurrent, pageSize, check1, val1, check2, }) } // 查询离线合同 -export function searchOfflineContract(pageCurrent, pageSize, check1, num, check2, name) { +export function searchOfflineContract(pageCurrent, pageSize, check1, num, check2, name, id) { return request({ url: '', method: 'post', @@ -41,7 +41,7 @@ export function searchOfflineContract(pageCurrent, pageSize, check1, num, check2 ModularID: router.currentRoute.path, type: '1', name: '采购管理_离线合同_查询数据_新', - param: `离线合同编号_check=${check1}&离线合同编号=${num}&供应商名称_check=${check2}&供应商名称=${name}`, + param: `离线合同编号_check=${check1}&离线合同编号=${num}&供应商名称_check=${check2}&供应商名称=${name}&人员编号=${id}`, Pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/api/PurchasingCenter/PurchaseContractRequestFund.js b/src/api/PurchasingCenter/PurchaseContractRequestFund.js index 740972f8..fc36966d 100644 --- a/src/api/PurchasingCenter/PurchaseContractRequestFund.js +++ b/src/api/PurchasingCenter/PurchaseContractRequestFund.js @@ -30,7 +30,7 @@ export function searchContract(check, num1, num2) { }) } // 查询请款表 -export function searchRequestFund(pageCurrent, pageSize, check1, start, end, check2, num, check3) { +export function searchRequestFund(pageCurrent, pageSize, check1, start, end, check2, num, check3, id) { return request({ url: '', method: 'post', @@ -39,7 +39,7 @@ export function searchRequestFund(pageCurrent, pageSize, check1, start, end, che ModularID: router.currentRoute.path, type: '1', name: '采购管理_采购合同_请款_查询数据', - param: `时间段_check=${check1}&开始时间=${start}&结束时间=${end}&供应商流水号_check=${check2}&供应商流水号=${num}&查询当前_check=${check3}`, + param: `时间段_check=${check1}&开始时间=${start}&结束时间=${end}&供应商流水号_check=${check2}&供应商流水号=${num}&查询当前_check=${check3}&人员编号=${id}`, Pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/api/WorkshopProcurement/PurchaseContractRequestFund1.js b/src/api/WorkshopProcurement/PurchaseContractRequestFund1.js index 8229701c..d992ee5b 100644 --- a/src/api/WorkshopProcurement/PurchaseContractRequestFund1.js +++ b/src/api/WorkshopProcurement/PurchaseContractRequestFund1.js @@ -80,7 +80,7 @@ export function searchPurchaseContract(check, num) { UserID: state.state.user.id, ModularID: router.currentRoute.path, type: '1', - name: '车间采购管理_采购合同_查询数据', + name: '车间采购管理_采购合同_查询数据_请款', param: `供应商流水号_check=${check}&供应商流水号=${num}` } }) diff --git a/src/views/BasicData/PartsNumberMaintenance/index.vue b/src/views/BasicData/PartsNumberMaintenance/index.vue index 168011df..216704ea 100644 --- a/src/views/BasicData/PartsNumberMaintenance/index.vue +++ b/src/views/BasicData/PartsNumberMaintenance/index.vue @@ -28,7 +28,8 @@ 全部删除 - + + @@ -115,7 +116,8 @@ size="mini" height="320" highlight-current-row - border> + border + @selection-change="handleSelectionChange1"> - + @@ -46,7 +46,7 @@ {{ scope.row.解除时间 }} - + @@ -78,7 +78,9 @@ export default { loading: false, total1: 0, pageCurrent1: 1, - pageSize1: 50 + pageSize1: 50, + order: '', + partName: '' } }, created() { @@ -87,12 +89,29 @@ export default { this.searchTable() }, methods: { + sortChange(column, prop, order) { + if (column.prop === '工位号') { + this.partName = 1 + } else if (column.prop === '安东明细描述') { + this.partName = 2 + } else if (column.prop === '处理时长') { + this.partName = 3 + } else { + this.partName = '' + } + if (column.order === 'ascending') { + this.order = 1 + } else if (column.order === 'descending') { this.order = 2 } else { + this.order = '' + } + this.searchTable() + }, searchTable() { this.loading = true this.tableData = [] var check1 this.dateRange ? check1 = 1 : (check1 = 0, this.dateRange = '') - searchTable(check1, this.dateRange[0], this.dateRange[1], this.pageCurrent1, this.pageSize1).then(response => { + searchTable(check1, this.dateRange[0], this.dateRange[1], this.order, this.partName, this.pageCurrent1, this.pageSize1).then(response => { this.tableData = response.data.rows this.total1 = response.data.total this.loading = false diff --git a/src/views/ManufacturingCenter/QualityInspectionQueryMetalworking/index.vue b/src/views/ManufacturingCenter/QualityInspectionQueryMetalworking/index.vue new file mode 100644 index 00000000..b9dd542f --- /dev/null +++ b/src/views/ManufacturingCenter/QualityInspectionQueryMetalworking/index.vue @@ -0,0 +1,416 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue index 5f557e88..8a06db60 100644 --- a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue +++ b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue @@ -279,7 +279,7 @@ export default { } else { sums[index] = 'N/A' } - } else if (index === 12) { + } else if (index === 13) { const values = data.map(item => Number(parseFloat(item['未税总额']))) if (!values.every(value => isNaN(value))) { sums[index] = values.reduce((prev, curr) => { diff --git a/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue b/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue index 825f1d35..e02092f3 100644 --- a/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue +++ b/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue @@ -87,7 +87,7 @@ {{ scope.row.申请时间 ? scope.row.申请时间.split(' ')[0] : '—' }} - + @@ -97,12 +97,12 @@ {{ scope.row.审批1未过原因 ? scope.row.审批1未过原因 : '—' }} - + - + @@ -117,7 +117,7 @@ {{ scope.row.审批4时间 ? scope.row.审批4时间.split(' ')[0] : '—' }} - + diff --git a/src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue b/src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue index 5883be48..496d4f03 100644 --- a/src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue +++ b/src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue @@ -75,7 +75,7 @@ @@ -85,7 +85,7 @@ @@ -95,7 +95,7 @@ diff --git a/src/views/PurchasingCenter/OfflineContract/index.vue b/src/views/PurchasingCenter/OfflineContract/index.vue index 6fd0ea20..61acc24f 100644 --- a/src/views/PurchasingCenter/OfflineContract/index.vue +++ b/src/views/PurchasingCenter/OfflineContract/index.vue @@ -812,12 +812,13 @@ export default { totalPrice: 0, // 合同总额 tableData4: [], // 合同模板 stipulateArrivalTime: '', // 规定到货时间 - 离线合同状态: '', + 离线合同状态: true, numbers: [], numbers1: [], paramRow: '', // 参数row disable: true, // 其他的禁用 tabName: '标准件', + tongguo: '', total22: 0, pageCurrent22: 1, pageSize22: 20 @@ -1067,7 +1068,8 @@ export default { this.supplierName0 ? this.check4 = 1 : this.check4 = 0 this.loading3 = true this.tableData3 = [] - searchOfflineContract(this.pageCurrent2, this.pageSize2, this.check3, this.offlineContract, this.check4, this.supplierName0).then(response => { + console.log(this.id, 'id') + searchOfflineContract(this.pageCurrent2, this.pageSize2, this.check3, this.offlineContract, this.check4, this.supplierName0, this.id).then(response => { console.log(response.data.rows, 99) this.tableData2 = response.data.rows this.total2 = response.data.total @@ -1283,6 +1285,7 @@ export default { !v.单价 ? v.单价 = v.参考价格 : v.单价 this.$set(v, '未税单价', v.单价 / (1 + this.taxRate)) }) + console.log(this.tableData3, 'tableData31') this.loading4 = false console.log(response.data.length, 1231231233) }) @@ -1439,8 +1442,17 @@ export default { // }) }, doneOfflineContact() { // 生成离线合同 + this.tongguo = true + console.log(this.tableData3, 'tableData3') + for (let i = 0; i < this.tableData3.length; i++) { + if (this.tableData3[i].数量 === '0' || this.tableData3[i].数量 === null || this.tableData3[i].数量 === '' || this.tableData3[i].单价 === '0' || this.tableData3[i].单价 === null || this.tableData3[i].单价 === '') { + this.tongguo = false + } + } if (this.tableData3.length === 0) { this.$message.error('无法生成空合同，请先选入物料！') + } else if (this.tongguo === false) { + this.$message.error('请完善单价或数量信息！') } else { let judge = true this.tableData3.map(v => { diff --git a/src/views/PurchasingCenter/OfflineContractSearch/index.vue b/src/views/PurchasingCenter/OfflineContractSearch/index.vue index 869f3372..8d3507d8 100644 --- a/src/views/PurchasingCenter/OfflineContractSearch/index.vue +++ b/src/views/PurchasingCenter/OfflineContractSearch/index.vue @@ -68,12 +68,17 @@ {{ scope.row.离线合同编号 }} + + + - + @@ -98,9 +103,9 @@ {{ scope.row.采购员 }} - + @@ -168,6 +173,7 @@ export default { name: 'OfflineContractSearch', data() { return { + row1: '', dateRange: '', contractNumber: '', supplierName: '', @@ -272,26 +278,31 @@ export default { this.searchTable1() }, back() { - this.$confirm('确定打回合同?', '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning' - }).then(() => { - if (this.number) { - back(this.number).then(response => { - if (response.data[0].result !== '0') { - this.$message.success('打回成功') - this.searchTable1() - } else { - this.$message.success('打回失败') - } - }) - } else { - this.$message.warning('请选择要打回的合同') - } - }) + if (this.row1.到货金额 !== '0') { + this.$message.error('已有到货信息，无法打回！！！') + } else { + this.$confirm('确定打回合同?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + if (this.number) { + back(this.number).then(response => { + if (response.data[0].result !== '0') { + this.$message.success('打回成功') + this.searchTable1() + } else { + this.$message.success('打回失败') + } + }) + } else { + this.$message.warning('请选择要打回的合同') + } + }) + } }, searchTable2(row) { + this.row1 = row this.number = row.离线合同流水号 searchOfflineContractContent(row.离线合同流水号).then(response => { this.contractDetail = response.data diff --git a/src/views/PurchasingCenter/OfflinePartsQuery/index.vue b/src/views/PurchasingCenter/OfflinePartsQuery/index.vue index 0f86ee23..207b5559 100644 --- a/src/views/PurchasingCenter/OfflinePartsQuery/index.vue +++ b/src/views/PurchasingCenter/OfflinePartsQuery/index.vue @@ -42,12 +42,22 @@ {{ scope.row.到货数量 }} + + + + + + - + diff --git a/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue b/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue index 703f3003..85adcc32 100644 --- a/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue +++ b/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue @@ -470,7 +470,7 @@ export default { this.dateRange ? check1 = 1 : (check1 = 0, this.dateRange = '') this.supplierValue ? check2 = 1 : check2 = 0 this.searchAll === false ? check3 = 1 : check3 = 0 - searchRequestFund(this.pageCurrent1, this.pageSize1, check1, this.dateRange[0], this.dateRange[1], check2, this.supplierValue, check3).then(response => { + searchRequestFund(this.pageCurrent1, this.pageSize1, check1, this.dateRange[0], this.dateRange[1], check2, this.supplierValue, check3, this.id).then(response => { this.tableData1 = response.data.rows this.total1 = response.data.total }) diff --git a/src/views/WorkshopProcurement/AccountingPrice/index.vue b/src/views/WorkshopProcurement/AccountingPrice/index.vue index d7bdb195..2502e935 100644 --- a/src/views/WorkshopProcurement/AccountingPrice/index.vue +++ b/src/views/WorkshopProcurement/AccountingPrice/index.vue @@ -42,12 +42,12 @@ {{ scope.row.数量 }} - + - + diff --git a/src/views/WorkshopProcurement/ArrivalStateSearch/index.vue b/src/views/WorkshopProcurement/ArrivalStateSearch/index.vue index 5b52da8a..241a13f2 100644 --- a/src/views/WorkshopProcurement/ArrivalStateSearch/index.vue +++ b/src/views/WorkshopProcurement/ArrivalStateSearch/index.vue @@ -26,7 +26,7 @@ - + + + +

到票结算申请单

- + @@ -141,7 +141,7 @@ 到票号： 追加入库记录 - +