提交调整

src/views/order/orderReview.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="ding-dan">
     <h1>创建订单审核</h1>
-    <table-lists ref="tableLists" v-model="list" :filter="filter" :filterSear="2" :filterReset="filterStyle.filterReset"
+    <table-lists ref="tableLists" v-model="list" :autoLoad="false" :filter="filter" :filterSear="2" :filterReset="filterStyle.filterReset"
       :filterType="filterStyle.filterType" requestApi="/order/orderCreateAuditList" @loading="load"
       @emptyFilter="emptyFilter" @pageChange="pageChange">
       <template slot="filterContent">
@@ -14,7 +14,7 @@
         </Select>
         <span style="margin-top: 7px;">业绩归属部门：</span>
         <cascaderMulti class="truecascader" placeholder="业绩归属部门" v-model="saleCodeModel" :data="saleDeplist" multiple
-          @on-change="saleDepChange" style="marginRight:10px;"></cascaderMulti>
+          @on-change="saleDepChange" style="marginRight:10px;" :disabled="saleDis"></cascaderMulti>
       </template>
       <Table ellipsis :loading="loading" ref="selection" :columns="columns" :data="list.lists" stripe></Table>
     </table-lists>
@@ -93,14 +93,27 @@ export default {
     getsaleDep() {
       let url = '/order/getSalesChannelItem'
       this.$request(url).data({
-        name: this.reqType
       }).success((res) => {
         if (res.data.dep) {
-          this.saleDeplist = res.data.dep
+          this.saleDeplist = res.data.dep   
         }
+        if(res.data.userDep && Object.keys(res.data.userDep).length>0){ // 有部门限制
+          this.saleDis = true
+          this.$nextTick(()=>{
+            this.saleCodeModel = [res.data.userDep.value]
+          }) 
+        }
+        if(res.data.equity){ // 审核默认筛选项回显
+          this.filter.auditStatus = res.data.equity + ''
+        }
+        this.flushList()
       }).post()
     },
     saleDepChange(val) {
+      if(this.saleDis){ // 后端给默认的回显部门（不能修改），则部门筛选值不传，仅展示出来回显部门
+        this.filter.saleDep = ''
+        return 
+      }
       if (val && val.length > 0) {
         let valres = this.getMinLevelData(this.saleDeplist, val)
         this.filter.saleDep = valres.join(',')
@@ -152,6 +165,7 @@ export default {
   },
   data() {
     return {
+      saleDis: false,
       saleCodeModel: [],
       saleDeplist: [],//部门数据
       loading: false,
@@ -352,7 +366,7 @@ export default {
                 }
               }, '查看')
             ]
-            if (row.audit_status === 1 || row.audit_status === 2 || row.audit_status === 4) {
+            if (row.auditButtShow == 1 && (row.audit_status === 1 || row.audit_status === 2 || row.audit_status === 4)) {
               opera.unshift(h('Button', {
                 props: {
                   type: 'success',

src/views/order/salesOrderMakeUp.vue

@@ -3,6 +3,7 @@
     <h1>补录订单审核</h1>
     <table-lists
         ref="tableLists"
+        :autoLoad="false"
         v-model="list"
         :filter="filter"
         :sear="sear"
@@ -56,7 +57,20 @@ export default {
   components: {
     demodel
   },
+  created(){
+    this.getsaleDep()
+  },
   methods: {
+    getsaleDep() {
+      let url = '/order/getSalesChannelItem'
+      this.$request(url).data({
+      }).success((res) => {
+        if(res.data.equity){ // 审核状态默认筛选项回显
+          this.filter.state = res.data.equity + ''
+        }
+        this.flushList()
+      }).post()
+    },
     load(val) { // 加载中
       this.loading = val
     },
@@ -104,6 +118,7 @@ export default {
         {v: '-1', n: '全部'},
         {v: '1', n: '待一审'},
         {v: '2', n: '待二审'},
+        { v: '5', n: '待三审' },
         {v: '3', n: '已通过'},
         {v: '4', n: '已退回'}
       ],
@@ -161,7 +176,15 @@ export default {
               }, [
                 h('span', '待二审')
               ])
-            } else if (row.state === 3) {
+            } else if (row.state === 4) {
+              return h('div', {
+                style: {
+                  color: '#34bfa3'
+                }
+              }, [
+                h('span', '待三审')
+              ])
+            }else if (row.state === 3) {
               return h('div', {
                 style: {
                   color: '#36a3f7'
@@ -209,7 +232,7 @@ export default {
                 }
               }, '查看')
             ]
-            if (row.state === 1 || row.state === 2) {
+            if (row.auditButtShow == 1 && (row.state === 1 || row.state === 2 || row.state === 4)) {
               opera.unshift(h('Button', {
                 props: {
                   type: 'success',