diff --git a/src/assets/img/img12.png b/src/assets/img/img12.png index c6606389..6b33e73b 100644 Binary files a/src/assets/img/img12.png and b/src/assets/img/img12.png differ 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 8ff60856..b6dbd859 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -26,5 +26,4 @@ const service = axios.create({ baseURL: `http://192.168.0.101:8411/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) - export default service 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 36dc2157..bfdef1c1 100644 --- a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue +++ b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue @@ -8,7 +8,8 @@ 查询全部 - + + 导出备料单 diff --git a/src/views/ManufacturingCenter/EquipmentConditionAnalysis/index.vue b/src/views/ManufacturingCenter/EquipmentConditionAnalysis/index.vue index bf1446f8..ac0edbed 100644 --- a/src/views/ManufacturingCenter/EquipmentConditionAnalysis/index.vue +++ b/src/views/ManufacturingCenter/EquipmentConditionAnalysis/index.vue @@ -82,22 +82,10 @@ @current-change="handleCurrentChange"/> - - - - - - - - - - - -
- +
@@ -135,6 +123,38 @@
+ + 工位号: + + +
{{ item.label }}
+
{{ item.value2 }}
+ + + 时间段: + + ~ + + 查询 +
@@ -149,6 +169,7 @@ export default { tableDataA: [], MachineValue: '', MachineValue1: '', + MachineValue2: '', Machine: [], yAxisValue: [], colors: [], @@ -156,6 +177,8 @@ export default { Time: '', date1: '', date2: '', + date3: '', + date4: '', time1: '', time2: '', time3: '', @@ -211,50 +234,33 @@ export default { }) }, searchData1() { - getData2(this.MachineValue1, this.date1, this.date2).then(response => { - this.table = response.data - }).then(() => { - this.drawLine() - if (!this.date1 || !this.date2) { - this.$message.warning('请选择开始时间或结束时间') - } else { - if (!this.MachineValue1) { - 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 - }).then(() => { - this.drawLine3() - }) - } + if (this.date1 === null || this.date2 === null) { + this.$message.warning('请选择开始时间或结束时间') + } else { + 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() + }) + } }, // 绘制图形 drawLine() { @@ -497,7 +503,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 cfefdb9d..8bd20783 100644 --- a/src/views/ManufacturingCenter/ParseQuery/index.vue +++ b/src/views/ManufacturingCenter/ParseQuery/index.vue @@ -3,139 +3,139 @@
-
+
角色：装配部
根据营销部门发出发货请求，
装配部进行发货
发货
{{ `${data[0].发货百分比}%` }}
-
+
角色：质检部
对机床进行总装调试
总装调试
{{ `${data[0].总装调试百分比}%` }}
-
+
角色：质检部
对机床重要部件进行检测
装配质检
{{ `${data[0].装配质检百分比}%` }}
-
+
角色：电气部
电气部长制定装配计划，
并记录计划执行情况
电气装配
{{ `${data[0].电气装配百分比}%` }}
-
+

角色：装配部长
装配部长制定装配计划，
并记录计划执行情况
机械装配
{{ `${data[0].机械装配百分比}%` }}
-
+
角色：冷作车间主任
冷作车间主任制定冷作计划，
并记录计划执行情况
冷作
{{ `${data[0].冷作百分比}%` }}
-
+
角色：油漆车间主任
油漆车间主任制定装配计划，
并记录计划执行情况
油漆
{{ `${data[0].油漆百分比}%` }}
-
+
角色：装配部长
此模块用于查询某机床是否达到装配条件，
即采购件与自制件是否成组配套
成组配套
{{ `${data[0].成组配套百分比}%` }}
-
+
角色：质检部
对自制件进行检测
自制质检
{{ `${data[0].自制质检百分比}%` }}
-
+
角色：质检部
对采购件进行检测
采购质检
{{ `${data[0].采购质检百分比}%` }}
-
+
角色：金工车间
接收加工任务并使用
MES工作站进行报工
车间加工
{{ `${data[0].车间加工百分比}%` }}
-
+
角色：外协员
进行外协加工
工序外协
{{ `${data[0].工序外协百分比}%` }}
-
+
角色：计划员
针对做完工艺定额的零件进行排查
能力平衡
{{ `${data[0].能力平衡百分比}%` }}
-
+
角色：工艺部
制定零件定额
定额
{{ `${data[0].定额百分比}%` }}
-
+
角色：工艺部
制定零件工艺
工艺
{{ `${data[0].工艺百分比}%` }}
-
+
角色：下料员
对于钢板等自家备料
下料员需要在系统确认备料
并通知金工领料
自家备料
{{ `${data[0].自家备料百分比}%` }}
-
- -
角色：营销内勤
负责创建项目及机床的基础信息，
此部分作为系统数据的源头
- 签订合同
{{ `${data[0].签订合同百分比}%` }} - +
+ + + + 签订合同
{{ `${data[0].签订合同百分比}%` }}
-
+
角色：技术员
负责导入三表(零件)，
组件在项目启动会时提出，
由制造总监导入
产品设计
{{ `${data[0].产品设计百分比}%` }}
-
+
角色：下料员
外购物料到货后，由下料员确认备料，
并通知金工领料
外购备料
{{ `${data[0].外购备料百分比}%` }}
-
+
角色：计划员
计划员负责将三表中的零件按实际情况分配为：
自制件、采购部采购件、制造部采购件三类
零件分配
{{ `${data[0].零件分配百分比}%` }}
-
+
角色：计划员
计划员分配零件后，
在生产计划下达模块
可查看到自家加工的零件任务，
计划员需要将这些零件投产
自制件
{{ `${data[0].自制件百分比}%` }}
-
+
角色：制造部长
计划员分配零件后，
将分配到制造部的采购件进行采购
车间采购
{{ `${data[0].车间采购百分比}%` }}
-
+
角色：采购部
计划员分配零件后，
将分配到采购部的采购件进行采购
采购部采购
{{ `${data[0].采购部采购百分比}%` }} @@ -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 @@ -4465,12 +4465,12 @@ export default { } .process{ text-align: center; - margin-left: 30px; - margin-top: 20px; + margin-left: 0px; + margin-top: 0px; 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%; } @@ -4481,7 +4481,7 @@ export default { overflow-x: auto; color: #000; font-size: 16px; - height: 440px; + height: 400px; } .main p{height:300px;} /*-------滚动条整体样式----*/ 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/PurchasingCenter/OfflineContractRequestFund/index.vue b/src/views/PurchasingCenter/OfflineContractRequestFund/index.vue index 2026f7ac..6c98f5ff 100644 --- a/src/views/PurchasingCenter/OfflineContractRequestFund/index.vue +++ b/src/views/PurchasingCenter/OfflineContractRequestFund/index.vue @@ -32,7 +32,7 @@ 请款

请款表

- + @@ -139,7 +139,7 @@

离线合同明细

- + + + + @@ -307,6 +312,7 @@ export default { name: '', // 离线合同 data() { return { + selectContents: '', totalSum: 0, totalPay: 0, totalDebt: 0, @@ -462,7 +468,7 @@ export default { }) this.tableData01.map(v => { this.$set(v, '请款金额', 0) - v.请款金额 = v.合同总额 - v.已付金额 + v.请款金额 = v.合同总额 - v.已付金额 - v.申请中金额 return v }) }) @@ -476,6 +482,7 @@ export default { }) }, handleSelectionChange(val) { + this.selectContents = val this.SUM = 0 this.contractGroup = [] this.sumGroup = [] @@ -491,13 +498,31 @@ 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/PurchasingCenter/PurchaseContractRequestFund/index.vue b/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue index 339eb258..c70b7be0 100644 --- a/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue +++ b/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue @@ -85,7 +85,7 @@

请款表

- + @@ -226,9 +226,14 @@ {{ scope.row.已付金额 }} + + + @@ -248,6 +253,7 @@ import { getNowTime, timeToStamp } from '@/utils/tool' export default { data() { return { + selectContents: [], getDate: null, tableData0: [], pickerOptions: { @@ -394,7 +400,7 @@ export default { this.tableData01 = response.data this.tableData01.map(v => { this.$set(v, '请款金额', 0) - v.请款金额 = v.合同总额 - v.已付金额 + v.请款金额 = v.合同总额 - v.已付金额 - v.申请中金额 return v }) }) @@ -406,6 +412,7 @@ export default { return parseInt(row.已请款) !== 1 // 已经请款 }, handleSelectionChange(val) { + this.selectContents = val this.SUM = 0 this.contractGroup = [] this.sumGroup = [] @@ -417,13 +424,31 @@ 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/FundApproval2/index.vue b/src/views/WorkshopProcurement/FundApproval2/index.vue index f0af6e1b..0d9a73a8 100644 --- a/src/views/WorkshopProcurement/FundApproval2/index.vue +++ b/src/views/WorkshopProcurement/FundApproval2/index.vue @@ -1,7 +1,7 @@ @@ -59,6 +59,7 @@
+

离线合同

- 查看详情 + 查看详情 - 通过 - 不通过 + 通过 + 不通过 @@ -116,6 +117,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('请选择需要请款的合同') }