新疆——新聚lims 1.标准库层级需要修改层级，行业-标准，总共两级；实验室换成行业 2.每个标准下的检验项列表加一个搜索查询功能

gaoluyang

5 天以前 eaff2fbd473362115c8c45e22b86b2ecb73e5a97

 src/views/standard/standardLibrary/index.vue

@@ -8,44 +8,41 @@
            <div class="head-container addButton">
              <el-input v-model="search" clearable placeholder="输入关键字进行搜索" size="small" style="margin-bottom: 5px"
                        suffix-icon="el-icon-search" @keydown.enter.native="searchFilter" @blur="searchFilter" @clear="searchFilter"></el-input>
              <el-button circle icon="el-icon-plus" size="mini" type="primary" @click="addDia = true"></el-button>
              <el-button circle icon="el-icon-plus" size="mini" type="primary" @click="openAddDia"></el-button>
            </div>
            <div class="head-container">
              <el-tree ref="tree" v-loading="treeLoad" :allow-drop="allowDrop" :data="list"
                       :default-expanded-keys="expandedKeys" :draggable="true" :filter-node-method="filterNode"
              <el-tree ref="tree" v-loading="treeLoad" :data="list"
                       :default-expanded-keys="expandedKeys" :filter-node-method="filterNode"
                       :props="{ children: 'children', label: 'label' }" highlight-current node-key="label"
                       style="
                        height: calc(100vh - 173px);
                        overflow-y: scroll;
                        scrollbar-width: none;"
                       @node-click="handleNodeClick"
                       @node-drop="handleDrop">
                       @node-click="handleNodeClick">
                <div slot-scope="{ node, data }" class="custom-tree-node">
                  <el-row style="width: 100%">
                    <el-col :class="{ sort: node.level > 3 }" :span="19" :title="data.label" style="text-align: left">
                    <el-col :span="19" :title="data.label" style="text-align: left">
              <span>
                <i :class="`node_i ${data.children != undefined
                  ? data.code === '[1]'
                <i :class="`node_i ${isLeaf(data)
                  ? 'el-icon-tickets'
                  : node.level === 1
                    ? 'el-icon-folder-opened'
                    : 'el-icon-folder'
                  : 'el-icon-tickets'
                  }`"></i>
                {{ data.label }}
              </span>
                    </el-col>
                    <el-col v-if="
              checkPermi(['standard:standardLibrary:delStandardTree']) &&
              (node.data.children === null ||
                node.data.children === undefined)
              isLeaf(node.data)
            " :span="2" style="text-align: right">
                      <el-button size="mini" type="text" @click.stop="editTreeName(node.data)">
                      <el-button size="mini" type="text" @click.stop="editTreeName(node)">
                        <i class="el-icon-edit"></i>
                      </el-button>
                    </el-col>
                    <el-col v-if="
              checkPermi(['standard:standardLibrary:delStandardTree']) &&
              (node.data.children === null ||
                node.data.children === undefined)
              isLeaf(node.data)
            " :span="2" style="text-align: right">
                      <el-button size="mini" type="text" @click.stop="remove(node, data)">
                        <i class="el-icon-delete"></i>
@@ -64,6 +61,9 @@
              <p style="font-size: 14px; color: #999;margin-left: 10px">{{ selectTree }}</p>
            </div>
            <div class="options_button">
              <el-input v-model="productKeyword" :disabled="!selected.isLeaf" clearable placeholder="搜索检验项/检验项子项"
                        size="small" style="width: 240px" suffix-icon="el-icon-search"
                        @keyup.enter.native="searchProduct" @clear="searchProduct"></el-input>
              <el-button v-if="isShowCopy" size="small" style="position: absolute; right: 20px; top: 1px" type="primary"
                         @click="openCopyDia">批量复制</el-button>
            </div>
@@ -198,12 +198,17 @@

    <el-dialog :visible.sync="addDia" title="分类添加" width="400px">
      <div class="body">
        <el-row style="line-height: 30px">
          <el-col :span="24" style="color: #999; font-size: 13px">
            新增到：{{ selected.tree || '根目录' }}
          </el-col>
        </el-row>
        <el-row style="line-height: 50px">
          <el-col :span="6" style="text-align: right">
            <span class="required-span">* </span>型号：
            <span class="required-span">* </span>名称：
          </el-col>
          <el-col :offset="1" :span="16">
            <el-input v-model="addOb.model" clearable placeholder="请输入型号" size="small"
            <el-input v-model="addOb.name" clearable placeholder="请输入名称" size="small"
                      @keyup.enter.native="addStandardTree"></el-input>
          </el-col>
        </el-row>
@@ -217,10 +222,10 @@
      <div class="body">
        <el-row style="line-height: 50px">
          <el-col :span="6" style="text-align: right">
            <span class="required-span">* </span>型号：
            <span class="required-span">* </span>名称：
          </el-col>
          <el-col :offset="1" :span="16">
            <el-input v-model="addOb.model" clearable placeholder="请输入型号" size="small"
            <el-input v-model="addOb.name" clearable placeholder="请输入名称" size="small"
                      @keyup.enter.native="updateStandardTree"></el-input>
          </el-col>
        </el-row>
@@ -302,9 +307,7 @@

<script>
import Sortable from "sortablejs";
import draggable from "vuedraggable";
import {
  updateTreeSort,
  resetTreeDragBatch,
  delStandardTree,
  selectStandardTreeList,
@@ -317,13 +320,16 @@
  upStandardProductList,
  selectStandardProductListByMethodId,
  updateSection,
  upStandardProducts,
  getStandardTemplate,
  selectStandardProductByMethodId,
  selectStandardProductEnumByMethodId,
} from "@/api/standard/standardLibrary";
import bindSupplierDensityDialogAsk from "./components/bindSupplierDensityDialogAsk.vue";
import BatchCopy from "./components/BatchCopy.vue";
import {
  isLeaf,
  buildSelectTree,
  getAncestorLabels,
  dropLastLabel,
} from "@/utils/standardTree";
import { Splitpanes, Pane } from "splitpanes";
import "splitpanes/dist/splitpanes.css";

@@ -332,7 +338,6 @@
  components: {
    BatchCopy,
    bindSupplierDensityDialogAsk,
    draggable,
    Splitpanes,
    Pane
  },
@@ -346,13 +351,18 @@
      factory: [],
      addDia: false,
      updateDia: false, // 修改树名字弹框
      oldModel: "",
      oldLabel: "",
      editTree: "",
      // 当前选中的节点：label / 完整路径 / 是否叶子(标准)
      selected: {
        label: "",
        tree: "",
        isLeaf: false,
      },
      // 检验项搜索关键字，走后端过滤（检验项 + 检验项子项）
      productKeyword: "",
      addOb: {
        factory: null,
        laboratory: null,
        sampleType: null,
        sample: null,
        model: null,
        name: "",
      },
      laboratory: [],
      addLoad: false,
@@ -384,29 +394,17 @@
      total: 0,
      currentPage: 1,
      standardId: 0,
      total0: 0,
      currentPage0: 1,
      productList0: [],
      methodList: [],
      productTableLoading0: false,
      filters0: [],
      filters1: [],
      pages: 1,
      inspectionItem: null,
      inspectionItemSubclass: null,
      sonLaboratory: null,
      token: null,
      fileList: [],
      uploading: false,
      isEquipment: true,
      isHaveChildren: {},
      sortTable: null,
      currentSupplierDensityRow: {}, // 选择零件绑定本条数据的信息
      bindSupplierDensityDialog: false,
      isShowCopy: false,
      batchCopyDia: false,
      VUE_APP_BASE_API: process.env.VUE_APP_BASE_API,
      moreSelects: [],
    };
  },
  mounted() {
@@ -424,40 +422,18 @@
    };
  },
  methods: {
    // 修改最子级名字
    editTreeName(info) {
    isLeaf,
    // 打开新增弹框：在当前选中节点下新增子级（未选中则新增根级）
    openAddDia() {
      this.addOb.name = "";
      this.addDia = true;
    },
    // 修改节点名字
    editTreeName(node) {
      this.updateDia = true;
      this.oldModel = info.label;
    },
    // 拖拽时判定目标节点能否被放置
    // 'prev'、'inner' 和 'next'，前、插入、后
    allowDrop(draggingNode, dropNode, type) {
      if (draggingNode.level !== 3) return;
      if (draggingNode.data.level === dropNode.data.level) {
        if (draggingNode.data.parentId === dropNode.data.parentId) {
          return type === "prev" || type === "next";
        } else {
          return false;
        }
      } else {
        // 不同级进行处理
        return false;
      }
    },
    // tree拖拽成功完成时触发的事件
    handleDrop(draggingNode, dropNode, dropType, ev) {
      try {
        this.treeLoad = true;
        updateTreeSort(this.list).then((res) => {
          if (res.code === 200) {
            this.$message.success("操作成功");
          }
          this.treeLoad = false;
        });
      } catch (e) {
        this.treeLoad = false;
        console.log("e----", e);
      }
      this.oldLabel = node.label;
      this.editTree = buildSelectTree(node, "null");
      this.addOb.name = node.label;
    },
    rowDrop(methodId) {
      const that = this;
@@ -497,54 +473,12 @@
        });
      }
    },
    hasChildWithId(nodes, name) {
      for (let node of nodes) {
        const comName = node.label + node.code;
        if (comName == name) {
          //判断递归结束条件
          this.isHaveChildren = node;
          return node;
        } else if (node.children && node.children.length > 0) {
          //判断children是否有数据
          this.hasChildWithId(node.children, name); //递归调用
        }
      }
    },
    // 调用tree过滤方法 中文英过滤
    filterNode (value, data, node) {
      if (!value) {　　　　//如果数据为空，则返回true,显示所有的数据项
        return true
      }
      return data.label.indexOf(value) !== -1;
      // 查询列表是否有匹配数据，将值小写，匹配英文数据
      // let val = value.toLowerCase()
      // return this.chooseNode(val, data, node) // 调用过滤二层方法
    },
    // 过滤父节点 / 子节点 (如果输入的参数是父节点且能匹配，则返回该节点以及其下的所有子节点；如果参数是子节点，则返回该节点的父节点。name是中文字符，enName是英文字符.
    chooseNode (value, data, node) {
      if (data.label.indexOf(value) !== -1) {
        return true
      }
      const level = node.level
      // 如果传入的节点本身就是一级节点就不用校验了
      if (level === 1) {
        return false
      }
      // 先取当前节点的父节点
      let parentData = node.parent
      // 遍历当前节点的父节点
      let index = 0
      while (index < level - 1) {
        // 如果匹配到直接返回，此处name值是中文字符，enName是英文字符。判断匹配中英文过滤
        if (parentData.data.label.indexOf(value) !== -1) {
          return true
        }
        // 否则的话再往上一层做匹配
        parentData = parentData.parent
        index++
      }
      // 没匹配到返回false
      return false
    },

    searchFilter() {
@@ -554,40 +488,26 @@
      this.upIndex++;
    },
    handleNodeClick(val, node, el) {
      //树的值
      if (node.childNodes.length === 0) {
        this.isShowCopy = true;
      } else {
        this.isShowCopy = false;
      }
      const leaf = isLeaf(val);
      // 叶子节点即标准，才显示批量复制、才查询检验项
      this.isShowCopy = leaf;
      this.total = 0;
      this.currentPage = 1;
      this.selectTree = "";
      this.getNodeParent(node);
      this.selectTree = this.selectTree.replace(" - ", "");
      let data = this.selectTree.split(" - ");
      let data2 = "";
      for (let index = data.length - 1; index >= 0; index--) {
        data2 += " - " + data[index];
      }
      this.selectTree = data2.replace(" - ", "");
      if (node.childNodes.length === 0) {
      this.selectTree = buildSelectTree(node, "null");
      this.selected = {
        label: val.label,
        tree: this.selectTree,
        isLeaf: leaf,
      };
      // 切换节点时清空搜索与列表；非标准节点还要清空 standardId，避免搜索查到上一个标准
      this.productKeyword = "";
      this.standardList = [];
      this.productList = [];
      if (leaf) {
        this.selectsStandardMethodByFLSSM();
      }
      let trees = this.selectTree.split(" - ");
      this.addOb.factory = trees[0];
      this.addOb.laboratory = trees[1];
      this.addOb.sampleType = trees[2];
      this.addOb.sample = trees[3];
    },
    getNodeParent(val) {
      if (val.parent != null) {
        if (val.data.children === null) {
          this.selectTree += " - " + val.label + " - " + "null";
        } else {
          this.selectTree += " - " + val.label;
        }
        this.getNodeParent(val.parent);
      } else {
        this.standardId = 0;
        this.syncSortable();
      }
    },
    remove(node, data) {
@@ -595,23 +515,20 @@
        type: "error",
      })
        .then(() => {
          // this.treeLoad = true
          this.selectTree = "";
          this.getNodeParent(node);
          this.selectTree = this.selectTree.replace(" - ", "");
          let data = this.selectTree.split(" - ");
          let data2 = "";
          for (let index = data.length - 1; index >= 0; index--) {
            data2 += " - " + data[index];
          }
          this.selectTree = data2.replace(" - ", "");
          delStandardTree({ tree: this.selectTree }).then((res) => {
          const tree = buildSelectTree(node, "null");
          delStandardTree({ tree }).then((res) => {
            this.$message.success("已删除");
            let arr = this.selectTree.split(" - ");
            this.deleteStandard(this.list, arr[arr.length - 1]);
            const labels = getAncestorLabels(node);
            this.deleteStandard(this.list, labels[labels.length - 1]);
            this.selectTree = "";
            this.selected = { label: "", tree: "", isLeaf: false };
            this.standardList = [];
            this.productList = [];
            this.standardId = 0;
            this.isShowCopy = false;
            this.productKeyword = "";
            this.total = 0;
            this.syncSortable();
          });
        })
        .catch((e) => { });
@@ -651,6 +568,7 @@
      this.treeLoad = true;
      selectStandardTreeList().then((res) => {
        this.list = res.data;
        this.expandedKeys = [];
        this.list.forEach((a) => {
          this.expandedKeys.push(a.label);
        });
@@ -693,31 +611,23 @@
        this.standardEnum = data;
      });
    },
    // 提交分类添加
    // 提交分类添加：在选中节点下新增子级，未选中则新增根级
    addStandardTree() {
      if (this.addOb.sampleType == null || this.addOb.sampleType == "") {
        this.$message.error("对象不存在");
        return;
      }
      if (this.addOb.model == null || this.addOb.model == "") {
        this.$message.error("请填写型号");
      const name = (this.addOb.name || "").trim();
      if (!name) {
        this.$message.error("请填写名称");
        return;
      }
      this.addLoad = true;
      addStandardTree(this.addOb)
      addStandardTree({
        parentTree: this.selected.tree || "",
        name,
      })
        .then((res) => {
          this.$message.success("添加成功");
          this.addDia = false;
          this.list
            .find((a) => a.label == this.addOb.factory)
            .children.find((a) => a.label == this.addOb.laboratory)
            .children.find((a) => a.label == this.addOb.sampleType)
            .children.find((a) => a.label == this.addOb.sample)
            .children.push({
            code: "[5]",
            label: this.addOb.model,
            value: this.addOb.model,
          });
          this.addOb.name = "";
          this.selectStandardTreeList();
          this.addLoad = false;
        })
        .catch((e) => {
@@ -725,24 +635,24 @@
          this.addLoad = false;
        });
    },
    // 修改型号
    // 修改节点名字
    updateStandardTree() {
      if (this.addOb.sampleType == null || this.addOb.sampleType == "") {
        this.$message.error("对象不存在");
      const name = (this.addOb.name || "").trim();
      if (!name) {
        this.$message.error("请填写名称");
        return;
      }
      if (this.addOb.model == null || this.addOb.model == "") {
        this.$message.error("请填写型号");
        return;
      }
      this.addOb.oldModel = this.oldModel;
      this.updateLoad = true;
      updateStandardTree(this.addOb)
      updateStandardTree({
        parentTree: dropLastLabel(this.editTree),
        oldLabel: this.oldLabel,
        name,
      })
        .then((res) => {
          this.$message.success("添加成功");
          this.$tab.refreshPage();
          // this.selectStandardTreeList();
          this.$message.success("修改成功");
          this.updateDia = false;
          this.addOb.name = "";
          this.selectStandardTreeList();
          this.updateLoad = false;
        })
        .catch((e) => {
@@ -756,12 +666,14 @@
        tree: this.selectTree,
      }).then((res) => {
        this.tableLoad = false;
        this.standardList = res.data.standardMethodList;
        if (this.standardList && this.standardList.length > 0) {
        const data = res.data || {};
        this.standardList = data.standardMethodList || [];
        if (this.standardList.length > 0) {
          this.$refs.standard.setCurrentRow(this.standardList[0]);
          this.rowClick(this.standardList[0]);
        } else {
          this.productList = [];
          this.syncSortable();
        }
      });
    },
@@ -853,6 +765,22 @@
        this.rowClick(this.standardList[index]);
      }
    },
    // 检验项搜索：走后端过滤（匹配检验项 + 检验项子项）
    searchProduct() {
      if (!this.selected.isLeaf || !this.standardId) return;
      this.rowClick({ id: this.standardId });
    },
    // 只有选中的是标准(叶子)、未在搜索过滤状态、且列表非空时，才允许拖拽排序
    syncSortable() {
      if (this.sortTable) {
        this.sortTable.destroy();
        this.sortTable = null;
      }
      if (!this.selected.isLeaf || this.productKeyword || this.productList.length === 0) return;
      this.$nextTick(() => {
        this.rowDrop(this.standardId);
      });
    },
    rowClick(row, column, event) {
      this.currentPage = 1;
      this.tableLoad2 = true;
@@ -861,40 +789,18 @@
        id: row.id,
        tree: this.selectTree,
        page: this.currentPage,
        keyword: this.productKeyword,
      }).then((res) => {
        this.productList = res.data.productList;
        this.total = res.data.total;
        const data = res.data || {};
        this.productList = data.productList || [];
        this.total = data.total || 0;
        setTimeout(() => {
          this.productList.forEach((a) => {
            if (a.state == 1) this.toggleSelection(a);
          });
        }, 300);
        this.tableLoad2 = false;
        const tree = this.selectTree.split(" - ");
        // 选择最后一层树才可以拖拽排序
        if (tree.length === 4) {
          const name = tree[3] + "[4]";
          this.hasChildWithId(this.list, name);
          if (
            this.isHaveChildren.children &&
            this.isHaveChildren.children.length > 0
          ) {
            if (this.sortTable) {
              this.sortTable.destroy();
              this.sortTable = null;
            }
            return;
          }
        } else if (tree.length < 4) {
          if (this.sortTable) {
            this.sortTable.destroy();
            this.sortTable = null;
          }
          return;
        }
        this.$nextTick(() => {
          this.rowDrop(row.id);
        });
        this.syncSortable();
      });
    },
    toggleSelection(row) {
@@ -916,28 +822,6 @@
      }).then((res) => {
        this.$message.success('已保存')
      });
    },
    filterHandler(value) {
      for (let column in value) {
        if (value[column].length === 0) {
          if (column === "inspectionItem") {
            this.inspectionItem = null;
          } else if (column === "inspectionItemSubclass") {
            this.inspectionItemSubclass = null;
          } else if (column === "sonLaboratory") {
            this.sonLaboratory = null;
          }
        } else {
          if (column === "inspectionItem") {
            this.inspectionItem = value[column][0];
          } else if (column === "inspectionItemSubclass") {
            this.inspectionItemSubclass = value[column][0];
          } else if (column === "sonLaboratory") {
            this.sonLaboratory = value[column][0];
          }
        }
        this.getList();
      }
    },
    handleAll(e) {
      if (e.length > 0) {
@@ -1049,48 +933,21 @@
        this.sectionRow.conductorType = JSON.stringify(conductorTypeList);
      }
      this.sectionLoad = true;
      if (this.moreSelects.length === 0) {
        updateSection({
          str: JSON.stringify({
            id: this.sectionRow.id,
            section: this.sectionRow.section,
            ask: this.sectionRow.ask,
            tell: this.sectionRow.tell,
            // price: this.sectionRow.price,
            // manHour: this.sectionRow.manHour,
            cores: this.sectionRow.cores,
            conductorMaterial: this.sectionRow.conductorMaterial,
            conductorType: this.sectionRow.conductorType,
          }),
        }).then((res) => {
          this.sectionLoad = false;
          this.$message.success("已保存");
          this.sectionUpDia = false;
        });
      } else {
        upStandardProducts({
          ids: JSON.stringify(this.moreSelects.map((a) => a.id)),
          standardProductList: {
            section: this.sectionRow.section,
            ask: this.sectionRow.ask,
            tell: this.sectionRow.tell,
            // price: this.sectionRow.price,
            // manHour: this.sectionRow.manHour,
            cores: this.sectionRow.cores,
            conductorMaterial: this.sectionRow.conductorMaterial,
            conductorType: this.sectionRow.conductorType,
          },
        }).then((res) => {
          this.sectionLoad = false;
          this.$message.success("已保存");
          this.sectionUpDia = false;
          this.currentPage0 = 1;
          this.getList();
          this.rowClick({
            id: this.standardId,
          });
        });
      }
      updateSection({
        str: JSON.stringify({
          id: this.sectionRow.id,
          section: this.sectionRow.section,
          ask: this.sectionRow.ask,
          tell: this.sectionRow.tell,
          cores: this.sectionRow.cores,
          conductorMaterial: this.sectionRow.conductorMaterial,
          conductorType: this.sectionRow.conductorType,
        }),
      }).then((res) => {
        this.sectionLoad = false;
        this.$message.success("已保存");
        this.sectionUpDia = false;
      });
    },
    bindSupplierDensitySecond(row) {
      this.bindSupplierDensity(row);
@@ -1143,81 +1000,6 @@
        this.methodList = data;
      });
    },
    handleSelectAll0(rows) {
      if (rows.length) {
        rows.forEach((a) => {
          if (!this.moreSelects.find((b) => a.id === b.id)) {
            this.moreSelects.push(a);
          }
        });
      } else {
        this.productList0.forEach((a) => {
          this.moreSelects = this.moreSelects.filter((b) => b.id != a.id);
        });
      }
    },
    handleSelectionChange0(val, row) {
      if (this.moreSelects.find((a) => a.id === row.id)) {
        this.moreSelects = this.moreSelects.filter((a) => a.id != row.id);
      } else {
        this.moreSelects.push(row);
      }
    },
    getList() {
      this.productTableLoading0 = true;
      this.getItemEnum();
      selectStandardProductByMethodId({
        id: this.standardId,
        tree: this.selectTree,
        page: this.currentPage0,
        laboratory: this.sonLaboratory,
        items: this.inspectionItemSubclass,
        item: this.inspectionItem,
      }).then((res) => {
        this.productList0 = res.data.records;
        this.total0 = res.data.total;
        this.productTableLoading0 = false;
        this.page = res.data.pages;
        this.$nextTick(() => {
          this.productList0.forEach((a, i) => {
            if (this.moreSelects.find((b) => a.id == b.id)) {
              this.$refs.productTable0.toggleRowSelection(
                this.productList0[i],
                true
              );
            }
          });
        });
      });
    },
    handleCurrentChange0(e) {
      this.currentPage0 = e;
      this.getList();
    },
    getItemEnum() {
      selectStandardProductEnumByMethodId({
        id: this.standardId,
        tree: this.selectTree,
        item: this.inspectionItem,
      }).then((res) => {
        this.filters0 = [];
        this.filters1 = [];
        res.data.item.forEach((a) => {
          this.filters0.push({
            text: a.inspectionItem,
            value: a.inspectionItem,
          });
        });
        res.data.items.forEach((a) => {
          if (a != null) {
            this.filters1.push({
              text: a.inspectionItemSubclass,
              value: a.inspectionItemSubclass,
            });
          }
        });
      });
    },
  },
};
</script>
@@ -1229,6 +1011,9 @@

  .options_button {
    margin-top: 3px;
    margin-right: 120px;
    display: flex;
    align-items: center;
  }
}