diff --git a/src/const/limsConfig/equipmentManage.js b/src/const/limsConfig/equipmentManage.js index 113481c..e532c24 100644 --- a/src/const/limsConfig/equipmentManage.js +++ b/src/const/limsConfig/equipmentManage.js @@ -45,20 +45,20 @@ export const tableOption = { overHidden: true, rules: [{ required: true, message: "请输入仪器/设备名称" }], }, - { - type: "select", - label: "仪器设备类型", - dicUrl: "/api/blade-system/dict-biz/dictionary?code=instrument", - props: { - label: "dictValue", - value: "dictKey", - }, - span: 8, - display: true, - prop: "type", - align: "left", - overHidden: true, - }, + // { + // type: "select", + // label: "仪器设备类型", + // dicUrl: "/api/blade-system/dict-biz/dictionary?code=instrument", + // props: { + // label: "dictValue", + // value: "dictKey", + // }, + // span: 8, + // display: true, + // prop: "type", + // align: "left", + // overHidden: true, + // }, { type: "input", span: 8, diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss index f354731..89cbc8d 100644 --- a/src/styles/sidebar.scss +++ b/src/styles/sidebar.scss @@ -41,6 +41,7 @@ box-shadow: 2px 0 6px rgba(0,21,41,.35); .el-scrollbar__wrap { overflow-x: hidden; + height: 93% !important; } &--tip{ width:90%; diff --git a/src/views/capital/components/outStatic.vue b/src/views/capital/components/outStatic.vue index fd72f20..b428541 100644 --- a/src/views/capital/components/outStatic.vue +++ b/src/views/capital/components/outStatic.vue @@ -113,7 +113,7 @@
- 导出 +
diff --git a/src/views/capital/productstoreList.vue b/src/views/capital/productstoreList.vue index 7ac42a3..953eada 100644 --- a/src/views/capital/productstoreList.vue +++ b/src/views/capital/productstoreList.vue @@ -554,6 +554,7 @@ - + @@ -92,8 +92,6 @@ - - + + ',res1) let result1 = res1.data.data; this.cardInfoList[0].judjeVariable = result1.djy // 待接样 this.cardInfoList[1].judjeVariable = result1.djh // 带计划