用户关联客户：导入功能修复未验证时点击覆盖导入报错问题

duhe

2024-01-03 5d9df9fd8a7fe9b4afefd61282ef4c5a780ef846

用户关联客户：导入功能修复未验证时点击覆盖导入报错问题

 WebTM/Properties/PublishProfiles/JFTM.pubxml.user

@@ -18,10 +18,10 @@
      <publishTime>01/28/2016 14:22:24</publishTime>
    </File>
    <File Include="bin/WebTM.dll">
      <publishTime>12/29/2023 11:41:05</publishTime>
      <publishTime>01/03/2024 13:01:40</publishTime>
    </File>
    <File Include="bin/WebTM.pdb">
      <publishTime>12/29/2023 11:41:05</publishTime>
      <publishTime>01/03/2024 13:01:40</publishTime>
    </File>
    <File Include="HtmlPage1.html">
      <publishTime>04/11/2023 16:34:42</publishTime>
@@ -720,7 +720,7 @@
      <publishTime>04/11/2023 16:34:42</publishTime>
    </File>
    <File Include="layuiadmin/Scripts/webConfig.js">
      <publishTime>12/27/2023 14:36:41</publishTime>
      <publishTime>01/03/2024 12:56:05</publishTime>
    </File>
    <File Include="layuiadmin/serial-reader.js">
      <publishTime>08/28/2023 13:54:42</publishTime>
@@ -1355,6 +1355,9 @@
    <File Include="views/grf/工序流转.grf">
      <publishTime>04/11/2023 16:34:43</publishTime>
    </File>
    <File Include="views/grf/异常类型.grf">
      <publishTime>01/03/2024 12:55:26</publishTime>
    </File>
    <File Include="views/grf/指引卡1.grf">
      <publishTime>09/14/2023 13:59:10</publishTime>
    </File>
@@ -1485,16 +1488,16 @@
      <publishTime>04/11/2023 16:34:43</publishTime>
    </File>
    <File Include="views/index.html">
      <publishTime>12/25/2023 14:58:48</publishTime>
      <publishTime>01/03/2024 12:55:26</publishTime>
    </File>
    <File Include="views/indexMenu.html">
      <publishTime>12/15/2023 16:23:31</publishTime>
      <publishTime>01/03/2024 12:55:26</publishTime>
    </File>
    <File Include="views/index_KaiBeiNaiTe.html">
      <publishTime>10/15/2023 20:35:49</publishTime>
    </File>
    <File Include="views/index_Mobile.html">
      <publishTime>12/15/2023 16:23:31</publishTime>
      <publishTime>01/03/2024 12:55:26</publishTime>
    </File>
    <File Include="views/index_Mobile_KaiBeiNaiTe.html">
      <publishTime>07/18/2023 08:40:58</publishTime>
@@ -1509,7 +1512,7 @@
      <publishTime>12/15/2023 16:23:31</publishTime>
    </File>
    <File Include="views/IpadIndex.html">
      <publishTime>12/25/2023 14:58:48</publishTime>
      <publishTime>01/03/2024 12:55:25</publishTime>
    </File>
    <File Include="views/IpadStepIndex.html">
      <publishTime>04/11/2023 16:34:43</publishTime>
