modified: src/views/equipment/equipment/index.vue modified: src/views...

zouyu

2023-11-09 5cf1a230144fc023b07c1aeccd8795b9741f7328

 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 label="班组人员" prop="crewSize">
              </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> -->
              <!-- <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"
@@ -307,7 +307,7 @@
              </el-table>
            </el-card>
          </el-tab-pane>
          <el-tab-pane
          <!-- <el-tab-pane
            v-if="isShowStepBusiness"
            label="工步"
            style="height: 100%"
@@ -363,7 +363,7 @@
                </el-table-column>
              </el-table>
            </el-card>
          </el-tab-pane>
          </el-tab-pane> -->
        </el-tabs>
        <ParamTemplateDialog
          :currshowlist.sync="showOperationTemplate"
@@ -448,7 +448,7 @@
        laborRunFactor: 0,
        laborSetupTime: 0,
        runTimeCodeDb: '2',
        crewSize: 1,
        crewSize: null,
        outsideOpItem:null
      },
      operationTemplateList: [],
@@ -724,7 +724,7 @@
      this.dataForm.laborRunFactor = 0
      this.dataForm.laborSetupTime = 0
      this.dataForm.runTimeCodeDb = '2'
      this.dataForm.crewSize = 1
      this.dataForm.crewSize = null
      this.fileList = []
      this.operationTemplateList = []
      this.stepList = []
@@ -751,17 +751,17 @@
      this.$refs.dataForm.validate((valid) => {
        if (valid) {
          // 校验【机器运转因素】、【机器设置时间】、【劳力运转因素】、【劳力设置时间】中至少有一个字段的值须大于0
          if (
            this.dataForm.machRunFactor == 0 &&
            this.dataForm.machSetupTime == 0 &&
            this.dataForm.laborRunFactor == 0 &&
            this.dataForm.laborSetupTime == 0
          ) {
            this.$message.error(
              '【机器运转因素】、【机器设置时间】、【劳力运转因素】、【劳力设置时间】中至少有一个字段的值须大于0'
            )
            this.isSubmit = false
          } else {
          // if (
          //   this.dataForm.machRunFactor == 0 &&
          //   this.dataForm.machSetupTime == 0 &&
          //   this.dataForm.laborRunFactor == 0 &&
          //   this.dataForm.laborSetupTime == 0
          // ) {
          //   this.$message.error(
          //     '【机器运转因素】、【机器设置时间】、【劳力运转因素】、【劳力设置时间】中至少有一个字段的值须大于0'
          //   )
          //   this.isSubmit = false
          // } else {
            // 【人工类别】为空时【班组人员】必须为空，否则必须大于0
            let remindInfo = ''
            let remindFlag = false
@@ -828,7 +828,7 @@
                  })
              }
            }
          }
          // }
        } else {
          this.isSubmit = false
        }