Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-mes into dev

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

@@ -42,6 +42,8 @@
             <div class="c_title"> 工单编号: {{ item.code }} </div>
           </template>
 
+
+
           <template v-slot:empty>
             <div class="empty">暂无领料数据</div>
           </template>
@@ -50,6 +52,12 @@
             {{ $index }} <el-tag>{{ row.rootCategoryLevelName }}</el-tag>
           </template>
 
+          
+          <template v-slot:warehouseLeaderName="{ row }">
+           <span style="color: #faad14"> {{ row.warehouseLeaderName }} </span>
+          </template>
+
+
           <template v-slot:demandQuantity="{ row }">
             {{ row.demandQuantity }} {{ row.unit }}
           </template>
@@ -94,7 +102,9 @@
           {
             prop: 'categoryName',
             label: '名称',
-            align: 'center'
+            align: 'center',
+            minWidth: 150,
+            showOverflowTooltip: true
           },
 
           {
@@ -112,6 +122,7 @@
 
           {
             prop: 'warehouseLeaderName',
+            slot: 'warehouseLeaderName',
             label: '审核人',
             align: 'center'
           },