Merge remote-tracking branch 'origin/master'

Crunchy

2023-12-07 6d213775d14a63d18d9eb17b44ba14bd3bb220da

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

@@ -58,13 +58,13 @@
                  style="width: 280px"
                ></el-input>
              </el-form-item>
              <el-form-item prop="wireCore" label="线芯">
              <!-- <el-form-item prop="wireCore" label="线芯">
                <el-input
                  v-model="dataForm.wireCore"
                  placeholder="线芯"
                  style="width: 60px"
                ></el-input>
              </el-form-item>
              </el-form-item> -->
              <el-form-item label="BOM" prop="bomId">
                <el-select :disabled="dataForm.id != null" v-model="dataForm.bomId" placeholder="" filterable>
                  <el-option
@@ -133,9 +133,9 @@
                  >{{ dataForm.ifsSync ? '是' : '否' }}</span
                >
              </el-form-item> -->
              <el-form-item label="主工艺" prop="master">
              <!-- <el-form-item label="主工艺" prop="master">
                <el-switch v-model="dataForm.master"> </el-switch>
              </el-form-item>
              </el-form-item> -->
            </el-col>
          </el-row>
        </el-form>
@@ -277,13 +277,13 @@
                <span v-if="!editable">{{ scope.row.operationName }}</span>
              </template>
            </el-table-column>
            <el-table-column
            <!-- <el-table-column
              prop="outsideOpItem"
              label="外部工序项目"
              align="center"
              show-overflow-tooltip
            >
            </el-table-column>
            </el-table-column> -->
            <el-table-column
              prop="partName"
              label="零件"
@@ -310,7 +310,7 @@
                }}</span>
              </template>
            </el-table-column>
            <el-table-column
            <!-- <el-table-column
              prop="runTimeCodeDb"
              label="因素单位"
              align="center"
@@ -350,7 +350,7 @@
              label="劳力设置时间"
              align="center"
            >
            </el-table-column>
            </el-table-column> -->
            <el-table-column
              prop="laborClassNo"
              label="人工类别"
@@ -428,7 +428,7 @@
                </el-input>
              </div>

              <el-divider content-position="left">配置项</el-divider>
              <!-- <el-divider content-position="left">配置项</el-divider>

              <div class="node-content-config">
                <el-checkbox-group
@@ -462,7 +462,7 @@
                    >工单预留</el-checkbox-button
                  >
                </el-checkbox-group>
              </div>
              </div> -->

              <!-- <el-divider content-position="left">能力</el-divider>
              <div class="node-content">