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

zouyu

2023-12-11 c7a1fa702720dd56f5bcb96002897b24be85270b

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

 src/views/basic/part/index.vue

@@ -190,7 +190,7 @@
            searchInfoType: 'text'
          },
          // 一级分类
          {
         /*  {
            minWidth: '120',
            prop: 'assortment',
            label: '一级分类',
@@ -227,7 +227,7 @@
            optList: () => {
              return this.getThreeLevelClassification()
            }
          },
          }, */
          // 规格
          {
            minWidth: '140',
@@ -239,7 +239,7 @@
            searchInfoType: 'text'
          },
          // 型号
          {
          /* {
            minWidth: '140',
            prop: 'partModel',
            label: '型号',
@@ -301,7 +301,7 @@
            optList: () => {
              return this.lotTrackingIfsOptions
            }
          },
          }, */
          // 版本号
          {
            minWidth: '140',
@@ -311,7 +311,7 @@
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          },
          }/* ,
          // 计划方法
          {
            minWidth: '140',
@@ -325,9 +325,9 @@
            optList: () => {
              return this.planningMethodOptions
            }
          },
          }, */
          // 图号
          {
         /*  {
            minWidth: '140',
            prop: 'drawingNumber',
            label: '图号',
@@ -355,9 +355,9 @@
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          },
          }, */
          // 检验员
          {
          /* {
            minWidth: '140',
            prop: 'examiner',
            label: '检验员',
@@ -388,7 +388,7 @@
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          }
          } */
        ],
        toolbar: [
          {

 src/views/quality/packageinspect/packageInspect-form.vue

@@ -152,7 +152,7 @@
                </el-table-column>
                <el-table-column  label="操作">
                    <template>
                        <el-button type="text" :disabled="resultVal==null" @click="submitSave()" size="small">上报</el-button>
                        <el-button type="text" :disabled="resultVal!=null" @click="submitSave()" size="small">上报</el-button>
                    </template>
                </el-table-column>
            </el-table>