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

晏有为

2024-05-27 1344317356b0407f4aff867865ba72248871ac1f

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


 Conflicts:

	src/components/view/b1-inspection-order.vue

 src/assets/api/controller.js

@@ -169,6 +169,7 @@
  upPlanUser: "/insOrderPlan/upPlanUser", //任务交接
  verifyPlan: "/insOrderPlan/verifyPlan", //复核检验任务
  submitPlan: "/insOrderPlan/submitPlan", //检验任务提交
  inspectionOrderDetailsTaskSwitching: "/insOrderPlan/inspectionOrderDetailsTaskSwitching", // æ£€éªŒå•è¯¦æƒ…-任务切换
}

const systemLog = {
@@ -271,6 +272,7 @@
  page: "/informationNotification/page", //滚动分页查询
  updateMessageStatus: "/informationNotification/updateMessageStatus", //更新消息状态（拒绝、接收）
  triggerModificationStatusToRead: "/informationNotification/triggerModificationStatusToRead", //点击详情触发修改状态为已读
  getNumberFourTypesMessagesHomePage: "/informationNotification/getNumberFourTypesMessagesHomePage", // æ¶ˆæ¯é€šçŸ¥-获取首页四种消息数量
}

const performanceShift = {

 src/components/do/b1-ins-order/add.vue

@@ -107,6 +107,7 @@
          <el-button size="medium" @click="templateDia=true" v-show="active==1">
            <span style="color: #3A7BFA;">保存模板</span>
          </el-button>
          <el-button size="medium" type="primary" @click="$parent.playOrder(4)">光纤配置</el-button>
          <el-button size="medium" type="primary" @click="save" :loading="saveLoad" v-show="active==1">提交</el-button>
          <!-- å®¡æ ¸ -->
          <el-button size="medium" @click="upInsOrderOfState(2)" :loading="saveLoad" v-show="active==3"
@@ -1145,7 +1146,8 @@
        this.getProductLoad = true
        this.$axios.post(this.$api.standardTree.selectStandardProductList, {
          model: row.model + '-' + row.modelNum,
          standardMethodListId: val
          standardMethodListId: val,
          factory: this.selectTree,
        }, {
          headers: {
            'Content-Type': 'application/json'

 src/components/do/b1-ins-order/fiberoptic-config.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,345 @@
<template>
<div class="ins_order_config">
  <div>
    <el-row class="title">
      <el-col :span="6" style="padding-left: 20px;">光纤配置</el-col>
      <el-col :span="18" style="text-align: right;">
        <el-button size="medium" type="primary" @click="save" :loading="saveLoad">保 å­˜</el-button>
        <el-button size="medium" @click="$parent.playOrder(0)">
          <span style="color: #3A7BFA;">取 æ¶ˆ</span>
        </el-button>
      </el-col>
    </el-row>
  </div>
  <div class="center">
    <el-row :gutter="10" style="margin-bottom: 10px;">
      <el-col :span="9">
        <div class="grid-content">
          <h4>套餐</h4>
          <div style="display: flex;align-items: center;justify-content: space-between;padding: 0 12px;box-sizing: border-box;">
            <div class="search-item">
              <label style="width: 70px;">样品型号</label>
              <span style="font-size: 14px;">GYTA53</span>
            </div>
            <el-radio-group v-model="packageInfo.radio" size="small">
              <el-radio :label="0">全检</el-radio>
              <el-radio :label="1">抽检</el-radio>
            </el-radio-group>
          </div>
          <div class="search-item" style="margin-bottom: 8px;padding: 0 12px;box-sizing: border-box;">
            <label style="width: 70px;">样品编号</label>
            <el-input v-model="packageInfo.input" placeholder="请输入" size="small"></el-input>
          </div>
          <div style="display: flex;align-items: center;justify-content: space-between;margin-bottom: 8px;padding: 0 12px;box-sizing: border-box;">
            <div class="search-item" style="margin-right: 10px;">
              <label>套管数目</label>
              <el-input v-model="packageInfo.input" placeholder="请输入" size="small"></el-input>
            </div>
            <div class="search-item" style="margin-right: 10px;">
              <label style="width: 70px;">标准量</label>
              <el-input v-model="packageInfo.input" placeholder="请输入" size="small"></el-input>
            </div>
            <div class="search-item">
              <label style="width: 70px;">检测量</label>
              <el-input v-model="packageInfo.input" placeholder="请输入" size="small"></el-input>
            </div>
          </div>
          <el-table
            ref="table0"
            :data="tableData"
            tooltip-effect="dark"
            style="width: 100%"
            height="150px"
            size="small"
            @selection-change="handleSelectionChange">
            <el-table-column
              type="selection"
              width="55">
            </el-table-column>
            <el-table-column
              label="管色标"
              show-overflow-tooltip>
              <template slot-scope="scope">{{ scope.row.date }}</template>
            </el-table-column>
            <el-table-column
              prop="name"
              label="标量"
              show-overflow-tooltip>
            </el-table-column>
            <el-table-column
              prop="address"
              label="测试量"
              show-overflow-tooltip>
            </el-table-column>
          </el-table>
        </div>
      </el-col>
      <el-col :span="15">
        <div class="grid-content">
          <h4>检测项信息</h4>
          <el-table
            ref="table1"
            :data="tableData"
            tooltip-effect="dark"
            style="width: 100%"
            height="274px"
            size="small"
            @selection-change="handleSelectionChange">
            <el-table-column
              type="selection"
              width="55">
            </el-table-column>
            <el-table-column
              label="实验室"
              show-overflow-tooltip>
              <template slot-scope="scope">{{ scope.row.date }}</template>
            </el-table-column>
            <el-table-column
              prop="name"
              label="检测项目"
              show-overflow-tooltip>
            </el-table-column>
            <el-table-column
              prop="address"
              label="试验方法"
              show-overflow-tooltip>
            </el-table-column>
            <el-table-column
              prop="address"
              label="单价"
              width="70"
              show-overflow-tooltip>
            </el-table-column>
            <el-table-column
              prop="address"
              label="单位"
              width="70"
              show-overflow-tooltip>
            </el-table-column>
            <el-table-column
              prop="address"
              label="预计时间"
              show-overflow-tooltip>
            </el-table-column>
            <el-table-column
              prop="address"
              label="检测标准"
              show-overflow-tooltip>
            </el-table-column>
            <el-table-column
              prop="address"
              label="检测要求"
              show-overflow-tooltip>
            </el-table-column>
          </el-table>
        </div>
      </el-col>
    </el-row>
    <el-row :gutter="10">
      <el-col :span="12">
        <div class="grid-content">
          <h4>光纤带</h4>
          <div class="btns">
            <el-button size="small" type="primary">生成光纤带</el-button>
            <el-button size="small" type="primary">保存光纤带项目</el-button>
          </div>
          <div style="display: flex;align-items: center;justify-content: space-between;margin-bottom: 8px;padding: 0 12px;box-sizing: border-box;">
            <div class="search-item" style="width: 50%;margin-right: 16px;">
              <label style="width: 80px;">纤带类型</label>
              <el-select v-model="tape.value" placeholder="请选择" size="small" style="width: 100%;">
                <el-option
                  v-for="item in options"
                  :key="item.value"
                  :label="item.label"
                  :value="item.value">
                </el-option>
              </el-select>
            </div>
            <div class="search-item" style="width: 50%;">
              <label style="width: 80px;">参考标准</label>
              <el-select v-model="tape.value" placeholder="请选择" size="small" style="width: 100%;">
                <el-option
                  v-for="item in options"
                  :key="item.value"
                  :label="item.label"
                  :value="item.value">
                </el-option>
              </el-select>
            </div>
          </div>
          <el-table
            ref="table2"
            :data="tableData"
            tooltip-effect="dark"
            style="width: 100%"
            height="270px"
            size="small"
            @selection-change="handleSelectionChange">
            <el-table-column
              type="selection"
              width="55">
            </el-table-column>
            <el-table-column
              label="光纤带编号"
              show-overflow-tooltip>
              <template slot-scope="scope">{{ scope.row.date }}</template>
            </el-table-column>
            <el-table-column
              prop="name"
              label="光纤带规格"
              show-overflow-tooltip>
            </el-table-column>
            <el-table-column
              prop="address"
              label="参考标准"
              show-overflow-tooltip>
            </el-table-column>
            <el-table-column
              prop="address"
              label="光纤检测量"
              show-overflow-tooltip>
            </el-table-column>
          </el-table>
        </div>
      </el-col>
      <el-col :span="12">
        <div class="grid-content">
          <h4>光纤</h4>
          <div class="btns">
            <el-button size="small" type="primary">光纤配色</el-button>
            <el-button size="small" type="primary">保存光纤项目</el-button>
          </div>
          <div style="display: flex;align-items: center;justify-content: space-between;margin-bottom: 8px;padding: 0 12px;box-sizing: border-box;">
            <div class="search-item" style="width: 50%;margin-right: 16px;">
              <label style="width: 80px;">光纤类型</label>
              <el-select v-model="tape.value" placeholder="请选择" size="small" style="width: 100%;">
                <el-option
                  v-for="item in options"
                  :key="item.value"
                  :label="item.label"
                  :value="item.value">
                </el-option>
              </el-select>
            </div>
            <div class="search-item" style="width: 50%;">
              <label style="width: 80px;">参考标准</label>
              <el-select v-model="tape.value" placeholder="请选择" size="small" style="width: 100%;">
                <el-option
                  v-for="item in options"
                  :key="item.value"
                  :label="item.label"
                  :value="item.value">
                </el-option>
              </el-select>
            </div>
          </div>
          <el-table
            ref="table3"
            :data="tableData"
            tooltip-effect="dark"
            style="width: 100%"
            height="270px"
            size="small"
            @selection-change="handleSelectionChange">
            <el-table-column
              type="selection"
              width="55">
            </el-table-column>
            <el-table-column
              label="管套色标"
              show-overflow-tooltip>
              <template slot-scope="scope">{{ scope.row.date }}</template>
            </el-table-column>
            <el-table-column
              prop="name"
              label="光纤色标"
              show-overflow-tooltip>
            </el-table-column>
            <el-table-column
              prop="address"
              label="光纤规格"
              show-overflow-tooltip>
            </el-table-column>
            <el-table-column
              prop="address"
              label="参考标准"
              show-overflow-tooltip>
            </el-table-column>
          </el-table>
        </div>
      </el-col>
    </el-row>
  </div>
</div>
</template>

<script>
export default {
  data(){
    return{
      saveLoad:false,
      packageInfo:{
        radio:1,
        input:''
      },
      tableData:[],
      tape:{
        value:''
      },
      options:[]
    }
  },
  methods:{
    save(){},
    handleSelectionChange(val) {}
  }
}
</script>

<style scoped>
  .ins_order_config {
    width: 100%;
    height: 100%;
    overflow-y: auto;
    overflow-x: hidden;
  }

  .title {
    height: 60px;
    line-height: 60px;
  }
  .center{
    width: 100%;
    height: calc(100% - 60px);
  }
  .grid-content{
    background: #fff;
    border-radius: 4px;
  }
  .grid-content h4{
    color: #3A7BFA;
    font-weight: 400;
    line-height: 32px;
    padding-left: 16px;
    box-sizing: border-box;
    border-bottom: 1px solid #eee;
  }
  .search-item{
    display: flex;
    align-items: center;
    line-height: 36px;
  }
  .search-item label{
    width: 90px;
    font-size: 12px;
    color: #606266;
    /* text-align: right; */
  }
  .btns{
    margin: 8px 0 8px 10px;
  }
  >>>.el-table th.el-table__cell>.cell{
    padding-top: 2px !important;
    padding-bottom: 2px !important;
  }
</style>

 src/components/do/b1-inspect-order-plan/Inspection.vue

@@ -319,7 +319,7 @@
      </el-table>
    </el-drawer>
    <el-drawer title="任务切换" :visible.sync="taskVisible" :size="500">
      <ValueTable class="value-table" ref="insOrderPlan" :url="$api.insOrderPlan.selectInsOrderPlanList"
      <ValueTable class="value-table" ref="insOrderPlan" :url="$api.insOrderPlan.inspectionOrderDetailsTaskSwitching"
        :componentData="componentData" :key="upIndex" style="height: 100%;"/>
    </el-drawer>
    <el-dialog title="检验复核" :visible.sync="reviewDia" width="500px">

 src/components/tool/excel.vue

@@ -20,6 +20,12 @@
        cursor: pointer;
    }

  #luckysheet .save_i{
    margin-right: 20px;
    font-size: 20px;
    cursor: help;
  }

    #luckysheet .save:hover {
        opacity: .8;
    }
@@ -114,7 +120,7 @@
                    cellFormat: false // è®¾ç½®å•å…ƒæ ¼æ ¼å¼
                },
                option.myFolderUrl = this.LOCATIONVUE + '/',
                option.functionButton = '<button onClick="excelClosed()" class="save">保存</button>'
                option.functionButton = '<i class="save_i el-icon-info" title="系统支持的变量：&#10序号&#10检验项&#10检验子项&#10设备名称&#10设备编码&#10单位&#10要求值&#10试验方法 | æ£€æµ‹æ–¹æ³•&#10最终值&#10结论&#10计算值&#10检验值"></i><button onClick="excelClosed()" class="save">保存</button>'
                luckysheet.create(option)
            }
        }

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

