Merge remote-tracking branch 'origin/master'

src/views/basic/product/bindHospProduct.vue

@@ -100,6 +100,7 @@
 import {getUdiInfos, thirdSysDetail,} from "@/api/basic/product/udiRelevance";
 import {filterByUuid} from "@/api/basic/product/udiInfo";
 import {bindBasicHospProduct, saveBasicHospType,getBindList} from "@/api/basic/basicHospType";
+import { sysFilter } from '@/api/basic/udiRelevance'
 
 
 
@@ -167,6 +168,18 @@ export default {
       this.filterQuery.page = 1;
       this.getList();
     },
+    getSysFilter() {
+      sysFilter()
+        .then((response) => {
+          this.loading = false;
+          this.filterList = response.data.list || [];
+        })
+        .catch(() => {
+          this.loading = false;
+          this.filterList = [];
+        });
+
+    },
     getList() {
       getBindList(this.filterQuery)
         .then((response) => {
@@ -224,6 +237,7 @@ export default {
   created() {
     this.filterQuery.bindType=1
     this.getList();
+    this.getSysFilter();
 
   },
 };

src/views/basic/product/unbindHospProduct.vue

@@ -99,6 +99,7 @@
 <script>
 
 import {bindBasicHospProduct, saveBasicHospType,unbindBasicHospProduct,getBindList} from "@/api/basic/basicHospType";
+import { sysFilter } from '@/api/basic/udiRelevance'
 
 
 
@@ -179,6 +180,18 @@ export default {
           this.total = 0;
         });
     },
+    getSysFilter() {
+      sysFilter()
+        .then((response) => {
+          this.loading = false;
+          this.filterList = response.data.list || [];
+        })
+        .catch(() => {
+          this.loading = false;
+          this.filterList = [];
+        });
+
+    },
     hideSearch() {
       this.showSearch = !this.showSearch;
     },
@@ -216,6 +229,7 @@ export default {
   created() {
     this.filterQuery.relCode=this.rId
     this.getList();
+    this.getSysFilter();
   },
 };
 </script>

src/views/system/dept/authDept.vue

@@ -503,7 +503,8 @@ export default {
       this.formData = {
         pid: row.id,
         pcode: row.code,
-        status: 1
+        status: 1,
+        spUse:false
       }
       // this.getStatusTreeselect();
       filterList().then(response => {