Prechádzať zdrojové kódy

1、床垫报价-修复分享报价出现key冲突问题
2、床垫清单-修复复制副规格不显示未产品审核单据问题

MY 1 mesiac pred
rodič
commit
462ebe18bf

+ 4 - 2
JLHHJSvr/Helper/MattressHelper.cs

@@ -2207,9 +2207,9 @@ namespace JLHHJSvr.Helper
                 _mattress.extraCostList = mattressMxExtra2List;
                 _mattress.subspecsList = mattressSubspecs;
                 SaveMattressPro(_mattress,true);
-                CopyMattressInterface(mattress_copy.mattressid,mattress.mattressid);
+                CopyMattressInterface(mattress.mattressid, _mattress.mattressid);
 
-                foreach (var sub in mattressSubspecs)
+                foreach (var sub in _mattress.subspecsList)
                 {
                     CopyMattressInterface(sub.copy_id.Value,sub.mattressid);
                 }
@@ -3047,6 +3047,8 @@ namespace JLHHJSvr.Helper
                 MattressCalculateCost(child, child.mxList, child.extraList, child.extraCostList);
                 SaveMattressPro(child, ifErp);
             }
+
+            mattress.subspecsList = subspecsList;
         }
         /// <summary>
         /// 子规格复制逻辑

+ 1 - 1
JLHWEB/src/views/erpapi/mattressInterface/detail.vue

@@ -853,7 +853,7 @@ const orderDefaultAction = [
       return !orderStatus.value || editType.value == 3;
     },
     clickFunc: item => {
-      fModelChoseMattress("", { arg_parentid: 0 }).then((res: any) => {
+      fModelChoseMattress("", { arg_parentid: 0, js1_flag: 1 }).then((res: any) => {
         RefreshMattressInterfaceList(
           res.mattressid,
           1,

+ 0 - 1
JLHWEB/src/views/erpapi/mattressInterface/hooks/index.tsx

@@ -2161,7 +2161,6 @@ export const useHooks = (t?: any) => {
     return new Promise((resolve, reject) => {
       let _params = {
         arg_deptid: state.mainData[0].deptid,
-        js1_flag: 1,
         ...params
       };
       state.MattressDialogProps = {