钢坯增加付跨

src/views/billet/Dashboard/components/OnDutySteelRolling.vue

@@ -15,6 +15,7 @@
         <a-tab-pane key="roll_club_three" tab="棒三"><chart key="roll_club_three" :list="onDutySteelData['roll_club_three']" /></a-tab-pane>
         <a-tab-pane key="roll_height" v-if="ccmNo == '6'" tab="高线"><chart key="roll_height" :list="onDutySteelData['roll_height']" /></a-tab-pane>
         <a-tab-pane key="roll_out_shipp" tab="上若"><chart key="roll_out_shipp" :list="onDutySteelData['roll_out_shipp']" /></a-tab-pane>
+        <a-tab-pane key="roll_deputy_cross" tab="付跨"><chart key="roll_deputy_cross" :list="onDutySteelData['roll_deputy_cross']" /></a-tab-pane>
       </a-tabs>
     </a-card>
   </a-spin>
@@ -42,6 +43,7 @@
         roll_club_three: [],
         roll_height: [],
         roll_out_shipp: [],
+        roll_deputy_cross: [],
       }),
     },
   });
@@ -61,6 +63,7 @@
     roll_club_three: [],
     roll_height: [],
     roll_out_shipp: [],
+    roll_deputy_cross: [],
   });
 
   const jumpUrl = {
@@ -80,7 +83,7 @@
       loading.value = true;
       const res = await getOnDutySteel({ ccmNo: props.ccmNo, changeShiftId: props.duty?.id });
 
-      const { rollClubOneList, rollClubTwoList, rollClubThreeList, rollHeightList, rollOutShippList } = res;
+      const { rollClubOneList, rollClubTwoList, rollClubThreeList, rollHeightList, rollOutShippList, rollDeputyCrossList } = res;
 
       if (rollClubOneList) {
         onDutySteelData.value.roll_club_one = rollClubOneList.map((item: any) => ({
@@ -121,6 +124,14 @@
           weight: item.totalBlankOutput,
         }));
       }
+
+      if (rollDeputyCrossList) {
+        onDutySteelData.value.roll_deputy_cross = rollDeputyCrossList.map((item: any) => ({
+          size: item.size,
+          nums: item.amountTotal,
+          weight: item.totalBlankOutput,
+        }));
+      }
     } catch (error) {
       console.error('getOnDutySteel error: ', error);
     } finally {

src/views/billet/carBoard/components/detailModal.vue

@@ -8,7 +8,7 @@
               <a-table
                 :dataSource="dataSource['one']"
                 :columns="columnsOne"
-                :scroll="{y: 600}"
+                :scroll="{ y: 600 }"
                 :pagination="{
                   total: dataSource['one'].length,
                   showTotal: (total) => `共 ${total} 条数据`,
@@ -19,7 +19,7 @@
               <a-table
                 :dataSource="dataSource['two']"
                 :columns="columnsOne"
-                :scroll="{y: 600}"
+                :scroll="{ y: 600 }"
                 :pagination="{
                   total: dataSource['two'].length,
                   showTotal: (total) => `共 ${total} 条数据`,
@@ -30,7 +30,7 @@
               <a-table
                 :dataSource="dataSource['three']"
                 :columns="columnsOne"
-                :scroll="{y: 600}"
+                :scroll="{ y: 600 }"
                 :pagination="{
                   total: dataSource['three'].length,
                   showTotal: (total) => `共 ${total} 条数据`,
@@ -41,7 +41,7 @@
               <a-table
                 :dataSource="dataSource['outShip']"
                 :columns="columnsOne"
-                :scroll="{y: 600}"
+                :scroll="{ y: 600 }"
                 :pagination="{
                   total: dataSource['outShip'].length,
                   showTotal: (total) => `共 ${total} 条数据`,
@@ -52,7 +52,7 @@
               <a-table
                 :dataSource="dataSource['height']"
                 :columns="columnsOne"
-                :scroll="{y: 600}"
+                :scroll="{ y: 600 }"
                 :pagination="{
                   total: dataSource['height'].length,
                   showTotal: (total) => `共 ${total} 条数据`,
@@ -64,13 +64,24 @@
             <a-table
               :dataSource="dataSource['stackingUp']"
               :columns="columnsOne"
-              :scroll="{y: 600}"
+              :scroll="{ y: 600 }"
               :pagination="{
                 total: dataSource['stackingUp'].length,
                 showTotal: (total) => `共 ${total} 条数据`,
               }"
             />
           </a-tab-pane>
