Fixiaobai
2023-09-04 0b9a9b4aa3051565b213b9efcb5e02ecbda0e791
Merge branch 'master' of http://192.168.73.113:9001/r/lims-before
已修改17个文件
349 ■■■■ 文件已修改
src/views/CNAS/nonConformanceManage/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/CNAS/reviewAnnualPlan/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/CNAS/satisfactionSurveys/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/basicData/index.vue 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/experiment/checkTheReport/index.vue 28 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/experiment/inspectionApplication/index.vue 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/experiment/nonConformanceReview/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/experiment/nonConformingFeedback/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/experiment/reportAuditing/index.vue 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/inspectionManagement/commissionInspection/index.vue 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/inspectionManagement/reportForInspection/index.vue 179 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/laboratory/ledger/index.vue 19 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/laboratory/measure/index.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/laboratory/personnel/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/laboratory/role/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/message/toDo/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/standardLibrary/index.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/CNAS/nonConformanceManage/index.vue
@@ -56,8 +56,8 @@
        <el-table
                ref="recordTable"
                :max-height="800"
                :cell-style="{textAlign: 'center'}"
                :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'center'}"
                :cell-style="{textAlign: 'left'}"
                :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'left'}"
                :data="recordTable"
                style="width: 100%"
              >
src/views/CNAS/reviewAnnualPlan/index.vue
@@ -279,13 +279,13 @@
          ref="auditTable"
          border
          :max-height="800"
          :cell-style="{ textAlign: 'center' }"
          :cell-style="{ textAlign: 'left' }"
          :header-cell-style="{
            border: '0px',
            background: '#f5f7fa',
            color: '#606266',
            boxShadow: 'inset 0 1px 0 #ebeef5',
            textAlign: 'center',
            textAlign: 'left',
          }"
          :data="auditTable"
          style="width: 100%"
src/views/CNAS/satisfactionSurveys/index.vue
@@ -33,8 +33,8 @@
    </div>
    <div class="library-table">
      <div class="table-box">
        <el-table ref="tableData" :max-height="800" :cell-style="{ textAlign: 'center' }"
          :header-cell-style="{ border: '0px', background: '#f5f7fa', color: '#606266', boxShadow: 'inset 0 1px 0 #ebeef5', textAlign: 'center' }"
        <el-table ref="tableData" :max-height="800" :cell-style="{ textAlign: 'left' }"
          :header-cell-style="{ border: '0px', background: '#f5f7fa', color: '#606266', boxShadow: 'inset 0 1px 0 #ebeef5', textAlign: 'left' }"
          :data="tableData" style="width: 100%">
          <el-table-column prop="id" type="index" label="序号" min-width="20%"/>
          <el-table-column prop="surveyDate" label="调查日期" min-width="10%" />
src/views/basicData/index.vue
@@ -2,7 +2,7 @@
    <div class="main_div">
        <div class="top_div">
            <span>样品名称:</span>
            <el-select v-model="params.material" size="small" placeholder="请选择样品名称">
            <el-select v-model="params.material" size="small" placeholder="请选择样品名称" @change="selectProductModelTable()">
                <el-option v-for="item in productModelSelectmater" :value="item" :key="item.index" :label="item"></el-option>
            </el-select>
            <span class="top_div_span">项目分组:</span>
@@ -160,6 +160,7 @@
                                    message: res.message,
                                    type: "success",
                                });
                                this.selectProductMaster();
                                this.selectProductModelTable();
                            });
                        }
