Merge branch 'master' of http://192.168.0.22:9001/r/mom-before

Fixiaobai

2023-09-15 0818becbf021341ce369d4f92b2ade3a2648a953

 src/components/view/standard.vue

@@ -13,15 +13,16 @@
    </div>
    <div class="thing">
      <div class="left">
        <el-row :gutter="5">
        <el-row :gutter="5" >
          <el-col :span="21">
            <el-input v-model="search" suffix-icon="el-icon-search" placeholder="请输入搜索内容" size="small" clearable></el-input>
          </el-col>
          <el-col :span="2">
            <el-button size="small" icon="el-icon-plus" @click="bomLeftAdd=true"></el-button>
            <el-button size="mini" icon="el-icon-plus" @click="bomLeftAdd=true"></el-button>
          </el-col>
        </el-row>
        <el-tree :data="list" ref="tree" default-expand-all :props="{ children: 'children', label: 'name' }"
        <el-row style="margin-top: 16px;">
          <el-tree :data="list" ref="tree" default-expand-all :props="{ children: 'children', label: 'name' }"
          node-key="id" :filter-node-method="filterNode" @node-click="handleNodeClick" highlight-current>
          <div class="custom-tree-node" slot-scope="{ node, data }">
            <span><i :class="`node_i ${data.code != '[5]' ? 'el-icon-folder-opened' : 'el-icon-tickets'}`"></i>
@@ -31,6 +32,7 @@
            </el-button>
          </div>
        </el-tree>
        </el-row>
      </div>
      <div class="right">
        <div class="choose">
@@ -42,21 +44,24 @@
            <el-option :value="2" label="物料清单"></el-option>
            <el-option :value="3" label="生产工艺"></el-option>
          </el-select>
          <span>{{ tableType == 1 ? '项目：' : '工艺名称：' }}</span>
          <el-input v-model="searchName" size="small" placeholder="请输入" style="width: 224px;margin-right: 50px;"
            clearable></el-input>
          <span>版本：</span>
          <el-select v-model="version2" @change="verevent" size="small" style="width: 280px;margin-right: 10px;" placeholder="请选择">
            <el-option v-for="item in version" :key="item" :label="item" :value="item">
          <el-select v-model="versionVal" @change="verevent" size="small" style="width: 280px;margin-right: 52px;" placeholder="请选择">
            <el-option v-for="(item,index) in versionData" :key="index" :label="item.label" :value="item.value">
            </el-option>
          </el-select>
          <el-button size="mini" @click="() => { searchName = ''; selectProductTableData() }"><span>重 置</span></el-button>
          <el-button size="mini" type="primary" style="background: #004EA2;" @click="selectProductTableData"><span>查
              询</span></el-button>
          <span>{{ tableType == 1 ? '项目：' : '工艺名称：' }}</span>
          <el-input v-model="searchName" size="small" placeholder="请输入" style="width: 224px;margin-right:10px"
            clearable></el-input>
          <el-button size="mini" @click="() => { searchName = ''; selectAll() }">
            <span>重 置</span>
          </el-button>
          <el-button size="mini" type="primary" style="background: #004EA2;" @click="selectAll">
            <span>查 询</span>
          </el-button>
        </div>

        <div class="contentTable" v-if="this.typeselect == 0">
          <technology @childData="getChildData"  :tableType="tableType" :tableData="tableData"></technology>
          <technology @childData="getChildData" @updateDevice="updateDevice"  :tableType="tableType" :tableData="tableData"></technology>
        </div>
        <div class="contentTable" v-if="this.typeselect == 1">
          <target @childData="getChildData" :tableType="tableType" :tableData="tableData"></target>