@@ -1823,11 +1826,44 @@
    <File Include="views/video/success.wav">
      <publishTime>04/11/2023 16:34:43</publishTime>
    </File>
    <File Include="views/WMS扫码模块/其他入库/Kf_OtherInBackBillList_PDA.html">
      <publishTime>01/03/2024 12:55:25</publishTime>
    </File>
    <File Include="views/WMS扫码模块/其他入库/Kf_OtherInBillList_PDA.html">
      <publishTime>01/03/2024 12:55:25</publishTime>
    </File>
    <File Include="views/WMS扫码模块/其他入库/Kf_OtherInBill_PDA.html">
      <publishTime>10/15/2023 20:35:49</publishTime>
    </File>
    <File Include="views/WMS扫码模块/其他出库/Kf_OtherOutBackBillList_PDA.html">
      <publishTime>01/03/2024 12:55:25</publishTime>
    </File>
    <File Include="views/WMS扫码模块/其他出库/Kf_OtherOutBillList_PDA.html">
      <publishTime>01/03/2024 12:55:25</publishTime>
    </File>
    <File Include="views/WMS扫码模块/委外入库/Kf_EntrustInBackBillList_PDA.html">
      <publishTime>01/03/2024 12:55:25</publishTime>
    </File>
    <File Include="views/WMS扫码模块/委外入库/Kf_EntrustInBillList_PDA.html">
      <publishTime>01/03/2024 12:55:26</publishTime>
    </File>
    <File Include="views/WMS扫码模块/委外领料/Kf_EntrustOutBackBillList_PDA.html">
      <publishTime>01/03/2024 12:55:26</publishTime>
    </File>
    <File Include="views/WMS扫码模块/委外领料/Kf_EntrustOutBillList_PDA.html">
      <publishTime>01/03/2024 12:55:26</publishTime>
    </File>
    <File Include="views/WMS扫码模块/条码查询/Gy_BarCodeBill_QiaoYi_PDA.html">
      <publishTime>11/03/2023 21:45:51</publishTime>
    </File>
    <File Include="views/WMS扫码模块/生产入库/Kf_ProductInBackBillList_PDA.html">
      <publishTime>01/03/2024 12:55:26</publishTime>
    </File>
    <File Include="views/WMS扫码模块/生产入库/Kf_ProductInBillList_PDA.html">
      <publishTime>01/03/2024 12:55:26</publishTime>
    </File>
    <File Include="views/WMS扫码模块/生产汇报/Sc_ICMOReportBillList_PDA.html">
      <publishTime>01/03/2024 12:55:26</publishTime>
    </File>
    <File Include="views/WMS扫码模块/生产管理/删托单/Sc_DeletePackUnionBill_PDA.html">
      <publishTime>11/03/2023 21:45:51</publishTime>
@@ -1838,11 +1874,38 @@
    <File Include="views/WMS扫码模块/生产管理/生产组托单/Sc_PackUnionBill_PDA.html">
      <publishTime>06/14/2023 13:28:26</publishTime>
    </File>
    <File Include="views/WMS扫码模块/生产调拨/Kf_MoveStockBillList_PDA.html">
      <publishTime>01/03/2024 12:55:26</publishTime>
    </File>
    <File Include="views/WMS扫码模块/生产调拨/Kf_MoveStockStepInBillList_PDA.html">
      <publishTime>01/03/2024 12:55:26</publishTime>
    </File>
    <File Include="views/WMS扫码模块/生产调拨/Kf_MoveStockStepOutBillList_PDA.html">
      <publishTime>01/03/2024 12:55:26</publishTime>
    </File>
    <File Include="views/WMS扫码模块/生产调拨/调拨换托/Kf_MoveStockBillList_HuanTuo_PDA.html">
      <publishTime>06/14/2023 13:28:26</publishTime>
    </File>
    <File Include="views/WMS扫码模块/生产调拨/调拨换托/Kf_MoveStockBill_HuanTuo_PDA.html">
      <publishTime>06/14/2023 13:28:26</publishTime>
    </File>
    <File Include="views/WMS扫码模块/生产领料/Kf_MateOutBackBillList_PDA.html">
      <publishTime>01/03/2024 12:55:26</publishTime>
    </File>
    <File Include="views/WMS扫码模块/生产领料/Kf_MateOutBillList_PDA.html">
      <publishTime>01/03/2024 12:55:26</publishTime>
    </File>
    <File Include="views/WMS扫码模块/采购入库/Kf_POStockInBackBillList_PDA.html">
      <publishTime>01/03/2024 12:55:26</publishTime>
    </File>
    <File Include="views/WMS扫码模块/采购入库/Kf_POStockInBillList_PDA.html">
      <publishTime>01/03/2024 12:55:26</publishTime>
    </File>
    <File Include="views/WMS扫码模块/销售出库/Kf_SellOutBackBillList_PDA.html">
      <publishTime>01/03/2024 12:55:26</publishTime>
    </File>
    <File Include="views/WMS扫码模块/销售出库/Kf_SellOutBillList_PDA.html">
      <publishTime>01/03/2024 12:55:26</publishTime>
    </File>
    <File Include="views/WMS扫码模块/销售出库/Kf_SellOutBillList_QiaoYi_PDA.html">
      <publishTime>11/28/2023 12:03:19</publishTime>
