提交merge1.3

openhis-ui-vue3/src/views/basicmanage/consumablesBinding/components/consumablesList.vue

@@ -32,7 +32,7 @@
               <PopoverList @search="handleSearch" :width="800" :modelValue="scope.row.name">
                 <template #popover-content="{}">
                   <DeviceList
-                    v-if="scope.row.type == '2' || props.tab == 2 "
+                    v-if="scope.row.type == '2' || props.tab == 2"
                     @selectRow="(row) => selectRow(row, scope.$index)"
                     :searchKey="searchKey"
                   />
@@ -171,7 +171,7 @@
     </el-form>
   </div>
 </template>
-      
+
 <script setup>
 import { reactive, watch } from 'vue';
 import { bind, deleteBind, init } from './api';
@@ -345,6 +345,5 @@ function selectRow(row, index) {
   }
 }
 </script>
-    
-<style scoped>
-</style>
+
+<style scoped></style>

openhis-ui-vue3/src/views/basicmanage/consumablesBinding/index.vue

@@ -79,8 +79,12 @@ import { getActivityList, getBindList, getRegistrationfeeList } from './componen
 import ConsumablesList from './components/consumablesList.vue';
 
 const activityList = ref([]);
-const queryParams = ref({});
-const queryParamsRegistration = ref({});
+const queryParams = ref({
+  statusEnum: 2,
+});
+const queryParamsRegistration = ref({
+  activeFlag: 1,
+});
 const bindList = ref([]);
 const bindInfo = ref({});
 const activeTab = ref(1);
@@ -91,19 +95,18 @@ const { proxy } = getCurrentInstance();
 const { method_code } = proxy.useDict('method_code');
 
 getList();
-getRegistrationList()
+getRegistrationList();
 function getList() {
   // queryParams.value.typeEnum = activeTab.value;
   getActivityList(queryParams.value).then((res) => {
     activityList.value = res.data.records;
   });
-
 }
 
 function getRegistrationList() {
-  getRegistrationfeeList(queryParamsRegistration.value).then(res => {
+  getRegistrationfeeList(queryParamsRegistration.value).then((res) => {
     RegistrationfeeList.value = res.data.records;
-  })
+  });
 }
 
 // 点击诊疗列表 获取绑定的耗材
@@ -119,5 +122,4 @@ function clickRow(row) {
 }
 </script>
 
-<style scoped>
-</style>
+<style scoped></style>