Merge branch 'master' of http://114.132.189.42:9002/r/mom-before

Fixiaobai

2023-09-24 92f198bd79e26fe1c31541432cf927403ce0e694

 src/components/view/standard.vue

@@ -13,55 +13,64 @@
    </div>
    <div class="thing">
      <div class="left">
        <el-row :gutter="5" style="position: fixed;top: 148px;z-index: 1;">
          <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="mini" icon="el-icon-plus" @click="bomLeftAdd=true"></el-button>
          </el-col>
        </el-row>
        <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>
              {{ data.code }}{{ data.name }}</span>
            <el-button type="text" size="mini" @click.stop="remove(node, data)">
              <i class="el-icon-delete"></i>
            </el-button>
          </div>
        </el-tree>
        </el-row>
        <div class="left_search">
          <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="mini" icon="el-icon-plus" @click="bomLeftAdd=true"></el-button>
            </el-col>
          </el-row>
        </div>
        <div class="left_tree">
          <el-row>
            <el-col :span="24">
              <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>
                  {{ data.code }}{{ data.name }}</span>
                <el-button type="text" size="mini" @click.stop="remove(node, data)">
                  <i class="el-icon-delete"></i>
                </el-button>
              </div>
            </el-tree>
            </el-col>
          </el-row>
        </div>
      </div>
      <div class="right">
        <div class="choose">
          <span>类型：</span>
          <el-select v-model="tableType" size="small" placeholder="请选择" @change="TYPE"
            style="width: 224px;margin-right: 52px;">
            style="width: 13vw;margin-right: 15px;">
            <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>{{ 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: 13vw;margin-right: 15px;" 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: 13vw;margin-right:15px"
            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" @updateDevice="updateDevice"  :tableType="tableType" :tableData="tableData"></technology>
        </div>
        <div class="contentTable" v-if="this.typeselect == 1">
          <target @childData="getChildData" :tableType="tableType" :tableData="tableData"></target>
          <target  @childData="getChildData" :tableType="tableType" :tableData="tableData"></target>
        </div>
        <div class="contentTable" v-if="this.typeselect == 2">
          <material @childData="getChildData" :tableType="tableType" :tableData="tableData"></material>
@@ -79,34 +88,34 @@
           ref="technologyForm" :rules="technologyRules" label-width="90px">
           <el-row>
            <el-col :span="12">
              <el-form-item label="工序:" prop="tefather">
                <el-select size="small" 
                filterable allow-create default-first-option
              <el-form-item label="工序:" prop="tefather"  style="display: flex;">
                <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>
                </el-select>
              </el-form-item>
            </el-col>
            <el-col :span="12">
              <el-form-item label="工艺名称:" prop="tename">
                <el-input size="small" placeholder="请输入工艺名称" 
              <el-form-item label="工艺名称:" prop="tename" style="display: flex;">
                <el-input  style="width: 100%;" size="small" placeholder="请输入工艺名称"
                clearable v-model="technologyForm.tename"></el-input>
              </el-form-item>
            </el-col>
          </el-row>
          <el-row>
            <el-col :span="12">
              <el-form-item label="设备组:" prop="deviceGroup">
                <el-select placeholder="请选择设备组" size="small"
              <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>
            </el-col>
            <el-col :span="12">
              <el-form-item label="生产定额:" prop="productionQuota">
                <el-input size="small" clearable v-model.number="technologyForm.productionQuota" placeholder="请输入生产定额" />
              <el-form-item label="生产定额:" prop="productionQuota" style="display: flex;">
                <el-input style="width: 100%;" size="small" clearable v-model.number="technologyForm.productionQuota" placeholder="请输入生产定额" />
              </el-form-item>
            </el-col>
          </el-row>
@@ -123,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>
@@ -142,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>
@@ -150,7 +159,7 @@
            </el-col>
            <el-col :span="12">
              <el-form-item label="指标名称:" prop="name">
                <el-input size="small" v-model="targetForm.name" placeholder="请输入指标名称"/>
                <el-input size="small"  v-model="targetForm.name" placeholder="请输入指标名称"/>
              </el-form-item>
            </el-col>
          </el-row>
@@ -191,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>
@@ -217,12 +226,12 @@
              <el-table :data="materialForm.tableList" border max-height="470"
              :cell-style="{height:'20px',textAlign:'left'}"
              :header-cell-style="{height:'20px'}">
                <el-table-column label="供应商名称">
                <!-- <el-table-column label="供应商名称">
                  <template slot-scope="scope">
                      <el-input size="mini" v-model="scope.row.supplier"
                      placeholder="请输入"></el-input>
                  </template>
                </el-table-column>
                </el-table-column> -->
                <el-table-column label="质量追溯号">
                  <template slot-scope="scope">
                      <el-input size="mini" v-model="scope.row.qualityTraceability"
@@ -253,6 +262,11 @@
                      placeholder="请输入"></el-input>
                  </template>
                </el-table-column>
                <el-table-column label="操作" width="60">
                  <template slot-scope="scope">
                      <el-button type="text" @click="removeMTableRow(scope.$index)">删除</el-button>
                  </template>
                </el-table-column>
              </el-table>
            </el-col>
          </el-row>
@@ -269,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>
@@ -428,8 +442,8 @@
        father:{required:true,message:'项目不能为空',trigger:'change'},
        name:{required:true,message:'指标名称不能为空',trigger:'blur'},
        unit:{required:true,message:'单位不能为空',trigger:'change'},
        internal:{validator:checkVal,trigger:'change'},
        required:{validator:checkVal,trigger:'change'}
        internal:{required:true,message:'内控值不能为空',trigger:'change'},
        required:{required:true,message:'标准值不能为空',trigger:'change'}
      },
      //物料清单
      materialForm:{
@@ -485,7 +499,6 @@
      formTypeOptions: null,
      typeselect: 0,
      returntree: {id:28},
      version: {},
      leftAdd:{
        type: [],
        father: null,
@@ -493,9 +506,8 @@
        name: null,
        specifications: null
      },
      version2: {},
      verdata: {},
      character: 0,
      versionData: [],
      versionVal: null,
      restaurants: [],
      bomName:[],
      bomStandard:[],
@@ -547,8 +559,8 @@
                      this.leftAdd.name=null
                      this.leftAdd.specifications=null
                      this.selectMaterialTree()
                      this.bomLeftAdd=false  
                      this.selectVersion() 
                      this.bomLeftAdd=false
                      this.selectVersion()
                  })
                  return
            }
