Merge remote-tracking branch 'origin/master'

Crunchy

2024-05-23 196c31f1f040c315de09a6808fc9cd63c63f9950

Merge remote-tracking branch 'origin/master'

 src/components/view/a6-personnel-detail.vue

@@ -114,7 +114,7 @@
      <el-tree :data="list" ref="tree" :props="{ children: 'children', label: 'name' }" node-key="id"
        :filter-node-method="filterNode" @node-click="handleNodeClick" highlight-current @node-expand="nodeOpen"
        @node-collapse="nodeClose" v-loading="treeLoad" :expand-on-click-node="false"
        :default-expanded-keys="expandedKeys" :default-checked-keys="defaultCheckedKeys">
        :default-expanded-keys="expandedKeys">
        <div class="custom-tree-node" slot-scope="{ node, data }">
          <el-row style="width: 100%;">
            <el-col :span="21" :class="{sort:node.level>3}">
@@ -271,7 +271,6 @@
            selectField: {},
          upUserDepardLimsIdPower: true
        },
        defaultCheckedKeys:[]
      }
    },
    mounted() {
@@ -338,14 +337,12 @@
        this.treeLoad = true
        this.$axios.get(this.$api.department.selectDepartmentLim).then(res => {
          this.list = res.data
          this.refresh()
          this.list.forEach(a => {
            a.children.forEach(b => {
              this.expandedKeys.push(b.id)
            })
          })
          this.treeLoad = false
          this.defaultCheckedKeys = [this.list[0].id]
          this.componentData.entity.departLimsId = this.list[0].id;
          this.selectTree = this.list[0].name
          this.refreshTable()

 src/components/view/b2-standard.vue

@@ -1341,6 +1341,11 @@
          return this.$message.error('请选择检验项')
        }
        this.moreEditLoad = true
        for(let a in this.moreInfo){
          if(this.moreInfo[a]==''){
            delete this.moreInfo[a]
          }
        }
        this.$axios.post(this.$api.standardTree.upStandardProducts, {
          ids: this.moreSelects.map(a => a.id),
          standardProductList: this.moreInfo

 static/js/menu.js

@@ -292,7 +292,7 @@
            i: "font icon-erjidaohang",
            u: "a6-personnel-overview",
            g: "6.2 人员",
            p: "selectUserList"
            p: "selectPersonnelOverview"
        }, {
            v: "人员明细",
            i: "font icon-erjidaohang",