Merge branch 'master' of http://192.168.65.113:9001/r/lims-before

Fixiaobai

2023-09-05 5535157ce811a29c4e3c68148fd110c9c5a4137b

Merge branch 'master' of http://192.168.65.113:9001/r/lims-before

 src/api/laboratory/organizational.js

@@ -4,7 +4,7 @@
    getOrganizational: "/organizational/list", // 四级树
    getTableInitialization: "/organizational/table", // 表格数据接口
    organizationalAdd: "/organizational/add", // 添加部门
    organizationalUpdate: "/organizational/add", // 修改部门
    organizationalUpdate: "/organizational/update", // 修改部门
    organizationalDelete: "/organizational/delete", // 删除部门
}
export function getOrganizationalApi() {

 src/views/experiment/inspectionApplication/Viewdetails/index.vue

@@ -174,7 +174,7 @@
                    id: row.id,
                    userProId: val
                }).then(res => {
                    if (res.data) this.$message.success('责任人分配成功')
                    this.$message.success('责任人分配成功')
                })
            },
            chooseEquipment(val, row) {
@@ -182,7 +182,7 @@
                    id: row.id,
                    equipmentId: val[2]
                }).then(res => {
                    if (res.data) this.$message.success('设备分配成功')
                    this.$message.success('设备分配成功')
                })
            }
        }

 src/views/experiment/planAssignments/plan.vue

@@ -96,8 +96,8 @@
                </el-table-column>
                <el-table-column prop="testState" label="检验状态" width="100px">
                    <template slot-scope="scope">
                        <el-tag type="success" v-if="scope.row.testState==1">合格</el-tag>
                        <el-tag type="danger" v-else-if="scope.row.testState==0">不合格</el-tag>
                        <el-tag type="success" v-if="scope.row.testState==1">已报检</el-tag>
                        <el-tag type="danger" v-else-if="scope.row.testState==0">未报检</el-tag>
                    </template>
                </el-table-column>
                <el-table-column prop="startTime" label="检验开始" width="100px">
