Browse Source

修改bug

master_hella_20240701
liuchen864 6 months ago
parent
commit
81848fbe80
  1. 1
      src/components/BasicForm/src/BasicForm.vue
  2. 4
      src/views/qms/sampleCode/sampleCode.data.ts
  3. 1
      src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
  4. 12
      src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts

1
src/components/BasicForm/src/BasicForm.vue

@ -725,6 +725,7 @@ const inpuFocus = (headerItem, row, index) => {
* @param cur 改变后值 * @param cur 改变后值
*/ */
const onChange = (field, cur) => { const onChange = (field, cur) => {
console.log(2222222222222)
emit('onChange', field, cur, formRef) emit('onChange', field, cur, formRef)
} }

4
src/views/qms/sampleCode/sampleCode.data.ts

@ -19,7 +19,7 @@ export const SampleCodeRules = reactive({
const samplingSchemeList = await getSamplingScheme() const samplingSchemeList = await getSamplingScheme()
export const SampleCode = useCrudSchemas(reactive<CrudSchema[]>([ export const SampleCode = useCrudSchemas(reactive<CrudSchema[]>([
{ {
label: '采样方案', label: '采样方案编码',
field: 'code', field: 'code',
sort: 'custom', sort: 'custom',
isSearch: true, isSearch: true,
@ -28,7 +28,7 @@ export const SampleCode = useCrudSchemas(reactive<CrudSchema[]>([
componentProps: { componentProps: {
options: samplingSchemeList, options: samplingSchemeList,
optionsAlias: { optionsAlias: {
labelField: 'description', labelField: 'code',
valueField: 'code' valueField: 'code'
}, },
} }

1
src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue

@ -342,6 +342,7 @@ const searchTableSuccessLabel = (formField, searchField, val, formRef, type, row
if (formField == 'secondPackUnit') { if (formField == 'secondPackUnit') {
row['secondPackUnit'] = val[0]['packUnit'] row['secondPackUnit'] = val[0]['packUnit']
row['secondPackQty'] = val[0]['packQty'] row['secondPackQty'] = val[0]['packQty']
SupplierdeliverRequestDetailRules.secondPackQty[0].required = true
} }
} }
}) })

12
src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts

@ -1114,6 +1114,13 @@ export const SupplierdeliverRequestDetailRules = reactive({
packUnit: [ packUnit: [
{ required: true, message: '请选择包装规格', trigger: 'change' } { required: true, message: '请选择包装规格', trigger: 'change' }
], ],
secondPackUnit: [
{ required: false, message: '请选择包装规格2', trigger: 'change' }
],
secondPackQty: [
{ required: false, message: '请输入包装数量2', trigger: 'blur' },
{ validator: validateInteger, message: '请输入正确的整数', trigger: 'blur' }
],
convertRate: [ convertRate: [
{ required: true, message: '请输入转换率', trigger: 'blur' } { required: true, message: '请输入转换率', trigger: 'blur' }
], ],
@ -1123,7 +1130,7 @@ export const SupplierdeliverRequestDetailRules = reactive({
remark: [ remark: [
{ max: 50, message: '不得超过50个字符', trigger: 'blur' } { max: 50, message: '不得超过50个字符', trigger: 'blur' }
], ],
secondPackQty:[{ validator:validateInteger, message: '请输入正确的整数', trigger: 'blur'}] // secondPackQty:[{ validator:validateInteger, message: '请输入正确的整数', trigger: 'blur'}]
}) })
export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSchema[]>([ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSchema[]>([
@ -1157,6 +1164,7 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSch
type: 'date', type: 'date',
dateFormat: 'YYYY-MM-DD', dateFormat: 'YYYY-MM-DD',
valueFormat: 'x', valueFormat: 'x',
} }
}, },
tableForm: { tableForm: {
@ -1526,7 +1534,6 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSch
} }
}, },
tableForm: { tableForm: {
// disabled: true,
} }
}, },
{ {
@ -1595,7 +1602,6 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSch
} }
}, },
tableForm: { tableForm: {
// disabled: true,
} }
}, },
{ {

Loading…
Cancel
Save