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

zouyu

2023-12-22 499c98f619f0bb25c31dc4d4ad0385e5ad4206c8

 src/views/technology/routing/routing-form.vue

@@ -50,17 +50,19 @@
            </el-col>
            <el-col :span="6">
              <el-form-item prop="partName" label="零件名称">
                <el-tooltip class="item" effect="dark" :content="dataForm.partName" >
                <el-input
                  v-model="dataForm.partName"
                  placeholder="零件名称"
                  readonly
                  style="width: 100%"
                ></el-input>
                </el-tooltip>
              </el-form-item>
            </el-col>
            <el-col :span="6">
              <el-form-item label="BOM" prop="bomId">
                <el-select style="width:100%" :disabled="dataForm.id != null" v-model="dataForm.bomId" placeholder="" filterable>
                <el-select style="width:100%"  v-model="dataForm.bomId" placeholder="" filterable>
                  <el-option
                    v-for="item in bomList"
                    :key="item.id"
@@ -681,6 +683,7 @@
        routingNo: null,
        name: null,
        partId: null,
        partNo: null,
        partName: null,
        description: null,
        state: null,