Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

王震

2023-12-07 75e035a10a0faeff6b2ec4b9fcbf98d1536274f2

 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',