工序参数

pages/aps/aps/add.vue

@@ -117,22 +117,17 @@
                     v-for="(item,index) in list"
                     :key="index"
                     :value="item.value"
-                    :label="item.title"
+                    :label="item.label"
                     style="display:none"
                   ></Option>
                   <Tree key="mytree" :data="data1" ref="mytree" :render="renderContent"></Tree>
                 </Select>
               </FormItem>
               <div class="check-box">
-                <CheckboxGroup v-model="entity.fruit">
-                  <Checkbox label="10985553333（数控车床 车工班）"></Checkbox>
-                  <br />
-                  <Checkbox label="10985553333（数控车床 车工班）"></Checkbox>
-                  <br />
-                  <Checkbox label="10985553333（数控车床 车工班）"></Checkbox>
-                  <br />
-                  <Checkbox label="10985553333（数控车床 车工班）"></Checkbox>
-                  <br />
+                <CheckboxGroup v-model="entity.multipleEquipIds">
+                  <div v-for="(item,index) in checkList" :key="index" class="check-item">
+                    <Checkbox :label="item.equip_pk">{{item.equip_name}}</Checkbox>
+                  </div>
                 </CheckboxGroup>
               </div>
             </div>
@@ -166,12 +161,13 @@ export default {
         planMethod: "转序规则", // 平行 重叠
         shopId: null,
         level: 100,
-        value2: 100,
-        fruit: []
+        multipleEquipIds: [], //设备
+        value2: 100
       },
+
       list: [],
       data1: [],
-
+      checkList: [],
       listCal: [],
       visible: false,
       rules: {
@@ -184,6 +180,7 @@ export default {
     this.getCal(); //获取连班策略
     this.apsGet(); //获取参数级别和转序等的关系
     this.initTree(); //获取当前登录人所在车间下的所有部门
+    this.multiple(0); //获取任务工单相关设备
   },
   methods: {
     getCal() {
@@ -216,7 +213,6 @@ export default {
       var sumData = [];
       Api.userdepartmentsofworkshop()
         .then(r => {
-        
           if (r.result) {
             this.data1 = r.result;
           } else {
@@ -249,9 +245,25 @@ export default {
       };
       this.list = [];
       this.list.push(obj);
-      
-      alert(this.list[0].value)
       this.entity.shopId = this.list[0].value;
+
+      this.multiple(this.entity.shopId);
+    },
+    multiple(id) {
+      // part_task_pk 任务ID 可以为0
+      //op_pk 工单ID 可以为0
+      //shop_id 班组ID 可以为0
+      Api.gettaskequips({
+        part_task_pk: 0,
+        op_pk: 0,
+        shop_id: id
+      })
+        .then(r => {
+          if (r.result) {
+            this.checkList = r.result;
+          }
+        })
+        .catch(err => {});
     },
     handleClose() {
       this.$emit("on-close");
@@ -354,6 +366,10 @@ export default {
       padding-left: 0;
       margin-left: 25px;
       overflow: auto;
+      .check-item {
+        height: 30px;
+        margin-left: 10px;
+      }
     }
   }
   .right-down {

pages/aps/aps/api.js

@@ -76,4 +76,8 @@ export default {
   userdepartmentsofworkshop(params) {
     return Api.get(`${systemUrl}/user/userdepartmentsofworkshop`, params);
   },
+  //获取任务工单相关设备
+  gettaskequips(params) {
+    return Api.get(`${apsUrl}/ser/gettaskequips`, params);
+  },
 }