Merge remote-tracking branch 'origin/feature/v2.4.38' into feature/v2.4.38

src/views/order/components/batchOrder.vue

@@ -392,9 +392,11 @@ export default {
             })
             return
           }
+          this.isDisable = true
           this.$request('/order/editBatchReturnMoneyInfo').data(obj).success((res) => {
             this.hShow = false
             this.asdShow = false
+            this.isDisable = false
             this.huiIds = []
             this.$Notice.success({
               title: '回款结果',

src/views/order/components/bigOrder.vue

@@ -447,7 +447,7 @@
                 </div>
             </Form>
             <div slot="footer">
-                <Button type="primary" size="large" @click="ordConfirm({ save: '1' })" :disabled="isDisable">提交</Button>
+                <Button type="primary" size="large" @click="ordConfirm({ save: '1' })" :disabled="isDisable" :loading="buttonLoading">提交</Button>
                 <Button type="primary" class="button-grey" size="large" @click="ordConfirm({ save: '2' })"
                     :disabled="isDisable" v-if="!showOrderStatus">暂存</Button>
                 <Button size="large" @click="ordCancel()">取消</Button>
@@ -1509,12 +1509,14 @@ export default {
             } else {
                 this.initialized()
             }
+            this.buttonLoading = true
             this.$request('/order/isOpenBig').data({// 验证手机号权限
                 buySubject: this.member.buySubject,
                 getContactOrder: 1,
                 phone: this.member.phone,
                 entName: (this.member.buySubject == '2') ? this.member.companyName : ''
             }).success((res) => {
+                this.buttonLoading = false
                 this.bigStas = res.data.Bigstatus
                 this.subStas = res.data.isSub
                 this.isYears = res.data.isYear // 0 开过大会员没超过一年,1 开过大会员超过一年, 2 没开过大会员
@@ -2355,6 +2357,9 @@ export default {
                 salesMoneylist.push({ id: Number(ele.id), money: this.fixedNum(ele.money)}) 
               } 
             })
+            if (this.bigStas == 0) { // 没有大会员权限
+                this.member.createType = '1'
+            }
             // 提交集合部分
             if (this.proNums == 1) {// 大会员
                 if (this.nums == 0) {
@@ -3245,6 +3250,7 @@ export default {
     },
     data() {
         return {
+            buttonLoading:false,
             firstOpen: true,
             buyserveName: '',
             serveEndtime: '',
@@ -4164,8 +4170,6 @@ export default {
                 { v: 1, n: '收费' }
             ],
             currentServerid: ''
-
-
         }
     }
 }

src/views/order/components/bigOrderEdit.vue

@@ -457,7 +457,7 @@
       <div slot="footer" style="width: 100%">
         <!--修改订单-->
         <div v-if="!readonly">
-          <Button type="primary" size="large" @click="ordConfirm()" :disabled="isDisable">提交</Button>
+          <Button type="primary" size="large" @click="ordConfirm()" :disabled="isDisable" :loading="buttonLoading">提交</Button>
           <Button size="large" @click="ordCancel()">取消</Button>
         </div>
         <!--审核订单-->
@@ -1737,6 +1737,7 @@ export default {
     reged(val, type) {
       this.spinShow = true
       // this.initialized()
+      this.buttonLoading = true
       this.$request('/order/isOpenBig').data({// 验证手机号权限
         phone: this.member.phone,
         orderCode: this.member.orderCode,
@@ -1744,6 +1745,7 @@ export default {
         getContactOrder: 1,
         entName: (this.member.buySubject == '2') ? this.member.companyName : ''
       }).success((res) => {
+        this.buttonLoading = false
         this.bigStas = res.data.Bigstatus
         this.subStas = res.data.isSub
         this.isYears = res.data.isYear // 0 开过大会员没超过一年,1 开过大会员超过一年, 2 没开过大会员
@@ -2611,6 +2613,9 @@ export default {
       if(this.member.recordPayType == '2' && this.member.buySubject == '1'){ // 个人续费 = 延长服务
         createTypeF = 3
       }
+      if (this.bigStas == 0) { // 没有大会员权限
+                this.member.createType = '1'
+      }
       // 提交集合部分
       if (this.proNums == 1) {// 大会员
         if (this.nums == 0) {
@@ -3768,6 +3773,7 @@ export default {
   },
   data() {
     return {
+      buttonLoading: false,
       startDate_p: '请选择开始时间',
       returnmoney: false,
       serveEndtime: '',

src/views/order/components/detailModel.vue

@@ -169,7 +169,7 @@
         </FormItem>
       </Form>
       <div slot="footer">
-        <Button type="primary" size="large" @click="correctionSave()" :disabled="redCorrection == 4">提交</Button>
+        <Button type="primary" size="large" @click="correctionSave()" :disabled="redCorrection == 4" :loading="btnloading">提交</Button>
         <Button size="large" @click="correctionShow = false">取消</Button>
       </div>
     </Modal>
@@ -231,6 +231,7 @@ import dateSigle from '@/components/dateSigle.vue'
 import bUpload from '@/components/uploadFile.vue'
 import saleSelect from './salesSelect.vue'
 import { dateFormatter } from '@/assets/js/date'
+import { Loading } from 'element-ui';
 export default {
   props: {
     data: {},
@@ -603,10 +604,12 @@ export default {
           redType: this.models.redType,
           signingSubject: this.signingSubject,
         }
+        this.btnloading = true
         this.$request('/order/addUpdateRecord').data(
           obj
         ).showSuccessTip().success(() => {
           this.correctionShow = false
+          this.btnloading = false
           this.$parent.ordered()
           this.inited()
         }).error(() => { }).get()
@@ -632,6 +635,7 @@ export default {
     },
     data() {
       return {
+        btnloading: false,
         pa_dis: false,
         performanceDis: false,
         permissionActivationShow: false,

src/views/order/components/details.vue

@@ -791,7 +791,7 @@
                         <i v-if="orDetails">
                             <em class="yuan"
                                 v-if="book">{{ book.original_price ? book.original_price ? '原价：' + localed(book.original_price / 100) : '' : '' }}</em>
-                            {{ orDetails.pay_money ? localed(orDetails.pay_money / 100) : localed(0.00) }}
+                            {{ getRealmoney(orDetails,book) ? localed(getRealmoney(orDetails,book)) : localed(0.00) }}
                         </i>
                     </span><!-- VIP订阅 -->
                     <span v-if="orderType == 1">
@@ -1564,6 +1564,13 @@ export default {
         localed(val) {
             return val.toLocaleString('zh', { style: 'currency', currency: 'CNY' })
         },
+        getRealmoney(r,f){
+            if (f.source == 'qmx' || this.orderType == '0') {
+              return r.pay_money / 100
+            } else {
+              return r.order_money
+            }
+        },
         unitNum(val) {
             if (val == 1) {
                 return '1月'

src/views/order/components/salePersonDetail.vue

@@ -37,8 +37,7 @@
       </div>
       <!-- 图片放大 -->
       <preview-imgs ref="previewRef" :urls="imgType"></preview-imgs>
-
-      <!--审核      -->
+      <!--审核-->
       <Divider v-if="doReview"/>
       <div v-if="doReview" style="width: 80%">
         <Form :show-message="false" :label-width="110">

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>
@@ -44,16 +44,35 @@ export default {
     pageChange() {
       this.selectName = []
     },
-    emptyFilter(val) { // 清空筛选
+    emptyFilter(val) { // 重置筛选
       if (val) {
         this.filter.salePerson = ''// 发起人
         this.filter.orderCode = ''// 订单编号
-        this.filter.auditStatus = "" // 审核状态
+        if(this.initsaleCodeModel){
+          this.$nextTick(()=>{
+            this.saleCodeModel = [this.initsaleCodeModel]
+          }) 
+        }else{
+          this.$nextTick(()=>{
+            this.saleCodeModel = []
+          }) 
+        }
+        this.filter.saleDep = ''
+        if(this.initequity){
+          this.filter.auditStatus = this.initequity
+        }else{
+          this.filter.auditStatus = "" // 审核状态
+        }  
       }
     },
     flushAuditStatus() {
       if (this.filter.salePerson === '' && this.filter.orderCode === '') {
-        this.filter.auditStatus = ''
+        if(this.initequity){
+          this.filter.auditStatus = this.initequity
+        }else{
+          this.filter.auditStatus = ''
+        }
+  
       } else {
         this.filter.auditStatus = '-1'
       }
@@ -93,14 +112,29 @@ 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.initsaleCodeModel = res.data.userDep.value
+          this.$nextTick(()=>{
+            this.saleCodeModel = [res.data.userDep.value]
+          }) 
         }
+        if(res.data.equity){ // 审核默认筛选项回显
+          this.initequity = res.data.equity + ''
+          this.filter.auditStatus = this.initequity
+        }
+        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 +186,9 @@ export default {
   },
   data() {
     return {
+      initsaleCodeModel: '',
+      initequity:'',
+      saleDis: false,
       saleCodeModel: [],
       saleDeplist: [],//部门数据
       loading: false,
@@ -352,7 +389,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,23 +57,45 @@ export default {
   components: {
     demodel
   },
+  created(){
+    this.getsaleDep()
+  },
   methods: {
+    getsaleDep() {
+      let url = '/order/getSalesChannelItem'
+      this.$request(url).data({
+      }).success((res) => {
+        if(res.data.equity){ // 审核状态默认筛选项回显
+          this.initequity = res.data.equity + ''
+          this.filter.state = this.initequity
+        }
+        this.flushList()
+      }).post()
+    },
     load(val) { // 加载中
       this.loading = val
     },
     pageChange() {
       this.selectName = []
     },
-    emptyFilter(val) { // 清空筛选
+    emptyFilter(val) { // 重置
       if (val) {
         this.filter.salePerson = ''// 发起人
         this.filter.orderCode = ''// 订单编号
-        this.filter.state = "" // 审核状态
+        if(this.initequity){
+          this.filter.state = this.initequity
+        }else{
+          this.filter.state = ''
+        } 
       }
     },
     flushAuditStatus() {
       if (this.filter.salePerson === '' && this.filter.orderCode === '') {
-        this.filter.state = ''
+        if(this.initequity){
+          this.filter.state = this.initequity
+        }else{
+          this.filter.state = ''
+        }     
       } else {
         this.filter.state = '-1'
       }
@@ -95,6 +118,7 @@ export default {
   },
   data() {
     return {
+      initequity:'',
       loading: false,
       filterStyle: {
         filterReset: 1, //是否展示重置
@@ -104,6 +128,7 @@ export default {
         {v: '-1', n: '全部'},
         {v: '1', n: '待一审'},
         {v: '2', n: '待二审'},
+        // { v: '5', n: '待三审' },
         {v: '3', n: '已通过'},
         {v: '4', n: '已退回'}
       ],
@@ -161,7 +186,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 +242,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',