Merge branch 'master' of http://111.30.93.211:10101/r/supipe

张晓波

2023-12-04 5883ac62ed84dd659318630eb631f1e41428596d

Merge branch 'master' of http://111.30.93.211:10101/r/supipe

 web/src/api/modules/ductpiecePLM.js

@@ -49,6 +49,9 @@
  // 新增管片信息
  insertPipeData: (params) =>
    axios.post('/m/modcheck/addPipe', params),
  //获取所有模具套号
  getTotalModelNums: (params) =>
    axios.post('/m/modcheck/allNumType', params),
  // 修改环号信息
  updataRingNumData: (params) =>
    axios.post('m/pipeInfo/updateRingNum', params),

 web/src/views/DuctpiecePLM/DuctProduct/ProductIndex.vue

@@ -402,6 +402,21 @@
            placeholder="请输入环号"
          ></el-input>
        </el-form-item>
        <el-form-item label="模具套号：" prop="numType" v-if="asyncTitle">
          <el-select
            v-model="formInsert.numType"
            clearable
            placeholder="请选择模具套号"
          >
            <el-option
              v-for="item in modelNumber"
              :key="item"
              :label="item"
              :value="item"
            >
            </el-option>
          </el-select>
        </el-form-item>
      </el-form>
      <div slot="footer">
        <el-button @click="asyncInsert = false">取 消</el-button>
@@ -551,6 +566,7 @@
      checkResult: "", // 质量标注
      reinforcement: "", // 配筋
      reinforcementData: [], // 配筋信息
      modelNumber:[],//模具套号
      groutingHoles: "", // 注浆孔
      groutingHolesData: [], // 注浆孔信息
      blockNum: "", // 块号
@@ -590,6 +606,13 @@
          {
            required: true,
            message: "请选择配筋",
            trigger: ["blur", "change"],
          },
        ],
        numType: [
          {
            required: true,
            message: "请选择模具套号",
            trigger: ["blur", "change"],
          },
        ],
@@ -660,6 +683,7 @@
    this.getAllProjects();
    this.getAllGroupData();
    this.searchDuctpiecePLMList(true);
    this.getModelNums()
  },
  methods: {
    // 根据项目获取钢筋笼 模具信息
@@ -675,6 +699,16 @@
        this.steelData = [];
      }
    },
    //获取所有模具套号
    getModelNums(){
      this.$api.DuctpiecePLM.getTotalModelNums().then(res=>{
        if(res.statusMsg ==='ok'){
          this.modelNumber = res.data
        }else{
          this.$message.warning(res.statusMsg)
        }
      })
    },
    // 获取全部班组
    async getAllGroupData() {
      const { data } = await this.$api.DuctpiecePLM.getAllGroupData();