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

pages/aps/dispatch/api.js

@@ -21,6 +21,9 @@ export default {
     getEntryList(params){
         return Api.get(`${PlanUrl}/teamsdispatchs/getentrylist`, params);
     },
+    // getEntryList(params){
+    //     return Api.get(`${PlanUrl}/teamsdispatchs/getentrylist_mutiroutinggroup`, params);
+    // },
     // 派工接口（保存）
     saveTeamentry(params){
         return Api.post(`${PlanUrl}/teamsdispatchs/saveteamentry`, params);

pages/aps/stream/index.vue

@@ -402,12 +402,12 @@ export default {
           this.result.forEach((element) => {
             for (let i = 0; i < element.list.length; i++) {
               obj = {
-                detailId: element.list.length[i].detailId,
-                shopId: element.list.length[i].shopId,
-                quantity: element.list.length[i].quantity,
-                beginTime: element.list.length[i].beginTime,
-                endTime: element.list.length[i].endTime,
-                remark: element.list.length[i].remark,
+                detailId: element.list[i].detailId,
+                shopId: element.list[i].shopId,
+                quantity: element.list[i].quantity,
+                beginTime: element.list[i].beginTime,
+                endTime: element.list[i].endTime,
+                remark: element.list[i].remark,
               };
               items.push(obj);
             }

pages/aps/stream/set.vue

@@ -22,14 +22,14 @@
           <Radio label="1">班组</Radio>
         </RadioGroup>
       </FormItem>-->
-      <FormItem label="人员" v-if="mode == 1" prop="userIds">
+      <FormItem label="人员" v-if="mode == 1" prop="userIds"  :rules="{required: true, message: '必填', trigger: 'blur'}">
         <!-- <UserSelect
           ref="userSelected"
           v-model="formItem.userIds"
           style="width:300px"
           :multiple="true"
         />-->
-        <UserSelect v-model="formItem.userIds" :multiple="true" :type="2" />
+        <UserSelect v-model="formItem.userIds" :multiple="true" :type="2" :rules="{required: true, message: '必填', trigger: 'blur'}"/>
       </FormItem>
       <FormItem label="班组" v-if="mode == 2" prop="shopId">
         <Select
@@ -106,21 +106,21 @@ export default {
             },
           },
         ],
-        userIds: [
-          {
-            required: true,
-            message: "请选择人员",
-            type: "array",
-            trigger: "change",
-          },
-        ],
-        shopId: [
-          {
-            required: true,
-            message: "请选择班组",
-            trigger: "change",
-          },
-        ],
+        // userIds: [
+        //   {
+        //     required: true,
+        //     message: "请选择人员",
+        //     type: "array",
+        //     trigger: "change",
+        //   },
+        // ],
+        // shopId: [
+        //   {
+        //     required: true,
+        //     message: "请选择班组",
+        //     trigger: "change",
+        //   },
+        // ],
       },
     };
   },
@@ -131,18 +131,25 @@ export default {
   methods: {
     //确定
     Determine() {
-      if (this.formItem.userIds && this.formItem.userIds.length == 0) {
-        this.$Message.error("人员不能为空");
+      if (this.mode == 1) {
+        if (!this.formItem.userIds) {
+          this.$Message.error("人员不能为空");
+          return false;
+        }
       } else {
-        this.$refs["formItem"].validate((valid) => {
-          if (valid) {
-            this.formItem.detailId = this.detailId;
-            this.$emit("on-DetermineOk", this.formItem, this.indexId);
-          } else {
-            this.$Message.error("请填写完整");
-          }
-        });
+        if (!this.formItem.shopId) {
+          this.$Message.error("班组不能为空");
+          return false;
+        }
       }
+      this.$refs["formItem"].validate((valid) => {
+        if (valid) {
+          this.formItem.detailId = this.detailId;
+          this.$emit("on-DetermineOk", this.formItem, this.indexId);
+        } else {
+          this.$Message.error("请填写完整");
+        }
+      });
     },
     closeOk() {
       this.$emit("closeOk");