Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyuji

2023-12-27 6465284c2be13a30785c8dccc7c2eba3b52d5a46

Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

 north-glass-erp/northglass-erp/src/views/mm/mainProductStock/CreateProductStock.vue

@@ -81,10 +81,11 @@
  ],//表头按钮
  toolbarConfig: {
    buttons: [{
      'name': '确认入库',
      'code':'add',
      status: 'primary'
    }],
      'name': '确认入库',status: 'primary',

      'code':'add'
    }
      ],
    import: false,
    export: true,
    print: true,

 north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductOut.vue

@@ -82,7 +82,8 @@
  ],//表头按钮
  toolbarConfig: {
    buttons: [{
      'name': '确认出库',status: 'primary'
      'name': '确认出库',
      status: 'primary'
    }],
    import: false,
    export: true,