@@ -347,13 +348,16 @@
                    name: null
                }
                this.selectProductModelTable()
            },
            selectList(){
                this.selectProductMaster().then((res) => {
                    this.params.material = this.productModelSelectmater[0];
                    this.selectProductModelTable();
                })
            }
        },
        mounted() {
            this.selectProductMaster().then((res) => {
                this.params.material = this.productModelSelectmater[0];
                this.selectProductModelTable();
            });
            this.selectList()
        },
        watch: {
            centerDialogVisible: {
src/views/experiment/checkTheReport/index.vue
@@ -26,10 +26,9 @@
                <div class="search-bar">
                    <el-radio-group v-model="checkStatus" @change="handleRadioChange">
                        <el-radio-button>全部</el-radio-button>
                        <el-radio-button label="0">待提交</el-radio-button>
                        <el-radio-button label="1">待审核</el-radio-button>
                        <el-radio-button label="2">待签字</el-radio-button>
                        <el-radio-button label="3">已完成</el-radio-button>
                        <el-radio-button label="0">待审核</el-radio-button>
                        <el-radio-button label="1">待签字</el-radio-button>
                        <el-radio-button label="2">已完成</el-radio-button>
                    </el-radio-group>
                    <el-checkbox v-model="checked" style="margin-left: 20px">仅看我的</el-checkbox>
                </div>
@@ -44,12 +43,12 @@
                </div>
            </el-dialog>
            <div class="table-box">
                <el-table ref="reportTable" :max-height="800" :cell-style="{ textAlign: 'center' }" :header-cell-style="{
                <el-table ref="reportTable" :max-height="800" :cell-style="{ textAlign: 'left' }" :header-cell-style="{
            border: '0px',
            background: '#f5f7fa',
            color: '#606266',
            boxShadow: 'inset 0 1px 0 #ebeef5',
            textAlign: 'center',
            textAlign: 'left',
          }" :data="reportTable" @selection-change="handleSelectionChange" style="width: 100%">
                    <el-table-column type="selection" min-width="5%" />
                    <el-table-column prop="type" label="报告类型" min-width="5%">
@@ -86,15 +85,14 @@
                    <el-table-column prop="status" label="审批状态" min-width="8%">
                        <template slot-scope="scope">
                            <span>
                                <el-tag type="info">{{
                  scope.row.status == 0
                    ? "待提交"
                    : scope.row.status == 1
                    ? "待审核"
                    : scope.row.status == 2
                    ? "代签字"
                    : "已完成"
                }}</el-tag>
                                <el-tag type="info">
                                    {{
                                    scope.row.status == 0
                                    ? "待审核"
                                    : scope.row.status == 1
                                    ? "代签字" : "已完成"
                                    }}
                                </el-tag>
                            </span>
                        </template></el-table-column>
                    <el-table-column prop="conclusion" label="检验结论" min-width="8%">
src/views/experiment/inspectionApplication/index.vue
@@ -41,8 +41,8 @@
                <div class="library-table">
                    <div class="table-box">
                        <el-table ref="inspectionTable" style="width: 100%;overflow-y: auto;max-height: 600px;" :height="600"
                            :cell-style="{textAlign: 'center'}"
                            :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'center'}"
                            :cell-style="{textAlign: 'left'}"
                            :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'left'}"
                            :data="inspectionTable">
                            <el-table-column type="selection" min-width="30px" />
                            <el-table-column prop="icode" label="申请单号" min-width="160px" />
@@ -338,10 +338,8 @@
                        <el-table-column prop="surveyor" label="检验人" min-width="8%" />
                        <el-table-column prop="startTime" label="检验日期" min-width="8%" />
                        <el-table-column prop="type" label="状态" min-width="8%">
                            <template slot-scope="scope">
                                <span :style="{ color: scope.row.state === type ? 'green' : 'red' }">
                                    {{ scope.row.state===1 ? '已检测':'待检测' }}
                                </span>
                            <template>
                                <span style="color: red">待检验</span>
                            </template>
                        </el-table-column>
                    </el-table>
