Merge remote-tracking branch 'origin/master'

Crunchy

2023-12-07 6d213775d14a63d18d9eb17b44ba14bd3bb220da

 src/views/common/operation.vue

@@ -94,8 +94,8 @@
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          },
          {
          }/*,
           {
            minWidth: '100',
            prop: 'productionCounting',
            label: '是否报工',
@@ -159,7 +159,7 @@
            optList: () => {
              return this.getChangeList()
            }
          }
          } */
        ]
      },
      addOrUpdateVisible: false,