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

王震

2023-12-07 75e035a10a0faeff6b2ec4b9fcbf98d1536274f2

 src/views/technology/operation/index.vue

@@ -35,7 +35,7 @@
      multipleSelection: [],
      uploadInfo: {
        // 是否展示上传EXCEL以及对应的url
        isShow: true,
        isShow: false,
        url: '/mes/operation/excel/upload'
      },
      prelang: 'operation',
@@ -186,19 +186,19 @@
          //   isSearch: true,
          //   searchInfoType: 'text'
          // },
          {
            minWidth: '120',
            prop: 'outsideOpItem',
            label: '外部工序项目',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'select',
            formatter: this.formatOutsideOpItem,
            optList: () => {
              return this.outsideOpItemOptions
            }
          },
          // {
          //   minWidth: '120',
          //   prop: 'outsideOpItem',
          //   label: '外部工序项目',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: true,
          //   searchInfoType: 'select',
          //   formatter: this.formatOutsideOpItem,
          //   optList: () => {
          //     return this.outsideOpItemOptions
          //   }
          // },
          // 备注
          {
            minWidth: '120',