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

pages/aps/dispatch/index.vue

@@ -24,13 +24,29 @@
                     <Checkbox
                       v-model="item.checked"
                       :disabled="item.dispatchStatus==2"
-                    >工单号：{{item.mesCode}}</Checkbox>
+                    >订单号：{{item.mesCode}}</Checkbox>
                   </p>
                   <div class="h60">
                     <p class="g_title">{{item.productName}}--{{item.equipCode}}</p>
                     <p>
                       <Icon type="ios-pricetags" />
-                      工序{{item.process_seq}}：{{item.process_name}}
+                      工序{{item.process_seq}}：{{item.process_name}}；
+                      产品数量：{{item.quantity}}
+                      <op
+                        title="拆分"
+                        type="icon"
+                        icon="md-cut"
+                        v-if="item.quantity > 1 && item.pid == 0"
+                        @click="setChai(item,index)"
+                      ></op>
+                      <op
+                        title="删除"
+                        type="icon"
+                        icon="md-close-circle"
+                        v-else-if="item.pid != 0"
+                        @click="removeDetail(item,index)"
+                      ></op>
+                      <!--  -->
                     </p>
                     <p>{{item.beginTime}}--{{item.endTime}}</p>
                     <!-- <p>设备 ：{{item.equipCode}}</p> -->
@@ -114,6 +130,13 @@
         </div>
       </Col>
     </Row>
+    <!-- 拆分 fenModel -->
+    <Modal v-model="chaiModal" title="拆分工序" :width="400"
+      :mask-closable="false" ok-text="拆分" @on-ok="okChai()" >
+      拆分数量:
+      <Tag>{{chaiNum}}</Tag>
+      <Slider v-model="chaiNum" :max="maxnum" show-stops :min="1"></Slider>
+    </Modal>
     <FooterToolbar style="height:65px" v-show="showOperate&&footerToolbar">
       <Button class="span ml20" type="primary" @click="openDrawer">设置</Button>
       <Button @click="footerToolbar=false">取消</Button>
@@ -241,6 +264,10 @@ export default {
       listMan: [], //人员列表
       listTask: [], //工单列表数据
       newList: [], //选中数据
+      chaiModal: false, //拆分弹框
+      chaiNum: 1, //拆分数量
+      maxnum: 1,
+      rowIndex: 0, //多选项的index
       entity: {
         taskTime: '', //工时
         userIds: null, //选中人员
@@ -346,7 +373,32 @@ export default {
     getEntryList(id) {
       let parme = { departmentId: id, DispatchStatus: this.status }
       Api.getEntryList(parme).then((res) => {
-        this.listTask = res.result
+          var savedUl = []
+          res.result.map((u) => {
+            let detailnew = {
+              beginTime: u.beginTime,//开始时间
+              dispatchStatus: u.dispatchStatus,//
+              endTime: u.endTime,//
+              equipCode: u.equipCode,//
+              equipId: u.equipId,//
+              executeId: u.executeId,//
+              id: u.id,//
+              mesCode: u.mesCode,//
+              order_id: u.order_id,//
+              process_content: u.process_content,//
+              process_name: u.process_name,//
+              process_seq: u.process_seq,//
+              productName: u.productName,//
+              quantity: u.quantity,//
+              routingDetailId: u.routingDetailId,//
+              routingHeaderId: u.routingHeaderId,//
+              status: u.status,//
+              userIds: u.userIds,//
+              pid: 0, //拆分项id
+            }
+            savedUl.push(detailnew)
+          })
+        this.listTask = savedUl
       })
     },
     // 时间改变方法
@@ -440,6 +492,29 @@ export default {
       })
       
     },
+    // 拆分方法
+    setChai(item, index) {
+      this.chaiModal = true
+      this.chaiNum = 1
+      this.maxnum = item.quantity - 1
+      this.rowIndex = index
+    },
+    okChai() {
+      var detail = this.$u.clone(this.listTask[this.rowIndex])
+      this.listTask[this.rowIndex].quantity -= this.chaiNum
+      // detail.pid = this.$u.guid()
+      detail.pid = this.$u.guid()
+      detail.quantity = this.chaiNum
+      this.listTask.splice(this.rowIndex + 1, 0, detail)
+    },
+    // 删除行
+    removeDetail(item, index) {
+      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

pages/mainProcess/index.vue

@@ -495,7 +495,7 @@ export default {
         if (this.list[i].userIds.length < 1) {
           this.$Message.error('有工序的人员未选！')
           return
-        } else if (this.list[i].times.length < 1) {
+        } else if (this.list[i].times[0] == undefined) {
           this.$Message.error('有工序的时间段未选！')
           return
         }
@@ -510,8 +510,8 @@ export default {
         .then((r) => {
           this.disableFlag = true
           this.$Message.success('派工成功！')
+          this.$router.push('/produce/scheduling')// 返回上一级
         })
-        this.$router.push('/produce/scheduling')// 返回上一级
     },
     //多选处理--表格选择项变化方法
     selectFunction(selection) {

pages/produce/taskList.vue

@@ -15,7 +15,8 @@
         border class="tableCommon" :height="tbHeight"
         ref="table" :columns="mColumn" :data="mDatas" >
         <template slot-scope="{ row,index }" slot="status">
-           <state code="taskList.status" type="text" class="bold" :value="row.status"></state>
+           <state code="plan.order.status" type="text" class="bold" :value="row.status"></state>
+           <!-- taskList.status -->
         </template>
       </Table>
         <!-- @on-row-click="(row,index)=>clickRow(row,index)" -->
@@ -284,7 +285,7 @@ export default {
           slot:"status",
           filters:this.getArry(
                 this.$store.getters.dictionaryByKey(
-                  'taskList.status'
+                  'plan.order.status'//taskList.status
                 )
               ),
           filterMultiple: false,