P348

src/views/order/components/bigOrder.vue

@@ -56,6 +56,9 @@
               <FormItem label="销售人员">
                 <sale-select ref="saleRef" @salePerson="salePerson" :setDefaultPerson="this.$store.getters.getAdminUser.username"></sale-select>
               </FormItem>
+              <FormItem label="业绩归属部门" required>
+                <Cascader :data="saleDep" trigger="hover" @on-visible-change="saleDepClick" @on-change="saleDepChange"></Cascader>
+              </FormItem>
               <FormItem label="业绩统计时间">
                   <date-sigle ref="sigleRef3" :dateType="'date'" :dataV="member.sale_time" :placeholderd="'请选择业绩统计时间'" @startDate="saleDate" :overTime="0"></date-sigle>
               </FormItem>
@@ -240,6 +243,11 @@
                     <FormItem label="签约主体" required>
                         <v-cascader ref="casRef2" :initVal="'h01'" placeholderType="签约主体" reqType="签约主体" @levelChange="paybackChange" v-if="bShow"></v-cascader>
                     </FormItem>
+                    <FormItem label="约定支付方式" required>
+                        <Select v-model="member.payType" placeholder="请选择约定支付方式">
+                            <Option v-for="item in payTypes" :value="item.v" :key="item.v">{{ item.n }}</Option>
+                        </Select>
+                    </FormItem>
                     <FormItem label="协议签订时间" v-show="member.agreementStatus == '1'">
                         <date-sigle ref="sigleRef" :dateType="'date'" :placeholderd="'请选择协议签订时间'" @startDate="agreeDate" :overTime="0"></date-sigle>
                     </FormItem>
@@ -341,6 +349,7 @@ export default {
           this.member.companyName = ''
           this.member.remark = ''
           this.member.agreementStatus = ''
+          this.member.payType = ''
           this.member.agreementNumber = ''
           this.member.cycleType = ''
           this.member.commission = '0'
@@ -391,6 +400,19 @@ export default {
             }
           },200)
         },
+        saleDepClick () {
+            let url = '/order/getSalesChannelItem'
+            this.$request(url).data({
+                name: this.reqType
+            }).success((res) => {
+                if (res.data.dep) {
+                    this.saleDep = res.data.dep
+                }
+            }).post()
+        },
+        saleDepChange (val) {
+            this.saleCode = String(val[val.length-1])
+        },
         onRemoveUpload () {
             this.member.contractUrl = ''
         },
@@ -1592,6 +1614,10 @@ export default {
                 this.$Notice.warning({title: '请选择购买主体'})
                 return
             }
