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

zouyu

2023-11-09 f0b5226a49dd90ede8e716ae405c9247480f2ff8

 src/views/equipment/metering/index.vue

@@ -37,7 +37,7 @@
        uploadInfo: {
          // 是否展示上传EXCEL以及对应的url
          isShow: true,
          url: '/mes/equipment/upload'
          url: '/mes/equipmentDevice/upload'
        },
        prelang: 'workstation',
        options: {
@@ -94,41 +94,23 @@
            //   isSearch: true,
            //   searchInfoType: 'text'
            // },
            {
              minWidth: '30',
              prop: 'type',
              label: '设备类型',
            //   sort: true,
              isTrue: true,
              isSearch: true,
            //   searchInfoType: 'select',
              formatter: this.workShopFormatter,
            //   optList: () => {
            //     return this.workshopList
            //   }
            },
            // {
            //   minWidth: '30',
            //   prop: 'type',
            //   label: '设备类型',
            // //   sort: true,
            //   isTrue: true,
            //   isSearch: true,
            // //   searchInfoType: 'select',
            //   formatter: this.workShopFormatter,
            // //   optList: () => {
            // //     return this.workshopList
            // //   }
            // },
            // 型号规格
            {
              minWidth: '30',
              prop: 'supplier',
              label: '厂家',
              sort: true,
              isTrue: true,
              isSearch: false,
              searchInfoType: 'text'
            },
                         // 状态
                         {
              minWidth: '30',
              prop: 'status',
              label: '状态',
              sort: true,
              isTrue: true,
              isSearch: true,
              searchInfoType: 'text'
            },
            // 制造日期
            {

 // 制造日期
 {
              minWidth: '150',
              width: '250',
              prop: 'createTime',
@@ -151,6 +133,99 @@
              isSearch: true,
              searchInfoType: 'datetime'
            },
            {
              minWidth: '30',
              prop: 'createUser',
              label: '负责人',
              sort: true,
              isTrue: true,
              isSearch: false,
              searchInfoType: 'text'
            },

            {
              minWidth: '30',
              prop: 'supplier',
              label: '厂家',
              sort: true,
              isTrue: true,
              isSearch: false,
              searchInfoType: 'text'
            },
                         // 状态
                         {
              minWidth: '30',
              prop: 'status',
              label: '状态',
              sort: true,
              isTrue: true,
              isSearch: true,
              searchInfoType: 'text'
            },
               // 状态
               {
              minWidth: '30',
              prop: 'responsibleDepartment',
              label: '负责部门',
              sort: true,
              isTrue: true,
              isSearch: true,
              searchInfoType: 'text'
            },
            {
              minWidth: '30',
              prop: 'InspectionUnit',
              label: '检验单位',
              sort: true,
              isTrue: true,
              isSearch: true,
              searchInfoType: 'text'
            },
            {
              minWidth: '30',
              prop: 'certificate',
              label: '证书编号',
              sort: true,
              isTrue: true,
              isSearch: true,
              searchInfoType: 'text'
            },
            {
              minWidth: '30',
              prop: 'verification',
              label: '检定',
              sort: true,
              isTrue: true,
              isSearch: true,
              searchInfoType: 'text'
            },
            {
              minWidth: '30',
              prop: 'classification',
              label: '分类',
              sort: true,
              isTrue: true,
              isSearch: true,
              searchInfoType: 'text'
            },
            {
              minWidth: '30',
              prop: 'FixedPointPosition',
              label: '定点位置',
              sort: true,
              isTrue: true,
              isSearch: true,
              searchInfoType: 'text'
            },
            {
              minWidth: '30',
              prop: 'specifications',
              label: '规格',
              sort: true,
              isTrue: true,
              isSearch: true,
              searchInfoType: 'text'
            },
          ],
          toolbar: [
            {