Merge branch 'develop' of http://git.168cad.top/jianglei/dcxy-manage-shell into develop

src/components/input/ServiceTypeSelect/mixin.js

@@ -13,6 +13,10 @@ export default {
       type: Number,
       default: null,
     },
+    isAll: {
+      type: Number,
+      default: null,
+    },
   },
   created() {
     store.install(this.$store);
@@ -20,6 +24,7 @@ export default {
       this.fetchServiceTypeList({
         serviceType: this.ServiceType,
         serviceState: this.ServiceState,
+        isAll: this.isAll,
       });
     }
   },

src/components/input/ServiceTypeSelect/serviceTypeStore.js

@@ -21,11 +21,14 @@ const getters = {
 };
 
 const actions = {
-  fetchServiceTypeList({ state, commit }, { serviceType, serviceState }) {
+  fetchServiceTypeList(
+    { state, commit },
+    { serviceType, serviceState, isAll }
+  ) {
     if (state.fetching[serviceType]) return;
     commit(FETCH_STATE, { value: true, index: serviceType });
     return fetchServiceList({
-      params: { serviceType, state: serviceState },
+      params: { serviceType, state: serviceState, isAll: isAll },
     }).then(res => {
       const { selfService } = res;
       commit(SERVICE_TYPE_LIST, { list: selfService, index: serviceType });