zouyu
2023-09-05 48ad70d6c9dca8d62d0c3120f8dba640272db4a5
	modified:   src/api/laboratory/organizational.js
modified: src/views/experiment/planAssignments/plan.vue
modified: src/views/laboratory/ledger/index.vue
modified: src/views/standardLibrary/index.vue
已修改4个文件
23 ■■■■■ 文件已修改
src/api/laboratory/organizational.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/experiment/planAssignments/plan.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/laboratory/ledger/index.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/standardLibrary/index.vue 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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/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);
                this.upDia = true
                this.upData = {
                    id: row.code,
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">
@@ -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>
@@ -736,7 +736,7 @@
          this.$message.success('添加成功')
        }
      } catch (error) {
        this.$message.error(error)
        this.$message.error(error.message)
      }
      await this.closeCodePoins()
    },
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: [],
@@ -189,7 +190,7 @@
                    })
                    .catch(() => {});
            },
            filterNode(value, data) {
            filterNode(value, data,node) {
                if (!value) return true;
                return data.name.indexOf(value) !== -1;
            },
@@ -242,6 +243,7 @@
                        //TODO handle the exception
                    }
                });
            },
            getDefault(arr, index) {
                for (const item of arr) {