车型库修改 和 角色修改

anrui-buscenter/anrui-buscenter-ui/src/api/chexingchaxun/modelinquire.js

@@ -18,7 +18,7 @@ export function modelPageList(data) {
 export function configPageList(data) {
   return request({
     // url: '/base/v1/basemodelconfig/configPageList', // 旧
-    url: '/base/v1/basemodelconfig/getModelConfigList',
+    url: '/base/v1/basemodelconfig/getPcModelConfigList',
     method: 'post',
     data: data,
     headers: {

anrui-buscenter/anrui-buscenter-ui/src/views/chexingchaxun/modelinquire/vehiclelibraryconfiguration.vue

@@ -412,8 +412,8 @@ export default {
       configPageList(this.listQuery).then((response) => {
         this.listLoading = false
         if (response.code === '200') {
-          this.listQuery.total = response.data.pages
-          this.list = response.data.modelConfigList
+          this.listQuery.total = response.data.total
+          this.list = response.data.records
         }
       })
     },

anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/cheliangxuqiu/cheliangxuqiuAdd.vue

@@ -704,7 +704,9 @@ export default {
       arrayList = value
       console.log(arrayList, 8888)
       this.temp.model = arrayList[0].modelName
+      this.temp.modelSid = arrayList[0].modelSid
       this.temp.configName = arrayList[0].configName
+      this.temp.configSid = arrayList[0].configSid
       this.temp.otherConfig = arrayList[0].otherConfig
       this.temp.guidancePrice = arrayList[0].guidedPrice
     },

anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/cheliangxuqiu/modelsToChoose.vue

@@ -121,10 +121,13 @@ export default {
     // 勾选
     handleSelectionChange(row) {
       const aa = []
+      console.log('1122',row)
       row.forEach((element) => {
         aa.push({
           modelName: element.modelName,
+          modelSid: element.modelSid,
           configName: element.configName,
+          configSid:element.configSid,
           otherConfig: element.otherConfig,
           guidedPrice: element.guidedPrice
         })

anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/vehiclelibraryconfiguration.vue

@@ -404,7 +404,7 @@ export default {
         this.listLoading = false
         if (response.code === '200') {
           this.listQuery.total = response.data.pages
-          this.list = response.data.modelConfigList
+          this.list = response.data.records
         }
       })
     },

anrui-system-ui/src/api/system/menu/index.js

@@ -3,43 +3,49 @@ import qs from 'qs'
 //let tokens = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyTm8iOiI2IiwiaXNzIjoiV0JLIiwiZXhwIjoxNjMwMDI3MDA3fQ.9bEgBzFW2g1CUT7s5VXxhNCa10cyU_WTCFeqpQje0iY'
 
 let tokens = window.sessionStorage.getItem('token');
+
 //获取菜单 分页列表
 export function pageList(data) {
   return request({
     url: '/portal/v1/sysmenu/listAllVoForSource',
     method: 'POST',
     data: data,
-    headers: {'Content-Type': 'application/json',
-    'token':tokens
+    headers: {
+      'Content-Type': 'application/json',
+      'token': tokens
     }
   })
 }
+
 // 新增保存 菜单信息
 export function saveMenusInfo(data) {
   return request({
     url: '/portal/v1/sysmenu/save',
     method: 'POST',
     data: data,
-    headers: {'Content-Type': 'application/json'}
+    headers: {'Content-Type': 'application/json'}
   })
 }
+
 // 修改保存 菜单信息
 export function putMenusInfo(data) {
   return request({
-    url: '/portal/v1/sysmenu/update/'+ data.sid,
+    url: '/portal/v1/sysmenu/update/' + data.sid,
     method: 'POST',
     data: data,
-    headers: {'Content-Type': 'application/json'}
+    headers: {'Content-Type': 'application/json'}
   })
 }
+
 //根据sid 删除单个 资源信息
 export function delMenus(data) {
   return request({
     url: '/portal/v1/sysmenu/delBySids/' + data.sid,
     method: 'get',
     data: qs.stringify(data),
-    headers: {'Content-Type': 'application/json',
-    'token':tokens
+    headers: {
+      'Content-Type': 'application/json',
+      'token': tokens
     }
   })
 }
@@ -47,35 +53,24 @@ export function delMenus(data) {
 // 修改状态
 export function IsEnable(data) {
   return request({
-    url: '/portal/v1/sysmenu/updateIsEnable/' + data.sid+'/'+data.isEnable,
+    url: '/portal/v1/sysmenu/updateIsEnable/' + data.sid + '/' + data.isEnable,
     method: 'POST',
-   /* data: qs.stringify(data),*/
-    headers:{'Content-Type':'application/json',
-    'token':tokens
+    /* data: qs.stringify(data),*/
+    headers: {
+      'Content-Type': 'application/json',
+      'token': tokens
     }
   })
 }
 
 
-
-
-
-
-
-
-
-
-
-
-
-
 // 获取菜单 不分页列表
 export function roleList(data) {
   return request({
     url: '/system/v1/menus/list',
     method: 'post',
     data: data,
-    headers: {'Content-Type': 'application/json'}
+    headers: {'Content-Type': 'application/json'}
   })
 }
 
@@ -85,7 +80,7 @@ export function menusPageList(data) {
     url: '/system/v1/menus/pagelist',
     method: 'POST',
     data: data,
-    headers: {'Content-Type': 'application/json'}
+    headers: {'Content-Type': 'application/json'}
   })
 }
 
@@ -95,12 +90,11 @@ export function menusTreelist(data) {
     url: '/system/v1/menus/treelist',
     method: 'POST',
     data: data,
-    headers: {'Content-Type': 'application/json'}
+    headers: {'Content-Type': 'application/json'}
   })
 }
 
 
-
 //根据sid 获取单个菜单 信息
 export function getRoleInfo(data) {
   return request({

anrui-system-ui/src/api/system/roleAdminister/index.js

@@ -23,6 +23,15 @@ export function postList(data){
   })
 }
 
+// 获取数据字典下拉列表
+export function typeValues(data) {
+  return request({
+    url: '/portal/v1/dictcommons/typeValues',
+    method: 'get',
+    params: data
+  })
+}
+
 // 设置是否可用：isEnable：1可用，0不可用
 export function setRoleEnable(data) {
   return request({

anrui-system-ui/src/views/RoleAdminister/RoleAdminister.vue

@@ -78,6 +78,19 @@
                   <el-input v-model="roleForm.code" style="width:300px"></el-input>
                 </td>
               </tr>
+              <tr>
+                <td>组织层级</td>
+                <td>
+                  <el-select v-model="roleForm.orgName" style="width:300px" @change="changeOrgName">
+                    <el-option
+                      v-for="(item, i) in orgName_list"
+                      :key="i"
+                      :label="item.dictValue"
+                      :value="item.dictValue">
+                    </el-option>
+                  </el-select>
+                </td>
+              </tr>
               <tr>
                 <td>排序</td>
                 <td>
@@ -174,12 +187,13 @@
           </el-dialog>
         </div>
       </el-tab-pane>
+      <!-- 新增角色 -->
       <el-tab-pane label="新增角色" name="addrole">
         <el-card class="box-card">
           <table class="e-table" cellspacing="0">
             <tr>
               <td>岗位</td>
-              <td>
+              <td colspan="3">
                 <el-select v-model="roleForm.postSid" style="width:300px" @change="changePost">
                   <el-option v-for="(item, i) in postSidData" :key="i" :label="item.name" :value="item.sid"></el-option>
                 </el-select>
@@ -190,14 +204,19 @@
               <td>
                 <el-input v-model="roleForm.name" style="width:300px"></el-input>
               </td>
-            </tr>
-            <tr>
               <td>编码</td>
               <td>
                 <el-input v-model="roleForm.code" style="width:300px"></el-input>
               </td>
             </tr>
             <tr>
+              <td>组织层级</td>
+              <td>
+                <el-select v-model="roleForm.orgName" style="width:300px" @change="changeOrgName">
+                  <el-option v-for="(item, i) in orgName_list" :key="i" :label="item.dictValue" :value="item.dictValue"></el-option>
+                </el-select>
+                <!--                <el-input v-model="roleForm.orgName" style="width:300px"></el-input>-->
+              </td>
               <td>排序</td>
               <td>
                 <el-input v-model="roleForm.sort" style="width:300px"></el-input>
@@ -205,7 +224,7 @@
             </tr>
             <tr>
               <td>备注</td>
-              <td>
+              <td colspan="3">
                 <el-input type="textarea" :autosize="{ minRows: 4, maxRows: 6}" v-model="roleForm.remarks"></el-input>
               </td>
             </tr>
@@ -221,18 +240,19 @@
 
 <script>
 import {
-  roleOrgList,
-  saveOrgroles,
-  putOrgroles,
   delOrgroles,
-  setRoleEnable,
+  funMenuTree,
+  postList,
+  putOrgroles,
   roleMenuTree,
+  roleOrgList,
+  savefunMenu,
   saveorgrolemenus,
-  sourceMenuTree,
+  saveOrgroles,
   saveSource,
-  funMenuTree,
-  savefunMenu,
-  postList
+  setRoleEnable,
+  sourceMenuTree,
+  typeValues
 } from '@/api/system/roleAdminister/index.js'
 
 export default {
@@ -259,6 +279,7 @@ export default {
       },
       roleTable: [],
       postSidData: [],
+      orgName_list: [], // 组织层级
       editDialog: false,
       // 树形
       loading: false,
@@ -283,9 +304,10 @@ export default {
     };
   },
   mounted() {
-    this.formBackup = Object.assign({}, this.roleForm),
-      this.getroleOrgList()
+    this.formBackup = Object.assign({}, this.roleForm)
+    this.getroleOrgList()
     this.getPostList()
+    this.getType()
   },
   methods: {
     pagination(val) { // 分页函数
@@ -300,6 +322,16 @@ export default {
         }
       })
     },
+    getType() {
+      typeValues({
+        type: 'roleType'
+      }).then((res) => {
+        if (res.code === '200') {
+          this.orgName_list = res.data
+          console.log('下拉框请求组织层级', res.data)
+        }
+      })
+    },
     // 分页列表
     getroleOrgList(flag) {
       if (flag == '1') {
@@ -319,6 +351,11 @@ export default {
         }
       })
     },
+    changeOrgName(value) {
+      const choosetItem = this.orgName_list.filter((item) => item.dictValue === value)
+      this.roleForm.orgSid = choosetItem[0].dictKey
+      console.log('组织层级',this.roleForm.orgSid,this.roleForm.orgName)
+    },
     changePost(value) {
       const choosetItem = this.postSidData.filter((item) => item.sid === value)
       this.roleForm.name = choosetItem[0].name