diff --git a/hb_client/src/components/Gantt/dashGantt.vue b/hb_client/src/components/Gantt/dashGantt.vue index fab0861..4d84376 100644 --- a/hb_client/src/components/Gantt/dashGantt.vue +++ b/hb_client/src/components/Gantt/dashGantt.vue @@ -295,7 +295,7 @@ ganttHeight:{ type:Number, default: () => { - return 300 + return 0 } } , }, @@ -374,14 +374,7 @@ }; }, mounted(){ - this.ganttHeight = this.ganttHeight-45; - if(window.innerHeight){ - this.windowWidth = window.innerWidth; - this.windowHeight = window.innerHeight; - }else{ - this.windowHeight=document.body.clientHeight?document.body.clientHeight:document.documentElement.clientHeight; - this.windowWidth=document.body.clientWidth?document.body.clientWidth:document.documentElement.clientWidth; - } + // this.ganttHeight = this.ganttHeight; let currentYear = new Date().getFullYear(); this.timeRange = [currentYear+'-01',(currentYear+1)+'-12']; this.list = [...this.proList]; @@ -533,14 +526,14 @@ }, //修改后续高度 resetTop(zindex, reduce, isexpand) { - let num = reduce ? -40 : 40; + let num = reduce ? -34 : 34; if (!reduce && !isexpand) { this.list.forEach((item, index) => { if (index > zindex) { - item.top = item.top + 40; + item.top = item.top + 35; if (item.children && item.children.length > 0) { item.children.forEach((k, i) => { - k.top = item.top + 40 * i + 40; + k.top = item.top + 34 * i + 35; }); } } @@ -820,19 +813,7 @@ parseInt(this.$refs[dom][0].style.width); end = Math.round(end / this.currentDaySize.value) * - this.currentDaySize.value - - this.currentDaySize.value; - let infoDomX=0,infoDomY = 0; - if(this.windowWidth-e.clientX>230){ - infoDomX = e.clientX; - }else{ - infoDomX = this.windowWidth-230; - } - if(this.windowHeight-e.clientY>200){ - infoDomY = e.clientY; - }else{ - infoDomY = this.windowHeight-200; - } + this.currentDaySize.value -this.currentDaySize.value; this.currentProjectMsg = { name: this.computedList[index].name, allTime: (end - start) / this.currentDaySize.value + 1, @@ -840,15 +821,9 @@ per1: this.computedList[index].per1, startTime: this.computedWithTime(start), endTime: this.computedWithTime(end), - left:infoDomX , - top: infoDomY + left:e.clientX , + top: e.clientY }; - /* - * left: - e.clientX + 220 - this.$refs.chart.scrollLeft >= this.$refs.chart.clientWidth - ? e.clientX - 220 - 400 - : e.clientX , - * */ this.isShowMsg = true; }, //鼠标离开信息消失，时间显示消失 diff --git a/hb_client/src/views/dashboard/index.vue b/hb_client/src/views/dashboard/index.vue index 7830601..1fbc573 100644 --- a/hb_client/src/views/dashboard/index.vue +++ b/hb_client/src/views/dashboard/index.vue @@ -15,7 +15,7 @@
本月合同数
- 30 + {{contractTotalCurrent}} 个
@@ -30,7 +30,7 @@
本月生产订单数
- 30 + {{orderTotalCurrent}} 个
@@ -45,7 +45,7 @@
本月在制任务
- 30 + {{planTotalCurrent}} 个
@@ -96,15 +96,15 @@ - +
@@ -124,19 +124,25 @@ >
-
本周
-
本月
-
三个月
+
+ 本周 +
+
本月 +
+
三个月 +
-
+
- + - +
库存列表 @@ -154,43 +160,45 @@
- - - - - - - - - - - - - - - - - - - - - - - +
+ + + + + + + + + + + + + + + + + + + + + + +
+
- +
提醒
-
- - -
    -
  • -
    - 玻璃低于安全库存2021-12-30 -
    -
    • -
  • -
    - {{item}}2021-12-20 -
    -
    • -
- - -
    -
  • -
    - 某某批货临近交货日期2021-12-20 -
    -
    • -
  • -
    - {{item}}2021-12-20 -
    -
    • -
- - -
    -
  • -
    - 某某批货临近过期2021-11-20 -
    -
    • -
  • -
    - {{item}}2021-12-20 -
    -
    • -
- - - +
+ + +
    +
  • +
    + {{item.name}}2021-12-30 +
    +
    • +
+ + +
    +
  • +
    + 某某批货临近交货日期2021-12-20 +
    +
    • +
  • +
    + {{item}}2021-12-20 +
    +
    • +
+ + +
    +
  • +
    + 某某批货临近过期2021-11-20 +
    +
    • +
  • +
    + {{item}}2021-12-20 +
    +
    • +
+ + +
+
diff --git a/hb_client/src/views/mtm/material.vue b/hb_client/src/views/mtm/material.vue index 0caa4fb..384a3fd 100644 --- a/hb_client/src/views/mtm/material.vue +++ b/hb_client/src/views/mtm/material.vue @@ -121,7 +121,7 @@ @@ -131,41 +131,42 @@ - + - + + :value="item.value" + > - - - + + + :value="item.value" + > - + - - - - + + + + + -
取消 @@ -189,8 +190,14 @@ import {genTree} from "@/utils"; import Pagination from "@/components/Pagination"; // secondary package based on el-pagination const defaultmaterial = { - name: "", - number: "", + name: null, + number: null, + specification: null, + unit: null, + type: null, + piece_count: null, + sort_str: null, + count_safe: 0, processes: [], }; export default { @@ -270,19 +277,13 @@ created() { this.getList(); this.getProcessList(); - }, methods: { checkPermission, - //物料详情 - handledetail(scope) - { + handledetail(scope){ this.$router.push({name: "MaterialDetail", params: { id: scope.row.id,type: scope.row.type }, }) - }, - - //选项卡切换 handleClick(tab) { this.listLoading = true; @@ -311,10 +312,8 @@ }, //绑定工序 handlebind(scope) { - this.$router.push({name: "MaterialDO", params: {id: scope.row.id},}) - } - , + }, handleFilter() { this.listQuery.page = 1; this.getList(); @@ -324,7 +323,7 @@ this.listQuery = { page: 1, page_size: 20, - } + }; this.getList(); }, handleCreate() { @@ -335,7 +334,6 @@ this.$refs["Form"].clearValidate(); }); }, - handleEdit(scope) { this.material = Object.assign({}, scope.row); // copy obj this.dialogType = "edit"; @@ -359,7 +357,6 @@ console.error(err); }); }, - async confirm(form) { this.$refs[form].validate((valid) => { if (valid) {