增加车辆储运配置

.env

@@ -1,5 +1,5 @@
 # port
-VITE_PORT = 3100
+VITE_PORT = 3102
 
 #  网站标题
 VITE_GLOB_APP_TITLE =  钢坯数字化管控平台

.env.development

@@ -6,13 +6,13 @@ VITE_PUBLIC_PATH = /
 
 # 跨域代理，您可以配置多个 ,请注意，没有换行符
 # VITE_PROXY = [["/jeecgboot","http://192.168.0.105:9999"],["/upload","http://localhost:3300/upload"]]
-VITE_PROXY = [["/jeecgboot","http://192.168.1.6:9999"],["/upload","http://localhost:3300/upload"]]
+VITE_PROXY = [["/jeecgboot","http://192.168.1.8:9999"],["/upload","http://localhost:3300/upload"]]
 
 #后台接口全路径地址(必填)
 # VITE_GLOB_DOMAIN_URL=http://localhost:9999
 # VITE_GLOB_DOMAIN_URL=http://192.168.0.105:8080/jeecg-boot
 # VITE_GLOB_DOMAIN_URL=http://192.168.6.24:8080/jeecg-boot
-VITE_GLOB_DOMAIN_URL=http://192.168.1.6:9999
+VITE_GLOB_DOMAIN_URL=http://192.168.1.8:9999
 
 
 

src/views/billet/CarUnit/CarUnit.api.ts

