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

@@ -12,9 +12,9 @@
                     <el-button size="mini" type="text" icon="el-icon-delete" @click="deleteRow($index)">删除</el-button>
                     <el-button size="mini" type="text" icon="el-icon-update" @click="updateRow($index)">修改</el-button>
                 </template>
-                
-                    
-               
+
+
+
             </el-table-column>
         </el-table>
 
@@ -53,7 +53,7 @@
 
 
 
-        <!-- 
+        <!--
         <pagination v-show="total > 0 && $attrs.optType !== 'add'" :total="total" :page.sync="queryParams.pageNum"
             :limit.sync="queryParams.pageSize" @pagination="getList" /> -->
     </div>
@@ -113,7 +113,7 @@ export default {
                 workstationName: null,
             },
             // 表单参数
-            form: { 
+            form: {
                 itemId: null,
                 sapItemCode: null,
                 itemName: null,
@@ -181,7 +181,8 @@ export default {
         },
 
         handleItemSelect() {
-            this.$refs.brSelectpro.showFlag = true;
+          this.$refs.brSelectpro.resetQuery();
+          this.$refs.brSelectpro.showFlag = true;
         },
         onItemSelect(row) {
             if (row != undefined && row != null) {
@@ -193,7 +194,7 @@ export default {
 
         /**表单提交 */
         submitForm() {
-           
+
             if(this.form.applyNum==0){
                 this.open = true;
                 this.$modal.confirm('申请数量需要输入数字');
@@ -293,4 +294,4 @@ export default {
         }
     }
 };
-</script>
\ No newline at end of file
+</script>