@@ -67,7 +67,7 @@
    background-color: #fff;
    height: 100%;
    display: flex;
    align-items: center;
    align-items: right;
    justify-content: end;
  }

@@ -160,7 +160,7 @@
            <span class="required-span">* </span>架构名称：
          </el-col>
          <el-col :span="16" :offset="1">
            <el-input v-model="addOb.name" placeholder="请输入架构名称" clearable size="small"></el-input>
            <el-input v-model="addOb.name" placeholder="请输入架构名称" clearable size="small" @keyup.enter.native="addStandardTree"></el-input>
          </el-col>
        </el-row>
      </div>
@@ -170,6 +170,13 @@
      </span>
    </el-dialog>
    <el-dialog title="选择用户" :visible.sync="selectUserDia" width="70%">
      <div class="search" style="margin-bottom: 9px;">
        <div class="search_thing">
          <div class="search_label">用户名：</div>
          <div class="search_input"><el-input size="small" placeholder="请输入" clearable
              v-model="componentData2.entity.name" @keyup.enter.native="$refs.ValueTable2.selectList()"></el-input></div>
        </div>
      </div>
        <div class="body" style="height: 60vh;" v-if="selectUserDia">
            <ValueTable ref="ValueTable2" :url="$api.user.selectUserList" :componentData="componentData2"/>
        </div>
