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

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

hella_online_20240904
zhang_li 2 months ago
parent
08c2f6cb6b 3418c48f3e
commit
d272291d03
5 changed files with 158 additions and 65 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. 127
      src/views/qms/inspectionQ2/index.vue
  2. 3
      src/views/wms/issueManage/issue/issueRequestMain/index.vue
  3. 82
      src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts
  4. 3
      src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
  5. 8
      src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts

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

@ -127,17 +127,25 @@ const route = useRoute() // 路由信息
const routeName = ref() const routeName = ref()
routeName.value = route.name routeName.value = route.name
const tableColumns = ref(Q2.allSchemas.tableColumns) const tableColumns = ref(Q2.allSchemas.tableColumns)
const clearSearchInput = (formField) => { const clearSearchInput = (formField) => {
if (formField == 'itemCode') { if (formField == 'itemCode') {
basicFormRef.value.formRef.setValues({ basicFormRef.value.formRef.setValues({
itemName: '', itemName: '',
SupplierCode: '', supplierCode: '',
SupplierName: '' supplierName: '',
purchaseReceiptNumber: ''
})
Q2.allSchemas.formSchema.forEach((item) => {
if (item.field == 'supplierCode') {
item.componentProps.options = []
}
}) })
} }
if (formField == 'lightItemCode') { if (formField == 'lightItemCode') {
basicFormRef.value.formRef.setValues({ basicFormRef.value.formRef.setValues({
standardCostPrice: '', standardCostPrice: '',
lightItemName: '',
lightQty: 0, lightQty: 0,
claimAmount: '', claimAmount: '',
otherClaimAmount: 0, otherClaimAmount: 0,
@ -147,7 +155,9 @@ const clearSearchInput = (formField) => {
}) })
const params2 = { const params2 = {
by: 'ASC', by: 'ASC',
filters: [{ column: 'itemCode', action: '==', value: basicFormRef.value.formRef.formModel.itemCode }], filters: [
{ column: 'itemCode', action: '==', value: basicFormRef.value.formRef.formModel.itemCode }
],
pageNo: 1, pageNo: 1,
pageSize: 500, pageSize: 500,
sort: '' sort: ''
@ -212,22 +222,22 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
setV['summaryAmount'] = 0 setV['summaryAmount'] = 0
setV['disbursementAmount'] = 0 setV['disbursementAmount'] = 0
setV['remainingAmount'] = 0 setV['remainingAmount'] = 0
 const params2 = { const params2 = {
        by: 'ASC', by: 'ASC',
        filters: [{ column: 'itemCode', action: '==', value: val[0].code }], filters: [{ column: 'itemCode', action: '==', value: val[0].code }],
        pageNo: 1, pageNo: 1,
        pageSize: 500, pageSize: 500,
        sort: '' sort: ''
      } }
      params2.isSearch = true params2.isSearch = true
      StdcostpriceApi.getStdcostpricePage(params2).then((res) => { StdcostpriceApi.getStdcostpricePage(params2).then((res) => {
        if (res.list?.length > 0) { if (res.list?.length > 0) {
          priceObj.value = res.list[0] priceObj.value = res.list[0]
          formRef.setValues({ formRef.setValues({
            standardCostPrice: priceObj.value.price standardCostPrice: priceObj.value.price
          }) })
        } }
      }) })
setV[formField] = val[0][searchField] setV[formField] = val[0][searchField]
formRef.setValues(setV) formRef.setValues(setV)
} }
@ -245,8 +255,8 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
} }
if (formField == 'itemCode') { if (formField == 'itemCode') {
setV['SupplierCode'] = '' setV['supplierCode'] = ''
setV['SupplierName'] = '' setV['supplierName'] = ''
setV['itemName'] = '' setV['itemName'] = ''
setV['uom'] = val[0].supplierUom setV['uom'] = val[0].supplierUom
@ -293,8 +303,9 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
}) })
} }
}) })
if (basicFormRef.value.formRef.formModel.lightItemCode == null||
if (val[0].lightItemCode == null) { basicFormRef.value.formRef.formModel.lightItemCode == ''
) {
setV['standardCostPrice'] = '' setV['standardCostPrice'] = ''
setV['lightQty'] = 0 setV['lightQty'] = 0
setV['claimAmount'] = '' setV['claimAmount'] = ''
@ -403,6 +414,76 @@ const onChange = (field, e) => {
} }
}) })
} }
// if (field == 'itemCode') {
// basicFormRef.value.formRef.formModel.supplierCode = ''
// basicFormRef.value.formRef.formModel.supplierName = ''
// basicFormRef.value.formRef.formModel.itemName = ''
// Q2Api.getEmail().then((res) => {
// if (res) {
// basicFormRef.value.formRef.formModel.cashierEmail =res
// }
// })
// const supplieritemParams = {
// by: 'ASC',
// filters: [{ column: 'itemCode', action: '==', value: basicFormRef.value.formRef.formModel.itemCode }],
// pageNo: 1,
// pageSize: 500,
// sort: ''
// }
// supplieritemParams.isSearch = true
// SupplieritemApi.getSupplieritemPage(supplieritemParams).then((res) => {
// if (res.list?.length > 0) {
// basicFormRef.value.formRef.formModel.supplierCode = res.list[0].supplierCode
// basicFormRef.value.formRef.formModel.supplierName = res.list[0].supplierName
// Q2.allSchemas.formSchema.forEach((item) => {
// if (item.field == 'supplierCode') {
// item.componentProps.options = res.list
// }
// })
// }
// })
// const itembasicParams = {
// by: 'ASC',
// filters: [{ column: 'code', action: '==', value: basicFormRef.value.formRef.formModel.itemCode }],
// pageNo: 1,
// pageSize: 500,
// sort: ''
// }
// itembasicParams.isSearch = true
// ItembasicApi.getItembasicPage(itembasicParams).then((res) => {
// if (res.list?.length > 0) {
// basicFormRef.value.formRef.formModel.itemName = res.list[0].name
// }
// })
// if (basicFormRef.value.formRef.formModel.lightItemCode == null) {
// basicFormRef.value.formRef.formModel.standardCostPrice = ''
// basicFormRef.value.formRef.formModel.lightQty = 0
// basicFormRef.value.formRef.formModel.claimAmount= ''
// basicFormRef.value.formRef.formModel.otherClaimAmount = 0
// basicFormRef.value.formRef.formModel.summaryAmount= 0
// basicFormRef.value.formRef.formModel.disbursementAmount = 0
// basicFormRef.value.formRef.formModel.remainingAmount = 0
// const params2 = {
// by: 'ASC',
// filters: [{ column: 'itemCode', action: '==', value: basicFormRef.value.formRef.formModel.itemCode }],
// pageNo: 1,
// pageSize: 500,
// sort: ''
// }
// params2.isSearch = true
// StdcostpriceApi.getStdcostpricePage(params2).then((res) => {
// if (res.list?.length > 0) {
// priceObj.value = res.list[0]
// basicFormRef.value.formRef.formModel.standardCostPrice = priceObj.value.price
// }
// })
// }
// }
} }
// 字段设置 更新主列表字段 // 字段设置 更新主列表字段