@@ -2034,7 +2097,7 @@
      <publishTime>04/17/2023 08:24:07</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/Add_Edit_Gy_InspectBasis.html">
      <publishTime>12/29/2023 11:38:44</publishTime>
      <publishTime>01/03/2024 12:55:26</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/Add_Edit_Gy_InspectInstruMent.html">
      <publishTime>12/29/2023 11:38:44</publishTime>
@@ -2238,16 +2301,16 @@
      <publishTime>04/11/2023 16:34:43</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/Gy_InspectBasis.html">
      <publishTime>12/29/2023 11:38:44</publishTime>
      <publishTime>01/03/2024 12:55:26</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/Gy_InspectInstruMent.html">
      <publishTime>12/29/2023 11:38:44</publishTime>
      <publishTime>01/03/2024 12:55:26</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/Gy_InspectMethod.html">
      <publishTime>12/29/2023 11:38:44</publishTime>
      <publishTime>01/03/2024 12:55:26</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/Gy_InspectValue.html">
      <publishTime>12/29/2023 11:38:44</publishTime>
      <publishTime>01/03/2024 12:55:26</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/Gy_Material.html">
      <publishTime>12/05/2023 16:00:53</publishTime>
@@ -2280,7 +2343,7 @@
      <publishTime>11/03/2023 21:45:51</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/Gy_QualityStd.html">
      <publishTime>12/29/2023 11:38:44</publishTime>
      <publishTime>01/03/2024 12:55:26</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/Gy_StockPlace.html">
      <publishTime>07/21/2023 16:50:50</publishTime>
@@ -2793,7 +2856,7 @@
      <publishTime>12/29/2023 11:38:44</publishTime>
    </File>
    <File Include="views/基础资料/生产基础资料/Add_Edit_Gy_BadType.html">
      <publishTime>11/15/2023 08:54:54</publishTime>
      <publishTime>01/03/2024 12:55:26</publishTime>
    </File>
    <File Include="views/基础资料/生产基础资料/Add_Edit_Gy_Process.html">
      <publishTime>09/02/2023 18:53:25</publishTime>
@@ -2805,10 +2868,10 @@
      <publishTime>07/24/2023 08:23:31</publishTime>
    </File>
    <File Include="views/基础资料/生产基础资料/Gy_BadResult.html">
      <publishTime>12/27/2023 11:11:29</publishTime>
      <publishTime>01/03/2024 12:55:26</publishTime>
    </File>
    <File Include="views/基础资料/生产基础资料/Gy_BadType.html">
      <publishTime>12/29/2023 11:38:44</publishTime>
      <publishTime>01/03/2024 12:55:26</publishTime>
    </File>
    <File Include="views/基础资料/生产基础资料/Gy_Process.html">
      <publishTime>11/03/2023 21:45:51</publishTime>
@@ -3876,7 +3939,7 @@
      <publishTime>11/03/2023 21:45:51</publishTime>
    </File>
    <File Include="views/生产管理/生产计划平台/JIT_DayPlanPlatForm.html">
      <publishTime>12/29/2023 11:38:44</publishTime>
      <publishTime>01/03/2024 12:55:26</publishTime>
    </File>
    <File Include="views/生产管理/生产计划平台/JIT_DayPlanPlatFormImport.html">
      <publishTime>07/24/2023 08:52:38</publishTime>
@@ -3885,7 +3948,7 @@
      <publishTime>11/03/2023 21:45:51</publishTime>
    </File>
    <File Include="views/生产管理/生产计划平台/Sc_ShopCalendar.html">
      <publishTime>11/08/2023 09:01:07</publishTime>
      <publishTime>01/03/2024 12:55:26</publishTime>
    </File>
    <File Include="views/生产管理/生产订单变更单/Sc_ICMOChangeBill.html">
      <publishTime>11/15/2023 20:40:37</publishTime>
