Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-09-09 c4355a18506cf0e8f63469a8a38f2e8d5e67d6f9

 src/components/view/standard.vue

@@ -42,7 +42,7 @@
          <span>{{ tableType == 1 ? '项目：' : '工艺名称：' }}</span>
          <el-input v-model="searchName" size="small" placeholder="请输入" style="width: 224px;margin-right: 24px;"
            clearable></el-input>
          <span>{{ tableType == 1 ? '版本：' : '工艺名称：' }}</span>
          <span>{{ tableType == 1 ? '版本：' : '版本：' }}</span>
          <el-select v-model="VER" @change="verevent" style="width: 280px;" placeholder="请选择">
            <el-option v-for="item in version" :key="item" :label="item" :value="item">
            </el-option>
@@ -52,40 +52,24 @@
              询</span></el-button>
        </div>

        <div>
          <el-table :data="tableData" style="width: 100%;margin-bottom: 20px;" row-key="name" border
            @selection-change="handleSelectionChange" default-expand-all
            :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
            <el-table-column type="selection" width="55">
            </el-table-column>
            <el-table-column type="index" width="50" label="序号">
            </el-table-column>
            <el-table-column prop="name" label="工序" sortable width="300px">
              <!-- <template slot-scope="scope">
                        <el-tag>
                            <div class="firstDiv" :style="`color: ${scope.row.children? '#16a7ff' : '#58c173'}`">
                            {{ scope.row.children ? "01" : "02" }}
        <div v-if="this.typeselect == 0">
          <technology  :tableType="tableType" :tableData="tableData"></technology>
                            </div>
                        </el-tag>
                        <span style="color: black">{{ scope.row.name }}</span>

                        </template> -->
            </el-table-column>
            <el-table-column prop="" sortable label="工艺名称">
            </el-table-column>
            <el-table-column prop="" label="指标名称">
            </el-table-column>
            <el-table-column prop="" label="单位">
            </el-table-column>
            <el-table-column prop="" label="内控值">
            </el-table-column>
            <el-table-column prop="unit" label="标准值">
            </el-table-column>
          </el-table>
        <div v-if="this.typeselect == 1">
          技术指标
        </div>
        <div class="table">
        <div v-if="this.typeselect == 2">
          <material  :tableType="tableType" :tableData="tableData"></material>
        </div>
        <div v-if="this.typeselect == 3">
          生产工艺
        </div>
        <!-- <div class="table">
          <technology v-if="tableData.length !== 0" :tableType="tableType" :tableData="tableData"></technology>
        </div>
        </div> -->
        <!-- <div class="table">
          <technology v-if="tableData.length !== 0" :tableType="tableType" :tableData="tableData"></technology>
        </div> -->
      </div>
    </div>

@@ -106,8 +90,10 @@

<script>
import technology from "./standard-table/technology.vue"
import material from "./standard-table/material.vue"
export default {
  components: { technology },
  components: { technology,material },

  data() {
    return {
      // BOM树数据结构
@@ -119,12 +105,14 @@
      tableData: [],
      bomAddModelVisible: false,// 控制bom新增模态框是否显示
      list: [],
      typeselect: {},
      returntree: {},
      typeselect: 0,
      returntree: {
        id:28,
      },
      version: {},
      VER: {},
      verdata: {},
      character: '',
      character: 0,
    }
  },
  // watch: {
@@ -137,6 +125,8 @@
  // },
  mounted() {
    this.selectMaterialTree()
    this.selectAll()
    this.selectVersion()
  },
  methods: {
    handleSelectionChange() {
@@ -145,14 +135,15 @@
    TYPE(val) {//类型.数据
      console.log(val);
      this.typeselect = val
      console.log(this.typeselect);
     
      // console.log(this.typeselect);
      this.selectVersion()
    },
    handleNodeClick(val) {//树的值
      console.log(val);
      this.returntree = val
    },
    selectVersion() {
    selectVersion() {//版本
      this.$axios.get(this.$api.url.selectVersion, {
        params: {
          specificationsId: this.returntree.id,
@@ -166,6 +157,20 @@
        console.log(this.verdata);
      })
    },
    //右侧数据
    selectAll() {
      console.log(this.$axios.get(this.$api.url.selectAll));
      this.$axios.get(this.$api.url.selectAll, {
        params: {
          specificationsId: this.returntree.id,//tree的点击反馈
          type: this.typeselect,//类型
          version: this.character,//版本
        }
      }).then(res => {
        console.log(res.data);
        this.tableData = res.data
      })
    },
    verevent(val) {
      console.log(val);
      let cc = val.replace('v', '')
@@ -175,19 +180,6 @@
      // const { v, ...newObj } = val;
      // delete newObj.v
      // console.log(newObj);
    },
    //右侧数据
    selectAll() {
      console.log(this.$axios.get(this.$api.url.selectAll));
      this.$axios.get(this.$api.url.selectAll, {
        params: {
          specificationsId: this.returntree.id,
          type: this.typeselect,
          version: this.character,
        }
      }).then(res => {
        this.tableData = res.data
      })
    },
    //五级树
    selectMaterialTree() {