@@ -268,6 +268,7 @@
                    .children.length
            },
            openUpDia(row) {
                console.log(row);
                // console.log(row);
                this.upDia = true
                this.upData = {

 src/views/inspectionManagement/commissionInspection/index.vue

@@ -1,6 +1,6 @@
<template>
    <div>
        <div v-if="!showDetail">
        <div>
            <div class="content-main">
                <div class="top-bar">
                    <el-form ref="form" :inline="true" :model="searchData">
@@ -24,19 +24,19 @@
                        </el-form-item>
                    </el-form>
                    <el-form>
                        <el-popover placement="left" width="350" trigger="click">
                        <el-popover placement="left" width="400" trigger="click">
                            <div class="vue_qr_div">
                                <el-row>
                                    <el-col>
                                        <el-input v-model="view" readonly size="medium" style="width: 250px;margin-right: 10px;"></el-input>
                                        <el-button size="small" type="primary" v-if="viewId==null" @click="viewDia=true">生成</el-button>
                                        <el-button size="small" type="primary" v-else-if="viewId!=null" @click="copy">复制</el-button>
                                        <el-button size="small" type="primary" @click="viewDia=true">生成</el-button>
                                        <el-button size="small" type="primary" @click="copy">复制</el-button>
                                    </el-col>
                                </el-row>
                                <el-row style="margin-top: 10px;">
                                    <el-col v-if="viewId==null">当前链接已过期，请点击生成按钮重新生成</el-col>
                                    <el-col
                                        v-else-if="viewId!=null">当前链接将在{{(parseInt(viewTime)/60/60)>1?(parseInt(viewTime)/60/60).toFixed(1)+'小时':Math.round(parseInt(viewTime)/60)+'分钟'}}后过期</el-col>
                                        v-else-if="viewId!=null">当前链接将在{{(parseInt(viewTime2)/60/60)>1?(parseInt(viewTime2)/60/60).toFixed(1)+'小时':Math.round(parseInt(viewTime2)/60)+'分钟'}}后过期</el-col>
                                </el-row>
                            </div>
                            <el-button slot="reference" class="rightBtn" type="primary" @click="goToaddCommision">新增委托</el-button>
@@ -97,9 +97,6 @@
                    </div>
                </div>
            </div>
        </div>
        <div v-else>
            <router-view />
        </div>
        <el-dialog title="链接时长设置" :visible.sync="viewDia" width="30%">
            <div>
@@ -228,7 +225,15 @@
                view: null,
                viewId: null,
                viewTime: 1,
                viewTime2: 1,
                viewDia: false
            }
        },
        watch:{
            addReportDialog(newVal){
                if(newVal === false){
                    this.resetForm("addInspectionForm");
                }
            }
        },
        created() {
@@ -471,7 +476,7 @@
                }).then(res => {
                    this.view = `${this.vueIp}addCommision/${res.data.id}`
                    this.viewId = res.data.id
                    this.viewTime = res.data.time
                    this.viewTime2 = res.data.time
                })
            },
            getViewId() {

 src/views/laboratory/ledger/index.vue

@@ -33,7 +33,7 @@
            </el-col>
          </el-row>
        </div>
        <el-tree highlight-current="true" ref="classTree" :data="classTree" :props="defaultProps" :default-expand-all="true"
        <el-tree :highlight-current="true" ref="classTree" :data="classTree" :props="defaultProps" :default-expand-all="true"
          :filter-node-method="filterNode" @node-click="nodeClickHandler" />
      </div>
      <div class="library-table">
@@ -154,7 +154,7 @@
              <span><i class="el-icon-edit" />验收日期：{{ equipmentDetail.acceptanceDate }}</span>
            </div>
            <div class="message-item">
              <span><i class="el-icon-edit" />保管人：{{ equipmentDetail.name }}</span>
              <span><i class="el-icon-edit" />保管人：{{ equipmentDetail.userName }}</span>
            </div>
            <div class="message-item">
              <span><i class="el-icon-edit" />是否支持数采：{{ equipmentDetail.whetherDataAcquisition == 1 ? '支持' : '不支持'
@@ -350,8 +350,8 @@
          </el-row>
          <el-row v-show="equipmentform.equipmentMeasurement === 1" :gutter="50">
            <el-col :span="12">
              <el-form-item label="计量截止有效期：" label-width="80">
                <el-input min="0" v-model="equipmentform.termValidity" placeholder="请填写计量有效期" type="number" />
              <el-form-item label="计量周期(月)：" label-width="80">
                <el-input min="0" v-model="equipmentform.termValidity" placeholder="请填写计量周期" type="number" />
              </el-form-item>
            </el-col>
          </el-row>
@@ -470,10 +470,6 @@
      userOpetions: [],
      // 仪器状态配置项
      conditionsOptions: [
        {
          label: '全部',
          value: 0
        },
        {
          label: '运行',
          value: 1
@@ -736,7 +732,7 @@
          this.$message.success('添加成功')
        }
      } catch (error) {
        this.$message.error(error)
        this.$message.error(error.message)
      }
      await this.closeCodePoins()
    },
@@ -777,7 +773,7 @@
          this.$message.error('添加失败')
        }
        this.$message.success('添加成功')
        let d = this.nodeclicked
        let d = this.nodeclicked;
        this.nodeClickHandler(d);
        this.addDrawerVisible = false
        this.equipmentform = {}
@@ -787,6 +783,8 @@
      try {
        const res = await changeInstrument(this.equipmentform)
        this.$message.success('修改成功')
        let d = this.nodeclicked;
        this.nodeClickHandler(d);
        this.addDrawerVisible = false
        this.detailDrawer = false
      } catch (error) {

 src/views/standardLibrary/index.vue

@@ -2,10 +2,10 @@
    <div class="standard-library-main">
        <div class="content-main">
            <div class="library-bom" style="width: 300px">
                <el-input v-model="filterText" placeholder="输入关键字进行过滤"></el-input>
                <el-input clearable v-model="filterText" placeholder="输入关键字进行过滤"></el-input>
                <el-button type="text">全部</el-button>
                <el-tree ref="tree" style="width: 100%" class="filter-tree" :data="standardTree" :props="defaultProps"
                    node-key="id" highlight-current default-expand-all :filter-node-method="filterNode"
                    node-key="id" :highlight-current="true" :default-expand-all="true" :filter-node-method="filterNode"
                    :render-content="renderContent" @node-click="nodeClick" />
            </div>
            <div class="library-table" style="width: 80%">
@@ -108,6 +108,7 @@
    export default {
        data() {
            return {
                filterNodeData: [],
                options: [],
                versionValue: "",
                deleteList: [],
@@ -224,7 +225,7 @@
                    })
                    .catch(() => {});
            },
            filterNode(value, data) {
            filterNode(value, data,node) {
                if (!value) return true;
                return data.name.indexOf(value) !== -1;
            },
@@ -277,6 +278,7 @@
                        //TODO handle the exception
                    }
                });

            },
            getDefault(arr, index) {
                for (const item of arr) {