wilson
/
ccl_plm-vue
0
1
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

2026-06-29 

lab优化
master
fengyuan_yang 1 month ago
parent
5897aae08b
commit
295456c9f5
1 changed files with 58 additions and 64 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 122
      src/views/modules/lab/labRecord.vue

122
src/views/modules/lab/labRecord.vue
View File

@ -131,7 +131,7 @@
<el-dialog
:title="modalTitle"
:visible.sync="modalFlag"
width="1025px"
width="965px"
top="5vh"
v-drag
:close-on-click-modal="false"
@ -337,7 +337,39 @@
</div>
</el-tab-pane>
<el-tab-pane label="结果信息" name="resultInfo">
<el-tab-pane label="审批信息" name="approvalInfo">
<div style="height: 715px; overflow-y: auto;">
<el-form :inline="true" label-position="top" :model="modalData" style="margin-top: -5px;">
<el-form-item label="备注（部门经理）" style="display: block;">
<el-input type="textarea" :rows="3" v-model="modalData.departmentManagerComments" :disabled="isLabFieldDisabled('departmentManagerComments')" resize="none" style="width: 772px"></el-input>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="modalData" style="margin-top: 45px;">
<el-form-item label="备注（实验室）" style="display: block;">
<el-input type="textarea" :rows="3" v-model="modalData.labComments" :disabled="isLabFieldDisabled('labComments')" resize="none" style="width: 772px"></el-input>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="modalData" style="margin-top: 45px">
<el-form-item>
<span style="cursor: pointer" v-if="!isLabFieldDisabled('tester')" slot="label" @click="openTesterChooseModal"><a herf="#">测试人</a></span>
<span v-else slot="label">测试人</span>
<el-input
v-model="modalData.testerName"
readonly
:disabled="isLabFieldDisabled('tester')"
style="width: 772px"
placeholder="请选择测试人"
@focus="openTesterChooseModal">
<span slot="suffix" v-show="modalData.testerName && !isLabFieldDisabled('tester')" @click.stop="clearTesterSelection">
<i class="el-icon-circle-close" style="margin-left: 5px;cursor: pointer;"></i>
</span>
</el-input>
</el-form-item>
</el-form>
</div>
</el-tab-pane>
<el-tab-pane label="测试结果" name="resultInfo">
<div style="height: 715px; overflow-y: auto;">
<el-form :inline="true" label-position="top" :model="modalData" style="margin-top: -5px;">
<el-form-item label="测试开始时间">
@ -382,43 +414,6 @@
</el-form>
</div>
</el-tab-pane>
<el-tab-pane label="审批信息-部门经理" name="departmentManagerInfo">
<div style="height: 715px; overflow-y: auto;">
<el-form :inline="true" label-position="top" :model="modalData" style="margin-top: -5px;">
<el-form-item label="备注" style="display: block;">
<el-input type="textarea" :rows="4" v-model="modalData.departmentManagerComments" :disabled="isLabFieldDisabled('departmentManagerComments')" resize="none" style="width: 772px"></el-input>
</el-form-item>
</el-form>
</div>
</el-tab-pane>
<el-tab-pane label="审批信息-实验室" name="labInfo">
<div style="height: 715px; overflow-y: auto;">
<el-form :inline="true" label-position="top" :model="modalData" style="margin-top: -5px;">
<el-form-item label="备注（实验室）" style="display: block;">
<el-input type="textarea" :rows="3" v-model="modalData.labComments" :disabled="isLabFieldDisabled('labComments')" resize="none" style="width: 772px"></el-input>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="modalData" style="margin-top: 45px">
<el-form-item>
<span style="cursor: pointer" v-if="!isLabFieldDisabled('tester')" slot="label" @click="openTesterChooseModal"><a herf="#">测试人</a></span>
<span v-else slot="label">测试人</span>
<el-input
v-model="modalData.testerName"
readonly
:disabled="isLabFieldDisabled('tester')"
style="width: 772px"
placeholder="请选择测试人"
@focus="openTesterChooseModal">
<span slot="suffix" v-show="modalData.testerName && !isLabFieldDisabled('tester')" @click.stop="clearTesterSelection">
<i class="el-icon-circle-close" style="margin-left: 5px;cursor: pointer;"></i>
</span>
</el-input>
</el-form-item>
</el-form>
</div>
</el-tab-pane>
</el-tabs>
<el-footer style="height:35px;margin-top: 15px;text-align:center">
@ -804,7 +799,27 @@
</el-form>
</div>
</el-tab-pane>
<el-tab-pane label="结果信息" name="resultInfo">
<el-tab-pane label="审批信息" name="approvalInfoDetail">
<div :style="{height: secondHeight + 'px'}" style="margin-left: 5px;margin-top: 5px; overflow-y: auto;">
<el-form :inline="true" label-position="top" :model="currentDetail">
<el-form-item label="备注（部门经理）" style="display: block;">
<el-input type="textarea" :rows="3" :value="currentDetail.departmentManagerComments || ''" disabled resize="none" style="width: 772px"></el-input>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="currentDetail" style="margin-top: 45px">
<el-form-item label="备注（实验室）" style="display: block;">
<el-input type="textarea" :rows="3" :value="currentDetail.labComments || ''" disabled resize="none" style="width: 772px"></el-input>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="currentDetail" style="margin-top: 45px">
<el-form-item label="测试人">
<el-input :value="currentDetail.testerName || currentDetail.tester || ''" disabled style="width: 772px"></el-input>
</el-form-item>
</el-form>
</div>
</el-tab-pane>
<el-tab-pane label="测试结果" name="resultInfo">
<div :style="{height: secondHeight + 'px'}" style="margin-left: 5px;margin-top: 5px; overflow-y: auto;">
<el-form :inline="true" label-position="top" :model="currentDetail">
<el-form-item label="测试开始时间">
@ -846,32 +861,11 @@
</el-form>
</div>
</el-tab-pane>
<el-tab-pane label="审批信息-部门经理" name="departmentManagerInfo">
<div :style="{height: secondHeight + 'px'}" style="margin-left: 5px;margin-top: 5px; overflow-y: auto;">
<el-form :inline="true" label-position="top" :model="currentDetail">
<el-form-item label="备注" style="display: block;">
<el-input type="textarea" :rows="4" :value="currentDetail.departmentManagerComments || ''" disabled resize="none" style="width: 772px"></el-input>
</el-form-item>
</el-form>
</div>
</el-tab-pane>
<el-tab-pane label="审批信息-实验室" name="labInfo">
<div :style="{height: secondHeight + 'px'}" style="margin-left: 5px;margin-top: 5px; overflow-y: auto;">
<el-form :inline="true" label-position="top" :model="currentDetail">
<el-form-item label="备注" style="display: block;">
<el-input type="textarea" :rows="3" :value="currentDetail.labComments || ''" disabled resize="none" style="width: 772px"></el-input>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="currentDetail" style="margin-top: 45px">
<el-form-item label="测试人">
<el-input :value="currentDetail.testerName || currentDetail.tester || ''" disabled style="width: 772px"></el-input>
</el-form-item>
</el-form>
</div>
</el-tab-pane>
<el-tab-pane label="审批信息" name="approvalInformation">
<el-tab-pane label="审批记录" name="approvalInformation">
<approval-information v-model:data-list="approvalList" :height="secondHeight"></approval-information>
</el-tab-pane>
</el-tabs>
<ChooseList ref="baseList" @getBaseData="getBaseData"></ChooseList>

Write Preview
Loading…
Cancel
Save