合并冲突

licp

2024-03-12 f443b27dd9dcf5af1339439689531536e85836c7

 src/views/quality/teststandard/index.vue

@@ -382,7 +382,7 @@
              return this.getInspectionTypeOptionList()
            }
          },
          {
          /* {
            minWidth: '120',
            prop: 'operationName',
            label: '工序名称',
@@ -390,7 +390,7 @@
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          },
          }, */
          {
            minWidth: '120',
            prop: 'state',