sfms3.0
/
sfms3.0-ui
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

检验记录样式

hella_online_20240829
zhang_li 4 months ago
parent
dd835c1d0d
commit
241201e672
3 changed files with 1470 additions and 1276 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 165
      src/views/qms/inspectionJob/addForm.vue
  2. 176
      src/views/qms/inspectionRecord/addForm.vue
  3. 69
      src/views/qms/inspectionRecordFirst/addForm.vue

165
src/views/qms/inspectionJob/addForm.vue
View File

@ -71,7 +71,11 @@
</span> </span>
</template> </template>
<div class="tabs-box"> <div class="tabs-box">
<el-collapse accordion>
<el-collapse-item name="1">
<template #title>
<div class="small-title">检验工序</div> <div class="small-title">检验工序</div>
</template>
<el-form :model="item" label-width="auto" :rules="rules" ref="formProcessRef"> <el-form :model="item" label-width="auto" :rules="rules" ref="formProcessRef">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
@ -104,7 +108,11 @@
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
</el-collapse-item>
<el-collapse-item name="2">
<template #title>
<div class="small-title">检验特性</div> <div class="small-title">检验特性</div>
</template>
<el-form :model="item" label-width="auto" :rules="rules" ref="formFeaturesRef"> <el-form :model="item" label-width="auto" :rules="rules" ref="formFeaturesRef">
<div> <div>
<el-row :gutter="20"> <el-row :gutter="20">
@ -135,7 +143,9 @@
> >
<div style="display: flex; width: 100%"> <div style="display: flex; width: 100%">
<el-input <el-input
v-model="item.inspectionJobCharacteristicsUpdateReqVO.inspectionMethodName" v-model="
item.inspectionJobCharacteristicsUpdateReqVO.inspectionMethodName
"
disabled disabled
placeholder="请选择检验方法" placeholder="请选择检验方法"
/> />
@ -149,7 +159,9 @@
> >
<div style="display: flex; width: 100%"> <div style="display: flex; width: 100%">
<el-input <el-input
v-model="item.inspectionJobCharacteristicsUpdateReqVO.samplingProcessName" v-model="
item.inspectionJobCharacteristicsUpdateReqVO.samplingProcessName
"
disabled disabled
placeholder="请选择采样过程编码" placeholder="请选择采样过程编码"
/> />
@ -178,7 +190,9 @@
> >
<div style="display: flex; width: 100%"> <div style="display: flex; width: 100%">
<el-input <el-input
v-model="item.inspectionJobCharacteristicsUpdateReqVO.samplePieceSize" v-model="
item.inspectionJobCharacteristicsUpdateReqVO.samplePieceSize
"
disabled disabled
placeholder="请输入样品份数" placeholder="请输入样品份数"
/> />
@ -202,7 +216,9 @@
prop="inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod" prop="inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod"
> >
<el-select <el-select
v-model="item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod" v-model="
item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod
"
placeholder="请选择结果录入方式" placeholder="请选择结果录入方式"
@change="resultEntryMethodChange($event, item)" @change="resultEntryMethodChange($event, item)"
disabled disabled
@ -250,7 +266,9 @@
prop="inspectionCharacteristicsBaseVO.quantifyIsCapping" prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
> >
<el-switch <el-switch
v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping" v-model="
item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping
"
:disabled="true" :disabled="true"
/> />
</el-form-item> </el-form-item>
@ -282,7 +300,9 @@
prop="inspectionCharacteristicsBaseVO.quantifyIsCapping" prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
> >
<el-switch <el-switch
v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit" v-model="
item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit
"
:disabled="true" :disabled="true"
/> />
</el-form-item> </el-form-item>
@ -299,7 +319,9 @@
prop="inspectionCharacteristicsBaseVO.quantifyCapping" prop="inspectionCharacteristicsBaseVO.quantifyCapping"
> >
<el-input <el-input
v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit" v-model="
item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit
"
:disabled="true" :disabled="true"
/> />
</el-form-item> </el-form-item>
@ -314,7 +336,9 @@
prop="inspectionCharacteristicsBaseVO.quantifyIsCapping" prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
> >
<el-switch <el-switch
v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget" v-model="
item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget
"
:disabled="true" :disabled="true"
/> />
</el-form-item> </el-form-item>
@ -343,7 +367,9 @@
prop="inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime" prop="inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime"
> >
<el-date-picker <el-date-picker
v-model="item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime" v-model="
item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime
"
type="datetime" type="datetime"
placeholder="请选择开始时间" placeholder="请选择开始时间"
style="width: 100%" style="width: 100%"
@ -357,7 +383,9 @@
prop="inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime" prop="inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime"
> >
<el-date-picker <el-date-picker
v-model="item.inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime" v-model="
item.inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime
"
type="datetime" type="datetime"
placeholder="请选择结束时间" placeholder="请选择结束时间"
style="width: 100%" style="width: 100%"
@ -386,12 +414,22 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
</div>
</el-form>
</el-collapse-item>
<el-collapse-item name="3">
<template #title>
<div class="small-title">检验结果</div>
</template>
<el-form :model="item" label-width="auto" :rules="rules" ref="formFeaturesRef">
<div>
<el-row :gutter="20">
<el-col <el-col
:span="24" :span="24"
v-for="(cur, i) in item.inspectionJobCharacteristicsUpdateReqVO v-for="(cur, i) in item.inspectionJobCharacteristicsUpdateReqVO
.recordInspectionQuantifyList" .recordInspectionQuantifyList"
:key="i" :key="i"
> >
<div <div
style=" style="
@ -399,12 +437,16 @@
border-radius: 4px; border-radius: 4px;
padding-top: 16px; padding-top: 16px;
margin-bottom: 10px; margin-bottom: 10px;
"> "
>
<el-row :gutter="20"> <el-row :gutter="20">
<!-- 汇总录入的时候显示 --> <!-- 汇总录入的时候显示 -->
<el-col <el-col
:span="12" :span="12"
v-if="item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1" v-if="
item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod ==
1
"
> >
<el-form-item label="合格数量" required> <el-form-item label="合格数量" required>
<el-input <el-input
@ -416,7 +458,10 @@
</el-col> </el-col>
<el-col <el-col
:span="12" :span="12"
v-if="item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1" v-if="
item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod ==
1
"
> >
<el-form-item label="不合格数量" required> <el-form-item label="不合格数量" required>
<el-input <el-input
@ -428,7 +473,9 @@
</el-col> </el-col>
<el-col <el-col
:span="12" :span="12"
v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == '0'" v-if="
item.inspectionJobCharacteristicsUpdateReqVO.featureType == '0'
"
> >
<el-form-item label="检验值" required> <el-form-item label="检验值" required>
<el-input <el-input
@ -441,7 +488,9 @@
</el-col> </el-col>
<el-col <el-col
:span="12" :span="12"
v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == '1'" v-if="
item.inspectionJobCharacteristicsUpdateReqVO.featureType == '1'
"
> >
<el-form-item label="选定集" required> <el-form-item label="选定集" required>
<el-select <el-select
@ -458,14 +507,13 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col <el-col :span="12">
:span="12"
>
<el-form-item label="备注"> <el-form-item label="备注">
<el-input <el-input
v-model="cur.remark" v-model="cur.remark"
placeholder="请输入备注" placeholder="请输入备注"
type="text" maxlength="200" type="text"
maxlength="200"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -482,10 +530,11 @@
</el-row> </el-row>
</div> </div>
</el-form> </el-form>
</el-collapse-item>
</el-collapse>
</div> </div>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</div> </div>
<template #footer> <template #footer>
<ButtonBase :Butttondata="Butttondata" @button-base-click="buttonBaseClick" /> <ButtonBase :Butttondata="Butttondata" @button-base-click="buttonBaseClick" />
@ -681,7 +730,7 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
data.value = JSON.parse(JSON.stringify(row)) data.value = JSON.parse(JSON.stringify(row))
// await InspectionJobMainApi.acceptInspectionJobMain(row.id) // await InspectionJobMainApi.acceptInspectionJobMain(row.id)
let list = [] let list = []
const masterId = row.jobId ||row.id const masterId = row.jobId || row.id
list = await InspectionJobDetailPageApi.getInspectionJobDetailList(masterId) list = await InspectionJobDetailPageApi.getInspectionJobDetailList(masterId)
data.value.packageList = await InspectionJobPackageApi.getInspectionJobPackageList(masterId) data.value.packageList = await InspectionJobPackageApi.getInspectionJobPackageList(masterId)
list.forEach((item, index) => { list.forEach((item, index) => {
@ -1361,15 +1410,22 @@ const boxList = ref()
// }) // })
// } // }
const inspectionValueInput = (item, cur) => { const inspectionValueInput = (item, cur) => {
for ( let i = 0;i < item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.length;i++) { for (
let i = 0;
i < item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.length;
i++
) {
item.isPass = true item.isPass = true
// 如果上限值存在,下限值和目标值不存在 大于上限值显示红色图标 // 如果上限值存在,下限值和目标值不存在 大于上限值显示红色图标
if ( if (
item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping && item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
!item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit && !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
!item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget && !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue&& item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping) .inspectionValue &&
parseFloat(
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue
) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping)
) { ) {
item.isPass = false item.isPass = false
return return
@ -1379,8 +1435,11 @@ const inspectionValueInput = (item, cur) => {
!item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping && !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit && item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
!item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget && !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue&& item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit) .inspectionValue &&
parseFloat(
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue
) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit)
) { ) {
item.isPass = false item.isPass = false
return return
@ -1390,8 +1449,11 @@ const inspectionValueInput = (item, cur) => {
!item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping && !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
!item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit && !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget && item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue&& item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) != parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget) .inspectionValue &&
parseFloat(
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue
) != parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget)
) { ) {
item.isPass = false item.isPass = false
return return
@ -1401,9 +1463,15 @@ const inspectionValueInput = (item, cur) => {
item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping && item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit && item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
!item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget && !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue&& item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
( parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping) || .inspectionValue &&
parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit)) (parseFloat(
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue
) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping) ||
parseFloat(
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
.inspectionValue
) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit))
) { ) {
item.isPass = false item.isPass = false
return return
@ -1413,9 +1481,12 @@ const inspectionValueInput = (item, cur) => {
item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping && item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
!item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit && !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget && item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue&& item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
(parseFloat(cur.inspectionValue) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping)|| .inspectionValue &&
parseFloat(cur.inspectionValue) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget)) (parseFloat(cur.inspectionValue) >
parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping) ||
parseFloat(cur.inspectionValue) <
parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget))
) { ) {
item.isPass = false item.isPass = false
return return
@ -1425,8 +1496,10 @@ const inspectionValueInput = (item, cur) => {
item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping && item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
!item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit && !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget && item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
(parseFloat(cur.inspectionValue) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget)|| (parseFloat(cur.inspectionValue) >
parseFloat(cur.inspectionValue) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit)) parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget) ||
parseFloat(cur.inspectionValue) <
parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit))
) { ) {
item.isPass = false item.isPass = false
return return
@ -1436,9 +1509,15 @@ const inspectionValueInput = (item, cur) => {
item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping && item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit && item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget && item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue&& item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
(parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping) || .inspectionValue &&
parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit)) (parseFloat(
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue
) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping) ||
parseFloat(
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
.inspectionValue
) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit))
) { ) {
item.isPass = false item.isPass = false
return return
@ -1453,8 +1532,8 @@ const inspectionValueInput = (item, cur) => {
color: #1a8bfc; color: #1a8bfc;
font-size: 16px; font-size: 16px;
} }
.tabs-box{ .tabs-box {
max-height:calc(80vh - 40px) ; max-height: calc(80vh - 40px);
overflow-x: hidden; overflow-x: hidden;
overflow-y: auto; overflow-y: auto;
} }