+          <a-tab-pane key="cross" tab="付跨" v-if="dtlType === 'all' || dtlType === 'hotCharge'">
+            <a-table
+              :dataSource="dataSource['cross']"
+              :columns="columnsOne"
+              :scroll="{ y: 600 }"
+              :pagination="{
+                total: dataSource['cross '].length,
+                showTotal: (total) => `共 ${total} 条数据`,
+              }"
+            />
+          </a-tab-pane>
         </a-tabs>
       </div>
     </a-spin>
@@ -92,6 +103,7 @@
     outShip: [],
     height: [],
     stackingUp: [],
+    cross: [],
   });
   const dtlType = ref('all');
   const ccmNo = ref(5);
@@ -130,6 +142,7 @@
         rollOutShippDetailsList,
         rollHeightDetails,
         stackingUpLogList,
+        rollDeputyCrossDetailsList,
       } = result;
 
       dataSource.value = {
@@ -139,6 +152,7 @@
         outShip: (rollOutShippDetailsList || []).filter((item) => (dtlType.value === 'hotCharge' ? !item.stackAddr : true)),
         height: rollHeightDetails || [],
         stackingUp: stackingUpLogList || [],
+        cross: rollDeputyCrossDetailsList || [],
       };
     } catch (error) {
       console.log(error);

src/views/billet/operator/components/headTop.vue

@@ -129,7 +129,7 @@
           (JSON.parse(infoRes.standNoSize) || []).forEach((item) => {
             standObj[item.strandNo] = item.length;
           });
-          emits('lengthChange', JSON.stringify(standObj));
+          emits('lengthChange', JSON.stringify(standObj), infoRes.cutToLength);
         } catch (error) {
           console.log(error);
         }

src/views/billet/operator/components/heatList.vue

@@ -16,10 +16,12 @@
             />
           </template>
         </div>
-        <div style="margin-right: 6px; display: none">
-          <a-button type="primary" danger style="font-size: 16px" @click="handlerChangeLength"> 变更定尺 </a-button>
-        </div>
         <div style="margin-right: 6px">
+          <a-button type="primary" danger style="font-size: 16px" @click="handlerChangeLength">
+            切换{{ cuttolengthStatus == 2 ? '手动定尺' : '自动定尺' }}
+          </a-button>
+        </div>
+        <div style="margin-right: 6px; display: none">
           <span style="font-size: 16px; color: #f50">短尺：</span>
           <a-select style="width: 120px" :options="shortSizeOptions" @change="changeShortLength" />
         </div>
@@ -223,6 +225,11 @@
         shiftGroup: '',
       }),
     },
+    cuttolength: {
+      // 1 手动定尺 2 自动定尺
+      type: Number,
+      default: 2,
+    },
   });
 
   const otherShiftTableData = ref<any[]>([]);
@@ -237,6 +244,7 @@
   const orgSizeNum = ref<number>(); // 原定尺
   const isAllHeat = ref<boolean>(false); // 是否是整炉添加
   const isRollOne = ref<string>('default'); // 是否是去棒一，不是整炉添加时有效
