Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-09-24 2573c1c123a8464c312d27e380ac16d7e0ac2f11

 src/components/view/standard.vue

@@ -48,7 +48,7 @@
            <el-option :value="0" label="工艺路线"></el-option>
            <el-option :value="1" label="技术指标"></el-option>
            <el-option :value="2" label="物料清单"></el-option>
            <!-- <el-option :value="3" label="生产工艺"></el-option> -->
            <el-option :value="3" label="生产工艺"></el-option>
          </el-select>
          <span>版本：</span>
          <el-select v-model="versionVal" @change="verevent" size="small" style="width: 13vw;margin-right: 15px;" placeholder="请选择">
@@ -89,7 +89,7 @@
           <el-row>
            <el-col :span="12">
              <el-form-item label="工序:" prop="tefather"  style="display: flex;">
                <el-select size="small" 
                <el-select size="small"
                filterable allow-create default-first-option style="width: 100%;"
                v-model="technologyForm.tefather" placeholder="请输入或选择工序">
                  <el-option :value="item.father" :label="item.father" v-for="(item,index) in fatherList" :key="index"></el-option>
@@ -98,7 +98,7 @@
            </el-col>
            <el-col :span="12">
              <el-form-item label="工艺名称:" prop="tename" style="display: flex;">
                <el-input  style="width: 100%;" size="small" placeholder="请输入工艺名称" 
                <el-input  style="width: 100%;" size="small" placeholder="请输入工艺名称"
                clearable v-model="technologyForm.tename"></el-input>
              </el-form-item>
            </el-col>
@@ -108,7 +108,7 @@
              <el-form-item label="设备组:" prop="deviceGroup" style="display: flex;">
                <el-select placeholder="请选择设备组" size="small" style="width: 100%;"
                v-model="technologyForm.deviceGroup">
                <el-option :value="item.father" 
                <el-option :value="item.father"
                v-for="(item,index) in deviceList" :key="index" :label="item.father"></el-option>
                </el-select>
              </el-form-item>
@@ -132,7 +132,7 @@
          <el-row>
            <el-col :span="12">
              <el-form-item label="工序:" prop="pfather">
                <el-select v-model="targetForm.pfather" 
                <el-select v-model="targetForm.pfather"
                @change="changeFather" size="small" placeholder="请选择工序">
                  <el-option :value="item.name" :label="item.name" v-for="(item,index) in targetFormList" :key="index"></el-option>
                </el-select>
@@ -151,7 +151,7 @@
            <el-col :span="12">
              <el-form-item label="项目:" prop="father">
                <el-select v-model="targetForm.father"
                filterable allow-create default-first-option 
                filterable allow-create default-first-option
                size="small" placeholder="请输入或选择项目">
                  <el-option :value="item.father" :label="item.father" v-for="(item,index) in projectList" :key="index"></el-option>
                </el-select>
@@ -200,16 +200,16 @@
                  style="width:100%;" v-model="materialForm.mfather" size="small">
                  <el-option v-for="(item,index) in materialFormList" :key="index"
                  :label="item.name" :value="item.name" ></el-option>
                  </el-select>              
                  </el-select>
                </el-form-item>
              </el-col>
              <el-col :span="12">
              <el-form-item label="工艺名称:" prop="mtechnologyId">
                <el-select placeholder="请选择工艺名称" style="width:100%;" 
                <el-select placeholder="请选择工艺名称" style="width:100%;"
                v-model="materialForm.mtechnologyId" size="small">
                <el-option v-for="(item,index) in mIdList" :key="index" 
                <el-option v-for="(item,index) in mIdList" :key="index"
                :value="item.id" :label="item.name"></el-option>
                </el-select>            
                </el-select>
              </el-form-item>
            </el-col>
          </el-row>
@@ -283,7 +283,7 @@
            <el-row>
              <el-col :span="12">
                <el-form-item label="工序:" prop="profather">
                  <el-select v-model="productForm.profather" 
                  <el-select v-model="productForm.profather"
                   @change="changeProduct" placeholder="请选择工序" size="small">
                    <el-option v-for="(item,index) in productFormList" :key="index"
                    :value="item.name" :label="item.name"></el-option>
@@ -559,8 +559,8 @@
                      this.leftAdd.name=null
                      this.leftAdd.specifications=null
                      this.selectMaterialTree()
                      this.bomLeftAdd=false  
                      this.selectVersion() 
                      this.bomLeftAdd=false
                      this.selectVersion()
                  })
                  return
            }
@@ -587,8 +587,8 @@
                      this.leftAdd.name=null
                      this.leftAdd.specifications=null
                      this.selectMaterialTree()
                      this.bomLeftAdd=false 
                      this.selectVersion() 
                      this.bomLeftAdd=false
                      this.selectVersion()
                  })
              }else{
                let three=two.children.filter(item=>{
@@ -610,7 +610,7 @@
                      this.leftAdd.name=null
                      this.leftAdd.specifications=null
                      this.selectMaterialTree()
                      this.bomLeftAdd=false  
                      this.bomLeftAdd=false
                      this.selectVersion()
                  })
                }else{
@@ -637,8 +637,8 @@
                      this.leftAdd.name=null
                      this.leftAdd.specifications=null
                      this.selectMaterialTree()
                      this.bomLeftAdd=false 
                      this.selectVersion()  
                      this.bomLeftAdd=false
                      this.selectVersion()
                   })
                  }else{
                     let specificationsDto={
@@ -658,7 +658,7 @@
                      this.leftAdd.name=null
                      this.leftAdd.specifications=null
                      this.selectMaterialTree()
                      this.bomLeftAdd=false  
                      this.bomLeftAdd=false
                      this.selectVersion()
                   })
                  }
@@ -676,7 +676,7 @@
        this.$refs[formName].resetFields();
      },
    leftAddBom(){
      

    },
    //获取子组件数据
    getChildData(data){
@@ -975,7 +975,7 @@
      }
    },
    startLeftAdd(){
      

    },
    getType(typeName){
      return typeName==="成品"?1:2
@@ -1312,7 +1312,7 @@
  height: calc(100% - 48px);
  background-color: #fff;
  display: flex;
  

}

.thing .left {