diff --git a/src/views/Gw/appIPGrade/AppIPGradeForm.vue b/src/views/Gw/appIPGrade/AppIPGradeForm.vue
index d0ba5ba..9a44aa9 100644
--- a/src/views/Gw/appIPGrade/AppIPGradeForm.vue
+++ b/src/views/Gw/appIPGrade/AppIPGradeForm.vue
@@ -205,7 +205,7 @@ const formDataAInit: any = {
CheckTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
PutCenterTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
StartTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
- StopTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
+ StopTime:undefined,
InspectionResults: 1,
Ecode: "NotImp",
SgEntityId: "NotImp",
@@ -319,6 +319,9 @@ const fnDeleteA = async (row: any) => {
}
// 提交
const fnSubmitA = async () => {
+ if(formDataA.value.StopTime ==undefined ||formDataA.value.StopTime ==null || formDataA.value.StopTime ==''){
+ formDataA.value.StopTime = dayjs().format("YYYY-MM-DD HH:mm:ss")
+ }
await refFormA.value.validate().then(async (res: any) => {
if (!res) {
switch (formType.value) {
diff --git a/src/views/Gw/appQualityInspection/AppQualityInspectionForm.vue b/src/views/Gw/appQualityInspection/AppQualityInspectionForm.vue
index e9db9d2..aa8ff36 100644
--- a/src/views/Gw/appQualityInspection/AppQualityInspectionForm.vue
+++ b/src/views/Gw/appQualityInspection/AppQualityInspectionForm.vue
@@ -224,7 +224,7 @@ const formDataAInit: any = {
CheckTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
PutCenterTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
StartTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
- StopTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
+ StopTime: undefined,
InspectionResults: 1,
Ecode: "NotImp",
SgEntityId: "NotImp",
@@ -340,6 +340,9 @@ const fnDeleteA = async (row: any) => {
}
// 提交
const fnSubmitA = async () => {
+ if(formDataA.value.StopTime ==undefined ||formDataA.value.StopTime ==null || formDataA.value.StopTime ==''){
+ formDataA.value.StopTime = dayjs().format("YYYY-MM-DD HH:mm:ss")
+ }
await refFormA.value.validate().then(async (res: any) => {
if (!res) {
switch (formType.value) {
diff --git a/src/views/Gw/finishedProductWarehousing/FinishedProductWarehousing.vue b/src/views/Gw/finishedProductWarehousing/FinishedProductWarehousing.vue
index 323cd8e..351aad2 100644
--- a/src/views/Gw/finishedProductWarehousing/FinishedProductWarehousing.vue
+++ b/src/views/Gw/finishedProductWarehousing/FinishedProductWarehousing.vue
@@ -56,6 +56,7 @@ const gridOptionsA: any = reactive({
// { field: 'SwId', title: '实物ID', width: '110px' },
// { field: 'ProcessType', title: '感知过程', width: '110px' },
{ field: 'SupplierSupportId', title: '产品编号', width: '110px' },
+ { field: 'ProductModel', title: '产品型号', width: '110px' },
{ field: 'SpecifNumber', title: '规格型号', width: '110px' },
{ field: 'IsQualified', title: '是否合格', width: '110px' },
{ field: 'InventoryQuantity', title: '成品入库数量', width: '110px' },
@@ -86,10 +87,13 @@ const gridOptionsA: any = reactive({
titleAlign: 'right',
items: [
{ field: 'SupplierWorkNo', title: '供应商工单编号', span: 8, itemRender: { name: '$input', props: { placeholder: '请输入供应商工单编号' } } },
+ { field: 'SupplierSupportId', title: '产品编号', span: 8, itemRender: { name: '$input', props: { placeholder: '请输入产品编号' } } },
+ { field: 'ProductModel', title: '产品型号', span: 8, itemRender: { name: '$input', props: { placeholder: '请输入产品型号' } } },
+ { field: 'SpecifNumber', title: '规格型号', span: 8, folding: true, itemRender: { name: '$input', props: { placeholder: '请输入规格型号' } } },
// { field: 'SupplierCode', title: '国网侧供应商编码', span: 8, itemRender: { name: '$input', props: { placeholder: '请输入国网侧供应商编码' } } },
- { field: 'EquipmentUniqueCode', title: '生产设备唯一识别号', span: 8, itemRender: { name: '$input', props: { placeholder: '请输入生产设备唯一识别号' } } },
- { field: 'FactoryCode', title: '厂区编号', span: 8, itemRender: { name: '$input', props: { placeholder: '请输入厂区编号' } } },
- { field: 'SupplierSupportId', title: '供应商产品编号', span: 8, folding: true, itemRender: { name: '$input', props: { placeholder: '请输入供应商产品编号' } } },
+ // { field: 'EquipmentUniqueCode', title: '生产设备唯一识别号', span: 8, itemRender: { name: '$input', props: { placeholder: '请输入生产设备唯一识别号' } } },
+ // { field: 'FactoryCode', title: '厂区编号', span: 8, itemRender: { name: '$input', props: { placeholder: '请输入厂区编号' } } },
+ // { field: 'SupplierSupportId', title: '供应商产品编号', span: 8, folding: true, itemRender: { name: '$input', props: { placeholder: '请输入供应商产品编号' } } },
{ span: 24, align: 'center', collapseNode: true, itemRender: { name: '$buttons', children: [{ props: { type: 'submit', content: '查询', status: 'primary' } }, { props: { type: 'reset', content: '重置' } }] } }
]
},
diff --git a/src/views/Gw/finishedProductWarehousing/FinishedProductWarehousingForm.vue b/src/views/Gw/finishedProductWarehousing/FinishedProductWarehousingForm.vue
index d4f647d..f12e5c8 100644
--- a/src/views/Gw/finishedProductWarehousing/FinishedProductWarehousingForm.vue
+++ b/src/views/Gw/finishedProductWarehousing/FinishedProductWarehousingForm.vue
@@ -87,6 +87,12 @@
@change="fnChangeA(params)" style="width: 196px;">
+
+
+
+
+
-
@@ -232,6 +238,15 @@ const formRulesA: any = ref({
SupplierWorkNo: [
{ required: true, message: '请输入供应商工单编号' }
],
+ VoltageGrade: [
+ { required: true, message: '请输入电压等级' }
+ ],
+ ProductModel: [
+ { required: true, message: '请输入产品型号' }
+ ],
+ SpecifNumber: [
+ { required: true, message: '请输入规格型号' }
+ ],
EquipmentUniqueCode: [
{ required: true, message: '请输入生产设备唯一识别号' }
],
@@ -241,12 +256,12 @@ const formRulesA: any = ref({
PdCode: [
{ required: true, message: '请输入工序' }
],
- InspectionResults: [
- { required: true, message: '请选择是否通过' }
- ],
- TextDescription: [
- { required: true, message: '请选择' }
- ],
+ // InspectionResults: [
+ // { required: true, message: '请选择是否通过' }
+ // ],
+ // TextDescription: [
+ // { required: true, message: '请选择' }
+ // ],
})
// 挂载
onMounted(() => {
diff --git a/src/views/Gw/insulationResistance/InsulationResistanceForm.vue b/src/views/Gw/insulationResistance/InsulationResistanceForm.vue
index e3e0be4..0ae77ab 100644
--- a/src/views/Gw/insulationResistance/InsulationResistanceForm.vue
+++ b/src/views/Gw/insulationResistance/InsulationResistanceForm.vue
@@ -211,7 +211,7 @@ const formDataAInit: any = {
CheckTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
PutCenterTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
StartTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
- StopTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
+ StopTime: undefined,
InspectionResults: 1,
Ecode: "NotImp",
SgEntityId: "NotImp",
@@ -326,6 +326,9 @@ const fnDeleteA = async (row: any) => {
}
// 提交
const fnSubmitA = async () => {
+ if(formDataA.value.StopTime ==undefined ||formDataA.value.StopTime ==null || formDataA.value.StopTime ==''){
+ formDataA.value.StopTime = dayjs().format("YYYY-MM-DD HH:mm:ss")
+ }
await refFormA.value.validate().then(async (res: any) => {
if (!res) {
switch (formType.value) {
diff --git a/src/views/Gw/machineOperation/MachineOperationForm.vue b/src/views/Gw/machineOperation/MachineOperationForm.vue
index 2481eb2..3446029 100644
--- a/src/views/Gw/machineOperation/MachineOperationForm.vue
+++ b/src/views/Gw/machineOperation/MachineOperationForm.vue
@@ -208,7 +208,7 @@ const formDataAInit: any = {
CheckTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
PutCenterTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
StartTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
- StopTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
+ StopTime: undefined,
InspectionResults: 1,
Ecode: "NotImp",
SgEntityId: "NotImp",
@@ -320,6 +320,9 @@ const fnDeleteA = async (row: any) => {
}
// 提交
const fnSubmitA = async () => {
+ if(formDataA.value.StopTime ==undefined ||formDataA.value.StopTime ==null || formDataA.value.StopTime ==''){
+ formDataA.value.StopTime = dayjs().format("YYYY-MM-DD HH:mm:ss")
+ }
await refFormA.value.validate().then(async (res: any) => {
if (!res) {
switch (formType.value) {
diff --git a/src/views/Gw/phaseLossProtectionTesting/PhaseLossProtectionTestingForm.vue b/src/views/Gw/phaseLossProtectionTesting/PhaseLossProtectionTestingForm.vue
index 414ac92..e2f34db 100644
--- a/src/views/Gw/phaseLossProtectionTesting/PhaseLossProtectionTestingForm.vue
+++ b/src/views/Gw/phaseLossProtectionTesting/PhaseLossProtectionTestingForm.vue
@@ -209,7 +209,7 @@ const formDataAInit: any = {
CheckTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
PutCenterTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
StartTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
- StopTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
+ StopTime:undefined,
InspectionResults: 1,
Ecode: "NotImp",
SgEntityId: "NotImp",
@@ -323,6 +323,9 @@ const fnDeleteA = async (row: any) => {
}
// 提交
const fnSubmitA = async () => {
+ if(formDataA.value.StopTime ==undefined ||formDataA.value.StopTime ==null || formDataA.value.StopTime ==''){
+ formDataA.value.StopTime = dayjs().format("YYYY-MM-DD HH:mm:ss")
+ }
await refFormA.value.validate().then(async (res: any) => {
if (!res) {
switch (formType.value) {
diff --git a/src/views/Gw/powerFrequancyTesting/PowerFrequancyTestingForm.vue b/src/views/Gw/powerFrequancyTesting/PowerFrequancyTestingForm.vue
index 0dde0f8..1476798 100644
--- a/src/views/Gw/powerFrequancyTesting/PowerFrequancyTestingForm.vue
+++ b/src/views/Gw/powerFrequancyTesting/PowerFrequancyTestingForm.vue
@@ -261,7 +261,7 @@ const formDataAInit: any = {
CheckTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
PutCenterTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
StartTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
- StopTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
+ StopTime: undefined,
InspectionResults: 1,
Ecode: "NotImp",
SgEntityId: "NotImp",
@@ -433,6 +433,10 @@ const fnDeleteA = async (row: any) => {
}
// 提交
const fnSubmitA = async () => {
+ if(formDataA.value.StopTime ==undefined ||formDataA.value.StopTime ==null || formDataA.value.StopTime ==''){
+ formDataA.value.StopTime = dayjs().format("YYYY-MM-DD HH:mm:ss")
+ }
+
await refFormA.value.validate().then(async (res: any) => {
if (!res) {
switch (formType.value) {
diff --git a/src/views/Gw/powerOperationTesting/PowerOperationTestingForm.vue b/src/views/Gw/powerOperationTesting/PowerOperationTestingForm.vue
index b35413c..18ec5fa 100644
--- a/src/views/Gw/powerOperationTesting/PowerOperationTestingForm.vue
+++ b/src/views/Gw/powerOperationTesting/PowerOperationTestingForm.vue
@@ -209,7 +209,7 @@ const formDataAInit: any = {
CheckTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
PutCenterTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
StartTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
- StopTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
+ StopTime: undefined,
InspectionResults: 1,
Ecode: "NotImp",
SgEntityId: "NotImp",
@@ -325,6 +325,9 @@ const fnDeleteA = async (row: any) => {
}
// 提交
const fnSubmitA = async () => {
+ if(formDataA.value.StopTime ==undefined ||formDataA.value.StopTime ==null || formDataA.value.StopTime ==''){
+ formDataA.value.StopTime = dayjs().format("YYYY-MM-DD HH:mm:ss")
+ }
await refFormA.value.validate().then(async (res: any) => {
if (!res) {
switch (formType.value) {
diff --git a/src/views/Gw/protectionCircuit/ProtectionCircuitForm.vue b/src/views/Gw/protectionCircuit/ProtectionCircuitForm.vue
index 51ec3d9..451ba31 100644
--- a/src/views/Gw/protectionCircuit/ProtectionCircuitForm.vue
+++ b/src/views/Gw/protectionCircuit/ProtectionCircuitForm.vue
@@ -337,7 +337,7 @@ const formDataAInit: any = {
CheckTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
PutCenterTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
StartTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
- StopTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
+ StopTime: undefined,
InspectionResults: 1,
Ecode: "NotImp",
SgEntityId: "NotImp",
@@ -469,6 +469,9 @@ const fnDeleteA = async (row: any) => {
}
// 提交
const fnSubmitA = async () => {
+ if(formDataA.value.StopTime ==undefined ||formDataA.value.StopTime ==null || formDataA.value.StopTime ==''){
+ formDataA.value.StopTime = dayjs().format("YYYY-MM-DD HH:mm:ss")
+ }
await refFormA.value.validate().then(async (res: any) => {
if (!res) {
switch (formType.value) {
diff --git a/src/views/Gw/voltageProtection/VoltageProtectionForm.vue b/src/views/Gw/voltageProtection/VoltageProtectionForm.vue
index e76e67a..f27e070 100644
--- a/src/views/Gw/voltageProtection/VoltageProtectionForm.vue
+++ b/src/views/Gw/voltageProtection/VoltageProtectionForm.vue
@@ -209,7 +209,7 @@ const formDataAInit: any = {
CheckTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
PutCenterTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
StartTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
- StopTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
+ StopTime: undefined,
InspectionResults: 1,
Ecode: "NotImp",
SgEntityId: "NotImp",
@@ -323,6 +323,9 @@ const fnDeleteA = async (row: any) => {
}
// 提交
const fnSubmitA = async () => {
+ if(formDataA.value.StopTime ==undefined ||formDataA.value.StopTime ==null || formDataA.value.StopTime ==''){
+ formDataA.value.StopTime = dayjs().format("YYYY-MM-DD HH:mm:ss")
+ }
await refFormA.value.validate().then(async (res: any) => {
if (!res) {
switch (formType.value) {