@@ -0,0 +1,64 @@
+import {defHttp} from '/@/utils/http/axios';
+import { useMessage } from "/@/hooks/web/useMessage";
+
+const { createConfirm } = useMessage();
+
+enum Api {
+  list = '/carUnit/carUnit/list',
+  save='/carUnit/carUnit/add',
+  edit='/carUnit/carUnit/edit',
+  deleteOne = '/carUnit/carUnit/delete',
+  deleteBatch = '/carUnit/carUnit/deleteBatch',
+  importExcel = '/carUnit/carUnit/importExcel',
+  exportXls = '/carUnit/carUnit/exportXls',
+}
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) =>
+  defHttp.get({url: Api.list, params});
+
+/**
+ * 删除单个
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+/**
+ * 批量删除
+ * @param params
+ */
+export const batchDelete = (params, handleSuccess) => {
+  createConfirm({
+    iconType: 'warning',
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+/**
+ * 保存或者更新
+ * @param params
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({url: url, params});
+}

src/views/billet/CarUnit/CarUnit.data.ts

@@ -0,0 +1,91 @@
+import { BasicColumn } from '/@/components/Table';
+import { FormSchema } from '/@/components/Table';
+// import { rules } from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+//列表数据
+export const columns: BasicColumn[] = [
+  {
+    title: '单位',
+    align: 'center',
+    dataIndex: 'unit',
+    customRender(opt) {
+      return render.renderDict(opt.record.unit, 'car_unit_type');
+    },
+  },
+  {
+    title: '车牌号',
+    align: 'center',
+    dataIndex: 'carNumer',
+  },
+  {
+    title: '是否启用',
+    align: 'center',
+    dataIndex: 'status',
+    customRender(opt) {
+      return render.renderTag(render.renderDict(opt.record.status, 'isEnable'), opt.record.status === 'true' ? 'red' : 'green');
+    },
+  },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+  {
+    label: '单位',
+    field: 'unit',
+    component: 'JDictSelectTag',
+    componentProps: {
+      dictCode: 'car_unit_type',
+    },
+  },
+  {
+    label: '车牌号',
+    field: 'carNumer',
+    component: 'JDictSelectTag',
+    componentProps: {
+      dictCode: 'lg_car',
+    },
+  },
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '单位',
+    field: 'unit',
+    component: 'JDictSelectTag',
+    componentProps: {
+      dictCode: 'car_unit_type',
+    },
+  },
+  {
+    label: '车牌号',
+    field: 'carNumer',
+    component: 'JSearchSelect',
+    componentProps: {
+      dict: 'lg_car',
+    },
+  },
+  {
+    label: '是否启用',
+    field: 'status',
+    component: 'JDictSelectTag',
+    componentProps: {
+      type: 'radio',
+      dictCode: 'isEnable',
+    },
+  },
+  // TODO 主键隐藏字段，目前写死为ID
+  {
+    label: '',
+    field: 'id',
+    component: 'Input',
+    show: false,
+  },
+];
+
+/**
+ * 流程表单调用这个方法获取formSchema
+ * @param param
+ */
+export function getBpmFormSchema(_formData): FormSchema[] {
+  // 默认和原始表单保持一致 如果流程中配置了权限数据，这里需要单独处理formSchema
+  return formSchema;
+}

src/views/billet/CarUnit/CarUnitList.vue

@@ -0,0 +1,161 @@
+<template>
+  <div>
+    <!--引用表格-->
+    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+      <!--插槽:table标题-->
+      <template #tableTitle>
+        <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+        <!-- <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button> -->
+        <!-- <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button> -->
+        <a-dropdown v-if="selectedRowKeys.length > 0">
+          <template #overlay>
+            <a-menu>
+              <a-menu-item key="1" @click="batchHandleDelete">
+                <Icon icon="ant-design:delete-outlined"></Icon>
+                删除
+              </a-menu-item>
+            </a-menu>
+          </template>
+          <a-button>
+            批量操作
+            <Icon icon="mdi:chevron-down"></Icon>
+          </a-button>
+        </a-dropdown>
+      </template>
+      <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
+      </template>
+      <!--字段回显插槽-->
+      <template v-slot:bodyCell="{ column, record, index, text }"> </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <CarUnitModal @register="registerModal" @success="handleSuccess"></CarUnitModal>
+  </div>
+</template>
+
+<script lang="ts" name="carUnit-carUnit" setup>
+  import { ref, computed, unref } from 'vue';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { useModal } from '/@/components/Modal';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import CarUnitModal from './components/CarUnitModal.vue';
+  import { columns, searchFormSchema } from './CarUnit.data';
+  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './CarUnit.api';
+  import { downloadFile } from '/@/utils/common/renderUtils';
+  import { useUserStore } from '/@/store/modules/user';
+  const checkedKeys = ref<Array<string | number>>([]);
+  const userStore = useUserStore();
+  //注册model
+  const [registerModal, { openModal }] = useModal();
+  //注册table数据
+  const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+    tableProps: {
+      title: '车辆单位管理',
+      api: list,
+      columns,
+      canResize: false,
+      formConfig: {
+        //labelWidth: 120,
+        schemas: searchFormSchema,
+        autoSubmitOnEnter: true,
+        showAdvancedButton: true,
+        fieldMapToNumber: [],
+        fieldMapToTime: [],
+      },
+      actionColumn: {
+        width: 150,
+        fixed: 'right',
+      },
+    },
+    exportConfig: {
+      name: '车辆单位管理',
+      url: getExportUrl,
+    },
+    importConfig: {
+      url: getImportUrl,
+      success: handleSuccess,
+    },
+  });
+
+  const [registerTable, { reload }, { rowSelection, selectedRowKeys }] = tableContext;
+
+  /**
+   * 新增事件
+   */
+  function handleAdd() {
+    openModal(true, {
+      isUpdate: false,
+      showFooter: true,
+    });
+  }
+  /**
+   * 编辑事件
+   */
+  function handleEdit(record: Recordable) {
+    openModal(true, {
+      record,
+      isUpdate: true,
+      showFooter: true,
+    });
+  }
+  /**
+   * 详情
+   */
+  function handleDetail(record: Recordable) {
+    openModal(true, {
+      record,
+      isUpdate: true,
+      showFooter: false,
+    });
+  }
+  /**
+   * 删除事件
+   */
+  async function handleDelete(record) {
+    await deleteOne({ id: record.id }, handleSuccess);
+  }
+  /**
+   * 批量删除事件
+   */
+  async function batchHandleDelete() {
+    await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
+  }
+  /**
+   * 成功回调
+   */
+  function handleSuccess() {
+    (selectedRowKeys.value = []) && reload();
+  }
+  /**
+   * 操作栏
+   */
+  function getTableAction(record) {
+    return [
+      {
+        label: '编辑',
+        onClick: handleEdit.bind(null, record),
+      },
+    ];
+  }
+  /**
+   * 下拉操作栏
+   */
+  function getDropDownAction(record) {
+    return [
+      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      },
+      {
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+        },
+      },
+    ];
+  }
+</script>
+
+<style scoped></style>

