P348

src/assets/css/common.css

@@ -332,6 +332,8 @@ textarea:-ms-input-placeholder {
 }
 .ivu-modal .ivu-modal-body {
   padding: 16px 32px;
+  max-height: 600px;
+  overflow-y: scroll;
 }
 .par-model .ivu-modal-body {
   padding: 0;

src/components/cascader.vue

@@ -9,7 +9,7 @@
       class="doms-width"
       trigger="hover"
       not-found-text="加载中"
-      :disabled="disvals"
+      :disabled="disabled"
   ></Cascader>
 </template>
 
@@ -21,14 +21,16 @@ export default {
     reqType: String,
     type: String,
     quType: String,
-    disval: Boolean
+    disabled: {
+      type: Boolean,
+      default: false
+    }
   },
   data() {
     return {
       values: [this.initVal],
       dictData: [],
-      flage: true,
-      disvals: this.disval
+      flage: true
     }
   },
   created() {

src/views/order/components/bigOrder.vue

@@ -9,10 +9,10 @@
                   </Select>
                 </FormItem>
                 <FormItem label="销售渠道" required>
-                  <v-cascader ref="casRef" type="1" quType="1" :disval="false" placeholderType="请选择销售渠道" reqType="销售渠道" @levelChange="salesChange"></v-cascader>
+                  <v-cascader ref="casRef" type="1" quType="1" placeholderType="请选择销售渠道" reqType="销售渠道" @levelChange="salesChange"></v-cascader>
                 </FormItem>
                 <FormItem label="下单渠道" required>
-                  <v-cascader ref="casRef1" :initVal="'d01'" :disval="false" placeholderType="请选择下单渠道" reqType="下单渠道" @levelChange="channelChange" v-if="bShow"></v-cascader>
+                  <v-cascader ref="casRef1" :initVal="'d01'" placeholderType="请选择下单渠道" reqType="下单渠道" @levelChange="channelChange" v-if="bShow"></v-cascader>
                 </FormItem>
                 <FormItem label="购买主体" required>
                     <RadioGroup v-model="member.buySubject" @on-change="radiosChange">
@@ -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"></Cascader>
+                <Cascader :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>
@@ -241,7 +241,7 @@
                         </Select>
                     </FormItem>
                     <FormItem label="签约主体" required>
-                        <v-cascader ref="casRef2" :initVal="'h01'" :disval="false" placeholderType="签约主体" reqType="签约主体" @levelChange="paybackChange" v-if="bShow"></v-cascader>
+                        <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="请选择约定支付方式">
@@ -358,6 +358,8 @@ 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 = []
@@ -1614,6 +1616,10 @@ export default {
                 this.$Notice.warning({title: '请选择购买主体'})
                 return
             }
+            if (!this.saleCode) {
+                this.$Notice.warning({title: '请选择业绩归属部门'})
+                return
+            }
             if (!this.member.payType) {
                 this.$Notice.warning({title: '请选择约定支付方式'})
                 return
@@ -1625,13 +1631,14 @@ export default {
             if(this.member.products == ''){
               this.$Notice.warning({title: '请选择产品类型'})
               return
-
             }
-
+            if(!this.member.paybackCompany){
+              this.$Notice.warning({title: '请选择签约主体'})
+              return
+            }
             if(this.member.billingMode  !== 0 && this.member.billingMode  !== 1){
               this.$Notice.warning({title: '请选择计费模式'})
               return
-
             }
             if (this.member.buySubject == '2') {
                 if(this.member.buyCount == '')  {

src/views/order/components/bigOrderEdit.vue

@@ -15,12 +15,12 @@
             </Select>
           </FormItem>
           <FormItem label="销售渠道" prop="salesChannel">
-            <v-cascader ref="casRef" type="1" quType="1" :disval="false" placeholderType="请选择销售渠道" reqType="销售渠道"
+            <v-cascader ref="casRef" type="1" quType="1" placeholderType="请选择销售渠道" reqType="销售渠道"
                         @levelChange="salesChange"
                         v-if="bShow"></v-cascader>
           </FormItem>
           <FormItem label="下单渠道" prop="orderChannel">
-            <v-cascader ref="casRef1" :initVal="'d01'" :disval="false" placeholderType="请选择下单渠道" reqType="下单渠道"
+            <v-cascader ref="casRef1" :initVal="'d01'" placeholderType="请选择下单渠道" reqType="下单渠道"
                         @levelChange="channelChange" v-if="bShow"></v-cascader>
           </FormItem>
           <FormItem label="购买主体" required>
@@ -69,7 +69,7 @@
             <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>
+            <Cascader v-model="member.saleCodeModel" change-on-select :data="saleDep" trigger="hover" @on-change="saleDepChange"></Cascader>
           </FormItem>
           <FormItem label="业绩统计时间">
             <date-sigle ref="sigleRef3" :dateType="'date'" :dataV="member.sale_time" :placeholderd="'请选择业绩统计时间'"
@@ -273,9 +273,9 @@
             </FormItem>
             <FormItem label="签约主体" prop="paybackCompany">
               <v-cascader ref="casRef2" :initVal="'h01'" placeholderType="签约主体" reqType="签约主体"
-                          @levelChange="paybackChange" :disval="finish_dis" v-if="bShow"></v-cascader>
+                          @levelChange="paybackChange" :disabled="finish_dis" v-if="bShow"></v-cascader>
             </FormItem>
-            <FormItem label="约定支付方式" prop="payType">
+            <FormItem label="约定支付方式">
               <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>
@@ -1872,35 +1872,31 @@ export default {
       //           return
       //       }
       if (this.member.phone == '') {
-                this.$Notice.warning({title: '请输入手机号'})
-                return
-            }
+          this.$Notice.warning({title: '请输入手机号'})
+          return
+      }
+      if(!this.member.paybackCompany){
+        this.$Notice.warning({title: '签约主体不能为空'})
+        return
+      }
       if(this.member.products == ''){
-              this.$Notice.warning({title: '请选择产品类型'})
-              return
-
-            }
-
+        this.$Notice.warning({title: '请选择产品类型'})
+        return
+      }
       if(this.member.billingMode  !== 0 && this.member.billingMode  !== 1){
-              this.$Notice.warning({title: '请选择计费模式'})
-              return
-
-            }
+        this.$Notice.warning({title: '请选择计费模式'})
+        return
+      }
       if (this.member.buySubject == '2') {
         if(this.member.buyCount == '')  {
-              this.$Notice.warning({title: '请输入购买数量'})
-              return
-          }
+            this.$Notice.warning({title: '请输入购买数量'})
+            return
+        }
         if(this.member.buyCount <= 0 ){
-              this.$Notice.warning({title: '请输入大于0的数量'})
-              return
-          }
-                // 公司名称在依赖后端校验的几个选项后 继续依赖后端校验
-                // if (this.member.companyName == ''){
-                //     this.$Notice.warning({title: '购买主体为企业,请输入公司名称'})
-                //     return
-                // }
-            }
+            this.$Notice.warning({title: '请输入大于0的数量'})
+            return
+        }
+      }
       let serveData = []
       this.datas2.forEach(v => {
         serveData.push({
@@ -2267,6 +2263,7 @@ export default {
           payType: res.payType,
           saleCodeModel: res.saleDep
         }
+        console.log(res.payType)
         if (this.member.cycleType === 1) {
           this.max_length = 4
         }

src/views/order/components/details.vue

@@ -33,7 +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.orderStatus!=0&&book.source!='qmx')||book.source=='qmx'?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>
@@ -913,10 +913,10 @@ 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) {
+            if (this.orders.res.payType) {
+                if (this.orders.res.payType === '微信') {
                     this.orders.res.payType = 'wx'
-                } else if (this.orders.res.pay_way.indexOf('ali') > -1) {
+                } else if (this.orders.res.payType === '支付宝') {
                     this.orders.res.payType = 'ali'
                 } else {
                     this.orders.res.payType = 'transferAccounts'

src/views/order/components/helpOrder.vue

@@ -34,7 +34,7 @@
           </RadioGroup>
         </FormItem>
         <FormItem label="业绩归属部门" required>
-          <Cascader :data="saleDep" trigger="hover" @on-visible-change="saleDepClick" @on-change="saleDepChange"></Cascader>
+          <Cascader :data="saleDep" change-on-select 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>

src/views/order/components/onlineOrderEdit.vue

@@ -13,7 +13,6 @@
             type="1"
             placeholderType="请选择销售渠道"
             reqType="销售渠道"
-            :disval="false"
             @levelChange="salesChange"
           ></v-cascader>
         </FormItem>

src/views/order/components/otherOrder.vue

@@ -10,11 +10,11 @@
           </Select>
         </FormItem>
         <FormItem label="销售渠道" required>
-          <v-cascader ref="casRef" :disval="false" type="1" quType="1" placeholderType="请选择销售渠道" reqType="销售渠道"
+          <v-cascader ref="casRef" type="1" quType="1" placeholderType="请选择销售渠道" reqType="销售渠道"
                       @levelChange="salesChange"></v-cascader>
         </FormItem>
         <FormItem label="下单渠道" required>
-          <v-cascader ref="casRef1" :disval="false" :initVal="'d01'" placeholderType="请选择下单渠道" reqType="下单渠道"
+          <v-cascader ref="casRef1" :initVal="'d01'" placeholderType="请选择下单渠道" reqType="下单渠道"
                       @levelChange="channelChange" v-if="oShow"></v-cascader>
         </FormItem>
         <FormItem label="购买主体" required>
@@ -62,7 +62,7 @@
                        :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>
+          <Cascader :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="'请选择业绩统计时间'"
@@ -128,7 +128,7 @@
           </Select>
         </FormItem>
         <FormItem label="签约主体" required>
-          <v-cascader ref="casRef2" :initVal="'h01'" :disval="false" placeholderType="请选择签约主体" reqType="签约主体"
+          <v-cascader ref="casRef2" :initVal="'h01'" placeholderType="请选择签约主体" reqType="签约主体"
                       @levelChange="paybackChange" v-if="oShow"></v-cascader>
         </FormItem>
         <FormItem label="约定支付方式" required>
@@ -297,6 +297,8 @@ 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
@@ -649,6 +651,10 @@ export default {
         this.$Notice.warning({title: '请选择销售渠道'})
         return
       }
+      if (!this.saleCode) {
+        this.$Notice.warning({title: '请选择业绩归属部门'})
+        return
+      }
       if (!this.others.payType) {
         this.$Notice.warning({title: '请选择约定支付方式'})
         return
@@ -761,6 +767,10 @@ export default {
         this.$Notice.warning({title: '应付金额不能为空'})
         return
       }
+      if(!this.others.paybackCompany){
+        this.$Notice.warning({title: '请选择签约主体'})
+        return
+      }
       let obj = {
         ...params,
         createTime: this.others.createTime,

src/views/order/components/otherOrderEdit.vue

@@ -17,12 +17,12 @@
             </Select>
           </FormItem>
           <FormItem label="销售渠道" prop="salesChannel">
-            <v-cascader ref="casRef" type="1" quType="1" :disval="false" placeholderType="请选择销售渠道" reqType="销售渠道"
+            <v-cascader ref="casRef" type="1" quType="1" placeholderType="请选择销售渠道" reqType="销售渠道"
                         @levelChange="salesChange"
                         v-if="oShow"></v-cascader>
           </FormItem>
           <FormItem label="下单渠道" prop="orderChannel">
-            <v-cascader ref="casRef1" :initVal="'d01'" :disval="false" placeholderType="请选择下单渠道" reqType="下单渠道"
+            <v-cascader ref="casRef1" :initVal="'d01'" placeholderType="请选择下单渠道" reqType="下单渠道"
                         @levelChange="channelChange" v-if="oShow"></v-cascader>
           </FormItem>
           <FormItem label="购买主体" required>
@@ -74,7 +74,7 @@
             <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>
+            <Cascader v-model="others.saleCodeModel" :data="saleDep" trigger="hover" change-on-select @on-change="saleDepChange"></Cascader>
           </FormItem>
           <FormItem label="业绩统计时间">
             <date-sigle ref="sigleRef4" :dateType="'date'" :dataV="others.sale_time" :placeholderd="'请选择业绩统计时间'"
@@ -141,7 +141,7 @@
             </Select>
           </FormItem>
           <FormItem label="签约主体" prop="paybackCompany">
-            <v-cascader ref="casRef2" :initVal="'h01'" :disval="false" placeholderType="请选择签约主体" reqType="签约主体"
+            <v-cascader ref="casRef2" :initVal="'h01'" :disabled="finish_dis" placeholderType="请选择签约主体" reqType="签约主体"
                         @levelChange="paybackChange" v-if="oShow"></v-cascader>
           </FormItem>
           <FormItem label="约定支付方式" prop="payType">
@@ -834,11 +834,14 @@ export default {
         return
       }
       let trueMoney = this.fixedNum(this.others.contractMoney - this.others.commission - this.others.proceduresMoney)
-      console.log(trueMoney, this.returnBoll)
       if (this.returnBoll !== null && trueMoney < this.returnBoll) {
         this.$Notice.warning({title: '警告提示', desc: ' 应收金额小于已回款金额，不允许提交！'})
         return
       }
+      if(!this.others.paybackCompany){
+        this.$Notice.warning({title: '签约主体不能为空'})
+        return
+      }
       let obj = {
         orderCode: this.others.orderCode,
         createTime: this.others.createTime,

src/views/order/components/salePersonAdd.vue

@@ -8,7 +8,7 @@
                  @orderCodeChange="orderCodeChange"></Input>
         </FormItem>
         <FormItem label="销售渠道" required>
-          <v-cascader ref="casRef" type="1" saleType="1" :disval="false" placeholderType="请选择销售渠道" reqType="销售渠道" initVal="x02,x020"
+          <v-cascader ref="casRef" type="1" saleType="1" placeholderType="请选择销售渠道" reqType="销售渠道" initVal="x02,x020"
                       @levelChange="salesChange"></v-cascader>
         </FormItem>
 
@@ -17,7 +17,7 @@
                        :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>
+          <Cascader v-model="saleCodeModel" :data="saleDep" trigger="hover" change-on-select @on-visible-change="saleDepClick" @on-change="saleDepChange"></Cascader>
         </FormItem>
         <FormItem label="业绩统计时间" required>
           <date-sigle ref="sigleRef4" :dateType="'date'" :dataV="others.sale_time" :placeholderd="'请选择业绩统计时间'"
@@ -291,6 +291,7 @@ export default {
     return {
       saleCode: '',
       saleDep : [],
+      saleCodeModel: [],
       oShow: false,
       isDisable: false,
       noPass: false,

src/views/order/orderList.vue

@@ -37,7 +37,7 @@
           <Option v-for="item in proType" :value="item.v" :key="item.v">{{ item.n }}</Option>
         </Select>
         <div class="cas-div">
-          <v-cascader ref="casRef" placeholderType="销售渠道" type="1" quType="1" :disval="false" @levelChange="levelChange"></v-cascader>
+          <v-cascader ref="casRef" placeholderType="销售渠道" type="1" quType="1" @levelChange="levelChange"></v-cascader>
         </div>
         <Select placeholder="订单状态" clearable v-model="filter.orderStatus" style="width:100px;margin:0 10px 10px 0">
           <Option v-for="item in orderStas" :value="item.v" :key="item.v">{{ item.n }}</Option>

src/views/order/orderReview.vue

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

src/views/order/salePersonlist.vue

@@ -204,7 +204,6 @@ export default {
   },*/
   methods: {
     salePersonEdit(row) {
-      console.log("数据：", row)
       this.$refs.otherModel.oShow = true
       this.$refs.otherModel.others.orderCode = row.order_code
       this.$refs.otherModel.$refs.saleRef.salePerson = JSON.stringify({
@@ -229,6 +228,16 @@ export default {
         this.$refs.otherModel.uploadList = JSON.parse(row.url)
         this.$refs.otherModel.defaultList = JSON.parse(row.url)
       }
+      if (row.saleDep) {
+        this.$refs.otherModel.saleCode = String(row.saleDep[row.saleDep.length-1])
+        this.$refs.otherModel.saleCodeModel = row.saleDep
+        let url = '/order/getSalesChannelItem'
+        this.$request(url).data({}).success((res) => {
+            if (res.data.dep) {
+              this.$refs.otherModel.saleDep  = res.data.dep
+            }
+        }).post()
+      }
       this.$refs.otherModel.id = row.id
     },
     /* goDetail(row) {