Merge remote-tracking branch 'origin/master'

Crunchy

2023-12-07 6d213775d14a63d18d9eb17b44ba14bd3bb220da

 src/views/product/workbench/productoutput-list.vue

@@ -130,7 +130,7 @@
            isSearch: true,
            searchInfoType: 'text'
          },
          {
          /* {
            minWidth: '100',
            prop: 'checkStatus',
            label: '检测状态',
@@ -152,8 +152,8 @@
            optList: () => {
              return this.checkStatusOptions
            }
          },
          {
          }, */
         /*  {
            minWidth: '140',
            prop: 'isQualified',
            label: '检测是否合格',
@@ -198,7 +198,7 @@
            optList: () => {
              return this.booleanOptions
            }
          },
          }, */
          {
            minWidth: '140',
            prop: 'remark',