Merge remote-tracking branch 'origin/master'

王震

2023-12-13 67da82f0b0c24df5f19bbfcfec63801d9ae902d8

 src/views/plan/masterproductionschedule/index.vue

@@ -411,7 +411,7 @@
            isSearch: true,
            searchInfoType: 'text'
          },
          {
          /* {
            minWidth: '140',
            prop: 'inventoryReservedQuantity',
            label: '库存预留数量',
@@ -419,8 +419,8 @@
            isTrue: true,
            isSearch: false,
            searchInfoType: 'text'
          },
          {
          }, */
          /* {
            minWidth: '140',
            prop: 'outsourcingNumber',
            label: '委外数量',
@@ -428,7 +428,7 @@
            isTrue: true,
            isSearch: false,
            searchInfoType: 'text'
          },
          }, */
          {
            minWidth: '140',
            prop: 'manufacturingQuantity',
@@ -552,7 +552,7 @@
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          },
          }/* ,
          {
            minWidth: '140',
            prop: 'outerColor',
@@ -588,7 +588,7 @@
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          }
          } */
        ],
        toolbar: [],
        operator: [