商品新增查看配方弹窗20240912-打包提交

dist/asset-manifest.json

@@ -1,6 +1,6 @@
 {
   "/umi.css": "/umi.2d7db433.css",
-  "/umi.js": "/umi.9daee39b.js",
+  "/umi.js": "/umi.80142491.js",
   "/t__plugin-layout__Layout.css": "/t__plugin-layout__Layout.e1129705.chunk.css",
   "/t__plugin-layout__Layout.js": "/t__plugin-layout__Layout.87f875be.async.js",
   "/p__user__login.css": "/p__user__login.2f84d6a8.chunk.css",
@@ -23,8 +23,8 @@
   "/p__database__goods__goodstypemanage.js": "/p__database__goods__goodstypemanage.22dd50b7.async.js",
   "/p__database__goods__goodsattribute.js": "/p__database__goods__goodsattribute.4738ebf1.async.js",
   "/p__database__goods__newgoods.css": "/p__database__goods__newgoods.648d67d4.chunk.css",
-  "/p__database__goods__newgoods.js": "/p__database__goods__newgoods.1b937ba1.async.js",
-  "/p__database__goods__goodsInfo.js": "/p__database__goods__goodsInfo.3cab935f.async.js",
+  "/p__database__goods__newgoods.js": "/p__database__goods__newgoods.2b98b660.async.js",
+  "/p__database__goods__goodsInfo.js": "/p__database__goods__goodsInfo.c1755db7.async.js",
   "/p__database__goods__goodsbom.js": "/p__database__goods__goodsbom.bf9c6572.async.js",
   "/p__database__goods__goodstechnology.css": "/p__database__goods__goodstechnology.bee21a79.chunk.css",
   "/p__database__goods__goodstechnology.js": "/p__database__goods__goodstechnology.1ea43b2e.async.js",

dist/authorization/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.9daee39b.js"></script>
+    <script src="/umi.80142491.js"></script>
   </body>
 </html>

dist/authorization/platformAuthorization/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.9daee39b.js"></script>
+    <script src="/umi.80142491.js"></script>
   </body>
 </html>

dist/authorization/storeAuthorization/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.9daee39b.js"></script>
+    <script src="/umi.80142491.js"></script>
   </body>
 </html>

dist/company/account/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.9daee39b.js"></script>
+    <script src="/umi.80142491.js"></script>
   </body>
 </html>

dist/company/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.9daee39b.js"></script>
+    <script src="/umi.80142491.js"></script>
   </body>
 </html>

dist/database/basic/batching/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.9daee39b.js"></script>
+    <script src="/umi.80142491.js"></script>
   </body>
 </html>

dist/database/bom/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.9daee39b.js"></script>
+    <script src="/umi.80142491.js"></script>
   </body>
 </html>

dist/database/goods/goodsInfo/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.9daee39b.js"></script>
+    <script src="/umi.80142491.js"></script>
   </body>
 </html>

dist/database/goods/goodsattribute/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.9daee39b.js"></script>
+    <script src="/umi.80142491.js"></script>
   </body>
 </html>

dist/database/goods/goodsattributeprice/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.9daee39b.js"></script>
+    <script src="/umi.80142491.js"></script>
   </body>
 </html>

dist/database/goods/goodsbom/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.9daee39b.js"></script>
+    <script src="/umi.80142491.js"></script>
   </body>
 </html>

dist/database/goods/goodsclassify/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.9daee39b.js"></script>
+    <script src="/umi.80142491.js"></script>
   </body>
 </html>

dist/database/goods/goodstechnology/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.9daee39b.js"></script>
+    <script src="/umi.80142491.js"></script>
   </body>
 </html>

dist/database/goods/goodstypemanage/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.9daee39b.js"></script>
+    <script src="/umi.80142491.js"></script>
   </body>
 </html>

dist/database/goods/newgoods/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.9daee39b.js"></script>
+    <script src="/umi.80142491.js"></script>
   </body>
 </html>

dist/database/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.9daee39b.js"></script>
+    <script src="/umi.80142491.js"></script>
   </body>
 </html>

dist/device/deviceInfo/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.9daee39b.js"></script>
+    <script src="/umi.80142491.js"></script>
   </body>
 </html>

dist/device/deviceVesion/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.9daee39b.js"></script>
+    <script src="/umi.80142491.js"></script>
   </body>
 </html>

dist/device/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.9daee39b.js"></script>
+    <script src="/umi.80142491.js"></script>
   </body>
 </html>

dist/device/product/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.9daee39b.js"></script>
+    <script src="/umi.80142491.js"></script>
   </body>
 </html>

dist/device/productmanage/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.9daee39b.js"></script>
+    <script src="/umi.80142491.js"></script>
   </body>
 </html>

dist/device/technology/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.9daee39b.js"></script>
+    <script src="/umi.80142491.js"></script>
   </body>
 </html>

dist/device/warehousepostion/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.9daee39b.js"></script>
+    <script src="/umi.80142491.js"></script>
   </body>
 </html>

dist/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.9daee39b.js"></script>
+    <script src="/umi.80142491.js"></script>
   </body>
 </html>

dist/order/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.9daee39b.js"></script>
+    <script src="/umi.80142491.js"></script>
   </body>
 </html>

dist/order/orderflow/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.9daee39b.js"></script>
+    <script src="/umi.80142491.js"></script>
   </body>
 </html>

dist/order/thirdAuthorize/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.9daee39b.js"></script>
+    <script src="/umi.80142491.js"></script>
   </body>
 </html>

dist/order/thirdOrder/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.9daee39b.js"></script>
+    <script src="/umi.80142491.js"></script>
   </body>
 </html>

dist/org/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.9daee39b.js"></script>
+    <script src="/umi.80142491.js"></script>
   </body>
 </html>

dist/org/orgamange/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.9daee39b.js"></script>
+    <script src="/umi.80142491.js"></script>
   </body>
 </html>

dist/org/roles/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.9daee39b.js"></script>
+    <script src="/umi.80142491.js"></script>
   </body>
 </html>

dist/org/users/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.9daee39b.js"></script>
+    <script src="/umi.80142491.js"></script>
   </body>
 </html>

dist/push/batchingpush/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.9daee39b.js"></script>
+    <script src="/umi.80142491.js"></script>
   </body>
 </html>

dist/push/bompush/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.9daee39b.js"></script>
+    <script src="/umi.80142491.js"></script>
   </body>
 </html>

dist/push/goodspush/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.9daee39b.js"></script>
+    <script src="/umi.80142491.js"></script>
   </body>
 </html>

dist/push/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.9daee39b.js"></script>
+    <script src="/umi.80142491.js"></script>
   </body>
 </html>

dist/push/technologypush/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.9daee39b.js"></script>
+    <script src="/umi.80142491.js"></script>
   </body>
 </html>

dist/scene/foodmenu/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.9daee39b.js"></script>
+    <script src="/umi.80142491.js"></script>
   </body>
 </html>

dist/scene/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.9daee39b.js"></script>
+    <script src="/umi.80142491.js"></script>
   </body>
 </html>

dist/scene/store/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.9daee39b.js"></script>
+    <script src="/umi.80142491.js"></script>
   </body>
 </html>

dist/sys/dictionary/dicttype/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.9daee39b.js"></script>
+    <script src="/umi.80142491.js"></script>
   </body>
 </html>

dist/sys/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.9daee39b.js"></script>
+    <script src="/umi.80142491.js"></script>
   </body>
 </html>

dist/sys/menus/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.9daee39b.js"></script>
+    <script src="/umi.80142491.js"></script>
   </body>
 </html>

dist/user/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.9daee39b.js"></script>
+    <script src="/umi.80142491.js"></script>
   </body>
 </html>

dist/user/login/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.9daee39b.js"></script>
+    <script src="/umi.80142491.js"></script>
   </body>
 </html>

dist/welcome/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.9daee39b.js"></script>
+    <script src="/umi.80142491.js"></script>
   </body>
 </html>

src/pages/database/goods/newgoods/index.jsx

@@ -1,5 +1,5 @@
 import { PlusOutlined, UploadOutlined, QuestionCircleOutlined, DownloadOutlined } from '@ant-design/icons';
-import { Button, message, Input, Drawer, Popconfirm, Upload, Spin, Tooltip, Modal, Select, Form } from 'antd';
+import { Button, message, Drawer, Popconfirm, Upload, Spin, Tooltip, Modal, Form } from 'antd';
 import React, { useState, useRef, useEffect } from 'react';
 import { PageContainer } from '@ant-design/pro-layout';
 import ProTable from '@ant-design/pro-table';
@@ -8,7 +8,7 @@ import { history } from 'umi';
 import CreateForm from './components/CreateForm';
 import ChooseForm from './components/ChooseForm';
 import { getDataBaseUrl } from '@/global_data';
-import { gettree, goods, removeGoods, addGoods, updateGoods, GetDeviceTechnology, GetgoodsWithIds, Getgoodslist, GoodsExport } from './service';
+import { gettree, goods, removeGoods, addGoods, updateGoods, GetDeviceTechnology, GoodsExport, GetGoodsRecipeList } from './service';
 import axios from 'axios';
 
 const aliyunHostUrl = 'https://bpa.oss-cn-chengdu.aliyuncs.com/hkerp/test/goods/';
@@ -35,6 +35,8 @@ const GoodsManage = () => {
   const [importFile, setImportFile] = useState();
   const [showChooseForm, setShowChooseForm] = useState(false);
   const [chooseFormData, setChooseFormData] = useState([]);
+  const [showRecipeForm, setShowRecipeForm] = useState(false);
+  const [recipeGoodsId, setRecipeGoodsId] = useState([]);
   /** 国际化配置 */
   useEffect(() => {
     gettree().then((r) => {
@@ -213,7 +215,7 @@ const GoodsManage = () => {
       dataIndex: 'option',
       valueType: 'option',
       fixed: 'right',
-      width: 350,
+      width: 400,
       render: (_, record) => [
         <a
           key="primary"
@@ -294,8 +296,17 @@ const GoodsManage = () => {
           }}
         >
           下载商品
-        </a>
-        ,
+        </a>,
+        <a
+          key="primary"
+          type="primary"
+          onClick={() => {
+            setRecipeGoodsId(record.id);
+            setShowRecipeForm(true);
+          }}
+        >
+          查看配方
+        </a>,
         <Popconfirm
           type="primary"
           key="primary"
@@ -319,7 +330,37 @@ const GoodsManage = () => {
       ],
     },
   ];
-
+  const recipeColumns = [
+    {
+      title: '序号',
+      dataIndex: 'sort',
+      hideInSearch: true
+    },
+    {
+      title: '商品名称',
+      dataIndex: 'name',
+      hideInSearch: true,
+      render: (text) => text === "-" ? '' : text
+    },
+    {
+      title: '工序名称',
+      dataIndex: 'technologyName',
+      hideInSearch: true,
+      render: (text) => text === "-" ? '' : text
+    },
+    {
+      title: '主/物料名称',
+      dataIndex: 'batchingName',
+      hideInSearch: true,
+      render: (text) => text === "-" ? '' : text
+    },
+    {
+      title: '重量',
+      dataIndex: 'weight',
+      hideInSearch: true,
+      render: (text) => text === "-" ? '' : text
+    },
+  ];
   const importMessage = (json) =>{
     const hide = message.loading('正在导入');
     const formDataAll = new FormData();
@@ -553,6 +594,35 @@ const GoodsManage = () => {
           values={currentRow || {}}
           form={form}
         />
+        <Modal
+          title="配方详情"
+          open={showRecipeForm}
+          onCancel={() => {
+            setShowRecipeForm(false);
+          }}
+          width={1040}
+          destroyOnClose={true}
+          bodyStyle={{ padding: '32px 40px 1px 48px' }}
+          footer={null}
+          maskClosable={false}
+        >
+          <ProTable
+            pagination={false}
+            search={false}
+            rowKey="sort"
+            request={async () => {
+              var recipeData = [];
+              await GetGoodsRecipeList(recipeGoodsId).then((r) => {
+                recipeData = r.data;
+              });
+              return {
+                data: recipeData,
+                success: true,
+              };
+            }}
+            columns={recipeColumns}
+          />
+        </Modal>
         <ChooseForm 
           onFinish={async (data) => {
             const transformedData = Object.entries(data).map(([key, value]) => ({

src/pages/database/goods/newgoods/service.js

@@ -185,4 +185,10 @@ export async function GoodsImport(data) {
     method: 'post',
     data: data
   });
+}
+
+export async function GetGoodsRecipeList(data) {
+  return request(getDataBaseUrl()+`/api/goods/GetGoodsRecipeList?goodsId=${data}`, {
+    method: 'Get',
+  });
 }