Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmMes

jiangping

2023-08-18 61b396740d284c565cc22badf8e44568bda13a90

 web_standard/src/components/business/OperaSalaryParamWindow.vue

@@ -32,9 +32,9 @@
        <el-select v-model="form.materialId" placeholder="请选择物料" :disabled="isEdit" clearable @change="selectMaterial">
          <el-option
            v-for="item in materials"
            :key="item.realMaterialId"
            :key="item.materialId"
            :label="item.mmodel.name"
            :value="item.realMaterialId"
            :value="item.materialId"
          >
          </el-option>
        </el-select>
@@ -103,7 +103,7 @@
        minute: '',
        second: '',
        unqualified: 0,
        type: ''
        type: 1
      },
      isEdit: false,
      type: [
@@ -196,7 +196,9 @@
          // if (!isEdit) {
          //   this.form.materialId = res[0]?res[0].materialId:''
          // }
          // this.selectMaterial(this.form.materialId)
          if (isEdit) {
            this.selectMaterial(this.form.materialId)
          }
        })
        .catch(err => {
          console.log(err)
@@ -206,7 +208,7 @@
     
      let routeId;
      for (const item of this.materials) {
        if (item.realMaterialId === id) {
        if (item.materialId === id) {
          routeId = item.routeId
        }
      }