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

guoyujie

2025-09-09 aa81c2e975852f293e4b2706e0f667c9cbaf38c9

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

 north-glass-erp/northglass-erp/src/views/pp/replenish/AddReplenish.vue

@@ -119,7 +119,6 @@
    showStatus: true
  },//表头参数
  columns:[
    {type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
    {field: 'select',type: "checkbox",title: t('basicData.check'), width: 80,fixed:"left"},
    {type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
    {field: 'reportingWorkTime', width: 120, title: t('reportingWorks.reportingWorkTime'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},

 north-glass-erp/northglass-erp/src/views/pp/replenish/PrintReplenishFlowCard.vue

@@ -286,7 +286,6 @@
    showStatus: true
  },//表头参数
  columns: [
    {type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
    // {title: t('basicData.operate'), width: 55, slots: { default: 'button_slot' },fixed:"left"},
    {type: 'checkbox', fixed: "left", title: t('basicData.check'), width: 80},
    {type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},

 north-glass-erp/northglass-erp/src/views/pp/replenish/SelectReplenish.vue

@@ -142,7 +142,6 @@
  },//表头参数
  columns:[

    {type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
    {type:'checkbox',title: t('basicData.check'), width: 80,fixed:"left"},
    {type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
    {field: 'reviewStatus',title: t('basicData.review'), width: 50, slots: { default: 'state' }},