@@ -391,6 +396,7 @@
    return {
      //子组件传的id列表
      childIds:[],
      isUpdateDevice:false,
      //工序列表
      fatherList:[],
      deviceList:[],
@@ -482,7 +488,6 @@
      formTypeOptions: null,
      typeselect: 0,
      returntree: {id:28},
      version: {},
      leftAdd:{
        type: [],
        father: null,
@@ -490,9 +495,8 @@
        name: null,
        specifications: null
      },
      version2: {},
      verdata: {},
      character: 0,
      versionData: [],
      versionVal: null,
      restaurants: [],
      bomName:[],
      bomStandard:[],
@@ -505,6 +509,9 @@
    this.selectVersion()
  },
  methods: {
    updateDevice(val){
      this.isUpdateDevice = val;
    },
    changeLeftAdd(){
        if(this.leftAdd.type.length===2){
          this.leftAdd.father=null
@@ -526,7 +533,26 @@
        this.$refs[formName].validate((valid) => {
          if (valid) {
            let obj=JSON.parse(JSON.stringify(this.leftAdd))
            console.log(obj);
            if(obj.type.length===1){
              obj.type=this.getType(obj.type[0])
                  this.$axios.post(this.$api.url.leftAddOneTwo,obj,{
                     headers: { "Content-Type": "application/json" }
                 }).then(res=>{
                     this.$message({
                      message: res.message,
                      type: 'success'
                      });
                      this.leftAdd.type=[]
                      this.leftAdd.father=null
                      this.leftAdd.standard=null
                      this.leftAdd.name=null
                      this.leftAdd.specifications=null
                      this.selectMaterialTree()
                      this.bomLeftAdd=false  
                      this.selectVersion() 
                  })
                  return
            }
            let one=this.list.filter(item=>{
                return item.name===obj.type[0]
              })[0]
@@ -544,7 +570,14 @@
                      message: res.message,
                      type: 'success'
                      });
                      this.selectMaterialTree()   
                      this.leftAdd.type=[]
                      this.leftAdd.father=null
                      this.leftAdd.standard=null
                      this.leftAdd.name=null
                      this.leftAdd.specifications=null
                      this.selectMaterialTree()
                      this.bomLeftAdd=false 
                      this.selectVersion() 
                  })
              }else{
                let three=two.children.filter(item=>{
@@ -560,7 +593,14 @@
                      message: res.message,
                      type: 'success'
                      });
                      this.selectMaterialTree()   
                      this.leftAdd.type=[]
                      this.leftAdd.father=null
                      this.leftAdd.standard=null
                      this.leftAdd.name=null
                      this.leftAdd.specifications=null
                      this.selectMaterialTree()
                      this.bomLeftAdd=false  
                      this.selectVersion()
                  })
                }else{
                  //新增标准型号
@@ -580,7 +620,14 @@
                      message: res.message,
                      type: 'success'
                      });
                      this.selectMaterialTree()   
                      this.leftAdd.type=[]
                      this.leftAdd.father=null
                      this.leftAdd.standard=null
                      this.leftAdd.name=null
                      this.leftAdd.specifications=null
                      this.selectMaterialTree()
                      this.bomLeftAdd=false 
                      this.selectVersion()  
                   })
                  }else{
                     let specificationsDto={
@@ -594,7 +641,13 @@
                      message: res.message,
                      type: 'success'
                      });
                      this.leftAdd.type=[]
                      this.leftAdd.father=null
                      this.leftAdd.standard=null
                      this.leftAdd.name=null
                      this.leftAdd.specifications=null
                      this.selectMaterialTree()
                      this.bomLeftAdd=false  
                      this.selectVersion()
                   })
                  }
