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

王震

2023-12-27 b1dbfd44f6bafaa4d24e0c1c3a0f7ae548e77f60

 src/views/common/part.vue

@@ -1,7 +1,7 @@
<template>
  <el-dialog
    v-diadrag
    width="60%"
    width="75%"
    title="零件"
    top="5vh"
    :visible.sync="innerVisible"
@@ -18,7 +18,7 @@
      :uploadInfo="uploadInfo"
      :prelang="prelang"
      :options="options"
      :bottomOffset="350"
      :bottomOffset="150"
      :ajaxFun="ajaxFun"
      :paramObj="paramObj"
      ref="commonPartTable"
@@ -202,24 +202,24 @@
            isSearch: true,
            searchInfoType: 'text'
          },
          {
            minWidth: '100',
            prop: 'drawingNumber',
            label: '图号',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          },
          {
            minWidth: '120',
            prop: 'ean',
            label: 'EAN编码',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          }
          // {
          //   minWidth: '100',
          //   prop: 'drawingNumber',
          //   label: '图号',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: true,
          //   searchInfoType: 'text'
          // },
          // {
          //   minWidth: '120',
          //   prop: 'ean',
          //   label: 'EAN编码',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: true,
          //   searchInfoType: 'text'
          // }
        ],
        materialTypeList: [],
        materialAttributeList: []