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

zouyu

2023-12-13 f9e420517e261d7a59be912c866987154ea3b8f6

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

 src/views/common/ztt-table.vue

@@ -1578,7 +1578,7 @@
      if (response.code != '0') {
        this.$message.warning(response.msg)
      } else {
      if(response.data!=""&&response.data!=[]){
      if(response.data!=""&&response.data!=[]&&response.data!=null){
        this.$message({
          message: response.data,
          type: 'success'

 src/views/equipment/metering/index.vue

@@ -85,7 +85,7 @@
          isRefresh: true, // 是否显示刷新按钮
          isShowHide: true, // 是否显示显影按钮
          isSearch: false, // 高级查询按钮
          defaultOrderBy: { column: 'manufactureDate', direction: 'desc' }
          defaultOrderBy: { column: 'id', direction: 'desc' }
        },
        table: {
          total: 0,

 src/views/plan/manufacturingorder/routing.vue

@@ -96,15 +96,15 @@
            isSearch: true,
            searchInfoType: 'text'
          },
          {
            minWidth: '100',
            prop: 'name',
            label: '工艺名称',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          },
          // {
          //   minWidth: '100',
          //   prop: 'name',
          //   label: '工艺名称',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: true,
          //   searchInfoType: 'text'
          // },
          // 工艺类型
          {
            minWidth: '120',