diff --git a/src/views/Gw/DistributionBox.vue b/src/views/Gw/DistributionBox.vue index d3ffe61..95494a7 100644 --- a/src/views/Gw/DistributionBox.vue +++ b/src/views/Gw/DistributionBox.vue @@ -73,7 +73,7 @@ const items: any = ref([ title: '其它', children: [ { title: '成品入库', name: 'finishedProductWarehousing', iconfont: 'iconfont icon-chengpinruku' }, - { title: '文件上传', name: 'fileUpload', iconfont: 'iconfont icon-wenjianshangchuan' }, + // { title: '文件上传', name: 'fileUpload', iconfont: 'iconfont icon-wenjianshangchuan' }, // { title: '网关抓取日志', iconfont: 'iconfont icon-wangguanrizhi' }, ] } diff --git a/src/views/Gw/appIPGrade/AppIPGradeForm.vue b/src/views/Gw/appIPGrade/AppIPGradeForm.vue index 2e40865..9d7ea26 100644 --- a/src/views/Gw/appIPGrade/AppIPGradeForm.vue +++ b/src/views/Gw/appIPGrade/AppIPGradeForm.vue @@ -214,7 +214,7 @@ const formDataAInit: any = { SupplierCode: "1000032215", ModelCode: "dtb00003", CategoryType: "90003", - EquipmentUniqueCode: '', + EquipmentUniqueCode: 'GSZ0001', FactoryCode: '01', SupplierSupportId: '', PdCode: "GX000090", diff --git a/src/views/Gw/appQualityInspection/AppQualityInspectionForm.vue b/src/views/Gw/appQualityInspection/AppQualityInspectionForm.vue index 2265ed1..e53ae35 100644 --- a/src/views/Gw/appQualityInspection/AppQualityInspectionForm.vue +++ b/src/views/Gw/appQualityInspection/AppQualityInspectionForm.vue @@ -235,7 +235,7 @@ const formDataAInit: any = { SupplierCode: "1000032215", ModelCode: "dtb00003", CategoryType: "90003", - EquipmentUniqueCode: '', + EquipmentUniqueCode: 'LSD0001', FactoryCode: '01', SupplierSupportId: '', PdCode: "GX000094", diff --git a/src/views/Gw/boxAppStruct/BoxAppStructForm.vue b/src/views/Gw/boxAppStruct/BoxAppStructForm.vue index e152474..7b2d309 100644 --- a/src/views/Gw/boxAppStruct/BoxAppStructForm.vue +++ b/src/views/Gw/boxAppStruct/BoxAppStructForm.vue @@ -214,7 +214,7 @@ const formDataAInit: any = { SupplierCode: "1000032215", ModelCode: "dtb00003", CategoryType: "90003", - EquipmentUniqueCode: '', + EquipmentUniqueCode: 'JC0001', FactoryCode: '01', SupplierSupportId: '', PdCode: "GX000083", diff --git a/src/views/Gw/componentInspect/ComponentInspectForm.vue b/src/views/Gw/componentInspect/ComponentInspectForm.vue index e5fe52a..3fcc28a 100644 --- a/src/views/Gw/componentInspect/ComponentInspectForm.vue +++ b/src/views/Gw/componentInspect/ComponentInspectForm.vue @@ -206,7 +206,7 @@ const formDataAInit: any = { SupplierCode: "1000032215", ModelCode: "dtb00003", CategoryType: "90003", - EquipmentUniqueCode: '', + EquipmentUniqueCode: 'LSD0001', FactoryCode: '01', SupplierSupportId: '', PdCode: "GX000081", diff --git a/src/views/Gw/daoXian/DaoXianForm.vue b/src/views/Gw/daoXian/DaoXianForm.vue index 55f3f03..30ee813 100644 --- a/src/views/Gw/daoXian/DaoXianForm.vue +++ b/src/views/Gw/daoXian/DaoXianForm.vue @@ -238,7 +238,7 @@ const formDataAInit: any = { SupplierCode: "1000032215", ModelCode: "dtb00003", CategoryType: "90003", - EquipmentUniqueCode: '', + EquipmentUniqueCode: 'YBKC0001', FactoryCode: '01', SupplierSupportId: '', PdCode: "GX000082", diff --git a/src/views/Gw/elecDistance/ElecDistanceForm.vue b/src/views/Gw/elecDistance/ElecDistanceForm.vue index 752e4dc..1364549 100644 --- a/src/views/Gw/elecDistance/ElecDistanceForm.vue +++ b/src/views/Gw/elecDistance/ElecDistanceForm.vue @@ -206,7 +206,7 @@ const formDataAInit: any = { SupplierCode: "1000032215", ModelCode: "dtb00003", CategoryType: "90003", - EquipmentUniqueCode: '', + EquipmentUniqueCode: 'YBKC0001', FactoryCode: '', SupplierSupportId: '', PdCode: "GX000085", diff --git a/src/views/Gw/elecGap/ElecGapForm.vue b/src/views/Gw/elecGap/ElecGapForm.vue index 18294ad..7522171 100644 --- a/src/views/Gw/elecGap/ElecGapForm.vue +++ b/src/views/Gw/elecGap/ElecGapForm.vue @@ -203,7 +203,7 @@ const formDataAInit: any = { "SupplierCode": "1000032215", "ModelCode": "dtb00003", "CategoryType": "90003", - "EquipmentUniqueCode": '', + "EquipmentUniqueCode": 'YBKC0001', "FactoryCode": '01', "SupplierSupportId": '', "PdCode": "GX000084", diff --git a/src/views/Gw/finishedProductWarehousing/FinishedProductWarehousingForm.vue b/src/views/Gw/finishedProductWarehousing/FinishedProductWarehousingForm.vue index b50ca61..26bde00 100644 --- a/src/views/Gw/finishedProductWarehousing/FinishedProductWarehousingForm.vue +++ b/src/views/Gw/finishedProductWarehousing/FinishedProductWarehousingForm.vue @@ -246,7 +246,7 @@ const formDataA: any = ref( "InventoryQuantity": 1, "MeasuringUnit": "台", "StorageTime": dayjs().format("YYYY-MM-DD HH:mm:ss"), - "DeliveryStatus": 2, + "DeliveryStatus": 1, "DeliveryTime": dayjs().format("YYYY-MM-DD"), "CheckTime": dayjs().format("YYYY-MM-DD HH:mm:ss"), "PutCenterTime": dayjs().format("YYYY-MM-DD HH:mm:ss"), @@ -421,7 +421,7 @@ const fnResetA = () => { "InventoryQuantity": 1, "MeasuringUnit": "台", "StorageTime": dayjs().format("YYYY-MM-DD HH:mm:ss"), - "DeliveryStatus": 2, + "DeliveryStatus": 1, "DeliveryTime": dayjs().format("YYYY-MM-DD"), "CheckTime": dayjs().format("YYYY-MM-DD HH:mm:ss"), "PutCenterTime": dayjs().format("YYYY-MM-DD HH:mm:ss"), diff --git a/src/views/Gw/insulationResistance/InsulationResistanceForm.vue b/src/views/Gw/insulationResistance/InsulationResistanceForm.vue index e31bbf4..f5b31f6 100644 --- a/src/views/Gw/insulationResistance/InsulationResistanceForm.vue +++ b/src/views/Gw/insulationResistance/InsulationResistanceForm.vue @@ -220,7 +220,7 @@ const formDataAInit: any = { SupplierCode: "1000032215", ModelCode: "dtb00003", CategoryType: "90003", - EquipmentUniqueCode: '', + EquipmentUniqueCode: 'JYDZCSY0001', FactoryCode: '', SupplierSupportId: '', PdCode: "GX000090", diff --git a/src/views/Gw/machineOperation/MachineOperationForm.vue b/src/views/Gw/machineOperation/MachineOperationForm.vue index 836156a..6c816a4 100644 --- a/src/views/Gw/machineOperation/MachineOperationForm.vue +++ b/src/views/Gw/machineOperation/MachineOperationForm.vue @@ -217,7 +217,7 @@ const formDataAInit: any = { SupplierCode: "1000032215", ModelCode: "dtb00003", CategoryType: "90003", - EquipmentUniqueCode: '', + EquipmentUniqueCode: 'SB0001', FactoryCode: '01', SupplierSupportId: '', PdCode: "GX000086", diff --git a/src/views/Gw/phaseLossProtectionTesting/PhaseLossProtectionTestingForm.vue b/src/views/Gw/phaseLossProtectionTesting/PhaseLossProtectionTestingForm.vue index aa6ad91..f3e652e 100644 --- a/src/views/Gw/phaseLossProtectionTesting/PhaseLossProtectionTestingForm.vue +++ b/src/views/Gw/phaseLossProtectionTesting/PhaseLossProtectionTestingForm.vue @@ -218,7 +218,7 @@ const formDataAInit: any = { SupplierCode: "1000032215", ModelCode: "dtb00003", CategoryType: "90003", - EquipmentUniqueCode: '', + EquipmentUniqueCode: 'SYT0001', FactoryCode: '01', SupplierSupportId: '', PdCode: "GX000091", diff --git a/src/views/Gw/powerFrequancyTesting/PowerFrequancyTestingForm.vue b/src/views/Gw/powerFrequancyTesting/PowerFrequancyTestingForm.vue index 733cf5c..9f8a2a8 100644 --- a/src/views/Gw/powerFrequancyTesting/PowerFrequancyTestingForm.vue +++ b/src/views/Gw/powerFrequancyTesting/PowerFrequancyTestingForm.vue @@ -270,7 +270,7 @@ const formDataAInit: any = { SupplierCode: "1000032215", ModelCode: "dtb00003", CategoryType: "90003", - EquipmentUniqueCode: 'ID16107BC', + EquipmentUniqueCode: 'ID16107BC873084', FactoryCode: '01', SupplierSupportId: '', PdCode: "GX000092", diff --git a/src/views/Gw/powerOperationTesting/PowerOperationTestingForm.vue b/src/views/Gw/powerOperationTesting/PowerOperationTestingForm.vue index caf1db8..90d7251 100644 --- a/src/views/Gw/powerOperationTesting/PowerOperationTestingForm.vue +++ b/src/views/Gw/powerOperationTesting/PowerOperationTestingForm.vue @@ -218,7 +218,7 @@ const formDataAInit: any = { SupplierCode: "1000032215", ModelCode: "dtb00003", CategoryType: "90003", - EquipmentUniqueCode: '', + EquipmentUniqueCode: 'SYT0001', FactoryCode: '01', SupplierSupportId: '', PdCode: "GX000088", diff --git a/src/views/Gw/protectionCircuit/ProtectionCircuitForm.vue b/src/views/Gw/protectionCircuit/ProtectionCircuitForm.vue index d3b3278..3ea4f0e 100644 --- a/src/views/Gw/protectionCircuit/ProtectionCircuitForm.vue +++ b/src/views/Gw/protectionCircuit/ProtectionCircuitForm.vue @@ -345,7 +345,7 @@ const formDataAInit: any = { SupplierCode: "1000032215", ModelCode: "dtb00003", CategoryType: "90003", - EquipmentUniqueCode: 'ID16113BC', + EquipmentUniqueCode: 'ID16113BC873085', FactoryCode: '01', SupplierSupportId: '', PdCode: "GX000087", diff --git a/src/views/Gw/user/UserForm.vue b/src/views/Gw/user/UserForm.vue index ac55603..784ec17 100644 --- a/src/views/Gw/user/UserForm.vue +++ b/src/views/Gw/user/UserForm.vue @@ -20,14 +20,14 @@ - - - + + + @@ -57,7 +57,8 @@ const modalTitle = ref('未知表单') // 表单 const refFormA = ref() // 表单类型[add - 新增|update - 修改|del - 删除] -const formTypeA: any = ref('') +const formTypeA: any = ref(true) +const active: any = ref("") // 表单A - 初始数据 const formDataAInit: any = { Id: 0, @@ -74,6 +75,9 @@ const fnChangeA = (params: any) => { const formDataA: any = ref(formDataAInit) // 表单规则 const formRulesA: any = ref({ + UserName: [ + { required: true, message: '用户名不能为空' } + ], Password: [ { required: true, message: '密码不能为空' } ] @@ -84,7 +88,8 @@ onMounted(() => { }) // 打开弹窗 const open = async (type: string, row?: any) => { - formTypeA.value = type + active.value = type + formTypeA.value = type=="add"?false:true await fnResetA() switch (type) { case 'add': @@ -104,36 +109,41 @@ const open = async (type: string, row?: any) => { const rowInfoA = await comApi.getUser(paramsA) console.log(rowInfoA) formDataA.value = rowInfoA.Data + formDataA.value.Password='' break; } } // 提交 const fnSubmitA = async () => { - switch (formTypeA.value) { - case 'add': - const paramsA = { - data: formDataA.value + await refFormA.value.validate().then(async (res: any) => { + if(!res){ + switch (active.value) { + case 'add': + const paramsA = { + data: formDataA.value + } + await comApi.saveUser(paramsA) + VXETable.modal.message({ content: '新增成功', status: 'success' }) + break; + case 'edit': + let setVal: any = _map(formDataA.value, (o1, k1) => { + return { field: k1, value: o1 } + }) + const paramsB = { + filter: { + field: 'ID', + value: formDataA.value.ID + }, + set: setVal + } + await comApi.editUser(paramsB) + VXETable.modal.message({ content: '修改成功', status: 'success' }) + break; } - await comApi.saveUser(paramsA) - VXETable.modal.message({ content: '新增成功', status: 'success' }) - break; - case 'edit': - let setVal: any = _map(formDataA.value, (o1, k1) => { - return { field: k1, value: o1 } - }) - const paramsB = { - filter: { - field: 'ID', - value: formDataA.value.ID - }, - set: setVal - } - await comApi.editUser(paramsB) - VXETable.modal.message({ content: '修改成功', status: 'success' }) - break; - } - refShow.value = false - emit('success') + refShow.value = false + emit('success') + } + }) } // 提供open方法打开弹窗 diff --git a/src/views/Gw/voltageProtection/VoltageProtectionForm.vue b/src/views/Gw/voltageProtection/VoltageProtectionForm.vue index c2df032..7156312 100644 --- a/src/views/Gw/voltageProtection/VoltageProtectionForm.vue +++ b/src/views/Gw/voltageProtection/VoltageProtectionForm.vue @@ -219,7 +219,7 @@ const formDataAInit: any = { SupplierCode: "1000032215", ModelCode: "dtb00003", CategoryType: "90003", - EquipmentUniqueCode: '', + EquipmentUniqueCode: 'SYT0001', FactoryCode: '01', SupplierSupportId: '', PdCode: "GX000089",