@@ -649,7 +647,10 @@
                                checkdate.push(item['updateTime'])
                                item['checkdate'] = checkdate // 检验日期
                            })
                            this.rawMaterialTable = res.data
                            let arr = res.data.filter((val)=>{
                                return val.type === 0;
                            })
                            this.rawMaterialTable = arr
                        })
                    } else if (this.type === 1) {
                        this.commisionVisible = true
src/views/experiment/nonConformanceReview/index.vue
@@ -41,8 +41,8 @@
    </div>
    <div class="library-table">
      <div class="table-box">
        <el-table ref="tableData" :max-height="800" :cell-style="{ textAlign: 'center' }"
          :header-cell-style="{ border: '0px', background: '#f5f7fa', color: '#606266', boxShadow: 'inset 0 1px 0 #ebeef5', textAlign: 'center' }"
        <el-table ref="tableData" :max-height="800" :cell-style="{ textAlign: 'left' }"
          :header-cell-style="{ border: '0px', background: '#f5f7fa', color: '#606266', boxShadow: 'inset 0 1px 0 #ebeef5', textAlign: 'left' }"
          :data="tableData" style="width: 100%">
          <el-table-column type="selection" label="" min-width="5%" />
          <el-table-column  label="样品编号" min-width="10%">
src/views/experiment/nonConformingFeedback/index.vue
@@ -41,8 +41,8 @@
    </div>
    <div class="library-table">
      <div class="table-box">
        <el-table ref="tableData" :max-height="800" :cell-style="{ textAlign: 'center' }"
          :header-cell-style="{ border: '0px', background: '#f5f7fa', color: '#606266', boxShadow: 'inset 0 1px 0 #ebeef5', textAlign: 'center' }"
        <el-table ref="tableData" :max-height="800" :cell-style="{ textAlign: 'left' }"
          :header-cell-style="{ border: '0px', background: '#f5f7fa', color: '#606266', boxShadow: 'inset 0 1px 0 #ebeef5', textAlign: 'left' }"
          :data="tableData" style="width: 100%">
          <el-table-column type="selection" label="" min-width="5%" />
          <el-table-column  label="样品编号" min-width="10%">
src/views/experiment/reportAuditing/index.vue
@@ -14,14 +14,6 @@
          <el-button type="primary" @click="getData()">查询</el-button>
          <el-button type="primary" plain @click="resetData()">重置</el-button>
        </el-form-item>
        <el-dropdown>
          <span class="el-dropdown-link">
            高级搜索<i class="el-icon-arrow-down el-icon--right"></i>
          </span>
          <el-dropdown-menu slot="dropdown">
            <el-dropdown-item>高级搜索</el-dropdown-item>
          </el-dropdown-menu>
        </el-dropdown>
      </el-form>
    </div>
    <div class="library-table">
@@ -41,13 +33,13 @@
        <el-table
          ref="reportTable"
          :max-height="800"
          :cell-style="{ textAlign: 'center' }"
          :cell-style="{ textAlign: 'left' }"
          :header-cell-style="{
            border: '0px',
            background: '#f5f7fa',
            color: '#606266',
            boxShadow: 'inset 0 1px 0 #ebeef5',
            textAlign: 'center',
            textAlign: 'left',
          }"
          :data="reportTable"
          style="width: 100%"
@@ -79,9 +71,9 @@
          <el-table-column prop="status" label="审批状态" min-width="8%" v-model="Auditconclusion">
            <template slot-scope="scope">
              <span>
                <el-tag :color="scope.row.status == 0 ? '' : 'rgb(187, 237, 221)'" type="warning">{{
                  scope.row.status == 0 ? "待通过" : "通过"
                }}</el-tag>
                <el-tag type="warning" v-if="scope.row.status === 0">待通过</el-tag>
                <el-tag type="success" v-else-if="scope.row.status === 1">通过</el-tag>
                <el-tag type="danger" v-else>不通过</el-tag>
              </span>
            </template></el-table-column
          >
