modified: src/views/basic/company/company-form.vue modified: src/view...

zouyu

2023-10-25 4983abda27a10440ed6e9d5d45849f499b0f6f25

	modified:   src/views/basic/company/company-form.vue
	modified:   src/views/basic/part/index.vue
	modified:   src/views/basic/part/part-form.vue
	modified:   src/views/common/operationParamTemplate.vue
	modified:   src/views/common/rich-text.vue
	modified:   src/views/technology/document/document-form.vue
	modified:   src/views/technology/document/index.vue
	modified:   src/views/technology/operation/index.vue
	modified:   src/views/technology/operation/operation-form.vue
	modified:   src/views/technology/routing/index.vue
	modified:   src/views/technology/routing/routing-form.vue
	modified:   src/views/technology/structure/index.vue
	modified:   src/views/technology/structure/single-structure-form.vue

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

@@ -38,7 +38,7 @@
        </el-col>
      </el-row>

      <el-row>
      <!-- <el-row>
        <el-col :span="12">
          <el-form-item label="logo中文" prop="iconNameCn" label-width="100px">
            <el-input
@@ -55,7 +55,7 @@
            ></el-input>
          </el-form-item>
        </el-col>
      </el-row>
      </el-row> -->

      <el-tabs v-model="showAllVisible" type="card" style="margin-top: 20px">
        <!--地址页面-->
@@ -191,7 +191,7 @@
            </el-table-column>
          </el-table>
        </el-tab-pane>
        <el-tab-pane label="logo" name="third">
        <!-- <el-tab-pane label="logo" name="third">
          <el-upload
            class="upload-demo"
            action="/mes/company/upload"
@@ -211,7 +211,7 @@
              只能上传png图片，且不超过2MB，像素为220*60
            </div>
          </el-upload>
        </el-tab-pane>
        </el-tab-pane> -->
      </el-tabs>
    </el-form>
    <span slot="footer" class="dialog-footer">

 src/views/basic/part/index.vue

