zouyu
2023-08-30 3757cdb07c84ab2eac4bdb41a7d98b46d38fdf48
Merge branch 'master' of http://192.168.110.209:9001/r/lims-before
已修改2个文件
13 ■■■■■ 文件已修改
src/utils/request.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/experiment/inspectionApplication/index.vue 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/utils/request.js
@@ -65,7 +65,6 @@
      sessionStorage.removeItem("user")
      sessionStorage.setItem("flushPage",1)
      router.replace({path: '/login'});
      // location.reload()
      }
      if(res.code===403){
        Message({
src/views/experiment/inspectionApplication/index.vue
@@ -50,8 +50,7 @@
                        </div>
                    </div>
                    <div class="table-box">
                        <el-table ref="inspectionTable" style="width: 100%;overflow-y: auto;min-height: calc(100% - 50px)"
                            max-height="calc(100% - 50px)" :cell-style="{textAlign: 'center'}"
                        <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'}"
                            :data="inspectionTable">
                            <el-table-column type="selection" min-width="30px" />
@@ -63,9 +62,9 @@
                                    <div v-if="scope.row.type === 2"><span>成品检验</span></div>
                                </template>
                            </el-table-column>
                            <el-table-column prop="formTime" label="来料日期" min-width="80px" />
                            <el-table-column prop="supplier" label="供应商名称" min-width="150px" />
                            <el-table-column prop="mcode" label="原材料编码" min-width="150px" />
                            <el-table-column prop="formTime" label="来料日期" min-width="90px" />
                            <el-table-column prop="supplier" label="供应商名称" min-width="150px" show-overflow-tooltip/>
                            <el-table-column prop="mcode" label="原材料编码" min-width="170px"/>
                            <el-table-column prop="name" label="原材料名称" min-width="80px" />
                            <el-table-column prop="specifications" label="规格型号" min-width="160px" />
                            <el-table-column prop="unit" label="单位" min-width="50px" />
@@ -78,7 +77,7 @@
                                </template>
                            </el-table-column>
                            <el-table-column prop="userName" label="登记人" min-width="80px" />
                            <el-table-column prop="checkdate" label="检验日期" min-width="150px" />
                            <el-table-column prop="checkdate" label="检验日期" min-width="160px" />
                            <el-table-column label="操作" min-width="150" fixed="right">
                                <template slot-scope="scope">
                                    <el-button type="text" size="small" @click="handleClick(scope.row)">查看</el-button>
@@ -952,7 +951,6 @@
    .pagination {
        display: flex;
        margin-top: 20px;
        justify-content: end;
    }