@@ -192,7 +184,7 @@
    async checkskip(row) {
      console.log(this.tableRow);
      this.reportTable[this.tableRow.$index].status=1
      this.transmitData(this.tableRow.row.id)
      this.transmitData(this.tableRow.row.id,1)
      this.checkskipvisible= false
      this.$message({
          message: '通过成功',
@@ -204,7 +196,7 @@
    async nocheckskip(row) {
      console.log(this.tableRow);
      this.reportTable[this.tableRow.$index].status=0
      this.transmitData(this.tableRow.row.id)
      this.transmitData(this.tableRow.row.id,2)
      this.checkskipvisible= false
      this.$message({
          message: '待通过',
@@ -213,8 +205,8 @@
    },
    //审核
    async transmitData(id) {
      let param={"id":id,"result":2}
    async transmitData(id, result) {
      let param={"id":id,"result":result}
     let data = await checkApi(param)
    },
    // 查询列表
src/views/inspectionManagement/commissionInspection/index.vue
@@ -58,8 +58,8 @@
                        </div>
                    </div>
                    <div class="table-box">
                        <el-table ref="commisionTable" :max-height="800" :cell-style="{textAlign: 'center'}"
                            :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'center'}"
                        <el-table ref="commisionTable" :max-height="800" :cell-style="{textAlign: 'left'}"
                            :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'left'}"
                            :data="commisionTable" @selection-change="handleSelectionChange" style="width: 100%">
                            <el-table-column type="selection" :selectable="checkSelect" min-width="10%" />
                            <el-table-column type="index" label="序号" min-width="10%" />
@@ -254,11 +254,13 @@
            },
            handleSelectionChange(val) {
                if (val.length > 1) {
                    let data = val.pop();
                    this.$refs.commisionTable.clearSelection();
                    this.$refs.commisionTable.toggleRowSelection(val.pop())
                    this.$refs.commisionTable.toggleRowSelection(data);
                    this.checkData = data;
                }else{
                    this.checkData = val;
                }
                this.checkData = val;
                console.log(this.checkData);
            },
            //生成报检单确认按钮
            confirmBtn(formName) {
@@ -288,10 +290,13 @@
            },
            //生成报检单请求
            async createReport(param) {
                let res = await addInspect(param);
                if(res.data==null)return
                this.$message.success('报检成功')
                this.$router.push(`/experiment/Viewdetails/${res.data}`)
                await addInspect(param).then(res =>{
                    this.search();
                    this.$message.success('报检成功')
                    this.$router.push(`/experiment/Viewdetails/${res.data}`)
                }).catch(()=>{
                    this.$message.error('报检失败')
                });
            },
            //生成报检单按钮
            addReportBtn() {
@@ -328,7 +333,10 @@
                    specifications : specifications,
                    version: version
                }).then((res)=>{
                    console.log(res);
                    var data = res.data;
                    for(var i=0;i<data.length;i++){
                        data[i].id = "0" + i;
                    }
                    vm.standardLibraryData = res.data;
                })
            },
src/views/inspectionManagement/reportForInspection/index.vue
@@ -8,7 +8,7 @@
                        </el-input>
                    </el-form-item>
                    <el-form-item label="材料名称:" class="sermargin">
                        <el-input v-model="searchData.name" class="input-form" placeholder="请输入">
                        <el-input v-model="searchData.name" class="input-form" placeholder="请输入材料名称">
                        </el-input>
                    </el-form-item>
                    <el-form-item label="状态:" class="sermargin">
@@ -18,8 +18,8 @@
                        </el-select>
                    </el-form-item>
                    <el-form-item label="来料日期:" style="margin-right: 20px;">
                        <el-input v-model="searchData.date" class="input-form" placeholder="请输入">
                        </el-input>
                        <el-date-picker value-format="yyyy-MM-dd" v-model="searchData.date" class="input-form" placeholder="请选择来料日期">
                        </el-date-picker>
                    </el-form-item>
                    <el-form-item>
                        <el-button type="primary" @click="search">查询</el-button>
@@ -54,7 +54,7 @@
                        <el-input type="text" v-model="insertData.unit" />
                    </el-form-item>
                    <el-form-item label="数量:" prop="num">
                        <el-input type="number" v-model="insertData.num"/>
                        <el-input type="number" min="0" v-model="insertData.num"/>
                    </el-form-item>
                </el-form>
                <span slot="footer" class="dialog-footer">
@@ -70,8 +70,8 @@
                    </div>
                </div>
                <div class="table-box">
                    <el-table ref="inspectionTable" :max-height="600" :cell-style="{textAlign: 'center'}"
                        :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'center'}"
                    <el-table ref="inspectionTable" :max-height="450" :cell-style="{textAlign: 'left'}"
                        :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'left'}"
                        :data="inspectionTable" style="width: 100%" @selection-change="handleSelectionChange">
                        <el-table-column type="selection" :selectable="checkSelect" min-width="5%"></el-table-column>
                        <el-table-column type="index" label="序号" min-width="8%" />
