Browse Source

达明 --装配收货记录、预生产收货记录添加“是否已撤销”

hella_online_20240828
wangyufei 3 months ago
parent
commit
2129fba1e6
  1. 5
      src/components/Descriptions/src/Descriptions.vue
  2. 3
      src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue
  3. 18
      src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts
  4. 3
      src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue
  5. 19
      src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts

5
src/components/Descriptions/src/Descriptions.vue

@ -146,9 +146,10 @@ const showAll = () =>{
}} }}
</slot> </slot>
<slot v-else-if="item.valueFilter"> <slot v-else-if="item.valueFilter">
{{ <el-tag v-if="item.dictType" :type="item.dictType">{{ item.valueFilter(data[item.field]) }}</el-tag>
<span v-else>{{
item.valueFilter(data[item.field]) item.valueFilter(data[item.field])
}} }}</span>
</slot> </slot>
<slot v-else-if="item.dictType"> <slot v-else-if="item.dictType">
<div v-if="data[item.field]&&Array.isArray(data[item.field])" > <div v-if="data[item.field]&&Array.isArray(data[item.field])" >

3
src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue

@ -28,6 +28,9 @@
v-model:currentPage="tableObject.currentPage" v-model:currentPage="tableObject.currentPage"
v-model:sort="tableObject.sort" v-model:sort="tableObject.sort"
> >
<template #recoveryRequestFlag="{row}">
<el-tag>{{ row.recoveryRequestFlag=='TRUE'?'是':'否' }}</el-tag>
</template>
<template #number="{row}"> <template #number="{row}">
<el-button type="primary" link @click="openDetail(row, '单据号', row.number)"> <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
<span>{{ row.number }}</span> <span>{{ row.number }}</span>

18
src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts

@ -569,6 +569,24 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
width: 150 width: 150
}, },
}, },
{
label: '是否已撤销',
field: 'recoveryRequestFlag',
sort: 'custom',
table: {
width: 150
},
detail:{
dictType:'primary',
valueFilter:(value)=>{
if(value=='TRUE'){
return ``
}else{
return '否'
}
}
}
},
{ {
label: '单据号', label: '单据号',
field: 'number', field: 'number',

3
src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue

@ -28,6 +28,9 @@
v-model:currentPage="tableObject.currentPage" v-model:currentPage="tableObject.currentPage"
v-model:sort="tableObject.sort" v-model:sort="tableObject.sort"
> >
<template #recoveryRequestFlag="{row}">
<el-tag>{{ row.recoveryRequestFlag=='TRUE'?'是':'否' }}</el-tag>
</template>
<template #number="{row}"> <template #number="{row}">
<el-button type="primary" link @click="openDetail(row, '单据号', row.number)"> <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
<span>{{ row.number }}</span> <span>{{ row.number }}</span>

19
src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts

@ -42,6 +42,25 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
}, },
isSearch: false isSearch: false
}, },
{
label: '是否已撤销',
field: 'recoveryRequestFlag',
sort: 'custom',
table: {
width: 150
},
detail:{
dictType:'primary',
valueFilter:(value)=>{
if(value=='TRUE'){
return ``
}else{
return '否'
}
}
}
},
{ {
label: '生产计划单号', label: '生产计划单号',
field: 'productionPlanNumber', field: 'productionPlanNumber',

Loading…
Cancel
Save