diff --git a/nx/api/material.js b/nx/api/material.js new file mode 100644 index 0000000..e69de29 diff --git a/pages.json b/pages.json index 88b9bfb..60c00a6 100644 --- a/pages.json +++ b/pages.json @@ -287,6 +287,21 @@ "navigationBarTitleText": "基础信息配置" } }, + // 物料试剂管理 + { + "path": "pages/material/index/index", + "style": { + "navigationBarTitleText": "物料试剂管理", + "navigationStyle": "custom" + } + }, + { + "path": "pages/material/inbound/index", + "style": { + "navigationBarTitleText": "物料列表", + "navigationStyle": "custom" + } + }, { "path": "pages/setting/UrlConfig", "style": { diff --git a/pages/analysis/sample/sample-work-detail.vue b/pages/analysis/sample/sample-work-detail.vue index 79d82b1..c787b6a 100644 --- a/pages/analysis/sample/sample-work-detail.vue +++ b/pages/analysis/sample/sample-work-detail.vue @@ -335,7 +335,9 @@ const parameterClassifyChange = v => { curParameterTitle.value = currentGroup.value[0].label groupFieldIndex.value = '' selectedField.value = {} - collapseRef.value.init() + nextTick(() => { + collapseRef.value.init() + }) autoNextField() } @@ -446,6 +448,7 @@ const switchSample = async index => { // 将菜单菜单活动item垂直居中 scrollTop.value = index * menuItemHeight.value + menuItemHeight.value / 2 - menuHeight.value / 2 - 50 uni.showLoading({ title: '加载中...' }) + setValueToField() autoGenerateCupNum() setTimeout(() => { @@ -892,7 +895,9 @@ function handleAssayTypeChange({ index, value }) { selectedField.value = {} curParameterKey.value = 'all' curParameterTitle.value = '选择字段分类' - collapseRef.value.init() + nextTick(() => { + collapseRef.value.init() + }) } // 获取任务数据 async function getSampleAnalysisByTaskId() { @@ -940,13 +945,12 @@ function setValueToField() { field.value = value let symbol = getFieldSymbol(field) field.symbol = symbol - if (!getField(field)) { - field.hidden = 1 - } else { - field.hidden = 0 - } + field.hidden = getField(field) ? 0 : 1 }) } + nextTick(() => { + collapseRef.value.init() + }) } function getField(field) { const fieldObj = currentSampleData.value[field.fieldIndex] diff --git a/pages/material/inbound/index.vue b/pages/material/inbound/index.vue new file mode 100644 index 0000000..677f24b --- /dev/null +++ b/pages/material/inbound/index.vue @@ -0,0 +1,7 @@ + + + + + diff --git a/pages/material/index/index.vue b/pages/material/index/index.vue new file mode 100644 index 0000000..32a39f5 --- /dev/null +++ b/pages/material/index/index.vue @@ -0,0 +1,52 @@ + + + + + diff --git a/static/images/menus/inbound.png b/static/images/menus/inbound.png new file mode 100644 index 0000000..37b94fe Binary files /dev/null and b/static/images/menus/inbound.png differ diff --git a/static/images/menus/material.png b/static/images/menus/material.png new file mode 100644 index 0000000..cc9ab83 Binary files /dev/null and b/static/images/menus/material.png differ