Merge branch 'dev' of http://10.2.1.24:10244/bpa/BPA.KitChen.Web into dev

src/pages/erp/basic/product/components/CreateForm.jsx

@@ -221,11 +221,11 @@ const CreateForm = (props) => {
               rules={[
                 {
                   required: true,
-                  message: '请选择物料类型',
+                  message: '请选择物料类别',
                 },
               ]}
               request={async () => props.typeListData}
-              placeholder="请选择物料类型"
+              placeholder="请选择物料类别"
             />
           </Col>
           <Col lg={8} md={12} sm={24}>

src/pages/order/cost-of-sales/index.jsx

@@ -69,6 +69,7 @@ export default function Index() {
             key: 'goodsId',
             render: (text) => {
                 const findGoods = goodsIdSelect.find(item => item.id === text);
+                console.log(">>>>", goodsIdSelect, text, findGoods)
                 if (findGoods) {
                     return <span>{findGoods.name}</span>
                 } else {