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

layouts/basic-layout/product.vue

@@ -400,6 +400,7 @@ export default {
         left: 56%;
         top: 57%;
         min-width: 1084px;
+        // min-width: 777px;
         min-height: 300px;
         box-shadow: 0px 5px 17px 5px rgba(0, 0, 0, 0.28);
         background: #f5f6fa;

pages/aps/dispatch/index.vue

@@ -66,7 +66,6 @@
                           </p>
                           <p>{{li.beginTime}}--{{li.endTime}}</p>
                           <p>人员 ：{{li.userNames}}</p>
-                          <!-- <p>设备 ：{{item.equipCode}}</p> -->
                         </div>
                       </Card>
                     </Col>
@@ -105,7 +104,6 @@
                         v-else-if="item.dispatchStatus!=2 && item.pid != 0"
                         @click="removeDetail(item,index)"
                       ></op>
-                      <!--  -->
                     </p>
                     <p>{{item.beginTime}}--{{item.endTime}}</p>
                     <p>人员 ：{{item.userNames}}</p>
@@ -135,7 +133,8 @@
             </span>
           </p>
           <div class="dispatch_part_body" :style="{height:byheight}">
-            <h4 class="tc" v-if="listMan.length==0 || listSheBei.length==0">暂无数据</h4>
+            <h4 class="tc" v-if="listSheBei.length==0 && button2 == '设备'">暂无数据</h4>
+            <h4 class="tc" v-else-if="listMan.length==0 && button2 == '人员'">暂无数据</h4>
             <div class="shebei" v-if="button2 == '设备'">
               <Row :gutter="15">
                 <!-- {{shebeiId}} -->
@@ -200,8 +199,7 @@
       :mask-closable="false"
       ok-text="拆分"
       @on-ok="okChai()"
-    >
-      拆分数量:
+    > 拆分数量: 
       <Tag>{{chaiNum}}</Tag>
       <Slider v-model="chaiNum" :max="maxnum" show-stops :min="1"></Slider>
     </Modal>
@@ -232,8 +230,7 @@
                 v-model="entity.userIds"
                 :multiple="true"
                 style="width: 500px"
-              />
-              <!-- :type="3" -->
+              /><!-- :type="3" -->
             </FormItem>
           </Col>
           <Col span="24" class="drawer_midell">
@@ -268,12 +265,9 @@
             <FormItem label="工时" prop="taskTime">
               <DatePicker
                 v-model="pentity.taskTime"
-                type="datetimerange"
-                placement="bottom-start"
-                :options="dateRange"
-                @on-change="handleChange"
-                placeholder="请选择时间段"
-                style="width: 330px"
+                type="datetimerange" placement="bottom-start"
+                :options="dateRange" @on-change="handleChange"
+                placeholder="请选择时间段" style="width: 330px"
               ></DatePicker>
             </FormItem>
           </Col>
@@ -285,13 +279,9 @@
           <Col span="24">
             <FormItem label="备注" style="width:100%">
               <Input
-                maxlength="200"
-                v-model="pentity.remark"
-                type="textarea"
-                :autosize="{minRows: 3,maxRows: 5}"
-                show-word-limit
-                class="drawer_row_textarea"
-              />
+                maxlength="200" v-model="pentity.remark"
+                type="textarea" :autosize="{minRows: 3,maxRows: 5}"
+                show-word-limit class="drawer_row_textarea"/>
             </FormItem>
           </Col>
         </Row>
@@ -317,8 +307,7 @@ export default {
       listShow: "订单",
       shebei: "",
       curTask:null,
-      dateRange: {
-        //禁选工时时间区间
+      dateRange: {//禁选工时时间区间
         disabledDate(date) {
           return date && date.valueOf() < Date.now() - 86400000;
         }
@@ -454,9 +443,7 @@ export default {
         res.result.map(u => {
           if (u.pid) {
             pid = u.pid;
-          } else {
-            pid = 0;
-          }
+          } else { pid = 0;}
           let detailnew = {
             beginTime: u.beginTime, //开始时间
             dispatchStatus: u.dispatchStatus, //
@@ -499,7 +486,6 @@ export default {
     },
     // 过滤条件
     changeStatus(a) {
-      // console.log(a)
       this.getUserInfoFn();
     },
     // 打开抽屉
@@ -509,7 +495,6 @@ export default {
       let timebegin = formData[0].beginTime;
       let timend = formData[0].endTime;
       this.newList = [];
-      // console.log("选中的id",chekids)
       chekids.forEach(v => {
         var item = formData.filter(u => {
           return u.id == v;
@@ -523,24 +508,12 @@ export default {
         this.facilityModal = true;
       } else {
         this.pentity.taskTime = [timebegin, timend];
-        // if (
-        //   formData.map(t => {
-        //     this.newList.filter(m => {
-        //       if ((m.id = t.id)) {
-        //         console.log(m.checked);
-        //       }
-        //     });
-        //   })
-        // ) {
-        // }
         this.manModal = true;
-      }
-      // console.log("选中的数据", this.newList);
+      }// console.log("选中的数据", this.newList);
     },
     // 设备派工
     sendSheBei() {
       let item = this.newList;
-      // console.log(item)
       item.map(u => {
         u.userIds = this.entity.userIds;
         u.remark = this.entity.remark;
@@ -569,7 +542,6 @@ export default {
     // 人员派工
     sendUser() {
       let item = this.newList;
-      // console.log("派工的数据",item)
       item.map(u => {
         u.userIds = this.peploeId;
         u.remark = this.pentity.remark;
@@ -596,22 +568,20 @@ export default {
     },
     // 拆分方法
     setChai(item, index) {
-      // console.log(item, index)
       this.curTask=item;
       this.chaiModal = true;
       this.chaiNum = 1;
       this.maxnum = item.quantity - 1;
       this.rowIndex = index;
     },
-
     // 拆分保存
     okChai() {
       var old = this.$u.clone(this.curTask);
       var add = this.$u.clone(this.curTask);
-      old.quantity -= this.chaiNum;
-      add.quantity = this.chaiNum;
-      add.id = 0;
-      add.pid = old.id;
+          old.quantity -= this.chaiNum;
+          add.quantity = this.chaiNum;
+          add.id = 0;
+          add.pid = old.id;
       let params = {
         isDispatch: 0, //派工是1，保存是0
         entryList: [old, add]
@@ -636,14 +606,9 @@ export default {
           this.$Message.error("拆分项删除失败！");
         }
       });
-      // let oldList = this.listTask;
-      // let clickRow = oldList.filter(listRow=>listRow.process_name===item.process_name)[0];
-      // clickRow.quantity += this.chaiNum
-      // this.listTask.splice(index, 1)
-      // this.$Message.success('拆分项已删除。')
     },
+    //取消
     cancle() {
-      //取消
       this.facilityModal = false;
       this.manModal = false;
       this.footerToolbar = false;
@@ -653,20 +618,15 @@ export default {
     ids() {
       let ids = [];
       this.listTask.map(u => {
-        if (u.checked) {
-          ids.push(u.id);
-        }
+        if (u.checked) { ids.push(u.id);}
       });
-      if (ids.length > 0) {
-        this.footerToolbar = true;
-      }
+      if (ids.length > 0) {this.footerToolbar = true;}
       return ids;
     },
     listOrder() {
       let orders = this.$u.group(this.listTask, u => {
         return u.mesCode;
-      });
-      // console.warn("listOrder", orders);
+      });// console.warn("listOrder", orders);      
       return orders;
     },
     peploeId() {
@@ -687,6 +647,4 @@ export default {
   },
   watch: {}
 };
-</script>
-<style lang="less">
+</script>
\ No newline at end of file
-</style>
\ No newline at end of file