Browse Source

Merge branch 'hella_online_20240828' into master_hella

hella_online_20240829
陈薪名 3 months ago
parent
commit
1318fc3a56
  1. 9
      src/views/qms/inspectionRecord/index.vue
  2. 2
      src/views/qms/inspectionRecord/useAddForm.vue
  3. 6
      src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
  4. 6
      src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
  5. 12
      src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
  6. 9
      src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue
  7. 4
      src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts
  8. 3
      src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
  9. 16
      src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
  10. 16
      src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
  11. 6
      src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
  12. 6
      src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
  13. 6
      src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts
  14. 6
      src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts
  15. 2
      src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue
  16. 39
      src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts
  17. 2
      src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
  18. 6
      src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
  19. 2
      src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue
  20. 2
      src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts
  21. 2
      src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
  22. 6
      src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
  23. 6
      src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts

9
src/views/qms/inspectionRecord/index.vue

@ -281,13 +281,13 @@ const buttonTableClick = async (val, row) => {
// //
// 1使 // 1使
if (row.estimateCode == 1) { if (row.estimateCode == 1) {
InspectionRecordMain.allSchemas.formSchema.forEach((itemColumn) => { InspectionRecordUser.allSchemas.formSchema.forEach((itemColumn) => {
if (itemColumn.field == 'useDecision') { if (itemColumn.field == 'useDecision') {
itemColumn.componentProps.options = useDecisionList?.filter((item) => item.value == 1) itemColumn.componentProps.options = useDecisionList?.filter((item) => item.value == 1)
} }
}) })
} else if (row.estimateCode == 2) { } else if (row.estimateCode == 2) {
InspectionRecordMain.allSchemas.formSchema.forEach((itemColumn) => { InspectionRecordUser.allSchemas.formSchema.forEach((itemColumn) => {
if (itemColumn.field == 'useDecision') { if (itemColumn.field == 'useDecision') {
itemColumn.componentProps.options = useDecisionList?.filter((item) => item.value != 1) itemColumn.componentProps.options = useDecisionList?.filter((item) => item.value != 1)
} }
@ -430,7 +430,10 @@ const submitForm = async (formType, data) => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
} }
formRef.value.dialogVisible = false formRef.value.dialogVisible = false
handleOrderPub(rowData.value) if (!data.isPublished) {
handleOrderPub(rowData.value)
}
// //
getList() getList()
} finally { } finally {

2
src/views/qms/inspectionRecord/useAddForm.vue

@ -140,7 +140,7 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
if(row.estimateCode == 1){ if(row.estimateCode == 1){
data.value.useDecision = '1' data.value.useDecision = '1'
}else{ }else{
data.value.useDecision ='' data.value.useDecision =row.useDecision?row.useDecision:''
} }
// == // ==
if(data.value.useDecision == 1){ if(data.value.useDecision == 1){

6
src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts

@ -952,13 +952,15 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
component: 'InputNumber', component: 'InputNumber',
componentProps: { componentProps: {
min: 0, min: 0,
precision: 6 max:9999,
// precision: 6
} }
}, },
tableForm: { tableForm: {
type: 'InputNumber', type: 'InputNumber',
min: 0, min: 0,
precision: 6 max:9999,
// precision: 6
} }
}, },
{ {

6
src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts

@ -867,13 +867,15 @@ export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
component: 'InputNumber', component: 'InputNumber',
componentProps: { componentProps: {
min: 0, min: 0,
precision: 6 max:9999,
// precision: 6
} }
}, },
tableForm: { tableForm: {
type: 'InputNumber', type: 'InputNumber',
min: 0, min: 0,
precision: 6 max:9999,
// precision: 6
} }
}, },
{ {

12
src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts

@ -658,13 +658,15 @@ export const DeliverPlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
component: 'InputNumber', component: 'InputNumber',
componentProps: { componentProps: {
min: 0, min: 0,
precision: 6 max:9999,
// precision: 6
} }
}, },
tableForm: { tableForm: {
type: 'InputNumber', type: 'InputNumber',
min: 0, min: 0,
precision: 6 max:9999,
// precision: 6
} }
}, },
{ {
@ -966,13 +968,15 @@ export const DeliverPlanDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
component: 'InputNumber', component: 'InputNumber',
componentProps: { componentProps: {
min: 0, min: 0,
precision: 6 max:9999,
// precision: 6
} }
}, },
tableForm: { tableForm: {
type: 'InputNumber', type: 'InputNumber',
min: 0, min: 0,
precision: 6 max:9999,
// precision: 6
} }
}, },
{ {

9
src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue

@ -97,6 +97,7 @@ import Detail from '@/components/Detail/src/Detail.vue'
import { formatDate } from '@/utils/formatTime' import { formatDate } from '@/utils/formatTime'
import { usePageLoading } from '@/hooks/web/usePageLoading' import { usePageLoading } from '@/hooks/web/usePageLoading'
const { loadStart, loadDone } = usePageLoading() const { loadStart, loadDone } = usePageLoading()
//
defineOptions({ name: 'SaleShipmentMain' }) defineOptions({ name: 'SaleShipmentMain' })
const message = useMessage() // const message = useMessage() //
@ -248,7 +249,7 @@ const butttondata = (row,$index) => {
defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:sale-shipment-main-request:refused'}), // defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:sale-shipment-main-request:refused'}), //
defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:sale-shipment-main-request:agree'}), // defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:sale-shipment-main-request:agree'}), //
defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:sale-shipment-main-request:handle'}), // defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:sale-shipment-main-request:handle'}), //
defaultButtons.mainListAbortBtn({hide:isShowMainButton(row,['8']),hasPermi:'wms:sale-shipment-main-request:abort'}), // // defaultButtons.mainListAbortBtn({hide:isShowMainButton(row,['8']),hasPermi:'wms:sale-shipment-main-request:abort'}), //
// defaultButtons.mainListDeleteBtn({hasPermi:'wms:sale-shipment-main-request:delete'}), // // defaultButtons.mainListDeleteBtn({hasPermi:'wms:sale-shipment-main-request:delete'}), //
] ]
} }
@ -323,7 +324,7 @@ const buttonTableClick = async (val, row) => {
tableObject.loading = false tableObject.loading = false
console.log(err) console.log(err)
}) })
} else if (val == 'mainAbort') { // } else if (val == 'mainAbort') { //
await message.confirm('确认要终止吗?') await message.confirm('确认要终止吗?')
tableObject.loading = true tableObject.loading = true
SaleShipmentMainApi.abort(row.masterId).then(() => { SaleShipmentMainApi.abort(row.masterId).then(() => {
@ -360,7 +361,7 @@ const openForm = (type: string, row?: any) => {
const inputNumberChange = (field, val,row, index) => { const inputNumberChange = (field, val,row, index) => {
if(field=='qty'){ if(field=='qty'){
if(row['subSettleQty']!=null&&row['qty']>row['subSettleQty']){ if(row['subSettleQty']!=null&&row['qty']>row['subSettleQty']){
message.error(`物料${row['itemCode']}最大数量为${row['subSettleQty']}`) message.error(`物料${row['itemCode']}最大数量为${row['subSettleQty']}`)
} }
} }
console.log('inputNumberChange',field, val,row, index) console.log('inputNumberChange',field, val,row, index)
@ -375,7 +376,7 @@ const submitForm = async (formType, submitData) => {
tableData.value.forEach(item=>{ tableData.value.forEach(item=>{
if(item['subSettleQty']!=null&&item['qty']>item['subSettleQty']){ if(item['subSettleQty']!=null&&item['qty']>item['subSettleQty']){
flag = false flag = false
message.error(`物料${item['itemCode']}最大数量为${item['subSettleQty']}`) message.error(`物料${item['itemCode']}最大数量为${item['subSettleQty']}`)
} }
}) })
if(!flag){ if(!flag){

4
src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts

@ -361,7 +361,7 @@ export const SaleShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
isMainValue: false isMainValue: false
}, },
{ {
key: 'customer_code', key: 'customerCode',
value: 'customerCode', value: 'customerCode',
isMainValue: true isMainValue: true
}] }]
@ -381,7 +381,7 @@ export const SaleShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
isMainValue: false isMainValue: false
}, },
{ {
key: 'customer_code', key: 'customerCode',
value: 'customerCode', value: 'customerCode',
isMainValue: true isMainValue: true
}] }]

3
src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts

@ -742,7 +742,8 @@ export const StockupDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
tableForm: { tableForm: {
type: 'InputNumber', type: 'InputNumber',
min: 0, min: 0,
precision: 6 max:9999,
// precision: 6
}, },
}, },
{ {

16
src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts

@ -761,14 +761,14 @@ export const ScrapJobMainRules = reactive({
* @returns {Array} * @returns {Array}
*/ */
export const ScrapJobDetail = useCrudSchemas(reactive<CrudSchema[]>([ export const ScrapJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
{ // {
label: '单据号', // label: '单据号',
field: 'number', // field: 'number',
sort: 'custom', // sort: 'custom',
table: { // table: {
width: 180 // width: 180
}, // },
}, // },
{ {
label: '物料代码', label: '物料代码',
field: 'itemCode', field: 'itemCode',

16
src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts

@ -544,14 +544,14 @@ export const ScrapRecordMainRules = reactive({
* @returns {Array} * @returns {Array}
*/ */
export const ScrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([ export const ScrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
{ // {
label: '单据号', // label: '单据号',
field: 'number', // field: 'number',
sort: 'custom', // sort: 'custom',
table: { // table: {
width: 180 // width: 180
}, // },
}, // },
{ {
label: '物料代码', label: '物料代码',
field: 'itemCode', field: 'itemCode',

6
src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts

@ -840,13 +840,15 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
component: 'InputNumber', component: 'InputNumber',
componentProps: { componentProps: {
min: 0, min: 0,
precision: 6 max:9999,
// precision: 6
} }
}, },
tableForm: { tableForm: {
type: 'InputNumber', type: 'InputNumber',
min: 0, min: 0,
precision: 6 max:9999,
// precision: 6
}, },
}, },
{ {

6
src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts

@ -839,13 +839,15 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
component: 'InputNumber', component: 'InputNumber',
componentProps: { componentProps: {
min: 0, min: 0,
precision: 6 max:9999,
// precision: 6
} }
}, },
tableForm: { tableForm: {
type: 'InputNumber', type: 'InputNumber',
min: 0, min: 0,
precision: 6 max:9999,
// precision: 6
}, },
}, },
{ {

6
src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts

@ -804,13 +804,15 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
component: 'InputNumber', component: 'InputNumber',
componentProps: { componentProps: {
min: 0, min: 0,
precision: 6 max:9999,
// precision: 6
} }
}, },
tableForm: { tableForm: {
type: 'InputNumber', type: 'InputNumber',
min: 0, min: 0,
precision: 6 max:9999,
// precision: 6
}, },
}, },
{ {

6
src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts

@ -792,13 +792,15 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
component: 'InputNumber', component: 'InputNumber',
componentProps: { componentProps: {
min: 0, min: 0,
precision: 6 max:9999,
// precision: 6
} }
}, },
tableForm: { tableForm: {
type: 'InputNumber', type: 'InputNumber',
min: 0, min: 0,
precision: 6 max:9999,
// precision: 6
}, },
}, },
{ {

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

@ -203,7 +203,7 @@ const butttondata = (row,$index) => {
// defaultButtons.mainInspectRequestBtn({hasPermi:'wms:productreceipt-record-main:createInspectRequest',hide:row.inspectRequestFlag == "FALSE" }),// // defaultButtons.mainInspectRequestBtn({hasPermi:'wms:productreceipt-record-main:createInspectRequest',hide:row.inspectRequestFlag == "FALSE" }),//
defaultButtons.mainInspectRequestBtn({hide:row.inspectRequestFlag == "FALSE" }),// defaultButtons.mainInspectRequestBtn({hide:row.inspectRequestFlag == "FALSE" }),//
defaultButtons.mainListPointBtn(null), // defaultButtons.mainListPointBtn(null), //
// defaultButtons.mainListRecoveryBtn({hide:row.recoveryRequestFlag == "TRUE" }), // //recoveryRequestFlag==TRUE defaultButtons.mainListRecoveryBtn({hide:row.recoveryRequestFlag == "TRUE" }), // //recoveryRequestFlag==TRUE
] ]
} }

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

@ -231,6 +231,24 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
}, },
isTable: false, isTable: false,
}, },
{
label: '是否已撤销',
field: 'recoveryRequestFlag',
sort: 'custom',
table: {
width: 150
},
detail:{
dictType:'primary',
valueFilter:(value)=>{
if(value=='TRUE'){
return ``
}else{
return '否'
}
}
}
},
{ {
label: '创建者', label: '创建者',
field: 'creator', field: 'creator',
@ -569,24 +587,7 @@ 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',
@ -760,7 +761,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
isDetail: false, isDetail: false,
isForm: false , isForm: false ,
table: { table: {
width: 280, width: 340,
fixed: 'right' fixed: 'right'
}, },
isTableForm:true, isTableForm:true,

2
src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue

@ -802,7 +802,7 @@ const tableFormButton = async (val, row) => {
bomModelVisible.value = true bomModelVisible.value = true
DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息' DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息'
detatableDataBom.params = { detatableDataBom.params = {
masterId: row.masterId number: row.number
} }
await getDetailListBom() await getDetailListBom()
} }

6
src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts

@ -1105,13 +1105,15 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
component: 'InputNumber', component: 'InputNumber',
componentProps: { componentProps: {
min: 0, min: 0,
precision: 6 max:9999,
// precision: 6
}, },
}, },
tableForm: { tableForm: {
type: 'InputNumber', type: 'InputNumber',
min: 0, min: 0,
precision: 6 max:9999,
// precision: 6
} }
}, },
{ {

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

@ -240,7 +240,7 @@ const butttondata = (row,$index) => {
defaultButtons.mainInspectRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createInspectRequest',hide:row.inspectRequestFlag == "FALSE" }),// defaultButtons.mainInspectRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createInspectRequest',hide:row.inspectRequestFlag == "FALSE" }),//
defaultButtons.mainPutawayRequestCpBtn({hasPermi:'wms:purchasereceipt-record-main:createPutawayRequest',hide:row.putawayRequestFlag == "FALSE" }),// defaultButtons.mainPutawayRequestCpBtn({hasPermi:'wms:purchasereceipt-record-main:createPutawayRequest',hide:row.putawayRequestFlag == "FALSE" }),//
defaultButtons.mainListPointBtn(null), // defaultButtons.mainListPointBtn(null), //
// defaultButtons.mainListRecoveryBtn({hide:row.recoveryRequestFlag == "TRUE" }), // //recoveryRequestFlag==TRUE defaultButtons.mainListRecoveryBtn({hide:row.recoveryRequestFlag == "TRUE" }), // //recoveryRequestFlag==TRUE
] ]
} }

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

