Browse Source

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

master_hella_20240701
ljlong_2630 6 months ago
parent
commit
7bb06e86fe
  1. 3
      .env
  2. 10
      src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
  3. 1
      src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
  4. 6
      src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts

3
.env

@ -15,6 +15,3 @@ VITE_APP_CAPTCHA_ENABLE=true
# 百度统计
VITE_APP_BAIDU_CODE = a1ff8825baa73c3a78eb96aa40325abc
# 查看质检报告环境
VITE_REPORT_URL = 'http://dev.ccwin-in.com:25400'

10
src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue

@ -674,19 +674,23 @@ const buttonBaseClick = (val, item) => {
//
const getFormSupplierList = async () => {
options.originSupplierList = await getSupplierList()
options.originSupplierList = await getSupplierList(null)
options.supplierList = [...options.originSupplierList]
}
//
const getFormCustomerList = async () => {
options.originSupplierList = await getCustomerList()
options.originSupplierList = await getCustomerList(null)
options.supplierList = [...options.originSupplierList]
}
const filterMethod = (query: string) => {
if (query) {
options.supplierList = options.originSupplierList.filter((item) => {
return item.name.includes(query)
if(item.name==''){
return item.code.includes(query)
}else{
return item.name.includes(query)
}
})
} else {
options.supplierList = [...options.originSupplierList]

1
src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue

@ -190,6 +190,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
} else {
row['itemCode'] = val[0]['code']
row['uom'] = val[0]['uom']
row['singlePrice'] = val[0]['price']
}
} else if(formField === 'costcentreCode'){
row['costcentreCode'] = val[0]['costcentreCode']

6
src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts

@ -532,6 +532,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
label: '包装号',
field: 'packingNumber',
sort: 'custom',
isTableForm:false,
table: {
width: 150
},
@ -543,6 +544,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
label: '器具号',
field: 'containerNumber',
sort: 'custom',
isTableForm:false,
table: {
width: 150
},
@ -581,7 +583,8 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
width: 150
},
tableForm: {
type: 'Select'
type: 'Select',
disabled: true
}
},
{
@ -602,6 +605,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
type: 'InputNumber',
min: 0,
precision: 6,
disabled: true
},
},
{

Loading…
Cancel
Save