给单据录入界面增加品牌和制造商的展示

jshERP-web/src/views/bill/mixins/BillModalMixin.js

@@ -606,6 +606,8 @@ export const BillModalMixin = {
         standard: mInfo.standard,
         model: mInfo.model,
         color: mInfo.color,
+        brand: mInfo.brand,
+        mfrs: mInfo.mfrs,
         materialOther: mInfo.materialOther,
         unit: mInfo.commodityUnit,
         sku: mInfo.sku,
@@ -621,6 +623,8 @@ export const BillModalMixin = {
     changeColumnHide() {
       this.changeFormTypes(this.materialTable.columns, 'model', 0)
       this.changeFormTypes(this.materialTable.columns, 'color', 0)
+      this.changeFormTypes(this.materialTable.columns, 'brand', 0)
+      this.changeFormTypes(this.materialTable.columns, 'mfrs', 0)
       this.changeFormTypes(this.materialTable.columns, 'materialOther', 0)
       this.changeFormTypes(this.materialTable.columns, 'sku', 0)
     },
@@ -632,6 +636,12 @@ export const BillModalMixin = {
       if(info.color) {
         this.changeFormTypes(this.materialTable.columns, 'color', 1)
       }
+      if(info.brand) {
+        this.changeFormTypes(this.materialTable.columns, 'brand', 1)
+      }
+      if(info.mfrs) {
+        this.changeFormTypes(this.materialTable.columns, 'mfrs', 1)
+      }
       if(info.materialOther) {
         this.changeFormTypes(this.materialTable.columns, 'materialOther', 1)
       }

jshERP-web/src/views/bill/modules/AllocationOutModal.vue

@@ -151,6 +151,8 @@
             { title: '规格', key: 'standard', width: '9%', type: FormTypes.normal },
             { title: '型号', key: 'model', width: '9%', type: FormTypes.normal },
             { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },
+            { title: '品牌', key: 'brand', width: '6%', type: FormTypes.normal },
+            { title: '制造商', key: 'mfrs', width: '6%', type: FormTypes.normal },
             { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal },
             { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },
             { title: '调入仓库', key: 'anotherDepotId', width: '8%', type: FormTypes.select, placeholder: '请选择${title}', options: [], allowSearch:true},

jshERP-web/src/views/bill/modules/AssembleModal.vue

@@ -152,6 +152,8 @@
             { title: '规格', key: 'standard', width: '9%', type: FormTypes.normal },
             { title: '型号', key: 'model', width: '9%', type: FormTypes.normal },
             { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },
+            { title: '品牌', key: 'brand', width: '6%', type: FormTypes.normal },
+            { title: '制造商', key: 'mfrs', width: '6%', type: FormTypes.normal },
             { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal },
             { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },
             { title: '单位', key: 'unit', width: '4%', type: FormTypes.normal },

jshERP-web/src/views/bill/modules/DisassembleModal.vue

@@ -152,6 +152,8 @@
             { title: '规格', key: 'standard', width: '9%', type: FormTypes.normal },
             { title: '型号', key: 'model', width: '9%', type: FormTypes.normal },
             { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },
+            { title: '品牌', key: 'brand', width: '6%', type: FormTypes.normal },
+            { title: '制造商', key: 'mfrs', width: '6%', type: FormTypes.normal },
             { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal },
             { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },
             { title: '单位', key: 'unit', width: '4%', type: FormTypes.normal },

jshERP-web/src/views/bill/modules/OtherInModal.vue

@@ -189,6 +189,8 @@
             { title: '规格', key: 'standard', width: '9%', type: FormTypes.normal },
             { title: '型号', key: 'model', width: '9%', type: FormTypes.normal },
             { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },
+            { title: '品牌', key: 'brand', width: '6%', type: FormTypes.normal },
+            { title: '制造商', key: 'mfrs', width: '6%', type: FormTypes.normal },
             { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal },
             { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },
             { title: '单位', key: 'unit', width: '4%', type: FormTypes.normal },

jshERP-web/src/views/bill/modules/OtherOutModal.vue

@@ -189,6 +189,8 @@
             { title: '规格', key: 'standard', width: '9%', type: FormTypes.normal },
             { title: '型号', key: 'model', width: '9%', type: FormTypes.normal },
             { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },
+            { title: '品牌', key: 'brand', width: '6%', type: FormTypes.normal },
+            { title: '制造商', key: 'mfrs', width: '6%', type: FormTypes.normal },
             { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal },
             { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },
             { title: '单位', key: 'unit', width: '4%', type: FormTypes.normal },

jshERP-web/src/views/bill/modules/PurchaseApplyModal.vue

@@ -166,6 +166,8 @@
             { title: '规格', key: 'standard', width: '9%', type: FormTypes.normal },
             { title: '型号', key: 'model', width: '9%', type: FormTypes.normal },
             { title: '颜色', key: 'color', width: '6%', type: FormTypes.normal },
+            { title: '品牌', key: 'brand', width: '6%', type: FormTypes.normal },
+            { title: '制造商', key: 'mfrs', width: '6%', type: FormTypes.normal },
             { title: '扩展信息', key: 'materialOther', width: '6%', type: FormTypes.normal },
             { title: '单位', key: 'unit', width: '6%', type: FormTypes.normal },
             { title: '多属性', key: 'sku', width: '10%', type: FormTypes.normal },

jshERP-web/src/views/bill/modules/PurchaseBackModal.vue

@@ -243,6 +243,8 @@
             { title: '规格', key: 'standard', width: '9%', type: FormTypes.normal },
             { title: '型号', key: 'model', width: '9%', type: FormTypes.normal },
             { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },
+            { title: '品牌', key: 'brand', width: '6%', type: FormTypes.normal },
+            { title: '制造商', key: 'mfrs', width: '6%', type: FormTypes.normal },
             { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal },
             { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },
             { title: '单位', key: 'unit', width: '4%', type: FormTypes.normal },

jshERP-web/src/views/bill/modules/PurchaseInModal.vue

@@ -276,6 +276,8 @@
             { title: '规格', key: 'standard', width: '9%', type: FormTypes.normal },
             { title: '型号', key: 'model', width: '9%', type: FormTypes.normal },
             { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },
+            { title: '品牌', key: 'brand', width: '6%', type: FormTypes.normal },
+            { title: '制造商', key: 'mfrs', width: '6%', type: FormTypes.normal },
             { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal },
             { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },
             { title: '单位', key: 'unit', width: '4%', type: FormTypes.normal },

jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue

@@ -259,6 +259,8 @@
             { title: '规格', key: 'standard', width: '9%', type: FormTypes.normal },
             { title: '型号', key: 'model', width: '9%', type: FormTypes.normal },
             { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },
+            { title: '品牌', key: 'brand', width: '6%', type: FormTypes.normal },
+            { title: '制造商', key: 'mfrs', width: '6%', type: FormTypes.normal },
             { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal },
             { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },
             { title: '单位', key: 'unit', width: '4%', type: FormTypes.normal },

jshERP-web/src/views/bill/modules/RetailBackModal.vue

@@ -232,6 +232,8 @@
             { title: '规格', key: 'standard', width: '10%', type: FormTypes.normal },
             { title: '型号', key: 'model', width: '10%', type: FormTypes.normal },
             { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },
+            { title: '品牌', key: 'brand', width: '6%', type: FormTypes.normal },
+            { title: '制造商', key: 'mfrs', width: '6%', type: FormTypes.normal },
             { title: '扩展信息', key: 'materialOther', width: '7%', type: FormTypes.normal },
             { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },
             { title: '单位', key: 'unit', width: '5%', type: FormTypes.normal },

jshERP-web/src/views/bill/modules/RetailOutModal.vue

@@ -244,6 +244,8 @@
             { title: '规格', key: 'standard', width: '10%', type: FormTypes.normal },
             { title: '型号', key: 'model', width: '10%', type: FormTypes.normal },
             { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },
+            { title: '品牌', key: 'brand', width: '6%', type: FormTypes.normal },
+            { title: '制造商', key: 'mfrs', width: '6%', type: FormTypes.normal },
             { title: '扩展信息', key: 'materialOther', width: '7%', type: FormTypes.normal },
             { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },
             { title: '单位', key: 'unit', width: '5%', type: FormTypes.normal },

jshERP-web/src/views/bill/modules/SaleBackModal.vue

@@ -248,6 +248,8 @@
             { title: '规格', key: 'standard', width: '9%', type: FormTypes.normal },
             { title: '型号', key: 'model', width: '9%', type: FormTypes.normal },
             { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },
+            { title: '品牌', key: 'brand', width: '6%', type: FormTypes.normal },
+            { title: '制造商', key: 'mfrs', width: '6%', type: FormTypes.normal },
             { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal },
             { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },
             { title: '单位', key: 'unit', width: '4%', type: FormTypes.normal },

jshERP-web/src/views/bill/modules/SaleOrderModal.vue

@@ -244,6 +244,8 @@
             { title: '规格', key: 'standard', width: '9%', type: FormTypes.normal },
             { title: '型号', key: 'model', width: '9%', type: FormTypes.normal },
             { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },
+            { title: '品牌', key: 'brand', width: '6%', type: FormTypes.normal },
+            { title: '制造商', key: 'mfrs', width: '6%', type: FormTypes.normal },
             { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal },
             { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },
             { title: '单位', key: 'unit', width: '4%', type: FormTypes.normal },

jshERP-web/src/views/bill/modules/SaleOutModal.vue

@@ -291,6 +291,8 @@
             { title: '规格', key: 'standard', width: '9%', type: FormTypes.normal },
             { title: '型号', key: 'model', width: '9%', type: FormTypes.normal },
             { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },
+            { title: '品牌', key: 'brand', width: '6%', type: FormTypes.normal },
+            { title: '制造商', key: 'mfrs', width: '6%', type: FormTypes.normal },
             { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal },
             { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },
             { title: '单位', key: 'unit', width: '4%', type: FormTypes.normal },