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

BUG修改

hella_online_20240829
叶佳兴 6 months ago
parent
54028775d0
commit
f9790cc1fa
5 changed files with 139 additions and 95 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. 6
      src/views/qms/inspectionQ1/index.vue
  2. 40
      src/views/qms/inspectionQ2/index.vue
  3. 91
      src/views/qms/inspectionQ2/inspectionQ2.data.ts
  4. 24
      src/views/qms/inspectionQ3/index.vue
  5. 73
      src/views/qms/inspectionQ3/inspectionQ3.data.ts

6
src/views/qms/inspectionQ1/index.vue
View File

@ -27,9 +27,9 @@
v-model:currentPage="tableObject.currentPage" v-model:currentPage="tableObject.currentPage"
v-model:sort="tableObject.sort" v-model:sort="tableObject.sort"
> >
<template #code="{row}"> <template #number="{row}">
<el-button type="primary" link @click="openDetail(row, '代码', row.code)"> <el-button type="primary" link @click="openDetail(row, '代码', row.number)">
<span>{{ row.code }}</span> <span>{{ row.number }}</span>
</el-button> </el-button>
</template> </template>
<template #action="{ row }"> <template #action="{ row }">

40
src/views/qms/inspectionQ2/index.vue
View File

@ -27,9 +27,9 @@
v-model:currentPage="tableObject.currentPage" v-model:currentPage="tableObject.currentPage"
v-model:sort="tableObject.sort" v-model:sort="tableObject.sort"
> >
<template #code="{row}"> <template #number="{row}">
<el-button type="primary" link @click="openDetail(row, '代码', row.code)"> <el-button type="primary" link @click="openDetail(row, '代码', row.number)">
<span>{{ row.code }}</span> <span>{{ row.number }}</span>
</el-button> </el-button>
</template> </template>
<template #action="{ row }"> <template #action="{ row }">
@ -84,21 +84,27 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
nextTick(() => { nextTick(() => {
const setV = {} const setV = {}
if(formField == 'itemCode'){ if(formField == 'itemCode'){
console.log(val);
setV['uom'] = val[0]['supplierUom'] setV['uom'] = val[0]['supplierUom']
} }
if (formField == 'q1Number') { // if (formField == 'q1Number') {
console.log(123) // console.log(123)
setV['q1Number'] = val[0]['number'] // setV['q1Number'] = val[0]['number']
// }
if (formField == 'purchaseReceiptNumber') {
setV['wmsQty'] = val[0]['qty']
} }
// if (formField == 'supplierCode') { if(formField == 'q1Number'){
// console.log(123) //Q1通知单号
// setV['supplierCode'] = val[0]['code'] let list = []
// } val.forEach(item=>{
list.push(item[searchField])
})
setV[formField] = val[0][searchField] setV[formField] = list.join(',')
formRef.setValues(setV) formRef.setValues(setV)
}else{
setV[formField] = val[0][searchField]
formRef.setValues(setV)
}
}) })
} }
@ -214,6 +220,10 @@ const formsSuccess = async (formType, data) => {
return; return;
} }
} }
if (data.qty>data.wmsQty) {
message.error('数量不能大于记录中的收货数量')
return;
}
if(data.activeTime==0)data.activeTime = null; if(data.activeTime==0)data.activeTime = null;
if(data.expireTime==0)data.expireTime = null; if(data.expireTime==0)data.expireTime = null;
if (formType === 'create') { if (formType === 'create') {

91
src/views/qms/inspectionQ2/inspectionQ2.data.ts
View File

@ -14,7 +14,7 @@ import * as SupplierApi from '@/api/wms/supplier'
import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data' import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
import * as PurchasereceiptRecordDetailApi from '@/api/wms/purchasereceiptRecordDetail' import * as PurchasereceiptRecordDetailApi from '@/api/wms/purchasereceiptRecordDetail'
import { PurchasereceiptRecordMain1 } from '@/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data' import { PurchasereceiptRecordDetail } from '@/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data'
import { useUserStore } from '@/store/modules/user' import { useUserStore } from '@/store/modules/user'
const userStore = useUserStore() const userStore = useUserStore()
@ -60,6 +60,7 @@ export const Q2 = useCrudSchemas(
// labelMessage: '信息提示说明！！！', // labelMessage: '信息提示说明！！！',
componentProps: { componentProps: {
enterSearch: true, enterSearch: true,
multiple: true,
isSearchList: true, // 开启查询弹窗 isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择Q1通知单', // 输入框占位文本 searchListPlaceholder: '请选择Q1通知单', // 输入框占位文本
searchField: 'number', // 查询弹窗赋值字段 searchField: 'number', // 查询弹窗赋值字段
@ -78,14 +79,16 @@ export const Q2 = useCrudSchemas(
isMainValue: false isMainValue: false
} }
], ],
verificationParams: [{ verificationParams: [
key: 'number', {
action: '==', key: 'number',
value: '', action: '==',
isMainValue: false, value: '',
isSearch: true, isMainValue: false,
isFormModel: true, isSearch: true,
}], // 失去焦点校验参数 isFormModel: true
}
] // 失去焦点校验参数
} }
}, },
isSearch: true isSearch: true
@ -132,14 +135,16 @@ export const Q2 = useCrudSchemas(
isMainValue: false isMainValue: false
} }
], ],
verificationParams: [{ verificationParams: [
key: 'code', {
action: '==', key: 'code',
value: '', action: '==',
isMainValue: false, value: '',
isSearch: true, isMainValue: false,
isFormModel: true, isSearch: true,
}], // 失去焦点校验参数 isFormModel: true
}
] // 失去焦点校验参数
} }
} }
}, },
@ -221,8 +226,8 @@ export const Q2 = useCrudSchemas(
searchListPlaceholder: '请选择采购收货记录单号', // 输入框占位文本 searchListPlaceholder: '请选择采购收货记录单号', // 输入框占位文本
searchField: 'number', // 查询弹窗赋值字段 searchField: 'number', // 查询弹窗赋值字段
searchTitle: '采购收货记录', // 查询弹窗标题 searchTitle: '采购收货记录', // 查询弹窗标题
searchAllSchemas: PurchasereceiptRecordMain1.allSchemas, // 查询弹窗所需类 searchAllSchemas: PurchasereceiptRecordDetail.allSchemas, // 查询弹窗所需类
searchPage: PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPageReturn, // 查询弹窗所需分页方法 searchPage: PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPage, // 查询弹窗所需分页方法
searchCondition: [ searchCondition: [
{ {
key: 'supplierCode', key: 'supplierCode',
@ -235,17 +240,29 @@ export const Q2 = useCrudSchemas(
isMainValue: true isMainValue: true
} }
], ],
verificationParams: [{ verificationParams: [
key: 'number', {
action: '==', key: 'number',
value: '', action: '==',
isMainValue: false, value: '',
isSearch: true, isMainValue: false,
isFormModel: true, isSearch: true,
}], // 失去焦点校验参数 isFormModel: true
}
] // 失去焦点校验参数
} }
} }
}, },
{
label: '采购收货数量',
field: 'wmsQty',
sort: 'custom',
isSearch: false,
isForm: false,
isTable: false,
isDetail: false
},
{ {
label: '数量', label: '数量',
field: 'qty', field: 'qty',
@ -328,7 +345,7 @@ export const Q2 = useCrudSchemas(
form: { form: {
// labelMessage: '信息提示说明！！！', // labelMessage: '信息提示说明！！！',
componentProps: { componentProps: {
enterSearch:true, enterSearch: true,
isSearchList: true, // 开启查询弹窗 isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择成本中心', // 输入框占位文本 searchListPlaceholder: '请选择成本中心', // 输入框占位文本
searchField: 'costcentreCode', // 查询弹窗赋值字段 searchField: 'costcentreCode', // 查询弹窗赋值字段
@ -342,14 +359,16 @@ export const Q2 = useCrudSchemas(
isMainValue: false isMainValue: false
} }
], ],
verificationParams: [{ verificationParams: [
key: 'costcentreCode', {
action: '==', key: 'costcentreCode',
value: '', action: '==',
isMainValue: false, value: '',
isSearch: true, isMainValue: false,
isFormModel: true, isSearch: true,
}], // 失去焦点校验参数 isFormModel: true
}
] // 失去焦点校验参数
} }
} }
}, },

