设备检定导入调整导入字段和对应关系

src/views/component/device/smallEquipmentImport.vue

@@ -509,10 +509,15 @@ export default {
           'bian_zhi_bu_men_',
           'she_bei_ming_chen',
           'yuan_she_bei_bian',
+          'she_bei_lei_xing_',
+          'chang_jia_pin_pai',
+          'xing_hao_gui_ge_',
           'jian_ding_dan_wei',
           'yi_jian_xiao_ri_q',
           'shi_shi_ri_qi_',
           'jian_ding_zhou_qi',
+          'chu_chang_bian_ha',
+          'fu_ze_ren_',
           'jing_ban_ren_',
           'zhun_que_du_',
           'fu_jian_'
@@ -577,12 +582,19 @@ export default {
           deviceList.find(
             (d) => d.yuan_she_bei_bian === item.yuan_she_bei_bian
           ) || {}
+        console.log(device, 'devicedevice')
         const userId = this.dataTransfer(
           userInfo,
           item.jing_ban_ren_,
           'name_',
           'id_'
         )
+        const userIdFZ = this.dataTransfer(
+          userInfo,
+          item.fu_ze_ren_,
+          'name_',
+          'id_'
+        )
         const deptList = this.$store.getters?.deptList || []
         const { fu_jian_, ...restItem } = item
         return {
@@ -614,23 +626,28 @@ export default {
             item.jian_ding_zhou_qi
           ),
           // 设备档案-ID
-          she_bei_bian_hao_: device.id_ || '',
+          she_bei_bian_hao_: device.id_ || item.id_ || '',
           // 设备档案-设备识别号
-          bian_hao_zhong_we: device.she_bei_shi_bie_h || '',
+          bian_hao_zhong_we:
+            device.she_bei_shi_bie_h || item.bian_hao_zhong_we || '',
           // 设备档案-设备类型
-          she_bei_lei_xing_: device.she_bei_lei_xing_ || '',
+          she_bei_lei_xing_:
+            device.she_bei_lei_xing_ || item.she_bei_lei_xing_ || '',
           // 设备档案-规格型号
-          xing_hao_gui_ge_: device.gui_ge_xing_hao_ || '',
+          xing_hao_gui_ge_:
+            device.gui_ge_xing_hao_ || item.xing_hao_gui_ge_ || '',
           // 设备档案-厂商
-          chang_jia_pin_pai: device.chang_shang_ || '',
+          chang_jia_pin_pai:
+            device.chang_shang_ || item.chang_jia_pin_pai || '',
           // 设备档案-保管人
-          fu_ze_ren_: device.guan_li_ren_ || '',
+          fu_ze_ren_: device.guan_li_ren_ || userIdFZ || '',
           // 设备档案-检定校准参数
-          can_shu_: device.jian_ding_xiao_ || '',
+          can_shu_: device.jian_ding_xiao_ || item.can_shu_ || '',
           // 设备档案-测量工作范围
-          liang_cheng_: device.ce_liang_gong_zuo || '',
+          liang_cheng_: device.ce_liang_gong_zuo || item.liang_cheng_ || '',
           // 设备档案-修正因子
-          xiu_zheng_yin_zi_: device.xiu_zheng_zhi_xiu || '',
+          xiu_zheng_yin_zi_:
+            device.xiu_zheng_zhi_xiu || item.xiu_zheng_yin_zi_ || '',
           // 附件ID（zip 匹配结果优先）
           bei_zhu_: item.bei_zhu_ || device.bei_zhu_ || '',
           shu_ju_lai_yuan_: device.id_