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

zouyu

2023-12-14 93bb83a3376eb619a4a2673373f15849cd99337d

 src/views/basic/part/part-form.vue

@@ -171,8 +171,8 @@
            <el-input v-model="dataForm.specs" placeholder="规格型号"></el-input>
          </el-form-item>
        </el-col>
        <el-col :span="12">
          <el-form-item label="检验员" prop="examiner">
       <!--  <el-col :span="12"> -->
          <!-- <el-form-item label="检验员" prop="examiner">
            <el-select
              v-model="dataForm.examiner"
              placeholder="请选择"
@@ -186,7 +186,7 @@
              >
              </el-option>
            </el-select>
          </el-form-item>
          </el-form-item> -->
          <!-- <el-form-item label="检验规则" prop="testRuleId">
            <el-select
              v-model="dataForm.testRuleId"
@@ -204,7 +204,7 @@
              </el-option>
            </el-select>
          </el-form-item> -->
        </el-col>
        <!-- </el-col> -->
        <!-- <el-col :span="12">
          <el-form-item label="图号" prop="drawingNumber">
            <el-input
@@ -266,8 +266,8 @@
            </el-select>
          </el-form-item>
        </el-col> -->
      </el-row>
      <el-row>
     <!--  </el-row>
      <el-row> -->
        <!-- <el-col :span="12">
          <el-form-item label="电压等级" prop="voltageLevel">
            <el-input
@@ -275,13 +275,15 @@
              placeholder="电压等级"
            ></el-input> </el-form-item
        ></el-col> -->
      </el-row>
      <el-row>
     <!--  </el-row>
      <el-row> -->
        <el-col :span="12"
          ><el-form-item label="重量" prop="weight">
            <el-input v-model="dataForm.weight" placeholder="重量"></el-input>
          </el-form-item>
        </el-col>
      </el-row>
      <el-row>
        <el-col :span="12">
          <el-form-item label="版本号" prop="engChgLevel">
            <el-input
@@ -291,6 +293,20 @@
            ></el-input>
          </el-form-item>
        </el-col>
        <el-col :span="12">
          <el-form-item label="零件属性" prop="materialAttribute">
            <el-select v-model="dataForm.materialAttribute" style="width: 100%">
              <el-option
                v-for="(item, index) in materialAttributeOptions"
                :key="index"
                :label="item.label"
                :value="item.value"
              >
              </el-option>
            </el-select>
          </el-form-item>
        </el-col>
      </el-row>
        <!-- <el-col :span="12">
            <el-form-item label="IFS启用批次管理" prop="lotTrackingIfs">
              <el-select
@@ -318,7 +334,7 @@
            </el-select>
          </el-form-item>
        </el-col> -->
      </el-row>
      <!-- </el-row> -->
      <el-row>
        <el-col :span="12">
          <el-form-item
@@ -342,20 +358,8 @@
          </el-form-item>
        </el-col>
      </el-row>
      <!-- <el-row> -->
      <el-row>
        <el-col :span="12">
          <el-form-item label="零件属性" prop="materialAttribute">
            <el-select v-model="dataForm.materialAttribute" style="width: 100%">
              <el-option
                v-for="(item, index) in materialAttributeOptions"
                :key="index"
                :label="item.label"
                :value="item.value"
              >
              </el-option>
            </el-select>
          </el-form-item>
        </el-col>
        <el-col :span="12">
          <el-form-item label="备注" prop="description">
            <el-input