@@ -4002,16 +4065,16 @@
      <publishTime>01/03/2024 08:07:18</publishTime>
    </File>
    <File Include="views/系统管理/用户管理/Gy_UserCustomer_ImportByExcel.html">
      <publishTime>01/03/2024 11:30:46</publishTime>
      <publishTime>01/03/2024 14:08:43</publishTime>
    </File>
    <File Include="views/系统管理/用户管理/Gy_UserDept.html">
      <publishTime>04/11/2023 16:34:43</publishTime>
    </File>
    <File Include="views/系统管理/用户管理/Gy_UserEmployee.html">
      <publishTime>04/11/2023 16:34:43</publishTime>
      <publishTime>01/03/2024 12:55:26</publishTime>
    </File>
    <File Include="views/系统管理/用户管理/Gy_UserEmployee_Excel.html">
      <publishTime>12/29/2023 11:38:44</publishTime>
      <publishTime>01/03/2024 12:55:26</publishTime>
    </File>
    <File Include="views/系统管理/用户管理/Gy_UserGroup.html">
      <publishTime>04/11/2023 16:34:43</publishTime>
@@ -4020,10 +4083,10 @@
      <publishTime>04/11/2023 16:34:43</publishTime>
    </File>
    <File Include="views/系统管理/用户管理/Gy_UserProcess.html">
      <publishTime>04/11/2023 16:34:43</publishTime>
      <publishTime>01/03/2024 12:55:26</publishTime>
    </File>
    <File Include="views/系统管理/用户管理/Gy_UserProcess_Excel.html">
      <publishTime>12/29/2023 11:38:44</publishTime>
      <publishTime>01/03/2024 12:55:26</publishTime>
    </File>
    <File Include="views/系统管理/用户管理/Gy_UserStock.html">
      <publishTime>04/11/2023 16:34:43</publishTime>
@@ -4044,7 +4107,7 @@
      <publishTime>12/29/2023 11:38:44</publishTime>
    </File>
    <File Include="views/系统管理/用户管理/Xt_UserSuplies_Excel.html">
      <publishTime>12/29/2023 11:38:44</publishTime>
      <publishTime>01/03/2024 12:55:26</publishTime>
    </File>
    <File Include="views/系统管理/系统参数管理/Xt_SystemParameterList.html">
      <publishTime>04/11/2023 16:34:43</publishTime>
@@ -4077,10 +4140,10 @@
      <publishTime>08/24/2023 08:50:29</publishTime>
    </File>
    <File Include="views/计划管理/工艺路线/Gy_RoutingBill.html">
      <publishTime>12/11/2023 10:08:35</publishTime>
      <publishTime>01/03/2024 12:55:26</publishTime>
    </File>
    <File Include="views/计划管理/工艺路线/Gy_RoutingBill.html">
      <publishTime>12/11/2023 10:08:35</publishTime>
      <publishTime>01/03/2024 12:55:26</publishTime>
    </File>
    <File Include="views/计划管理/工艺路线/Gy_RoutingBillimport.html">
      <publishTime>04/11/2023 16:34:43</publishTime>
@@ -4322,11 +4385,17 @@
    <File Include="views/质量管理/出厂检验单/QC_OutCompCheckBillList.html">
      <publishTime>11/03/2023 21:45:51</publishTime>
    </File>
    <File Include="views/质量管理/基础建模/Add_Edit_Gy_ErrType.html">
      <publishTime>01/03/2024 12:55:26</publishTime>
    </File>
    <File Include="views/质量管理/基础建模/Gy_ErrType.html">
      <publishTime>01/03/2024 12:55:26</publishTime>
    </File>
    <File Include="views/质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckBill.html">
      <publishTime>10/07/2023 09:12:15</publishTime>
    </File>
    <File Include="views/质量管理/巡检记录单/QC_PatrolProcCheckBillList.html">
      <publishTime>11/03/2023 21:45:51</publishTime>
      <publishTime>01/03/2024 12:55:26</publishTime>
    </File>
    <File Include="views/质量管理/工序检验单/MES_ProcessCheckBillList_PDA.html">
      <publishTime>11/03/2023 21:45:51</publishTime>
@@ -4338,7 +4407,7 @@
      <publishTime>12/20/2023 10:55:06</publishTime>
    </File>
    <File Include="views/质量管理/工序检验单/QC_ProcessCheckBillList.html">
      <publishTime>11/03/2023 21:45:51</publishTime>
      <publishTime>01/03/2024 12:55:26</publishTime>
    </File>
    <File Include="views/质量管理/来料检验单/Kf_QCStockInCheckBill_Fast.html">
      <publishTime>06/29/2023 15:20:45</publishTime>
