工种管理模块 编辑工种接口400的问题修改+增加如果启用不达标保底，则必须输入保底工资的逻辑

haoxuan

2024-05-07 544f30e28a3d8ea41e5ea8c0add2ce77c1b6fb1a

 src/views/productManage/silkRegisterForm/addPage.vue

@@ -48,7 +48,7 @@
            label-width="80px"
          >
            <el-form-item label="编号" prop="number" class="form-item">
              <el-input v-model="form.number" placeholder="请输入"> </el-input>
              <el-input v-model="form.number" :disabled="title=='修改'?true:false" placeholder="请输入"> </el-input>
            </el-form-item>
            <el-form-item label="落丝时间" prop="finishDate" class="form-item">
              <el-date-picker
@@ -77,18 +77,18 @@
                </el-option>
              </el-select>
            </el-form-item>
            <el-form-item label="车间" prop="name" class="form-item">
            <el-form-item label="车间" prop="workshopObj" class="form-item">
              <el-select
                v-model="form.name"
                v-model="form.workshopObj"
                placeholder="请选择"
                class="select-width"
                @change="getGroupNumber('name')"
                @change="getGroupNumber('workshopObj')"
              >
                <el-option
                  v-for="item in nameList"
                  :key="item.ID"
                  :label="item.name"
                  :value="item.name"
                  :value="{ value: item.number, label: item.name }"
                >
                </el-option>
              </el-select>
@@ -181,6 +181,7 @@
              :detail-enter="isView ? true : false"
              :selectBox="false"
              :detailEnter="true"
              :isBorder="true"
              :show-summary="showSummary"
              :product-table-list="tableList"
              @inputContent="inputContent"
@@ -222,25 +223,25 @@
          :model="form"
          :rules="rules"
          label-position="right"
          label-width="60px"
          label-width="70px"
        >
          <div class="form-box-t">
            <el-form-item label="编号" prop="number" class="form-item">
            <el-form-item label="编号：" prop="number" class="form-item">
              {{ form.number }}
            </el-form-item>
            <el-form-item label="车间" prop="name" class="form-item">
              {{ form.name }}
            <el-form-item label="车间：" prop="workshopName" class="form-item">
              {{ form.workshopName }}
            </el-form-item>
            <el-form-item label="组别" prop="workshopGroup" class="form-item">
            <el-form-item label="组别：" prop="workshopGroup" class="form-item">
              {{ form.workshopGroup }}
            </el-form-item>
            <el-form-item label="回数" prop="circle" class="form-item">
            <el-form-item label="回数：" prop="circle" class="form-item">
              {{ form.circle }}
            </el-form-item>
            <el-form-item label="规格" prop="spec" class="form-item">
            <el-form-item label="规格：" prop="spec" class="form-item">
              {{ form.spec }}
            </el-form-item>
            <el-form-item label="日期" prop="finishDate" class="form-item">
            <el-form-item label="日期：" prop="finishDate" class="form-item">
              {{ form.finishDate }}
            </el-form-item>
          </div>
@@ -251,6 +252,8 @@
              tooltip-effect="dark"
              style="width: 100%"
              :height="'calc(100% - 0px)'"
              :header-cell-style="{ background: '#f1f3f8',color: '#000009', 'font-size': '12px', 'font-family': 'PingFangSC' }"
              border
            >
              <el-table-column label="车号" prop="ID" width="100">
              </el-table-column>
