Merge branch 'dev' of https://e.coding.net/g-pheu9517/grt-iscs/ISCS_Ui_Admin_Base into dev

src/views/mes/job/jobm/lookWork.vue

@@ -197,7 +197,8 @@
                   :data="tableData"
                   stripe
                   height="300"
-                  style="width: 100%"
+                  style="width: 100%; overflow: -moz-scrollbars-none"
+                  class="tabData"
                 >
                   <el-table-column prop="pointName" label="隔离点" width="60">
                     <template slot-scope="scope">
@@ -319,7 +320,8 @@
                   :data="sortedTicketUserDTOList"
                   stripe
                   height="300"
-                  style="width: 100%"
+                  style="width: 100%; overflow: -moz-scrollbars-none"
+                  class="tabData"
                 >
                   <el-table-column prop="userId" label="序号" width="50">
                   </el-table-column>
@@ -1280,7 +1282,7 @@ export default {
             userName: user.label,
             userId: user.value,
             userType: 0,
-            userRole: 'jtcolocker',
+            userRole: "jtcolocker",
           });
           console.log(this.form.ticketUserDTOList, "用户");
         } else {
@@ -1339,7 +1341,7 @@ export default {
             userName: item.userName,
             userId: 0,
             userType: 1,
-            userRole: 'jtcolocker',
+            userRole: "jtcolocker",
           });
         }
       });
@@ -1498,6 +1500,9 @@ export default {
         z-index: 10;
       }
     }
+    .box-card::-webkit-scrollbar {
+      display: none;
+    }
     .title {
       display: block;
       width: 25%;
@@ -1509,6 +1514,9 @@ export default {
     }
   }
 }
+.newOperations::-webkit-scrollbar {
+  display: none;
+}
 
 //右侧卡片样式开始
 .text {

src/views/mes/sop/sopm/sopmLook.vue

@@ -58,7 +58,8 @@
         content="收起作业区域内容"
         placement="top-start"
       >
-        <el-button v-no-more-click
+        <el-button
+          v-no-more-click
           type="primary"
           icon="el-icon-s-fold"
           class="btnwork"
@@ -74,7 +75,8 @@
         content="展开作业区域内容"
         placement="top-start"
       >
-        <el-button v-no-more-click
+        <el-button
+          v-no-more-click
           type="primary"
           icon="el-icon-s-unfold"
           class="btnwork"
@@ -278,7 +280,8 @@
                 </el-select>
               </el-form-item>
               <el-form-item label="共锁人" prop="coLocker">
-                <el-button v-no-more-click
+                <el-button
+                  v-no-more-click
                   type="primary"
                   @click="addInside"
                   class="gsr"
@@ -286,7 +289,8 @@
                   disabled
                   >添加内部人员
                 </el-button>
-                <el-button v-no-more-click
+                <el-button
+                  v-no-more-click
                   type="primary"
                   @click="addOutside"
                   size="mini"
@@ -319,7 +323,8 @@
                   </el-table-column>
                   <el-table-column label="" width="80">
                     <template slot-scope="scope">
-                      <el-button v-no-more-click
+                      <el-button
+                        v-no-more-click
                         @click.native.prevent="
                           deleteRow(scope.$index, sortedTicketUserDTOList)
                         "
@@ -381,7 +386,10 @@
               />
             </el-col>
             <el-col :span="4">
-              <el-button v-no-more-click type="primary" @click="insertOutSideTable"
+              <el-button
+                v-no-more-click
+                type="primary"
+                @click="insertOutSideTable"
                 >添加</el-button
               >
             </el-col>
@@ -402,7 +410,8 @@
             </el-table-column>
             <el-table-column label="操作" width="80">
               <template slot-scope="scope">
-                <el-button v-no-more-click
+                <el-button
+                  v-no-more-click
                   @click.native.prevent="
                     deleteRow(scope.$index, OutSideUserTableData)
                   "
@@ -418,11 +427,16 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <!--  内部人员确认-->
-        <el-button v-no-more-click type="primary" @click="cancel" v-if="insideMumber"
+        <el-button
+          v-no-more-click
+          type="primary"
+          @click="cancel"
+          v-if="insideMumber"
           >确认</el-button
         >
         <!--        外部人员确认-->
-        <el-button v-no-more-click
+        <el-button
+          v-no-more-click
           type="primary"
           @click="outSideDialogConfirm"
           v-if="outsideMumber"
@@ -744,7 +758,7 @@ export default {
             console.log(value, response.data.ticketUserDTOList, "form.locker");
           this.form.ticketUserDTOList = response.data.ticketUserDTOList.filter(
             (item) => {
-              return item.userRole !== "jtlocker"
+              return item.userRole !== "jtlocker";
             }
           ); //过滤上锁人
 
@@ -1178,7 +1192,7 @@ export default {
             userName: user.label,
             userId: user.value,
             userType: 0,
-            userRole: 'jtcolocker',
+            userRole: "jtcolocker",
           });
           console.log(this.form.ticketUserDTOList, "用户");
         } else {
@@ -1220,7 +1234,7 @@ export default {
             userName: item.userName,
             userId: 0,
             userType: 1,
-            userRole: 'jtcolocker',
+            userRole: "jtcolocker",
           });
         }
       });
@@ -1352,7 +1366,6 @@ export default {
     }
   }
   .right {
-
     flex: 1;
     height: 100%;
     // background: #000;
@@ -1373,6 +1386,9 @@ export default {
           z-index: 10;
         }
       }
+      .box-card::-webkit-scrollbar {
+        display: none;
+      }
     }
     .title {
       display: block;
@@ -1385,7 +1401,9 @@ export default {
     }
   }
 }
-
+.newOperations::-webkit-scrollbar {
+  display: none;
+}
 //右侧卡片样式开始
 .text {
   font-size: 14px;