55

src/views/pick/pickApply/index.vue

@@ -22,6 +22,13 @@
             >自建领料单</el-button
           >
         </template>
+         
+        <template v-slot:joinWorkOrderCode="{ row }">
+          <el-tag type="warning" v-if="row.type == 1" >自建领料单</el-tag>
+          <div v-else>{{ row.joinWorkOrderCode}}</div>
+
+        </template>
+
         <template v-slot:status="{ row }">
           <el-tag
             :type="
@@ -100,6 +107,7 @@
 
           {
             prop: 'joinWorkOrderCode',
+            slot: 'joinWorkOrderCode',
             label: '关联工单编号',
             align: 'center'
           },

src/views/produce/components/picking/detailed.vue

@@ -28,7 +28,6 @@
       </div>
 
       <div v-for="(item, index) in dataObj.orderInfoList" :key="index">
-        
         <ele-pro-table
           ref="table"
           :columns="columns"
@@ -37,7 +36,7 @@
           cache-key="detailed"
           highlight-current-row
           :need-page="false"
-              v-if="item.bomDetailDTOS.length > 0 || item.instanceList.length > 0"
+          v-if="item.bomDetailDTOS.length > 0 || item.instanceList.length > 0"
         >
           <template v-slot:toolbar>
             <div class="c_title"> 工单编号: {{ item.code }} </div>
@@ -54,19 +53,14 @@
           <template v-slot:demandQuantity="{ row }">
             {{ row.demandQuantity }} {{ row.unit }}
           </template>
-
-
         </ele-pro-table>
       </div>
     </el-dialog>
-
-
   </div>
 </template>
 <script>
-
   export default {
-    components: { },
+    components: {},
     props: {
       detailedObj: {}
     },
@@ -94,37 +88,32 @@
           {
             prop: 'categoryCode',
             label: '编码',
-            align: 'center',
- 
+            align: 'center'
           },
 
           {
             prop: 'categoryName',
             label: '名称',
-            align: 'center',
-     
+            align: 'center'
           },
 
           {
             prop: 'demandQuantity',
             label: '数量',
             align: 'center',
-            slot: 'demandQuantity',
-  
+            slot: 'demandQuantity'
           },
 
           {
             prop: 'warehouseName',
             label: '领料仓库',
-            align: 'center',
-   
+            align: 'center'
           },
 
           {
             prop: 'warehouseLeaderName',
             label: '审核人',
-            align: 'center',
-  
+            align: 'center'
           },
 
           {
@@ -142,7 +131,6 @@
             label: '规格',
             align: 'center'
           }
-      
         ];
       },
 
@@ -175,9 +163,7 @@
 </script>
 
 <style lang="scss" scoped>
-
-
-.tableZ_box {
+  .tableZ_box {
     border: 1px solid #e3e5e5;
     margin: 6px 0;
 
@@ -229,8 +215,8 @@
     }
   }
 
-  .tag_box{
-    span{
+  .tag_box {
+    span {
       display: inline-block;
       padding: 2px 4px;
       background: #e6f7ff;