diff --git a/.env.development b/.env.development index b7ccb77..b87a9f3 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,8 @@ # VITE_APP_API_BASEURL = http://139.198.29.133:8089 VITE_APP_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://192.168.8.100:5909 -VITE_METER_API_BASEURL = http://111.198.10.15:21606 +# VITE_METER_API_BASEURL = http://111.198.10.15:21606 +VITE_METER_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://192.168.8.107:5909 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 diff --git a/.env.development b/.env.development index b7ccb77..b87a9f3 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,8 @@ # VITE_APP_API_BASEURL = http://139.198.29.133:8089 VITE_APP_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://192.168.8.100:5909 -VITE_METER_API_BASEURL = http://111.198.10.15:21606 +# VITE_METER_API_BASEURL = http://111.198.10.15:21606 +VITE_METER_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://192.168.8.107:5909 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 diff --git a/public/config/config.json b/public/config/config.json index 4e81ae5..d2da659 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,7 +1,7 @@ { "title":"计量业务系统", "baseUrl": "http://111.198.10.15:21611", - "baseUrlBusiness": "http://111.198.10.15:21606", + "baseUrlBusiness": "http://111.198.10.15:21611", "pathDict": { "fbfpsbgl":"/reviewpage/detail", "fbfmlgl":"/directorypage/detail", diff --git a/.env.development b/.env.development index b7ccb77..b87a9f3 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,8 @@ # VITE_APP_API_BASEURL = http://139.198.29.133:8089 VITE_APP_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://192.168.8.100:5909 -VITE_METER_API_BASEURL = http://111.198.10.15:21606 +# VITE_METER_API_BASEURL = http://111.198.10.15:21606 +VITE_METER_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://192.168.8.107:5909 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 diff --git a/public/config/config.json b/public/config/config.json index 4e81ae5..d2da659 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,7 +1,7 @@ { "title":"计量业务系统", "baseUrl": "http://111.198.10.15:21611", - "baseUrlBusiness": "http://111.198.10.15:21606", + "baseUrlBusiness": "http://111.198.10.15:21611", "pathDict": { "fbfpsbgl":"/reviewpage/detail", "fbfmlgl":"/directorypage/detail", diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue index 30e2c2c..83ce3e2 100644 --- a/src/components/scanEquipmentDialog/index.vue +++ b/src/components/scanEquipmentDialog/index.vue @@ -200,7 +200,7 @@ - diff --git a/.env.development b/.env.development index b7ccb77..b87a9f3 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,8 @@ # VITE_APP_API_BASEURL = http://139.198.29.133:8089 VITE_APP_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://192.168.8.100:5909 -VITE_METER_API_BASEURL = http://111.198.10.15:21606 +# VITE_METER_API_BASEURL = http://111.198.10.15:21606 +VITE_METER_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://192.168.8.107:5909 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 diff --git a/public/config/config.json b/public/config/config.json index 4e81ae5..d2da659 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,7 +1,7 @@ { "title":"计量业务系统", "baseUrl": "http://111.198.10.15:21611", - "baseUrlBusiness": "http://111.198.10.15:21606", + "baseUrlBusiness": "http://111.198.10.15:21611", "pathDict": { "fbfpsbgl":"/reviewpage/detail", "fbfmlgl":"/directorypage/detail", diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue index 30e2c2c..83ce3e2 100644 --- a/src/components/scanEquipmentDialog/index.vue +++ b/src/components/scanEquipmentDialog/index.vue @@ -200,7 +200,7 @@ - diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts index 9214173..8b37e75 100644 --- a/src/router/modules/tested.ts +++ b/src/router/modules/tested.ts @@ -252,6 +252,18 @@ activeMenu: '/meteringcurator', }, }, + { + path: '/curatorpage/:type', + name: 'MeteringdetEdit', + component: () => import('@/views/tested/MeasurementPlan/dept/components/edit.vue'), + meta: { + title: '负责人送检通知编辑', + auth: '/tested/metering/curator', + sidebar: false, + breadcrumb: false, + activeMenu: '/meteringcurator', + }, + }, ], }, { diff --git a/.env.development b/.env.development index b7ccb77..b87a9f3 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,8 @@ # VITE_APP_API_BASEURL = http://139.198.29.133:8089 VITE_APP_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://192.168.8.100:5909 -VITE_METER_API_BASEURL = http://111.198.10.15:21606 +# VITE_METER_API_BASEURL = http://111.198.10.15:21606 +VITE_METER_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://192.168.8.107:5909 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 diff --git a/public/config/config.json b/public/config/config.json index 4e81ae5..d2da659 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,7 +1,7 @@ { "title":"计量业务系统", "baseUrl": "http://111.198.10.15:21611", - "baseUrlBusiness": "http://111.198.10.15:21606", + "baseUrlBusiness": "http://111.198.10.15:21611", "pathDict": { "fbfpsbgl":"/reviewpage/detail", "fbfmlgl":"/directorypage/detail", diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue index 30e2c2c..83ce3e2 100644 --- a/src/components/scanEquipmentDialog/index.vue +++ b/src/components/scanEquipmentDialog/index.vue @@ -200,7 +200,7 @@ - diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts index 9214173..8b37e75 100644 --- a/src/router/modules/tested.ts +++ b/src/router/modules/tested.ts @@ -252,6 +252,18 @@ activeMenu: '/meteringcurator', }, }, + { + path: '/curatorpage/:type', + name: 'MeteringdetEdit', + component: () => import('@/views/tested/MeasurementPlan/dept/components/edit.vue'), + meta: { + title: '负责人送检通知编辑', + auth: '/tested/metering/curator', + sidebar: false, + breadcrumb: false, + activeMenu: '/meteringcurator', + }, + }, ], }, { diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue index 5833d2e..0e62a9f 100644 --- a/src/views/tested/MeasurementPlan/dept/components/list.vue +++ b/src/views/tested/MeasurementPlan/dept/components/list.vue @@ -120,8 +120,9 @@ const $router = useRouter() // 新建编辑操作 const handler = (row: any, type: string) => { + const path = $props.notifyType === '1' ? 'curatorpage' : 'meteringdept' $router.push({ - path: `/meteringdept/${type}`, + path: `/${path}/${type}`, query: { row: JSON.stringify(row), id: row.id, diff --git a/.env.development b/.env.development index b7ccb77..b87a9f3 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,8 @@ # VITE_APP_API_BASEURL = http://139.198.29.133:8089 VITE_APP_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://192.168.8.100:5909 -VITE_METER_API_BASEURL = http://111.198.10.15:21606 +# VITE_METER_API_BASEURL = http://111.198.10.15:21606 +VITE_METER_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://192.168.8.107:5909 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 diff --git a/public/config/config.json b/public/config/config.json index 4e81ae5..d2da659 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,7 +1,7 @@ { "title":"计量业务系统", "baseUrl": "http://111.198.10.15:21611", - "baseUrlBusiness": "http://111.198.10.15:21606", + "baseUrlBusiness": "http://111.198.10.15:21611", "pathDict": { "fbfpsbgl":"/reviewpage/detail", "fbfmlgl":"/directorypage/detail", diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue index 30e2c2c..83ce3e2 100644 --- a/src/components/scanEquipmentDialog/index.vue +++ b/src/components/scanEquipmentDialog/index.vue @@ -200,7 +200,7 @@ - diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts index 9214173..8b37e75 100644 --- a/src/router/modules/tested.ts +++ b/src/router/modules/tested.ts @@ -252,6 +252,18 @@ activeMenu: '/meteringcurator', }, }, + { + path: '/curatorpage/:type', + name: 'MeteringdetEdit', + component: () => import('@/views/tested/MeasurementPlan/dept/components/edit.vue'), + meta: { + title: '负责人送检通知编辑', + auth: '/tested/metering/curator', + sidebar: false, + breadcrumb: false, + activeMenu: '/meteringcurator', + }, + }, ], }, { diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue index 5833d2e..0e62a9f 100644 --- a/src/views/tested/MeasurementPlan/dept/components/list.vue +++ b/src/views/tested/MeasurementPlan/dept/components/list.vue @@ -120,8 +120,9 @@ const $router = useRouter() // 新建编辑操作 const handler = (row: any, type: string) => { + const path = $props.notifyType === '1' ? 'curatorpage' : 'meteringdept' $router.push({ - path: `/meteringdept/${type}`, + path: `/${path}/${type}`, query: { row: JSON.stringify(row), id: row.id, diff --git a/src/views/tested/MeasurementPlan/early/components/edit.vue b/src/views/tested/MeasurementPlan/early/components/edit.vue index 405b6df..3d92213 100644 --- a/src/views/tested/MeasurementPlan/early/components/edit.vue +++ b/src/views/tested/MeasurementPlan/early/components/edit.vue @@ -36,6 +36,7 @@ approvalType: $route.query.approvalType, reason: '', equipmentList: [], + id: '', }) // 表单 const rules = ref({ reason: [{ required: true, message: '送检原因必填', trigger: ['blur', 'change'] }], @@ -86,6 +87,7 @@ const tableRef = ref() // 保存 const submitId = ref('') +const disabledSave = ref(false) const saveForm = async (formEl: FormInstance | undefined) => { if (!formEl) { return } await formEl.validate((valid, fields) => { @@ -100,8 +102,13 @@ type: 'warning', }, ).then((res) => { + disabledSave.value = true ruleForm.value.equipmentList = tableRef.value.list + if (submitId.value) { + ruleForm.value.id = submitId.value + } editApply(ruleForm.value).then((res) => { + disabledSave.value = false submitId.value = res.data if (statusName === '已取消' || statusName === '未通过') { submitApply({ id: res.data, formId: $route.query.approvalType === '0' ? SCHEDULE.METERING_PLAN_EARLY : SCHEDULE.METERING_PLAN_DEALY }).then((res) => { @@ -192,7 +199,7 @@ 提交 - + 保存 diff --git a/.env.development b/.env.development index b7ccb77..b87a9f3 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,8 @@ # VITE_APP_API_BASEURL = http://139.198.29.133:8089 VITE_APP_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://192.168.8.100:5909 -VITE_METER_API_BASEURL = http://111.198.10.15:21606 +# VITE_METER_API_BASEURL = http://111.198.10.15:21606 +VITE_METER_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://192.168.8.107:5909 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 diff --git a/public/config/config.json b/public/config/config.json index 4e81ae5..d2da659 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,7 +1,7 @@ { "title":"计量业务系统", "baseUrl": "http://111.198.10.15:21611", - "baseUrlBusiness": "http://111.198.10.15:21606", + "baseUrlBusiness": "http://111.198.10.15:21611", "pathDict": { "fbfpsbgl":"/reviewpage/detail", "fbfmlgl":"/directorypage/detail", diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue index 30e2c2c..83ce3e2 100644 --- a/src/components/scanEquipmentDialog/index.vue +++ b/src/components/scanEquipmentDialog/index.vue @@ -200,7 +200,7 @@ - diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts index 9214173..8b37e75 100644 --- a/src/router/modules/tested.ts +++ b/src/router/modules/tested.ts @@ -252,6 +252,18 @@ activeMenu: '/meteringcurator', }, }, + { + path: '/curatorpage/:type', + name: 'MeteringdetEdit', + component: () => import('@/views/tested/MeasurementPlan/dept/components/edit.vue'), + meta: { + title: '负责人送检通知编辑', + auth: '/tested/metering/curator', + sidebar: false, + breadcrumb: false, + activeMenu: '/meteringcurator', + }, + }, ], }, { diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue index 5833d2e..0e62a9f 100644 --- a/src/views/tested/MeasurementPlan/dept/components/list.vue +++ b/src/views/tested/MeasurementPlan/dept/components/list.vue @@ -120,8 +120,9 @@ const $router = useRouter() // 新建编辑操作 const handler = (row: any, type: string) => { + const path = $props.notifyType === '1' ? 'curatorpage' : 'meteringdept' $router.push({ - path: `/meteringdept/${type}`, + path: `/${path}/${type}`, query: { row: JSON.stringify(row), id: row.id, diff --git a/src/views/tested/MeasurementPlan/early/components/edit.vue b/src/views/tested/MeasurementPlan/early/components/edit.vue index 405b6df..3d92213 100644 --- a/src/views/tested/MeasurementPlan/early/components/edit.vue +++ b/src/views/tested/MeasurementPlan/early/components/edit.vue @@ -36,6 +36,7 @@ approvalType: $route.query.approvalType, reason: '', equipmentList: [], + id: '', }) // 表单 const rules = ref({ reason: [{ required: true, message: '送检原因必填', trigger: ['blur', 'change'] }], @@ -86,6 +87,7 @@ const tableRef = ref() // 保存 const submitId = ref('') +const disabledSave = ref(false) const saveForm = async (formEl: FormInstance | undefined) => { if (!formEl) { return } await formEl.validate((valid, fields) => { @@ -100,8 +102,13 @@ type: 'warning', }, ).then((res) => { + disabledSave.value = true ruleForm.value.equipmentList = tableRef.value.list + if (submitId.value) { + ruleForm.value.id = submitId.value + } editApply(ruleForm.value).then((res) => { + disabledSave.value = false submitId.value = res.data if (statusName === '已取消' || statusName === '未通过') { submitApply({ id: res.data, formId: $route.query.approvalType === '0' ? SCHEDULE.METERING_PLAN_EARLY : SCHEDULE.METERING_PLAN_DEALY }).then((res) => { @@ -192,7 +199,7 @@ 提交 - + 保存 diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue index ca37520..50711ce 100644 --- a/src/views/tested/MeasurementPlan/plan/components/edit.vue +++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue @@ -133,6 +133,7 @@ const tableRef = ref() // 保存 const submitId = ref('') +const disabledSave = ref(false) const saveForm = async (formEl: FormInstance | undefined) => { if (!formEl) { return } await formEl.validate((valid, _fields) => { @@ -147,6 +148,7 @@ type: 'warning', }, ).then((_res) => { + disabledSave.value = true if ($route.query.category as string === 'season' || typeFlag.value === '1') { ruleForm.value.planName = `${currentYear.value}年第${ruleForm.value.season}季度计量计划` ruleForm.value.planType = '1' @@ -157,7 +159,11 @@ } ruleForm.value.equipmentIds = tableRef.value.list.map((item: any) => item.equipmentId) // console.log(tableRef.value.list, 'tableRef.value.list') + if (submitId.value) { + ruleForm.value.id = submitId.value + } editPlan(ruleForm.value).then((res) => { + disabledSave.value = false submitId.value = res.data // close() if (statusName === '已取消' || statusName === '未通过') { @@ -280,7 +286,7 @@ 提交 - + 保存 diff --git a/.env.development b/.env.development index b7ccb77..b87a9f3 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,8 @@ # VITE_APP_API_BASEURL = http://139.198.29.133:8089 VITE_APP_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://192.168.8.100:5909 -VITE_METER_API_BASEURL = http://111.198.10.15:21606 +# VITE_METER_API_BASEURL = http://111.198.10.15:21606 +VITE_METER_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://192.168.8.107:5909 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 diff --git a/public/config/config.json b/public/config/config.json index 4e81ae5..d2da659 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,7 +1,7 @@ { "title":"计量业务系统", "baseUrl": "http://111.198.10.15:21611", - "baseUrlBusiness": "http://111.198.10.15:21606", + "baseUrlBusiness": "http://111.198.10.15:21611", "pathDict": { "fbfpsbgl":"/reviewpage/detail", "fbfmlgl":"/directorypage/detail", diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue index 30e2c2c..83ce3e2 100644 --- a/src/components/scanEquipmentDialog/index.vue +++ b/src/components/scanEquipmentDialog/index.vue @@ -200,7 +200,7 @@ - diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts index 9214173..8b37e75 100644 --- a/src/router/modules/tested.ts +++ b/src/router/modules/tested.ts @@ -252,6 +252,18 @@ activeMenu: '/meteringcurator', }, }, + { + path: '/curatorpage/:type', + name: 'MeteringdetEdit', + component: () => import('@/views/tested/MeasurementPlan/dept/components/edit.vue'), + meta: { + title: '负责人送检通知编辑', + auth: '/tested/metering/curator', + sidebar: false, + breadcrumb: false, + activeMenu: '/meteringcurator', + }, + }, ], }, { diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue index 5833d2e..0e62a9f 100644 --- a/src/views/tested/MeasurementPlan/dept/components/list.vue +++ b/src/views/tested/MeasurementPlan/dept/components/list.vue @@ -120,8 +120,9 @@ const $router = useRouter() // 新建编辑操作 const handler = (row: any, type: string) => { + const path = $props.notifyType === '1' ? 'curatorpage' : 'meteringdept' $router.push({ - path: `/meteringdept/${type}`, + path: `/${path}/${type}`, query: { row: JSON.stringify(row), id: row.id, diff --git a/src/views/tested/MeasurementPlan/early/components/edit.vue b/src/views/tested/MeasurementPlan/early/components/edit.vue index 405b6df..3d92213 100644 --- a/src/views/tested/MeasurementPlan/early/components/edit.vue +++ b/src/views/tested/MeasurementPlan/early/components/edit.vue @@ -36,6 +36,7 @@ approvalType: $route.query.approvalType, reason: '', equipmentList: [], + id: '', }) // 表单 const rules = ref({ reason: [{ required: true, message: '送检原因必填', trigger: ['blur', 'change'] }], @@ -86,6 +87,7 @@ const tableRef = ref() // 保存 const submitId = ref('') +const disabledSave = ref(false) const saveForm = async (formEl: FormInstance | undefined) => { if (!formEl) { return } await formEl.validate((valid, fields) => { @@ -100,8 +102,13 @@ type: 'warning', }, ).then((res) => { + disabledSave.value = true ruleForm.value.equipmentList = tableRef.value.list + if (submitId.value) { + ruleForm.value.id = submitId.value + } editApply(ruleForm.value).then((res) => { + disabledSave.value = false submitId.value = res.data if (statusName === '已取消' || statusName === '未通过') { submitApply({ id: res.data, formId: $route.query.approvalType === '0' ? SCHEDULE.METERING_PLAN_EARLY : SCHEDULE.METERING_PLAN_DEALY }).then((res) => { @@ -192,7 +199,7 @@ 提交 - + 保存 diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue index ca37520..50711ce 100644 --- a/src/views/tested/MeasurementPlan/plan/components/edit.vue +++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue @@ -133,6 +133,7 @@ const tableRef = ref() // 保存 const submitId = ref('') +const disabledSave = ref(false) const saveForm = async (formEl: FormInstance | undefined) => { if (!formEl) { return } await formEl.validate((valid, _fields) => { @@ -147,6 +148,7 @@ type: 'warning', }, ).then((_res) => { + disabledSave.value = true if ($route.query.category as string === 'season' || typeFlag.value === '1') { ruleForm.value.planName = `${currentYear.value}年第${ruleForm.value.season}季度计量计划` ruleForm.value.planType = '1' @@ -157,7 +159,11 @@ } ruleForm.value.equipmentIds = tableRef.value.list.map((item: any) => item.equipmentId) // console.log(tableRef.value.list, 'tableRef.value.list') + if (submitId.value) { + ruleForm.value.id = submitId.value + } editPlan(ruleForm.value).then((res) => { + disabledSave.value = false submitId.value = res.data // close() if (statusName === '已取消' || statusName === '未通过') { @@ -280,7 +286,7 @@ 提交 - + 保存 diff --git a/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue b/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue index aa4287a..cbeac96 100644 --- a/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue +++ b/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue @@ -154,6 +154,7 @@ option.series = { data: props.seriesData, type: 'bar', + barWidth: 15, } } if (props.yAxisData && props.yAxisData.length > 0) { diff --git a/.env.development b/.env.development index b7ccb77..b87a9f3 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,8 @@ # VITE_APP_API_BASEURL = http://139.198.29.133:8089 VITE_APP_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://192.168.8.100:5909 -VITE_METER_API_BASEURL = http://111.198.10.15:21606 +# VITE_METER_API_BASEURL = http://111.198.10.15:21606 +VITE_METER_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://192.168.8.107:5909 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 diff --git a/public/config/config.json b/public/config/config.json index 4e81ae5..d2da659 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,7 +1,7 @@ { "title":"计量业务系统", "baseUrl": "http://111.198.10.15:21611", - "baseUrlBusiness": "http://111.198.10.15:21606", + "baseUrlBusiness": "http://111.198.10.15:21611", "pathDict": { "fbfpsbgl":"/reviewpage/detail", "fbfmlgl":"/directorypage/detail", diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue index 30e2c2c..83ce3e2 100644 --- a/src/components/scanEquipmentDialog/index.vue +++ b/src/components/scanEquipmentDialog/index.vue @@ -200,7 +200,7 @@ - diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts index 9214173..8b37e75 100644 --- a/src/router/modules/tested.ts +++ b/src/router/modules/tested.ts @@ -252,6 +252,18 @@ activeMenu: '/meteringcurator', }, }, + { + path: '/curatorpage/:type', + name: 'MeteringdetEdit', + component: () => import('@/views/tested/MeasurementPlan/dept/components/edit.vue'), + meta: { + title: '负责人送检通知编辑', + auth: '/tested/metering/curator', + sidebar: false, + breadcrumb: false, + activeMenu: '/meteringcurator', + }, + }, ], }, { diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue index 5833d2e..0e62a9f 100644 --- a/src/views/tested/MeasurementPlan/dept/components/list.vue +++ b/src/views/tested/MeasurementPlan/dept/components/list.vue @@ -120,8 +120,9 @@ const $router = useRouter() // 新建编辑操作 const handler = (row: any, type: string) => { + const path = $props.notifyType === '1' ? 'curatorpage' : 'meteringdept' $router.push({ - path: `/meteringdept/${type}`, + path: `/${path}/${type}`, query: { row: JSON.stringify(row), id: row.id, diff --git a/src/views/tested/MeasurementPlan/early/components/edit.vue b/src/views/tested/MeasurementPlan/early/components/edit.vue index 405b6df..3d92213 100644 --- a/src/views/tested/MeasurementPlan/early/components/edit.vue +++ b/src/views/tested/MeasurementPlan/early/components/edit.vue @@ -36,6 +36,7 @@ approvalType: $route.query.approvalType, reason: '', equipmentList: [], + id: '', }) // 表单 const rules = ref({ reason: [{ required: true, message: '送检原因必填', trigger: ['blur', 'change'] }], @@ -86,6 +87,7 @@ const tableRef = ref() // 保存 const submitId = ref('') +const disabledSave = ref(false) const saveForm = async (formEl: FormInstance | undefined) => { if (!formEl) { return } await formEl.validate((valid, fields) => { @@ -100,8 +102,13 @@ type: 'warning', }, ).then((res) => { + disabledSave.value = true ruleForm.value.equipmentList = tableRef.value.list + if (submitId.value) { + ruleForm.value.id = submitId.value + } editApply(ruleForm.value).then((res) => { + disabledSave.value = false submitId.value = res.data if (statusName === '已取消' || statusName === '未通过') { submitApply({ id: res.data, formId: $route.query.approvalType === '0' ? SCHEDULE.METERING_PLAN_EARLY : SCHEDULE.METERING_PLAN_DEALY }).then((res) => { @@ -192,7 +199,7 @@ 提交 - + 保存 diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue index ca37520..50711ce 100644 --- a/src/views/tested/MeasurementPlan/plan/components/edit.vue +++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue @@ -133,6 +133,7 @@ const tableRef = ref() // 保存 const submitId = ref('') +const disabledSave = ref(false) const saveForm = async (formEl: FormInstance | undefined) => { if (!formEl) { return } await formEl.validate((valid, _fields) => { @@ -147,6 +148,7 @@ type: 'warning', }, ).then((_res) => { + disabledSave.value = true if ($route.query.category as string === 'season' || typeFlag.value === '1') { ruleForm.value.planName = `${currentYear.value}年第${ruleForm.value.season}季度计量计划` ruleForm.value.planType = '1' @@ -157,7 +159,11 @@ } ruleForm.value.equipmentIds = tableRef.value.list.map((item: any) => item.equipmentId) // console.log(tableRef.value.list, 'tableRef.value.list') + if (submitId.value) { + ruleForm.value.id = submitId.value + } editPlan(ruleForm.value).then((res) => { + disabledSave.value = false submitId.value = res.data // close() if (statusName === '已取消' || statusName === '未通过') { @@ -280,7 +286,7 @@ 提交 - + 保存 diff --git a/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue b/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue index aa4287a..cbeac96 100644 --- a/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue +++ b/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue @@ -154,6 +154,7 @@ option.series = { data: props.seriesData, type: 'bar', + barWidth: 15, } } if (props.yAxisData && props.yAxisData.length > 0) { diff --git a/src/views/tested/dashboard/components/BarChartVertical.vue b/src/views/tested/dashboard/components/BarChartVertical.vue index 9598215..3954e2f 100644 --- a/src/views/tested/dashboard/components/BarChartVertical.vue +++ b/src/views/tested/dashboard/components/BarChartVertical.vue @@ -371,6 +371,7 @@ { data: props.data as any[], type: 'bar', + barWidth: 15, }, ] // 横轴, 水平柱状图，y轴为横轴 } diff --git a/.env.development b/.env.development index b7ccb77..b87a9f3 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,8 @@ # VITE_APP_API_BASEURL = http://139.198.29.133:8089 VITE_APP_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://192.168.8.100:5909 -VITE_METER_API_BASEURL = http://111.198.10.15:21606 +# VITE_METER_API_BASEURL = http://111.198.10.15:21606 +VITE_METER_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://192.168.8.107:5909 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 diff --git a/public/config/config.json b/public/config/config.json index 4e81ae5..d2da659 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,7 +1,7 @@ { "title":"计量业务系统", "baseUrl": "http://111.198.10.15:21611", - "baseUrlBusiness": "http://111.198.10.15:21606", + "baseUrlBusiness": "http://111.198.10.15:21611", "pathDict": { "fbfpsbgl":"/reviewpage/detail", "fbfmlgl":"/directorypage/detail", diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue index 30e2c2c..83ce3e2 100644 --- a/src/components/scanEquipmentDialog/index.vue +++ b/src/components/scanEquipmentDialog/index.vue @@ -200,7 +200,7 @@ - diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts index 9214173..8b37e75 100644 --- a/src/router/modules/tested.ts +++ b/src/router/modules/tested.ts @@ -252,6 +252,18 @@ activeMenu: '/meteringcurator', }, }, + { + path: '/curatorpage/:type', + name: 'MeteringdetEdit', + component: () => import('@/views/tested/MeasurementPlan/dept/components/edit.vue'), + meta: { + title: '负责人送检通知编辑', + auth: '/tested/metering/curator', + sidebar: false, + breadcrumb: false, + activeMenu: '/meteringcurator', + }, + }, ], }, { diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue index 5833d2e..0e62a9f 100644 --- a/src/views/tested/MeasurementPlan/dept/components/list.vue +++ b/src/views/tested/MeasurementPlan/dept/components/list.vue @@ -120,8 +120,9 @@ const $router = useRouter() // 新建编辑操作 const handler = (row: any, type: string) => { + const path = $props.notifyType === '1' ? 'curatorpage' : 'meteringdept' $router.push({ - path: `/meteringdept/${type}`, + path: `/${path}/${type}`, query: { row: JSON.stringify(row), id: row.id, diff --git a/src/views/tested/MeasurementPlan/early/components/edit.vue b/src/views/tested/MeasurementPlan/early/components/edit.vue index 405b6df..3d92213 100644 --- a/src/views/tested/MeasurementPlan/early/components/edit.vue +++ b/src/views/tested/MeasurementPlan/early/components/edit.vue @@ -36,6 +36,7 @@ approvalType: $route.query.approvalType, reason: '', equipmentList: [], + id: '', }) // 表单 const rules = ref({ reason: [{ required: true, message: '送检原因必填', trigger: ['blur', 'change'] }], @@ -86,6 +87,7 @@ const tableRef = ref() // 保存 const submitId = ref('') +const disabledSave = ref(false) const saveForm = async (formEl: FormInstance | undefined) => { if (!formEl) { return } await formEl.validate((valid, fields) => { @@ -100,8 +102,13 @@ type: 'warning', }, ).then((res) => { + disabledSave.value = true ruleForm.value.equipmentList = tableRef.value.list + if (submitId.value) { + ruleForm.value.id = submitId.value + } editApply(ruleForm.value).then((res) => { + disabledSave.value = false submitId.value = res.data if (statusName === '已取消' || statusName === '未通过') { submitApply({ id: res.data, formId: $route.query.approvalType === '0' ? SCHEDULE.METERING_PLAN_EARLY : SCHEDULE.METERING_PLAN_DEALY }).then((res) => { @@ -192,7 +199,7 @@ 提交 - + 保存 diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue index ca37520..50711ce 100644 --- a/src/views/tested/MeasurementPlan/plan/components/edit.vue +++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue @@ -133,6 +133,7 @@ const tableRef = ref() // 保存 const submitId = ref('') +const disabledSave = ref(false) const saveForm = async (formEl: FormInstance | undefined) => { if (!formEl) { return } await formEl.validate((valid, _fields) => { @@ -147,6 +148,7 @@ type: 'warning', }, ).then((_res) => { + disabledSave.value = true if ($route.query.category as string === 'season' || typeFlag.value === '1') { ruleForm.value.planName = `${currentYear.value}年第${ruleForm.value.season}季度计量计划` ruleForm.value.planType = '1' @@ -157,7 +159,11 @@ } ruleForm.value.equipmentIds = tableRef.value.list.map((item: any) => item.equipmentId) // console.log(tableRef.value.list, 'tableRef.value.list') + if (submitId.value) { + ruleForm.value.id = submitId.value + } editPlan(ruleForm.value).then((res) => { + disabledSave.value = false submitId.value = res.data // close() if (statusName === '已取消' || statusName === '未通过') { @@ -280,7 +286,7 @@ 提交 - + 保存 diff --git a/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue b/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue index aa4287a..cbeac96 100644 --- a/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue +++ b/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue @@ -154,6 +154,7 @@ option.series = { data: props.seriesData, type: 'bar', + barWidth: 15, } } if (props.yAxisData && props.yAxisData.length > 0) { diff --git a/src/views/tested/dashboard/components/BarChartVertical.vue b/src/views/tested/dashboard/components/BarChartVertical.vue index 9598215..3954e2f 100644 --- a/src/views/tested/dashboard/components/BarChartVertical.vue +++ b/src/views/tested/dashboard/components/BarChartVertical.vue @@ -371,6 +371,7 @@ { data: props.data as any[], type: 'bar', + barWidth: 15, }, ] // 横轴, 水平柱状图，y轴为横轴 } diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue index 9fd9307..4a5658e 100644 --- a/src/views/tested/device/info/components/edit.vue +++ b/src/views/tested/device/info/components/edit.vue @@ -373,6 +373,7 @@ const tableRef = ref() const technologyRef = ref() const certificateRef = ref() +const disabledSave = ref(false) // 保存 const saveForm = async (formEl: FormInstance | undefined, formEl1: FormInstance | undefined, formEl2: FormInstance | undefined) => { console.log(formEl, formEl1) @@ -389,6 +390,7 @@ type: 'warning', }, ).then((res) => { + disabledSave.value = true ruleForm.value.attachments = tableRef.value.list ruleForm.value.technicalTargetList = technologyRef.value.list // if (!ruleForm.value.groupInfos.length) { @@ -398,8 +400,12 @@ // 特种设备 ruleForm.value.certificateList = certificateRef.value.list } + if (submitId.value !== '未提交' && submitId.value !== '') { + ruleForm.value.id = submitId.value + } editInfo(ruleForm.value).then((res) => { submitId.value = res.data + disabledSave.value = false if (statusName === '已取消' || statusName === '未通过') { submitInfo({ id: submitId.value, formId: SCHEDULE.DEVICE_INFO_APPROVAL }).then((res) => { ElMessage.success('已提交') @@ -603,7 +609,7 @@ 提交 - + 保存 diff --git a/.env.development b/.env.development index b7ccb77..b87a9f3 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,8 @@ # VITE_APP_API_BASEURL = http://139.198.29.133:8089 VITE_APP_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://192.168.8.100:5909 -VITE_METER_API_BASEURL = http://111.198.10.15:21606 +# VITE_METER_API_BASEURL = http://111.198.10.15:21606 +VITE_METER_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://192.168.8.107:5909 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 diff --git a/public/config/config.json b/public/config/config.json index 4e81ae5..d2da659 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,7 +1,7 @@ { "title":"计量业务系统", "baseUrl": "http://111.198.10.15:21611", - "baseUrlBusiness": "http://111.198.10.15:21606", + "baseUrlBusiness": "http://111.198.10.15:21611", "pathDict": { "fbfpsbgl":"/reviewpage/detail", "fbfmlgl":"/directorypage/detail", diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue index 30e2c2c..83ce3e2 100644 --- a/src/components/scanEquipmentDialog/index.vue +++ b/src/components/scanEquipmentDialog/index.vue @@ -200,7 +200,7 @@ - diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts index 9214173..8b37e75 100644 --- a/src/router/modules/tested.ts +++ b/src/router/modules/tested.ts @@ -252,6 +252,18 @@ activeMenu: '/meteringcurator', }, }, + { + path: '/curatorpage/:type', + name: 'MeteringdetEdit', + component: () => import('@/views/tested/MeasurementPlan/dept/components/edit.vue'), + meta: { + title: '负责人送检通知编辑', + auth: '/tested/metering/curator', + sidebar: false, + breadcrumb: false, + activeMenu: '/meteringcurator', + }, + }, ], }, { diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue index 5833d2e..0e62a9f 100644 --- a/src/views/tested/MeasurementPlan/dept/components/list.vue +++ b/src/views/tested/MeasurementPlan/dept/components/list.vue @@ -120,8 +120,9 @@ const $router = useRouter() // 新建编辑操作 const handler = (row: any, type: string) => { + const path = $props.notifyType === '1' ? 'curatorpage' : 'meteringdept' $router.push({ - path: `/meteringdept/${type}`, + path: `/${path}/${type}`, query: { row: JSON.stringify(row), id: row.id, diff --git a/src/views/tested/MeasurementPlan/early/components/edit.vue b/src/views/tested/MeasurementPlan/early/components/edit.vue index 405b6df..3d92213 100644 --- a/src/views/tested/MeasurementPlan/early/components/edit.vue +++ b/src/views/tested/MeasurementPlan/early/components/edit.vue @@ -36,6 +36,7 @@ approvalType: $route.query.approvalType, reason: '', equipmentList: [], + id: '', }) // 表单 const rules = ref({ reason: [{ required: true, message: '送检原因必填', trigger: ['blur', 'change'] }], @@ -86,6 +87,7 @@ const tableRef = ref() // 保存 const submitId = ref('') +const disabledSave = ref(false) const saveForm = async (formEl: FormInstance | undefined) => { if (!formEl) { return } await formEl.validate((valid, fields) => { @@ -100,8 +102,13 @@ type: 'warning', }, ).then((res) => { + disabledSave.value = true ruleForm.value.equipmentList = tableRef.value.list + if (submitId.value) { + ruleForm.value.id = submitId.value + } editApply(ruleForm.value).then((res) => { + disabledSave.value = false submitId.value = res.data if (statusName === '已取消' || statusName === '未通过') { submitApply({ id: res.data, formId: $route.query.approvalType === '0' ? SCHEDULE.METERING_PLAN_EARLY : SCHEDULE.METERING_PLAN_DEALY }).then((res) => { @@ -192,7 +199,7 @@ 提交 - + 保存 diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue index ca37520..50711ce 100644 --- a/src/views/tested/MeasurementPlan/plan/components/edit.vue +++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue @@ -133,6 +133,7 @@ const tableRef = ref() // 保存 const submitId = ref('') +const disabledSave = ref(false) const saveForm = async (formEl: FormInstance | undefined) => { if (!formEl) { return } await formEl.validate((valid, _fields) => { @@ -147,6 +148,7 @@ type: 'warning', }, ).then((_res) => { + disabledSave.value = true if ($route.query.category as string === 'season' || typeFlag.value === '1') { ruleForm.value.planName = `${currentYear.value}年第${ruleForm.value.season}季度计量计划` ruleForm.value.planType = '1' @@ -157,7 +159,11 @@ } ruleForm.value.equipmentIds = tableRef.value.list.map((item: any) => item.equipmentId) // console.log(tableRef.value.list, 'tableRef.value.list') + if (submitId.value) { + ruleForm.value.id = submitId.value + } editPlan(ruleForm.value).then((res) => { + disabledSave.value = false submitId.value = res.data // close() if (statusName === '已取消' || statusName === '未通过') { @@ -280,7 +286,7 @@ 提交 - + 保存 diff --git a/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue b/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue index aa4287a..cbeac96 100644 --- a/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue +++ b/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue @@ -154,6 +154,7 @@ option.series = { data: props.seriesData, type: 'bar', + barWidth: 15, } } if (props.yAxisData && props.yAxisData.length > 0) { diff --git a/src/views/tested/dashboard/components/BarChartVertical.vue b/src/views/tested/dashboard/components/BarChartVertical.vue index 9598215..3954e2f 100644 --- a/src/views/tested/dashboard/components/BarChartVertical.vue +++ b/src/views/tested/dashboard/components/BarChartVertical.vue @@ -371,6 +371,7 @@ { data: props.data as any[], type: 'bar', + barWidth: 15, }, ] // 横轴, 水平柱状图，y轴为横轴 } diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue index 9fd9307..4a5658e 100644 --- a/src/views/tested/device/info/components/edit.vue +++ b/src/views/tested/device/info/components/edit.vue @@ -373,6 +373,7 @@ const tableRef = ref() const technologyRef = ref() const certificateRef = ref() +const disabledSave = ref(false) // 保存 const saveForm = async (formEl: FormInstance | undefined, formEl1: FormInstance | undefined, formEl2: FormInstance | undefined) => { console.log(formEl, formEl1) @@ -389,6 +390,7 @@ type: 'warning', }, ).then((res) => { + disabledSave.value = true ruleForm.value.attachments = tableRef.value.list ruleForm.value.technicalTargetList = technologyRef.value.list // if (!ruleForm.value.groupInfos.length) { @@ -398,8 +400,12 @@ // 特种设备 ruleForm.value.certificateList = certificateRef.value.list } + if (submitId.value !== '未提交' && submitId.value !== '') { + ruleForm.value.id = submitId.value + } editInfo(ruleForm.value).then((res) => { submitId.value = res.data + disabledSave.value = false if (statusName === '已取消' || statusName === '未通过') { submitInfo({ id: submitId.value, formId: SCHEDULE.DEVICE_INFO_APPROVAL }).then((res) => { ElMessage.success('已提交') @@ -603,7 +609,7 @@ 提交 - + 保存 diff --git a/src/views/tested/status/delay/components/edit.vue b/src/views/tested/status/delay/components/edit.vue index 19ca488..2c88cab 100644 --- a/src/views/tested/status/delay/components/edit.vue +++ b/src/views/tested/status/delay/components/edit.vue @@ -131,6 +131,7 @@ $router.back() } const annexRef = ref() +const disabledSave = ref(false) // 保存 const saveForm = async (formEl: FormInstance | undefined, formEl1: FormInstance | undefined) => { if (!formEl || !formEl1) { return } @@ -146,9 +147,14 @@ type: 'warning', }, ).then((res) => { + disabledSave.value = true + if (submitId.value) { + ruleForm.value.id = submitId.value + } ruleForm.value.attachments = annexRef.value.list ruleForm.value.equipmentInfo = undefined editStatus(ruleForm.value).then((res) => { + disabledSave.value = false submitId.value = res.data if (statusName === '已取消' || statusName === '未通过') { submitStatus({ id: submitId.value, formId: formIdDict.value[Number($route.query.statusType as string)] }).then((res) => { @@ -286,7 +292,7 @@ 提交 - + 保存 diff --git a/.env.development b/.env.development index b7ccb77..b87a9f3 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,8 @@ # VITE_APP_API_BASEURL = http://139.198.29.133:8089 VITE_APP_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://192.168.8.100:5909 -VITE_METER_API_BASEURL = http://111.198.10.15:21606 +# VITE_METER_API_BASEURL = http://111.198.10.15:21606 +VITE_METER_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://192.168.8.107:5909 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 diff --git a/public/config/config.json b/public/config/config.json index 4e81ae5..d2da659 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,7 +1,7 @@ { "title":"计量业务系统", "baseUrl": "http://111.198.10.15:21611", - "baseUrlBusiness": "http://111.198.10.15:21606", + "baseUrlBusiness": "http://111.198.10.15:21611", "pathDict": { "fbfpsbgl":"/reviewpage/detail", "fbfmlgl":"/directorypage/detail", diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue index 30e2c2c..83ce3e2 100644 --- a/src/components/scanEquipmentDialog/index.vue +++ b/src/components/scanEquipmentDialog/index.vue @@ -200,7 +200,7 @@ - diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts index 9214173..8b37e75 100644 --- a/src/router/modules/tested.ts +++ b/src/router/modules/tested.ts @@ -252,6 +252,18 @@ activeMenu: '/meteringcurator', }, }, + { + path: '/curatorpage/:type', + name: 'MeteringdetEdit', + component: () => import('@/views/tested/MeasurementPlan/dept/components/edit.vue'), + meta: { + title: '负责人送检通知编辑', + auth: '/tested/metering/curator', + sidebar: false, + breadcrumb: false, + activeMenu: '/meteringcurator', + }, + }, ], }, { diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue index 5833d2e..0e62a9f 100644 --- a/src/views/tested/MeasurementPlan/dept/components/list.vue +++ b/src/views/tested/MeasurementPlan/dept/components/list.vue @@ -120,8 +120,9 @@ const $router = useRouter() // 新建编辑操作 const handler = (row: any, type: string) => { + const path = $props.notifyType === '1' ? 'curatorpage' : 'meteringdept' $router.push({ - path: `/meteringdept/${type}`, + path: `/${path}/${type}`, query: { row: JSON.stringify(row), id: row.id, diff --git a/src/views/tested/MeasurementPlan/early/components/edit.vue b/src/views/tested/MeasurementPlan/early/components/edit.vue index 405b6df..3d92213 100644 --- a/src/views/tested/MeasurementPlan/early/components/edit.vue +++ b/src/views/tested/MeasurementPlan/early/components/edit.vue @@ -36,6 +36,7 @@ approvalType: $route.query.approvalType, reason: '', equipmentList: [], + id: '', }) // 表单 const rules = ref({ reason: [{ required: true, message: '送检原因必填', trigger: ['blur', 'change'] }], @@ -86,6 +87,7 @@ const tableRef = ref() // 保存 const submitId = ref('') +const disabledSave = ref(false) const saveForm = async (formEl: FormInstance | undefined) => { if (!formEl) { return } await formEl.validate((valid, fields) => { @@ -100,8 +102,13 @@ type: 'warning', }, ).then((res) => { + disabledSave.value = true ruleForm.value.equipmentList = tableRef.value.list + if (submitId.value) { + ruleForm.value.id = submitId.value + } editApply(ruleForm.value).then((res) => { + disabledSave.value = false submitId.value = res.data if (statusName === '已取消' || statusName === '未通过') { submitApply({ id: res.data, formId: $route.query.approvalType === '0' ? SCHEDULE.METERING_PLAN_EARLY : SCHEDULE.METERING_PLAN_DEALY }).then((res) => { @@ -192,7 +199,7 @@ 提交 - + 保存 diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue index ca37520..50711ce 100644 --- a/src/views/tested/MeasurementPlan/plan/components/edit.vue +++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue @@ -133,6 +133,7 @@ const tableRef = ref() // 保存 const submitId = ref('') +const disabledSave = ref(false) const saveForm = async (formEl: FormInstance | undefined) => { if (!formEl) { return } await formEl.validate((valid, _fields) => { @@ -147,6 +148,7 @@ type: 'warning', }, ).then((_res) => { + disabledSave.value = true if ($route.query.category as string === 'season' || typeFlag.value === '1') { ruleForm.value.planName = `${currentYear.value}年第${ruleForm.value.season}季度计量计划` ruleForm.value.planType = '1' @@ -157,7 +159,11 @@ } ruleForm.value.equipmentIds = tableRef.value.list.map((item: any) => item.equipmentId) // console.log(tableRef.value.list, 'tableRef.value.list') + if (submitId.value) { + ruleForm.value.id = submitId.value + } editPlan(ruleForm.value).then((res) => { + disabledSave.value = false submitId.value = res.data // close() if (statusName === '已取消' || statusName === '未通过') { @@ -280,7 +286,7 @@ 提交 - + 保存 diff --git a/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue b/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue index aa4287a..cbeac96 100644 --- a/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue +++ b/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue @@ -154,6 +154,7 @@ option.series = { data: props.seriesData, type: 'bar', + barWidth: 15, } } if (props.yAxisData && props.yAxisData.length > 0) { diff --git a/src/views/tested/dashboard/components/BarChartVertical.vue b/src/views/tested/dashboard/components/BarChartVertical.vue index 9598215..3954e2f 100644 --- a/src/views/tested/dashboard/components/BarChartVertical.vue +++ b/src/views/tested/dashboard/components/BarChartVertical.vue @@ -371,6 +371,7 @@ { data: props.data as any[], type: 'bar', + barWidth: 15, }, ] // 横轴, 水平柱状图，y轴为横轴 } diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue index 9fd9307..4a5658e 100644 --- a/src/views/tested/device/info/components/edit.vue +++ b/src/views/tested/device/info/components/edit.vue @@ -373,6 +373,7 @@ const tableRef = ref() const technologyRef = ref() const certificateRef = ref() +const disabledSave = ref(false) // 保存 const saveForm = async (formEl: FormInstance | undefined, formEl1: FormInstance | undefined, formEl2: FormInstance | undefined) => { console.log(formEl, formEl1) @@ -389,6 +390,7 @@ type: 'warning', }, ).then((res) => { + disabledSave.value = true ruleForm.value.attachments = tableRef.value.list ruleForm.value.technicalTargetList = technologyRef.value.list // if (!ruleForm.value.groupInfos.length) { @@ -398,8 +400,12 @@ // 特种设备 ruleForm.value.certificateList = certificateRef.value.list } + if (submitId.value !== '未提交' && submitId.value !== '') { + ruleForm.value.id = submitId.value + } editInfo(ruleForm.value).then((res) => { submitId.value = res.data + disabledSave.value = false if (statusName === '已取消' || statusName === '未通过') { submitInfo({ id: submitId.value, formId: SCHEDULE.DEVICE_INFO_APPROVAL }).then((res) => { ElMessage.success('已提交') @@ -603,7 +609,7 @@ 提交 - + 保存 diff --git a/src/views/tested/status/delay/components/edit.vue b/src/views/tested/status/delay/components/edit.vue index 19ca488..2c88cab 100644 --- a/src/views/tested/status/delay/components/edit.vue +++ b/src/views/tested/status/delay/components/edit.vue @@ -131,6 +131,7 @@ $router.back() } const annexRef = ref() +const disabledSave = ref(false) // 保存 const saveForm = async (formEl: FormInstance | undefined, formEl1: FormInstance | undefined) => { if (!formEl || !formEl1) { return } @@ -146,9 +147,14 @@ type: 'warning', }, ).then((res) => { + disabledSave.value = true + if (submitId.value) { + ruleForm.value.id = submitId.value + } ruleForm.value.attachments = annexRef.value.list ruleForm.value.equipmentInfo = undefined editStatus(ruleForm.value).then((res) => { + disabledSave.value = false submitId.value = res.data if (statusName === '已取消' || statusName === '未通过') { submitStatus({ id: submitId.value, formId: formIdDict.value[Number($route.query.statusType as string)] }).then((res) => { @@ -286,7 +292,7 @@ 提交 - + 保存 diff --git a/src/views/tested/subpackage/directory/components/edit.vue b/src/views/tested/subpackage/directory/components/edit.vue index 3725dd9..690cfd4 100644 --- a/src/views/tested/subpackage/directory/components/edit.vue +++ b/src/views/tested/subpackage/directory/components/edit.vue @@ -215,7 +215,7 @@ const close = () => { $router.back() } - +const disabledSave = ref(false) // 保存 const saveForm = async (formEl: FormInstance | undefined) => { if (!formEl) { return } @@ -231,6 +231,10 @@ type: 'warning', }, ).then((res) => { + disabledSave.value = true + if (submitId.value) { + ruleForm.value.id = submitId.value + } const data = { subcontractor: ruleForm.value, abilityList: capacityRef.value.list, // 业务能力 @@ -238,6 +242,7 @@ staffList: personRef.value.list, // 分包人员 } editDirectory(data, $route.query.statusName as string).then((res) => { + disabledSave.value = false submitId.value = res.data if (statusName === '已取消' || statusName === '未通过') { submitDirectory({ id: submitId.value, formId: SCHEDULE.SUBCONTRACTOR_APPROVAL }).then((res) => { @@ -387,7 +392,7 @@ 提交 - + 保存 @@ -404,7 +409,7 @@ - + @@ -572,7 +577,7 @@ -
+
diff --git a/.env.development b/.env.development index b7ccb77..b87a9f3 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,8 @@ # VITE_APP_API_BASEURL = http://139.198.29.133:8089 VITE_APP_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://192.168.8.100:5909 -VITE_METER_API_BASEURL = http://111.198.10.15:21606 +# VITE_METER_API_BASEURL = http://111.198.10.15:21606 +VITE_METER_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://192.168.8.107:5909 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 diff --git a/public/config/config.json b/public/config/config.json index 4e81ae5..d2da659 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,7 +1,7 @@ { "title":"计量业务系统", "baseUrl": "http://111.198.10.15:21611", - "baseUrlBusiness": "http://111.198.10.15:21606", + "baseUrlBusiness": "http://111.198.10.15:21611", "pathDict": { "fbfpsbgl":"/reviewpage/detail", "fbfmlgl":"/directorypage/detail", diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue index 30e2c2c..83ce3e2 100644 --- a/src/components/scanEquipmentDialog/index.vue +++ b/src/components/scanEquipmentDialog/index.vue @@ -200,7 +200,7 @@ - diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts index 9214173..8b37e75 100644 --- a/src/router/modules/tested.ts +++ b/src/router/modules/tested.ts @@ -252,6 +252,18 @@ activeMenu: '/meteringcurator', }, }, + { + path: '/curatorpage/:type', + name: 'MeteringdetEdit', + component: () => import('@/views/tested/MeasurementPlan/dept/components/edit.vue'), + meta: { + title: '负责人送检通知编辑', + auth: '/tested/metering/curator', + sidebar: false, + breadcrumb: false, + activeMenu: '/meteringcurator', + }, + }, ], }, { diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue index 5833d2e..0e62a9f 100644 --- a/src/views/tested/MeasurementPlan/dept/components/list.vue +++ b/src/views/tested/MeasurementPlan/dept/components/list.vue @@ -120,8 +120,9 @@ const $router = useRouter() // 新建编辑操作 const handler = (row: any, type: string) => { + const path = $props.notifyType === '1' ? 'curatorpage' : 'meteringdept' $router.push({ - path: `/meteringdept/${type}`, + path: `/${path}/${type}`, query: { row: JSON.stringify(row), id: row.id, diff --git a/src/views/tested/MeasurementPlan/early/components/edit.vue b/src/views/tested/MeasurementPlan/early/components/edit.vue index 405b6df..3d92213 100644 --- a/src/views/tested/MeasurementPlan/early/components/edit.vue +++ b/src/views/tested/MeasurementPlan/early/components/edit.vue @@ -36,6 +36,7 @@ approvalType: $route.query.approvalType, reason: '', equipmentList: [], + id: '', }) // 表单 const rules = ref({ reason: [{ required: true, message: '送检原因必填', trigger: ['blur', 'change'] }], @@ -86,6 +87,7 @@ const tableRef = ref() // 保存 const submitId = ref('') +const disabledSave = ref(false) const saveForm = async (formEl: FormInstance | undefined) => { if (!formEl) { return } await formEl.validate((valid, fields) => { @@ -100,8 +102,13 @@ type: 'warning', }, ).then((res) => { + disabledSave.value = true ruleForm.value.equipmentList = tableRef.value.list + if (submitId.value) { + ruleForm.value.id = submitId.value + } editApply(ruleForm.value).then((res) => { + disabledSave.value = false submitId.value = res.data if (statusName === '已取消' || statusName === '未通过') { submitApply({ id: res.data, formId: $route.query.approvalType === '0' ? SCHEDULE.METERING_PLAN_EARLY : SCHEDULE.METERING_PLAN_DEALY }).then((res) => { @@ -192,7 +199,7 @@ 提交 - + 保存 diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue index ca37520..50711ce 100644 --- a/src/views/tested/MeasurementPlan/plan/components/edit.vue +++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue @@ -133,6 +133,7 @@ const tableRef = ref() // 保存 const submitId = ref('') +const disabledSave = ref(false) const saveForm = async (formEl: FormInstance | undefined) => { if (!formEl) { return } await formEl.validate((valid, _fields) => { @@ -147,6 +148,7 @@ type: 'warning', }, ).then((_res) => { + disabledSave.value = true if ($route.query.category as string === 'season' || typeFlag.value === '1') { ruleForm.value.planName = `${currentYear.value}年第${ruleForm.value.season}季度计量计划` ruleForm.value.planType = '1' @@ -157,7 +159,11 @@ } ruleForm.value.equipmentIds = tableRef.value.list.map((item: any) => item.equipmentId) // console.log(tableRef.value.list, 'tableRef.value.list') + if (submitId.value) { + ruleForm.value.id = submitId.value + } editPlan(ruleForm.value).then((res) => { + disabledSave.value = false submitId.value = res.data // close() if (statusName === '已取消' || statusName === '未通过') { @@ -280,7 +286,7 @@ 提交 - + 保存 diff --git a/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue b/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue index aa4287a..cbeac96 100644 --- a/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue +++ b/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue @@ -154,6 +154,7 @@ option.series = { data: props.seriesData, type: 'bar', + barWidth: 15, } } if (props.yAxisData && props.yAxisData.length > 0) { diff --git a/src/views/tested/dashboard/components/BarChartVertical.vue b/src/views/tested/dashboard/components/BarChartVertical.vue index 9598215..3954e2f 100644 --- a/src/views/tested/dashboard/components/BarChartVertical.vue +++ b/src/views/tested/dashboard/components/BarChartVertical.vue @@ -371,6 +371,7 @@ { data: props.data as any[], type: 'bar', + barWidth: 15, }, ] // 横轴, 水平柱状图，y轴为横轴 } diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue index 9fd9307..4a5658e 100644 --- a/src/views/tested/device/info/components/edit.vue +++ b/src/views/tested/device/info/components/edit.vue @@ -373,6 +373,7 @@ const tableRef = ref() const technologyRef = ref() const certificateRef = ref() +const disabledSave = ref(false) // 保存 const saveForm = async (formEl: FormInstance | undefined, formEl1: FormInstance | undefined, formEl2: FormInstance | undefined) => { console.log(formEl, formEl1) @@ -389,6 +390,7 @@ type: 'warning', }, ).then((res) => { + disabledSave.value = true ruleForm.value.attachments = tableRef.value.list ruleForm.value.technicalTargetList = technologyRef.value.list // if (!ruleForm.value.groupInfos.length) { @@ -398,8 +400,12 @@ // 特种设备 ruleForm.value.certificateList = certificateRef.value.list } + if (submitId.value !== '未提交' && submitId.value !== '') { + ruleForm.value.id = submitId.value + } editInfo(ruleForm.value).then((res) => { submitId.value = res.data + disabledSave.value = false if (statusName === '已取消' || statusName === '未通过') { submitInfo({ id: submitId.value, formId: SCHEDULE.DEVICE_INFO_APPROVAL }).then((res) => { ElMessage.success('已提交') @@ -603,7 +609,7 @@ 提交 - + 保存 diff --git a/src/views/tested/status/delay/components/edit.vue b/src/views/tested/status/delay/components/edit.vue index 19ca488..2c88cab 100644 --- a/src/views/tested/status/delay/components/edit.vue +++ b/src/views/tested/status/delay/components/edit.vue @@ -131,6 +131,7 @@ $router.back() } const annexRef = ref() +const disabledSave = ref(false) // 保存 const saveForm = async (formEl: FormInstance | undefined, formEl1: FormInstance | undefined) => { if (!formEl || !formEl1) { return } @@ -146,9 +147,14 @@ type: 'warning', }, ).then((res) => { + disabledSave.value = true + if (submitId.value) { + ruleForm.value.id = submitId.value + } ruleForm.value.attachments = annexRef.value.list ruleForm.value.equipmentInfo = undefined editStatus(ruleForm.value).then((res) => { + disabledSave.value = false submitId.value = res.data if (statusName === '已取消' || statusName === '未通过') { submitStatus({ id: submitId.value, formId: formIdDict.value[Number($route.query.statusType as string)] }).then((res) => { @@ -286,7 +292,7 @@ 提交 - + 保存 diff --git a/src/views/tested/subpackage/directory/components/edit.vue b/src/views/tested/subpackage/directory/components/edit.vue index 3725dd9..690cfd4 100644 --- a/src/views/tested/subpackage/directory/components/edit.vue +++ b/src/views/tested/subpackage/directory/components/edit.vue @@ -215,7 +215,7 @@ const close = () => { $router.back() } - +const disabledSave = ref(false) // 保存 const saveForm = async (formEl: FormInstance | undefined) => { if (!formEl) { return } @@ -231,6 +231,10 @@ type: 'warning', }, ).then((res) => { + disabledSave.value = true + if (submitId.value) { + ruleForm.value.id = submitId.value + } const data = { subcontractor: ruleForm.value, abilityList: capacityRef.value.list, // 业务能力 @@ -238,6 +242,7 @@ staffList: personRef.value.list, // 分包人员 } editDirectory(data, $route.query.statusName as string).then((res) => { + disabledSave.value = false submitId.value = res.data if (statusName === '已取消' || statusName === '未通过') { submitDirectory({ id: submitId.value, formId: SCHEDULE.SUBCONTRACTOR_APPROVAL }).then((res) => { @@ -387,7 +392,7 @@ 提交 - + 保存 @@ -404,7 +409,7 @@ - + @@ -572,7 +577,7 @@
-
+
diff --git a/src/views/tested/subpackage/directory/components/list.vue b/src/views/tested/subpackage/directory/components/list.vue index b144a8a..ba0934d 100644 --- a/src/views/tested/subpackage/directory/components/list.vue +++ b/src/views/tested/subpackage/directory/components/list.vue @@ -35,7 +35,7 @@ }) const columns = ref([ { - text: '分包方编号', + text: '编号', value: 'subcontractorNo', align: 'center', }, diff --git a/.env.development b/.env.development index b7ccb77..b87a9f3 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,8 @@ # VITE_APP_API_BASEURL = http://139.198.29.133:8089 VITE_APP_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://192.168.8.100:5909 -VITE_METER_API_BASEURL = http://111.198.10.15:21606 +# VITE_METER_API_BASEURL = http://111.198.10.15:21606 +VITE_METER_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://192.168.8.107:5909 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 diff --git a/public/config/config.json b/public/config/config.json index 4e81ae5..d2da659 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,7 +1,7 @@ { "title":"计量业务系统", "baseUrl": "http://111.198.10.15:21611", - "baseUrlBusiness": "http://111.198.10.15:21606", + "baseUrlBusiness": "http://111.198.10.15:21611", "pathDict": { "fbfpsbgl":"/reviewpage/detail", "fbfmlgl":"/directorypage/detail", diff --git a/src/components/scanEquipmentDialog/index.vue b/src/components/scanEquipmentDialog/index.vue index 30e2c2c..83ce3e2 100644 --- a/src/components/scanEquipmentDialog/index.vue +++ b/src/components/scanEquipmentDialog/index.vue @@ -200,7 +200,7 @@ - diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts index 9214173..8b37e75 100644 --- a/src/router/modules/tested.ts +++ b/src/router/modules/tested.ts @@ -252,6 +252,18 @@ activeMenu: '/meteringcurator', }, }, + { + path: '/curatorpage/:type', + name: 'MeteringdetEdit', + component: () => import('@/views/tested/MeasurementPlan/dept/components/edit.vue'), + meta: { + title: '负责人送检通知编辑', + auth: '/tested/metering/curator', + sidebar: false, + breadcrumb: false, + activeMenu: '/meteringcurator', + }, + }, ], }, { diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue index 5833d2e..0e62a9f 100644 --- a/src/views/tested/MeasurementPlan/dept/components/list.vue +++ b/src/views/tested/MeasurementPlan/dept/components/list.vue @@ -120,8 +120,9 @@ const $router = useRouter() // 新建编辑操作 const handler = (row: any, type: string) => { + const path = $props.notifyType === '1' ? 'curatorpage' : 'meteringdept' $router.push({ - path: `/meteringdept/${type}`, + path: `/${path}/${type}`, query: { row: JSON.stringify(row), id: row.id, diff --git a/src/views/tested/MeasurementPlan/early/components/edit.vue b/src/views/tested/MeasurementPlan/early/components/edit.vue index 405b6df..3d92213 100644 --- a/src/views/tested/MeasurementPlan/early/components/edit.vue +++ b/src/views/tested/MeasurementPlan/early/components/edit.vue @@ -36,6 +36,7 @@ approvalType: $route.query.approvalType, reason: '', equipmentList: [], + id: '', }) // 表单 const rules = ref({ reason: [{ required: true, message: '送检原因必填', trigger: ['blur', 'change'] }], @@ -86,6 +87,7 @@ const tableRef = ref() // 保存 const submitId = ref('') +const disabledSave = ref(false) const saveForm = async (formEl: FormInstance | undefined) => { if (!formEl) { return } await formEl.validate((valid, fields) => { @@ -100,8 +102,13 @@ type: 'warning', }, ).then((res) => { + disabledSave.value = true ruleForm.value.equipmentList = tableRef.value.list + if (submitId.value) { + ruleForm.value.id = submitId.value + } editApply(ruleForm.value).then((res) => { + disabledSave.value = false submitId.value = res.data if (statusName === '已取消' || statusName === '未通过') { submitApply({ id: res.data, formId: $route.query.approvalType === '0' ? SCHEDULE.METERING_PLAN_EARLY : SCHEDULE.METERING_PLAN_DEALY }).then((res) => { @@ -192,7 +199,7 @@ 提交 - + 保存 diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue index ca37520..50711ce 100644 --- a/src/views/tested/MeasurementPlan/plan/components/edit.vue +++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue @@ -133,6 +133,7 @@ const tableRef = ref() // 保存 const submitId = ref('') +const disabledSave = ref(false) const saveForm = async (formEl: FormInstance | undefined) => { if (!formEl) { return } await formEl.validate((valid, _fields) => { @@ -147,6 +148,7 @@ type: 'warning', }, ).then((_res) => { + disabledSave.value = true if ($route.query.category as string === 'season' || typeFlag.value === '1') { ruleForm.value.planName = `${currentYear.value}年第${ruleForm.value.season}季度计量计划` ruleForm.value.planType = '1' @@ -157,7 +159,11 @@ } ruleForm.value.equipmentIds = tableRef.value.list.map((item: any) => item.equipmentId) // console.log(tableRef.value.list, 'tableRef.value.list') + if (submitId.value) { + ruleForm.value.id = submitId.value + } editPlan(ruleForm.value).then((res) => { + disabledSave.value = false submitId.value = res.data // close() if (statusName === '已取消' || statusName === '未通过') { @@ -280,7 +286,7 @@ 提交 - + 保存 diff --git a/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue b/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue index aa4287a..cbeac96 100644 --- a/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue +++ b/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue @@ -154,6 +154,7 @@ option.series = { data: props.seriesData, type: 'bar', + barWidth: 15, } } if (props.yAxisData && props.yAxisData.length > 0) { diff --git a/src/views/tested/dashboard/components/BarChartVertical.vue b/src/views/tested/dashboard/components/BarChartVertical.vue index 9598215..3954e2f 100644 --- a/src/views/tested/dashboard/components/BarChartVertical.vue +++ b/src/views/tested/dashboard/components/BarChartVertical.vue @@ -371,6 +371,7 @@ { data: props.data as any[], type: 'bar', + barWidth: 15, }, ] // 横轴, 水平柱状图，y轴为横轴 } diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue index 9fd9307..4a5658e 100644 --- a/src/views/tested/device/info/components/edit.vue +++ b/src/views/tested/device/info/components/edit.vue @@ -373,6 +373,7 @@ const tableRef = ref() const technologyRef = ref() const certificateRef = ref() +const disabledSave = ref(false) // 保存 const saveForm = async (formEl: FormInstance | undefined, formEl1: FormInstance | undefined, formEl2: FormInstance | undefined) => { console.log(formEl, formEl1) @@ -389,6 +390,7 @@ type: 'warning', }, ).then((res) => { + disabledSave.value = true ruleForm.value.attachments = tableRef.value.list ruleForm.value.technicalTargetList = technologyRef.value.list // if (!ruleForm.value.groupInfos.length) { @@ -398,8 +400,12 @@ // 特种设备 ruleForm.value.certificateList = certificateRef.value.list } + if (submitId.value !== '未提交' && submitId.value !== '') { + ruleForm.value.id = submitId.value + } editInfo(ruleForm.value).then((res) => { submitId.value = res.data + disabledSave.value = false if (statusName === '已取消' || statusName === '未通过') { submitInfo({ id: submitId.value, formId: SCHEDULE.DEVICE_INFO_APPROVAL }).then((res) => { ElMessage.success('已提交') @@ -603,7 +609,7 @@ 提交 - + 保存 diff --git a/src/views/tested/status/delay/components/edit.vue b/src/views/tested/status/delay/components/edit.vue index 19ca488..2c88cab 100644 --- a/src/views/tested/status/delay/components/edit.vue +++ b/src/views/tested/status/delay/components/edit.vue @@ -131,6 +131,7 @@ $router.back() } const annexRef = ref() +const disabledSave = ref(false) // 保存 const saveForm = async (formEl: FormInstance | undefined, formEl1: FormInstance | undefined) => { if (!formEl || !formEl1) { return } @@ -146,9 +147,14 @@ type: 'warning', }, ).then((res) => { + disabledSave.value = true + if (submitId.value) { + ruleForm.value.id = submitId.value + } ruleForm.value.attachments = annexRef.value.list ruleForm.value.equipmentInfo = undefined editStatus(ruleForm.value).then((res) => { + disabledSave.value = false submitId.value = res.data if (statusName === '已取消' || statusName === '未通过') { submitStatus({ id: submitId.value, formId: formIdDict.value[Number($route.query.statusType as string)] }).then((res) => { @@ -286,7 +292,7 @@ 提交 - + 保存 diff --git a/src/views/tested/subpackage/directory/components/edit.vue b/src/views/tested/subpackage/directory/components/edit.vue index 3725dd9..690cfd4 100644 --- a/src/views/tested/subpackage/directory/components/edit.vue +++ b/src/views/tested/subpackage/directory/components/edit.vue @@ -215,7 +215,7 @@ const close = () => { $router.back() } - +const disabledSave = ref(false) // 保存 const saveForm = async (formEl: FormInstance | undefined) => { if (!formEl) { return } @@ -231,6 +231,10 @@ type: 'warning', }, ).then((res) => { + disabledSave.value = true + if (submitId.value) { + ruleForm.value.id = submitId.value + } const data = { subcontractor: ruleForm.value, abilityList: capacityRef.value.list, // 业务能力 @@ -238,6 +242,7 @@ staffList: personRef.value.list, // 分包人员 } editDirectory(data, $route.query.statusName as string).then((res) => { + disabledSave.value = false submitId.value = res.data if (statusName === '已取消' || statusName === '未通过') { submitDirectory({ id: submitId.value, formId: SCHEDULE.SUBCONTRACTOR_APPROVAL }).then((res) => { @@ -387,7 +392,7 @@ 提交 - + 保存 @@ -404,7 +409,7 @@ - + @@ -572,7 +577,7 @@
-
+
diff --git a/src/views/tested/subpackage/directory/components/list.vue b/src/views/tested/subpackage/directory/components/list.vue index b144a8a..ba0934d 100644 --- a/src/views/tested/subpackage/directory/components/list.vue +++ b/src/views/tested/subpackage/directory/components/list.vue @@ -35,7 +35,7 @@ }) const columns = ref([ { - text: '分包方编号', + text: '编号', value: 'subcontractorNo', align: 'center', }, diff --git a/src/views/tested/subpackage/directory/components/personTable.vue b/src/views/tested/subpackage/directory/components/personTable.vue index 4c3becd..ec2c983 100644 --- a/src/views/tested/subpackage/directory/components/personTable.vue +++ b/src/views/tested/subpackage/directory/components/personTable.vue @@ -39,7 +39,7 @@ const list = ref([]) // 检查数据列表 function checkCertificateList() { - return useCheckList(list.value, columns.value, '分包方人员') + return useCheckList(list.value, columns.value, '人员') } // 将列表置为不可编辑状态 function setAllRowReadable() { @@ -95,7 +95,7 @@