@@ -169,7 +169,7 @@
          {
            minWidth: '120',
            prop: 'sunit',
            label: '单位2',
            label: '重量单位',
            sort: true,
            isTrue: true,
            isSearch: true,

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

@@ -88,7 +88,7 @@
      </el-row>
      <el-row>
        <el-col :span="12">
          <el-form-item label="单位2" prop="sunit">
          <el-form-item label="重量单位" prop="sunit">
            <el-select
              v-model="dataForm.sunit"
              filterable
@@ -167,11 +167,45 @@
      </el-row>
      <el-row>
        <el-col :span="12"
          ><el-form-item label="规格" prop="specs">
            <el-input v-model="dataForm.specs" placeholder="规格"></el-input>
          ><el-form-item label="规格型号" prop="specs">
            <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-select
              v-model="dataForm.examiner"
              placeholder="请选择"
              style="width: 100%;"
            >
              <el-option
                v-for="(item, index) in examinerOptions"
                :key="index"
                :label="item.label"
                :value="item.value"
              >
              </el-option>
            </el-select>
          </el-form-item>
          <!-- <el-form-item label="检验规则" prop="testRuleId">
            <el-select
              v-model="dataForm.testRuleId"
              filterable
              clearable
              placeholder="请选择"
              style="width: 100%;"
            >
              <el-option
                v-for="(item, index) in ruleOptions"
                :key="index"
                :label="item.ruleName"
                :value="item.id"
              >
              </el-option>
            </el-select>
          </el-form-item> -->
        </el-col>
        <!-- <el-col :span="12">
          <el-form-item label="图号" prop="drawingNumber">
            <el-input
              v-model="dataForm.drawingNumber"
@@ -186,7 +220,7 @@
              placeholder="型号"
            ></el-input>
          </el-form-item>
        </el-col>
        </el-col> -->

        <!--        <el-col :span="12">-->
        <!--          <el-form-item label="零件族" prop="partFamilyId">-->
@@ -208,12 +242,12 @@
        <!--            </el-select>-->
        <!--          </el-form-item>-->
        <!--        </el-col>-->
        <el-col :span="12">
        <!-- <el-col :span="12">
          <el-form-item label="EAN编码" prop="ean">
            <el-input v-model="dataForm.ean" placeholder="EAN编码"></el-input>
          </el-form-item>
        </el-col>
        <el-col :span="12">
        </el-col> -->
        <!-- <el-col :span="12">
          <el-form-item label="系统编号管理" prop="useSystemNo">
            <el-select
              v-model="dataForm.useSystemNo"
@@ -231,35 +265,16 @@
              </el-option>
            </el-select>
          </el-form-item>
        </el-col>
        </el-col> -->
      </el-row>
      <el-row>
        <el-col :span="12">
          <el-form-item label="检验规则" prop="testRuleId">
            <el-select
              v-model="dataForm.testRuleId"
              filterable
              clearable
              placeholder="请选择"
              style="width: 100%;"
            >
              <el-option
                v-for="(item, index) in ruleOptions"
                :key="index"
                :label="item.ruleName"
                :value="item.id"
              >
              </el-option>
            </el-select>
          </el-form-item>
        </el-col>
        <el-col :span="12">
        <!-- <el-col :span="12">
          <el-form-item label="电压等级" prop="voltageLevel">
            <el-input
              v-model="dataForm.voltageLevel"
              placeholder="电压等级"
            ></el-input> </el-form-item
        ></el-col>
        ></el-col> -->
      </el-row>
      <el-row>
        <el-col :span="12"
@@ -268,21 +283,30 @@
          </el-form-item>
        </el-col>
        <el-col :span="12">
          <!--          <el-form-item label="IFS启用批次管理" prop="lotTrackingIfs">-->
          <!--            <el-select-->
          <!--              v-model="dataForm.lotTrackingIfs"-->
          <!--              placeholder="请选择"-->
          <!--              style="width: 100%;"-->
          <!--            >-->
          <!--              <el-option-->
          <!--                v-for="(item, index) in lotTrackingIfsOptions"-->
          <!--                :key="index"-->
          <!--                :label="item.label"-->
          <!--                :value="item.value"-->
          <!--              >-->
          <!--              </el-option>-->
          <!--            </el-select>-->
          <!--          </el-form-item>-->
          <el-form-item label="版本号" prop="engChgLevel">
            <el-input
              v-model="dataForm.engChgLevel"
              placeholder="版本号"
              :disabled="dataForm.id && dataForm.id != null ? true : false"
            ></el-input>
          </el-form-item>
        </el-col>
        <!-- <el-col :span="12">
            <el-form-item label="IFS启用批次管理" prop="lotTrackingIfs">
              <el-select
                v-model="dataForm.lotTrackingIfs"
                placeholder="请选择"
                style="width: 100%;"
              >
                <el-option
                  v-for="(item, index) in lotTrackingIfsOptions"
                  :key="index"
                  :label="item.label"
                  :value="item.value"
                >
                </el-option>
              </el-select>
            </el-form-item>
          <el-form-item label="原材料检" prop="testRuleType">
            <el-select
              v-model="dataForm.testRuleType"
@@ -293,18 +317,9 @@
              <el-option label="是" :value="1"> </el-option>
            </el-select>
          </el-form-item>
        </el-col>
        </el-col> -->
      </el-row>
      <el-row>
        <el-col :span="12">
          <el-form-item label="版本号" prop="engChgLevel">
            <el-input
              v-model="dataForm.engChgLevel"
              placeholder="版本号"
              :disabled="dataForm.id && dataForm.id != null ? true : false"
            ></el-input>
          </el-form-item>
        </el-col>
        <el-col :span="12">
          <el-form-item
            v-if="permissions.basic_has_ifs"
@@ -330,7 +345,7 @@
      <el-row>
        <el-col :span="12">
          <el-form-item label="零件属性" prop="materialAttribute">
            <el-select v-model="dataForm.materialAttribute">
            <el-select v-model="dataForm.materialAttribute" style="width: 100%">
              <el-option
                v-for="(item, index) in materialAttributeOptions"
                :key="index"
@@ -351,41 +366,24 @@
        </el-col>
      </el-row>
      <el-row>
        <el-col :span="12">
          <el-form-item label="检验员" prop="examiner">
            <el-select
              v-model="dataForm.examiner"
              placeholder="请选择"
              style="width: 100%;"
            >
              <el-option
                v-for="(item, index) in examinerOptions"
                :key="index"
                :label="item.label"
                :value="item.value"
              >
              </el-option>
            </el-select>
          </el-form-item>
        </el-col>
        <el-col :span="12">
        <!-- <el-col :span="12">
          <el-form-item label="产品名称" prop="prodName">
            <el-input
              v-model="dataForm.prodName"
              placeholder="产品名称"
            ></el-input>
          </el-form-item>
        </el-col>
        </el-col> -->
      </el-row>
      <el-row>
        <el-col :span="12">
        <!-- <el-col :span="12">
          <el-form-item label="节距" prop="prodName">
            <el-input
              v-model="dataForm.partPitch"
              placeholder="节距"
            ></el-input>
          </el-form-item>
        </el-col>
        </el-col> -->
      </el-row>
    </el-form>
    <span slot="footer" class="dialog-footer">

 src/views/common/operationParamTemplate.vue

@@ -161,8 +161,10 @@
    },
    saveSelectRow() {
      if (this.multiSelect) {
        console.log("aaaaaaa--",this.multiSelect,this.multipleSelection)
        this.$emit('handleSelectionParamTemplateChange', this.multipleSelection)
      } else {
        console.log("bbbbbbb--",this.multiSelect,this.currentRow)
        this.$emit('listenToParamTemplateEvent', this.currentRow)
      }
      this.innerVisible = false

 src/views/common/rich-text.vue

@@ -115,7 +115,6 @@
  },
  mounted() {
    this.flag = true
    console.log(this.richContent)
    this.content = this.richContent
  },
  watch: {

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

@@ -36,7 +36,7 @@
                </el-input>
              </el-form-item>
            </el-col>
            <el-col :span="4">
            <!-- <el-col :span="4">
              <el-form-item prop="docType" label="类型">
                <el-select
                  v-model="dataForm.docType"
@@ -52,7 +52,7 @@
                  </el-option>
                </el-select>
              </el-form-item>
            </el-col>
            </el-col> -->
            <el-col :span="3">
              <el-form-item prop="version" label="版本号">
                <el-input
@@ -61,7 +61,7 @@
                ></el-input>
              </el-form-item>
            </el-col>
            <el-col :span="3">
            <!-- <el-col :span="3">
              <el-form-item prop="sheathColor" label="护套颜色">
                <el-input
                  v-model="dataForm.sheathColor"
@@ -76,7 +76,7 @@
                  placeholder="绝缘颜色"
                ></el-input>
              </el-form-item>
            </el-col>
            </el-col> -->
            <!-- <el-col :span="4">
              <el-form-item label="项目号" prop="projectNo">
                <el-input
@@ -108,9 +108,7 @@
                <countrySelector v-model="dataForm.country"></countrySelector>
              </el-form-item>
            </el-col> -->
          </el-row>
          <el-row>
            <el-col :span="5">
            <el-col :span="6">
              <el-form-item label="产品零件号" prop="partNo">
                <el-input v-model="dataForm.partNo" placeholder="请选择零件">
                  <el-button
@@ -121,11 +119,13 @@
                </el-input>
              </el-form-item>
            </el-col>
            <el-col :span="7">
            <el-col :span="6">
              <el-form-item label="产品零件描述" prop="partName">
                <el-input v-model="dataForm.partName" disabled> </el-input>
              </el-form-item>
            </el-col>
          </el-row>
          <el-row>
            <el-col :span="5">
              <el-form-item label="备注" prop="remark">
                <el-input
@@ -219,7 +219,7 @@
            </TeststandardDialog>
          </el-tab-pane>
          <el-tab-pane label="产品结构工序参数" style="height: 100%">
            <div class="document-related-stock-part">
            <!-- <div class="document-related-stock-part">
              <div
                style="padding-left:18px;font-size:14px;font-weight:700;color:#000;height:20px;line-height:20px;"
              >
@@ -306,9 +306,9 @@
                >
                </el-table-column>
              </el-table>
            </div>
            <el-card class="document-bom" header="BOM-工序参数">
              <div slot="header">
            </div> -->
            <el-card class="document-bom" header="">
              <!-- <div slot="header">
                <span>BOM-工序参数</span>
                <el-tooltip
                  class="item"
@@ -339,7 +339,7 @@
                    >添加
                  </el-button>
                </el-tooltip>
              </div>
              </div> -->
              <el-collapse
                v-model="currTechnologyBomPartName"
                accordion
@@ -367,7 +367,7 @@
                    </el-checkbox>
                  </template>
                  <div style="display:flex;">
                    <div
                    <!-- <div
                      style="font-size:13px;font-weight:bold;cursor: pointer;border-radius:2px 2px 0px 0px;width:80px;text-align:center;"
                      :class="[
                        item.showBom
@@ -377,21 +377,16 @@
                      @click="item.showBom = true"
                    >
                      BOM结构
                    </div>
                    </div> -->
                    <div
                      style="font-size:13px;font-weight:bold;cursor: pointer;margin-left: 10px;border-radius:2px 2px 0px 0px;width:80px;text-align:center;"
                      :class="[
                        !item.showBom
                          ? 'highlight-tab-class'
                          : 'unhighlight-tab-class'
                      ]"
                      @click="item.showBom = false"
                      :class="['highlight-tab-class']"
                    >
                      工序参数
                    </div>
                  </div>

                  <div class="document-bom-div" v-show="item.showBom">
 
                 <!-- <div class="document-bom-div" v-show="item.showBom">
                    <el-tooltip
                      class="item"
                      effect="dark"
