Merge branch 'dev' into 'master'

选择物料分类四级分类筛选未停用的

See merge request new-business/drp-web!12

src/api/classify/basic.js

@@ -1,10 +1,11 @@
 import request from '@/utils/request'
 
 // 获取物料分类树形结构数据
-export function getTree() {
+export function getTree(data) {
   return request({
     url: `/system/classify/list`,
     method: 'post',
+    data: data
   })
 }
 // 获取物料基本分类详细信息

src/components/PopDialog/fourClass.vue

@@ -89,7 +89,7 @@ export default {
     // 获取数据列表
     refreshList(data) {
       this.loading = true;
-      getTree(data).then(res => {
+      getTree({isEnable: '0'}).then(res => {
         console.log('res',res)
         if(res.code === 200) {
           this.threedata = res.rows

src/views/material/changeApply/add.vue

@@ -315,7 +315,7 @@
             </el-col>
           </el-row>
           <el-row :gutter="20">
-            <el-col :span="8">
+            <!-- <el-col :span="8">
               <el-form-item label="最后审核人" prop="approver">
                 <el-input disabled v-model="basicForm.approver"></el-input>
               </el-form-item>
@@ -324,7 +324,7 @@
               <el-form-item label="最后审核时间" prop="approvalTime">
                 <el-input disabled v-model="basicForm.approvalTime"></el-input>
               </el-form-item>
-            </el-col>
+            </el-col> -->
             <el-col :span="8">
               <el-form-item label="单据状态" prop="status">
                 <el-select 

src/views/material/classify/index.vue

@@ -232,7 +232,7 @@ export default {
     // 获取树形结构
     getTreeData(data) {
       this.loading = true;
-      getTree(data)
+      getTree({})
         .then((res) => {
           let { code, rows } = res;
           if (code === 200) {

src/views/material/requisition/add.vue

@@ -788,7 +788,7 @@
             </el-col>
           </el-row>
           <el-row :gutter="20">
-            <el-col :span="8">
+            <!-- <el-col :span="8">
               <el-form-item label="最后审核人" prop="reviewedByName">
                 <el-input disabled v-model="basicForm.reviewedByName"></el-input>
               </el-form-item>
@@ -797,7 +797,7 @@
               <el-form-item label="最后审核时间" prop="approvalTime">
                 <el-input disabled v-model="basicForm.approvalTime"></el-input>
               </el-form-item>
-            </el-col>
+            </el-col> -->
             <el-col :span="8">
               <el-form-item label="单据状态" prop="status">
                 <el-select 

src/views/material/specialAttr/index.vue

@@ -234,7 +234,7 @@ export default {
   methods: {
     // 获取树形结构
     getTreeData(data) {
-      getTree(data).then(res => {
+      getTree({}).then(res => {
         let {code, rows} = res
         if(code === 200) {
           this.data = rows