物料维护模块

src/components/login-form/login-form.vue

@@ -123,7 +123,8 @@ export default {
 				headers:{
 					'Captcha-Key':this.form.key,
 					'Captcha-Code':this.form.code,
-					'Tenant-Id': this.form.tenantId
+					'Tenant-Id': this.form.tenantId,
+					'Authorization':'Basic c2FiZXI6c2FiZXJfc2VjcmV0'
 				},
 			}).then(res=>{
 				console.log(res)

src/libs/http.js

@@ -18,11 +18,14 @@ axios.interceptors.request.use(
         if(userData && userData.access_token){
             token = userData.access_token
         }
-        
         config.data = JSON.stringify(config.data)
         config.headers['Content-Type'] = 'application/json;charset=UTF-8'
-        config.headers['Authorization'] = 'Basic c2FiZXI6c2FiZXJfc2VjcmV0'
-        config.headers['Blade-Auth'] = token
+        
+        if(config.url.indexOf('oauth/captcha') === -1){
+            config.headers['Authorization'] = 'Basic c2FiZXI6c2FiZXJfc2VjcmV0'
+            config.headers['Blade-Auth'] = token
+        }
+        
         return config;
     },
     error => {

src/view/base-manage/material-maintenance/material-maintenance.vue

@@ -224,9 +224,9 @@ export default {
           title: '物料属性',
           key: 'technologyType',
           minWidth: 100,
-          render: (h, params) => {
-            return h('span', this.formConfig[8].list.filter(item => item.value === String(params.row.technologyType))[0].label)
-          }
+          // render: (h, params) => {
+          //   return h('span', this.formConfig[8].list.filter(item => item.value === String(params.row.technologyType))[0].label)
+          // }
         },
         {
           title: '门幅',
@@ -383,14 +383,14 @@ export default {
     },
     treeInit(data){
       for (let i = 0; i < data.length; i++) {
-        const element = data[i];
-        element.name = element.roleName = element.title
+        const element = data[i]; 
+        element.value = element.code
         if(element.children && element.children.length > 0) this.treeInit(element.children)
       }
     },
     getTree () {
       const v = this
-      v.$post('/api/blade-auth/materialClassify/tree').then(res=>{
+      v.$post('/api/storage-restructure/materialClassify/tree').then(res=>{
         v.treeInit(res.data)
         this.treeData = res.data
         console.log(res)
@@ -414,12 +414,20 @@ export default {
       })
     },
     getList () {
-      GetMaterialPageList(this.params).then(res => {
-        if (res.code === 0) {
-          this.data = res.result.list
-          this.params.total = res.result.totalCount
-        }
+      const v = this
+      v.$post('/api/storage-restructure/material/page',this.params).then(res=>{
+        
+        this.data = res.data.records
+        this.params.total = res.data.pages
+
+        console.log(res)
       })
+      // GetMaterialPageList(this.params).then(res => {
+      //   if (res.code === 0) {
+      //     this.data = res.result.list
+      //     this.params.total = res.result.totalCount
+      //   }
+      // })
     },
     changePage (pageIndex) {
       this.params.pageIndex = pageIndex
@@ -451,8 +459,9 @@ export default {
     },
     // 选择物料分类 显示物料列表
     treeCheck (data) {
-      this.categoryCode = data.value
-      this.params.categoryCode = data.value
+      console.log(data)
+      this.categoryCode = data.code
+      this.params.categoryCode = data.code
       this.params.pageIndex = 1
       this.params.total = 0
       this.getList()
@@ -460,18 +469,30 @@ export default {
     // 提交树操作
     treeHandle (type, data, target) {
       if (type === 'add') {
-        AddMaterialCategory({
+        this.$post('/api/storage-restructure/materialClassify/add',{
           ...data,
-          parentCode: target.value || '01'
+          parentId:target.id || 0
         }).then(res => {
-          if (res.code === 0) {
+          if (res.code === 200) {
             this.$Message.info(res.msg)
             this.getTree()
+          }else{
+            alert(123123123)
+            this.$Message.info(res.msg)
           }
         })
+        // AddMaterialCategory({
+        //   ...data,
+        //   parentCode: target.value || '01'
+        // }).then(res => {
+        //   if (res.code === 0) {
+        //     this.$Message.info(res.msg)
+        //     this.getTree()
+        //   }
+        // })
       } else if (type === 'edit') {
         console.log('data.data.id-----------')
-        console.log(data.data.id)
+        console.log(data)
         UpdateMaterialCategory({
           ...data,
           id: data.data.id

src/view/system-manage/user.vue

@@ -467,24 +467,37 @@ export default {
         }
       })
     },
+    treeInit(data){
+      for (let i = 0; i < data.length; i++) {
+        const element = data[i];
+        element.name = element.roleName = element.title
+        if(element.children && element.children.length > 0) this.treeInit(element.children)
+      }
+    },
     getTree () {
-      GetDeptZTreeChildren().then(res => {
-        if (res.code === 0) {
-          this.treeData = res.result
-          // let arr = []
-          // arr.push({
-          //   label: res.result[0].name,
-          //   value: res.result[0].value
-          // })
-          // res.result[0].children.forEach(item => {
-          //   arr.push({
-          //     label: item.name,
-          //     value: item.value
-          //   })
-          // })
-          this.formConfig[6].list = this.handleDeptData(this.treeData)
-        }
+      const v = this
+      v.$get('/api/blade-system/dept/tree').then(res=>{
+        v.treeInit(res.data)
+        this.treeData = res.data
+        console.log(res)
       })
+      // GetDeptZTreeChildren().then(res => {
+      //   if (res.code === 0) {
+      //     this.treeData = res.result
+      //     // let arr = []
+      //     // arr.push({
+      //     //   label: res.result[0].name,
+      //     //   value: res.result[0].value
+      //     // })
+      //     // res.result[0].children.forEach(item => {
+      //     //   arr.push({
+      //     //     label: item.name,
+      //     //     value: item.value
+      //     //   })
+      //     // })
+      //     this.formConfig[6].list = this.handleDeptData(this.treeData)
+      //   }
+      // })
     },
     /* 处理部门树形数据 */
     handleDeptData (data) {
@@ -575,10 +588,10 @@ export default {
     }
   },
   mounted () {
-    this.getList()
+    //this.getList()
     this.getTree()
-    this.getRoleSelectItem()
-    this.getMaterialType()
+    //this.getRoleSelectItem()
+    //this.getMaterialType()
   }
 }
 </script>