@@ -667,7 +720,7 @@
        }).then(() => {
          this.$axios.post(this.$api.url.addVersion,{
            specificationsId : this.returntree.id,
            version : this.version2.substring(1,2),
            version : this.versionVal,
          }).then(res=>{
            this.selectVersion();
            this.$message.success(res.message);
@@ -684,6 +737,7 @@
          let obj = {}
          if(type == 0){
            obj = {
                version : this.versionVal,
                specificationsId: Number.parseInt(this.returntree.id),
                deviceGroup: this.technologyForm.deviceGroup,
                father: this.technologyForm.tefather,
@@ -692,11 +746,14 @@
              }
              this.submitBomAdd(this.$api.url.addTechnology,obj);
          }else if(type == 1){
            this.submitBomAdd(this.$api.url.addProductByStandard,this.targetForm);
            obj = this.targetForm;
            obj.version = this.versionVal;
            this.submitBomAdd(this.$api.url.addProductByStandard,obj);
          }else if(type == 2){
            obj = {
              mbomDto2List:this.materialForm.tableList,
              technologyId:this.materialForm.mtechnologyId
              technologyId:this.materialForm.mtechnologyId,
              version : this.versionVal
            }
            this.submitBomAdd(this.$api.url.addMBomByStandard,obj);
          }else if(type == 3){
@@ -706,12 +763,17 @@
                    product: form.product,
                    productFather: form.productFather,
                    technologyId: form.protechnologyId,
                    unit: form.unit
                    unit: form.unit,
                    version : this.versionVal
                }
                this.submitBomAdd(this.$api.url.addTechniqueByStandard,obj);
          }else{
            return
          }
          this.technologyVisible = false;
          this.targetVisible = false;
          this.materialVisible = false;
          this.productVisible = false;
        }
      })
    },
