ci-plus 1.6.1 → 1.6.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ci-plus",
-  "version": "1.6.1",
+  "version": "1.6.3",
   "description": "ci组件库",
   "main": "./index.ts",
   "scripts": {
@@ -12,7 +12,7 @@
     "vue",
     "element-plus",
     "ui组件库二次封装",
-    "更新第二版为尚标识卡模板-修改下载文档函数"
+    "更新第二版为尚标识卡模板- 客户名称字段取值"
   ],
   "type": "module",
   "author": {

package/src/identificationCard/identificationCard.vue

@@ -25,7 +25,10 @@
       :srcdoc="barcodeCon"
       frameborder="0"
     ></iframe>
-    <div id="barcode" style="display: none">
+    <div
+      id="barcode"
+      style="display: none"
+    >
       <!-- 给print-conten 添加 page-break-a;可以使打印的时候在每个print-content元素的下方添加一个分页标记，即可实现一张纸只打印一张标签
         参考：https://blog.csdn.net/qq_35491739/article/details/126279510
        -->
@@ -1998,7 +2001,7 @@
 defineOptions({ name: 'ci-identificationCard' })
 import { ref, onMounted, nextTick, watch, computed } from 'vue'
 import barCode from './barCode.vue'
-import { ElButton,ElImage } from 'element-plus'
+import { ElButton,ElIcon,ElPopover,ElImage } from 'element-plus'
 import CiQrcode from './qrcode'
 // 导入 public/C&U.png 图片
 // import C_U from '@/assets/C&U.png'

package/src/sortableTable/README.md

@@ -0,0 +1,287 @@
+## 使用示例
+
+```ts
+const useBackStoreM = defineStore(
+  'MaterialWarehouse-MaterialsPreparationNotice-index',
+  () => {
+    const ifshow = ref(true)
+
+    type Scoped = Scope<MPNRes>
+    const store: ReturnType<
+      ReturnType<typeof getOptStore<MPNRes, any, any, any, { ids: number[] }>>
+    > = getOptStore<MPNRes, any, any, any, { ids: number[] }>({
+      model: 'material_preparation_notice_list', // 请求地址：material_preparation_notice_list_post
+      id: 'MaterialWarehouse-MaterialsPreparationNotice-index', // 配置存储的id（约定项目名称-模块名称-页面名称）
+      name: '材料库_备料通知',
+      storage_type: '', //CHUKU
+      params: { limit: 20, storage_type: 'CAILIAO' },
+      baseUrl: storageModule,
+      setId: true,
+      ifInitData: false, // 是否初始请求表格数据
+      sortColumn: [
+        { col: { width: 60, label: '序号', type: 'index', fixed: 'left' } },
+        {
+          col: { width: 130, label: '计划开始时间', prop: 'plan_start_date' }, 
+          // 示例1：日期格式
+          header(createVNode: any) {
+            return createVNode(HeaderInput, {
+              text: '计划开始时间',
+              column: 'plan_start_date',
+              storePar: store.params.value,
+              type: 'date',
+              placeholder: '请选择...',
+              popperStyle: { width: '450px', height: '300px' },
+              onChange(val: any) {
+                console.log('val: ', val)
+                store.HEADERSEARCH(val)
+                console.log('当前的参数: ', store.params.value)
+              },
+              ordersConfig: { enableOrder: true },
+            })
+          },
+        },
+         {
+          col: { width: 330, label: '物料编码', prop: 'material_info', },
+          // 示例2：输入框(简写)
+          header(createVNode: any) {
+            return createVNode(HeaderInput, {
+              text: '物料编码|物料名称|物料型号',
+              column: 'material_info',
+              storePar: store.params.value,
+              placeholder: '请输入关键字...',
+              onChange(val: any) {
+                store.HEADERSEARCH(val)
+              },
+            })
+          },          
+        },
+        {
+          col: { width: 150, label: '产线', prop: 'line_name' },
+          // 示例3：输入框
+          header(createVNode: any) {
+            return createVNode(HeaderInput, {
+              text: '产线',
+              column: 'line_name',
+              storePar: store.params.value,
+              type: 'text',
+              disableFilter: false,// 关闭筛选功能true
+              selectConfig: {},
+              placeholder: '请输入关键字...',
+              onChange(val: any) {
+                console.log('val: ', val)
+                store.HEADERSEARCH(val)
+                console.log('当前的参数: ', store.params.value)
+              },
+              onGetstore(val: any) {
+                console.log('val: ', val)
+                console.log('当前的参数: ', store.params.value)
+              },
+              ordersConfig: { enableOrder: false }, // 开启排序功能true
+            })
+          },
+        }, 
+        {
+          col: {
+            width: 100,
+            label: '通用件库存',
+            prop: 'common_parts_inventory_count',
+          },
+          component(createVNode, { row }: Scoped) {
+            return createVNode(
+              'div',
+              {
+                style: {
+                  color: `${row.common_parts_inventory_count < row.count
+                    ? 'red'
+                    : 'black'
+                    }`,
+                }, // 行内样式
+                class: 'flex-a-c', // 添加一个flex-a-c的class名称
+              },
+              row.common_parts_inventory_count,
+            )
+          },
+          
+        },
+        {
+          col: { width: 100, label: '状态', prop: 'state', fixed: 'right' },
+          component(createVNode, { row }: Scoped) {
+            let { type, val } = setLibraryName(row.state)
+            if (val) {
+              return createVNode(ElTag, { type, class: 'ml-2' }, () => val)
+            } else {
+              return createVNode('div', [val])
+            }
+          },
+          // 示例4：下拉选择框(多选)
+          header(createVNode: any) {
+            return createVNode(HeaderInput, {
+              text: '状态',
+              column: 'state',
+              storePar: store.params.value,
+              type: 'select',
+              selectConfig: {
+                options: [
+                  { value: '0', label: '备货中' },
+                  { value: '1', label: '已备货' },
+                ],
+                selectMultiple: true, // 是否多选
+              },
+              placeholder: '请选择...',
+              onChange(val: any) {
+                console.log('val: ', val)
+                store.HEADERSEARCH(val)
+                console.log('当前的参数: ', store.params.value)
+              },
+            })
+          },
+        },
+        {
+          col: {
+            width: 100,
+            label: '操作',
+            prop: 'state',
+            fixed: 'right',
+          },
+          component(createVNode: any, { row }: Scoped) {
+            // 单元格内容为一个开关 ElSwitch 组件
+            return createVNode(ElSwitch, {
+              style: {
+                '--el-switch-on-color': '#13ce66',
+                '--el-switch-off-color': '#e6a23c',
+              },
+              modelValue: row.state === 0 ? false : true, //ifshow.value,
+              inlinePrompt: true,
+              activeText: '备货完成',
+              inactiveText: '备货中', 
+              'onUpdate:modelValue': (newValue: any) => {
+                console.log('newValue: ', newValue)
+                // ifshow.value = newValue
+                row.state = newValue ? 1 : 0
+                materialPreparationCompleted(
+                  [row],
+                  store.loading,
+                  store.UPDATEPOST,
+                )
+              },
+              // 点击事件
+              onClick: (event: MouseEvent) => {
+                event.stopPropagation() // 阻止事件冒泡
+              },
+              // 禁用状态
+              disabled:
+                Number(row.material_preparation_count) >= Number(row.count)
+                  ? true
+                  : false,
+            })
+          },
+          header(createVNode: any) {
+            return createVNode(HeaderInput, {
+              text: '操作',
+              column: 'state',
+              storePar: store.params.value,
+              type: 'select',
+              initValue: '0',
+              popperStyle: { width: '300px', height: '150px' },
+              selectConfig: {
+                options: [
+                  { value: '0', label: '备货中' },
+                  { value: '1', label: '已备货' },
+                ],
+                selectMultiple: true, // 是否多选
+              },
+              placeholder: '请选择...',
+              onChange(val: any) {
+                console.log('val: ', val)
+                store.HEADERSEARCH(val)
+                console.log('当前的参数: ', store.params.value)
+              },
+            })
+          },
+        },
+
+        {
+          col: { label: '操作', prop: '', width: 240 },
+          // 单元格中渲染2个普通按钮组件
+          component(createVNode, { row }: Scoped) {
+            return createVNode('div', [
+              createVNode(
+                ElButton,
+                {
+                  size: 'small',
+                  type: 'warning',
+                  color: '#2193b0',
+                  onClick(evt) {
+                    evt.stopPropagation() // 阻止冒泡事件
+                    console.log('修改', row) 
+                  },
+                },
+                () => '公司详情记录',
+              ),
+              createVNode(
+                ElButton,
+                {
+                  size: 'small',
+                  color: '#2c56a0',
+                  onClick(evt) {
+                    evt.stopPropagation() // 阻止冒泡事件
+                    console.log('编辑', row) 
+                  },
+                },
+                () => '条款详情记录',
+              ),
+            ])
+          },
+        },
+
+        {
+          col: { width: 180, label: '操作', prop: '' },
+          component(createVNode, { row }: Scoped) {
+            // 单元格中渲染3个图标按钮组件
+            return createVNode('div', [
+              createVNode(ElButton, {
+                size: 'small',
+                type: 'warning',
+                icon: View, // 查看
+                color: '#2193b0',
+                onClick(evt) {
+                  evt.stopPropagation() // 阻止冒泡事件
+                  console.log('查看', row)
+                  console.log('detailsRef', detailsRef.value)
+                  // detailsRef.value?.showMydia()
+                  onSeeDetails(detailsRef.value, row)
+                },
+              }),
+              createVNode(
+                ElButton,
+                {
+                  size: 'small',
+                  icon: EditPen,
+                  onClick(evt) {
+                    evt.stopPropagation() // 阻止冒泡事件
+                    onAdd(true, addRef.value, row)
+                  },
+                }, //, () => '修改'
+              ),
+              createVNode(ElButton, {
+                size: 'small',
+                type: 'danger',
+                icon: Delete,
+                onClick(evt) {
+                  evt.stopPropagation() // 阻止冒泡事件
+                  console.log('修改', row)
+                  deleteOpen([row.id], store.UPDATEPOST)
+                },
+              }),
+            ])
+          },
+        },
+
+
+
+      ],
+    })()
+    return store
+  },
+)
+```

package/src/utils/cardPrint.ts

@@ -2,8 +2,9 @@
  * @module cardPrint
  * @author : 卖女孩的小火柴
  * !description : 标识卡打印
- * @version : 1.0.2
+ * @version : 1.0.3
  * @since : 创建时间 2024-03-15 15:16:12
+ * @update : 2024-11-5 13:26:12更新标识卡模板，删除为尚工厂的一些字段
  */
 // import { scan_card_code_get } from '@/api/InventoryBatch'
 import { ElMessage, MessageParamsWithType } from 'element-plus'
@@ -122,84 +123,64 @@ export const cardPrint = (
             r2c2: item.center_data[0]?.distribute_place_name,
             r2c4: baseUrls + item.qr_code_path, // 二维码地址
             r3c1: '客户名称',
-            r3c2: item.center_data[0]?.customer_name,
+            r3c2: item.customer_name || item.center_data[0]?.customer_name || '',
             r4c1: '供应商',
             r4c2: item.center_data[0]?.supplier_name,
-            r5c1: '淬火件型号',
-            r5c2: item.quenching_material_model,
+            r5c1: '材料厂家',
+            r5c2: item.center_data[0]?.material_manufacturer,
             r5c4: item.card_code, // 标识卡号
-            r6c1: '淬火件编码', // 建
-            r6c2: item.quenching_material_code, // 值
-            r6c3: '材料炉号', // 建
-            r6c4: item.center_data[0]?.material_heat_number, // 值
-            r7c1: '产品物料号', // 建
-            r7c2: item.material_code, // 值
-            r7c3: '库位', // 建
-            r7c4: item.location_name, // 值
-            r8c1: '产品型号', // 建
-            r8c2: item.material_model, // 值-产品型号
-            r8c3: '操作工', // 建 2024.08.31 由 收货人员 改为 操作工
-            r8c4: item.report_user_name
-              ? item.report_user_name
-              : item.opt_user_name, // 值：item.center_data[0]?.consignee
-            r9c1: '本工序',
-            r9c2: item.process_name, // 材料厂家
-            r9c3: '下工序',
-            r9c4: item.next_process_name,
-            r10c1: '产线',
-            r10c2: item.line_name,
-            r10c3: '工单号',
-            r10c4: item.wip_order_number,
-            r11c1: '材料厂家',
-            r11c2: item.center_data[0]?.material_manufacturer,
-            r11c3: '收货人员',
-            r11c4: item.center_data[0]?.consignee,
-            r12c1: '抽检结果',
-            r12c2: item.check_result,
-            r12c3: '材料牌号',
-            r12c4: item.center_data[0]?.material_mark,
-            r13c1: '本箱数量',
-            r13c2: item.current_inventory,
-            r13c3: '本批数量',
-            r13c4: item.center_data[0]?.batch_count,
-            r14c1: '总箱数',
-            r14c2: item.total_row,
-            r14c3: '称重总数',
-            r14c4: item.center_data[0]?.weighing_count,
-            r15c1: '单重',
-            r15c2: item.piece_weight,
-            r15c3: '净重',
-            r15c4: item.net_weight,
-            r16c1: '检验日期',
-            r16c2: item.center_data[0]?.inspect_time,
-            r16c3: '抽检人员',
-            r16c4: item.rework_check_user_name,
-            r17c1: '炉号/炉数',
-            r17c2: item.number_of_furnace,
-            r17c3: '生产日期',
-            r17c4: item.product_date,
-            r18c1: '热处理批号',
-            r18c2: item.center_data[0]?.heat_batch_number,
-            r18c3: '材料批次',
-            r18c4: item.center_data[0]?.material_batch_number,
-            r19c1: '包装方式',
-            r19c2: item.packaging_specifications_name,
-            r19c3: '回火温度',
-            r19c4: item.temper_temperature,
-            r20c1: '件数规格',
-            r20c2: item.center_data[0]?.case_count_str,
-            r20c3: '',
-            r20c4: '',
 
+            r6c1: '淬火件型号',
+            r6c2: item.quenching_material_model,
+            r6c3: '材料炉号',
+            r6c4: item.center_data[0]?.material_heat_number,
+            r7c1: '淬火件编码',
+            r7c2: item.quenching_material_code,
+            r7c3: '材料牌号',
+            r7c4: item.center_data[0]?.material_mark,
+            r8c1: '产品物料号',
+            r8c2: item.material_code,
+            r8c3: '库位',
+            r8c4: item.location_name,
+            r9c1: '产品型号',
+            r9c2: item.material_model,
+            r9c3: '收货人员',
+            r9c4: item.center_data[0]?.consignee,
+            r10c1: '净重',
+            r10c2: item.net_weight,
+            r10c3: '单重',
+            r10c4: item.piece_weight,
+            r11c1: '产线',
+            r11c2: item.line_name,
+            r11c3: '工单号',
+            r11c4: item.wip_order_number,
+            r12c1: '本箱数量',
+            r12c2: item.current_inventory,
+            r12c3: '本批数量',
+            r12c4: item.center_data[0]?.batch_count,
+            r13c1: '总箱数',
+            r13c2: item.total_row,
+            r13c3: '生产日期',
+            r13c4: item.product_date,
+            r14c1: '热处理批号',
+            r14c2: item.center_data[0]?.heat_batch_number,
+            r14c3: '件数规格',
+            r14c4: item.center_data[0]?.case_count_str,
+            r15c1: '包装方式',
+            r15c2: item.packaging_specifications_name,
+            r15c3: '',
+            r15c4: '',
 
             r40c1: '备注', // 备注
             r40c2: item.remark, // 备注key
             r41c1: item.center_data[0]?.b2b_batch_number || '', //条形码文本666
-
           }
         }
         //  成品工厂-尾料标识卡(为尚无尾料标识卡，使用为尚的成品标识卡)