@@ -575,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=>{
@@ -598,7 +610,7 @@
                      this.leftAdd.name=null
                      this.leftAdd.specifications=null
                      this.selectMaterialTree()
                      this.bomLeftAdd=false  
                      this.bomLeftAdd=false
                      this.selectVersion()
                  })
                }else{
@@ -625,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={
@@ -646,7 +658,7 @@
                      this.leftAdd.name=null
                      this.leftAdd.specifications=null
                      this.selectMaterialTree()
                      this.bomLeftAdd=false  
                      this.bomLeftAdd=false
                      this.selectVersion()
                   })
                  }
@@ -664,11 +676,15 @@
        this.$refs[formName].resetFields();
      },
    leftAddBom(){
      

    },
    //获取子组件数据
    getChildData(data){
      this.childIds = data;
    },
    //物料清单-新增bom-表格删除行
    removeMTableRow(index){
      this.materialForm.tableList.splice(index,1);
    },
    //删除按钮
    deleteDataBtn(){
@@ -719,14 +735,12 @@
        }).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);
          }).catch(error=>{
            this.$message.error(error.message);
          })
        }).catch(() => {});
        })
    },
    //右侧bom,确认新增
    confirmAdd(formName){
@@ -736,19 +750,23 @@
          let obj = {}
          if(type == 0){
            obj = {
                version : this.versionVal,
                specificationsId: Number.parseInt(this.returntree.id),
                deviceGroup: this.technologyForm.deviceGroup,
                father: this.technologyForm.tefather,
                name: this.technologyForm.tename,
                productionQuota: Number.parseInt(this.technologyForm.productionQuota),
                productionQuota: this.technologyForm.productionQuota,
              }
              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){
@@ -758,12 +776,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;
        }
      })
    },