@@ -725,11 +787,8 @@
      }).catch(error=>{
        this.$message.error(error.message);
      })
      this.technologyVisible = false;
      this.targetVisible = false;
      this.materialVisible = false;
      this.productVisible = false;
    },
    //清空新增bom表单
    clearBomAddModel(){
      if(this.typeselect == 0){
        this.deviceList=[];
@@ -740,6 +799,7 @@
        this.$refs["targetForm"].resetFields();
      }else if(this.typeselect == 2){
        this.mIdList = [];
        this.materialForm.tableList = [];
        this.$refs["materialForm"].resetFields();
      }else{
        this.productDeviceList=[];
@@ -781,7 +841,10 @@
    //物料清单--获取工序，工艺列表
    getMaterialFormList(){
      this.$axios.get(this.$api.url.chooseTechByMBom,{
        params:{specificationsId : this.returntree.id}
        params:{
          specificationsId : this.returntree.id,
          version : this.versionVal
        }
      }).then(res=>{
        this.materialFormList = res.data;
      }).catch(error=>{
@@ -797,7 +860,10 @@
    //技术指标--获取工序，工艺列表
    getTargetFormList(){
      this.$axios.get(this.$api.url.chooseTechByStandard,{
        params:{specificationsId : this.returntree.id}
        params:{
          specificationsId : this.returntree.id,
          version : this.versionVal
        }
      }).then(res=>{
        this.targetFormList = res.data;
      }).catch(error=>{
@@ -807,7 +873,10 @@
    //1.生产工艺-->选择工序,工艺
    getProductFormList(){
      this.$axios.get(this.$api.url.chooseTechByProduct,{
        params:{specificationsId : this.returntree.id}
        params:{
          specificationsId : this.returntree.id,
          version : this.versionVal
        }
      }).then(res=>{
        this.productFormList = res.data;
      }).catch(error=>{
@@ -859,7 +928,10 @@
    //工艺路线--获取工序列表
    getFatherList(){
      this.$axios.get(this.$api.url.chooseFather,{
        params:{specificationsId : this.returntree.id}
        params:{
          specificationsId : this.returntree.id,
          version: this.versionVal
        }
      }).then(res=>{
        this.fatherList = res.data;
      }).catch(error=>{
@@ -955,10 +1027,8 @@

    },
    TYPE(val) {//类型.数据
      // console.log(val);
      this.typeselect = val

      // console.log(this.typeselect);
      this.searchName = '';
      this.selectVersion()
    },
    handleNodeClick(val) {//树的值
@@ -968,23 +1038,24 @@
      }
    },
    async selectVersion() {//版本
      let v=await this.$axios.get(this.$api.url.selectVersion, {
      this.versionData = [];
      await this.$axios.get(this.$api.url.selectVersion, {
        params: {
          specificationsId: this.returntree.id,
          type: this.typeselect,
        }
      }).then(res => {
        this.verdata = res.data
        this.version = this.verdata.map(el => {
          return el = `v${el}`
        })
        // console.log("版本");
        return this.verdata[0]
        //初始化版本选择列表
        if(res.data != null){
          res.data.forEach(item=>{
            this.versionData.push({
              label:"v"+item,
              value:item
            })
            this.versionVal = res.data[0];
          })
        }
      })
      this.character=v
      if(this.character != undefined){
        this.version2="v"+v
      }
      this.selectAll()
    },
    //右侧数据
@@ -993,34 +1064,27 @@
        params: {
          specificationsId: this.returntree.id,//tree的点击反馈
          type: this.typeselect,//类型
          version: this.character,//版本
          version: this.versionVal,//版本
          message: this.searchName//搜索条件
        }
      }).then(res => {
        let arr = res.data;
        this.formatData(arr)
        this.tableData = arr;
        console.log("arr--",arr);
      })
    },
    formatData(data){
      let arr = data;
      for(var i=0;i<arr.length;i++){
            arr[i].rowId = Math.random();
            arr[i].indents = 1;
            if(arr[i].children != undefined){
              this.formatData(arr[i].children);
            }
        }
    },
    verevent(val) {
      // console.log(val);
      let cc = val.replace('v', '')
      // console.log(cc);
      this.character = cc
      this.versionVal = val
      this.selectAll()
      // const { v, ...newObj } = val;
      // delete newObj.v
      // console.log(newObj);
    },
    //五级树
    selectMaterialTree() {
@@ -1034,6 +1098,28 @@
            arr[idx].name = '半成品'
          }
        })
        if(res.data.length<1){
          let obj={
            name: '成品',
          }
          let obj2={
            name: '半成品',
          }
          this.list.push(obj)
          this.list.push(obj2)
        }
        if(res.data.length===1){
          if(res.data[0].name==='成品'){
            this.list.push({
            name: '半成品',
          })
          }
          if(res.data[0].name==='半成品'){
            this.list.push({
            name: '成品',
          })
          }
        }
        this.selectDataList()
        // 默认第一个五级节点搜索，新增配置项
        const treeOptions = JSON.parse(JSON.stringify(this.list));
@@ -1082,26 +1168,6 @@
    nodeClose(data, node, el) {
      $($(el.$el).find('.node_i')[0]).attr('class', 'node_i el-icon-folder')
    },
    async selectProductTableData() {
      switch (this.tableType) {
        case 0:
          const { data: technologyList } = await this.$axios.get(this.$api.url.selectTechnologyByMaterial, { params: { specificationId: this.checkTreeNode.id, technologyName: this.searchName } })
          this.tableData = technologyList
          break;
        case 1:
          const { data: productList } = await this.$axios.get(this.$api.url.selectProductByMaterial, { params: { specifications: this.checkTreeNode.id, project: this.searchName } })
          productList.forEach((item, index) => {
            item.name = item.father
            item.index = index + 1
            item.id = item.father
            if (item.children.length === 1) {
              productList[index] = { ...item.children[0], index: index + 1, name: item.father }
            }
          })
          this.tableData = productList
          break;
      }
    },
    // 递归更改添加级联所需属性
    replaceProp(arr){
      for (let index = 0; index < arr.length; index++) {
@@ -1119,6 +1185,11 @@
    }
  },
  watch:{
    isUpdateDevice(val){
      if(val){
        this.selectAll();
      }
    },
    search(val) {
        this.$refs.tree.filter(val);
    },
@@ -1126,12 +1197,16 @@
    handler(newVal, oldVal) {
    if(this.isLeftAdd){
      let tree=JSON.parse(JSON.stringify(this.list))
      console.log(tree);
      let father=null;
      if(newVal.father!=null&&newVal.father!=''&&newVal.type.length>0){
          let one=tree.filter(item=>{
            return item.name===newVal.type[0]
          })[0]
          console.log(one);
          if(one.children===undefined){
            return
          }
          let two=one.children.filter(item=>{
            return item.name===newVal.father
          })[0]