176
src/views/qms/inspectionRecord/addForm.vue
View File

@ -71,7 +71,11 @@
</span> </span>
</template> </template>
<div class="tabs-box"> <div class="tabs-box">
<el-collapse accordion>
<el-collapse-item name="1">
<template #title>
<div class="small-title">检验工序</div> <div class="small-title">检验工序</div>
</template>
<el-form :model="item" label-width="auto" :rules="rules" ref="formProcessRef"> <el-form :model="item" label-width="auto" :rules="rules" ref="formProcessRef">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
@ -104,7 +108,11 @@
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
</el-collapse-item>
<el-collapse-item name="2">
<template #title>
<div class="small-title">检验特性</div> <div class="small-title">检验特性</div>
</template>
<el-form :model="item" label-width="auto" :rules="rules" ref="formFeaturesRef"> <el-form :model="item" label-width="auto" :rules="rules" ref="formFeaturesRef">
<div> <div>
<el-row :gutter="20"> <el-row :gutter="20">
@ -135,7 +143,9 @@
> >
<div style="display: flex; width: 100%"> <div style="display: flex; width: 100%">
<el-input <el-input
v-model="item.inspectionJobCharacteristicsUpdateReqVO.inspectionMethodName" v-model="
item.inspectionJobCharacteristicsUpdateReqVO.inspectionMethodName
"
disabled disabled
placeholder="请选择检验方法" placeholder="请选择检验方法"
/> />
@ -149,7 +159,9 @@
> >
<div style="display: flex; width: 100%"> <div style="display: flex; width: 100%">
<el-input <el-input
v-model="item.inspectionJobCharacteristicsUpdateReqVO.samplingProcessName" v-model="
item.inspectionJobCharacteristicsUpdateReqVO.samplingProcessName
"
disabled disabled
placeholder="请选择采样过程编码" placeholder="请选择采样过程编码"
/> />
@ -178,7 +190,9 @@
> >
<div style="display: flex; width: 100%"> <div style="display: flex; width: 100%">
<el-input <el-input
v-model="item.inspectionJobCharacteristicsUpdateReqVO.samplePieceSize" v-model="
item.inspectionJobCharacteristicsUpdateReqVO.samplePieceSize
"
disabled disabled
placeholder="请输入样品份数" placeholder="请输入样品份数"
/> />
@ -202,7 +216,9 @@
prop="inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod" prop="inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod"
> >
<el-select <el-select
v-model="item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod" v-model="
item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod
"
placeholder="请选择结果录入方式" placeholder="请选择结果录入方式"
@change="resultEntryMethodChange($event, item)" @change="resultEntryMethodChange($event, item)"
disabled disabled
@ -250,7 +266,9 @@
prop="inspectionCharacteristicsBaseVO.quantifyIsCapping" prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
> >
<el-switch <el-switch
v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping" v-model="
item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping
"
:disabled="true" :disabled="true"
/> />
</el-form-item> </el-form-item>
@ -282,7 +300,9 @@
prop="inspectionCharacteristicsBaseVO.quantifyIsCapping" prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
> >
<el-switch <el-switch
v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit" v-model="
item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit
"
:disabled="true" :disabled="true"
/> />
</el-form-item> </el-form-item>
@ -299,7 +319,9 @@
prop="inspectionCharacteristicsBaseVO.quantifyCapping" prop="inspectionCharacteristicsBaseVO.quantifyCapping"
> >
<el-input <el-input
v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit" v-model="
item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit
"
:disabled="true" :disabled="true"
/> />
</el-form-item> </el-form-item>
@ -314,7 +336,9 @@
prop="inspectionCharacteristicsBaseVO.quantifyIsCapping" prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
> >
<el-switch <el-switch
v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget" v-model="
item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget
"
:disabled="true" :disabled="true"
/> />
</el-form-item> </el-form-item>
@ -343,7 +367,9 @@
prop="inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime" prop="inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime"
> >
<el-date-picker <el-date-picker
v-model="item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime" v-model="
item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime
"
type="datetime" type="datetime"
placeholder="请选择开始时间" placeholder="请选择开始时间"
style="width: 100%" style="width: 100%"
@ -357,7 +383,9 @@
prop="inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime" prop="inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime"
> >
<el-date-picker <el-date-picker
v-model="item.inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime" v-model="
item.inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime
"
type="datetime" type="datetime"
placeholder="请选择结束时间" placeholder="请选择结束时间"
style="width: 100%" style="width: 100%"
@ -386,12 +414,22 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
</div>
</el-form>
</el-collapse-item>
<el-collapse-item name="3">
<template #title>
<div class="small-title">检验结果</div>
</template>
<el-form :model="item" label-width="auto" :rules="rules" ref="formFeaturesRef">
<div>
<el-row :gutter="20">
<el-col <el-col
:span="24" :span="24"
v-for="(cur, i) in item.inspectionJobCharacteristicsUpdateReqVO v-for="(cur, i) in item.inspectionJobCharacteristicsUpdateReqVO
.recordInspectionQuantifyList" .recordInspectionQuantifyList"
:key="i" :key="i"
> >
<div <div
style=" style="
@ -399,12 +437,16 @@
border-radius: 4px; border-radius: 4px;
padding-top: 16px; padding-top: 16px;
margin-bottom: 10px; margin-bottom: 10px;
"> "
>
<el-row :gutter="20"> <el-row :gutter="20">
<!-- 汇总录入的时候显示 --> <!-- 汇总录入的时候显示 -->
<el-col <el-col
:span="12" :span="12"
v-if="item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1" v-if="
item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod ==
1
"
> >
<el-form-item label="合格数量" required> <el-form-item label="合格数量" required>
<el-input <el-input
@ -416,7 +458,10 @@
</el-col> </el-col>
<el-col <el-col
:span="12" :span="12"
v-if="item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1" v-if="
item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod ==
1
"
> >
<el-form-item label="不合格数量" required> <el-form-item label="不合格数量" required>
<el-input <el-input
@ -428,7 +473,9 @@
</el-col> </el-col>
<el-col <el-col
:span="12" :span="12"
v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == '0'" v-if="
item.inspectionJobCharacteristicsUpdateReqVO.featureType == '0'
"
> >
<el-form-item label="检验值" required> <el-form-item label="检验值" required>
<el-input <el-input
@ -441,7 +488,9 @@
</el-col> </el-col>
<el-col <el-col
:span="12" :span="12"
v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == '1'" v-if="
item.inspectionJobCharacteristicsUpdateReqVO.featureType == '1'
"
> >
<el-form-item label="选定集" required> <el-form-item label="选定集" required>
<el-select <el-select
@ -458,14 +507,13 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col <el-col :span="12">
:span="12"
>
<el-form-item label="备注"> <el-form-item label="备注">
<el-input <el-input
v-model="cur.remark" v-model="cur.remark"
placeholder="请输入备注" placeholder="请输入备注"
type="text" maxlength="200" type="text"
maxlength="200"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -482,10 +530,11 @@
</el-row> </el-row>
</div> </div>
</el-form> </el-form>
</el-collapse-item>
</el-collapse>
</div> </div>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</div> </div>
<template #footer> <template #footer>
<ButtonBase :Butttondata="Butttondata" @button-base-click="buttonBaseClick" /> <ButtonBase :Butttondata="Butttondata" @button-base-click="buttonBaseClick" />
@ -524,7 +573,7 @@ import * as InspectionJobMainApi from '@/api/qms/inspectionJob/inspectionJobMain
import * as InspectionJobPackageApi from '@/api/qms/inspectionJob/InspectionJobPackage/InspectionJobPackage' import * as InspectionJobPackageApi from '@/api/qms/inspectionJob/InspectionJobPackage/InspectionJobPackage'
import * as InspectionRecordDetailPageApi from '@/api/qms/inspectionRecord/inspectionRecordDetail' import * as InspectionRecordDetailPageApi from '@/api/qms/inspectionRecord/inspectionRecordDetail'
import * as InspectionRecordPackageApi from '@/api/qms/inspectionRecord/InspectionRecordPackage/InspectionRecordPackage' import * as InspectionRecordPackageApi from '@/api/qms/inspectionRecord/InspectionRecordPackage/InspectionRecordPackage'
const { proxy } = getCurrentInstance() const { proxy } = getCurrentInstance()
const message = useMessage() // 消息弹窗 const message = useMessage() // 消息弹窗
@ -683,9 +732,11 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
data.value = JSON.parse(JSON.stringify(row)) data.value = JSON.parse(JSON.stringify(row))
// await InspectionJobMainApi.acceptInspectionJobMain(row.id) // await InspectionJobMainApi.acceptInspectionJobMain(row.id)
let list = [] let list = []
const masterId =row.id const masterId = row.id
list = await InspectionRecordDetailPageApi.getInspectionRecordDetailList(row.id) list = await InspectionRecordDetailPageApi.getInspectionRecordDetailList(row.id)
data.value.packageList = await InspectionRecordPackageApi.getInspectionRecordPackageList(masterId) data.value.packageList = await InspectionRecordPackageApi.getInspectionRecordPackageList(
masterId
)
list.forEach((item, index) => { list.forEach((item, index) => {
editableTabsValue.value = 1 editableTabsValue.value = 1
item.name = index + 1 item.name = index + 1
@ -699,7 +750,10 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
).toFixed(6) ).toFixed(6)
) )
// rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true // rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true
item.inspectionRecordCharacteristicsRespVO.recordInspectionQuantifyList = item.inspectionRecordCharacteristicsRespVO.featureType == 1 ? item.inspectionRecordCharacteristicsRespVO.qualitativeRespVOList : item.inspectionRecordCharacteristicsRespVO.quantifyRespVOList item.inspectionRecordCharacteristicsRespVO.recordInspectionQuantifyList =
item.inspectionRecordCharacteristicsRespVO.featureType == 1
? item.inspectionRecordCharacteristicsRespVO.qualitativeRespVOList
: item.inspectionRecordCharacteristicsRespVO.quantifyRespVOList
if (!item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList) { if (!item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList) {
// 单个录入时 // 单个录入时
if (item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 2) { if (item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 2) {
@ -1364,15 +1418,22 @@ const boxList = ref()
// }) // })
// } // }
const inspectionValueInput = (item, cur) => { const inspectionValueInput = (item, cur) => {
for ( let i = 0;i < item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.length;i++) { for (
let i = 0;
i < item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.length;
i++
) {
item.isPass = true item.isPass = true
// 如果上限值存在,下限值和目标值不存在 大于上限值显示红色图标 // 如果上限值存在,下限值和目标值不存在 大于上限值显示红色图标
if ( if (
item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping && item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
!item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit && !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
!item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget && !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue&& item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping) .inspectionValue &&
parseFloat(
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue
) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping)
) { ) {
item.isPass = false item.isPass = false
return return
@ -1382,8 +1443,11 @@ const inspectionValueInput = (item, cur) => {
!item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping && !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit && item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
!item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget && !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue&& item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit) .inspectionValue &&
parseFloat(
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue
) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit)
) { ) {
item.isPass = false item.isPass = false
return return
@ -1393,8 +1457,11 @@ const inspectionValueInput = (item, cur) => {
!item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping && !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
!item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit && !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget && item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue&& item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) != parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget) .inspectionValue &&
parseFloat(
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue
) != parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget)
) { ) {
item.isPass = false item.isPass = false
return return
@ -1404,9 +1471,15 @@ const inspectionValueInput = (item, cur) => {
item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping && item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit && item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
!item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget && !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue&& item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
( parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping) || .inspectionValue &&
parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit)) (parseFloat(
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue
) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping) ||
parseFloat(
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
.inspectionValue
) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit))
) { ) {
item.isPass = false item.isPass = false
return return
@ -1416,9 +1489,12 @@ const inspectionValueInput = (item, cur) => {
item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping && item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
!item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit && !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget && item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue&& item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
(parseFloat(cur.inspectionValue) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping)|| .inspectionValue &&
parseFloat(cur.inspectionValue) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget)) (parseFloat(cur.inspectionValue) >
parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping) ||
parseFloat(cur.inspectionValue) <
parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget))
) { ) {
item.isPass = false item.isPass = false
return return
@ -1428,8 +1504,10 @@ const inspectionValueInput = (item, cur) => {
item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping && item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
!item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit && !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget && item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
(parseFloat(cur.inspectionValue) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget)|| (parseFloat(cur.inspectionValue) >
parseFloat(cur.inspectionValue) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit)) parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget) ||
parseFloat(cur.inspectionValue) <
parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit))
) { ) {
item.isPass = false item.isPass = false
return return
@ -1439,9 +1517,15 @@ const inspectionValueInput = (item, cur) => {
item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping && item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit && item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget && item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue&& item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
(parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping) || .inspectionValue &&
parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit)) (parseFloat(
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue
) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping) ||
parseFloat(
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
.inspectionValue
) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit))
) { ) {
item.isPass = false item.isPass = false
return return
@ -1456,8 +1540,8 @@ const inspectionValueInput = (item, cur) => {
color: #1a8bfc; color: #1a8bfc;
font-size: 16px; font-size: 16px;
} }
.tabs-box{ .tabs-box {
max-height:calc(80vh - 40px) ; max-height: calc(80vh - 40px);
overflow-x: hidden; overflow-x: hidden;
overflow-y: auto; overflow-y: auto;
} }

