整机排产

pages/aps/complete/api.js

+import Api from '@/plugins/request'
+export default {
+    getmesorder(params) {
+        return Api.get(`${apsManualUrl}/aps/getmesorder`, params); //待排产订单数据
+    },
+    gettaskseqinfo(params) {
+        return Api.get(`${apsManualUrl}/aps/gettaskseqinfo`, params); //根据订单获取全部工序数据
+    },
+    getlist(params) {
+        return Api.get(`${apsManualUrl}/mes_sys_shop_info/getlist`, params); //手工排产:查询所在车间下的所有班组信息
+    },
+    getbyshopid(params) {
+        return Api.get(`${apsManualUrl}/mes_sys_user_info/getuserbyshopid`, params); //手工排产:根据班组ID,加载人员信息
+    },
+    getlistEquip(params) {
+        return Api.get(`${apsManualUrl}/mes_equip_info/getlist`, params); //手工排产：获取所在车间的设备
+    },
+    getbyequippk(params) {
+        return Api.get(`${apsManualUrl}/mes_sys_user_info/getuserbyequippk`, params); //手工排产:根据设备ID,加载人员信息
+    },
+}
\ No newline at end of file

pages/aps/complete/checkboxList.vue

+<template>
+  <div class="checkbox-list">
+    <Row class="check-title">
+      <Col span="20">
+        <div>
+          <!-- :indeterminate="indeterminate" -->
+          <!-- :label="resourcesType==0?singleList.shop_name:resourcesType==2?singleList.equip_name:''" -->
+          <Checkbox
+            :label="singleList.equip_name"
+            v-model="checkAll"
+            @click.prevent.native="handleCheckAll(singleList.shop_id)"
+          >{{singleList.equip_name}}</Checkbox>
+          <!-- {{resourcesType==0?singleList.shop_name:resourcesType==2?singleList.equip_name:''}} -->
+        </div>
+      </Col>
+      <Col span="4">
+        <div class="icon-down">
+          <Icon type="ios-arrow-down" v-if="!singleList.isClick" @click="upDown(singleList)"></Icon>
+          <Icon type="ios-arrow-up" v-if="singleList.isClick" @click="upDown(singleList)"></Icon>
+        </div>
+      </Col>
+    </Row>
+    <div class="row-name">张芳 &nbsp&nbsp 1级</div>
+    <!-- <CheckboxGroup
+      v-model="checkAllGroup"
+      @on-change="checkAllGroupChange"
+      v-if="singleList.isClick"
+    >-->
+    <!-- :label="resourcesType==0?item.user_name:resourcesType==2?item.equip_name:''" -->
+    <!-- <Checkbox v-for="(item,index) in list" :key="index" :label="item.name">{{item.name}}</Checkbox>
+    </CheckboxGroup>-->
+  </div>
+</template>
+<script>
+import Api from "./api";
+export default {
+  name: "CheckboxList",
+  props: ["singleList"],
+  data() {
+    return {
+      indeterminate: true,
+      checkAll: false,
+      checkAllGroup: [],
+      typeIcon: "ios-arrow-down",
+      show: -1,
+      list: [
+        {
+          name: "张芳"
+        }
+      ],
+      taglistData: []
+    };
+  },
+
+  mounted() {
+    // this.checkList()
+  },
+  methods: {
+    handleCheckAll(id) {
+      // console.log(this.list)
+      // this.list.map((u) => {
+      //   console.log(u)
+      // })
+      // this.checkList(id)
+      this.checkAll = !this.checkAll;
+      if (this.checkAll) {
+        let listNew = [];
+
+        this.list.map(u => {
+          if (this.resourcesType == 0) {
+            listNew.push(u.user_name);
+          } else if (this.resourcesType == 2) {
+            listNew.push(u.equip_name);
+          }
+        });
+        this.checkAllGroup = listNew;
+        this.$emit("changeData", this.checkAllGroup);
+      } else {
+        this.checkAllGroup = [];
+      }
+    },
+
+    checkAllGroupChange(data) {
+      console.log(data);
+      console.log(this.list);
+
+      this.checkAllGroup = data;
+      this.$emit("changeData", this.checkAllGroup);
+      if (data.length === this.list.length) {
+        this.indeterminate = false;
+        this.checkAll = true;
+      } else if (data.length > 0) {
+        this.indeterminate = true;
+        this.checkAll = false;
+      } else {
+        this.indeterminate = false;
+        this.checkAll = false;
+      }
+    },
+    checkList(id) {
+      if (this.resourcesType == 0) {
+        //班组
+        Api.getbyshopid({ shop_id: id }).then(r => {
+          // console.log(r)
+          if (r.success) {
+            r.result.forEach(e => {
+              e.ischeckBox = false;
+            });
+            this.list = r.result;
+          }
+        });
+      } else if (this.resourcesType == 2) {
+        //设备
+        Api.getbyequippk({ equip_pk: 91 }).then(r => {
+          // console.log(r)
+          if (r.success) {
+            r.result.forEach(e => {
+              e.ischeckBox = false;
+            });
+            this.list = r.result;
+          }
+        });
+      }
+    },
+    upDown(post) {
+      if (!post.isClick) {
+        this.$set(post, "isClick", true);
+        this.checkList(post.shop_id);
+      } else {
+        this.$set(post, "isClick", false);
+      }
+    }
+  }
+  // watch: {
+  //   list: {
+  //     handler(newVal, oldVal) {
+  //       console.log('深度监听', newVal, oldVal)
+  //     },
+  //     deep: true
+  //   }
+  // }
+};
+</script>
+<style lang="less" scoped>
+.checkbox-list {
+  .icon-down {
+    text-align: right;
+  }
+  .check-title {
+    height: 40px;
+    line-height: 40px;
+    padding: 0 10px;
+    background: rgba(38, 128, 235, 0.5);
+  }
+  .row-name {
+    text-align: center;
+    width: 100px;
+    height: 30;
+    border-radius: 20px;
+    margin: 5px;
+    cursor: pointer;
+    background: rgba(38, 128, 235, 0.2);
+  }
+  .row-name:hover {
+    border: 1px solid rgba(38, 128, 235, 0.5);
+  }
+}
+</style>
\ No newline at end of file

