Merge branch 'product' of http://git.mes123.com/zhouyx/mes-ui into product

pages/aps/results/gantt.vue

@@ -269,9 +269,9 @@ let options = {
       },
       {
         id: 2,
-        label: "任务",
-        value: "label",
-        width: 200,
+        label: "名称",
+        value: "name",
+        width: 100,
         expander: true,
         html: true
         // events: {
@@ -283,38 +283,43 @@ let options = {
       {
         id: 3,
         label: "设备编号",
-        value: "user",
-
-        width: 130,
+        value: "EquipmentNo",
+        width: 160,
         html: true
       },
       {
         id: 4,
-        label: "开始时间",
+        label: "计划开始时间",
         value: task => dayjs(task.start).format("YYYY-MM-DD"),
-        width: 78
+        width: 100
       },
       {
         id: 5,
-        label: "结束时间",
+        label: "计划结束时间",
         value: task => dayjs(task.endTime).format("YYYY-MM-DD"),
-        width: 78
+        width: 100
       },
 
       {
         id: 6,
+        label: "计划数量",
+        value: "plan_qty",
+        width: 68
+      },
+      {
+        id: 7,
         label: "投入数量",
         value: "put_into_qty",
         width: 68
       },
       {
-        id: 7,
+        id: 8,
         label: "派工数量",
         value: "dispatch_qty",
         width: 68
       },
       {
-        id: 8,
+        id: 9,
         label: "%",
         value: "progress",
         width: 35,
@@ -369,7 +374,7 @@ export default {
 
   data() {
     return {
-      tasks:[],
+      tasks,
       options,
       dynamicStyle: {},
       lastId: 16
@@ -385,22 +390,37 @@ export default {
         Api.paged({ scheduleId: this.id })
           .then(r => {
             if (r.result) {
+              var parentId = r.result[0].id; //父级id
+              var list = [];
+              var obj = {
+                id: r.result[0].id,
+                name: r.result[0].part_name,
+                start: r.result[0].plan_start,
+                endTime: r.result[0].plan_finish,
+                EquipmentNo: "/",
+                duration: 15 * 24 * 60 * 60 * 1000,
+                percent: 85,
+                plan_qty: r.result[0].plan_qty,
+                put_into_qty: "/",
+                dispatch_qty: "/"
+              };
+              list.push(obj);
               Api.getdetail({
                 part_task_pk: r.result[0].id,
                 scheduleId: this.id
               }).then(r => {
                 if (r.result) {
-                  var list = [];
                   for (var i = 0; i < r.result.length; i++) {
                     let temp = {
                       id: r.result[i].op_task_pk,
-                      label: r.result[i].task_name,
-                      user: r.result[i].equip_id,
+                      name: r.result[i].task_name,
+                      EquipmentNo: r.result[i].equip_id,
+                      parentId: parentId,
                       // start: r.result[i].plan_start,
                       // endTime: r.result[i].plan_finish,
                       endTime: "2020-7-30",
-                      start:  getDate(1),
-                      duration: (15*i) * 24 * 60 * 60 * 1000,
+                      start: getDate(-24 * 5),
+                      duration: 15 * 24 * 60 * 60 * 1000,
                       percent: 85,
                       put_into_qty: r.result[i].put_into_qty,
                       dispatch_qty: r.result[i].dispatch_qty

pages/resourceManagement/productionResources/index.vue

@@ -68,7 +68,9 @@ export default {
       easySearch: {
         keys: { op: "title,code,type,departTitle", value: null }
       },
-      entity: {},
+      entity: {
+        isimportant: "1"
+      },
       disabled: false,
       ids: [],
       editModal: false,
@@ -285,6 +287,8 @@ export default {
               this.$Message.error("保存失败");
               console.warn(err);
             });
+        } else {
+          this.$Message.error("请输入必填项");
         }
       });
     },

pages/technology/index.vue

@@ -166,7 +166,8 @@ export default {
           title: this.l("name"),
           align: "left",
           easy: true,
-          high: true
+          high: true,
+          tooltip:true,
         },
         {
           key: "phase",
@@ -209,14 +210,16 @@ export default {
           key: "productName",
           title: this.l("productName"),
           align: "left",
-          high: true
+          high: true,
+          tooltip:true,
         },
         {
           key: "departmentName",
           title: this.l("departmentName"),
           width: 100,
           align: "left",
-          high: true
+          high: true,
+          tooltip:true,
         },
         {
           key: "isEffect",