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

Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

hella_online_20240829
chenfang 2 months ago
parent
d375188935 bf6459f754
commit
7e0fca7bb9
3 changed files with 798 additions and 697 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. 282
      src/views/qms/inspectionRecordFirst/addForm.vue
  2. 38
      src/views/wms/issueManage/productionscrap/productionscrapRecordMain/index.vue
  3. 23
      src/views/wms/issueManage/productionscrap/productionscrapRecordMain/productionscrapRecordMain.data.ts

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

@ -34,9 +34,12 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="物料编码" prop="itemCode"> <el-form-item label="物料编码" prop="itemCode">
<div style="display: flex; width: 100%"> <div style="display: flex; width: 100%">
<el-input v-model="data.itemCode" placeholder="请选择物料编码" <el-input
@blur="onBlur('item', ItemBasicApi.getItembasicPage)" v-model="data.itemCode"
@focus="onFocus"/> placeholder="请选择物料编码"
@blur="onItemBlur('itemCode', ItemBasicApi.getItembasicPage)"
@focus="onFocus"
/>
<el-button type="info" plain style="width: 40px" @click="opensearchItemsTable()" <el-button type="info" plain style="width: 40px" @click="opensearchItemsTable()"
><Icon icon="ep:search" /> ><Icon icon="ep:search" />
</el-button> </el-button>
@ -45,7 +48,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="物料名称" prop="itemName"> <el-form-item label="物料名称" prop="itemName">
<el-input v-model="data.itemName" placeholder="请填写描述" disabled /> <el-input v-model="data.itemName" placeholder="请填写名称" disabled />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@ -59,8 +62,14 @@
<el-input <el-input
v-model="data.inspectionSchemeCode" v-model="data.inspectionSchemeCode"
placeholder="请选择检验方案" placeholder="请选择检验方案"
@blur="onBlur('inspectionScheme', InspectionSchemeApi.InspectionSchemePage)" @blur="
@focus="onFocus"/> onInspectionSchemeBlur(
'inspectionSchemeCode',
InspectionSchemeApi.InspectionSchemePage
)
"
@focus="onFocus"
/>
<el-button <el-button
type="info" type="info"
plain plain
@ -90,7 +99,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="检验人" prop="creatorName"> <el-form-item label="检验人" prop="creatorName">
<el-input v-model="data.creatorName" placeholder="请填写检验人" disabled/> <el-input v-model="data.creatorName" placeholder="请填写检验人" disabled />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -194,7 +203,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="请选择检验方法"
/> />
@ -208,7 +219,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="请选择采样过程编码"
/> />
@ -216,10 +229,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item <el-form-item label="样品份数" prop="samplingProcessRespVO.sampleQty">
label="样品份数"
prop="samplingProcessRespVO.sampleQty"
>
<div style="display: flex; width: 100%"> <div style="display: flex; width: 100%">
<el-input <el-input
v-model="item.samplingProcessRespVO.sampleQty" v-model="item.samplingProcessRespVO.sampleQty"
@ -450,7 +460,6 @@
v-for="(cur, i) in item.inspectionJobCharacteristicsUpdateReqVO v-for="(cur, i) in item.inspectionJobCharacteristicsUpdateReqVO
.recordInspectionQuantifyList" .recordInspectionQuantifyList"
:key="i" :key="i"
> >
<div <div
style=" style="
@ -458,12 +467,15 @@
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
@ -475,7 +487,9 @@
</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
@ -517,14 +531,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>
@ -544,10 +557,9 @@
</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" :key="count"/> <ButtonBase :Butttondata="Butttondata" @button-base-click="buttonBaseClick" :key="count" />
</template> </template>
</Dialog> </Dialog>
<Dialog <Dialog
@ -581,18 +593,16 @@ import * as InspectionJobDetailApi from '@/api/qms/inspectionJob/inspectionJobDe
import { SearchTable } from '@/components/SearchTable' import { SearchTable } from '@/components/SearchTable'
import * as InspectionRecordDetail from '@/api/qms/inspectionRecord/inspectionRecordDetail' import * as InspectionRecordDetail from '@/api/qms/inspectionRecord/inspectionRecordDetail'
import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data' import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
import * as ItemBasicApi from '@/api/wms/itembasic' import * as ItemBasicApi from '@/api/wms/itembasic'
import { InspectionSchemeMain } from '@/views/qms/inspectionScheme/inspectionScheme.data' import { InspectionSchemeMain } from '@/views/qms/inspectionScheme/inspectionScheme.data'
import * as InspectionSchemeApi from '@/api/qms/InspectionScheme' import * as InspectionSchemeApi from '@/api/qms/InspectionScheme'
import { formatDate } from '@/utils/formatTime' import { formatDate } from '@/utils/formatTime'
import { useUserStore } from '@/store/modules/user' import { useUserStore } from '@/store/modules/user'
const userStore = useUserStore() const userStore = useUserStore()
console.log(3355,userStore.getUser.id) console.log(3355, userStore.getUser.id)
const { proxy } = getCurrentInstance() const { proxy } = getCurrentInstance()
@ -639,7 +649,7 @@ const props = defineProps({
type: Object, type: Object,
required: true, required: true,
default: null default: null
}, }
}) })
const { t } = useI18n() // 国际化 const { t } = useI18n() // 国际化
@ -661,7 +671,7 @@ const data = ref({
desc1: '', desc1: '',
inspectionSchemeCode: '', inspectionSchemeCode: '',
inspectionBatch: '', inspectionBatch: '',
inspectionTime:formatDate(new Date()), inspectionTime: formatDate(new Date()),
creator: userStore.getUser.id, creator: userStore.getUser.id,
creatorName: userStore.getUser.nickname, creatorName: userStore.getUser.nickname,
subList: [] subList: []
@ -678,9 +688,7 @@ if (props.basicFormWidth) {
dialogWidth.value = props.isBusiness ? '60%' : '40%' dialogWidth.value = props.isBusiness ? '60%' : '40%'
} }
const rules = ref({ const rules = ref({
'inspectionTime': [ inspectionTime: [{ required: true, message: '请选择检验时间', trigger: 'blur' }],
{ required: true, message: '请选择检验时间', trigger: 'blur' }
],
'inspectionJobCharacteristicsUpdateReqVO.description': [ 'inspectionJobCharacteristicsUpdateReqVO.description': [
{ required: true, message: '请填写描述', trigger: ['blur', 'change'] } { required: true, message: '请填写描述', trigger: ['blur', 'change'] }
], ],
@ -739,7 +747,7 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
if (row) { if (row) {
data.value = JSON.parse(JSON.stringify(row)) data.value = JSON.parse(JSON.stringify(row))
let list = await InspectionRecordDetail.getInspectionRecordDetailList(data.value.id) let list = await InspectionRecordDetail.getInspectionRecordDetailList(data.value.id)
await processList( data.value,list) await processList(data.value, list)
} else { } else {
data.value = { data.value = {
code: '', code: '',
@ -749,7 +757,7 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
desc1: '', desc1: '',
inspectionSchemeCode: '', inspectionSchemeCode: '',
inspectionBatch: '', inspectionBatch: '',
inspectionTime:formatDate(new Date()), inspectionTime: formatDate(new Date()),
creator: userStore.getUser.id, creator: userStore.getUser.id,
creatorName: userStore.getUser.nickname, creatorName: userStore.getUser.nickname,
subList: [] subList: []
@ -760,7 +768,7 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
} }
// 渲染工序列表 // 渲染工序列表
const processList =async (InspectionSchemeObj,list) => { const processList = async (InspectionSchemeObj, list) => {
editableTabsValue.value = 1 editableTabsValue.value = 1
list.forEach((item, index) => { list.forEach((item, index) => {
item.name = index + 1 item.name = index + 1
@ -774,18 +782,17 @@ const processList =async (InspectionSchemeObj,list) => {
).toFixed(6) ).toFixed(6)
) )
rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = item.inspectionJobCharacteristicsUpdateReqVO.featureType == 1 ? item.inspectionJobCharacteristicsUpdateReqVO.qualitativeRespVOList : item.inspectionJobCharacteristicsUpdateReqVO.quantifyRespVOList item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList =
item.inspectionJobCharacteristicsUpdateReqVO.featureType == 1
? item.inspectionJobCharacteristicsUpdateReqVO.qualitativeRespVOList
: item.inspectionJobCharacteristicsUpdateReqVO.quantifyRespVOList
if (!item?.inspectionJobCharacteristicsUpdateReqVO?.recordInspectionQuantifyList) { if (!item?.inspectionJobCharacteristicsUpdateReqVO?.recordInspectionQuantifyList) {
// 单个录入时 // 单个录入时
if (item?.inspectionJobCharacteristicsUpdateReqVO?.resultEntryMethod == 2) { if (item?.inspectionJobCharacteristicsUpdateReqVO?.resultEntryMethod == 2) {
// rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true // rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = [] item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = []
for ( for (let i = 0; i < parseInt(item.samplingProcessRespVO.sampleQty); i++) {
let i = 0;
i < parseInt(item.samplingProcessRespVO.sampleQty);
i++
) {
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.push({ item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.push({
inspectionValue: '', //检验值 inspectionValue: '', //检验值
qualitativeCode: '', //定性字典项值 qualitativeCode: '', //定性字典项值
@ -796,7 +803,7 @@ const processList =async (InspectionSchemeObj,list) => {
} }
} else { } else {
// 汇总录入时 // 汇总录入时
console.log(2333,item.inspectionJobCharacteristicsUpdateReqVO) console.log(2333, item.inspectionJobCharacteristicsUpdateReqVO)
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = [] item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = []
rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = false rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = false
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.push({ item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.push({
@ -941,7 +948,7 @@ const validateForm = (formRef) => {
} }
const submitForm = async () => { const submitForm = async () => {
try { try {
await formMainRef.value.validate() await formMainRef.value.validate()
const bol2 = await validateForm(formFeaturesRef.value) const bol2 = await validateForm(formFeaturesRef.value)
if (!bol2) { if (!bol2) {
message.error(`模板中有检验工序和检验特性未填写完全`) message.error(`模板中有检验工序和检验特性未填写完全`)
@ -1092,9 +1099,9 @@ const opensearchItemsTable = () => {
) )
} }
const opensearchInspectionTable = () => { const opensearchInspectionTable = () => {
if(!data.value.itemCode){ if (!data.value.itemCode) {
message.error(`请选择物料`) message.error(`请选择物料`)
return; return
} }
const _searchCondition = {} const _searchCondition = {}
const filters: any[] = [] const filters: any[] = []
@ -1183,11 +1190,7 @@ const searchTableSuccess = async (formField, searchField, val, type, row) => {
if (item?.inspectionJobCharacteristicsUpdateReqVO?.resultEntryMethod == 2) { if (item?.inspectionJobCharacteristicsUpdateReqVO?.resultEntryMethod == 2) {
// rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true // rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = [] item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = []
for ( for (let i = 0; i < parseInt(item.samplingProcessRespVO.sampleQty); i++) {
let i = 0;
i < parseInt(item.samplingProcessRespVO.sampleQty);
i++
) {
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.push({ item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.push({
inspectionValue: '', //检验值 inspectionValue: '', //检验值
qualitativeCode: '', //定性字典项值 qualitativeCode: '', //定性字典项值
@ -1198,9 +1201,10 @@ const searchTableSuccess = async (formField, searchField, val, type, row) => {
} }
} else { } else {
// 汇总录入时 // 汇总录入时
console.log(2333,item.inspectionJobCharacteristicsUpdateReqVO) console.log(2333, item.inspectionJobCharacteristicsUpdateReqVO)
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = [] item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = []
rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = false rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required =
false
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.push({ item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.push({
inspectionValue: '', //检验值 inspectionValue: '', //检验值
qualitativeCode: '', //定性字典项值 qualitativeCode: '', //定性字典项值
@ -1225,7 +1229,8 @@ const searchTableSuccess = async (formField, searchField, val, type, row) => {
if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit) { if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit) {
rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit'][0].required = true rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit'][0].required = true
} else { } else {
rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit'][0].required = false rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit'][0].required =
false
} }
if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget) { if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget) {
rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyTarget'][0].required = true rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyTarget'][0].required = true
@ -1242,7 +1247,7 @@ const searchTableSuccess = async (formField, searchField, val, type, row) => {
data.value.subList = list data.value.subList = list
} else if (formField == 'inspectionSchemeCode') { } else if (formField == 'inspectionSchemeCode') {
console.log(val[0]) console.log(val[0])
const InspectionSchemeObj =val[0] const InspectionSchemeObj = val[0]
data.value.samplePieceSize = InspectionSchemeObj.samplePieceSize data.value.samplePieceSize = InspectionSchemeObj.samplePieceSize
data.value.inspectionSchemeCode = InspectionSchemeObj.code data.value.inspectionSchemeCode = InspectionSchemeObj.code
let list = await InspectionJobDetailApi.getBySchemeCode(data.value.inspectionSchemeCode) let list = await InspectionJobDetailApi.getBySchemeCode(data.value.inspectionSchemeCode)
@ -1264,11 +1269,7 @@ const searchTableSuccess = async (formField, searchField, val, type, row) => {
if (item?.inspectionJobCharacteristicsUpdateReqVO?.resultEntryMethod == 2) { if (item?.inspectionJobCharacteristicsUpdateReqVO?.resultEntryMethod == 2) {
// rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true // rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = [] item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = []
for ( for (let i = 0; i < parseInt(item.samplingProcessRespVO.sampleQty); i++) {
let i = 0;
i < parseInt(item.samplingProcessRespVO.sampleQty);
i++
) {
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.push({ item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.push({
inspectionValue: '', //检验值 inspectionValue: '', //检验值
qualitativeCode: '', //定性字典项值 qualitativeCode: '', //定性字典项值
@ -1279,9 +1280,10 @@ const searchTableSuccess = async (formField, searchField, val, type, row) => {
} }
} else { } else {
// 汇总录入时 // 汇总录入时
console.log(2333,item.inspectionJobCharacteristicsUpdateReqVO) console.log(2333, item.inspectionJobCharacteristicsUpdateReqVO)
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = [] item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = []
rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = false rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required =
false
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.push({ item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.push({
inspectionValue: '', //检验值 inspectionValue: '', //检验值
qualitativeCode: '', //定性字典项值 qualitativeCode: '', //定性字典项值
@ -1306,7 +1308,8 @@ const searchTableSuccess = async (formField, searchField, val, type, row) => {
if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit) { if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit) {
rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit'][0].required = true rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit'][0].required = true
} else { } else {
rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit'][0].required = false rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit'][0].required =
false
} }
if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget) { if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget) {
rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyTarget'][0].required = true rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyTarget'][0].required = true
@ -1383,15 +1386,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
@ -1401,8 +1411,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
@ -1412,8 +1425,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
@ -1423,9 +1439,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
@ -1435,9 +1457,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
@ -1447,8 +1472,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
@ -1458,19 +1485,80 @@ 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
} }
} }
} }
const onItemBlur = async (field, pageApi) => {
if (data.value[field]) {
const _searchCondition = {}
const filters: any[] = []
filters.push(
{
action: '==',
column: 'available',
value: 'TRUE'
},
{
column: 'type',
action: 'in',
value: 'BCP,CCP'
},
{
column: 'code',
action: '==',
value: data.value[field]?.trim()
}
)
// 参数整理
_searchCondition.isSearch = true
_searchCondition.filters = filters
_searchCondition.pageNo = 1
_searchCondition.pageSize = 20
_searchCondition.by = 'ASC'
const array = await pageApi(_searchCondition)
Butttondata = [
defaultButtons.formSaveBtn(null), // 保存
defaultButtons.formCloseBtn(null) // 关闭
]
count.value++
const obj = array.list[0]
if (obj) {
// data.value['itemName'] = obj.name
// data.value['desc1'] = obj.desc1
// const searchTableSuccess = async(formField, searchField, val, type, row)
searchTableSuccess(field,'code',array.list,'main')
} else {
message.alert('暂无数据')
data.value[field] = ''
data.value['itemName'] = ''
data.value['desc1'] = ''
data.value['inspectionSchemeCode'] = ''
data.value.subList =[]
}
} else {
data.value[field] = ''
Butttondata = [
defaultButtons.formSaveBtn(null), // 保存
defaultButtons.formCloseBtn(null) // 关闭
]
count.value++
}
}
//失去焦点 //失去焦点
const onBlur = async (field, pageApi, item) => { const onInspectionSchemeBlur = async (field, pageApi) => {
const dataObj = item ? item.inspectionCharacteristicsBaseVO : data.value if (data.value[field]) {
if (dataObj[field + 'Code']) {
const _searchCondition = {} const _searchCondition = {}
const filters: any[] = [] const filters: any[] = []
filters.push( filters.push(
@ -1482,12 +1570,25 @@ const onBlur = async (field, pageApi, item) => {
{ {
column: 'code', column: 'code',
action: '==', action: '==',
value: dataObj[field + 'Code']?.trim() value: data.value[field]?.trim()
},
{
column: 'itemCode',
action: '==',
value: data.value.itemCode
},
{
column: 'inspectionType',
action: '==',
value: data.value.inspectionType
} }
) )
// 参数整理 // 参数整理
_searchCondition.isSearch = true _searchCondition.isSearch = true
_searchCondition.filters = filters _searchCondition.filters = filters
_searchCondition.pageNo = 1
_searchCondition.pageSize = 20
_searchCondition.by = 'ASC'
const array = await pageApi(_searchCondition) const array = await pageApi(_searchCondition)
Butttondata = [ Butttondata = [
defaultButtons.formSaveBtn(null), // 保存 defaultButtons.formSaveBtn(null), // 保存
@ -1496,14 +1597,15 @@ const onBlur = async (field, pageApi, item) => {
count.value++ count.value++
const obj = array.list[0] const obj = array.list[0]
if (obj) { if (obj) {
dataObj[field + 'Name'] = obj.description searchTableSuccess(field,'code',array.list,'main')
} else { } else {
message.alert('暂无数据') message.alert('暂无数据')
dataObj[field + 'Code'] = '' data.value[field] = ''
dataObj[field + 'Name'] = '' data.value['inspectionSchemeName'] = ''
data.value.subList =[]
} }
} else { } else {
dataObj[field + 'Name'] = '' data.value['inspectionSchemeName'] = ''
Butttondata = [ Butttondata = [
defaultButtons.formSaveBtn(null), // 保存 defaultButtons.formSaveBtn(null), // 保存
defaultButtons.formCloseBtn(null) // 关闭 defaultButtons.formCloseBtn(null) // 关闭
@ -1528,8 +1630,8 @@ const onFocus = () => {
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;
} }

38
src/views/wms/issueManage/productionscrap/productionscrapRecordMain/index.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<ContentWrap> <ContentWrap>
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<Search :schema="[...ProductionreturnRecordMain.allSchemas.searchSchema,...ProductionreturnRecordDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" /> <Search :schema="[...ProductionscrapRecordMain.allSchemas.searchSchema,...ProductionscrapRecordDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap> </ContentWrap>
<!-- 列表头部 --> <!-- 列表头部 -->
@ -11,8 +11,8 @@
:routeName="routeName" :routeName="routeName"
@updataTableColumns="updataTableColumns" @updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick" @searchFormClick="searchFormClick"
:allSchemas="ProductionreturnRecordMain.allSchemas" :allSchemas="ProductionscrapRecordMain.allSchemas"
:detailAllSchemas="ProductionreturnRecordDetail.allSchemas" :detailAllSchemas="ProductionscrapRecordDetail.allSchemas"
/> />
<!-- 列表 --> <!-- 列表 -->
@ -43,10 +43,10 @@
<BasicForm <BasicForm
ref="formRef" ref="formRef"
@success="getList" @success="getList"
:rules="ProductionreturnRecordMainRules" :rules="ProductionscrapRecordMainRules"
:formAllSchemas="ProductionreturnRecordMain.allSchemas" :formAllSchemas="ProductionscrapRecordMain.allSchemas"
:tableAllSchemas="ProductionreturnRecordDetail.allSchemas" :tableAllSchemas="ProductionscrapRecordDetail.allSchemas"
:tableFormRules="ProductionreturnRecordDetailRules" :tableFormRules="ProductionscrapRecordDetailRules"
:isBusiness="true" :isBusiness="true"
/> />
@ -54,18 +54,18 @@
<Detail <Detail
ref="detailRef" ref="detailRef"
:isBasic="false" :isBasic="false"
:allSchemas="ProductionreturnRecordMain.allSchemas" :allSchemas="ProductionscrapRecordMain.allSchemas"
:detailAllSchemas="ProductionreturnRecordDetail.allSchemas" :detailAllSchemas="ProductionscrapRecordDetail.allSchemas"
:detailAllSchemasRules="ProductionreturnRecordDetailRules" :detailAllSchemasRules="ProductionscrapRecordDetailRules"
:apiPage="ProductionreturnRecordDetailApi.getProductionreturnRecordDetailPage" :apiPage="ProductionscrapRecordDetailApi.getProductionscrapRecordDetailPage"
/> />
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import download from '@/utils/download' import download from '@/utils/download'
import { ProductionreturnRecordMain,ProductionreturnRecordMainRules,ProductionreturnRecordDetail,ProductionreturnRecordDetailRules } from './productionscrapRecordMain.data' import { ProductionscrapRecordMain,ProductionscrapRecordMainRules,ProductionscrapRecordDetail,ProductionscrapRecordDetailRules } from './productionscrapRecordMain.data'
import * as ProductionreturnRecordMainApi from '@/api/wms/productionreturnRecordMain' import * as ProductionscrapRecordMainApi from '@/api/wms/productionscrapRecordMain'
import * as ProductionreturnRecordDetailApi from '@/api/wms/productionreturnRecordDetail' import * as ProductionscrapRecordDetailApi from '@/api/wms/productionscrapRecordDetail'
import * as defaultButtons from '@/utils/disposition/defaultButtons' import * as defaultButtons from '@/utils/disposition/defaultButtons'
import { CACHE_KEY, useCache } from '@/hooks/web/useCache' import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
// 生产退料记录主 // 生产退料记录主
@ -77,7 +77,7 @@ const { t } = useI18n() // 国际化
const route = useRoute() // 路由信息 const route = useRoute() // 路由信息
const routeName = ref() const routeName = ref()
routeName.value = route.name routeName.value = route.name
const tableColumns = ref([...ProductionreturnRecordMain.allSchemas.tableColumns,...ProductionreturnRecordDetail.allSchemas.tableMainColumns]) const tableColumns = ref([...ProductionscrapRecordMain.allSchemas.tableColumns,...ProductionscrapRecordDetail.allSchemas.tableMainColumns])
// 字段设置 更新主列表字段 // 字段设置 更新主列表字段
const updataTableColumns = (val) => { const updataTableColumns = (val) => {
@ -85,7 +85,7 @@ const updataTableColumns = (val) => {
} }
const { tableObject, tableMethods } = useTable({ const { tableObject, tableMethods } = useTable({
getListApi: ProductionreturnRecordDetailApi.getProductionreturnRecordDetailPage // 分页接口 getListApi: ProductionscrapRecordDetailApi.getProductionscrapRecordDetailPage // 分页接口
}) })
// 获得表格的各种操作 // 获得表格的各种操作
@ -93,7 +93,7 @@ const { getList, setSearchParams } = tableMethods
// 列表头部按钮 // 列表头部按钮
const HeadButttondata = [ const HeadButttondata = [
defaultButtons.defaultExportBtn({hasPermi:'wms:productionreturn-record-main:export'}), // 导出 defaultButtons.defaultExportBtn({hasPermi:'wms:productionscrap-record-main:export'}), // 导出
defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFreshBtn(null), // 刷新
defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultFilterBtn(null), // 筛选
defaultButtons.defaultSetBtn(null), // 设置 defaultButtons.defaultSetBtn(null), // 设置
@ -155,8 +155,8 @@ const handleExport = async () => {
await message.exportConfirm() await message.exportConfirm()
// 发起导出 // 发起导出
exportLoading.value = true exportLoading.value = true
const data = await ProductionreturnRecordMainApi.exportProductionreturnRecordMain(tableObject.params) const data = await ProductionscrapRecordMainApi.exportProductionscrapRecordMain(tableObject.params)
download.excel(data, '生产退料记录主.xlsx') download.excel(data, '线标报废记录主.xlsx')
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false

23
src/views/wms/issueManage/productionscrap/productionscrapRecordMain/productionscrapRecordMain.data.ts
View File

@ -4,7 +4,7 @@ import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
/** /**
* @returns {Array} 生产退料记录主表 * @returns {Array} 生产退料记录主表
*/ */
export const ProductionreturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>([ export const ProductionscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
{ {
label: '单据号', label: '单据号',
field: 'number', field: 'number',
@ -16,22 +16,21 @@ export const ProductionreturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
isSearch: true isSearch: true
}, },
{ {
label: '车间代码', label: '申请单号',
field: 'workshopCode', field: 'requestNumber',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 180
}, },
isSearch: true
}, },
{ {
label: '申请单号', label: '车间代码',
field: 'requestNumber', field: 'workshopCode',
sort: 'custom', sort: 'custom',
table: { table: {
width: 180 width: 150
}, },
isTable: false,
isSearch: true
}, },
{ {
label: '出库事务类型', label: '出库事务类型',
@ -319,7 +318,7 @@ export const ProductionreturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
])) ]))
//表单校验 //表单校验
export const ProductionreturnRecordMainRules = reactive({ export const ProductionscrapRecordMainRules = reactive({
requestNumber: [ requestNumber: [
{ required: true, message: '请选择申请单号', trigger: 'change' } { required: true, message: '请选择申请单号', trigger: 'change' }
], ],
@ -373,7 +372,7 @@ export const ProductionreturnRecordMainRules = reactive({
/** /**
* @returns {Array} 生产退料记录子表 * @returns {Array} 生产退料记录子表
*/ */
export const ProductionreturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([ export const ProductionscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
{ {
label: '生产线代码', label: '生产线代码',
field: 'productionLineCode', field: 'productionLineCode',
@ -636,7 +635,7 @@ export const ProductionreturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]
])) ]))
//表单校验 //表单校验
export const ProductionreturnRecordDetailRules = reactive({ export const ProductionscrapRecordDetailRules = reactive({
inventoryStatus: [ inventoryStatus: [
{ required: true, message: '请选择库存状态', trigger: 'change' } { required: true, message: '请选择库存状态', trigger: 'change' }
], ],

Write Preview
Loading…
Cancel
Save