pages/aps/complete/index.vue

@@ -16,10 +16,12 @@
         v-for="(li,index) in list"
         :key="index"
         @click="listData(li.part_task_pk,index)"
-        :class="isactive == index ? 'addclass' : '' "
+        :class="li.checked == true ? 'addclass' : '' "
       >
         <Row class="title-i">
-          <Col :span="20" class="order-code">订单号：{{li.order_id}}</Col>
+          <Col :span="20" class="order-code">
+            <Checkbox v-model="li.checked">订单号：{{li.order_id}}</Checkbox>
+          </Col>
           <Col :span="4" class="order-ringht">
             <Icon type="md-close" @click="close" />
           </Col>
@@ -57,35 +59,41 @@
           ></Dictionary>
         </FormItem>
         <FormItem label="班组" v-if="formItem.radio==1">
-          <Select v-model="formItem.model1" style="width:200px">
+          <Select v-model="formItem.model1" style="width:300px" multiple>
             <Option v-for="item in cityList" :value="item.value" :key="item.value">{{ item.label }}</Option>
           </Select>
         </FormItem>
 
         <FormItem>
-          <div v-for="(li,index) in listGroup" :key="index" class="list-check">
-            <!-- <Checkbox-List
-            :single-list="li"
-            ref="groups"
-            @changeData="setData"
-            :resourcesType="resourcesType"
-            ></Checkbox-List>-->
+          <!-- <UserSelect ref="userSelected" v-model="formItem.DistributeMainRouting" /> -->
+          <div class="list-check">
+            <Checkbox-List
+              :single-list="li"
+              ref="groups"
+              @changeData="setData"
+              v-for="(li,index) in listGroup"
+              :key="index"
+            ></Checkbox-List>
           </div>
         </FormItem>
-        <FormItem label="已选择">
-          <Tag
-            closable
-            @on-close="handleClose"
-            :key="index"
-            v-for="(val, index) in tagGroup"
-          >{{val}}</Tag>
+        <!-- v-if="tagGroup.lenght>0" -->
+        <FormItem label="已选择" v-if="formItem.radio==0">
+          <div class="tag-list">
+            <Tag
+              color="rgba(38,128,235,0.3)"
+              closable
+              @on-close="handleClose"
+              :key="index"
+              v-for="(val, index) in tagGroup"
+            >{{val.name}}</Tag>
+          </div>
         </FormItem>
         <FormItem label="备注">
           <Input
             v-model="formItem.textarea"
             type="textarea"
             :autosize="{minRows: 2,maxRows: 5}"
