diff --git a/components.d.ts b/components.d.ts index f759a60..f818db3 100644 --- a/components.d.ts +++ b/components.d.ts @@ -18,6 +18,7 @@ declare module 'vue' { ElCheckbox: typeof import('element-plus/es')['ElCheckbox'] ElCol: typeof import('element-plus/es')['ElCol'] ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider'] + ElCountdown: typeof import('element-plus/es')['ElCountdown'] ElDatePicker: typeof import('element-plus/es')['ElDatePicker'] ElDialog: typeof import('element-plus/es')['ElDialog'] ElEmpty: typeof import('element-plus/es')['ElEmpty'] @@ -31,6 +32,7 @@ declare module 'vue' { ElMenu: typeof import('element-plus/es')['ElMenu'] ElMenuItem: typeof import('element-plus/es')['ElMenuItem'] ElOption: typeof import('element-plus/es')['ElOption'] + ElPageHeader: typeof import('element-plus/es')['ElPageHeader'] ElPagination: typeof import('element-plus/es')['ElPagination'] ElPopconfirm: typeof import('element-plus/es')['ElPopconfirm'] ElProgress: typeof import('element-plus/es')['ElProgress'] diff --git a/env/.env.dev b/env/.env.dev index ff089c7..ca086de 100644 --- a/env/.env.dev +++ b/env/.env.dev @@ -7,8 +7,8 @@ VITE_API_URL = '/proxyApi' # 开发环境接口地址 # VITE_proxyTarget = 'http://10.40.92.74:8080' #盛旭 -# VITE_proxyTarget = 'http://192.168.2.246:28080' # 马帅 -VITE_proxyTarget = 'http://192.168.2.123:28080' # 梁超 +VITE_proxyTarget = 'http://192.168.2.246:28080' # 马帅 +# VITE_proxyTarget = 'http://192.168.2.123:28080' # 梁超 # VITE_proxyTarget = 'http://192.168.0.244:28580' # 马帅 # VITE_proxyTarget = 'http://192.168.2.129:18080' # 马帅 diff --git a/src/views/user/goodsManagement/index.vue b/src/views/user/goodsManagement/index.vue index 9ed1bff..97c265b 100644 --- a/src/views/user/goodsManagement/index.vue +++ b/src/views/user/goodsManagement/index.vue @@ -475,6 +475,7 @@ const submitBtn = () => { insurancePdf: insurancePdf.value, //合格证 examinationPdf: examinationPdf.value, //检测证明 } + param.maStatus == 0 ? (param.maStatus = 1) : param.maStatus if ( equipmentDeploymentParams.value.maId && equipmentDeploymentParams.value.maId != '' diff --git a/src/views/user/sourcingNeed/index.vue b/src/views/user/sourcingNeed/index.vue index 850882b..ed0f570 100644 --- a/src/views/user/sourcingNeed/index.vue +++ b/src/views/user/sourcingNeed/index.vue @@ -116,7 +116,7 @@ - +