348

src/views/order/components/bigOrder.vue

@@ -57,7 +57,7 @@
                 <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" change-on-select></Cascader>
+                <Cascader v-model="member.saleCodeModel" :data="saleDep" trigger="hover" @on-visible-change="saleDepClick" @on-change="saleDepChange" change-on-select></Cascader>
               </FormItem>
               <FormItem label="业绩统计时间">
                   <date-sigle ref="sigleRef3" :dateType="'date'" :dataV="member.sale_time" :placeholderd="'请选择业绩统计时间'" @startDate="saleDate" :overTime="0"></date-sigle>
@@ -358,8 +358,6 @@ export default {
           this.member.contract_archive_num = ''
           this.member.single = false
           this.member.areaCount = 0
-          this.member.saleCodeModel = []
-          this.member.payType = ''
           this.sumSel = []
           this.sPrice = 0
           this.strItems = []
@@ -413,7 +411,11 @@ export default {
             }).post()
         },
         saleDepChange (val) {
-            this.saleCode = String(val[val.length-1])
+            if (val && val.length > 0) {
+                this.saleCode = String(val[val.length-1])
+            } else {
+                this.saleCode = ''
+            }
         },
         onRemoveUpload () {
             this.member.contractUrl = ''
@@ -1818,10 +1820,11 @@ export default {
                     this.urlReq('/order/myCreateSupplyOrder', obj)
                 }
             }