69
src/views/qms/inspectionRecordFirst/addForm.vue
View File

@ -139,7 +139,11 @@
</span> </span>
</template> </template>
<div class="tabs-box"> <div class="tabs-box">
<el-collapse accordion>
<el-collapse-item name="1">
<template #title>
<div class="small-title">检验工序</div> <div class="small-title">检验工序</div>
</template>
<el-form :model="item" label-width="auto" :rules="rules" ref="formProcessRef"> <el-form :model="item" label-width="auto" :rules="rules" ref="formProcessRef">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
@ -172,7 +176,11 @@
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
</el-collapse-item>
<el-collapse-item name="2">
<template #title>
<div class="small-title">检验特性</div> <div class="small-title">检验特性</div>
</template>
<el-form :model="item" label-width="auto" :rules="rules" ref="formFeaturesRef"> <el-form :model="item" label-width="auto" :rules="rules" ref="formFeaturesRef">
<div> <div>
<el-row :gutter="20"> <el-row :gutter="20">
@ -271,7 +279,9 @@
prop="inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod" prop="inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod"
> >
<el-select <el-select
v-model="item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod" v-model="
item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod
"
placeholder="请选择结果录入方式" placeholder="请选择结果录入方式"
@change="resultEntryMethodChange($event, item)" @change="resultEntryMethodChange($event, item)"
disabled disabled
@ -319,7 +329,9 @@
prop="inspectionCharacteristicsBaseVO.quantifyIsCapping" prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
> >
<el-switch <el-switch
v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping" v-model="
item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping
"
:disabled="true" :disabled="true"
/> />
</el-form-item> </el-form-item>
@ -351,7 +363,9 @@
prop="inspectionCharacteristicsBaseVO.quantifyIsCapping" prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
> >
<el-switch <el-switch
v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit" v-model="
item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit
"
:disabled="true" :disabled="true"
/> />
</el-form-item> </el-form-item>
@ -368,7 +382,9 @@
prop="inspectionCharacteristicsBaseVO.quantifyCapping" prop="inspectionCharacteristicsBaseVO.quantifyCapping"
> >
<el-input <el-input
v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit" v-model="
item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit
"
:disabled="true" :disabled="true"
/> />
</el-form-item> </el-form-item>
@ -383,7 +399,9 @@
prop="inspectionCharacteristicsBaseVO.quantifyIsCapping" prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
> >
<el-switch <el-switch
v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget" v-model="
item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget
"
:disabled="true" :disabled="true"
/> />
</el-form-item> </el-form-item>
@ -412,7 +430,9 @@
prop="inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime" prop="inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime"
> >
<el-date-picker <el-date-picker
v-model="item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime" v-model="
item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime
"
type="datetime" type="datetime"
placeholder="请选择开始时间" placeholder="请选择开始时间"
style="width: 100%" style="width: 100%"
@ -426,7 +446,9 @@
prop="inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime" prop="inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime"
> >
<el-date-picker <el-date-picker
v-model="item.inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime" v-model="
item.inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime
"
type="datetime" type="datetime"
placeholder="请选择结束时间" placeholder="请选择结束时间"
style="width: 100%" style="width: 100%"
@ -455,6 +477,15 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
</div>
</el-form>
</el-collapse-item>
<el-collapse-item name="3">
<template #title>
<div class="small-title">检验结果</div>
</template>
<el-form :model="item" label-width="auto" :rules="rules" ref="formFeaturesRef">
<el-col <el-col
:span="24" :span="24"
v-for="(cur, i) in item.inspectionJobCharacteristicsUpdateReqVO v-for="(cur, i) in item.inspectionJobCharacteristicsUpdateReqVO
@ -551,9 +582,9 @@
</el-row> </el-row>
</div> </div>
</el-col> </el-col>
</el-row>
</div>
</el-form> </el-form>
</el-collapse-item>
</el-collapse>
</div> </div>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
@ -1081,12 +1112,12 @@ const opensearchItemsTable = () => {
column: 'type', column: 'type',
action: 'in', action: 'in',
value: 'BCP,CCP' value: 'BCP,CCP'
},
{
column: 'status',
action: 'in',
value: 'ENABLE'
} }
// {
// column: 'status',
// action: 'in',
// value: 'ENABLE'
// }
) )
// 参数整理 // 参数整理
_searchCondition.isSearch = true _searchCondition.isSearch = true
@ -1178,7 +1209,7 @@ const searchTableSuccess = async (formField, searchField, val, type, row) => {
data.value.inspectionSchemeCode = InspectionSchemeObj?.code || '' data.value.inspectionSchemeCode = InspectionSchemeObj?.code || ''
if (!data.value.inspectionSchemeCode) { if (!data.value.inspectionSchemeCode) {
data.value.subList = [] data.value.subList = []
return; return
} }
let list = await InspectionJobDetailApi.getBySchemeCode(data.value.inspectionSchemeCode) let list = await InspectionJobDetailApi.getBySchemeCode(data.value.inspectionSchemeCode)
editableTabsValue.value = 1 editableTabsValue.value = 1
@ -1552,14 +1583,14 @@ const onItemBlur = async (field, pageApi) => {
// data.value['itemName'] = obj.name // data.value['itemName'] = obj.name
// data.value['desc1'] = obj.desc1 // data.value['desc1'] = obj.desc1
// const searchTableSuccess = async(formField, searchField, val, type, row) // const searchTableSuccess = async(formField, searchField, val, type, row)
searchTableSuccess(field,'code',array.list,'main') searchTableSuccess(field, 'code', array.list, 'main')
} else { } else {
message.alert('暂无数据') message.alert('暂无数据')
data.value[field] = '' data.value[field] = ''
data.value['itemName'] = '' data.value['itemName'] = ''
data.value['desc1'] = '' data.value['desc1'] = ''
data.value['inspectionSchemeCode'] = '' data.value['inspectionSchemeCode'] = ''
data.value.subList =[] data.value.subList = []
} }
} else { } else {
data.value[field] = '' data.value[field] = ''
@ -1611,12 +1642,12 @@ const onInspectionSchemeBlur = async (field, pageApi) => {
count.value++ count.value++
const obj = array.list[0] const obj = array.list[0]
if (obj) { if (obj) {
searchTableSuccess(field,'code',array.list,'main') searchTableSuccess(field, 'code', array.list, 'main')
} else { } else {
message.alert('暂无数据') message.alert('暂无数据')
data.value[field] = '' data.value[field] = ''
data.value['inspectionSchemeName'] = '' data.value['inspectionSchemeName'] = ''
data.value.subList =[] data.value.subList = []
} }
} else { } else {
data.value['inspectionSchemeName'] = '' data.value['inspectionSchemeName'] = ''

Write Preview
Loading…
Cancel
Save