24
src/views/qms/inspectionQ3/index.vue
View File

@ -27,9 +27,9 @@
v-model:currentPage="tableObject.currentPage" v-model:currentPage="tableObject.currentPage"
v-model:sort="tableObject.sort" v-model:sort="tableObject.sort"
> >
<template #code="{row}"> <template #number="{row}">
<el-button type="primary" link @click="openDetail(row, '代码', row.code)"> <el-button type="primary" link @click="openDetail(row, '代码', row.number)">
<span>{{ row.code }}</span> <span>{{ row.number }}</span>
</el-button> </el-button>
</template> </template>
<template #action="{ row }"> <template #action="{ row }">
@ -87,12 +87,18 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
console.log(val); console.log(val);
setV['uom'] = val[0]['uom'] setV['uom'] = val[0]['uom']
} }
if (formField == 'q1Number') { if(formField == 'q1Number'){
console.log(123) //Q1通知单号
setV['q1Number'] = val[0]['number'] let list = []
} val.forEach(item=>{
setV[formField] = val[0][searchField] list.push(item[searchField])
formRef.setValues(setV) })
setV[formField] = list.join(',')
formRef.setValues(setV)
}else{
setV[formField] = val[0][searchField]
formRef.setValues(setV)
}
}) })
} }

73
src/views/qms/inspectionQ3/inspectionQ3.data.ts
View File

