modified: src/router/index.js modified: src/views/laboratory/organiza...

Fixiaobai

2023-09-07 bc0956b0fcfb1eb2709d6eb0f94c9e9d11c01eb3

	modified:   src/router/index.js
	modified:   src/views/laboratory/organizational/index.vue
	modified:   src/views/laboratory/role/index.vue
	modified:   src/views/standardLibrary/index.vue

 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/laboratory/organizational/index.vue

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

 src/views/laboratory/role/index.vue

@@ -440,6 +440,7 @@
      res.data.list.forEach(item => {
        item.roleId = String(item.roleId)
      })
      console.log(res.data);
      this.roleTable = res.data.list
      this.total = res.data.total
    },

 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">
@@ -592,9 +595,15 @@
                    required: scope.row.required,
                    internal: scope.row.internal,
                }; 
                let internal=obj.internal.charAt(0)
                let required=obj.required.charAt(0)
                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: '标准值参数不符合！',
@@ -602,6 +611,15 @@
                        });
                     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: '内控值参数不符合！',
@@ -609,6 +627,7 @@
                        });
                     return
                }
            }
                await blurUpdateApi(obj).then((res) => {
                    this.$message({
                        message: res.message,