ysy 1 yıl önce
ebeveyn
işleme
c0c8eb8c94

+ 1 - 0
src/views/produce/components/feeding/components/instanceBom.vue

@@ -86,6 +86,7 @@
                 v-model="item.deviceId"
                 placeholder="请选择"
                 @change="(e) => selectVal(e, item, index)"
+                   size="mini"
               >
                 <el-option
                   v-for="item in deviceList"

+ 1 - 0
src/views/produce/components/feeding/components/semiProductBom.vue

@@ -88,6 +88,7 @@
                   v-model="item.deviceId"
                   placeholder="请选择"
                   @change="(e) => selectVal(e, item, index)"
+                  size="mini"
                 >
                   <el-option
                     v-for="item in deviceList"

+ 10 - 1
src/views/produce/components/picking/index.vue

@@ -69,14 +69,23 @@
             tooltip-effect="dark"
             style="width: 100%"
             stripe
+            border
           >
-            <el-table-column label="序号" type="index" width="120">
+            <el-table-column label="序号" type="index" width="60">
               <template slot-scope="{ row, $index }">
                 {{ $index }}
+              </template>
+            </el-table-column>
+
+            <el-table-column label="类型"  prop="rootCategoryLevelId"  width="80">
+              <template slot-scope="{ row, $index }">
                 <el-tag>{{ typeName[Number(row.rootCategoryLevelId)] }}</el-tag>
               </template>
             </el-table-column>
 
+
+       
+
             <el-table-column label="编码" prop="assetCode">
               <template slot-scope="{ row, $index }">
                 <span

+ 34 - 23
src/views/produce/index.vue

@@ -3,8 +3,23 @@
     <div class="content_box">
       <Search></Search>
 
-      <div class="main">
-        <div class="left_main">
+      <ele-split-layout
+        space="0px"
+          width="45%"
+        :resizable="true"
+        :min-size="300"
+        :max-size="-300"
+        :left-style="{
+          background: 'rgba(185, 182, 229, .4)',
+          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"></produceOrder>
           </div>
@@ -12,29 +27,25 @@
             <productionResource></productionResource>
           </div>
         </div>
-        <div class="right_main">
-          <div v-if="operationType == 'pick'">
-            <pickDetails ref="pickListRef"></pickDetails>
+        <template v-slot:content>
+          <div class="right_main">
+            <div v-if="operationType == 'pick'">
+              <pickDetails ref="pickListRef"></pickDetails>
+            </div>
+  
+            <div v-if="operationType == 'feed'">
+              <feeding :workListIds="workListIds"></feeding>
+            </div>
+  
+            <div v-if="operationType == 'job'">
+              <jobBooking :workListIds="workListIds" ref="jobRef"></jobBooking>
+            </div>
           </div>
+        </template>
+      </ele-split-layout>
 
-          <div v-if="operationType == 'feed'">
-            <feeding :workListIds="workListIds"></feeding>
-          </div>
-
-          <div v-if="operationType == 'job'">
-            <jobBooking :workListIds="workListIds" ref="jobRef"></jobBooking>
-          </div>
-        </div>
-      </div>
       <footBtn @footBtn="footBtn"></footBtn>
     </div>
-
-    <!--领料弹框 -->
-    <picking
-      v-if="pickingShow"
-      @close="pickingClose"
-      :workListIds="workListIds"
-    ></picking>
   </div>
 </template>
 
@@ -238,11 +249,11 @@
   }
 
   .left_main {
+    width: 100%;
     height: 100%;
     display: flex;
     flex-direction: column;
     justify-content: space-around;
-    width: 49.4%;
     min-width: 640px;
 
     .top {
@@ -259,7 +270,7 @@
   }
 
   .right_main {
-    width: 49.4%;
+
     min-width: 640px;
     height: calc((100vh - 70px - 50px - 80px - 12px));
     margin-top: 6px;