Merge remote-tracking branch 'origin/master'

zss

2023-12-11 c880739ec4cd5ede33b31eb98ad5f7628ea288e5

 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">
@@ -536,7 +534,6 @@
          // 去除零件编号两边的空格
          this.dataForm.partNo = this.dataForm.partNo.trim()
          if (this.dataForm.id) {
            console.log(this.dataForm)
            putObj(this.dataForm)
              .then((data) => {
                this.$message.success('修改成功')
@@ -546,7 +543,7 @@
              })
              .catch((error) => {
                this.isSubmit = false
                console.log(error)
                console.error(error)
              })
          } else {
            addObj(this.dataForm)
@@ -558,7 +555,7 @@
              })
              .catch((error) => {
                this.isSubmit = false
                console.log(error)
                console.error(error)
              })
          }
        } else {