diff --git a/src/assets/img/img13.png b/src/assets/img/img13.png new file mode 100644 index 00000000..5ba524eb Binary files /dev/null and b/src/assets/img/img13.png differ diff --git a/src/utils/request.js b/src/utils/request.js index 8eaacaf2..8ff60856 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -23,7 +23,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx` export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx` const service = axios.create({ - baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`, + baseURL: `http://192.168.0.101:8411/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) diff --git a/src/views/Assembly/DeliveryConfirmation/index.vue b/src/views/Assembly/DeliveryConfirmation/index.vue index ebb3398b..9a9aacf0 100644 --- a/src/views/Assembly/DeliveryConfirmation/index.vue +++ b/src/views/Assembly/DeliveryConfirmation/index.vue @@ -336,12 +336,12 @@ - + diff --git a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue index 26d1fca9..10e67751 100644 --- a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue +++ b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue @@ -5,8 +5,8 @@ 零件图号: 查询 - 查询全部 - 导出备料单 + + 导出备料单 自家备料 外购备料 diff --git a/src/views/ManufacturingCenter/EquipmentConditionAnalysis/index.vue b/src/views/ManufacturingCenter/EquipmentConditionAnalysis/index.vue index 0c6d0fce..f4d5f9ac 100644 --- a/src/views/ManufacturingCenter/EquipmentConditionAnalysis/index.vue +++ b/src/views/ManufacturingCenter/EquipmentConditionAnalysis/index.vue @@ -82,10 +82,10 @@ @current-change="handleCurrentChange"/> - +
- +
@@ -123,6 +123,38 @@
+ + 工位号: + + +
{{ item.label }}
+
{{ item.value2 }}
+ + + 时间段: + + ~ + + 查询 +
@@ -137,6 +169,7 @@ export default { tableDataA: [], MachineValue: '', MachineValue1: '', + MachineValue2: '', Machine: [], yAxisValue: [], colors: [], @@ -144,6 +177,8 @@ export default { Time: '', date1: '', date2: '', + date3: '', + date4: '', time1: '', time2: '', time3: '', @@ -199,47 +234,32 @@ export default { }) }, searchData1() { - getData2(this.MachineValue1, this.date1, this.date2).then(response => { - this.table = response.data - console.log(this.table, 222) - }).then(() => { - this.drawLine() - }) if (this.date1 === null || this.date2 === null) { this.$message.warning('请选择开始时间或结束时间') } else { - const endYear = parseInt(this.date2.split('-')[0]) - const startYear = parseInt(this.date1.split('-')[0]) - const endMonth = parseInt(this.date2.split('-')[1]) - const startMonth = parseInt(this.date1.split('-')[1]) - const endDate = parseInt(this.date2.split('-')[2]) - const startDate = parseInt(this.date1.split('-')[2]) - let diff - if ((endMonth - startMonth) === 0) { - diff = endDate - startDate - } - if ((endMonth - startMonth) === 1) { - diff = endDate - startDate + 10 - } - if ((endMonth - startMonth) > 1 || (endYear - startYear) !== 0) { - diff = 999 - } - if (diff > 6) { - this.$message.warning('选择时间区间不得超过6天！') - } else { - searchState().then(response => { - for (let i = 0; i < response.data.length; i++) { - this.colors.push(response.data[i].颜色) - this.state.push(response.data[i].状态) - } - }) - getData3(this.MachineValue1, this.date1, this.date2).then(response => { - this.table1 = response.data - console.log(this.table1) - }).then(() => { - this.drawLine3() - }) - } + getData2(this.MachineValue1, this.date1, this.date2).then(response => { + this.table = response.data + }).then(() => { + this.drawLine() + }) + } + }, + searchData2() { + if (this.date3 === null || this.date4 === null) { + this.$message.warning('请选择开始时间或结束时间') + } else { + searchState().then(response => { + for (let i = 0; i < response.data.length; i++) { + this.colors.push(response.data[i].颜色) + this.state.push(response.data[i].状态) + } + }) + getData3(this.MachineValue2, this.date3, this.date4).then(response => { + this.table1 = response.data + console.log(this.table1) + }).then(() => { + this.drawLine3() + }) } }, // 绘制图形 @@ -484,7 +504,7 @@ export default { var categoryIndex = api.value(0) // 这里使用 api.value(0) 取出当前 dataItem 中第一个维度的数值。 var start = api.coord([api.value(1), categoryIndex]) // 这里使用 api.coord(...) 将数值在当前坐标系中转换成为屏幕上的点的像素值。 var end = api.coord([api.value(2), categoryIndex]) - var height = 24 // 柱体宽度 + var height = 10 // 柱体宽度 return { type: 'rect', // 表示这个图形元素是矩形。还可以是 'circle', 'sector', 'polygon' 等等。 diff --git a/src/views/ManufacturingCenter/ParseQuery/index.vue b/src/views/ManufacturingCenter/ParseQuery/index.vue index d11117ea..36d9406c 100644 --- a/src/views/ManufacturingCenter/ParseQuery/index.vue +++ b/src/views/ManufacturingCenter/ParseQuery/index.vue @@ -2671,7 +2671,7 @@ export default { left join (select 组件流水号,count(*) as 已传递条数 from 车间生产管理工艺_零件工序_投产信息_查询视图 where 是否传递 = 2 group by 组件流水号) as b on 综合查询_零件分配模块信息视图.组件流水号 = b.组件流水号 - where 机床流水号 = ${this.machineValue1} order by 组号` + where 机床流水号 = ${this.machineValue1} and 组号 <> '00组' order by 组号` } }).then(res => { this.tableDataDiv4 = res.data @@ -4470,7 +4470,7 @@ export default { width: 1858px; height: 400px; /*border: 1px solid red;*/ - background: url('../../../assets/img/img12.png') repeat; + background: url('../../../assets/img/img13.png') repeat; background-repeat:no-repeat; background-size:100% 100%;-moz-background-size:100% 100%; } diff --git a/src/views/ManufacturingCenter/TraceabilityOfParts/index.vue b/src/views/ManufacturingCenter/TraceabilityOfParts/index.vue index cad4991b..2bf45415 100644 --- a/src/views/ManufacturingCenter/TraceabilityOfParts/index.vue +++ b/src/views/ManufacturingCenter/TraceabilityOfParts/index.vue @@ -172,9 +172,9 @@ 跳转链接 - 零件状态查询 + 零件状态查询 - 加工进度查询 + 加工进度查询
@@ -307,6 +307,12 @@ export default { }) } }, + toStatusQuery() { + this.$router.push('/ManufacturingCenter/StatusQuery') + }, + toProcessingStatus() { + this.$router.push('/ManufacturingCenter/ProcessingStatus') + }, createFilterPick(queryString) { return (restaurant) => { return (restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) !== -1) diff --git a/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue b/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue index 7835b8dc..8a37c23e 100644 --- a/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue +++ b/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue @@ -32,7 +32,7 @@ highlight-current-row height="380" size="mini" - stripe="true" + stripe style="width: 100%;" border element-loading-text="拼命加载中" @@ -65,7 +65,7 @@
- + diff --git a/src/views/WorkshopProcurement/OfflineContractRequestFund1/index.vue b/src/views/WorkshopProcurement/OfflineContractRequestFund1/index.vue index e3a7b54b..06fbb840 100644 --- a/src/views/WorkshopProcurement/OfflineContractRequestFund1/index.vue +++ b/src/views/WorkshopProcurement/OfflineContractRequestFund1/index.vue @@ -32,7 +32,7 @@ - + - 查看详情 + 查看详情 - 取消请款 + 取消请款 @@ -167,9 +167,14 @@ {{ scope.row.已付金额 }} + + + @@ -187,6 +192,7 @@ export default { name: '', // 离线合同 data() { return { + selectContents: [], totalSum: 0, totalPay: 0, totalDebt: 0, @@ -337,7 +343,7 @@ export default { }) this.tableData01.map(v => { this.$set(v, '请款金额', 0) - v.请款金额 = v.合同总额 - v.已付金额 + v.请款金额 = v.合同总额 - v.已付金额 - v.申请中金额 return v }) }) @@ -346,6 +352,7 @@ export default { } }, handleSelectionChange(val) { + this.selectContents = val this.SUM = 0 this.contractGroup = [] this.sumGroup = [] @@ -361,13 +368,29 @@ export default { }, submitRequestFund() { // 确认请款 if (this.supplierValue && this.contractGroup.length !== 0) { - submitRequestFund(this.contractGroup, this.sumGroup, this.supplierValue, this.SUM, this.id).then(response => { // 离线合同流水号组=${contractGroup}&合同总额组=${sumGroup}&供应商流水号=${supplier}&请款金额=${money}&请款人=${person - if (response.data[0].result === '1') { - this.$message.success('请款成功') - this.searchTable1() - this.dialogVisible2 = false - } else { this.$message.error('请款失败') } - }) + this.SUM = 0 + this.contractGroup = [] + this.sumGroup = [] + for (let i = 0; i < this.tableData01.length; i++) { + for (let j = 0; j < this.selectContents.length; j++) { + if (this.selectContents[j].离线合同流水号 === this.tableData01[i].离线合同流水号) { + this.SUM += parseFloat(this.tableData01[i].请款金额) + this.contractGroup.push(this.tableData01[i].离线合同流水号) + this.sumGroup.push(this.tableData01[i].请款金额) + } + } + } + if (this.SUM === 0) { + this.$message.error('请款金额不能为0') + } else { + submitRequestFund(this.contractGroup, this.sumGroup, this.supplierValue, this.SUM, this.id).then(response => { // 离线合同流水号组=${contractGroup}&合同总额组=${sumGroup}&供应商流水号=${supplier}&请款金额=${money}&请款人=${person + if (response.data[0].result === '1') { + this.$message.success('请款成功') + this.searchTable1() + this.dialogVisible2 = false + } else { this.$message.error('请款失败') } + }) + } } else { this.$message.error('请选择需要请款的合同') } diff --git a/src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue b/src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue index 59f8a4d8..dd0b9470 100644 --- a/src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue +++ b/src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue @@ -32,7 +32,7 @@ - + - 查看详情 + 查看详情 - 取消请款 + 取消请款 @@ -167,9 +167,14 @@ {{ scope.row.已付金额 }} + + + @@ -187,6 +192,7 @@ import { timeToStamp } from '@/utils/tool' export default { data() { return { + selectContents: [], getDate: null, tableData0: [], pickerOptions: { @@ -319,7 +325,7 @@ export default { this.tableData01 = response.data this.tableData01.map(v => { this.$set(v, '请款金额', 0) - v.请款金额 = v.含税总金额 - v.已付金额 + v.请款金额 = v.含税总金额 - v.已付金额 - v.申请中金额 return v }) }) @@ -331,6 +337,7 @@ export default { return parseInt(row.已请款) !== 1 // 已经请款 }, handleSelectionChange(val) { + this.selectContents = val this.SUM = 0 this.contractGroup = [] this.sumGroup = [] @@ -342,13 +349,31 @@ export default { }, submitRequestFund() { // 确认请款 if (this.supplierValue && this.contractGroup.length !== 0) { - submitRequestFund(this.contractGroup, this.sumGroup, this.supplierValue, this.SUM, this.id).then(response => { - if (response.data[0].result === '1') { - this.$message.success('请款成功') - this.searchTable1() - this.dialogVisible2 = false - } else { this.$message.error('请款失败') } - }) + this.SUM = 0 + this.contractGroup = [] + this.sumGroup = [] + for (let i = 0; i < this.tableData01.length; i++) { + for (let j = 0; j < this.selectContents.length; j++) { + if (this.selectContents[j].采购合同流水号 === this.tableData01[i].采购合同流水号) { + this.SUM += parseFloat(this.tableData01[i].请款金额) + this.contractGroup.push(this.tableData01[i].采购合同流水号) + this.sumGroup.push(this.tableData01[i].请款金额) + } + } + } + if (this.SUM === 0) { + this.$message.error('请款金额不能为0') + } else { + submitRequestFund(this.contractGroup, this.sumGroup, this.supplierValue, this.SUM, this.id).then(response => { + if (response.data[0].result === '1') { + this.$message.success('请款成功') + this.searchTable1() + this.dialogVisible2 = false + } else { + this.$message.error('请款失败') + } + }) + } } else { this.$message.error('请选择需要请款的合同') }