@ -54,6 +54,7 @@ export const Q3 = useCrudSchemas(
// labelMessage: '信息提示说明！！！', // labelMessage: '信息提示说明！！！',
componentProps: { componentProps: {
enterSearch: true, enterSearch: true,
multiple: true,
isSearchList: true, // 开启查询弹窗 isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择Q1通知单', // 输入框占位文本 searchListPlaceholder: '请选择Q1通知单', // 输入框占位文本
searchField: 'number', // 查询弹窗赋值字段 searchField: 'number', // 查询弹窗赋值字段
@ -72,14 +73,16 @@ export const Q3 = useCrudSchemas(
isMainValue: false isMainValue: false
} }
], ],
verificationParams: [{ verificationParams: [
key: 'number', {
action: '==', key: 'number',
value: '', action: '==',
isMainValue: false, value: '',
isSearch: true, isMainValue: false,
isFormModel: true, isSearch: true,
}], // 失去焦点校验参数 isFormModel: true
}
] // 失去焦点校验参数
} }
}, },
isSearch: true isSearch: true
@ -125,14 +128,16 @@ export const Q3 = useCrudSchemas(
isMainValue: false isMainValue: false
} }
], ],
verificationParams: [{ verificationParams: [
key: 'code', {
action: '==', key: 'code',
value: '', action: '==',
isMainValue: false, value: '',
isSearch: true, isMainValue: false,
isFormModel: true, isSearch: true,
}], // 失去焦点校验参数 isFormModel: true
}
] // 失去焦点校验参数
}, },
form: { form: {
// labelMessage: '信息提示说明！！！', // labelMessage: '信息提示说明！！！',
@ -151,14 +156,16 @@ export const Q3 = useCrudSchemas(
isMainValue: false isMainValue: false
} }
], ],
verificationParams: [{ verificationParams: [
key: 'code', {
action: '==', key: 'code',
value: '', action: '==',
isMainValue: false, value: '',
isSearch: true, isMainValue: false,
isFormModel: true, isSearch: true,
}], // 失去焦点校验参数 isFormModel: true
}
] // 失去焦点校验参数
} }
} }
}, },
@ -311,14 +318,16 @@ export const Q3 = useCrudSchemas(
isMainValue: false isMainValue: false
} }
], ],
verificationParams: [{ verificationParams: [
key: 'costcentreCode', {
action: '==', key: 'costcentreCode',
value: '', action: '==',
isMainValue: false, value: '',
isSearch: true, isMainValue: false,
isFormModel: true, isSearch: true,
}], // 失去焦点校验参数 isFormModel: true
}
] // 失去焦点校验参数
} }
} }
}, },

Write Preview
Loading…
Cancel
Save