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

Fixiaobai

2023-09-15 c7ccbc6510a9350e0a0a5a39a84f46c382d080b3

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

 src/components/view/standard.vue

@@ -13,26 +13,32 @@
    </div>
    <div class="thing">
      <div class="left">
        <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>
        <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">
@@ -254,6 +260,11 @@
                  <template slot-scope="scope">
                      <el-input size="mini" v-model="scope.row.num"
                      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>
@@ -671,6 +682,10 @@
    getChildData(data){
      this.childIds = data;
    },
    //物料清单-新增bom-表格删除行
    removeMTableRow(index){
      this.materialForm.tableList.splice(index,1);
    },
    //删除按钮
    deleteDataBtn(){
      let ids;
@@ -742,7 +757,7 @@
                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){
@@ -785,7 +800,6 @@
        this.selectAll();
        this.$message.success(res.message);
      }).catch(error=>{
        this.$message.error(error.message);
      })
    },
    //清空新增bom表单
@@ -1300,16 +1314,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;
}