@@ -245,6 +252,7 @@
        expandedKeys: [],
        selectUserDia: false,
        componentData2: {
          name: null,
            entity: {
                orderBy: {
                    field: 'id',
@@ -271,6 +279,7 @@
            selectField: {},
          upUserDepardLimsIdPower: true
        },
        currentCompaniesList: []
      }
    },
    mounted() {
@@ -304,11 +313,12 @@
        }
        this.selectTree = data2.replace(' - ', '')
        this.addOb.fatherId = val.id;
        this.componentData.entity.departLimsId = val.id;
        this.componentData.entity.departLimsId = val.id+',';
        this.refreshTable()
      },
      getNodeParent(val) {
        if (val.parent != null) {
          this.currentCompaniesList[val.level-1] = val.data.id
          this.selectTree += ' - ' + val.label
          this.getNodeParent(val.parent)
        }
@@ -423,10 +433,14 @@
        selects.forEach(a=>{
          ids.push(a.id)
        })
        let str = ''
        this.currentCompaniesList.forEach(a=>{
          str+=(a+',')
        })
          this.selectUserDia = false
        this.$axios.post(this.$api.user.upUserDepardLimsId,{
          ids: JSON.stringify(ids),
          id: this.componentData.entity.departLimsId
          id: str
        }).then(res=>{
          if (res.code === 201) {
            return

 src/components/view/b2-standard-template.vue

@@ -62,8 +62,8 @@
                :upUrl="$api.StandardTemplate.upStandardTemplate" :delUrl="$api.StandardTemplate.delStandardTemplate"
                :componentData="componentData" :key="upIndex" />
        </div>
        <el-dialog title="模板编制" :visible.sync="isShow" width="80%" :before-close="isClose">
            <div style="width: 100%;height: 80vh;overflow: auto;" v-if="isShow">
        <el-dialog title="模板编制" :visible.sync="isShow" width="85%" :before-close="isClose">
            <div style="width: 100%;height: 82vh;overflow: auto;" v-if="isShow">
                <Excel :data="row.thing" :execlTitle="row.name" v-loading="loading"></Excel>
            </div>
        </el-dialog>
@@ -162,12 +162,16 @@
                    this.componentData.do.splice(1, 1)
                }
                if (!up) {
          this.componentData.do.splice(2, 1)
                    this.componentData.do.splice(0, 1)
                }
                this.addPower = add
            },
            templateWrite(row) {
                this.$axios.get(this.$api.StandardTemplate.getEditTemplatePreparation + '?id=' + row.id).then(res => {
          if(res.code != 200){
            return
          }
                    this.row = row
                    this.row.thing = res.data
                    this.isShow = true

 src/components/view/b2-standard.vue

@@ -577,32 +577,8 @@
        },
        methodList: [],
        productTableLoading0: false,
        filters0: [{
            text: '测试',
            value: 0,
          },
          {
            text: '测试1',
            value: 1,
          },
          {
            text: '测试2',
            value: 2,
          }
        ],
        filters1: [{
            text: '测试',
            value: 0,
          },
          {
            text: '测试1',
            value: 1,
          },
          {
            text: '测试2',
            value: 2,
          }
        ],
        filters0: [],
        filters1: [],
        pages: 1,
        inspectionItem: null,
        inspectionItemSubclass: null,
@@ -1347,7 +1323,7 @@
          }
        }
        this.$axios.post(this.$api.standardTree.upStandardProducts, {
          ids: this.moreSelects.map(a => a.id),
          ids: JSON.stringify(this.moreSelects.map(a => a.id)),
          standardProductList: this.moreInfo
        }, {
          headers: {

 src/components/view/custom_manage.vue

@@ -112,6 +112,13 @@
                </el-row>
                <el-row style="line-height: 50px;">
                    <el-col :span="7" style="text-align: right;padding-right: 8px;"><span class="required-span">*
                        </span>单位EN：</el-col>
                    <el-col :span="15">
                        <el-input v-model="user.companyEn" size="small" clearable></el-input>
                    </el-col>
                </el-row>
                <el-row style="line-height: 50px;">
                    <el-col :span="7" style="text-align: right;padding-right: 8px;"><span class="required-span">*
                        </span>工厂域：</el-col>
                    <el-col :span="15">
                        <el-input v-model="user.code" size="small" clearable></el-input>
@@ -125,6 +132,14 @@
                            :autosize="{minRows: 2, maxRows: 4}"></el-input>
                    </el-col>
                </el-row>
                <el-row style="margin-top: 15px;">
                    <el-col :span="7" style="text-align: right;padding-right: 8px;"><span class="required-span">*
                        </span>地址EN：</el-col>
                    <el-col :span="15">
                        <el-input type="textarea" v-model="user.addressEn" size="small" clearable
                            :autosize="{minRows: 2, maxRows: 4}"></el-input>
                    </el-col>
                </el-row>
            </div>
            <span slot="footer" class="dialog-footer">
                <el-button @click="addDia = false">取 æ¶ˆ</el-button>
@@ -132,6 +147,13 @@
            </span>
        </el-dialog>
        <el-dialog title="选择用户" :visible.sync="selectUserDia" width="70%">
            <div class="search" style="height: 35px; margin-bottom: 9px;">
                <div class="search_thing">
                <div class="search_label">用户名：</div>
                <div class="search_input"><el-input size="small" placeholder="请输入" clearable
                    v-model="componentData2.entity.name" @keyup.enter.native="$refs.ValueTable2.selectList()"></el-input></div>
                </div>
            </div>
            <div class="body" style="height: 60vh;" v-if="selectUserDia">
                <ValueTable ref="ValueTable2" :url="$api.user.selectUserList" :componentData="componentData2" />
            </div>
@@ -282,6 +304,14 @@
                    this.$message.error('请填写单位地址')
                    return
                }
                if (this.user.companyEn == '' || this.user.companyEn == null) {
                    this.$message.error('请填写英文客户单位')
                    return
                }
                if (this.user.addressEn == '' || this.user.addressEn == null) {
                    this.$message.error('请填写英文单位地址')
                    return
                }
                this.loading = true
                this.$axios.post(this.$api.user.addCustom, this.user, {
                    headers: {

 src/components/view/index-index.vue

@@ -304,7 +304,7 @@
              <img src="../../../static/img/index-0.svg" alt="">
            </div>
            <div class="mun">
              <p style="font-size: 20px;">0</p>
              <p style="font-size: 20px;">{{getNumberFourTypes.totalNumberOfMessages}}</p>
              <p style="font-size: 14px;margin-bottom: 10px;">我的待办</p>
            </div>
          </div>
@@ -313,7 +313,7 @@
              <img src="../../../static/img/index-1.svg" alt="">
            </div>
            <div class="mun">
              <p style="font-size: 20px;">0</p>
              <p style="font-size: 20px;">{{ getNumberFourTypes.remainingToDo }}</p>
              <p style="font-size: 14px;margin-bottom: 10px;">已办事宜</p>
            </div>
          </div>
@@ -322,7 +322,7 @@
              <img src="../../../static/img/index-2.svg" alt="">
            </div>
            <div class="mun">
              <p style="font-size: 20px;">0</p>
              <p style="font-size: 20px;">{{ getNumberFourTypes.totalNumberOfReadMessages }}</p>
              <p style="font-size: 14px;margin-bottom: 10px;">剩余待办</p>
            </div>
          </div>
@@ -331,7 +331,7 @@
              <img src="../../../static/img/index-3.svg" alt="">
            </div>
            <div class="mun">
              <p style="font-size: 20px;">0</p>
              <p style="font-size: 20px;">{{ getNumberFourTypes.totalNumberOfMessagesInThePastSevenDays }}</p>
              <p style="font-size: 14px;margin-bottom: 10px;">近期事宜</p>
            </div>
          </div>
@@ -467,6 +467,7 @@
        finishLoding: false, // åŠ è½½å®Œæˆï¼Œæ˜¾ç¤ºå·²ç»æ²¡æœ‰æ›´å¤šäº†
        timer:null,
        keyMap:{},
        getNumberFourTypes: {}, 
            }
        },
    watch:{
@@ -502,8 +503,14 @@
        this.getList();
        this.getScheduleByMe()
      },1000*60*10)
      this.getNumberFourTypesFun()
        },
        methods: {
      getNumberFourTypesFun() {
        this.$axios.get(this.$api.informationNotification.getNumberFourTypesMessagesHomePage).then(res => {
          this.getNumberFourTypes = res.data
        })
      },
      getList(){
        const key = `_${this.currentPage}`
        const value = this.keyMap[key]

 src/components/view/person-manage.vue

@@ -289,7 +289,7 @@
            font: '编辑',
            type: 'text',
            method: 'doDiy',
            field: ['createUserName', 'updateUserName', 'roleName', '角色=roleId', '密码=password',
            field: ['roleName', '角色=roleId', '密码=password',
            '姓名EN=nameEn','年龄=age','邮箱=email','单位=company','签名=pictureUrl','本人照=signatureUrl']
          }],
          tagField: {
@@ -490,8 +490,10 @@
        this.addUserPower = addUserPower
      },
      handleAdd() {
        console.log(`output->this.addOb.fatherId`,this.addOb.fatherId)
        console.log(`output->this.addOb.name`,this.addOb.name)
        if (this.addOb.fatherId||this.addOb.name=='全部') {
          this.addDia0 = true;
          this.addDia = true;
        } else {
          this.$message.error('请选择一个架构层级')
        }
@@ -522,7 +524,7 @@
        }
        this.selectTree = data2.replace(' - ', '')
        this.addOb.fatherId = val.id;
        this.componentData.entity.departId = val.id;
        this.componentData.entity.departId = val.id + ',';
        this.refreshTable()
      },
      nodeOpen(data, node, el) {
@@ -587,18 +589,18 @@
            return
          }
          this.$message.success('添加成功')
          this.addDia0 = false
          this.addDia = false
          this.selectTreeList()
          this.addLoad = false
          this.addOb.name = ''
          this.addOb.fatherId = ''
        }).catch(e => {
          this.addDia0 = false
          this.addDia = false
          this.addLoad = false
        })
      },
      nodeClick2(ob, node, el) {
        this.currentCompaniesList[node.level-1] = ob.id
        this.getNodeParent(node)
        if (ob.id !== 'SC21') {
          this.personLoad = true
          this.$axios.post(this.$api.companies.selectSimpleList, {
@@ -611,6 +613,12 @@
          })
        }
      },
      getNodeParent(val){
        this.currentCompaniesList[val.level-1] = val.data.id
        if(val.parent!=null){
          this.getNodeParent(val.parent)
        }
      },
      handleSelectionChange(val) {
        this.multipleSelection = val;
      },