3
src/views/wms/issueManage/issue/issueRequestMain/index.vue
View File

@ -487,6 +487,9 @@ const submitForm = async (formType, submitData) => {
if(data.masterId){ if(data.masterId){
data.id = data.masterId data.id = data.masterId
} }
tableData.value.forEach((item,index)=>{
item['orderNumber'] = index+1
})
data.subList = tableData.value // 拼接子表数据参数 data.subList = tableData.value // 拼接子表数据参数
if(tableData.value.find(item => (item.qty <= 0))) { if(tableData.value.find(item => (item.qty <= 0))) {
message.warning('数量必须大于0') message.warning('数量必须大于0')

82
src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts
View File

@ -100,22 +100,22 @@ export const ProductscrapRecordMain = useCrudSchemas(
width: 150 width: 150
} }
}, },
{ // {
label: '班组', // label: '班组',
field: 'team', // field: 'team',
sort: 'custom', // sort: 'custom',
table: { // table: {
width: 150 // width: 150
} // }
}, // },
{ // {
label: '班次', // label: '班次',
field: 'shift', // field: 'shift',
sort: 'custom', // sort: 'custom',
table: { // table: {
width: 150 // width: 150
} // }
}, // },
{ {
label: '报废原因', label: '报废原因',
field: 'scrappingReason', field: 'scrappingReason',
@ -270,15 +270,15 @@ export const ProductscrapRecordMain = useCrudSchemas(
}, },
isTable: false isTable: false
}, },
{ // {
label: '备注', // label: '备注',
field: 'remark', // field: 'remark',
sort: 'custom', // sort: 'custom',
table: { // table: {
width: 150 // width: 150
}, // },
isTable: false // isTable: false
}, // },
{ {
label: '是否已撤销', label: '是否已撤销',
field: 'revokeFlag', field: 'revokeFlag',
@ -729,22 +729,22 @@ export const ProductscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
}, },
isTable: false, isTable: false,
}, },
{ // {
label: '备注', // label: '备注',
field: 'remark', // field: 'remark',
sort: 'custom', // sort: 'custom',
table: { // table: {
width: 150 // width: 150
}, // },
isSearch: true, // isSearch: true,
search: { // search: {
component: 'Input', // component: 'Input',
componentProps: { // componentProps: {
placeholder: '请输入备注' // placeholder: '请输入备注'
} // }
}, // },
isTable: true, // isTable: true,
}, // },
{ {
label: '创建时间', label: '创建时间',
field: 'createTime', field: 'createTime',

3
src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
View File

@ -390,6 +390,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
// 明细查询页赋值 // 明细查询页赋值
if(formField == 'productionLineCode'){ if(formField == 'productionLineCode'){
row['productionLineCode'] = val[0]['code'] row['productionLineCode'] = val[0]['code']
tableData.value = []
}else if(formField == 'fromLocationCode'){ }else if(formField == 'fromLocationCode'){
// val.forEach(item=>{ // val.forEach(item=>{
// const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) // const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
@ -458,6 +459,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
//成本中心代码 //成本中心代码
//成本中心类型 //成本中心类型
setV['costCenterType'] = val[0]['costcentreType'] setV['costCenterType'] = val[0]['costcentreType']
}else if(formField == 'productionLineCode'){
tableData.value = []
} }
formRef.setValues(setV) formRef.setValues(setV)
} }

8
src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts
View File

@ -723,7 +723,8 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isSearch: true, isTable:false,
isSearch: false,
sortTableDefault: 10, sortTableDefault: 10,
}, },
{ {
@ -733,6 +734,8 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable:false,
isSearch: false,
sortTableDefault: 10, sortTableDefault: 10,
}, },
{ {
@ -746,6 +749,7 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
hiddenInMain:true, hiddenInMain:true,
isTableForm: false, isTableForm: false,
isForm: false, isForm: false,
isTable:false,
}, },
// { // {
// label: '器具号', // label: '器具号',
@ -820,6 +824,7 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
}, },
sortTableDefault: 16, sortTableDefault: 16,
hiddenInMain:true, hiddenInMain:true,
isTable:false,
}, },
{ {
label: '到货主代码', label: '到货主代码',
@ -830,6 +835,7 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
}, },
sortTableDefault: 16, sortTableDefault: 16,
hiddenInMain:true, hiddenInMain:true,
isTable:false,
}, },
{ {
label: '订单号', label: '订单号',

Write Preview
Loading…
Cancel
Save