@@ -276,6 +276,13 @@
        mounted() {
            this.getMaterielName();
        },
        watch:{
            addReportDialog(newVal){
                if(newVal === false){
                    this.resetForm("addInspectionForm");
                }
            }
        },
        methods: {
            handleChange() {
@@ -312,11 +319,14 @@
                }
            },
            handleSelectionChange(val) {
        if (val.length > 1) {
                if (val.length > 1) {
                    let data = val.pop();
                    this.$refs.inspectionTable.clearSelection();
                    this.$refs.inspectionTable.toggleRowSelection(val.pop())
                    this.$refs.inspectionTable.toggleRowSelection(data);
                    this.checkData = new Array(data);
                }else{
                    this.checkData = val;
                }
                this.checkData = val;
            },
            //生成报检单按钮
            addReportBtn() {
@@ -326,86 +336,95 @@
                    if (this.checkData.length > 1) {
                        this.$message.error("最多选择一条数据!");
                    } else {
            let mcode = this.checkData[0].materialCoding;
            let name = this.checkData[0].materialName;
            let specifications = this.checkData[0].specificationsModels;
            this.getChooseVersionFun(mcode,name,specifications);
                        let mcode = this.checkData[0].materialCoding;
                        let name = this.checkData[0].materialName;
                        let speId = this.checkData[0].specificationsId;
                        this.getChooseVersionFun(mcode,name,speId);
                        this.addReportDialog = true;
                    }
                }
            },
      changeVersionFun(){
        let mCode = this.checkData[0].materialCoding;
        let name = this.checkData[0].materialName;
        let specifications = this.checkData[0].specificationsModels;
        let version = this.addInspectionForm.version;
        this.getProByVersion(mCode,name,specifications,version);
      },
      //获取版本下的标准库数据
      async getProByVersion(mCode,name,specifications,version){
          var vm = this;
          await lookProByVer({
              mcode : mCode,
              name : name,
              specifications : specifications,
              version: version
          }).then((res)=>{
            vm.standardLibraryData = res.data;
          })
      },
      //获取版本列表
      async getChooseVersionFun(mCode,name,specifications){
        var vm = this;
        this.chooseVersion = [];
        await getChooseVersion({
          mcode : mCode,
          name : name,
          specifications : specifications
        }).then((res)=>{
              vm.getProByVersion(mCode,name,specifications,res.data[0])
              for(let i=0;i<res.data.length;i++){
                vm.chooseVersion.push({
                  value: res.data[i],
                  label: "V"+res.data[i]
                });
              }
              vm.addInspectionForm.version = res.data[0];
        });
      },
            changeVersionFun(){
                let mCode = this.checkData[0].materialCoding;
                let name = this.checkData[0].materialName;
                let specifications = this.checkData[0].specificationsModels;
                let version = this.addInspectionForm.version;
                this.getProByVersion(mCode,name,specifications,version);
            },
            //获取版本下的标准库数据
            async getProByVersion(mCode,name,specifications,version){
                var vm = this;
                await lookProByVer({
                    mcode : mCode,
                    name : name,
                    specifications : specifications,
                    version: version
                }).then((res)=>{
                    var arr = res.data;
                    for(var i=0;i<arr.length;i++){
                        arr[i].id = "0" + i;
                    }
                    vm.standardLibraryData = arr;
                })
            },
            //获取版本列表
            async getChooseVersionFun(mCode,name,specifications){
                var vm = this;
                this.chooseVersion = [];
                await getChooseVersion({
                mcode : mCode,
                name : name,
                specifications : specifications
                }).then((res)=>{
                    vm.getProByVersion(mCode,name,specifications,res.data[0])
                    for(let i=0;i<res.data.length;i++){
                        vm.chooseVersion.push({
                        value: res.data[i],
                        label: "V"+res.data[i]
                        });
                    }
                    vm.addInspectionForm.version = res.data[0];
                });
            },
            //生成报检单确认按钮
            confirmBtn(formName) {
        this.$refs[formName].validate((valid=>{
          if(valid){
            let dateArr = this.addInspectionForm.inspectionDate;
            //添加报检单
            let val = this.checkData[0];
            let obj = {
              "endTime": dateArr[1],
              "experiment": "",
              "formTime": val.createTime,
              "id": val.id,
              "mcode": val.materialCoding,
              "name": val.materialName,
              "num": val.quantity,
              "specifications": val.specificationsModels,
              "startTime": dateArr[0],
              "supplier": val.supplierName,
              "type": val.type,
              "unit": val.unit,
              "version": this.addInspectionForm.version
            }
            this.createReport(obj);
            this.addReportDialog = false;
          }
        }));
                this.$refs[formName].validate((valid=>{
                if(valid){
                    let dateArr = this.addInspectionForm.inspectionDate;
                    //添加报检单
                    let val = this.checkData[0];
                    let obj = {
                    "endTime": dateArr[1],
                    "experiment": "",
                    "formTime": val.createTime,
                    "id": val.id,
                    "mcode": val.materialCoding,
                    "name": val.materialName,
                    "num": val.quantity,
                    "specifications": val.specificationsModels,
                    "specificationsId": val.specificationsId,
                    "startTime": dateArr[0],
                    "supplier": val.supplierName,
                    "type": val.type,
                    "unit": val.unit,
                    "version": this.addInspectionForm.version
                    }
                    // this.createReport(obj);
                    console.log("obj---",obj);
                    this.addReportDialog = false;
                }
                }));
            },
            //生成报检单
            async createReport(param) {
                let res = await addInspect(param);
                if(res.data==null)return
                this.$message.success('报检成功')
                this.$router.push(`/experiment/Viewdetails/${res.data}`)
                await addInspect(param).then(res =>{
                    this.search();
                    this.$message.success('报检成功')
                    this.$router.push(`/experiment/Viewdetails/${res.data}`)
                }).catch(error =>{
                    this.$message.error('报检失败')
                });
            },
            // 获取分页列表数据
            async getRawMaterialList() {
src/views/laboratory/ledger/index.vue
@@ -52,8 +52,8 @@
          </div>
        </div>
        <div class="table-box">
          <el-table ref="equipmentTable" node-key="father_name" :cell-style="{ textAlign: 'center' }"
            :header-cell-style="{ border: '0px', background: '#f5f7fa', color: '#606266', boxShadow: 'inset 0 1px 0 #ebeef5', textAlign: 'center' }"
          <el-table ref="equipmentTable" node-key="father_name" :cell-style="{ textAlign: 'left' }"
            :header-cell-style="{ border: '0px', background: '#f5f7fa', color: '#606266', boxShadow: 'inset 0 1px 0 #ebeef5', textAlign: 'left' }"
            :data="equipmentTable" style="width: 100%;">
            <el-table-column type="index" label="序号" min-width="90" />
            <el-table-column prop="equipment_code" label="仪器设备编号" min-width="200" />
@@ -685,7 +685,7 @@
    // 节点点击处理
    nodeClickHandler(data, node, element) {
      this.nodeclicked = data
      // console.log(data)
      console.log(data)
      // 只有数据中携带id才能发送查询请求
      if (data.id) {
        this.getEquipmentTable({ classifyId: data.id, pageSize: this.pageSize, pageNo: this.currentPage, whetherWhether: this.isOut })
@@ -950,15 +950,14 @@
      this.deletedialogVisible = true
    },
    async deleteInstrument() {
      let up = await deleteInstrument({ instrumentId: this.instrumentId })
      if (up.data) {
        this.$message({
          message: '操作成功!',
          type: 'success'
        });
      await deleteInstrument({ instrumentId: this.instrumentId }).then(res=>{
        this.$message.error('删除成功!');
        let d = this.nodeclicked
        console.log(d);
        this.nodeClickHandler(d);
      }
      }).catch(()=>{
        this.$message.error('删除失败!');
      });
      this.deletedialogVisible = false
    },
    async submitTreeForm(formName) {
src/views/laboratory/measure/index.vue
@@ -42,8 +42,8 @@
          </div>
        </div>
        <div class="table-box">
          <el-table v-if="this.radioValue == 0" :max-height="500" :cell-style="{ textAlign: 'center' }"
            :header-cell-style="{ border: '0px', background: '#f5f7fa', color: '#606266', boxShadow: 'inset 0 1px 0 #ebeef5', textAlign: 'center' }"
          <el-table v-if="this.radioValue == 0" :max-height="500" :cell-style="{ textAlign: 'left' }"
            :header-cell-style="{ border: '0px', background: '#f5f7fa', color: '#606266', boxShadow: 'inset 0 1px 0 #ebeef5', textAlign: 'left' }"
            :data="measureLedgerTable" style="width: 100%">
            <el-table-column type="index" min-width="10%" />
            <el-table-column prop="equipmentCode" label="仪器设备编号" min-width="10%" />
@@ -396,7 +396,6 @@
      });
      this.lookVisible = false
      this.addBtn = false
      this.getPlanPageList()
      this.limitGetPlanMeasureInstrument()
    },
    async handleSizeChangePlan(num) {
src/views/laboratory/personnel/index.vue
@@ -56,13 +56,13 @@
        </div>
        <div class="content-main">
            <div class="personner-table">
                <el-table ref="personnerlTable" height="calc(100vh - 240px)" border :cell-style="{ textAlign: 'center' }"
                <el-table ref="personnerlTable" height="calc(100vh - 240px)" border :cell-style="{ textAlign: 'left' }"
                    :header-cell-style="{
            border: '0px',
            background: '#f5f7fa',
            color: '#606266',
            boxShadow: 'inset 0 1px 0 #ebeef5',
            textAlign: 'center',
            textAlign: 'left',
          }" @filter-change="fnFilterChangeInit" :data="personnerlTable" style="width: 100%">
                    <el-table-column prop="username" label="角色名称" min-width="120" />
                    <el-table-column prop="roleName" label="角色权限" min-width="120" />
