Merge branch 'dev/v2.4.18' of jianyu/qmx_page_admin into feature/v2.4.18

src/components/cascader.vue

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

src/views/order/components/bigOrder.vue

@@ -9,10 +9,10 @@
                   </Select>
                 </FormItem>
                 <FormItem label="销售渠道" required>
-                  <v-cascader ref="casRef" type="1" quType="1" placeholderType="请选择销售渠道" reqType="销售渠道" @levelChange="salesChange"></v-cascader>
+                  <v-cascader ref="casRef" type="1" quType="1" :disval="false" placeholderType="请选择销售渠道" reqType="销售渠道" @levelChange="salesChange"></v-cascader>
                 </FormItem>
                 <FormItem label="下单渠道" required>
-                  <v-cascader ref="casRef1" :initVal="'d01'" placeholderType="请选择下单渠道" reqType="下单渠道" @levelChange="channelChange" v-if="bShow"></v-cascader>
+                  <v-cascader ref="casRef1" :initVal="'d01'" :disval="false" placeholderType="请选择下单渠道" reqType="下单渠道" @levelChange="channelChange" v-if="bShow"></v-cascader>
                 </FormItem>
                 <FormItem label="购买主体" required>
                     <RadioGroup v-model="member.buySubject" @on-change="radiosChange">
@@ -241,7 +241,7 @@
                         </Select>
                     </FormItem>
                     <FormItem label="签约主体" required>
-                        <v-cascader ref="casRef2" :initVal="'h01'" placeholderType="签约主体" reqType="签约主体" @levelChange="paybackChange" v-if="bShow"></v-cascader>
+                        <v-cascader ref="casRef2" :initVal="'h01'" :disval="false" placeholderType="签约主体" reqType="签约主体" @levelChange="paybackChange" v-if="bShow"></v-cascader>
                     </FormItem>
                     <FormItem label="约定支付方式" required>
                         <Select v-model="member.payType" placeholder="请选择约定支付方式">

src/views/order/components/bigOrderEdit.vue

@@ -15,12 +15,12 @@
             </Select>
           </FormItem>
           <FormItem label="销售渠道" prop="salesChannel">
-            <v-cascader ref="casRef" type="1" quType="1" placeholderType="请选择销售渠道" reqType="销售渠道"
+            <v-cascader ref="casRef" type="1" quType="1" :disval="false" placeholderType="请选择销售渠道" reqType="销售渠道"
                         @levelChange="salesChange"
                         v-if="bShow"></v-cascader>
           </FormItem>
           <FormItem label="下单渠道" prop="orderChannel">
-            <v-cascader ref="casRef1" :initVal="'d01'" placeholderType="请选择下单渠道" reqType="下单渠道"
+            <v-cascader ref="casRef1" :initVal="'d01'" :disval="false" placeholderType="请选择下单渠道" reqType="下单渠道"
                         @levelChange="channelChange" v-if="bShow"></v-cascader>
           </FormItem>
           <FormItem label="购买主体" required>
@@ -273,7 +273,7 @@
             </FormItem>
             <FormItem label="签约主体" prop="paybackCompany">
               <v-cascader ref="casRef2" :initVal="'h01'" placeholderType="签约主体" reqType="签约主体"
-                          @levelChange="paybackChange" v-if="bShow"></v-cascader>
+                          @levelChange="paybackChange" :disval="finish_dis" v-if="bShow"></v-cascader>
             </FormItem>
             <FormItem label="约定支付方式" prop="payType">
               <Select v-model="member.payType" placeholder="请选择约定支付方式" :disabled="finish_dis">