src/views/billet/CarUnit/CarUnit_menu_insert.sql

@@ -0,0 +1,26 @@
+-- 注意：该页面对应的前台目录为views/carUnit文件夹下
+-- 如果你想更改到其他目录，请修改sql中component字段对应的值
+
+
+INSERT INTO sys_permission(id, parent_id, name, url, component, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_route, is_leaf, keep_alive, hidden, hide_tab, description, status, del_flag, rule_flag, create_by, create_time, update_by, update_time, internal_or_external) 
+VALUES ('2025041901107740150', NULL, '车辆单位管理', '/carUnit/carUnitList', 'carUnit/CarUnitList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 0, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2025-04-19 13:10:15', NULL, NULL, 0);
+
+-- 权限控制sql
+-- 新增
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2025041901107740151', '2025041901107740150', '添加车辆单位管理', NULL, NULL, 0, NULL, NULL, 2, 'carUnit:car_unit:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-04-19 13:10:15', NULL, NULL, 0, 0, '1', 0);
+-- 编辑
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2025041901107740152', '2025041901107740150', '编辑车辆单位管理', NULL, NULL, 0, NULL, NULL, 2, 'carUnit:car_unit:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-04-19 13:10:15', NULL, NULL, 0, 0, '1', 0);
+-- 删除
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2025041901107740153', '2025041901107740150', '删除车辆单位管理', NULL, NULL, 0, NULL, NULL, 2, 'carUnit:car_unit:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-04-19 13:10:15', NULL, NULL, 0, 0, '1', 0);
+-- 批量删除
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2025041901107740154', '2025041901107740150', '批量删除车辆单位管理', NULL, NULL, 0, NULL, NULL, 2, 'carUnit:car_unit:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-04-19 13:10:15', NULL, NULL, 0, 0, '1', 0);
+-- 导出excel
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2025041901107740155', '2025041901107740150', '导出excel_车辆单位管理', NULL, NULL, 0, NULL, NULL, 2, 'carUnit:car_unit:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-04-19 13:10:15', NULL, NULL, 0, 0, '1', 0);
+-- 导入excel
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2025041901107740156', '2025041901107740150', '导入excel_车辆单位管理', NULL, NULL, 0, NULL, NULL, 2, 'carUnit:car_unit:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-04-19 13:10:15', NULL, NULL, 0, 0, '1', 0);

src/views/billet/CarUnit/components/CarUnitForm.vue

@@ -0,0 +1,70 @@
+<template>
+    <div style="min-height: 400px">
+        <BasicForm @register="registerForm"></BasicForm>
+        <div style="width: 100%;text-align: center" v-if="!formDisabled">
+            <a-button @click="submitForm" pre-icon="ant-design:check" type="primary">提 交</a-button>
+        </div>
+    </div>
+</template>
+
+<script lang="ts">
+    import {BasicForm, useForm} from '/@/components/Form/index';
+    import {computed, defineComponent} from 'vue';
+    import {defHttp} from '/@/utils/http/axios';
+    import { propTypes } from '/@/utils/propTypes';
+    import {getBpmFormSchema} from '../CarUnit.data';
+    import {saveOrUpdate} from '../CarUnit.api';
+    
+    export default defineComponent({
+        name: "CarUnitForm",
+        components:{
+            BasicForm
+        },
+        props:{
+            formData: propTypes.object.def({}),
+            formBpm: propTypes.bool.def(true),
+        },
+        setup(props){
+            const [registerForm, { setFieldsValue, setProps, getFieldsValue }] = useForm({
+                labelWidth: 150,
+                schemas: getBpmFormSchema(props.formData),
+                showActionButtonGroup: false,
+                baseColProps: {span: 24}
+            });
+
+            const formDisabled = computed(()=>{
+                if(props.formData.disabled === false){
+                    return false;
+                }
+                return true;
+            });
+
+            let formData = {};
+            const queryByIdUrl = '/carUnit/carUnit/queryById';
+            async function initFormData(){
+                let params = {id: props.formData.dataId};
+                const data = await defHttp.get({url: queryByIdUrl, params});
+                formData = {...data}
+                //设置表单的值
+                await setFieldsValue(formData);
+                //默认是禁用
+                await setProps({disabled: formDisabled.value})
+            }
+
+            async function submitForm() {
+                let data = getFieldsValue();
+                let params = Object.assign({}, formData, data);
+                console.log('表单数据', params)
+                await saveOrUpdate(params, true)
+            }
+
+            initFormData();
+            
+            return {
+                registerForm,
+                formDisabled,
+                submitForm,
+            }
+        }
+    });
+</script>