-        else if (item.card_state == 'WEILIAO' && item.is_finished_goods == 2) {
+        else if (
+          item.card_state == 'WEILIAO' &&
+          item.is_finished_goods == 2
+        ) {
           obj = {
             card_state: item.card_state,
             // 工厂类型：1：为尚工厂 | 2：成品工厂
@@ -377,22 +358,20 @@ export const cardPrint = (
             r2c2: item.center_data[0]?.distribute_place_name,
             r2c4: baseUrls + item.qr_code_path, // 二维码地址
             r3c1: '客户名称', // 建
-            r3c2: item.center_data[0]?.customer_name,
+            r3c2: item.customer_name || item.center_data[0]?.customer_name || '',
             r4c1: '供应商', // 建
             r4c2: item.center_data[0]?.supplier_name,
             r5c1: '材料厂家',
             r5c2: item.center_data[0]?.material_manufacturer,
             r5c4: item.card_code, // 标识卡号
-
             r6c1: '淬火件型号',
             r6c2: item.quenching_material_model,
             r6c3: '材料炉号',
             r6c4: item.center_data[0]?.material_heat_number,
             r7c1: '淬火件编码',
             r7c2: item.quenching_material_code,
-            r7c3: '材料批次',
-            r7c4: item.center_data[0]?.material_batch_number,
-
+            r7c3: '材料牌号',
+            r7c4: item.center_data[0]?.material_mark,
             r8c1: '产品物料号',
             r8c2: item.material_code,
             r8c3: '库位',
@@ -403,33 +382,21 @@ export const cardPrint = (
             r9c4: item.center_data[0]?.consignee,
             r10c1: '责废总数', // 建
             r10c2: item.storage_scrap_count,
-            r10c3: '材料牌号',
-            r10c4: item.center_data[0]?.material_mark,
+            r10c3: '单重',
+            r10c4: item.piece_weight,
             r11c1: '工序',
             r11c2: item.process_name,
-            r11c3: '单重',
-            r11c4: item.piece_weight,
-            r12c1: '生产日期',
-            r12c2: item.product_date,
-            r12c3: '本批数量',
-            r12c4: item.center_data[0]?.batch_count,
-            r13c1: '提交人',
-            r13c2: item.opt_user_name,
-            r13c3: '责任人',
-            r13c4: item.duty_user_name,
+            r11c3: '本批数量',
+            r11c4: item.center_data[0]?.batch_count,
+            r12c1: '热处理批号',
+            r12c2: item.center_data[0]?.heat_batch_number,
+            r12c3: '生产日期',
+            r12c4: item.product_date,
+            r13c1: '责任人',
+            r13c2: item.duty_user_name,
+            r13c3: '提交人',
+            r13c4: item.opt_user_name,
 
-            r14c1: '检验员',
-            r14c2: item.center_data[0]?.inspector,
-            r14c3: '检验日期',
-            r14c4: item.center_data[0]?.inspect_time,
-            r15c1: '热处理批号',
-            r15c2: item.center_data[0]?.heat_batch_number,
-            r15c3: '炉号/炉数',
-            r15c4: item.number_of_furnace,
-            r16c1: '回火温度',
-            r16c2: item.temper_temperature,
-            r16c3: '',
-            r16c4: '',
             /** ----循环的数据-------------------------------- **/
             r30c1: badList[0]?.label, // 渲染数组第0行的'建'
             r30c2: badList[0]?.value, // 渲染数组第0行的'值'
@@ -440,11 +407,13 @@ export const cardPrint = (
             r40c1: '备注', // 备注
             r40c2: item.remark, //条形码文本
             r41c1: item.center_data[0]?.b2b_batch_number || '', // 条形码文本
-
           }
         }
         //  成品工厂-返工标识卡
-        else if (item.card_state == 'FANGONG' && item.is_finished_goods == 2) {
+        else if (
+          item.card_state == 'FANGONG' &&
+          item.is_finished_goods == 2
+        ) {
           // 如果有不良项目，就循环获取其中值
           let badNum = item.bad_item_list?.length || 0
           let badList: { id: number; label: string; value: string }[] = []
@@ -524,11 +493,16 @@ export const cardPrint = (
             r30c2: badStr, // 渲染数组不良项目的'值'
             r40c1: '备注',
             r40c2: item.remark, // 备注
-            r41c1: item.flow_lot_number ? item.flow_lot_number : item.center_data[0]?.b2b_batch_number || '', //条形码文本:流转批次号存在就用流转批次号，不存在用批次序列号
+            r41c1: item.flow_lot_number
+              ? item.flow_lot_number
+              : item.center_data[0]?.b2b_batch_number || '', //条形码文本:流转批次号存在就用流转批次号，不存在用批次序列号
           }
         }
         //  为尚工厂-返工标识卡
-        else if (item.card_state == 'FANGONG' && item.is_finished_goods == 1) {
+        else if (
+          item.card_state == 'FANGONG' &&
+          item.is_finished_goods == 1
+        ) {
           // 如果有不良项目，就循环获取其中值
           let badNum = item.bad_item_list?.length || 0
           let badList: { id: number; label: string; value: string }[] = []
@@ -563,7 +537,7 @@ export const cardPrint = (
             r2c2: item.material_code,
             r2c4: baseUrls + item.qr_code_path, // 二维码地址
             r3c1: '客户名称',
-            r3c2: item.material_model,
+            r3c2: item.customer_name || item.center_data[0]?.customer_name || '',
             r4c1: '供应商',
             r4c2: item.center_data[0]?.supplier_name,
             r5c1: '材料厂家',
@@ -576,8 +550,8 @@ export const cardPrint = (
             r6c4: item.center_data[0]?.material_heat_number,
             r7c1: '淬火件编码',
             r7c2: item.quenching_material_code,
-            r7c3: '材料批次',
-            r7c4: item.center_data[0]?.material_batch_number,
+            r7c3: '材料牌号',
+            r7c4: item.center_data[0]?.material_mark,
             r8c1: '产品物料号',
             r8c2: item.material_code,
             r8c3: '热处理批号',
@@ -592,24 +566,13 @@ export const cardPrint = (
             r10c4: item.center_data[0]?.batch_count,
             r11c1: '返工工序',
             r11c2: item.rework_process_names,
-            r11c3: '材料牌号',
-            r11c4: item.center_data[0]?.material_mark,
-            r12c1: '返工期限',
-            r12c2: item.rework_dead_line,
-            r12c3: '生产日期',
-            r12c4: item.product_date,
-            r13c1: '检验员',
-            r13c2: item.center_data[0]?.inspector,
-            r13c3: '检验日期',
-            r13c4: item.center_data[0]?.inspect_time,
-            r14c1: '热处理批号',
-            r14c2: item.center_data[0]?.heat_batch_number,
-            r14c3: '炉号/炉数',
-            r14c4: item.number_of_furnace,
-            r15c1: '回火温度',
-            r15c2: item.temper_temperature,
-            r15c3: '',
-            r15c4: '',
+            r11c3: '返工期限',
+            r11c4: item.rework_dead_line,
+            r12c1: '生产日期',
+            r12c2: item.product_date,
+            r12c3: '',
+            r12c4: '',
+
             /** ----循环的数据---------------- **/
             r30c1: '不良项目',
             r30c2: badStr, // 渲染数组不良项目的'值'
@@ -619,7 +582,10 @@ export const cardPrint = (
           }
         }
         //  成品工厂-装配标识卡（为尚工厂无装配标识卡）
-        else if (item.card_state == 'ZHUANGPEI' && item.is_finished_goods == 2) {
+        else if (
+          item.card_state == 'ZHUANGPEI' &&
+          item.is_finished_goods == 2
+        ) {
           // 如果有children ，就循环获取其中值
           let badNum = item.children?.length || 0
           let badList: {
@@ -666,7 +632,7 @@ export const cardPrint = (
             r3c1: '成品型号',
             r3c2: item.material_model,
             r4c1: '客户名称/代号',
-            r4c2: item.center_data[0]?.customer_name,
+            r4c2: item.customer_name || item.center_data[0]?.customer_name || '',
             r5c1: '工单号',
             r5c2: item.wip_order_number,
             r5c4: item.card_code, // 标识卡号
@@ -723,7 +689,10 @@ export const cardPrint = (
           Object.assign(obj, obj1, obj2, obj3)
         }
         //  为尚工厂-装配标识卡（为尚工厂无装配标识卡）
-        else if (item.card_state == 'ZHUANGPEI' && item.is_finished_goods == 1) {
+        else if (
+          item.card_state == 'ZHUANGPEI' &&
+          item.is_finished_goods == 1
+        ) {
           obj = {
             card_state: item.card_state,
             // 工厂类型：1：为尚工厂 | 2：成品工厂
@@ -731,7 +700,10 @@ export const cardPrint = (
           }
         }
         //  成品工厂-料废标识卡
-        else if (item.card_state == 'LIAOFEI' && item.is_finished_goods == 2) {
+        else if (
+          item.card_state == 'LIAOFEI' &&
+          item.is_finished_goods == 2
+        ) {
           // 如果有不良项目，就循环获取其中值
           let badNum = item.bad_item_list?.length || 0
           let badList: { id: number; label: string; value: string }[] = []
@@ -819,7 +791,10 @@ export const cardPrint = (
           }
         }
         //  为尚工厂-料废标识卡
-        else if (item.card_state == 'LIAOFEI' && item.is_finished_goods == 1) {
+        else if (
+          item.card_state == 'LIAOFEI' &&
+          item.is_finished_goods == 1
+        ) {
           // 如果有不良项目，就循环获取其中值
           let badNum = item.bad_item_list?.length || 0
           let badList: { id: number; label: string; value: string }[] = []
@@ -854,7 +829,7 @@ export const cardPrint = (
             r2c2: item.center_data[0]?.distribute_place_name,
             r2c4: baseUrls + item.qr_code_path, // 二维码地址
             r3c1: '客户名称',
-            r3c2: item.center_data[0]?.customer_name,
+            r3c2: item.customer_name || item.center_data[0]?.customer_name || '',
             r4c1: '供应商',
             r4c2: item.center_data[0]?.supplier_name,
             r5c1: '材料厂家',
@@ -867,8 +842,8 @@ export const cardPrint = (
             r6c4: item.center_data[0]?.material_heat_number,
             r7c1: '淬火件编码',
             r7c2: item.quenching_material_code,
-            r7c3: '材料批次',
-            r7c4: item.center_data[0]?.material_batch_number,
+            r7c3: '材料牌号',
+            r7c4: item.center_data[0]?.material_mark,
             r8c1: '产品物料号',
             r8c2: item.material_code,
             r8c3: '库位',
@@ -879,24 +854,17 @@ export const cardPrint = (
             r9c4: item.center_data[0]?.consignee,
             r10c1: '料废总数',
             r10c2: item.storage_scrap_count,
-            r10c3: '材料牌号',
-            r10c4: item.center_data[0]?.material_mark,
+            r10c3: '单重',
+            r10c4: item.piece_weight,
             r11c1: '工序',
             r11c2: item.process_name,
-            r11c3: '单重',
-            r11c4: item.piece_weight,
+            r11c3: '本批数量',
+            r11c4: item.center_data[0]?.batch_count,
             r12c1: '生产日期',
             r12c2: item.product_date,
-            r12c3: '本批数量',
-            r12c4: item.center_data[0]?.batch_count,
-            r13c1: '检验员',
-            r13c2: item.center_data[0]?.inspector,
-            r13c3: '检验日期',
-            r13c4: item.center_data[0]?.inspect_time,
-            r14c1: '提交人',
-            r14c2: item.opt_user_name,
-            r14c3: '',
-            r14c4: '',
+            r12c3: '提交人',
+            r12c4: item.opt_user_name,
+
             /** ----循环的数据---------------- **/
             r30c1: '不良项目',
             r30c2: badStr, // 渲染数组不良项目的'值'
@@ -937,7 +905,7 @@ export const cardPrint = (
             r7c4: item.center_data[0]?.material_batch_number,
             data: [
               {
-                opt_time: item.opt_time, // 日期
+                opt_time: setDate(item.opt_time), // 日期
                 sr: item.record_type === 1 ? item.inventory : '', // 收入
                 fc: item.record_type === 2 ? item.inventory : '', // 发出
                 balance_count: item.balance_count, //结存
@@ -1013,7 +981,7 @@ export const cardPrint = (
             r2c2: item.material_code,
             r2c4: baseUrls + item.qr_code_path, // 二维码地址
             r3c1: '客户名称',
-            r3c2: item.material_model,
+            r3c2: item.customer_name || item.center_data[0]?.customer_name || '',
             r4c1: '供应商',
             r4c2: item.center_data[0]?.supplier_name,
             r5c1: '材料厂家',
@@ -1026,40 +994,32 @@ export const cardPrint = (
             r6c4: item.center_data[0]?.material_heat_number,
             r7c1: '淬火件编码',
             r7c2: item.quenching_material_code,
-            r7c3: '材料批次',
-            r7c4: item.center_data[0]?.material_batch_number,
+            r7c3: '材料牌号',
+            r7c4: item.center_data[0]?.material_mark,
             r8c1: '产品物料号',
             r8c2: item.material_code,
-            r8c3: '库位',
-            r8c4: item.location_name,
+            r8c3: '收货人员',
+            r8c4: item.center_data[0]?.consignee,
             r9c1: '产品型号',
             r9c2: item.material_model,
-            r9c3: '收货人员',
-            r9c4: item.center_data[0]?.consignee,
+            r9c3: '本批数量',
+            r9c4: item.center_data[0]?.batch_count,
             r10c1: '本箱数量',
             r10c2: item.current_inventory,
-            r10c3: '材料牌号',
-            r10c4: item.center_data[0]?.material_mark,
+            r10c3: '单重',
+            r10c4: item.piece_weight,
             r11c1: '总箱数',
             r11c2: item.total_row,
-            r11c3: '本批数量',
-            r11c4: item.center_data[0]?.batch_count,
+            r11c3: '净重',
+            r11c4: item.net_weight,
             r12c1: '包装方式',
             r12c2: item.packaging_specifications_name,
-            r12c3: '单重',
-            r12c4: item.piece_weight,
+            r12c3: '生产日期',
+            r12c4: item.product_date,
             r13c1: '件数规格',
             r13c2: item.center_data[0]?.case_count_str,
-            r13c3: '净重',
-            r13c4: item.net_weight,
-            r14c1: '检验员',
-            r14c2: item.center_data[0]?.inspector,
-            r14c3: '检验日期',
-            r14c4: item.center_data[0]?.inspect_time,
-            r15c1: '生产日期',
-            r15c2: item.product_date,
-            r15c3: '',
-            r15c4: '',
+            r13c3: '',
+            r13c4: '',
 
             r40c1: '备注',
             r40c2: item.remark, // 备注
@@ -1067,7 +1027,10 @@ export const cardPrint = (
           }
         }
         //  成品工厂-材料标识卡
-        else if (item.card_state == 'CAILIAO' && item.is_finished_goods == 2) {
+        else if (
+          item.card_state == 'CAILIAO' &&
+          item.is_finished_goods == 2
+        ) {
           obj = {
             card_state: item.card_state, // 标识卡类型
             // 工厂类型：1：为尚工厂 | 2：成品工厂
@@ -1113,10 +1076,13 @@ export const cardPrint = (
           }
         }
         //  为尚工厂-材料标识卡（为尚工厂无材料标识卡）
-        else if (item.card_state == 'CAILIAO' && item.is_finished_goods == 1) {
+        else if (
+          item.card_state == 'CAILIAO' &&
+          item.is_finished_goods == 1
+        ) {
           obj = {
             card_state: item.card_state,
-            factoryType: item.is_finished_goods,// 工厂类型：1：为尚工厂 | 2：成品工厂
+            factoryType: item.is_finished_goods, // 工厂类型：1：为尚工厂 | 2：成品工厂
           }
         }
         // 为尚工厂无：尾料标识卡、装配标识卡、材料标识卡