Browse Source

Merge branch 'deploy_0804' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into deploy_0804

chenrui 3 years ago
parent
commit
994075c304
3 changed files with 8 additions and 4 deletions
  1. 6 4
      src/App.vue
  2. 1 0
      src/views/power/user/userModal.vue
  3. 1 0
      src/views/power/user/userSyncModal.vue

+ 6 - 4
src/App.vue

@@ -1,15 +1,17 @@
 <template>
-  <a-locale-provider :locale="locale">
+  <a-config-provider :locale="locale">
     <div id="app">
       <router-view/>
     </div>
-  </a-locale-provider>
+  </a-config-provider>
 </template>
 
 <script>
-import zhCN from 'ant-design-vue/lib/locale-provider/zh_CN'
+import zhCN from 'ant-design-vue/es/locale/zh_CN'
 import { AppDeviceEnquire } from '@/utils/mixin'
-
+import moment from 'moment'
+import 'moment/locale/zh-cn'
+moment.locale('zh-cn')
 export default {
   mixins: [AppDeviceEnquire],
   data () {

+ 1 - 0
src/views/power/user/userModal.vue

@@ -163,6 +163,7 @@ export default {
           const params = JSON.parse(JSON.stringify(_this.form))
           params.roleNames = _this.form.roleNames.join(',')
           params.id = _this.nowData && _this.nowData.id ? _this.nowData.id : null
+          params.ownerOrgFlag = _this.nowData && _this.nowData.ownerOrgFlag
           _this.spinning = true
           saveUserPower(params).then(res => {
             if (res.status == 200) {

+ 1 - 0
src/views/power/user/userSyncModal.vue

@@ -78,6 +78,7 @@ export default {
         if (valid) {
           const params = JSON.parse(JSON.stringify(_this.detailData))
           params.roleNames = _this.form.roleNames.join(',')
+          params.ownerOrgFlag = _this.nowData && _this.nowData.ownerOrgFlag
           _this.spinning = true
           saveUserPower(params).then(res => {
             if (res.status == 200) {