diff --git a/config/index.js b/config/index.js
index 79d8e71..3f5ea9e 100644
--- a/config/index.js
+++ b/config/index.js
@@ -13,7 +13,7 @@ module.exports = {
// 代理列表, 是否开启代理通过[./dev.env.js]配置
proxyTable: devEnv.OPEN_PROXY === false ? {} : {
'/proxyApi': {
- target: 'http://127.0.0.1:9090',
+ target: 'http://192.168.1.83:9091',
changeOrigin: true,
pathRewrite: {
// 把 /proxyApi 替换成 /
diff --git a/src/api/yieldReport/com_produce_material.js b/src/api/yieldReport/com_produce_material.js
index 54dcb51..78748d3 100644
--- a/src/api/yieldReport/com_produce_material.js
+++ b/src/api/yieldReport/com_produce_material.js
@@ -8,3 +8,6 @@ export const feedingMaterialRoll = data => createAPI('schedule/feedingMaterialRo
export const scannerMaterial = data => createAPI('schedule/scannerMaterial', 'POST', data)
+
+
+export const getBomItemNosByKeyPartNo = data => createAPI('schedule/getBomItemNosByKeyPartNo', 'POST', data)
diff --git a/src/views/common/home.vue b/src/views/common/home.vue
index a63d0b8..1338e2a 100644
--- a/src/views/common/home.vue
+++ b/src/views/common/home.vue
@@ -26,7 +26,7 @@
computed: {
userName: {
get() {
- return this.$store.state.user.name
+ return this.$store.state.user.userDisplay
}
},
mainTabs: {
diff --git a/src/views/modules/base/calendar.vue b/src/views/modules/base/calendar.vue
index b39a17d..bb18520 100644
--- a/src/views/modules/base/calendar.vue
+++ b/src/views/modules/base/calendar.vue
@@ -462,7 +462,7 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
@@ -1238,8 +1238,8 @@ export default {
let list = data.rows;
if (list.length > 0) {
for (let i = 0; i < list.length; i++) {
- for ( let f = 0; f < this.maintainColumnList2.length ; f++ ){
- list[i][this.maintainColumnList2[f].columnProp] = this.maintainCalendarSearchData.datetype;
+ for (let f = 0; f < this.maintainColumnList2.length; f++) {
+ list[i][this.maintainColumnList2[f].columnProp] = this.maintainCalendarSearchData.datetype;
}
}
}
@@ -1546,6 +1546,12 @@ export default {
})
},
+ workTimeSum() {
+ let durationTime = parseFloat(this.workingCalendar.exceptduration1 || 0) + parseFloat(this.workingCalendar.exceptduration2 || 0) + parseFloat(this.workingCalendar.exceptduration3 || 0)
+ + parseFloat(this.workingCalendar.exceptduration4 || 0) + parseFloat(this.workingCalendar.exceptduration5 || 0) + parseFloat(this.workingCalendar.exceptduration6 || 0)
+
+ this.workingCalendar.worktime = 24 - durationTime
+ },
// 保存修改后的班次信息
updateWorkingCalendar() {
this.workingCalendar.excepttime1 = parseInt(this.dayjs(this.workingCalendar.scheduledate + ' ' + this.workingCalendar.exceptexacttime1 + ':00').format('H'))
@@ -1560,6 +1566,12 @@ export default {
+ parseFloat(this.dayjs(this.workingCalendar.scheduledate + ' ' + this.workingCalendar.exceptexacttime5 + ':00').format('mm')) / 60
this.workingCalendar.excepttime6 = parseInt(this.dayjs(this.workingCalendar.scheduledate + ' ' + this.workingCalendar.exceptexacttime6 + ':00').format('H'))
+ parseFloat(this.dayjs(this.workingCalendar.scheduledate + ' ' + this.workingCalendar.exceptexacttime6 + ':00').format('mm')) / 60
+
+ let durationTime = parseFloat(this.workingCalendar.exceptduration1 || 0) + parseFloat(this.workingCalendar.exceptduration2 || 0) + parseFloat(this.workingCalendar.exceptduration3 || 0)
+ + parseFloat(this.workingCalendar.exceptduration4 || 0) + parseFloat(this.workingCalendar.exceptduration5 || 0) + parseFloat(this.workingCalendar.exceptduration6 || 0)
+
+ this.workingCalendar.worktime = 24 - durationTime
+
updateWorkingCalendar(this.workingCalendar).then(({data}) => {
if (data && data.code == 0) {
this.$message.success(data.msg)
diff --git a/src/views/modules/common/com_work_calendar_out.vue b/src/views/modules/common/com_work_calendar_out.vue
index fc1396e..9c93f8d 100644
--- a/src/views/modules/common/com_work_calendar_out.vue
+++ b/src/views/modules/common/com_work_calendar_out.vue
@@ -82,7 +82,7 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
@@ -518,15 +518,33 @@ export default {
})
},
+ workTimeSum() {
+ let durationTime = parseFloat(this.workingCalendar.exceptduration1 || 0) + parseFloat(this.workingCalendar.exceptduration2 || 0) + parseFloat(this.workingCalendar.exceptduration3 || 0)
+ + parseFloat(this.workingCalendar.exceptduration4 || 0) + parseFloat(this.workingCalendar.exceptduration5 || 0) + parseFloat(this.workingCalendar.exceptduration6 || 0)
+
+ this.workingCalendar.worktime = 24 - durationTime
+ },
// 保存修改后的班次信息
updateWorkingCalendar() {
- this.workingCalendar.excepttime1 = this.dayjs(this.workingCalendar.scheduledate + ' ' + this.workingCalendar.exceptexacttime1 + ':00').format('H')
- this.workingCalendar.excepttime2 = this.dayjs(this.workingCalendar.scheduledate + ' ' + this.workingCalendar.exceptexacttime2 + ':00').format('H')
- this.workingCalendar.excepttime3 = this.dayjs(this.workingCalendar.scheduledate + ' ' + this.workingCalendar.exceptexacttime3 + ':00').format('H')
- this.workingCalendar.excepttime4 = this.dayjs(this.workingCalendar.scheduledate + ' ' + this.workingCalendar.exceptexacttime4 + ':00').format('H')
- this.workingCalendar.excepttime5 = this.dayjs(this.workingCalendar.scheduledate + ' ' + this.workingCalendar.exceptexacttime5 + ':00').format('H')
- this.workingCalendar.excepttime6 = this.dayjs(this.workingCalendar.scheduledate + ' ' + this.workingCalendar.exceptexacttime6 + ':00').format('H')
+ this.workingCalendar.excepttime1 = parseInt(this.dayjs(this.workingCalendar.scheduledate + ' ' + this.workingCalendar.exceptexacttime1 + ':00').format('H'))
+ + parseFloat(this.dayjs(this.workingCalendar.scheduledate + ' ' + this.workingCalendar.exceptexacttime1 + ':00').format('mm')) / 60
+ this.workingCalendar.excepttime2 = parseInt(this.dayjs(this.workingCalendar.scheduledate + ' ' + this.workingCalendar.exceptexacttime2 + ':00').format('H'))
+ + parseFloat(this.dayjs(this.workingCalendar.scheduledate + ' ' + this.workingCalendar.exceptexacttime2 + ':00').format('mm')) / 60
+ this.workingCalendar.excepttime3 = parseInt(this.dayjs(this.workingCalendar.scheduledate + ' ' + this.workingCalendar.exceptexacttime3 + ':00').format('H'))
+ + parseFloat(this.dayjs(this.workingCalendar.scheduledate + ' ' + this.workingCalendar.exceptexacttime3 + ':00').format('mm')) / 60
+ this.workingCalendar.excepttime4 = parseInt(this.dayjs(this.workingCalendar.scheduledate + ' ' + this.workingCalendar.exceptexacttime4 + ':00').format('H'))
+ + parseFloat(this.dayjs(this.workingCalendar.scheduledate + ' ' + this.workingCalendar.exceptexacttime4 + ':00').format('mm')) / 60
+ this.workingCalendar.excepttime5 = parseInt(this.dayjs(this.workingCalendar.scheduledate + ' ' + this.workingCalendar.exceptexacttime5 + ':00').format('H'))
+ + parseFloat(this.dayjs(this.workingCalendar.scheduledate + ' ' + this.workingCalendar.exceptexacttime5 + ':00').format('mm')) / 60
+ this.workingCalendar.excepttime6 = parseInt(this.dayjs(this.workingCalendar.scheduledate + ' ' + this.workingCalendar.exceptexacttime6 + ':00').format('H'))
+ + parseFloat(this.dayjs(this.workingCalendar.scheduledate + ' ' + this.workingCalendar.exceptexacttime6 + ':00').format('mm')) / 60
+
+ let durationTime = parseFloat(this.workingCalendar.exceptduration1 || 0) + parseFloat(this.workingCalendar.exceptduration2 || 0) + parseFloat(this.workingCalendar.exceptduration3 || 0)
+ + parseFloat(this.workingCalendar.exceptduration4 || 0) + parseFloat(this.workingCalendar.exceptduration5 || 0) + parseFloat(this.workingCalendar.exceptduration6 || 0)
+
+ this.workingCalendar.worktime = 24 - durationTime
+
updateWorkingCalendar(this.workingCalendar).then(({data}) => {
if (data && data.code == 0) {
this.$message.success(data.msg)
diff --git a/src/views/modules/yieldReport/com_produce_report_normal.vue b/src/views/modules/yieldReport/com_produce_report_normal.vue
index 3a21d85..2aad3e3 100644
--- a/src/views/modules/yieldReport/com_produce_report_normal.vue
+++ b/src/views/modules/yieldReport/com_produce_report_normal.vue
@@ -475,6 +475,11 @@
style=" width: 120px; margin-bottom: 5px;margin-left: 3PX; ">
{{ buttons.notProduce }}
+
+
+
+
+
+
+
{
+ this.showKeyMaterialFlag = true;
+ this.$refs.comProduceKeyMaterial.init(this.scheduleData, this.operatorData)
+ });
+ },
/*生产过程的停机组件*/
produceDownModal() {
//1.首先调用菜单判断方式 打开生产过程的停机的页面