@@ -451,6 +454,7 @@
  computed: {},
  data() {
    return {
      title:'',
      loading: false,
      activeName: "first",
      searchOptions: [],
@@ -473,7 +477,7 @@
          { required: true, message: "请选择", trigger: ["change", "blur"] },
        ],
        // 车间 应该true
        name: [
        workshopObj: [
          { required: true, message: "请选择", trigger: ["change", "blur"] },
        ],
        spec: [
@@ -576,6 +580,7 @@
      this.activeName = query.activeName ? query.activeName : "first";
      this.registerId = query.id ? query.id : "";
      this.inspectID = query.inspectID ? query.inspectID : "";
      this.title= query.title ? query.title : "";
    }
    this.getSelectDataList();
    this.keyword = "";
@@ -588,7 +593,7 @@
          number: "",
          finishDate: "",
          market: "",
          name: "",
          workshopObj: "",
          spec: "",
          workshopGroup: "",
          circleTwo: "",
@@ -604,7 +609,11 @@
                  JSON.stringify(response.data ? response.data : {})
                );
                this.form = config;
                this.getGroupNumber()
                this.form.workshopObj={
                  value:config.workshopNumber,
                  label:config.workshopName,
                }
                this.getGroupNumber('','edit')
                let finenessList=config.finenessList
                  ? config.finenessList
                  : [];
@@ -622,7 +631,7 @@
      } else {
        this.form = {
          number: "",
          name: "",
          workshopObj: "",
          workshopGroup: "",
          circle: "",
          spec: "",
@@ -646,7 +655,7 @@
              );
              this.form = config;
              this.form.number = config.finenessRegister.number;
              this.form.name = config.finenessRegister.name;
              this.form.workshopName = config.finenessRegister.workshopName;
              this.form.workshopGroup = config.finenessRegister.workshopGroup;
              this.form.spec = config.finenessRegister.spec;
              this.form.finishDate = config.finenessRegister.finishDate;
@@ -760,34 +769,28 @@
        }
      });
    },
    async getGroupNumber(val) {
      if (this.form.name) {
        //组别
        let number = "";
        for (let i in this.nameList) {
          if (this.nameList[i].name == this.form.name) {
            number = this.nameList[i].number;
            break;
          }
        }
        await getWorkshopManageGroup({ number: number }).then((res) => {
          if (res.code == 200) {
            this.workshopGroupList = [];
            let workshopGroupList = res.data || {};
            this.workshopGroupList=[]
            if(val=='name'){
              this.form.workshopGroup=''
            }
            if (Object.keys(workshopGroupList).length > 0) {
              for (let i in workshopGroupList) {
                this.workshopGroupList.push(workshopGroupList[i]);
    async getGroupNumber(val,type) {
      if (Object.keys(this.form.workshopObj).length>0) {
        if(this.form.workshopObj.value){
          await getWorkshopManageGroup({ number: this.form.workshopObj.value }).then((res) => {
            if (res.code == 200) {
              this.workshopGroupList = [];
              let workshopGroupList = res.data || {};
              this.workshopGroupList=[]
              if(val=='workshopObj'){
                this.form.workshopGroup=''
              }
              if (Object.keys(workshopGroupList).length > 0) {
                for (let i in workshopGroupList) {
                  this.workshopGroupList.push(workshopGroupList[i]);
                }
              }
            }
          }
        })
        if(this.form.workshopGroup&&this.form.market){
            getCarNumber({
              workshopName:this.form.name,
          })
        }
        if(this.form.workshopGroup&&this.form.market&&type!='edit'){
          await  getCarNumber({
              workshopName:this.form.workshopObj.label,
              marketName:this.form.market,
              groupNumber:this.form.workshopGroup,
            }).then((res) => {
@@ -796,10 +799,11 @@
                let data = res.data?JSON.parse(JSON.stringify(res.data)) : [];
               if(Object.keys(data).length>0){
                for(let i in data){
                    this.tableData.push({position:data[i],productId:Number(i)+1})
                    this.tableData.push({position:data[i],productId:Number(i)*2+1})
                    this.tableData.push({position:data[i],productId:Number(i)*2+2})
                }
               }
               this.tableList.tableData = this.tableData
               this.tableList.tableData = this.tableData 
              }else{
                this.tableData=[]
              }
@@ -869,7 +873,7 @@
          number: "",
          finishDate: "",
          market: "",
          name: "",
          workshopObj: "",
          spec: "",
          workshopGroup: "",
          circleTwo: "",
@@ -932,7 +936,8 @@
            if (this.inspectID) {
              params.ID = this.form.ID ? this.form.ID : Number(this.inspectID);
            }
          
            params.workshopName=this.form.workshopObj.label;
            params.workshopNumber=this.form.workshopObj.value;
            saveRegister(params)
              .then((res) => {
                if (res.code == 200) {
@@ -954,7 +959,9 @@
              });
          } else {
            let paramsTwo = {
              ...form,
              // ...form,
              info:form,
              items:this.tableTwoList.tableInfomation,
            };
            // 编辑
            if (this.registerId) {