-            // this.$refs.casRef.values = []
+            this.member.saleCodeModel = []
         },
         ordCancel() {
             this.$refs.casRef.values = []
+            this.member.saleCodeModel = []
             this.bShow = false
         },
         visibleChange(val) {
@@ -1963,7 +1966,8 @@ export default {
                 contract_archive_num: '',
                 single:false, // 大会员商机版2.0-单省版 radio 选中状态
                 areaCount:'0', // 大会员省份版-省份数量
-                payType: ''
+                payType: '',
+                saleCodeModel: []
             },
             isAll: false,
             radioDis1: false,

src/views/order/components/bigOrderEdit.vue

@@ -68,7 +68,7 @@
           <FormItem label="销售人员">
             <sale-select ref="saleRef" :saleType="'1'" @salePerson="salePerson" v-if="bShow"></sale-select>
           </FormItem>
-          <FormItem label="业绩归属部门">
+          <FormItem label="业绩归属部门" required>
             <Cascader v-model="member.saleCodeModel" change-on-select :data="saleDep" trigger="hover" @on-change="saleDepChange"></Cascader>
           </FormItem>
           <FormItem label="业绩统计时间">
@@ -275,7 +275,7 @@
               <v-cascader ref="casRef2" :initVal="'h01'" placeholderType="签约主体" reqType="签约主体"
                           @levelChange="paybackChange" :disabled="finish_dis" v-if="bShow"></v-cascader>
             </FormItem>
-            <FormItem label="约定支付方式">
+            <FormItem label="约定支付方式" required>
               <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>
@@ -455,7 +455,11 @@ export default {
       }).post()
     },
     saleDepChange (val) {
-        this.saleCode = String(val[val.length-1])
+        if (val && val.length > 0) {
+          this.saleCode = String(val[val.length-1])
+        } else {
+          this.saleCode = ''
+        }
     },
     radiosChange(val) {
             this.member.buySubject = String(val)
@@ -1879,6 +1883,14 @@ export default {
         this.$Notice.warning({title: '签约主体不能为空'})
         return
       }
+      if(!this.member.payType){
+        this.$Notice.warning({title: '请选择约定支付方式'})
+        return
+      }
+      if(!this.saleCode){
+        this.$Notice.warning({title: '请选择业绩归属部门'})
+        return
+      }
       if(this.member.products == ''){
         this.$Notice.warning({title: '请选择产品类型'})
         return
@@ -2260,10 +2272,9 @@ export default {
           contract_archive_num: contractRes.contract_archive_num == 0 ? '' : contractRes.contract_archive_num ,//
           single: filterData.areaCount>0 ? true:false,
           areaCount: filterData.areaCount,
-          payType: res.payType,
+          payType: res.payTypes,
           saleCodeModel: res.saleDep
         }
-        console.log(res.payType)
         if (this.member.cycleType === 1) {
           this.max_length = 4
         }

src/views/order/components/details.vue

@@ -915,14 +915,14 @@ export default {
             const product_type = this.orDetails.product_type
             if (this.orders.res.payType) {
                 if (this.orders.res.payType === '微信') {
-                    this.orders.res.payType = 'wx'
+                    this.orders.res.payTypes = 'wx'
                 } else if (this.orders.res.payType === '支付宝') {
-                    this.orders.res.payType = 'ali'
+                    this.orders.res.payTypes = 'ali'
                 } else {
-                    this.orders.res.payType = 'transferAccounts'
+                    this.orders.res.payTypes = 'transferAccounts'
                 }
             } else {
-                this.orders.res.payType = 'transferAccounts'
+                this.orders.res.payTypes = 'transferAccounts'
             }
             if(source=='qmx'){ //线下
                 if(product_type.indexOf('大会员')!=-1){

src/views/order/components/otherOrder.vue

@@ -62,7 +62,7 @@
                        :setDefaultPerson="this.$store.getters.getAdminUser.username"></sale-select>
         </FormItem>
         <FormItem label="业绩归属部门" required>
-          <Cascader :data="saleDep" trigger="hover" change-on-select @on-visible-change="saleDepClick" @on-change="saleDepChange"></Cascader>
+          <Cascader v-model="others.saleCodeModel" :data="saleDep" trigger="hover" change-on-select @on-visible-change="saleDepClick" @on-change="saleDepChange"></Cascader>
         </FormItem>
         <FormItem label="业绩统计时间">
           <date-sigle ref="sigleRef4" :dateType="'date'" :dataV="others.sale_time" :placeholderd="'请选择业绩统计时间'"
@@ -297,8 +297,6 @@ export default {
       this.others.salesChannel = ''
       this.others.orderChannel = 'd01'
       this.others.paybackCompany = 'h01'
-      this.others.saleCodeModel = []
-      this.others.payType = ''
       //this.$refs.saleRef.salePerson = ''
       setTimeout(() => {
         let sigs1 = this.$refs.sigleRef1
@@ -352,7 +350,11 @@ export default {
         }).post()
     },
     saleDepChange (val) {
+      if (val && val.length > 0) {
         this.saleCode = String(val[val.length-1])
+      } else {
+        this.saleCode = ''
+      }
     },
     onRemoveUpload () {
       this.others.contract_file_url = ''
@@ -767,7 +769,7 @@ export default {
         this.$Notice.warning({title: '应付金额不能为空'})
         return
       }
-      if(!this.others.paybackCompany){
+      if(this.others.paybackCompany === ''){
         this.$Notice.warning({title: '请选择签约主体'})
         return
       }
@@ -850,6 +852,7 @@ export default {
      // 置空销售渠道
      resetCalesValue () {
       this.$refs.casRef.values = []
+      this.others.saleCodeModel = []
     },
     visibleChange(val) {
       if (val == false) {
@@ -927,7 +930,8 @@ export default {
         contract_archive_status: '0',
         contract_archive_time: '',
         contract_archive_num: '',
-        payType: ''
+        payType: '',
+        saleCodeModel: []
       },
       otherPro: [
         {v: '1', n: '广告'},

src/views/order/components/otherOrderEdit.vue

@@ -73,7 +73,7 @@
           <FormItem label="销售人员">
             <sale-select ref="saleRef" :saleType="'1'" @salePerson="salePerson" v-if="oShow"></sale-select>
           </FormItem>
-          <FormItem label="业绩归属部门">
+          <FormItem label="业绩归属部门" required>
             <Cascader v-model="others.saleCodeModel" :data="saleDep" trigger="hover" change-on-select @on-change="saleDepChange"></Cascader>
           </FormItem>
           <FormItem label="业绩统计时间">
@@ -144,7 +144,7 @@
             <v-cascader ref="casRef2" :initVal="'h01'" :disabled="finish_dis" placeholderType="请选择签约主体" reqType="签约主体"
                         @levelChange="paybackChange" v-if="oShow"></v-cascader>
           </FormItem>
-          <FormItem label="约定支付方式" prop="payType">
+          <FormItem label="约定支付方式" prop="payType" required>
             <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>
@@ -396,7 +396,11 @@ export default {
       })
     },
     saleDepChange (val) {
+      if (val && val.length > 0) {
         this.saleCode = String(val[val.length-1])
+      } else {
+        this.saleCode = ''
+      }
     },
     intered(time, phone, money) {// 判断权益是否开通
       console.log(time, phone.substr(0, 1), money)
@@ -713,6 +717,10 @@ export default {
         this.$Notice.warning({title: '请选择约定支付方式'})
         return
       }
+      if (!this.saleCode) {
+        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
@@ -1106,7 +1114,7 @@ export default {
             username: res.salesperson
           }), //
           // salesPersonId: res.salesperson_id //
-          payType: res.payType,
+          payType: res.payTypes,  
           saleCodeModel: res.saleDep
         }
         if (productType == "5") {

src/views/order/orderReview.vue

@@ -89,14 +89,14 @@ export default {
         if (r.status === "success") {
           if (r.data.res.payType) {
             if (r.data.res.payType === '微信') {
-              r.data.res.payType = 'wx'
+              r.data.res.payTypes = 'wx'
             } else if (r.data.res.payType === '支付宝') {
-              r.data.res.payType = 'ali'
+              r.data.res.payTypes = 'ali'
             } else {
-              r.data.res.payType = 'transferAccounts'
+              r.data.res.payTypes = 'transferAccounts'
             }
           } else {
-            r.data.res.payType = 'transferAccounts'
+            r.data.res.payTypes = 'transferAccounts'
           }
           if (proType.indexOf('大会员') === -1) {
             this.$refs.otherModel.doReview = opera