diff --git a/src/components/ImportForm/src/ImportDetailForm.vue b/src/components/ImportForm/src/ImportDetailForm.vue index 580183cee..757a7409a 100644 --- a/src/components/ImportForm/src/ImportDetailForm.vue +++ b/src/components/ImportForm/src/ImportDetailForm.vue @@ -206,6 +206,17 @@ const props = defineProps({ } } }) + + +watch( + () => props.url, + () => { + importUrl.value = getBaseUrl() + import.meta.env.VITE_API_URL + props.url + }, + { + deep: true + } +) const importTemplateData = ref(props.importTemplateData) const accept = ref(props.accept) const mode = ref(props.mode) //是否更新已经存在的用户数据.默认值是1 @@ -215,7 +226,7 @@ const coverIsDisable = ref(props.coverIsDisable) //覆盖是否禁用,默认值 const updatePart = ref(props.updatePart) //是否部门保存 const outFile = ref(props.outFile) //是否引入外部资源 -const importUrl = getBaseUrl() + import.meta.env.VITE_API_URL + props.url +const importUrl = ref(getBaseUrl() + import.meta.env.VITE_API_URL + props.url) /** 打开弹窗 */ const open = () => { diff --git a/src/views/wms/countManage/count/countJobMain/index.vue b/src/views/wms/countManage/count/countJobMain/index.vue index 03d550f0f..32bbf56c2 100644 --- a/src/views/wms/countManage/count/countJobMain/index.vue +++ b/src/views/wms/countManage/count/countJobMain/index.vue @@ -241,7 +241,7 @@ const butttondata = (row, $index) => { { label: '线边盘点', name: 'lineTypeImport', - hide: row.isLineType!=true, + hide: !(row.status==2&&row.lineType==true), type: 'success', color: '', link: true, //文本展现按钮