@@ -428,8 +423,9 @@
                      <el-table-column prop="unit" label="单位">
                      </el-table-column>
                    </el-table>
                  </div>
                  <div class="document-technology-div" v-show="!item.showBom">
                  </div> -->

                  <div class="document-technology-div" v-show="item.showBom">
                    <div
                      style="border: 1px solid #ebeef5;height: 440px;overflow: auto;"
                    >
@@ -666,7 +662,7 @@
                </el-select>
                <div id="demo" style="margin:5px auto;"></div>
              </div>
              <!--<el-upload
              <el-upload
                              class="upload-demo"
                              action="/mes/document/uploadLct"
                              :headers="headers"
@@ -686,7 +682,7 @@
                              <div slot="tip" class="el-upload__tip">
                                只能上传jpg图片，且不超过2MB
                              </div>
                            </el-upload>-->
                            </el-upload>
              <el-dialog :visible.sync="dialogFlowVisible">
                <img width="100%" :src="dialogFlowImageUrl" alt="" />
              </el-dialog>

 src/views/technology/document/index.vue

@@ -142,25 +142,25 @@
            searchInfoType: 'text'
          },
          // 绝缘颜色
          {
            minWidth: '120',
            prop: 'insulationColor',
            label: '绝缘颜色',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          },
          // {
          //   minWidth: '120',
          //   prop: 'insulationColor',
          //   label: '绝缘颜色',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: true,
          //   searchInfoType: 'text'
          // },
          // 护套颜色
          {
            minWidth: '120',
            prop: 'sheathColor',
            label: '护套颜色',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          },
          // {
          //   minWidth: '120',
          //   prop: 'sheathColor',
          //   label: '护套颜色',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: true,
          //   searchInfoType: 'text'
          // },
          {
            minWidth: '120',
            prop: 'testStandard',

 src/views/technology/operation/index.vue

@@ -85,15 +85,15 @@
            searchInfoType: 'text'
          },
          // 零件族
          {
            minWidth: '120',
            prop: 'partFamilyName',
            label: '零件族',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          },
          // {
          //   minWidth: '120',
          //   prop: 'partFamilyName',
          //   label: '零件族',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: true,
          //   searchInfoType: 'text'
          // },
          // 工作中心
          {
            minWidth: '120',
@@ -109,25 +109,25 @@
            }
          },
          // 机器运转因素
          {
            minWidth: '120',
            prop: 'machRunFactor',
            label: '机器运转因素',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          },
          // {
          //   minWidth: '120',
          //   prop: 'machRunFactor',
          //   label: '机器运转因素',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: true,
          //   searchInfoType: 'text'
          // },
          // 机器设置时间
          {
            minWidth: '120',
            prop: 'machSetupTime',
            label: '机器设置时间',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          },
          // {
          //   minWidth: '120',
          //   prop: 'machSetupTime',
          //   label: '机器设置时间',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: true,
          //   searchInfoType: 'text'
          // },
          // 人工类别
          {
            minWidth: '120',
@@ -143,39 +143,39 @@
            }
          },
          // 劳力运转因素
          {
            minWidth: '120',
            prop: 'laborRunFactor',
            label: '劳力运转因素',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          },
          // {
          //   minWidth: '120',
          //   prop: 'laborRunFactor',
          //   label: '劳力运转因素',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: true,
          //   searchInfoType: 'text'
          // },
          // 劳力设置时间
          {
            minWidth: '120',
            prop: 'laborSetupTime',
            label: '劳力设置时间',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          },
          // {
          //   minWidth: '120',
          //   prop: 'laborSetupTime',
          //   label: '劳力设置时间',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: true,
          //   searchInfoType: 'text'
          // },
          // 因素单位
          {
            minWidth: '120',
            prop: 'runTimeCodeDb',
            label: '因素单位',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'select',
            formatter: this.formatRunTimeCodeDbType,
            optList: () => {
              return this.runTimeCodeDbTypeOptions
            }
          },
          // {
          //   minWidth: '120',
          //   prop: 'runTimeCodeDb',
          //   label: '因素单位',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: true,
          //   searchInfoType: 'select',
          //   formatter: this.formatRunTimeCodeDbType,
          //   optList: () => {
          //     return this.runTimeCodeDbTypeOptions
          //   }
          // },
          // 班组人员
          {
            minWidth: '120',

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

@@ -35,7 +35,7 @@
                  placeholder="工序编号"
                ></el-input>
              </el-form-item>
              <el-form-item label="零件族" prop="partFamilyId">
              <!-- <el-form-item label="零件族" prop="partFamilyId">
                <el-select
                  v-model="dataForm.partFamilyId"
                  filterable
@@ -50,7 +50,7 @@
                  >
                  </el-option>
                </el-select>
              </el-form-item>
              </el-form-item> -->
              <el-form-item label="工作中心" prop="workCenter">
                <el-select
                  v-model="dataForm.workCenter"
@@ -66,7 +66,7 @@
                  />
                </el-select>
              </el-form-item>
              <el-form-item label="机器运转因素" prop="machRunFactor">
              <!-- <el-form-item label="机器运转因素" prop="machRunFactor">
                <el-input
                  v-model="dataForm.machRunFactor"
                  placeholder="机器运转因素"
@@ -77,7 +77,7 @@
                  v-model="dataForm.machSetupTime"
                  placeholder="机器设置时间"
                ></el-input>
              </el-form-item>
              </el-form-item> -->
              <el-form-item label="人工类别" prop="laborClassNo">
                <el-select
                  v-model="dataForm.laborClassNo"
@@ -94,19 +94,19 @@
                  </el-option>
                </el-select>
              </el-form-item>
              <el-form-item label="劳力运转因素" prop="laborRunFactor">
              <!-- <el-form-item label="劳力运转因素" prop="laborRunFactor">
                <el-input
                  v-model="dataForm.laborRunFactor"
                  placeholder="劳力运转因素"
                ></el-input>
              </el-form-item>
              <el-form-item label="劳力设置时间" prop="laborSetupTime">
              </el-form-item> -->
              <!-- <el-form-item label="劳力设置时间" prop="laborSetupTime">
                <el-input
                  v-model="dataForm.laborSetupTime"
                  placeholder="劳力设置时间"
                ></el-input>
              </el-form-item>
              <el-form-item label="因素单位" prop="runTimeCodeDb">
              </el-form-item> -->
              <!-- <el-form-item label="因素单位" prop="runTimeCodeDb">
                <el-select
                  v-model="dataForm.runTimeCodeDb"
                  placeholder="因素单位"
@@ -119,14 +119,14 @@
                    :value="item.value"
                  />
                </el-select>
              </el-form-item>
              </el-form-item> -->
              <el-form-item label="班组人员" prop="crewSize">
                <el-input
                  v-model="dataForm.crewSize"
                  placeholder="班组人员"
                ></el-input>
              </el-form-item>
              <el-form-item label="外部工序项目" prop="outsideOpItem">
              <!-- <el-form-item label="外部工序项目" prop="outsideOpItem">
                <el-select
                  v-model="dataForm.outsideOpItem"
                  placeholder="外部工序项目"
@@ -140,7 +140,7 @@
                    :value="item.value"
                  />
                </el-select>
              </el-form-item>
              </el-form-item> -->
              <el-form-item label="备注" prop="remark">
                <el-input
                  v-model="dataForm.remark"

 src/views/technology/routing/index.vue

@@ -320,21 +320,21 @@
            searchInfoType: 'text'
          },
          // 是否已同步至IFS
          {
            minWidth: '120',
            prop: 'ifsSync',
            label: '已同步至IFS',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'select',
            optList: () => {
              return this.getIfsSyncOptionList()
            },
            formatter: (row, column, cellValue) => {
              return cellValue == true ? '是' : '否'
            }
          },
          // {
          //   minWidth: '120',
          //   prop: 'ifsSync',
          //   label: '已同步至IFS',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: true,
          //   searchInfoType: 'select',
          //   optList: () => {
          //     return this.getIfsSyncOptionList()
          //   },
          //   formatter: (row, column, cellValue) => {
          //     return cellValue == true ? '是' : '否'
          //   }
          // },
          // 更新时间
          {
            minWidth: '200',

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

@@ -115,24 +115,24 @@
                >
                </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> -->
              <el-form-item label="主工艺" prop="master">
                <el-switch v-model="dataForm.master"> </el-switch>
              </el-form-item>
@@ -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
      })

 src/views/technology/structure/index.vue