src/views/laboratory/role/index.vue
@@ -22,8 +22,8 @@
      </div>
      <div class="library-table">
        <div class="table-box">
          <el-table :max-height="800" :cell-style="{ textAlign: 'center' }"
            :header-cell-style="{ border: '0px', background: '#f5f7fa', color: '#606266', boxShadow: 'inset 0 1px 0 #ebeef5', textAlign: 'center' }"
          <el-table :max-height="800" :cell-style="{ textAlign: 'left' }"
            :header-cell-style="{ border: '0px', background: '#f5f7fa', color: '#606266', boxShadow: 'inset 0 1px 0 #ebeef5', textAlign: 'left' }"
            :data="roleTable" style="width: 100%">
            <el-table-column type="index" min-width="8%" />
            <el-table-column prop="roleName" label="角色名称" min-width="20%" />
src/views/message/toDo/index.vue
@@ -40,8 +40,8 @@
        <el-table
                ref="toDoTable"
                :max-height="800"
                :cell-style="{textAlign: 'center'}"
                :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'center'}"
                :cell-style="{textAlign: 'left'}"
                :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'left'}"
                :data="toDoTable"
                @selection-change="handleSelectionChange"
                style="width: 100%"
src/views/standardLibrary/index.vue
@@ -167,7 +167,8 @@
            },
            async insertVersion() {
                const resp = await addVersion({
                    specificationsId: this.selectData.id
                    specificationsId: this.selectData.id,
                    version: this.versionValue
                });
                if (resp.code === 200) {
                    this.initSelect();