Merge remote-tracking branch 'origin/dev' into dev

src/views/tirePartsMall/purchasingManagement/warehouseEntryOrder/detailsPage.vue

@@ -421,19 +421,25 @@ export default {
                     overHidden: true,
                     disabled: false,
                     width: 140
-                }, {
+                // }, {
+                //     label: "品牌",
+                //     prop: 'brandId',
+                //     width: 100,
+                //     overHidden: true,
+                //     disabled: false,
+                //     type: 'select',
+                //     props: {
+                //         label: 'cname',
+                //         value: 'id'
+                //     },
+                //     dicUrl: '/api/blade-sales-part/brandDesc/listAll?type=PP'
+                // }, {
+                  }, {
                     label: "品牌",
-                    prop: 'brandId',
-                    width: 100,
-                    overHidden: true,
+                    prop: "brandName",
                     disabled: false,
-                    type: 'select',
-                    props: {
-                        label: 'cname',
-                        value: 'id'
-                    },
-                    dicUrl: '/api/blade-sales-part/brandDesc/listAll?type=PP'
-                }, {
+                    overHidden: true
+                  }, {
                     label: "规格型号",
                     prop: "propertyName",
                     overHidden: true,

src/views/tirePartsMall/salesManagement/saleOrder/index.vue

@@ -118,17 +118,31 @@ export default {
             overHidden: true,
             width: 150
           },
+          // {
+          //   label: '品牌',
+          //   prop: 'brandId',
+          //   disabled: false,
+          //   width: 100,
+          //   overHidden: true,
+          //   props: {
+          //     label: 'cname',
+          //     value: 'id'
+          //   },
+          //   dicUrl: '/api/blade-sales-part/brandDesc/listAll?type=PP'
+          // },
           {
             label: '品牌',
-            prop: 'brandId',
+            prop: 'brandName',
+            overHidden: true,
             disabled: false,
-            width: 100,
+            width: 150
+          },
+          {
+            label: '规格型号',
+            prop: 'propertyName',
             overHidden: true,
-            props: {
-              label: 'cname',
-              value: 'id'
-            },
-            dicUrl: '/api/blade-sales-part/brandDesc/listAll?type=PP'
+            disabled: false,
+            width: 150
           },
           {
             label: '花纹',