Merge remote-tracking branch 'origin/master'

王震

2023-12-13 67da82f0b0c24df5f19bbfcfec63801d9ae902d8

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

@@ -58,15 +58,15 @@
                  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 v-model="dataForm.bomId" placeholder="" filterable>
                <el-select :disabled="dataForm.id != null" v-model="dataForm.bomId" placeholder="" filterable>
                  <el-option
                    v-for="item in bomList"
                    :key="item.id"
@@ -75,13 +75,13 @@
                  />
                </el-select>
              </el-form-item>
              <el-form-item prop="version" label="工艺版本">
              <!-- <el-form-item prop="version" label="工艺版本">
                <el-input
                  v-model="dataForm.version"
                  placeholder="工艺版本"
                ></el-input>
              </el-form-item>
              <el-form-item label="工艺类型" prop="bomTypeDb">
              </el-form-item> -->
              <!-- <el-form-item label="工艺类型" prop="bomTypeDb">
                <el-select
                  v-model="dataForm.bomTypeDb"
                  placeholder="请选择工艺类型"
@@ -96,7 +96,7 @@
                  >
                  </el-option>
                </el-select>
              </el-form-item>
              </el-form-item> -->
              <el-form-item label="逐步采用日期" prop="phaseInDate">
                <el-date-picker
                  v-model="dataForm.phaseInDate"
@@ -115,27 +115,27 @@
                >
                </el-date-picker>
              </el-form-item>
              <el-form-item prop="alternativeNo" label="替代">
              <!-- <el-form-item prop="alternativeNo" label="替代">
                <el-input
                  v-model="dataForm.alternativeNo"
                  placeholder="替代"
                ></el-input>
              </el-form-item>
              <el-form-item prop="alternativeDesc" label="替代描述">
              </el-form-item> -->
              <!-- <el-form-item prop="alternativeDesc" label="替代描述">
                <el-input
                  v-model="dataForm.alternativeDesc"
                  placeholder="替代描述"
                ></el-input>
              </el-form-item>
              <el-form-item label="已同步至IFS" prop="ifsSync">
              </el-form-item> -->
              <!-- <el-form-item label="已同步至IFS" prop="ifsSync">
                <span
                  style="width: 146px;display: inline-block;font-size:12px;font-weight:bold;"
                  >{{ dataForm.ifsSync ? '是' : '否' }}</span
                >
              </el-form-item>
              <el-form-item label="主工艺" prop="master">
              </el-form-item> -->
              <!-- <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,9 +462,9 @@
                    >工单预留</el-checkbox-button
                  >
                </el-checkbox-group>
              </div>
              </div> -->

              <el-divider content-position="left">能力</el-divider>
              <!-- <el-divider content-position="left">能力</el-divider>
              <div class="node-content">
                <label
                  v-if="capacities == null || capacities.length == 0"
@@ -473,7 +473,7 @@
                  没有配置能力
                </label>

                <el-tag
               <el-tag
                  size="medium"
                  v-for="item in capacities"
                  :key="item.id"
@@ -484,8 +484,8 @@
                  effect="dark"
                >
                  {{ item.label }}
                </el-tag>
              </div>
                </el-tag> 
              </div> -->
              <el-divider content-position="left">备注</el-divider>
              <div class="node-content-remark">
                <rich-text
@@ -494,7 +494,7 @@
                ></rich-text>
              </div>
            </el-tab-pane>
            <el-tab-pane label="工序参数" style="height: 100%">
            <el-tab-pane label="工序参数" style="height: 100%" v-if="dataForm.routingNo!=null">
              <el-card class="params-template">
                <div slot="header">
                  <span>参数集</span>
@@ -1036,6 +1036,7 @@
        this.$set(e, 'active', false)
      })
      row.active = true
      console.log(row)
      this.getRoutingTemplate(row.id)
    },
    // 根据工艺、工序id去获取参数集模板
@@ -1085,7 +1086,6 @@
      }
    },
    dragEnd() {
      console.log(this.dataForm.operations)
      this.dataForm.operations.forEach((e, i) => {
        e.index = i + 1
      })