@@ -621,24 +629,17 @@
        if(this.currentCompaniesList.length === 0){
          return this.$message.error('请选择组织')
        }
        for (let index = this.currentCompaniesList.length-1; index >1; index--) {
        /* for (let index = this.currentCompaniesList.length-1; index >1; index--) {
          let obj = this.multipleSelection.find(a=>a.companyId==this.currentCompaniesList[index])
          if(!obj){
            this.currentCompaniesList.splice(index,1)
          }else{
            return
          }
        }
        } */
        let arr = []
        this.currentCompaniesList.forEach(b=>{
          /* this.companiesList.forEach(a=>{
            if(a.companyId===b){
              console.log(a)
            }
          }) */
          let obj = this.companiesList.find(a=>a.companyId==b)
          arr.push(obj)
          })
        })
        this.addLoad = true
        this.$axios.post(this.$api.companies.addPersonUser, {
          company: arr,
@@ -659,7 +660,7 @@
          this.addLoad = false
          this.personList = []
          this.userSearch2 = ''
          this.refresh()
          this.selectTreeList()
        }).catch(e => {
          this.addthirdParty = false
          this.addLoad = false

 src/view/notice.vue

@@ -4,7 +4,7 @@
  title="消息通知"
  :visible.sync="drawer"
  :direction="direction"
  :before-close="handleClose" style="height: 100vh;z-index: 9999999;">
  :before-close="handleClose" style="height: 100vh;z-index: 9999999;" size="450px">
    <div class="head">
      <div class="head-search">
        <label>消息类型：</label>