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

zouyu

2023-09-07 b580f0402ff66d0c5b74460edcb920a516b1ce6e

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

 src/router/index.js

@@ -48,7 +48,7 @@
          path: 'index',
          name: 'StandardLibrary',
          component: () => import('@/views/standardLibrary/index'),
          meta: { title: '标准库', icon: 'el-icon-s-help' }
          meta: { title: '标准库', icon: 'el-icon-s-management' }
        },
        // {
        //   path: 'specificationDetails/:id',
@@ -64,7 +64,7 @@
      component: Layout,
      redirect: '/inspectionManagement/commissionInspection',
      name: 'InspectionManagement',
      meta: { title: '报检管理', icon: 'el-icon-s-help' },
      meta: { title: '报检管理', icon: 'el-icon-s-order' },
      children: [
        {
          path: 'commissionInspection',
@@ -85,7 +85,7 @@
      component: Layout,
      redirect: '/experiment/inspectionApplication',
      name: 'Experiment',
      meta: { title: '试验管理', icon: 'el-icon-s-help' },
      meta: { title: '试验管理', icon: 'el-icon-s-marketing' },
      children: [
        {
          path: 'inspectionApplication',
@@ -143,7 +143,7 @@
      component: Layout,
      redirect: '/laboratory/ledger',
      name: 'Laboratory',
      meta: { title: '实验室管理', icon: 'el-icon-s-help' },
      meta: { title: '实验室管理', icon: 'el-icon-cpu' },
      children: [
        {
          path: 'ledger',
@@ -221,7 +221,7 @@
      component: Layout,
      redirect: '/chart/center',
      name: 'Chart',
      meta: { title: '智能图表', icon: 'el-icon-s-help' },
      meta: { title: '智能图表', icon: 'el-icon-s-data' },
      children: [
        {
          path: 'center',
@@ -261,7 +261,7 @@
          name: 'ToDo',
          component: () => import('@/views/message/toDo/index'),
          // meta: { title: '消息待办', icon: 'tree' }
          meta: { title: '我的待办', icon: 'el-icon-s-help' },
          meta: { title: '我的待办', icon: 'el-icon-s-promotion' },
        },
        // {
        //   path: 'message',
@@ -282,7 +282,7 @@
          name: 'MyInformation',
          component: () => import('@/views/personal/myInformation/index'),
          // meta: { title: '个人管理', icon: 'el-icon-s-help' }
          meta: { title: '我的信息', icon: 'el-icon-s-help' }
          meta: { title: '我的信息', icon: 'el-icon-user-solid' }
        },
        // {
        //   path: 'myBusiness',

 src/views/basicData/index.vue

@@ -24,26 +24,23 @@
                        @click="deleteListClick">删除</el-button>
                </el-form-item>
            </el-form>
            <el-dialog :visible.sync="centerDialogVisible" width="30%" right :before-close="handleClose"
            <el-dialog :visible.sync="centerDialogVisible" width="45%" right :before-close="handleClose"
                :title="isUpdate ? '更新' : '新增'" :hide-required-asterisk="false">
                <el-form :model="form" :rules="rules" ref="ruleForm" class="addForm">
                    <el-form-item prop="material" required>
                        <span>样品名称：</span>
                <el-form style="width: 100%;" label-width="100px" :model="form" :rules="rules" ref="ruleForm" class="addForm" label-position="left">
                    <el-form-item label="样品名称：" prop="material" required>
                        <el-autocomplete class="inline-input" v-model="form.material" :fetch-suggestions="querySearch1"
                            placeholder="请输入样品名称" style="width: calc(100% - 70px);"></el-autocomplete>
                    </el-form-item>
                    <el-form-item>
                        <span>项目分组：</span>
                    <el-form-item label="项目分组：">
                        <el-autocomplete class="inline-input" v-model="form.father" :fetch-suggestions="querySearch2"
                            placeholder="请输入项目分组" style="width: calc(100% - 70px);"></el-autocomplete>
                    </el-form-item>
                    <el-row :gutter="24">
                        <el-col :span="12"><el-form-item prop="name" required><span>项目名称：</span>
                        <el-col :span="12"><el-form-item label="项目名称：" prop="name" required>
                                <el-input style="width: calc(100% - 70px);" v-model="form.name"
                                    placeholder="请输入项目名称"></el-input></el-form-item></el-col>
                        <el-col :span="12">
                            <el-form-item prop="unit">
                                <span v-html="'单&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;位：'"></span>
                            <el-form-item label="单位" prop="unit">
                                <el-input style="width: calc(100% - 70px);" v-model="form.unit"
                                    placeholder="请输入单位"></el-input></el-form-item></el-col>
                    </el-row>

 src/views/experiment/nonConformingFeedback/index.vue

@@ -1,7 +1,7 @@
<template>
  <div class="content-main">
    <div class="top-bar">
      <el-form ref="form" style="width: 1000px;margin-top: 10px;" :inline="true">
      <el-form ref="form" style="width: 100%;margin-top: 10px;" :inline="true">
          <el-form-item label="样式编号：">
            <el-input size="small" v-model="materialCode" placeholder="请输入样式编号"></el-input>
          </el-form-item>

 src/views/experiment/planAssignments/plan.vue

@@ -63,6 +63,7 @@
            </el-form>
            <el-button size="small" type="primary" @click="selectDataList">查询</el-button>
            <el-button size="small" @click="cleanBtn">重置</el-button>
            <el-checkbox style="margin-left: 10px;" @change="selectDataList" v-model="isLookMe">只看我</el-checkbox>
        </div>
        <div class="thing">
            <el-table :data="tableData" style="width: 100%;" row-key="code" default-expand-all
@@ -229,7 +230,8 @@
                upInsDia: false,
                upIndex2: 0,
                users: [],
                devices: []
                devices: [],
                isLookMe: false
            }
        },
        mounted() {
@@ -241,6 +243,7 @@
            selectDataList() {
                var str = {}
                str.code = this.search.code
                str.isLookMe=this.isLookMe
                str.status = this.search.testValue
                try {
                    if (this.search.date.length != 0) {

 src/views/experiment/reportAuditing/index.vue

@@ -177,7 +177,7 @@
      this.getData();
    },
    //通过
    async checkskip(row) {
     checkskip(row) {
      console.log(this.tableRow);
      this.reportTable[this.tableRow.$index].status=1
      this.transmitData(this.tableRow.row.id,1)
@@ -186,10 +186,10 @@
          message: '通过成功',
          type: 'success'
        });

         this.getData();
    },
    //不通过
    async nocheckskip(row) {
     nocheckskip(row) {
      console.log(this.tableRow);
      this.reportTable[this.tableRow.$index].status=0
      this.transmitData(this.tableRow.row.id,2)
@@ -198,7 +198,7 @@
          message: '待通过',
          type: 'warning'
        });

        this.getData();
    },
    //审核
    async transmitData(id, result) {

 src/views/laboratory/organizational/index.vue

@@ -317,6 +317,7 @@
}
.filter-tree {
  margin-top: 6px;
  // display: inline-block;
}
.table_top_div {
  height: 80px;

 src/views/login/index.vue

@@ -218,7 +218,6 @@
            this.$message.success("登录成功")
            this.btnload = false
            this.$router.push({ path: this.redirect || '/' })
            // this.$router.push('/')
          }).catch((error) => {
            this.$message.error(error.message)
            this.btnload = false

 src/views/standardLibrary/index.vue

@@ -7,7 +7,8 @@
                    <el-input size="small" clearable v-model="filterText" placeholder="输入关键字进行过滤"></el-input>
                    </el-col>
                    <el-col :span="5">
                        <el-button size="small" type="primary" icon="el-icon-plus" @click="addTreeFormVisible = true"></el-button>
                        <el-button size="small" type="primary" icon="el-icon-plus"
                            @click="addTreeFormVisible = true"></el-button>
                    </el-col>
                </el-row>
                <el-button size="small" type="text">全部</el-button>
@@ -39,8 +40,7 @@
                        <el-table-column label="项目名称" sortable>
                            <template scope="scope">
                                <el-tag>
                                    <div class="firstDiv" :style="`color: ${
                      scope.row.code == '[1]' ? '#16a7ff' : '#58c173'
                                    <div class="firstDiv" :style="`color: ${scope.row.code == '[1]' ? '#16a7ff' : '#58c173'
                    }`">
                                        {{ scope.row.code == "[1]" ? "01" : "02" }}
                                    </div>
@@ -51,14 +51,16 @@
                        <el-table-column prop="unit" label="单位" sortable></el-table-column>
                        <el-table-column label="标准值" sortable>
                            <template scope="scope">
                                <el-input v-if="scope.row.edit === true || scope.row.code === '[2]'" @blur="requiredOnfocus(scope)"
                                    v-model="scope.row.required" placeholder="请输入标准值"></el-input>
                                <el-input v-if="scope.row.edit === true || scope.row.code === '[2]'"
                                    @blur="requiredOnfocus(scope)" v-model="scope.row.required"
                                    placeholder="请输入标准值"></el-input>
                            </template>
                        </el-table-column>
                        <el-table-column prop="internal" label="内控值" sortable>
                            <template scope="scope">
                                <el-input v-if="scope.row.edit === true || scope.row.code === '[2]'" @blur="requiredOnfocus(scope)"
                                    v-model="scope.row.internal" placeholder="请输入内控值"></el-input>
                                <el-input v-if="scope.row.edit === true || scope.row.code === '[2]'"
                                    @blur="requiredOnfocus(scope)" v-model="scope.row.internal"
                                    placeholder="请输入内控值"></el-input>
                            </template>
                        </el-table-column>
                    </el-table>
@@ -101,7 +103,8 @@
                    <el-col :span="12">
                        <el-form-item prop="name">
                            <span>项目名称：</span>
                            <el-input style="width: calc(100% - 70px);" v-model="form.name" placeholder="请输入项目名称"></el-input>
                            <el-input style="width: calc(100% - 70px);" v-model="form.name"
                                placeholder="请输入项目名称"></el-input>
                        </el-form-item>
                    </el-col>
                    <el-col :span="12">
@@ -586,12 +589,45 @@
                });
            },
            async requiredOnfocus(scope) {
            console.log(scope);
                let obj = {
                    id: scope.row.id,
                    required: scope.row.required,
                    internal: scope.row.internal,
                };

            let arr = ['>', '<', '='];
            if (obj.required === null || obj.required === undefined) {
                this.$message({
                    message: '标准值不能为空！',
                    type: 'warning'
                });
                return
            } else {
                let required = obj.required.charAt(0)
                if (!arr.includes(required)) {
                    this.$message({
                        message: '标准值参数不符合！',
                        type: 'warning'
                    });
                    return
                }
            }
            if (obj.internal === null || obj.internal === undefined) {
                this.$message({
                    message: '内控值不能为空！',
                    type: 'warning'
                });
                return
            } else {
                let internal = obj.internal.charAt(0)
                if (!arr.includes(internal)) {
                    this.$message({
                        message: '内控值参数不符合！',
                        type: 'warning'
                    });
                    return
                }
            }
                await blurUpdateApi(obj).then((res) => {
                    this.$message({
                        message: res.message,