@ -765,7 +765,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
isDetail: false, isDetail: false,
isForm: false , isForm: false ,
table: { table: {
width: 350, width: 410,
fixed: 'right' fixed: 'right'
}, },
hiddenInMain: false, hiddenInMain: false,

2
src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue

@ -709,7 +709,7 @@ const tableFormButton = async (val , row) => {
bomModelVisible.value = true bomModelVisible.value = true
DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息' DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息'
detatableDataBom.params = { detatableDataBom.params = {
masterId: row.masterId number: row.number
} }
await getDetailListBom() await getDetailListBom()
} }

6
src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts

@ -1172,13 +1172,15 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
component: 'InputNumber', component: 'InputNumber',
componentProps: { componentProps: {
min: 0, min: 0,
precision: 6 max:9999,
// precision: 6
}, },
}, },
tableForm: { tableForm: {
type: 'InputNumber', type: 'InputNumber',
min: 0, min: 0,
precision: 6 max:9999,
// precision: 6
} }
}, },
{ {

6
src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts

@ -943,14 +943,16 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
component: 'InputNumber', component: 'InputNumber',
componentProps: { componentProps: {
min: 0, min: 0,
precision: 6 max:9999,
// precision: 6
}, },
}, },
tableForm: { tableForm: {
type: 'InputNumber', type: 'InputNumber',
default:1, default:1,
min: 0, min: 0,
precision: 6 max:9999,
// precision: 6
} }
}, },
{ {

Loading…
Cancel
Save