+  const cuttolengthStatus = ref<string | number>(props.cuttolength); // 1 手动定尺 2  自动定尺
   const columns = getColumns({
     clickCb: ({ record, size, strandNo }) => {
       newSizeNum.value = size;
@@ -822,6 +830,7 @@
       onOk: () => {
         const params = {
           ccmNo: props.ccmNo,
+          cutToLength: cuttolengthStatus.value == 2 ? 1 : 2,
           strandNoSizeList: Object.keys(record)
             .filter((ele) => record[ele])
             .map((item) => ({

src/views/billet/operator/components/printBilletSampleCard.vue

@@ -1,5 +1,5 @@
 <template>
-  <BasicModal v-bind="$attrs" @register="registerModal" destroyOnClose title="打印钢坯送样卡" :width="800" :height="930" ok-text="打印" @ok="onPrint">
+  <BasicModal v-bind="$attrs" @register="registerModal" destroyOnClose title="钢坯送样卡" :width="800" :height="930" ok-text="打印" @ok="onPrint">
     <section
       ref="print"
       style="padding: 10px 10px 0; position: relative; border: 1px solid #c5c5c5; background: #fff; width: 98%"
@@ -116,11 +116,11 @@
         <a-descriptions style="padding: 0" size="small" :column="6">
           <a-descriptions-item label="备注" :span="1">
             <div class="size-items-remark flex">
-              <div class="size-remark-item" v-for="(ele, size) in sizeObjs">
+              <!-- <div class="size-remark-item" v-for="(ele, size) in sizeObjs">
                 <span class="size-remark-size">{{ Number(size) / 1000 }} m:</span>
                 <span class="size-remark-num">{{ ele.num }}</span>
                 <span>{{ ele.weight.toFixed(3) }}t</span>
-              </div>
+              </div> -->
             </div>
           </a-descriptions-item>
         </a-descriptions>
@@ -210,7 +210,6 @@
         });
 
         sizeList = [...new Set(sizeList)];
-        console.log('111111111111111111', sizeObj);
         sizeArrs.value = sizeList;
         heatList.value = res;
         sizeObjs.value = sizeObj;
@@ -233,6 +232,8 @@
 </script>
 <style scoped lang="less">
   .ticket {
+    max-width: 900px;
+
     .ccmno-info {
       font-family: 'Kingsoft_Cloud_Font';
     }
@@ -300,7 +301,7 @@
       flex-direction: column;
       justify-content: center;
       align-items: flex-end;
-      padding-right: 20px;
+      padding-right: 6px;
     }
 
     .s-txt {

src/views/billet/operator/index.vue

@@ -9,7 +9,7 @@
     <a-layout class="operator-large-layout">
       <a-layout-header class="operator-header cover">
         <div class="change-shift print-billet-card">
-          <a-button type="primary" size="large" @click="() => openModal(true, { ccmNo, queryType: '1', shiftText })"> 打印钢坯送样卡 </a-button>
+          <a-button type="primary" size="large" @click="() => openModal(true, { ccmNo, queryType: '1', shiftText })"> 钢坯送样卡 </a-button>
         </div>
         <div class="shift-wrapper"> {{ shiftText }} </div>
         <div class="change-shift">
@@ -22,7 +22,7 @@
         </div>
       </a-layout-header>
       <a-layout-content class="operator-content">
-        <head-top @onShiftChange="curShiftChange" ref="headTopRef" @lengthChange="(v) => (lengthList = v)" />
+        <head-top @onShiftChange="curShiftChange" ref="headTopRef" @lengthChange="(v, auto) => ((lengthList = v), (cuttolength = auto))" />
         <div class="operator-content-wrapper flex">
           <div class="operator-content-left">
             <heat-list
@@ -31,6 +31,7 @@
               :ccmNo="ccmNo"
               :carRef="carRef"
               :lengthList="lengthList"
+              :cuttolength="cuttolength"
               @changeLengthSuccess="() => headTopRef && headTopRef.reload()"
               :curShiftInfo="curShiftInfo"
             />
@@ -106,6 +107,7 @@
   });
 
   const lengthList = ref('');
+  const cuttolength = ref(2); // 1 手动定尺， 2 自动定尺
 
   const clock = () => {
     try {
@@ -153,7 +155,7 @@
           headTopRef && headTopRef.value.reload();
           carRef && carRef.value.refreshCarList();
           heatListRef && heatListRef.value.reload();
-          
+
           openJiaobanModal.value = false;
         });
       },