模版绑定配方去重bug2024111-打包提交

dist/asset-manifest.json

@@ -1,6 +1,6 @@
 {
   "/umi.css": "/umi.3663c81d.css",
-  "/umi.js": "/umi.6f24377c.js",
+  "/umi.js": "/umi.a03e5fe9.js",
   "/t__plugin-layout__Layout.css": "/t__plugin-layout__Layout.e1129705.chunk.css",
   "/t__plugin-layout__Layout.js": "/t__plugin-layout__Layout.2b13eb06.async.js",
   "/p__user__login.css": "/p__user__login.2f84d6a8.chunk.css",
@@ -56,7 +56,7 @@
   "/866.ff791879.async.js": "/866.ff791879.async.js",
   "/667.9fcc4826.async.js": "/667.9fcc4826.async.js",
   "/607.2aeb1e75.async.js": "/607.2aeb1e75.async.js",
-  "/899.4d610b05.async.js": "/899.4d610b05.async.js",
+  "/899.634b5ec9.async.js": "/899.634b5ec9.async.js",
   "/public/logo.png": "/logo.png",
   "/public/logo.svg": "/logo.svg",
   "/public/icons/icon-512x512.png": "/icons/icon-512x512.png",

dist/authorization/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.6f24377c.js"></script>
+    <script src="/umi.a03e5fe9.js"></script>
   </body>
 </html>

dist/authorization/platformAuthorization/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.6f24377c.js"></script>
+    <script src="/umi.a03e5fe9.js"></script>
   </body>
 </html>

dist/authorization/storeAuthorization/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.6f24377c.js"></script>
+    <script src="/umi.a03e5fe9.js"></script>
   </body>
 </html>

dist/batching/batchinginfo/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.6f24377c.js"></script>
+    <script src="/umi.a03e5fe9.js"></script>
   </body>
 </html>

dist/batching/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.6f24377c.js"></script>
+    <script src="/umi.a03e5fe9.js"></script>
   </body>
 </html>

dist/company/account/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.6f24377c.js"></script>
+    <script src="/umi.a03e5fe9.js"></script>
   </body>
 </html>

dist/company/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.6f24377c.js"></script>
+    <script src="/umi.a03e5fe9.js"></script>
   </body>
 </html>

dist/device/deviceInfo/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.6f24377c.js"></script>
+    <script src="/umi.a03e5fe9.js"></script>
   </body>
 </html>

dist/device/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.6f24377c.js"></script>
+    <script src="/umi.a03e5fe9.js"></script>
   </body>
 </html>

dist/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.6f24377c.js"></script>
+    <script src="/umi.a03e5fe9.js"></script>
   </body>
 </html>

dist/interfacedoc/index/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.6f24377c.js"></script>
+    <script src="/umi.a03e5fe9.js"></script>
   </body>
 </html>

dist/order/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.6f24377c.js"></script>
+    <script src="/umi.a03e5fe9.js"></script>
   </body>
 </html>

dist/order/orderflow/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.6f24377c.js"></script>
+    <script src="/umi.a03e5fe9.js"></script>
   </body>
 </html>

dist/order/thirdAuthorize/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.6f24377c.js"></script>
+    <script src="/umi.a03e5fe9.js"></script>
   </body>
 </html>

dist/order/thirdOrder/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.6f24377c.js"></script>
+    <script src="/umi.a03e5fe9.js"></script>
   </body>
 </html>

dist/org/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.6f24377c.js"></script>
+    <script src="/umi.a03e5fe9.js"></script>
   </body>
 </html>

dist/org/orgamange/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.6f24377c.js"></script>
+    <script src="/umi.a03e5fe9.js"></script>
   </body>
 </html>

dist/org/roles/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.6f24377c.js"></script>
+    <script src="/umi.a03e5fe9.js"></script>
   </body>
 </html>

dist/org/users/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.6f24377c.js"></script>
+    <script src="/umi.a03e5fe9.js"></script>
   </body>
 </html>

dist/recipe/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.6f24377c.js"></script>
+    <script src="/umi.a03e5fe9.js"></script>
   </body>
 </html>

dist/recipe/recipegrouptemplate/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.6f24377c.js"></script>
+    <script src="/umi.a03e5fe9.js"></script>
   </body>
 </html>

dist/recipe/recipeinfo/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.6f24377c.js"></script>
+    <script src="/umi.a03e5fe9.js"></script>
   </body>
 </html>

dist/report/batchingreport/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.6f24377c.js"></script>
+    <script src="/umi.a03e5fe9.js"></script>
   </body>
 </html>

dist/report/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.6f24377c.js"></script>
+    <script src="/umi.a03e5fe9.js"></script>
   </body>
 </html>

dist/report/recipereport/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.6f24377c.js"></script>
+    <script src="/umi.a03e5fe9.js"></script>
   </body>
 </html>

dist/store/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.6f24377c.js"></script>
+    <script src="/umi.a03e5fe9.js"></script>
   </body>
 </html>

dist/store/storeinfo/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.6f24377c.js"></script>
+    <script src="/umi.a03e5fe9.js"></script>
   </body>
 </html>

dist/sys/activationinfo/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.6f24377c.js"></script>
+    <script src="/umi.a03e5fe9.js"></script>
   </body>
 </html>

dist/sys/devicelog/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.6f24377c.js"></script>
+    <script src="/umi.a03e5fe9.js"></script>
   </body>
 </html>

dist/sys/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.6f24377c.js"></script>
+    <script src="/umi.a03e5fe9.js"></script>
   </body>
 </html>

dist/sys/menus/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.6f24377c.js"></script>
+    <script src="/umi.a03e5fe9.js"></script>
   </body>
 </html>

dist/user/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.6f24377c.js"></script>
+    <script src="/umi.a03e5fe9.js"></script>
   </body>
 </html>

dist/user/login/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.6f24377c.js"></script>
+    <script src="/umi.a03e5fe9.js"></script>
   </body>
 </html>

dist/welcome/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.6f24377c.js"></script>
+    <script src="/umi.a03e5fe9.js"></script>
   </body>
 </html>

src/pages/recipe/recipetemplate/components/RecipeTemplateForm.jsx

@@ -161,6 +161,7 @@ const RecipeTemplateForm = (props) => {
         modalVisible={modalVisible}
         isWeight={props.isWeight}
         autoKey={props.autoKey}
+        groupTempId={props.groupTempId}
         values={recipeTemplate || {}}
       />
     </div>

src/pages/recipe/recipetemplate/components/UpRecipeTemplateForm.jsx

@@ -14,7 +14,7 @@ const UpdateRecipeInfoForm = (props) => {
   }, [props.values]);
 
   const getRecipeVersionSelectList = async () => {
-    await api.getRecipeVersionSelectList(props.values.recipeId, props.isWeight, props.autoKey).then((r) => {
+    await api.getRecipeVersionSelectList(props.values.recipeId != null ? props.values.recipeId : "", props.isWeight, props.autoKey, props.groupTempId).then((r) => {
       if (r.data) {
         setRecipeList(r.data);
         var data = r.data.find(t => t.recipeId == props.values.recipeId);

src/pages/recipe/recipetemplate/index.jsx

@@ -161,7 +161,7 @@ const recipetemplate = (props) => {
               marginTop: -10,
               marginBottom: 10,
               backgroundColor: isWeight ? '#8F452B' : '#FA541C',
-              borderColor: isWeight ? '#8F452B' : '#FA541C', 
+              borderColor: isWeight ? '#8F452B' : '#FA541C',
             }}
           />
           <div>
@@ -256,7 +256,14 @@ const recipetemplate = (props) => {
               }
             </div>
             {
-              <RecipeTemplateForm values={recipeInfoValues} current={current} groupId={groupId} isWeight={isWeight} autoKey={props.autoKey ? props.autoKey : 0} />
+              <RecipeTemplateForm
+                values={recipeInfoValues}
+                current={current}
+                groupId={groupId}
+                isWeight={isWeight}
+                autoKey={props.autoKey ? props.autoKey : 0}
+                groupTempId={props.groupTempId ? props.groupTempId : ""}
+              />
             }
           </div>
         </ProCard>

src/pages/recipe/recipetemplate/service.js

@@ -49,8 +49,8 @@ export default {
       method: 'Get',
     });
   },
-  getRecipeVersionSelectList(recipeId, isWeight, autoKey) {
-    return request(getDataBaseUrl() + `/api/recipe/getRecipeVersionSelectList?recipeId=${recipeId}&isWeight=${isWeight}&autoKey=${autoKey}`, {
+  getRecipeVersionSelectList(recipeId, isWeight, autoKey, groupTempId) {
+    return request(getDataBaseUrl() + `/api/recipe/getRecipeVersionSelectList?recipeId=${recipeId}&isWeight=${isWeight}&autoKey=${autoKey}&groupTempId=${groupTempId}`, {
       method: 'Get',
     });
   },