-            placeholder="Enter something..."
+            placeholder="请输入备注信息"
           ></Input>
         </FormItem>
         <FormItem>
@@ -97,39 +105,49 @@
   </div>
 </template>
 <script>
+import CheckboxList from "./checkboxList";
 // import Set from './set'
 // import Api from './api'
 export default {
   name: "list",
-  //   components: {
-  //     Set
-  //   },
+  components: {
+    CheckboxList
+  },
   async fetch({ store, params }) {
     await store.dispatch("loadDictionary"); // 加载数据字典
   },
   data() {
     return {
-      activeindex: 1,
+      //   activeindex: 1,
       list: [
         {
           part_task_pk: "euuei",
           order_id: "hdhfk",
           routing_version: "fsslllsl",
           demand_start: "2020-3-30",
-          demand_finish: "2020-3-30"
+          demand_finish: "2020-3-30",
+          checked: true
         },
         {
           part_task_pk: "euuei",
           order_id: "hdhfk",
           routing_version: "fsslllsl",
           demand_start: "2020-3-30",
-          demand_finish: "2020-3-30"
+          demand_finish: "2020-3-30",
+          checked: true
+        },
+        {
+          part_task_pk: "euuei",
+          order_id: "hdhfk",
+          routing_version: "fsslllsl",
+          demand_start: "2020-3-30",
+          demand_finish: "2020-3-30",
+          checked: false
         }
       ],
       status: "0", //全部排产0，1为未排产；2为已排查；
       partTaskPk: "", //车间
       result: [],
-      isactive: 0,
 
       formItem: {
         resourcesType: 0,
@@ -145,32 +163,36 @@ export default {
         day: 0
       },
       tagdata: [],
-      listGroup: [],
-      tagGroup: [],
-      cityList: [
+      listGroup: [
         {
-          value: "New York",
-          label: "New York"
+          equip_name: "调试组",
+          isClick: true
         },
         {
-          value: "London",
-          label: "London"
-        },
+          equip_name: "装配组"
+        }
+      ],
+      tagGroup: [
         {
-          value: "Sydney",
-          label: "Sydney"
+          name: "张芳"
+        }
+      ],
+      cityList: [
+        {
+          value: "0",
+          label: "调试组"
         },
         {
-          value: "Ottawa",
-          label: "Ottawa"
+          value: "1",
+          label: "装配组"
         },
         {
-          value: "Paris",
-          label: "Paris"
+          value: "2",
+          label: "计划组"
         },
         {
-          value: "Canberra",
-          label: "Canberra"
+          value: "3",
+          label: "管理组"
         }
       ]
     };
@@ -201,7 +223,7 @@ export default {
       });
     },
     listData(li, index) {
-      this.isactive = index;
+      //   this.isactive = index;
     },
 
     tagTata(name) {
@@ -225,7 +247,18 @@ export default {
         }
       });
     },
-    close() {},
+    close() {
+      this.$Modal.confirm({
+        title: "删除",
+        content: "<p>您确定要移除此订单吗</p>",
+        onOk: () => {
+          this.$Message.success("删除成功");
+        },
+        onCancel: () => {
+          this.$Message.info("您已取消删除");
+        }
+      });
+    },
     getList(v) {},
     handleClose(nodeKey) {
       // this.$refs.users.handleCheck({ checked: false, nodeKey: nodeKey });
@@ -265,13 +298,6 @@ export default {
         text-align: right;
       }
     }
-    .left-body:hover {
-      cursor: pointer;
-      border-color: rgba(38, 128, 235, 0.5);
-      .title-i {
-        background: rgba(38, 128, 235, 0.5) !important;
-      }
-    }
     .left-body {
       margin-top: 15px;
       border: 1px solid rgba(228, 230, 237, 1);
@@ -311,7 +337,12 @@ export default {
     margin-left: 20px;
     box-shadow: darkgrey 2px 2px 8px 1px; //边框阴影
     .list-check {
-      border-color: rgba(38, 128, 235, 0.5);
+      border: 1px solid rgba(38, 128, 235, 0.5);
+    }
+    .tag-list {
+      width: 100%;
+      min-height: 50px;
+      border: 1px solid rgba(228, 230, 237, 1);
     }
   }
 }