diff --git a/src/api/WorkshopProcurement/InvoiceSettlementApproveSearchMetalworking.js b/src/api/WorkshopProcurement/InvoiceSettlementApproveSearchMetalworking.js new file mode 100644 index 00000000..0a65dbcd --- /dev/null +++ b/src/api/WorkshopProcurement/InvoiceSettlementApproveSearchMetalworking.js @@ -0,0 +1,32 @@ +import request from '@/utils/request' +import state from '@/store' +import router from '@/router' + +// 查询供应商 +export function searchSupplier() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '采购管理_供应商_查询数据_根据条件' + } + }) +} +// 根据条件查发票结算申请单 +export function searchTable1(...group) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '车间采购管理_发票结算申请单_查询数据', + param: `发票号_check=${group[0]}&发票号=${group[1]}`, + Pagination: group[2] + '&' + group[3] + } + }) +} diff --git a/src/api/WorkshopProcurement/PurchaseSituationSearchMetalworking.js b/src/api/WorkshopProcurement/PurchaseSituationSearchMetalworking.js new file mode 100644 index 00000000..5608e148 --- /dev/null +++ b/src/api/WorkshopProcurement/PurchaseSituationSearchMetalworking.js @@ -0,0 +1,19 @@ +import request from '@/utils/request' +import state from '@/store' +import router from '@/router' + +// 初始化合同 +export function searchdata(check1, partDrawing, check2, daterange0, daterange1, partName, order, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '车间管理_车间采购_采购件查询', + param: `零件图号_check=${check1}&零件图号=${partDrawing}&时间段_check=${check2}&开始时间=${daterange0}&结束时间=${daterange1}&排序名称=${partName}&排序方式=${order}`, + Pagination: pageCurrent + '&' + pageSize + } + }) +} diff --git a/src/views/Inventory/MaterialReturn/index.vue b/src/views/Inventory/MaterialReturn/index.vue index 79eda31c..dab97b71 100644 --- a/src/views/Inventory/MaterialReturn/index.vue +++ b/src/views/Inventory/MaterialReturn/index.vue @@ -96,7 +96,7 @@ @@ -114,6 +114,20 @@ +
+ + {{ nameOrNumber }} + + + 出库数量:{{ outNumber }} + + + 领料人:{{ people }} + + + 出库时间:{{ time }} + +
@@ -164,6 +178,10 @@ export default { model: '', typeNumber: '', floatNumber: '', + time: '', + nameOrNumber: '', + people: '', + number: '', locateName: [], tableData: [], pageSize1: 100, @@ -246,19 +264,28 @@ export default { this.materialNumber = row.物料流水号 this.basicNumber = row.组件零件基本件流水号 this.outNumber = Number(row.出库数量) + this.nameOrNumber = row.名称 + ' ' + row.图号或型号 this.typeNumber = row.退料类型 this.floatNumber = row.零件流水号 + this.time = row.出库时间 ? row.出库时间.split(' ')[0] : '' + this.people = row.领料人 }, submit() { - submitMaterialReturn(this.materialNumber, this.basicNumber, this.form.退料数量, this.form.货位名称, this.id, this.typeNumber, this.floatNumber).then(response => { - if (response.data[0].result === '1') { - this.$message.success('退料成功') - this.dialogFormVisible = false - this.searchRecord() - this.handleEdit_disable = false + this.$refs['form'].validate((valid) => { + if (valid) { + submitMaterialReturn(this.materialNumber, this.basicNumber, this.form.退料数量, this.form.货位名称, this.id, this.typeNumber, this.floatNumber).then(response => { + if (response.data[0].result === '1') { + this.$message.success('退料成功') + this.dialogFormVisible = false + this.searchRecord() + this.handleEdit_disable = false + } else { + this.handleEdit_disable = false + this.$message.error('退料失败') + } + }) } else { - this.handleEdit_disable = false - this.$message.error('退料失败') + return false } }) }, diff --git a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue index 21d36b0f..5b99fec1 100644 --- a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue +++ b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue @@ -41,7 +41,7 @@ end-placeholder="结束日期"/> 查询 - 打回重新编制 + 打回重新编制 工艺员调整 @@ -175,7 +175,7 @@ {{ value.准结定额工时 }} {{ value.计划日期 }} - {{ value.工序流水号 }} + 2{{ value.工序流水号 }} 工艺员 @@ -184,10 +184,10 @@ {{ tableData2[0] ? tableData2[0].定额员 : '' }} 工艺完成 {{ tableData2[0].工艺实际完成时间 ? tableData2[0].工艺实际完成时间.split(' ')[0] : '' }} - 加工开始 - {{ tableData2[0] ? tableData2[0].机加工开始时间 : '' }} - 加工结束 - {{ tableData2[0] ? tableData2[0].机加工结束时间 : '' }} + 计划开始 + {{ tableData2[0] ? tableData2[0].机加工开始时间.split(' ')[0] : '' }} + 计划结束 + {{ tableData2[0] ? tableData2[0].机加工结束时间.split(' ')[0] : '' }} @@ -232,7 +232,8 @@ export default { 日期: '', PersonValue1: '', Person1: [], - jinyong: false + jinyong: false, + jinyong1: false } }, created() { @@ -351,12 +352,16 @@ export default { }, handleSelectionChange(val) { this.jinyong = false + this.jinyong1 = false this.partNumValue = [] for (let i = 0; i < val.length; i++) { this.partNumValue.push(val[i].工艺计划流水号) - if (val[i].工艺任务分配状态 === 1) { + if (val[i].进程 !== '编制中') { this.jinyong = true } + if (val[i].进程 === '编制中') { + this.jinyong1 = true + } } }, handleSizeChange(val) { diff --git a/src/views/ManufacturingCenter/ScrappedSupplementaryInvestment/index.vue b/src/views/ManufacturingCenter/ScrappedSupplementaryInvestment/index.vue index 1126aac1..69f166a6 100644 --- a/src/views/ManufacturingCenter/ScrappedSupplementaryInvestment/index.vue +++ b/src/views/ManufacturingCenter/ScrappedSupplementaryInvestment/index.vue @@ -126,9 +126,14 @@ {{ scope.row.报废时间 ? scope.row.报废时间.split(' ')[0] : '' }} + + + @@ -136,6 +141,11 @@ {{ scope.row.补投时间 ? scope.row.补投时间.split(' ')[0] : '' }} + + + - + @@ -344,9 +344,20 @@ {{ (scope.row.单价 / (1 + taxRate)).toFixed(2) }} - + @@ -844,6 +855,23 @@ export default { this.initDirection() }, methods: { + changefixed(val, index, date) { + console.log(index, 6666) + let value = '' + val + value = value + .replace(/[^\d.]/g, '') // 清除“数字”和“.”以外的字符 + .replace(/\.{2,}/g, '.') // 只保留第一个. 清除多余的 + .replace('.', '$#$') + .replace(/\./g, '') + .replace('$#$', '.') + .replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3') // 只能输入两个小数 + if (value.indexOf('.') < 0 && value !== '') { + value = parseFloat(value).toFixed(2) + } + console.log(value, this.tableData3[index][date]) + this.tableData3[index][date] = value + console.log(this.tableData3[index][date], 'this.tableData3[index][date]') + }, handleSelection(val, row) { console.log(row, 123) this.tableData00.forEach((item, i) => { @@ -1294,13 +1322,14 @@ export default { this.离线合同状态 = row.离线合同状态 this.loading4 = true searchMateriel(this.offlineContractNum).then(response => { - console.log(response.data) + console.log(response, 'response') this.tableData3 = response.data this.tableData3.map(v => { this.$set(v, '未税总额', 0) this.$set(v, '含税总额', 0) - !v.单价 ? v.单价 = v.参考价格 : v.单价 - this.$set(v, '未税单价', v.单价 / (1 + this.taxRate)) + this.$set(v, '单价', (v.单价).toFixed(2)) + !v.单价 ? v.单价 = parseFloat(v.参考价格).toFixed(2) : parseFloat(v.单价).toFixed(2) + this.$set(v, '未税单价', (v.单价 / (1 + this.taxRate)).toFixed(2)) }) console.log(this.tableData3, 'tableData31') this.loading4 = false @@ -1372,7 +1401,7 @@ export default { this.$set(v, '未税总额', 0) this.$set(v, '含税总额', 0) !v.单价 ? v.单价 = v.参考价格 : v.单价 - this.$set(v, '未税单价', v.单价 / (1 + this.taxRate)) + this.$set(v, '未税单价', (v.单价 / (1 + this.taxRate)).toFixed(2)) }) }) } else { this.$message.error('选入失败') } @@ -1395,7 +1424,7 @@ export default { this.$set(v, '未税总额', 0) this.$set(v, '含税总额', 0) !v.单价 ? v.单价 = v.参考价格 : v.单价 - this.$set(v, '未税单价', v.单价 / (1 + this.taxRate)) + this.$set(v, '未税单价', (v.单价 / (1 + this.taxRate)).toFixed(2)) }) }) if (this.tabName === '外购件' || this.tabName === '标准件') { @@ -1768,6 +1797,13 @@ export default { width:150px; margin-right: 10px; } + .editWorkTime input::-webkit-outer-spin-button, input::-webkit-inner-spin-button { + -webkit-appearance: none; + text-align: center; + } + .editWorkTime input[type="number"]{ + -moz-appearance: textfield; + } + diff --git a/src/views/WorkshopProcurement/PurchaseSituationSearchMetalworking/index.vue b/src/views/WorkshopProcurement/PurchaseSituationSearchMetalworking/index.vue new file mode 100644 index 00000000..ffc3ff77 --- /dev/null +++ b/src/views/WorkshopProcurement/PurchaseSituationSearchMetalworking/index.vue @@ -0,0 +1,153 @@ + + + + + diff --git a/src/views/WorkshopProcurement/RequestApprovalQuery2/index.vue b/src/views/WorkshopProcurement/RequestApprovalQuery2/index.vue index c9a83f26..62a6dbb5 100644 --- a/src/views/WorkshopProcurement/RequestApprovalQuery2/index.vue +++ b/src/views/WorkshopProcurement/RequestApprovalQuery2/index.vue @@ -36,7 +36,7 @@ - + @@ -46,7 +46,7 @@ {{ scope.row.姓名 }} - + @@ -71,16 +71,16 @@ - - - + + + - + @@ -226,6 +226,7 @@ export default { }, searchTable2(row) { // 查看详情（请款信息包含的合同） this.gridData = [] + this.dialogFormVisible = true searchRequsetFundDetail(row.采购合同请款流水号).then(response => { this.gridData = response.data })