diff --git a/.env.wyf b/.env.wyf index b6c7aec27..865f01438 100644 --- a/.env.wyf +++ b/.env.wyf @@ -46,11 +46,11 @@ VITE_DEV=false # # 上传路径 # VITE_UPLOAD_URL='http://192.168.0.37:12080/admin-api/infra/file/upload' -# 81 WMS请求路径 82 SCP -VITE_BASE_URL='http://172.22.32.9/api' -# 上传路径 -VITE_UPLOAD_URL='http://172.22.32.9/api/admin-api/infra/file/upload' +# 请求路径 +VITE_BASE_URL='http://dev.ccwin-in.com:25400/api' +# 上传路径 +VITE_UPLOAD_URL='http://dev.ccwin-in.com:25400/api/admin-api/infra/file/upload' # # 81 WMS请求路径 82 SCP @@ -116,7 +116,7 @@ VITE_INTERFACE_URL='http://dev.ccwin-in.com:25310/magic/web/index.html' VITE_JMREPORT_BASE_URL='http://172.22.32.9:90' # 租户配置 -VITE_TENANT='["长春1379","成都1397","长春2379"]' +VITE_TENANT='["德立天津工厂"]' # 查看质检报告环境 VITE_REPORT_URL = 'http://localhost' @@ -140,4 +140,4 @@ VITE_LOGO_WHITE_URL = '/src/assets/imgs/logo_white.png' VITE_PROJECT_NAME = '富维海拉智慧工厂管理平台' # 租户配置 -VITE_TENANT_LIST='[{"text":"长春1379","value":1},{"text":"成都1397","value":2},{"text":"长春2379","value":3}]' \ No newline at end of file +VITE_TENANT_LIST='[{"text":"德立天津工厂","value":1}]' diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue index caaa938ab..1375ed0a1 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue @@ -99,7 +99,7 @@ { { label: t('ts.上传履历表'), name: 'mainPlanCurriculumVitae', - hide: row.status==5, + hide: !switchCurriculumVitae.value||row.status==5, type: 'primary', icon: '', color: '', @@ -1339,10 +1344,13 @@ const getDefaultSupplier = async () => { } console.log('defaultSupplierCode', defaultSupplierCode) } - +const switchCurriculumVitae = ref(false) /** 初始化 **/ onMounted(async () => { getDefaultSupplier() + let switch2 = await SwitchApi.getByCode('supplerUploadResumeFlag') + switchCurriculumVitae.value = switch2=='TRUE' + console.log('switchCurriculumVitae',switchCurriculumVitae.value) getList() importTemplateData.templateUrl = await SupplierdeliverRequestMainApi.importTemplate()