@@ -775,12 +798,7 @@
        this.selectAll();
        this.$message.success(res.message);
      }).catch(error=>{
        this.$message.error(error.message);
      })
      this.technologyVisible = false;
      this.targetVisible = false;
      this.materialVisible = false;
      this.productVisible = false;
    },
    //清空新增bom表单
    clearBomAddModel(){
@@ -827,7 +845,7 @@
        "num": null,
        "qualityTraceability": "",
        "specifications": "",
        "supplier": "",
        // "supplier": "",
        "unit": ""
      }
      this.materialForm.tableList.push(obj);
@@ -835,7 +853,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=>{
@@ -851,7 +872,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=>{
@@ -861,7 +885,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=>{
@@ -913,7 +940,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=>{
@@ -945,41 +975,41 @@
      }
    },
    startLeftAdd(){
      

    },
    getType(typeName){
      return typeName==="成品"?1:2
    },
    handleSelect(item) {
        console.log(item);
      },
      querySearch(queryString, cb) {
        var restaurants = this.restaurants;
        var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
        // 调用 callback 返回建议列表的数据
        cb(results);
      },
      querySearchName(queryString, cb) {
        var restaurants = this.bomName;
        var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
        // 调用 callback 返回建议列表的数据
        cb(results);
      },
      querySearchStandar(queryString, cb) {
        var restaurants = this.bomStandard;
        var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
        // 调用 callback 返回建议列表的数据
        cb(results);
      },
      loadFatherType(){
        return [{label:"橡胶连接器",value: "橡胶连接器"},{label:"金属连接器",value: "金属连接器"},
        {label:"湿插拔电连接器",value: "湿插拔电连接器"},{label:"分支组件",value: "分支组件"}]
      },
      createFilter(queryString) {
        return (restaurant) => {
          return (restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
        };
      },
    },
    querySearch(queryString, cb) {
      var restaurants = this.restaurants;
      var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
      // 调用 callback 返回建议列表的数据
      cb(results);
    },
    querySearchName(queryString, cb) {
      var restaurants = this.bomName;
      var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
      // 调用 callback 返回建议列表的数据
      cb(results);
    },
    querySearchStandar(queryString, cb) {
      var restaurants = this.bomStandard;
      var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
      // 调用 callback 返回建议列表的数据
      cb(results);
    },
    loadFatherType(){
      return [{label:"橡胶连接器",value: "橡胶连接器"},{label:"金属连接器",value: "金属连接器"},
      {label:"湿插拔电连接器",value: "湿插拔电连接器"},{label:"分支组件",value: "分支组件"}]
    },
    createFilter(queryString) {
      return (restaurant) => {
        return (restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
      };
    },
    selectDataList() {
            this.list.forEach(a => {
               a.code = '[1]'
@@ -1004,15 +1034,13 @@
                  })
               }
            })
         },
      },
    handleSelectionChange() {

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

      // console.log(this.typeselect);
      this.searchName = '';
      this.selectVersion()
    },
    handleNodeClick(val) {//树的值
@@ -1022,24 +1050,25 @@
      }
    },
    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.selectAll()
      })
      this.character=v
      if(this.character != undefined){
        this.version2="v"+v
      }
      this.selectAll()
    },
    //右侧数据
    selectAll() {
@@ -1047,7 +1076,8 @@
        params: {
          specificationsId: this.returntree.id,//tree的点击反馈
          type: this.typeselect,//类型
          version: this.character,//版本
          version: this.versionVal,//版本
          message: this.searchName//搜索条件
        }
      }).then(res => {
        let arr = res.data;
@@ -1059,21 +1089,14 @@
      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() {
@@ -1109,7 +1132,6 @@
          })
          }
        }
        console.log(this.list);
        this.selectDataList()
        // 默认第一个五级节点搜索，新增配置项
        const treeOptions = JSON.parse(JSON.stringify(this.list));
@@ -1157,26 +1179,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){
@@ -1310,16 +1312,29 @@
  height: calc(100% - 48px);
  background-color: #fff;
  display: flex;

}

.thing .left {
  width: 295px;
  height: calc(100% - 32px);
  overflow-y: auto;
  border-right: 3px solid rgb(245, 247, 251);
  padding: 16px;
}

.thing .left .left_search{
  width:95%;
  height: 32px;
  line-height: 32px;
  margin-bottom: 5px;
}

.thing .left .left_tree{
  width: 100%;
  height: calc(100% - 32px);
  overflow-y: scroll;
}

.thing .left .custom-tree-node span {
  font-size: 14px;
}