Merge remote-tracking branch 'origin/master'

Crunchy

2023-12-07 6d213775d14a63d18d9eb17b44ba14bd3bb220da

 src/views/technology/routing/edit-routing-operation.vue

@@ -35,7 +35,7 @@
            </el-select>
          </el-form-item>
        </el-col>
        <el-col :span="12">
        <!-- <el-col :span="12">
          <el-form-item label="因素单位" prop="runTimeCodeDb" :rules="disabled ?  [{required: false}] : dataRule.runTimeCodeDb">
            <el-select
              v-model="dataForm.runTimeCodeDb"
@@ -51,9 +51,9 @@
              />
            </el-select>
          </el-form-item>
        </el-col>
        </el-col> -->
      </el-row>
      <el-row>
      <!-- <el-row>
        <el-col :span="12">
          <el-form-item label="机器运转因素" prop="machRunFactor" :rules="disabled ?  [{required: false}] : dataRule.machRunFactor">
            <el-input
@@ -92,7 +92,7 @@
            ></el-input>
          </el-form-item>
        </el-col>
      </el-row>
      </el-row> -->
      <el-row>
        <el-col :span="12">
          <el-form-item label="人工类别" prop="laborClassNo">
@@ -124,7 +124,7 @@
        </el-col>
      </el-row>
      <el-row>
        <el-col :span="12">
        <!-- <el-col :span="12">
          <el-form-item label="外部工序项目" prop="outsideOpItem">
            <el-select
              v-model="dataForm.outsideOpItem"
@@ -141,7 +141,7 @@
              />
            </el-select>
          </el-form-item>
        </el-col>
        </el-col> -->
        <el-col :span="12"> </el-col>
      </el-row>
    </el-form>