Ver Fonte

修改单位部门树。

yangzhijie há 4 anos atrás
pai
commit
0dbacd515f

+ 8 - 0
packages/client-organization/index.js

@@ -0,0 +1,8 @@
+
+import ClientOrganization from './src/ClientOrganization.vue';
+
+ClientOrganization.install = function(Vue) {
+  Vue.component(ClientOrganization.name, ClientOrganization);
+};
+
+export default ClientOrganization;

+ 4 - 4
packages/info/src/customer/ClientOrganizationInfo.vue → packages/client-organization/src/ClientOrganization.vue

@@ -23,12 +23,12 @@
 </template>
 
 <script>
-var Common = require('../../../common/Common.js').default;
-var Loading = require('../../../loading/src/Loading.vue').default;
-var TreeViewNode = require('../../../tree/src/TreeViewNode.vue').default;
+var Common = require('../../common/Common.js').default;
+var Loading = require('../../loading/src/Loading.vue').default;
+var TreeViewNode = require('../../tree/src/TreeViewNode.vue').default;
 
 export default {
-
+  name: 'ClientOrganization',
   components: {
     TreeViewNode, Loading,
   },

+ 6 - 15
packages/index.js

@@ -30,7 +30,7 @@ import PrintWidget from './print/print-widget.js';
 // import Pagination from './pagination/index.js';
 
 import TreeViewNode from './tree/index.js';
-
+import ClientOrganization from './client-organization/index.js';
 
 import langZhCn from './i18n/zh-CN.js';
 import langEnUs from './i18n/en-US.js';
@@ -77,6 +77,7 @@ const components = [
   PrintEpc,
   PrintWidget,
   TreeViewNode,
+  ClientOrganization,
   // Pagination
 ];
 
@@ -98,9 +99,9 @@ const install = function (app, opts = {}) {
       // 这里为了防止 beforeCreate 比 vue-i18n 的 beforeCreate 先执行导致 this.$i18n 为空
       this.$nextTick(() => {
         // 判断是否为根节点,合并国际化信息
-        //if (this.$root === this && this.$i18n) {
-        console.log('install pc-component-v3 i18n.');
-        if (this.$i18n) {
+        if (this.$root === this && this.$i18n) {
+        //if (this.$i18n) {
+          console.log('merge pc-component-v3 i18n.');
           _self.$i18n.mergeLocaleMessage('zh-CN', langZhCn);
           _self.$i18n.mergeLocaleMessage('en-US', langEnUs);
         }
@@ -108,9 +109,6 @@ const install = function (app, opts = {}) {
     },
   });
 
-  // locale.use(opts.locale);
-  // locale.i18n(opts.i18n);
-
   components.map(component => {
     console.log('install component: ' + component.name);
     app.component(component.name, component);
@@ -123,16 +121,8 @@ const install = function (app, opts = {}) {
 };
 
 
-/* istanbul ignore if */
-// if (typeof window !== 'undefined' && window.Vue) {
-//   install(window.Vue);
-// };
-
-
 export default {
   version: '1.2.9',
-  // locale: locale.use,
-  // i18n: locale.i18n,
   install,
   Loading,
   Modal,
@@ -160,6 +150,7 @@ export default {
   PrintEpc,
   PrintWidget,
   TreeViewNode,
+  ClientOrganization,
   // Pagination,
   Uuid,
   Common,

+ 2 - 1
packages/info/src/InfoWindow.vue

@@ -20,7 +20,7 @@
 var Common = require('../../common/Common.js').default;
 var QueryPage = require('./QueryPage.vue').default;
 var Loading = require('../../loading/src/Loading.vue').default;
-var ClientOrganization = require('./customer/ClientOrganizationInfo.vue').default;
+var ClientOrganization = require('../../client-organization/src/ClientOrganization.vue').default;
 
 export default {
   name: 'InfoWindow',
@@ -30,6 +30,7 @@ export default {
     Loading,
     'ClientOrganization' : ClientOrganization,
   },
+
   props: {
     'whereClause':
         {