+            if (!this.member.payType) {
+                this.$Notice.warning({title: '请选择约定支付方式'})
+                return
+            }
             if (this.member.phone == '') {
                 this.$Notice.warning({title: '请输入手机号'})
                 return
@@ -1696,6 +1722,8 @@ export default {
                     salesPerson: this.member.salesPerson?JSON.parse(this.member.salesPerson).username:'',
                     salesPersonId: this.member.salesPerson?JSON.parse(this.member.salesPerson).id:'',
                     areaCount:this.member.areaCount,
+                    saleDep: this.saleCode,
+                    payType: this.member.payType
                 }
                 // console.log(obj)
                 if (this.showOrderStatus){
@@ -1734,7 +1762,9 @@ export default {
                     contract_archive_time: this.member.agreementStatus == '1'?this.member.contract_archive_time:'',
                     contract_archive_num: this.member.agreementStatus == '1'?this.member.contract_archive_num:'',
                     salesPerson: this.member.salesPerson?JSON.parse(this.member.salesPerson).username:'',
-                    salesPersonId: this.member.salesPerson?JSON.parse(this.member.salesPerson).id:''
+                    salesPersonId: this.member.salesPerson?JSON.parse(this.member.salesPerson).id:'',
+                    saleDep: this.saleCode,
+                    payType: this.member.payType
                 }
                 if (this.showOrderStatus){
                     this.urlReq('/order/createSubOrder', obj)
@@ -1771,7 +1801,9 @@ export default {
                     contract_archive_time: this.member.agreementStatus == '1'?this.member.contract_archive_time:'',
                     contract_archive_num: this.member.agreementStatus == '1'?this.member.contract_archive_num:'',
                     salesPerson: this.member.salesPerson?JSON.parse(this.member.salesPerson).username:'',
-                    salesPersonId: this.member.salesPerson?JSON.parse(this.member.salesPerson).id:''
+                    salesPersonId: this.member.salesPerson?JSON.parse(this.member.salesPerson).id:'',
+                    saleDep: this.saleCode,
+                    payType: this.member.payType
                 }
                 if (this.showOrderStatus){
                     this.urlReq('/order/createSupplyOrder', obj)
@@ -1843,7 +1875,9 @@ export default {
     },
     data() {
         return {
-           comingIntoEffective:false,
+            saleCode: '',
+            saleDep : [],
+            comingIntoEffective:false,
             max_length:2,
             serData: [],
             servedData: [],
@@ -1922,6 +1956,7 @@ export default {
                 contract_archive_num: '',
                 single:false, // 大会员商机版2.0-单省版 radio 选中状态
                 areaCount:'0', // 大会员省份版-省份数量
+                payType: ''
             },
             isAll: false,
             radioDis1: false,
@@ -1936,6 +1971,11 @@ export default {
                 {v: '0', n: '不签协议'},
                 {v: '1', n: '已签协议'}
             ],
+            payTypes: [
+                {v: 'transferAccounts', n: '对公转账'},
+                {v: 'wx', n: '微信'},
+                {v: 'ali', n: '支付宝'}
+            ],
             unitOptions: [
                 {v: '0', n: '月'},
                 {v: '1', n: '天'}

src/views/order/components/bigOrderEdit.vue

@@ -68,6 +68,9 @@
           <FormItem label="销售人员">
             <sale-select ref="saleRef" :saleType="'1'" @salePerson="salePerson" v-if="bShow"></sale-select>
           </FormItem>
+          <FormItem label="业绩归属部门">
+            <Cascader v-model="member.saleCodeModel" :data="saleDep" trigger="hover" @on-change="saleDepChange"></Cascader>
+          </FormItem>
           <FormItem label="业绩统计时间">
             <date-sigle ref="sigleRef3" :dateType="'date'" :dataV="member.sale_time" :placeholderd="'请选择业绩统计时间'"
                         @startDate="saleDate" :overTime="0"></date-sigle>
@@ -272,6 +275,11 @@
               <v-cascader ref="casRef2" :initVal="'h01'" placeholderType="签约主体" reqType="签约主体"
                           @levelChange="paybackChange" v-if="bShow"></v-cascader>
             </FormItem>
+            <FormItem label="约定支付方式" prop="payType">
+              <Select v-model="member.payType" placeholder="请选择约定支付方式" :disabled="finish_dis">
+                <Option v-for="item in payTypes" :value="item.v" :key="item.v">{{ item.n }}</Option>
+              </Select>
+            </FormItem>
             <FormItem label="协议签订时间" v-show="member.agreementStatus == '1'">
               <date-sigle ref="sigleRef" :dateType="'date'" :placeholderd="'请选择协议签订时间'" @startDate="agreeDate"
                           :overTime="0"></date-sigle>
@@ -446,6 +454,9 @@ export default {
         },500)
       }).post()
     },
+    saleDepChange (val) {
+        this.saleCode = String(val[val.length-1])
+    },
     radiosChange(val) {
             this.member.buySubject = String(val)
             this.member.buyCount = ''
@@ -470,7 +481,7 @@ export default {
               this.show(this.olddata)
             }
             
-            console.log(this.repair,this.member.createType,'切换服务状态')
+            // console.log(this.repair,this.member.createType,'切换服务状态')
         },
     buyHandler() {
             this.member.buyCount=this.member.buyCount.replace(/[^\d]+/g,'')
@@ -579,7 +590,7 @@ export default {
       // if (!this.returnMyReceivable) {
       //   this.interested = false
       // }
-      console.log('权益是否开通' + this.interested)
+      // console.log('权益是否开通' + this.interested)
     },
     moneyReg(val) {
       return val.replace(/[^\d^\.]+/g, '').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.')
@@ -651,7 +662,7 @@ export default {
 
             }
           }
-          console.log(this.member.products,this.member.buySubject)
+          // console.log(this.member.products,this.member.buySubject)
           if (this.member.products == 1) {
             if(this.member.buySubject!='2'){//主体为个体走原有逻辑
               if (this.bigStas == 1) {
@@ -722,7 +733,7 @@ export default {
             }
 
             }else{
-              console.log('企业',this.member.buySubject)
+              // console.log('企业',this.member.buySubject)
               this.colr = ''
               if (this.nums == 0) {
                 this.creAuth = '1'
@@ -906,7 +917,7 @@ export default {
       }).success((res) => {
         this.oldCurrentId = res.data.list
       }).post()
-      console.log("扩充订单新旧服务对比", this.currentId, this.oldCurrentId)
+      // console.log("扩充订单新旧服务对比", this.currentId, this.oldCurrentId)
     },
     unique(arr) {// 去重
       const res = new Map()
@@ -976,7 +987,7 @@ export default {
             }).map(t => {
               return t.count
             }) : []
-            console.log(this.member.level,this.member.buySubject)
+            // console.log(this.member.level,this.member.buySubject)
             if(this.member.buySubject!=this.show_buy_subject){
               this.pacData.push({
               id: v.id,
@@ -986,7 +997,7 @@ export default {
               b_pkcount: '',
               count: Number(String(countStr))
             })
-            console.log(this.member.supplyMoney)
+            // console.log(this.member.supplyMoney)
             this.member.supplyMoney='0'
             this.member.sums='0'
             this.member.supplyPayMoney=0
@@ -1122,7 +1133,7 @@ export default {
       this.sumSel = []
       this.serData.forEach(k => {
         if (this.repair == '1') {
-          console.log(this.currentId,this.equity,'新服务选中ID，和权益是否开通')
+          // console.log(this.currentId,this.equity,'新服务选中ID，和权益是否开通')
           if (k.id == 1) {
             k._checked = true
             k._disabled = true
@@ -1206,7 +1217,7 @@ export default {
       })
     },
     leChange(val, check = true) {// 会员套餐
-      console.log("会员套餐", val, check)
+      // console.log("会员套餐", val, check)
 
       val = val ? JSON.parse(val) : ''
       this.sArr = []
@@ -1215,7 +1226,7 @@ export default {
       if (this.pReadon) {
         this.myNoTchange()
       }
-      console.log("phone 权益", val.i_ispreinstall, this.bigStas, this.subStas)
+      // console.log("phone 权益", val.i_ispreinstall, this.bigStas, this.subStas)
       if (val.i_ispreinstall == 0) { //自定义套餐
         //   if (check && val !== undefined) {
         //   this.allCancel()
@@ -1983,7 +1994,7 @@ export default {
           areaCount:this.member.single&&this.combo_id.id==6?this.member.areaCount:0,// 仅大会员商机版2.0时 单省版才有效
           updateType: this.noPass1 ? 0 : 1
         }
-        console.log(obj)
+        // console.log(obj)
         if (this.returnMyReceivable) {
           this.urlReq('/order/updateBigOrder', obj)
         } else {
@@ -2025,7 +2036,7 @@ export default {
           salesPersonId: this.member.salesPerson ? JSON.parse(this.member.salesPerson).id : '',
           updateType: this.noPass1 ? 0 : 1
         }
-        console.log(obj)
+        // console.log(obj)
         if (this.returnMyReceivable) {
           this.urlReq('/order/updateSubOrder', obj)
         } else {
@@ -2179,14 +2190,23 @@ export default {
           this.radio_dis=true
         }else{
           this.radio_dis=false
-
         }
         this.show_buy_subject=res.buy_subject
         if(res.orderStatus == 1){//回显订单已完成禁用购买主体
           this.finish_dis=true
         }else{
           this.finish_dis=false
-
+        }
+        if (res.saleDep) {
+          let url = '/order/getSalesChannelItem'
+          this.$request(url).data({
+              name: this.reqType
+          }).success((res) => {
+              if (res.data.dep) {
+                  this.saleDep = res.data.dep
+              }
+          }).post()
+          this.saleCode = String(res.saleDep[res.saleDep.length-1])
         }
        
         // 补充包列表
@@ -2238,8 +2258,9 @@ export default {
           contract_archive_time: contractRes.contract_archive_time, //
           contract_archive_num: contractRes.contract_archive_num == 0 ? '' : contractRes.contract_archive_num ,//
           single: filterData.areaCount>0 ? true:false,
-          areaCount: filterData.areaCount
-
+          areaCount: filterData.areaCount,
+          payType: res.payType,
+          saleCodeModel: res.saleDep
         }
         if (this.member.cycleType === 1) {
           this.max_length = 4
@@ -2295,7 +2316,7 @@ export default {
           // this.proChange(Number(products))
         }
         this.nums = 0
-        console.log(this.interested,res.buy_subject,this.member.buySubject,'21212121')
+        // console.log(this.interested,res.buy_subject,this.member.buySubject,'21212121')
       })
       this.bShow = true
       
@@ -2304,6 +2325,8 @@ export default {
   },
   data() {
     return {
+      saleCode: '',
+      saleDep : [],
       olddata:null,
       show_buy_subject:'',
       max_length: 2,
@@ -2405,6 +2428,8 @@ export default {
         contract_archive_num: '',
         single:false, // 大会员商机版2.0-单省版 radio 选中状态
         areaCount:'0', // 大会员省份版-省份数量
+        payType: '',
+        saleCodeModel: []
       },
       isAll: false,
       radioDis1: false,
@@ -2421,6 +2446,11 @@ export default {
         {v: '0', n: '不签协议'},
         {v: '1', n: '已签协议'}
       ],
+      payTypes: [
+          {v: 'transferAccounts', n: '对公转账'},
+          {v: 'wx', n: '微信'},
+          {v: 'ali', n: '支付宝'}
+      ],
       unitOptions: [
         {v: 0, n: '月'},
         {v: 1, n: '天'}

src/views/order/components/detailModel.vue

@@ -138,30 +138,38 @@
       </div>
     </Modal>
     <!-- 修正记录 -->
-    <Modal title="金额修正" v-model="correctionShow" class-name="order-model tui-model" :mask-closable="false" @on-visible-change="visibleChange">
-      <label class="correctionLabel">请输入该订单最终准确的金额：</label>
+    <Modal title="红冲" v-model="correctionShow" class-name="order-model tui-model" :mask-closable="false" @on-visible-change="visibleChange">
+      <!-- <label class="correctionLabel">请输入该订单最终准确的信息：</label> -->
       <Form ref="correctionModels" :model="models" :label-width="110">
-        <!-- <FormItem label="请输入该订单最终准确的金额：">
-        </FormItem> -->
-        <FormItem label="大会员应付金额" v-if="bigCorrection">
+        <FormItem label="红冲类型">
+            <CheckboxGroup v-model="models.redType" @on-change="checkAllGroupChange">
+                <Checkbox label="签约主体红冲"></Checkbox>
+                <Checkbox label="金额红冲"></Checkbox>
+            </CheckboxGroup>
+        </FormItem>
+        <p class="correctionLabel">请输入该订单最终准确的信息：</p>
+        <FormItem label="签约主体" v-if="redCorrection == 3 || redCorrection == 1">
+            <Input v-model="signingSubject" type="text" :maxlength="50" disabled placeholder="请输入签约主体"></Input>
+        </FormItem>
+        <FormItem label="大会员应付金额" v-if="(redCorrection == 3 || redCorrection == 2) && bigCorrection">
             <Input v-model="models.bigPayMoney" type="text" :maxlength="9" placeholder="请输入大会员应付金额"></Input>
         </FormItem>
-        <FormItem label="子账号应付金额" v-if="bigCorrection">
+        <FormItem label="子账号应付金额" v-if="(redCorrection == 3 || redCorrection == 2) && bigCorrection">
             <Input v-model="models.subMoney" type="text" :maxlength="9" :disabled="!(filterData.subPayMoney && filterData.subPayMoney>0)" placeholder="请输入子账号应付金额"></Input>
         </FormItem>
-        <FormItem label="补充包应付金额" v-if="bigCorrection">
+        <FormItem label="补充包应付金额" v-if="(redCorrection == 3 || redCorrection == 2) && bigCorrection">
             <Input v-model="models.supplyMoney" type="text" :maxlength="9" :disabled="!(filterData.supplyPayMoney && filterData.supplyPayMoney>0)" placeholder="请输入补充包应付金额"></Input>
         </FormItem>
-        <FormItem label="订单金额" v-if="!bigCorrection">
+        <FormItem label="订单金额" v-if="(redCorrection == 3 || redCorrection == 2) && !bigCorrection">
             <Input v-model="models.orderMoney" type="text" :maxlength="9" placeholder="请输入订单金额"></Input>
         </FormItem>
-        <FormItem label="应付金额" v-if="!bigCorrection">
+        <FormItem label="应付金额" v-if="(redCorrection == 3 || redCorrection == 2) && !bigCorrection">
             <Input v-model="models.payMoney" type="text" :maxlength="9" placeholder="请输入应付金额"></Input>
         </FormItem>
-        <FormItem label="佣金">
+        <FormItem label="佣金" v-if="redCorrection == 3 || redCorrection == 2">
             <Input v-model="models.commission" type="text" :maxlength="9" placeholder="请输入佣金"></Input>
         </FormItem>
-        <FormItem label="手续费">
+        <FormItem label="手续费" v-if="redCorrection == 3 || redCorrection == 2">
             <Input v-model="models.proceduresMoney" type="text" :maxlength="9" placeholder="请输入手续费"></Input>
         </FormItem>
         <FormItem label="修正原因">
@@ -174,7 +182,7 @@
         </FormItem>
       </Form>
       <div slot="footer">
-          <Button type="primary" size="large" @click="correctionSave()" :disabled="isDisable">提交</Button>
+          <Button type="primary" size="large" @click="correctionSave()" :disabled="redCorrection == 4">提交</Button>
           <Button size="large" @click="correctionShow = false">取消</Button>
       </div>
     </Modal>
@@ -429,6 +437,8 @@ export default {
         commission: this.fixedNum(this.models.commission),
         proceduresMoney: this.fixedNum(this.models.proceduresMoney),
         correctionReason: this.models.correctionType !== '其他' ? this.models.correctionType : this.models.correctionReason,
+        redType: this.models.redType.join(','),
+        signingSubject: this.signingSubject,
       }
       this.$request('/order/addUpdateRecord').data(
         obj
@@ -437,6 +447,17 @@ export default {
         this.$parent.ordered()
         this.inited()
       }).error(() => {}).get()
+    },
+    checkAllGroupChange (data) {
+      if (data.length === 1 && data[0] === '签约主体红冲') {
+        this.redCorrection = 1
+      } else if (data.length === 1 && data[0] === '金额红冲') {
+        this.redCorrection = 2
+      } else if (data.length === 0) {
+        this.redCorrection = 4
+      } else {
+        this.redCorrection = 3
+      }
     }
   },
   data() {
@@ -448,6 +469,7 @@ export default {
       tShow: false,
       correctionShow: false,
       bigCorrection: false,
+      redCorrection: 1,
       isDisable: false,
       invoice: {
         type: ''
@@ -476,7 +498,8 @@ export default {
         orderMoney: '',
         payMoney: '',
         commission: '',
-        proceduresMoney: ''
+        proceduresMoney: '',
+        redType: ['签约主体红冲']
       },
       backed: {
         return_status: ''
@@ -552,6 +575,11 @@ export default {
         ]
       }
     }
+  },
+  computed: {
+    signingSubject () {
+      return this.orderDetail.signing_subject==='h01'?'北京拓普丰联信息科技股份有限公司':'北京剑鱼信息技术有限公司'
+    }
   }
 }
 </script>
@@ -560,5 +588,6 @@ export default {
   font-size: 16px;
   font-weight: bold;
   color: red;
+  margin-bottom: 10px;
 }
 </style>

src/views/order/components/details.vue

@@ -25,6 +25,7 @@
                         <p>销售人员：</p>
                         <i class="i-inpt">{{orDetails.salesperson?orDetails.salesperson:'--'}}</i>
                     </span>
+                    <span><p>销售渠道：</p>{{orDetails?orDetails.saleDepShow?orDetails.saleDepShow:'--':'--'}}</span>
                     <span>
                         <p>业绩统计时间：</p>
                         <i class="i-inpt">{{orDetails?orDetails.sale_time?orDetails.sale_time:'--':'--'}}</i>
@@ -32,6 +33,7 @@
                     <span v-if="orDetails.buy_subject"><p>购买主体：</p>{{orDetails.buy_subject==1?'个人':'企业'}}</span>
                     <span><p>公司名称：</p>{{orDetails?orDetails.company_name?orDetails.company_name:'--':'--'}}</span>
                     <span><p>签约主体：</p>{{orDetails?orDetails.return_commpany?orDetails.return_commpany:'--':'--'}}</span>
+                    <span><p>约定支付方式：</p>{{orDetails?orDetails.payType?orDetails.payType:'--':'--'}}</span>
                     <span><p>销售渠道：</p>{{orDetails?orDetails.sales_channel?orDetails.sales_channel:'--':'--'}}</span>
                     <span><p>下单渠道：</p>{{orDetails?orDetails.order_channel_new?orDetails.order_channel_new:'--':'--'}}</span>
                     <span><p>创建时间：</p>{{orDetails?orDetails.create_time:'--'}}</span>
@@ -469,21 +471,23 @@
             </div>
             <Divider />
         </div>
-        <!-- 金额修正记录 -->
+        <!-- 红冲记录 -->
         <div class="infor-card" v-if="book.source == 'qmx' || orDetails.pay_way == '对公转账' || orDetails.order_channel == 'd03' || orDetails.return_status !== 1">
             <div class="cont">
-                <div class="tit">金额修正记录</div>
+                <div class="tit">红冲记录</div>
                 <div class="classfity">
-                    <i v-if="orDetails.moneyCorrectionData && orDetails.moneyCorrectionData.length === 0" style="color:#888">暂无金额修正记录</i>
+                    <i v-if="orDetails.moneyCorrectionData && orDetails.moneyCorrectionData.length === 0" style="color:#888">暂无红冲记录</i>
                     <div v-for="(item,index) in orDetails.moneyCorrectionData" :key="item.id" v-else>
-                        <p  style="color:#700">金额修正记录 {{index + 1}}.</p>
-                        <span v-if="orDetails.product_type === '大会员'"><p>大会员应付金额变动：</p>{{item.payMoney?item.payMoney>0?'+'+item.payMoney/100:item.payMoney/100:'--'}}</span>
-                        <span v-if="orDetails.product_type === '大会员'"><p>子账号应付金额变动：</p>{{item.bigSubMoney?item.bigSubMoney>0?'+'+item.bigSubMoney/100:item.bigSubMoney/100:'--'}}</span>
-                        <span v-if="orDetails.product_type === '大会员'"><p>补充包应付金额变动：</p>{{item.supplyMoney?item.supplyMoney>0?'+'+item.supplyMoney/100:item.supplyMoney/100:'--'}}</span>
-                        <span v-if="orDetails.product_type != '大会员'"><p>订单金额变动：</p>{{item.orderMoney?item.orderMoney>0?'+'+item.orderMoney/100:item.orderMoney/100:'--'}}</span>
-                        <span v-if="orDetails.product_type != '大会员'"><p>应付金额变动：</p>{{item.payMoney?item.payMoney>0?'+'+item.payMoney/100:item.payMoney/100:'--'}}</span>
-                        <span><p>佣金金额变动：</p>{{item.commission?item.commission>0?'+'+item.commission/100:item.commission/100:'--'}}</span>
-                        <span><p>手续费变动：</p>{{item.proceduresMoney?item.proceduresMoney>0?'+'+item.proceduresMoney/100:item.proceduresMoney/100:'--'}}</span>
+                        <p  style="color:#700">红冲记录 {{index + 1}}.</p>
+                        <span><p>红冲类型：</p>{{item.redType}}</span>
+                        <span v-if="item.redType.indexOf('签约主体')>-1"><p>红冲前签约主体：</p>{{item.signingSubject}}</span>
+                        <span v-if="item.redType.indexOf('金额')>-1 && orDetails.product_type === '大会员'"><p>大会员应付金额变动：</p>{{item.payMoney?item.payMoney>0?'+'+item.payMoney/100:item.payMoney/100:'--'}}</span>
+                        <span v-if="item.redType.indexOf('金额')>-1 && orDetails.product_type === '大会员'"><p>子账号应付金额变动：</p>{{item.bigSubMoney?item.bigSubMoney>0?'+'+item.bigSubMoney/100:item.bigSubMoney/100:'--'}}</span>
+                        <span v-if="item.redType.indexOf('金额')>-1 && orDetails.product_type === '大会员'"><p>补充包应付金额变动：</p>{{item.supplyMoney?item.supplyMoney>0?'+'+item.supplyMoney/100:item.supplyMoney/100:'--'}}</span>
+                        <span v-if="item.redType.indexOf('金额')>-1 && orDetails.product_type != '大会员'"><p>订单金额变动：</p>{{item.orderMoney?item.orderMoney>0?'+'+item.orderMoney/100:item.orderMoney/100:'--'}}</span>
+                        <span v-if="item.redType.indexOf('金额')>-1 && orDetails.product_type != '大会员'"><p>应付金额变动：</p>{{item.payMoney?item.payMoney>0?'+'+item.payMoney/100:item.payMoney/100:'--'}}</span>
+                        <span v-if="item.redType.indexOf('金额')>-1"><p>佣金金额变动：</p>{{item.commission?item.commission>0?'+'+item.commission/100:item.commission/100:'--'}}</span>
+                        <span v-if="item.redType.indexOf('金额')>-1"><p>手续费变动：</p>{{item.proceduresMoney?item.proceduresMoney>0?'+'+item.proceduresMoney/100:item.proceduresMoney/100:'--'}}</span>
                         <span><p>修正原因：</p>{{item.correctionReason?item.correctionReason:'--'}}</span>
                         <span><p>修正时间：</p>{{item.createTime?item.createTime:'--'}}</span>
                         <span><p>操作人：</p>{{item.createPerson?item.createPerson:'--'}}</span>
@@ -560,7 +564,7 @@
             <Button class="shen-btn" type="primary" size="large" disabled v-else-if="returnMyReceivable">审核</Button>
             <Button class="tui-btn" size="small" type="error" @click="refund" v-if="returnMyReceivable && orderComp">退款</Button>
             <Button class="tui-btn" size="small" type="error" disabled v-else-if="returnMyReceivable" >退款</Button>
-            <Button class="shen-btn" size="small" type="error" :disabled="!returnMyReceivable" @click="correction" v-if="returnMyReceivable && orDetails.billingMode === 1 && this.book.source === 'qmx'" >金额修正</Button>
+            <Button class="shen-btn" size="small" type="error" :disabled="!returnMyReceivable" @click="correction" v-if="returnMyReceivable && orDetails.billingMode === 1 && this.book.source === 'qmx'" >红冲</Button>
         </div>
         <!-- 线下开发票、新增回款信息、审核、退款弹框 -->
         <d-model
@@ -909,6 +913,17 @@ export default {
         editOrder() {
             const source = this.book.source
             const product_type = this.orDetails.product_type
+            if (this.orders.res.pay_way) {
+                if (this.orders.res.pay_way.indexOf('wx') > -1) {
+                    this.orders.res.payType = 'wx'
+                } else if (this.orders.res.pay_way.indexOf('ali') > -1) {
+                    this.orders.res.payType = 'ali'
+                } else {
+                    this.orders.res.payType = 'transferAccounts'
+                }
+            } else {
+                this.orders.res.payType = 'transferAccounts'
+            }
             if(source=='qmx'){ //线下
                 if(product_type.indexOf('大会员')!=-1){
                     this.$refs.bigOrderEdit.show(this.orders)

src/views/order/components/helpOrder.vue

@@ -33,6 +33,9 @@
             <Radio :label="item.val" v-for="item in timesList" :key="item.val">{{ item.name }}</Radio>
           </RadioGroup>
         </FormItem>
+        <FormItem label="业绩归属部门" required>
+          <Cascader :data="saleDep" trigger="hover" @on-visible-change="saleDepClick" @on-change="saleDepChange"></Cascader>
+        </FormItem>
         <!-- <FormItem label="购买省份" required v-show="others.productType == '5'">
           <city-select ref="cityArea" :stopCheck="stopCheck" @provinceSel="provinceSel"></city-select>
           <div v-show="others.vipType=='1'||others.vipType=='2'" style="color:#ed4014;font-size:13px;line-height:20px">
@@ -57,6 +60,8 @@ export default {
   },
   data() {
     return {
+      saleCode: '',
+      saleDep : [],
       loading: false,
       loading1: false,
       oShow: false,
@@ -120,7 +125,19 @@ export default {
     },
     timesChange(val) {//单选改变事件
       console.log(val)
-
+    },
+    saleDepClick () {
+        let url = '/order/getSalesChannelItem'
+        this.$request(url).data({
+            name: this.reqType
+        }).success((res) => {
+            if (res.data.dep) {
+                this.saleDep = res.data.dep
+            }
+        }).post()
+    },
+    saleDepChange (val) {
+        this.saleCode = String(val[val.length-1])
     },
     pheHandler() {//手机号校验
       this.others.phone = this.others.phone.replace(/[^\d]/g, '')
@@ -262,11 +279,16 @@ export default {
         this.$Notice.warning({ title: '付费类型为必填项' })
         return
       }
+      if (!this.saleCode) {
+        this.$Notice.warning({ title: '业绩归属部门为必填项' })
+        return
+      }
       let obj = {
         userId: this.others.phone,
         // vipType: this.others.productType == '5' ? this.others.vipType : '',
         cycleUnit: 2,  //目前单位后台不支持配置 写死为月 标识为2
         cycleCount:this.others.times,
+        saleDep: this.saleCode,
       }
       this.isDisable = true
       this.loading = true

src/views/order/components/otherOrder.vue

@@ -61,6 +61,9 @@
           <sale-select ref="saleRef" @salePerson="salePerson"
                        :setDefaultPerson="this.$store.getters.getAdminUser.username"></sale-select>
         </FormItem>
+        <FormItem label="业绩归属部门" required>
+          <Cascader :data="saleDep" trigger="hover" @on-visible-change="saleDepClick" @on-change="saleDepChange"></Cascader>
+        </FormItem>
         <FormItem label="业绩统计时间">
           <date-sigle ref="sigleRef4" :dateType="'date'" :dataV="others.sale_time" :placeholderd="'请选择业绩统计时间'"
                       @startDate="saleDate" :overTime="0"></date-sigle>
@@ -128,6 +131,11 @@
           <v-cascader ref="casRef2" :initVal="'h01'" placeholderType="请选择签约主体" reqType="签约主体"
                       @levelChange="paybackChange" v-if="oShow"></v-cascader>
         </FormItem>
+        <FormItem label="约定支付方式" required>
+          <Select v-model="others.payType" placeholder="请选择约定支付方式">
+            <Option v-for="item in payTypes" :value="item.v" :key="item.v">{{ item.n }}</Option>
+          </Select>
+        </FormItem>
         <FormItem label="协议签订时间" v-if="others.contractStatus == '1'">
           <date-sigle ref="sigleRef2" :dateType="'date'" :placeholderd="'请选择协议签订时间'" @startDate="agreeDate"
                       :overTime="0"></date-sigle>
@@ -331,6 +339,19 @@ export default {
         }
       })
     },
+    saleDepClick () {
+        let url = '/order/getSalesChannelItem'
+        this.$request(url).data({
+            name: this.reqType
+        }).success((res) => {
+            if (res.data.dep) {
+                this.saleDep = res.data.dep
+            }
+        }).post()
+    },
+    saleDepChange (val) {
+        this.saleCode = String(val[val.length-1])
+    },
     onRemoveUpload () {
       this.others.contract_file_url = ''
     },
@@ -628,6 +649,10 @@ export default {
         this.$Notice.warning({title: '请选择销售渠道'})
         return
       }
+      if (!this.others.payType) {
+        this.$Notice.warning({title: '请选择约定支付方式'})
+        return
+      }
       if (this.others.buySubject == '') {
         this.$Notice.warning({title: '请选择购买主体'})
         return
@@ -776,9 +801,10 @@ export default {
         contract_archive_time: this.others.contractStatus == '1' ? this.others.contract_archive_time : '',
         contract_archive_num: this.others.contractStatus == '1' ? this.others.contract_archive_num : '',
         salesPerson: this.others.salesPerson ? JSON.parse(this.others.salesPerson).username : '',
-        salesPersonId: this.others.salesPerson ? JSON.parse(this.others.salesPerson).id : ''
+        salesPersonId: this.others.salesPerson ? JSON.parse(this.others.salesPerson).id : '',
+        saleDep: this.saleCode,
+        payType: this.others.payType
       }
-      console.log(obj)
       var urlVue = ``
       if (this.showOrderStatus) {
         urlVue = `/order/createOtherOrder`
@@ -838,6 +864,8 @@ export default {
   },
   data() {
     return {
+      saleCode: '',
+      saleDep : [],
       oShow: false,
       isDisable: false,
       noPass: false,
@@ -888,7 +916,8 @@ export default {
         order_status: '1',
         contract_archive_status: '0',
         contract_archive_time: '',
-        contract_archive_num: ''
+        contract_archive_num: '',
+        payType: ''
       },
       otherPro: [
         {v: '1', n: '广告'},
@@ -914,6 +943,11 @@ export default {
         {v: '0', n: '不签协议'},
         {v: '1', n: '已签协议'}
       ],
+      payTypes: [
+          {v: 'transferAccounts', n: '对公转账'},
+          {v: 'wx', n: '微信'},
+          {v: 'ali', n: '支付宝'}
+      ],
       chargeStatus: [
         {v: '0', n: '免费'},
         {v: '1', n: '收费'}

src/views/order/components/otherOrderEdit.vue

@@ -73,6 +73,9 @@
           <FormItem label="销售人员">
             <sale-select ref="saleRef" :saleType="'1'" @salePerson="salePerson" v-if="oShow"></sale-select>
           </FormItem>
+          <FormItem label="业绩归属部门">
+            <Cascader v-model="others.saleCodeModel" :data="saleDep" trigger="hover" @on-change="saleDepChange"></Cascader>
+          </FormItem>
           <FormItem label="业绩统计时间">
             <date-sigle ref="sigleRef4" :dateType="'date'" :dataV="others.sale_time" :placeholderd="'请选择业绩统计时间'"
                         @startDate="saleDate" :overTime="0"></date-sigle>
@@ -141,6 +144,11 @@
             <v-cascader ref="casRef2" :initVal="'h01'" placeholderType="请选择签约主体" reqType="签约主体"
                         @levelChange="paybackChange" v-if="oShow"></v-cascader>
           </FormItem>
+          <FormItem label="约定支付方式" prop="payType">
+            <Select v-model="others.payType" placeholder="请选择约定支付方式" :disabled="finish_dis">
+              <Option v-for="item in payTypes" :value="item.v" :key="item.v">{{ item.n }}</Option>
+            </Select>
+          </FormItem>
           <FormItem label="协议签订时间" v-show="others.contractStatus == '1'">
             <date-sigle ref="sigleRef2" :dateType="'date'" :placeholderd="'请选择协议签订时间'" @startDate="agreeDate"
                         :overTime="0"></date-sigle>
@@ -387,6 +395,9 @@ export default {
         }
       })
     },
+    saleDepChange (val) {
+        this.saleCode = String(val[val.length-1])
+    },
     intered(time, phone, money) {// 判断权益是否开通
       console.log(time, phone.substr(0, 1), money)
       if (money > 0) {// 已回款金额
@@ -698,10 +709,10 @@ export default {
         this.$Notice.warning({title: '请选择销售渠道'})
         return
       }
-      // if (!this.others.createTime) {
-      //   this.$Notice.warning({title: '请选择订单时间'})
-      //   return
-      // }
+      if (!this.others.payType) {
+        this.$Notice.warning({title: '请选择约定支付方式'})
+        return
+      }
       if (!this.others.phone && this.others.productType !== '1' && this.others.productType !== '6' && this.others.productType !== '7' && this.others.productType !== '8' && this.others.productType !== '9'&& this.others.productType !== '14') {
         this.$Notice.warning({title: '手机号不能为空'})
         return
@@ -774,7 +785,6 @@ export default {
         if (this.others.phone) {
           if ((/^1[3456789]\d{9}$/.test(this.others.phone))) {
             let selects = this.$refs.cityArea.selectCitys.length, originalArea = this.areaNums.areaCount
-            console.log(selects, originalArea)
             if (this.others.productType == '5') {
               if (this.others.vipType == '2') {
                 if (!this.stopCheck) {
@@ -870,9 +880,10 @@ export default {
         contract_archive_num: this.others.contractStatus == '1' ? this.others.contract_archive_num : '',
         salesPerson: this.others.salesPerson ? JSON.parse(this.others.salesPerson).username : '',
         salesPersonId: this.others.salesPerson ? JSON.parse(this.others.salesPerson).id : '',
-        updateType: this.noPass1 ? 0 : 1
+        updateType: this.noPass1 ? 0 : 1,
+        payType: this.others.payType,
+        saleDep: this.saleCode
       }
-      console.log(obj)
       this.isDisable = true
       var submitUrl = ''
       if (this.returnMyOther) {
@@ -1027,7 +1038,6 @@ export default {
           this.radio_dis=true
         }else{
           this.radio_dis=false
-
         }
 
         if(res.orderStatus == 1){//回显订单已完成禁用购买主体
@@ -1035,7 +1045,17 @@ export default {
           this.$refs.dateRef.isDis = true
         }else{
           this.finish_dis=false
-
+        }
+        if (res.saleDep) {
+          let url = '/order/getSalesChannelItem'
+          this.$request(url).data({
+              name: this.reqType
+          }).success((res) => {
+              if (res.data.dep) {
+                  this.saleDep = res.data.dep
+              }
+          }).post()
+          this.saleCode = String(res.saleDep[res.saleDep.length-1])
         }
 
         this.others = {
@@ -1083,8 +1103,9 @@ export default {
             username: res.salesperson
           }), //
           // salesPersonId: res.salesperson_id //
+          payType: res.payType,
+          saleCodeModel: res.saleDep
         }
-        console.log(this.others)
         if (productType == "5") {
           this.checkVip(1)
         }
@@ -1127,6 +1148,8 @@ export default {
   },
   data() {
     return {
+      saleCode: '',
+      saleDep : [],
       isEnterprise:false,
       radio_dis:false,
       finish_dis:false,
@@ -1188,7 +1211,9 @@ export default {
         order_status: '1',
         contract_archive_status: '0',
         contract_archive_time: '',
-        contract_archive_num: ''
+        contract_archive_num: '',
+        payType: '',
+        saleCodeModel: []
       },
       ruleValidate: {
         phone: [{required: true}],
@@ -1235,6 +1260,11 @@ export default {
         {v: '0', n: '不签协议'},
         {v: '1', n: '已签协议'}
       ],
+      payTypes: [
+          {v: 'transferAccounts', n: '对公转账'},
+          {v: 'wx', n: '微信'},
+          {v: 'ali', n: '支付宝'}
+      ],
       chargeStatus: [
         {v: '0', n: '免费'},
         {v: '1', n: '收费'}

src/views/order/components/salePersonAdd.vue

@@ -16,6 +16,9 @@
           <sale-select ref="saleRef" saleType="1" :dis="true" @salePerson="salePerson"
                        :setDefaultPerson="this.$store.getters.getAdminUser.username"></sale-select>
         </FormItem>
+        <FormItem label="业绩归属部门" required>
+          <Cascader :data="saleDep" trigger="hover" @on-visible-change="saleDepClick" @on-change="saleDepChange"></Cascader>
+        </FormItem>
         <FormItem label="业绩统计时间" required>
           <date-sigle ref="sigleRef4" :dateType="'date'" :dataV="others.sale_time" :placeholderd="'请选择业绩统计时间'"
                       @startDate="saleDate" :overTime="0"></date-sigle>
@@ -190,6 +193,10 @@ export default {
         this.$Notice.warning({title: '请选择业绩统计时间'})
         return
       }
+      if (!this.saleCode) {
+        this.$Notice.warning({ title: '请选择业绩归属部门' })
+        return
+      }
       // console.log("上传图片：", this.uploadList.length)
       if (!this.uploadList.length) {
         this.$Notice.warning({title: '请上传销售凭证'})
@@ -204,6 +211,7 @@ export default {
         salePerson: this.others.salesPerson ? JSON.parse(this.others.salesPerson).username : '',
         salesPersonId: this.others.salesPerson ? JSON.parse(this.others.salesPerson).id : '',
         imgUrl: this.others.imgUrl,
+        saleDep: this.saleCode
       }
       this.isDisable = true
       if (this.id !== 0) {
@@ -265,9 +273,24 @@ export default {
       this.imgType = img
       this.$refs.previewRef.preview = true
     },
+    saleDepClick () {
+        let url = '/order/getSalesChannelItem'
+        this.$request(url).data({
+            name: this.reqType
+        }).success((res) => {
+            if (res.data.dep) {
+                this.saleDep = res.data.dep
+            }
+        }).post()
+    },
+    saleDepChange (val) {
+        this.saleCode = String(val[val.length-1])
+    }
   },
   data() {
     return {
+      saleCode: '',
+      saleDep : [],
       oShow: false,
       isDisable: false,
       noPass: false,