@@ -1992,7 +1992,9 @@ 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.single&&this.combo_id.id==6?this.member.areaCount:0,// 仅大会员商机版2.0时 单省版才有效
-          updateType: this.noPass1 ? 0 : 1
+          updateType: this.noPass1 ? 0 : 1,
+          payType: this.member.payType,
+          saleDep: this.saleCode
         }
         // console.log(obj)
         if (this.returnMyReceivable) {
@@ -2034,7 +2036,9 @@ export default {
           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 : '',
-          updateType: this.noPass1 ? 0 : 1
+          updateType: this.noPass1 ? 0 : 1,
+          payType: this.member.payType,
+          saleDep: this.saleCode
         }
         // console.log(obj)
         if (this.returnMyReceivable) {
@@ -2074,7 +2078,9 @@ export default {
           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 : '',
-          updateType: this.noPass1 ? 0 : 1
+          updateType: this.noPass1 ? 0 : 1,
+          payType: this.member.payType,
+          saleDep: this.saleCode
         }
         if (this.returnMyReceivable) {
           this.urlReq('/order/updateSupplyOrder', obj)
@@ -2208,7 +2214,6 @@ export default {
           }).post()
           this.saleCode = String(res.saleDep[res.saleDep.length-1])
         }
-       
         // 补充包列表
         this.supplys = filterData.supplys
         this.member = {

src/views/order/components/details.vue

@@ -25,7 +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>{{orDetails?orDetails.saleDepShow?orDetails.saleDepShow:'--':'--'}}</span>
                     <span>
                         <p>业绩统计时间：</p>
                         <i class="i-inpt">{{orDetails?orDetails.sale_time?orDetails.sale_time:'--':'--'}}</i>

src/views/order/components/onlineOrderEdit.vue

@@ -13,6 +13,7 @@
             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" type="1" quType="1" placeholderType="请选择销售渠道" reqType="销售渠道"
+          <v-cascader ref="casRef" :disval="false" type="1" quType="1" placeholderType="请选择销售渠道" reqType="销售渠道"
                       @levelChange="salesChange"></v-cascader>
         </FormItem>
         <FormItem label="下单渠道" required>
-          <v-cascader ref="casRef1" :initVal="'d01'" placeholderType="请选择下单渠道" reqType="下单渠道"
+          <v-cascader ref="casRef1" :disval="false" :initVal="'d01'" placeholderType="请选择下单渠道" reqType="下单渠道"
                       @levelChange="channelChange" v-if="oShow"></v-cascader>
         </FormItem>
         <FormItem label="购买主体" required>
@@ -128,7 +128,7 @@
           </Select>
         </FormItem>
         <FormItem label="签约主体" required>
-          <v-cascader ref="casRef2" :initVal="'h01'" placeholderType="请选择签约主体" reqType="签约主体"
+          <v-cascader ref="casRef2" :initVal="'h01'" :disval="false" placeholderType="请选择签约主体" reqType="签约主体"
                       @levelChange="paybackChange" v-if="oShow"></v-cascader>
         </FormItem>
         <FormItem label="约定支付方式" required>

src/views/order/components/otherOrderEdit.vue

@@ -17,12 +17,12 @@
             </Select>
           </FormItem>
           <FormItem label="销售渠道" prop="salesChannel">
-            <v-cascader ref="casRef" type="1" quType="1" placeholderType="请选择销售渠道" reqType="销售渠道"
+            <v-cascader ref="casRef" type="1" quType="1" :disval="false" placeholderType="请选择销售渠道" reqType="销售渠道"
                         @levelChange="salesChange"
                         v-if="oShow"></v-cascader>
           </FormItem>
           <FormItem label="下单渠道" prop="orderChannel">
-            <v-cascader ref="casRef1" :initVal="'d01'" placeholderType="请选择下单渠道" reqType="下单渠道"
+            <v-cascader ref="casRef1" :initVal="'d01'" :disval="false" placeholderType="请选择下单渠道" reqType="下单渠道"
                         @levelChange="channelChange" v-if="oShow"></v-cascader>
           </FormItem>
           <FormItem label="购买主体" required>
@@ -141,7 +141,7 @@
             </Select>
           </FormItem>
           <FormItem label="签约主体" prop="paybackCompany">
-            <v-cascader ref="casRef2" :initVal="'h01'" placeholderType="请选择签约主体" reqType="签约主体"
+            <v-cascader ref="casRef2" :initVal="'h01'" :disval="false" placeholderType="请选择签约主体" reqType="签约主体"
                         @levelChange="paybackChange" v-if="oShow"></v-cascader>
           </FormItem>
           <FormItem label="约定支付方式" prop="payType">

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" placeholderType="请选择销售渠道" reqType="销售渠道" initVal="x02,x020"
+          <v-cascader ref="casRef" type="1" saleType="1" :disval="false" placeholderType="请选择销售渠道" reqType="销售渠道" initVal="x02,x020"
                       @levelChange="salesChange"></v-cascader>
         </FormItem>
 

src/views/order/components/salePersonDetail.vue

@@ -18,6 +18,7 @@
               <div class="l-cont">
                 <p>订单编号：{{ salePersonInfo.order_code }}</p>
                 <p class="par">销售人员：{{ salePersonInfo.sale_person }}</p>
+                <p class="par">业绩归属部门：{{ salePersonInfo.saleDepShow }}</p>
               </div>
               <div class="l-cont r-cont">
                 <p>销售渠道：{{ salePersonInfo.distribution_channel }}</p>

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" @levelChange="levelChange"></v-cascader>
+          <v-cascader ref="casRef" placeholderType="销售渠道" type="1" quType="1" :disval="false" @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>