Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-ui into dev

src/components/itemSelect/single.vue

@@ -315,6 +315,14 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        itemCode: undefined,
+        itemName: undefined,
+        sapItemCode: undefined,
+        itemTypeId: 0,
+      }
       this.resetForm("queryForm");
       this.handleQuery();
     },

src/views/mes/cal/calendar/team.vue

@@ -75,7 +75,7 @@
                       :ref="`popoverRef-${calendarDay.theDay}`"
                       placement="bottom"
                       trigger="click"
-                      @show="handleShow(teamShift, `popoverRef-${calendarDay.theDay}`)"
+                      @show="handleShow(teamShift, index, `popoverRef-${calendarDay.theDay}`)"
                     >
                       <span
                         v-for="(item, index) in content"
@@ -300,7 +300,7 @@ export default {
 
       return festAndTerm == "" ? lunarMD : festAndTerm;
     },
-    handleShow(row, ref) {
+    handleShow(row, index, ref) {
       Object.keys(this.$refs).forEach((key) => {
         if(key.includes("popoverRef-")) {
           if(key != ref) {
@@ -311,6 +311,14 @@ export default {
                 });
               }
             })
+          } else {
+            this.$refs[key].forEach((ele, idx) => {
+              if(index != idx) {
+                this.$nextTick(() => {
+                  ele.doClose();
+                });
+              }
+            })
           }
         }
       });

src/views/mes/pro/secretSend/components/requestIndex.vue

@@ -181,6 +181,7 @@ export default {
         },
 
         handleItemSelect() {
+          this.$refs.brSelectpro.resetQuery();
           this.$refs.brSelectpro.showFlag = true;
         },
         onItemSelect(row) {