src/views/billet/CarUnit/components/CarUnitModal.vue

@@ -0,0 +1,75 @@
+<template>
+  <BasicModal
+    v-bind="$attrs"
+    @register="registerModal"
+    destroyOnClose
+    :title="title"
+    :bodyStyle="{ padding: '30px 0 0' }"
+    :width="800"
+    :height="400"
+    @ok="handleSubmit"
+  >
+    <BasicForm @register="registerForm" />
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, computed, unref } from 'vue';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import { BasicForm, useForm } from '/@/components/Form/index';
+  import { formSchema } from '../CarUnit.data';
+  import { saveOrUpdate } from '../CarUnit.api';
+  // Emits声明
+  const emit = defineEmits(['register', 'success']);
+  const isUpdate = ref(true);
+  //表单配置
+  const [registerForm, { setProps, resetFields, setFieldsValue, validate }] = useForm({
+    //labelWidth: 150,
+    schemas: formSchema,
+    showActionButtonGroup: false,
+    baseColProps: { span: 24 },
+  });
+  //表单赋值
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+    //重置表单
+    await resetFields();
+    setModalProps({ confirmLoading: false, showCancelBtn: !!data?.showFooter, showOkBtn: !!data?.showFooter });
+    isUpdate.value = !!data?.isUpdate;
+    if (unref(isUpdate)) {
+      //表单赋值
+      await setFieldsValue({
+        ...data.record,
+      });
+    }
+    // 隐藏底部时禁用整个表单
+    setProps({ disabled: !data?.showFooter });
+  });
+  //设置标题
+  const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑'));
+  //表单提交事件
+  async function handleSubmit(v) {
+    try {
+      let values = await validate();
+      setModalProps({ confirmLoading: true });
+      //提交表单
+      await saveOrUpdate(values, isUpdate.value);
+      //关闭弹窗
+      closeModal();
+      //刷新列表
+      emit('success');
+    } finally {
+      setModalProps({ confirmLoading: false });
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+  /** 时间和数字输入框样式 */
+  :deep(.ant-input-number) {
+    width: 100%;
+  }
+
+  :deep(.ant-calendar-picker) {
+    width: 100%;
+  }
+</style>

src/views/billet/ShiftConfiguration/ShiftConfiguration.data.ts

@@ -3,6 +3,12 @@ import { FormSchema } from '/@/components/Table';
 // import { rules } from '/@/utils/helper/validator';
 import { render } from '/@/utils/common/renderUtils';
 import { destinationOptions } from '/@/views/billet/hotDelivery/common.data';
+
+// 新旧站台
+export const platformOptions = [
+  { label: '新站台', value: 0 },
+  { label: '旧站台', value: 1 },
+];
 //列表数据
 export const columns: BasicColumn[] = [
   {
@@ -66,7 +72,9 @@ export const columns: BasicColumn[] = [
     align: 'center',
     dataIndex: 'newOldPlatform',
     customRender(opt) {
-      return opt.record.newOldPlatform === 0 ? '新站台' : '旧站台';
+      const { record } = opt;
+      const findItem = platformOptions.find((item) => item.value === record.newOldPlatform);
+      return findItem ? findItem.label : '';
     },
   },
 ];
@@ -125,10 +133,7 @@ export const searchFormSchema: FormSchema[] = [
     field: 'newOldPlatform',
     component: 'Select',
     componentProps: {
-      options: [
-        { label: '新站台', value: 0 },
-        { label: '旧站台', value: 1 },
-      ],
+      options: platformOptions,
     },
   },
   {
@@ -197,10 +202,7 @@ export const formSchema: FormSchema[] = [
     field: 'newOldPlatform',
     component: 'Select',
     componentProps: {
-      options: [
-        { label: '新站台', value: 0 },
-        { label: '旧站台', value: 1 },
-      ],
+      options: platformOptions,
     },
   },
   // TODO 主键隐藏字段，目前写死为ID

src/views/billet/shippingBill/components/editForm.vue

@@ -8,11 +8,6 @@
             <JSearchSelect placeholder="请选择" disabled v-model:value="model.ccmNo" dict="lg_zj" defaultValue="5" />
           </a-form-item>
         </a-col>
-        <a-col :span="12">
-          <a-form-item label="牌号">
-            <JSearchSelect type="list" v-model:value="model.brandNum" dict="billet_spec" placeholder="请选择" allowClear />
-          </a-form-item>
-        </a-col>
       </a-row>
       <a-row :gutter="24">
         <a-col :span="12">
@@ -85,7 +80,19 @@
         </a-col>
       </a-row>
       <a-row :gutter="24">
-        <a-col :span="12" v-if="model.ccmNo == 6">
+        <a-col :span="12">
+          <a-form-item label="牌号">
+            <JSearchSelect type="list" v-model:value="model.brandNum" dict="billet_spec" placeholder="请选择" allowClear />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="新/旧站台">
+            <a-select allowClear v-model:value="model.newOldPlatform" :options="platformOptions"></a-select>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24">
+        <a-col :span="12">
           <a-form-item label="车位号">
             <a-select style="width: 100%" disabled v-model:value="model.positionNum" placeholder="请选择" :options="carPosition" />
           </a-form-item>
@@ -124,6 +131,8 @@
   import { carPosition } from '../shippingBill.data';
   import { getDictItemsByCode } from '/@/utils/dict/index';
   import dayjs from 'dayjs';
+  import { platformOptions } from '../../ShiftConfiguration/ShiftConfiguration.data';
+
   const props = defineProps({
     rowData: {
       type: Object,
@@ -204,6 +213,7 @@
       typeConfigId,
       licensePlateStatus,
       brandNum,
+      newOldPlatform,
       remarks,
     } = model.value;
     let objParams = {
@@ -225,6 +235,7 @@
       typeConfigId,
       remarks,
       brandNum,
+      newOldPlatform,
     };
     confirmLoading.value = true;
     const newTypeConfigId = destination ? machineConfig.value[ccmNo].find((item) => item.label == destination).id : null;

src/views/billet/shippingBill/shippingBill.data.ts

@@ -5,6 +5,8 @@ import { render } from '/@/utils/common/renderUtils';
 import { groupArray } from '/@/views/billet/hotDelivery/common.data';
 import { FormSchema } from '/@/components/Table';
 import { cloneDeep } from 'lodash-es';
+import { platformOptions } from '../ShiftConfiguration/ShiftConfiguration.data';
+
 export const dictOptions = ref({});
 /**
  * 初始化字典选项(编辑表格班组，定尺为下拉框，需要获取字典)
@@ -103,18 +105,15 @@ export const columns: BasicColumn[] = computed(() => [
     },
   },
   {
-    title: '钢种',
+    title: '新/旧站台',
     align: 'center',
-    width: 80,
-    dataIndex: 'steel',
-    // fixed: true
-  },
-  {
-    title: '规格',
-    align: 'center',
-    width: 80,
-    dataIndex: 'spec_dictText',
-    // fixed: true
+    width: 100,
+    dataIndex: 'newOldPlatform',
+    customRender(opt) {
+      const { record } = opt;
+      const findItem = platformOptions.find((item) => item.value === record.newOldPlatform);
+      return findItem ? findItem.label : '';
+    },
   },
   {
     title: '类型',
@@ -171,6 +170,20 @@ export const columns: BasicColumn[] = computed(() => [
     dataIndex: 'amountTotal',
     // fixed: true
   },
+  {
+    title: '钢种',
+    align: 'center',
+    width: 80,
+    dataIndex: 'steel',
+    // fixed: true
+  },
+  {
+    title: '规格',
+    align: 'center',
+    width: 80,
+    dataIndex: 'spec_dictText',
+    // fixed: true
+  },
   {
     title: '备注',
     align: 'center',