695593266@qq.com 11 месяцев назад
Родитель
Сommit
d1803abe18

+ 5 - 0
src/views/produce/components/feeding/details.vue

@@ -8,6 +8,11 @@
             <div class="time">投料时间:{{ item.executorTime }} </div>
           </div>
 
+          <div class="item_box rx-bc">
+            <div class="time">报工人 {{ item.executorName }}</div>
+          </div>
+
+
           <div class="item_box rx-bc">
             <div class="time">工序名称: {{ item.taskName }}</div>
           </div>

+ 7 - 1
src/views/produce/components/jobBooking/details.vue

@@ -11,6 +11,12 @@
             </div>
           </div>
 
+          <div class="item_box rx-bc">
+            <div class="time"
+              >报工人:{{ objData.workReportInfo.executorName }}
+            </div>
+          </div>
+
           <div class="item_box rx-bc">
             <div class="time"
               >工序名称:
@@ -177,7 +183,7 @@
       <div class="card_box" v-for="(objData, index) in list" :key="index">
         <div class="rx-bc title_card">
           <div>{{ index + 1 }}</div>
-          <div>报工时间: {{ objData.createTime }}</div>
+          <div>报工时间: </div>
         </div>
 
         <workOrderBom2

+ 11 - 1
src/views/produce/components/new_produceOrder.vue

@@ -44,6 +44,10 @@
         >
       </template>
 
+      <template v-slot:productUnitWeight="{ row }">
+        <span> {{ row.productUnitWeight }}{{ row.weightUnit }}</span>
+      </template>
+
       <template v-slot:taskName="{ row }">
         <span> {{ row.taskName }}</span>
       </template>
@@ -183,7 +187,13 @@
             align: 'center',
             showOverflowTooltip: true
           },
-
+          {
+            prop: 'productUnitWeight',
+            slot: 'productUnitWeight',
+            label: '单重',
+            align: 'center',
+            showOverflowTooltip: true
+          },
           {
             prop: 'priority',
             label: '优先级',