@@ -199,25 +199,25 @@
            }
          },
          // 替代
          {
            minWidth: '120',
            prop: 'alternativeNo',
            label: '替代',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          },
          // {
          //   minWidth: '120',
          //   prop: 'alternativeNo',
          //   label: '替代',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: true,
          //   searchInfoType: 'text'
          // },
          // 替代描述
          {
            minWidth: '120',
            prop: 'alternativeDesc',
            label: '替代描述',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          },
          // {
          //   minWidth: '120',
          //   prop: 'alternativeDesc',
          //   label: '替代描述',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: true,
          //   searchInfoType: 'text'
          // },
          // 是否已同步至ERP
          {
            minWidth: '120',

 src/views/technology/structure/single-structure-form.vue

@@ -59,7 +59,7 @@
                  </el-option>
                </el-select>
              </el-form-item>
              <el-form-item label="替代" prop="alternativeNo">
              <!-- <el-form-item label="替代" prop="alternativeNo">
                <el-input v-model="dataForm.alternativeNo"></el-input>
              </el-form-item>
              <el-form-item label="替代描述" prop="alternativeDesc">
@@ -68,7 +68,7 @@
                  :autosize="{ minRows: 1, maxRows: 3 }"
                  v-model="dataForm.alternativeDesc"
                ></el-input>
              </el-form-item>
              </el-form-item> -->
              <el-form-item label="版本号" prop="version">
                <el-input v-model="dataForm.version" disabled></el-input>
              </el-form-item>
@@ -79,12 +79,12 @@
                  v-model="dataForm.remark"
                ></el-input>
              </el-form-item>
              <el-form-item label="已同步至IFS" prop="ifsSync">
              <!-- <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> -->
              <el-form-item label="默认结构" prop="master">
                <el-checkbox v-model="dataForm.master"></el-checkbox>
              </el-form-item>