zhangafei 15 цаг өмнө
parent
commit
8278c1ab51

+ 28 - 6
src/views/billet/hotDelivery/common.data.ts

@@ -98,6 +98,20 @@ export const configAll5 = [
     remark: null,
     belongTable: 'stacking_and_loading_vehicles',
   },
+  {
+    id: '17',
+    createBy: 'admin',
+    createTime: '2025-06-05 08:56:03',
+    updateBy: null,
+    updateTime: null,
+    sysOrgCode: null,
+    castMachine: '5',
+    typeName: '付跨',
+    belongType: 0,
+    isTrucking: 1,
+    remark: null,
+    belongTable: 'roll_deputy_cross',
+  },
   {
     id: '2',
     createBy: 'admin',
@@ -111,7 +125,6 @@ export const configAll5 = [
     isTrucking: 1,
     remark: null,
     belongTable: 'roll_club_two',
-    color: '#f50',
   },
   {
     id: '3',
@@ -126,7 +139,6 @@ export const configAll5 = [
     isTrucking: 1,
     remark: null,
     belongTable: 'roll_club_three',
-    color: '#87d068',
   },
   {
     id: '5',
@@ -141,7 +153,6 @@ export const configAll5 = [
     isTrucking: 1,
     remark: null,
     belongTable: 'roll_out_shipp',
-    color: '#c41d7f',
   },
 ];
 // 六号机所有目的地、堆垛配置信息
@@ -159,7 +170,6 @@ export const configAll6 = [
     isTrucking: 1,
     remark: null,
     belongTable: 'roll_club_two',
-    color: '#f50',
   },
   {
     id: '14',
@@ -174,7 +184,6 @@ export const configAll6 = [
     isTrucking: 1,
     remark: null,
     belongTable: 'roll_club_three',
-    color: '#87d068',
   },
   {
     id: '15',
@@ -203,7 +212,20 @@ export const configAll6 = [
     isTrucking: 1,
     remark: null,
     belongTable: 'roll_out_shipp',
-    color: '#c41d7f',
+  },
+  {
+    id: '18',
+    createBy: 'admin',
+    createTime: '2025-06-05 08:56:03',
+    updateBy: null,
+    updateTime: null,
+    sysOrgCode: null,
+    castMachine: '6',
+    typeName: '付跨',
+    belongType: 0,
+    isTrucking: 1,
+    remark: null,
+    belongTable: 'roll_deputy_cross',
   },
   {
     id: '6',

+ 19 - 0
src/views/billet/operator/components/heatList.vue

@@ -19,6 +19,11 @@
         <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-select style="width: 120px" @change="changeShortLength">
+            <a-select-option value="短尺">短尺</a-select-option>
+          </a-select>
+        </div>
         <div style="margin-right: 6px">
           <a-button
             type="primary"
@@ -155,6 +160,7 @@
     changeStrandLength,
     addBilletBasic,
     addHeatBillet,
+    queryChangeShortLength,
   } from '../operator.api';
   import { h, onMounted, onUnmounted, ref, watch } from 'vue';
   import { mapTableTotalSummary } from '/@/utils/common/compUtils';
@@ -797,6 +803,19 @@
     });
   };
 
+  const changeShortLength = (v) => {
+    createConfirm({
+      title: '变更短尺确认',
+      iconType: 'warning',
+      onOk: () => {
+        return queryChangeShortLength({
+          ccmNo: props.ccmNo,
+          length: '短尺',
+        });
+      },
+    });
+  };
+
   /**
    * 操作栏
    */

+ 3 - 3
src/views/billet/operator/components/printCarInfo.vue

@@ -30,9 +30,9 @@
       </div>
       <a-descriptions layout="vertical" bordered :column="8" size="small">
         <a-descriptions-item label="序号">
-          <div style="min-height: 80px; display: flex; align-items: center; justify-content: center"
-            ><span>{{ info.carAllNum }}</span></div
-          >
+          <div style="min-height: 80px; display: flex; align-items: center; justify-content: center">
+            <span>{{ info.carAllNum }}</span>
+          </div>
         </a-descriptions-item>
         <a-descriptions-item label="车号">
           <!-- {{ info.licensePlate }} -->

+ 7 - 0
src/views/billet/operator/operator.api.ts

@@ -21,6 +21,8 @@ enum Api {
   addBilletBasic = '/actualControl/billetActual/addBilletBasic',
   // 整炉增加钢坯
   addHeatBillet = '/billetHotsendBase/billetHotsendBase/addBilletBasic',
+  // 变更短尺
+  pushCcmNoSize = '/billetHotsendBase/billetHotsendBase/pushCcmNoSize',
 }
 
 // 炉次信息
@@ -72,3 +74,8 @@ export const addBilletBasic = (params: any) => {
 export const addHeatBillet = (params: any) => {
   return defHttp.post({ url: Api.addHeatBillet, params });
 };
+
+// 变更短尺
+export const queryChangeShortLength = (params: any) => {
+  return defHttp.post({ url: Api.pushCcmNoSize, params });
+};

+ 2 - 2
src/views/billet/shippingBill/components/editForm.vue

@@ -17,12 +17,12 @@
       <a-row :gutter="24">
         <a-col :span="12">
           <a-form-item label="班组">
-            <JSearchSelect type="list" v-model:value="model.shiftGroup" dict="lg_bz" placeholder="请选择" allowClear />
+            <JSearchSelect type="list" v-model:value="model.shiftGroup" disabled dict="lg_bz" placeholder="请选择" allowClear />
           </a-form-item>
         </a-col>
         <a-col :span="12">
           <a-form-item label="班别">
-            <JSearchSelect type="list" v-model:value="model.shift" dict="lg_bb" placeholder="请选择" allowClear />
+            <JSearchSelect type="list" v-model:value="model.shift" disabled dict="lg_bb" placeholder="请选择" allowClear />
           </a-form-item>
         </a-col>
       </a-row>