ccc开发分支 勿用

src/views/produce/index.vue

@@ -3,78 +3,84 @@
     <div class="content_box">
 
       <!-- 工序名称 -->
-      <Search></Search>
-      <!-- <div>
-        111
-      </div> -->
-      <ele-split-layout space="0px" width="45%" :resizable="true" :min-size="200" :max-size="-200" :left-style="{
-        overflow: 'hidden',
-        width: '100%'
-      }" :right-style="{ overflow: 'hidden' }" :responsive="false" style="height: calc(100vh - 70px - 50px - 80px)">
+      <!-- <Search></Search> -->
+      <div class="content_box_tab">
+        <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
+          <el-tab-pane label="工序" name="first">工序</el-tab-pane>
+          <el-tab-pane label="设备" name="second">设备</el-tab-pane>
+        </el-tabs>
+      </div>
+      <div>
+
+        <ele-split-layout space="0px" width="35%" :resizable="true" :min-size="200" :max-size="-200" :left-style="{
+          overflow: 'hidden',
+          width: '100%'
+        }" :right-style="{ overflow: 'hidden' }" :responsive="false" style="height: calc(100vh - 70px - 50px - 80px)">
+
+          <!-- 左侧 工单列表 -->
+          <div class="left_main">
+            <div class="top">
+              <!-- /工单列表 -->
+              <produceOrder @workSelect="workSelect" @rowClick="rowClick"></produceOrder>
 
-
-
-
-
-        <!-- 左侧 工单列表 -->
-        <div class="left_main">
-          <div class="top">
-            <!-- /工单列表 -->
-            <produceOrder @workSelect="workSelect" @rowClick="rowClick"></produceOrder>
-
-          </div>
-          <!-- <div class="bottom">
+            </div>
+            <!-- <div class="bottom">
             <productionResource :BomObj="BomObj"></productionResource>
           </div> -->
-        </div>
-        <!-- 右侧 详情 -->
-        <template v-slot:content>
+          </div>
+          <!-- 右侧 详情 -->
+          <template v-slot:content>
 
 
-          <div class="right_main">
+            <div class="right_main">
 
-            <div v-if="operationType == 'pick'">
-              <pickDetails ref="pickListRef" @pickAdd="pickAdd"></pickDetails>
-            </div>
+              <div v-if="operationType == 'pick'">
+                <pickDetails ref="pickListRef" @pickAdd="pickAdd"></pickDetails>
+              </div>
 
-            <div v-if="operationType == 'feed'">
-              <!-- 投料 -->
-              <feeding :workListIds="workListIds"></feeding>
-            </div>
+              <div v-if="operationType == 'feed'">
+                <!-- 投料 -->
+                <feeding :workListIds="workListIds"></feeding>
+              </div>
 
-            <div v-if="operationType == 'job'">
-              <!-- // 报工列表 入库 -->
+              <div v-if="operationType == 'job'">
+                <!-- // 报工列表 入库 -->
 
-              <warehousing v-if="taskObj.id == -1" :workListIds="workListIds" ref="wareRef"></warehousing>
+                <warehousing v-if="taskObj.id == -1" :workListIds="workListIds" ref="wareRef"></warehousing>
 
-              <!-- // 设备 入库 -->
+                <!-- // 设备 入库 -->
 
-              <jobBooking v-else :workListIds="workListIds" ref="jobRef"></jobBooking>
+                <jobBooking v-else :workListIds="workListIds" ref="jobRef"></jobBooking>
 
-            </div>
+              </div>
 
 
-            <div v-if="operationType == 'inspection'">
-              55
-            </div>
+              <div v-if="operationType == 'inspection'">
+                55
+              </div>
+
+              <!-- 委外 -->
+              <div v-if="operationType == 'Outsourcing' && isType == '3'" class="right_main_box">
 
-            <!-- 委外 -->
-            <div v-if="operationType == 'Outsourcing' && isType == '3'" class="right_main_box">
+                <outsourcing :outsourceFormVal="outsourceForm" @changePlugIn="changePlugIn" v-if="isStep"></outsourcing>
 
-              <outsourcing :outsourceFormVal="outsourceForm" @changePlugIn="changePlugIn" v-if="isStep"></outsourcing>
+                <!--   -->
+                <outsourceList :outsourceFormVal="outObj" @closeForm="closeForm" v-else></outsourceList>
 
-              <!--   -->
-              <outsourceList :outsourceFormVal="outObj" @closeForm="closeForm" v-else></outsourceList>
+              </div>
 
             </div>
+          </template>
 
-          </div>
-        </template>
+        </ele-split-layout>
+
+        <!-- 1111111 -->
 
+        <!-- <footBtn @footBtn="footBtn"></footBtn> -->
 
-      </ele-split-layout>
 
-      <footBtn @footBtn="footBtn"></footBtn>
+      </div>
+      <!-- <footBtn @footBtn="footBtn"></footBtn> -->
     </div>
 
     <!--领料弹框 -->
@@ -321,9 +327,20 @@ export default {
 </script>
 
 <style>
+.content_box {
+  display: flex;
+}
+
+.content_box_tab {
+  padding: 5px;
+  height: calc(100vh - 100px);
+  background-color: #fff;
+}
 
-.content_box{
-  /* display: flex; */
+.footBtn {
+  position: absolute;
+  bottom: 20px;
+  left: 0;
 }
 
 .new-ele-admin-tabs {