@@ -4407,7 +4476,7 @@
      <publishTime>12/20/2023 10:55:06</publishTime>
    </File>
    <File Include="views/质量管理/首件检验单/QC_FirstPieceCheckBillList.html">
      <publishTime>11/03/2023 21:45:51</publishTime>
      <publishTime>01/03/2024 12:55:26</publishTime>
    </File>
    <File Include="views/设备管理/Sb_Add_EqpConkBookBillList.html">
      <publishTime>12/25/2023 14:58:48</publishTime>
@@ -4467,13 +4536,13 @@
      <publishTime>10/07/2023 09:12:15</publishTime>
    </File>
    <File Include="views/质量管理/巡检记录单/QC_PatrolProcCheckBillList.html">
      <publishTime>11/03/2023 21:45:51</publishTime>
      <publishTime>01/03/2024 12:55:26</publishTime>
    </File>
    <File Include="views/质量管理/工序检验单/QC_ProcessCheckBill.html">
      <publishTime>12/20/2023 10:55:06</publishTime>
    </File>
    <File Include="views/质量管理/工序检验单/QC_ProcessCheckBillList.html">
      <publishTime>11/03/2023 21:45:51</publishTime>
      <publishTime>01/03/2024 12:55:26</publishTime>
    </File>
    <File Include="views/质量管理/来料检验单/QC_Add_Edit_POStockInCheckBill.html">
      <publishTime>04/11/2023 16:34:43</publishTime>
@@ -4491,7 +4560,7 @@
      <publishTime>12/20/2023 10:55:06</publishTime>
    </File>
    <File Include="views/质量管理/首件检验单/QC_FirstPieceCheckBillList.html">
      <publishTime>11/03/2023 21:45:51</publishTime>
      <publishTime>01/03/2024 12:55:26</publishTime>
    </File>
    <File Include="views/质量管理/首件检验单/QC_FirstPieceCheckReport_ZDQX.html">
      <publishTime>11/03/2023 21:45:51</publishTime>
@@ -5091,7 +5160,7 @@
      <publishTime>10/15/2023 20:35:49</publishTime>
    </File>
    <File Include="views/项目管理/工作任务/PM_WorkTaskBillList.html">
      <publishTime>11/03/2023 21:45:51</publishTime>
      <publishTime>01/03/2024 12:55:26</publishTime>
    </File>
    <File Include="views/项目管理/工作任务/PM_WorkTaskReportBill.html">
      <publishTime>10/15/2023 20:35:49</publishTime>
@@ -5394,7 +5463,7 @@
      <publishTime>04/11/2023 16:34:43</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>12/29/2023 09:52:52</publishTime>
      <publishTime>01/03/2024 13:01:47</publishTime>
    </File>
  </ItemGroup>
</Project>

 WebTM/views/ϵͳ¹ÜÀí/Óû§¹ÜÀí/Gy_UserCustomer_ImportByExcel.html

@@ -131,7 +131,7 @@
            } else {
                var reConfirmBar = 1;
                for (var i = 0; i < option.data.length; i++) {
                    if (option.data[i].判定结果 != "" && option.data[i].判定结果 != "用户已经关联该客户；") {
                    if ( (option.data[i].判定结果 != "" && option.data[i].判定结果 != "用户已经关联该客户；") || (option.data[i].客户内码 === null || option.data[i].客户内码 == "") ) {
                        reConfirmBar = 0;
                        break;
                    }
@@ -139,7 +139,7 @@
                if (reConfirmBar == 1) {
                    set_AddNew(data, 1);
                } else {
                    layer.msg("保存失败，数据未通过校验，请在修改后重新校验！")
                    layer.msg("保存失败，数据未通过校验，请在修改后重新校验！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                }
            }
        })
@@ -150,7 +150,7 @@
            if (confirmBar == 1) {
                set_AddNew(data, 2);
            } else {
                layer.msg("保存失败，数据未通过校验，请在修改后重新校验！")
                layer.msg("保存失败，数据未通过校验，请在修改后重新校验！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
            }
        })
        //#endregion